diff --git a/chat2db-community-client/package.json b/chat2db-community-client/package.json
index 80b981cba3..0d159049e5 100644
--- a/chat2db-community-client/package.json
+++ b/chat2db-community-client/package.json
@@ -12,7 +12,7 @@
     "build": "yarn run build:web:community",
     "build:prod": "yarn run build:web:community",
     "build:web": "umi build",
-    "prebuild:web:community": "yarn test:community-boundary && yarn test:retired-ai && yarn test:tree-title-highlight && yarn test:tree-search-lifecycle && yarn test:driver-upload && yarn test:tree-loading && yarn test:tree-node-lookup && yarn test:tree-node-path && yarn test:data-source-authorization && yarn test:data-source-mutation-refresh && yarn test:ai-model-config && yarn test:ai-model-select && yarn test:export-connections && yarn test:main-page-navigation && yarn test:console-tab-name && yarn test:workspace-tab-scroll && yarn test:workspace-split-lifecycle && yarn test:sql-completion-context && yarn test:file-manager-label && yarn test:local-file-encoding && yarn test:editor-close && yarn test:result-set-ui && yarn test:result-pagination && yarn test:result-table-layout && yarn test:result-status && yarn test:data-source-identity && yarn test:data-source-execution-snapshot && yarn test:data-source-watermark && yarn test:hot-update && yarn test:task-center && yarn test:application-exit && yarn test:monaco-lifecycle && yarn test:result-set-editor",
+    "prebuild:web:community": "yarn test:community-boundary && yarn test:database-capabilities && yarn test:table-editor && yarn test:retired-ai && yarn test:tree-title-highlight && yarn test:tree-search-lifecycle && yarn test:driver-upload && yarn test:tree-loading && yarn test:tree-node-lookup && yarn test:tree-node-path && yarn test:data-source-authorization && yarn test:active-transactions && yarn test:data-source-mutation-refresh && yarn test:ai-model-config && yarn test:ai-model-select && yarn test:export-connections && yarn test:main-page-navigation && yarn test:shortcut && yarn test:console-tab-name && yarn test:workspace-tab-scroll && yarn test:workspace-split-lifecycle && yarn test:sql-completion-context && yarn test:file-manager-label && yarn test:local-file-encoding && yarn test:local-file-save && yarn test:local-file-tree-path && yarn test:saved-console-dirty && yarn test:editor-close && yarn test:result-set-ui && yarn test:result-pagination && yarn test:sql-execution-stream && yarn test:result-table-layout && yarn test:result-status && yarn test:data-source-identity && yarn test:data-source-execution-snapshot && yarn test:data-source-watermark && yarn test:hot-update && yarn test:task-center && yarn test:import-preview && yarn test:application-exit && yarn test:monaco-lifecycle && yarn test:result-set-editor && yarn test:account-grants-request && yarn test:connection-close-request && yarn test:ssh-connection && yarn test:operation-log-filters && yarn test:dashboard-store",
     "postbuild:web:community": "node ./scripts/verify-production-bundles.cjs",
     "build:web:2java": "yarn run build:web:community && rm -rf ../chat2db-community-server/chat2db-community-start/src/main/resources/thymeleaf/* && cp -r dist/index.html ../chat2db-community-server/chat2db-community-start/src/main/resources/thymeleaf/",
     "build:web:community": "cross-env UMI_ENV=community cross-env APP_NAME=chat2db-community cross-env APP_VERSION=${npm_config_app_version} cross-env PRINT_LOGS=${npm_config_print_logs} cross-env APP_PORT=${npm_config_app_port} umi build",
@@ -25,8 +25,11 @@
     "lint:style": "stylelint \"src/**/*.{css,less}\" --max-warnings=0",
     "test:i18n": "node ./scripts/validate-i18n.cjs",
     "test:community-boundary": "node ./scripts/verify-community-boundary.cjs",
-    "test:retired-ai": "tsx src/blocks/AI/retiredAiSurface.test.ts && tsx src/blocks/AI/components/AIChatInput/mentionSelection.test.ts && tsx src/blocks/AI/knowledgeSelection.test.ts",
+    "test:database-capabilities": "tsx src/utils/databaseJudgments.test.ts",
+    "test:table-editor": "tsx src/blocks/DatabaseTableEditor/ColumnList/normalizeColumn.test.ts",
+    "test:retired-ai": "tsx src/blocks/AI/retiredAiSurface.test.ts && tsx src/blocks/AI/components/AICascaderSource/contextTree.test.ts && tsx src/blocks/AI/components/AIChatInput/mentionSelection.test.ts && tsx src/blocks/AI/messageNavigation.test.ts",
     "test:hot-update": "tsx src/store/global/slices/hotUpdate/action.test.ts",
+    "test:active-transactions": "tsx src/blocks/NewTree/components/ActiveTransactionsContent/activeTransactionUtils.test.ts && tsx src/blocks/NewTree/treeMenuGrouping.test.ts",
     "test:result-pagination": "tsx src/blocks/SearchResult/components/ResultSet/pagination.test.ts",
     "test:tree-node-path": "tsx src/blocks/NewTree/utils/treeNodePath.test.ts",
     "test:ai-model-config": "tsx src/blocks/AI/components/AIModelConfigModal/modelConfigDefaults.test.ts",
@@ -40,19 +43,22 @@
     "test:data-source-identity": "tsx src/utils/dataSourceIdentity.test.ts && tsx src/store/tree/dataSourceIdentity.test.ts && tsx src/store/tree/dataSourceList.test.ts && tsx src/store/tree/treeNodeLoadState.test.ts && tsx src/blocks/NewTree/dataSourceIdentity.test.ts && tsx src/blocks/NewTree/dataSourceColorMenu.test.ts && tsx src/blocks/NewTree/treeMenuDanger.test.ts && tsx src/blocks/NewTree/treeMenuGrouping.test.ts && tsx src/blocks/NewTree/dataSourceIdentityColorRequest.test.ts && tsx src/components/ConnectionEdit/identityColorUpdate.test.ts && tsx src/utils/editorDataSourceLifecycle.test.ts && tsx src/components/SelectBoundInfo/cascadeRequestGuard.test.ts && tsx src/components/SelectBoundInfo/dataSourceSelection.test.ts && tsx src/blocks/AI/dataSourceContext.test.ts",
     "test:database-object-sorting": "tsx src/blocks/NewTree/utils/sortTreeNodes.test.ts",
     "test:data-source-authorization": "tsx src/utils/dataSourceAuthorization.test.ts",
-    "test:data-source-mutation-refresh": "tsx src/store/tree/dataSourceMutationRefresh.test.ts",
+    "test:data-source-mutation-refresh": "tsx src/store/tree/dataSourceMutationRefresh.test.ts && tsx src/components/ConnectionEdit/submissionGuard.test.ts && tsx src/blocks/NewTree/treePositionMutation.test.ts",
+    "test:dashboard-store": "tsx src/store/dashboard/slices/common/refreshCurrentDashboard.test.ts",
     "test:dynamic-database-registry": "tsx src/utils/dynamicDatabaseRegistry.test.ts",
     "test:execution-console": "tsx src/blocks/SearchResult/components/ExecutionConsole/executionConsolePreferences.test.ts",
-    "test:editor-close": "tsx src/utils/editorCloseGuard.test.ts",
+    "test:editor-close": "tsx src/utils/editorCloseGuard.test.ts && tsx src/pages/main/workspace/components/SQLExecute/liveEditorHandle.test.ts && tsx src/pages/main/workspace/components/SQLExecute/liveEditorBoundInfo.test.ts",
     "test:export-connections": "tsx src/pages/main/workspace/components/WorkspaceLeftActionBar/components/TreeSetting/exportConnectionsFlow.test.ts",
     "test:file-manager-label": "tsx src/utils/fileManagerLabel.test.ts",
     "test:label-rotation": "tsx src/blocks/BI/Chart/components/EChartsContainer/hooks/useLabelRotate.test.ts",
     "test:redis-explorer": "tsx src/blocks/RedisAllData/redisExplorer.test.ts",
     "test:result-markdown": "tsx src/blocks/SearchResult/components/ResultSetTable/event/onContextmenuCell/handleCopyAsMarkdown.test.ts",
-    "test:result-set-ui": "tsx src/blocks/SearchResult/components/ResultSet/resultSetUi.test.ts",
+    "test:result-set-ui": "tsx src/blocks/SearchResult/components/ResultSet/resultSetUi.test.ts && tsx src/blocks/SearchResult/components/SQLPreviewExecute/updateSql.test.ts",
     "test:result-table-layout": "tsx src/blocks/SearchResult/components/ResultSetTable/layoutOptions.test.ts && tsx src/blocks/SearchResult/components/ResultSetTable/rowHeight.test.ts",
     "test:result-status": "tsx src/blocks/SearchResult/components/StatusBar/resultSummary.test.ts",
     "test:runtime-storage": "tsx src/store/indexDB/storageKey.test.ts && tsx src/pages/main/workspace/components/WorkspaceLeft/desktopBridge.test.ts",
+    "test:connection-close-request": "tsx src/service/connectionCloseRequest.test.ts",
+    "test:ssh-connection": "tsx src/components/ConnectionEdit/testSsh.test.ts",
     "test:result-tab-preferences": "tsx src/blocks/SearchResult/resultTabPreferences.test.ts && tsx src/service/resultTabShortcut.test.ts",
     "test:result-inspector": "tsx src/store/workspace/utils/resultInspector.test.ts && yarn test:search-result-tab-selection",
     "test:result-operation-record": "tsx src/blocks/SearchResult/components/ResultSetTable/hooks/useOperationRecord.test.tsx && tsx src/blocks/SearchResult/components/ResultSetTable/event/onChangeCellValue/index.test.ts",
@@ -62,8 +68,9 @@
     "test:saved-console-lifecycle": "tsx src/store/workspace/utils/savedConsoleLifecycle.test.ts && tsx src/store/workspace/utils/workspaceTabPersistence.test.ts",
     "test:sse-request": "tsx src/components/SSERequest/requestOwnership.test.ts && tsx src/components/SSERequest/requestTransport.test.ts",
     "test:settings-layout": "tsx src/blocks/Setting/navigation.test.ts && tsx src/blocks/Setting/search.test.ts && tsx src/blocks/Setting/BaseSetting/model.test.ts && tsx src/client-extension/settingMenus.test.ts && tsx src/blocks/Setting/settingsLayout.test.ts",
-    "test:shortcut": "tsx src/constants/shortcut.test.ts && tsx src/utils/appTitleBarAction.test.ts && tsx src/layouts/GlobalLayout/AppTitleBar/platform.test.ts && tsx src/utils/jcefZoom.test.ts",
+    "test:shortcut": "tsx src/constants/shortcut.test.ts && tsx src/utils/appTitleBarAction.test.ts && tsx src/layouts/GlobalLayout/AppTitleBar/platform.test.ts && tsx src/utils/jcefZoom.test.ts && tsx src/utils/shortcutDispatch.test.ts",
     "test:sql-execution-log": "tsx src/service/sqlExecutionLog.test.ts",
+    "test:operation-log-filters": "tsx src/components/OperationLogFilters/model.test.ts && tsx src/hooks/selectDatabaseRequestLifecycle.test.ts",
     "test:sql-execution-batch": "tsx src/service/sqlExecutionBatch.test.ts",
     "test:data-source-execution-snapshot": "tsx src/service/dataSourceExecutionSnapshot.test.ts",
     "test:sql-execution-request-tracker": "tsx src/service/sqlExecutionRequestTracker.test.ts",
@@ -71,26 +78,31 @@
     "test:result-set-editor": "tsx src/blocks/SearchResult/components/ResultSetTable/utils/editorType.test.ts && tsx src/blocks/CanvasTable/editor/SelectIEditor/index.test.ts && tsx src/blocks/CanvasTable/editor/MultiSelectIEditor/index.test.ts && tsx src/blocks/CanvasTable/editor/SelectIEditor/index.dom.test.ts",
     "test:local-file-tab-title": "tsx src/pages/main/workspace/utils/localTextFile.test.ts",
     "test:local-file-tab-refresh": "tsx src/store/workspace/utils/localFileWorkspaceTab.test.ts",
+    "test:local-file-save": "tsx src/utils/localFileSaveCoordinator.test.ts",
+    "test:local-file-tree-path": "tsx src/pages/main/workspace/components/LocalSQLFileTree/path.test.ts",
+    "test:saved-console-dirty": "tsx src/utils/savedConsoleDirty.test.ts",
     "test:local-file-encoding": "tsx src/utils/localFileEncoding.test.ts && yarn test:local-file-tab-refresh && tsx src/store/workspace/utils/workspaceTabPersistence.test.ts",
     "test:main-page-navigation": "tsx src/utils/mainPageNavigation.test.ts && tsx src/pages/main/navigationItems.test.ts && tsx src/client-extension/extension.test.ts",
-    "test:monaco-lifecycle": "tsx src/utils/monaco.test.ts",
+    "test:monaco-lifecycle": "tsx src/utils/monaco.test.ts && tsx src/components/SingleFileMonacoEditor/refAdapter.test.ts",
     "test:mcp-lifecycle": "tsx src/blocks/Setting/McpSetting/mcpLifecycle.test.ts",
     "test:sql-completion-context": "tsx src/components/SQLEditor/core/sqlCompletionContext.test.ts && tsx src/components/SQLEditor/core/sqlCompletionRequestError.test.ts",
     "test:sql-in-clipboard": "tsx src/utils/sqlInClipboard.test.ts && tsx src/components/SQLEditor/helper/sqlInsertValueDefaults.test.ts",
     "test:console-tab-name": "tsx src/store/workspace/utils/consoleTabName.test.ts && tsx src/utils/workspaceObjectTabTitle.test.ts",
-    "test:workspace-tab-scroll": "tsx src/store/workspace/utils/workspaceTabScrollRequest.test.ts && tsx src/components/Tabs/activeTabScroll.test.ts && tsx src/components/Tabs/wheelScroll.test.ts",
-    "test:workspace-split-lifecycle": "tsx src/pages/main/workspace/components/WorkspaceTabs/workspaceTabContentLayout.test.ts",
+    "test:workspace-tab-scroll": "tsx src/store/workspace/utils/workspaceTabScrollRequest.test.ts && tsx src/components/Tabs/activeTabScroll.test.ts && tsx src/components/Tabs/wheelScroll.test.ts && tsx src/components/Tabs/tabAccentColor.test.ts",
+    "test:workspace-split-lifecycle": "tsx src/pages/main/workspace/components/WorkspaceTabs/workspaceTabContentLayout.test.ts && tsx src/pages/main/workspace/components/WorkspaceTabs/workspaceTabLayout.test.ts",
     "test:tree-title-highlight": "tsx src/blocks/NewTree/components/TitleRender/highlightSearchText.test.ts",
     "test:tree-search-lifecycle": "tsx src/pages/main/workspace/components/WorkspaceTreeSearch/lifecycle.test.ts && tsx src/pages/main/workspace/components/WorkspaceTreeSearch/refresh.test.ts",
     "test:tree-data-update": "tsx src/store/tree/treeDataUpdate.test.ts",
-    "test:tree-loading": "tsx src/store/tree/loadNamespaceTree.test.ts && tsx src/store/tree/treeDataUpdate.test.ts && tsx src/store/tree/hiddenTreeNodeState.test.ts && tsx src/blocks/NewTree/components/TitleRender/switcherAction.test.ts && tsx src/blocks/NewTree/treeScrollWidth.test.ts && tsx src/pages/main/workspace/components/WorkspaceLeft/loadDatabaseTreePath.test.ts && tsx src/store/tree/savedConsoleTreeRefresh.test.ts",
+    "test:tree-loading": "tsx src/store/tree/loadNamespaceTree.test.ts && tsx src/store/tree/treeDataUpdate.test.ts && tsx src/store/tree/hiddenTreeNodeState.test.ts && tsx src/blocks/NewTree/components/TitleRender/switcherAction.test.ts && tsx src/blocks/NewTree/treeScrollWidth.test.ts && tsx src/blocks/NewTree/monitorTree.test.ts && tsx src/pages/main/workspace/components/WorkspaceLeft/loadDatabaseTreePath.test.ts && tsx src/store/tree/savedConsoleTreeRefresh.test.ts",
     "test:tree-node-lookup": "tsx src/utils/treeNodeLookup.test.ts",
     "test:data-source-watermark": "tsx src/utils/dataSourceWatermark.test.ts",
     "test:driver-upload": "tsx src/components/ConnectionEdit/components/Driver/driverUpload.test.ts",
     "test:terminal": "tsx src/constants/terminal.test.ts && tsx src/pages/main/workspace/components/WorkspaceExtend/WorkspaceExtendNav/quickTerminal.test.ts && tsx src/pages/main/workspace/components/WorkspaceTabs/terminalTabPlacement.test.ts && tsx src/pages/main/workspace/components/WorkspaceTabs/terminalAttachmentLifecycle.test.ts && tsx src/pages/main/workspace/components/WorkspaceTabs/workspaceTabSelection.test.ts",
-    "test:task-center": "tsx src/store/importExport/taskCenterUtils.test.ts",
+    "test:task-center": "tsx src/store/importExport/taskCenterUtils.test.ts && tsx src/store/importExport/taskCenterStore.test.ts && tsx src/blocks/ImportAndExport/components/Log/eventMessage.test.ts",
+    "test:import-preview": "tsx src/components/SingleCharacterSelect/index.test.ts && tsx src/blocks/ImportAndExport/components/ImportMappingContent/mapping.test.ts && tsx src/blocks/ImportAndExport/components/ImportMappingContent/fileStaging.test.ts && tsx src/blocks/ImportAndExport/components/ImportExportFile/selection.test.ts && tsx src/blocks/ImportAndExport/components/ImportFileModal/submission.test.ts && tsx src/blocks/ImportAndExport/utils/csvOptions.test.ts",
     "test:workspace-tab-drag": "tsx src/pages/main/workspace/components/WorkspaceTabs/workspaceTabDrop.test.ts",
     "test:verification-code-countdown": "tsx src/utils/verificationCodeCountdown.test.ts && tsx src/utils/latestRequest.test.ts",
+    "test:account-grants-request": "tsx src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/accountGrantsRequest.test.ts",
     "modify:package:name": "node ./scripts/modify-package-name.js",
     "start": "yarn run start:community:hot",
     "start:community:hot": "cross-env UMI_ENV=community cross-env APP_NAME=chat2db-community cross-env DISABLE_MFSU=true cross-env UMI_DEV_SERVER_COMPRESS=none cross-env HOST=127.0.0.1 cross-env PORT=8889 node --require ./scripts/bind-dev-server-loopback.cjs ./node_modules/umi/bin/umi.js dev --public_path=/",
diff --git a/chat2db-community-client/scripts/i18n-source-hashes.json b/chat2db-community-client/scripts/i18n-source-hashes.json
index 648acb4cf0..f52283d60c 100644
--- a/chat2db-community-client/scripts/i18n-source-hashes.json
+++ b/chat2db-community-client/scripts/i18n-source-hashes.json
@@ -6,9 +6,9 @@
       "ai.ts": "e7a2fcbfb3ed647bd14f63aca4b6c35c8fb402c49a6a1f36bb04f76f4e8415af",
       "chat.ts": "f6c6ab9cbc5c1c828c35c75d83c4adca347ade590b5177e10d64fdd18cc8aef5",
       "common.ts": "24aa2228702754bc019f1e21dd7be9f6d1c6ff02ed9bd9227ab319f331248b11",
-      "connection.ts": "d70578a3444978b60ea41c670e8b180849eaab297e33325db56c891e1058e899",
+      "connection.ts": "24f987f3e4188c0076c1c17591b9fd5792b29c2c176b2069f50a3bdf5d661af9",
       "dashboard.ts": "b99f5e6b81271573a8db1a585ac879724441b7163050899c3abaf9498217bd21",
-      "editTable.ts": "0f7a808f50053cd52b183d156bb4fd46bb125b8058f8774deb61c7f02894a350",
+      "editTable.ts": "6d1233d574dbd2e038ed112bc8677b12f61a0fc831f56f77d5ce024a96a319f6",
       "editTableData.ts": "b6f40d2e1f612b716c0dbc2ade925069a039585a28ada997e004c33ce2fd0901",
       "feedback.ts": "080fbb0b2e6578d10499d47e0f23b7161feffb769c8a574048c5a737c9624eea",
       "login.ts": "df4c7c4b2020ef3e9a70277f364d078fc6a10ad81be31d3b648933f14c423f43",
@@ -17,19 +17,19 @@
       "notification.ts": "500751da2f02391622f074448eb46611fd41da2e5530d6c7d65f17a1382bd236",
       "plugin.ts": "01f15b6342cc5b29899ee4144d67b04bb4bc02c6bb10779806be322dc5e9a2bc",
       "redis.ts": "cacf9cf685bf3bf6d019f18eead0f63713d4727be741a87d8dc1d22807ebd9ad",
-      "setting.ts": "14aea4aebdbe5cff2ae9ba4bf955aa42a95ac23d1950ea69291b22c29330d7cf",
+      "setting.ts": "cdc0698420cb89407b2e91ad31e45ddd7f8eb63ca3dd58196da5d6f8739a65b8",
       "spaceSetting.ts": "defdf3138e5e1782f0282760bcef4ce1b8550cc80b03052fea468d97165cb980",
       "sqlEditor.ts": "5c41e5f24d5ba78909795bcc681cabb8460cca075233b665dc4940afe82ce0c9",
-      "stream.ts": "8418dd25b0fd54b2ef2b15a2573edf0a4876efb4e69936ff82a157ea5cf42be4",
-      "workspace.ts": "ff3ba00ee05c5e04c6ccaef4083a83e4f01b5307eff17b9afc6480525a9ef141"
+      "stream.ts": "2e2fca0b1ba1ecd5a1501b767be8857cf0b72d800d69a4acf9cd62a61d5ceaf5",
+      "workspace.ts": "e23d0f03ed0c87023f92de7a3e01a40815c5135924902304a8b8e5c809afc609"
     },
     "ko-KR": {
       "ai.ts": "e7a2fcbfb3ed647bd14f63aca4b6c35c8fb402c49a6a1f36bb04f76f4e8415af",
       "chat.ts": "f6c6ab9cbc5c1c828c35c75d83c4adca347ade590b5177e10d64fdd18cc8aef5",
       "common.ts": "24aa2228702754bc019f1e21dd7be9f6d1c6ff02ed9bd9227ab319f331248b11",
-      "connection.ts": "d70578a3444978b60ea41c670e8b180849eaab297e33325db56c891e1058e899",
+      "connection.ts": "24f987f3e4188c0076c1c17591b9fd5792b29c2c176b2069f50a3bdf5d661af9",
       "dashboard.ts": "b99f5e6b81271573a8db1a585ac879724441b7163050899c3abaf9498217bd21",
-      "editTable.ts": "0f7a808f50053cd52b183d156bb4fd46bb125b8058f8774deb61c7f02894a350",
+      "editTable.ts": "6d1233d574dbd2e038ed112bc8677b12f61a0fc831f56f77d5ce024a96a319f6",
       "editTableData.ts": "b6f40d2e1f612b716c0dbc2ade925069a039585a28ada997e004c33ce2fd0901",
       "feedback.ts": "080fbb0b2e6578d10499d47e0f23b7161feffb769c8a574048c5a737c9624eea",
       "login.ts": "df4c7c4b2020ef3e9a70277f364d078fc6a10ad81be31d3b648933f14c423f43",
@@ -38,11 +38,11 @@
       "notification.ts": "500751da2f02391622f074448eb46611fd41da2e5530d6c7d65f17a1382bd236",
       "plugin.ts": "01f15b6342cc5b29899ee4144d67b04bb4bc02c6bb10779806be322dc5e9a2bc",
       "redis.ts": "cacf9cf685bf3bf6d019f18eead0f63713d4727be741a87d8dc1d22807ebd9ad",
-      "setting.ts": "14aea4aebdbe5cff2ae9ba4bf955aa42a95ac23d1950ea69291b22c29330d7cf",
+      "setting.ts": "cdc0698420cb89407b2e91ad31e45ddd7f8eb63ca3dd58196da5d6f8739a65b8",
       "spaceSetting.ts": "defdf3138e5e1782f0282760bcef4ce1b8550cc80b03052fea468d97165cb980",
       "sqlEditor.ts": "5c41e5f24d5ba78909795bcc681cabb8460cca075233b665dc4940afe82ce0c9",
-      "stream.ts": "8418dd25b0fd54b2ef2b15a2573edf0a4876efb4e69936ff82a157ea5cf42be4",
-      "workspace.ts": "ff3ba00ee05c5e04c6ccaef4083a83e4f01b5307eff17b9afc6480525a9ef141"
+      "stream.ts": "2e2fca0b1ba1ecd5a1501b767be8857cf0b72d800d69a4acf9cd62a61d5ceaf5",
+      "workspace.ts": "e23d0f03ed0c87023f92de7a3e01a40815c5135924902304a8b8e5c809afc609"
     }
   }
 }
diff --git a/chat2db-community-client/src/blocks/AI/components/AIAtMetion/index.tsx b/chat2db-community-client/src/blocks/AI/components/AIAtMetion/index.tsx
index 8e9c61ecbd..f6dfbbba12 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIAtMetion/index.tsx
+++ b/chat2db-community-client/src/blocks/AI/components/AIAtMetion/index.tsx
@@ -1,11 +1,10 @@
 import React, { useMemo, useState } from 'react';
 import { SuggestionItem } from './interface';
 import { useEvent, useMergedState } from 'rc-util';
-import { Cascader, CascaderProps, Spin } from 'antd';
+import { Cascader, CascaderProps } from 'antd';
 import useActive from './useActive';
 import { useStyles } from './style';
 import { IconfontSvg } from '@chat2db/ui';
-import { BookOpenText } from 'lucide-react';
 
 export interface RenderChildrenProps<T> {
   /**
@@ -26,9 +25,6 @@ export interface AIAtMetionProps<T> {
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
   onSelect?: (item: SuggestionItem) => void;
-  hasMore?: boolean;
-  loadingMore?: boolean;
-  onLoadMore?: () => void;
   children?: (props: RenderChildrenProps<T>) => React.ReactElement;
   /**
    * list of suggestions
@@ -45,9 +41,6 @@ function AIAtMetion<T>(props: AIAtMetionProps<T>) {
     open,
     onOpenChange,
     onSelect,
-    hasMore,
-    loadingMore,
-    onLoadMore,
     items,
     children,
   } = props;
@@ -95,42 +88,21 @@ function AIAtMetion<T>(props: AIAtMetionProps<T>) {
   };
 
   // =========================== Accessibility ===========================
-  const [activePath, onKeyDown, previewItem, setPreviewValue] = useActive(
-    itemList,
-    mergedOpen,
-    onInternalChange,
-    onClose,
-  );
-
-  const knowledgeTypeClassName = (item: SuggestionItem) => {
-    switch (item.knowledge?.type) {
-      case 'BUSINESS_LOGIC':
-        return styles.businessLogic;
-      case 'SQL_TEMPLATE':
-        return styles.sqlTemplate;
-      default:
-        return styles.knowledgeTerm;
-    }
-  };
+  const [activePath, onKeyDown] = useActive(itemList, mergedOpen, onInternalChange, onClose);
 
   const optionRender: CascaderProps<SuggestionItem>['optionRender'] = (node) => {
     return (
-      <div
-        className={styles.optionRow}
-        onMouseEnter={() => setPreviewValue(node.kind === 'knowledge' ? node.value : undefined)}
-      >
+      <div className={styles.optionRow}>
         <div className={styles.optionTitle}>
-          {node.kind === 'knowledge' ? (
-            <BookOpenText size={15} className={knowledgeTypeClassName(node)} />
-          ) : (
-            <IconfontSvg
-              size="md"
-              existDark={true}
-              appearance={appearance}
-              code={node.tableType === 'TABLE' ? 'icon-colourful-table' : 'icon-colourful-table-view'}
-            />
-          )}
-          <span className={styles.optionLabel}>{node.label}</span>
+          <IconfontSvg
+            size="md"
+            existDark={true}
+            appearance={appearance}
+            code={node.tableType === 'TABLE' ? 'icon-colourful-table' : 'icon-colourful-table-view'}
+          />
+          <span className={styles.optionLabel} title={node.label}>
+            {node.label}
+          </span>
         </div>
         <div className={styles.optionExtra}>{node.extra}</div>
       </div>
@@ -154,50 +126,6 @@ function AIAtMetion<T>(props: AIAtMetionProps<T>) {
       value={activePath}
       optionRender={optionRender}
       onChange={onInternalChange}
-      dropdownRender={(menus) =>
-        mergedOpen ? (
-          <div className={styles.dropdownLayout}>
-            <div
-              className={styles.menuPane}
-              onScrollCapture={(event) => {
-                const target = event.target as HTMLElement;
-                if (!target.classList.contains('ant-cascader-menu')) return;
-                if (
-                  hasMore &&
-                  !loadingMore &&
-                  target.scrollHeight - target.scrollTop - target.clientHeight <= 24
-                ) {
-                  onLoadMore?.();
-                }
-              }}
-            >
-              {menus}
-              {loadingMore ? (
-                <div className={styles.loadingMore} aria-live="polite">
-                  <Spin size="small" />
-                </div>
-              ) : null}
-            </div>
-            {previewItem?.knowledge && (
-              <div className={styles.previewPane}>
-                <div className={styles.previewHeader}>
-                  <span className={`${styles.previewType} ${knowledgeTypeClassName(previewItem)}`}>
-                    {previewItem.extra}
-                  </span>
-                  <strong className={styles.previewTitle}>{previewItem.knowledge.key}</strong>
-                </div>
-                <div
-                  className={`${styles.previewContent} ${
-                    previewItem.knowledge.type === 'SQL_TEMPLATE' ? styles.previewSql : ''
-                  }`}
-                >
-                  {previewItem.knowledge.value || '暂无说明'}
-                </div>
-              </div>
-            )}
-          </div>
-        ) : null
-      }
       onDropdownVisibleChange={(nextOpen) => {
         if (!nextOpen) {
           onClose();
diff --git a/chat2db-community-client/src/blocks/AI/components/AIAtMetion/interface.ts b/chat2db-community-client/src/blocks/AI/components/AIAtMetion/interface.ts
index 8fc9c6dcae..5fff0664f7 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIAtMetion/interface.ts
+++ b/chat2db-community-client/src/blocks/AI/components/AIAtMetion/interface.ts
@@ -3,17 +3,9 @@ import React from 'react';
 export interface SuggestionItem {
   label: string;
   value: string;
-  kind: 'table' | 'knowledge';
+  kind: 'table';
   tableType?: string;
   tableName?: string;
-  knowledge?: {
-    id: number;
-    type: 'KNOWLEDGE_TERM' | 'BUSINESS_LOGIC' | 'SQL_TEMPLATE';
-    key: string;
-    value: string;
-  };
-
-  icon?: React.ReactNode;
   children?: SuggestionItem[];
   extra?: React.ReactNode;
 }
diff --git a/chat2db-community-client/src/blocks/AI/components/AIAtMetion/style.ts b/chat2db-community-client/src/blocks/AI/components/AIAtMetion/style.ts
index 951e24daa9..13720b59c9 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIAtMetion/style.ts
+++ b/chat2db-community-client/src/blocks/AI/components/AIAtMetion/style.ts
@@ -14,6 +14,8 @@ export const useStyles = createStyles(({ css, token }) => {
 
       .ant-cascader-menu {
         min-width: 280px !important;
+        width: min(340px, calc(100vw - 32px)) !important;
+        max-width: min(340px, calc(100vw - 32px)) !important;
         height: auto !important;
         max-height: 280px !important;
         overflow-y: auto;
@@ -25,35 +27,13 @@ export const useStyles = createStyles(({ css, token }) => {
         padding: 6px 10px !important;
         font-size: 13px;
       }
+
+      .ant-cascader-menu-item-content {
+        width: 100%;
+        min-width: 0;
+      }
     `,
     content: css``,
-    dropdownLayout: css`
-      display: flex;
-      align-items: stretch;
-      max-width: min(680px, calc(100vw - 32px));
-      overflow: hidden;
-    `,
-    menuPane: css`
-      position: relative;
-      min-width: 280px;
-      max-width: 340px;
-      overflow: hidden;
-    `,
-    loadingMore: css`
-      position: absolute;
-      bottom: 8px;
-      left: 50%;
-      z-index: 1;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 28px;
-      height: 28px;
-      border: 1px solid ${token.colorBorderSecondary};
-      border-radius: 4px;
-      background: ${token.colorBgElevated};
-      transform: translateX(-50%);
-    `,
     optionRow: css`
       display: flex;
       align-items: center;
@@ -65,8 +45,10 @@ export const useStyles = createStyles(({ css, token }) => {
     optionTitle: css`
       display: flex;
       align-items: center;
+      flex: 1;
       min-width: 0;
       gap: 6px;
+      overflow: hidden;
       color: ${token.colorText};
       font-weight: 500;
     `,
@@ -77,64 +59,9 @@ export const useStyles = createStyles(({ css, token }) => {
     `,
     optionExtra: css`
       flex-shrink: 0;
+      width: 36px;
       color: ${token.colorTextDescription};
       font-size: 11px;
     `,
-    previewPane: css`
-      width: 320px;
-      min-width: 260px;
-      max-height: 280px;
-      padding: 14px 16px;
-      overflow: auto;
-      border-inline-start: 1px solid ${token.colorBorderSecondary};
-      background: ${token.colorBgElevated};
-    `,
-    previewHeader: css`
-      display: flex;
-      flex-direction: column;
-      align-items: flex-start;
-      gap: 8px;
-      margin-bottom: 10px;
-    `,
-    previewType: css`
-      display: inline-flex;
-      align-items: center;
-      min-height: 22px;
-      padding: 2px 7px;
-      border-radius: 4px;
-      font-size: 11px;
-      line-height: 18px;
-      background: ${token.colorFillTertiary};
-    `,
-    previewTitle: css`
-      color: ${token.colorText};
-      font-size: 14px;
-      line-height: 20px;
-      word-break: break-word;
-    `,
-    previewContent: css`
-      color: ${token.colorTextSecondary};
-      font-size: 13px;
-      line-height: 22px;
-      white-space: pre-wrap;
-      word-break: break-word;
-    `,
-    previewSql: css`
-      padding: 10px;
-      border-radius: 4px;
-      background: ${token.colorFillQuaternary};
-      color: ${token.colorText};
-      font-family: ${token.fontFamilyCode};
-      line-height: 20px;
-    `,
-    knowledgeTerm: css`
-      color: ${token.colorInfo};
-    `,
-    businessLogic: css`
-      color: ${token.colorSuccess};
-    `,
-    sqlTemplate: css`
-      color: ${token.colorWarning};
-    `,
   };
 });
diff --git a/chat2db-community-client/src/blocks/AI/components/AIAtMetion/useActive.ts b/chat2db-community-client/src/blocks/AI/components/AIAtMetion/useActive.ts
index 566bd5e893..9e99475b61 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIAtMetion/useActive.ts
+++ b/chat2db-community-client/src/blocks/AI/components/AIAtMetion/useActive.ts
@@ -10,20 +10,14 @@ export default function useActive(
   onCancel: () => void,
 ) {
   const [activePaths, setActivePaths] = useState<string[]>([]);
-  const [previewValue, setPreviewValue] = useState<string>();
 
   const activeValue = activePaths[0];
-  const activeItem = items.find((item) => item.value === activeValue);
-  const previewItem = items.find((item) => item.value === previewValue);
 
   const offsetRow = (offset: number) => {
     if (!items.length) return;
     const currentRowIndex = items.findIndex((item) => item.value === activeValue);
     const nextItem = items[(currentRowIndex + offset + items.length) % items.length];
     setActivePaths([nextItem.value]);
-    if (previewValue) {
-      setPreviewValue(nextItem.kind === 'knowledge' ? nextItem.value : undefined);
-    }
 
     // Add a delay to wait for the DOM to update before scrolling
     setTimeout(() => {
@@ -55,23 +49,6 @@ export default function useActive(
         e.preventDefault();
         break;
       }
-
-      case 'ArrowRight': {
-        if (activeItem?.kind === 'knowledge') {
-          setPreviewValue(activeItem.value);
-          e.preventDefault();
-        }
-        break;
-      }
-
-      case 'ArrowLeft': {
-        if (previewValue) {
-          setPreviewValue(undefined);
-          e.preventDefault();
-        }
-        break;
-      }
-
       case 'Enter': {
         if (activeValue) {
           onSelect([activeValue]);
@@ -96,9 +73,8 @@ export default function useActive(
       setActivePaths((previous) => (items.some((item) => item.value === previous[0]) ? previous : [items[0].value]));
     } else if (!open) {
       setActivePaths([]);
-      setPreviewValue(undefined);
     }
   }, [open, items]);
 
-  return [activePaths, onKeyDown, previewItem, setPreviewValue] as const;
+  return [activePaths, onKeyDown] as const;
 }
diff --git a/chat2db-community-client/src/blocks/AI/components/AICascaderSource/contextTree.test.ts b/chat2db-community-client/src/blocks/AI/components/AICascaderSource/contextTree.test.ts
new file mode 100644
index 0000000000..54dffc3270
--- /dev/null
+++ b/chat2db-community-client/src/blocks/AI/components/AICascaderSource/contextTree.test.ts
@@ -0,0 +1,30 @@
+import assert from 'node:assert/strict';
+import { TreeNodeType } from '@/constants/tree';
+import type { TreeNodeData } from '@/typings';
+import { buildAIContextTree } from './contextTree';
+
+const node = (treeNodeType: TreeNodeType, key: string, children?: TreeNodeData[]): TreeNodeData => ({
+  treeNodeType,
+  key,
+  originalTitle: key,
+  title: key,
+  isLeaf: false,
+  children,
+  extraParams: {},
+});
+
+const source = node(TreeNodeType.DATA_SOURCE, 'source', [
+  node(TreeNodeType.DATABASE, 'app'),
+  node(TreeNodeType.MONITOR, 'monitor'),
+  node(TreeNodeType.DATABASE_ACCOUNTS, 'accounts'),
+]);
+const result = buildAIContextTree([source]);
+
+assert.deepEqual(result[0].children?.map(({ treeNodeType }) => treeNodeType), [TreeNodeType.DATABASE]);
+assert.equal(result[0].isLeaf, false);
+const flatSource = node(TreeNodeType.DATA_SOURCE, 'flat-source');
+flatSource.extraParams = { supportDatabase: false, supportSchema: false };
+assert.equal(buildAIContextTree([flatSource])[0].isLeaf, true);
+assert.equal(buildAIContextTree([node(TreeNodeType.DATA_SOURCE, 'unloaded-source')])[0].isLeaf, false);
+assert.deepEqual(buildAIContextTree([node(TreeNodeType.GROUP, 'empty-group', [node(TreeNodeType.MONITOR, 'monitor')])]), []);
+assert.equal(source.children?.length, 3, 'the shared workspace tree must not be mutated');
diff --git a/chat2db-community-client/src/blocks/AI/components/AICascaderSource/contextTree.ts b/chat2db-community-client/src/blocks/AI/components/AICascaderSource/contextTree.ts
new file mode 100644
index 0000000000..f84c7907d3
--- /dev/null
+++ b/chat2db-community-client/src/blocks/AI/components/AICascaderSource/contextTree.ts
@@ -0,0 +1,36 @@
+import { TreeNodeType } from '@/constants/tree';
+import type { TreeNodeData } from '@/typings';
+
+const AI_CONTEXT_NODE_TYPES = new Set([
+  TreeNodeType.GROUP,
+  TreeNodeType.DATA_SOURCE,
+  TreeNodeType.DATABASE,
+  TreeNodeType.SCHEMA,
+]);
+
+export const buildAIContextTree = (data: readonly TreeNodeData[]): TreeNodeData[] =>
+  data.flatMap((item) => {
+    if (!AI_CONTEXT_NODE_TYPES.has(item.treeNodeType)) {
+      return [];
+    }
+
+    const children = buildAIContextTree(item.children || []);
+    if (item.treeNodeType === TreeNodeType.GROUP && !children.length) {
+      return [];
+    }
+
+    const isLeaf =
+      item.treeNodeType === TreeNodeType.SCHEMA ||
+      (item.treeNodeType === TreeNodeType.DATABASE && !item.extraParams?.supportSchema) ||
+      (item.treeNodeType === TreeNodeType.DATA_SOURCE &&
+        item.extraParams?.supportDatabase === false &&
+        item.extraParams?.supportSchema === false);
+
+    return [
+      {
+        ...item,
+        isLeaf,
+        children: isLeaf || !children.length ? undefined : children,
+      },
+    ];
+  });
diff --git a/chat2db-community-client/src/blocks/AI/components/AICascaderSource/index.tsx b/chat2db-community-client/src/blocks/AI/components/AICascaderSource/index.tsx
index f30c6293c4..02a78a2ef5 100644
--- a/chat2db-community-client/src/blocks/AI/components/AICascaderSource/index.tsx
+++ b/chat2db-community-client/src/blocks/AI/components/AICascaderSource/index.tsx
@@ -3,7 +3,6 @@ import { ILoadDataOptions, switchIcon, treeConfig } from '@/blocks/NewTree/treeC
 import { TreeNodeType, databaseMap } from '@/constants';
 import i18n from '@/i18n';
 import { useTreeStore } from '@/store/tree';
-import { TreeNodeData } from '@/typings';
 import { IDBContextInfo } from '@/typings/database';
 import { findNode } from '@/utils';
 import { IconfontSvg } from '@chat2db/ui';
@@ -11,6 +10,7 @@ import { Cascader, Tooltip } from 'antd';
 import { useMemo } from 'react';
 import { ChevronDown } from 'lucide-react';
 import { useStyles } from './style';
+import { buildAIContextTree } from './contextTree';
 
 export type IAICascaderData = IDBContextInfo | null;
 
@@ -43,29 +43,8 @@ const AICascaderSource = (props: IProps) => {
     handleLoadData: state.handleLoadData,
   }));
 
-  // recursively processes treeData
-  const handleTreeData = (data: TreeNodeData[]) => {
-    const list = data.map((item) => {
-      let isLeaf = false;
-      if (
-        (item?.treeNodeType === TreeNodeType.DATABASE && !item?.extraParams?.supportSchema) ||
-        item?.treeNodeType === TreeNodeType.SCHEMA
-      ) {
-        isLeaf = true;
-        item.children = undefined;
-      }
-
-      return {
-        ...item,
-        isLeaf,
-        children: item.children?.length ? handleTreeData(item.children) : undefined,
-      };
-    });
-    return list.filter((item) => !(item?.treeNodeType === TreeNodeType.GROUP && !item.children?.length));
-  };
-
   const treeDataOptions = useMemo(() => {
-    return handleTreeData(treeData || []);
+    return buildAIContextTree(treeData || []);
   }, [treeData]);
 
   const options = useMemo(() => {
diff --git a/chat2db-community-client/src/blocks/AI/components/AIChatInput/index.tsx b/chat2db-community-client/src/blocks/AI/components/AIChatInput/index.tsx
index f54659d0c2..345478d882 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIChatInput/index.tsx
+++ b/chat2db-community-client/src/blocks/AI/components/AIChatInput/index.tsx
@@ -35,16 +35,8 @@ import aiAttachmentService, { IChatAttachment } from '@/service/aiAttachment';
 import { isDesktop } from '@/utils/env';
 import jcefApi from '@/jcef';
 import feedback from '@/utils/feedback';
-import type { ISelectedKnowledge } from '@/service/aiStream';
-import clientExtension from '@client-extension';
-import type {
-  KnowledgeMentionCandidate,
-  KnowledgeMentionRequest,
-} from '@/client-extension/types';
 import {
   detectMentionTrigger,
-  filterUnselectedMentionCandidates,
-  normalizeMentionInput,
   reconcileSelectedMentions,
   replaceMentionTrigger,
   upsertSelectedMention,
@@ -71,7 +63,6 @@ export interface SendParams {
   sql?: string;
 
   attachments?: IChatAttachment[];
-  selectedKnowledge?: ISelectedKnowledge[];
 }
 
 interface ChatInputProps {
@@ -107,32 +98,6 @@ export interface ChatInputPropsRef {
 const ATTACHMENT_ACCEPT = '.pdf,.doc,.docx,.md,.txt,.json,.csv,.xlsx,.xls';
 const ATTACHMENT_FILE_TYPES = ['pdf', 'doc', 'docx', 'md', 'txt', 'json', 'csv', 'xlsx', 'xls'];
 const ATTACHMENT_PARSE_MESSAGE_KEY = 'chat-attachment-parse';
-const KNOWLEDGE_PAGE_SIZE = 20;
-
-type KnowledgeSearchRequest = Pick<KnowledgeMentionRequest, 'searchKey' | 'inputText'>;
-
-interface KnowledgeSearchCursor {
-  contextInfo: IAICascaderData | null | undefined;
-  request: KnowledgeSearchRequest;
-  requestSequence: number;
-  pageNo: number;
-  hasNextPage: boolean;
-}
-
-const toKnowledgeSuggestions = (candidates: readonly KnowledgeMentionCandidate[]): SuggestionItem[] =>
-  candidates.map((candidate) => ({
-    label: candidate.key,
-    value: `knowledge:${candidate.type}:${candidate.id}`,
-    kind: 'knowledge',
-    knowledge: candidate,
-    extra:
-      candidate.type === 'KNOWLEDGE_TERM'
-        ? '知识名词'
-        : candidate.type === 'BUSINESS_LOGIC'
-        ? '业务逻辑'
-        : 'SQL 模板',
-  }));
-
 const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInputPropsRef>) => {
   const {
     className,
@@ -155,9 +120,6 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
   const [inputValue, setInputValue] = useState('');
   const [prefillQuestionType, setPrefillQuestionType] = useState<QuestionType>();
   const [tableList, setTableList] = useState<ITable[]>([]);
-  const [knowledgeList, setKnowledgeList] = useState<SuggestionItem[]>([]);
-  const [knowledgeHasNextPage, setKnowledgeHasNextPage] = useState(false);
-  const [knowledgeLoadingMore, setKnowledgeLoadingMore] = useState(false);
   const [selectedMentions, setSelectedMentions] = useState<SelectedMention[]>([]);
   const [mentionTrigger, setMentionTrigger] = useState<MentionTrigger | null>(null);
   const [attachments, setAttachments] = useState<IChatAttachment[]>([]);
@@ -165,9 +127,7 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
   const textareaRef = useRef<TextAreaRef>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
   const isComposingRef = useRef<boolean>(false); // IME input method combination status
-  const knowledgeRequestSequenceRef = useRef(0);
-  const knowledgeSearchCursorRef = useRef<KnowledgeSearchCursor | null>(null);
-  const knowledgeLoadingSequenceRef = useRef<number | null>(null);
+  const tableRequestSequenceRef = useRef(0);
 
   // caches tables without search conditions
   const tableListWithoutSearchKey = useRef<ITable[]>([]);
@@ -237,23 +197,19 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
 
   useEffect(() => {
     tableListWithoutSearchKey.current = [];
-    knowledgeRequestSequenceRef.current += 1;
+    tableRequestSequenceRef.current += 1;
     setSelectedMentions([]);
     setMentionTrigger(null);
     setTableList([]);
-    setKnowledgeList([]);
-    setKnowledgeHasNextPage(false);
-    knowledgeSearchCursorRef.current = null;
-    knowledgeLoadingSequenceRef.current = null;
-    setKnowledgeLoadingMore(false);
     if (cascaderDataMap[mainPageActiveTab]) {
       fetchTableList(cascaderDataMap[mainPageActiveTab], '');
     }
   }, [cascaderDataMap[mainPageActiveTab]]);
 
   const fetchTableList = useRef(
-    debounce(async (_contextInfo: IAICascaderData, searchKey: string) => {
+    debounce(async (_contextInfo: IAICascaderData, searchKey: string, requestSequence?: number) => {
       if (!_contextInfo) return;
+      if (requestSequence !== undefined && requestSequence !== tableRequestSequenceRef.current) return;
       if ('dataSourceId' in _contextInfo && _contextInfo?.dataSourceId) {
         if (!searchKey && tableListWithoutSearchKey.current.length) {
           setTableList(tableListWithoutSearchKey.current);
@@ -279,6 +235,7 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
             searchKey,
           });
         } catch (error) {
+          if (requestSequence !== undefined && requestSequence !== tableRequestSequenceRef.current) return;
           const requestError = error as { errorCode?: string };
           if (
             requestError.errorCode === 'QUERY_DATASOURCE_ERROR' ||
@@ -291,6 +248,8 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
           return;
         }
 
+        if (requestSequence !== undefined && requestSequence !== tableRequestSequenceRef.current) return;
+
         const atTableList =
           res.data?.map((s) => ({
             ...s,
@@ -318,76 +277,6 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
     return () => fetchTableList.cancel();
   }, []);
 
-  const requestKnowledgePage = (
-    contextInfo: IAICascaderData | null | undefined,
-    request: KnowledgeSearchRequest,
-    pageNo: number,
-  ) => {
-    if (!clientExtension.knowledgeMentions) {
-      return null;
-    }
-    const dataSourceId = contextInfo && 'dataSourceId' in contextInfo ? contextInfo.dataSourceId : undefined;
-    const databaseName = contextInfo && 'databaseName' in contextInfo ? contextInfo.databaseName : undefined;
-    const schemaName = contextInfo && 'schemaName' in contextInfo ? contextInfo.schemaName : undefined;
-    return clientExtension.knowledgeMentions({
-      ...request,
-      dataSourceId,
-      databaseName,
-      schemaName,
-      pageNo,
-      pageSize: KNOWLEDGE_PAGE_SIZE,
-    });
-  };
-
-  const fetchKnowledgeList = async (
-    contextInfo: IAICascaderData | null | undefined,
-    request: KnowledgeSearchRequest,
-    requestSequence: number,
-    onResolved: (hasCandidates: boolean) => void,
-  ) => {
-    const response = requestKnowledgePage(contextInfo, request, 1);
-    if (!response) {
-      setKnowledgeList([]);
-      setKnowledgeHasNextPage(false);
-      onResolved(false);
-      return;
-    }
-    try {
-      const page = await response;
-      if (requestSequence !== knowledgeRequestSequenceRef.current) return;
-      const suggestions = toKnowledgeSuggestions(page.data || []);
-      const hasUnselectedCandidates = filterUnselectedMentionCandidates(suggestions, selectedMentions).length > 0;
-      const hasNextPage = Boolean(page.hasNextPage);
-      setKnowledgeList(suggestions);
-      setKnowledgeHasNextPage(hasNextPage);
-      knowledgeSearchCursorRef.current = {
-        contextInfo,
-        request,
-        requestSequence,
-        pageNo: page.pageNo || 1,
-        hasNextPage,
-      };
-      window.setTimeout(() => {
-        if (requestSequence === knowledgeRequestSequenceRef.current) {
-          onResolved(hasUnselectedCandidates);
-        }
-      }, 0);
-    } catch {
-      if (requestSequence !== knowledgeRequestSequenceRef.current) return;
-      setKnowledgeList([]);
-      setKnowledgeHasNextPage(false);
-      knowledgeSearchCursorRef.current = null;
-      onResolved(false);
-    }
-  };
-
-  useEffect(
-    () => () => {
-      knowledgeRequestSequenceRef.current += 1;
-    },
-    [],
-  );
-
   const handleSend = async (params?: SendParams) => {
     if (loading || attachmentLoading) return;
 
@@ -417,7 +306,7 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
 
     const finalAttachments = params?.attachments ?? attachments;
     const rawInput = params?.input ?? inputValue;
-    const trimmedInput = normalizeMentionInput(rawInput || '', selectedMentions).trim();
+    const trimmedInput = (rawInput || '').trim();
     const finalInput =
       trimmedInput ||
       (finalAttachments.length
@@ -447,16 +336,7 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
       source,
       model: useAIStore.getState().selectedModel?.value,
       tableList: selectedMentions
-        .filter((mention) => mention.kind === 'table')
         .map((mention) => ({ tableName: mention.tableName, tableType: mention.tableType })) as any,
-      selectedKnowledge: selectedMentions
-        .filter((mention) => mention.kind === 'knowledge' && mention.knowledge)
-        .map((mention) => ({
-          id: mention.knowledge!.id,
-          type: mention.knowledge!.type,
-          key: mention.knowledge!.key,
-          value: mention.knowledge!.value,
-        })),
       attachments: finalAttachments,
     };
 
@@ -623,12 +503,7 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
     setAttachments((prev) => prev.filter((_, currentIndex) => currentIndex !== index));
   };
 
-  const removeSelectedMention = (value: string) => {
-    setSelectedMentions((previous) => previous.filter((mention) => mention.value !== value));
-  };
-
   const getMentionList = (info?: MentionTrigger) => {
-    const availableKnowledge = filterUnselectedMentionCandidates(knowledgeList, selectedMentions);
     const tables: SuggestionItem[] = (tableList || []).map((table) => ({
       label: table.name,
       value: `table:${table.tableType}:${table.name}`,
@@ -637,46 +512,8 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
       tableType: table.tableType,
       extra: table.tableType === 'VIEW' ? '视图' : '表',
     }));
-    if (info?.mode === 'natural') return availableKnowledge;
-    const candidates = [...tables, ...availableKnowledge];
-    if (!info?.query) return candidates;
-    return candidates.filter((item) => item.label.toLowerCase().includes(info.query.toLowerCase()));
-  };
-
-  const loadMoreKnowledge = async () => {
-    const cursor = knowledgeSearchCursorRef.current;
-    if (!cursor?.hasNextPage || knowledgeLoadingSequenceRef.current === cursor.requestSequence) {
-      return;
-    }
-    knowledgeLoadingSequenceRef.current = cursor.requestSequence;
-    setKnowledgeLoadingMore(true);
-    try {
-      const nextPageNo = cursor.pageNo + 1;
-      const response = requestKnowledgePage(cursor.contextInfo, cursor.request, nextPageNo);
-      if (!response) return;
-      const page = await response;
-      if (cursor.requestSequence !== knowledgeRequestSequenceRef.current) return;
-      const suggestions = toKnowledgeSuggestions(page.data || []);
-      setKnowledgeList((previous) => {
-        const merged = new Map(previous.map((item) => [item.value, item]));
-        suggestions.forEach((item) => merged.set(item.value, item));
-        return [...merged.values()];
-      });
-      const hasNextPage = Boolean(page.hasNextPage);
-      setKnowledgeHasNextPage(hasNextPage);
-      knowledgeSearchCursorRef.current = {
-        ...cursor,
-        pageNo: page.pageNo || nextPageNo,
-        hasNextPage,
-      };
-    } catch {
-      // Keep the current page and allow another scroll attempt.
-    } finally {
-      if (knowledgeLoadingSequenceRef.current === cursor.requestSequence) {
-        knowledgeLoadingSequenceRef.current = null;
-        setKnowledgeLoadingMore(false);
-      }
-    }
+    if (!info?.query) return tables;
+    return tables.filter((item) => item.label.toLowerCase().includes(info.query.toLowerCase()));
   };
 
   const updateMentionSuggestions = (
@@ -686,47 +523,19 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
   ) => {
     const nextTrigger = detectMentionTrigger(value, cursor);
     if (!nextTrigger) {
-      knowledgeRequestSequenceRef.current += 1;
+      tableRequestSequenceRef.current += 1;
       setMentionTrigger(null);
-      setKnowledgeList([]);
-      setKnowledgeHasNextPage(false);
-      knowledgeSearchCursorRef.current = null;
       onTrigger(false);
       return;
     }
 
-    const requestSequence = knowledgeRequestSequenceRef.current + 1;
-    knowledgeRequestSequenceRef.current = requestSequence;
-    onTrigger(false);
-    setKnowledgeList([]);
+    const requestSequence = tableRequestSequenceRef.current + 1;
+    tableRequestSequenceRef.current = requestSequence;
     setTableList([]);
-    knowledgeSearchCursorRef.current = null;
-    knowledgeLoadingSequenceRef.current = null;
-    setKnowledgeHasNextPage(false);
-    setKnowledgeLoadingMore(false);
     setMentionTrigger(nextTrigger);
     const contextInfo = cascaderDataMap[mainPageActiveTab];
-
-    if (nextTrigger.mode === 'explicit') {
-      fetchTableList(contextInfo, nextTrigger.query);
-    }
-
-    fetchKnowledgeList(
-      contextInfo,
-      nextTrigger.mode === 'explicit'
-        ? { searchKey: nextTrigger.query || undefined }
-        : { inputText: nextTrigger.inputText.slice(-200) },
-      requestSequence,
-      (hasCandidates) => {
-        if (requestSequence !== knowledgeRequestSequenceRef.current) return;
-        if (hasCandidates) {
-          onTrigger(nextTrigger);
-        } else {
-          setMentionTrigger(null);
-          onTrigger(false);
-        }
-      },
-    );
+    fetchTableList(contextInfo, nextTrigger.query, requestSequence);
+    onTrigger(nextTrigger);
   };
 
   const isSameContextInfo = (prev: IAICascaderData, next: IAICascaderData) => {
@@ -744,30 +553,16 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
     );
   };
 
-  const selectedMentionClassName = (mention: SelectedMention) => {
-    switch (mention.knowledge?.type) {
-      case 'BUSINESS_LOGIC':
-        return styles.businessLogicMention;
-      case 'SQL_TEMPLATE':
-        return styles.sqlTemplateMention;
-      default:
-        return styles.knowledgeTermMention;
-    }
-  };
-
   return (
     <AIAtMetion<MentionTrigger>
       className={className}
       items={getMentionList}
-      hasMore={knowledgeHasNextPage}
-      loadingMore={knowledgeLoadingMore}
-      onLoadMore={loadMoreKnowledge}
       onSelect={(item) => {
         const textarea = textareaRef.current?.resizableTextArea?.textArea;
         const cursor = textarea?.selectionStart ?? inputValue.length;
         const activeTrigger = mentionTrigger || detectMentionTrigger(inputValue, cursor);
         const replacement = activeTrigger
-          ? replaceMentionTrigger(inputValue, cursor, activeTrigger, item.label)
+          ? replaceMentionTrigger(inputValue, activeTrigger, item.label)
           : { value: `${inputValue}${item.label}`, cursor: inputValue.length + item.label.length };
 
         setInputValue(replacement.value);
@@ -776,17 +571,13 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
             value: item.value,
             label: item.label,
             kind: item.kind,
-            tableName: item.tableName,
+            tableName: item.tableName!,
             tableType: item.tableType,
-            knowledge: item.knowledge,
           };
           return upsertSelectedMention(previous, nextMention);
         });
-        knowledgeRequestSequenceRef.current += 1;
+        tableRequestSequenceRef.current += 1;
         setMentionTrigger(null);
-        setKnowledgeList([]);
-        setKnowledgeHasNextPage(false);
-        knowledgeSearchCursorRef.current = null;
         window.setTimeout(() => {
           textarea?.focus();
           textarea?.setSelectionRange(replacement.cursor, replacement.cursor);
@@ -821,25 +612,6 @@ const AIChatInput = forwardRef((props: ChatInputProps, ref: ForwardedRef<ChatInp
               ))}
             </div>
           )}
-          {!!selectedMentions.some((mention) => mention.kind === 'knowledge') && (
-            <div className={styles.selectedKnowledgeList}>
-              {selectedMentions
-                .filter((mention) => mention.kind === 'knowledge')
-                .map((mention) => (
-                  <button
-                    key={mention.value}
-                    type="button"
-                    className={`${styles.selectedKnowledgeItem} ${selectedMentionClassName(mention)}`}
-                    title={mention.knowledge?.value}
-                    aria-label={`取消选择${mention.label}`}
-                    onClick={() => removeSelectedMention(mention.value)}
-                  >
-                    <span>{mention.label}</span>
-                    <CloseOutlined className={styles.selectedKnowledgeRemoveIcon} />
-                  </button>
-                ))}
-            </div>
-          )}
           <Input.TextArea
             ref={textareaRef}
             className={styles.textarea}
diff --git a/chat2db-community-client/src/blocks/AI/components/AIChatInput/mentionSelection.test.ts b/chat2db-community-client/src/blocks/AI/components/AIChatInput/mentionSelection.test.ts
index 1b1ac9a37a..c6ff9f30f9 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIChatInput/mentionSelection.test.ts
+++ b/chat2db-community-client/src/blocks/AI/components/AIChatInput/mentionSelection.test.ts
@@ -1,152 +1,35 @@
 import assert from 'node:assert/strict';
 import {
   detectMentionTrigger,
-  filterUnselectedMentionCandidates,
-  findNaturalFragmentRange,
-  normalizeMentionInput,
   reconcileSelectedMentions,
   replaceMentionTrigger,
   upsertSelectedMention,
   type SelectedMention,
 } from './mentionSelection';
 
-const selected: SelectedMention[] = [
-  {
-    value: 'knowledge:KNOWLEDGE_TERM:1',
-    label: '销量',
-    kind: 'knowledge',
-    knowledge: { id: 1, type: 'KNOWLEDGE_TERM', key: '销量', value: '商品销售数量' },
-  },
-  {
-    value: 'knowledge:BUSINESS_LOGIC:2',
-    label: '销量',
-    kind: 'knowledge',
-    knowledge: { id: 2, type: 'BUSINESS_LOGIC', key: '销量', value: 'SUM(quantity)' },
-  },
-];
+const tableMention = (name: string, tableType = 'TABLE'): SelectedMention => ({
+  value: `table:${tableType}:${name}`,
+  label: name,
+  kind: 'table',
+  tableName: name,
+  tableType,
+});
 
-assert.deepEqual(
-  reconcileSelectedMentions('查询 @销量 ', selected).map(({ value }) => value),
-  ['knowledge:KNOWLEDGE_TERM:1'],
-);
-assert.deepEqual(reconcileSelectedMentions('查询 @销量 和 @销量 ', selected), selected);
-assert.equal(
-  normalizeMentionInput('查询 @三全水饺 的 @销量 ', [
-    {
-      value: 'knowledge:KNOWLEDGE_TERM:3',
-      label: '三全水饺',
-      kind: 'knowledge',
-      knowledge: { id: 3, type: 'KNOWLEDGE_TERM', key: '三全水饺', value: '三全食品旗下产品' },
-    },
-    selected[1],
-  ]),
-  '查询 三全水饺 的 销量 ',
-);
-assert.equal(normalizeMentionInput('联系 test@example.com', selected), '联系 test@example.com');
+assert.deepEqual(detectMentionTrigger('@', 1), { query: '', start: 0, end: 1 });
+assert.deepEqual(detectMentionTrigger('query @orders', 13), { query: 'orders', start: 6, end: 13 });
+assert.equal(detectMentionTrigger('contact test@example.com', 24), null);
+assert.equal(detectMentionTrigger('orders', 6), null);
 
-assert.deepEqual(detectMentionTrigger('我要查询三全', 6), {
-  mode: 'natural',
-  query: '我要查询三全',
-  inputText: '我要查询三全',
-  start: 0,
-  end: 6,
-});
-const punctuatedNaturalInput = '请查看生产工。';
-assert.deepEqual(detectMentionTrigger(punctuatedNaturalInput, punctuatedNaturalInput.length), {
-  mode: 'natural',
-  query: '请查看生产工',
-  inputText: punctuatedNaturalInput,
-  start: 0,
-  end: 6,
-});
-assert.equal(detectMentionTrigger('华东 ', 3), null);
-assert.deepEqual(detectMentionTrigger('我要查询 @三全', 8), {
-  mode: 'explicit',
-  query: '三全',
-  inputText: '我要查询 @三全',
-  start: 5,
-  end: 8,
-});
-assert.equal(detectMentionTrigger('联系 test@example.com', 19)?.mode, 'natural');
-assert.deepEqual(findNaturalFragmentRange('我要查询三全', 6, '三全水饺'), { start: 4, end: 6 });
-assert.deepEqual(findNaturalFragmentRange('统计', 2, '动销商品统计'), { start: 0, end: 2 });
-assert.deepEqual(replaceMentionTrigger('我要查询三全', 6, detectMentionTrigger('我要查询三全', 6)!, '三全水饺'), {
-  value: '我要查询三全水饺',
-  cursor: 8,
+assert.deepEqual(replaceMentionTrigger('query @ord', detectMentionTrigger('query @ord', 10)!, 'orders'), {
+  value: 'query orders ',
+  cursor: 13,
 });
-assert.deepEqual(replaceMentionTrigger('统计', 2, detectMentionTrigger('统计', 2)!, '动销商品统计'), {
-  value: '动销商品统计',
-  cursor: 6,
-});
-assert.deepEqual(
-  replaceMentionTrigger(
-    '我要查询三全水饺的销量',
-    11,
-    detectMentionTrigger('我要查询三全水饺的销量', 11)!,
-    '三全水饺',
-  ),
-  {
-    value: '我要查询三全水饺的销量',
-    cursor: 11,
-  },
-);
-assert.deepEqual(
-  replaceMentionTrigger('我要查询未知内容', 8, detectMentionTrigger('我要查询未知内容', 8)!, '三全水饺'),
-  {
-    value: '我要查询未知内容',
-    cursor: 8,
-  },
-);
-assert.deepEqual(replaceMentionTrigger('我要查询 @三全', 8, detectMentionTrigger('我要查询 @三全', 8)!, '三全水饺'), {
-  value: '我要查询 三全水饺 ',
-  cursor: 10,
-});
-const punctuatedPrefixInput = '请查看生产工。';
-assert.deepEqual(
-  replaceMentionTrigger(
-    punctuatedPrefixInput,
-    punctuatedPrefixInput.length,
-    detectMentionTrigger(punctuatedPrefixInput, punctuatedPrefixInput.length)!,
-    '生产工单',
-  ),
-  {
-    value: '请查看生产工单。',
-    cursor: 7,
-  },
-);
-
-const knowledgeTerm: SelectedMention = {
-  value: 'knowledge:KNOWLEDGE_TERM:3',
-  label: '三全水饺',
-  kind: 'knowledge',
-  knowledge: { id: 3, type: 'KNOWLEDGE_TERM', key: '三全水饺', value: '三全食品旗下产品' },
-};
-const businessLogic: SelectedMention = {
-  value: 'knowledge:BUSINESS_LOGIC:2',
-  label: '销量',
-  kind: 'knowledge',
-  knowledge: { id: 2, type: 'BUSINESS_LOGIC', key: '销量', value: 'SUM(quantity)' },
-};
-assert.deepEqual(upsertSelectedMention(upsertSelectedMention([], knowledgeTerm), businessLogic), [
-  knowledgeTerm,
-  businessLogic,
-]);
-assert.deepEqual(upsertSelectedMention([knowledgeTerm, businessLogic], knowledgeTerm), [businessLogic, knowledgeTerm]);
 
-const selectedContribution: SelectedMention = {
-  value: 'knowledge:BUSINESS_LOGIC:225',
-  label: '重点客户贡献率',
-  kind: 'knowledge',
-  knowledge: { id: 225, type: 'BUSINESS_LOGIC', key: '重点客户贡献率', value: '重点客户销售额占比' },
-};
-assert.deepEqual(
-  filterUnselectedMentionCandidates(
-    [
-      { value: 'knowledge:BUSINESS_LOGIC:225', label: '重点客户贡献率' },
-      { value: 'knowledge:SQL_TEMPLATE:262', label: '重点客户贡献率' },
-      { value: 'knowledge:KNOWLEDGE_TERM:209', label: '华东大区' },
-    ],
-    [selectedContribution],
-  ),
-  [{ value: 'knowledge:KNOWLEDGE_TERM:209', label: '华东大区' }],
-);
+const orders = tableMention('orders');
+const customers = tableMention('customers');
+assert.deepEqual(upsertSelectedMention(upsertSelectedMention([], orders), customers), [orders, customers]);
+assert.deepEqual(upsertSelectedMention([orders, customers], orders), [customers, orders]);
+assert.deepEqual(reconcileSelectedMentions('query orders and customers', [orders, customers]), [orders, customers]);
+assert.deepEqual(reconcileSelectedMentions('query customers', [orders, customers]), [customers]);
+assert.deepEqual(reconcileSelectedMentions('query preorders', [orders]), []);
+assert.deepEqual(reconcileSelectedMentions('query @orders', [orders]), [orders]);
diff --git a/chat2db-community-client/src/blocks/AI/components/AIChatInput/mentionSelection.ts b/chat2db-community-client/src/blocks/AI/components/AIChatInput/mentionSelection.ts
index 5a86b17869..7d6b6e5df4 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIChatInput/mentionSelection.ts
+++ b/chat2db-community-client/src/blocks/AI/components/AIChatInput/mentionSelection.ts
@@ -1,21 +1,13 @@
 export interface SelectedMention {
   value: string;
   label: string;
-  kind: 'table' | 'knowledge';
-  tableName?: string;
+  kind: 'table';
+  tableName: string;
   tableType?: string;
-  knowledge?: {
-    id: number;
-    type: 'KNOWLEDGE_TERM' | 'BUSINESS_LOGIC' | 'SQL_TEMPLATE';
-    key: string;
-    value: string;
-  };
 }
 
 export interface MentionTrigger {
-  mode: 'explicit' | 'natural';
   query: string;
-  inputText: string;
   start: number;
   end: number;
 }
@@ -26,96 +18,34 @@ export interface MentionReplacement {
 }
 
 const escapeRegExp = (value: string) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-
-const mentionPattern = (label: string, global = false) =>
-  new RegExp(`@${escapeRegExp(label)}(?=\\s|$)`, global ? 'g' : undefined);
-
-const selectedLabelPattern = (label: string, global = false) =>
-  new RegExp(`@?${escapeRegExp(label)}`, global ? 'g' : undefined);
-
+const MENTION_BOUNDARY = '[\\s，。！？,!?;；:：()\\[\\]{}]';
+const mentionPattern = (label: string) =>
+  new RegExp(`(^|${MENTION_BOUNDARY})@?${escapeRegExp(label)}(?=$|${MENTION_BOUNDARY})`);
 const EXPLICIT_TRIGGER_PATTERN = /(^|[\s，。！？,!?;；:：([{])@([^@\s，。！？,!?;；:：)\]}]*)$/;
-const NATURAL_TRAILING_TEXT_PATTERN = /([^\s，。！？,!?;；:：()[\]{}]+)(?:[\s，。！？,!?;；:：()[\]{}]+)?$/;
 
 export const detectMentionTrigger = (input: string, cursor: number): MentionTrigger | null => {
   const safeCursor = Math.max(0, Math.min(cursor, input.length));
   const inputText = input.slice(0, safeCursor);
-  const explicitMatch = inputText.match(EXPLICIT_TRIGGER_PATTERN);
-  if (explicitMatch) {
-    const query = explicitMatch[2];
-    return {
-      mode: 'explicit',
-      query,
-      inputText,
-      start: safeCursor - query.length - 1,
-      end: safeCursor,
-    };
-  }
-
-  if (/\s$/.test(inputText)) {
-    return null;
-  }
-
-  const trailingMatch = inputText.match(NATURAL_TRAILING_TEXT_PATTERN);
-  const trailingText = trailingMatch?.[1] || '';
-  if (trailingText.length < 2) {
-    return null;
-  }
-  const triggerStart = safeCursor - (trailingMatch?.[0].length || trailingText.length);
+  const match = inputText.match(EXPLICIT_TRIGGER_PATTERN);
+  if (!match) return null;
+  const query = match[2];
   return {
-    mode: 'natural',
-    query: trailingText,
-    inputText,
-    start: triggerStart,
-    end: triggerStart + trailingText.length,
+    query,
+    start: safeCursor - query.length - 1,
+    end: safeCursor,
   };
 };
 
-export const findNaturalFragmentRange = (
-  input: string,
-  cursor: number,
-  candidateKey: string,
-): { start: number; end: number } | null => {
-  const safeCursor = Math.max(0, Math.min(cursor, input.length));
-  const inputText = input.slice(0, safeCursor).toLocaleLowerCase();
-  const normalizedCandidate = candidateKey.toLocaleLowerCase();
-  const maximumLength = Math.min(inputText.length, normalizedCandidate.length);
-  for (let length = maximumLength; length >= 2; length -= 1) {
-    if (normalizedCandidate.includes(inputText.slice(-length))) {
-      return { start: safeCursor - length, end: safeCursor };
-    }
-  }
-  return null;
-};
-
 export const replaceMentionTrigger = (
   input: string,
-  cursor: number,
   trigger: MentionTrigger,
-  candidateKey: string,
+  tableName: string,
 ): MentionReplacement => {
-  if (trigger.mode === 'natural') {
-    const normalizedInput = input.toLocaleLowerCase();
-    if (normalizedInput.includes(candidateKey.toLocaleLowerCase())) {
-      return { value: input, cursor };
-    }
-
-    const range = findNaturalFragmentRange(input, trigger.end, candidateKey);
-    if (!range) {
-      return { value: input, cursor };
-    }
-
-    return {
-      value: `${input.slice(0, range.start)}${candidateKey}${input.slice(range.end)}`,
-      cursor: range.start + candidateKey.length,
-    };
-  }
-
-  const replacementRange = { start: trigger.start, end: trigger.end };
   const suffix = ' ';
-  const value = `${input.slice(0, replacementRange.start)}${candidateKey}${suffix}${input.slice(replacementRange.end)}`;
+  const value = `${input.slice(0, trigger.start)}${tableName}${suffix}${input.slice(trigger.end)}`;
   return {
     value,
-    cursor: replacementRange.start + candidateKey.length + suffix.length,
+    cursor: trigger.start + tableName.length + suffix.length,
   };
 };
 
@@ -127,34 +57,6 @@ export const upsertSelectedMention = (
   nextMention,
 ];
 
-export const filterUnselectedMentionCandidates = <T extends Pick<SelectedMention, 'value' | 'label'>>(
-  candidates: readonly T[],
-  selected: readonly Pick<SelectedMention, 'value' | 'label'>[],
-): T[] => {
-  const selectedValues = new Set(selected.map((mention) => mention.value));
-  const selectedLabels = new Set(selected.map((mention) => mention.label));
-  return candidates.filter(
-    (candidate) => !selectedValues.has(candidate.value) && !selectedLabels.has(candidate.label),
-  );
-};
-
 export const reconcileSelectedMentions = (input: string, selected: readonly SelectedMention[]): SelectedMention[] => {
-  const remainingByLabel = new Map<string, number>();
-  selected.forEach(({ label }) => {
-    if (!remainingByLabel.has(label)) {
-      remainingByLabel.set(label, input.match(selectedLabelPattern(label, true))?.length || 0);
-    }
-  });
-
-  return selected.filter(({ label }) => {
-    const remaining = remainingByLabel.get(label) || 0;
-    if (remaining <= 0) return false;
-    remainingByLabel.set(label, remaining - 1);
-    return true;
-  });
-};
-
-export const normalizeMentionInput = (input: string, selected: readonly SelectedMention[]): string => {
-  const labels = [...new Set(selected.map(({ label }) => label))].sort((left, right) => right.length - left.length);
-  return labels.reduce((text, label) => text.replace(mentionPattern(label, true), label), input);
+  return selected.filter(({ label }) => mentionPattern(label).test(input));
 };
diff --git a/chat2db-community-client/src/blocks/AI/components/AIChatInput/style.ts b/chat2db-community-client/src/blocks/AI/components/AIChatInput/style.ts
index 985f8c1b35..0671db60aa 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIChatInput/style.ts
+++ b/chat2db-community-client/src/blocks/AI/components/AIChatInput/style.ts
@@ -76,52 +76,6 @@ export const useStyles = createStyles(({ css, token }) => {
         color: ${token.colorText};
       }
     `,
-    selectedKnowledgeList: css`
-      display: flex;
-      flex-wrap: wrap;
-      align-items: center;
-      gap: 6px;
-      margin-bottom: 7px;
-    `,
-    selectedKnowledgeItem: css`
-      display: inline-flex;
-      align-items: center;
-      gap: 5px;
-      max-width: 240px;
-      min-height: 26px;
-      padding: 3px 8px;
-      border: 1px solid transparent;
-      border-radius: 5px;
-      font-size: 12px;
-      line-height: 18px;
-      cursor: pointer;
-
-      > span:first-of-type {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    `,
-    selectedKnowledgeRemoveIcon: css`
-      flex-shrink: 0;
-      font-size: 10px;
-      opacity: 0.72;
-    `,
-    knowledgeTermMention: css`
-      color: ${token.colorInfoText};
-      border-color: ${token.colorInfoBorder};
-      background: ${token.colorInfoBg};
-    `,
-    businessLogicMention: css`
-      color: ${token.colorSuccessText};
-      border-color: ${token.colorSuccessBorder};
-      background: ${token.colorSuccessBg};
-    `,
-    sqlTemplateMention: css`
-      color: ${token.colorWarningText};
-      border-color: ${token.colorWarningBorder};
-      background: ${token.colorWarningBg};
-    `,
     bottomAddonsRow: css`
       width: 100%;
       display: flex;
diff --git a/chat2db-community-client/src/blocks/AI/components/AIModelConfigModal/index.tsx b/chat2db-community-client/src/blocks/AI/components/AIModelConfigModal/index.tsx
index 0dac65cad6..ca2297b5c2 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIModelConfigModal/index.tsx
+++ b/chat2db-community-client/src/blocks/AI/components/AIModelConfigModal/index.tsx
@@ -181,7 +181,10 @@ export default function AIModelConfigModal({ open, onClose, onChanged }: AIModel
     } catch (error: any) {
       modal.error({
         title: i18n('setting.modelConfig.testFailed'),
-        content: error?.errorMessage || error?.message || String(error),
+        content: (
+          <pre className={styles.testResult}>{error?.errorMessage || error?.message || String(error)}</pre>
+        ),
+        width: 680,
       });
     } finally {
       setTesting(false);
diff --git a/chat2db-community-client/src/blocks/AI/components/AIModelConfigModal/style.ts b/chat2db-community-client/src/blocks/AI/components/AIModelConfigModal/style.ts
index b8232e34c1..828e820a14 100644
--- a/chat2db-community-client/src/blocks/AI/components/AIModelConfigModal/style.ts
+++ b/chat2db-community-client/src/blocks/AI/components/AIModelConfigModal/style.ts
@@ -117,6 +117,7 @@ export const useStyles = createStyles(({ css, token }) => {
     `,
     testResult: css`
       max-height: 320px;
+      overflow-y: auto;
       margin: 0;
       white-space: pre-wrap;
       word-break: break-word;
diff --git a/chat2db-community-client/src/blocks/AI/components/MessageNavigationRail/index.tsx b/chat2db-community-client/src/blocks/AI/components/MessageNavigationRail/index.tsx
new file mode 100644
index 0000000000..41159174ae
--- /dev/null
+++ b/chat2db-community-client/src/blocks/AI/components/MessageNavigationRail/index.tsx
@@ -0,0 +1,73 @@
+import { memo, useState, type CSSProperties } from 'react';
+import { cx } from 'antd-style';
+
+import i18n from '@/i18n';
+import {
+  getMessageNavigationRailWidth,
+  type UserMessageNavigationItem,
+} from '../../messageNavigation';
+import { useStyles } from './style';
+
+interface MessageNavigationRailProps {
+  items: UserMessageNavigationItem[];
+  onNavigate: (messageId: string) => void;
+}
+
+const MessageNavigationRail = ({ items, onNavigate }: MessageNavigationRailProps) => {
+  const { styles } = useStyles();
+  const [selectedIndex, setSelectedIndex] = useState(-1);
+  const [railScrollTop, setRailScrollTop] = useState(0);
+  const activeIndex = selectedIndex < items.length ? selectedIndex : -1;
+  const selectedItem = activeIndex >= 0 ? items[activeIndex] : null;
+
+  if (!items.length) {
+    return null;
+  }
+
+  return (
+    <div
+      className={styles.rail}
+      aria-label={i18n('stream.messageNavigation.title')}
+      onMouseLeave={() => setSelectedIndex(-1)}
+      onBlur={(event) => {
+        if (!event.currentTarget.contains(event.relatedTarget as Node | null)) {
+          setSelectedIndex(-1);
+        }
+      }}
+    >
+      <div
+        className={styles.list}
+        onScroll={(event) => setRailScrollTop(event.currentTarget.scrollTop)}
+      >
+        {items.map((item, itemIndex) => (
+          <button
+            key={item.id}
+            type="button"
+            className={cx(styles.item, activeIndex === itemIndex && styles.itemActive)}
+            style={
+              {
+                '--message-navigation-rail-width': `${getMessageNavigationRailWidth(itemIndex, activeIndex)}px`,
+              } as CSSProperties
+            }
+            aria-label={`${item.index}. ${item.label}`}
+            onMouseEnter={() => setSelectedIndex(itemIndex)}
+            onFocus={() => setSelectedIndex(itemIndex)}
+            onClick={() => onNavigate(item.id)}
+          >
+            <span />
+          </button>
+        ))}
+      </div>
+      {selectedItem ? (
+        <div className={styles.preview} style={{ top: activeIndex * 14 + 6 - railScrollTop }}>
+          <div className={styles.previewQuestion}>{selectedItem.label}</div>
+          {selectedItem.assistantPreview ? (
+            <div className={styles.previewAnswer}>{selectedItem.assistantPreview}</div>
+          ) : null}
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default memo(MessageNavigationRail);
diff --git a/chat2db-community-client/src/blocks/AI/components/MessageNavigationRail/style.ts b/chat2db-community-client/src/blocks/AI/components/MessageNavigationRail/style.ts
new file mode 100644
index 0000000000..594007d051
--- /dev/null
+++ b/chat2db-community-client/src/blocks/AI/components/MessageNavigationRail/style.ts
@@ -0,0 +1,106 @@
+import { createStyles } from 'antd-style';
+
+export const useStyles = createStyles(({ css, token }) => ({
+  rail: css`
+    position: absolute;
+    z-index: 6;
+    top: 50%;
+    left: max(8px, calc(50% - 448px));
+    transform: translateY(-50%);
+    width: 36px;
+    padding: 6px 0;
+    opacity: 0.72;
+    transition: opacity 0.15s ease;
+
+    &:hover,
+    &:focus-within {
+      opacity: 1;
+    }
+  `,
+  list: css`
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 2px;
+    width: 36px;
+    max-height: min(240px, 60vh);
+    overflow-y: auto;
+    overflow-x: hidden;
+  `,
+  item: css`
+    display: flex;
+    align-items: center;
+    width: 34px;
+    height: 12px;
+    padding: 0;
+    border: 0;
+    background: transparent;
+    cursor: pointer;
+
+    > span {
+      display: block;
+      width: var(--message-navigation-rail-width, 8px);
+      height: 2px;
+      border-radius: 1px;
+      background: ${token.colorTextQuaternary};
+      opacity: 0.55;
+      transition: background-color 0.1s ease, opacity 0.1s ease;
+    }
+
+    &:hover > span,
+    &:focus-visible > span {
+      width: 22px;
+      background: ${token.colorTextSecondary};
+      opacity: 1;
+    }
+
+  `,
+  itemActive: css`
+    > span,
+    &:hover > span,
+    &:focus-visible > span {
+      width: 30px;
+      height: 3px;
+      background: ${token.colorText};
+      opacity: 1;
+    }
+  `,
+  preview: css`
+    position: absolute;
+    left: 44px;
+    transform: translateY(-50%);
+    z-index: 1;
+    width: min(320px, calc(100vw - 96px));
+    height: 108px;
+    min-width: 0;
+    padding: 10px 12px;
+    border: 1px solid ${token.colorBorderSecondary};
+    border-radius: 8px;
+    background: ${token.colorBgElevated};
+    box-shadow: ${token.boxShadowSecondary};
+    pointer-events: none;
+    box-sizing: border-box;
+  `,
+  previewQuestion: css`
+    display: -webkit-box;
+    overflow: hidden;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    color: ${token.colorText};
+    font-size: 13px;
+    font-weight: 600;
+    line-height: 20px;
+  `,
+  previewAnswer: css`
+    display: -webkit-box;
+    overflow: hidden;
+    margin-top: 6px;
+    padding-top: 6px;
+    border-top: 1px solid ${token.colorBorderSecondary};
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 3;
+    color: ${token.colorTextSecondary};
+    font-size: 12px;
+    line-height: 18px;
+  `,
+}));
diff --git a/chat2db-community-client/src/blocks/AI/index.tsx b/chat2db-community-client/src/blocks/AI/index.tsx
index efa6f8ad13..eab958c473 100644
--- a/chat2db-community-client/src/blocks/AI/index.tsx
+++ b/chat2db-community-client/src/blocks/AI/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Dropdown, Flex, Modal } from 'antd';
 import feedback from '@/utils/feedback';
 import {
@@ -24,8 +24,6 @@ import aiStreamService, {
   IChatMessage,
   IChatSession,
   IModelOptionItem,
-  ISelectedKnowledge,
-  KnowledgeSelectionType,
 } from '@/service/aiStream';
 import { IChatAttachment } from '@/service/aiAttachment';
 import { useAIStore } from '@/store/ai';
@@ -48,10 +46,13 @@ import { listAvailableModelOptions, resolveModelRequestPayload } from '@/service
 import { isDesktop } from '@/utils/env';
 import { usePermission } from '@/hooks/usePermission';
 import { clientRuntime } from '@client-runtime';
-import { toKnowledgeSelectionReferences } from './knowledgeSelection';
 import { buildWorkspaceObjectTabTitle } from '@/utils/workspaceObjectTabTitle';
 import type { IConnectionEnv } from '@/typings';
 import { resolveAIDataSourceContext } from './dataSourceContext';
+import { buildUserMessageNavigationItems } from './messageNavigation';
+import { Pencil } from 'lucide-react';
+import MessageNavigationRail from './components/MessageNavigationRail';
+import InlineRenameInput from '@/components/InlineRenameInput';
 
 /** detects unclosed text in flowing text ```chart block, return chart and whether there are any unfinished diagrams */
 function splitIncompleteChartBlock(text: string): { textBeforeChart: string; hasIncompleteChart: boolean } {
@@ -329,16 +330,9 @@ interface IChatItem {
   role: ChatRole;
   content: string;
   attachments?: IChatAttachment[];
-  selectedKnowledge?: ISelectedKnowledge[];
   traceEntries?: ITraceEntry[];
 }
 
-const knowledgeTypeLabel: Record<KnowledgeSelectionType, string> = {
-  KNOWLEDGE_TERM: '知识名词',
-  BUSINESS_LOGIC: '业务逻辑',
-  SQL_TEMPLATE: 'SQL 模板',
-};
-
 interface IChatRound {
   key: string;
   user?: IChatItem;
@@ -534,6 +528,7 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
     questionType?: QuestionType;
   } | null>(null);
   const [currentRoundUserMessageId, setCurrentRoundUserMessageId] = useState<string | null>(null);
+  const [highlightedUserMessageId, setHighlightedUserMessageId] = useState<string | null>(null);
   const [messageListContentHeight, setMessageListContentHeight] = useState(0);
 
   // Session management.
@@ -541,6 +536,7 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
   const [currentSessionTitle, setCurrentSessionTitle] = useState<string>('');
   const [openSettings, setOpenSettings] = useState(false);
   const [sessionLoading, setSessionLoading] = useState(false);
+  const [panelRenamingSessionId, setPanelRenamingSessionId] = useState<string | null>(null);
   const isEmptyState = !messages.length && !streamingText && !streamTraceEntries.length;
 
   const streamingRef = useRef('');
@@ -570,6 +566,12 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
   const topAlignmentTimerRef = useRef<number | null>(null);
   const pendingInitialBottomSyncRef = useRef(false);
   const initialBottomSyncTimerRef = useRef<number | null>(null);
+  const messageHighlightTimerRef = useRef<number | null>(null);
+
+  const userMessageNavigationItems = useMemo(
+    () => buildUserMessageNavigationItems(messages, i18n('stream.messageNavigation.userMessage')),
+    [messages, language],
+  );
 
   const lockScrollTracking = useCallback((behavior: ScrollBehavior = 'auto') => {
     suppressScrollTrackingRef.current = true;
@@ -753,6 +755,22 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
     [scrollMessageToTop],
   );
 
+  const handleNavigateToUserMessage = useCallback(
+    (messageId: string) => {
+      setAutoFollow(false);
+      scrollMessageToTop(messageId);
+      setHighlightedUserMessageId(messageId);
+      if (messageHighlightTimerRef.current !== null) {
+        window.clearTimeout(messageHighlightTimerRef.current);
+      }
+      messageHighlightTimerRef.current = window.setTimeout(() => {
+        setHighlightedUserMessageId(null);
+        messageHighlightTimerRef.current = null;
+      }, 1600);
+    },
+    [scrollMessageToTop, setAutoFollow],
+  );
+
   const flushPendingBuffer = useCallback(() => {
     return;
   }, []);
@@ -945,6 +963,10 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
         window.clearTimeout(initialBottomSyncTimerRef.current);
         initialBottomSyncTimerRef.current = null;
       }
+      if (messageHighlightTimerRef.current !== null) {
+        window.clearTimeout(messageHighlightTimerRef.current);
+        messageHighlightTimerRef.current = null;
+      }
     };
   }, []);
 
@@ -1236,6 +1258,11 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
     currentSessionTitleRef.current = '';
     setCurrentRoundUserMessageId(null);
     currentRoundUserMessageIdRef.current = null;
+    setHighlightedUserMessageId(null);
+    if (messageHighlightTimerRef.current !== null) {
+      window.clearTimeout(messageHighlightTimerRef.current);
+      messageHighlightTimerRef.current = null;
+    }
     currentRoundBlockRef.current = null;
     newSessionIdRef.current = null;
     inProgressSessionRef.current = null;
@@ -1245,6 +1272,30 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
     onSessionChange?.();
   }, [isPanel, clearChatIdFromPath, onSessionChange, stop]);
 
+  const startPanelHistoryRename = useCallback((session: IChatSession) => {
+    setPanelRenamingSessionId(session.id);
+  }, []);
+
+  const renamePanelHistorySession = useCallback(async (sessionId: string, title: string) => {
+    try {
+      await aiStreamService.renameChatSession({ id: sessionId, title });
+      setSessionList((prev) => prev.map((item) => (item.id === sessionId ? { ...item, title } : item)));
+      if (currentSessionIdRef.current === sessionId) {
+        setCurrentSessionTitle(title);
+        currentSessionTitleRef.current = title;
+      }
+      window.dispatchEvent(
+        new CustomEvent('stream:sessionRenamed', {
+          detail: { sessionId, title },
+        }),
+      );
+      feedback.success(i18n('common.message.modifySuccessfully'));
+    } catch (error) {
+      feedback.error(i18n('stream.sidebar.renameFailed'));
+      throw error;
+    }
+  }, []);
+
   const handleDeleteHistorySession = useCallback(
     async (sessionId: string) => {
       try {
@@ -1334,6 +1385,11 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
       currentSessionTitleRef.current = title || '';
       setCurrentRoundUserMessageId(null);
       currentRoundUserMessageIdRef.current = null;
+      setHighlightedUserMessageId(null);
+      if (messageHighlightTimerRef.current !== null) {
+        window.clearTimeout(messageHighlightTimerRef.current);
+        messageHighlightTimerRef.current = null;
+      }
       currentRoundBlockRef.current = null;
 
       const inProgressSession = inProgressSessionRef.current;
@@ -1362,7 +1418,6 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
           role: m.role as ChatRole,
           content: m.content,
           attachments: m.attachments,
-          selectedKnowledge: m.selectedKnowledge,
           traceEntries: parseTraceEntries(m.reasoningContent),
         }));
         const latestInProgressSession = inProgressSessionRef.current;
@@ -1457,6 +1512,23 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
     };
   }, [isPanel, handleLoadSessionById]);
 
+  useEffect(() => {
+    const handleSessionRenamed = (event: Event) => {
+      const { sessionId, title } = (event as CustomEvent<{ sessionId: string; title: string }>).detail || {};
+      if (!sessionId || !title) {
+        return;
+      }
+      setSessionList((prev) => prev.map((session) => (session.id === sessionId ? { ...session, title } : session)));
+      if (currentSessionIdRef.current === sessionId) {
+        setCurrentSessionTitle(title);
+        currentSessionTitleRef.current = title;
+      }
+    };
+
+    window.addEventListener('stream:sessionRenamed', handleSessionRenamed);
+    return () => window.removeEventListener('stream:sessionRenamed', handleSessionRenamed);
+  }, []);
+
   // Send a message.
 
   const handleSend = useCallback(
@@ -1510,7 +1582,6 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
             role: 'user' as const,
             content,
             attachments: params.attachments,
-            selectedKnowledge: params.selectedKnowledge,
           },
         ];
         messagesRef.current = next;
@@ -1561,7 +1632,6 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
         databaseType: params.databaseType,
         tableName: params.tableName,
         questionType: params.questionType,
-        selectedKnowledge: toKnowledgeSelectionReferences(params.selectedKnowledge),
         attachments: params.attachments,
       });
 
@@ -1891,7 +1961,13 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
               style={isLastRound && messageListContentHeight > 0 ? { minHeight: messageListContentHeight } : undefined}
             >
               {round.user && (
-                <div className={styles.userRow} ref={(node) => setMessageElement(round.user!.id, node)}>
+                <div
+                  className={cx(
+                    styles.userRow,
+                    highlightedUserMessageId === round.user.id && styles.userRowHighlighted,
+                  )}
+                  ref={(node) => setMessageElement(round.user!.id, node)}
+                >
                   <div className={styles.userBubbleWrap}>
                     {round.user.attachments?.length ? (
                       <div className={styles.userAttachmentList}>
@@ -1906,27 +1982,6 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
                         ))}
                       </div>
                     ) : null}
-                    {round.user.selectedKnowledge?.some((knowledge) => knowledge.key) ? (
-                      <div className={styles.userKnowledgeList} aria-label="本次使用的知识点">
-                        {round.user.selectedKnowledge
-                          .filter((knowledge) => knowledge.key)
-                          .map((knowledge) => (
-                            <span
-                              key={`${knowledge.type}-${knowledge.id}`}
-                              className={cx(
-                                styles.userKnowledgeItem,
-                                knowledge.type === 'KNOWLEDGE_TERM' && styles.userKnowledgeTerm,
-                                knowledge.type === 'BUSINESS_LOGIC' && styles.userBusinessLogic,
-                                knowledge.type === 'SQL_TEMPLATE' && styles.userSqlTemplate,
-                              )}
-                              title={knowledge.value || knowledge.key}
-                            >
-                              <span className={styles.userKnowledgeType}>{knowledgeTypeLabel[knowledge.type]}：</span>
-                              <span className={styles.userKnowledgeName}>{knowledge.key}</span>
-                            </span>
-                          ))}
-                      </div>
-                    ) : null}
                     <div className={styles.userBubble}>{round.user.content}</div>
                   </div>
                 </div>
@@ -2006,12 +2061,42 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
                 <div
                   className={styles.panelHistoryItem}
                   title={item.title || i18n('stream.session.title')}
-                  onClick={() => handleLoadSessionById(item.id, item.title)}
+                  onClick={() => {
+                    if (panelRenamingSessionId !== item.id) {
+                      handleLoadSessionById(item.id, item.title);
+                    }
+                  }}
                 >
-                  <span className={styles.panelHistoryTitle}>{item.title || i18n('stream.session.title')}</span>
+                  {panelRenamingSessionId === item.id ? (
+                    <InlineRenameInput
+                      key={item.id}
+                      className={styles.panelHistoryRenameInput}
+                      initialValue={item.title || ''}
+                      maxLength={50}
+                      onCancel={() => setPanelRenamingSessionId(null)}
+                      onSubmit={(title) => renamePanelHistorySession(item.id, title)}
+                    />
+                  ) : (
+                    <span className={styles.panelHistoryTitle}>{item.title || i18n('stream.session.title')}</span>
+                  )}
+                  <button
+                    type="button"
+                    className={styles.panelHistoryEditBtn}
+                    title={i18n('common.text.rename')}
+                    aria-label={i18n('common.text.rename')}
+                    onClick={(event) => {
+                      event.preventDefault();
+                      event.stopPropagation();
+                      startPanelHistoryRename(item);
+                    }}
+                  >
+                    <Pencil size={14} />
+                  </button>
                   <button
+                    type="button"
                     className={styles.panelHistoryDeleteBtn}
                     title={i18n('common.button.delete')}
+                    aria-label={i18n('common.button.delete')}
                     onClick={(event) => {
                       event.preventDefault();
                       event.stopPropagation();
@@ -2052,7 +2137,7 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
         ? renderPanelHeader()
         : (!isEmptyState || sessionLoading) && (
             <div className={styles.header}>
-              {currentSessionTitle || i18n('stream.session.title')}
+              <span className={styles.headerTitle}>{currentSessionTitle || i18n('stream.session.title')}</span>
               {sessionLoading && <div className={styles.topLoadingBar} />}
             </div>
           )}
@@ -2060,10 +2145,16 @@ export default function AI({ variant = 'page', onTableClick, onPinSql, onSession
       {sessionLoading ? null : (
         <div className={isEmptyState && !isPanel ? styles.chatPanelCenter : styles.chatPanel}>
           {!isEmptyState && (
-            <div className={styles.messageList} ref={messageListRef} onScroll={handleMessageListScroll}>
-              <div className={styles.contentWidth} ref={messageContentRef}>
-                {renderMessages()}
-                <div ref={bottomSentinelRef} aria-hidden="true" />
+            <div className={styles.messageListShell}>
+              <MessageNavigationRail
+                items={userMessageNavigationItems}
+                onNavigate={handleNavigateToUserMessage}
+              />
+              <div className={styles.messageList} ref={messageListRef} onScroll={handleMessageListScroll}>
+                <div className={styles.contentWidth} ref={messageContentRef}>
+                  {renderMessages()}
+                  <div ref={bottomSentinelRef} aria-hidden="true" />
+                </div>
               </div>
             </div>
           )}
diff --git a/chat2db-community-client/src/blocks/AI/knowledgeSelection.test.ts b/chat2db-community-client/src/blocks/AI/knowledgeSelection.test.ts
deleted file mode 100644
index cf39ed90ec..0000000000
--- a/chat2db-community-client/src/blocks/AI/knowledgeSelection.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import assert from 'node:assert/strict';
-import { toKnowledgeSelectionReferences } from './knowledgeSelection';
-
-const references = toKnowledgeSelectionReferences([
-  {
-    id: 186,
-    type: 'KNOWLEDGE_TERM',
-    key: '三全水饺',
-    value: '客户端展示内容不能作为服务端知识上下文。',
-  },
-  {
-    id: 220,
-    type: 'BUSINESS_LOGIC',
-    key: '销量',
-    value: 'SUM(quantity)',
-  },
-]);
-
-assert.deepEqual(references, [
-  { id: 186, type: 'KNOWLEDGE_TERM' },
-  { id: 220, type: 'BUSINESS_LOGIC' },
-]);
-assert.equal(Object.hasOwn(references[0], 'key'), false);
-assert.equal(Object.hasOwn(references[0], 'value'), false);
-
-console.log('Knowledge selection reference tests passed.');
diff --git a/chat2db-community-client/src/blocks/AI/knowledgeSelection.ts b/chat2db-community-client/src/blocks/AI/knowledgeSelection.ts
deleted file mode 100644
index 9ca6aa75c9..0000000000
--- a/chat2db-community-client/src/blocks/AI/knowledgeSelection.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { ISelectedKnowledge, KnowledgeSelectionType } from '@/service/aiStream';
-
-export interface IKnowledgeSelectionReference {
-  id: number;
-  type: KnowledgeSelectionType;
-}
-
-export const toKnowledgeSelectionReferences = (
-  selectedKnowledge: readonly ISelectedKnowledge[] | undefined,
-): IKnowledgeSelectionReference[] =>
-  (selectedKnowledge || []).map(({ id, type }) => ({
-    id,
-    type,
-  }));
diff --git a/chat2db-community-client/src/blocks/AI/messageNavigation.test.ts b/chat2db-community-client/src/blocks/AI/messageNavigation.test.ts
new file mode 100644
index 0000000000..992e2c633d
--- /dev/null
+++ b/chat2db-community-client/src/blocks/AI/messageNavigation.test.ts
@@ -0,0 +1,31 @@
+import assert from 'node:assert/strict';
+
+import { buildUserMessageNavigationItems, getMessageNavigationRailWidth } from './messageNavigation';
+
+const items = buildUserMessageNavigationItems(
+  [
+    { id: 'user-1', role: 'user', content: '  first\nquestion  ' },
+    { id: 'assistant-1', role: 'assistant', content: '## first\nanswer' },
+    { id: 'user-2', role: 'user', content: '继续' },
+    { id: 'user-3', role: 'user', content: '继续' },
+    { id: 'user-4', role: 'user', content: '   ' },
+  ],
+  'User message',
+);
+
+assert.deepEqual(items, [
+  { id: 'user-1', index: 1, label: 'first question', assistantPreview: 'first answer' },
+  { id: 'user-2', index: 2, label: '继续' },
+  { id: 'user-3', index: 3, label: '继续' },
+  { id: 'user-4', index: 4, label: 'User message' },
+]);
+
+assert.equal(new Set(items.map((item) => item.id)).size, items.length, 'navigation uses stable message ids');
+assert.deepEqual(
+  [0, 1, 2, 3, 4, 5].map((distance) => getMessageNavigationRailWidth(5 + distance, 5)),
+  [30, 27, 19, 13, 9, 8],
+  'rail width follows a bell curve and converges to the minimum',
+);
+assert.equal(getMessageNavigationRailWidth(3, -1), 8, 'unselected rails use the minimum width');
+
+console.log('AI user message navigation tests passed');
diff --git a/chat2db-community-client/src/blocks/AI/messageNavigation.ts b/chat2db-community-client/src/blocks/AI/messageNavigation.ts
new file mode 100644
index 0000000000..f76e210109
--- /dev/null
+++ b/chat2db-community-client/src/blocks/AI/messageNavigation.ts
@@ -0,0 +1,56 @@
+export interface MessageNavigationSource {
+  id: string;
+  role: string;
+  content?: string;
+}
+
+export interface UserMessageNavigationItem {
+  id: string;
+  index: number;
+  label: string;
+  assistantPreview?: string;
+}
+
+function normalizePreview(content?: string) {
+  return content
+    ?.trim()
+    .replace(/```[\s\S]*?```/g, ' code ')
+    .replace(/[#>*`]|\[|\]/g, '')
+    .replace(/\s+/g, ' ')
+    .trim();
+}
+
+export function getMessageNavigationRailWidth(itemIndex: number, selectedIndex: number) {
+  const minimumWidth = 8;
+  if (selectedIndex < 0) {
+    return minimumWidth;
+  }
+  const distance = Math.abs(itemIndex - selectedIndex);
+  const variance = 1.7 * 1.7;
+  return Math.round(minimumWidth + 22 * Math.exp(-(distance * distance) / (2 * variance)));
+}
+
+export function buildUserMessageNavigationItems(
+  messages: MessageNavigationSource[],
+  emptyLabel: string,
+): UserMessageNavigationItem[] {
+  const items: UserMessageNavigationItem[] = [];
+
+  messages.forEach((message) => {
+    if (message.role === 'user') {
+      items.push({
+        id: message.id,
+        index: items.length + 1,
+        label: normalizePreview(message.content) || emptyLabel,
+      });
+      return;
+    }
+
+    const currentItem = items[items.length - 1];
+    if (message.role === 'assistant' && currentItem && !currentItem.assistantPreview) {
+      currentItem.assistantPreview = normalizePreview(message.content);
+    }
+  });
+
+  return items;
+}
diff --git a/chat2db-community-client/src/blocks/AI/retiredAiSurface.test.ts b/chat2db-community-client/src/blocks/AI/retiredAiSurface.test.ts
index 0644a4498f..950ac8e40a 100644
--- a/chat2db-community-client/src/blocks/AI/retiredAiSurface.test.ts
+++ b/chat2db-community-client/src/blocks/AI/retiredAiSurface.test.ts
@@ -64,8 +64,6 @@ for (const sourceFile of sourceFiles) {
 }
 
 const aiSource = readFileSync('src/blocks/AI/index.tsx', 'utf8');
-const inputSource = readFileSync('src/blocks/AI/components/AIChatInput/index.tsx', 'utf8');
-const mentionSource = readFileSync('src/blocks/AI/components/AIAtMetion/index.tsx', 'utf8');
 const treeStoreSource = readFileSync('src/store/tree/index.tsx', 'utf8');
 const i18nSource = readdirSync('src/i18n')
   .filter((locale) => statSync(path.join('src/i18n', locale)).isDirectory())
@@ -75,25 +73,7 @@ const i18nSource = readdirSync('src/i18n')
       .map((file) => readFileSync(path.join('src/i18n', locale, file), 'utf8')),
   )
   .join('\n');
-const requestSource = readFileSync(
-  '../chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/ChatRequest.java',
-  'utf8',
-);
 assert.match(aiSource, /baseURL: '\/api\/v3\/ai\/chat\/stream'/);
-assert.match(aiSource, /selectedKnowledge: toKnowledgeSelectionReferences\(params\.selectedKnowledge\)/);
-assert.match(inputSource, /clientExtension\.knowledgeMentions/);
-assert.match(inputSource, /normalizeMentionInput/);
-const knowledgeRequestSource = inputSource.slice(
-  inputSource.indexOf('const fetchKnowledgeList'),
-  inputSource.indexOf('const handleSend'),
-);
-assert.doesNotMatch(knowledgeRequestSource, /debounce/);
-assert.match(inputSource, /pageSize: KNOWLEDGE_PAGE_SIZE/);
-assert.match(inputSource, /loadMoreKnowledge/);
-assert.match(mentionSource, /onScrollCapture/);
-assert.match(requestSource, /List<SelectedKnowledgeRequest> selectedKnowledge/);
-assert.doesNotMatch(requestSource, /private String key/);
-assert.doesNotMatch(requestSource, /private String value/);
 assert.match(treeStoreSource, /import \{ clientRuntime \} from '@client-runtime';/);
 assert.doesNotMatch(i18nSource, /aiDataCollection|databaseOrDataCollection/);
 
diff --git a/chat2db-community-client/src/blocks/AI/style.ts b/chat2db-community-client/src/blocks/AI/style.ts
index b8f6b25583..e97a2b7d54 100644
--- a/chat2db-community-client/src/blocks/AI/style.ts
+++ b/chat2db-community-client/src/blocks/AI/style.ts
@@ -79,6 +79,12 @@ export const useStyles = createStyles(({ css, token, prefixCls }) => {
         background-color: ${token.colorFillTertiary};
         color: ${token.colorText};
       }
+
+      &:disabled {
+        color: ${token.colorTextQuaternary};
+        background: none;
+        cursor: default;
+      }
     `,
 
     panelHistoryItem: css`
@@ -97,12 +103,18 @@ export const useStyles = createStyles(({ css, token, prefixCls }) => {
       text-overflow: ellipsis;
     `,
 
-    panelHistoryDeleteBtn: css`
+    panelHistoryRenameInput: css`
+      flex: 1;
+      min-width: 0;
+    `,
+
+    panelHistoryEditBtn: css`
       display: inline-flex;
       align-items: center;
       justify-content: center;
       width: 22px;
       height: 22px;
+      padding: 0;
       border: none;
       border-radius: 5px;
       background: transparent;
@@ -118,9 +130,35 @@ export const useStyles = createStyles(({ css, token, prefixCls }) => {
         opacity: 1;
       }
 
+      &:hover {
+        background-color: ${token.colorFillSecondary};
+        color: ${token.colorText};
+      }
+    `,
+
+    panelHistoryDeleteBtn: css`
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 22px;
+      height: 22px;
+      border: none;
+      border-radius: 5px;
+      background: transparent;
+      color: ${token.colorError};
+      cursor: pointer;
+      flex-shrink: 0;
+      opacity: 0;
+      transition: opacity 0.15s, background-color 0.15s, color 0.15s;
+
+      ${`.${prefixCls}-dropdown-menu-item-active &,
+      .${prefixCls}-dropdown-menu-item-selected &,
+      .${prefixCls}-dropdown-menu-item:hover &`} {
+        opacity: 1;
+      }
+
       &:hover {
         background-color: ${token.colorErrorBg};
-        color: ${token.colorError};
       }
     `,
 
@@ -128,13 +166,18 @@ export const useStyles = createStyles(({ css, token, prefixCls }) => {
       flex-shrink: 0;
       position: relative;
       height: 36px;
-      line-height: 36px;
       padding: 0 16px;
       font-size: 14px;
       font-weight: 500;
       width: 100%;
       box-sizing: border-box;
-      text-align: center;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    `,
+
+    headerTitle: css`
+      max-width: calc(100% - 80px);
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -157,11 +200,18 @@ export const useStyles = createStyles(({ css, token, prefixCls }) => {
       padding: 0 0 14px;
     `,
 
-    messageList: css`
+    messageListShell: css`
       flex: 1;
       min-height: 0;
+      position: relative;
+    `,
+
+    messageList: css`
+      width: 100%;
+      height: 100%;
       overflow: auto;
       padding: 14px 0 10px;
+      box-sizing: border-box;
     `,
 
     contentWidth: css`
@@ -201,6 +251,25 @@ export const useStyles = createStyles(({ css, token, prefixCls }) => {
       }
     `,
 
+    userRowHighlighted: css`
+      .ant-input,
+      > div:last-child {
+        animation: streamUserMessageHighlight 1.6s ease-out;
+      }
+
+      @keyframes streamUserMessageHighlight {
+        0%,
+        35% {
+          filter: drop-shadow(0 0 0 ${token.colorPrimary});
+          transform: translateX(-4px);
+        }
+        100% {
+          filter: drop-shadow(0 0 8px transparent);
+          transform: translateX(0);
+        }
+      }
+    `,
+
     assistantRow: css`
       display: flex;
       width: 100%;
@@ -310,61 +379,6 @@ export const useStyles = createStyles(({ css, token, prefixCls }) => {
       text-overflow: ellipsis;
     `,
 
-    userKnowledgeList: css`
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: flex-end;
-      gap: 6px;
-      max-width: 100%;
-    `,
-
-    userKnowledgeItem: css`
-      display: inline-flex;
-      align-items: center;
-      gap: 2px;
-      max-width: 260px;
-      min-width: 0;
-      min-height: 26px;
-      padding: 3px 8px;
-      border: 1px solid transparent;
-      border-radius: 5px;
-      line-height: 18px;
-    `,
-
-    userKnowledgeType: css`
-      flex-shrink: 0;
-      font-size: 11px;
-      font-weight: 400;
-      opacity: 0.72;
-    `,
-
-    userKnowledgeName: css`
-      min-width: 0;
-      font-size: 13px;
-      font-weight: 500;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    `,
-
-    userKnowledgeTerm: css`
-      color: ${token.colorInfoText};
-      border-color: ${token.colorInfoBorder};
-      background: ${token.colorInfoBg};
-    `,
-
-    userBusinessLogic: css`
-      color: ${token.colorSuccessText};
-      border-color: ${token.colorSuccessBorder};
-      background: ${token.colorSuccessBg};
-    `,
-
-    userSqlTemplate: css`
-      color: ${token.colorWarningText};
-      border-color: ${token.colorWarningBorder};
-      background: ${token.colorWarningBg};
-    `,
-
     userBubble: css`
       max-width: 100%;
       white-space: pre-wrap;
diff --git a/chat2db-community-client/src/blocks/BI/ChartCardBox/DingChartModal/index.tsx b/chat2db-community-client/src/blocks/BI/ChartCardBox/DingChartModal/index.tsx
index 267ce4dd9e..8dbd6ee0db 100644
--- a/chat2db-community-client/src/blocks/BI/ChartCardBox/DingChartModal/index.tsx
+++ b/chat2db-community-client/src/blocks/BI/ChartCardBox/DingChartModal/index.tsx
@@ -68,9 +68,11 @@ export default forwardRef((props: IProps, ref: ForwardedRef<DingChartModalRef>)
           if (newDashboardDetail?.id) {
             updateDashboard(newDashboardDetail).then(() => {
               setChartDetail(null);
-              refreshCurrentDashboard().then(() => {
-                staticMessage.success(i18n('dashboard.chart.pinToDashboardSuccess'));
-              });
+              refreshCurrentDashboard()
+                .then(() => {
+                  staticMessage.success(i18n('dashboard.chart.pinToDashboardSuccess'));
+                })
+                .catch(() => undefined);
             });
           }
         });
diff --git a/chat2db-community-client/src/blocks/CanvasTable/index.tsx b/chat2db-community-client/src/blocks/CanvasTable/index.tsx
index ec200d2b39..52d2a67188 100644
--- a/chat2db-community-client/src/blocks/CanvasTable/index.tsx
+++ b/chat2db-community-client/src/blocks/CanvasTable/index.tsx
@@ -40,6 +40,7 @@ interface IProps {
   customOptions?: ICustomOptions;
   // callback after initialization is completed
   onInit?: (tableInstance: ITableInstance) => void;
+  onBeforeRecordsChange?: (tableInstance: ITableInstance) => void;
   onCopy?: () => void;
   onPaste?: () => void;
   onKeyDown?: React.KeyboardEventHandler<HTMLDivElement>;
@@ -90,6 +91,7 @@ const CanvasTable = forwardRef((props: IProps, ref: ForwardedRef<CanvasTableRef>
     records,
     columns,
     onInit,
+    onBeforeRecordsChange,
     tooltip,
     options = null,
     customOptions,
@@ -211,8 +213,9 @@ const CanvasTable = forwardRef((props: IProps, ref: ForwardedRef<CanvasTableRef>
   // update records
   useEffect(() => {
     if (!tableInstance) return;
+    onBeforeRecordsChange?.(tableInstance);
     tableInstance.setRecords(records);
-  }, [records]);
+  }, [records, onBeforeRecordsChange, tableInstance]);
 
   // update columns
   useEffect(() => {
diff --git a/chat2db-community-client/src/blocks/DatabaseTableEditor/BaseInfo/index.tsx b/chat2db-community-client/src/blocks/DatabaseTableEditor/BaseInfo/index.tsx
index d0008d9e12..8c1143f0c5 100644
--- a/chat2db-community-client/src/blocks/DatabaseTableEditor/BaseInfo/index.tsx
+++ b/chat2db-community-client/src/blocks/DatabaseTableEditor/BaseInfo/index.tsx
@@ -3,7 +3,8 @@ import classnames from 'classnames';
 import { Form, Input } from 'antd';
 import { Context } from '../index';
 import { IBaseInfo } from '@/typings';
-import { shouldShowMysqlTableBaseInfo } from '@/utils/databaseJudgments';
+import { DatabaseCapability } from '@/constants';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import i18n from '@/i18n';
 import CustomSelect from '@/components/CustomSelect';
 import { useStyles } from './style';
@@ -54,7 +55,7 @@ const BaseInfo = forwardRef((props: IProps, ref: ForwardedRef<IBaseInfoRef>) =>
           <Form.Item label={`${i18n('editTable.label.comment')}:`} name="comment">
             <Input autoComplete="off" />
           </Form.Item>
-          {shouldShowMysqlTableBaseInfo(databaseType) && (
+          {isDatabaseCapabilitySupported(databaseType, DatabaseCapability.TABLE_EDITOR_BASE_INFO) && (
             <>
               <Form.Item label={`${i18n('editTable.label.characterSet')}:`} name="charset">
                 <CustomSelect options={databaseSupportField.charsets} />
diff --git a/chat2db-community-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx b/chat2db-community-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
index 60cbe64d43..46a5236e76 100644
--- a/chat2db-community-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
+++ b/chat2db-community-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
@@ -19,8 +19,8 @@ import { CSS } from '@dnd-kit/utilities';
 import { Context } from '../index';
 import { IColumnItemNew, IColumnTypes } from '@/typings';
 import i18n from '@/i18n';
-import { EditColumnOperationType, NullableType } from '@/constants';
-import { isSqliteExistingColumnReadonly, shouldShowSqlServerSparse } from '@/utils/databaseJudgments';
+import { DatabaseCapability, EditColumnOperationType, MYSQL_VISIBILITY, NullableType } from '@/constants';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import CustomSelect from '@/components/CustomSelect';
 import Iconfont from '@/components/Iconfont';
 import { useStyles } from './style';
@@ -197,7 +197,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
 
   const columns = useMemo(() => {
     const isEditing = (record: IColumnItemNew) => record.key === editingData?.key;
-    return [
+    const _columns = [
       {
         key: 'sort',
         width: columnsWidth[0],
@@ -270,7 +270,13 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
             <div>
               <Checkbox
                 onChange={() => {
-                  if (isSqliteExistingColumnReadonly(databaseType, record.editStatus)) {
+                  if (
+                    record.editStatus !== EditColumnOperationType.Add &&
+                    !isDatabaseCapabilitySupported(
+                      databaseType,
+                      DatabaseCapability.TABLE_EDITOR_EXISTING_COLUMN_EDIT,
+                    )
+                  ) {
                     return null;
                   }
                   handelNullable(record);
@@ -279,7 +285,11 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
                 disabled={
                   editingConfig?.supportNullable === false ||
                   !!record.primaryKey ||
-                  isSqliteExistingColumnReadonly(databaseType, record.editStatus)
+                  (record.editStatus !== EditColumnOperationType.Add &&
+                    !isDatabaseCapabilitySupported(
+                      databaseType,
+                      DatabaseCapability.TABLE_EDITOR_EXISTING_COLUMN_EDIT,
+                    ))
                 }
               />
             </div>
@@ -295,7 +305,13 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
             <div
               className={cx(styles.keyBox)}
               onClick={() => {
-                if (isSqliteExistingColumnReadonly(databaseType, record.editStatus)) {
+                if (
+                  record.editStatus !== EditColumnOperationType.Add &&
+                  !isDatabaseCapabilitySupported(
+                    databaseType,
+                    DatabaseCapability.TABLE_EDITOR_EXISTING_COLUMN_EDIT,
+                  )
+                ) {
                   return null;
                 }
                 handelPrimaryKey(record);
@@ -325,7 +341,10 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
         width: columnsWidth[7],
         render: (text: string, record: IColumnItemNew) => {
           // sqlLite does not support deleting fields. New fields can be deleted.
-          if (isSqliteExistingColumnReadonly(databaseType, record.editStatus)) {
+          if (
+            record.editStatus !== EditColumnOperationType.Add &&
+            !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.TABLE_EDITOR_EXISTING_COLUMN_EDIT)
+          ) {
             return null;
           }
           return (
@@ -343,7 +362,42 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
         },
       },
     ];
-  }, [columnsWidth, editingData, editingConfig, databaseType, dataSource]);
+    if (isDatabaseCapabilitySupported(databaseType, DatabaseCapability.TABLE_EDITOR_COLUMN_VISIBILITY)) {
+      _columns.splice(-1, 0, {
+        title: i18n('editTable.label.columnVisible'),
+        dataIndex: 'visible',
+        width: 80,
+        render: (text: boolean | null | undefined, record: IColumnItemNew) => {
+          const editable = isEditing(record);
+          const value =
+            record.visible === MYSQL_VISIBILITY.INVISIBLE.value
+              ? MYSQL_VISIBILITY.INVISIBLE.label
+              : MYSQL_VISIBILITY.VISIBLE.label;
+          return editable ? (
+            <Form.Item name="visible" style={{ margin: 0 }}>
+              <Select size="small" style={{ width: '100%' }}>
+                <Select.Option value={MYSQL_VISIBILITY.VISIBLE.value}>
+                  {MYSQL_VISIBILITY.VISIBLE.label}
+                </Select.Option>
+                <Select.Option value={MYSQL_VISIBILITY.INVISIBLE.value}>
+                  {MYSQL_VISIBILITY.INVISIBLE.label}
+                </Select.Option>
+              </Select>
+            </Form.Item>
+          ) : (
+            <div className={styles.editableCell}>{value}</div>
+          );
+        },
+      });
+    }
+    return _columns;
+  }, [
+    columnsWidth,
+    editingData,
+    editingConfig,
+    databaseType,
+    dataSource,
+  ]);
 
   const handleResize = useCallback(
     (index) =>
@@ -572,7 +626,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
             <Checkbox>{i18n('editTable.label.autoIncrement')}</Checkbox>
           </Form.Item>
         )}
-        {shouldShowSqlServerSparse(databaseType) && (
+        {isDatabaseCapabilitySupported(databaseType, DatabaseCapability.TABLE_EDITOR_SPARSE_COLUMN) && (
           <Form.Item className={styles.checkboxContainer} labelCol={labelCol} name="sparse" valuePropName="checked">
             <Checkbox>{i18n('editTable.label.sparse')}</Checkbox>
           </Form.Item>
@@ -631,7 +685,10 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
     return {
       onClick: () => {
         // sqlLite does not support modifying fields. New fields can be modified.
-        if (isSqliteExistingColumnReadonly(databaseType, record.editStatus)) {
+        if (
+          record.editStatus !== EditColumnOperationType.Add &&
+          !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.TABLE_EDITOR_EXISTING_COLUMN_EDIT)
+        ) {
           return;
         }
         if (editingData?.key !== record.key) {
diff --git a/chat2db-community-client/src/blocks/DatabaseTableEditor/ColumnList/normalizeColumn.test.ts b/chat2db-community-client/src/blocks/DatabaseTableEditor/ColumnList/normalizeColumn.test.ts
index 8913a2b9ce..70672c7ef2 100644
--- a/chat2db-community-client/src/blocks/DatabaseTableEditor/ColumnList/normalizeColumn.test.ts
+++ b/chat2db-community-client/src/blocks/DatabaseTableEditor/ColumnList/normalizeColumn.test.ts
@@ -72,4 +72,10 @@ assertEqual(
   'do not default non-DECIMAL precision',
 );
 
+assertEqual(
+  normalizeColumnForSubmit(column({ visible: false })).visible,
+  false,
+  'preserve invisible column state for submission',
+);
+
 console.log('normalizeColumn tests passed');
diff --git a/chat2db-community-client/src/blocks/DatabaseTableEditor/IncludeCol/index.tsx b/chat2db-community-client/src/blocks/DatabaseTableEditor/IncludeCol/index.tsx
index ff4ddcb6d9..b850086cd6 100644
--- a/chat2db-community-client/src/blocks/DatabaseTableEditor/IncludeCol/index.tsx
+++ b/chat2db-community-client/src/blocks/DatabaseTableEditor/IncludeCol/index.tsx
@@ -16,7 +16,8 @@ import { Table, Form, Select, Button } from 'antd';
 import { v4 as uuidv4 } from 'uuid';
 import { Context } from '../index';
 import { IColumnItemNew, IIndexIncludeColumnItem } from '@/typings';
-import { shouldShowSqliteIncludeCollation } from '@/utils/databaseJudgments';
+import { DatabaseCapability } from '@/constants';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import i18n from '@/i18n';
 import lodash from 'lodash';
 import Iconfont from '@/components/Iconfont';
@@ -188,7 +189,7 @@ const IncludeCol = forwardRef((props: IProps, ref: ForwardedRef<IIncludeColRef>)
     // },
   ];
   // sqlLite Add sorting rules
-  if (shouldShowSqliteIncludeCollation(databaseType)) {
+  if (isDatabaseCapabilitySupported(databaseType, DatabaseCapability.TABLE_EDITOR_INCLUDE_COLLATION)) {
     columns.splice(2, 0, {
       title: i18n('editTable.label.collation'),
       dataIndex: 'collation',
diff --git a/chat2db-community-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx b/chat2db-community-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx
index 0c38bdf488..7eed2ba95e 100644
--- a/chat2db-community-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx
+++ b/chat2db-community-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx
@@ -18,8 +18,13 @@ import { Table, Input, Form, Select, Modal } from 'antd';
 import { v4 as uuidv4 } from 'uuid';
 import IncludeCol, { IIncludeColRef } from '../IncludeCol';
 import { IIndexItem, IIndexIncludeColumnItem } from '@/typings';
-import { EditColumnOperationType } from '@/constants';
-import { shouldHideOracleIndexColumn, shouldShowMysqlIndexMethod } from '@/utils/databaseJudgments';
+import {
+  DatabaseCapability,
+  EditColumnOperationType,
+  MYSQL_PRIMARY_INDEX_TYPE,
+  MYSQL_VISIBILITY,
+} from '@/constants';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import Iconfont from '@/components/Iconfont';
 import { Context } from '../index';
 import i18n from '@/i18n';
@@ -325,7 +330,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
         },
       },
     ];
-    if (shouldShowMysqlIndexMethod(databaseType)) {
+    if (isDatabaseCapabilitySupported(databaseType, DatabaseCapability.TABLE_EDITOR_INDEX_METHOD)) {
       _columns.splice(3, 0, {
         title: i18n('editTable.label.indexMethod'),
         dataIndex: 'method',
@@ -348,12 +353,41 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
         },
       });
     }
-    if (shouldHideOracleIndexColumn(databaseType)) {
+    if (isDatabaseCapabilitySupported(databaseType, DatabaseCapability.TABLE_EDITOR_INDEX_VISIBILITY)) {
+      _columns.splice(-1, 0, {
+        title: i18n('editTable.label.indexVisible'),
+        dataIndex: 'visible',
+        width: '100px',
+        render: (text: boolean | null | undefined, record: IIndexItem) => {
+          const isPrimaryKey = record.type === MYSQL_PRIMARY_INDEX_TYPE;
+          const editable = isEditing(record) && !isPrimaryKey;
+          const value =
+            record.visible === MYSQL_VISIBILITY.INVISIBLE.value
+              ? MYSQL_VISIBILITY.INVISIBLE.label
+              : MYSQL_VISIBILITY.VISIBLE.label;
+          return editable ? (
+            <Form.Item name="visible" style={{ margin: 0 }}>
+              <Select style={{ width: '100%' }} disabled={isPrimaryKey}>
+                <Select.Option value={MYSQL_VISIBILITY.VISIBLE.value}>
+                  {MYSQL_VISIBILITY.VISIBLE.label}
+                </Select.Option>
+                <Select.Option value={MYSQL_VISIBILITY.INVISIBLE.value}>
+                  {MYSQL_VISIBILITY.INVISIBLE.label}
+                </Select.Option>
+              </Select>
+            </Form.Item>
+          ) : (
+            <div className={styles.editableCell}>{value}</div>
+          );
+        },
+      });
+    }
+    if (!isDatabaseCapabilitySupported(databaseType, DatabaseCapability.TABLE_EDITOR_INDEX_COLUMN)) {
       _columns.splice(-2, 1);
     }
     return _columns;
     // TODO: isEditing changes every time, so this check is ineffective and should be improved.
-  }, [isEditing]);
+  }, [isEditing, databaseType]);
 
   const getIncludeColInfo = () => {
     setDataSource(
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/index.tsx b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/index.tsx
index eb453e1370..b7bbbe8862 100644
--- a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/index.tsx
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/index.tsx
@@ -1,6 +1,6 @@
 import { memo, useMemo, useState, forwardRef, ForwardedRef, useImperativeHandle, useEffect } from 'react';
 import { useStyles } from './style';
-import UploadLocalFile from '@/components/UploadLocalFile';
+import UploadLocalFile, { type FileUrl } from '@/components/UploadLocalFile';
 import { Form, Input, Select } from 'antd';
 import i18n from '@/i18n';
 import { useImportExportStore } from '@/store/importExport';
@@ -9,10 +9,12 @@ import { ImportExportType, ImportExportFileType, ImportExportTaskType } from '@/
 import { ExportTaskParams, ImportTaskParams } from '@/service/importExport';
 import { isDesktop, isDevelopment } from '@/utils/env';
 import jcefApi from '@/jcef';
+import { hasSelectedImportFile } from './selection';
 
 interface IProps {
   className?: string;
   setIsReady?: (p: boolean) => void;
+  onImportFileChange?: (file?: FileUrl) => void;
 }
 
 export interface ImportExportFileRef {
@@ -34,10 +36,10 @@ const exportTypeOptions = [
 ];
 
 const ImportExportFile = forwardRef((props: IProps, ref: ForwardedRef<ImportExportFileRef>) => {
-  const { setIsReady } = props;
+  const { setIsReady, onImportFileChange } = props;
   const { styles } = useStyles();
   const [form] = Form.useForm();
-  const [fileUrlList, setFileUrlList] = useState<string[]>([]);
+  const [selectedFilePaths, setSelectedFilePaths] = useState<string[]>([]);
   const [exportLocation, setExportLocation] = useState<string>('');
   const [formValue, setFormValue] = useState<ImportExportFormValue>({
     exportType: ImportExportFileType.CSV,
@@ -68,21 +70,18 @@ const ImportExportFile = forwardRef((props: IProps, ref: ForwardedRef<ImportExpo
     return formValue.exportType ? exportTypeOptions.find((item) => item.value === formValue.exportType)?.accept : '';
   }, [formValue.exportType]);
 
-  // file list changes
-  useEffect(() => {
-    if (isImport) {
-      setIsReady?.(!!(fileUrlList.length || formValue.fileUrl));
-    }
-  }, [fileUrlList, formValue]);
-
   useEffect(() => {
     if (isExport) {
       setIsReady?.(!isDesktop || !!exportLocation || !!formValue.fileUrl);
     }
   }, [exportLocation, formValue]);
 
-  const handleFileUrlListChange = (_fileUrlList) => {
-    setFileUrlList(_fileUrlList.map((item) => item.filePath));
+  const handleSelectedFilesChange = (files: FileUrl[]) => {
+    setSelectedFilePaths(files.map((item) => item.filePath).filter((path): path is string => !!path));
+    if (isImport) {
+      setIsReady?.(hasSelectedImportFile(files));
+      onImportFileChange?.(files[0]);
+    }
   };
 
   useImperativeHandle(ref, () => ({
@@ -111,7 +110,7 @@ const ImportExportFile = forwardRef((props: IProps, ref: ForwardedRef<ImportExpo
             ? ImportExportTaskType.SQL_FILE_IMPORT
             : ImportExportTaskType.DATA_FILE_IMPORT,
         tableName,
-        sourceFile: fileUrlList[0] || formValue.fileUrl || '',
+        sourceFile: selectedFilePaths[0] || '',
       };
     },
   }));
@@ -159,10 +158,10 @@ const ImportExportFile = forwardRef((props: IProps, ref: ForwardedRef<ImportExpo
       )}
       {isImport && (
         <Form.Item>
-          <UploadLocalFile fileUrlListChange={handleFileUrlListChange} accept={uploadLocalFileAccept} />
+          <UploadLocalFile fileUrlListChange={handleSelectedFilesChange} accept={uploadLocalFileAccept} />
         </Form.Item>
       )}
-      {isDevelopment && (
+      {isDevelopment && isExport && (
         <Form.Item label="File URL" name="fileUrl">
           <Input autoComplete="off" />
         </Form.Item>
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/selection.test.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/selection.test.ts
new file mode 100644
index 0000000000..0fd0a6a3a9
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/selection.test.ts
@@ -0,0 +1,6 @@
+import assert from 'node:assert/strict';
+import { hasSelectedImportFile } from './selection';
+
+assert.equal(hasSelectedImportFile([]), false);
+assert.equal(hasSelectedImportFile([{ filePath: '/tmp/users.sql' }]), true);
+assert.equal(hasSelectedImportFile([{ file: {} as File }]), true);
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/selection.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/selection.ts
new file mode 100644
index 0000000000..c2d5dd6ad8
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportExportFile/selection.ts
@@ -0,0 +1,7 @@
+interface ImportFileSelection {
+  filePath?: string;
+  file?: File;
+}
+
+export const hasSelectedImportFile = (files: ImportFileSelection[]) =>
+  files.some(({ filePath, file }) => !!filePath || !!file);
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/index.tsx b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/index.tsx
index 6798440605..700fb5a52e 100644
--- a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/index.tsx
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/index.tsx
@@ -9,18 +9,33 @@ import importExportServices from '@/service/importExport';
 import { ImportExportTaskStatus, ImportExportType } from '@/constants/importExport';
 import Log from '@/blocks/ImportAndExport/components/Log';
 import { ImportExportTaskDetails } from '@/typings/importExport';
+import ImportMappingContent from '@/blocks/ImportAndExport/components/ImportMappingContent';
 import jcefApi from '@/jcef';
 import { isDesktop } from '@/utils/env';
+import sqlService from '@/service/sql';
+import { prepareWebImportParams } from './submission';
+import {
+  IMPORT_TARGET_TABLE_REFRESH_EVENT,
+  shouldRefreshImportTargetTable,
+} from '@/store/importExport/taskCenterUtils';
+import type { FileUrl } from '@/components/UploadLocalFile';
 
 interface IProps {
   className?: string;
 }
 
+const isPreviewFile = (file?: FileUrl) => {
+  const name = (file?.fileName || file?.file?.name)?.toLowerCase();
+  return name?.endsWith('.csv') || name?.endsWith('.xls') || name?.endsWith('.xlsx');
+};
+
 export default memo<IProps>((_props) => {
   const [isReady, setIsReady] = useState(false);
   const importExportFileRef = useRef<ImportExportFileRef>(null);
+  const previousTaskDetailsRef = useRef<ImportExportTaskDetails>();
   const [taskId, setTaskId] = useState<number>();
   const [taskDetails, setTaskDetails] = useState<ImportExportTaskDetails>();
+  const [importFile, setImportFile] = useState<FileUrl>();
 
   const { importExportDataBoundInfo, setImportExportDataBoundInfo, getTaskList } = useImportExportStore((state) => {
     return {
@@ -34,18 +49,31 @@ export default memo<IProps>((_props) => {
     if (!importExportDataBoundInfo) {
       setTaskId(undefined);
       setTaskDetails(undefined);
+      previousTaskDetailsRef.current = undefined;
+      setImportFile(undefined);
     }
   }, [importExportDataBoundInfo]);
 
-  const handleRunSQl = () => {
+  const handleRunSQl = async () => {
     const params = importExportFileRef.current?.getValues();
     if (!params) return;
-    const request =
-      'sourceFile' in params ? importExportServices.submitImport(params) : importExportServices.submitExport(params);
-    request.then((res) => {
-      setTaskId(res.taskId);
-      getTaskList();
-    });
+    let response;
+    if ('sourceFile' in params) {
+      let importParams = params;
+      if (!isDesktop) {
+        if (!importFile?.file) return;
+        importParams = await prepareWebImportParams(importParams, importFile.file, sqlService.uploadImportFile);
+      }
+      response = await importExportServices.submitImport(importParams);
+    } else {
+      response = await importExportServices.submitExport(params);
+    }
+    setTaskId(response.taskId);
+    getTaskList();
+  };
+
+  const handleImportFileChange = (file?: FileUrl) => {
+    setImportFile(file);
   };
 
   const renderFooter = () => {
@@ -105,9 +133,35 @@ export default memo<IProps>((_props) => {
   );
 
   const handleTaskChange = (_taskDetails: ImportExportTaskDetails) => {
+    const previousTask = previousTaskDetailsRef.current;
+    previousTaskDetailsRef.current = _taskDetails;
     setTaskDetails(_taskDetails);
+    if (shouldRefreshImportTargetTable(previousTask, _taskDetails)) {
+      window.dispatchEvent(
+        new CustomEvent(IMPORT_TARGET_TABLE_REFRESH_EVENT, {
+          detail: _taskDetails.target,
+        }),
+      );
+      void getTaskList();
+    }
   };
 
+  const importPreviewContext =
+    importExportDataBoundInfo?.type === ImportExportType.IMPORT &&
+    isPreviewFile(importFile) &&
+    importExportDataBoundInfo.dataSourceId != null &&
+    importExportDataBoundInfo.databaseName != null &&
+    importFile != null
+      ? {
+          dataSourceId: importExportDataBoundInfo.dataSourceId,
+          databaseName: importExportDataBoundInfo.databaseName,
+          schemaName: importExportDataBoundInfo.schemaName,
+          tableName: importExportDataBoundInfo.tableName || '',
+          file: importFile,
+        }
+      : null;
+  const showImportPreview = taskId == null && importPreviewContext != null;
+
   return (
     <Modal
       open={!!importExportDataBoundInfo}
@@ -119,9 +173,10 @@ export default memo<IProps>((_props) => {
           : i18n('workspace.menu.exportData')
       }
       headerIconCode={importExportDataBoundInfo?.type === ImportExportType.IMPORT ? 'icon-upload' : 'icon-download'}
-      headerBorder
+      width={showImportPreview ? 960 : undefined}
+      centered
       destroyOnClose
-      footer={taskId ? logRenderFooter() : renderFooter()}
+      footer={taskId ? logRenderFooter() : showImportPreview ? null : renderFooter()}
       maskClosable={false}
       onCancel={() => {
         setImportExportDataBoundInfo(null);
@@ -129,8 +184,24 @@ export default memo<IProps>((_props) => {
     >
       {taskId ? (
         <Log onTaskChange={handleTaskChange} taskId={taskId} />
+      ) : importPreviewContext ? (
+        <ImportMappingContent
+          dataSourceId={importPreviewContext.dataSourceId}
+          databaseName={importPreviewContext.databaseName}
+          schemaName={importPreviewContext.schemaName}
+          tableName={importPreviewContext.tableName}
+          file={importPreviewContext.file}
+          onSubmitted={(submittedTaskId) => {
+            setTaskId(submittedTaskId);
+            getTaskList();
+          }}
+        />
       ) : (
-        <ImportExportFile ref={importExportFileRef} setIsReady={setIsReady} />
+        <ImportExportFile
+          ref={importExportFileRef}
+          setIsReady={setIsReady}
+          onImportFileChange={handleImportFileChange}
+        />
       )}
     </Modal>
   );
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/submission.test.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/submission.test.ts
new file mode 100644
index 0000000000..0f5420ac45
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/submission.test.ts
@@ -0,0 +1,25 @@
+import assert from 'node:assert/strict';
+import { ImportExportFileType, ImportExportTaskType } from '@/constants/importExport';
+import { prepareWebImportParams } from './submission';
+
+const file = { name: 'users.json' } as File;
+const params = {
+  dataSourceId: 1,
+  databaseName: 'app',
+  tableName: 'users',
+  taskType: ImportExportTaskType.DATA_FILE_IMPORT,
+  format: ImportExportFileType.JSON,
+  sourceFile: '',
+};
+
+prepareWebImportParams(params, file, async ({ file: uploadedFile }) => {
+  assert.equal(uploadedFile, file);
+  return 'staged-file-id';
+}).then((prepared) => {
+  assert.deepEqual(prepared, {
+    ...params,
+    sourceFile: undefined,
+    fileId: 'staged-file-id',
+    displayFileName: 'users.json',
+  });
+});
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/submission.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/submission.ts
new file mode 100644
index 0000000000..db92755c98
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportFileModal/submission.ts
@@ -0,0 +1,14 @@
+import { ImportTaskParams } from '@/service/importExport';
+
+type UploadImportFile = (params: { file: File }) => Promise<string>;
+
+export const prepareWebImportParams = async (
+  params: ImportTaskParams,
+  file: File,
+  uploadImportFile: UploadImportFile,
+): Promise<ImportTaskParams> => ({
+  ...params,
+  sourceFile: undefined,
+  fileId: await uploadImportFile({ file }),
+  displayFileName: file.name,
+});
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/CsvOptionsSections.tsx b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/CsvOptionsSections.tsx
new file mode 100644
index 0000000000..562a3abea9
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/CsvOptionsSections.tsx
@@ -0,0 +1,249 @@
+import { Checkbox, Collapse, InputNumber, Select, type CollapseProps } from 'antd';
+import type { ICsvOptions } from '@/typings/importExport';
+import i18n from '@/i18n';
+import LocalFileEncodingSelect from '@/components/LocalFileEncodingSelect';
+import SingleCharacterSelect from '@/components/SingleCharacterSelect';
+import { getCsvDateTimeExamples } from '../../utils/csvOptions';
+import { useStyles } from './style';
+
+interface Props {
+  value: ICsvOptions;
+  activeKeys: string[];
+  disabled?: boolean;
+  dataItems: CollapseProps['items'];
+  onChange: (value: ICsvOptions) => void;
+  onActiveKeysChange: (keys: string[]) => void;
+}
+
+const CsvOptionsSections = ({ value, activeKeys, disabled, dataItems, onChange, onActiveKeysChange }: Props) => {
+  const { styles } = useStyles();
+  const update = (patch: Partial<ICsvOptions>) => onChange({ ...value, ...patch });
+  const characterProps = {
+    className: styles.csvOptionField,
+    customInputClassName: styles.customCharacterInput,
+    customOptionLabel: (character: string) => i18n('workspace.importExport.customCharacterValue', character),
+    customInputLabel: i18n('workspace.importExport.customCharacter'),
+    disabled,
+  };
+
+  return (
+    <Collapse
+      className={styles.sections}
+      ghost
+      size="small"
+      activeKey={activeKeys}
+      onChange={(keys) => onActiveKeysChange(Array.isArray(keys) ? keys : [keys])}
+      items={[
+        {
+          key: 'csvFormat',
+          label: i18n('workspace.importExport.csvFormat'),
+          children: (
+            <div className={styles.csvFormatOptions}>
+              <div className={styles.csvOptionField}>
+                <span>{i18n('workspace.importExport.encoding')}</span>
+                <LocalFileEncodingSelect
+                  className={styles.fullWidthControl}
+                  charset={value.encoding === 'AUTO' ? undefined : value.encoding}
+                  disabled={disabled}
+                  size="middle"
+                  variant="outlined"
+                  onEncodingChange={async (encoding) => update({ encoding: encoding || 'AUTO' })}
+                />
+              </div>
+              <SingleCharacterSelect
+                {...characterProps}
+                label={i18n('workspace.importExport.delimiter')}
+                value={value.delimiter}
+                options={[
+                  { value: ',', label: i18n('workspace.importExport.delimiterComma') },
+                  { value: ';', label: i18n('workspace.importExport.delimiterSemicolon') },
+                  { value: '\t', label: i18n('workspace.importExport.delimiterTab') },
+                  { value: '|', label: i18n('workspace.importExport.delimiterPipe') },
+                ]}
+                onChange={(delimiter) => update({ delimiter })}
+              />
+              <SingleCharacterSelect
+                {...characterProps}
+                label={i18n('workspace.importExport.textQualifier')}
+                value={value.quote}
+                options={[
+                  { value: '"', label: i18n('workspace.importExport.quoteDouble') },
+                  { value: "'", label: i18n('workspace.importExport.quoteSingle') },
+                  { value: '`', label: i18n('workspace.importExport.quoteBacktick') },
+                  { value: '~', label: i18n('workspace.importExport.quoteTilde') },
+                ]}
+                onChange={(quote) => update({ quote, escape: value.escape === value.quote ? quote : value.escape })}
+              />
+              <SingleCharacterSelect
+                {...characterProps}
+                label={i18n('workspace.importExport.escapeMethod')}
+                value={value.escape}
+                options={[
+                  { value: value.quote, label: i18n('workspace.importExport.escapeRepeatedQualifier') },
+                  { value: '\\', label: i18n('workspace.importExport.escapeBackslash') },
+                ]}
+                onChange={(escape) => update({ escape })}
+              />
+            </div>
+          ),
+        },
+        {
+          key: 'sourceRows',
+          label: i18n('workspace.importExport.sourceRows'),
+          children: (
+            <div className={styles.sourceRowOptions}>
+              <Checkbox
+                className={styles.sourceRowHasHeader}
+                checked={value.hasHeader}
+                disabled={disabled}
+                onChange={(event) => {
+                  const hasHeader = event.target.checked;
+                  const dataStartRow = hasHeader ? Math.max(value.dataStartRow, value.headerRow + 1) : 1;
+                  update({
+                    hasHeader,
+                    dataStartRow,
+                    dataEndRow:
+                      hasHeader && value.dataEndRow && value.dataEndRow < dataStartRow
+                        ? dataStartRow
+                        : value.dataEndRow,
+                  });
+                }}
+              >
+                {i18n('workspace.importExport.hasHeader')}
+              </Checkbox>
+              <div className={styles.csvOptionField}>
+                <span>{i18n('workspace.importExport.headerRow')}</span>
+                <InputNumber
+                  min={1}
+                  precision={0}
+                  disabled={disabled || !value.hasHeader}
+                  value={value.headerRow}
+                  onChange={(headerRow) => {
+                    if (headerRow === null) return;
+                    const dataStartRow = Math.max(value.dataStartRow, headerRow + 1);
+                    update({
+                      headerRow,
+                      dataStartRow,
+                      dataEndRow:
+                        value.dataEndRow && value.dataEndRow < dataStartRow ? dataStartRow : value.dataEndRow,
+                    });
+                  }}
+                />
+              </div>
+              <label className={styles.csvOptionField}>
+                <span>{i18n('workspace.importExport.dataStartRow')}</span>
+                <InputNumber
+                  min={value.hasHeader ? value.headerRow + 1 : 1}
+                  precision={0}
+                  disabled={disabled}
+                  value={value.dataStartRow}
+                  onChange={(dataStartRow) => {
+                    if (dataStartRow === null) return;
+                    update({
+                      dataStartRow,
+                      dataEndRow:
+                        value.dataEndRow && value.dataEndRow < dataStartRow ? dataStartRow : value.dataEndRow,
+                    });
+                  }}
+                />
+              </label>
+              <label className={styles.csvOptionField}>
+                <span>{i18n('workspace.importExport.dataEndRow')}</span>
+                <InputNumber
+                  min={value.dataStartRow}
+                  precision={0}
+                  disabled={disabled}
+                  placeholder={i18n('workspace.importExport.endOfFile')}
+                  value={value.dataEndRow}
+                  onChange={(dataEndRow) => update({ dataEndRow: dataEndRow === null ? undefined : dataEndRow })}
+                />
+              </label>
+            </div>
+          ),
+        },
+        {
+          key: 'formats',
+          label: i18n('workspace.importExport.dateTimeFormats'),
+          children: (
+            <div className={styles.formatOptions}>
+              <label className={styles.csvOptionField}>
+                <span>{i18n('workspace.importExport.dateOrder')}</span>
+                <Select
+                  disabled={disabled}
+                  value={value.dateOrder}
+                  options={['MDY', 'DMY', 'YMD', 'YDM', 'DYM', 'MYD'].map((order) => ({ value: order, label: order }))}
+                  onChange={(dateOrder) => update({ dateOrder })}
+                />
+              </label>
+              <label className={styles.csvOptionField}>
+                <span>{i18n('workspace.importExport.dateTimeOrder')}</span>
+                <Select
+                  disabled={disabled}
+                  value={value.dateTimeOrder}
+                  options={[
+                    { value: 'DATE_TIME', label: i18n('workspace.importExport.dateFirst') },
+                    { value: 'TIME_DATE', label: i18n('workspace.importExport.timeFirst') },
+                    { value: 'DATE_TIME_TIMEZONE', label: i18n('workspace.importExport.dateTimeTimezone') },
+                    { value: 'TIME_DATE_TIMEZONE', label: i18n('workspace.importExport.timeDateTimezone') },
+                    { value: 'TIME_TIMEZONE_DATE', label: i18n('workspace.importExport.timeTimezoneDate') },
+                  ]}
+                  onChange={(dateTimeOrder) => update({ dateTimeOrder })}
+                />
+              </label>
+              <SingleCharacterSelect
+                {...characterProps}
+                label={i18n('workspace.importExport.dateDelimiter')}
+                value={value.dateDelimiter}
+                options={dateDelimiterOptions()}
+                onChange={(dateDelimiter) => update({ dateDelimiter })}
+              />
+              <SingleCharacterSelect
+                {...characterProps}
+                label={i18n('workspace.importExport.yearDelimiter')}
+                value={value.yearDelimiter}
+                options={dateDelimiterOptions()}
+                onChange={(yearDelimiter) => update({ yearDelimiter })}
+              />
+              <SingleCharacterSelect
+                {...characterProps}
+                label={i18n('workspace.importExport.timeDelimiter')}
+                value={value.timeDelimiter}
+                options={[
+                  { value: ':', label: i18n('workspace.importExport.delimiterColon') },
+                  { value: '.', label: i18n('workspace.importExport.delimiterDot') },
+                ]}
+                onChange={(timeDelimiter) => update({ timeDelimiter })}
+              />
+              <SingleCharacterSelect
+                {...characterProps}
+                allowCustom={false}
+                label={i18n('workspace.importExport.decimalSymbol')}
+                value={value.decimalSymbol}
+                options={[
+                  { value: '.', label: i18n('workspace.importExport.delimiterDot') },
+                  { value: ',', label: i18n('workspace.importExport.delimiterComma') },
+                ]}
+                onChange={(decimalSymbol) => update({ decimalSymbol })}
+              />
+              <div className={styles.dateExamples}>
+                <span>{i18n('workspace.importExport.dateTimeExample')}</span>
+                {getCsvDateTimeExamples(value).map((example) => (
+                  <code key={example}>{example}</code>
+                ))}
+              </div>
+            </div>
+          ),
+        },
+        ...(dataItems || []),
+      ]}
+    />
+  );
+};
+
+const dateDelimiterOptions = () => [
+  { value: '-', label: i18n('workspace.importExport.delimiterDash') },
+  { value: '/', label: i18n('workspace.importExport.delimiterSlash') },
+  { value: '.', label: i18n('workspace.importExport.delimiterDot') },
+];
+
+export default CsvOptionsSections;
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/ImportDataSections.tsx b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/ImportDataSections.tsx
new file mode 100644
index 0000000000..f090024ada
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/ImportDataSections.tsx
@@ -0,0 +1,184 @@
+import { Checkbox, Select, Table, Tooltip, type CollapseProps } from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import { TriangleAlert } from 'lucide-react';
+import { ImportUnmappedTarget, SKIP_IMPORT_SOURCE_FIELD } from '@/constants/importExport';
+import i18n from '@/i18n';
+import type { IImportPreview } from '@/service/sql';
+import type { ICsvOptions } from '@/typings/importExport';
+import { buildImportMappingRows, type IDuplicateImportMapping, type ImportMappingRow } from './mapping';
+import { useStyles } from './style';
+
+interface Props {
+  preview: IImportPreview | null;
+  mapping: Record<string, string>;
+  duplicateMappings: Record<string, IDuplicateImportMapping>;
+  blockedColumnNames: Set<string>;
+  unmappedTarget: ImportUnmappedTarget;
+  csvOptions: ICsvOptions;
+  isCsv: boolean;
+  loading: boolean;
+  onMappingChange: (sourceColumn: string, targetColumn: string) => void;
+  onUnmappedTargetChange: (value: ImportUnmappedTarget) => void;
+  onCsvOptionsChange: (value: ICsvOptions) => void;
+}
+
+const useImportDataSections = (props: Props): CollapseProps['items'] => {
+  const { styles, cx } = useStyles();
+  const {
+    preview,
+    mapping,
+    duplicateMappings,
+    blockedColumnNames,
+    unmappedTarget,
+    csvOptions,
+    isCsv,
+    loading,
+    onMappingChange,
+    onUnmappedTargetChange,
+    onCsvOptionsChange,
+  } = props;
+  if (!preview) {
+    return [];
+  }
+  const targetOptions = [
+    { value: SKIP_IMPORT_SOURCE_FIELD, label: i18n('workspace.importExport.skipSourceField') },
+    ...preview.targetColumns.map((column) => ({
+      value: column.name,
+      label: `${column.name} (${column.dataType}${column.nullable ? '' : ', NOT NULL'})${
+        column.comment ? ` - ${column.comment}` : ''
+      }`,
+    })),
+  ];
+  const mappingRows = buildImportMappingRows(preview.sourceColumns, preview.targetColumns, mapping);
+  const columns: ColumnsType<ImportMappingRow<IImportPreview['targetColumns'][number]>> = [
+    {
+      title: i18n('workspace.importExport.sourceField'),
+      width: '28%',
+      render: (_, record) =>
+        record.kind === 'source' ? (
+          record.sourceColumn
+        ) : (
+          <span className={styles.unmappedSource}>{i18n('workspace.importExport.unmapped')}</span>
+        ),
+    },
+    {
+      title: i18n('workspace.importExport.targetColumn'),
+      width: '52%',
+      render: (_, record) => {
+        if (record.kind === 'target') {
+          return targetOptions.find(({ value }) => value === record.targetColumn.name)?.label;
+        }
+        const duplicate = duplicateMappings[record.sourceColumn];
+        const warning = duplicate
+          ? i18n('workspace.importExport.duplicateMappingContent', duplicate.targetColumn, duplicate.mappedSource)
+          : undefined;
+        return (
+          <div className={styles.targetColumnCell}>
+            {warning && (
+              <span className={styles.mappingWarningSlot}>
+                <Tooltip title={warning}>
+                  <span className={styles.mappingWarningIcon} role="img" aria-label={warning}>
+                    <TriangleAlert size={16} />
+                  </span>
+                </Tooltip>
+              </span>
+            )}
+            <Select
+              className={cx(styles.targetColumnSelect, warning && styles.targetColumnSelectWarning)}
+              value={mapping[record.sourceColumn]}
+              options={targetOptions}
+              onChange={(value) => onMappingChange(record.sourceColumn, value)}
+            />
+          </div>
+        );
+      },
+    },
+    {
+      title: i18n('workspace.importExport.mappingStatus'),
+      width: '20%',
+      render: (_, record) => {
+        if (record.kind === 'source') {
+          return mapping[record.sourceColumn] === SKIP_IMPORT_SOURCE_FIELD
+            ? i18n('workspace.importExport.skipped')
+            : i18n('workspace.importExport.mapped');
+        }
+        if (blockedColumnNames.has(record.targetColumn.name)) {
+          return <span className={styles.requiredStatus}>{i18n('workspace.importExport.unmappedRequired')}</span>;
+        }
+        if (record.targetColumn.autoIncrement) {
+          return i18n('workspace.importExport.unmappedAutoIncrement');
+        }
+        return unmappedTarget === ImportUnmappedTarget.NULL
+          ? i18n('workspace.importExport.unmappedNullValue')
+          : i18n('workspace.importExport.unmappedDefaultValue');
+      },
+    },
+  ];
+  const previewColumns: ColumnsType<{ key: number; values: string[] }> = preview.sourceColumns.map(
+    (column, index) => ({
+      title: column,
+      width: 180,
+      ellipsis: true,
+      render: (_, record) => record.values[index],
+    }),
+  );
+  const previewData = preview.previewData.map((values, index) => ({ key: index, values }));
+
+  return [
+    {
+      key: 'mapping',
+      label: i18n('workspace.importExport.fieldMapping'),
+      children: (
+        <>
+          <div className={styles.mappingControls}>
+            {isCsv && (
+              <Checkbox
+                checked={csvOptions.emptyAsNull}
+                onChange={(event) => onCsvOptionsChange({ ...csvOptions, emptyAsNull: event.target.checked })}
+              >
+                {i18n('workspace.importExport.emptyAsNull')}
+              </Checkbox>
+            )}
+            <Select
+              className={styles.unmappedTargetSelect}
+              value={unmappedTarget}
+              onChange={onUnmappedTargetChange}
+              options={[
+                { value: ImportUnmappedTarget.DEFAULT, label: i18n('workspace.importExport.unmappedDefault') },
+                { value: ImportUnmappedTarget.NULL, label: i18n('workspace.importExport.unmappedNull') },
+              ]}
+            />
+          </div>
+          <Table
+            className={cx(styles.mappingTable, styles.scrollableTable)}
+            size="small"
+            rowKey="key"
+            columns={columns}
+            dataSource={mappingRows}
+            loading={loading}
+            pagination={false}
+            tableLayout="fixed"
+            scroll={{ y: 220 }}
+          />
+        </>
+      ),
+    },
+    {
+      key: 'preview',
+      label: i18n('workspace.importExport.dataPreview', preview.previewLimit),
+      children: (
+        <Table
+          className={styles.scrollableTable}
+          size="small"
+          rowKey="key"
+          columns={previewColumns}
+          dataSource={previewData}
+          pagination={false}
+          scroll={{ x: 'max-content', y: 190 }}
+        />
+      ),
+    },
+  ] satisfies CollapseProps['items'];
+};
+
+export default useImportDataSections;
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/fileStaging.test.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/fileStaging.test.ts
new file mode 100644
index 0000000000..ef546830cf
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/fileStaging.test.ts
@@ -0,0 +1,38 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { stageSelectedImportFile } from './fileStaging';
+
+test('stages browser files through multipart upload', async () => {
+  const browserFile = { name: 'users.csv' } as File;
+  const fileId = await stageSelectedImportFile(
+    { file: browserFile, fileName: browserFile.name },
+    async ({ file }) => {
+      assert.equal(file, browserFile);
+      return 'browser-file-id';
+    },
+    async () => {
+      throw new Error('desktop staging must not be used');
+    },
+  );
+
+  assert.equal(fileId, 'browser-file-id');
+});
+
+test('stages desktop paths through the JCEF-only endpoint', async () => {
+  const fileId = await stageSelectedImportFile(
+    { filePath: '/tmp/users.xlsx', fileName: 'users.xlsx' },
+    async () => {
+      throw new Error('browser upload must not be used');
+    },
+    async (request) => {
+      assert.deepEqual(request, { sourceFile: '/tmp/users.xlsx', originalFileName: 'users.xlsx' });
+      return 'desktop-file-id';
+    },
+  );
+
+  assert.equal(fileId, 'desktop-file-id');
+});
+
+test('rejects incomplete selections', async () => {
+  await assert.rejects(() => stageSelectedImportFile({}, async () => '', async () => ''));
+});
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/fileStaging.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/fileStaging.ts
new file mode 100644
index 0000000000..6bebe064ce
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/fileStaging.ts
@@ -0,0 +1,18 @@
+import type { FileUrl } from '@/components/UploadLocalFile';
+
+type UploadBrowserFile = (params: { file: File }) => Promise<string>;
+type StageDesktopFile = (params: { sourceFile: string; originalFileName: string }) => Promise<string>;
+
+export const stageSelectedImportFile = (
+  selection: FileUrl,
+  uploadBrowserFile: UploadBrowserFile,
+  stageDesktopFile: StageDesktopFile,
+): Promise<string> => {
+  if (selection.file) {
+    return uploadBrowserFile({ file: selection.file });
+  }
+  if (selection.filePath && selection.fileName) {
+    return stageDesktopFile({ sourceFile: selection.filePath, originalFileName: selection.fileName });
+  }
+  return Promise.reject(new Error('Import file selection is incomplete'));
+};
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/index.tsx b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/index.tsx
new file mode 100644
index 0000000000..42537405a9
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/index.tsx
@@ -0,0 +1,292 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { Button, Collapse, Modal, Spin } from 'antd';
+import { TriangleAlert } from 'lucide-react';
+import {
+  ImportExportFileType,
+  ImportPreviewErrorCode,
+  ImportUnmappedTarget,
+  SKIP_IMPORT_SOURCE_FIELD,
+} from '@/constants/importExport';
+import i18n from '@/i18n';
+import sqlService, { IImportPreview } from '@/service/sql';
+import type { ICsvOptions } from '@/typings/importExport';
+import {
+  buildInitialImportMapping,
+  getDuplicateImportMappings,
+  getImportPreviewErrorMessage,
+} from './mapping';
+import { useStyles } from './style';
+import type { FileUrl } from '@/components/UploadLocalFile';
+import { stageSelectedImportFile } from './fileStaging';
+import CsvOptionsSections from './CsvOptionsSections';
+import useImportDataSections from './ImportDataSections';
+import {
+  buildCsvOptionsForTaskSubmit,
+  DEFAULT_CSV_OPTIONS,
+  inferImportFileFormat,
+} from '../../utils/csvOptions';
+
+interface IProps {
+  dataSourceId: number;
+  databaseName: string;
+  schemaName?: string;
+  tableName: string;
+  file: FileUrl;
+  onSubmitted: (taskId: number) => void;
+}
+
+/**
+ * Database-independent import preview and column mapping. Loads a bounded preview of the
+ * file, lets the user remap source fields to target columns (or skip them), chooses how
+ * unmapped target columns are filled (DEFAULT or NULL), executes the import, and reports
+ * task progress. Preview and execution share the backend parser.
+ */
+const ImportMappingContent = ({ dataSourceId, databaseName, schemaName, tableName, file, onSubmitted }: IProps) => {
+  const { styles } = useStyles();
+  const [modal, modalContextHolder] = Modal.useModal();
+  const [preview, setPreview] = useState<IImportPreview | null>(null);
+  const [fileId, setFileId] = useState<string>();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [mapping, setMapping] = useState<Record<string, string>>({});
+  const [unmappedTarget, setUnmappedTarget] = useState(ImportUnmappedTarget.DEFAULT);
+  const [executing, setExecuting] = useState(false);
+  const [activeSections, setActiveSections] = useState<string[]>(['mapping', 'preview']);
+  const [csvOptions, setCsvOptions] = useState<ICsvOptions>(DEFAULT_CSV_OPTIONS);
+  const selectedFileName = file.fileName || file.file?.name || file.filePath || '';
+  const isCsv = inferImportFileFormat(selectedFileName) === ImportExportFileType.CSV;
+  const currentPreviewKey = JSON.stringify({
+    dataSourceId,
+    databaseName,
+    schemaName,
+    tableName,
+    fileId,
+    csvOptions: isCsv ? csvOptions : undefined,
+  });
+  const [loadedPreviewKey, setLoadedPreviewKey] = useState<string>();
+  const resolveErrorMessage = useCallback(
+    (requestError: unknown) =>
+      getImportPreviewErrorMessage(requestError, i18n('common.text.failure'), {
+        [ImportPreviewErrorCode.DUPLICATE_SOURCE_COLUMNS]: i18n('workspace.importExport.duplicateSourceColumns'),
+        [ImportPreviewErrorCode.INVALID_CSV_OPTIONS]: i18n('workspace.importExport.invalidCsvOptions'),
+      }),
+    [],
+  );
+
+  useEffect(() => {
+    let active = true;
+    setFileId(undefined);
+    setLoading(true);
+    setError(null);
+    stageSelectedImportFile(file, sqlService.uploadImportFile, sqlService.stageDesktopImportFile)
+      .then((id) => {
+        if (active) {
+          setFileId(id);
+        }
+      })
+      .catch((e) => {
+        if (active) {
+          setError(resolveErrorMessage(e));
+          setLoading(false);
+        }
+      });
+    return () => {
+      active = false;
+    };
+  }, [file, resolveErrorMessage]);
+
+  useEffect(() => {
+    if (!fileId) {
+      return;
+    }
+    let active = true;
+    let validatedCsvOptions: ICsvOptions | undefined;
+    try {
+      validatedCsvOptions = buildCsvOptionsForTaskSubmit(isCsv, csvOptions);
+    } catch (e) {
+      setPreview(null);
+      setLoadedPreviewKey(undefined);
+      setMapping({});
+      setError(resolveErrorMessage(e));
+      setLoading(false);
+      return;
+    }
+    setLoading(true);
+    setError(null);
+    sqlService
+      .getImportPreview({
+        dataSourceId,
+        databaseName,
+        schemaName,
+        tableName,
+        fileId,
+        csvOptions: validatedCsvOptions,
+      })
+      .then((data) => {
+        if (!active) {
+          return;
+        }
+        setPreview(data);
+        setLoadedPreviewKey(currentPreviewKey);
+        setMapping(buildInitialImportMapping(data.sourceColumns, data.suggestedMapping));
+      })
+      .catch((e) => {
+        if (active) {
+          setPreview(null);
+          setLoadedPreviewKey(undefined);
+          setMapping({});
+          setError(resolveErrorMessage(e));
+        }
+      })
+      .finally(() => active && setLoading(false));
+    return () => {
+      active = false;
+    };
+  }, [
+    currentPreviewKey,
+    csvOptions,
+    dataSourceId,
+    databaseName,
+    fileId,
+    isCsv,
+    resolveErrorMessage,
+    schemaName,
+    tableName,
+  ]);
+
+  const blockedColumns = useMemo(() => {
+    if (!preview) return [];
+    return preview.targetColumns.filter(
+      (column) =>
+        !column.nullable &&
+        !column.autoIncrement &&
+        !Object.values(mapping).includes(column.name) &&
+        (unmappedTarget === ImportUnmappedTarget.NULL ||
+          (column.defaultValue === null && unmappedTarget === ImportUnmappedTarget.DEFAULT)),
+    );
+  }, [preview, mapping, unmappedTarget]);
+  const duplicateMappings = getDuplicateImportMappings(mapping);
+  const dataSectionItems = useImportDataSections({
+    preview,
+    mapping,
+    duplicateMappings,
+    blockedColumnNames: new Set(blockedColumns.map(({ name }) => name)),
+    unmappedTarget,
+    csvOptions,
+    isCsv,
+    loading,
+    onMappingChange: (sourceColumn, targetColumn) =>
+      setMapping((current) => ({ ...current, [sourceColumn]: targetColumn })),
+    onUnmappedTargetChange: setUnmappedTarget,
+    onCsvOptionsChange: setCsvOptions,
+  });
+
+  const execute = () => {
+    const duplicateMapping = Object.values(duplicateMappings)[0];
+    if (duplicateMapping) {
+      modal.error({
+        title: i18n('workspace.importExport.duplicateMappingTitle'),
+        content: i18n(
+          'workspace.importExport.duplicateMappingContent',
+          duplicateMapping.targetColumn,
+          duplicateMapping.mappedSource,
+        ),
+      });
+      return;
+    }
+    if (blockedColumns.length > 0) {
+      modal.error({
+        title: i18n('workspace.importExport.requiredUnmapped'),
+        content: blockedColumns.map((c) => `${c.name} (${c.dataType})`).join(', '),
+      });
+      return;
+    }
+    setExecuting(true);
+    setError(null);
+    if (!fileId) {
+      setExecuting(false);
+      return;
+    }
+    let taskCsvOptions: ICsvOptions | undefined;
+    try {
+      taskCsvOptions = buildCsvOptionsForTaskSubmit(isCsv, csvOptions);
+    } catch (e) {
+      setExecuting(false);
+      setError(resolveErrorMessage(e));
+      return;
+    }
+    sqlService
+      .executeImportWithMapping({
+        dataSourceId,
+        databaseName,
+        schemaName,
+        tableName,
+        fileId,
+        mappings: Object.entries(mapping)
+          .filter(([, target]) => target && target !== SKIP_IMPORT_SOURCE_FIELD)
+          .map(([source, target]) => ({ sourceColumn: source, targetColumn: target })),
+        unmappedTarget,
+        csvOptions: taskCsvOptions,
+      })
+      .then((result) => onSubmitted(result.taskId))
+      .catch((e) => setError(resolveErrorMessage(e)))
+      .finally(() => setExecuting(false));
+  };
+
+  return (
+    <div className={styles.container}>
+      {modalContextHolder}
+      <div className={styles.scrollContent}>
+        {error && preview && <div className={styles.error}>{error}</div>}
+        {isCsv && (
+          <div className={styles.csvOptions}>
+            <CsvOptionsSections
+              value={csvOptions}
+              activeKeys={activeSections}
+              disabled={executing}
+              dataItems={dataSectionItems}
+              onChange={setCsvOptions}
+              onActiveKeysChange={setActiveSections}
+            />
+          </div>
+        )}
+        {!preview && (
+          <div className={styles.previewState} role={error ? undefined : 'status'}>
+            {error ? (
+              <div className={styles.previewError} role="alert">
+                <TriangleAlert size={24} />
+                <span>{error}</span>
+              </div>
+            ) : (
+              <Spin />
+            )}
+          </div>
+        )}
+        {!isCsv && preview && (
+          <Collapse
+            className={styles.sections}
+            ghost
+            size="small"
+            activeKey={activeSections}
+            onChange={(keys) => setActiveSections(Array.isArray(keys) ? keys : [keys])}
+            items={dataSectionItems}
+          />
+        )}
+      </div>
+      {preview && (
+        <div className={styles.actions}>
+          <Button
+            type="primary"
+            loading={executing}
+            disabled={loading || !fileId || loadedPreviewKey !== currentPreviewKey}
+            onClick={execute}
+          >
+            {i18n('common.button.execute')}
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default ImportMappingContent;
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/mapping.test.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/mapping.test.ts
new file mode 100644
index 0000000000..986b611368
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/mapping.test.ts
@@ -0,0 +1,61 @@
+import assert from 'node:assert/strict';
+import { ImportPreviewErrorCode, SKIP_IMPORT_SOURCE_FIELD } from '@/constants/importExport';
+import {
+  buildImportMappingRows,
+  buildInitialImportMapping,
+  getDuplicateImportMappings,
+  getImportPreviewErrorMessage,
+} from './mapping';
+
+const mapping = buildInitialImportMapping(
+  ['name', 'email', 'extra_column'],
+  [
+    { sourceColumn: 'name', targetColumn: 'name' },
+    { sourceColumn: 'email', targetColumn: 'email' },
+  ],
+);
+
+assert.deepEqual(mapping, {
+  name: 'name',
+  email: 'email',
+  extra_column: SKIP_IMPORT_SOURCE_FIELD,
+});
+
+assert.deepEqual(
+  buildImportMappingRows(['name', 'extra_column'], [{ name: 'id' }, { name: 'name' }, { name: 'note' }], {
+    name: 'name',
+    extra_column: SKIP_IMPORT_SOURCE_FIELD,
+  }),
+  [
+    { key: 'source:name', kind: 'source', sourceColumn: 'name' },
+    { key: 'source:extra_column', kind: 'source', sourceColumn: 'extra_column' },
+    { key: 'target:id', kind: 'target', targetColumn: { name: 'id' } },
+    { key: 'target:note', kind: 'target', targetColumn: { name: 'note' } },
+  ],
+);
+
+assert.deepEqual(getDuplicateImportMappings({ ...mapping, extra_column: 'email' }), {
+  extra_column: {
+    sourceColumn: 'extra_column',
+    targetColumn: 'email',
+    mappedSource: 'email',
+  },
+});
+assert.deepEqual(getDuplicateImportMappings(mapping), {});
+assert.equal(
+  getImportPreviewErrorMessage({ errorMessage: 'Duplicate source column: name' }, 'Failed'),
+  'Duplicate source column: name',
+);
+assert.equal(getImportPreviewErrorMessage(new Error('Network unavailable'), 'Failed'), 'Network unavailable');
+assert.equal(getImportPreviewErrorMessage({ errorCode: 'SYSTEM_ERROR' }, 'Failed'), 'Failed');
+assert.equal(
+  getImportPreviewErrorMessage(
+    {
+      errorCode: ImportPreviewErrorCode.DUPLICATE_SOURCE_COLUMNS,
+      errorMessage: 'import.preview.duplicateSourceColumns : no message.',
+    },
+    'Failed',
+    { [ImportPreviewErrorCode.DUPLICATE_SOURCE_COLUMNS]: 'The import file contains duplicate source fields' },
+  ),
+  'The import file contains duplicate source fields',
+);
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/mapping.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/mapping.ts
new file mode 100644
index 0000000000..5d3593c728
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/mapping.ts
@@ -0,0 +1,97 @@
+import { SKIP_IMPORT_SOURCE_FIELD } from '@/constants/importExport';
+
+interface ISuggestedMapping {
+  sourceColumn: string;
+  targetColumn: string;
+}
+
+export type ImportMappingRow<TTargetColumn extends { name: string }> =
+  | {
+      key: string;
+      kind: 'source';
+      sourceColumn: string;
+    }
+  | {
+      key: string;
+      kind: 'target';
+      targetColumn: TTargetColumn;
+    };
+
+export interface IDuplicateImportMapping {
+  sourceColumn: string;
+  targetColumn: string;
+  mappedSource: string;
+}
+
+export const getImportPreviewErrorMessage = (
+  error: unknown,
+  fallback: string,
+  messagesByCode: Record<string, string> = {},
+): string => {
+  if (typeof error === 'string' && error) {
+    return error;
+  }
+  if (!error || typeof error !== 'object') {
+    return fallback;
+  }
+  const value = error as { errorCode?: unknown; errorMessage?: unknown; message?: unknown };
+  if (typeof value.errorMessage === 'string' && value.errorMessage && !value.errorMessage.endsWith(' : no message.')) {
+    return value.errorMessage;
+  }
+  if (typeof value.errorCode === 'string' && messagesByCode[value.errorCode]) {
+    return messagesByCode[value.errorCode];
+  }
+  return typeof value.message === 'string' && value.message ? value.message : fallback;
+};
+
+export const buildInitialImportMapping = (
+  sourceColumns: string[],
+  suggestedMapping: ISuggestedMapping[],
+): Record<string, string> => {
+  const mapping = Object.fromEntries(sourceColumns.map((name) => [name, SKIP_IMPORT_SOURCE_FIELD]));
+  suggestedMapping.forEach(({ sourceColumn, targetColumn }) => {
+    mapping[sourceColumn] = targetColumn;
+  });
+  return mapping;
+};
+
+export const buildImportMappingRows = <TTargetColumn extends { name: string }>(
+  sourceColumns: string[],
+  targetColumns: TTargetColumn[],
+  mapping: Record<string, string>,
+): ImportMappingRow<TTargetColumn>[] => {
+  const mappedTargetColumns = new Set(Object.values(mapping));
+  return [
+    ...sourceColumns.map((name) => ({
+      key: `source:${name}`,
+      kind: 'source' as const,
+      sourceColumn: name,
+    })),
+    ...targetColumns
+      .filter(({ name }) => !mappedTargetColumns.has(name))
+      .map((targetColumn) => ({
+        key: `target:${targetColumn.name}`,
+        kind: 'target' as const,
+        targetColumn,
+      })),
+  ];
+};
+
+export const getDuplicateImportMappings = (
+  mapping: Record<string, string>,
+): Record<string, IDuplicateImportMapping> => {
+  const firstSourceByTarget = new Map<string, string>();
+  const duplicates: Record<string, IDuplicateImportMapping> = {};
+  Object.entries(mapping).forEach(([sourceColumn, targetColumn]) => {
+    if (targetColumn === SKIP_IMPORT_SOURCE_FIELD) {
+      return;
+    }
+    const mappedSource = firstSourceByTarget.get(targetColumn);
+    if (mappedSource) {
+      duplicates[sourceColumn] = { sourceColumn, targetColumn, mappedSource };
+      return;
+    }
+    firstSourceByTarget.set(targetColumn, sourceColumn);
+  });
+  return duplicates;
+};
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/style.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/style.ts
new file mode 100644
index 0000000000..b52bcdc88d
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/ImportMappingContent/style.ts
@@ -0,0 +1,238 @@
+import { createStyles } from 'antd-style';
+
+export const useStyles = createStyles(({ css, token }) => ({
+  container: css`
+    display: flex;
+    max-height: min(82vh, calc(100vh - 116px));
+    max-height: min(82dvh, calc(100dvh - 116px));
+    min-width: 0;
+    flex-direction: column;
+  `,
+  scrollContent: css`
+    min-height: 0;
+    overflow-y: auto;
+    padding-right: 4px;
+
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      border-radius: 999px;
+      background-color: transparent;
+    }
+
+    &:hover::-webkit-scrollbar-thumb {
+      background-color: ${token.colorFill};
+    }
+  `,
+  error: css`
+    margin-bottom: 8px;
+    color: ${token.colorError};
+  `,
+  previewState: css`
+    display: flex;
+    min-height: min(430px, 50vh);
+    min-height: min(430px, 50dvh);
+    align-items: center;
+    justify-content: center;
+  `,
+  previewError: css`
+    display: flex;
+    max-width: calc(100% - 32px);
+    flex-direction: column;
+    align-items: center;
+    gap: 10px;
+    color: ${token.colorError};
+    line-height: 1.6;
+    text-align: center;
+    white-space: nowrap;
+
+    @media (max-width: 720px) {
+      white-space: normal;
+    }
+  `,
+  csvOptions: css`
+    margin-bottom: 12px;
+  `,
+  csvOptionField: css`
+    display: flex;
+    min-width: 0;
+    flex-direction: column;
+    gap: 4px;
+
+    > span:first-child {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      color: ${token.colorTextSecondary};
+      font-size: 12px;
+      white-space: nowrap;
+    }
+  `,
+  fullWidthControl: css`
+    width: 100%;
+  `,
+  customCharacterInput: css`
+    padding: 4px 8px;
+  `,
+  sections: css`
+    padding-top: 4px;
+
+    .ant-collapse-header {
+      min-height: 40px;
+      align-items: center !important;
+      padding: 6px 0 !important;
+      font-weight: 600;
+    }
+
+    .ant-collapse-content-box {
+      padding: 4px 0 10px !important;
+    }
+  `,
+  csvFormatOptions: css`
+    display: grid;
+    grid-template-columns: 130px 150px 160px 170px;
+    gap: 8px;
+
+    @media (max-width: 900px) {
+      grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+  `,
+  sourceRowOptions: css`
+    display: grid;
+    grid-template-columns: repeat(3, minmax(0, 160px));
+    gap: 8px;
+
+    .ant-input-number {
+      width: 100%;
+    }
+  `,
+  sourceRowHasHeader: css`
+    grid-column: 1 / -1;
+    width: fit-content;
+    font-size: 12px;
+  `,
+  formatOptions: css`
+    display: grid;
+    grid-template-columns: 1fr 1.15fr 1fr 1.3fr 1fr 1fr;
+    gap: 8px;
+
+    @media (max-width: 900px) {
+      grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+  `,
+  dateExamples: css`
+    display: grid;
+    grid-column: 1 / -1;
+    grid-template-columns: 1fr repeat(4, auto);
+    gap: 18px;
+    align-items: center;
+    color: ${token.colorTextSecondary};
+    font-size: 12px;
+
+    code {
+      color: ${token.colorText};
+      font-family: inherit;
+      white-space: nowrap;
+    }
+
+    code:not(:first-of-type) {
+      padding-left: 18px;
+      border-left: 1px solid ${token.colorBorderSecondary};
+    }
+
+    @media (max-width: 900px) {
+      grid-template-columns: 1fr 1fr;
+
+      > span:first-child {
+        grid-column: 1 / -1;
+      }
+
+      code:not(:first-of-type) {
+        padding-left: 0;
+        border-left: 0;
+      }
+    }
+  `,
+  sectionTitle: css`
+    grid-column: 1 / -1;
+    font-size: 14px;
+  `,
+  mappingControls: css`
+    display: flex;
+    gap: 12px;
+    align-items: center;
+    justify-content: flex-end;
+    margin-bottom: 8px;
+
+    .ant-checkbox-wrapper {
+      white-space: nowrap;
+    }
+  `,
+  unmappedTargetSelect: css`
+    width: 220px;
+  `,
+  unmappedSource: css`
+    color: ${token.colorTextSecondary};
+  `,
+  requiredStatus: css`
+    color: ${token.colorError};
+  `,
+  targetColumnCell: css`
+    position: relative;
+  `,
+  mappingWarningSlot: css`
+    position: absolute;
+    z-index: 1;
+    top: 50%;
+    left: 10px;
+    display: flex;
+    width: 16px;
+    height: 16px;
+    transform: translateY(-50%);
+  `,
+  mappingWarningIcon: css`
+    display: flex;
+    color: ${token.colorWarning};
+    cursor: help;
+  `,
+  targetColumnSelect: css`
+    width: 100%;
+  `,
+  targetColumnSelectWarning: css`
+    .ant-select-selector {
+      padding-left: 34px !important;
+    }
+  `,
+  mappingTable: css`
+    .ant-table-tbody > tr > td {
+      border-bottom: 0;
+    }
+  `,
+  scrollableTable: css`
+    .ant-table-ping-left:not(.ant-table-has-fix-left) .ant-table-container::before,
+    .ant-table-ping-right:not(.ant-table-has-fix-right) .ant-table-container::after {
+      box-shadow: none;
+    }
+
+    .ant-table-body {
+      overflow-y: auto !important;
+      -ms-overflow-style: none;
+      scrollbar-width: none;
+
+      &::-webkit-scrollbar {
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  `,
+  actions: css`
+    z-index: 2;
+    flex: none;
+    padding-top: 6px;
+    background: ${token.colorBgElevated};
+    text-align: right;
+  `,
+}));
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/Log/eventMessage.test.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/Log/eventMessage.test.ts
new file mode 100644
index 0000000000..3fa5970bdd
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/Log/eventMessage.test.ts
@@ -0,0 +1,48 @@
+import assert from 'node:assert/strict';
+import { formatTaskEventMessage, type TaskEventMessageKey } from './eventMessage';
+import type { ImportExportTaskEvent } from '@/typings/importExport';
+
+const event = (code: string, message: string): ImportExportTaskEvent => ({
+  eventId: 1,
+  taskId: 1,
+  sequence: 1,
+  level: 'INFO',
+  code,
+  message,
+  createdAt: 1,
+});
+
+const translations: Record<'zh' | 'en', Partial<Record<TaskEventMessageKey, string>>> = {
+  zh: {
+    'workspace.task.event.taskCreated': '任务已创建',
+    'workspace.task.event.importPreparing': '正在准备导入数据',
+    'workspace.task.event.batchExecuted': '已执行批量导入：{1} 条',
+  },
+  en: {
+    'workspace.task.event.taskCreated': 'Task created',
+    'workspace.task.event.batchExecuted': 'Imported batch: {1} rows',
+  },
+};
+
+const translate = (language: keyof typeof translations) =>
+  (key: TaskEventMessageKey, ...args: Array<string | number>) =>
+    args.reduce(
+      (message, value, index) => message.replace(`{${index + 1}}`, String(value)),
+      translations[language][key] || key,
+    );
+
+const created = event('TASK_CREATED', 'Task created');
+assert.equal(formatTaskEventMessage(created, translate('zh')), '任务已创建');
+assert.equal(formatTaskEventMessage(created, translate('en')), 'Task created');
+assert.equal(
+  formatTaskEventMessage(event('IMPORT_PREPARING', 'Preparing data import'), translate('zh')),
+  '正在准备导入数据',
+);
+assert.equal(
+  formatTaskEventMessage(event('BATCH_EXECUTED', 'Executing batch insert: 120'), translate('zh')),
+  '已执行批量导入：120 条',
+);
+assert.equal(
+  formatTaskEventMessage(event('TASK_FAILED', 'CSV 存在从第 123 行开始未闭合的引号'), translate('en')),
+  'CSV 存在从第 123 行开始未闭合的引号',
+);
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/Log/eventMessage.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/Log/eventMessage.ts
new file mode 100644
index 0000000000..2e350796dc
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/Log/eventMessage.ts
@@ -0,0 +1,55 @@
+import type { ImportExportTaskEvent } from '@/typings/importExport';
+
+const LEGACY_EVENT_TIMESTAMP = /^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}:\d{2}:?\s*/;
+
+const lifecycleMessageKeys = {
+  TASK_CREATED: 'workspace.task.event.taskCreated',
+  TASK_STARTED: 'workspace.task.event.taskStarted',
+  TASK_SUCCEEDED: 'workspace.task.event.taskSucceeded',
+  IMPORT_PREPARING: 'workspace.task.event.importPreparing',
+  TARGET_METADATA_LOADED: 'workspace.task.event.targetMetadataLoaded',
+  IMPORT_COMPLETED: 'workspace.task.event.importCompleted',
+  IMPORT_BATCH_FAILED: 'workspace.task.event.importBatchFailed',
+} as const;
+
+const fixedMessageKeys = {
+  'Reading import file': 'workspace.task.event.fileReadStarted',
+  'Import file read completed': 'workspace.task.event.fileReadCompleted',
+  'Reading SQL import file': 'workspace.task.event.sqlFileReadStarted',
+  'SQL file parsed': 'workspace.task.event.sqlFileParsed',
+  'SQL batch executed': 'workspace.task.event.sqlBatchExecuted',
+  'SQL statement executed': 'workspace.task.event.sqlStatementExecuted',
+} as const;
+
+export type TaskEventMessageKey =
+  | (typeof lifecycleMessageKeys)[keyof typeof lifecycleMessageKeys]
+  | (typeof fixedMessageKeys)[keyof typeof fixedMessageKeys]
+  | 'workspace.task.event.batchExecuted'
+  | 'workspace.task.event.importingRecords';
+
+type Translate = (key: TaskEventMessageKey, ...args: Array<string | number>) => string;
+
+export const formatTaskEventMessage = (event: ImportExportTaskEvent, translate: Translate) => {
+  const message = event.message?.replace(LEGACY_EVENT_TIMESTAMP, '').trim() || '-';
+  const lifecycleKey = lifecycleMessageKeys[event.code as keyof typeof lifecycleMessageKeys];
+  if (lifecycleKey) {
+    return translate(lifecycleKey);
+  }
+
+  const fixedMessageKey = fixedMessageKeys[message as keyof typeof fixedMessageKeys];
+  if (fixedMessageKey) {
+    return translate(fixedMessageKey);
+  }
+
+  const batchSize = /^Executing batch insert: (\d+)$/.exec(message)?.[1];
+  if (batchSize) {
+    return translate('workspace.task.event.batchExecuted', batchSize);
+  }
+
+  const recordCount = /^Importing (\d+) records$/.exec(message)?.[1];
+  if (recordCount) {
+    return translate('workspace.task.event.importingRecords', recordCount);
+  }
+
+  return message;
+};
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/Log/index.tsx b/chat2db-community-client/src/blocks/ImportAndExport/components/Log/index.tsx
index e1c6d1e84c..90a0fff767 100644
--- a/chat2db-community-client/src/blocks/ImportAndExport/components/Log/index.tsx
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/Log/index.tsx
@@ -11,7 +11,7 @@ import {
 import { useSize } from 'ahooks';
 import VirtualList, { type ListRef } from 'rc-virtual-list';
 import { useStyles } from './style';
-import { Spin } from 'antd';
+import { Progress, Spin } from 'antd';
 import importExportServices from '@/service/importExport';
 import { ImportExportTaskDetails, ImportExportTaskEvent } from '@/typings/importExport';
 import { ACTIVE_TASK_STATUSES, ImportExportTaskStatus } from '@/constants/importExport';
@@ -23,6 +23,7 @@ import {
   TASK_EVENT_PAGE_SIZE,
 } from '@/store/importExport/taskCenterUtils';
 import { ConsoleOutputEmpty, ConsoleOutputMessageLine } from '@/components/ConsoleOutput';
+import { formatTaskEventMessage } from './eventMessage';
 
 interface IProps {
   className?: string;
@@ -30,10 +31,6 @@ interface IProps {
   onTaskChange?: (taskDetails: ImportExportTaskDetails) => void;
 }
 
-const LEGACY_EVENT_TIMESTAMP = /^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}:\d{2}:?\s*/;
-
-const formatEventMessage = (message?: string) => message?.replace(LEGACY_EVENT_TIMESTAMP, '').trim() || '-';
-
 interface ScrollRestore {
   anchorSequence: number;
   scrollTop: number;
@@ -274,7 +271,18 @@ const Log = (props: IProps) => {
         ]
       : [];
   const visibleEvents = events.length ? events : fallbackErrorEvent;
-
+  const progress =
+    taskDetails.status === ImportExportTaskStatus.SUCCESS
+      ? 100
+      : Math.min(100, Math.max(0, Number(taskDetails.progress) || 0));
+  const progressStatus =
+    taskDetails.status === ImportExportTaskStatus.SUCCESS
+      ? 'success'
+      : taskDetails.status === ImportExportTaskStatus.FAILED
+      ? 'exception'
+      : taskDetails.status === ImportExportTaskStatus.RUNNING
+      ? 'active'
+      : 'normal';
   return (
     <div className={styles.log}>
       {loadingOlder && (
@@ -301,7 +309,7 @@ const Log = (props: IProps) => {
                   className={styles.virtualListItem}
                   timestamp={event.createdAt}
                   level={event.level}
-                  message={formatEventMessage(event.message)}
+                  message={formatTaskEventMessage(event, i18n)}
                 />
               )}
             </VirtualList>
@@ -317,6 +325,20 @@ const Log = (props: IProps) => {
           <div className={styles.loadFailed}>{i18n('workspace.task.events.loadFailed')}</div>
         )}
       </div>
+      <div className={styles.progressPanel}>
+        <div className={styles.progressHeader}>
+          <Progress
+            className={styles.progressBar}
+            percent={progress}
+            showInfo={false}
+            size="small"
+            status={progressStatus}
+          />
+          <span className={styles.progressValue} data-status={taskDetails.status}>
+            {progress}%
+          </span>
+        </div>
+      </div>
     </div>
   );
 };
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/Log/style.ts b/chat2db-community-client/src/blocks/ImportAndExport/components/Log/style.ts
index 44afb08073..fbde474b92 100644
--- a/chat2db-community-client/src/blocks/ImportAndExport/components/Log/style.ts
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/Log/style.ts
@@ -38,6 +38,48 @@ export const useStyles = createStyles(({ css, token }) => {
       font-size: 12px;
       transform: translateX(-50%);
     `,
+    progressPanel: css`
+      flex: none;
+      padding: 8px 16px;
+      border-top: 1px solid ${token.colorBorderSecondary};
+      background: ${token.colorBgElevated};
+    `,
+    progressHeader: css`
+      display: flex;
+      width: 100%;
+      gap: 12px;
+      align-items: center;
+      min-width: 0;
+    `,
+    progressValue: css`
+      flex: none;
+      color: ${token.colorPrimary};
+      font-size: 14px;
+      font-variant-numeric: tabular-nums;
+      font-weight: 600;
+
+      &[data-status='SUCCESS'] {
+        color: ${token.colorSuccess};
+      }
+
+      &[data-status='FAILED'] {
+        color: ${token.colorError};
+      }
+
+      &[data-status='CANCELLED'] {
+        color: ${token.colorTextSecondary};
+      }
+    `,
+    progressBar: css`
+      min-width: 80px;
+      flex: 1;
+      line-height: 1;
+
+      :global(.ant-progress-inner),
+      :global(.ant-progress-bg) {
+        border-radius: 999px;
+      }
+    `,
     eventConsole: css`
       display: flex;
       min-height: 0;
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/components/TaskCenter/index.tsx b/chat2db-community-client/src/blocks/ImportAndExport/components/TaskCenter/index.tsx
index eb2a473253..c8b514efc0 100644
--- a/chat2db-community-client/src/blocks/ImportAndExport/components/TaskCenter/index.tsx
+++ b/chat2db-community-client/src/blocks/ImportAndExport/components/TaskCenter/index.tsx
@@ -1,6 +1,6 @@
 import { memo, type ReactNode, useEffect, useState } from 'react';
 import { useStyles } from './style';
-import { IconButton, Empty, EmptyImage } from '@chat2db/ui';
+import { IconButton, Empty, EmptyImage, staticMessage } from '@chat2db/ui';
 import { Progress, Spin, Tooltip } from 'antd';
 import i18n from '@/i18n';
 import RunSqlModal from '@/blocks/ImportAndExport/components/RunSqlModal';
@@ -144,7 +144,9 @@ export default memo<TaskCenterProps>(({ headerLeading }) => {
           const list = event.currentTarget;
           const distanceToBottom = list.scrollHeight - list.scrollTop - list.clientHeight;
           if (distanceToBottom <= 40 && taskListHasNextPage && !taskListLoadingMore) {
-            void loadMoreTasks();
+            void loadMoreTasks().catch((error: { errorMessage?: string; message?: string }) => {
+              staticMessage.error(error.errorMessage || error.message || i18n('common.text.failure'));
+            });
           }
         }}
       >
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/utils/csvOptions.test.ts b/chat2db-community-client/src/blocks/ImportAndExport/utils/csvOptions.test.ts
new file mode 100644
index 0000000000..f1019f7c0d
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/utils/csvOptions.test.ts
@@ -0,0 +1,58 @@
+import assert from 'node:assert/strict';
+import {
+  buildCsvOptionsForTaskSubmit,
+  csvOptionsToPreviewParam,
+  DEFAULT_CSV_OPTIONS,
+  inferImportFileFormat,
+  getCsvDateTimeExamples,
+  supportsCsvMappingPreview,
+  validateCsvOptions,
+} from './csvOptions';
+import { ImportExportFileType } from '@/constants/importExport';
+
+assert.equal(DEFAULT_CSV_OPTIONS.encoding, 'AUTO');
+
+const options = {
+  ...DEFAULT_CSV_OPTIONS,
+  encoding: 'AUTO',
+  delimiter: '|',
+  quote: '"',
+  escape: '\\',
+  newline: 'CRLF',
+};
+
+assert.deepEqual(buildCsvOptionsForTaskSubmit(true, options), options);
+assert.equal(csvOptionsToPreviewParam(true, options), JSON.stringify(options));
+assert.equal(buildCsvOptionsForTaskSubmit(false, options), undefined);
+assert.equal(csvOptionsToPreviewParam(false, options), undefined);
+assert.equal(inferImportFileFormat('/tmp/orders.csv'), ImportExportFileType.CSV);
+assert.equal(inferImportFileFormat('/tmp/orders.xlsx'), ImportExportFileType.XLSX);
+assert.equal(supportsCsvMappingPreview(ImportExportFileType.CSV), true);
+assert.equal(supportsCsvMappingPreview(ImportExportFileType.XLSX), false);
+assert.equal(supportsCsvMappingPreview(ImportExportFileType.XLS), false);
+assert.equal(supportsCsvMappingPreview(ImportExportFileType.JSON), false);
+assert.equal(supportsCsvMappingPreview(ImportExportFileType.SQL), false);
+assert.equal(validateCsvOptions({ ...options, encoding: 'koi8-r' }).encoding, 'KOI8-R');
+assert.equal(validateCsvOptions({ ...options, delimiter: '^' }).delimiter, '^');
+assert.deepEqual(
+  getCsvDateTimeExamples({
+    ...options,
+    dateOrder: 'DMY',
+    dateTimeOrder: 'DATE_TIME',
+    dateDelimiter: '/',
+    yearDelimiter: '-',
+    timeDelimiter: ':',
+  }),
+  ['24/8-23 15:30:38', '24/8-2023 15:30:38', '24/Aug-23 15:30:38', '24/August-23 15:30:38'],
+);
+
+assert.throws(
+  () => validateCsvOptions({ ...options, delimiter: '"' }),
+  (error: unknown) => (error as { errorCode?: string }).errorCode === 'import.preview.invalidCsvOptions',
+  'delimiter cannot match quote',
+);
+assert.throws(
+  () => validateCsvOptions({ ...options, escape: '\n' }),
+  (error: unknown) => (error as { errorCode?: string }).errorCode === 'import.preview.invalidCsvOptions',
+  'escape cannot be a line break',
+);
diff --git a/chat2db-community-client/src/blocks/ImportAndExport/utils/csvOptions.ts b/chat2db-community-client/src/blocks/ImportAndExport/utils/csvOptions.ts
new file mode 100644
index 0000000000..7f2049176e
--- /dev/null
+++ b/chat2db-community-client/src/blocks/ImportAndExport/utils/csvOptions.ts
@@ -0,0 +1,151 @@
+import type { ICsvOptions } from '@/typings/importExport';
+import { ImportExportFileType, ImportPreviewErrorCode } from '@/constants/importExport';
+
+export const DEFAULT_CSV_OPTIONS: ICsvOptions = {
+  encoding: 'AUTO',
+  delimiter: ',',
+  quote: '"',
+  escape: '"',
+  newline: 'LF',
+  hasHeader: true,
+  emptyAsNull: true,
+  headerRow: 1,
+  dataStartRow: 2,
+  dataEndRow: undefined,
+  dateOrder: 'YMD',
+  dateTimeOrder: 'DATE_TIME',
+  dateDelimiter: '-',
+  yearDelimiter: '-',
+  timeDelimiter: ':',
+  decimalSymbol: '.',
+};
+
+export class CsvOptionsValidationError extends Error {
+  readonly errorCode = ImportPreviewErrorCode.INVALID_CSV_OPTIONS;
+
+  constructor() {
+    super();
+    this.name = 'CsvOptionsValidationError';
+  }
+}
+
+const SUPPORTED_NEWLINES = ['LF', 'CRLF', 'CR'];
+const SUPPORTED_DATE_ORDERS = ['YMD', 'YDM', 'MDY', 'MYD', 'DMY', 'DYM'];
+const SUPPORTED_DATE_TIME_ORDERS = [
+  'DATE_TIME',
+  'TIME_DATE',
+  'DATE_TIME_TIMEZONE',
+  'TIME_DATE_TIMEZONE',
+  'TIME_TIMEZONE_DATE',
+];
+
+export function validateCsvOptions(options: ICsvOptions): ICsvOptions {
+  const normalized: ICsvOptions = {
+    encoding: (options.encoding || DEFAULT_CSV_OPTIONS.encoding).trim().toUpperCase(),
+    delimiter: options.delimiter || DEFAULT_CSV_OPTIONS.delimiter,
+    quote: options.quote || DEFAULT_CSV_OPTIONS.quote,
+    escape: options.escape || DEFAULT_CSV_OPTIONS.escape,
+    newline: (options.newline || DEFAULT_CSV_OPTIONS.newline).trim().toUpperCase(),
+    hasHeader: options.hasHeader ?? DEFAULT_CSV_OPTIONS.hasHeader,
+    emptyAsNull: options.emptyAsNull ?? DEFAULT_CSV_OPTIONS.emptyAsNull,
+    headerRow: options.headerRow ?? DEFAULT_CSV_OPTIONS.headerRow,
+    dataStartRow: options.dataStartRow ?? (options.hasHeader ? (options.headerRow || 1) + 1 : 1),
+    dataEndRow: options.dataEndRow,
+    dateOrder: options.dateOrder || DEFAULT_CSV_OPTIONS.dateOrder,
+    dateTimeOrder: options.dateTimeOrder || DEFAULT_CSV_OPTIONS.dateTimeOrder,
+    dateDelimiter: options.dateDelimiter || DEFAULT_CSV_OPTIONS.dateDelimiter,
+    yearDelimiter: options.yearDelimiter || options.dateDelimiter || DEFAULT_CSV_OPTIONS.yearDelimiter,
+    timeDelimiter: options.timeDelimiter || DEFAULT_CSV_OPTIONS.timeDelimiter,
+    decimalSymbol: options.decimalSymbol || DEFAULT_CSV_OPTIONS.decimalSymbol,
+  };
+  if (
+    !normalized.encoding ||
+    normalized.delimiter.length !== 1 ||
+    !SUPPORTED_NEWLINES.includes(normalized.newline) ||
+    normalized.quote.length !== 1 ||
+    normalized.escape.length !== 1 ||
+    normalized.quote === '\n' ||
+    normalized.quote === '\r' ||
+    normalized.escape === '\n' ||
+    normalized.escape === '\r' ||
+    normalized.delimiter === normalized.quote ||
+    normalized.delimiter === normalized.escape ||
+    !Number.isInteger(normalized.headerRow) ||
+    normalized.headerRow < 1 ||
+    !Number.isInteger(normalized.dataStartRow) ||
+    normalized.dataStartRow < 1 ||
+    (normalized.dataEndRow !== undefined &&
+      (!Number.isInteger(normalized.dataEndRow) || normalized.dataEndRow < normalized.dataStartRow)) ||
+    (normalized.hasHeader && normalized.headerRow >= normalized.dataStartRow) ||
+    !SUPPORTED_DATE_ORDERS.includes(normalized.dateOrder) ||
+    !SUPPORTED_DATE_TIME_ORDERS.includes(normalized.dateTimeOrder) ||
+    normalized.dateDelimiter.length !== 1 ||
+    normalized.yearDelimiter.length !== 1 ||
+    normalized.timeDelimiter.length !== 1 ||
+    !['.', ','].includes(normalized.decimalSymbol)
+  ) {
+    throw new CsvOptionsValidationError();
+  }
+  return normalized;
+}
+
+export function getCsvDateTimeExamples(options: ICsvOptions): string[] {
+  const values = [
+    { year: '23', month: '8', day: '24' },
+    { year: '2023', month: '8', day: '24' },
+    { year: '23', month: 'Aug', day: '24' },
+    { year: '23', month: 'August', day: '24' },
+  ];
+  return values.map(({ year, month, day }) => {
+    const parts = { Y: year, M: month, D: day };
+    const order = options.dateOrder.split('') as Array<keyof typeof parts>;
+    const separators = [0, 1].map((index) => {
+      const nextToYear = order[index] === 'Y' || order[index + 1] === 'Y';
+      return nextToYear ? options.yearDelimiter : options.dateDelimiter;
+    });
+    const date = `${parts[order[0]]}${separators[0]}${parts[order[1]]}${separators[1]}${parts[order[2]]}`;
+    const time = `15${options.timeDelimiter}30${options.timeDelimiter}38`;
+    switch (options.dateTimeOrder) {
+      case 'TIME_DATE':
+        return `${time} ${date}`;
+      case 'DATE_TIME_TIMEZONE':
+        return `${date} ${time} +08:00`;
+      case 'TIME_DATE_TIMEZONE':
+        return `${time} ${date} +08:00`;
+      case 'TIME_TIMEZONE_DATE':
+        return `${time} +08:00 ${date}`;
+      default:
+        return `${date} ${time}`;
+    }
+  });
+}
+
+export function buildCsvOptionsForTaskSubmit(isCsv: boolean, options: ICsvOptions): ICsvOptions | undefined {
+  return isCsv ? validateCsvOptions(options) : undefined;
+}
+
+export function csvOptionsToPreviewParam(isCsv: boolean, options: ICsvOptions): string | undefined {
+  const validated = buildCsvOptionsForTaskSubmit(isCsv, options);
+  return validated ? JSON.stringify(validated) : undefined;
+}
+
+export function inferImportFileFormat(filePath: string): ImportExportFileType {
+  const lower = filePath.toLowerCase();
+  if (lower.endsWith('.xlsx')) {
+    return ImportExportFileType.XLSX;
+  }
+  if (lower.endsWith('.xls')) {
+    return ImportExportFileType.XLS;
+  }
+  if (lower.endsWith('.json')) {
+    return ImportExportFileType.JSON;
+  }
+  if (lower.endsWith('.sql')) {
+    return ImportExportFileType.SQL;
+  }
+  return ImportExportFileType.CSV;
+}
+
+export function supportsCsvMappingPreview(format?: ImportExportFileType): boolean {
+  return format === ImportExportFileType.CSV;
+}
diff --git a/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/activeTransactionUtils.test.ts b/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/activeTransactionUtils.test.ts
new file mode 100644
index 0000000000..be292dfbd1
--- /dev/null
+++ b/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/activeTransactionUtils.test.ts
@@ -0,0 +1,130 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+
+import {
+  ActiveTransactionLoadErrorKind,
+  beginActiveTransactionRefresh,
+  classifyActiveTransactionLoadError,
+  formatActiveTransactionStartedAt,
+  getActiveTransactionRowKey,
+  getLiveTransactionAge,
+  getTransactionConnectionInspection,
+  invalidateActiveTransactionRefresh,
+  isLatestActiveTransactionRefresh,
+} from './activeTransactionUtils';
+import {
+  ACTIVE_TRANSACTION_PROCESS_PRIVILEGE_ERROR_CODE,
+  ActiveTransactionLockMetadataSource,
+  ActiveTransactionLockMetadataState,
+  ActiveTransactionQueryState,
+  ActiveTransactionSessionState,
+  MYSQL_ACTIVE_TRANSACTION_STATE,
+} from '@/constants/activeTransaction';
+import type { IActiveTransactionItem } from '@/service/sql';
+
+const waitingTransaction: IActiveTransactionItem = {
+  trxId: '421337',
+  state: MYSQL_ACTIVE_TRANSACTION_STATE.LOCK_WAIT,
+  startedAt: '2026-08-31 12:00:00',
+  ageSeconds: 12,
+  isolationLevel: 'REPEATABLE READ',
+  rowsLocked: 1,
+  rowsModified: 0,
+  lockStructs: 2,
+  threadId: 45,
+  user: 'ops002_user',
+  host: '127.0.0.1:50000',
+  db: 'ops002_test',
+  query: null,
+  queryState: ActiveTransactionQueryState.UNAVAILABLE,
+  sessionAvailable: true,
+  sessionState: ActiveTransactionSessionState.LIVE,
+  canOpenSession: true,
+  connectionInspectionSql: 'owner inspection sql',
+  waitingLockId: '421337:7:3:2',
+  blockingLockId: '421336:7:3:2',
+  blockingTrxId: '421336',
+  blockingThreadId: 44,
+  blockingSessionAvailable: true,
+  canOpenBlockingSession: true,
+  blockingConnectionInspectionSql: 'blocker inspection sql',
+  blockingUser: 'ops002_admin',
+  blockingHost: '127.0.0.1:49999',
+  blockingDb: 'ops002_test',
+  lockMetadataState: ActiveTransactionLockMetadataState.AVAILABLE,
+  lockMetadataSource: ActiveTransactionLockMetadataSource.MYSQL_80_PERFORMANCE_SCHEMA,
+};
+
+assert.equal(getActiveTransactionRowKey(waitingTransaction), '421337:421337:7:3:2:421336:7:3:2:421336:45');
+assert.notEqual(
+  getActiveTransactionRowKey(waitingTransaction),
+  getActiveTransactionRowKey({
+    ...waitingTransaction,
+    blockingLockId: '421338:7:3:2',
+    blockingTrxId: '421338',
+  }),
+);
+assert.deepEqual(getTransactionConnectionInspection(waitingTransaction, 'owner'), {
+  connectionId: 45,
+  sql: 'owner inspection sql',
+});
+assert.deepEqual(getTransactionConnectionInspection(waitingTransaction, 'blocker'), {
+  connectionId: 44,
+  sql: 'blocker inspection sql',
+});
+assert.equal(
+  getTransactionConnectionInspection({ ...waitingTransaction, connectionInspectionSql: null }, 'owner'),
+  null,
+);
+assert.deepEqual(
+  classifyActiveTransactionLoadError({ errorCode: ACTIVE_TRANSACTION_PROCESS_PRIVILEGE_ERROR_CODE }),
+  { kind: ActiveTransactionLoadErrorKind.PROCESS_PRIVILEGE_REQUIRED },
+);
+assert.deepEqual(classifyActiveTransactionLoadError({ errorMessage: 'connection failed' }), {
+  kind: ActiveTransactionLoadErrorKind.OTHER,
+  message: 'connection failed',
+});
+assert.deepEqual(classifyActiveTransactionLoadError(new Error('connection failed')), {
+  kind: ActiveTransactionLoadErrorKind.OTHER,
+  message: 'connection failed',
+});
+const refreshGenerationRef = { current: 0 };
+const olderRefresh = beginActiveTransactionRefresh(refreshGenerationRef);
+const newerRefresh = beginActiveTransactionRefresh(refreshGenerationRef);
+assert.equal(isLatestActiveTransactionRefresh(refreshGenerationRef, olderRefresh), false);
+assert.equal(isLatestActiveTransactionRefresh(refreshGenerationRef, newerRefresh), true);
+invalidateActiveTransactionRefresh(refreshGenerationRef);
+assert.equal(isLatestActiveTransactionRefresh(refreshGenerationRef, newerRefresh), false);
+assert.equal(getLiveTransactionAge(12, 1_000, 4_900), 15);
+assert.equal(getLiveTransactionAge(12, 5_000, 4_000), 12);
+assert.equal(getLiveTransactionAge(null, 1_000, 4_900), null);
+assert.equal(formatActiveTransactionStartedAt('2026-08-31 12:00:00'), '2026-08-31 12:00:00');
+assert.match(formatActiveTransactionStartedAt(1_788_352_626_000), /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/);
+assert.notEqual(formatActiveTransactionStartedAt(1_788_352_626_000), '1788352626000');
+assert.equal(formatActiveTransactionStartedAt(null), '-');
+assert.equal(formatActiveTransactionStartedAt('not-a-date'), '-');
+const activeTransactionsSource = readFileSync(
+  'src/blocks/NewTree/components/ActiveTransactionsContent/index.tsx',
+  'utf8',
+);
+const activeTransactionsStyle = readFileSync(
+  'src/blocks/NewTree/components/ActiveTransactionsContent/index.less',
+  'utf8',
+);
+assert.doesNotMatch(
+  activeTransactionsSource,
+  /fixed:\s*['"]right['"]/,
+  'the session action column must not render the fixed-column divider in dark mode',
+);
+assert.doesNotMatch(
+  activeTransactionsSource,
+  /workspace\.ops\.sessionAction/,
+  'session inspection links belong beside their target thread IDs instead of a duplicate action column',
+);
+assert.doesNotMatch(
+  activeTransactionsSource,
+  /queryState\s*===\s*['"]UNAVAILABLE['"]/,
+  'query state comparisons must use the centralized enum',
+);
+assert.match(activeTransactionsStyle, /ant-table-ping-right/);
+assert.match(activeTransactionsStyle, /box-shadow:\s*none/);
diff --git a/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/activeTransactionUtils.ts b/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/activeTransactionUtils.ts
new file mode 100644
index 0000000000..2c70606d1d
--- /dev/null
+++ b/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/activeTransactionUtils.ts
@@ -0,0 +1,98 @@
+import { ACTIVE_TRANSACTION_PROCESS_PRIVILEGE_ERROR_CODE } from '@/constants/activeTransaction';
+import type { IActiveTransactionItem } from '@/service/sql';
+import dayjs from 'dayjs';
+import {
+  beginLatestRequest,
+  invalidateLatestRequest,
+  isLatestRequest,
+  RequestGenerationRef,
+} from '@/utils/latestRequest';
+
+export function getActiveTransactionRowKey(record: IActiveTransactionItem): string {
+  return [
+    record.trxId || 'no-trx',
+    record.waitingLockId || 'no-wait',
+    record.blockingLockId || 'no-blocking-lock',
+    record.blockingTrxId || 'no-blocking-trx',
+    record.threadId == null ? 'no-thread' : String(record.threadId),
+  ].join(':');
+}
+
+export enum ActiveTransactionLoadErrorKind {
+  PROCESS_PRIVILEGE_REQUIRED = 'PROCESS_PRIVILEGE_REQUIRED',
+  OTHER = 'OTHER',
+}
+
+export interface ActiveTransactionLoadError {
+  kind: ActiveTransactionLoadErrorKind;
+  message?: string;
+}
+
+export function classifyActiveTransactionLoadError(error: unknown): ActiveTransactionLoadError {
+  if (typeof error !== 'object' || error === null) {
+    return { kind: ActiveTransactionLoadErrorKind.OTHER };
+  }
+  const response = error as Record<string, unknown>;
+  if (response.errorCode === ACTIVE_TRANSACTION_PROCESS_PRIVILEGE_ERROR_CODE) {
+    return { kind: ActiveTransactionLoadErrorKind.PROCESS_PRIVILEGE_REQUIRED };
+  }
+  return {
+    kind: ActiveTransactionLoadErrorKind.OTHER,
+    message:
+      typeof response.errorMessage === 'string'
+        ? response.errorMessage
+        : typeof response.message === 'string'
+          ? response.message
+          : undefined,
+  };
+}
+
+export function beginActiveTransactionRefresh(generationRef: RequestGenerationRef): number {
+  return beginLatestRequest(generationRef);
+}
+
+export function invalidateActiveTransactionRefresh(generationRef: RequestGenerationRef): void {
+  invalidateLatestRequest(generationRef);
+}
+
+export function isLatestActiveTransactionRefresh(generationRef: RequestGenerationRef, generation: number): boolean {
+  return isLatestRequest(generationRef, generation);
+}
+
+export function getLiveTransactionAge(
+  ageSeconds: number | null,
+  snapshotAtMs: number,
+  nowMs: number,
+): number | null {
+  if (ageSeconds == null) {
+    return null;
+  }
+  return ageSeconds + Math.max(0, Math.floor((nowMs - snapshotAtMs) / 1000));
+}
+
+export function formatActiveTransactionStartedAt(value: number | string | null): string {
+  if (value == null || value === '') {
+    return '-';
+  }
+  const timestamp = dayjs(value);
+  return timestamp.isValid() ? timestamp.format('YYYY-MM-DD HH:mm:ss') : '-';
+}
+
+export interface TransactionConnectionInspection {
+  connectionId: number;
+  sql: string;
+}
+
+export function getTransactionConnectionInspection(
+  record: IActiveTransactionItem,
+  target: 'owner' | 'blocker',
+): TransactionConnectionInspection | null {
+  const connectionId = target === 'blocker' ? record.blockingThreadId : record.threadId;
+  const sql =
+    target === 'blocker' ? record.blockingConnectionInspectionSql : record.connectionInspectionSql;
+  const available = target === 'blocker' ? record.canOpenBlockingSession : record.canOpenSession;
+  if (!available || connectionId == null || !sql) {
+    return null;
+  }
+  return { connectionId, sql };
+}
diff --git a/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/index.less b/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/index.less
new file mode 100644
index 0000000000..5e18e8225b
--- /dev/null
+++ b/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/index.less
@@ -0,0 +1,8 @@
+.table {
+  :global {
+    .ant-table-ping-left:not(.ant-table-has-fix-left) .ant-table-container::before,
+    .ant-table-ping-right:not(.ant-table-has-fix-right) .ant-table-container::after {
+      box-shadow: none;
+    }
+  }
+}
diff --git a/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/index.tsx b/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/index.tsx
new file mode 100644
index 0000000000..1928caf3b9
--- /dev/null
+++ b/chat2db-community-client/src/blocks/NewTree/components/ActiveTransactionsContent/index.tsx
@@ -0,0 +1,287 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { Button, Space, Table, Tag, Tooltip, Typography } from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import { ExternalLink } from 'lucide-react';
+import styles from './index.less';
+import i18n from '@/i18n';
+import {
+  ActiveTransactionLockMetadataState,
+  ActiveTransactionQueryState,
+  MYSQL_ACTIVE_TRANSACTION_STATE,
+} from '@/constants/activeTransaction';
+import sqlService, { type IActiveTransactionItem } from '@/service/sql';
+import { RequestGenerationRef } from '@/utils/latestRequest';
+import {
+  beginActiveTransactionRefresh,
+  type ActiveTransactionLoadError,
+  ActiveTransactionLoadErrorKind,
+  classifyActiveTransactionLoadError,
+  formatActiveTransactionStartedAt,
+  getActiveTransactionRowKey,
+  getLiveTransactionAge,
+  getTransactionConnectionInspection,
+  type TransactionConnectionInspection,
+  invalidateActiveTransactionRefresh,
+  isLatestActiveTransactionRefresh,
+} from './activeTransactionUtils';
+
+/**
+ * Active InnoDB transaction list (MYSQL-OPS-002). Read-only; full visibility of other
+ * users' transactions and their SQL requires the PROCESS privilege, which is surfaced as
+ * an explicit unavailable state instead of a misleading blank list.
+ */
+interface ActiveTransactionsContentProps {
+  dataSourceId: number;
+  databaseName?: string;
+  schemaName?: string;
+  onInspectConnection?: (inspection: TransactionConnectionInspection) => void;
+}
+
+const ActiveTransactionsContent = ({
+  dataSourceId,
+  databaseName,
+  schemaName,
+  onInspectConnection,
+}: ActiveTransactionsContentProps) => {
+  const [data, setData] = useState<IActiveTransactionItem[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<ActiveTransactionLoadError | null>(null);
+  const [snapshotAtMs, setSnapshotAtMs] = useState(() => Date.now());
+  const [nowMs, setNowMs] = useState(() => Date.now());
+  const refreshGenerationRef = useRef<RequestGenerationRef>({ current: 0 });
+
+  const load = useCallback(() => {
+    const generation = beginActiveTransactionRefresh(refreshGenerationRef.current);
+    setLoading(true);
+    setError(null);
+    sqlService
+      .getActiveTransactionList({ dataSourceId, databaseName, schemaName })
+      .then((list) => {
+        if (!isLatestActiveTransactionRefresh(refreshGenerationRef.current, generation)) {
+          return;
+        }
+        const loadedAt = Date.now();
+        setData(list || []);
+        setSnapshotAtMs(loadedAt);
+        setNowMs(loadedAt);
+      })
+      .catch((e: unknown) => {
+        if (!isLatestActiveTransactionRefresh(refreshGenerationRef.current, generation)) {
+          return;
+        }
+        setData([]);
+        setError(classifyActiveTransactionLoadError(e));
+      })
+      .finally(() => {
+        if (isLatestActiveTransactionRefresh(refreshGenerationRef.current, generation)) {
+          setLoading(false);
+        }
+      });
+  }, [dataSourceId, databaseName, schemaName]);
+
+  useEffect(() => {
+    load();
+    return () => invalidateActiveTransactionRefresh(refreshGenerationRef.current);
+  }, [load]);
+
+  useEffect(() => {
+    const timer = window.setInterval(() => setNowMs(Date.now()), 1000);
+    return () => window.clearInterval(timer);
+  }, []);
+
+  const inspectConnection = useCallback(
+    (record: IActiveTransactionItem, target: 'owner' | 'blocker') => {
+      const inspection = getTransactionConnectionInspection(record, target);
+      if (!inspection || !onInspectConnection) {
+        return;
+      }
+      onInspectConnection(inspection);
+    },
+    [onInspectConnection],
+  );
+
+  const renderUnavailable = (label: string) => <Tag color="default">{label}</Tag>;
+
+  const columns: ColumnsType<IActiveTransactionItem> = [
+    { title: i18n('workspace.ops.transactionId'), dataIndex: 'trxId', width: 120 },
+    {
+      title: i18n('workspace.ops.transactionState'),
+      dataIndex: 'state',
+      width: 120,
+      filters: [
+        { text: MYSQL_ACTIVE_TRANSACTION_STATE.RUNNING, value: MYSQL_ACTIVE_TRANSACTION_STATE.RUNNING },
+        { text: MYSQL_ACTIVE_TRANSACTION_STATE.LOCK_WAIT, value: MYSQL_ACTIVE_TRANSACTION_STATE.LOCK_WAIT },
+      ],
+      onFilter: (value, record) => record.state === value,
+      sorter: (a, b) => String(a.state || '').localeCompare(String(b.state || '')),
+    },
+    {
+      title: i18n('workspace.ops.transactionStarted'),
+      dataIndex: 'startedAt',
+      width: 170,
+      render: formatActiveTransactionStartedAt,
+      sorter: (a, b) => String(a.startedAt || '').localeCompare(String(b.startedAt || '')),
+    },
+    {
+      title: i18n('workspace.ops.transactionAge'),
+      dataIndex: 'ageSeconds',
+      width: 90,
+      render: (v: number | null) => {
+        const liveAge = getLiveTransactionAge(v, snapshotAtMs, nowMs);
+        return liveAge == null ? '-' : i18n('workspace.ops.secondsFormat', liveAge);
+      },
+      sorter: (a, b) => (a.ageSeconds || 0) - (b.ageSeconds || 0),
+    },
+    { title: i18n('workspace.ops.transactionIsolation'), dataIndex: 'isolationLevel', width: 130 },
+    {
+      title: i18n('workspace.ops.rowsLocked'),
+      dataIndex: 'rowsLocked',
+      width: 100,
+      sorter: (a, b) => (a.rowsLocked || 0) - (b.rowsLocked || 0),
+    },
+    {
+      title: i18n('workspace.ops.rowsModified'),
+      dataIndex: 'rowsModified',
+      width: 110,
+      sorter: (a, b) => (a.rowsModified || 0) - (b.rowsModified || 0),
+    },
+    {
+      title: i18n('workspace.ops.threadId'),
+      dataIndex: 'threadId',
+      width: 120,
+      render: (_value, record) => {
+        if (!onInspectConnection || !getTransactionConnectionInspection(record, 'owner')) {
+          return record.sessionAvailable === false
+            ? renderUnavailable(i18n('workspace.ops.sessionUnavailable'))
+            : record.threadId;
+        }
+        return (
+          <Tooltip title={i18n('workspace.ops.openSession')}>
+            <Button
+              type="link"
+              size="small"
+              icon={<ExternalLink size={14} />}
+              onClick={() => inspectConnection(record, 'owner')}
+            >
+              {record.threadId}
+            </Button>
+          </Tooltip>
+        );
+      },
+      sorter: (a, b) => (a.threadId || 0) - (b.threadId || 0),
+    },
+    { title: i18n('workspace.ops.user'), dataIndex: 'user', width: 110 },
+    { title: i18n('workspace.ops.host'), dataIndex: 'host', width: 140 },
+    { title: i18n('workspace.ops.database'), dataIndex: 'db', width: 120 },
+    {
+      title: i18n('workspace.ops.waitedLock'),
+      dataIndex: 'waitingLockId',
+      width: 220,
+      render: (_value, record) => {
+        if (record.lockMetadataState === ActiveTransactionLockMetadataState.UNAVAILABLE) {
+          return renderUnavailable(i18n('workspace.ops.lockMetadataUnavailable'));
+        }
+        if (!record.lockWaitAvailable) {
+          return '-';
+        }
+        return (
+          <Space direction="vertical" size={0}>
+            <Typography.Text copyable>{record.waitingLockId}</Typography.Text>
+            <Typography.Text type="secondary">
+              {[record.waitingObject, record.waitingIndex, record.waitingLockMode].filter(Boolean).join(' / ')}
+            </Typography.Text>
+          </Space>
+        );
+      },
+    },
+    {
+      title: i18n('workspace.ops.blocker'),
+      dataIndex: 'blockingTrxId',
+      width: 240,
+      render: (_value, record) => {
+        if (!record.lockWaitAvailable) {
+          return '-';
+        }
+        return (
+          <Space direction="vertical" size={0}>
+            <Typography.Text copyable>{record.blockingTrxId}</Typography.Text>
+            {onInspectConnection && getTransactionConnectionInspection(record, 'blocker') && (
+              <Tooltip title={i18n('workspace.ops.openBlockingSession')}>
+                <Button
+                  type="link"
+                  size="small"
+                  icon={<ExternalLink size={14} />}
+                  onClick={() => inspectConnection(record, 'blocker')}
+                >
+                  {`${i18n('workspace.ops.threadId')}: ${record.blockingThreadId}`}
+                </Button>
+              </Tooltip>
+            )}
+            <Typography.Text type="secondary">
+              {[record.blockingUser, record.blockingHost, record.blockingDb].filter(Boolean).join(' / ') ||
+                i18n('workspace.ops.sessionUnavailable')}
+            </Typography.Text>
+          </Space>
+        );
+      },
+    },
+    {
+      title: i18n('workspace.ops.query'),
+      dataIndex: 'query',
+      width: 260,
+      ellipsis: true,
+      render: (value: string | null, record) =>
+        value ? (
+          <Typography.Text ellipsis={{ tooltip: value }}>{value}</Typography.Text>
+        ) : (
+          renderUnavailable(
+            record.queryState === ActiveTransactionQueryState.UNAVAILABLE
+              ? i18n('workspace.ops.queryUnavailable')
+              : i18n('workspace.ops.emptyValue'),
+          )
+        ),
+    },
+  ];
+  const hasUnavailableLockMetadata = data.some(
+    (item) => item.lockMetadataState === ActiveTransactionLockMetadataState.UNAVAILABLE,
+  );
+  const errorMessage = error
+    ? error.kind === ActiveTransactionLoadErrorKind.PROCESS_PRIVILEGE_REQUIRED
+      ? `${i18n('workspace.ops.permissionRequired')} ${i18n('workspace.ops.processPrivilegeHint')}`
+      : error.message || i18n('common.text.failure')
+    : null;
+
+  return (
+    <div>
+      <div style={{ marginBottom: 8, display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+        <span>
+          {error ? i18n('common.text.failure') : i18n('workspace.ops.activeTransactionCount', data.length)}
+        </span>
+        <Button size="small" onClick={load} loading={loading}>
+          {i18n('common.button.refresh')}
+        </Button>
+      </div>
+      {!error && hasUnavailableLockMetadata && (
+        <div style={{ marginBottom: 8, color: 'var(--text-color-secondary)' }}>
+          {i18n('workspace.ops.lockMetadataDegraded')} {i18n('workspace.ops.lockMetadataUnavailable')}
+        </div>
+      )}
+      {error ? (
+        <div style={{ color: 'var(--text-color-danger)' }}>{errorMessage}</div>
+      ) : (
+        <Table
+          className={styles.table}
+          size="small"
+          rowKey={getActiveTransactionRowKey}
+          columns={columns}
+          dataSource={data}
+          loading={loading}
+          pagination={false}
+          scroll={{ x: 1720 }}
+        />
+      )}
+    </div>
+  );
+};
+
+export default ActiveTransactionsContent;
diff --git a/chat2db-community-client/src/blocks/NewTree/components/TitleRender/index.tsx b/chat2db-community-client/src/blocks/NewTree/components/TitleRender/index.tsx
index 6ebf90e491..7e7e06813e 100644
--- a/chat2db-community-client/src/blocks/NewTree/components/TitleRender/index.tsx
+++ b/chat2db-community-client/src/blocks/NewTree/components/TitleRender/index.tsx
@@ -7,7 +7,7 @@ import { setFocusedContent, getFocusedContent } from '@/store/common/copyFocused
 import { switchIcon, treeConfig } from '../../treeConfig';
 import LoadingGracile from '@/components/Loading/LoadingGracile';
 import { type ThemeAppearance } from 'antd-style';
-import { ChevronRight, User, Users } from 'lucide-react';
+import { Activity, ChevronRight, SquareActivity, User, Users } from 'lucide-react';
 import { ContextMenuRef } from '@/components/ContextMenu';
 import Filtration from '../Filtration';
 import { splitSearchHighlight } from './highlightSearchText';
@@ -160,6 +160,14 @@ const TitleRender = (props: IProps) => {
       return <User className={cx(styles.customizeIconIsLeaf, styles.customizeIcon)} size={19} />;
     }
 
+    if (nodeData.treeNodeType === TreeNodeType.MONITOR) {
+      return <SquareActivity className={styles.customizeIcon} size={19} />;
+    }
+
+    if (nodeData.treeNodeType === TreeNodeType.ACTIVE_TRANSACTIONS) {
+      return <Activity className={cx(styles.customizeIconIsLeaf, styles.customizeIcon)} size={19} />;
+    }
+
     if (isExpanded && switchIcon[nodeData.treeNodeType]!.unfoldIcon) {
       return (
         <IconfontSvg
diff --git a/chat2db-community-client/src/blocks/NewTree/dataSourceIdentity.test.ts b/chat2db-community-client/src/blocks/NewTree/dataSourceIdentity.test.ts
index 857480bdd4..2e91cccd41 100644
--- a/chat2db-community-client/src/blocks/NewTree/dataSourceIdentity.test.ts
+++ b/chat2db-community-client/src/blocks/NewTree/dataSourceIdentity.test.ts
@@ -29,10 +29,10 @@ const decorated = decorateDataSourceIdentityTree([source], [identitySource]);
 assert.match(decorated?.[0].className || '', new RegExp(DATA_SOURCE_IDENTITY_NODE_CLASS));
 assert.match(decorated?.[0].className || '', new RegExp(DATA_SOURCE_IDENTITY_ROOT_CLASS));
 assert.equal(decorated?.[0].style?.['--chat2db-data-source-identity-color'], '#112233');
-assert.equal(decorated?.[0].style?.['--chat2db-data-source-identity-tint'], 'rgba(17, 34, 51, 0.1)');
+assert.equal(decorated?.[0].style?.['--chat2db-data-source-identity-tint'], 'rgba(17, 34, 51, 0.4)');
 assert.match(decorated?.[0].children?.[0].className || '', new RegExp(DATA_SOURCE_IDENTITY_NODE_CLASS));
 assert.equal(decorated?.[0].children?.[0].style?.['--chat2db-data-source-identity-color'], '#112233');
-assert.equal(decorated?.[0].children?.[0].style?.['--chat2db-data-source-identity-tint'], 'rgba(17, 34, 51, 0.06)');
+assert.equal(decorated?.[0].children?.[0].style?.['--chat2db-data-source-identity-tint'], 'rgba(17, 34, 51, 0.2)');
 assert.doesNotMatch(decorated?.[0].children?.[0].className || '', new RegExp(DATA_SOURCE_IDENTITY_ROOT_CLASS));
 assert.equal(source.style, undefined);
 
diff --git a/chat2db-community-client/src/blocks/NewTree/dataSourceIdentity.ts b/chat2db-community-client/src/blocks/NewTree/dataSourceIdentity.ts
index 7b831ad3f3..a9811f4495 100644
--- a/chat2db-community-client/src/blocks/NewTree/dataSourceIdentity.ts
+++ b/chat2db-community-client/src/blocks/NewTree/dataSourceIdentity.ts
@@ -84,7 +84,7 @@ export function decorateDataSourceIdentityTree(
     const style: IdentityTreeNodeStyle = {
       ...cleanNode.style,
       '--chat2db-data-source-identity-color': color,
-      '--chat2db-data-source-identity-tint': withIdentityColorAlpha(color, isDataSourceRoot ? 0.1 : 0.06),
+      '--chat2db-data-source-identity-tint': withIdentityColorAlpha(color, isDataSourceRoot ? 0.4 : 0.2),
     };
     const identityClassName = appendClassName(cleanNode.className, DATA_SOURCE_IDENTITY_NODE_CLASS);
     const className = isDataSourceRoot
diff --git a/chat2db-community-client/src/blocks/NewTree/functions/copyTable.tsx b/chat2db-community-client/src/blocks/NewTree/functions/copyTable.tsx
new file mode 100644
index 0000000000..5601809f31
--- /dev/null
+++ b/chat2db-community-client/src/blocks/NewTree/functions/copyTable.tsx
@@ -0,0 +1,79 @@
+import { createRef, forwardRef, useImperativeHandle } from 'react';
+import { Form, Input, type FormInstance } from 'antd';
+import { staticModal } from '@chat2db/ui';
+import i18n from '@/i18n';
+import sqlService, { type ICopyTableParams } from '@/service/sql';
+
+interface CopyTableValues {
+  newName: string;
+}
+
+interface CopyTableContentProps {
+  defaultName: string;
+  onSubmit: () => void;
+}
+
+const CopyTableContent = forwardRef<FormInstance<CopyTableValues>, CopyTableContentProps>(
+  ({ defaultName, onSubmit }, ref) => {
+    const [form] = Form.useForm<CopyTableValues>();
+    useImperativeHandle(ref, () => form, [form]);
+
+    return (
+      <Form form={form} layout="vertical" initialValues={{ newName: defaultName }}>
+        <Form.Item
+          name="newName"
+          label={i18n('common.text.tableName')}
+          rules={[{ required: true, whitespace: true, message: i18n('common.form.error.required') }]}
+        >
+          <Input
+            onFocus={(event) => event.target.select()}
+            onPressEnter={(event) => {
+              event.preventDefault();
+              if (event.nativeEvent.isComposing) return;
+              onSubmit();
+            }}
+          />
+        </Form.Item>
+      </Form>
+    );
+  },
+);
+
+export const openCopyTableModal = async (params: Omit<ICopyTableParams, 'newName'>, onSuccess: () => void) => {
+  const defaultName = await sqlService.prepareCopyTable(params);
+  const form = createRef<FormInstance<CopyTableValues>>();
+  let pending: Promise<void> | undefined;
+
+  const submit = (): Promise<void> => {
+    if (pending) return pending;
+    pending = (async () => {
+      const values = await form.current!.validateFields();
+      modal.update({ confirmLoading: true, cancelButtonProps: { disabled: true }, keyboard: false, closable: false });
+      await sqlService.copyTable({ ...params, newName: values.newName });
+      onSuccess();
+      modal.destroy();
+    })().finally(() => {
+      pending = undefined;
+      modal.update({ confirmLoading: false, cancelButtonProps: { disabled: false }, keyboard: true, closable: true });
+    });
+    return pending;
+  };
+
+  const modal = staticModal.confirm({
+    title: i18n(params.copyData ? 'workspace.menu.copyStructureData' : 'workspace.menu.copyStructure'),
+    icon: null,
+    autoFocusButton: null,
+    afterOpenChange: (open) => {
+      if (open) form.current?.focusField('newName', { focus: true });
+    },
+    content: <CopyTableContent ref={form} defaultName={defaultName} onSubmit={() => void submit().catch(() => {})} />,
+    okText: i18n('common.button.confirm'),
+    cancelText: i18n('common.button.cancel'),
+    confirmLoading: false,
+    cancelButtonProps: { disabled: false },
+    maskClosable: false,
+    closable: true,
+    keyboard: true,
+    onOk: submit,
+  });
+};
diff --git a/chat2db-community-client/src/blocks/NewTree/hooks/useCreateRightClickMenu.tsx b/chat2db-community-client/src/blocks/NewTree/hooks/useCreateRightClickMenu.tsx
index 74cd945dab..598b9cb8a8 100644
--- a/chat2db-community-client/src/blocks/NewTree/hooks/useCreateRightClickMenu.tsx
+++ b/chat2db-community-client/src/blocks/NewTree/hooks/useCreateRightClickMenu.tsx
@@ -1,10 +1,17 @@
 import i18n from '@/i18n';
 import { Form } from 'antd';
-import { SquarePen } from 'lucide-react';
+import { Copy, SquarePen } from 'lucide-react';
 import { type ReactNode, useRef } from 'react';
 import { v4 as uuid } from 'uuid';
 
-import { ConsoleOpenedStatus, OperationColumn, TreeNodeType, WorkspaceTabType, databaseTypeList } from '@/constants';
+import {
+  ConsoleOpenedStatus,
+  DatabaseCapability,
+  OperationColumn,
+  TreeNodeType,
+  WorkspaceTabType,
+  databaseTypeList,
+} from '@/constants';
 import { ImportExportType } from '@/constants/importExport';
 import { ShortcutAction } from '@/constants/shortcut';
 import { TreeNodeData } from '@/typings';
@@ -25,6 +32,7 @@ import sqlService from '@/service/sql';
 import { copyToClipboard, getParentNode } from '@/utils';
 import { staticMessage, staticModal } from '@chat2db/ui';
 import { deleteTable } from '../functions/deleteTable';
+import { openCopyTableModal } from '../functions/copyTable';
 import { generateJavaClass } from '../functions/generateJavaClass';
 import { neatenMoveToGroup } from '../functions/moveToGroup';
 import { editView, openFunction, openProcedure, openTrigger, openView } from '../functions/openAsyncSql';
@@ -34,15 +42,7 @@ import { viewDDL } from '../functions/viewDDL';
 
 // ----- utils -----
 import { compatibleDataBaseName, getDatabaseSupport } from '@/utils/database';
-import {
-  canDeleteDatabase,
-  canDeleteSchema,
-  canExportData,
-  canExportSqlFile,
-  canGenerateJavaClass,
-  canImportData,
-  canRunSqlFile,
-} from '@/utils/databaseJudgments';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import { dropMenuConfig } from '../menuConfig';
 
 import { handleExportSqlFile } from '@/blocks/ImportAndExport/functions/exportSqlFile';
@@ -62,6 +62,7 @@ import { DataSourceIdentityColorRequestRegistry } from '../dataSourceIdentityCol
 import DataSourceColorMenuItem from '../components/DataSourceColorMenuItem';
 import { withDataSourceColorMenuOption } from '../dataSourceColorMenu';
 import { isDangerousTreeOperation } from '../treeMenuDanger';
+import { createActiveTransactionsWorkspaceTabId } from '../monitorTree';
 
 export interface MenuLabelRenderContext {
   closeMenu: () => void;
@@ -125,6 +126,7 @@ export const canBeDoubleClicked = [
   TreeNodeType.TRIGGER,
   TreeNodeType.ALL_DATA,
   TreeNodeType.DATABASE_ACCOUNT,
+  TreeNodeType.ACTIVE_TRANSACTIONS,
   TreeNodeType.SAVE_CONSOLE,
 ];
 
@@ -270,6 +272,16 @@ export const useCreateRightClickMenu = () => {
       });
     };
 
+    const handleCopyTable = (copyData: boolean) => {
+      void openCopyTableModal(
+        { dataSourceId: dataSourceId!, databaseName: databaseName!, schemaName, tableName: tableName!, copyData },
+        () => {
+          const parentNode = getParentNode(treeNodeData.key, treeData);
+          if (parentNode) handleLoadData(parentNode, { refresh: true });
+        },
+      ).catch(() => {});
+    };
+
     const renderDeleteInputConfirmLabel = (labelKey: string, confirmName: string) => {
       return (
         <>
@@ -354,7 +366,11 @@ export const useCreateRightClickMenu = () => {
       // copyName
       [OperationColumn.CopyName]: {
         text: i18n('common.button.copyName'),
-        icon: <span aria-hidden="true" style={{ display: 'inline-block', width: 20, height: 20 }} />,
+        icon: (
+          <span style={{ alignItems: 'center', display: 'inline-flex', height: 20, justifyContent: 'center', width: 20 }}>
+            <Copy size={18} strokeWidth={1.75} />
+          </span>
+        ),
         handle: () => {
           copyToClipboard(treeNodeData.originalTitle);
         },
@@ -405,6 +421,26 @@ export const useCreateRightClickMenu = () => {
         },
       },
 
+      [OperationColumn.ActiveTransactions]: {
+        text: i18n('workspace.ops.activeTransactions'),
+        icon: 'icon-file-text',
+        doubleClickTrigger: true,
+        handle: () => {
+          addWorkspaceTab({
+            id: createActiveTransactionsWorkspaceTabId(dataSourceId),
+            type: WorkspaceTabType.ActiveTransactions,
+            title: i18n('workspace.ops.activeTransactions'),
+            uniqueData: {
+              ...extraParams,
+            },
+          });
+        },
+        discard:
+          !hasPermission ||
+          !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.ACTIVE_TRANSACTION_INSPECTION),
+        requiredOperations: ['SELECT'],
+      },
+
       [OperationColumn.CreateAccount]: {
         text: i18n('workspace.databaseAccount.createUser'),
         icon: 'icon-users',
@@ -744,7 +780,7 @@ export const useCreateRightClickMenu = () => {
           treeNodeType !== TreeNodeType.DATABASE ||
           !hasPermission ||
           !supportDatabase ||
-          !canDeleteDatabase(databaseType),
+          !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.DATABASE_DELETE),
         requiredOperations: ['DROP'],
       },
 
@@ -753,7 +789,10 @@ export const useCreateRightClickMenu = () => {
         icon: 'icon-trash',
         handle: openDeleteSchemaModal,
         discard:
-          treeNodeType !== TreeNodeType.SCHEMA || !hasPermission || !supportSchema || !canDeleteSchema(databaseType),
+          treeNodeType !== TreeNodeType.SCHEMA ||
+          !hasPermission ||
+          !supportSchema ||
+          !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.SCHEMA_DELETE),
         requiredOperations: ['DROP'],
       },
 
@@ -1011,7 +1050,10 @@ export const useCreateRightClickMenu = () => {
             schemaName,
           });
         },
-        discard: !canImportExport || !canRunSqlFile(databaseType) || !hasPermission,
+        discard:
+          !canImportExport ||
+          !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.IMPORT_EXPORT) ||
+          !hasPermission,
       },
 
       [OperationColumn.CopyMcpConfig]: {
@@ -1088,7 +1130,7 @@ export const useCreateRightClickMenu = () => {
         discard:
           (treeNodeType === TreeNodeType.DATABASE && supportSchema) ||
           !canImportExport ||
-          !canExportSqlFile(databaseType),
+          !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.IMPORT_EXPORT),
       },
 
       // Export data.
@@ -1106,7 +1148,9 @@ export const useCreateRightClickMenu = () => {
           });
         },
         discard:
-          (treeNodeType === TreeNodeType.DATABASE && supportSchema) || !canImportExport || !canExportData(databaseType),
+          (treeNodeType === TreeNodeType.DATABASE && supportSchema) ||
+          !canImportExport ||
+          !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.IMPORT_EXPORT),
       },
 
       // Import data.
@@ -1124,7 +1168,9 @@ export const useCreateRightClickMenu = () => {
           });
         },
         discard:
-          (treeNodeType === TreeNodeType.DATABASE && supportSchema) || !canImportExport || !canImportData(databaseType),
+          (treeNodeType === TreeNodeType.DATABASE && supportSchema) ||
+          !canImportExport ||
+          !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.IMPORT_EXPORT),
         requiredOperations: ['INSERT'],
       },
 
@@ -1140,7 +1186,9 @@ export const useCreateRightClickMenu = () => {
             tableName: tableName!,
           });
         },
-        discard: !canImportExport || !canGenerateJavaClass(databaseType),
+        discard:
+          !canImportExport ||
+          !isDatabaseCapabilitySupported(databaseType, DatabaseCapability.JAVA_CLASS_GENERATION),
       },
 
       // Truncate the table.
@@ -1174,46 +1222,12 @@ export const useCreateRightClickMenu = () => {
           {
             text: i18n('workspace.menu.copyStructure'),
             requiredOperations: ['CREATE'],
-            handle: () => {
-              sqlService
-                .copyTable({
-                  dataSourceId: dataSourceId!,
-                  databaseName: databaseName!,
-                  schemaName,
-                  tableName: tableName!,
-                  copyData: false,
-                })
-                .then(() => {
-                  const parentNode = getParentNode(treeNodeData.key, treeData);
-                  if (parentNode) {
-                    handleLoadData(parentNode, {
-                      refresh: true,
-                    });
-                  }
-                });
-            },
+            handle: () => handleCopyTable(false),
           },
           {
             text: i18n('workspace.menu.copyStructureData'),
             requiredOperations: ['CREATE', 'SELECT', 'INSERT'],
-            handle: () => {
-              sqlService
-                .copyTable({
-                  dataSourceId: dataSourceId!,
-                  databaseName: databaseName!,
-                  schemaName,
-                  tableName: tableName!,
-                  copyData: true,
-                })
-                .then(() => {
-                  const parentNode = getParentNode(treeNodeData.key, treeData);
-                  if (parentNode) {
-                    handleLoadData(parentNode, {
-                      refresh: true,
-                    });
-                  }
-                });
-            },
+            handle: () => handleCopyTable(true),
           },
         ],
         requiredOperations: ['CREATE'],
diff --git a/chat2db-community-client/src/blocks/NewTree/index.tsx b/chat2db-community-client/src/blocks/NewTree/index.tsx
index 1e472e953a..c47ba3c807 100644
--- a/chat2db-community-client/src/blocks/NewTree/index.tsx
+++ b/chat2db-community-client/src/blocks/NewTree/index.tsx
@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useEffect, useLayoutEffect, useRef, useMemo, forwardRef, useState } from 'react';
-import { Tree, TreeProps, ConfigProvider, TreeDataNode, Spin } from 'antd';
+import { Tree, TreeProps, ConfigProvider, Spin } from 'antd';
 import { useStyles } from './style';
 import { useStyles as renderTitleUseStyles } from './renderTitleStyle';
 
@@ -24,6 +24,9 @@ import connectionService from '@/service/connection';
 import { useSize } from 'ahooks';
 import { decorateDataSourceIdentityTree } from './dataSourceIdentity';
 import { measureTreeScrollWidth, resolveNextTreeScrollWidth } from './treeScrollWidth';
+import { TreePositionMutationCoordinator, TreePositionRefreshError } from './treePositionMutation';
+import i18n from '@/i18n';
+import { staticMessage } from '@chat2db/ui';
 
 interface IProps extends TreeProps<TreeNodeData> {
   className?: string;
@@ -69,12 +72,12 @@ const NewTree = (props: IProps, ref: React.ForwardedRef<NewTreeRef>) => {
   const horizontalMeasureFrameRef = useRef<number>();
   const horizontalMeasureResetRef = useRef(false);
   const horizontalScrollHideTimerRef = useRef<number>();
+  const treePositionMutationRef = useRef(new TreePositionMutationCoordinator());
   const [treeScrollWidth, setTreeScrollWidth] = useState<number>();
   const [isHorizontalScrolling, setIsHorizontalScrolling] = useState(false);
   const filteredTreeData = useTrimTreeData({ leafNodes, hiddenNoPermission, excludeNodes });
   const {
     editingTreeNode,
-    setTreeData,
     selectedKeys,
     setSelectedKeys,
     setTreeRef,
@@ -83,9 +86,9 @@ const NewTree = (props: IProps, ref: React.ForwardedRef<NewTreeRef>) => {
     setScrollTargetKey,
     searchBarValue,
     dataSourceList,
+    getTreeData,
   } = useTreeStore((state) => ({
     editingTreeNode: state.editingTreeNode,
-    setTreeData: state.setTreeData,
     selectedKeys: state.selectedKeys,
     setSelectedKeys: state.setSelectedKeys,
     setTreeRef: state.setTreeRef,
@@ -94,6 +97,7 @@ const NewTree = (props: IProps, ref: React.ForwardedRef<NewTreeRef>) => {
     setScrollTargetKey: state.setScrollTargetKey,
     searchBarValue: state.searchBarValue,
     dataSourceList: state.dataSourceList,
+    getTreeData: state.getTreeData,
   }));
   const identityTreeData = useMemo(
     () => decorateDataSourceIdentityTree(filteredTreeData, dataSourceList),
@@ -202,75 +206,32 @@ const NewTree = (props: IProps, ref: React.ForwardedRef<NewTreeRef>) => {
   };
 
   const onDrop: TreeProps['onDrop'] = (info: any) => {
-    const dropKey = info.node.key;
     const dragKey = info.dragNode.key;
     const dropPos = info.node.pos.split('-');
     const dropPosition = info.dropPosition - Number(dropPos[dropPos.length - 1]);
     // the drop position relative to the drop node, inside 0, top -1, bottom 1
 
-    const loop = (
-      data: TreeDataNode[],
-      key: React.Key,
-      callback: (node: TreeDataNode, i: number, data: TreeDataNode[]) => void,
-    ) => {
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].key === key) {
-          return callback(data[i], i, data);
-        }
-        if (data[i].children) {
-          loop(data[i].children!, key, callback);
+    void treePositionMutationRef.current
+      .run(
+        dragKey,
+        () =>
+          connectionService.updatePosition({
+            dragNode: {
+              id: info.dragNode.id,
+              type: info.dragNode.treeNodeType === TreeNodeType.GROUP ? 'NAMESPACE' : 'DATA_SOURCE',
+            },
+            dropToNode: {
+              id: info.node.id,
+              type: info.node.treeNodeType === TreeNodeType.GROUP ? 'NAMESPACE' : 'DATA_SOURCE',
+            },
+            dropPosition: dropPosition as 0 | 1 | -1,
+          }),
+        () => getTreeData({ refresh: true, throwOnError: true }),
+      )
+      .catch((error) => {
+        if (error instanceof TreePositionRefreshError) {
+          staticMessage.error(i18n('workspace.tips.treePositionRefreshFailed'));
         }
-      }
-    };
-
-    const data = [...(filteredTreeData || [])];
-
-    // Find dragObject
-    let dragObj: TreeDataNode;
-    loop(data, dragKey, (item, index, arr) => {
-      arr.splice(index, 1);
-      dragObj = item;
-    });
-
-    if (!info.dropToGap) {
-      // Drop on the content
-      loop(data, dropKey, (item) => {
-        item.children = item.children || [];
-        // where to insert. New item was inserted to the start of the array in this example, but can be anywhere
-        item.children.unshift(dragObj);
-      });
-    } else {
-      let ar: TreeDataNode[] = [];
-      let i: number;
-      loop(data, dropKey, (_item, index, arr) => {
-        ar = arr;
-        i = index;
-      });
-      if (dropPosition === -1) {
-        // Drop on the top of the drop node
-        ar.splice(i!, 0, dragObj!);
-      } else {
-        // Drop on the bottom of the drop node
-        ar.splice(i! + 1, 0, dragObj!);
-      }
-    }
-
-    connectionService
-      .updatePosition({
-        dragNode: {
-          id: info.dragNode.id,
-          type: info.dragNode.treeNodeType === TreeNodeType.GROUP ? 'NAMESPACE' : 'DATA_SOURCE',
-          // name: info.dragNode.originalTitle,
-        },
-        dropToNode: {
-          id: info.node.id,
-          type: info.node.treeNodeType === TreeNodeType.GROUP ? 'NAMESPACE' : 'DATA_SOURCE',
-          // name: info.node.originalTitle,
-        },
-        dropPosition: dropPosition as 0 | 1 | -1,
-      })
-      .then(() => {
-        setTreeData(data);
       });
   };
 
diff --git a/chat2db-community-client/src/blocks/NewTree/menuConfig.tsx b/chat2db-community-client/src/blocks/NewTree/menuConfig.tsx
index f662aa53ee..f013ece2b2 100644
--- a/chat2db-community-client/src/blocks/NewTree/menuConfig.tsx
+++ b/chat2db-community-client/src/blocks/NewTree/menuConfig.tsx
@@ -165,6 +165,8 @@ export const dropMenuConfig = {
       OperationColumn.Divider,
       OperationColumn.RemoveDataSource,
     ],
+    [TreeNodeType.MONITOR]: [],
+    [TreeNodeType.ACTIVE_TRANSACTIONS]: [OperationColumn.ActiveTransactions],
     [TreeNodeType.DATABASE_ACCOUNTS]: [OperationColumn.CreateAccount, OperationColumn.Refresh],
     [TreeNodeType.DATABASE_ACCOUNT]: [OperationColumn.OpenAccountPrivileges],
     [TreeNodeType.SCHEMAS]: [],
diff --git a/chat2db-community-client/src/blocks/NewTree/monitorTree.test.ts b/chat2db-community-client/src/blocks/NewTree/monitorTree.test.ts
new file mode 100644
index 0000000000..921158ffac
--- /dev/null
+++ b/chat2db-community-client/src/blocks/NewTree/monitorTree.test.ts
@@ -0,0 +1,42 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { DatabaseTypeCode } from '@/constants/common';
+import { DatabaseCapability } from '@/constants/databaseCapabilities';
+import { TreeNodeType } from '@/constants/tree';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
+import {
+  createActiveTransactionsTreeNodeKey,
+  createActiveTransactionsWorkspaceTabId,
+  createMonitorTreeNodeKey,
+  MONITOR_TREE_ITEMS,
+} from './monitorTree';
+
+assert.deepEqual(MONITOR_TREE_ITEMS, [
+  {
+    capability: DatabaseCapability.ACTIVE_TRANSACTION_INSPECTION,
+    treeNodeType: TreeNodeType.ACTIVE_TRANSACTIONS,
+    titleKey: 'workspace.ops.activeTransactions',
+  },
+]);
+assert.equal(
+  isDatabaseCapabilitySupported(DatabaseTypeCode.MYSQL, DatabaseCapability.ACTIVE_TRANSACTION_INSPECTION),
+  true,
+);
+assert.equal(
+  isDatabaseCapabilitySupported(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.ACTIVE_TRANSACTION_INSPECTION),
+  false,
+);
+assert.equal(createMonitorTreeNodeKey(42), 'dataSource_42-monitor');
+assert.equal(createActiveTransactionsTreeNodeKey(42), 'dataSource_42-monitor-activeTransactions');
+assert.equal(createActiveTransactionsWorkspaceTabId(42), 'activeTransactions-42');
+
+const monitorTreeSource = readFileSync('src/blocks/NewTree/monitorTree.ts', 'utf8');
+const treeConfigSource = readFileSync('src/blocks/NewTree/treeConfig.tsx', 'utf8');
+const workspaceTabsSource = readFileSync('src/pages/main/workspace/components/WorkspaceTabs/index.tsx', 'utf8');
+assert.doesNotMatch(monitorTreeSource, /isDatabaseCapabilitySupported|getMonitorTreeNodeTypes/);
+assert.match(treeConfigSource, /isDatabaseCapabilitySupported/);
+assert.match(treeConfigSource, /DatabaseCapability\.ACTIVE_TRANSACTION_INSPECTION|capability/);
+assert.match(workspaceTabsSource, /isDatabaseCapabilitySupported/);
+assert.match(workspaceTabsSource, /DatabaseCapability\.ACTIVE_TRANSACTION_INSPECTION/);
+
+console.log('Monitor tree tests passed');
diff --git a/chat2db-community-client/src/blocks/NewTree/monitorTree.ts b/chat2db-community-client/src/blocks/NewTree/monitorTree.ts
new file mode 100644
index 0000000000..e34c55f740
--- /dev/null
+++ b/chat2db-community-client/src/blocks/NewTree/monitorTree.ts
@@ -0,0 +1,18 @@
+import { DatabaseCapability } from '@/constants/databaseCapabilities';
+import { TreeNodeType } from '@/constants/tree';
+
+export const MONITOR_TREE_ITEMS = [
+  {
+    capability: DatabaseCapability.ACTIVE_TRANSACTION_INSPECTION,
+    treeNodeType: TreeNodeType.ACTIVE_TRANSACTIONS,
+    titleKey: 'workspace.ops.activeTransactions',
+  },
+] as const;
+
+export const createMonitorTreeNodeKey = (dataSourceId?: number) => `dataSource_${dataSourceId}-monitor`;
+
+export const createActiveTransactionsTreeNodeKey = (dataSourceId?: number) =>
+  `${createMonitorTreeNodeKey(dataSourceId)}-activeTransactions`;
+
+export const createActiveTransactionsWorkspaceTabId = (dataSourceId?: number) =>
+  `activeTransactions-${dataSourceId}`;
diff --git a/chat2db-community-client/src/blocks/NewTree/treeConfig.tsx b/chat2db-community-client/src/blocks/NewTree/treeConfig.tsx
index d772c9efb1..4be4f42168 100644
--- a/chat2db-community-client/src/blocks/NewTree/treeConfig.tsx
+++ b/chat2db-community-client/src/blocks/NewTree/treeConfig.tsx
@@ -1,4 +1,4 @@
-import { ConsoleStatus, OperationColumn, TreeNodeType, WorkspaceTabType } from '@/constants';
+import { ConsoleStatus, DatabaseCapability, OperationColumn, TreeNodeType, WorkspaceTabType } from '@/constants';
 import i18n from '@/i18n';
 import accountAdminService from '@/service/accountAdmin';
 import connectionService from '@/service/connection';
@@ -7,9 +7,14 @@ import mysqlServer from '@/service/sql';
 import { useTreeStore } from '@/store/tree';
 import { IConnectionDetails, TreeNodeData } from '@/typings';
 import { getDatabaseSupport } from '@/utils/database';
-import { canUseAccountManage, isMongodbTreeDataSource, isRedisTreeDataSource } from '@/utils/databaseJudgments';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import { v4 as uuid } from 'uuid';
 import { createSavedConsoleTreeNodeKey } from '@/store/tree/backgroundRefresh';
+import {
+  createActiveTransactionsTreeNodeKey,
+  createMonitorTreeNodeKey,
+  MONITOR_TREE_ITEMS,
+} from './monitorTree';
 
 const fileIcon = 'icon-colourful-folder-close';
 const unfoldFileIcon = 'icon-colourful-folder-open';
@@ -179,6 +184,17 @@ function createSaveConsolesNode(extraParams: any): TreeNodeData {
   };
 }
 
+function createMonitorNode(extraParams: any): TreeNodeData {
+  return {
+    key: createMonitorTreeNodeKey(extraParams.dataSourceId),
+    originalTitle: i18n('workspace.ops.monitor'),
+    title: null,
+    treeNodeType: TreeNodeType.MONITOR,
+    isLeaf: false,
+    extraParams,
+  };
+}
+
 export const treeConfig: { [key in TreeNodeType]: ITreeConfigItem } = {
   [TreeNodeType.GROUPS]: {
     getChildren: () => {
@@ -255,7 +271,10 @@ export const treeConfig: { [key in TreeNodeType]: ITreeConfigItem } = {
       return new Promise((r, j) => {
         const { dataSourceId, databaseType } = extraParams;
         const { supportDatabase, supportSchema } = getDatabaseSupport(databaseType);
-        const accountNode: TreeNodeData | null = canUseAccountManage(databaseType)
+        const accountNode: TreeNodeData | null = isDatabaseCapabilitySupported(
+          databaseType,
+          DatabaseCapability.ACCOUNT_MANAGEMENT,
+        )
           ? {
               key: treeConfig[TreeNodeType.DATABASE_ACCOUNTS].createTreeNodeKey!({ dataSourceId }),
               originalTitle: i18n('workspace.databaseAccount.title'),
@@ -265,6 +284,20 @@ export const treeConfig: { [key in TreeNodeType]: ITreeConfigItem } = {
               extraParams,
             }
           : null;
+        const monitorNode = MONITOR_TREE_ITEMS.some(({ capability }) =>
+          isDatabaseCapabilitySupported(databaseType, capability),
+        )
+          ? createMonitorNode(extraParams)
+          : null;
+        const appendDataSourceNodes = (data: TreeNodeData[]) => {
+          if (monitorNode) {
+            data.push(monitorNode);
+          }
+          if (accountNode) {
+            data.push(accountNode);
+          }
+          return data;
+        };
         if (supportDatabase === false && supportSchema === false) {
           // No database or schema level at all (Firebird, IoTDB, ...): the
           // connection itself is the namespace, so show the object folders
@@ -314,10 +347,7 @@ export const treeConfig: { [key in TreeNodeType]: ITreeConfigItem } = {
             },
             createSaveConsolesNode(nodeExtraParams),
           ];
-          if (accountNode) {
-            data.push(accountNode);
-          }
-          r(data);
+          r(appendDataSourceNodes(data));
           return;
         }
         if (supportDatabase === false) {
@@ -342,10 +372,7 @@ export const treeConfig: { [key in TreeNodeType]: ITreeConfigItem } = {
                   },
                 };
               });
-              if (accountNode) {
-                data.push(accountNode);
-              }
-              r(data);
+              r(appendDataSourceNodes(data));
             })
             .catch(() => {
               j();
@@ -372,10 +399,7 @@ export const treeConfig: { [key in TreeNodeType]: ITreeConfigItem } = {
                   },
                 };
               });
-              if (accountNode) {
-                data.push(accountNode);
-              }
-              r(data);
+              r(appendDataSourceNodes(data));
             })
             .catch(() => {
               j();
@@ -389,6 +413,29 @@ export const treeConfig: { [key in TreeNodeType]: ITreeConfigItem } = {
     },
   },
 
+  [TreeNodeType.MONITOR]: {
+    getChildren: (extraParams: any) => {
+      return Promise.resolve(
+        MONITOR_TREE_ITEMS.filter(({ capability }) =>
+          isDatabaseCapabilitySupported(extraParams.databaseType, capability),
+        ).map(({ treeNodeType, titleKey }) => ({
+          key: treeConfig[treeNodeType].createTreeNodeKey!(extraParams),
+          originalTitle: i18n(titleKey),
+          title: null,
+          treeNodeType,
+          isLeaf: true,
+          extraParams,
+        })),
+      );
+    },
+    createTreeNodeKey: (params) => createMonitorTreeNodeKey(params.dataSourceId),
+  },
+
+  [TreeNodeType.ACTIVE_TRANSACTIONS]: {
+    getChildren: () => Promise.resolve([]),
+    createTreeNodeKey: (params) => createActiveTransactionsTreeNodeKey(params.dataSourceId),
+  },
+
   [TreeNodeType.DATABASE_ACCOUNTS]: {
     getChildren: (extraParams: any) => {
       return accountAdminService.list({ dataSourceId: extraParams.dataSourceId }).then((accounts) => {
@@ -603,7 +650,7 @@ export const treeConfig: { [key in TreeNodeType]: ITreeConfigItem } = {
             },
             createSaveConsolesNode(nodeExtraParams),
           ];
-          if (isRedisTreeDataSource(databaseType)) {
+          if (isDatabaseCapabilitySupported(databaseType, DatabaseCapability.REDIS_TREE)) {
             finalData = redisData;
           }
           r(finalData);
@@ -705,7 +752,7 @@ export const treeConfig: { [key in TreeNodeType]: ITreeConfigItem } = {
         ];
 
         let finalData = data;
-        if (isMongodbTreeDataSource(databaseType)) {
+        if (isDatabaseCapabilitySupported(databaseType, DatabaseCapability.MONGODB_TREE)) {
           finalData = mongodbData;
         }
         r(finalData);
diff --git a/chat2db-community-client/src/blocks/NewTree/treeMenuGrouping.test.ts b/chat2db-community-client/src/blocks/NewTree/treeMenuGrouping.test.ts
index 6c2bc91a64..e3809ca490 100644
--- a/chat2db-community-client/src/blocks/NewTree/treeMenuGrouping.test.ts
+++ b/chat2db-community-client/src/blocks/NewTree/treeMenuGrouping.test.ts
@@ -1,4 +1,5 @@
 import assert from 'node:assert/strict';
+import { DatabaseTypeCode } from '@/constants/common';
 import { OperationColumn, TreeNodeType } from '@/constants/tree';
 import { dropMenuConfig } from './menuConfig';
 
@@ -56,4 +57,14 @@ assert.deepEqual(splitGroups(dropMenuConfig.DEFAULT[TreeNodeType.SAVE_CONSOLE]),
   [OperationColumn.RemoveConsole],
 ]);
 
+assert.equal(
+  dropMenuConfig[DatabaseTypeCode.ORACLE][TreeNodeType.DATA_SOURCE].includes(OperationColumn.ActiveTransactions),
+  false,
+);
+assert.equal(
+  dropMenuConfig.DEFAULT[TreeNodeType.DATA_SOURCE].includes(OperationColumn.ActiveTransactions),
+  false,
+);
+assert.deepEqual(dropMenuConfig.DEFAULT[TreeNodeType.ACTIVE_TRANSACTIONS], [OperationColumn.ActiveTransactions]);
+
 console.log('Tree menu grouping tests passed');
diff --git a/chat2db-community-client/src/blocks/NewTree/treePositionMutation.test.ts b/chat2db-community-client/src/blocks/NewTree/treePositionMutation.test.ts
new file mode 100644
index 0000000000..716dfde6f8
--- /dev/null
+++ b/chat2db-community-client/src/blocks/NewTree/treePositionMutation.test.ts
@@ -0,0 +1,114 @@
+import assert from 'node:assert/strict';
+import { TreePositionMutationCoordinator, TreePositionRefreshError } from './treePositionMutation';
+
+function deferred() {
+  let resolve!: () => void;
+  let reject!: (error: Error) => void;
+  const promise = new Promise<void>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise;
+    reject = rejectPromise;
+  });
+  return { promise, resolve, reject };
+}
+
+async function testSuccessfulMoveRefreshesTree() {
+  const coordinator = new TreePositionMutationCoordinator();
+  let refreshCount = 0;
+
+  const committed = await coordinator.run(
+    'dataSource_1',
+    () => Promise.resolve(),
+    () => {
+      refreshCount += 1;
+      return Promise.resolve();
+    },
+  );
+
+  assert.equal(committed, true);
+  assert.equal(refreshCount, 1);
+}
+
+async function testFailedMoveDoesNotRefreshTree() {
+  const coordinator = new TreePositionMutationCoordinator();
+  let refreshCount = 0;
+
+  await assert.rejects(
+    coordinator.run(
+      'dataSource_1',
+      () => Promise.reject(new Error('move failed')),
+      () => {
+        refreshCount += 1;
+        return Promise.resolve();
+      },
+    ),
+    /move failed/,
+  );
+
+  assert.equal(refreshCount, 0);
+}
+
+async function testConcurrentMoveForSameNodeIsRejected() {
+  const coordinator = new TreePositionMutationCoordinator();
+  const request = deferred();
+  let updateCount = 0;
+  const updatePosition = () => {
+    updateCount += 1;
+    return request.promise;
+  };
+
+  const first = coordinator.run('dataSource_1', updatePosition, () => Promise.resolve());
+  const second = coordinator.run('dataSource_1', updatePosition, () => Promise.resolve());
+
+  assert.equal(await second, false);
+  await Promise.resolve();
+  assert.equal(updateCount, 1);
+  request.resolve();
+  assert.equal(await first, true);
+}
+
+async function testMoveCanRetryAfterFailure() {
+  const coordinator = new TreePositionMutationCoordinator();
+  const request = deferred();
+  const first = coordinator.run('dataSource_1', () => request.promise, () => Promise.resolve());
+  request.reject(new Error('move failed'));
+  await assert.rejects(first, /move failed/);
+
+  assert.equal(
+    await coordinator.run('dataSource_1', () => Promise.resolve(), () => Promise.resolve()),
+    true,
+  );
+}
+
+async function testRefreshFailureIsDistinguishedAndCanRetry() {
+  const coordinator = new TreePositionMutationCoordinator();
+  let updateCount = 0;
+  const updatePosition = () => {
+    updateCount += 1;
+    return Promise.resolve();
+  };
+
+  await assert.rejects(
+    coordinator.run('dataSource_1', updatePosition, () => Promise.reject(new Error('refresh failed'))),
+    TreePositionRefreshError,
+  );
+
+  assert.equal(
+    await coordinator.run('dataSource_1', updatePosition, () => Promise.resolve()),
+    true,
+  );
+  assert.equal(updateCount, 2);
+}
+
+async function main() {
+  await testSuccessfulMoveRefreshesTree();
+  await testFailedMoveDoesNotRefreshTree();
+  await testConcurrentMoveForSameNodeIsRejected();
+  await testMoveCanRetryAfterFailure();
+  await testRefreshFailureIsDistinguishedAndCanRetry();
+  console.log('Tree position mutation tests passed');
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});
diff --git a/chat2db-community-client/src/blocks/NewTree/treePositionMutation.ts b/chat2db-community-client/src/blocks/NewTree/treePositionMutation.ts
new file mode 100644
index 0000000000..b9e89ce736
--- /dev/null
+++ b/chat2db-community-client/src/blocks/NewTree/treePositionMutation.ts
@@ -0,0 +1,33 @@
+import type { Key } from 'react';
+
+export class TreePositionRefreshError extends Error {
+  constructor() {
+    super('The tree position was updated, but refreshing the tree failed');
+    this.name = 'TreePositionRefreshError';
+  }
+}
+
+export class TreePositionMutationCoordinator {
+  private readonly pendingKeys = new Set<Key>();
+
+  run(key: Key, updatePosition: () => Promise<void>, refreshTree: () => Promise<unknown>): Promise<boolean> {
+    if (this.pendingKeys.has(key)) {
+      return Promise.resolve(false);
+    }
+
+    this.pendingKeys.add(key);
+    return Promise.resolve()
+      .then(updatePosition)
+      .then(async () => {
+        try {
+          await refreshTree();
+        } catch {
+          throw new TreePositionRefreshError();
+        }
+      })
+      .then(() => true)
+      .finally(() => {
+        this.pendingKeys.delete(key);
+      });
+  }
+}
diff --git a/chat2db-community-client/src/blocks/RedisAllData/index.tsx b/chat2db-community-client/src/blocks/RedisAllData/index.tsx
index e25ecace02..73f768aca4 100644
--- a/chat2db-community-client/src/blocks/RedisAllData/index.tsx
+++ b/chat2db-community-client/src/blocks/RedisAllData/index.tsx
@@ -636,6 +636,7 @@ const RedisAllData = (props) => {
           selectedRows={selectedRows}
           onSelectedRowsChange={handleSelectedRowsChange}
           onActivateRow={handleActivateRedisRow}
+          onRowClick={handleActivateRedisRow}
           onEscapeKey={handleCloseEditPane}
           primaryKey={viewMode === 'tree' ? 'key' : undefined}
           treeMode={viewMode === 'tree' ? redisTreeMode : undefined}
diff --git a/chat2db-community-client/src/blocks/RedisAllData/redisExplorer.test.ts b/chat2db-community-client/src/blocks/RedisAllData/redisExplorer.test.ts
index 03b07c7cd0..f4bec6178b 100644
--- a/chat2db-community-client/src/blocks/RedisAllData/redisExplorer.test.ts
+++ b/chat2db-community-client/src/blocks/RedisAllData/redisExplorer.test.ts
@@ -13,6 +13,7 @@ assert.match(redisAllDataSource, /clickArea: 'cell'/);
 assert.match(redisAllDataSource, /iconIndent: 0/);
 assert.match(redisAllDataSource, /iconGap: 2/);
 assert.match(redisAllDataSource, /onActivateRow=\{handleActivateRedisRow\}/);
+assert.match(redisAllDataSource, /onRowClick=\{handleActivateRedisRow\}/);
 assert.match(redisAllDataSource, /onEscapeKey=\{handleCloseEditPane\}/);
 assert.match(redisAllDataSource, /\.catch\(\(\) => \{/);
 assert.match(redisAllDataSource, /detailLoadStatus === 'failed'/);
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/FESearch/index.tsx b/chat2db-community-client/src/blocks/SearchResult/components/FESearch/index.tsx
index d1ad87bef5..f47d164edc 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/FESearch/index.tsx
+++ b/chat2db-community-client/src/blocks/SearchResult/components/FESearch/index.tsx
@@ -17,6 +17,7 @@ import { hexToRgba } from '@/utils/color';
 import { debounce } from 'lodash';
 import { IconButton } from '@chat2db/ui';
 import SearchBar, { type SearchBarRef } from '@/components/SearchBar';
+import { matchResultSearchValue } from './searchMatcher';
 
 interface IProps {
   className?: string;
@@ -56,6 +57,18 @@ const FESearch = forwardRef((props: IProps, ref: ForwardedRef<FESearchRef>) => {
       focuseHighlightCellStyle: {
         bgColor: focuseHighlightCellStyleBgColor,
       } as any,
+      queryMethod: (query, cellValue, context) =>
+        matchResultSearchValue(
+          query,
+          cellValue,
+          context
+            ? {
+                col: context.col,
+                row: context.row,
+                table: context.table as ITableInstance,
+              }
+            : undefined,
+        ),
     });
   }, [tableInstance]);
 
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/FESearch/searchMatcher.ts b/chat2db-community-client/src/blocks/SearchResult/components/FESearch/searchMatcher.ts
new file mode 100644
index 0000000000..98a7416690
--- /dev/null
+++ b/chat2db-community-client/src/blocks/SearchResult/components/FESearch/searchMatcher.ts
@@ -0,0 +1,21 @@
+import type { ITableInstance } from '@/blocks/CanvasTable/typings';
+import { getResultColumnNameAtTableColumn } from '../ResultSetTable/columnState';
+
+export interface ResultSearchQueryContext {
+  col: number;
+  row: number;
+  table: ITableInstance;
+}
+
+export function matchResultSearchValue(
+  query: string,
+  value: unknown,
+  context?: ResultSearchQueryContext,
+): boolean {
+  const headerName =
+    context?.table.isHeader(context.col, context.row) === true
+      ? getResultColumnNameAtTableColumn(context.table, context.col, context.row)
+      : undefined;
+  const searchableValue = headerName ?? value;
+  return searchableValue !== null && searchableValue !== undefined && String(searchableValue).includes(query);
+}
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/index.tsx b/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/index.tsx
index 68d2505951..a6cc11bc9f 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/index.tsx
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/index.tsx
@@ -29,6 +29,7 @@ import { ITableInstance } from '@/blocks/CanvasTable/typings';
 import {
   ShortcutAction,
   ShortcutOverrides,
+  ShortcutScope,
   getEffectiveShortcutConfigMap,
   isShortcutEventMatch,
 } from '@/constants/shortcut';
@@ -63,6 +64,7 @@ import {
 import { resolveResultInspectorActiveCell } from '../ResultSetTable/selectionState';
 import { areResultCellValuesEquivalent } from './inspectorState';
 import SqlExecutionLoading from '@/components/SqlExecutionLoading';
+import { hasPendingResultEdit, resolvePendingResultEditOperations } from './resultEditActions';
 
 interface IProps {
   resultData: IManageResultData;
@@ -89,6 +91,7 @@ export default memo<IProps>(
     const screenResultRef = useRef<IScreeningResultRef>(null);
     const resultSetTableRef = useRef<ResultSetTableRef>(null);
     const [hasOperationRecord, setHasOperationRecord] = useState(false);
+    const [hasActiveEditorChange, setHasActiveEditorChange] = useState(false);
     const sqlPreviewExecuteRef = useRef<SQLPreviewExecuteRef>(null);
     const sidebarViewDataRef = useRef<ViewDataRef>(null);
     const modalViewDataRef = useRef<ViewDataRef>(null);
@@ -121,6 +124,7 @@ export default memo<IProps>(
     const currentWorkspaceExtend = useWorkspaceStore((state) => state.currentWorkspaceExtend);
     const inspectorExtendCode = useMemo(() => getWorkspaceResultInspectorCode(searchAreaId), [searchAreaId]);
     const inspectorSidebarOpen = currentWorkspaceExtend === inspectorExtendCode;
+    const hasPendingChanges = hasPendingResultEdit(hasOperationRecord, hasActiveEditorChange);
     const inspectorOpen = inspectorSidebarOpen || inspectorModalOpen;
     const shortcutOverrides = useGlobalStore((s) => s.shortcutOverrides);
     const shortcutConfig = useMemo(
@@ -145,6 +149,7 @@ export default memo<IProps>(
 
     useEffect(() => {
       setResultData(props.resultData);
+      setHasActiveEditorChange(false);
     }, [props.resultData]);
 
     useEffect(() => {
@@ -294,18 +299,29 @@ export default memo<IProps>(
     const completeActiveEditor = useCallback(async () => {
       await Promise.resolve(resultSetTableRef.current?.tableInstance?.completeEditCell?.());
       await new Promise((resolve) => setTimeout(resolve, 0));
+      setHasActiveEditorChange(false);
     }, []);
 
-    const handleUpdateSubmit = useCallback(() => {
-      completeActiveEditor().then(() => {
-        const operations = resultSetTableRef.current?.operationRecordUtils?.getOperationChangeDetail();
-        sqlPreviewExecuteRef.current?.handleExecuteSql({
-          operations: transformOperations(operations, resultData.headerList),
-          resultData,
-          callback: setSubmitLoading,
-        });
+    const getPendingEditOperations = useCallback(
+      () =>
+        resolvePendingResultEditOperations({
+          completeActiveEditor,
+          getOperations: () => resultSetTableRef.current?.operationRecordUtils?.getOperationChangeDetail(),
+        }),
+      [completeActiveEditor],
+    );
+
+    const handleUpdateSubmit = useCallback(async () => {
+      const operations = await getPendingEditOperations();
+      if (!operations.length) {
+        return;
+      }
+      sqlPreviewExecuteRef.current?.handleExecuteSql({
+        operations: transformOperations(operations, resultData.headerList),
+        resultData,
+        callback: setSubmitLoading,
       });
-    }, [completeActiveEditor, resultData]);
+    }, [getPendingEditOperations, resultData]);
 
     useEffect(() => {
       const handleKeyDown = (e: KeyboardEvent) => {
@@ -334,7 +350,7 @@ export default memo<IProps>(
         }
         if (isShortcutEventMatch(e, shortcutConfig[ShortcutAction.ResultSubmit].binding)) {
           e.preventDefault();
-          if (hasOperationRecord) {
+          if (hasPendingChanges || resultSetTableRef.current?.tableInstance?.editorManager?.editingEditor) {
             handleUpdateSubmit();
           }
         }
@@ -348,7 +364,7 @@ export default memo<IProps>(
       return () => {
         resultSetContent?.removeEventListener('keydown', handleKeyDown);
       };
-    }, [hasOperationRecord, handleSearch, handleUpdateSubmit, shortcutConfig]);
+    }, [handleSearch, handleUpdateSubmit, hasPendingChanges, shortcutConfig]);
 
     // SQL execution successful
     const handleExecuteSuccess = useCallback(() => {
@@ -384,21 +400,23 @@ export default memo<IProps>(
       resultSetTableRef.current?.operationRecordUtils?.handleDeleteRow();
     }, []);
 
-    const handleRevocation = useCallback(() => {
+    const handleRevocation = useCallback(async () => {
+      await completeActiveEditor();
       resultSetTableRef.current?.operationRecordUtils?.handleRevocation();
-    }, []);
+    }, [completeActiveEditor]);
 
     const handleOperationChange = useCallback((_hasOperationRecord) => {
       setHasOperationRecord(_hasOperationRecord);
     }, []);
 
-    const handleViewSQl = () => {
-      completeActiveEditor().then(() => {
-        const operations = resultSetTableRef.current?.operationRecordUtils?.getOperationChangeDetail();
-        sqlPreviewExecuteRef.current?.handleViewSQL({
-          operations: transformOperations(operations, resultData.headerList),
-          resultData,
-        });
+    const handleViewSQl = async () => {
+      const operations = await getPendingEditOperations();
+      if (!operations.length) {
+        return;
+      }
+      sqlPreviewExecuteRef.current?.handleViewSQL({
+        operations: transformOperations(operations, resultData.headerList),
+        resultData,
       });
     };
 
@@ -814,14 +832,20 @@ export default memo<IProps>(
 
     return (
       <>
-        <div tabIndex={0} className={cx(styles.container)} ref={resultSetRef} id={searchAreaId}>
+        <div
+          tabIndex={0}
+          data-shortcut-scope={ShortcutScope.ResultSet}
+          className={cx(styles.container)}
+          ref={resultSetRef}
+          id={searchAreaId}
+        >
           {(executing || submitLoading) && (
             <SqlExecutionLoading onCancel={executing ? stopExecuteSQL : undefined} />
           )}
           <>
             <ResultSetToolbar
               handleToolbarOperation={handleToolbarOperation}
-              hasOperationRecord={hasOperationRecord}
+              hasPendingChanges={hasPendingChanges}
               resultData={resultData}
               activeFilterCount={activeFilterCount}
               onClearAllFilters={handleClearAllFilters}
@@ -854,6 +878,7 @@ export default memo<IProps>(
                   resultData={resultData}
                   setOrderByText={setOrderByText}
                   onOperationChange={handleOperationChange}
+                  onActiveEditChange={setHasActiveEditorChange}
                   onTableOperationUtils={onTableOperationUtils}
                   onFilterCountChange={setActiveFilterCount}
                   onSelectionChange={handleSelectionChange}
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/resultEditActions.ts b/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/resultEditActions.ts
new file mode 100644
index 0000000000..9772d7c73b
--- /dev/null
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/resultEditActions.ts
@@ -0,0 +1,40 @@
+import isEqual from 'lodash/isEqual';
+
+export async function resolvePendingResultEditOperations<T>(params: {
+  completeActiveEditor: () => Promise<void>;
+  getOperations: () => T[] | undefined;
+}) {
+  await params.completeActiveEditor();
+  return params.getOperations() || [];
+}
+
+interface ResultEditorTable {
+  editorManager?: {
+    editingEditor?: {
+      getValue?: () => unknown;
+    };
+    editCell?: {
+      col: number;
+      row: number;
+    };
+  };
+  getCellOriginValue: (col: number, row: number) => unknown;
+}
+
+export function hasActiveResultEditorChange(tableInstance: ResultEditorTable | null | undefined) {
+  const editorManager = tableInstance?.editorManager;
+  const editor = editorManager?.editingEditor;
+  const editCell = editorManager?.editCell;
+  if (!tableInstance || !editor?.getValue || !editCell) {
+    return false;
+  }
+  const currentValue = editor.getValue();
+  if (currentValue === undefined) {
+    return false;
+  }
+  return !isEqual(currentValue, tableInstance.getCellOriginValue(editCell.col, editCell.row));
+}
+
+export function hasPendingResultEdit(hasOperationRecord: boolean, hasActiveEditorChange: boolean) {
+  return hasOperationRecord || hasActiveEditorChange;
+}
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/resultSetUi.test.ts b/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/resultSetUi.test.ts
index 14b04a05a4..bb3bab9d1f 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/resultSetUi.test.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/resultSetUi.test.ts
@@ -33,6 +33,12 @@ import {
   isResultHeaderContext,
   joinContextMenuGroups,
 } from '../ResultSetTable/event/onContextmenuCell/menuGroups';
+import { matchResultSearchValue } from '../FESearch/searchMatcher';
+import {
+  hasActiveResultEditorChange,
+  hasPendingResultEdit,
+  resolvePendingResultEditOperations,
+} from './resultEditActions';
 
 const exportBarSource = readFileSync('src/blocks/SearchResult/components/ExportBar/index.tsx', 'utf8');
 const tabsSource = readFileSync('src/components/Tabs/index.tsx', 'utf8');
@@ -42,6 +48,14 @@ const resultToolbarStyleSource = readFileSync(
   'src/blocks/SearchResult/components/ResultSetToolbar/style.ts',
   'utf8',
 );
+const resultToolbarSource = readFileSync(
+  'src/blocks/SearchResult/components/ResultSetToolbar/index.tsx',
+  'utf8',
+);
+const resultSetTableComponentSource = readFileSync(
+  'src/blocks/SearchResult/components/ResultSetTable/index.tsx',
+  'utf8',
+);
 const columnVisibilityModalSource = readFileSync(
   'src/blocks/SearchResult/components/ResultSetTable/ColumnVisibilityModal.tsx',
   'utf8',
@@ -58,6 +72,10 @@ const resultSetSource = readFileSync(
   'src/blocks/SearchResult/components/ResultSet/index.tsx',
   'utf8',
 );
+const sqlExecuteSource = readFileSync(
+  'src/pages/main/workspace/components/SQLExecute/index.tsx',
+  'utf8',
+);
 const headerTooltipSource = readFileSync(
   'src/blocks/SearchResult/components/ResultSetTable/hooks/useHeaderTooltip.tsx',
   'utf8',
@@ -84,6 +102,75 @@ test('query result export sends the concrete table as the task target', () => {
   assert.match(exportBarSource, /tableNames: tableName \? \[tableName\] : undefined,/);
 });
 
+test('result edit actions commit the active editor before reading pending operations', async () => {
+  const calls: string[] = [];
+  let operations: Array<{ type: string }> = [];
+  const result = await resolvePendingResultEditOperations({
+    completeActiveEditor: async () => {
+      calls.push('complete');
+      await Promise.resolve();
+      operations = [{ type: 'UPDATE' }];
+    },
+    getOperations: () => {
+      calls.push('read');
+      return operations;
+    },
+  });
+
+  assert.deepEqual(calls, ['complete', 'read']);
+  assert.deepEqual(result, [{ type: 'UPDATE' }]);
+  assert.deepEqual(
+    await resolvePendingResultEditOperations({
+      completeActiveEditor: async () => undefined,
+      getOperations: () => undefined,
+    }),
+    [],
+    'an unchanged edit cannot produce an empty preview or submit request',
+  );
+  assert.equal(hasPendingResultEdit(false, false), false);
+  assert.equal(hasPendingResultEdit(true, false), true);
+  assert.equal(hasPendingResultEdit(false, true), true);
+  const editorState = {
+    editorManager: {
+      editingEditor: { getValue: () => 'original' },
+      editCell: { col: 2, row: 1 },
+    },
+    getCellOriginValue: () => 'original',
+  };
+  assert.equal(hasActiveResultEditorChange(editorState), false);
+  editorState.editorManager.editingEditor.getValue = () => 'changed';
+  assert.equal(hasActiveResultEditorChange(editorState), true);
+  editorState.editorManager.editingEditor.getValue = () => 'original';
+  assert.equal(hasActiveResultEditorChange(editorState), false);
+  assert.match(resultToolbarSource, /disabled=\{!hasPendingChanges\}/);
+  assert.doesNotMatch(resultToolbarSource, /isActive=\{hasPendingChanges\}/);
+  assert.doesNotMatch(resultToolbarSource, /type="primary"/);
+  assert.equal(
+    resultToolbarSource.match(/hasPendingChanges && styles\.pendingAction/g)?.length,
+    3,
+    'revert, preview, and submit should highlight only their icons when changes are pending',
+  );
+  assert.match(resultSetTableComponentSource, /tableElement\.addEventListener\('input', syncActiveEditState, true\)/);
+  assert.doesNotMatch(resultSetTableComponentSource, /document\.addEventListener\('(input|change)'/);
+  assert.match(
+    resultSetSource,
+    /const handleRevocation = useCallback\(async \(\) => \{[\s\S]*?await completeActiveEditor\(\);[\s\S]*?operationRecordUtils\?\.handleRevocation\(\)/,
+  );
+  assert.match(
+    resultSetSource,
+    /const operations = await getPendingEditOperations\(\);[\s\S]*?if \(!operations\.length\) \{[\s\S]*?return;/,
+  );
+  assert.match(resultSetSource, /data-shortcut-scope=\{ShortcutScope\.ResultSet\}/);
+});
+
+test('result table sorting and paging refresh the current result instead of creating a console result', () => {
+  assert.doesNotMatch(sqlExecuteSource, /onResultPagingChange=\{handleResultPagingChange\}/);
+  assert.match(
+    resultSetSource,
+    /const requestSequence = \+\+executeRequestSequenceRef\.current;[\s\S]*?executeSQL\(executeSqlParams\)[\s\S]*?setResultData\(/,
+  );
+});
+
 test('manage-columns title exposes an aligned localized help tooltip', () => {
   assert.match(columnVisibilityModalSource, /<CircleHelp aria-hidden="true" size=\{14\} \/>/);
   assert.match(columnVisibilityModalSource, /i18n\('common\.text\.manageColumns\.tooltip'\)/);
@@ -129,6 +216,18 @@ test('result search escape and close action use the same close lifecycle', () =>
   assert.deepEqual(calls, ['close']);
 });
 
+test('result search matches custom-rendered field names and regular cell values', () => {
+  const table = {
+    columns: [{ field: '1', originalData: { name: 'record_primary_key' } }],
+    getHeaderField: (col: number) => (col === 1 ? '1' : undefined),
+    isHeader: (_col: number, row: number) => row === 0,
+  } as any;
+
+  assert.equal(matchResultSearchValue('primary', '', { col: 1, row: 0, table }), true);
+  assert.equal(matchResultSearchValue('missing', '', { col: 1, row: 0, table }), false);
+  assert.equal(matchResultSearchValue('customer', 'customer-001', { col: 1, row: 1, table }), true);
+});
+
 test('record field focus updates the cell used by the value inspector', () => {
   assert.match(rowDetailSource, /onFocus=\{\(\) => handleFieldActivate\(item\)\}/);
   assert.match(rowDetailSource, /onActiveFieldChange\?\.\(\{[\s\S]*?field: item\.field,[\s\S]*?\}\);/);
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/viewTablePagingFlow.test.ts b/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/viewTablePagingFlow.test.ts
index a282b2be71..012e5923cb 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/viewTablePagingFlow.test.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSet/viewTablePagingFlow.test.ts
@@ -155,16 +155,18 @@ test('table browse flows from the initial response through filtered 50000-row st
 
   const replacedResults = replaceViewTableResult([initialResult], transition.completedResult!);
   assert.equal(replacedResults[0].uuid, initialUuid, 'completion preserves the mounted result identity');
+  assert.equal(replacedResults[0].originalSql, BASE_SQL, 'completion preserves the original table query');
+  const nextSortedSql = composeResultQuery({
+    databaseType: DatabaseTypeCode.MYSQL,
+    orderByValue: 'status ASC',
+    originalSql: replacedResults[0].originalSql,
+  });
   assert.equal(
-    composeResultQuery({
-      databaseType: DatabaseTypeCode.MYSQL,
-      filterValue: "status = 'ACTIVE'",
-      orderByValue: 'id DESC',
-      originalSql: initialResult.originalSql,
-    }),
-    filteredSql,
-    'later searches continue composing from the stable base query instead of nesting prior filters',
+    nextSortedSql,
+    `${BASE_SQL} ORDER BY status ASC`,
+    'later searches compose from the stable base query instead of nesting the previous sort',
   );
+  assert.equal(nextSortedSql.match(/\bORDER\s+BY\b/gi)?.length, 1, 'consecutive grid sorts emit one ORDER BY clause');
 });
 
 test('table browse SQL normalization follows originalSql, sql, then request SQL', () => {
@@ -224,6 +226,31 @@ test('a cancelled table browse never publishes its buffered partial rows', () =>
   assert.equal(transition.completedResult, undefined, 'cancellation leaves the visible completed result untouched');
 });
 
+test('a failed filter keeps the mounted table and allows a corrected query to replace it', () => {
+  const [initialResult] = normalizeViewTablePageResults([result()], { sql: BASE_SQL, dataSourceId: 42 });
+  const failedParams = { ...initialResult.executeSqlParams!, sql: `${BASE_SQL} WHERE %asda` };
+  const failed = reduceViewTablePagingEvent(
+    createViewTablePagingState(1, failedParams),
+    event('resultFinished', result({ success: false, headerList: [], message: 'Invalid WHERE condition' })),
+    1,
+  );
+
+  assert.equal(failed.completedResult, undefined, 'a SQL error must not replace and unmount the table');
+  assert.equal(failed.state.result?.message, 'Invalid WHERE condition', 'the request retains the error to report');
+
+  const correctedParams = { ...failedParams, sql: `${BASE_SQL} WHERE id = 1` };
+  const corrected = reduceViewTablePagingEvent(
+    createViewTablePagingState(2, correctedParams),
+    event('resultFinished', result({ dataList: [[{ value: '1' }]] as any })),
+    2,
+  );
+  assert.ok(corrected.completedResult);
+  const [replaced] = replaceViewTableResult([initialResult], corrected.completedResult);
+  assert.equal(replaced.uuid, initialResult.uuid);
+  assert.equal(replaced.originalSql, BASE_SQL);
+  assert.deepEqual(replaced.dataList, [[{ value: '1' }]]);
+});
+
 test('table browse cancellation targets the active JCEF execution and releases the request', async () => {
   const tracker = createSqlExecutionRequestTracker();
   const requestSequence = beginSqlExecutionRequest(tracker)!;
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/index.tsx b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/index.tsx
index 8d5e3de83d..f074527858 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/index.tsx
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/index.tsx
@@ -37,7 +37,8 @@ import {
 } from './columnState';
 import { resolveResultSelectionActiveCell, ResultSelectionCause } from './selectionState';
 import { RESULT_TABLE_CONTENT_LAYOUT_OPTIONS } from './layoutOptions';
-import { capResultTableAutoRowHeights } from './rowHeight';
+import { resetResultTableLayout, updateResultTableRowExpansion } from './rowHeight';
+import { hasActiveResultEditorChange } from '../ResultSet/resultEditActions';
 
 interface IProps {
   className?: string;
@@ -50,6 +51,7 @@ interface IProps {
   setTableInstance: (tableInstance: ITableInstance) => void;
   setOrderByText?: (orderByText: string) => void;
   onFilterCountChange?: (count: number) => void;
+  onActiveEditChange?: (hasChange: boolean) => void;
   onSelectionChange?: (selection: IResultSetSelection) => void;
 }
 
@@ -128,6 +130,40 @@ const ResultSetTable = forwardRef((props: IProps, ref: ForwardedRef<ResultSetTab
     theme,
   });
 
+  useEffect(() => {
+    if (!tableInstance || !props.onActiveEditChange) {
+      return;
+    }
+    let frameId: number | null = null;
+    const syncActiveEditState = () => {
+      if (frameId !== null) {
+        cancelAnimationFrame(frameId);
+      }
+      frameId = requestAnimationFrame(() => {
+        frameId = null;
+        props.onActiveEditChange?.(hasActiveResultEditorChange(tableInstance));
+      });
+    };
+    const eventIds = [
+      tableInstance.on('click_cell', syncActiveEditState),
+      tableInstance.on('dblclick_cell', syncActiveEditState),
+      tableInstance.on('keydown', syncActiveEditState),
+      tableInstance.on('change_cell_value', syncActiveEditState),
+    ];
+    const tableElement = tableInstance.getElement();
+    tableElement.addEventListener('input', syncActiveEditState, true);
+    tableElement.addEventListener('change', syncActiveEditState, true);
+    syncActiveEditState();
+    return () => {
+      if (frameId !== null) {
+        cancelAnimationFrame(frameId);
+      }
+      eventIds.forEach((eventId) => tableInstance.off(eventId));
+      tableElement.removeEventListener('input', syncActiveEditState, true);
+      tableElement.removeEventListener('change', syncActiveEditState, true);
+    };
+  }, [props.onActiveEditChange, tableInstance]);
+
   // Filter and sort
   const { activeFilterCount, clearAllFilters } = useFilterAndSort({
     theme,
@@ -164,9 +200,9 @@ const ResultSetTable = forwardRef((props: IProps, ref: ForwardedRef<ResultSetTab
     if (!tableInstance) {
       return;
     }
-    const capAutoRowHeights = () => capResultTableAutoRowHeights(tableInstance);
-    const eventId = tableInstance.on('after_render', capAutoRowHeights);
-    capAutoRowHeights();
+    const eventId = tableInstance.on('resize_row_end', ({ row, rowHeight }) => {
+      updateResultTableRowExpansion(tableInstance, row, rowHeight);
+    });
     return () => tableInstance.off(eventId);
   }, [tableInstance]);
 
@@ -406,12 +442,17 @@ const ResultSetTable = forwardRef((props: IProps, ref: ForwardedRef<ResultSetTab
     interactionRevisionRef.current += 1;
   }, []);
 
+  const handleBeforeRecordsChange = useCallback((table: ITableInstance) => {
+    resetResultTableLayout(table);
+  }, []);
+
   return (
     <>
       <CanvasTable
         columns={columns}
         records={records}
         onInit={onInit}
+        onBeforeRecordsChange={handleBeforeRecordsChange}
         className={styles.canvasTable}
         onCopy={onCopy}
         onPaste={onPaste}
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/layoutOptions.test.ts b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/layoutOptions.test.ts
index ea9c6fe966..b406a0d843 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/layoutOptions.test.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/layoutOptions.test.ts
@@ -2,10 +2,10 @@ import assert from 'node:assert/strict';
 import test from 'node:test';
 import { RESULT_TABLE_CONTENT_LAYOUT_OPTIONS } from './layoutOptions';
 
-test('result tables measure multiline cell content instead of clipping it', () => {
+test('result tables keep fixed rows while allowing wrapped content on demand', () => {
   assert.deepEqual(RESULT_TABLE_CONTENT_LAYOUT_OPTIONS, {
     autoWrapText: true,
-    heightMode: 'autoHeight',
+    heightMode: 'standard',
     maxCharactersNumber: Number.MAX_SAFE_INTEGER,
   });
 });
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/layoutOptions.ts b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/layoutOptions.ts
index 6f03a2a465..41d58157db 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/layoutOptions.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/layoutOptions.ts
@@ -1,9 +1,7 @@
-export const RESULT_TABLE_MAX_AUTO_ROW_HEIGHT = 240;
-
 export const RESULT_TABLE_CONTENT_LAYOUT_OPTIONS = {
   autoWrapText: true,
-  heightMode: 'autoHeight',
-  // VTable defaults to truncating every cell after 200 characters. Large values
-  // are handled by the cell metadata renderer; ordinary result text remains complete.
+  heightMode: 'standard',
+  // Collapsed long cells use a bounded custom preview. Keep the full value available
+  // for a row after the user explicitly resizes it.
   maxCharactersNumber: Number.MAX_SAFE_INTEGER,
 } as const;
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/rowHeight.test.ts b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/rowHeight.test.ts
index 9d03477952..d50b2d4bcc 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/rowHeight.test.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/rowHeight.test.ts
@@ -1,48 +1,112 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 import type { ITableInstance } from '@/blocks/CanvasTable/typings';
-import { capResultTableAutoRowHeights } from './rowHeight';
+import {
+  getCollapsedResultCellPreview,
+  isResultTableRowExpanded,
+  resetResultTableLayout,
+  updateResultTableRowExpansion,
+  RESULT_TABLE_CELL_PREVIEW_CHARACTERS,
+} from './rowHeight';
 
 function tableFixture(overrides: Partial<ITableInstance> = {}) {
   const heights = new Map<number, number>([
     [0, 32],
-    [1, 520],
-    [2, 360],
+    [1, 28],
+    [2, 120],
     [3, 28],
   ]);
-  const resizedRows = new Set([2]);
-  const resized: Array<[number, number]> = [];
+  const refreshed: Array<[number, number]> = [];
+  let scheduledFrames = 0;
+  let clearedSelections = 0;
+  let clearedRowHeightCaches = 0;
   const table = {
-    heightMode: 'autoHeight',
+    colCount: 4,
     rowCount: 4,
     columnHeaderLevelCount: 1,
     bottomFrozenRowCount: 0,
-    getRowHeight: (row: number) => heights.get(row) || 0,
-    internalProps: { _heightResizedRowMap: resizedRows },
+    getDefaultRowHeight: () => 28,
+    getRowHeight: (row: number) => heights.get(row) || 28,
+    internalProps: { _heightResizedRowMap: new Set([2]) },
+    clearSelected: () => {
+      clearedSelections += 1;
+    },
+    clearRowHeightCache: () => {
+      clearedRowHeightCaches += 1;
+    },
     scenegraph: {
-      setRowHeight: (row: number, height: number) => {
-        heights.set(row, height);
-        resized.push([row, height]);
+      updateCellContent: (col: number, row: number) => refreshed.push([col, row]),
+      updateNextFrame: () => {
+        scheduledFrames += 1;
       },
     },
     ...overrides,
   } as unknown as ITableInstance;
-  return { table, heights, resized };
+  return {
+    table,
+    heights,
+    refreshed,
+    scheduledFrames: () => scheduledFrames,
+    clearedSelections: () => clearedSelections,
+    clearedRowHeightCaches: () => clearedRowHeightCaches,
+  };
 }
 
-test('caps automatic rows while preserving manually resized rows', () => {
-  const { table, heights, resized } = tableFixture();
+test('keeps short single-line values on the default renderer', () => {
+  assert.equal(getCollapsedResultCellPreview('short value', false), undefined);
+});
+
+test('builds a bounded single-line preview for collapsed long and multiline values', () => {
+  assert.equal(
+    getCollapsedResultCellPreview('x'.repeat(RESULT_TABLE_CELL_PREVIEW_CHARACTERS + 20), false),
+    `${'x'.repeat(RESULT_TABLE_CELL_PREVIEW_CHARACTERS)}...`,
+  );
+  assert.equal(getCollapsedResultCellPreview('first\r\nsecond', false), 'first second...');
+});
+
+test('does not expand a row while VTable is still resizing it', () => {
+  const { table } = tableFixture();
+
+  assert.equal(table.internalProps._heightResizedRowMap.has(2), true);
+  assert.equal(isResultTableRowExpanded(table, 2), false);
+});
+
+test('expands only after resize ends and collapses again at the default height', () => {
+  const { table, heights, refreshed, scheduledFrames } = tableFixture();
+
+  assert.equal(updateResultTableRowExpansion(table, 2, 120), 3);
+  assert.equal(isResultTableRowExpanded(table, 2), true);
+  assert.equal(getCollapsedResultCellPreview('first\nsecond', true), undefined);
+  assert.deepEqual(refreshed, [
+    [1, 2],
+    [2, 2],
+    [3, 2],
+  ]);
+  assert.equal(scheduledFrames(), 1);
+
+  heights.set(2, 28);
+  assert.equal(updateResultTableRowExpansion(table, 2, 28), 3);
+  assert.equal(isResultTableRowExpanded(table, 2), false);
+  assert.equal(scheduledFrames(), 2);
+});
+
+test('drops stale expansion state when VTable resets a row height', () => {
+  const { table, heights } = tableFixture();
 
-  assert.equal(capResultTableAutoRowHeights(table, 240), 1);
-  assert.equal(heights.get(1), 240);
-  assert.equal(heights.get(2), 360);
-  assert.deepEqual(resized, [[1, 240]]);
+  updateResultTableRowExpansion(table, 2, 120);
+  heights.set(2, 28);
+
+  assert.equal(isResultTableRowExpanded(table, 2), false);
 });
 
-test('does not cap rows when the table is not in auto-height mode', () => {
-  const { table, heights, resized } = tableFixture({ heightMode: 'standard' } as Partial<ITableInstance>);
+test('resets row layout and selection before records are replaced', () => {
+  const { table, clearedSelections, clearedRowHeightCaches } = tableFixture();
+
+  updateResultTableRowExpansion(table, 2, 120);
+  resetResultTableLayout(table);
 
-  assert.equal(capResultTableAutoRowHeights(table, 240), 0);
-  assert.equal(heights.get(1), 520);
-  assert.deepEqual(resized, []);
+  assert.equal(isResultTableRowExpanded(table, 2), false);
+  assert.equal(table.internalProps._heightResizedRowMap.size, 0);
+  assert.equal(clearedSelections(), 1);
+  assert.equal(clearedRowHeightCaches(), 1);
 });
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/rowHeight.ts b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/rowHeight.ts
index 4a6a8310b3..f9148dcf1d 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/rowHeight.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/rowHeight.ts
@@ -1,27 +1,73 @@
 import type { ITableInstance } from '@/blocks/CanvasTable/typings';
-import { RESULT_TABLE_MAX_AUTO_ROW_HEIGHT } from './layoutOptions';
 
-/** Keep automatic rows readable without preventing manual row resizing. */
-export function capResultTableAutoRowHeights(
-  table: ITableInstance,
-  maxHeight = RESULT_TABLE_MAX_AUTO_ROW_HEIGHT,
+export const RESULT_TABLE_CELL_PREVIEW_CHARACTERS = 200;
+const expandedRowsByTable = new WeakMap<object, Set<number>>();
+
+function getExpandedRows(table: object) {
+  let expandedRows = expandedRowsByTable.get(table);
+  if (!expandedRows) {
+    expandedRows = new Set();
+    expandedRowsByTable.set(table, expandedRows);
+  }
+  return expandedRows;
+}
+
+export function isResultTableRowExpanded(
+  table: Pick<ITableInstance, 'getDefaultRowHeight' | 'getRowHeight'>,
+  row: number,
 ) {
-  if (table.heightMode !== 'autoHeight' || !Number.isFinite(maxHeight) || maxHeight <= 0) {
-    return 0;
+  const expandedRows = expandedRowsByTable.get(table);
+  if (!expandedRows?.has(row)) {
+    return false;
+  }
+  if (table.getRowHeight(row) <= table.getDefaultRowHeight(row)) {
+    expandedRows.delete(row);
+    return false;
+  }
+  return true;
+}
+
+export function getCollapsedResultCellPreview(
+  value: unknown,
+  expanded: boolean,
+  maxCharacters = RESULT_TABLE_CELL_PREVIEW_CHARACTERS,
+) {
+  if (expanded || typeof value !== 'string' || !Number.isFinite(maxCharacters) || maxCharacters <= 0) {
+    return undefined;
   }
 
-  const resizedRows = table.internalProps._heightResizedRowMap;
+  if (value.length <= maxCharacters && !/\r|\n/.test(value)) {
+    return undefined;
+  }
+
+  const preview = value.slice(0, maxCharacters).replace(/\r\n?|\n/g, ' ');
+  return `${preview}...`;
+}
+
+export function updateResultTableRowExpansion(table: ITableInstance, row: number, rowHeight: number) {
   const firstBodyRow = table.columnHeaderLevelCount;
   const lastBodyRow = table.rowCount - table.bottomFrozenRowCount;
-  let cappedRows = 0;
+  if (row < firstBodyRow || row >= lastBodyRow) {
+    return 0;
+  }
+
+  const expandedRows = getExpandedRows(table);
+  if (rowHeight > table.getDefaultRowHeight(row)) {
+    expandedRows.add(row);
+  } else {
+    expandedRows.delete(row);
+  }
 
-  for (let row = firstBodyRow; row < lastBodyRow; row += 1) {
-    if (resizedRows.has(row) || table.getRowHeight(row) <= maxHeight) {
-      continue;
-    }
-    table.scenegraph.setRowHeight(row, maxHeight);
-    cappedRows += 1;
+  for (let col = 1; col < table.colCount; col += 1) {
+    table.scenegraph.updateCellContent(col, row);
   }
+  table.scenegraph.updateNextFrame();
+  return Math.max(0, table.colCount - 1);
+}
 
-  return cappedRows;
+export function resetResultTableLayout(table: ITableInstance) {
+  expandedRowsByTable.delete(table);
+  table.internalProps._heightResizedRowMap.clear();
+  table.clearSelected();
+  table.clearRowHeightCache();
 }
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/utils/dataTreating.ts b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/utils/dataTreating.ts
index fa4de1cb5f..cc55bb7228 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/utils/dataTreating.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetTable/utils/dataTreating.ts
@@ -5,6 +5,7 @@ import i18n from '@/i18n';
 import { resolveResultSetEditor } from './editorType';
 import type { HeaderMetadataVisibility } from '../headerMetadata';
 import { createResultHeaderCustomRender } from '../headerRender';
+import { getCollapsedResultCellPreview, isResultTableRowExpanded } from '../rowHeight';
 
 const handleDataDisplay = (params: {
   data: ITableHeaderItem;
@@ -146,6 +147,32 @@ const handleDataDisplay = (params: {
           expectedWidth: 90,
         };
       }
+      const collapsedPreview = getCollapsedResultCellPreview(
+        args.dataValue,
+        isResultTableRowExpanded(args.table, args.row),
+      );
+      if (collapsedPreview !== undefined) {
+        return {
+          elements: [
+            {
+              type: 'text',
+              fill: theme.colorText,
+              fontSize: customFontSize,
+              fontFamily: theme.fontFamily,
+              fontWeight: 400,
+              text: collapsedPreview,
+              x: 6,
+              y: 19,
+              maxLineWidth: Math.max(0, (args.rect?.width ?? 160) - 12),
+              heightLimit: 20,
+              lineClamp: 1,
+              ellipsis: true,
+            },
+          ],
+          expectedHeight: 28,
+          expectedWidth: 160,
+        };
+      }
       return {
         renderDefault: true,
       };
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetToolbar/index.tsx b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetToolbar/index.tsx
index 801d67d67d..73fd4f8172 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetToolbar/index.tsx
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetToolbar/index.tsx
@@ -35,7 +35,7 @@ const RESULT_TOOLBAR_BUTTON_SIZE = {
 interface IProps {
   resultData: IManageResultData;
   handleToolbarOperation: (type: ToolbarOperationType, paging?: ResultPaging) => void;
-  hasOperationRecord: boolean;
+  hasPendingChanges: boolean;
   activeFilterCount?: number;
   onClearAllFilters?: () => void;
   onManageColumns: () => void;
@@ -44,7 +44,7 @@ interface IProps {
 const ResultSetToolbar = (props: IProps) => {
   const {
     resultData,
-    hasOperationRecord,
+    hasPendingChanges,
     handleToolbarOperation,
     activeFilterCount = 0,
     onClearAllFilters,
@@ -176,8 +176,8 @@ const ResultSetToolbar = (props: IProps) => {
           />
           {/* Undo. */}
           <IconButton
-            className={styles.toolbarAction}
-            // disabled={revokeDisableBarState}
+            className={cx(styles.toolbarAction, hasPendingChanges && styles.pendingAction)}
+            disabled={!hasPendingChanges}
             title={i18n('editTableData.tips.revert')}
             onClick={() => {
               handleToolbarOperation(ToolbarOperationType.REVOKE);
@@ -187,8 +187,8 @@ const ResultSetToolbar = (props: IProps) => {
           />
           {/* View SQL. */}
           <IconButton
-            className={styles.toolbarAction}
-            disabled={!hasOperationRecord}
+            className={cx(styles.toolbarAction, hasPendingChanges && styles.pendingAction)}
+            disabled={!hasPendingChanges}
             title={i18n('editTableData.tips.previewPendingChanges')}
             onClick={() => {
               handleToolbarOperation(ToolbarOperationType.VIEW_SQL);
@@ -198,8 +198,8 @@ const ResultSetToolbar = (props: IProps) => {
           />
           {/* Submit for execution. */}
           <IconButton
-            className={styles.toolbarAction}
-            disabled={!hasOperationRecord}
+            className={cx(styles.toolbarAction, hasPendingChanges && styles.pendingAction)}
+            disabled={!hasPendingChanges}
             title={i18n('editTableData.tips.submit') + `${keyboardKey.command} + S`}
             onClick={() => {
               handleToolbarOperation(ToolbarOperationType.UPDATE_SUBMIT);
@@ -250,7 +250,7 @@ const ResultSetToolbar = (props: IProps) => {
 export default memo(ResultSetToolbar, (prevProps, nextProps) => {
   return isEqualMemo(
     [prevProps.resultData, nextProps.resultData],
-    [prevProps.hasOperationRecord, nextProps.hasOperationRecord],
+    [prevProps.hasPendingChanges, nextProps.hasPendingChanges],
     [prevProps.handleToolbarOperation, nextProps.handleToolbarOperation],
     [prevProps.activeFilterCount, nextProps.activeFilterCount],
     [prevProps.onClearAllFilters, nextProps.onClearAllFilters],
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetToolbar/style.ts b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetToolbar/style.ts
index 6dcfe69c6c..3f0eb0b9d9 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ResultSetToolbar/style.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ResultSetToolbar/style.ts
@@ -41,6 +41,13 @@ export const useStyles = createStyles(({ css, token }) => {
         color: ${token.colorText};
       }
     `,
+    pendingAction: css`
+      &&,
+      && i,
+      && svg {
+        color: ${token.colorPrimary};
+      }
+    `,
     toolBarRight: css`
       flex: 1;
       flex-shrink: 0;
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/index.tsx b/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/index.tsx
index e202c19b5d..27d9513646 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/index.tsx
+++ b/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/index.tsx
@@ -4,7 +4,6 @@ import { Modal } from 'antd';
 import i18n from '@/i18n';
 import ExecuteSQL, { IExecuteSQLRef } from '@/components/ExecuteSQL';
 import executeSql from '@/service/executeSql';
-import useSqlExecutor from '@/hooks/useSqlExecutor';
 import { getRequestErrorMessage, resolveUpdateExecuteParams } from './updateSql';
 
 interface IProps {
@@ -26,15 +25,8 @@ const SQLPreviewExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLPrevie
   const [executeSqlParams, setExecuteSqlParams] = useState<any>(null);
   const executeSQLRef = useRef<IExecuteSQLRef>();
   const executePendingRef = useRef(false);
-  const { executeSQL, canExecuteSQL } = useSqlExecutor();
 
   const getUpdateDataSql = ({ operations, resultData }) => {
-    if (!operations.length) {
-      return Promise.resolve({
-        ...(resultData.executeSqlParams || {}),
-        sql: '',
-      });
-    }
     return resolveUpdateExecuteParams({
       operations,
       resultData,
@@ -52,21 +44,21 @@ const SQLPreviewExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLPrevie
   };
 
   const handleExecuteSql = ({ operations, resultData, callback }) => {
-    if (executePendingRef.current || !canExecuteSQL()) {
+    if (executePendingRef.current) {
       return;
     }
     executePendingRef.current = true;
     callback?.(true);
     Promise.resolve()
       .then(() => getUpdateDataSql({ operations, resultData }))
-      .then((res) => executeSQL(res))
+      .then((res) => executeSql.executeUpdateDataSql(res))
       .then((_res) => {
-        if (_res?.[0]?.success === true) {
+        if (_res?.success === true) {
           onExecuteSuccess?.();
           setViewUpdateDataSqlModal(false);
           setUpdateDataSql('');
         } else {
-          onExecuteError?.(_res?.[0]?.message || '');
+          onExecuteError?.(_res?.message || '');
         }
       })
       .catch((error) => {
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/updateSql.test.ts b/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/updateSql.test.ts
index 04ab56b4d5..099c0fe844 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/updateSql.test.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/updateSql.test.ts
@@ -22,6 +22,15 @@ const resultData = {
     databaseType: 'MYSQL',
     dataSourceId: 46,
     databaseName: 'enterprise_gateway_dev',
+    schemaName: 'test_schema',
+    sql: 'SELECT * FROM ai_chat_message',
+    single: true,
+    explain: true,
+    errorContinue: true,
+    pageNo: 3,
+    pageSize: 50,
+    consoleId: 12,
+    applyId: 13,
     resultSetId: 1,
   },
   dataList: [
@@ -58,12 +67,14 @@ assertEqual(
 assertEqual(
   buildUpdateSqlRequestParams([operationWithOldDataList], resultData),
   {
-    ...resultData.executeSqlParams,
+    dataSourceId: 46,
+    databaseName: 'enterprise_gateway_dev',
+    schemaName: 'test_schema',
     tableName: 'ai_chat_message',
     headerList: resultData.headerList,
     operations: [operationWithOldDataList],
   },
-  'update SQL request keeps table metadata and operation payload together',
+  'update SQL generation uses connection context and table edits without query execution options',
 );
 
 assertEqual(
@@ -100,6 +111,49 @@ async function main() {
     'resolved execute params keep the full multiline generated SQL',
   );
 
+  assertEqual(
+    resolved,
+    {
+      dataSourceId: 46,
+      databaseName: 'enterprise_gateway_dev',
+      schemaName: 'test_schema',
+      sql: resolved.sql,
+    },
+    'table edits only inherit connection context from the original query',
+  );
+
+  const batchSql = 'UPDATE example_table SET value = 904 WHERE id = 1;\nUPDATE example_table SET value = 904 WHERE id = 2;';
+  const batch = await resolveUpdateExecuteParams({
+    operations: [operationWithOldDataList, { ...operationWithOldDataList, rowId: 'row-2' }],
+    resultData,
+    getUpdateDataSql: async () => batchSql,
+  });
+  assertEqual(
+    batch,
+    { dataSourceId: 46, databaseName: 'enterprise_gateway_dev', schemaName: 'test_schema', sql: batchSql },
+    'multi-row edits preserve the generated script without inheriting single-statement mode',
+  );
+
+  const empty = await resolveUpdateExecuteParams({
+    operations: [],
+    resultData,
+    getUpdateDataSql: async () => { throw new Error('empty edits must not request SQL generation'); },
+  });
+  assertEqual(empty.sql, '', 'empty edits do not execute the original query');
+
+  let generationCalled = false;
+  try {
+    await resolveUpdateExecuteParams({
+      operations: [operationWithOldDataList],
+      resultData: { ...resultData, executeSqlParams: undefined },
+      getUpdateDataSql: async () => { generationCalled = true; return batchSql; },
+    });
+    throw new Error('missing connection context must be rejected');
+  } catch (error) {
+    assertEqual(getRequestErrorMessage(error), 'dataSourceId is required', 'missing connection is rejected');
+  }
+  assertEqual(generationCalled, false, 'missing connection cannot generate or execute SQL');
+
   console.log('SQLPreviewExecute update SQL tests passed');
 }
 
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/updateSql.ts b/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/updateSql.ts
index 995e658e75..c206ad3432 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/updateSql.ts
+++ b/chat2db-community-client/src/blocks/SearchResult/components/SQLPreviewExecute/updateSql.ts
@@ -1,3 +1,5 @@
+import type { IDataSourceExecutionContext, ITableEditExecuteRequest } from '@/service/dmlRequest';
+
 export interface UpdateSqlOperation {
   rowId?: string | number;
   type?: string;
@@ -9,7 +11,7 @@ export interface UpdateSqlResultData {
   tableName?: string;
   headerList?: any[];
   dataList?: Array<Array<{ value?: any } | null | undefined>>;
-  executeSqlParams?: Record<string, any>;
+  executeSqlParams?: Partial<IDataSourceExecutionContext>;
 }
 
 export function appendMissingOldDataList(operations: UpdateSqlOperation[], resultData: UpdateSqlResultData) {
@@ -26,8 +28,14 @@ export function appendMissingOldDataList(operations: UpdateSqlOperation[], resul
 }
 
 export function buildUpdateSqlRequestParams(operations: UpdateSqlOperation[], resultData: UpdateSqlResultData) {
+  const { dataSourceId, databaseName, schemaName } = resultData.executeSqlParams || {};
+  if (dataSourceId == null) {
+    throw new Error('dataSourceId is required');
+  }
   return {
-    ...(resultData.executeSqlParams || {}),
+    dataSourceId,
+    databaseName,
+    schemaName,
     tableName: resultData.tableName,
     headerList: resultData.headerList,
     operations: appendMissingOldDataList(operations, resultData),
@@ -38,10 +46,13 @@ export async function resolveUpdateExecuteParams(params: {
   operations: UpdateSqlOperation[];
   resultData: UpdateSqlResultData;
   getUpdateDataSql: (requestParams: any) => Promise<string>;
-}) {
-  const sql = await params.getUpdateDataSql(buildUpdateSqlRequestParams(params.operations, params.resultData));
+}): Promise<ITableEditExecuteRequest> {
+  const request = buildUpdateSqlRequestParams(params.operations, params.resultData);
+  const sql = params.operations.length ? await params.getUpdateDataSql(request) : '';
   return {
-    ...(params.resultData.executeSqlParams || {}),
+    dataSourceId: request.dataSourceId,
+    databaseName: request.databaseName,
+    schemaName: request.schemaName,
     sql,
   };
 }
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ScreeningResult/index.tsx b/chat2db-community-client/src/blocks/SearchResult/components/ScreeningResult/index.tsx
index 0ff75879f4..7b3db67526 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ScreeningResult/index.tsx
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ScreeningResult/index.tsx
@@ -1,6 +1,8 @@
 import React, { memo, useEffect, forwardRef, ForwardedRef, useImperativeHandle } from 'react';
 import classnames from 'classnames';
-import SingleFileMonacoEditor from '@/components/SingleFileMonacoEditor';
+import SingleFileMonacoEditor, {
+  ISingleFileMonacoEditorRefFunction,
+} from '@/components/SingleFileMonacoEditor';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import { useStyles } from './style';
 import { useUpdateEffect } from 'ahooks';
@@ -60,8 +62,8 @@ const ScreeningResult = forwardRef((props: IProps, ref: ForwardedRef<IScreeningR
   const [isActive, setIsActive] = React.useState(false);
   const keywordHintRef = React.useRef<any>(null);
   const fieldHintRef = React.useRef<any>(null);
-  const whereSingleFileMonacoEditorRef = React.useRef<any>(null);
-  const orderBySingleFileMonacoEditorRef = React.useRef<any>(null);
+  const whereSingleFileMonacoEditorRef = React.useRef<ISingleFileMonacoEditorRefFunction>(null);
+  const orderBySingleFileMonacoEditorRef = React.useRef<ISingleFileMonacoEditorRefFunction>(null);
 
   useEffect(() => {
     keywordHintRef.current && keywordHintRef.current.dispose();
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ViewData/JsonAwareMonacoEditor.tsx b/chat2db-community-client/src/blocks/SearchResult/components/ViewData/JsonAwareMonacoEditor.tsx
index cc7d0dda6e..6ff97169c0 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ViewData/JsonAwareMonacoEditor.tsx
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ViewData/JsonAwareMonacoEditor.tsx
@@ -6,6 +6,7 @@ import MonacoEditor, { IEditorIns } from '@/components/MonacoEditor';
 interface IProps {
   id: string;
   value: string;
+  resetViewRevision: number;
   readOnly: boolean;
   onChange: (value: string) => void;
   onJsonChange: (isJson: boolean) => void;
@@ -16,7 +17,7 @@ interface JsonValidationWorker {
   parseJSONDocument: (uri: string) => Promise<monaco.languages.json.JSONDocument | null>;
 }
 
-const JsonAwareMonacoEditor = ({ id, value, readOnly, onChange, onJsonChange }: IProps) => {
+const JsonAwareMonacoEditor = ({ id, value, resetViewRevision, readOnly, onChange, onJsonChange }: IProps) => {
   const editorRef = useRef<IEditorIns | null>(null);
   const changeDisposerRef = useRef<{ dispose: () => void } | null>(null);
   const validationModelRef = useRef<monaco.editor.ITextModel | null>(null);
@@ -107,6 +108,15 @@ const JsonAwareMonacoEditor = ({ id, value, readOnly, onChange, onJsonChange }:
     editorRef.current?.updateOptions({ readOnly });
   }, [readOnly]);
 
+  useEffect(() => {
+    const editor = editorRef.current;
+    if (!editor) {
+      return;
+    }
+    editor.setPosition({ lineNumber: 1, column: 1 });
+    editor.setScrollPosition({ scrollTop: 0, scrollLeft: 0 });
+  }, [resetViewRevision]);
+
   useEffect(() => {
     return () => {
       validationVersionRef.current += 1;
diff --git a/chat2db-community-client/src/blocks/SearchResult/components/ViewData/index.tsx b/chat2db-community-client/src/blocks/SearchResult/components/ViewData/index.tsx
index 06ebddd732..19f900db8c 100644
--- a/chat2db-community-client/src/blocks/SearchResult/components/ViewData/index.tsx
+++ b/chat2db-community-client/src/blocks/SearchResult/components/ViewData/index.tsx
@@ -72,6 +72,7 @@ export interface ViewDataRef {
 const ViewData = forwardRef((_props: IProps, ref: ForwardedRef<ViewDataRef>) => {
   const [viewData, setViewData] = useState<IViewData | null>(null);
   const [editorValue, setEditorContent] = useState('');
+  const [editorViewRevision, setEditorViewRevision] = useState(0);
   const [isJsonContent, setIsJsonContent] = useState(false);
   const activeViewDataRef = useRef<IViewData | null>(null);
   const editorValueRef = useRef('');
@@ -414,13 +415,21 @@ const ViewData = forwardRef((_props: IProps, ref: ForwardedRef<ViewDataRef>) =>
     applyEditorValue(value);
   };
 
+  const applyJsonPresentation = (value: string) => {
+    setEditorContent(value);
+    setEditorViewRevision((revision) => revision + 1);
+    if (!isLargeValue) {
+      applyEditorValue(value);
+    }
+  };
+
   const formatJson = () => {
     try {
       const parsed = JSON.parse(editorValue);
       const formatted = JSON.stringify(parsed, null, 2);
-      handleEditorValueChange(formatted);
+      applyJsonPresentation(formatted);
     } catch (err) {
-      console.error('无效的 JSON 格式，请检查语法', err);
+      console.error('Invalid JSON format. Check the syntax.', err);
     }
   };
 
@@ -428,9 +437,9 @@ const ViewData = forwardRef((_props: IProps, ref: ForwardedRef<ViewDataRef>) =>
     try {
       const parsed = JSON.parse(editorValue);
       const compressed = JSON.stringify(parsed);
-      handleEditorValueChange(compressed);
+      applyJsonPresentation(compressed);
     } catch (err) {
-      console.error('无效的 JSON 格式，请检查语法', err);
+      console.error('Invalid JSON format. Check the syntax.', err);
     }
   };
 
@@ -528,6 +537,7 @@ const ViewData = forwardRef((_props: IProps, ref: ForwardedRef<ViewDataRef>) =>
             <JsonAwareMonacoEditor
               id={uuid}
               value={editorValue}
+              resetViewRevision={editorViewRevision}
               readOnly={!editorCanEdit}
               onChange={handleEditorValueChange}
               onJsonChange={setIsJsonContent}
@@ -551,6 +561,7 @@ const ViewData = forwardRef((_props: IProps, ref: ForwardedRef<ViewDataRef>) =>
     largeValueStatus,
     displayMode,
     editorValue,
+    editorViewRevision,
     editorCanEdit,
     isJsonContent,
     viewerMode,
diff --git a/chat2db-community-client/src/blocks/Setting/ApiKeys/index.tsx b/chat2db-community-client/src/blocks/Setting/ApiKeys/index.tsx
deleted file mode 100644
index 711c7b9372..0000000000
--- a/chat2db-community-client/src/blocks/Setting/ApiKeys/index.tsx
+++ /dev/null
@@ -1,232 +0,0 @@
-import { memo, useEffect, useRef, useState } from 'react';
-import { useStyles } from './style';
-import SettingSubsection from '../SettingSubsection';
-import i18n, { i18nElement } from '@/i18n';
-import { Button, Form, Input } from 'antd';
-import { Modal, IconButton } from '@chat2db/ui';
-import apiKeysServices, { ApiKeyDetail } from '@/service/apiKeys';
-import ModalFooterButton from '@/components/Modal/ModalFooterButton';
-import dayjs from 'dayjs';
-import { copyToClipboard } from '@/utils';
-import { useGlobalStore } from '@/store/global';
-import AntdTable from '@/components/AntdTable';
-import { beginLatestRequest, invalidateLatestRequest, isLatestRequest } from '@/utils/latestRequest';
-
-interface IProps {
-  className?: string;
-}
-
-export default memo<IProps>((props) => {
-  const { className } = props;
-  const { styles, cx } = useStyles();
-  const [visible, setVisible] = useState(false);
-  const [form] = Form.useForm();
-  const [loading, setLoading] = useState(false);
-  const [apiKeys, setApiKeys] = useState<ApiKeyDetail[]>([]);
-  const [currentApiKey, setCurrentApiKey] = useState<ApiKeyDetail | null>(null);
-  const requestGenerationRef = useRef(0);
-
-  const { openUnifiedConfirmationModal, appUrlConfig } = useGlobalStore((state) => {
-    return {
-      openUnifiedConfirmationModal: state.openUnifiedConfirmationModal,
-      appUrlConfig: state.appUrlConfig,
-    };
-  });
-
-  useEffect(() => {
-    getApiKeyList();
-    return () => {
-      invalidateLatestRequest(requestGenerationRef);
-    };
-  }, []);
-
-  const renderDescribe = () => {
-    return (
-      <div>
-        {i18nElement(
-          'setting.apiKeys.describe',
-          <a target="_blank" rel="noreferrer" href={`${appUrlConfig.DOCS_URL}/docs/ai-chat/rest-api`}>
-            {i18n('setting.apiKeys.addApiDoc')}
-          </a>,
-        )}
-      </div>
-    );
-  };
-
-  const getApiKeyList = () => {
-    const requestGeneration = beginLatestRequest(requestGenerationRef);
-    apiKeysServices
-      .getApiKeyList()
-      .then((res) => {
-        if (!isLatestRequest(requestGenerationRef, requestGeneration)) return;
-        setApiKeys(res);
-      });
-  };
-
-  const createApiKey = () => {
-    setVisible(true);
-  };
-
-  const handleCreateApiKey = () => {
-    form.validateFields().then((values) => {
-      setLoading(true);
-      apiKeysServices.createApiKey({ name: values.name, nonExpire: 'Y' }).then((res) => {
-        setCurrentApiKey(res);
-        setLoading(false);
-        getApiKeyList();
-      });
-    });
-  };
-
-  useEffect(() => {
-    if (!visible) {
-      form.resetFields();
-      setCurrentApiKey(null);
-    }
-  }, [visible]);
-
-  const columns: any = [
-    {
-      title: i18n('common.text.name'),
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: 'API Key',
-      dataIndex: 'apiKey',
-      key: 'apiKey',
-      render: (data) => {
-        return (
-          <div className={styles.apiKeyBox}>
-            <div className={styles.apiKeyText}>{data}</div>
-            <IconButton
-              className={styles.iconButton}
-              size="md"
-              code="icon-copy"
-              onClick={() => {
-                copyToClipboard(data);
-              }}
-            />
-          </div>
-        );
-      },
-    },
-    {
-      title: i18nElement('common.text.createTime'),
-      dataIndex: 'createTime',
-      key: 'createTime',
-      render: (data) => {
-        return dayjs(data).format('YYYY-MM-DD HH:mm:ss');
-      },
-    },
-    {
-      fixed: 'right',
-      width: '100px',
-      title: i18n('common.text.action'),
-      dataIndex: 'delete',
-      key: 'createTime',
-      render: (data, rowData: ApiKeyDetail) => {
-        return (
-          <div
-            className={styles.deleteButton}
-            onClick={() => {
-              openUnifiedConfirmationModal({
-                title: i18n('common.text.deleteConfirmTitle'),
-                content: i18n('setting.apiKeys.deleteTips'),
-                onOk: () => {
-                  return apiKeysServices.deleteApiKey({ id: rowData.id }).then(() => {
-                    apiKeysServices.getApiKeyList().then((res) => {
-                      setApiKeys(res);
-                    });
-                  });
-                },
-              });
-            }}
-          >
-            {i18n('common.button.delete')}
-          </div>
-        );
-      },
-    },
-  ];
-
-  return (
-    <>
-      <div className={cx(styles.apiKeys, className)}>
-        <SettingSubsection
-          className={styles.apiKeysHeader}
-          title={i18n('setting.nav.apiKeys')}
-          describe={renderDescribe()}
-        />
-        <div className={styles.apiKeysBody}>
-          <div className={styles.createButton}>
-            <div className={styles.titleBox}>
-              {i18n('setting.text.APIKeyList')}
-              <IconButton code="icon-refresh" size="md" onClick={getApiKeyList} />
-            </div>
-            <Button type="primary" onClick={createApiKey}>
-              {i18n('setting.apiKeys.CreateApiKey')}
-            </Button>
-          </div>
-          <AntdTable className={styles.antdTableBox} dataSource={apiKeys} columns={columns} />
-        </div>
-      </div>
-      <Modal
-        open={visible}
-        headerIconCode={'icon-apikeys'}
-        title={!currentApiKey && i18n('setting.apiKeys.CreateApiKey')}
-        onCancel={() => {
-          setVisible(false);
-        }}
-        width={500}
-        maskClosable={false}
-        footer={
-          currentApiKey ? null : (
-            <ModalFooterButton
-              footerRight={
-                <>
-                  <Button
-                    onClick={() => {
-                      setVisible(false);
-                    }}
-                  >
-                    {i18n('common.button.cancel')}
-                  </Button>
-                  <Button type="primary" loading={loading} onClick={handleCreateApiKey}>
-                    {i18n('common.button.confirm')}
-                  </Button>
-                </>
-              }
-            />
-          )
-        }
-      >
-        <div className={styles.modalBody}>
-          {currentApiKey ? (
-            <div className={styles.createSuccessTips}>
-              <div className={styles.CreateSuccess}>{i18n('setting.apiKeys.CreateSuccess')}</div>
-              <div className={styles.createSuccessTips1}>{i18n('setting.apiKeys.createSuccessTips1')}</div>
-              <div className={styles.apiKey}>
-                {currentApiKey.apiKey}
-                <IconButton
-                  code="icon-copy"
-                  size="md"
-                  onClick={() => {
-                    copyToClipboard(currentApiKey.apiKey);
-                  }}
-                />
-              </div>
-              <div className={styles.createSuccessTips2}>{i18n('setting.apiKeys.createSuccessTips2')}</div>
-            </div>
-          ) : (
-            <Form form={form} autoComplete="off" layout="vertical">
-              <Form.Item label={i18n('common.text.name')} name="name">
-                <Input />
-              </Form.Item>
-            </Form>
-          )}
-        </div>
-      </Modal>
-    </>
-  );
-});
diff --git a/chat2db-community-client/src/blocks/Setting/ApiKeys/style.ts b/chat2db-community-client/src/blocks/Setting/ApiKeys/style.ts
deleted file mode 100644
index 2a277a70bd..0000000000
--- a/chat2db-community-client/src/blocks/Setting/ApiKeys/style.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { createStyles } from 'antd-style';
-
-export const useStyles = createStyles(({ css, token }) => {
-  return {
-    apiKeys: css`
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-    `,
-    apiKeysHeader: css`
-      flex-shrink: 0;
-    `,
-    apiKeysBody: css`
-      flex: 1;
-      height: 0px;
-      display: flex;
-      flex-direction: column;
-    `,
-    titleBox: css`
-      flex: 1;
-      display: flex;
-      align-items: center;
-      gap: 12px;
-      font-size: 16px;
-      font-weight: 600;
-    `,
-    createButton: css`
-      display: flex;
-      justify-content: flex-end;
-      margin-bottom: 15px;
-      flex-shrink: 0;
-    `,
-    antdTableBox: css`
-      flex: 1;
-      height: 0px;
-    `,
-    modalBody: css`
-      padding-top: 10px;
-    `,
-    apiKeyBox: css`
-      display: flex;
-      gap: 4px;
-    `,
-    apiKeyText: css`
-      flex: 1;
-      width: 0px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    `,
-    iconButton: css`
-      flex-shrink: 0;
-    `,
-    deleteButton: css`
-      cursor: pointer;
-      color: ${token.colorPrimary};
-      &:hover {
-        color: ${token.colorPrimaryHover};
-      }
-    `,
-    createSuccessTips: css`
-      display: flex;
-      flex-direction: column;
-      gap: 10px;
-    `,
-    CreateSuccess: css`
-      font-size: 20px;
-      color: ${token.colorPrimary};
-    `,
-    createSuccessTips1: css`
-      color: ${token.colorTextSecondary};
-    `,
-    createSuccessTips2: css`
-      color: ${token.colorTextSecondary};
-    `,
-    apiKey: css`
-      display: flex;
-      align-items: center;
-      gap: 6px;
-    `,
-  };
-});
diff --git a/chat2db-community-client/src/client-extension/extension.test.ts b/chat2db-community-client/src/client-extension/extension.test.ts
index fd6de0e56a..ee74197b39 100644
--- a/chat2db-community-client/src/client-extension/extension.test.ts
+++ b/chat2db-community-client/src/client-extension/extension.test.ts
@@ -12,7 +12,6 @@ assert.equal(clientExtension.mainPage.slots, undefined);
 assert.equal(clientExtension.mainPage.hiddenCoreActions, undefined);
 assert.equal(clientExtension.settings, undefined);
 assert.equal(clientExtension.resourceOperations, undefined);
-assert.equal(clientExtension.knowledgeMentions, undefined);
 assert.equal(clientExtension.tableMetadataSearch, undefined);
 assert.deepEqual(clientExtension.requestPolicy, {
   permissionDeniedInteraction: 'prompt-application',
@@ -28,16 +27,16 @@ const coreNavigation = [
 ];
 const extensionNavigation: ClientNavigationContribution[] = [
   {
-    id: 'knowledge',
-    icon: 'knowledge-icon',
-    name: 'Knowledge',
-    component: 'knowledge-panel',
+    id: 'reports',
+    icon: 'reports-icon',
+    name: 'Reports',
+    component: 'reports-panel',
   },
 ];
 
 assert.deepEqual(
   mergeNavigationItems(coreNavigation, extensionNavigation).map((item) => item.key),
-  ['workspace', 'knowledge'],
+  ['workspace', 'reports'],
 );
 assert.throws(
   () => mergeNavigationItems(coreNavigation, [{ ...extensionNavigation[0], id: 'workspace' }]),
@@ -45,7 +44,7 @@ assert.throws(
 );
 assert.throws(
   () => mergeNavigationItems(coreNavigation, [...extensionNavigation, extensionNavigation[0]]),
-  /Duplicate client contribution id: knowledge/,
+  /Duplicate client contribution id: reports/,
 );
 
 for (const host of ['src/blocks/Setting/index.tsx', 'src/pages/main/CommunityMainPage.tsx']) {
diff --git a/chat2db-community-client/src/client-extension/types.ts b/chat2db-community-client/src/client-extension/types.ts
index 0742fc568f..16829affc9 100644
--- a/chat2db-community-client/src/client-extension/types.ts
+++ b/chat2db-community-client/src/client-extension/types.ts
@@ -58,31 +58,6 @@ export interface ResourceOperationRequest {
 
 export type ResourceOperationCapabilities = Readonly<Record<ResourceOperation, boolean>>;
 
-export interface KnowledgeMentionCandidate {
-  id: number;
-  type: 'KNOWLEDGE_TERM' | 'BUSINESS_LOGIC' | 'SQL_TEMPLATE';
-  key: string;
-  value: string;
-}
-
-export interface KnowledgeMentionRequest {
-  searchKey?: string;
-  inputText?: string;
-  dataSourceId?: number;
-  databaseName?: string;
-  schemaName?: string;
-  pageNo?: number;
-  pageSize?: number;
-}
-
-export interface KnowledgeMentionPage {
-  data: readonly KnowledgeMentionCandidate[];
-  pageNo: number;
-  pageSize: number;
-  total: number;
-  hasNextPage: boolean;
-}
-
 export interface TableMetadataSearchRequest {
   dataSourceId: number;
   searchKey: string;
@@ -130,7 +105,6 @@ export interface ClientExtension {
   resourceOperations?: (
     request: ResourceOperationRequest,
   ) => Promise<ResourceOperationCapabilities>;
-  knowledgeMentions?: (request: KnowledgeMentionRequest) => Promise<KnowledgeMentionPage>;
   tableMetadataSearch?: (request: TableMetadataSearchRequest) => Promise<readonly TableMetadataSearchResult[]>;
   dashboardActions?: (context: DashboardActionContext) => ReactNode;
   openPermissionApplication?: (request: PermissionApplicationRequest) => void;
diff --git a/chat2db-community-client/src/components/BaseTable/index.tsx b/chat2db-community-client/src/components/BaseTable/index.tsx
index 3db62ae8f0..12fbf69a85 100644
--- a/chat2db-community-client/src/components/BaseTable/index.tsx
+++ b/chat2db-community-client/src/components/BaseTable/index.tsx
@@ -106,6 +106,8 @@ interface IProps {
   showEmptyState?: boolean;
   // Activates a source row from its first cell with Enter or Space.
   onActivateRow?: (index: number, rowData: any) => void;
+  // Handles clicks anywhere inside a selectable source row.
+  onRowClick?: (index: number, rowData: any) => void;
   // Handles Escape while focus is inside the table.
   onEscapeKey?: () => void;
   // Cell-edit callback.
@@ -144,6 +146,7 @@ const BaseTable = forwardRef((props: IProps, ref: ForwardedRef<BaseTableRef>) =>
     getRowIndex,
     showEmptyState = true,
     onActivateRow,
+    onRowClick,
     onEscapeKey,
   } = props;
   const { styles, cx, theme } = useStyles();
@@ -277,6 +280,18 @@ const BaseTable = forwardRef((props: IProps, ref: ForwardedRef<BaseTableRef>) =>
       ];
     });
   }
+  if (onRowClick) {
+    pipeline.appendRowPropsGetter((rowData, rowIndex) => {
+      const sourceRowIndex = getRowIndex ? getRowIndex(rowData, rowIndex) : rowIndex;
+      if (sourceRowIndex === undefined) {
+        return {};
+      }
+      return {
+        onClick: () => onRowClick(sourceRowIndex, rowData),
+        style: { cursor: 'pointer' },
+      };
+    });
+  }
   pipeline.use(
     features.columnResize({
       handleHoverBackground: theme.colorPrimaryBgHover,
diff --git a/chat2db-community-client/src/components/BaseTable/treeInteraction.test.ts b/chat2db-community-client/src/components/BaseTable/treeInteraction.test.ts
index 4907702290..ecd90f61ef 100644
--- a/chat2db-community-client/src/components/BaseTable/treeInteraction.test.ts
+++ b/chat2db-community-client/src/components/BaseTable/treeInteraction.test.ts
@@ -53,6 +53,8 @@ assert.match(source, /window\.requestAnimationFrame/);
 assert.match(source, /requestTableKeyboardFocus\(currentRowKey, true\)/);
 assert.doesNotMatch(source, /keyboardActions\.indexOf/);
 assert.match(source, /onActivateRow\?\.\(index, rowData\)/);
+assert.match(source, /onRowClick\(sourceRowIndex, rowData\)/);
+assert.match(source, /pipeline\.appendRowPropsGetter/);
 assert.match(source, /event\.key === 'Escape' && onEscapeKey/);
 assert.match(
   source,
diff --git a/chat2db-community-client/src/components/ConnectionEdit/components/Driver/index.tsx b/chat2db-community-client/src/components/ConnectionEdit/components/Driver/index.tsx
index 25f8b6d1f4..d26578743f 100644
--- a/chat2db-community-client/src/components/ConnectionEdit/components/Driver/index.tsx
+++ b/chat2db-community-client/src/components/ConnectionEdit/components/Driver/index.tsx
@@ -167,34 +167,29 @@ export default memo<IProps>((props) => {
         </Form.Item>
       </Form>
       <div className={styles.downloadDriveFooter}>
-        {(driverObj?.driverConfigList && !driverObj?.driverConfigList?.length) ||
-        downloadStatus === DownloadStatus.Success ? (
-          <div onClick={downloadDrive} className={styles.downloadDrive}>
-            {downloadStatus === DownloadStatus.Default && (
-              <div className={classnames(styles.downloadText, styles.downloadTextDownload)}>
-                {i18n('connection.text.downloadDriver')}
-              </div>
-            )}
-            {downloadStatus === DownloadStatus.Loading && (
-              <div className={classnames(styles.downloadText, styles.downloadTextLoading)}>
-                <LoadingGracile />
-                <div className={styles.text}>{i18n('connection.text.downloading')}</div>
-              </div>
-            )}
-            {downloadStatus === DownloadStatus.Error && (
-              <div className={classnames(styles.downloadText, styles.downloadTextError)}>
-                {i18n('connection.text.tryAgainDownload')}
-              </div>
-            )}
-            {downloadStatus === DownloadStatus.Success && (
-              <div className={classnames(styles.downloadText, styles.downloadTextSuccess)}>
-                {i18n('connection.text.downloadSuccess')}
-              </div>
-            )}
-          </div>
-        ) : (
-          <div />
-        )}
+        <div onClick={downloadDrive} className={styles.downloadDrive}>
+          {downloadStatus === DownloadStatus.Default && (
+            <div className={classnames(styles.downloadText, styles.downloadTextDownload)}>
+              {i18n('connection.text.downloadDriver')}
+            </div>
+          )}
+          {downloadStatus === DownloadStatus.Loading && (
+            <div className={classnames(styles.downloadText, styles.downloadTextLoading)}>
+              <LoadingGracile />
+              <div className={styles.text}>{i18n('connection.text.downloading')}</div>
+            </div>
+          )}
+          {downloadStatus === DownloadStatus.Error && (
+            <div className={classnames(styles.downloadText, styles.downloadTextError)}>
+              {i18n('connection.text.tryAgainDownload')}
+            </div>
+          )}
+          {downloadStatus === DownloadStatus.Success && (
+            <div className={classnames(styles.downloadText, styles.downloadTextSuccess)}>
+              {i18n('connection.text.downloadSuccess')}
+            </div>
+          )}
+        </div>
         {(isDesktop || isCommunityEnv) && (
           <div
             className={styles.uploadCustomDrive}
diff --git a/chat2db-community-client/src/components/ConnectionEdit/index.tsx b/chat2db-community-client/src/components/ConnectionEdit/index.tsx
index a3b9c75035..0a348b07f7 100644
--- a/chat2db-community-client/src/components/ConnectionEdit/index.tsx
+++ b/chat2db-community-client/src/components/ConnectionEdit/index.tsx
@@ -11,13 +11,14 @@ import { FolderOpenOutlined } from '@ant-design/icons';
 import { Button, Checkbox, Collapse, Form, Input, Select, Table, Tooltip } from 'antd';
 import classnames from 'classnames';
 import { CircleHelp } from 'lucide-react';
-import React, { ForwardedRef, Fragment, forwardRef, useEffect, useImperativeHandle, useMemo, useState } from 'react';
+import React, { ForwardedRef, Fragment, forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import Driver from './components/Driver';
 import { dataSourceFormConfigs } from './config/dataSource';
 import { InputType } from './config/enum';
 import { IConnectionConfig, IFormItem, ILocalizedConnectionText, ISelect } from './config/types';
 import { applyConnectionIdentityColorUpdate } from './identityColorUpdate';
 import styles from './index.less';
+import { SubmissionGuard } from './submissionGuard';
 import { formatJdbcHostForUrl, normalizeJdbcHostFromUrl, shouldSyncJdbcUrlForField } from './utils/jdbcUrl';
 
 // ----- store -----
@@ -35,6 +36,14 @@ const OSCAR_JDBC_URL_PREFIX = 'jdbc:oscar://';
 const OSCAR_DRIVER_CLASS = 'com.oscar.Driver';
 
 const connectionFormTranslations: Partial<Record<LangType, Record<string, string>>> = {
+  [LangType.ZH_CN]: {
+    'User&Password': '用户名和密码',
+    NONE: '无',
+  },
+  [LangType.JA_JP]: {
+    'User&Password': 'ユーザー名とパスワード',
+    NONE: 'なし',
+  },
   [LangType.ES_ES]: {
     'USE SSH': 'Usar SSH',
     'SSH Hostname': 'Host SSH',
@@ -67,6 +76,7 @@ const connectionFormTranslations: Partial<Record<LangType, Record<string, string
     Datatset: 'Conjunto de datos',
     'Google Service Account': 'Cuenta de servicio de Google',
     'User&Password': 'Usuario y contraseña',
+    NONE: 'Ninguno',
     LocalFile: 'Archivo local',
     Service: 'Servicio',
   },
@@ -102,6 +112,7 @@ const connectionFormTranslations: Partial<Record<LangType, Record<string, string
     Datatset: '데이터 세트',
     'Google Service Account': 'Google 서비스 계정',
     'User&Password': '사용자 및 비밀번호',
+    NONE: '없음',
     LocalFile: '로컬 파일',
     Service: '서비스',
   },
@@ -388,6 +399,7 @@ const ConnectionEdit = forwardRef((props: IProps, ref: ForwardedRef<ICreateConne
     testButton: false,
     sshTestLoading: false,
   });
+  const submissionGuardRef = useRef(new SubmissionGuard());
   const { curOrg } = useOrgStore((s) => ({ curOrg: s.curOrg }));
 
   const dataSourceFormConfigPropsMemo = useMemo<IConnectionConfig>(() => {
@@ -520,7 +532,11 @@ const ConnectionEdit = forwardRef((props: IProps, ref: ForwardedRef<ICreateConne
     }));
 
     if ((type === submitType.SAVE || type === submitType.UPDATE) && submit) {
-      Promise.resolve(submit(p, type))
+      const request = submissionGuardRef.current.run(() => submit(p, type));
+      if (!request) {
+        return;
+      }
+      request
         .catch((error: any) => {
           staticMessage.error(getConnectionErrorMessage(error));
         })
@@ -533,7 +549,13 @@ const ConnectionEdit = forwardRef((props: IProps, ref: ForwardedRef<ICreateConne
       return;
     }
 
-    const api: any = connectionService[type](p);
+    const api: any =
+      type === submitType.SAVE || type === submitType.UPDATE
+        ? submissionGuardRef.current.run(() => connectionService[type](p))
+        : connectionService[type](p);
+    if (!api) {
+      return;
+    }
     if (type === submitType.TEST) {
       api
         .then((res: any) => {
@@ -608,6 +630,13 @@ const ConnectionEdit = forwardRef((props: IProps, ref: ForwardedRef<ICreateConne
       .then(() => {
         staticMessage.success(i18n('connection.message.testConnectResult', i18n('common.text.successful')));
       })
+      .catch((error: unknown) => {
+        if (error instanceof Error) {
+          staticMessage.error(getConnectionErrorMessage(error));
+        } else if (typeof error === 'string' && error.startsWith('timeout_error:')) {
+          staticMessage.error(i18n('connection.message.testSshTimeout'));
+        }
+      })
       .finally(() => {
         setLoading({
           ...loadings,
diff --git a/chat2db-community-client/src/components/ConnectionEdit/submissionGuard.test.ts b/chat2db-community-client/src/components/ConnectionEdit/submissionGuard.test.ts
new file mode 100644
index 0000000000..089c3a7bcd
--- /dev/null
+++ b/chat2db-community-client/src/components/ConnectionEdit/submissionGuard.test.ts
@@ -0,0 +1,56 @@
+import assert from 'node:assert/strict';
+import { SubmissionGuard } from './submissionGuard';
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (error: Error) => void;
+  const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise;
+    reject = rejectPromise;
+  });
+  return { promise, resolve, reject };
+}
+
+async function testConcurrentSubmissionIsRejected() {
+  const guard = new SubmissionGuard();
+  const request = deferred<number>();
+  let submitCount = 0;
+  const submit = () => {
+    submitCount += 1;
+    return request.promise;
+  };
+
+  const first = guard.run(submit);
+  const second = guard.run(submit);
+
+  assert.ok(first);
+  assert.equal(second, null);
+  await Promise.resolve();
+  assert.equal(submitCount, 1);
+  request.resolve(1);
+  assert.equal(await first, 1);
+}
+
+async function testSubmissionCanRetryAfterFailure() {
+  const guard = new SubmissionGuard();
+  const failedRequest = deferred<void>();
+  const first = guard.run(() => failedRequest.promise);
+  assert.ok(first);
+  failedRequest.reject(new Error('save failed'));
+  await assert.rejects(first, /save failed/);
+
+  const second = guard.run(() => Promise.resolve('saved'));
+  assert.ok(second);
+  assert.equal(await second, 'saved');
+}
+
+async function main() {
+  await testConcurrentSubmissionIsRejected();
+  await testSubmissionCanRetryAfterFailure();
+  console.log('Connection submission guard tests passed');
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});
diff --git a/chat2db-community-client/src/components/ConnectionEdit/submissionGuard.ts b/chat2db-community-client/src/components/ConnectionEdit/submissionGuard.ts
new file mode 100644
index 0000000000..f492665c42
--- /dev/null
+++ b/chat2db-community-client/src/components/ConnectionEdit/submissionGuard.ts
@@ -0,0 +1,16 @@
+export class SubmissionGuard {
+  private pending = false;
+
+  run<T>(submit: () => Promise<T>): Promise<T> | null {
+    if (this.pending) {
+      return null;
+    }
+
+    this.pending = true;
+    return Promise.resolve()
+      .then(submit)
+      .finally(() => {
+        this.pending = false;
+      });
+  }
+}
diff --git a/chat2db-community-client/src/components/ConnectionEdit/testSsh.test.ts b/chat2db-community-client/src/components/ConnectionEdit/testSsh.test.ts
new file mode 100644
index 0000000000..c8b4db324b
--- /dev/null
+++ b/chat2db-community-client/src/components/ConnectionEdit/testSsh.test.ts
@@ -0,0 +1,91 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
+import { setImmediate } from 'node:timers/promises';
+import { test } from 'node:test';
+import vm from 'node:vm';
+import ts from 'typescript';
+import en from '../../i18n/en-US/connection';
+import zh from '../../i18n/zh-CN/connection';
+import ja from '../../i18n/ja-JP/connection';
+import ko from '../../i18n/ko-KR/connection';
+import es from '../../i18n/es-ES/connection';
+
+const source = ts.createSourceFile(
+  'index.tsx',
+  readFileSync(path.join(__dirname, 'index.tsx'), 'utf8'),
+  ts.ScriptTarget.Latest,
+  true,
+  ts.ScriptKind.TSX,
+);
+const functions: string[] = [];
+function visit(node: ts.Node) {
+  if (ts.isFunctionDeclaration(node) && ['testSSH', 'getConnectionErrorMessage'].includes(node.name?.text || '')) {
+    functions.push(node.getText(source));
+  }
+  ts.forEachChild(node, visit);
+}
+visit(source);
+assert.equal(functions.length, 2);
+const code = ts.transpileModule(functions.join('\n') + '\ntestSSH();', {
+  compilerOptions: { target: ts.ScriptTarget.ES2022 },
+}).outputText;
+
+async function invoke(error: unknown, locale = zh, successful = false) {
+  const errors: string[] = [];
+  const successes: string[] = [];
+  const loading: boolean[] = [];
+  let requests = 0;
+  vm.runInNewContext(code, {
+    Error,
+    sshForm: { getFieldsValue: () => ({ host: 'review.invalid' }) },
+    connectionService: {
+      testSSH: (params: { host: string }) => {
+        assert.equal(params.host, 'review.invalid');
+        requests += 1;
+        return successful ? Promise.resolve(true) : Promise.reject(error);
+      },
+    },
+    loadings: { sshTestLoading: false },
+    setLoading: (state: { sshTestLoading: boolean }) => loading.push(state.sshTestLoading),
+    staticMessage: {
+      error: (message: string) => errors.push(message),
+      success: (message: string) => successes.push(message),
+    },
+    i18n: (key: keyof typeof zh) => locale[key] || key,
+  });
+  await setImmediate();
+  assert.equal(requests, 1);
+  assert.deepEqual(loading, [true, false]);
+  assert.equal(successes.length, successful ? 1 : 0);
+  return errors;
+}
+
+test('successful SSH tests do not show an error', async () => {
+  assert.deepEqual(await invoke(undefined, zh, true), []);
+});
+
+test('business errors keep the existing global notification without a second toast', async () => {
+  assert.deepEqual(await invoke({ errorCode: 'ssh.error', errorMessage: 'Authentication failed' }), []);
+});
+
+test('desktop bridge failures keep the existing alert without a second toast', async () => {
+  assert.deepEqual(await invoke('Bridge request failed'), []);
+});
+
+test('network and HTTP errors show their cause once', async () => {
+  for (const message of ['Failed to fetch', 'Request failed with status code 503']) {
+    assert.deepEqual(await invoke(new Error(message)), [message]);
+  }
+});
+
+test('SSH timeouts use the current locale and do not expose the internal request URL', async () => {
+  const timeout = 'timeout_error:/api/connection/ssh/pre_connect';
+  for (const locale of [zh, en, ja, ko, es, zh]) {
+    const message = locale['connection.message.testSshTimeout'];
+    assert.ok(message.trim());
+    assert.deepEqual(await invoke(timeout, locale), [message]);
+    assert.ok(!message.includes('/api/'));
+  }
+  assert.equal(new Set([zh, en, ja, ko, es].map(locale => locale['connection.message.testSshTimeout'])).size, 5);
+});
diff --git a/chat2db-community-client/src/components/CreateDatabase/index.tsx b/chat2db-community-client/src/components/CreateDatabase/index.tsx
index d832eb5600..3f29dba91c 100644
--- a/chat2db-community-client/src/components/CreateDatabase/index.tsx
+++ b/chat2db-community-client/src/components/CreateDatabase/index.tsx
@@ -5,9 +5,9 @@ import { v4 as uuid } from 'uuid';
 import sqlService from '@/service/sql';
 import i18n from '@/i18n';
 import { debounce } from 'lodash';
-import { DatabaseTypeCode } from '@/constants';
+import { DatabaseCapability, DatabaseTypeCode } from '@/constants';
 import { useWorkspaceStore } from '@/store/workspace';
-import { canSetCreateDatabaseCharset, canSetCreateDatabaseCollation } from '@/utils/databaseJudgments';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import type { ICharset, ICollation } from '@/typings';
 import { buildCharsetOptions, buildCollationOptions } from './options';
 import { useStyles } from './style';
@@ -62,8 +62,14 @@ const CreateDatabase = () => {
   const [previewReady, setPreviewReady] = useState(false);
   const screens = Grid.useBreakpoint();
 
-  const supportsCharset = canSetCreateDatabaseCharset(relyOnParams?.databaseType);
-  const supportsCollation = canSetCreateDatabaseCollation(relyOnParams?.databaseType);
+  const supportsCharset = isDatabaseCapabilitySupported(
+    relyOnParams?.databaseType,
+    DatabaseCapability.DATABASE_CREATE_CHARSET,
+  );
+  const supportsCollation = isDatabaseCapabilitySupported(
+    relyOnParams?.databaseType,
+    DatabaseCapability.DATABASE_CREATE_COLLATION,
+  );
 
   const charsetOptions = useMemo(() => buildCharsetOptions(charsets), [charsets]);
   const collationOptions = useMemo(
diff --git a/chat2db-community-client/src/components/InlineRenameInput/index.tsx b/chat2db-community-client/src/components/InlineRenameInput/index.tsx
new file mode 100644
index 0000000000..d7a2aa5e8c
--- /dev/null
+++ b/chat2db-community-client/src/components/InlineRenameInput/index.tsx
@@ -0,0 +1,88 @@
+import { useEffect, useRef, useState } from 'react';
+import { Input, type InputRef } from 'antd';
+
+interface InlineRenameInputProps {
+  className?: string;
+  initialValue: string;
+  maxLength: number;
+  onCancel: () => void;
+  onSubmit: (value: string) => Promise<void>;
+}
+
+const InlineRenameInput = ({
+  className,
+  initialValue,
+  maxLength,
+  onCancel,
+  onSubmit,
+}: InlineRenameInputProps) => {
+  const [draft, setDraft] = useState(initialValue);
+  const [saving, setSaving] = useState(false);
+  const inputRef = useRef<InputRef>(null);
+  const savingRef = useRef(false);
+  const cancelRequestedRef = useRef(false);
+
+  useEffect(() => {
+    inputRef.current?.focus({ cursor: 'all' });
+  }, []);
+
+  const cancel = () => {
+    cancelRequestedRef.current = true;
+    onCancel();
+  };
+
+  const submit = async () => {
+    if (cancelRequestedRef.current) {
+      cancelRequestedRef.current = false;
+      return;
+    }
+    if (savingRef.current) {
+      return;
+    }
+    const value = draft.trim();
+    if (!value || value === initialValue) {
+      onCancel();
+      return;
+    }
+
+    savingRef.current = true;
+    setSaving(true);
+    try {
+      await onSubmit(value);
+      onCancel();
+    } catch {
+      requestAnimationFrame(() => inputRef.current?.focus({ cursor: 'end' }));
+    } finally {
+      savingRef.current = false;
+      setSaving(false);
+    }
+  };
+
+  return (
+    <Input
+      ref={inputRef}
+      className={className}
+      size="small"
+      maxLength={maxLength}
+      value={draft}
+      disabled={saving}
+      onClick={(event) => event.stopPropagation()}
+      onChange={(event) => setDraft(event.target.value)}
+      onPressEnter={(event) => {
+        event.preventDefault();
+        event.stopPropagation();
+        submit();
+      }}
+      onBlur={submit}
+      onKeyDown={(event) => {
+        if (event.key === 'Escape') {
+          event.preventDefault();
+          event.stopPropagation();
+          cancel();
+        }
+      }}
+    />
+  );
+};
+
+export default InlineRenameInput;
diff --git a/chat2db-community-client/src/components/LocalFileEncodingSelect/index.tsx b/chat2db-community-client/src/components/LocalFileEncodingSelect/index.tsx
index e4a7b7b589..5a9bc43b6d 100644
--- a/chat2db-community-client/src/components/LocalFileEncodingSelect/index.tsx
+++ b/chat2db-community-client/src/components/LocalFileEncodingSelect/index.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Select, Tooltip } from 'antd';
+import { Select, Tooltip, type SelectProps } from 'antd';
 import { staticMessage } from '@chat2db/ui';
 import i18n from '@/i18n';
 import { LOCAL_FILE_CHARSETS, formatLocalFileEncoding } from '@/utils/localFileEncoding';
@@ -8,16 +8,22 @@ import styles from './index.less';
 const AUTO_DETECT_VALUE = '__auto_detect__';
 
 interface LocalFileEncodingSelectProps {
+  className?: string;
   charset?: string;
   bom?: boolean;
   disabled?: boolean;
+  size?: SelectProps['size'];
+  variant?: SelectProps['variant'];
   onEncodingChange: (charset?: string) => Promise<void>;
 }
 
 const LocalFileEncodingSelect = ({
+  className,
   charset,
   bom,
   disabled,
+  size = 'small',
+  variant = 'borderless',
   onEncodingChange,
 }: LocalFileEncodingSelectProps) => {
   const [loading, setLoading] = useState(false);
@@ -47,14 +53,14 @@ const LocalFileEncodingSelect = ({
   const selectedLabel = charset ? currentLabel : autoDetectLabel;
   return (
     <Tooltip title={label}>
-      <span className={styles.wrapper}>
+      <span className={`${styles.wrapper} ${className || ''}`}>
         <span className={styles.sizer} aria-hidden="true">
           {selectedLabel}
         </span>
         <Select<string>
           className={styles.selector}
-          size="small"
-          variant="borderless"
+          size={size}
+          variant={variant}
           value={charset || AUTO_DETECT_VALUE}
           loading={loading}
           disabled={disabled || loading}
diff --git a/chat2db-community-client/src/components/NodeFiltering/index.tsx b/chat2db-community-client/src/components/NodeFiltering/index.tsx
index 5caee1dd6d..bdf168e546 100644
--- a/chat2db-community-client/src/components/NodeFiltering/index.tsx
+++ b/chat2db-community-client/src/components/NodeFiltering/index.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useLayoutEffect, useRef, useState } from 'react';
 import { Tree, Checkbox } from 'antd';
 import SearchBar from '@/components/SearchBar';
 import { useStyles } from './style';
@@ -30,11 +30,32 @@ export interface NodeFilteringRef {
 const NodeFiltering = (props: IProps) => {
   const { data, filterTitle, selectedKeys, onChangeSelect } = props;
   const { styles } = useStyles();
+  const treeBoxRef = useRef<HTMLDivElement>(null);
+  // rc-virtual-list enables horizontal wheel handling from the initial scrollWidth.
+  const [scrollWidth, setScrollWidth] = useState(1);
   const [treeData, setTreeData] = useState<IData[]>(data);
   const [checkedKeys, setCheckedKeys] = useState<string[]>(
     selectedKeys?.map((item) => createChat2dbSpecificSymbolIdentifier(item)) || [],
   );
 
+  const measureScrollWidth = () => {
+    const nodes = treeBoxRef.current?.querySelectorAll<HTMLElement>('.ant-tree-treenode');
+    return Array.from(nodes || []).reduce(
+      (width, node) => Math.max(width, node.scrollWidth),
+      treeBoxRef.current?.clientWidth || 1,
+    );
+  };
+
+  useLayoutEffect(() => {
+    const treeBox = treeBoxRef.current;
+    if (!treeBox) {
+      return;
+    }
+    const observer = new ResizeObserver(() => setScrollWidth(measureScrollWidth()));
+    observer.observe(treeBox);
+    return () => observer.disconnect();
+  }, [treeData]);
+
   const onCheck = (_checkedKeys, halfChecked) => {
     const { key, checked } = halfChecked.node;
       // Toggle off a previously checked node; otherwise select it.
@@ -129,10 +150,12 @@ const NodeFiltering = (props: IProps) => {
             {i18n('workspace.text.clearFilter')}
           </div>
         </div>
-        <div className={styles.treeBox}>
+        <div ref={treeBoxRef} className={styles.treeBox}>
           {!!treeData?.length && (
             <Tree
               height={279}
+              scrollWidth={scrollWidth}
+              onScroll={() => setScrollWidth((width) => Math.max(width, measureScrollWidth()))}
               className={styles.treeSelect}
               checkable
               switcherIcon={null}
diff --git a/chat2db-community-client/src/components/NodeFiltering/style.tsx b/chat2db-community-client/src/components/NodeFiltering/style.tsx
index 1f5a15c090..63b7718848 100644
--- a/chat2db-community-client/src/components/NodeFiltering/style.tsx
+++ b/chat2db-community-client/src/components/NodeFiltering/style.tsx
@@ -64,6 +64,7 @@ export const useStyles = createStyles(({ css, token }) => {
       padding: 0px 8px;
       display: flex;
       align-items: center;
+      white-space: nowrap;
     `,
     treeTitleCount: css`
       color: ${token.colorTextSecondary};
@@ -114,9 +115,20 @@ export const useStyles = createStyles(({ css, token }) => {
       .ant-tree-node-content-wrapper {
         padding: 0px !important;
       }
+      .ant-tree-list-scrollbar {
+        pointer-events: none;
+      }
       .ant-tree-list-scrollbar-thumb {
         background-color: ${token.colorFill} !important;
-        transition: background-color 0.1s ease;
+        opacity: 0;
+        pointer-events: none;
+        transition: opacity 0.12s ease, background-color 0.1s ease;
+      }
+      &:hover .ant-tree-list-scrollbar-thumb,
+      .ant-tree-list-scrollbar-thumb-moving {
+        opacity: 1;
+        pointer-events: auto;
+        visibility: visible;
       }
     `,
   };
diff --git a/chat2db-community-client/src/components/OperationLogFilters/index.tsx b/chat2db-community-client/src/components/OperationLogFilters/index.tsx
new file mode 100644
index 0000000000..ee43f4ea90
--- /dev/null
+++ b/chat2db-community-client/src/components/OperationLogFilters/index.tsx
@@ -0,0 +1,98 @@
+import i18n from '@/i18n';
+import useSelectDatabase from '@/hooks/useSelectDatabase';
+import { Input, Select } from 'antd';
+import classnames from 'classnames';
+import { memo } from 'react';
+import { OperationLogFilterValues, updateOperationLogFilters } from './model';
+import { useStyles } from './style';
+
+interface IProps {
+  className?: string;
+  value: OperationLogFilterValues;
+  onChange: (value: OperationLogFilterValues) => void;
+  size?: 'small' | 'middle' | 'large';
+}
+
+function OperationLogFilters({ className, value, onChange, size = 'middle' }: IProps) {
+  const { styles } = useStyles();
+  const { dataSourceList, databaseList, schemaList, selectDatabase, onChangeSelectDatabase } = useSelectDatabase({});
+  const hasDataSource = value.dataSourceId !== undefined;
+  const showDatabase = hasDataSource && selectDatabase?.supportDatabase === true;
+  const showSchema = hasDataSource && selectDatabase?.supportSchema === true;
+  const schemaEnabled = showSchema && (!showDatabase || !!value.databaseName);
+
+  const handleDataSourceChange = (dataSourceId?: number) => {
+    onChangeSelectDatabase({ dataSourceId });
+    onChange(updateOperationLogFilters(value, { field: 'dataSourceId', value: dataSourceId }));
+  };
+
+  const handleDatabaseChange = (databaseName?: string) => {
+    onChangeSelectDatabase({ databaseName });
+    onChange(updateOperationLogFilters(value, { field: 'databaseName', value: databaseName }));
+  };
+
+  const handleSchemaChange = (schemaName?: string) => {
+    onChangeSelectDatabase({ schemaName });
+    onChange(updateOperationLogFilters(value, { field: 'schemaName', value: schemaName }));
+  };
+
+  return (
+    <div className={classnames(styles.filters, className)}>
+      <Select
+        allowClear
+        showSearch
+        className={styles.scopeFilter}
+        loading={dataSourceList === null}
+        optionFilterProp="label"
+        options={dataSourceList || []}
+        placeholder={i18n('common.dataSource.title')}
+        size={size}
+        value={value.dataSourceId}
+        onChange={handleDataSourceChange}
+      />
+      {showDatabase && (
+        <Select
+          allowClear
+          showSearch
+          className={styles.scopeFilter}
+          loading={databaseList === null}
+          optionFilterProp="label"
+          options={databaseList || []}
+          placeholder={i18n('common.database.title')}
+          size={size}
+          value={value.databaseName}
+          onChange={handleDatabaseChange}
+        />
+      )}
+      {showSchema && (
+        <Select
+          allowClear
+          showSearch
+          className={styles.scopeFilter}
+          disabled={!schemaEnabled}
+          loading={schemaList === null}
+          optionFilterProp="label"
+          options={schemaList || []}
+          placeholder={i18n('common.schema.title')}
+          size={size}
+          value={value.schemaName}
+          onChange={handleSchemaChange}
+        />
+      )}
+      <Input
+        allowClear
+        className={styles.searchFilter}
+        placeholder={i18n('common.text.searchPlaceholder')}
+        size={size}
+        value={value.searchKey || ''}
+        onChange={(event) =>
+          onChange(updateOperationLogFilters(value, { field: 'searchKey', value: event.target.value }))
+        }
+      />
+    </div>
+  );
+}
+
+export default memo(OperationLogFilters);
+export type { OperationLogFilterValues } from './model';
+export { useDebouncedOperationLogFilters } from './useDebouncedFilters';
diff --git a/chat2db-community-client/src/components/OperationLogFilters/model.test.ts b/chat2db-community-client/src/components/OperationLogFilters/model.test.ts
new file mode 100644
index 0000000000..e4b779654c
--- /dev/null
+++ b/chat2db-community-client/src/components/OperationLogFilters/model.test.ts
@@ -0,0 +1,104 @@
+import assert from 'node:assert/strict';
+import type { OperationTypeEnum } from '@/service/history';
+import {
+  buildOperationLogListParams,
+  normalizeOperationLogFilters,
+  shouldApplyOperationLogPageResponse,
+  shouldStartOperationLogPageRequest,
+  updateOperationLogFilters,
+} from './model';
+
+const sqlExecute = 'SQL_EXECUTE' as OperationTypeEnum;
+
+{
+  const filters = normalizeOperationLogFilters({
+    dataSourceId: 12,
+    databaseName: ' application ',
+    schemaName: ' public ',
+    searchKey: '  Orders  ',
+  });
+
+  assert.deepEqual(filters, {
+    dataSourceId: 12,
+    databaseName: ' application ',
+    schemaName: ' public ',
+    searchKey: 'Orders',
+  });
+  assert.deepEqual(normalizeOperationLogFilters({ databaseName: ' ', searchKey: '\t' }), { databaseName: ' ' });
+}
+
+{
+  const filters = {
+    dataSourceId: 12,
+    databaseName: 'application',
+    schemaName: 'public',
+    searchKey: 'orders',
+  };
+
+  assert.deepEqual(updateOperationLogFilters(filters, { field: 'databaseName', value: 'analytics' }), {
+    dataSourceId: 12,
+    databaseName: 'analytics',
+    schemaName: undefined,
+    searchKey: 'orders',
+  });
+  assert.deepEqual(updateOperationLogFilters(filters, { field: 'dataSourceId', value: undefined }), {
+    dataSourceId: undefined,
+    databaseName: undefined,
+    schemaName: undefined,
+    searchKey: 'orders',
+  });
+}
+
+{
+  assert.deepEqual(
+    buildOperationLogListParams(
+      {
+        dataSourceId: 12,
+        databaseName: ' application ',
+        schemaName: ' public ',
+        searchKey: ' orders ',
+      },
+      1,
+      40,
+      sqlExecute,
+    ),
+    {
+      pageNo: 1,
+      pageSize: 40,
+      operationType: sqlExecute,
+      dataSourceId: 12,
+      databaseName: ' application ',
+      schemaName: ' public ',
+      searchKey: 'orders',
+    },
+  );
+}
+
+{
+  const current = { currentGeneration: 3, finished: false };
+
+  // Fresh replace request for the current generation starts.
+  assert.equal(shouldStartOperationLogPageRequest(3, true, { ...current }), true);
+  // Append request starts while pages remain.
+  assert.equal(shouldStartOperationLogPageRequest(3, false, { ...current }), true);
+  // Stale generation from an older filter change is dropped.
+  assert.equal(shouldStartOperationLogPageRequest(2, true, { ...current }), false);
+  // Append is dropped once the stream is finished, but a replace (filter change) still runs.
+  assert.equal(shouldStartOperationLogPageRequest(3, false, { ...current, finished: true }), false);
+  assert.equal(shouldStartOperationLogPageRequest(3, true, { ...current, finished: true }), true);
+  // A request already in flight for the same generation is not duplicated.
+  assert.equal(shouldStartOperationLogPageRequest(3, true, { ...current, activeRequestGeneration: 3 }), false);
+  assert.equal(shouldStartOperationLogPageRequest(3, true, { ...current, activeRequestGeneration: 2 }), true);
+}
+
+{
+  const response = { mounted: true, currentGeneration: 5 };
+
+  assert.equal(shouldApplyOperationLogPageResponse(5, response), true);
+  // Response arriving after a filter change (generation bumped) is dropped.
+  assert.equal(shouldApplyOperationLogPageResponse(4, response), false);
+  // Response arriving after unmount is dropped.
+  assert.equal(shouldApplyOperationLogPageResponse(5, { ...response, mounted: false }), false);
+}
+
+console.log('Operation log filter tests passed');
diff --git a/chat2db-community-client/src/components/OperationLogFilters/model.ts b/chat2db-community-client/src/components/OperationLogFilters/model.ts
new file mode 100644
index 0000000000..aa9c179f50
--- /dev/null
+++ b/chat2db-community-client/src/components/OperationLogFilters/model.ts
@@ -0,0 +1,107 @@
+import type { IGetHistoryListParams, OperationTypeEnum } from '@/service/history';
+
+export interface OperationLogFilterValues {
+  dataSourceId?: number;
+  databaseName?: string;
+  schemaName?: string;
+  searchKey?: string;
+}
+
+export type OperationLogFilterChange =
+  | { field: 'dataSourceId'; value?: number }
+  | { field: 'databaseName' | 'schemaName' | 'searchKey'; value?: string };
+
+function normalizeText(value?: string) {
+  const normalizedValue = value?.trim();
+  return normalizedValue || undefined;
+}
+
+export function normalizeOperationLogFilters(filters: OperationLogFilterValues): OperationLogFilterValues {
+  const normalizedFilters: OperationLogFilterValues = {};
+
+  if (filters.dataSourceId !== undefined) {
+    normalizedFilters.dataSourceId = filters.dataSourceId;
+  }
+
+  const searchKey = normalizeText(filters.searchKey);
+
+  if (filters.databaseName) {
+    normalizedFilters.databaseName = filters.databaseName;
+  }
+  if (filters.schemaName) {
+    normalizedFilters.schemaName = filters.schemaName;
+  }
+  if (searchKey) {
+    normalizedFilters.searchKey = searchKey;
+  }
+
+  return normalizedFilters;
+}
+
+export function updateOperationLogFilters(
+  filters: OperationLogFilterValues,
+  change: OperationLogFilterChange,
+): OperationLogFilterValues {
+  if (change.field === 'dataSourceId') {
+    return {
+      ...filters,
+      dataSourceId: change.value,
+      databaseName: undefined,
+      schemaName: undefined,
+    };
+  }
+
+  if (change.field === 'databaseName') {
+    return {
+      ...filters,
+      databaseName: change.value,
+      schemaName: undefined,
+    };
+  }
+
+  return {
+    ...filters,
+    [change.field]: change.value,
+  };
+}
+
+export interface OperationLogPageRequestState {
+  currentGeneration: number;
+  finished: boolean;
+  activeRequestGeneration?: number;
+}
+
+export function shouldStartOperationLogPageRequest(
+  generation: number,
+  replace: boolean,
+  state: OperationLogPageRequestState,
+): boolean {
+  if (generation !== state.currentGeneration) {
+    return false;
+  }
+  if (!replace && state.finished) {
+    return false;
+  }
+  return state.activeRequestGeneration !== generation;
+}
+
+export function shouldApplyOperationLogPageResponse(
+  generation: number,
+  state: { mounted: boolean; currentGeneration: number },
+): boolean {
+  return state.mounted && generation === state.currentGeneration;
+}
+
+export function buildOperationLogListParams(
+  filters: OperationLogFilterValues,
+  pageNo: number,
+  pageSize: number,
+  operationType: OperationTypeEnum,
+): IGetHistoryListParams {
+  return {
+    pageNo,
+    pageSize,
+    operationType,
+    ...normalizeOperationLogFilters(filters),
+  };
+}
diff --git a/chat2db-community-client/src/components/OperationLogFilters/style.ts b/chat2db-community-client/src/components/OperationLogFilters/style.ts
new file mode 100644
index 0000000000..60a2f3580f
--- /dev/null
+++ b/chat2db-community-client/src/components/OperationLogFilters/style.ts
@@ -0,0 +1,23 @@
+import { createStyles } from 'antd-style';
+
+export const useStyles = createStyles(({ css }) => ({
+  filters: css`
+    display: flex;
+    flex: 0 0 auto;
+    flex-wrap: wrap;
+    align-items: center;
+    align-content: flex-start;
+    gap: 8px;
+    box-sizing: border-box;
+    width: 100%;
+    min-width: 0;
+  `,
+  scopeFilter: css`
+    min-width: 120px;
+    flex: 1 1 140px;
+  `,
+  searchFilter: css`
+    min-width: 160px;
+    flex: 2 1 220px;
+  `,
+}));
diff --git a/chat2db-community-client/src/components/OperationLogFilters/useDebouncedFilters.ts b/chat2db-community-client/src/components/OperationLogFilters/useDebouncedFilters.ts
new file mode 100644
index 0000000000..79148ba611
--- /dev/null
+++ b/chat2db-community-client/src/components/OperationLogFilters/useDebouncedFilters.ts
@@ -0,0 +1,26 @@
+import { useEffect, useMemo, useState } from 'react';
+import { normalizeOperationLogFilters, OperationLogFilterValues } from './model';
+
+export function useDebouncedOperationLogFilters(filters: OperationLogFilterValues, delay = 300) {
+  const { dataSourceId, databaseName, schemaName, searchKey } = filters;
+  const [debouncedSearchKey, setDebouncedSearchKey] = useState(normalizeOperationLogFilters({ searchKey }).searchKey);
+
+  useEffect(() => {
+    const timeoutId = window.setTimeout(() => {
+      setDebouncedSearchKey(normalizeOperationLogFilters({ searchKey }).searchKey);
+    }, delay);
+
+    return () => window.clearTimeout(timeoutId);
+  }, [delay, searchKey]);
+
+  return useMemo(
+    () =>
+      normalizeOperationLogFilters({
+        dataSourceId,
+        databaseName,
+        schemaName,
+        searchKey: debouncedSearchKey,
+      }),
+    [dataSourceId, databaseName, debouncedSearchKey, schemaName],
+  );
+}
diff --git a/chat2db-community-client/src/components/Output/index.tsx b/chat2db-community-client/src/components/Output/index.tsx
index e66876af70..d9d92eafdc 100644
--- a/chat2db-community-client/src/components/Output/index.tsx
+++ b/chat2db-community-client/src/components/Output/index.tsx
@@ -1,6 +1,15 @@
-import React, { memo, useCallback, useMemo, useRef, useState } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import classnames from 'classnames';
 import ScrollLoading from '@/components/ScrollLoading';
+import OperationLogFilters, {
+  OperationLogFilterValues,
+  useDebouncedOperationLogFilters,
+} from '@/components/OperationLogFilters';
+import {
+  buildOperationLogListParams,
+  shouldApplyOperationLogPageResponse,
+  shouldStartOperationLogPageRequest,
+} from '@/components/OperationLogFilters/model';
 import historyService, { IHistoryRecord, OperationTypeEnum } from '@/service/history';
 import i18n from '@/i18n';
 import { useStyles } from './style';
@@ -53,17 +62,13 @@ function getHistoryDataSourceName(item: IDatasource, sourceInfo?: TreeNodeData,
 }
 
 function getHistoryTitle(item: IDatasource, sourceInfo?: TreeNodeData, cachedSourceName?: string) {
-  const dataSourceName =
-    getHistoryDataSourceName(item, sourceInfo, cachedSourceName);
+  const dataSourceName = getHistoryDataSourceName(item, sourceInfo, cachedSourceName);
   const nameList = [dataSourceName, item.databaseName || item.schemaName].filter(Boolean);
   return nameList.join(' / ');
 }
 
 function getHistoryPopover(item: IDatasource, sourceInfo?: TreeNodeData, cachedSourceName?: string) {
-  return [
-    getHistoryTitle(item, sourceInfo, cachedSourceName),
-    item.gmtCreate,
-  ].filter(Boolean).join('\n');
+  return [getHistoryTitle(item, sourceInfo, cachedSourceName), item.gmtCreate].filter(Boolean).join('\n');
 }
 
 export default memo<IProps>((props) => {
@@ -77,11 +82,16 @@ export default memo<IProps>((props) => {
   const savedConsoleList = useWorkspaceStore((state) => state.savedConsoleList);
   const dataSourceList = useTreeStore((state) => state.dataSourceList);
   const [dataSource, setDataSource] = useState<IDatasource[]>([]);
+  const [filters, setFilters] = useState<OperationLogFilterValues>({});
   const [finished, setFinished] = useState(false);
+  const appliedFilters = useDebouncedOperationLogFilters(filters);
   const outputContentRef = useRef<HTMLDivElement>(null);
   const curPageRef = useRef(1);
-  const loadingRef = useRef(false);
   const finishedRef = useRef(false);
+  const initializedRef = useRef(false);
+  const mountedRef = useRef(true);
+  const requestGenerationRef = useRef(0);
+  const activeRequestRef = useRef<{ generation: number; pageNo: number } | null>(null);
 
   const dataSourceInfoMap = useMemo(() => {
     return (dataSourceList || []).reduce<Record<string, TreeNodeData>>((map, item) => {
@@ -123,42 +133,89 @@ export default memo<IProps>((props) => {
     return item;
   }, []);
 
-  const getHistoryList = useCallback(async () => {
-    if (loadingRef.current || finishedRef.current) {
-      return;
-    }
-    loadingRef.current = true;
-    try {
-      const res = await historyService.getHistoryList({
-        pageNo: curPageRef.current,
-        pageSize: 40,
-        operationType: OperationTypeEnum.SQL_EXECUTE,
-      });
+  const loadHistoryPage = useCallback(
+    async (pageNo: number, requestFilters: OperationLogFilterValues, generation: number, replace: boolean) => {
+      if (
+        !shouldStartOperationLogPageRequest(generation, replace, {
+          currentGeneration: requestGenerationRef.current,
+          finished: finishedRef.current,
+          activeRequestGeneration: activeRequestRef.current?.generation,
+        })
+      ) {
+        return;
+      }
 
-      curPageRef.current += 1;
-      finishedRef.current = !res.hasNextPage;
-      setFinished(finishedRef.current);
-      setDataSource((prev) => [...prev, ...((res.data || []) as IDatasource[])]);
-    } finally {
-      loadingRef.current = false;
-    }
-  }, []);
+      const activeRequest = { generation, pageNo };
+      activeRequestRef.current = activeRequest;
 
-  const refresh = useCallback(() => {
+      try {
+        const res = await historyService.getHistoryList(
+          buildOperationLogListParams(requestFilters, pageNo, 40, OperationTypeEnum.SQL_EXECUTE),
+        );
+
+        if (!shouldApplyOperationLogPageResponse(generation, {
+          mounted: mountedRef.current,
+          currentGeneration: requestGenerationRef.current,
+        })) {
+          return;
+        }
+
+        const records = (res.data || []) as IDatasource[];
+        curPageRef.current = pageNo + 1;
+        finishedRef.current = !res.hasNextPage;
+        setFinished(finishedRef.current);
+        setDataSource((previousRecords) => (replace ? records : [...previousRecords, ...records]));
+      } catch {
+        // Request errors are surfaced by the shared request layer. Keep pagination retryable.
+      } finally {
+        if (activeRequestRef.current === activeRequest) {
+          activeRequestRef.current = null;
+        }
+      }
+    },
+    [],
+  );
+
+  const resetAndLoadHistory = useCallback(() => {
+    const generation = requestGenerationRef.current + 1;
+    requestGenerationRef.current = generation;
+    initializedRef.current = true;
     curPageRef.current = 1;
-    loadingRef.current = false;
     finishedRef.current = false;
     setFinished(false);
     setDataSource([]);
-    getHistoryList();
-  }, [getHistoryList]);
+    return loadHistoryPage(1, appliedFilters, generation, true);
+  }, [appliedFilters, loadHistoryPage]);
+
+  useEffect(() => {
+    void resetAndLoadHistory();
+  }, [resetAndLoadHistory]);
+
+  useEffect(() => {
+    mountedRef.current = true;
+    return () => {
+      mountedRef.current = false;
+      requestGenerationRef.current += 1;
+    };
+  }, []);
+
+  const getHistoryList = useCallback(() => {
+    if (!initializedRef.current || finishedRef.current) {
+      return Promise.resolve();
+    }
+
+    return loadHistoryPage(curPageRef.current, appliedFilters, requestGenerationRef.current, false);
+  }, [appliedFilters, loadHistoryPage]);
+
+  const refresh = useCallback(() => {
+    void resetAndLoadHistory();
+  }, [resetAndLoadHistory]);
 
   const openHistoryConsole = useCallback(
     async (item: IDatasource, readOnly: boolean) => {
       const detail = await getFullHistoryRecord(item);
       const tabId = getTemporaryId(`${readOnly ? 'execution-log' : 'execution-log-copy'}-${item.id || Date.now()}`);
-      const sourceInfo =
-        dataSourceInfoMap[getHistorySourceKey(detail)] || dataSourceInfoMap[getHistorySourceKey(item)];
+      const sourceInfo = dataSourceInfoMap[getHistorySourceKey(detail)] || dataSourceInfoMap[getHistorySourceKey(item)];
       const cachedSourceName =
         dataSourceNameMap[getHistorySourceKey(detail)] || dataSourceNameMap[getHistorySourceKey(item)];
       const dataSourceName = getHistoryDataSourceName(detail, sourceInfo, cachedSourceName);
@@ -187,10 +244,7 @@ export default memo<IProps>((props) => {
     [addWorkspaceTab, dataSourceInfoMap, dataSourceNameMap, getFullHistoryRecord],
   );
 
-  const openHistoryTab = useCallback(
-    (item: IDatasource) => openHistoryConsole(item, true),
-    [openHistoryConsole],
-  );
+  const openHistoryTab = useCallback((item: IDatasource) => openHistoryConsole(item, true), [openHistoryConsole]);
 
   const openEditableHistoryTab = useCallback(
     (event: React.MouseEvent, item: IDatasource) => {
@@ -244,6 +298,7 @@ export default memo<IProps>((props) => {
         leading={headerLeading ?? <span>{i18n('common.title.executiveLogging')}</span>}
         trailing={<IconButton size={PANEL_TOOLBAR_BUTTON_SIZE} icon={RotateCw} onClick={refresh} />}
       />
+      <OperationLogFilters className={styles.outputFilters} size="small" value={filters} onChange={setFilters} />
       <div className={styles.outputContent} ref={outputContentRef}>
         <ScrollLoading
           onReachBottom={getHistoryList}
diff --git a/chat2db-community-client/src/components/Output/style.ts b/chat2db-community-client/src/components/Output/style.ts
index 23b5b2548d..e0ca6b89e6 100644
--- a/chat2db-community-client/src/components/Output/style.ts
+++ b/chat2db-community-client/src/components/Output/style.ts
@@ -16,6 +16,12 @@ export const useStyles = createStyles(({ css, token }) => {
       flex: 1;
       height: 0px;
     `,
+    outputFilters: css`
+      flex: 0 0 auto;
+      padding: 8px 12px;
+      border-bottom: 1px solid ${token.colorBorderSecondary};
+      background: ${token.colorBgContainer};
+    `,
     outputItem: css`
       position: relative;
       display: flex;
@@ -28,9 +34,7 @@ export const useStyles = createStyles(({ css, token }) => {
       border-radius: 6px;
       background: ${token.colorFillQuaternary};
       cursor: pointer;
-      transition:
-        border-color 0.16s ease,
-        background-color 0.16s ease;
+      transition: border-color 0.16s ease, background-color 0.16s ease;
 
       &:hover {
         border-color: ${token.colorPrimaryBorder};
diff --git a/chat2db-community-client/src/components/SQLEditor/components/OperationLine/index.tsx b/chat2db-community-client/src/components/SQLEditor/components/OperationLine/index.tsx
index 3d1b9e44c0..836abbabaa 100644
--- a/chat2db-community-client/src/components/SQLEditor/components/OperationLine/index.tsx
+++ b/chat2db-community-client/src/components/SQLEditor/components/OperationLine/index.tsx
@@ -1,7 +1,8 @@
 import { useMemo } from 'react';
 import { EditorType, SQLOptType } from '../../type';
 import { useStyles } from './style';
-import { isRoutineOperationSupportedDatabaseType, WorkspaceTabType } from '@/constants';
+import { DatabaseCapability, WorkspaceTabType } from '@/constants';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import SelectBoundInfo from '@/components/SelectBoundInfo';
 import { IBoundInfo as IDBInfo } from '@/typings/workspace';
 import historyService from '@/service/history';
@@ -44,8 +45,10 @@ const OperationLine = ({
   }, [type]);
 
   const showRoutineButtons = useMemo(() => {
-    return isRoutineOperationSupportedDatabaseType(dbInfo.databaseType)
-      && [WorkspaceTabType.FUNCTION, WorkspaceTabType.PROCEDURE].includes(type);
+    return (
+      isDatabaseCapabilitySupported(dbInfo.databaseType, DatabaseCapability.ROUTINE_OPERATION) &&
+      [WorkspaceTabType.FUNCTION, WorkspaceTabType.PROCEDURE].includes(type)
+    );
   }, [dbInfo.databaseType, type]);
 
   const showSettingButton = useMemo(() => {
diff --git a/chat2db-community-client/src/components/SQLEditor/core/completionProviderManager.ts b/chat2db-community-client/src/components/SQLEditor/core/completionProviderManager.ts
index 5812fd7c75..b3fd38a147 100644
--- a/chat2db-community-client/src/components/SQLEditor/core/completionProviderManager.ts
+++ b/chat2db-community-client/src/components/SQLEditor/core/completionProviderManager.ts
@@ -1,12 +1,9 @@
 import * as monaco from 'monaco-editor';
 import keywordObj, { IFunctionParameter, IKeyword } from '../helper/keywords';
-import { DatabaseTypeCode } from '@/constants';
-import { quoteSqlCompletionIdentifier } from '@/utils/databaseJudgments';
+import { DatabaseCapability, DatabaseTypeCode } from '@/constants';
+import { isDatabaseCapabilitySupported, quoteSqlCompletionIdentifier } from '@/utils/databaseJudgments';
 import SQLParserService from '@/service/sqlParser';
-import {
-  isBackendCompletionDatabaseType,
-  isBackendCompletionModel,
-} from './sqlCompletionModelMode';
+import { isBackendCompletionModel } from './sqlCompletionModelMode';
 import {
   getBackendCompletionItemEffectiveFilterText,
   getBackendCompletionItemInsertText,
@@ -201,7 +198,10 @@ class CompletionProviderManager {
 
     const { dataSourceId, databaseType, databaseName, schemaName } = dbInfo;
     const completionContextId = getSqlCompletionContextId(dbInfo);
-    const backendCompletionMode = isBackendCompletionDatabaseType(databaseType);
+    const backendCompletionMode = isDatabaseCapabilitySupported(
+      databaseType,
+      DatabaseCapability.BACKEND_COMPLETION,
+    );
     if (databaseType && !backendCompletionMode) {
       this.registerBuiltInKeywordsProvider();
       this.registerBuiltInFunctionsProvider();
diff --git a/chat2db-community-client/src/components/SQLEditor/core/sqlCompletionModelMode.test.ts b/chat2db-community-client/src/components/SQLEditor/core/sqlCompletionModelMode.test.ts
index f0b6ced41b..a91bf941bc 100644
--- a/chat2db-community-client/src/components/SQLEditor/core/sqlCompletionModelMode.test.ts
+++ b/chat2db-community-client/src/components/SQLEditor/core/sqlCompletionModelMode.test.ts
@@ -1,49 +1,58 @@
 import assert from 'node:assert/strict';
-import { DatabaseTypeCode } from '../../../constants/common';
-import {
-  isBackendCompletionDatabaseType,
-  isBackendEditorHintsDatabaseType,
-  isBackendCompletionModel,
-  setBackendCompletionModel,
-} from './sqlCompletionModelMode';
+import { DatabaseTypeCode } from '@/constants/common';
+import { DatabaseCapability } from '@/constants/databaseCapabilities';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
+import { isBackendCompletionModel, setBackendCompletionModel } from './sqlCompletionModelMode';
 
 const model = {} as any;
 
-assert.equal(isBackendCompletionDatabaseType(DatabaseTypeCode.MYSQL), true, 'MySQL uses backend completion mode');
 assert.equal(
-  isBackendCompletionDatabaseType(DatabaseTypeCode.POSTGRESQL),
+  isDatabaseCapabilitySupported(DatabaseTypeCode.MYSQL, DatabaseCapability.BACKEND_COMPLETION),
+  true,
+  'MySQL uses backend completion mode',
+);
+assert.equal(
+  isDatabaseCapabilitySupported(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.BACKEND_COMPLETION),
   false,
   'non-configured databases keep legacy completion mode',
 );
 assert.equal(
-  isBackendCompletionDatabaseType(DatabaseTypeCode.GAUSSDB),
+  isDatabaseCapabilitySupported(DatabaseTypeCode.GAUSSDB, DatabaseCapability.BACKEND_COMPLETION),
   false,
   'GaussDB keeps legacy completion mode while using backend editor hints',
 );
-assert.equal(isBackendCompletionDatabaseType(undefined), false, 'missing database type keeps legacy completion mode');
-assert.equal(isBackendEditorHintsDatabaseType(DatabaseTypeCode.MYSQL), true, 'MySQL supports backend editor hints');
 assert.equal(
-  isBackendEditorHintsDatabaseType(DatabaseTypeCode.POSTGRESQL),
+  isDatabaseCapabilitySupported(undefined, DatabaseCapability.BACKEND_COMPLETION),
+  false,
+  'missing database type keeps legacy completion mode',
+);
+assert.equal(
+  isDatabaseCapabilitySupported(DatabaseTypeCode.MYSQL, DatabaseCapability.BACKEND_EDITOR_HINTS),
+  true,
+  'MySQL supports backend editor hints',
+);
+assert.equal(
+  isDatabaseCapabilitySupported(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.BACKEND_EDITOR_HINTS),
   true,
   'PostgreSQL supports backend editor hints without switching completion mode',
 );
 assert.equal(
-  isBackendEditorHintsDatabaseType(DatabaseTypeCode.GAUSSDB),
+  isDatabaseCapabilitySupported(DatabaseTypeCode.GAUSSDB, DatabaseCapability.BACKEND_EDITOR_HINTS),
   true,
   'GaussDB supports PostgreSQL-compatible backend editor hints',
 );
 assert.equal(
-  isBackendEditorHintsDatabaseType(DatabaseTypeCode.SQLSERVER),
+  isDatabaseCapabilitySupported(DatabaseTypeCode.SQLSERVER, DatabaseCapability.BACKEND_EDITOR_HINTS),
   false,
   'unvalidated SQL dialects do not request INSERT editor hints',
 );
 assert.equal(
-  isBackendEditorHintsDatabaseType(DatabaseTypeCode.MONGODB),
+  isDatabaseCapabilitySupported(DatabaseTypeCode.MONGODB, DatabaseCapability.BACKEND_EDITOR_HINTS),
   false,
   'non-relational databases do not request SQL INSERT editor hints',
 );
 assert.equal(
-  isBackendEditorHintsDatabaseType(DatabaseTypeCode.GBASE8S),
+  isDatabaseCapabilitySupported(DatabaseTypeCode.GBASE8S, DatabaseCapability.BACKEND_EDITOR_HINTS),
   false,
   'databases without a SQL syntax plugin do not advertise backend editor hints',
 );
diff --git a/chat2db-community-client/src/components/SQLEditor/core/sqlCompletionModelMode.ts b/chat2db-community-client/src/components/SQLEditor/core/sqlCompletionModelMode.ts
index 8f21769bdf..2a16562c7e 100644
--- a/chat2db-community-client/src/components/SQLEditor/core/sqlCompletionModelMode.ts
+++ b/chat2db-community-client/src/components/SQLEditor/core/sqlCompletionModelMode.ts
@@ -1,24 +1,9 @@
 import * as monaco from 'monaco-editor';
-import type { DatabaseTypeCode } from '../../../constants/common';
-import { databaseCapabilities } from '@/constants/databaseCapabilities';
-import { canUseBackendCompletion, canUseBackendEditorHints } from '@/utils/databaseJudgments';
 
 // Frontend routing capability: these databases consume backend completion results
 // directly, so local snippets/providers should stay out of the completion list.
-export const BACKEND_COMPLETION_DATABASE_TYPES: ReadonlySet<DatabaseTypeCode> = new Set([
-  ...databaseCapabilities.backendCompletionSupported,
-]);
-
 const backendCompletionModels = new WeakSet<monaco.editor.ITextModel>();
 
-export function isBackendCompletionDatabaseType(databaseType: DatabaseTypeCode | null | undefined): boolean {
-  return canUseBackendCompletion(databaseType);
-}
-
-export function isBackendEditorHintsDatabaseType(databaseType: DatabaseTypeCode | null | undefined): boolean {
-  return canUseBackendEditorHints(databaseType);
-}
-
 export function setBackendCompletionModel(
   model: monaco.editor.ITextModel | null | undefined,
   enabled: boolean,
diff --git a/chat2db-community-client/src/components/SQLEditor/editor/SQLEditor/index.tsx b/chat2db-community-client/src/components/SQLEditor/editor/SQLEditor/index.tsx
index 339ede0d75..ab654c0d28 100644
--- a/chat2db-community-client/src/components/SQLEditor/editor/SQLEditor/index.tsx
+++ b/chat2db-community-client/src/components/SQLEditor/editor/SQLEditor/index.tsx
@@ -5,11 +5,9 @@ import { useGlobalStore } from '@/store/global';
 import { debounce } from 'lodash';
 import MonacoEditor, { MonacoEditorRef } from '../MonacoEditor';
 import CompletionProviderManager from '../../core/completionProviderManager';
-import {
-  isBackendCompletionDatabaseType,
-  isBackendEditorHintsDatabaseType,
-  setBackendCompletionModel,
-} from '../../core/sqlCompletionModelMode';
+import { setBackendCompletionModel } from '../../core/sqlCompletionModelMode';
+import { DatabaseCapability } from '@/constants';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import {
   SqlCompletionHintScope,
   createSqlCompletionHintStore,
@@ -245,7 +243,10 @@ const SQLEditor = forwardRef<SQLEditorRef, SQLEditorProps>(
         if (!model) {
           return;
         }
-        const backendCompletionMode = isBackendCompletionDatabaseType(dbInfo.databaseType);
+        const backendCompletionMode = isDatabaseCapabilitySupported(
+          dbInfo.databaseType,
+          DatabaseCapability.BACKEND_COMPLETION,
+        );
         setBackendCompletionModel(model, backendCompletionMode);
         completionProvider.current?.bindModelDBInfo(model, dbInfo);
         if (!backendCompletionMode) {
@@ -702,7 +703,11 @@ const SQLEditor = forwardRef<SQLEditorRef, SQLEditorProps>(
         positionSnapshot?: monaco.Position | null,
         scope?: SqlCompletionHintScope | null,
       ) => {
-        if (!isBackendEditorHintsDatabaseType(dbInfo.databaseType) || !completionProvider.current || !editor) {
+        if (
+          !isDatabaseCapabilitySupported(dbInfo.databaseType, DatabaseCapability.BACKEND_EDITOR_HINTS) ||
+          !completionProvider.current ||
+          !editor
+        ) {
           return;
         }
         const model = editor.getModel();
diff --git a/chat2db-community-client/src/components/SQLEditor/editor/SQLEditorWithOperation/index.tsx b/chat2db-community-client/src/components/SQLEditor/editor/SQLEditorWithOperation/index.tsx
index f87509599d..5f9f473d67 100644
--- a/chat2db-community-client/src/components/SQLEditor/editor/SQLEditorWithOperation/index.tsx
+++ b/chat2db-community-client/src/components/SQLEditor/editor/SQLEditorWithOperation/index.tsx
@@ -9,7 +9,7 @@ import { EditorSetValueType, EditorType, SQLOptType } from '../../type';
 import { staticMessage } from '@chat2db/ui';
 import { Modal } from 'antd';
 import { IConsoleReturnExecuteSql, IBoundInfo, TreeNodeData } from '@/typings';
-import { saveFileToDesktop, updateFileContent } from '@/utils/file';
+import { saveFileToDesktop, saveLocalFileContent, waitForLocalFileSave } from '@/utils/file';
 import i18n from '@/i18n';
 import { useSaveEditorData } from '@/components/SQLEditor/hooks/useSaveEditorData';
 import { formatSql } from '../../helper/utils';
@@ -20,10 +20,11 @@ import { ChatSourceType, QuestionType } from '@/constants/chat';
 import { useWorkspaceStore } from '@/store/workspace';
 import { useAIStore } from '@/store/ai';
 import sqlService, { type IRoutineMigrationParams } from '@/service/sql';
-import { isRoutineOperationSupportedDatabaseType, OperationColumn, TreeNodeType, WorkspaceTabType } from '@/constants';
+import { DatabaseCapability, OperationColumn, TreeNodeType, WorkspaceTabType } from '@/constants';
 import { EditorTableIdentifier } from '../../helper/tableIdentifier';
 import { useTreeStore } from '@/store/tree';
 import { isTemporaryId } from '@/utils';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 import { readClipboard } from '@/utils/clipboard';
 import executeSql from '@/service/executeSql';
 import { parseClipboardTextToSqlInTokens } from '@/utils/sqlInClipboard';
@@ -70,7 +71,7 @@ interface ISQLEditorWithOperationProps {
   active: boolean;
   defaultSQL?: string;
   dbInfo: IBoundInfo;
-  setDBInfo: (dbInfo: IBoundInfo) => void;
+  setDBInfo: (dbInfo: Partial<IBoundInfo>) => void;
 
   sqlFileName?: string;
   workspaceTabsTitle?: string;
@@ -139,9 +140,9 @@ const SQLEditorWithOperation = forwardRef<ISQLEditorWithOperationRef, ISQLEditor
   } = props;
   const isReadOnly = !!dbInfo.readOnly;
   const isSupportedRoutineEditor =
-    isRoutineOperationSupportedDatabaseType(dbInfo.databaseType) &&
+    isDatabaseCapabilitySupported(dbInfo.databaseType, DatabaseCapability.ROUTINE_OPERATION) &&
     [WorkspaceTabType.FUNCTION, WorkspaceTabType.PROCEDURE].includes(type as WorkspaceTabType);
-  const { styles } = useStyles();
+  const { styles, theme } = useStyles();
   const [modal, modalContextHolder] = Modal.useModal();
   const [contextMenuInfo, setContextMenuInfo] = useState<IContextMenuInfo>(contextMenuDefaultConfig);
   const [contextTableIdentifier, setContextTableIdentifier] = useState<EditorTableIdentifier | null>(null);
@@ -208,6 +209,10 @@ const SQLEditorWithOperation = forwardRef<ISQLEditorWithOperationRef, ISQLEditor
     executeSQL: handleExecuteSQL,
     hasUnsavedChangesBeforeClose,
     saveBeforeClose,
+    waitForPendingSave:
+      type === WorkspaceTabType.LocalSQLFile && dbInfo.filePath
+        ? () => waitForLocalFileSave(dbInfo.filePath!)
+        : undefined,
     persistBeforeApplicationExit: type === WorkspaceTabType.CONSOLE ? flushAutoSave : undefined,
   }));
 
@@ -940,7 +945,10 @@ const SQLEditorWithOperation = forwardRef<ISQLEditorWithOperationRef, ISQLEditor
       }
       return;
     }
-    void saveConsole(getValue(), { mode: 'manual' });
+    void saveConsole(getValue(), { mode: 'manual' }).catch((error) => {
+      console.error('save saved-console error', error);
+      staticMessage.error(i18n('common.text.failure'));
+    });
   }, [
     dbInfo.consoleId,
     dbInfo.databaseName,
@@ -983,8 +991,9 @@ const SQLEditorWithOperation = forwardRef<ISQLEditorWithOperationRef, ISQLEditor
 
   const handleSaveFile = async () => {
     const fileContent = sqlEditorRef.current?.getValue() ?? '';
+    let result: Awaited<ReturnType<typeof saveLocalFileContent>>;
     try {
-      await updateFileContent({
+      result = await saveLocalFileContent({
         filePath: dbInfo.filePath!,
         fileContent,
         charset: dbInfo.fileCharset,
@@ -996,10 +1005,11 @@ const SQLEditorWithOperation = forwardRef<ISQLEditorWithOperationRef, ISQLEditor
       return false;
     }
     try {
-      sqlEditorRef.current?.resetContentDiffBaseline(fileContent);
+      sqlEditorRef.current?.resetContentDiffBaseline(result.fileContent);
     } catch {
       // Content diff is only a hint and must not affect file saving.
     }
+    setDBInfo({ ddl: result.fileContent });
     staticMessage.success(i18n('workspace.text.changeFileSuccess'));
     return true;
   };
@@ -1028,7 +1038,9 @@ const SQLEditorWithOperation = forwardRef<ISQLEditorWithOperationRef, ISQLEditor
       try {
         await saveConsole(getValue(), { mode: 'manual' });
         return true;
-      } catch {
+      } catch (error) {
+        console.error('save saved-console before close error', error);
+        staticMessage.error(i18n('common.text.failure'));
         return false;
       }
     }
@@ -1152,7 +1164,7 @@ const SQLEditorWithOperation = forwardRef<ISQLEditorWithOperationRef, ISQLEditor
     isConsole && type === WorkspaceTabType.CONSOLE && dbInfo.dataSourceId
       ? getDataSourceWatermarkContent(dbInfo, dataSourceState)
       : undefined;
-  const watermarkColor = identityColor ? withIdentityColorAlpha(identityColor, 0.4) : undefined;
+  const watermarkColor = withIdentityColorAlpha(identityColor || theme.colorPrimary, 0.4);
   const watermarkLayout = getDataSourceWatermarkLayout(editorViewportSize?.width, editorViewportSize?.height);
 
   return (
diff --git a/chat2db-community-client/src/components/SQLEditor/editor/SQLEditorWithOperation/style.ts b/chat2db-community-client/src/components/SQLEditor/editor/SQLEditorWithOperation/style.ts
index 1c40655bd8..a8ac89bba4 100644
--- a/chat2db-community-client/src/components/SQLEditor/editor/SQLEditorWithOperation/style.ts
+++ b/chat2db-community-client/src/components/SQLEditor/editor/SQLEditorWithOperation/style.ts
@@ -25,6 +25,19 @@ export const useStyles = createStyles(({ css, token }) => {
       width: 100%;
       height: 0px;
       border-top: 1px solid ${colorBorderLayout};
+
+      > .monaco-editor {
+        width: 100% !important;
+      }
+
+      > .monaco-editor > .overflow-guard {
+        width: 100% !important;
+      }
+
+      > .monaco-editor .editor-scrollable {
+        right: 0 !important;
+        width: auto !important;
+      }
     `,
     watermarkLayer: css`
       position: absolute;
diff --git a/chat2db-community-client/src/components/SQLEditor/hooks/useSaveEditorData.ts b/chat2db-community-client/src/components/SQLEditor/hooks/useSaveEditorData.ts
index a0542994f1..0d5df2597e 100644
--- a/chat2db-community-client/src/components/SQLEditor/hooks/useSaveEditorData.ts
+++ b/chat2db-community-client/src/components/SQLEditor/hooks/useSaveEditorData.ts
@@ -15,6 +15,7 @@ import {
   type SavedConsoleSaveMode,
 } from '@/store/workspace/utils/savedConsoleMutationCoordinator';
 import { persistSavedConsoleRecord } from '@/store/workspace/utils/savedConsolePersistence';
+import { hasUnsavedSavedConsoleChanges } from '@/utils/savedConsoleDirty';
 
 interface IProps {
   isActive?: boolean;
@@ -44,7 +45,7 @@ export const useSaveEditorData = (props: IProps) => {
   const timerRef = useRef<any>();
   const effectiveConsoleIdRef = useRef<number | undefined>(boundInfo?.consoleId);
   // Console data from the previous synchronization.
-  const lastSyncConsole = useRef<any>(defaultValue);
+  const lastSyncConsole = useRef(defaultValue ?? '');
   const storageId = boundInfo?.workspaceTabId ?? boundInfo?.consoleId;
   const isReadOnly = !!boundInfo?.readOnly;
   const [saveStatus, setSaveStatus] = useState<ConsoleStatus>(boundInfo?.status || ConsoleStatus.DRAFT);
@@ -93,7 +94,7 @@ export const useSaveEditorData = (props: IProps) => {
     }
 
     if (isReadOnly) {
-      lastSyncConsole.current = value;
+      lastSyncConsole.current = value ?? '';
       return Promise.resolve();
     }
 
@@ -106,7 +107,7 @@ export const useSaveEditorData = (props: IProps) => {
           userId: curUser?.id,
         })
         .then(() => {
-          lastSyncConsole.current = value;
+          lastSyncConsole.current = value ?? '';
         });
     }
 
@@ -139,7 +140,7 @@ export const useSaveEditorData = (props: IProps) => {
               userId: curUser?.id,
             })
             .then(() => {
-              lastSyncConsole.current = value;
+              lastSyncConsole.current = value ?? '';
             });
           return;
         }
@@ -163,7 +164,7 @@ export const useSaveEditorData = (props: IProps) => {
         getSavedConsoleList();
         emitSavedConsoleUpdated(savedBoundInfo);
         void indexDB.deleteValue(storageId);
-        lastSyncConsole.current = value;
+        lastSyncConsole.current = value ?? '';
         saveStatusRef.current = ConsoleStatus.RELEASE;
         setSaveStatus(ConsoleStatus.RELEASE);
         markWorkspaceTabConsoleSaved({
@@ -182,6 +183,9 @@ export const useSaveEditorData = (props: IProps) => {
   };
 
   const persistAutomaticValue = async (value = editorRef.current?.getValue()) => {
+    if (type === WorkspaceTabType.LocalSQLFile) {
+      return true;
+    }
     if (value === undefined || value === lastSyncConsole.current || isReadOnly) {
       return true;
     }
@@ -229,7 +233,6 @@ export const useSaveEditorData = (props: IProps) => {
       timingAutoSave();
     }
     return () => {
-      lastSyncConsole.current = null;
       if (timerRef.current) {
         clearInterval(timerRef.current);
       }
@@ -247,6 +250,10 @@ export const useSaveEditorData = (props: IProps) => {
   }, [boundInfo?.consoleId, boundInfo?.status]);
 
   useEffect(() => {
+    if (type === WorkspaceTabType.LocalSQLFile) {
+      editorRef?.current?.setValue(defaultValue || '', 'reset');
+      return;
+    }
     if (saveStatus === ConsoleStatus.RELEASE) {
       editorRef?.current?.setValue(defaultValue || '', 'reset');
     } else {
@@ -265,12 +272,7 @@ export const useSaveEditorData = (props: IProps) => {
   }, []);
 
   const hasUnsavedChanges = useCallback(
-    (value: string) => {
-      if (!value.trim()) {
-        return false;
-      }
-      return !hasSavedSqlRecord || value !== lastSyncConsole.current;
-    },
+    (value: string) => hasUnsavedSavedConsoleChanges(value, hasSavedSqlRecord, lastSyncConsole.current),
     [hasSavedSqlRecord],
   );
 
diff --git a/chat2db-community-client/src/components/SingleCharacterSelect/index.test.ts b/chat2db-community-client/src/components/SingleCharacterSelect/index.test.ts
new file mode 100644
index 0000000000..d9915ce224
--- /dev/null
+++ b/chat2db-community-client/src/components/SingleCharacterSelect/index.test.ts
@@ -0,0 +1,14 @@
+import assert from 'node:assert/strict';
+import { buildSingleCharacterOptions } from './index';
+
+const presets = [
+  { value: ',', label: 'Comma' },
+  { value: ';', label: 'Semicolon' },
+];
+
+assert.equal(buildSingleCharacterOptions(',', presets, true, (value) => `Custom (${value})`), presets);
+assert.deepEqual(buildSingleCharacterOptions('^', presets, true, (value) => `Custom (${value})`), [
+  ...presets,
+  { value: '^', label: 'Custom (^)' },
+]);
+assert.equal(buildSingleCharacterOptions('^', presets, false, (value) => `Custom (${value})`), presets);
diff --git a/chat2db-community-client/src/components/SingleCharacterSelect/index.tsx b/chat2db-community-client/src/components/SingleCharacterSelect/index.tsx
new file mode 100644
index 0000000000..bdf22e9d10
--- /dev/null
+++ b/chat2db-community-client/src/components/SingleCharacterSelect/index.tsx
@@ -0,0 +1,88 @@
+import { useEffect, useState } from 'react';
+import { Divider, Input, Select } from 'antd';
+
+export interface SingleCharacterSelectProps {
+  label: string;
+  value: string;
+  options: { value: string; label: string }[];
+  className: string;
+  customInputClassName: string;
+  customOptionLabel: (value: string) => string;
+  customInputLabel: string;
+  allowCustom?: boolean;
+  disabled?: boolean;
+  onChange: (value: string) => void;
+}
+
+export const buildSingleCharacterOptions = (
+  value: string,
+  options: SingleCharacterSelectProps['options'],
+  allowCustom: boolean,
+  customOptionLabel: SingleCharacterSelectProps['customOptionLabel'],
+) =>
+  options.some((option) => option.value === value) || !allowCustom
+    ? options
+    : [...options, { value, label: customOptionLabel(value) }];
+
+const SingleCharacterSelect = ({
+  label,
+  value,
+  options,
+  className,
+  customInputClassName,
+  customOptionLabel,
+  customInputLabel,
+  allowCustom = true,
+  disabled,
+  onChange,
+}: SingleCharacterSelectProps) => {
+  const preset = options.some((option) => option.value === value);
+  const [customValue, setCustomValue] = useState(preset ? '' : value);
+
+  useEffect(() => {
+    setCustomValue(preset ? '' : value);
+  }, [preset, value]);
+
+  const selectOptions = buildSingleCharacterOptions(value, options, allowCustom, customOptionLabel);
+
+  return (
+    <div className={className}>
+      <span>{label}</span>
+      <Select
+        value={value}
+        options={selectOptions}
+        disabled={disabled}
+        onChange={onChange}
+        dropdownRender={
+          allowCustom
+            ? (menu) => (
+                <>
+                  {menu}
+                  <Divider style={{ margin: '4px 0' }} />
+                  <div className={customInputClassName} onMouseDown={(event) => event.stopPropagation()}>
+                    <Input
+                      aria-label={customInputLabel}
+                      maxLength={1}
+                      placeholder={customInputLabel}
+                      value={customValue}
+                      disabled={disabled}
+                      onKeyDown={(event) => event.stopPropagation()}
+                      onChange={(event) => {
+                        const nextValue = event.target.value;
+                        setCustomValue(nextValue);
+                        if (nextValue) {
+                          onChange(nextValue);
+                        }
+                      }}
+                    />
+                  </div>
+                </>
+              )
+            : undefined
+        }
+      />
+    </div>
+  );
+};
+
+export default SingleCharacterSelect;
diff --git a/chat2db-community-client/src/components/SingleFileMonacoEditor/index.tsx b/chat2db-community-client/src/components/SingleFileMonacoEditor/index.tsx
index 33d656294b..c6db60ee87 100644
--- a/chat2db-community-client/src/components/SingleFileMonacoEditor/index.tsx
+++ b/chat2db-community-client/src/components/SingleFileMonacoEditor/index.tsx
@@ -4,6 +4,12 @@ import classnames from 'classnames';
 import MonacoEditor, { IExportRefFunction } from '@/components/MonacoEditor';
 import { v4 as uuid } from 'uuid';
 import { createSingleFileShortcutController } from './shortcut';
+import {
+  createSingleFileMonacoEditorRef,
+  ISingleFileMonacoEditorRefFunction,
+} from './refAdapter';
+
+export type { ISingleFileMonacoEditorRefFunction } from './refAdapter';
 
 interface IProps {
   className?: string;
@@ -12,12 +18,6 @@ interface IProps {
   ref: any; // TODO: Move this ref to the appropriate owner.
 }
 
-export interface ISingleFileMonacoEditorRefFunction {
-  getAllContent?: () => string;
-  setValue?: (value: string) => void;
-  onSearch?: () => void;
-}
-
 const options = {
   lineNumbers: false,
   renderLineHighlight: 'none',
@@ -77,15 +77,9 @@ const SingleFileMonacoEditor = memo<IProps>(
       [shortcutController],
     );
 
-    const getAllContent = () => {
-      return monacoEditorRef.current?.getAllContent() || '';
-    };
-
-    useImperativeHandle(ref, () => ({
-      getAllContent,
-      setValue: (value) => monacoEditorRef.current?.setValue(value),
-      onSearch: handleEnterSearch,
-    }));
+    useImperativeHandle(ref, () =>
+      createSingleFileMonacoEditorRef(() => monacoEditorRef.current, handleEnterSearch),
+    );
 
     return (
       <div ref={ref as any} className={classnames(styles.singleFileMonacoEditor, className)}>
diff --git a/chat2db-community-client/src/components/SingleFileMonacoEditor/refAdapter.test.ts b/chat2db-community-client/src/components/SingleFileMonacoEditor/refAdapter.test.ts
new file mode 100644
index 0000000000..e5fe176247
--- /dev/null
+++ b/chat2db-community-client/src/components/SingleFileMonacoEditor/refAdapter.test.ts
@@ -0,0 +1,26 @@
+import assert from 'node:assert/strict';
+import { createSingleFileMonacoEditorRef } from './refAdapter';
+
+let value = 'legacy desc';
+const receivedRanges: unknown[] = [];
+const editor = {
+  getAllContent: () => value,
+  setValue: (text: unknown, range: unknown = 'end') => {
+    receivedRanges.push(range);
+    value = range === 'cover' ? String(text) : `${value}${text}`;
+  },
+};
+
+const editorRef = createSingleFileMonacoEditorRef(() => editor, () => undefined);
+
+editorRef.setValue?.('id desc', 'cover');
+assert.equal(value, 'id desc', 'the first grid sort replaces stale order text');
+
+editorRef.setValue?.('category asc', 'cover');
+assert.equal(value, 'category asc', 'switching grid columns replaces the previous sort instead of appending');
+
+editorRef.setValue?.('', 'cover');
+assert.equal(value, '', 'clearing grid sorting removes the previous order text');
+assert.deepEqual(receivedRanges, ['cover', 'cover', 'cover'], 'the adapter preserves the Monaco edit range');
+
+console.log('SingleFileMonacoEditor ref adapter tests passed');
diff --git a/chat2db-community-client/src/components/SingleFileMonacoEditor/refAdapter.ts b/chat2db-community-client/src/components/SingleFileMonacoEditor/refAdapter.ts
new file mode 100644
index 0000000000..0fbb321fda
--- /dev/null
+++ b/chat2db-community-client/src/components/SingleFileMonacoEditor/refAdapter.ts
@@ -0,0 +1,18 @@
+import type { IExportRefFunction } from '@/components/MonacoEditor';
+
+export interface ISingleFileMonacoEditorRefFunction {
+  getAllContent?: () => string;
+  setValue?: IExportRefFunction['setValue'];
+  onSearch?: () => void;
+}
+
+type SingleFileMonacoEditor = Pick<IExportRefFunction, 'getAllContent' | 'setValue'>;
+
+export const createSingleFileMonacoEditorRef = (
+  getEditor: () => SingleFileMonacoEditor | null | undefined,
+  onSearch: () => void,
+): ISingleFileMonacoEditorRefFunction => ({
+  getAllContent: () => getEditor()?.getAllContent() || '',
+  setValue: (...args) => getEditor()?.setValue(...args),
+  onSearch,
+});
diff --git a/chat2db-community-client/src/components/Tabs/index.tsx b/chat2db-community-client/src/components/Tabs/index.tsx
index 0a3f0667a7..d56140ae1e 100644
--- a/chat2db-community-client/src/components/Tabs/index.tsx
+++ b/chat2db-community-client/src/components/Tabs/index.tsx
@@ -32,6 +32,7 @@ import {
   registerCloseActiveResultTabHandler,
 } from '@/service/resultTabShortcut';
 import { shouldProcessTabScrollRequest, type ProcessedTabScrollRequest } from './activeTabScroll';
+import { getTabAccentStyle } from './tabAccentColor';
 import { getTabWheelScrollAmount } from './wheelScroll';
 
 export interface ITabItem {
@@ -708,9 +709,7 @@ export default memo<IProps>((props) => {
 
     const tabStyle = {
       ...t.styles,
-      ...(t.accentColor !== undefined
-        ? ({ '--chat2db-tab-accent-color': t.accentColor || 'transparent' } as React.CSSProperties)
-        : {}),
+      ...getTabAccentStyle(t.accentColor),
     };
     const tabNode = enableReorder ? (
       <SortableTabItem
diff --git a/chat2db-community-client/src/components/Tabs/tabAccentColor.test.ts b/chat2db-community-client/src/components/Tabs/tabAccentColor.test.ts
new file mode 100644
index 0000000000..0377897153
--- /dev/null
+++ b/chat2db-community-client/src/components/Tabs/tabAccentColor.test.ts
@@ -0,0 +1,9 @@
+import assert from 'node:assert/strict';
+import { getTabAccentStyle } from './tabAccentColor';
+
+assert.deepEqual(getTabAccentStyle('#12AB34'), { '--chat2db-tab-accent-color': '#12AB34' });
+assert.deepEqual(getTabAccentStyle(null), {});
+assert.deepEqual(getTabAccentStyle(undefined), {});
+assert.deepEqual(getTabAccentStyle(''), {});
+
+console.log('Tab accent color tests passed');
diff --git a/chat2db-community-client/src/components/Tabs/tabAccentColor.ts b/chat2db-community-client/src/components/Tabs/tabAccentColor.ts
new file mode 100644
index 0000000000..ac63cb3110
--- /dev/null
+++ b/chat2db-community-client/src/components/Tabs/tabAccentColor.ts
@@ -0,0 +1,9 @@
+import type { CSSProperties } from 'react';
+
+type TabAccentStyle = CSSProperties & {
+  '--chat2db-tab-accent-color'?: string;
+};
+
+export function getTabAccentStyle(accentColor?: string | null): TabAccentStyle {
+  return accentColor ? { '--chat2db-tab-accent-color': accentColor } : {};
+}
diff --git a/chat2db-community-client/src/components/ViewTable/index.tsx b/chat2db-community-client/src/components/ViewTable/index.tsx
index b971ddd25a..3937346f33 100644
--- a/chat2db-community-client/src/components/ViewTable/index.tsx
+++ b/chat2db-community-client/src/components/ViewTable/index.tsx
@@ -8,6 +8,7 @@ import { replaceViewTableResult } from '@/hooks/viewTablePagingModel';
 import SqlExecutionLoading from '@/components/SqlExecutionLoading';
 import { useStyles } from './style';
 import { beginLatestRequest, invalidateLatestRequest, isLatestRequest } from '@/utils/latestRequest';
+import { IMPORT_TARGET_TABLE_REFRESH_EVENT } from '@/store/importExport/taskCenterUtils';
 
 interface IProps {
   className?: string;
@@ -26,7 +27,7 @@ const ViewTable = memo<IProps>((props) => {
   } = useViewTable();
   const { resultData: pagedResultData, executing: pagingExecuting, executePage, stopExecuteSQL: stopPaging } =
     useViewTablePaging();
-  useEffect(() => {
+  const refreshCurrentTable = useCallback(() => {
     if (viewTableParams) {
       const requestGeneration = beginLatestRequest(requestGenerationRef);
       executeInitialTable(viewTableParams).then((data) => {
@@ -35,10 +36,30 @@ const ViewTable = memo<IProps>((props) => {
         setResultDataList(_resultDataList);
       });
     }
+  }, [executeInitialTable, viewTableParams]);
+
+  useEffect(() => {
+    refreshCurrentTable();
     return () => {
       invalidateLatestRequest(requestGenerationRef);
     };
-  }, [executeInitialTable]);
+  }, [refreshCurrentTable]);
+
+  useEffect(() => {
+    const handleImportRefresh = (event: Event) => {
+      const target = (event as CustomEvent<IViewTableParams>).detail;
+      if (
+        target?.dataSourceId === viewTableParams?.dataSourceId &&
+        target?.databaseName === viewTableParams?.databaseName &&
+        target?.schemaName === viewTableParams?.schemaName &&
+        target?.tableName === viewTableParams?.tableName
+      ) {
+        refreshCurrentTable();
+      }
+    };
+    window.addEventListener(IMPORT_TARGET_TABLE_REFRESH_EVENT, handleImportRefresh);
+    return () => window.removeEventListener(IMPORT_TARGET_TABLE_REFRESH_EVENT, handleImportRefresh);
+  }, [refreshCurrentTable, viewTableParams]);
 
   useEffect(() => {
     if (pagedResultData) {
diff --git a/chat2db-community-client/src/constants/activeTransaction.ts b/chat2db-community-client/src/constants/activeTransaction.ts
new file mode 100644
index 0000000000..6b3379292a
--- /dev/null
+++ b/chat2db-community-client/src/constants/activeTransaction.ts
@@ -0,0 +1,27 @@
+export enum ActiveTransactionQueryState {
+  VISIBLE = 'VISIBLE',
+  UNAVAILABLE = 'UNAVAILABLE',
+}
+
+export enum ActiveTransactionSessionState {
+  LIVE = 'LIVE',
+  DISAPPEARED_OR_HIDDEN = 'DISAPPEARED_OR_HIDDEN',
+}
+
+export enum ActiveTransactionLockMetadataState {
+  AVAILABLE = 'AVAILABLE',
+  UNAVAILABLE = 'UNAVAILABLE',
+}
+
+export enum ActiveTransactionLockMetadataSource {
+  MYSQL_80_PERFORMANCE_SCHEMA = 'MYSQL_80_PERFORMANCE_SCHEMA',
+  MYSQL_57_INFORMATION_SCHEMA = 'MYSQL_57_INFORMATION_SCHEMA',
+}
+
+export const ACTIVE_TRANSACTION_PROCESS_PRIVILEGE_ERROR_CODE =
+  'mysql.activeTransaction.processPrivilegeRequired';
+
+export const MYSQL_ACTIVE_TRANSACTION_STATE = {
+  RUNNING: 'RUNNING',
+  LOCK_WAIT: 'LOCK WAIT',
+} as const;
diff --git a/chat2db-community-client/src/constants/database.ts b/chat2db-community-client/src/constants/database.ts
index 3dbb41a9c7..34b38d0abd 100644
--- a/chat2db-community-client/src/constants/database.ts
+++ b/chat2db-community-client/src/constants/database.ts
@@ -1,6 +1,5 @@
 import { IDatabase } from '@/typings';
 import { DatabaseTypeCode } from './common';
-import { databaseCapabilities } from './databaseCapabilities';
 
 export enum ConnectionEnvType {
   DAILY = 'DAILY',
@@ -124,8 +123,8 @@ export const databaseMap: {
     name: 'Hive',
     code: DatabaseTypeCode.HIVE,
     icon: 'icon-colourful-HIVE',
-    supportDatabase: false,
-    supportSchema: true,
+    supportDatabase: true,
+    supportSchema: false,
   },
   [DatabaseTypeCode.KINGBASE]: {
     name: 'Kingbase',
@@ -285,29 +284,6 @@ const databaseTypeAliasMap: Record<string, DatabaseTypeCode> = {
   SHENTONGDB: DatabaseTypeCode.OSCAR,
 };
 
-interface RoutineOperationDatabaseConfig {
-  enabled: boolean;
-}
-
-const buildEnabledDatabaseConfig = <T extends { enabled: boolean }>(
-  databaseTypes: readonly DatabaseTypeCode[],
-): Partial<Record<DatabaseTypeCode, T>> => {
-  return databaseTypes.reduce<Partial<Record<DatabaseTypeCode, T>>>((config, databaseType) => {
-    config[databaseType] = { enabled: true } as T;
-    return config;
-  }, {});
-};
-
-export const routineOperationDatabaseConfig: Partial<Record<DatabaseTypeCode, RoutineOperationDatabaseConfig>> =
-  buildEnabledDatabaseConfig(databaseCapabilities.routineOperationSupported);
-
-interface AccountManageDatabaseConfig {
-  enabled: boolean;
-}
-
-export const accountManageDatabaseConfig: Partial<Record<DatabaseTypeCode, AccountManageDatabaseConfig>> =
-  buildEnabledDatabaseConfig(databaseCapabilities.accountManageSupported);
-
 export const normalizeDatabaseType = (databaseType?: string | null) => {
   if (!databaseType) {
     return undefined;
@@ -332,13 +308,3 @@ export const getDatabaseInfo = (databaseType?: string | null) => {
   const normalizedType = normalizeDatabaseType(databaseType);
   return normalizedType ? databaseMap[normalizedType] : undefined;
 };
-
-export const isRoutineOperationSupportedDatabaseType = (databaseType?: string | null) => {
-  const normalizedType = normalizeDatabaseType(databaseType);
-  return !!normalizedType && !!routineOperationDatabaseConfig[normalizedType as DatabaseTypeCode]?.enabled;
-};
-
-export const isAccountManageSupportedDatabaseType = (databaseType?: string | null) => {
-  const normalizedType = normalizeDatabaseType(databaseType);
-  return !!normalizedType && !!accountManageDatabaseConfig[normalizedType as DatabaseTypeCode]?.enabled;
-};
diff --git a/chat2db-community-client/src/constants/databaseCapabilities.ts b/chat2db-community-client/src/constants/databaseCapabilities.ts
index 234cf9bd0d..686c4a7eaf 100644
--- a/chat2db-community-client/src/constants/databaseCapabilities.ts
+++ b/chat2db-community-client/src/constants/databaseCapabilities.ts
@@ -1,4 +1,28 @@
-import { DatabaseTypeCode } from './common';
+export enum DatabaseCapability {
+  ROUTINE_OPERATION = 'ROUTINE_OPERATION',
+  ACCOUNT_MANAGEMENT = 'ACCOUNT_MANAGEMENT',
+  ACTIVE_TRANSACTION_INSPECTION = 'ACTIVE_TRANSACTION_INSPECTION',
+  DATABASE_DELETE = 'DATABASE_DELETE',
+  SCHEMA_DELETE = 'SCHEMA_DELETE',
+  DATABASE_CREATE = 'DATABASE_CREATE',
+  DATABASE_CREATE_CHARSET = 'DATABASE_CREATE_CHARSET',
+  DATABASE_CREATE_COLLATION = 'DATABASE_CREATE_COLLATION',
+  SCHEMA_CREATE = 'SCHEMA_CREATE',
+  IMPORT_EXPORT = 'IMPORT_EXPORT',
+  JAVA_CLASS_GENERATION = 'JAVA_CLASS_GENERATION',
+  BACKEND_COMPLETION = 'BACKEND_COMPLETION',
+  BACKEND_EDITOR_HINTS = 'BACKEND_EDITOR_HINTS',
+  TABLE_EDITOR_BASE_INFO = 'TABLE_EDITOR_BASE_INFO',
+  TABLE_EDITOR_INDEX_METHOD = 'TABLE_EDITOR_INDEX_METHOD',
+  TABLE_EDITOR_COLUMN_VISIBILITY = 'TABLE_EDITOR_COLUMN_VISIBILITY',
+  TABLE_EDITOR_INDEX_VISIBILITY = 'TABLE_EDITOR_INDEX_VISIBILITY',
+  TABLE_EDITOR_INDEX_COLUMN = 'TABLE_EDITOR_INDEX_COLUMN',
+  TABLE_EDITOR_INCLUDE_COLLATION = 'TABLE_EDITOR_INCLUDE_COLLATION',
+  TABLE_EDITOR_EXISTING_COLUMN_EDIT = 'TABLE_EDITOR_EXISTING_COLUMN_EDIT',
+  TABLE_EDITOR_SPARSE_COLUMN = 'TABLE_EDITOR_SPARSE_COLUMN',
+  REDIS_TREE = 'REDIS_TREE',
+  MONGODB_TREE = 'MONGODB_TREE',
+}
 
 export enum IdentifierQuoteMode {
   NONE = 'NONE',
@@ -6,92 +30,3 @@ export enum IdentifierQuoteMode {
   SQUARE_BRACKET = 'SQUARE_BRACKET',
   BACKTICK = 'BACKTICK',
 }
-
-export const databaseCapabilities = {
-  routineOperationSupported: [DatabaseTypeCode.MYSQL],
-  accountManageSupported: [DatabaseTypeCode.MYSQL],
-  databaseDeleteSupported: [DatabaseTypeCode.MYSQL, DatabaseTypeCode.POSTGRESQL],
-  schemaDeleteSupported: [DatabaseTypeCode.POSTGRESQL],
-  createDatabaseUnsupported: [DatabaseTypeCode.H2],
-  createDatabaseCharsetSupported: [DatabaseTypeCode.MYSQL],
-  createDatabaseCollationSupported: [DatabaseTypeCode.MYSQL],
-  createSchemaUnsupported: [DatabaseTypeCode.ORACLE, DatabaseTypeCode.OSCAR],
-  importExportUnsupported: [
-    DatabaseTypeCode.REDIS,
-    DatabaseTypeCode.H2,
-    DatabaseTypeCode.PRESTO,
-    DatabaseTypeCode.MONGODB,
-    DatabaseTypeCode.SNOWFLAKE,
-    DatabaseTypeCode.KYLIN,
-    DatabaseTypeCode.KINGBASE,
-    DatabaseTypeCode.HIVE,
-  ],
-  generateJavaClassSupported: [
-    DatabaseTypeCode.CLICKHOUSE,
-    DatabaseTypeCode.DB2,
-    DatabaseTypeCode.DM,
-    DatabaseTypeCode.KINGBASE,
-    DatabaseTypeCode.POSTGRESQL,
-    DatabaseTypeCode.SQLITE,
-    DatabaseTypeCode.SQLSERVER,
-    DatabaseTypeCode.MYSQL,
-    DatabaseTypeCode.ORACLE,
-  ],
-  backendCompletionSupported: [DatabaseTypeCode.MYSQL],
-  backendEditorHintsSupported: [
-    DatabaseTypeCode.MYSQL,
-    DatabaseTypeCode.POSTGRESQL,
-    DatabaseTypeCode.GAUSSDB,
-  ],
-  tableEditorMysqlBaseInfoSupported: [DatabaseTypeCode.MYSQL],
-  tableEditorMysqlIndexMethodSupported: [DatabaseTypeCode.MYSQL],
-  tableEditorOracleIndexColumnHidden: [DatabaseTypeCode.ORACLE],
-  tableEditorSqliteIncludeCollationSupported: [DatabaseTypeCode.SQLITE],
-  tableEditorSqliteExistingColumnReadonly: [DatabaseTypeCode.SQLITE],
-  tableEditorSqlServerSparseSupported: [DatabaseTypeCode.SQLSERVER],
-  redisTreeDataSourceTypes: [DatabaseTypeCode.REDIS],
-  mongodbTreeDataSourceTypes: [DatabaseTypeCode.MONGODB],
-  openTableIdentifierQuote: {
-    [IdentifierQuoteMode.DOUBLE_QUOTE]: [
-      DatabaseTypeCode.ORACLE,
-      DatabaseTypeCode.OSCAR,
-      DatabaseTypeCode.SQLITE,
-      DatabaseTypeCode.POSTGRESQL,
-      DatabaseTypeCode.H2,
-      DatabaseTypeCode.DB2,
-      DatabaseTypeCode.KINGBASE,
-      DatabaseTypeCode.DM,
-    ],
-    [IdentifierQuoteMode.SQUARE_BRACKET]: [DatabaseTypeCode.SQLSERVER],
-    [IdentifierQuoteMode.BACKTICK]: [DatabaseTypeCode.MYSQL, DatabaseTypeCode.CLICKHOUSE, DatabaseTypeCode.MARIADB],
-  },
-  sqlCompletionIdentifierQuote: {
-    [IdentifierQuoteMode.DOUBLE_QUOTE]: [
-      DatabaseTypeCode.POSTGRESQL,
-      DatabaseTypeCode.ORACLE,
-      DatabaseTypeCode.OSCAR,
-      DatabaseTypeCode.DB2,
-      DatabaseTypeCode.DM,
-      DatabaseTypeCode.H2,
-      DatabaseTypeCode.SQLITE,
-      DatabaseTypeCode.OCEANBASE_ORACLE,
-      DatabaseTypeCode.KINGBASE,
-      DatabaseTypeCode.SNOWFLAKE,
-      DatabaseTypeCode.OPENGAUSS,
-      DatabaseTypeCode.SUNDB,
-      DatabaseTypeCode.COCKROACHDB,
-      DatabaseTypeCode.KYLIN,
-      DatabaseTypeCode.XUGUDB,
-      DatabaseTypeCode.PRESTO,
-    ],
-    [IdentifierQuoteMode.SQUARE_BRACKET]: [DatabaseTypeCode.SQLSERVER],
-    [IdentifierQuoteMode.BACKTICK]: [
-      DatabaseTypeCode.MYSQL,
-      DatabaseTypeCode.MARIADB,
-      DatabaseTypeCode.TIDB,
-      DatabaseTypeCode.CLICKHOUSE,
-      DatabaseTypeCode.OCEANBASE,
-      DatabaseTypeCode.HIVE,
-    ],
-  },
-} as const;
diff --git a/chat2db-community-client/src/constants/editTable.ts b/chat2db-community-client/src/constants/editTable.ts
index 042cf7c683..6739d50b07 100644
--- a/chat2db-community-client/src/constants/editTable.ts
+++ b/chat2db-community-client/src/constants/editTable.ts
@@ -14,3 +14,10 @@ export enum NullableType {
   // Can be null
   Null = 1,
 }
+
+export const MYSQL_PRIMARY_INDEX_TYPE = 'Primary' as const;
+
+export const MYSQL_VISIBILITY = {
+  VISIBLE: { label: 'VISIBLE', value: true },
+  INVISIBLE: { label: 'INVISIBLE', value: false },
+} as const;
diff --git a/chat2db-community-client/src/constants/importExport.ts b/chat2db-community-client/src/constants/importExport.ts
index e9872ba2df..eb7fb72542 100644
--- a/chat2db-community-client/src/constants/importExport.ts
+++ b/chat2db-community-client/src/constants/importExport.ts
@@ -32,3 +32,15 @@ export const ACTIVE_TASK_STATUSES: ImportExportTaskStatus[] = [
   ImportExportTaskStatus.PENDING,
   ImportExportTaskStatus.RUNNING,
 ];
+
+export const SKIP_IMPORT_SOURCE_FIELD = '__skip__';
+
+export enum ImportUnmappedTarget {
+  DEFAULT = 'DEFAULT',
+  NULL = 'NULL',
+}
+
+export enum ImportPreviewErrorCode {
+  DUPLICATE_SOURCE_COLUMNS = 'import.preview.duplicateSourceColumns',
+  INVALID_CSV_OPTIONS = 'import.preview.invalidCsvOptions',
+}
diff --git a/chat2db-community-client/src/constants/tree.ts b/chat2db-community-client/src/constants/tree.ts
index 94049852b4..e069d16a18 100644
--- a/chat2db-community-client/src/constants/tree.ts
+++ b/chat2db-community-client/src/constants/tree.ts
@@ -5,6 +5,8 @@ export enum TreeNodeType {
   ALL_DATA = 'allData', // All data dedicated to redis
   DATA_SOURCES = 'dataSources',
   DATA_SOURCE = 'dataSource',
+  MONITOR = 'monitor',
+  ACTIVE_TRANSACTIONS = 'activeTransactions',
   DATABASE_ACCOUNTS = 'databaseAccounts',
   DATABASE_ACCOUNT = 'databaseAccount',
   DATABASE = 'database',
@@ -50,6 +52,7 @@ export enum OperationColumn {
   // Universal
   DeleteTreeNode = 'deleteTreeNode', // delete tree node
   Refresh = 'refresh', // Refresh menus at all levels
+  ActiveTransactions = 'activeTransactions', // Active InnoDB transactions (MYSQL-OPS-002)
   CreateConsole = 'createConsole', // Create a new console
   Rename = 'rename', // Rename
 
diff --git a/chat2db-community-client/src/constants/workspace.ts b/chat2db-community-client/src/constants/workspace.ts
index 17f539cf5a..3e55641804 100644
--- a/chat2db-community-client/src/constants/workspace.ts
+++ b/chat2db-community-client/src/constants/workspace.ts
@@ -33,6 +33,7 @@ export enum WorkspaceTabType {
   ViewERModal = 'viewERModal',
   RedisAllData = 'redisAllData',
   AccountPrivileges = 'accountPrivileges',
+  ActiveTransactions = 'activeTransactions',
   ContentDiff = 'contentDiff',
   Terminal = 'terminal',
 }
@@ -88,6 +89,9 @@ export const workspaceTabConfig: {
   [WorkspaceTabType.AccountPrivileges]: {
     icon: 'icon-users',
   },
+  [WorkspaceTabType.ActiveTransactions]: {
+    icon: 'icon-file-text',
+  },
   [WorkspaceTabType.ContentDiff]: {
     icon: 'icon-switch-horizontal',
   },
diff --git a/chat2db-community-client/src/hooks/selectDatabaseRequestLifecycle.test.ts b/chat2db-community-client/src/hooks/selectDatabaseRequestLifecycle.test.ts
new file mode 100644
index 0000000000..b1526967a4
--- /dev/null
+++ b/chat2db-community-client/src/hooks/selectDatabaseRequestLifecycle.test.ts
@@ -0,0 +1,221 @@
+import assert from 'node:assert/strict';
+import { DatabaseTypeCode } from '@/constants/common';
+import { TreeNodeType } from '@/constants/tree';
+import type { TreeNodeData } from '@/typings/tree';
+import {
+  createSelectDatabaseRequestLifecycle,
+  disposeSelectDatabaseRequests,
+  hasApplicableDatabaseNameChange,
+  invalidateDatabaseOptionRequests,
+  invalidateDataSourceOptionRequests,
+  normalizeDataSourceOptions,
+  normalizeDatabaseOptions,
+  normalizeSchemaOptions,
+  runDatabaseOptionRequest,
+  runSchemaOptionRequest,
+} from './selectDatabaseRequestLifecycle';
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (reason?: unknown) => void;
+  const promise = new Promise<T>((done, fail) => {
+    resolve = done;
+    reject = fail;
+  });
+  return { promise, reject, resolve };
+}
+
+function treeNode(
+  treeNodeType: TreeNodeType,
+  originalTitle: string,
+  extraParams: TreeNodeData['extraParams'],
+): TreeNodeData {
+  return {
+    key: `${treeNodeType}-${originalTitle}`,
+    originalTitle,
+    treeNodeType,
+    extraParams,
+  };
+}
+
+async function testLatestDataSourceDatabaseRequestWins() {
+  const lifecycle = createSelectDatabaseRequestLifecycle();
+  const firstResponse = deferred<string[]>();
+  const secondResponse = deferred<string[]>();
+  const committedOptions: string[][] = [];
+  const firstRequest = runDatabaseOptionRequest(
+    lifecycle,
+    () => firstResponse.promise,
+    (options) => committedOptions.push(options),
+    () => committedOptions.push([]),
+  );
+  const secondRequest = runDatabaseOptionRequest(
+    lifecycle,
+    () => secondResponse.promise,
+    (options) => committedOptions.push(options),
+    () => committedOptions.push([]),
+  );
+
+  secondResponse.resolve(['new-source-database']);
+  await secondRequest;
+  firstResponse.reject(new Error('stale source request failed'));
+  await firstRequest;
+
+  assert.deepEqual(committedOptions, [['new-source-database']]);
+}
+
+async function testLatestDatabaseSchemaRequestWins() {
+  const lifecycle = createSelectDatabaseRequestLifecycle();
+  const firstResponse = deferred<string[]>();
+  const secondResponse = deferred<string[]>();
+  const committedOptions: string[][] = [];
+  const firstRequest = runSchemaOptionRequest(
+    lifecycle,
+    () => firstResponse.promise,
+    (options) => committedOptions.push(options),
+    () => committedOptions.push([]),
+  );
+
+  invalidateDatabaseOptionRequests(lifecycle);
+  const secondRequest = runSchemaOptionRequest(
+    lifecycle,
+    () => secondResponse.promise,
+    (options) => committedOptions.push(options),
+    () => committedOptions.push([]),
+  );
+  secondResponse.resolve(['new-database-schema']);
+  await secondRequest;
+  firstResponse.resolve(['stale-database-schema']);
+  await firstRequest;
+
+  assert.deepEqual(committedOptions, [['new-database-schema']]);
+}
+
+async function testParentClearInvalidatesBothDependentLevels() {
+  const lifecycle = createSelectDatabaseRequestLifecycle();
+  const databaseResponse = deferred<string[]>();
+  const schemaResponse = deferred<string[]>();
+  const committedOptions: string[][] = [];
+  const databaseRequest = runDatabaseOptionRequest(
+    lifecycle,
+    () => databaseResponse.promise,
+    (options) => committedOptions.push(options),
+    () => committedOptions.push([]),
+  );
+  const schemaRequest = runSchemaOptionRequest(
+    lifecycle,
+    () => schemaResponse.promise,
+    (options) => committedOptions.push(options),
+    () => committedOptions.push([]),
+  );
+
+  invalidateDataSourceOptionRequests(lifecycle);
+  databaseResponse.resolve(['stale-database']);
+  schemaResponse.resolve(['stale-schema']);
+  await Promise.all([databaseRequest, schemaRequest]);
+
+  assert.deepEqual(committedOptions, []);
+}
+
+async function testUnmountInvalidatesBothDependentLevels() {
+  const lifecycle = createSelectDatabaseRequestLifecycle();
+  const databaseResponse = deferred<string[]>();
+  const schemaResponse = deferred<string[]>();
+  const committedOptions: string[][] = [];
+  const databaseRequest = runDatabaseOptionRequest(
+    lifecycle,
+    () => databaseResponse.promise,
+    (options) => committedOptions.push(options),
+    () => committedOptions.push([]),
+  );
+  const schemaRequest = runSchemaOptionRequest(
+    lifecycle,
+    () => schemaResponse.promise,
+    (options) => committedOptions.push(options),
+    () => committedOptions.push([]),
+  );
+
+  disposeSelectDatabaseRequests(lifecycle);
+  databaseResponse.resolve(['unmounted-database']);
+  schemaResponse.resolve(['unmounted-schema']);
+  await Promise.all([databaseRequest, schemaRequest]);
+
+  assert.deepEqual(committedOptions, []);
+}
+
+async function testSchemaOnlyFullInitializationKeepsSchemaRequest() {
+  const lifecycle = createSelectDatabaseRequestLifecycle();
+  const schemaResponse = deferred<string[]>();
+  const committedOptions: string[][] = [];
+  const initData = {
+    dataSourceId: 1,
+    databaseName: undefined,
+    schemaName: 'PUBLIC',
+  };
+
+  const schemaRequest = runSchemaOptionRequest(
+    lifecycle,
+    () => schemaResponse.promise,
+    (options) => committedOptions.push(options),
+    () => committedOptions.push([]),
+  );
+
+  if (hasApplicableDatabaseNameChange(initData, false)) {
+    invalidateDatabaseOptionRequests(lifecycle);
+  }
+
+  schemaResponse.resolve(['PUBLIC', 'AUDIT']);
+  await schemaRequest;
+
+  assert.deepEqual(committedOptions, [['PUBLIC', 'AUDIT']]);
+}
+
+function testOnlyRealNamedDatabaseAndSchemaNodesBecomeOptions() {
+  const databaseNodes = [
+    treeNode(TreeNodeType.DATABASE, 'orders', { databaseName: 'orders' }),
+    treeNode(TreeNodeType.DATABASE_ACCOUNTS, 'Database Accounts', { databaseName: 'inherited-name' }),
+    treeNode(TreeNodeType.AI_DATA_COLLECTIONS, 'AI data collections', {}),
+    treeNode(TreeNodeType.DATABASE, 'blank database', { databaseName: '  ' }),
+    treeNode(TreeNodeType.DATABASE, 'duplicate orders', { databaseName: 'orders' }),
+  ];
+  assert.deepEqual(normalizeDatabaseOptions(databaseNodes), [{ value: 'orders', label: 'orders' }]);
+
+  const schemaNodes = [
+    treeNode(TreeNodeType.SCHEMA, 'public', { schemaName: 'public' }),
+    treeNode(TreeNodeType.TABLES, 'Tables', {}),
+    treeNode(TreeNodeType.SCHEMA, 'blank schema', { schemaName: '' }),
+  ];
+  assert.deepEqual(normalizeSchemaOptions(schemaNodes), [{ value: 'public', label: 'public' }]);
+}
+
+function testDataSourceOptionsFollowTheLatestTreeState() {
+  const first = treeNode(TreeNodeType.DATA_SOURCE, 'First', {
+    dataSourceId: 1,
+    databaseType: DatabaseTypeCode.MYSQL,
+  });
+  const second = treeNode(TreeNodeType.DATA_SOURCE, 'Second', {
+    dataSourceId: 2,
+    databaseType: DatabaseTypeCode.POSTGRESQL,
+  });
+
+  assert.deepEqual(normalizeDataSourceOptions([first]), [
+    { value: 1, label: 'First', databaseType: DatabaseTypeCode.MYSQL },
+  ]);
+  assert.deepEqual(normalizeDataSourceOptions([first, second]), [
+    { value: 1, label: 'First', databaseType: DatabaseTypeCode.MYSQL },
+    { value: 2, label: 'Second', databaseType: DatabaseTypeCode.POSTGRESQL },
+  ]);
+}
+
+async function run() {
+  await testLatestDataSourceDatabaseRequestWins();
+  await testLatestDatabaseSchemaRequestWins();
+  await testParentClearInvalidatesBothDependentLevels();
+  await testUnmountInvalidatesBothDependentLevels();
+  await testSchemaOnlyFullInitializationKeepsSchemaRequest();
+  testOnlyRealNamedDatabaseAndSchemaNodesBecomeOptions();
+  testDataSourceOptionsFollowTheLatestTreeState();
+  console.log('Select database request lifecycle tests passed');
+}
+
+void run();
diff --git a/chat2db-community-client/src/hooks/selectDatabaseRequestLifecycle.ts b/chat2db-community-client/src/hooks/selectDatabaseRequestLifecycle.ts
new file mode 100644
index 0000000000..843adab5a6
--- /dev/null
+++ b/chat2db-community-client/src/hooks/selectDatabaseRequestLifecycle.ts
@@ -0,0 +1,172 @@
+import { DatabaseTypeCode } from '@/constants/common';
+import { TreeNodeType } from '@/constants/tree';
+import type { TreeNodeData } from '@/typings/tree';
+import {
+  beginLatestRequest,
+  invalidateLatestRequest,
+  isLatestRequest,
+  type RequestGenerationRef,
+} from '@/utils/latestRequest';
+
+export interface SelectDatabaseOption {
+  value: string;
+  label: string;
+}
+
+export interface SelectDataSourceOption {
+  value: number;
+  label: string;
+  databaseType: DatabaseTypeCode;
+}
+
+interface LatestOptionRequest {
+  active: boolean;
+  generationRef: RequestGenerationRef;
+}
+
+export interface SelectDatabaseRequestLifecycle {
+  database: LatestOptionRequest;
+  schema: LatestOptionRequest;
+}
+
+export function hasApplicableDatabaseNameChange(changedValues: { databaseName?: string }, supportDatabase?: boolean) {
+  return supportDatabase !== false && 'databaseName' in changedValues;
+}
+
+function createLatestOptionRequest(): LatestOptionRequest {
+  return {
+    active: true,
+    generationRef: { current: 0 },
+  };
+}
+
+export function createSelectDatabaseRequestLifecycle(): SelectDatabaseRequestLifecycle {
+  return {
+    database: createLatestOptionRequest(),
+    schema: createLatestOptionRequest(),
+  };
+}
+
+function activateLatestOptionRequest(request: LatestOptionRequest) {
+  request.active = true;
+}
+
+function invalidateLatestOptionRequest(request: LatestOptionRequest) {
+  invalidateLatestRequest(request.generationRef);
+}
+
+function disposeLatestOptionRequest(request: LatestOptionRequest) {
+  request.active = false;
+  invalidateLatestOptionRequest(request);
+}
+
+export function activateSelectDatabaseRequests(lifecycle: SelectDatabaseRequestLifecycle) {
+  activateLatestOptionRequest(lifecycle.database);
+  activateLatestOptionRequest(lifecycle.schema);
+}
+
+export function invalidateDataSourceOptionRequests(lifecycle: SelectDatabaseRequestLifecycle) {
+  invalidateLatestOptionRequest(lifecycle.database);
+  invalidateLatestOptionRequest(lifecycle.schema);
+}
+
+export function invalidateDatabaseOptionRequests(lifecycle: SelectDatabaseRequestLifecycle) {
+  invalidateLatestOptionRequest(lifecycle.schema);
+}
+
+export function disposeSelectDatabaseRequests(lifecycle: SelectDatabaseRequestLifecycle) {
+  disposeLatestOptionRequest(lifecycle.database);
+  disposeLatestOptionRequest(lifecycle.schema);
+}
+
+async function runLatestOptionRequest<T>(
+  request: LatestOptionRequest,
+  load: () => Promise<T>,
+  onSuccess: (value: T) => void,
+  onError: () => void,
+) {
+  if (!request.active) {
+    return false;
+  }
+
+  const generation = beginLatestRequest(request.generationRef);
+  try {
+    const value = await load();
+    if (!request.active || !isLatestRequest(request.generationRef, generation)) {
+      return false;
+    }
+    onSuccess(value);
+    return true;
+  } catch {
+    if (!request.active || !isLatestRequest(request.generationRef, generation)) {
+      return false;
+    }
+    onError();
+    return true;
+  }
+}
+
+export function runDatabaseOptionRequest<T>(
+  lifecycle: SelectDatabaseRequestLifecycle,
+  load: () => Promise<T>,
+  onSuccess: (value: T) => void,
+  onError: () => void,
+) {
+  return runLatestOptionRequest(lifecycle.database, load, onSuccess, onError);
+}
+
+export function runSchemaOptionRequest<T>(
+  lifecycle: SelectDatabaseRequestLifecycle,
+  load: () => Promise<T>,
+  onSuccess: (value: T) => void,
+  onError: () => void,
+) {
+  return runLatestOptionRequest(lifecycle.schema, load, onSuccess, onError);
+}
+
+export function normalizeDataSourceOptions(nodes: TreeNodeData[]): SelectDataSourceOption[] {
+  return nodes.reduce<SelectDataSourceOption[]>((options, node) => {
+    const dataSourceId = node.extraParams?.dataSourceId;
+    const databaseType = node.extraParams?.databaseType;
+    if (node.treeNodeType !== TreeNodeType.DATA_SOURCE || dataSourceId === undefined || !databaseType) {
+      return options;
+    }
+
+    options.push({
+      value: dataSourceId,
+      label: node.originalTitle,
+      databaseType,
+    });
+    return options;
+  }, []);
+}
+
+function normalizeNamedOptions(
+  nodes: TreeNodeData[],
+  expectedNodeType: TreeNodeType,
+  field: 'databaseName' | 'schemaName',
+): SelectDatabaseOption[] {
+  const seenValues = new Set<string>();
+
+  return nodes.reduce<SelectDatabaseOption[]>((options, node) => {
+    const value = node.extraParams?.[field];
+    if (node.treeNodeType !== expectedNodeType || typeof value !== 'string' || !value.trim() || seenValues.has(value)) {
+      return options;
+    }
+
+    seenValues.add(value);
+    options.push({
+      value,
+      label: node.originalTitle?.trim() || value,
+    });
+    return options;
+  }, []);
+}
+
+export function normalizeDatabaseOptions(nodes: TreeNodeData[]) {
+  return normalizeNamedOptions(nodes, TreeNodeType.DATABASE, 'databaseName');
+}
+
+export function normalizeSchemaOptions(nodes: TreeNodeData[]) {
+  return normalizeNamedOptions(nodes, TreeNodeType.SCHEMA, 'schemaName');
+}
diff --git a/chat2db-community-client/src/hooks/useSelectDatabase.ts b/chat2db-community-client/src/hooks/useSelectDatabase.ts
index a2aa06878f..9569e1db6f 100644
--- a/chat2db-community-client/src/hooks/useSelectDatabase.ts
+++ b/chat2db-community-client/src/hooks/useSelectDatabase.ts
@@ -1,8 +1,23 @@
-import { useState, useMemo, useEffect } from 'react';
 import { normalizeTreeNodeLoadResult, treeConfig } from '@/blocks/NewTree/treeConfig';
-import { DatabaseTypeCode } from '@/constants';
+import { DatabaseTypeCode, TreeNodeType } from '@/constants';
 import { databaseMap } from '@/constants/database';
+import { useTreeStore } from '@/store/tree';
 import { getDatabaseSupport } from '@/utils/database';
+import { useEffect, useMemo, useRef, useState } from 'react';
+import {
+  activateSelectDatabaseRequests,
+  createSelectDatabaseRequestLifecycle,
+  disposeSelectDatabaseRequests,
+  hasApplicableDatabaseNameChange,
+  invalidateDatabaseOptionRequests,
+  invalidateDataSourceOptionRequests,
+  normalizeDataSourceOptions,
+  normalizeDatabaseOptions,
+  normalizeSchemaOptions,
+  runDatabaseOptionRequest,
+  runSchemaOptionRequest,
+  SelectDatabaseOption,
+} from './selectDatabaseRequestLifecycle';
 
 export type ISelectDatabase = {
   dataSourceId?: number;
@@ -26,34 +41,26 @@ interface IUseSelectDatabaseProps {
 
 const useSelectDatabase = (props: IUseSelectDatabaseProps) => {
   const { astrictDatabaseType } = props;
-  const [dataSourceList, setDataSourceList] = useState<
-    | {
-        value: number;
-        label: string;
-        databaseType: DatabaseTypeCode;
-      }[]
-    | null
-    >([]);
-  
-  const [databaseList, setDatabaseList] = useState<
-    | {
-        value: string;
-        label: string;
-      }[]
-    | null
-    >([]);
-  
-  const [schemaList, setSchemaList] = useState<
-    | {
-        value: string;
-        label: string;
-      }[]
-    | null
-  >([]);
-
+  const treeDataSourceList = useTreeStore((state) => state.dataSourceList);
+  const dataSourceList = useMemo(
+    () => (treeDataSourceList === null ? null : normalizeDataSourceOptions(treeDataSourceList)),
+    [treeDataSourceList],
+  );
+  const [databaseList, setDatabaseList] = useState<SelectDatabaseOption[] | null>([]);
+  const [schemaList, setSchemaList] = useState<SelectDatabaseOption[] | null>([]);
   const [selectDatabase, setSelectDatabase] = useState<ISelectDatabase>();
+  const requestLifecycleRef = useRef(createSelectDatabaseRequestLifecycle());
+  const requestLifecycle = requestLifecycleRef.current;
 
   useEffect(() => {
+    activateSelectDatabaseRequests(requestLifecycle);
+    return () => {
+      disposeSelectDatabaseRequests(requestLifecycle);
+    };
+  }, [requestLifecycle]);
+
+  useEffect(() => {
+    invalidateDataSourceOptionRequests(requestLifecycle);
     setDatabaseList([]);
     setSchemaList([]);
 
@@ -70,7 +77,7 @@ const useSelectDatabase = (props: IUseSelectDatabaseProps) => {
       return;
     }
     setSelectDatabase(null);
-  }, [astrictDatabaseType]);
+  }, [astrictDatabaseType, requestLifecycle]);
 
   const astrictDataSourceList = useMemo(() => {
     if (astrictDatabaseType) {
@@ -79,115 +86,99 @@ const useSelectDatabase = (props: IUseSelectDatabaseProps) => {
     return dataSourceList;
   }, [dataSourceList, astrictDatabaseType]);
 
-  useEffect(() => {
-    getDataSourceList();
-  }, []);
-
-  const getDataSourceList = () => {
-    setDataSourceList(null);
-    setDatabaseList([]);
-    setSchemaList([]);
-    treeConfig['dataSources']
-      .getChildren?.({
-        refresh: true,
-      })
-      .then((res) => {
-        const _dataSourceList = normalizeTreeNodeLoadResult(res).children.map((item) => {
-          return {
-            value: item.extraParams.dataSourceId!,
-            label: item.originalTitle,
-            databaseType: item.extraParams.databaseType!,
-          };
-        });
-        setDataSourceList(_dataSourceList);
-      })
-      .catch(() => {
-        setDataSourceList([]);
-      });
-  };
-
   const getDatabaseList = (params: { dataSourceId: number; databaseType: DatabaseTypeCode }) => {
+    invalidateDatabaseOptionRequests(requestLifecycle);
     setDatabaseList(null);
     setSchemaList([]);
-    treeConfig['dataSource']
-      .getChildren?.({
-        ...params,
-        refresh: true,
-      })
-      .then((res) => {
-        const _databaseList = normalizeTreeNodeLoadResult(res).children.map((item) => {
-          return {
-            value: item.extraParams.databaseName!,
-            label: item.originalTitle,
-          };
-        });
-        setDatabaseList(_databaseList);
-      })
-      .catch(() => {
-        setDatabaseList([]);
-      });
+
+    const getChildren = treeConfig[TreeNodeType.DATA_SOURCE].getChildren;
+    if (!getChildren) {
+      setDatabaseList([]);
+      return;
+    }
+
+    void runDatabaseOptionRequest(
+      requestLifecycle,
+      () =>
+        getChildren({
+          ...params,
+          refresh: true,
+        }),
+      (res) => setDatabaseList(normalizeDatabaseOptions(normalizeTreeNodeLoadResult(res).children)),
+      () => setDatabaseList([]),
+    );
   };
 
-  const getSchemaList = (params) => {
+  const getSchemaList = (params: NonNullable<ISelectDatabase>) => {
     setSchemaList(null);
-    treeConfig['database']
-      .getChildren?.({
-        ...params,
-        refresh: true,
-      })
-      .then((res) => {
-        const _schemaList = normalizeTreeNodeLoadResult(res).children.map((item) => {
-          return {
-            value: item.extraParams.schemaName!,
-            label: item.originalTitle,
-          };
-        });
 
-        setSchemaList(_schemaList);
-      })
-      .catch(() => {
-        setSchemaList([]);
-      });
+    const getChildren = treeConfig[TreeNodeType.DATABASE].getChildren;
+    if (!getChildren) {
+      setSchemaList([]);
+      return;
+    }
+
+    void runSchemaOptionRequest(
+      requestLifecycle,
+      () =>
+        getChildren({
+          ...params,
+          refresh: true,
+        }),
+      (res) => setSchemaList(normalizeSchemaOptions(normalizeTreeNodeLoadResult(res).children)),
+      () => setSchemaList([]),
+    );
   };
 
   const isSelectDone = (params: ISelectDatabase) => {
-    let flag = true;
-    if (params?.supportDatabase) {
-      if (!params.databaseName) {
-        flag = false;
-      }
+    if (params?.supportDatabase && !params.databaseName) {
+      return false;
     }
-
-    if (params?.supportSchema) {
-      if (!params.schemaName) {
-        flag = false;
-      }
+    if (params?.supportSchema && !params.schemaName) {
+      return false;
     }
+    return true;
+  };
 
-    return flag;
+  const resetSelectDatabase = (): ISelectDatabase => {
+    if (!astrictDatabaseType) {
+      return null;
+    }
+    const { supportSchema, supportDatabase } = databaseMap[astrictDatabaseType];
+    return {
+      databaseType: undefined,
+      supportSchema,
+      supportDatabase,
+      selectDone: false,
+    };
   };
 
   const onChangeSelectDatabase = (changedValues: IChangedValues) => {
-    let newSelectDatabase: any = {
+    let newSelectDatabase: ISelectDatabase = {
       ...selectDatabase,
     };
 
     if ('dataSourceId' in changedValues) {
-      const dataSource = astrictDataSourceList?.find((item) => item.value === changedValues?.dataSourceId);
+      invalidateDataSourceOptionRequests(requestLifecycle);
+      setDatabaseList([]);
+      setSchemaList([]);
+      const dataSource = astrictDataSourceList?.find((item) => item.value === changedValues.dataSourceId);
 
       if (!dataSource) {
+        if (changedValues.dataSourceId !== undefined) {
+          return;
+        }
+        setSelectDatabase(resetSelectDatabase());
         return;
       }
 
       const databaseType = dataSource.databaseType;
-
       const { supportSchema, supportDatabase } = getDatabaseSupport(databaseType);
-
       newSelectDatabase = {
         dataSourceId: dataSource.value,
         databaseName: undefined,
         schemaName: undefined,
-        selectDone: false,
+        selectDone: !supportDatabase && !supportSchema,
         databaseType,
         supportSchema,
         supportDatabase,
@@ -196,44 +187,44 @@ const useSelectDatabase = (props: IUseSelectDatabaseProps) => {
       if (supportDatabase) {
         getDatabaseList({
           dataSourceId: dataSource.value,
-          databaseType: dataSource.databaseType,
-        });
-      } else {
-        getSchemaList({
-          dataSourceId: dataSource.value,
-          databaseType: dataSource.databaseType
+          databaseType,
         });
+      } else if (supportSchema) {
+        getSchemaList(newSelectDatabase);
       }
-
     }
-    
-    if ('databaseName' in changedValues) {
+
+    if (hasApplicableDatabaseNameChange(changedValues, newSelectDatabase?.supportDatabase)) {
+      invalidateDatabaseOptionRequests(requestLifecycle);
+      setSchemaList([]);
       newSelectDatabase = {
         ...newSelectDatabase,
         schemaName: undefined,
         databaseName: changedValues.databaseName,
       };
-      // Do you choose to complete
-      if (isSelectDone(newSelectDatabase)) {
-        newSelectDatabase.selectDone = true;
+      newSelectDatabase.selectDone = isSelectDone(newSelectDatabase);
+      if (changedValues.databaseName && newSelectDatabase.supportSchema) {
+        getSchemaList(newSelectDatabase);
       }
-      getSchemaList(newSelectDatabase);
     }
-    
+
     if ('schemaName' in changedValues) {
       newSelectDatabase = {
         ...newSelectDatabase,
         schemaName: changedValues.schemaName,
       };
-      // Do you choose to complete
-      if (isSelectDone(newSelectDatabase)) {
-        newSelectDatabase.selectDone = true;
-      }
+      newSelectDatabase.selectDone = isSelectDone(newSelectDatabase);
     }
     setSelectDatabase(newSelectDatabase);
   };
 
-  return { dataSourceList: astrictDataSourceList, databaseList, schemaList, selectDatabase, onChangeSelectDatabase };
+  return {
+    dataSourceList: astrictDataSourceList,
+    databaseList,
+    schemaList,
+    selectDatabase,
+    onChangeSelectDatabase,
+  };
 };
 
 export default useSelectDatabase;
diff --git a/chat2db-community-client/src/hooks/useViewTablePaging.ts b/chat2db-community-client/src/hooks/useViewTablePaging.ts
index 24386372f2..79f95806c4 100644
--- a/chat2db-community-client/src/hooks/useViewTablePaging.ts
+++ b/chat2db-community-client/src/hooks/useViewTablePaging.ts
@@ -44,6 +44,10 @@ export default function useViewTablePaging() {
       paramsRef.current = params;
       return executeSQL(params).then((data) => {
         const normalizedData = normalizeViewTablePageResults(data, params);
+        const pageResult = normalizedData[0] || pagingStateRef.current?.result;
+        if (pageResult?.success === false) {
+          throw new Error(pageResult.message);
+        }
         if (normalizedData.length) {
           setResultData(normalizedData[0]);
         }
diff --git a/chat2db-community-client/src/hooks/viewTablePagingModel.ts b/chat2db-community-client/src/hooks/viewTablePagingModel.ts
index aad4cf4900..7c3b8bda7f 100644
--- a/chat2db-community-client/src/hooks/viewTablePagingModel.ts
+++ b/chat2db-community-client/src/hooks/viewTablePagingModel.ts
@@ -73,7 +73,7 @@ export function reduceViewTablePagingEvent(
   const nextState = { ...state, result };
   return {
     state: nextState,
-    completedResult: event.eventType === 'resultFinished' ? result : undefined,
+    completedResult: event.eventType === 'resultFinished' && result.success ? result : undefined,
   };
 }
 
@@ -81,10 +81,14 @@ export function replaceViewTableResult(
   current: IManageResultData[] | undefined,
   pagedResult: IManageResultData,
 ) {
+  const currentResult = current?.[0];
+  const baseQuerySql = currentResult?.originalSql || currentResult?.sql || currentResult?.executeSqlParams?.sql;
+
   return [
     {
       ...pagedResult,
-      uuid: current?.[0]?.uuid || pagedResult.uuid,
+      uuid: currentResult?.uuid || pagedResult.uuid,
+      originalSql: baseQuerySql || pagedResult.originalSql,
     },
   ];
 }
diff --git a/chat2db-community-client/src/i18n/en-US/connection.ts b/chat2db-community-client/src/i18n/en-US/connection.ts
index 76f77837a6..203c554191 100644
--- a/chat2db-community-client/src/i18n/en-US/connection.ts
+++ b/chat2db-community-client/src/i18n/en-US/connection.ts
@@ -1,4 +1,5 @@
 export default {
+  'connection.message.testSshTimeout': 'SSH connection test timed out. Check the host and network, then try again.',
   'connection.title': 'Connections',
   'connection.title.connections': 'Connections',
   'connection.title.createConnection': 'New Connection',
diff --git a/chat2db-community-client/src/i18n/en-US/editTable.ts b/chat2db-community-client/src/i18n/en-US/editTable.ts
index 60f92ee92f..13e2a9c3b9 100644
--- a/chat2db-community-client/src/i18n/en-US/editTable.ts
+++ b/chat2db-community-client/src/i18n/en-US/editTable.ts
@@ -11,6 +11,7 @@ export default {
   'editTable.label.indexName': 'Name',
   'editTable.label.indexType': 'Type',
   'editTable.label.indexMethod': 'Index method',
+  'editTable.label.indexVisible': 'Visible',
   'editTable.label.includeColumn': 'Include column',
   'editTable.button.createTable': 'Create Table',
   'editTable.button.importTable': 'Export Table',
@@ -19,6 +20,7 @@ export default {
   'editTable.label.columnSize': 'Size',
   'editTable.label.columnType': 'Type',
   'editTable.label.nullable': 'Nullable',
+  'editTable.label.columnVisible': 'Visible',
   'editTable.label.prefixLength': 'Prefix length',
   'editTable.label.defaultValue': 'Default value',
   'editTable.label.updateTime': 'Update based on current timestamp',
diff --git a/chat2db-community-client/src/i18n/en-US/setting.ts b/chat2db-community-client/src/i18n/en-US/setting.ts
index b8ef73d9b5..806e7e0300 100644
--- a/chat2db-community-client/src/i18n/en-US/setting.ts
+++ b/chat2db-community-client/src/i18n/en-US/setting.ts
@@ -14,7 +14,6 @@ export default {
   'setting.nav.aboutUs': 'About Us',
   'setting.nav.aboutUsDescribe': 'About us',
   'setting.nav.editSetting': 'Editor Settings',
-  'setting.nav.apiKeys': 'Api Keys',
   'setting.nav.editSettingDescribe': 'SQL Editor Settings',
   'setting.nav.terminal': 'Terminal',
   'setting.nav.terminalDescribe': 'Configure terminal position, close behavior, default shell, and colors',
@@ -248,15 +247,6 @@ export default {
   'setting.text.updateLog': 'Update Log',
   'setting.nav.editorFontSize': 'Editor Font Size',
   'setting.nav.editorFontSizeDescribe': 'Set the font size of the editor',
-  'setting.apiKeys.describe':
-    '{PRODUCT_NAME} provides AI services through APIs. For detailed usage, please refer to the documentation. {1} Do not expose your API key to other clients or code.',
-  'setting.apiKeys.CreateApiKey': 'Create API key',
-  'setting.apiKeys.addApiDoc': '《API call method》',
-  'setting.apiKeys.CreateSuccess': 'Create success',
-  'setting.apiKeys.createSuccessTips1': 'Your APIKey is:',
-  'setting.apiKeys.createSuccessTips2': 'We will not show you this key anymore, so please keep it safe',
-  'setting.text.APIKeyList': 'API Key List',
-  'setting.apiKeys.deleteTips': 'After deletion, the key will not be available, please be careful!',
 
   'setting.placeholder.customFont': 'Please enter the font name, such as SN Pro, Arial',
   'setting.modelConfig.title': 'Custom Models',
diff --git a/chat2db-community-client/src/i18n/en-US/stream.ts b/chat2db-community-client/src/i18n/en-US/stream.ts
index 4410b95c80..3c1b679cc2 100644
--- a/chat2db-community-client/src/i18n/en-US/stream.ts
+++ b/chat2db-community-client/src/i18n/en-US/stream.ts
@@ -28,6 +28,9 @@ export default {
   'stream.sidebar.unnamed': 'Unnamed Chat',
   'stream.sidebar.deleteConfirm': 'Are you sure you want to delete this session?',
   'stream.sidebar.deleteFailed': 'Failed to delete session',
+  'stream.sidebar.renameFailed': 'Failed to rename session',
+  'stream.messageNavigation.title': 'User message outline',
+  'stream.messageNavigation.userMessage': 'User message',
   'stream.intro.desc': 'Query data and generate charts with natural language\nNo SQL needed',
   'stream.intro.cta': 'Try New AI Chat',
   'stream.intro.dismiss': "Don't show again",
diff --git a/chat2db-community-client/src/i18n/en-US/workspace.ts b/chat2db-community-client/src/i18n/en-US/workspace.ts
index d442f6d718..6dc7830e7f 100644
--- a/chat2db-community-client/src/i18n/en-US/workspace.ts
+++ b/chat2db-community-client/src/i18n/en-US/workspace.ts
@@ -82,6 +82,7 @@ export default {
   'workspace.tips.cannotMoveLastSplitTab': 'Keep at least one tab in the current split pane',
   'workspace.menu.newGroup': 'New group',
   'workspace.menu.moveToGroup': 'Move to',
+  'workspace.tips.treePositionRefreshFailed': 'The position was updated, but the data source list failed to refresh. Please refresh it manually.',
   'workspace.menu.deleteGroup': 'Delete group',
   'workspace.menu.renameGroup': 'Rename',
   'workspace.menu.newDataSource': 'New connection',
@@ -158,6 +159,21 @@ export default {
   'workspace.task.events.unit': 'events',
   'workspace.task.events.empty': 'No activity yet',
   'workspace.task.events.loadFailed': 'Unable to load the execution log. Retrying...',
+  'workspace.task.event.taskCreated': 'Task created',
+  'workspace.task.event.taskStarted': 'Task started',
+  'workspace.task.event.taskSucceeded': 'Task completed successfully',
+  'workspace.task.event.importPreparing': 'Preparing data import',
+  'workspace.task.event.targetMetadataLoaded': 'Target table metadata loaded',
+  'workspace.task.event.importCompleted': 'Data import completed',
+  'workspace.task.event.importBatchFailed': 'Import batch failed',
+  'workspace.task.event.fileReadStarted': 'Reading import file',
+  'workspace.task.event.fileReadCompleted': 'Import file read completed',
+  'workspace.task.event.batchExecuted': 'Imported batch: {1} rows',
+  'workspace.task.event.importingRecords': 'Importing {1} records',
+  'workspace.task.event.sqlFileReadStarted': 'Reading SQL import file',
+  'workspace.task.event.sqlFileParsed': 'SQL file parsed',
+  'workspace.task.event.sqlBatchExecuted': 'SQL batch executed',
+  'workspace.task.event.sqlStatementExecuted': 'SQL statement executed',
   'workspace.task.delete.confirm': 'Delete task "{1}", all execution logs, and exported files?',
   'workspace.text.startTime': 'Start time',
   'workspace.text.endTime': 'End time',
@@ -295,6 +311,101 @@ export default {
   'workspace.databaseAccount.revokePrivilege': 'Revoke privileges',
   'workspace.databaseAccount.lockUnsupported':
     'Account lock is not supported by this MySQL version or current account privileges',
+  'workspace.importExport.sourceField': 'Source Field',
+  'workspace.importExport.targetColumn': 'Target Column',
+  'workspace.importExport.skipSourceField': 'Skip field',
+  'workspace.importExport.fieldMapping': 'Field Mapping',
+  'workspace.importExport.dataPreview': 'Data Preview (first {1} rows)',
+  'workspace.importExport.mappingStatus': 'Handling',
+  'workspace.importExport.mapped': 'Mapped',
+  'workspace.importExport.skipped': 'Skip',
+  'workspace.importExport.unmapped': 'Unmapped',
+  'workspace.importExport.unmappedAutoIncrement': 'Auto-generated',
+  'workspace.importExport.unmappedDefaultValue': 'Use default',
+  'workspace.importExport.unmappedNullValue': 'Write NULL',
+  'workspace.importExport.unmappedRequired': 'Mapping required',
+  'workspace.importExport.duplicateMappingTitle': 'Duplicate mapping',
+  'workspace.importExport.duplicateMappingContent':
+    'Target column {1} is already mapped from source field {2}. Choose another target column.',
+  'workspace.importExport.unmappedDefault': 'Unmapped columns: DEFAULT',
+  'workspace.importExport.unmappedNull': 'Unmapped columns: NULL',
+  'workspace.importExport.requiredUnmapped': 'NOT NULL columns without a default are unmapped',
+  'workspace.importExport.duplicateSourceColumns': 'The import file contains duplicate source fields',
+  'workspace.importExport.csvOptions': 'CSV options',
+  'workspace.importExport.csvFormat': 'CSV format',
+  'workspace.importExport.invalidCsvOptions': 'This CSV option combination is not supported. Check the delimiter, qualifier, and escape settings.',
+  'workspace.importExport.encoding': 'Encoding',
+  'workspace.importExport.delimiter': 'Delimiter',
+  'workspace.importExport.quote': 'Quote character',
+  'workspace.importExport.escape': 'Escape character',
+  'workspace.importExport.delimiterComma': 'Comma (,)',
+  'workspace.importExport.delimiterSemicolon': 'Semicolon (;)',
+  'workspace.importExport.delimiterTab': 'Tab',
+  'workspace.importExport.delimiterPipe': 'Pipe (|)',
+  'workspace.importExport.delimiterDash': 'Dash (-)',
+  'workspace.importExport.delimiterSlash': 'Slash (/)',
+  'workspace.importExport.delimiterDot': 'Dot (.)',
+  'workspace.importExport.delimiterColon': 'Colon (:)',
+  'workspace.importExport.customCharacter': 'Custom',
+  'workspace.importExport.customCharacterValue': 'Custom ({1})',
+  'workspace.importExport.textQualifier': 'Text qualifier',
+  'workspace.importExport.escapeMethod': 'Escape method',
+  'workspace.importExport.escapeRepeatedQualifier': 'Repeat qualifier',
+  'workspace.importExport.quoteDouble': 'Double quote (")',
+  'workspace.importExport.quoteSingle': "Single quote (')",
+  'workspace.importExport.quoteBacktick': 'Backtick (`)',
+  'workspace.importExport.quoteTilde': 'Tilde (~)',
+  'workspace.importExport.escapeDouble': 'Double quote escape',
+  'workspace.importExport.escapeBackslash': 'Backslash escape',
+  'workspace.importExport.hasHeader': 'File includes a header row',
+  'workspace.importExport.emptyAsNull': 'Empty field = NULL',
+  'workspace.importExport.sourceRows': 'Source rows',
+  'workspace.importExport.headerRow': 'Header row',
+  'workspace.importExport.noHeader': 'No header',
+  'workspace.importExport.dataStartRow': 'First data row',
+  'workspace.importExport.dataEndRow': 'Last data row',
+  'workspace.importExport.endOfFile': 'End of file',
+  'workspace.importExport.dateTimeFormats': 'Date and number formats',
+  'workspace.importExport.dateOrder': 'Date order',
+  'workspace.importExport.dateTimeOrder': 'Date-time order',
+  'workspace.importExport.dateFirst': 'Date first',
+  'workspace.importExport.timeFirst': 'Time first',
+  'workspace.importExport.dateTimeTimezone': 'Date Time Timezone',
+  'workspace.importExport.timeDateTimezone': 'Time Date Timezone',
+  'workspace.importExport.timeTimezoneDate': 'Time Timezone Date',
+  'workspace.importExport.dateDelimiter': 'Date delimiter',
+  'workspace.importExport.yearDelimiter': 'Year delimiter',
+  'workspace.importExport.timeDelimiter': 'Time delimiter',
+  'workspace.importExport.decimalSymbol': 'Decimal symbol',
+  'workspace.importExport.dateTimeExample': 'Examples',
+  'workspace.ops.activeTransactions': 'Active Transactions',
+  'workspace.ops.monitor': 'Monitor',
+  'workspace.ops.transactionId': 'Transaction ID',
+  'workspace.ops.transactionState': 'State',
+  'workspace.ops.transactionStarted': 'Started',
+  'workspace.ops.transactionAge': 'Age',
+  'workspace.ops.secondsFormat': '{1}s',
+  'workspace.ops.transactionIsolation': 'Isolation',
+  'workspace.ops.rowsLocked': 'Rows Locked',
+  'workspace.ops.rowsModified': 'Rows Modified',
+  'workspace.ops.threadId': 'MySQL Connection ID',
+  'workspace.ops.user': 'User',
+  'workspace.ops.host': 'Host',
+  'workspace.ops.database': 'Database',
+  'workspace.ops.query': 'Query',
+  'workspace.ops.permissionRequired': 'Insufficient permissions.',
+  'workspace.ops.processPrivilegeHint': 'PROCESS privilege is required for full transaction visibility.',
+  'workspace.ops.activeTransactionCount': '{1} active transaction(s)',
+  'workspace.ops.waitedLock': 'Waited Lock',
+  'workspace.ops.blocker': 'Blocker',
+  'workspace.ops.openSession': 'Inspect the current connection in a new console',
+  'workspace.ops.openBlockingSession': 'Inspect the blocking connection in a new console',
+  'workspace.ops.sessionUnavailable': 'Session unavailable',
+  'workspace.ops.queryUnavailable': 'SQL unavailable',
+  'workspace.ops.emptyValue': 'Empty',
+  'workspace.ops.lockMetadataUnavailable': 'Lock metadata unavailable',
+  'workspace.ops.lockMetadataDegraded': 'Lock-wait details are degraded:',
+  'workspace.ops.sessionThreadTitle': 'MySQL connection {1}',
   'workspace.routine.button.invoke': 'Invoke routine',
   'workspace.routine.button.apply': 'Apply changes',
   'workspace.routine.button.refresh': 'Reload DDL',
diff --git a/chat2db-community-client/src/i18n/es-ES/connection.ts b/chat2db-community-client/src/i18n/es-ES/connection.ts
index 46de903b5e..b255ad9395 100644
--- a/chat2db-community-client/src/i18n/es-ES/connection.ts
+++ b/chat2db-community-client/src/i18n/es-ES/connection.ts
@@ -1,4 +1,5 @@
 export default {
+  'connection.message.testSshTimeout': 'La prueba de conexión SSH agotó el tiempo de espera. Comprueba el host y la red e inténtalo de nuevo.',
   'connection.title': 'Conexiones',
   'connection.title.connections': 'Conexiones',
   'connection.title.createConnection': 'Nueva conexión',
diff --git a/chat2db-community-client/src/i18n/es-ES/editTable.ts b/chat2db-community-client/src/i18n/es-ES/editTable.ts
index 272596977d..284e4689b2 100644
--- a/chat2db-community-client/src/i18n/es-ES/editTable.ts
+++ b/chat2db-community-client/src/i18n/es-ES/editTable.ts
@@ -11,6 +11,7 @@ export default {
   'editTable.label.indexName': 'Nombre',
   'editTable.label.indexType': 'Tipo',
   'editTable.label.indexMethod': 'Método de índice',
+  'editTable.label.indexVisible': 'Visible',
   'editTable.label.includeColumn': 'Columna incluida',
   'editTable.button.createTable': 'Crear tabla',
   'editTable.button.importTable': 'Exportar tabla',
@@ -19,6 +20,7 @@ export default {
   'editTable.label.columnSize': 'Tamaño',
   'editTable.label.columnType': 'Tipo',
   'editTable.label.nullable': 'Permite NULL',
+  'editTable.label.columnVisible': 'Visible',
   'editTable.label.prefixLength': 'Longitud del prefijo',
   'editTable.label.defaultValue': 'Valor predeterminado',
   'editTable.label.updateTime': 'Actualizar según la marca de tiempo actual',
diff --git a/chat2db-community-client/src/i18n/es-ES/setting.ts b/chat2db-community-client/src/i18n/es-ES/setting.ts
index b6f9f9f014..6d0002aaf8 100644
--- a/chat2db-community-client/src/i18n/es-ES/setting.ts
+++ b/chat2db-community-client/src/i18n/es-ES/setting.ts
@@ -14,7 +14,6 @@ export default {
   'setting.nav.aboutUs': 'Acerca de',
   'setting.nav.aboutUsDescribe': 'Acerca de nosotros',
   'setting.nav.editSetting': 'Configuración del editor',
-  'setting.nav.apiKeys': 'Claves API',
   'setting.nav.editSettingDescribe': 'Configuración del editor SQL',
   'setting.nav.terminal': 'Terminal',
   'setting.nav.terminalDescribe': 'Configura la posición, la confirmación de cierre, el shell y los colores',
@@ -250,15 +249,6 @@ export default {
   'setting.text.updateLog': 'Registro de actualizaciones',
   'setting.nav.editorFontSize': 'Tamaño de fuente del editor',
   'setting.nav.editorFontSizeDescribe': 'Establecer el tamaño de fuente del editor',
-  'setting.apiKeys.describe':
-    '{PRODUCT_NAME} ofrece servicios de IA mediante API. Consulte la documentación para obtener información detallada. {1} No exponga su clave API a otros clientes ni en el código.',
-  'setting.apiKeys.CreateApiKey': 'Crear clave API',
-  'setting.apiKeys.addApiDoc': '«Método de llamada a la API»',
-  'setting.apiKeys.CreateSuccess': 'Creación correcta',
-  'setting.apiKeys.createSuccessTips1': 'Su APIKey es:',
-  'setting.apiKeys.createSuccessTips2': 'No volveremos a mostrar esta clave; guárdela de forma segura',
-  'setting.text.APIKeyList': 'Lista de claves API',
-  'setting.apiKeys.deleteTips': 'Después de eliminarla, la clave dejará de estar disponible. Proceda con cuidado.',
 
   'setting.placeholder.customFont': 'Introduzca el nombre de la fuente, por ejemplo, SN Pro o Arial',
   'setting.modelConfig.title': 'Modelos personalizados',
diff --git a/chat2db-community-client/src/i18n/es-ES/stream.ts b/chat2db-community-client/src/i18n/es-ES/stream.ts
index 309d7c3226..7da40391f8 100644
--- a/chat2db-community-client/src/i18n/es-ES/stream.ts
+++ b/chat2db-community-client/src/i18n/es-ES/stream.ts
@@ -28,6 +28,9 @@ export default {
   'stream.sidebar.unnamed': 'Chat sin nombre',
   'stream.sidebar.deleteConfirm': '¿Confirma que desea eliminar esta sesión?',
   'stream.sidebar.deleteFailed': 'No se pudo eliminar la sesión',
+  'stream.sidebar.renameFailed': 'No se pudo renombrar la conversación',
+  'stream.messageNavigation.title': 'Índice de mensajes del usuario',
+  'stream.messageNavigation.userMessage': 'Mensaje del usuario',
   'stream.intro.desc': 'Consulte datos y genere gráficos con lenguaje natural\nNo necesita SQL',
   'stream.intro.cta': 'Probar el nuevo chat con IA',
   'stream.intro.dismiss': 'No volver a mostrar',
diff --git a/chat2db-community-client/src/i18n/es-ES/workspace.ts b/chat2db-community-client/src/i18n/es-ES/workspace.ts
index 361249e8fb..2bfa569c52 100644
--- a/chat2db-community-client/src/i18n/es-ES/workspace.ts
+++ b/chat2db-community-client/src/i18n/es-ES/workspace.ts
@@ -82,6 +82,7 @@ export default {
   'workspace.tips.cannotMoveLastSplitTab': 'Mantenga al menos una pestaña en el panel dividido actual',
   'workspace.menu.newGroup': 'Nuevo grupo',
   'workspace.menu.moveToGroup': 'Mover a',
+  'workspace.tips.treePositionRefreshFailed': 'La posición se actualizó, pero no se pudo actualizar la lista de fuentes de datos. Actualícela manualmente.',
   'workspace.menu.deleteGroup': 'Eliminar grupo',
   'workspace.menu.renameGroup': 'Cambiar nombre',
   'workspace.menu.newDataSource': 'Nueva conexión',
@@ -158,6 +159,21 @@ export default {
   'workspace.task.events.unit': 'eventos',
   'workspace.task.events.empty': 'Aún no hay registros',
   'workspace.task.events.loadFailed': 'No se pudo cargar el registro de ejecución. Reintentando...',
+  'workspace.task.event.taskCreated': 'Tarea creada',
+  'workspace.task.event.taskStarted': 'Tarea iniciada',
+  'workspace.task.event.taskSucceeded': 'Tarea completada correctamente',
+  'workspace.task.event.importPreparing': 'Preparando la importación de datos',
+  'workspace.task.event.targetMetadataLoaded': 'Metadatos de la tabla de destino cargados',
+  'workspace.task.event.importCompleted': 'Importación de datos completada',
+  'workspace.task.event.importBatchFailed': 'Error en el lote de importación',
+  'workspace.task.event.fileReadStarted': 'Leyendo el archivo de importación',
+  'workspace.task.event.fileReadCompleted': 'Lectura del archivo de importación completada',
+  'workspace.task.event.batchExecuted': 'Lote importado: {1} filas',
+  'workspace.task.event.importingRecords': 'Importando {1} registros',
+  'workspace.task.event.sqlFileReadStarted': 'Leyendo el archivo SQL de importación',
+  'workspace.task.event.sqlFileParsed': 'Archivo SQL analizado',
+  'workspace.task.event.sqlBatchExecuted': 'Lote SQL ejecutado',
+  'workspace.task.event.sqlStatementExecuted': 'Sentencia SQL ejecutada',
   'workspace.task.delete.confirm':
     '¿Eliminar la tarea «{1}», todos los registros de ejecución y los archivos exportados?',
   'workspace.text.startTime': 'Hora de inicio',
@@ -297,6 +313,101 @@ export default {
   'workspace.databaseAccount.revokePrivilege': 'Revocar privilegios',
   'workspace.databaseAccount.lockUnsupported':
     'Esta versión de MySQL o los privilegios de la cuenta actual no admiten el bloqueo de cuentas',
+  'workspace.importExport.sourceField': 'Campo de origen',
+  'workspace.importExport.targetColumn': 'Columna de destino',
+  'workspace.importExport.skipSourceField': 'Omitir campo',
+  'workspace.importExport.fieldMapping': 'Asignación de campos',
+  'workspace.importExport.dataPreview': 'Vista previa de datos (primeras {1} filas)',
+  'workspace.importExport.mappingStatus': 'Tratamiento',
+  'workspace.importExport.mapped': 'Asignado',
+  'workspace.importExport.skipped': 'Omitir',
+  'workspace.importExport.unmapped': 'Sin asignar',
+  'workspace.importExport.unmappedAutoIncrement': 'Generado automáticamente',
+  'workspace.importExport.unmappedDefaultValue': 'Usar valor predeterminado',
+  'workspace.importExport.unmappedNullValue': 'Escribir NULL',
+  'workspace.importExport.unmappedRequired': 'Asignación obligatoria',
+  'workspace.importExport.duplicateMappingTitle': 'Hay una asignación duplicada',
+  'workspace.importExport.duplicateMappingContent':
+    'La columna de destino {1} ya está asignada desde el campo de origen {2}. Seleccione otra columna.',
+  'workspace.importExport.unmappedDefault': 'Columnas sin asignar: DEFAULT',
+  'workspace.importExport.unmappedNull': 'Columnas sin asignar: NULL',
+  'workspace.importExport.requiredUnmapped': 'Columnas NOT NULL sin predeterminado sin asignar',
+  'workspace.importExport.duplicateSourceColumns': 'El archivo de importación contiene campos de origen duplicados',
+  'workspace.importExport.csvOptions': 'Opciones CSV',
+  'workspace.importExport.csvFormat': 'Formato CSV',
+  'workspace.importExport.invalidCsvOptions': 'Esta combinación de opciones CSV no es compatible. Compruebe el delimitador, el calificador y el escape.',
+  'workspace.importExport.encoding': 'Codificación',
+  'workspace.importExport.delimiter': 'Delimitador',
+  'workspace.importExport.quote': 'Carácter de comillas',
+  'workspace.importExport.escape': 'Carácter de escape',
+  'workspace.importExport.delimiterComma': 'Coma (,)',
+  'workspace.importExport.delimiterSemicolon': 'Punto y coma (;)',
+  'workspace.importExport.delimiterTab': 'Tabulador',
+  'workspace.importExport.delimiterPipe': 'Barra vertical (|)',
+  'workspace.importExport.delimiterDash': 'Guion (-)',
+  'workspace.importExport.delimiterSlash': 'Barra (/)',
+  'workspace.importExport.delimiterDot': 'Punto (.)',
+  'workspace.importExport.delimiterColon': 'Dos puntos (:)',
+  'workspace.importExport.customCharacter': 'Personalizado',
+  'workspace.importExport.customCharacterValue': 'Personalizado ({1})',
+  'workspace.importExport.textQualifier': 'Calificador de texto',
+  'workspace.importExport.escapeMethod': 'Método de escape',
+  'workspace.importExport.escapeRepeatedQualifier': 'Repetir calificador',
+  'workspace.importExport.quoteDouble': 'Comillas dobles (")',
+  'workspace.importExport.quoteSingle': "Comilla simple (')",
+  'workspace.importExport.quoteBacktick': 'Acento grave (`)',
+  'workspace.importExport.quoteTilde': 'Tilde (~)',
+  'workspace.importExport.escapeDouble': 'Escape con comillas dobles',
+  'workspace.importExport.escapeBackslash': 'Escape con barra invertida',
+  'workspace.importExport.hasHeader': 'El archivo incluye una fila de encabezado',
+  'workspace.importExport.emptyAsNull': 'Campo vacío = NULL',
+  'workspace.importExport.sourceRows': 'Filas de origen',
+  'workspace.importExport.headerRow': 'Fila de encabezado',
+  'workspace.importExport.noHeader': 'Sin encabezado',
+  'workspace.importExport.dataStartRow': 'Primera fila de datos',
+  'workspace.importExport.dataEndRow': 'Última fila de datos',
+  'workspace.importExport.endOfFile': 'Fin del archivo',
+  'workspace.importExport.dateTimeFormats': 'Formatos de fecha y número',
+  'workspace.importExport.dateOrder': 'Orden de fecha',
+  'workspace.importExport.dateTimeOrder': 'Orden fecha-hora',
+  'workspace.importExport.dateFirst': 'Fecha primero',
+  'workspace.importExport.timeFirst': 'Hora primero',
+  'workspace.importExport.dateTimeTimezone': 'Fecha Hora Zona horaria',
+  'workspace.importExport.timeDateTimezone': 'Hora Fecha Zona horaria',
+  'workspace.importExport.timeTimezoneDate': 'Hora Zona horaria Fecha',
+  'workspace.importExport.dateDelimiter': 'Separador de fecha',
+  'workspace.importExport.yearDelimiter': 'Separador de año',
+  'workspace.importExport.timeDelimiter': 'Separador de hora',
+  'workspace.importExport.decimalSymbol': 'Símbolo decimal',
+  'workspace.importExport.dateTimeExample': 'Ejemplos',
+  'workspace.ops.activeTransactions': 'Transacciones activas',
+  'workspace.ops.monitor': 'Monitorización',
+  'workspace.ops.transactionId': 'ID de transacción',
+  'workspace.ops.transactionState': 'Estado',
+  'workspace.ops.transactionStarted': 'Inicio',
+  'workspace.ops.transactionAge': 'Edad',
+  'workspace.ops.secondsFormat': '{1}s',
+  'workspace.ops.transactionIsolation': 'Aislamiento',
+  'workspace.ops.rowsLocked': 'Filas bloqueadas',
+  'workspace.ops.rowsModified': 'Filas modificadas',
+  'workspace.ops.threadId': 'ID de conexión MySQL',
+  'workspace.ops.user': 'Usuario',
+  'workspace.ops.host': 'Host',
+  'workspace.ops.database': 'Base de datos',
+  'workspace.ops.query': 'Consulta',
+  'workspace.ops.permissionRequired': 'Permisos insuficientes.',
+  'workspace.ops.processPrivilegeHint': 'Se requiere el privilegio PROCESS para ver las transacciones.',
+  'workspace.ops.activeTransactionCount': '{1} transacción(es) activa(s)',
+  'workspace.ops.waitedLock': 'Bloqueo esperado',
+  'workspace.ops.blocker': 'Bloqueador',
+  'workspace.ops.openSession': 'Inspeccionar la conexión actual en una consola nueva',
+  'workspace.ops.openBlockingSession': 'Inspeccionar la conexión bloqueadora en una consola nueva',
+  'workspace.ops.sessionUnavailable': 'Sesión no disponible',
+  'workspace.ops.queryUnavailable': 'SQL no disponible',
+  'workspace.ops.emptyValue': 'Vacío',
+  'workspace.ops.lockMetadataUnavailable': 'Metadatos de bloqueo no disponibles',
+  'workspace.ops.lockMetadataDegraded': 'Los detalles de espera de bloqueo están degradados:',
+  'workspace.ops.sessionThreadTitle': 'Conexión MySQL {1}',
   'workspace.routine.button.invoke': 'Invocar rutina',
   'workspace.routine.button.apply': 'Aplicar cambios',
   'workspace.routine.button.refresh': 'Volver a cargar DDL',
diff --git a/chat2db-community-client/src/i18n/ja-JP/connection.ts b/chat2db-community-client/src/i18n/ja-JP/connection.ts
index 9c52ce783d..1fd3f39eff 100644
--- a/chat2db-community-client/src/i18n/ja-JP/connection.ts
+++ b/chat2db-community-client/src/i18n/ja-JP/connection.ts
@@ -1,4 +1,5 @@
 export default {
+  'connection.message.testSshTimeout': 'SSH 接続テストがタイムアウトしました。ホストとネットワークを確認してから、再試行してください。',
   'connection.title': '接続',
   'connection.title.connections': '接続',
   'connection.title.createConnection': '新規接続',
diff --git a/chat2db-community-client/src/i18n/ja-JP/editTable.ts b/chat2db-community-client/src/i18n/ja-JP/editTable.ts
index 030a63b32f..4f48ebb14c 100644
--- a/chat2db-community-client/src/i18n/ja-JP/editTable.ts
+++ b/chat2db-community-client/src/i18n/ja-JP/editTable.ts
@@ -11,6 +11,7 @@ export default {
   'editTable.label.indexName': '名前',
   'editTable.label.indexType': 'タイプ',
   'editTable.label.indexMethod': 'インデックス方法',
+  'editTable.label.indexVisible': '表示',
   'editTable.label.includeColumn': '列を含む',
   'editTable.button.createTable': 'テーブルを作成',
   'editTable.button.importTable': 'テーブルをエクスポート',
@@ -19,6 +20,7 @@ export default {
   'editTable.label.columnSize': 'サイズ',
   'editTable.label.columnType': 'タイプ',
   'editTable.label.nullable': 'Null許容',
+  'editTable.label.columnVisible': '表示',
   'editTable.label.prefixLength': 'プレフィックス長',
   'editTable.label.defaultValue': 'デフォルト値',
   'editTable.label.updateTime': '現在のタイムスタンプに基づいて更新',
diff --git a/chat2db-community-client/src/i18n/ja-JP/setting.ts b/chat2db-community-client/src/i18n/ja-JP/setting.ts
index fca00eed99..ca851a5628 100644
--- a/chat2db-community-client/src/i18n/ja-JP/setting.ts
+++ b/chat2db-community-client/src/i18n/ja-JP/setting.ts
@@ -14,7 +14,6 @@ export default {
   'setting.nav.aboutUs': '私たちについて',
   'setting.nav.aboutUsDescribe': '私たちについて',
   'setting.nav.editSetting': 'エディタ設定',
-  'setting.nav.apiKeys': 'APIキー',
   'setting.nav.editSettingDescribe': 'SQL エディタ設定',
   'setting.nav.terminal': 'ターミナル設定',
   'setting.nav.terminalDescribe': 'ターミナルの表示位置、終了確認、既定のシェル、配色を設定',
@@ -208,15 +207,6 @@ export default {
   'setting.text.updateLog': '更新ログ',
   'setting.nav.editorFontSize': 'エディタのフォントサイズ',
   'setting.nav.editorFontSizeDescribe': 'SQLエディタ内のフォントサイズを設定します',
-  'setting.apiKeys.describe':
-    '{PRODUCT_NAME}は、APIを使用してAIサービスを提供します。詳細な使用方法については、ドキュメントを参照してください。{1} APIキーを他のクライアントやコードに公開しないでください。',
-  'setting.apiKeys.CreateApiKey': 'APIキーを追加',
-  'setting.apiKeys.addApiDoc': '《API呼び出し方法》',
-  'setting.apiKeys.CreateSuccess': 'APIキーが作成されました',
-  'setting.apiKeys.createSuccessTips1': 'あなたのapiKeyは',
-  'setting.apiKeys.createSuccessTips2': 'これ以上あなたにこのキーを表示しませんので、大切に保管してください',
-  'setting.text.APIKeyList': 'APIキーリスト',
-  'setting.apiKeys.deleteTips': 'APIキーを削除すると、関連するすべてのサービスが停止します。本当に削除しますか？',
 
   'setting.placeholder.customFont': 'フォント名を入力してください。例：SN Pro、Arial',
   'setting.shortcut.arouseAIAssistant': 'AI アシスタントを起動',
diff --git a/chat2db-community-client/src/i18n/ja-JP/stream.ts b/chat2db-community-client/src/i18n/ja-JP/stream.ts
index 41c667177e..2c53c56382 100644
--- a/chat2db-community-client/src/i18n/ja-JP/stream.ts
+++ b/chat2db-community-client/src/i18n/ja-JP/stream.ts
@@ -28,6 +28,9 @@ export default {
   'stream.sidebar.unnamed': '名前のない会話',
   'stream.sidebar.deleteConfirm': 'この会話を削除しますか？',
   'stream.sidebar.deleteFailed': '会話の削除に失敗しました',
+  'stream.sidebar.renameFailed': '会話名の変更に失敗しました',
+  'stream.messageNavigation.title': 'ユーザーメッセージ一覧',
+  'stream.messageNavigation.userMessage': 'ユーザーメッセージ',
   'stream.intro.desc': '自然言語でデータクエリやチャート生成が可能\nSQLを書く必要はありません',
   'stream.intro.cta': 'AIチャットを試す',
   'stream.intro.dismiss': '今後表示しない',
diff --git a/chat2db-community-client/src/i18n/ja-JP/workspace.ts b/chat2db-community-client/src/i18n/ja-JP/workspace.ts
index c69f096cf8..52f5e216b8 100644
--- a/chat2db-community-client/src/i18n/ja-JP/workspace.ts
+++ b/chat2db-community-client/src/i18n/ja-JP/workspace.ts
@@ -81,6 +81,7 @@ export default {
   'workspace.tips.cannotMoveLastSplitTab': '現在の分割ペインには少なくとも1つのタブを残してください',
   'workspace.menu.newGroup': '新しいグループ',
   'workspace.menu.moveToGroup': '移動先',
+  'workspace.tips.treePositionRefreshFailed': '位置は更新されましたが、データソース一覧を更新できませんでした。手動で更新してください。',
   'workspace.menu.deleteGroup': 'グループを削除',
   'workspace.menu.renameGroup': '名前を変更',
   'workspace.menu.newDataSource': '新しい接続',
@@ -156,6 +157,21 @@ export default {
   'workspace.task.events.unit': '件',
   'workspace.task.events.empty': '実行ログはありません',
   'workspace.task.events.loadFailed': '実行ログを読み込めません。再試行しています...',
+  'workspace.task.event.taskCreated': 'タスクを作成しました',
+  'workspace.task.event.taskStarted': 'タスクを開始しました',
+  'workspace.task.event.taskSucceeded': 'タスクが正常に完了しました',
+  'workspace.task.event.importPreparing': 'データインポートを準備しています',
+  'workspace.task.event.targetMetadataLoaded': 'ターゲットテーブルのメタデータを読み込みました',
+  'workspace.task.event.importCompleted': 'データインポートが完了しました',
+  'workspace.task.event.importBatchFailed': 'インポートバッチに失敗しました',
+  'workspace.task.event.fileReadStarted': 'インポートファイルを読み込んでいます',
+  'workspace.task.event.fileReadCompleted': 'インポートファイルの読み込みが完了しました',
+  'workspace.task.event.batchExecuted': '{1} 行のバッチをインポートしました',
+  'workspace.task.event.importingRecords': '{1} 件のレコードをインポートしています',
+  'workspace.task.event.sqlFileReadStarted': 'SQL インポートファイルを読み込んでいます',
+  'workspace.task.event.sqlFileParsed': 'SQL ファイルの解析が完了しました',
+  'workspace.task.event.sqlBatchExecuted': 'SQL バッチを実行しました',
+  'workspace.task.event.sqlStatementExecuted': 'SQL ステートメントを実行しました',
   'workspace.task.delete.confirm': 'タスク「{1}」、すべての実行ログ、エクスポートファイルを削除しますか？',
   'workspace.text.startTime': '開始時間',
   'workspace.text.endTime': '終了時間',
@@ -295,6 +311,101 @@ export default {
   'workspace.databaseAccount.revokePrivilege': '権限を取り消し',
   'workspace.databaseAccount.lockUnsupported':
     'この MySQL バージョンまたは現在の権限ではアカウントロックを利用できません',
+  'workspace.importExport.sourceField': 'ソースフィールド',
+  'workspace.importExport.targetColumn': 'ターゲット列',
+  'workspace.importExport.skipSourceField': 'フィールドをスキップ',
+  'workspace.importExport.fieldMapping': 'フィールドマッピング',
+  'workspace.importExport.dataPreview': 'データプレビュー（先頭 {1} 行）',
+  'workspace.importExport.mappingStatus': '処理方法',
+  'workspace.importExport.mapped': 'マッピング済み',
+  'workspace.importExport.skipped': 'スキップ',
+  'workspace.importExport.unmapped': '未マッピング',
+  'workspace.importExport.unmappedAutoIncrement': '自動生成',
+  'workspace.importExport.unmappedDefaultValue': 'デフォルト値を使用',
+  'workspace.importExport.unmappedNullValue': 'NULL を書き込む',
+  'workspace.importExport.unmappedRequired': 'マッピング必須',
+  'workspace.importExport.duplicateMappingTitle': '重複マッピングがあります',
+  'workspace.importExport.duplicateMappingContent':
+    'ターゲット列 {1} はソースフィールド {2} にマッピング済みです。別のターゲット列を選択してください。',
+  'workspace.importExport.unmappedDefault': '未マッピング列: DEFAULT',
+  'workspace.importExport.unmappedNull': '未マッピング列: NULL',
+  'workspace.importExport.requiredUnmapped': 'デフォルトなしの NOT NULL 列が未マッピングです',
+  'workspace.importExport.duplicateSourceColumns': 'インポートファイルに重複したソースフィールドがあります',
+  'workspace.importExport.csvOptions': 'CSV オプション',
+  'workspace.importExport.csvFormat': 'CSV 形式',
+  'workspace.importExport.invalidCsvOptions': 'この CSV オプションの組み合わせはサポートされていません。区切り文字、限定符、エスケープを確認してください。',
+  'workspace.importExport.encoding': 'エンコーディング',
+  'workspace.importExport.delimiter': '区切り文字',
+  'workspace.importExport.quote': '引用符',
+  'workspace.importExport.escape': 'エスケープ文字',
+  'workspace.importExport.delimiterComma': 'カンマ (,)',
+  'workspace.importExport.delimiterSemicolon': 'セミコロン (;)',
+  'workspace.importExport.delimiterTab': 'タブ',
+  'workspace.importExport.delimiterPipe': 'パイプ (|)',
+  'workspace.importExport.delimiterDash': 'ハイフン (-)',
+  'workspace.importExport.delimiterSlash': 'スラッシュ (/)',
+  'workspace.importExport.delimiterDot': 'ピリオド (.)',
+  'workspace.importExport.delimiterColon': 'コロン (:)',
+  'workspace.importExport.customCharacter': 'カスタム',
+  'workspace.importExport.customCharacterValue': 'カスタム ({1})',
+  'workspace.importExport.textQualifier': 'テキスト修飾子',
+  'workspace.importExport.escapeMethod': 'エスケープ方式',
+  'workspace.importExport.escapeRepeatedQualifier': '修飾子を繰り返す',
+  'workspace.importExport.quoteDouble': '二重引用符 (")',
+  'workspace.importExport.quoteSingle': "一重引用符 (')",
+  'workspace.importExport.quoteBacktick': 'バッククォート (`)',
+  'workspace.importExport.quoteTilde': 'チルダ (~)',
+  'workspace.importExport.escapeDouble': '二重引用符エスケープ',
+  'workspace.importExport.escapeBackslash': 'バックスラッシュエスケープ',
+  'workspace.importExport.hasHeader': 'ファイルにヘッダー行がある',
+  'workspace.importExport.emptyAsNull': '空フィールド = NULL',
+  'workspace.importExport.sourceRows': 'ソース行',
+  'workspace.importExport.headerRow': 'ヘッダー行',
+  'workspace.importExport.noHeader': 'ヘッダーなし',
+  'workspace.importExport.dataStartRow': 'データ開始行',
+  'workspace.importExport.dataEndRow': 'データ終了行',
+  'workspace.importExport.endOfFile': 'ファイル末尾',
+  'workspace.importExport.dateTimeFormats': '日付と数値の形式',
+  'workspace.importExport.dateOrder': '日付順序',
+  'workspace.importExport.dateTimeOrder': '日時順序',
+  'workspace.importExport.dateFirst': '日付を先に',
+  'workspace.importExport.timeFirst': '時刻を先に',
+  'workspace.importExport.dateTimeTimezone': '日付 時刻 タイムゾーン',
+  'workspace.importExport.timeDateTimezone': '時刻 日付 タイムゾーン',
+  'workspace.importExport.timeTimezoneDate': '時刻 タイムゾーン 日付',
+  'workspace.importExport.dateDelimiter': '日付区切り文字',
+  'workspace.importExport.yearDelimiter': '年区切り文字',
+  'workspace.importExport.timeDelimiter': '時刻区切り文字',
+  'workspace.importExport.decimalSymbol': '小数点記号',
+  'workspace.importExport.dateTimeExample': '形式例',
+  'workspace.ops.activeTransactions': 'アクティブなトランザクション',
+  'workspace.ops.monitor': '監視',
+  'workspace.ops.transactionId': 'トランザクション ID',
+  'workspace.ops.transactionState': '状態',
+  'workspace.ops.transactionStarted': '開始時刻',
+  'workspace.ops.transactionAge': '経過時間',
+  'workspace.ops.secondsFormat': '{1}秒',
+  'workspace.ops.transactionIsolation': '分離レベル',
+  'workspace.ops.rowsLocked': 'ロック行数',
+  'workspace.ops.rowsModified': '変更行数',
+  'workspace.ops.threadId': 'MySQL 接続 ID',
+  'workspace.ops.user': 'ユーザー',
+  'workspace.ops.host': 'ホスト',
+  'workspace.ops.database': 'データベース',
+  'workspace.ops.query': 'SQL',
+  'workspace.ops.permissionRequired': '権限が不足しています。',
+  'workspace.ops.processPrivilegeHint': 'トランザクションの完全な表示には PROCESS 権限が必要です。',
+  'workspace.ops.activeTransactionCount': 'アクティブなトランザクション: {1} 件',
+  'workspace.ops.waitedLock': '待機中のロック',
+  'workspace.ops.blocker': 'ブロッカー',
+  'workspace.ops.openSession': '新しい Console で現在の接続を確認',
+  'workspace.ops.openBlockingSession': '新しい Console でブロック元の接続を確認',
+  'workspace.ops.sessionUnavailable': 'セッションは利用できません',
+  'workspace.ops.queryUnavailable': 'SQL は利用できません',
+  'workspace.ops.emptyValue': '空',
+  'workspace.ops.lockMetadataUnavailable': 'ロックメタデータは利用できません',
+  'workspace.ops.lockMetadataDegraded': 'ロック待機の詳細は制限されています:',
+  'workspace.ops.sessionThreadTitle': 'MySQL 接続 {1}',
   'workspace.routine.button.invoke': 'ルーチンを呼び出す',
   'workspace.routine.button.apply': '変更を適用',
   'workspace.routine.button.refresh': 'DDL を再読み込み',
diff --git a/chat2db-community-client/src/i18n/ko-KR/connection.ts b/chat2db-community-client/src/i18n/ko-KR/connection.ts
index 1ca85a3a4b..3eaba8bc5d 100644
--- a/chat2db-community-client/src/i18n/ko-KR/connection.ts
+++ b/chat2db-community-client/src/i18n/ko-KR/connection.ts
@@ -1,4 +1,5 @@
 export default {
+  'connection.message.testSshTimeout': 'SSH 연결 테스트 시간이 초과되었습니다. 호스트와 네트워크를 확인한 후 다시 시도하세요.',
   'connection.title': '연결',
   'connection.title.connections': '연결',
   'connection.title.createConnection': '새 연결',
diff --git a/chat2db-community-client/src/i18n/ko-KR/editTable.ts b/chat2db-community-client/src/i18n/ko-KR/editTable.ts
index 4934cd8d2e..8af32d81c2 100644
--- a/chat2db-community-client/src/i18n/ko-KR/editTable.ts
+++ b/chat2db-community-client/src/i18n/ko-KR/editTable.ts
@@ -11,6 +11,7 @@ export default {
   'editTable.label.indexName': '이름',
   'editTable.label.indexType': '유형',
   'editTable.label.indexMethod': '인덱스 방식',
+  'editTable.label.indexVisible': '표시',
   'editTable.label.includeColumn': '포함 열',
   'editTable.button.createTable': '테이블 생성',
   'editTable.button.importTable': '테이블 내보내기',
@@ -19,6 +20,7 @@ export default {
   'editTable.label.columnSize': '크기',
   'editTable.label.columnType': '유형',
   'editTable.label.nullable': 'NULL 허용',
+  'editTable.label.columnVisible': '표시',
   'editTable.label.prefixLength': '접두사 길이',
   'editTable.label.defaultValue': '기본값',
   'editTable.label.updateTime': '현재 타임스탬프에 따라 업데이트',
diff --git a/chat2db-community-client/src/i18n/ko-KR/setting.ts b/chat2db-community-client/src/i18n/ko-KR/setting.ts
index 8e02d2bfe3..39c3ad1987 100644
--- a/chat2db-community-client/src/i18n/ko-KR/setting.ts
+++ b/chat2db-community-client/src/i18n/ko-KR/setting.ts
@@ -14,7 +14,6 @@ export default {
   'setting.nav.aboutUs': 'Chat2DB 정보',
   'setting.nav.aboutUsDescribe': 'Chat2DB 정보',
   'setting.nav.editSetting': '편집기 설정',
-  'setting.nav.apiKeys': 'API 키',
   'setting.nav.editSettingDescribe': 'SQL 편집기 설정',
   'setting.nav.terminal': '터미널 설정',
   'setting.nav.terminalDescribe': '터미널 위치, 닫기 확인, 기본 셸 및 색상 구성',
@@ -248,15 +247,6 @@ export default {
   'setting.text.updateLog': '업데이트 로그',
   'setting.nav.editorFontSize': '편집기 글꼴 크기',
   'setting.nav.editorFontSizeDescribe': '편집기 글꼴 크기 설정',
-  'setting.apiKeys.describe':
-    '{PRODUCT_NAME}는 API를 통해 AI 서비스를 제공합니다. 자세한 사용 방법은 문서를 참조하세요. {1} API 키를 다른 클라이언트나 코드에 노출하지 마세요.',
-  'setting.apiKeys.CreateApiKey': 'API 키 생성',
-  'setting.apiKeys.addApiDoc': '《API 호출 방법》',
-  'setting.apiKeys.CreateSuccess': '생성되었습니다',
-  'setting.apiKeys.createSuccessTips1': 'API Key:',
-  'setting.apiKeys.createSuccessTips2': '이 키는 다시 표시되지 않으므로 안전하게 보관해 주세요',
-  'setting.text.APIKeyList': 'API 키 목록',
-  'setting.apiKeys.deleteTips': '삭제하면 키를 사용할 수 없습니다. 신중하게 진행해 주세요!',
 
   'setting.placeholder.customFont': 'SN Pro, Arial 등의 글꼴 이름을 입력해 주세요',
   'setting.modelConfig.title': '사용자 지정 모델',
diff --git a/chat2db-community-client/src/i18n/ko-KR/stream.ts b/chat2db-community-client/src/i18n/ko-KR/stream.ts
index 2f99b40c70..8d77891768 100644
--- a/chat2db-community-client/src/i18n/ko-KR/stream.ts
+++ b/chat2db-community-client/src/i18n/ko-KR/stream.ts
@@ -28,6 +28,9 @@ export default {
   'stream.sidebar.unnamed': '이름 없는 채팅',
   'stream.sidebar.deleteConfirm': '이 세션을 삭제하시겠습니까?',
   'stream.sidebar.deleteFailed': '세션을 삭제하지 못했습니다',
+  'stream.sidebar.renameFailed': '대화 이름을 변경하지 못했습니다',
+  'stream.messageNavigation.title': '사용자 메시지 목차',
+  'stream.messageNavigation.userMessage': '사용자 메시지',
   'stream.intro.desc': '자연어로 데이터를 조회하고 차트를 생성하세요\nSQL이 필요하지 않습니다',
   'stream.intro.cta': '새 AI 채팅 사용해 보기',
   'stream.intro.dismiss': '다시 표시하지 않기',
diff --git a/chat2db-community-client/src/i18n/ko-KR/workspace.ts b/chat2db-community-client/src/i18n/ko-KR/workspace.ts
index d021394a25..7417b656a2 100644
--- a/chat2db-community-client/src/i18n/ko-KR/workspace.ts
+++ b/chat2db-community-client/src/i18n/ko-KR/workspace.ts
@@ -81,6 +81,7 @@ export default {
   'workspace.tips.cannotMoveLastSplitTab': '현재 분할 창에 탭을 하나 이상 유지하세요',
   'workspace.menu.newGroup': '새 그룹',
   'workspace.menu.moveToGroup': '이동',
+  'workspace.tips.treePositionRefreshFailed': '위치는 변경되었지만 데이터 소스 목록을 새로 고치지 못했습니다. 수동으로 새로 고쳐 주세요.',
   'workspace.menu.deleteGroup': '그룹 삭제',
   'workspace.menu.renameGroup': '이름 변경',
   'workspace.menu.newDataSource': '새 연결',
@@ -157,6 +158,21 @@ export default {
   'workspace.task.events.unit': '건',
   'workspace.task.events.empty': '실행 로그가 없습니다',
   'workspace.task.events.loadFailed': '실행 로그를 불러올 수 없습니다. 다시 시도하는 중...',
+  'workspace.task.event.taskCreated': '작업이 생성되었습니다',
+  'workspace.task.event.taskStarted': '작업이 시작되었습니다',
+  'workspace.task.event.taskSucceeded': '작업이 완료되었습니다',
+  'workspace.task.event.importPreparing': '데이터 가져오기를 준비하는 중입니다',
+  'workspace.task.event.targetMetadataLoaded': '대상 테이블 메타데이터를 불러왔습니다',
+  'workspace.task.event.importCompleted': '데이터 가져오기가 완료되었습니다',
+  'workspace.task.event.importBatchFailed': '가져오기 배치가 실패했습니다',
+  'workspace.task.event.fileReadStarted': '가져오기 파일을 읽는 중입니다',
+  'workspace.task.event.fileReadCompleted': '가져오기 파일 읽기가 완료되었습니다',
+  'workspace.task.event.batchExecuted': '{1}개 행을 일괄 가져왔습니다',
+  'workspace.task.event.importingRecords': '{1}개 레코드를 가져오는 중입니다',
+  'workspace.task.event.sqlFileReadStarted': 'SQL 가져오기 파일을 읽는 중입니다',
+  'workspace.task.event.sqlFileParsed': 'SQL 파일 구문 분석이 완료되었습니다',
+  'workspace.task.event.sqlBatchExecuted': 'SQL 배치가 실행되었습니다',
+  'workspace.task.event.sqlStatementExecuted': 'SQL 문이 실행되었습니다',
   'workspace.task.delete.confirm': '작업 "{1}", 모든 실행 로그 및 내보낸 파일을 삭제하시겠습니까?',
   'workspace.text.startTime': '시작 시간',
   'workspace.text.endTime': '종료 시간',
@@ -293,6 +309,101 @@ export default {
   'workspace.databaseAccount.grantPrivilege': '권한 부여',
   'workspace.databaseAccount.revokePrivilege': '권한 회수',
   'workspace.databaseAccount.lockUnsupported': '이 MySQL 버전 또는 현재 계정 권한에서는 계정 잠금을 지원하지 않습니다',
+  'workspace.importExport.sourceField': '소스 필드',
+  'workspace.importExport.targetColumn': '대상 열',
+  'workspace.importExport.skipSourceField': '필드 건너뛰기',
+  'workspace.importExport.fieldMapping': '필드 매핑',
+  'workspace.importExport.dataPreview': '데이터 미리보기 (처음 {1}행)',
+  'workspace.importExport.mappingStatus': '처리 방식',
+  'workspace.importExport.mapped': '매핑됨',
+  'workspace.importExport.skipped': '건너뛰기',
+  'workspace.importExport.unmapped': '매핑되지 않음',
+  'workspace.importExport.unmappedAutoIncrement': '자동 생성',
+  'workspace.importExport.unmappedDefaultValue': '기본값 사용',
+  'workspace.importExport.unmappedNullValue': 'NULL 쓰기',
+  'workspace.importExport.unmappedRequired': '매핑 필요',
+  'workspace.importExport.duplicateMappingTitle': '중복 매핑이 있습니다',
+  'workspace.importExport.duplicateMappingContent':
+    '대상 열 {1}은(는) 이미 소스 필드 {2}에 매핑되어 있습니다. 다른 대상 열을 선택하세요.',
+  'workspace.importExport.unmappedDefault': '매핑되지 않은 열: DEFAULT',
+  'workspace.importExport.unmappedNull': '매핑되지 않은 열: NULL',
+  'workspace.importExport.requiredUnmapped': '기본값이 없는 NOT NULL 열이 매핑되지 않았습니다',
+  'workspace.importExport.duplicateSourceColumns': '가져오기 파일에 중복된 소스 필드가 있습니다',
+  'workspace.importExport.csvOptions': 'CSV 옵션',
+  'workspace.importExport.csvFormat': 'CSV 형식',
+  'workspace.importExport.invalidCsvOptions': '이 CSV 옵션 조합은 지원되지 않습니다. 구분자, 한정자 및 이스케이프 설정을 확인하세요.',
+  'workspace.importExport.encoding': '인코딩',
+  'workspace.importExport.delimiter': '구분 기호',
+  'workspace.importExport.quote': '따옴표 문자',
+  'workspace.importExport.escape': '이스케이프 문자',
+  'workspace.importExport.delimiterComma': '쉼표 (,)',
+  'workspace.importExport.delimiterSemicolon': '세미콜론 (;)',
+  'workspace.importExport.delimiterTab': '탭',
+  'workspace.importExport.delimiterPipe': '파이프 (|)',
+  'workspace.importExport.delimiterDash': '하이픈 (-)',
+  'workspace.importExport.delimiterSlash': '슬래시 (/)',
+  'workspace.importExport.delimiterDot': '점 (.)',
+  'workspace.importExport.delimiterColon': '콜론 (:)',
+  'workspace.importExport.customCharacter': '사용자 지정',
+  'workspace.importExport.customCharacterValue': '사용자 지정 ({1})',
+  'workspace.importExport.textQualifier': '텍스트 한정자',
+  'workspace.importExport.escapeMethod': '이스케이프 방식',
+  'workspace.importExport.escapeRepeatedQualifier': '한정자 반복',
+  'workspace.importExport.quoteDouble': '큰따옴표 (")',
+  'workspace.importExport.quoteSingle': "작은따옴표 (')",
+  'workspace.importExport.quoteBacktick': '백틱 (`)',
+  'workspace.importExport.quoteTilde': '물결표 (~)',
+  'workspace.importExport.escapeDouble': '큰따옴표 이스케이프',
+  'workspace.importExport.escapeBackslash': '백슬래시 이스케이프',
+  'workspace.importExport.hasHeader': '파일에 헤더 행 포함',
+  'workspace.importExport.emptyAsNull': '빈 필드 = NULL',
+  'workspace.importExport.sourceRows': '원본 행',
+  'workspace.importExport.headerRow': '헤더 행',
+  'workspace.importExport.noHeader': '헤더 없음',
+  'workspace.importExport.dataStartRow': '데이터 시작 행',
+  'workspace.importExport.dataEndRow': '데이터 종료 행',
+  'workspace.importExport.endOfFile': '파일 끝',
+  'workspace.importExport.dateTimeFormats': '날짜 및 숫자 형식',
+  'workspace.importExport.dateOrder': '날짜 순서',
+  'workspace.importExport.dateTimeOrder': '날짜-시간 순서',
+  'workspace.importExport.dateFirst': '날짜 먼저',
+  'workspace.importExport.timeFirst': '시간 먼저',
+  'workspace.importExport.dateTimeTimezone': '날짜 시간 시간대',
+  'workspace.importExport.timeDateTimezone': '시간 날짜 시간대',
+  'workspace.importExport.timeTimezoneDate': '시간 시간대 날짜',
+  'workspace.importExport.dateDelimiter': '날짜 구분자',
+  'workspace.importExport.yearDelimiter': '연도 구분자',
+  'workspace.importExport.timeDelimiter': '시간 구분자',
+  'workspace.importExport.decimalSymbol': '소수점 기호',
+  'workspace.importExport.dateTimeExample': '형식 예시',
+  'workspace.ops.activeTransactions': '활성 트랜잭션',
+  'workspace.ops.monitor': '모니터링',
+  'workspace.ops.transactionId': '트랜잭션 ID',
+  'workspace.ops.transactionState': '상태',
+  'workspace.ops.transactionStarted': '시작 시간',
+  'workspace.ops.transactionAge': '경과 시간',
+  'workspace.ops.secondsFormat': '{1}초',
+  'workspace.ops.transactionIsolation': '격리 수준',
+  'workspace.ops.rowsLocked': '잠긴 행',
+  'workspace.ops.rowsModified': '수정된 행',
+  'workspace.ops.threadId': 'MySQL 연결 ID',
+  'workspace.ops.user': '사용자',
+  'workspace.ops.host': '호스트',
+  'workspace.ops.database': '데이터베이스',
+  'workspace.ops.query': 'SQL',
+  'workspace.ops.permissionRequired': '권한이 부족합니다.',
+  'workspace.ops.processPrivilegeHint': '트랜잭션 전체 보기에는 PROCESS 권한이 필요합니다.',
+  'workspace.ops.activeTransactionCount': '활성 트랜잭션 {1}개',
+  'workspace.ops.waitedLock': '대기 중인 잠금',
+  'workspace.ops.blocker': '차단 세션',
+  'workspace.ops.openSession': '새 Console에서 현재 연결 검사',
+  'workspace.ops.openBlockingSession': '새 Console에서 차단 연결 검사',
+  'workspace.ops.sessionUnavailable': '세션을 사용할 수 없음',
+  'workspace.ops.queryUnavailable': 'SQL을 사용할 수 없음',
+  'workspace.ops.emptyValue': '비어 있음',
+  'workspace.ops.lockMetadataUnavailable': '잠금 메타데이터를 사용할 수 없음',
+  'workspace.ops.lockMetadataDegraded': '잠금 대기 세부 정보가 제한되었습니다:',
+  'workspace.ops.sessionThreadTitle': 'MySQL 연결 {1}',
   'workspace.routine.button.invoke': '루틴 호출',
   'workspace.routine.button.apply': '변경 사항 적용',
   'workspace.routine.button.refresh': 'DDL 다시 불러오기',
diff --git a/chat2db-community-client/src/i18n/zh-CN/connection.ts b/chat2db-community-client/src/i18n/zh-CN/connection.ts
index b631b431f4..ce187f065f 100644
--- a/chat2db-community-client/src/i18n/zh-CN/connection.ts
+++ b/chat2db-community-client/src/i18n/zh-CN/connection.ts
@@ -1,4 +1,5 @@
 export default {
+  'connection.message.testSshTimeout': 'SSH 连接测试超时，请检查主机和网络后重试',
   'connection.title': '数据源',
   'connection.title.connections': '连接',
   'connection.title.createConnection': '创建数据源',
diff --git a/chat2db-community-client/src/i18n/zh-CN/editTable.ts b/chat2db-community-client/src/i18n/zh-CN/editTable.ts
index c2d0473783..fe67946f51 100644
--- a/chat2db-community-client/src/i18n/zh-CN/editTable.ts
+++ b/chat2db-community-client/src/i18n/zh-CN/editTable.ts
@@ -11,6 +11,7 @@ export default {
   'editTable.label.indexName': '索引名称',
   'editTable.label.indexType': '索引类型',
   'editTable.label.indexMethod': '索引方法',
+  'editTable.label.indexVisible': '可见',
   'editTable.label.includeColumn': '包含列',
   'editTable.button.createTable': '新建表',
   'editTable.button.importTable': '导出表',
@@ -19,6 +20,7 @@ export default {
   'editTable.label.columnSize': '长度',
   'editTable.label.columnType': '类型',
   'editTable.label.nullable': '可空',
+  'editTable.label.columnVisible': '可见',
   'editTable.label.prefixLength': '前缀长度',
   'editTable.label.defaultValue': '默认值',
   'editTable.label.updateTime': '根据当前时间戳更新',
diff --git a/chat2db-community-client/src/i18n/zh-CN/setting.ts b/chat2db-community-client/src/i18n/zh-CN/setting.ts
index 402df798f4..faa081615d 100644
--- a/chat2db-community-client/src/i18n/zh-CN/setting.ts
+++ b/chat2db-community-client/src/i18n/zh-CN/setting.ts
@@ -14,7 +14,6 @@ export default {
   'setting.nav.aboutUs': '关于我们',
   'setting.nav.aboutUsDescribe': '关于我们',
   'setting.nav.editSetting': '编辑器设置',
-  'setting.nav.apiKeys': 'Api Keys',
   'setting.nav.editSettingDescribe': 'SQL编辑器设置',
   'setting.nav.terminal': '终端设置',
   'setting.nav.terminalDescribe': '配置终端打开位置、关闭行为、默认 Shell 和配色',
@@ -227,15 +226,6 @@ export default {
   'setting.text.updateLog': '更新日志',
   'setting.nav.editorFontSize': '编辑器字体大小',
   'setting.nav.editorFontSizeDescribe': '设置SQL编辑器内字体大小',
-  'setting.apiKeys.describe':
-    '{PRODUCT_NAME} 提供 API 方式调用 AI 服务，详细使用方式请查看文档，{1} 请勿将你的 API key 暴露在其他客户端或者代码中。',
-  'setting.apiKeys.CreateApiKey': '创建API key',
-  'setting.apiKeys.addApiDoc': '《API调用方式》',
-  'setting.apiKeys.CreateSuccess': 'API key创建成功',
-  'setting.apiKeys.createSuccessTips1': '你的APIKey为',
-  'setting.apiKeys.createSuccessTips2': '我们后续不再为你展示该key，请妥善保管',
-  'setting.text.APIKeyList': 'API Key 列表',
-  'setting.apiKeys.deleteTips': '删除后该key将无法使用，请谨慎操作！',
 
   'setting.placeholder.customFont': '请输入字体名，如 SN Pro, Arial',
   'setting.shortcut.arouseAIAssistant': '唤起 AI 助手',
diff --git a/chat2db-community-client/src/i18n/zh-CN/stream.ts b/chat2db-community-client/src/i18n/zh-CN/stream.ts
index 09c4739f89..1c527c7a47 100644
--- a/chat2db-community-client/src/i18n/zh-CN/stream.ts
+++ b/chat2db-community-client/src/i18n/zh-CN/stream.ts
@@ -28,6 +28,9 @@ export default {
   'stream.sidebar.unnamed': '未命名对话',
   'stream.sidebar.deleteConfirm': '确认删除此会话？',
   'stream.sidebar.deleteFailed': '删除会话失败',
+  'stream.sidebar.renameFailed': '重命名会话失败',
+  'stream.messageNavigation.title': '用户消息目录',
+  'stream.messageNavigation.userMessage': '用户消息',
   'stream.intro.desc': '用自然语言查询数据、生成图表\n无需手写 SQL',
   'stream.intro.cta': '试试 AI 对话',
   'stream.intro.dismiss': '不再提示',
diff --git a/chat2db-community-client/src/i18n/zh-CN/workspace.ts b/chat2db-community-client/src/i18n/zh-CN/workspace.ts
index 55f7b50f86..821a62b8e8 100644
--- a/chat2db-community-client/src/i18n/zh-CN/workspace.ts
+++ b/chat2db-community-client/src/i18n/zh-CN/workspace.ts
@@ -32,8 +32,7 @@ export default {
   'workspace.watermark.label': '水印',
   'workspace.watermark.contentLabel': '水印内容',
   'workspace.watermark.contentPlaceholder': '自定义水印内容',
-  'workspace.watermark.help':
-    '控制 SQL 编辑器是否显示该数据源的水印。自定义内容对所有用户共享，留空时显示默认水印。',
+  'workspace.watermark.help': '控制 SQL 编辑器是否显示该数据源的水印。自定义内容对所有用户共享，留空时显示默认水印。',
   'workspace.dataSourceLifecycle.connectionUnavailable': '连接不可用',
   'workspace.dataSourceLifecycle.deleted': '该数据源已删除，请选择其他数据源后再执行 SQL',
   'workspace.menu.viewAllTable': '查看所有表',
@@ -78,6 +77,7 @@ export default {
   'workspace.tips.cannotMoveLastSplitTab': '当前分屏至少需要保留一个标签',
   'workspace.menu.newGroup': '新建组',
   'workspace.menu.moveToGroup': '移动到',
+  'workspace.tips.treePositionRefreshFailed': '位置已更新，但数据源列表刷新失败，请手动刷新',
   'workspace.menu.deleteGroup': '删除组',
   'workspace.menu.renameGroup': '重命名',
   'workspace.menu.newDataSource': '新建连接',
@@ -152,6 +152,21 @@ export default {
   'workspace.task.events.unit': '条',
   'workspace.task.events.empty': '暂无执行日志',
   'workspace.task.events.loadFailed': '执行日志加载失败，正在重试...',
+  'workspace.task.event.taskCreated': '任务已创建',
+  'workspace.task.event.taskStarted': '任务已开始',
+  'workspace.task.event.taskSucceeded': '任务执行完成',
+  'workspace.task.event.importPreparing': '正在准备导入数据',
+  'workspace.task.event.targetMetadataLoaded': '目标表结构读取完成',
+  'workspace.task.event.importCompleted': '数据导入完成',
+  'workspace.task.event.importBatchFailed': '导入批次执行失败',
+  'workspace.task.event.fileReadStarted': '正在读取导入文件',
+  'workspace.task.event.fileReadCompleted': '导入文件读取完成',
+  'workspace.task.event.batchExecuted': '已执行批量导入：{1} 条',
+  'workspace.task.event.importingRecords': '正在导入 {1} 条记录',
+  'workspace.task.event.sqlFileReadStarted': '正在读取 SQL 导入文件',
+  'workspace.task.event.sqlFileParsed': 'SQL 文件解析完成',
+  'workspace.task.event.sqlBatchExecuted': 'SQL 批次执行完成',
+  'workspace.task.event.sqlStatementExecuted': 'SQL 语句执行完成',
   'workspace.task.delete.confirm': '删除任务“{1}”、全部执行日志和导出文件吗？',
   'workspace.text.startTime': '开始时间',
   'workspace.text.endTime': '结束时间',
@@ -286,6 +301,100 @@ export default {
   'workspace.databaseAccount.grantPrivilege': '授予权限',
   'workspace.databaseAccount.revokePrivilege': '撤销权限',
   'workspace.databaseAccount.lockUnsupported': '当前 MySQL 版本或账号权限不支持账号锁定',
+  'workspace.importExport.sourceField': '源字段',
+  'workspace.importExport.targetColumn': '目标列',
+  'workspace.importExport.skipSourceField': '跳过该字段',
+  'workspace.importExport.fieldMapping': '字段映射',
+  'workspace.importExport.dataPreview': '数据预览（前 {1} 行）',
+  'workspace.importExport.mappingStatus': '处理方式',
+  'workspace.importExport.mapped': '已映射',
+  'workspace.importExport.skipped': '跳过',
+  'workspace.importExport.unmapped': '未映射',
+  'workspace.importExport.unmappedAutoIncrement': '自动生成',
+  'workspace.importExport.unmappedDefaultValue': '使用默认值',
+  'workspace.importExport.unmappedNullValue': '写入 NULL',
+  'workspace.importExport.unmappedRequired': '必须映射',
+  'workspace.importExport.duplicateMappingTitle': '存在重复映射',
+  'workspace.importExport.duplicateMappingContent': '目标列 {1} 已由源字段 {2} 映射，请选择其他目标列',
+  'workspace.importExport.unmappedDefault': '未映射列：使用默认值',
+  'workspace.importExport.unmappedNull': '未映射列：写入 NULL',
+  'workspace.importExport.requiredUnmapped': '以下无默认值的 NOT NULL 列未映射',
+  'workspace.importExport.duplicateSourceColumns': '导入文件包含重复的源字段',
+  'workspace.importExport.csvOptions': 'CSV 选项',
+  'workspace.importExport.csvFormat': 'CSV 格式',
+  'workspace.importExport.invalidCsvOptions': '当前 CSV 选项组合不受支持，请检查分隔符、限定符和转义方式',
+  'workspace.importExport.encoding': '编码',
+  'workspace.importExport.delimiter': '分隔符',
+  'workspace.importExport.quote': '引号字符',
+  'workspace.importExport.escape': '转义字符',
+  'workspace.importExport.delimiterComma': '逗号 (,)',
+  'workspace.importExport.delimiterSemicolon': '分号 (;)',
+  'workspace.importExport.delimiterTab': '制表符 (Tab)',
+  'workspace.importExport.delimiterPipe': '竖线 (|)',
+  'workspace.importExport.delimiterDash': '短横线 (-)',
+  'workspace.importExport.delimiterSlash': '斜杠 (/)',
+  'workspace.importExport.delimiterDot': '点 (.)',
+  'workspace.importExport.delimiterColon': '冒号 (:)',
+  'workspace.importExport.customCharacter': '自定义',
+  'workspace.importExport.customCharacterValue': '自定义 ({1})',
+  'workspace.importExport.textQualifier': '文本限定符',
+  'workspace.importExport.escapeMethod': '转义方式',
+  'workspace.importExport.escapeRepeatedQualifier': '重复限定符',
+  'workspace.importExport.quoteDouble': '双引号 (")',
+  'workspace.importExport.quoteSingle': "单引号 (')",
+  'workspace.importExport.quoteBacktick': '反引号 (`)',
+  'workspace.importExport.quoteTilde': '波浪号 (~)',
+  'workspace.importExport.escapeDouble': '双引号转义',
+  'workspace.importExport.escapeBackslash': '反斜杠转义',
+  'workspace.importExport.hasHeader': '文件包含表头行',
+  'workspace.importExport.emptyAsNull': '空字段视为 NULL',
+  'workspace.importExport.sourceRows': '源数据范围',
+  'workspace.importExport.headerRow': '表头行',
+  'workspace.importExport.noHeader': '无表头',
+  'workspace.importExport.dataStartRow': '数据起始行',
+  'workspace.importExport.dataEndRow': '数据结束行',
+  'workspace.importExport.endOfFile': '文件末尾',
+  'workspace.importExport.dateTimeFormats': '日期和数字格式',
+  'workspace.importExport.dateOrder': '日期顺序',
+  'workspace.importExport.dateTimeOrder': '日期时间顺序',
+  'workspace.importExport.dateFirst': '日期在前',
+  'workspace.importExport.timeFirst': '时间在前',
+  'workspace.importExport.dateTimeTimezone': '日期 时间 时区',
+  'workspace.importExport.timeDateTimezone': '时间 日期 时区',
+  'workspace.importExport.timeTimezoneDate': '时间 时区 日期',
+  'workspace.importExport.dateDelimiter': '日期分隔符',
+  'workspace.importExport.yearDelimiter': '年份分隔符',
+  'workspace.importExport.timeDelimiter': '时间分隔符',
+  'workspace.importExport.decimalSymbol': '小数符号',
+  'workspace.importExport.dateTimeExample': '格式示例',
+  'workspace.ops.activeTransactions': '活动事务',
+  'workspace.ops.monitor': '监控',
+  'workspace.ops.transactionId': '事务 ID',
+  'workspace.ops.transactionState': '状态',
+  'workspace.ops.transactionStarted': '开始时间',
+  'workspace.ops.transactionAge': '时长',
+  'workspace.ops.secondsFormat': '{1} 秒',
+  'workspace.ops.transactionIsolation': '隔离级别',
+  'workspace.ops.rowsLocked': '锁定行数',
+  'workspace.ops.rowsModified': '修改行数',
+  'workspace.ops.threadId': 'MySQL 连接 ID',
+  'workspace.ops.user': '用户',
+  'workspace.ops.host': '主机',
+  'workspace.ops.database': '数据库',
+  'workspace.ops.query': 'SQL',
+  'workspace.ops.permissionRequired': '权限不足。',
+  'workspace.ops.processPrivilegeHint': '完整事务可见性需要 PROCESS 权限。',
+  'workspace.ops.activeTransactionCount': '{1} 个活动事务',
+  'workspace.ops.waitedLock': '等待的锁',
+  'workspace.ops.blocker': '阻塞方',
+  'workspace.ops.openSession': '在新 Console 中检查当前连接',
+  'workspace.ops.openBlockingSession': '在新 Console 中检查阻塞连接',
+  'workspace.ops.sessionUnavailable': '会话不可用',
+  'workspace.ops.queryUnavailable': 'SQL 不可用',
+  'workspace.ops.emptyValue': '空值',
+  'workspace.ops.lockMetadataUnavailable': '锁元数据不可用',
+  'workspace.ops.lockMetadataDegraded': '锁等待详情已降级：',
+  'workspace.ops.sessionThreadTitle': 'MySQL 连接 {1}',
   'workspace.routine.button.invoke': '调用例程',
   'workspace.routine.button.apply': '提交变更',
   'workspace.routine.button.refresh': '重新加载 DDL',
diff --git a/chat2db-community-client/src/pages/main/CommunityMainPage.tsx b/chat2db-community-client/src/pages/main/CommunityMainPage.tsx
index 2d091da7b5..2fd6842aa2 100644
--- a/chat2db-community-client/src/pages/main/CommunityMainPage.tsx
+++ b/chat2db-community-client/src/pages/main/CommunityMainPage.tsx
@@ -290,6 +290,23 @@ function CommunityMainPage() {
     [activeSessionId],
   );
 
+  const handleSidebarRenameSession = useCallback(
+    async (sessionId: string, title: string) => {
+      try {
+        await aiStreamService.renameChatSession({ id: sessionId, title });
+        setSidebarSessions((prev) =>
+          prev.map((session) => (session.id === sessionId ? { ...session, title } : session)),
+        );
+        window.dispatchEvent(new CustomEvent('stream:sessionRenamed', { detail: { sessionId, title } }));
+        feedback.success(i18n('common.message.modifySuccessfully'));
+      } catch (error) {
+        feedback.error(i18n('stream.sidebar.renameFailed'));
+        throw error;
+      }
+    },
+    [],
+  );
+
   const handleSidebarNewChat = useCallback(() => {
     setActiveSessionId(null);
     handleChangePageTab({ page: 'stream', navConfigTmp: navConfig, pathName: '/stream' });
@@ -464,6 +481,7 @@ function CommunityMainPage() {
           onNewChat={handleSidebarNewChat}
           onSessionClick={handleSidebarSessionClick}
           onSessionDelete={handleSidebarDeleteSession}
+          onSessionRename={handleSidebarRenameSession}
         />
       )}
 
diff --git a/chat2db-community-client/src/pages/main/components/StreamSidebar/index.tsx b/chat2db-community-client/src/pages/main/components/StreamSidebar/index.tsx
index f9a72e0c79..0945fa0fd3 100644
--- a/chat2db-community-client/src/pages/main/components/StreamSidebar/index.tsx
+++ b/chat2db-community-client/src/pages/main/components/StreamSidebar/index.tsx
@@ -6,6 +6,7 @@ import { MessageSquarePlus, Search } from 'lucide-react';
 
 import PortalContextMenu from '@/components/ContextMenu/PortalContextMenu';
 import type { ContextMenuAction, ContextMenuIntent } from '@/components/ContextMenu/core';
+import InlineRenameInput from '@/components/InlineRenameInput';
 import i18n from '@/i18n';
 import { IChatSession } from '@/service/aiStream';
 import MainSecondaryPanel from '../MainSecondaryPanel';
@@ -23,6 +24,7 @@ interface StreamSidebarProps {
   onNewChat: () => void;
   onSessionClick: (session: IChatSession) => void;
   onSessionDelete: (sessionId: string) => void;
+  onSessionRename: (sessionId: string, title: string) => Promise<void>;
 }
 
 interface StreamSessionContextSnapshot {
@@ -44,11 +46,17 @@ const StreamSidebar = ({
   onNewChat,
   onSessionClick,
   onSessionDelete,
+  onSessionRename,
 }: StreamSidebarProps) => {
   const { styles } = useStyles();
   const [contextMenu, setContextMenu] = useState<StreamSessionContextIntent | null>(null);
+  const [editingSessionId, setEditingSessionId] = useState<string | null>(null);
   const [modal, modalContextHolder] = Modal.useModal();
 
+  const startRename = useCallback((session: IChatSession) => {
+    setEditingSessionId(session.id);
+  }, []);
+
   const formatSessionTime = useCallback((session: IChatSession) => {
     const time = session.gmtModified || session.gmtCreate;
 
@@ -80,6 +88,17 @@ const StreamSidebar = ({
   const contextMenuActions = useMemo<ContextMenuAction<StreamSessionContextIntent>[]>(
     () => {
       return [
+        {
+          id: 'rename',
+          label: i18n('common.text.rename'),
+          validateBeforeExecute: (intent) => sessions.some((session) => session.id === intent.targetSnapshot.sessionId),
+          execute: (intent) => {
+            const session = sessions.find((item) => item.id === intent.targetSnapshot.sessionId);
+            if (session) {
+              startRename(session);
+            }
+          },
+        },
         {
           id: 'delete',
           label: i18n('common.button.delete'),
@@ -97,7 +116,7 @@ const StreamSidebar = ({
         },
       ];
     },
-    [modal, onSessionDelete, sessions],
+    [modal, onSessionDelete, sessions, startRename],
   );
 
   const handleContextMenu = useCallback((event: React.MouseEvent, session: IChatSession) => {
@@ -181,8 +200,21 @@ const StreamSidebar = ({
             onClick={() => onSessionClick(session)}
             onContextMenu={(event) => handleContextMenu(event, session)}
           >
-            <div className={styles.sidebarSessionTitle}>{session.title || i18n('stream.sidebar.unnamed')}</div>
-            <div className={styles.sidebarSessionTime}>{formatSessionTime(session)}</div>
+            {editingSessionId === session.id ? (
+              <InlineRenameInput
+                key={session.id}
+                className={styles.sidebarSessionRenameInput}
+                initialValue={session.title || ''}
+                maxLength={50}
+                onCancel={() => setEditingSessionId(null)}
+                onSubmit={(title) => onSessionRename(session.id, title)}
+              />
+            ) : (
+              <>
+                <div className={styles.sidebarSessionTitle}>{session.title || i18n('stream.sidebar.unnamed')}</div>
+                <div className={styles.sidebarSessionTime}>{formatSessionTime(session)}</div>
+              </>
+            )}
           </div>
         ))}
       </div>
diff --git a/chat2db-community-client/src/pages/main/components/StreamSidebar/style.ts b/chat2db-community-client/src/pages/main/components/StreamSidebar/style.ts
index 9a9ae84d7f..1caf1bcc44 100644
--- a/chat2db-community-client/src/pages/main/components/StreamSidebar/style.ts
+++ b/chat2db-community-client/src/pages/main/components/StreamSidebar/style.ts
@@ -66,9 +66,6 @@ export const useStyles = createStyles(({ css, token }) => {
       &:hover {
         background-color: ${token.colorFillTertiary};
       }
-      &:hover .sidebar-session-delete {
-        opacity: 1;
-      }
     `,
     sidebarSessionItemActive: css`
       background-color: ${token.colorPrimaryBg};
@@ -90,6 +87,10 @@ export const useStyles = createStyles(({ css, token }) => {
       white-space: nowrap;
       flex-shrink: 0;
     `,
+    sidebarSessionRenameInput: css`
+      flex: 1;
+      min-width: 0;
+    `,
     sessionEmpty: css`
       font-size: 13px;
       color: ${token.colorTextTertiary};
diff --git a/chat2db-community-client/src/pages/main/dashboard/DashboardContent/index.tsx b/chat2db-community-client/src/pages/main/dashboard/DashboardContent/index.tsx
index b1dd232fab..72db957d5d 100644
--- a/chat2db-community-client/src/pages/main/dashboard/DashboardContent/index.tsx
+++ b/chat2db-community-client/src/pages/main/dashboard/DashboardContent/index.tsx
@@ -79,9 +79,11 @@ export default memo<IProps>((props) => {
   const refreshChartList = () => {
     if (currentDashboard?.id) {
       setRefreshLoading(true);
-      refreshCurrentDashboard().then(() => {
-        setRefreshLoading(false);
-      });
+      refreshCurrentDashboard()
+        .catch(() => undefined)
+        .finally(() => {
+          setRefreshLoading(false);
+        });
     }
   };
 
diff --git a/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/index.tsx b/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/index.tsx
index 0104144566..0845a003a1 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/index.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/index.tsx
@@ -26,13 +26,17 @@ import {
   isShortcutEventMatch,
   ShortcutAction,
   ShortcutOverrides,
+  ShortcutScope,
 } from '@/constants/shortcut';
 import i18n from '@/i18n';
 import jcefApi from '@/jcef';
 import { useGlobalStore } from '@/store/global';
 import { useWorkspaceStore } from '@/store/workspace';
+import { osNow } from '@/utils';
+import { confirmDirtyWorkspaceEditors, waitForPendingWorkspaceEditors } from '@/utils/editorCloseConfirmation';
 import { getFileManagerLabelKey } from '@/utils/fileManagerLabel';
 import { getLocalTextFileIcon, LOCAL_TEXT_FILE_ICON_MAP, SQL_FILE_EXTENSION_NAME } from '../../utils/localTextFile';
+import { createLocalFileTreePathOperations } from './path';
 import { useStyles } from './style';
 import { LocalSQLFileTreeCreateType, LocalSQLFileTreeNode, LocalSQLFileTreeNodeType } from './type';
 
@@ -112,39 +116,14 @@ const LOCAL_SQL_TOOLBAR_BUTTON_SIZE = { boxSize: 24, iconSize: 16 };
 const LOCAL_SQL_TREE_BASE_INDENT = 0;
 const LOCAL_SQL_TREE_LEVEL_INDENT = 14;
 const LOCAL_SQL_FILE_TREE_REVEAL_LABEL = getFileManagerLabelKey('workspace');
-
-const normalizeComparablePath = (value: string) => value.replace(/\\/g, '/').replace(/\/+$/, '');
-
-const isSameOrChildPath = (filePath: string, targetPath: string, targetType: LocalSQLFileTreeNodeType) => {
-  const normalizedFilePath = normalizeComparablePath(filePath);
-  const normalizedTargetPath = normalizeComparablePath(targetPath);
-  if (targetType === 'file') {
-    return normalizedFilePath === normalizedTargetPath;
-  }
-  return normalizedFilePath === normalizedTargetPath || normalizedFilePath.startsWith(`${normalizedTargetPath}/`);
-};
-
-const replacePathPrefix = (filePath: string, sourcePath: string, targetPath: string) => {
-  const normalizedFilePath = filePath.replace(/\\/g, '/');
-  const normalizedSourcePath = normalizeComparablePath(sourcePath);
-  const suffix =
-    normalizeComparablePath(filePath) === normalizedSourcePath
-      ? ''
-      : normalizedFilePath.slice(normalizedSourcePath.length);
-  const separator = targetPath.includes('\\') ? '\\' : '/';
-  return `${targetPath}${suffix.replace(/\//g, separator)}`;
-};
-
-const getParentPath = (filePath: string) => {
-  const separatorIndex = Math.max(filePath.lastIndexOf('/'), filePath.lastIndexOf('\\'));
-  return separatorIndex > 0 ? filePath.slice(0, separatorIndex) : '';
-};
+const { getComparablePath, getParentPath, getRenamedFilePaths, isSameOrChildPath } =
+  createLocalFileTreePathOperations(osNow().isWin);
 
 const isSameOrChildKey = (key: string, targetKey: string) =>
   key === targetKey ||
   (targetKey.endsWith(':') && key.startsWith(targetKey)) ||
   key.startsWith(`${targetKey}/`) ||
-  key.startsWith(`${targetKey}\\`);
+  (IS_WINDOWS_PLATFORM && key.startsWith(`${targetKey}\\`));
 
 const hasFileExtension = (name: string) => {
   const dotIndex = name.lastIndexOf('.');
@@ -188,7 +167,7 @@ const selectInputName = (input: HTMLInputElement, name: string, type: LocalSQLFi
 
 const getRootPath = (node: LocalSQLFileTreeNode) => node.rootPath || node.path;
 
-const getComparableRootPath = (path?: string) => normalizeComparablePath(path || '').toLowerCase();
+const getComparableRootPath = (path?: string) => getComparablePath(path || '');
 
 const normalizeRootNode = (node: LocalSQLFileTreeNode): LocalSQLFileTreeNode => ({
   ...node,
@@ -360,14 +339,11 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
     [shortcutOverrides],
   );
   const readFile = useWorkspaceStore((state) => state.readFile);
-  const { activeConsoleId, workspaceTabList, setWorkspaceTabList, setActiveConsoleId, deleteEditor } =
-    useWorkspaceStore((state) => ({
-      activeConsoleId: state.activeConsoleId,
-      workspaceTabList: state.workspaceTabList,
-      setWorkspaceTabList: state.setWorkspaceTabList,
-      setActiveConsoleId: state.setActiveConsoleId,
-      deleteEditor: state.deleteEditor,
-    }));
+  const { workspaceTabList, setWorkspaceTabList, setActiveConsoleId } = useWorkspaceStore((state) => ({
+    workspaceTabList: state.workspaceTabList,
+    setWorkspaceTabList: state.setWorkspaceTabList,
+    setActiveConsoleId: state.setActiveConsoleId,
+  }));
 
   const selectedNodeResult = useMemo(() => {
     if (!rootNodes.length || !selectedNodeKey) {
@@ -388,10 +364,10 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
       return false;
     }
 
-    const normalizedTargetPath = normalizeComparablePath(filePath).toLowerCase();
+    const normalizedTargetPath = getComparablePath(filePath);
     const result = findTreeNodeWithAncestors(
       rootNodes,
-      (node) => node.type === 'file' && normalizeComparablePath(node.path).toLowerCase() === normalizedTargetPath,
+      (node) => node.type === 'file' && getComparablePath(node.path) === normalizedTargetPath,
     );
 
     if (!result) {
@@ -589,7 +565,7 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
           rootNodes,
           (node) =>
             node.type === 'directory' &&
-            normalizeComparablePath(node.path).toLowerCase() === normalizeComparablePath(parentPath).toLowerCase(),
+            getComparablePath(node.path) === getComparablePath(parentPath),
         )
       : undefined;
     if (parentResult?.node) {
@@ -891,6 +867,18 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
     const loadingRenamingNode = { ...currentRenamingNode, loading: true };
     renamingRef.current = loadingRenamingNode;
     setRenamingNode(loadingRenamingNode);
+    if (
+      originalNode &&
+      !(await waitForPendingWorkspaceEditors(
+        getWorkspaceTabsForNode(originalNode),
+        useWorkspaceStore.getState().editorList || {},
+      ))
+    ) {
+      const retryRenamingNode = { ...currentRenamingNode, loading: false };
+      renamingRef.current = retryRenamingNode;
+      setRenamingNode(retryRenamingNode);
+      return;
+    }
     try {
       const result = (await jcefApi.renameSqlDirectoryChild({
         rootToken: currentRenamingNode.rootToken,
@@ -925,7 +913,9 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
     } catch (error) {
       console.error('rename sql directory child error', error);
       feedback.error(i18n('workspace.localSqlFileTree.renameFailed'));
-      setRenamingNode((current) => (current ? { ...current, loading: false } : current));
+      const retryRenamingNode = { ...currentRenamingNode, loading: false };
+      renamingRef.current = retryRenamingNode;
+      setRenamingNode(retryRenamingNode);
     }
   }
 
@@ -939,13 +929,15 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
   }
 
   function syncRenamedWorkspaceTabs(sourceNode: LocalSQLFileTreeNode, targetNode: LocalSQLFileTreeNode) {
-    if (!workspaceTabList?.length) {
+    const workspace = useWorkspaceStore.getState();
+    const currentWorkspaceTabList = workspace.workspaceTabList || [];
+    if (!currentWorkspaceTabList.length) {
       return;
     }
 
-    let nextActiveConsoleId = activeConsoleId;
+    let nextActiveConsoleId = workspace.activeConsoleId;
     let changed = false;
-    const nextWorkspaceTabList = workspaceTabList.map((tab) => {
+    const nextWorkspaceTabList = currentWorkspaceTabList.map((tab) => {
       if (tab.type !== WorkspaceTabType.LocalSQLFile || !tab.uniqueData?.filePath) {
         return tab;
       }
@@ -954,8 +946,15 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
       }
 
       changed = true;
-      const filePath = replacePathPrefix(tab.uniqueData.filePath, sourceNode.path, targetNode.path);
-      if (tab.id === activeConsoleId) {
+      const { filePath, fileRelativePath } = getRenamedFilePaths({
+        filePath: tab.uniqueData.filePath,
+        fileRelativePath: tab.uniqueData.fileRelativePath,
+        sourcePath: sourceNode.path,
+        sourceRelativePath: sourceNode.relativePath,
+        targetPath: targetNode.path,
+        targetRelativePath: targetNode.relativePath,
+      });
+      if (tab.id === workspace.activeConsoleId) {
         nextActiveConsoleId = tab.id;
       }
       return {
@@ -964,24 +963,27 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
         uniqueData: {
           ...tab.uniqueData,
           filePath,
+          fileRelativePath,
           fileExtension: sourceNode.type === 'file' ? targetNode.fileExtension : tab.uniqueData.fileExtension,
         },
       };
     });
 
     if (changed) {
-      setWorkspaceTabList(nextWorkspaceTabList);
-      setActiveConsoleId(nextActiveConsoleId);
+      workspace.setWorkspaceTabList(nextWorkspaceTabList);
+      workspace.setActiveConsoleId(nextActiveConsoleId);
     }
   }
 
   function removeDeletedWorkspaceTabs(targetNode: LocalSQLFileTreeNode) {
-    if (!workspaceTabList?.length) {
+    const workspace = useWorkspaceStore.getState();
+    const currentWorkspaceTabList = workspace.workspaceTabList || [];
+    if (!currentWorkspaceTabList.length) {
       return;
     }
 
     const removedTabIds: Array<string | number> = [];
-    const nextWorkspaceTabList = workspaceTabList.filter((tab) => {
+    const nextWorkspaceTabList = currentWorkspaceTabList.filter((tab) => {
       if (tab.type !== WorkspaceTabType.LocalSQLFile || !tab.uniqueData?.filePath) {
         return true;
       }
@@ -997,19 +999,33 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
     }
 
     removedTabIds.forEach((tabId) => {
-      if (typeof tabId === 'number') {
-        deleteEditor(tabId);
-      }
+      workspace.deleteEditor(tabId);
     });
-    setWorkspaceTabList(nextWorkspaceTabList);
-    if (removedTabIds.includes(activeConsoleId as string | number)) {
+    workspace.setWorkspaceTabList(nextWorkspaceTabList);
+    if (removedTabIds.includes(workspace.activeConsoleId as string | number)) {
       const nextActiveId = nextWorkspaceTabList.length
         ? nextWorkspaceTabList[nextWorkspaceTabList.length - 1].id
         : null;
-      setActiveConsoleId(nextActiveId);
+      workspace.setActiveConsoleId(nextActiveId);
     }
   }
 
+  function getWorkspaceTabsForNode(node: LocalSQLFileTreeNode) {
+    return (useWorkspaceStore.getState().workspaceTabList || []).filter(
+      (tab) =>
+        tab.type === WorkspaceTabType.LocalSQLFile &&
+        !!tab.uniqueData?.filePath &&
+        isSameOrChildPath(tab.uniqueData.filePath, node.path, node.type),
+    );
+  }
+
+  async function confirmWorkspaceFileTabsBeforeRemoval(node: LocalSQLFileTreeNode) {
+    return confirmDirtyWorkspaceEditors(
+      getWorkspaceTabsForNode(node),
+      useWorkspaceStore.getState().editorList || {},
+    );
+  }
+
   async function deleteNode(node: LocalSQLFileTreeNode) {
     if (node.disabled || node.rootPath) {
       return;
@@ -1050,20 +1066,28 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
   }
 
   function confirmDeleteNode(node: LocalSQLFileTreeNode) {
-    modal.confirm({
+    const confirmation = modal.confirm({
       title: i18n('common.text.deleteConfirmTitle'),
       content: i18n('common.text.deleteConfirmTip', node.name),
       okText: i18n('common.button.delete'),
       okButtonProps: { danger: true },
       cancelText: i18n('common.button.cancel'),
-      onOk: () => deleteNode(node),
+      onOk: async () => {
+        confirmation.destroy();
+        if (await confirmWorkspaceFileTabsBeforeRemoval(node)) {
+          await deleteNode(node);
+        }
+      },
     });
   }
 
-  function removeRootNode(node: LocalSQLFileTreeNode) {
+  async function removeRootNode(node: LocalSQLFileTreeNode) {
     if (!node.rootPath) {
       return;
     }
+    if (!(await confirmWorkspaceFileTabsBeforeRemoval(node))) {
+      return;
+    }
 
     setRootNodes((currentRoots) => {
       const nextRoots = currentRoots.filter((root) => root.key !== node.key);
@@ -1729,6 +1753,7 @@ const LocalSQLFileTree = forwardRef<LocalSQLFileTreeRef, LocalSQLFileTreeProps>(
       className={styles.fileTreeModule}
       tabIndex={active ? 0 : -1}
       aria-hidden={!active}
+      data-shortcut-scope={ShortcutScope.LocalSqlFileTree}
       onKeyDown={handleLocalShortcut}
       onContextMenuCapture={handleFileTreeContextMenu}
       onDragEnd={handleTreeDragEnd}
diff --git a/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/path.test.ts b/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/path.test.ts
new file mode 100644
index 0000000000..45c4a9ece3
--- /dev/null
+++ b/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/path.test.ts
@@ -0,0 +1,36 @@
+import assert from 'node:assert/strict';
+import { createLocalFileTreePathOperations } from './path';
+
+const posix = createLocalFileTreePathOperations(false);
+assert.notEqual(posix.getComparablePath('/tmp/a\\b.sql'), posix.getComparablePath('/tmp/a/b.sql'));
+assert.equal(posix.isSameOrChildPath('/tmp/sql/nested/query.sql', '/tmp/sql', 'directory'), true);
+assert.equal(posix.isSameOrChildPath('/tmp/sql-copy/query.sql', '/tmp/sql', 'directory'), false);
+assert.equal(posix.replacePathPrefix('/tmp/sql/query.sql', '/tmp/sql', '/tmp/renamed'), '/tmp/renamed/query.sql');
+assert.equal(posix.replacePathPrefix('sql/query.sql', 'sql', 'renamed'), 'renamed/query.sql');
+assert.deepEqual(
+  posix.getRenamedFilePaths({
+    filePath: '/tmp/sql/nested/query.sql',
+    fileRelativePath: 'sql/nested/query.sql',
+    sourcePath: '/tmp/sql',
+    sourceRelativePath: 'sql',
+    targetPath: '/tmp/renamed',
+    targetRelativePath: 'renamed',
+  }),
+  {
+    filePath: '/tmp/renamed/nested/query.sql',
+    fileRelativePath: 'renamed/nested/query.sql',
+  },
+);
+assert.equal(posix.getParentPath('/tmp/a\\b.sql'), '/tmp');
+
+const windows = createLocalFileTreePathOperations(true);
+assert.equal(windows.getComparablePath('C:\\SQL\\Query.sql'), windows.getComparablePath('c:/sql/query.sql'));
+assert.equal(windows.isSameOrChildPath('C:\\SQL\\nested\\query.sql', 'c:/sql', 'directory'), true);
+assert.equal(
+  windows.replacePathPrefix('C:\\SQL\\nested\\query.sql', 'c:\\sql', 'C:\\Renamed'),
+  'C:\\Renamed\\nested\\query.sql',
+);
+assert.equal(windows.replacePathPrefix('sql\\query.sql', 'SQL', 'renamed'), 'renamed/query.sql');
+assert.equal(windows.getParentPath('C:\\SQL\\query.sql'), 'C:\\SQL');
+
+console.log('local file tree path tests passed');
diff --git a/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/path.ts b/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/path.ts
new file mode 100644
index 0000000000..4205aaf171
--- /dev/null
+++ b/chat2db-community-client/src/pages/main/workspace/components/LocalSQLFileTree/path.ts
@@ -0,0 +1,71 @@
+import type { LocalSQLFileTreeNodeType } from './type';
+
+export function createLocalFileTreePathOperations(isWindows: boolean) {
+  const normalizeComparablePath = (value: string) =>
+    (isWindows ? value.replace(/\\/g, '/') : value).replace(/\/+$/, '');
+
+  const getComparablePath = (value: string) => {
+    const normalizedPath = normalizeComparablePath(value);
+    return isWindows ? normalizedPath.toLowerCase() : normalizedPath;
+  };
+
+  const isSameOrChildPath = (
+    filePath: string,
+    targetPath: string,
+    targetType: LocalSQLFileTreeNodeType,
+  ) => {
+    const normalizedFilePath = getComparablePath(filePath);
+    const normalizedTargetPath = getComparablePath(targetPath);
+    if (targetType === 'file') {
+      return normalizedFilePath === normalizedTargetPath;
+    }
+    return normalizedFilePath === normalizedTargetPath || normalizedFilePath.startsWith(`${normalizedTargetPath}/`);
+  };
+
+  const replacePathPrefix = (filePath: string, sourcePath: string, targetPath: string) => {
+    const normalizedFilePath = isWindows ? filePath.replace(/\\/g, '/') : filePath;
+    const normalizedSourcePath = normalizeComparablePath(sourcePath);
+    const suffix =
+      getComparablePath(filePath) === getComparablePath(sourcePath)
+        ? ''
+        : normalizedFilePath.slice(normalizedSourcePath.length);
+    const separator = isWindows && targetPath.includes('\\') ? '\\' : '/';
+    return `${targetPath}${suffix.replace(/\//g, separator)}`;
+  };
+
+  const getParentPath = (filePath: string) => {
+    const separatorIndex = isWindows
+      ? Math.max(filePath.lastIndexOf('/'), filePath.lastIndexOf('\\'))
+      : filePath.lastIndexOf('/');
+    return separatorIndex > 0 ? filePath.slice(0, separatorIndex) : '';
+  };
+
+  const getRenamedFilePaths = ({
+    filePath,
+    fileRelativePath,
+    sourcePath,
+    sourceRelativePath,
+    targetPath,
+    targetRelativePath,
+  }: {
+    filePath: string;
+    fileRelativePath?: string;
+    sourcePath: string;
+    sourceRelativePath: string;
+    targetPath: string;
+    targetRelativePath: string;
+  }) => ({
+    filePath: replacePathPrefix(filePath, sourcePath, targetPath),
+    fileRelativePath: fileRelativePath
+      ? replacePathPrefix(fileRelativePath, sourceRelativePath, targetRelativePath)
+      : fileRelativePath,
+  });
+
+  return {
+    getComparablePath,
+    getParentPath,
+    getRenamedFilePaths,
+    isSameOrChildPath,
+    replacePathPrefix,
+  };
+}
diff --git a/chat2db-community-client/src/pages/main/workspace/components/OperationLine/index.tsx b/chat2db-community-client/src/pages/main/workspace/components/OperationLine/index.tsx
index 5d57689c26..1ae4464699 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/OperationLine/index.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/components/OperationLine/index.tsx
@@ -10,7 +10,8 @@ import Iconfont from '@/components/Iconfont';
 
 // ----- store -----
 import { useWorkspaceStore } from '@/store/workspace';
-import { canCreateDatabase, canCreateSchema } from '@/utils/databaseJudgments';
+import { DatabaseCapability } from '@/constants';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 
 interface IProps {
   searchValue: string;
@@ -45,10 +46,13 @@ const OperationLine = (props: IProps) => {
 
   const showCreate = useMemo(() => {
     if (currentConnectionDetails?.supportDatabase) {
-      return canCreateDatabase(currentConnectionDetails!.type!);
+      return isDatabaseCapabilitySupported(
+        currentConnectionDetails.type,
+        DatabaseCapability.DATABASE_CREATE,
+      );
     }
     if (currentConnectionDetails?.supportSchema) {
-      return canCreateSchema(currentConnectionDetails!.type!);
+      return isDatabaseCapabilitySupported(currentConnectionDetails.type, DatabaseCapability.SCHEMA_CREATE);
     }
   }, [currentConnectionDetails]);
 
diff --git a/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/index.tsx b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/index.tsx
index bb471fcd65..6038a0a89a 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/index.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/index.tsx
@@ -11,6 +11,7 @@ import {
   useImperativeHandle,
 } from 'react';
 import { beginLatestRequest, invalidateLatestRequest, isLatestRequest } from '@/utils/latestRequest';
+import { WorkspaceTabType } from '@/constants/workspace';
 import {
   getDataSourceRuntimeAvailabilityGeneration,
   getSqlExecutionBlockReason,
@@ -52,6 +53,8 @@ import {
   ISQLEditorWithOperationRef,
   type SQLExecutionInvocation,
 } from '@/components/SQLEditor/editor/SQLEditorWithOperation';
+import { createLiveSqlEditorHandle } from './liveEditorHandle';
+import { mergeLatestLocalFileBoundInfo } from './liveEditorBoundInfo';
 import SplitPaneUnpack from '@/components/SplitPaneUnpack';
 import useSqlExecutor from '@/hooks/useSqlExecutor';
 import i18n from '@/i18n';
@@ -214,6 +217,7 @@ const SQLExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLExecuteRef>)
   } = props;
   const { styles, cx } = useStyles();
   const sqlEditorRef = useRef<ISQLEditorWithOperationRef>(null);
+  const liveSqlEditorHandle = useMemo(() => createLiveSqlEditorHandle(sqlEditorRef), []);
   const [boundInfo, setBoundInfo] = useState<IBoundInfo>(_boundInfo);
   const boundInfoRef = useRef<IBoundInfo>(_boundInfo);
   const editorId = boundInfo.workspaceTabId ?? boundInfo.consoleId;
@@ -244,7 +248,6 @@ const SQLExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLExecuteRef>)
     }),
   );
   const [resultDataList, setResultDataList] = useState<IManageResultData[]>([]);
-  const resultPageSizeRef = useRef<number>();
   const pendingRowsRef = useRef<PendingSqlExecutionRows>(new Map());
   const pendingRowsFlushTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const closedSqlExecutionResultsRef = useRef<ClosedSqlExecutionResults>(new Map());
@@ -724,14 +727,14 @@ const SQLExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLExecuteRef>)
 
   useEffect(() => {
     if (editorId) {
-      setEditorToList(editorId, sqlEditorRef.current);
+      setEditorToList(editorId, liveSqlEditorHandle);
     }
     return () => {
       if (editorId) {
         deleteEditor(editorId);
       }
     };
-  }, [editorId]);
+  }, [editorId, liveSqlEditorHandle]);
 
   useUpdateEffect(() => {
     boundInfoRef.current = boundInfo;
@@ -751,6 +754,29 @@ const SQLExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLExecuteRef>)
     _boundInfo.connectable,
   ]);
 
+  useUpdateEffect(() => {
+    if (type !== WorkspaceTabType.LocalSQLFile) {
+      return;
+    }
+    setBoundInfo((currentBoundInfo) => ({
+      ...currentBoundInfo,
+      filePath: _boundInfo.filePath,
+      fileExtension: _boundInfo.fileExtension,
+      fileCharset: _boundInfo.fileCharset,
+      fileBom: _boundInfo.fileBom,
+      fileRootToken: _boundInfo.fileRootToken,
+      fileRelativePath: _boundInfo.fileRelativePath,
+    }));
+  }, [
+    type,
+    _boundInfo.filePath,
+    _boundInfo.fileExtension,
+    _boundInfo.fileCharset,
+    _boundInfo.fileBom,
+    _boundInfo.fileRootToken,
+    _boundInfo.fileRelativePath,
+  ]);
+
   useEffect(() => {
     const requestGeneration = beginLatestRequest(requestGenerationRef);
     if (loadSQL) {
@@ -795,13 +821,26 @@ const SQLExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLExecuteRef>)
     [discardPendingResult],
   );
 
-  const handleChangeDBInfo = (newBoundInfo: IBoundInfo) => {
-    const { databaseType } = newBoundInfo;
-    setBoundInfo((currentBoundInfo) => ({
-      ...currentBoundInfo,
-      ...newBoundInfo,
-      ...getDatabaseSupport(databaseType),
-    }));
+  const handleChangeDBInfo = (newBoundInfo: Partial<IBoundInfo>) => {
+    setBoundInfo((currentBoundInfo) => {
+      const latestWorkspaceBoundInfo =
+        type === WorkspaceTabType.LocalSQLFile
+          ? useWorkspaceStore
+              .getState()
+              .workspaceTabList?.find((tab) => tab.id === currentBoundInfo.workspaceTabId)?.uniqueData
+          : undefined;
+      const nextBoundInfo = mergeLatestLocalFileBoundInfo(
+        currentBoundInfo,
+        newBoundInfo,
+        latestWorkspaceBoundInfo,
+      );
+      return newBoundInfo.databaseType === undefined
+        ? nextBoundInfo
+        : {
+            ...nextBoundInfo,
+            ...getDatabaseSupport(nextBoundInfo.databaseType),
+          };
+    });
   };
 
   const handleExecuteSQL = (params: IConsoleReturnExecuteSql | SQLExecutionInvocation): Promise<any> => {
@@ -857,9 +896,6 @@ const SQLExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLExecuteRef>)
 
     const executeSqlParams = {
       ...requestParams,
-      ...(requestParams.pageSize === undefined && resultPageSizeRef.current !== undefined
-        ? { pageSize: resultPageSizeRef.current }
-        : {}),
       databaseType: executionSnapshot.databaseType,
       dataSourceId: executionSnapshot.dataSourceId,
       dataSourceName: executionSnapshot.dataSourceName,
@@ -1019,14 +1055,6 @@ const SQLExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLExecuteRef>)
       });
   };
 
-  const handleResultPagingChange = useCallback(
-    (_resultData: IManageResultData, executeSqlParams: IExecuteSqlParams) => {
-      resultPageSizeRef.current = executeSqlParams.pageSize;
-      return handleExecuteSQL(executeSqlParams);
-    },
-    [handleExecuteSQL],
-  );
-
   const stopExecuteSql = () => {
     stopExecuteSQL();
   };
@@ -1094,7 +1122,6 @@ const SQLExecute = forwardRef((props: IProps, ref: ForwardedRef<SQLExecuteRef>)
                 onKeepExecutionLogHistoryChange={handleKeepExecutionLogHistoryChange}
                 onKeepResultHistoryChange={handleKeepResultHistoryChange}
                 onResultDataListChange={handleResultDataListChange}
-                onResultPagingChange={handleResultPagingChange}
               />
             )}
             {executing && (
diff --git a/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorBoundInfo.test.ts b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorBoundInfo.test.ts
new file mode 100644
index 0000000000..68365620dc
--- /dev/null
+++ b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorBoundInfo.test.ts
@@ -0,0 +1,36 @@
+import assert from 'node:assert/strict';
+import { mergeLatestLocalFileBoundInfo } from './liveEditorBoundInfo';
+
+const merged = mergeLatestLocalFileBoundInfo(
+  {
+    workspaceTabId: 'file-tab',
+    filePath: '/old/query.sql',
+    fileRelativePath: 'old/query.sql',
+    fileCharset: 'UTF-8',
+    ddl: 'old persisted content',
+  },
+  { ddl: 'latest saved content' },
+  {
+    workspaceTabId: 'file-tab',
+    filePath: '/renamed/query.sql',
+    fileRelativePath: 'renamed/query.sql',
+    fileCharset: 'UTF-16LE',
+    fileBom: true,
+    ddl: 'previous saved content',
+  },
+);
+
+assert.deepEqual(merged, {
+  workspaceTabId: 'file-tab',
+  filePath: '/renamed/query.sql',
+  fileRelativePath: 'renamed/query.sql',
+  fileCharset: 'UTF-16LE',
+  fileBom: true,
+  fileExtension: undefined,
+  filePreviewUrl: undefined,
+  filePreviewMimeType: undefined,
+  fileRootToken: undefined,
+  ddl: 'latest saved content',
+});
+
+console.log('live editor bound info tests passed');
diff --git a/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorBoundInfo.ts b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorBoundInfo.ts
new file mode 100644
index 0000000000..c2eadafbec
--- /dev/null
+++ b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorBoundInfo.ts
@@ -0,0 +1,30 @@
+import type { IBoundInfo } from '@/typings';
+
+function getLocalFileMetadata(boundInfo?: IBoundInfo) {
+  if (!boundInfo) {
+    return {};
+  }
+  return {
+    ddl: boundInfo.ddl,
+    filePath: boundInfo.filePath,
+    fileExtension: boundInfo.fileExtension,
+    fileCharset: boundInfo.fileCharset,
+    fileBom: boundInfo.fileBom,
+    filePreviewUrl: boundInfo.filePreviewUrl,
+    filePreviewMimeType: boundInfo.filePreviewMimeType,
+    fileRootToken: boundInfo.fileRootToken,
+    fileRelativePath: boundInfo.fileRelativePath,
+  };
+}
+
+export function mergeLatestLocalFileBoundInfo(
+  currentBoundInfo: IBoundInfo,
+  update: Partial<IBoundInfo>,
+  latestWorkspaceBoundInfo?: IBoundInfo,
+): IBoundInfo {
+  return {
+    ...currentBoundInfo,
+    ...getLocalFileMetadata(latestWorkspaceBoundInfo),
+    ...update,
+  };
+}
diff --git a/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorHandle.test.ts b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorHandle.test.ts
new file mode 100644
index 0000000000..ab971ee198
--- /dev/null
+++ b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorHandle.test.ts
@@ -0,0 +1,40 @@
+import assert from 'node:assert/strict';
+import type { ISQLEditorWithOperationRef } from '@/components/SQLEditor/editor/SQLEditorWithOperation';
+import { createLiveSqlEditorHandle, type CurrentSqlEditorHandleRef } from './liveEditorHandle';
+
+const first = {
+  getValue: () => 'first',
+  hasUnsavedChangesBeforeClose: () => false,
+  saveBeforeClose: async () => false,
+} as ISQLEditorWithOperationRef;
+const second = {
+  getValue: () => 'second',
+  hasUnsavedChangesBeforeClose: () => true,
+  saveBeforeClose: async () => true,
+  waitForPendingSave: async () => undefined,
+  persistBeforeApplicationExit: async () => true,
+} as ISQLEditorWithOperationRef;
+const editorRef: CurrentSqlEditorHandleRef = { current: first };
+const liveEditor = createLiveSqlEditorHandle(editorRef);
+
+async function run() {
+  assert.equal(liveEditor.getValue(), 'first');
+  assert.equal(liveEditor.hasUnsavedChangesBeforeClose?.(), false);
+  assert.equal(liveEditor.persistBeforeApplicationExit, undefined);
+
+  editorRef.current = second;
+  assert.equal(liveEditor.getValue(), 'second', 'the registered handle reads the latest editor ref');
+  assert.equal(liveEditor.hasUnsavedChangesBeforeClose?.(), true);
+  assert.equal(await liveEditor.saveBeforeClose?.(), true);
+  assert.equal(await liveEditor.waitForPendingSave?.(), undefined);
+  assert.equal(await liveEditor.persistBeforeApplicationExit?.(), true);
+
+  editorRef.current = null;
+  assert.equal(liveEditor.hasUnsavedChangesBeforeClose?.(), true, 'a missing live editor fails closed');
+  assert.equal(await liveEditor.saveBeforeClose?.(), false);
+  assert.equal(await liveEditor.waitForPendingSave?.(), undefined);
+
+  console.log('live editor handle tests passed');
+}
+
+void run();
diff --git a/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorHandle.ts b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorHandle.ts
new file mode 100644
index 0000000000..ab7bcc775d
--- /dev/null
+++ b/chat2db-community-client/src/pages/main/workspace/components/SQLExecute/liveEditorHandle.ts
@@ -0,0 +1,34 @@
+import type { ISQLEditorWithOperationRef } from '@/components/SQLEditor/editor/SQLEditorWithOperation';
+
+export interface CurrentSqlEditorHandleRef {
+  current: ISQLEditorWithOperationRef | null;
+}
+
+export function createLiveSqlEditorHandle(
+  editorRef: CurrentSqlEditorHandleRef,
+): ISQLEditorWithOperationRef {
+  return {
+    getId: () => editorRef.current?.getId() ?? '',
+    getInstance: () => editorRef.current?.getInstance() ?? null,
+    getValue: () => editorRef.current?.getValue() ?? '',
+    setValue: (value, type) => editorRef.current?.setValue(value, type),
+    getContentDiffBaseline: () => editorRef.current?.getContentDiffBaseline() ?? '',
+    resetContentDiffBaseline: (value) => editorRef.current?.resetContentDiffBaseline(value),
+    getSelectedContent: () => editorRef.current?.getSelectedContent() ?? '',
+    getCursorSQL: () => editorRef.current?.getCursorSQL() ?? '',
+    getCursorCurLineNearestSQL: () => editorRef.current?.getCursorCurLineNearestSQL() ?? '',
+    handleSQLParser: (sql, dbInfo) => editorRef.current?.handleSQLParser(sql, dbInfo),
+    handleQuickSQLParser: (sql, dbInfo) => editorRef.current?.handleQuickSQLParser(sql, dbInfo),
+    getTableIdentifierAtPosition: (position) => editorRef.current?.getTableIdentifierAtPosition(position) ?? null,
+    executeSQL: () => editorRef.current?.executeSQL(),
+    hasUnsavedChangesBeforeClose: () => editorRef.current?.hasUnsavedChangesBeforeClose?.() ?? true,
+    saveBeforeClose: () => editorRef.current?.saveBeforeClose?.() ?? Promise.resolve(false),
+    waitForPendingSave: () => editorRef.current?.waitForPendingSave?.() ?? Promise.resolve(),
+    get persistBeforeApplicationExit() {
+      if (!editorRef.current?.persistBeforeApplicationExit) {
+        return undefined;
+      }
+      return () => editorRef.current?.persistBeforeApplicationExit?.() ?? Promise.resolve(false);
+    },
+  };
+}
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/accountGrantsRequest.test.ts b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/accountGrantsRequest.test.ts
new file mode 100644
index 0000000000..57c66c7af1
--- /dev/null
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/accountGrantsRequest.test.ts
@@ -0,0 +1,153 @@
+import assert from 'node:assert/strict';
+import { invalidateLatestRequest } from '@/utils/latestRequest';
+import { loadLatestAccountGrants } from './accountGrantsRequest';
+
+interface Deferred<T> {
+  promise: Promise<T>;
+  resolve: (value: T) => void;
+  reject: (error: unknown) => void;
+}
+
+function deferred<T>(): Deferred<T> {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise;
+    reject = rejectPromise;
+  });
+  return { promise, resolve, reject };
+}
+
+async function testStaleResponseCannotReplaceLatestAccount() {
+  const requestGenerationRef = { current: 0 };
+  const firstRequest = deferred<string[]>();
+  const secondRequest = deferred<string[]>();
+  let displayedGrants = ['initial'];
+  let settleCount = 0;
+
+  const runFirstRequest = loadLatestAccountGrants(
+    requestGenerationRef,
+    () => firstRequest.promise,
+    (grants) => {
+      displayedGrants = grants;
+    },
+    () => {
+      settleCount += 1;
+    },
+  );
+  const runSecondRequest = loadLatestAccountGrants(
+    requestGenerationRef,
+    () => secondRequest.promise,
+    (grants) => {
+      displayedGrants = grants;
+    },
+    () => {
+      settleCount += 1;
+    },
+  );
+
+  firstRequest.resolve(['old-account-grant']);
+  await runFirstRequest;
+
+  assert.deepEqual(displayedGrants, []);
+  assert.equal(settleCount, 0, 'an old request must not stop the latest request spinner');
+
+  secondRequest.resolve(['new-account-grant']);
+  await runSecondRequest;
+
+  assert.deepEqual(displayedGrants, ['new-account-grant']);
+  assert.equal(settleCount, 1);
+}
+
+async function testLatestRequestClearsPreviousGrantsImmediately() {
+  const requestGenerationRef = { current: 0 };
+  const nextRequest = deferred<string[]>();
+  let displayedGrants: string[] = [];
+
+  await loadLatestAccountGrants(
+    requestGenerationRef,
+    async () => ['old-account-grant'],
+    (grants) => {
+      displayedGrants = grants;
+    },
+    () => {},
+  );
+
+  assert.deepEqual(displayedGrants, ['old-account-grant']);
+
+  const runNextRequest = loadLatestAccountGrants(
+    requestGenerationRef,
+    () => nextRequest.promise,
+    (grants) => {
+      displayedGrants = grants;
+    },
+    () => {},
+  );
+
+  assert.deepEqual(displayedGrants, []);
+
+  nextRequest.resolve(['new-account-grant']);
+  await runNextRequest;
+  assert.deepEqual(displayedGrants, ['new-account-grant']);
+}
+
+async function testLatestFailureClearsGrantsAndSettles() {
+  const requestGenerationRef = { current: 0 };
+  let displayedGrants = ['previous-grant'];
+  let settled = false;
+
+  await loadLatestAccountGrants(
+    requestGenerationRef,
+    async () => {
+      throw new Error('request failed');
+    },
+    (grants) => {
+      displayedGrants = grants;
+    },
+    () => {
+      settled = true;
+    },
+  );
+
+  assert.deepEqual(displayedGrants, []);
+  assert.equal(settled, true);
+}
+
+async function testUnmountedRequestCannotUpdateState() {
+  const requestGenerationRef = { current: 0 };
+  const request = deferred<string[]>();
+  let updateCount = 0;
+  let settleCount = 0;
+
+  const runRequest = loadLatestAccountGrants(
+    requestGenerationRef,
+    () => request.promise,
+    () => {
+      updateCount += 1;
+    },
+    () => {
+      settleCount += 1;
+    },
+  );
+
+  invalidateLatestRequest(requestGenerationRef);
+  request.resolve(['ignored-grant']);
+  await runRequest;
+
+  assert.equal(updateCount, 1);
+  assert.equal(settleCount, 0);
+}
+
+Promise.all([
+  testStaleResponseCannotReplaceLatestAccount(),
+  testLatestRequestClearsPreviousGrantsImmediately(),
+  testLatestFailureClearsGrantsAndSettles(),
+  testUnmountedRequestCannotUpdateState(),
+])
+  .then(() => {
+    console.log('Account grants request tests passed');
+  })
+  .catch((error) => {
+    console.error(error);
+    process.exitCode = 1;
+  });
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/accountGrantsRequest.ts b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/accountGrantsRequest.ts
new file mode 100644
index 0000000000..f024d9b445
--- /dev/null
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/accountGrantsRequest.ts
@@ -0,0 +1,28 @@
+import { beginLatestRequest, isLatestRequest, type RequestGenerationRef } from '@/utils/latestRequest';
+
+type AccountGrantsLoader = () => Promise<string[] | undefined>;
+
+export async function loadLatestAccountGrants(
+  requestGenerationRef: RequestGenerationRef,
+  loadGrants: AccountGrantsLoader,
+  updateGrants: (grants: string[]) => void,
+  settleLoading: () => void,
+) {
+  const requestGeneration = beginLatestRequest(requestGenerationRef);
+  updateGrants([]);
+
+  try {
+    const grants = await loadGrants();
+    if (isLatestRequest(requestGenerationRef, requestGeneration)) {
+      updateGrants(grants || []);
+    }
+  } catch (_error) {
+    if (isLatestRequest(requestGenerationRef, requestGeneration)) {
+      updateGrants([]);
+    }
+  } finally {
+    if (isLatestRequest(requestGenerationRef, requestGeneration)) {
+      settleLoading();
+    }
+  }
+}
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/index.tsx b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/index.tsx
index 13f14980ed..152bdb9e88 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/index.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/GlobalExtendComponents/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useWorkspaceStore } from '@/store/workspace';
 import { useTreeStore } from '@/store/tree';
 import { GlobalComponents } from '../config';
@@ -11,6 +11,8 @@ import { Spin } from 'antd';
 import i18n from '@/i18n';
 import type { TreeNodeData } from '@/typings/tree';
 import accountAdminService from '@/service/accountAdmin';
+import { invalidateLatestRequest } from '@/utils/latestRequest';
+import { loadLatestAccountGrants } from './accountGrantsRequest';
 
 const GlobalExtendComponents = () => {
   const { styles } = useStyles();
@@ -101,28 +103,29 @@ const AccountGrants = ({ data }: AccountGrantsProps) => {
   const { styles } = useStyles();
   const [loading, setLoading] = useState(false);
   const [grants, setGrants] = useState<string[]>([]);
+  const requestGenerationRef = useRef(0);
 
   useEffect(() => {
     if (!data?.dataSourceId || !data.user || !data.host) {
       setGrants([]);
+      setLoading(false);
       return;
     }
     setLoading(true);
-    accountAdminService
-      .grants({
-        dataSourceId: data.dataSourceId,
-        user: data.user,
-        host: data.host,
-      })
-      .then((res) => {
-        setGrants(res || []);
-      })
-      .catch(() => {
-        setGrants([]);
-      })
-      .finally(() => {
-        setLoading(false);
-      });
+    void loadLatestAccountGrants(
+      requestGenerationRef,
+      () =>
+        accountAdminService.grants({
+          dataSourceId: data.dataSourceId,
+          user: data.user,
+          host: data.host,
+        }),
+      setGrants,
+      () => setLoading(false),
+    );
+    return () => {
+      invalidateLatestRequest(requestGenerationRef);
+    };
   }, [data?.dataSourceId, data?.user, data?.host]);
 
   return (
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/WorkspaceExtendBody/index.tsx b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/WorkspaceExtendBody/index.tsx
index 72e16c348d..1fd049fc23 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/WorkspaceExtendBody/index.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceExtend/WorkspaceExtendBody/index.tsx
@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { memo, useMemo } from 'react';
 import { extendConfig, isWorkspaceRecordCode } from '../config';
 import { useWorkspaceStore } from '@/store/workspace';
 import { useStyles } from './style';
@@ -10,7 +10,7 @@ import {
 } from '@/store/workspace/utils/resultInspector';
 import WorkspaceRecordSwitcher from '../WorkspaceRecordSwitcher';
 
-export default () => {
+export default memo(() => {
   const { styles } = useStyles();
 
   const currentWorkspaceExtend = useWorkspaceStore((state) => state.currentWorkspaceExtend);
@@ -43,4 +43,4 @@ export default () => {
   ) : (
     false
   );
-};
+});
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceLeft/style.ts b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceLeft/style.ts
index 56b8c5a1c5..1af079f2e1 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceLeft/style.ts
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceLeft/style.ts
@@ -27,7 +27,7 @@ export const useStyles = createStyles(({ css, token }) => {
       align-items: center;
       justify-content: space-between;
       flex-shrink: 0;
-      height: 42px;
+      height: 36px;
       box-sizing: border-box;
       padding: 0 8px 0 6px;
       border-bottom: 1px solid ${token.colorBorderLayout};
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceLeftActionBar/components/AddDatasourceBar/index.tsx b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceLeftActionBar/components/AddDatasourceBar/index.tsx
index 8d345b4853..78fc13addd 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceLeftActionBar/components/AddDatasourceBar/index.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceLeftActionBar/components/AddDatasourceBar/index.tsx
@@ -208,7 +208,7 @@ export default memo<IProps>(() => {
         .then(async (res: any) => {
           setIsModalVisible(false);
           if (res?.id) {
-            await refreshDataSourceAfterMutation(res.id);
+            await refreshDataSourceAfterMutation(res.id, { expandParent: true });
           }
         });
     }
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx
index 4439900349..d6f420ed1c 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceRight/index.tsx
@@ -66,8 +66,10 @@ const WorkspaceRight = memo(() => {
           maxSize={maxPanelSize}
           primary="second"
           allowResize={panelRight}
-          onChange={(newSize) => {
-            setPanelRightWidth(newSize);
+          onDragFinished={(newSize) => {
+            if (Number.isFinite(newSize) && newSize !== panelRightWidth) {
+              setPanelRightWidth(newSize);
+            }
           }}
         >
           <div className={styles.masterScope}>
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/FilePreviewTab.tsx b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/FilePreviewTab.tsx
index 70ad5a6134..52bd1a59c2 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/FilePreviewTab.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/FilePreviewTab.tsx
@@ -11,11 +11,18 @@ import remarkMath from 'remark-math';
 import MonacoEditor, { type IEditorIns, type IExportRefFunction } from '@/components/MonacoEditor';
 import i18n from '@/i18n';
 import type { IBoundInfo } from '@/typings';
-import { updateFileContent } from '@/utils/file';
+import { saveLocalFileContent, waitForLocalFileSave } from '@/utils/file';
 import 'katex/dist/katex.min.css';
 import styles from './FilePreviewTab.less';
 import { getSqlDirectoryPreviewUrl } from '@/utils/previewResource';
 import LocalFileEncodingSelect from '@/components/LocalFileEncodingSelect';
+import {
+  getEffectiveShortcutConfigMap,
+  shortcutBindingToMonacoKeybinding,
+  ShortcutAction,
+  type ShortcutOverrides,
+} from '@/constants/shortcut';
+import { useGlobalStore } from '@/store/global';
 import { useWorkspaceStore } from '@/store/workspace';
 import { hasUnsavedLocalFileChanges } from '@/utils/localFileEncoding';
 
@@ -120,26 +127,23 @@ function MermaidDiagram({ source }: { source: string }) {
 
 function MarkdownSourceEditor({
   source,
-  filePath,
-  fileCharset,
-  fileBom,
+  saveKeybinding,
   onChange,
   onSave,
   onEditorChange,
   onCursorPositionChange,
 }: {
   source: string;
-  filePath?: string;
-  fileCharset?: string;
-  fileBom?: boolean;
+  saveKeybinding?: number;
   onChange: (value: string) => void;
-  onSave: (value: string) => void;
+  onSave: (value: string) => Promise<boolean>;
   onEditorChange: (editor?: IEditorIns) => void;
   onCursorPositionChange: (position: monaco.IPosition) => void;
 }) {
   const reactId = useId();
   const editorId = useMemo(() => `markdown-${reactId.replace(/[^a-zA-Z0-9_-]/g, '')}`, [reactId]);
   const editorRef = useRef<IExportRefFunction>(null);
+  const [editorInstance, setEditorInstance] = useState<IEditorIns>();
 
   useEffect(() => {
     if (editorRef.current?.getAllContent() !== source) {
@@ -149,6 +153,21 @@ function MarkdownSourceEditor({
 
   useEffect(() => () => onEditorChange(undefined), [onEditorChange]);
 
+  useEffect(() => {
+    if (!editorInstance || !saveKeybinding) {
+      return undefined;
+    }
+    const action = editorInstance.addAction({
+      id: `${editorId}-save`,
+      label: i18n('monaco.text.saveFile'),
+      keybindings: [saveKeybinding],
+      run: () => {
+        void onSave(editorInstance.getValue());
+      },
+    });
+    return () => action.dispose();
+  }, [editorId, editorInstance, onSave, saveKeybinding]);
+
   return (
     <MonacoEditor
       ref={editorRef}
@@ -163,6 +182,7 @@ function MarkdownSourceEditor({
         padding: { top: 12, bottom: 12 },
       }}
       didMount={(editor) => {
+        setEditorInstance(editor);
         onEditorChange(editor);
         const initialPosition = editor.getPosition();
         if (initialPosition) {
@@ -170,25 +190,6 @@ function MarkdownSourceEditor({
         }
         editor.onDidChangeCursorPosition(({ position }) => onCursorPositionChange(position));
         editor.onDidChangeModelContent(() => onChange(editor.getValue()));
-        editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS, () => {
-          if (filePath) {
-            const fileContent = editor.getValue();
-            void updateFileContent({
-              filePath,
-              fileContent,
-              charset: fileCharset,
-              bom: fileBom,
-            })
-              .then(() => {
-                onSave(fileContent);
-                staticMessage.success(i18n('workspace.text.changeFileSuccess'));
-              })
-              .catch((error) => {
-                console.error('update local file error', error);
-                staticMessage.error(i18n('common.text.failure'));
-              });
-          }
-        });
       }}
     />
   );
@@ -253,7 +254,106 @@ const FilePreviewTab = memo(({ file, workspaceTabId }: FilePreviewTabProps) => {
   const scrollSyncFrameRef = useRef<number | undefined>(undefined);
   const pdfLoadTimeoutRef = useRef<number | undefined>(undefined);
   const markdownCursorPositionRef = useRef<HTMLSpanElement>(null);
+  const fileRef = useRef(file);
+  const markdownContentRef = useRef(markdownContent);
+  const markdownPersistedContentRef = useRef(markdownPersistedContent);
   const [modal, modalContextHolder] = Modal.useModal();
+  const shortcutOverrides = useGlobalStore((state) => state.shortcutOverrides);
+  const { setEditorToList, deleteEditor } = useWorkspaceStore((state) => ({
+    setEditorToList: state.setEditorToList,
+    deleteEditor: state.deleteEditor,
+  }));
+
+  fileRef.current = file;
+  markdownContentRef.current = markdownContent;
+  markdownPersistedContentRef.current = markdownPersistedContent;
+
+  useEffect(() => {
+    if (!isMarkdown || file.ddl !== undefined || !file.filePath) {
+      return;
+    }
+    void useWorkspaceStore
+      .getState()
+      .readFile(file.filePath, file.fileExtension, {
+        rootToken: file.fileRootToken,
+        relativePath: file.fileRelativePath,
+        charset: file.fileCharset,
+        workspaceTabId,
+      })
+      .catch((error) => console.error('Failed to restore local file content', error));
+  }, [
+    file.ddl,
+    file.fileCharset,
+    file.fileExtension,
+    file.filePath,
+    file.fileRelativePath,
+    file.fileRootToken,
+    isMarkdown,
+    workspaceTabId,
+  ]);
+
+  useEffect(() => {
+    if (!isMarkdown || file.ddl === undefined) {
+      return;
+    }
+    setMarkdownContent(file.ddl);
+    setMarkdownPreviewContent(file.ddl);
+    setMarkdownPersistedContent(file.ddl);
+  }, [file.ddl, file.filePath, isMarkdown]);
+
+  const markdownSaveKeybinding = useMemo(() => {
+    const shortcutConfig = getEffectiveShortcutConfigMap(shortcutOverrides as ShortcutOverrides);
+    return shortcutBindingToMonacoKeybinding(shortcutConfig[ShortcutAction.SqlSave].binding, monaco) || undefined;
+  }, [shortcutOverrides]);
+
+  const saveMarkdownFile = useCallback(async (value = markdownContentRef.current) => {
+    const currentFile = fileRef.current;
+    if (!currentFile.filePath) {
+      return false;
+    }
+    try {
+      const result = await saveLocalFileContent({
+        filePath: currentFile.filePath,
+        fileContent: value,
+        charset: currentFile.fileCharset,
+        bom: currentFile.fileBom,
+      });
+      markdownPersistedContentRef.current = result.fileContent;
+      setMarkdownPersistedContent(result.fileContent);
+      useWorkspaceStore.getState().updateWorkspaceTabBoundInfo({
+        workspaceTabId,
+        ddl: result.fileContent,
+      });
+      staticMessage.success(i18n('workspace.text.changeFileSuccess'));
+      return true;
+    } catch (error) {
+      console.error('update local file error', error);
+      staticMessage.error(i18n('common.text.failure'));
+      return false;
+    }
+  }, [workspaceTabId]);
+
+  const markdownCloseGuard = useMemo(
+    () => ({
+      hasUnsavedChangesBeforeClose: () =>
+        isMarkdown &&
+        hasUnsavedLocalFileChanges(markdownContentRef.current, markdownPersistedContentRef.current),
+      saveBeforeClose: () => saveMarkdownFile(),
+      waitForPendingSave: () => {
+        const filePath = fileRef.current.filePath;
+        return filePath ? waitForLocalFileSave(filePath) : Promise.resolve();
+      },
+    }),
+    [isMarkdown, saveMarkdownFile],
+  );
+
+  useEffect(() => {
+    if (!isMarkdown) {
+      return undefined;
+    }
+    setEditorToList(workspaceTabId, markdownCloseGuard);
+    return () => deleteEditor(workspaceTabId);
+  }, [deleteEditor, isMarkdown, markdownCloseGuard, setEditorToList, workspaceTabId]);
 
   const confirmDiscardUnsavedChanges = useCallback(
     () =>
@@ -314,13 +414,15 @@ const FilePreviewTab = memo(({ file, workspaceTabId }: FilePreviewTabProps) => {
   }, []);
 
   useEffect(() => {
+    if (isMarkdown) {
+      return;
+    }
     setMarkdownContent(file.ddl || '');
     setMarkdownPreviewContent(file.ddl || '');
     setMarkdownPersistedContent(file.ddl || '');
-    setMarkdownViewMode('review');
     setImageZoom(1);
     setImageNaturalSize({ width: 0, height: 0 });
-  }, [file.filePath]);
+  }, [file.ddl, file.filePath, isMarkdown]);
 
   useEffect(() => {
     if (markdownViewMode === 'source') {
@@ -536,13 +638,11 @@ const FilePreviewTab = memo(({ file, workspaceTabId }: FilePreviewTabProps) => {
     );
     const source = (
       <MarkdownSourceEditor
-        key={`${workspaceTabId}:${file.filePath || ''}:${file.fileCharset || ''}:${String(file.fileBom)}`}
+        key={`${workspaceTabId}:${file.fileCharset || ''}:${String(file.fileBom)}`}
         source={markdownContent}
-        filePath={file.filePath}
-        fileCharset={file.fileCharset}
-        fileBom={file.fileBom}
+        saveKeybinding={markdownSaveKeybinding}
         onChange={setMarkdownContent}
-        onSave={setMarkdownPersistedContent}
+        onSave={saveMarkdownFile}
         onEditorChange={setEditor}
         onCursorPositionChange={handleMarkdownCursorPositionChange}
       />
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/index.tsx b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/index.tsx
index ec0bf7ae80..e761052fe0 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/index.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/index.tsx
@@ -19,7 +19,7 @@ import {
 } from '@dnd-kit/core';
 
 // ----- constants -----
-import { ConsoleOpenedStatus, WorkspaceTabType, workspaceTabConfig } from '@/constants';
+import { ConsoleOpenedStatus, DatabaseCapability, WorkspaceTabType, workspaceTabConfig } from '@/constants';
 import { DEFAULT_TERMINAL_SETTINGS } from '@/constants/terminal';
 import {
   IWorkspaceTab,
@@ -40,6 +40,7 @@ import RedisAllData from '@/blocks/RedisAllData';
 import Iconfont from '@/components/Iconfont';
 import { useZoerStore } from '@/store/zoer';
 import AccountPrivilegePanel from '../AccountPrivilegePanel';
+import ActiveTransactionsContent from '@/blocks/NewTree/components/ActiveTransactionsContent';
 import ContentDiffTab from './ContentDiffTab';
 import FilePreviewTab from './FilePreviewTab';
 import TerminalTab from './TerminalTab';
@@ -48,6 +49,7 @@ import TerminalTab from './TerminalTab';
 import { useWorkspaceStore } from '@/store/workspace';
 import { useGlobalStore } from '@/store/global';
 import { getPersistableActiveConsoleId } from '@/store/workspace/utils/workspaceTabPersistence';
+import { getRestoredLocalFileReadRequest } from '@/store/workspace/utils/localFileWorkspaceTab';
 import { isWorkspaceResultInspectorCode } from '@/store/workspace/utils/resultInspector';
 import { isConsoleTabNameCustomized } from '@/store/workspace/utils/consoleTabName';
 import { useTreeStore } from '@/store/tree';
@@ -59,6 +61,7 @@ import jcefApi from '@/jcef';
 
 import { copyToClipboard, getTemporaryId, isTemporaryId } from '@/utils';
 import { resolveDataSourceIdentityColor } from '@/utils/dataSourceIdentity';
+import { isDatabaseCapabilitySupported } from '@/utils/databaseJudgments';
 
 import { useIndexDBStore } from '@/store/indexDB';
 import { getDatabaseSupport } from '@/utils/database';
@@ -87,6 +90,7 @@ import {
 } from './terminalTabPlacement';
 import { getNextActiveWorkspaceTabIdAfterClose } from './workspaceTabSelection';
 import {
+  appendWorkspaceTabToPane,
   areWorkspaceTabSplitLayoutsEqual,
   collectWorkspaceTabPaneIds,
   createWorkspaceTabSplitNode,
@@ -106,6 +110,7 @@ const SplitPaneAny = SplitPane as any;
 const MAIN_WORKSPACE_TAB_PANE: WorkspaceTabPaneId = 'main';
 const SPLIT_WORKSPACE_TAB_PANE: WorkspaceTabPaneId = 'split';
 const WORKSPACE_TAB_PANE_DROPPABLE_PREFIX = 'workspace-tab-pane:';
+const WORKSPACE_TAB_HEADER_HEIGHT = 36;
 const WORKSPACE_TAB_WIDTH = 200;
 const WORKSPACE_TAB_HORIZONTAL_RESIZE_CLASS = 'WorkspaceTabHorizontalResizing';
 const WORKSPACE_TAB_VERTICAL_RESIZE_CLASS = 'WorkspaceTabVerticalResizing';
@@ -271,6 +276,22 @@ function rebuildSqlExecuteTabData(item: IWorkspaceTab) {
     return uniqueData;
   }
 
+  const localFileReadRequest = getRestoredLocalFileReadRequest(item);
+  if (localFileReadRequest) {
+    return {
+      ...uniqueData,
+      loadSQL: () =>
+        useWorkspaceStore
+          .getState()
+          .readFile(
+            localFileReadRequest.filePath,
+            localFileReadRequest.fileExtension,
+            localFileReadRequest.context,
+          )
+          .then((file) => file?.content || ''),
+    };
+  }
+
   const { dataSourceId, databaseName, schemaName } = uniqueData;
 
   if (item.type === WorkspaceTabType.VIEW) {
@@ -824,6 +845,9 @@ const WorkspaceTabs = memo(() => {
   // The split box does not exist in an empty workspace. Re-run when the first
   // tab mounts even if the normalized split layout remains null.
   useLayoutEffect(() => {
+    if (!workspaceTabSplitLayout) {
+      return;
+    }
     const container = splitTabBoxRef.current;
     if (!container) {
       return;
@@ -887,6 +911,7 @@ const WorkspaceTabs = memo(() => {
     tabs: IWorkspaceTab[],
     layout: IWorkspaceTabSplitLayout | null | undefined = useWorkspaceStore.getState().workspaceTabSplitLayout,
     nextActiveConsoleId: string | number | null | undefined = useWorkspaceStore.getState().activeConsoleId,
+    nextRecentlyClosedWorkspaceTabs?: IWorkspaceTab[],
   ) => {
     const orderedTabs = orderPinnedWorkspaceTabsFirst(tabs);
     const orderedLayout = orderSplitLayoutPaneIdsByPinned(layout || null, orderedTabs);
@@ -902,6 +927,9 @@ const WorkspaceTabs = memo(() => {
     if (!areWorkspaceTabSplitLayoutsEqual(currentState.workspaceTabSplitLayout, normalizedLayout)) {
       nextState.workspaceTabSplitLayout = normalizedLayout;
     }
+    if (nextRecentlyClosedWorkspaceTabs !== undefined) {
+      nextState.recentlyClosedWorkspaceTabs = nextRecentlyClosedWorkspaceTabs;
+    }
     useWorkspaceStore.setState(nextState);
   };
 
@@ -1018,25 +1046,22 @@ const WorkspaceTabs = memo(() => {
     });
   };
 
-  const rememberClosedWorkspaceTabs = (tabs: IWorkspaceTab[]) => {
+  const createRecentlyClosedWorkspaceTabs = (tabs: IWorkspaceTab[]) => {
+    const currentRecentlyClosed = useWorkspaceStore.getState().recentlyClosedWorkspaceTabs || [];
     if (!tabs.length) {
-      return;
+      return currentRecentlyClosed;
     }
     const currentEditorList = useWorkspaceStore.getState().editorList || {};
     const snapshots = tabs
       .map((tab) => createPersistableWorkspaceTabSnapshot(tab, currentEditorList[tab.id]?.getValue?.()))
       .filter(Boolean) as IWorkspaceTab[];
     if (!snapshots.length) {
-      return;
+      return currentRecentlyClosed;
     }
-    const currentRecentlyClosed = useWorkspaceStore.getState().recentlyClosedWorkspaceTabs || [];
-    const nextRecentlyClosedWorkspaceTabs = [...snapshots, ...currentRecentlyClosed].slice(
+    return [...snapshots, ...currentRecentlyClosed].slice(
       0,
       RECENTLY_CLOSED_WORKSPACE_TAB_LIMIT,
     );
-    useWorkspaceStore.setState({
-      recentlyClosedWorkspaceTabs: nextRecentlyClosedWorkspaceTabs,
-    });
   };
 
   const closeWorkspaceTabs = (tabs: IWorkspaceTab[]) => {
@@ -1053,8 +1078,13 @@ const WorkspaceTabs = memo(() => {
       layout: workspaceTabSplitLayout,
       orderedNextWorkspaceTabList,
     });
-    rememberClosedWorkspaceTabs(closableTabs);
-    setWorkspaceTabsState(orderedNextWorkspaceTabList, workspaceTabSplitLayout, nextActiveConsoleId);
+    const nextRecentlyClosedWorkspaceTabs = createRecentlyClosedWorkspaceTabs(closableTabs);
+    setWorkspaceTabsState(
+      orderedNextWorkspaceTabList,
+      workspaceTabSplitLayout,
+      nextActiveConsoleId,
+      nextRecentlyClosedWorkspaceTabs,
+    );
 
     if (closeTabIds.has(activeConsoleId as any)) {
       setActiveConsoleId(nextActiveConsoleId);
@@ -1093,26 +1123,18 @@ const WorkspaceTabs = memo(() => {
     }
   };
 
+  const appendNewConsoleToPane = (consoleId: string | number, targetPaneId?: WorkspaceTabPaneId) => {
+    const currentLayout = useWorkspaceStore.getState().workspaceTabSplitLayout;
+    if (!currentLayout) {
+      return;
+    }
+    const activePaneId = targetPaneId || currentLayout.activePane || MAIN_WORKSPACE_TAB_PANE;
+    updateWorkspaceTabSplitLayout(appendWorkspaceTabToPane(currentLayout, consoleId, activePaneId));
+  };
+
   const createNewConsole = (targetPaneId?: WorkspaceTabPaneId) => {
-    const appendNewConsoleToActivePane = (consoleId: string | number) => {
-      const currentLayout = useWorkspaceStore.getState().workspaceTabSplitLayout;
-      if (!currentLayout) {
-        return;
-      }
-      const activePaneId = targetPaneId || currentLayout.activePane || MAIN_WORKSPACE_TAB_PANE;
-      updateWorkspaceTabSplitLayout({
-        ...currentLayout,
-        activePane: activePaneId,
-        paneTabIds: {
-          ...currentLayout.paneTabIds,
-          [activePaneId]: [...(currentLayout.paneTabIds[activePaneId] || []), consoleId],
-        },
-        activeTabIds: {
-          ...currentLayout.activeTabIds,
-          [activePaneId]: consoleId,
-        },
-      });
-    };
+    const appendNewConsoleToActivePane = (consoleId: string | number) =>
+      appendNewConsoleToPane(consoleId, targetPaneId);
 
     if (zoerBoundInfo) {
       const param: any = zoerBoundInfo;
@@ -1361,18 +1383,7 @@ const WorkspaceTabs = memo(() => {
     }
     const activePaneId = workspaceTabSplitLayout?.activePane || MAIN_WORKSPACE_TAB_PANE;
     const nextLayout = workspaceTabSplitLayout
-      ? {
-          ...workspaceTabSplitLayout,
-          activePane: activePaneId,
-          paneTabIds: {
-            ...workspaceTabSplitLayout.paneTabIds,
-            [activePaneId]: [...(workspaceTabSplitLayout.paneTabIds[activePaneId] || []), nextTab.id],
-          },
-          activeTabIds: {
-            ...workspaceTabSplitLayout.activeTabIds,
-            [activePaneId]: nextTab.id,
-          },
-        }
+      ? appendWorkspaceTabToPane(workspaceTabSplitLayout, nextTab.id, activePaneId)
       : workspaceTabSplitLayout;
     setWorkspaceTabsState([...(workspaceTabList || []), nextTab], nextLayout, nextTab.id);
     setActiveConsoleId(nextTab.id);
@@ -1830,6 +1841,41 @@ const WorkspaceTabs = memo(() => {
     return <AccountPrivilegePanel uniqueData={uniqueData} />;
   };
 
+  const renderActiveTransactions = (item: IWorkspaceTab) => {
+    const { uniqueData } = item;
+    if (
+      !uniqueData?.dataSourceId ||
+      !isDatabaseCapabilitySupported(
+        uniqueData.databaseType,
+        DatabaseCapability.ACTIVE_TRANSACTION_INSPECTION,
+      )
+    ) {
+      return;
+    }
+    return (
+      <div style={{ height: '100%', overflow: 'auto', padding: 12 }}>
+        <ActiveTransactionsContent
+          dataSourceId={uniqueData.dataSourceId}
+          databaseName={uniqueData.databaseName}
+          schemaName={uniqueData.schemaName}
+          onInspectConnection={({ connectionId, sql }) => {
+            createConsole({
+              name: i18n('workspace.ops.sessionThreadTitle', connectionId),
+              ddl: sql,
+              dataSourceId: uniqueData.dataSourceId!,
+              dataSourceName: uniqueData.dataSourceName!,
+              environmentId: uniqueData.environmentId,
+              environment: uniqueData.environment,
+              databaseType: uniqueData.databaseType!,
+              databaseName: uniqueData.databaseName,
+              schemaName: uniqueData.schemaName,
+            }).then((consoleId) => appendNewConsoleToPane(consoleId));
+          }}
+        />
+      </div>
+    );
+  };
+
   const renderContentDiff = (item: IWorkspaceTab) => {
     const { uniqueData } = item;
     return (
@@ -1878,6 +1924,8 @@ const WorkspaceTabs = memo(() => {
         return renderRedisAllData(item);
       case WorkspaceTabType.AccountPrivileges:
         return renderAccountPrivileges(item);
+      case WorkspaceTabType.ActiveTransactions:
+        return renderActiveTransactions(item);
       case WorkspaceTabType.ContentDiff:
         return renderContentDiff(item);
       case WorkspaceTabType.Terminal:
@@ -2064,7 +2112,7 @@ const WorkspaceTabs = memo(() => {
         }}
       >
         <CustomTabs
-          height={36}
+          height={WORKSPACE_TAB_HEADER_HEIGHT}
           hideAdd={hideAdd}
           className={styles.tabHeaderBox}
           onChange={(key) => onPaneTabChange(paneId, key)}
@@ -2149,16 +2197,25 @@ const WorkspaceTabs = memo(() => {
           const paneId = activeTabPaneIds.get(item.key);
           const bounds = paneId ? paneContentBounds[paneId] : undefined;
           const isActive = paneId !== undefined;
+          const fillsSinglePane = isActive && !workspaceTabSplitLayout;
+          const isVisible = fillsSinglePane || !!bounds;
           if (item.destroyOnHide && !isActive) {
             return null;
           }
           return (
             <div
               key={item.key}
-              aria-hidden={!bounds}
-              className={`${styles.workspaceTabContentItem} ${bounds ? styles.workspaceTabContentItemActive : ''}`}
+              aria-hidden={!isVisible}
+              className={`${styles.workspaceTabContentItem} ${isVisible ? styles.workspaceTabContentItemActive : ''}`}
               style={
-                bounds
+                fillsSinglePane
+                  ? {
+                      top: WORKSPACE_TAB_HEADER_HEIGHT,
+                      right: 0,
+                      bottom: 0,
+                      left: 0,
+                    }
+                  : bounds
                   ? {
                       left: bounds.left,
                       top: bounds.top,
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/workspaceTabLayout.test.ts b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/workspaceTabLayout.test.ts
new file mode 100644
index 0000000000..7abe5d262d
--- /dev/null
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/workspaceTabLayout.test.ts
@@ -0,0 +1,25 @@
+import assert from 'node:assert/strict';
+import type { IWorkspaceTabSplitLayout } from '@/typings';
+import { appendWorkspaceTabToPane } from './workspaceTabLayout';
+
+const layout: IWorkspaceTabSplitLayout = {
+  direction: 'horizontal',
+  activePane: 'split',
+  paneTabIds: {
+    main: ['main-tab'],
+    split: ['monitor-tab'],
+  },
+  activeTabIds: {
+    main: 'main-tab',
+    split: 'monitor-tab',
+  },
+};
+
+const appended = appendWorkspaceTabToPane(layout, 596);
+assert.deepEqual(appended.paneTabIds.split, ['monitor-tab', 596]);
+assert.equal(appended.activeTabIds.split, 596);
+assert.equal(appended.activePane, 'split');
+assert.deepEqual(appended.paneTabIds.main, ['main-tab']);
+assert.deepEqual(appendWorkspaceTabToPane(appended, 596).paneTabIds.split, ['monitor-tab', 596]);
+
+console.log('Workspace tab layout tests passed');
diff --git a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/workspaceTabLayout.ts b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/workspaceTabLayout.ts
index c45c4d0364..3e5f0c33a6 100644
--- a/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/workspaceTabLayout.ts
+++ b/chat2db-community-client/src/pages/main/workspace/components/WorkspaceTabs/workspaceTabLayout.ts
@@ -7,6 +7,26 @@ import type {
 
 let splitNodeSequence = 0;
 
+export function appendWorkspaceTabToPane(
+  layout: IWorkspaceTabSplitLayout,
+  tabId: string | number,
+  paneId: WorkspaceTabPaneId = layout.activePane,
+): IWorkspaceTabSplitLayout {
+  const paneTabIds = layout.paneTabIds[paneId] || [];
+  return {
+    ...layout,
+    activePane: paneId,
+    paneTabIds: {
+      ...layout.paneTabIds,
+      [paneId]: paneTabIds.includes(tabId) ? paneTabIds : [...paneTabIds, tabId],
+    },
+    activeTabIds: {
+      ...layout.activeTabIds,
+      [paneId]: tabId,
+    },
+  };
+}
+
 function createSplitNodeId() {
   splitNodeSequence += 1;
   return `split_${Date.now()}_${splitNodeSequence}`;
diff --git a/chat2db-community-client/src/pages/main/workspace/index.tsx b/chat2db-community-client/src/pages/main/workspace/index.tsx
index 5f0e749bd4..502bcc38d7 100644
--- a/chat2db-community-client/src/pages/main/workspace/index.tsx
+++ b/chat2db-community-client/src/pages/main/workspace/index.tsx
@@ -1,4 +1,4 @@
-import React, { memo, useEffect } from 'react';
+import { memo } from 'react';
 import SplitPane from 'react-split-pane';
 import { useWorkspaceStore } from '@/store/workspace';
 import WorkspaceLeft from './components/WorkspaceLeft';
@@ -7,45 +7,34 @@ import WorkspaceRight from './components/WorkspaceRight';
 import { useStyles } from './style';
 
 const workspacePage = memo(() => {
-  const { cx } = useStyles();
+  const { cx, styles } = useStyles();
   const { panelLeftWidth, setPanelLeftWidth } = useWorkspaceStore((state) => {
     return {
       panelLeftWidth: state.layout.panelLeftWidth,
       setPanelLeftWidth: state.setPanelLeftWidth,
     };
   });
-  const [size, setSize] = React.useState(panelLeftWidth);
-
-  useEffect(() => {
-    if (size !== panelLeftWidth) {
-      setSize(panelLeftWidth);
-    }
-  }, [panelLeftWidth]);
-
   return (
-    <>
+    <div className={styles.workspaceRoot} data-workspace-shortcut-surface="true">
       <SplitPane
         split="vertical"
-        className={cx({ ['ResizerSizeIsZeroRight']: size === 0 })}
+        className={cx({ ['ResizerSizeIsZeroRight']: panelLeftWidth === 0 })}
         pane1Style={{ zIndex: 2 }}
         pane2Style={{ zIndex: 1 }}
-        onChange={(newSize) => {
-          if (newSize < 100) {
-            setSize(0);
-            setPanelLeftWidth(0);
-            return;
+        onDragFinished={(newSize) => {
+          const nextWidth = newSize < 100 ? 0 : newSize;
+          if (Number.isFinite(nextWidth) && nextWidth !== panelLeftWidth) {
+            setPanelLeftWidth(nextWidth);
           }
-          setSize(newSize);
-          setPanelLeftWidth(newSize);
         }}
-        size={size}
+        size={panelLeftWidth}
         minSize={0}
         primary="first"
       >
         <WorkspaceLeft />
         <WorkspaceRight />
       </SplitPane>
-    </>
+    </div>
   );
 });
 
diff --git a/chat2db-community-client/src/pages/main/workspace/style.ts b/chat2db-community-client/src/pages/main/workspace/style.ts
index 10246a984b..40158b87df 100644
--- a/chat2db-community-client/src/pages/main/workspace/style.ts
+++ b/chat2db-community-client/src/pages/main/workspace/style.ts
@@ -2,6 +2,10 @@ import { createStyles } from 'antd-style';
 
 export const useStyles = createStyles(({ css }) => {
   return {
+    workspaceRoot: css`
+      width: 100%;
+      height: 100%;
+    `,
     leftContainer: css`
       display: relative;
       height: 100%;
diff --git a/chat2db-community-client/src/service/aiStream.ts b/chat2db-community-client/src/service/aiStream.ts
index e23f3fbfe1..27b25167ac 100644
--- a/chat2db-community-client/src/service/aiStream.ts
+++ b/chat2db-community-client/src/service/aiStream.ts
@@ -23,15 +23,6 @@ export interface IChatSession {
   gmtModified: string;
 }
 
-export type KnowledgeSelectionType = 'KNOWLEDGE_TERM' | 'BUSINESS_LOGIC' | 'SQL_TEMPLATE';
-
-export interface ISelectedKnowledge {
-  id: number;
-  type: KnowledgeSelectionType;
-  key: string;
-  value?: string;
-}
-
 export interface IChatMessage {
   id: string;
   sessionId: string;
@@ -39,7 +30,6 @@ export interface IChatMessage {
   content: string;
   reasoningContent?: string;
   attachments?: IChatAttachment[];
-  selectedKnowledge?: ISelectedKnowledge[];
   gmtCreate: string;
 }
 
@@ -50,6 +40,9 @@ const getChatMessages = createRequest<{ sessionId: string }, IChatMessage[]>('/a
 const deleteChatSession = createRequest<{ id: string }, void>('/api/v3/ai/chat/history/session/delete', {
   method: 'post',
 });
+const renameChatSession = createRequest<{ id: string; title: string }, void>('/api/v3/ai/chat/history/session/rename', {
+  method: 'post',
+});
 
 export default {
   getModelCatalog,
@@ -57,4 +50,5 @@ export default {
   getChatSessions,
   getChatMessages,
   deleteChatSession,
+  renameChatSession,
 };
diff --git a/chat2db-community-client/src/service/apiKeys.ts b/chat2db-community-client/src/service/apiKeys.ts
deleted file mode 100644
index 4f7608cd24..0000000000
--- a/chat2db-community-client/src/service/apiKeys.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import createRequest from './base';
-
-export interface CreateApiKeyParams {
-  authType?: string;
-  name: string;
-  endTime?: string;
-  nonExpire: 'Y' | 'N';
-}
-
-const createApiKey = createRequest<CreateApiKeyParams, ApiKeyDetail>(`/api/key/create`, {
-  method: 'post',
-});
-
-export interface ApiKeyDetail {
-  id: number;
-  authType?: string;
-  apiKey: string;
-  endTime?: string;
-  modifyTime: string;
-}
-
-const getApiKeyList = createRequest<void, ApiKeyDetail[]>(`/api/key/list`, {
-  method: 'get',
-});
-
-const deleteApiKey = createRequest<{ id: number }, void>(`/api/key/delete`, {
-  method: 'delete',
-});
-
-export default { createApiKey, getApiKeyList, deleteApiKey };
diff --git a/chat2db-community-client/src/service/connection.ts b/chat2db-community-client/src/service/connection.ts
index 4e2e2ac56f..528bb750c1 100644
--- a/chat2db-community-client/src/service/connection.ts
+++ b/chat2db-community-client/src/service/connection.ts
@@ -13,6 +13,7 @@ import {
 import { ISchemaItem } from '@/typings/schema';
 import { UpdatePositionInTree } from '@/typings/tree';
 import createRequest from './base';
+import { connectionCloseRequest } from './connectionCloseRequest';
 
 export interface IDriverResponse {
   driverConfigList: {
@@ -165,8 +166,8 @@ const exportDataSource = createRequest<
   method: 'post',
 });
 
-const closeConnection = createRequest<{ id: number }, void>('/api/connection/close', {
-  method: 'get',
+const closeConnection = createRequest<{ id: number }, void>(connectionCloseRequest.path, {
+  method: connectionCloseRequest.method,
 });
 
 export default {
diff --git a/chat2db-community-client/src/service/connectionCloseRequest.test.ts b/chat2db-community-client/src/service/connectionCloseRequest.test.ts
new file mode 100644
index 0000000000..b846f77a98
--- /dev/null
+++ b/chat2db-community-client/src/service/connectionCloseRequest.test.ts
@@ -0,0 +1,9 @@
+import assert from 'node:assert/strict';
+import { connectionCloseRequest } from './connectionCloseRequest';
+
+assert.deepEqual(connectionCloseRequest, {
+  path: '/api/connection/close',
+  method: 'post',
+});
+
+console.log('connection close request contract tests passed');
diff --git a/chat2db-community-client/src/service/connectionCloseRequest.ts b/chat2db-community-client/src/service/connectionCloseRequest.ts
new file mode 100644
index 0000000000..079753c372
--- /dev/null
+++ b/chat2db-community-client/src/service/connectionCloseRequest.ts
@@ -0,0 +1,4 @@
+export const connectionCloseRequest = {
+  path: '/api/connection/close',
+  method: 'post' as const,
+};
diff --git a/chat2db-community-client/src/service/executeSql.ts b/chat2db-community-client/src/service/executeSql.ts
index e54c9e0d43..3063ed26ad 100644
--- a/chat2db-community-client/src/service/executeSql.ts
+++ b/chat2db-community-client/src/service/executeSql.ts
@@ -75,7 +75,7 @@ const executeUpdateDataSql = createRequest<
   { success: boolean; message: string; sql: string }
 >(
   '/api/rdb/dml/execute_update',
-  { method: 'post', errorLevel: false },
+  { method: 'post', errorLevel: false, timeout: false },
 );
 
 const viewTable = createRequest<ITableBrowseRequest, IManageResultData[]>('/api/rdb/dml/execute_table', {
diff --git a/chat2db-community-client/src/service/importExport.ts b/chat2db-community-client/src/service/importExport.ts
index 47e6cc944d..12d2083173 100644
--- a/chat2db-community-client/src/service/importExport.ts
+++ b/chat2db-community-client/src/service/importExport.ts
@@ -1,7 +1,7 @@
 import createRequest from './base';
 import { IDatabaseBaseInfo } from '@/typings/database';
 import { IPageResponse } from '@/typings';
-import { ImportExportTaskDetails, ImportExportTaskEvent } from '@/typings/importExport';
+import type { ICsvOptions, ImportExportTaskDetails, ImportExportTaskEvent } from '@/typings/importExport';
 import { ImportExportFileType, ImportExportTaskType } from '@/constants/importExport';
 
 export interface GenerateJavaClassParams extends IDatabaseBaseInfo {
@@ -59,10 +59,12 @@ export interface ImportTaskParams extends IDatabaseBaseInfo {
   taskType: ImportTaskType;
   taskName?: string;
   tableName?: string;
-  sourceFile: string;
+  sourceFile?: string;
+  fileId?: string;
   displayFileName?: string;
   format: ImportExportFileType;
   dataTimeFormat?: string;
+  csvOptions?: ICsvOptions;
 }
 
 const submitExport = createRequest<ExportTaskParams, TaskSubmissionResponse>('/api/tasks/export', { method: 'post' });
diff --git a/chat2db-community-client/src/service/sql.ts b/chat2db-community-client/src/service/sql.ts
index 61940b2859..02a81d2668 100644
--- a/chat2db-community-client/src/service/sql.ts
+++ b/chat2db-community-client/src/service/sql.ts
@@ -1,4 +1,6 @@
 import createRequest from './base';
+import type { ICsvOptions } from '@/typings/importExport';
+import { ImportUnmappedTarget } from '@/constants/importExport';
 import {
   IPageResponse,
   IPageParams,
@@ -15,6 +17,12 @@ import {
 } from '@/typings';
 import { DatabaseTypeCode } from '@/constants';
 import { ExportSizeEnum, ExportTypeEnum } from '@/typings/resultTable';
+import type {
+  ActiveTransactionLockMetadataSource,
+  ActiveTransactionLockMetadataState,
+  ActiveTransactionQueryState,
+  ActiveTransactionSessionState,
+} from '@/constants/activeTransaction';
 import type {
   IDdlExecuteRequest,
   ISqlEditorExecuteRequest,
@@ -424,11 +432,129 @@ const truncateTable = createRequest<ITableParams, void>('/api/rdb/table/truncate
 
 export interface ICopyTableParams extends ITableParams {
   copyData: boolean;
+  newName: string;
 }
 
+const prepareCopyTable = createRequest<ITableParams, string>('/api/rdb/table/copy/prepare', { method: 'get' });
+
 // Copy table
 const copyTable = createRequest<ICopyTableParams, void>('/api/rdb/table/copy', { method: 'post' });
 
+/** Database-independent import preview and column mapping. */
+export interface IImportPreview {
+  sourceColumns: string[];
+  previewData: string[][];
+  targetTableName: string;
+  targetColumns: {
+    name: string;
+    dataType: string;
+    nullable: boolean;
+    autoIncrement: boolean;
+    defaultValue: string | null;
+    comment: string | null;
+  }[];
+  suggestedMapping: { sourceColumn: string; targetColumn: string }[];
+  previewLimit: number;
+}
+
+export interface IImportTaskSubmitResult {
+  taskId: number;
+}
+
+const uploadImportFile = createRequest<{ file: File }, string>('/api/rdb/import_preview/upload', {
+  method: 'post',
+  contentType: 'formData',
+});
+
+const stageDesktopImportFile = createRequest<{ sourceFile: string; originalFileName: string }, string>(
+  '/api/rdb/import_preview/upload_local',
+  { method: 'post' },
+);
+
+const getImportPreview = createRequest<
+  {
+    dataSourceId: number;
+    databaseName: string;
+    schemaName?: string;
+    tableName: string;
+    fileId: string;
+    csvOptions?: ICsvOptions;
+  },
+  IImportPreview
+>('/api/rdb/import_preview/preview', { method: 'post', errorLevel: false });
+
+const executeImportWithMapping = createRequest<
+  {
+    dataSourceId: number;
+    databaseName: string;
+    schemaName?: string;
+    tableName: string;
+    fileId: string;
+    mappings: { sourceColumn: string | null; targetColumn: string }[];
+    unmappedTarget: ImportUnmappedTarget;
+    csvOptions?: ICsvOptions;
+  },
+  IImportTaskSubmitResult
+>('/api/rdb/import_preview/execute', { method: 'post' });
+/** Active InnoDB transactions (MYSQL-OPS-002). */
+export interface IActiveTransactionItem {
+  trxId: string | null;
+  state: string | null;
+  startedAt: number | string | null;
+  ageSeconds: number | null;
+  isolationLevel: string | null;
+  rowsLocked: number | null;
+  rowsModified: number | null;
+  lockStructs: number | null;
+  threadId: number | null;
+  user: string | null;
+  host: string | null;
+  db: string | null;
+  query: string | null;
+  queryState?: ActiveTransactionQueryState;
+  sessionAvailable?: boolean;
+  sessionState?: ActiveTransactionSessionState;
+  canOpenSession?: boolean;
+  connectionInspectionSql: string | null;
+  waitingLockId?: string | null;
+  blockingLockId?: string | null;
+  blockingTrxId?: string | null;
+  waitingPerformanceSchemaThreadId?: number | null;
+  blockingPerformanceSchemaThreadId?: number | null;
+  blockingThreadId?: number | null;
+  blockingSessionAvailable?: boolean;
+  canOpenBlockingSession?: boolean;
+  blockingConnectionInspectionSql: string | null;
+  blockingUser?: string | null;
+  blockingHost?: string | null;
+  blockingDb?: string | null;
+  waitingObject?: string | null;
+  waitingIndex?: string | null;
+  waitingLockType?: string | null;
+  waitingLockMode?: string | null;
+  waitingLockStatus?: string | null;
+  waitingLockData?: string | null;
+  blockingObject?: string | null;
+  blockingIndex?: string | null;
+  blockingLockType?: string | null;
+  blockingLockMode?: string | null;
+  blockingLockStatus?: string | null;
+  blockingLockData?: string | null;
+  lockWaitAvailable?: boolean;
+  lockMetadataState?: ActiveTransactionLockMetadataState;
+  lockMetadataSource?: ActiveTransactionLockMetadataSource | null;
+}
+
+export interface IActiveTransactionRequest {
+  dataSourceId: number;
+  databaseName?: string;
+  schemaName?: string;
+}
+
+const getActiveTransactionList = createRequest<IActiveTransactionRequest, IActiveTransactionItem[]>(
+  '/api/rdb/active_transaction/list',
+  { method: 'get', errorLevel: false },
+);
 const checkIsSelectSQL = createRequest<{ sql: string; dbType: DatabaseTypeCode }, boolean>('/api/sql/valid_select');
 
 const getDataSourceList = createRequest<IPageParams, IPageResponse<IConnectionDetails>>(
@@ -440,6 +566,7 @@ const getDataSourceList = createRequest<IPageParams, IPageResponse<IConnectionDe
 
 export default {
   copyTable,
+  prepareCopyTable,
   downloadLargeCellValue,
   getLargeCellValue,
   truncateTable,
@@ -487,5 +614,10 @@ export default {
   getAllTableList,
   getAllFieldByTable,
   checkIsSelectSQL,
+  getImportPreview,
+  executeImportWithMapping,
+  uploadImportFile,
+  stageDesktopImportFile,
+  getActiveTransactionList,
   getDataSourceList,
 };
diff --git a/chat2db-community-client/src/store/dashboard/slices/common/action.ts b/chat2db-community-client/src/store/dashboard/slices/common/action.ts
index a6b03ff94b..db1992d4cc 100644
--- a/chat2db-community-client/src/store/dashboard/slices/common/action.ts
+++ b/chat2db-community-client/src/store/dashboard/slices/common/action.ts
@@ -1,6 +1,7 @@
 import { StateCreator } from 'zustand';
 import { DashboardStore } from '../../store';
 import { CommonState } from './initialState';
+import { runDashboardRefresh } from './refreshCurrentDashboard';
 import {
   createDashboard,
   deleteDashboard,
@@ -133,16 +134,6 @@ export const createCommonAction: StateCreator<DashboardStore, [['zustand/devtool
   },
   refreshCurrentDashboard: () => {
     const currentDashboardId = get().currentDashboard?.id;
-    return new Promise((resolve) => {
-      if (!currentDashboardId) {
-        resolve(false);
-        return;
-      }
-      get()
-        .getDashboardById(currentDashboardId)
-        .then(() => {
-          resolve(true);
-        });
-    });
+    return runDashboardRefresh(currentDashboardId, (dashboardId) => get().getDashboardById(dashboardId));
   },
 });
diff --git a/chat2db-community-client/src/store/dashboard/slices/common/refreshCurrentDashboard.test.ts b/chat2db-community-client/src/store/dashboard/slices/common/refreshCurrentDashboard.test.ts
new file mode 100644
index 0000000000..3d0bd793d7
--- /dev/null
+++ b/chat2db-community-client/src/store/dashboard/slices/common/refreshCurrentDashboard.test.ts
@@ -0,0 +1,58 @@
+import assert from 'node:assert/strict';
+import { runDashboardRefresh } from './refreshCurrentDashboard';
+
+async function testSuccessfulRefresh() {
+  let loadedDashboardId: number | undefined;
+
+  const result = await runDashboardRefresh(42, async (dashboardId) => {
+    loadedDashboardId = dashboardId;
+  });
+
+  assert.equal(result, true);
+  assert.equal(loadedDashboardId, 42);
+}
+
+async function testFailedRefreshSettles() {
+  await assert.rejects(
+    runDashboardRefresh(42, async () => {
+      throw new Error('request failed');
+    }),
+    /request failed/,
+  );
+}
+
+async function testMissingDashboardSkipsRequest() {
+  let requestCount = 0;
+  const result = await runDashboardRefresh(undefined, async () => {
+    requestCount += 1;
+  });
+
+  assert.equal(result, false);
+  assert.equal(requestCount, 0);
+}
+
+async function testZeroDashboardIdIsLoaded() {
+  let loadedDashboardId: number | undefined;
+  const result = await runDashboardRefresh(0, async (dashboardId) => {
+    loadedDashboardId = dashboardId;
+  });
+
+  assert.equal(result, true);
+  assert.equal(loadedDashboardId, 0);
+}
+
+async function run() {
+  await testSuccessfulRefresh();
+  await testFailedRefreshSettles();
+  await testMissingDashboardSkipsRequest();
+  await testZeroDashboardIdIsLoaded();
+}
+
+run()
+  .then(() => {
+    console.log('Dashboard refresh tests passed');
+  })
+  .catch((error) => {
+    console.error(error);
+    process.exitCode = 1;
+  });
diff --git a/chat2db-community-client/src/store/dashboard/slices/common/refreshCurrentDashboard.ts b/chat2db-community-client/src/store/dashboard/slices/common/refreshCurrentDashboard.ts
new file mode 100644
index 0000000000..90efbbf605
--- /dev/null
+++ b/chat2db-community-client/src/store/dashboard/slices/common/refreshCurrentDashboard.ts
@@ -0,0 +1,13 @@
+type DashboardLoader = (dashboardId: number) => Promise<void>;
+
+export async function runDashboardRefresh(
+  currentDashboardId: number | undefined,
+  loadDashboard: DashboardLoader,
+): Promise<boolean> {
+  if (currentDashboardId === undefined) {
+    return false;
+  }
+
+  await loadDashboard(currentDashboardId);
+  return true;
+}
diff --git a/chat2db-community-client/src/store/importExport/index.ts b/chat2db-community-client/src/store/importExport/index.ts
index 308a109b31..51a7ad00fe 100644
--- a/chat2db-community-client/src/store/importExport/index.ts
+++ b/chat2db-community-client/src/store/importExport/index.ts
@@ -4,9 +4,10 @@ import { createWithEqualityFn } from 'zustand/traditional';
 import { StateCreator } from 'zustand/vanilla';
 import { IDatabaseBaseInfo } from '@/typings/database';
 import { ImportExportDataBoundInfo, ImportExportTaskDetails } from '@/typings/importExport';
-import { ImportExportTaskStatus } from '@/constants/importExport';
+import { ACTIVE_TASK_STATUSES, ImportExportTaskStatus } from '@/constants/importExport';
 import importExportServices from '@/service/importExport';
 import {
+  createTaskListRequestCoordinator,
   getTaskPollingDelay,
   listAllTasksByStatus,
   loadMissingTrackedTasks,
@@ -20,6 +21,7 @@ import {
 } from './taskCenterUtils';
 
 let taskListRequestGeneration = 0;
+const taskListRequestCoordinator = createTaskListRequestCoordinator();
 
 interface ImportExportState {
   runSqlBoundInfo: IDatabaseBaseInfo | null;
@@ -105,27 +107,21 @@ export const createImportExportAction: StateCreator<
       .then(async ([recentPage, pendingTasks, runningTasks]) => {
         if (requestGeneration !== taskListRequestGeneration) return;
         const activeTasks = mergeTasks(pendingTasks, runningTasks);
-        const previouslyLoadedTasks = get().taskList.filter((task) => !previousActiveTaskIds.includes(task.id));
-        const visibleTasks = mergeTasks(previouslyLoadedTasks, recentPage.data || [], activeTasks);
+        const visibleTasks = mergeTasks(recentPage.data || [], activeTasks);
         const recovered = await loadMissingTrackedTasks(
           previousActiveTaskIds,
           visibleTasks,
           importExportServices.getTaskDetails,
         );
         if (requestGeneration !== taskListRequestGeneration) return;
-        const taskList = mergeTasks(visibleTasks, recovered.tasks);
-        const recoveredActiveTaskIds = recovered.tasks
-          .filter((task) => [ImportExportTaskStatus.PENDING, ImportExportTaskStatus.RUNNING].includes(task.status))
+        const currentState = get();
+        const taskList = mergeTasks(currentState.taskList, visibleTasks, recovered.tasks);
+        const knownTaskIds = new Set(taskList.map((task) => task.id));
+        const activeTaskIds = taskList
+          .filter((task) => ACTIVE_TASK_STATUSES.includes(task.status))
           .map((task) => task.id);
-        const activeTaskIds = [
-          ...new Set([
-            ...activeTasks.map((task) => task.id),
-            ...recoveredActiveTaskIds,
-            ...recovered.unresolvedTaskIds,
-          ]),
-        ];
+        activeTaskIds.push(...recovered.unresolvedTaskIds.filter((id) => !knownTaskIds.has(id)));
         const pollDelay = getTaskPollingDelay(activeTaskIds.length);
-        const currentState = get();
         const notificationUpdate = reconcileCompletedTaskNotifications(
           currentState.taskStatusById,
           taskList,
@@ -169,32 +165,39 @@ export const createImportExportAction: StateCreator<
       return Promise.resolve();
     }
     const nextPageSize = taskListPageSize + TASK_CENTER_PAGE_SIZE;
+    const loadMoreRequest = taskListRequestCoordinator.beginLoadMoreRequest();
     set({ taskListLoadingMore: true });
     return importExportServices
       .getTaskList({ pageNo: 1, pageSize: nextPageSize })
       .then((page) => {
-        const activeStatuses = new Set<ImportExportTaskStatus>([
-          ImportExportTaskStatus.PENDING,
-          ImportExportTaskStatus.RUNNING,
-        ]);
-        const activeTasks = get().taskList.filter((task) => activeStatuses.has(task.status));
+        if (!taskListRequestCoordinator.canApplyLoadMoreResponse(loadMoreRequest)) return;
         set({
-          taskList: mergeTasks(page.data || [], activeTasks),
+          taskList: mergeTasks(page.data || [], get().taskList),
           taskListPageSize: nextPageSize,
           taskListHasNextPage: page.hasNextPage === true,
         });
       })
-      .finally(() => set({ taskListLoadingMore: false }));
+      .catch((error) => {
+        if (taskListRequestCoordinator.canApplyLoadMoreResponse(loadMoreRequest)) throw error;
+      })
+      .finally(() => {
+        if (taskListRequestCoordinator.isLatestLoadMoreRequest(loadMoreRequest)) {
+          set({ taskListLoadingMore: false });
+        }
+      });
   },
   stopTaskListPolling: () => {
     taskListRequestGeneration += 1;
+    taskListRequestCoordinator.invalidateState();
     const { getTaskListTimer } = get();
     if (getTaskListTimer) {
       clearTimeout(getTaskListTimer);
-      set({ getTaskListTimer: null });
     }
+    set({ getTaskListTimer: null, taskListLoadingMore: false });
   },
   removeTask: (taskId) => {
+    taskListRequestGeneration += 1;
+    taskListRequestCoordinator.invalidateState();
     const state = get();
     const taskStatusById = { ...state.taskStatusById };
     delete taskStatusById[String(taskId)];
@@ -202,6 +205,7 @@ export const createImportExportAction: StateCreator<
     set({
       taskList: state.taskList.filter((task) => task.id !== taskId),
       taskListPageSize: Math.max(TASK_CENTER_PAGE_SIZE, state.taskListPageSize - 1),
+      taskListLoadingMore: false,
       unreadCompletedTaskIds,
       unreadCompletedTaskCount: unreadCompletedTaskIds.length,
       taskStatusById,
@@ -213,6 +217,9 @@ export const createImportExportAction: StateCreator<
   },
   setTaskCenterOpen: (open) => {
     const state = get();
+    if (!open) {
+      taskListRequestCoordinator.invalidateState();
+    }
     if (!open && state.activeTaskIds.length === 0) {
       taskListRequestGeneration += 1;
       if (state.getTaskListTimer) {
@@ -221,6 +228,7 @@ export const createImportExportAction: StateCreator<
     }
     set({
       taskCenterOpen: open,
+      taskListLoadingMore: open ? state.taskListLoadingMore : false,
       unreadCompletedTaskCount: open ? 0 : get().unreadCompletedTaskCount,
       unreadCompletedTaskIds: open ? [] : get().unreadCompletedTaskIds,
       getTaskListTimer: !open && state.activeTaskIds.length === 0 ? null : state.getTaskListTimer,
diff --git a/chat2db-community-client/src/store/importExport/taskCenterStore.test.ts b/chat2db-community-client/src/store/importExport/taskCenterStore.test.ts
new file mode 100644
index 0000000000..d519380b4b
--- /dev/null
+++ b/chat2db-community-client/src/store/importExport/taskCenterStore.test.ts
@@ -0,0 +1,212 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import ts from 'typescript';
+import type { ImportExportTaskDetails } from '@/typings/importExport';
+import { ImportExportTaskStatus, ImportExportTaskType } from '@/constants/importExport';
+import type { TaskListParams } from '@/service/importExport';
+import type { useImportExportStore } from './index';
+
+type TaskPage = { data: ImportExportTaskDetails[]; hasNextPage: boolean };
+interface TaskApi {
+  getTaskList: (params: TaskListParams) => Promise<TaskPage>;
+  getTaskDetails: (params: { taskId: number }) => Promise<ImportExportTaskDetails>;
+}
+
+const clientRoot = process.cwd();
+const requirePackage = createRequire(path.join(clientRoot, 'package.json'));
+const deferred = <T>() => {
+  let resolve!: (value: T) => void;
+  let reject!: (error: Error) => void;
+  const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise;
+    reject = rejectPromise;
+  });
+  return { promise, resolve, reject };
+};
+const page = (data: ImportExportTaskDetails[], hasNextPage = false): TaskPage => ({ data, hasNextPage });
+const tasks = Array.from({ length: 20 }, (_, index): ImportExportTaskDetails => ({
+  id: index + 1,
+  name: `task-${index + 1}`,
+  type: ImportExportTaskType.QUERY_RESULT_EXPORT,
+  status: index === 0 ? ImportExportTaskStatus.RUNNING : ImportExportTaskStatus.SUCCESS,
+  progress: index === 0 ? 50 : 100,
+  createdAt: 20000 - index * 100,
+  updatedAt: 30000,
+}));
+
+// Evaluate the real store with an isolated module scope; replace only its network boundary.
+function createStore(api: TaskApi): typeof useImportExportStore {
+  const modules = new Map<string, { exports: unknown }>();
+  const load = (filename: string): unknown => {
+    const cached = modules.get(filename);
+    if (cached) return cached.exports;
+    const module = { exports: {} as unknown };
+    modules.set(filename, module);
+    const code = ts.transpileModule(fs.readFileSync(filename, 'utf8'), {
+      compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020, esModuleInterop: true },
+      fileName: filename,
+    }).outputText;
+    const requireSource = (name: string): unknown => {
+      if (name === '@/service/importExport') return api;
+      if (!name.startsWith('.') && !name.startsWith('@/')) return requirePackage(name);
+      const resolved = name.startsWith('@/')
+        ? path.join(clientRoot, 'src', name.slice(2))
+        : path.resolve(path.dirname(filename), name);
+      return load(fs.existsSync(`${resolved}.ts`) ? `${resolved}.ts` : path.join(resolved, 'index.ts'));
+    };
+    new Function('require', 'module', 'exports', code)(requireSource, module, module.exports);
+    return module.exports;
+  };
+  return (load(path.join(clientRoot, 'src/store/importExport/index.ts')) as {
+    useImportExportStore: typeof useImportExportStore;
+  }).useImportExportStore;
+}
+
+const apiWith = (getTaskList: TaskApi['getTaskList']): TaskApi => ({
+  getTaskList,
+  getTaskDetails: async ({ taskId }) => tasks.find((task) => task.id === taskId)!,
+});
+const seed = (store: typeof useImportExportStore) => store.setState({
+  taskList: tasks.slice(0, 10), taskListHasNextPage: true, taskCenterOpen: true,
+  activeTaskIds: [1], activeTaskCount: 1,
+});
+
+async function slowLoadSurvivesAutomaticPolling() {
+  let polls = 0;
+  const store = createStore(apiWith(async (params) => {
+    if (params.status) return page(params.status === ImportExportTaskStatus.RUNNING ? [tasks[0]] : []);
+    if (params.pageSize > 10) {
+      await new Promise((resolve) => setTimeout(resolve, 1200));
+      return page(tasks);
+    }
+    polls += 1;
+    return page(tasks.slice(0, 10), true);
+  }));
+  try {
+    store.getState().setTaskCenterOpen(true);
+    await store.getState().getTaskList();
+    await store.getState().loadMoreTasks();
+    assert.ok(polls >= 2, 'the production polling timer must run during the slow load');
+    assert.equal(store.getState().taskList.length, 20);
+    assert.equal(store.getState().taskListPageSize, 20);
+    assert.equal(store.getState().taskListLoadingMore, false);
+  } finally { store.getState().stopTaskListPolling(); }
+}
+
+async function stalePageKeepsCompletionFromPolling() {
+  const load = deferred<TaskPage>();
+  const completed = { ...tasks[0], status: ImportExportTaskStatus.SUCCESS, progress: 100, updatedAt: 40000 };
+  const store = createStore(apiWith(async (params) => {
+    if (params.status) return page([]);
+    return params.pageSize > 10 ? load.promise : page([completed, ...tasks.slice(1, 10)], true);
+  }));
+  try {
+    seed(store);
+    const loading = store.getState().loadMoreTasks();
+    await store.getState().getTaskList();
+    load.resolve(page(tasks));
+    await loading;
+    assert.equal(store.getState().taskList.length, 20);
+    assert.equal(store.getState().taskList.find((task) => task.id === 1)?.status, ImportExportTaskStatus.SUCCESS);
+    assert.equal(store.getState().activeTaskCount, 0);
+  } finally { store.getState().stopTaskListPolling(); }
+}
+
+async function slowRecoveryKeepsNewlyLoadedHistoryAndCompletion() {
+  const details = deferred<ImportExportTaskDetails>();
+  const requested = deferred<void>();
+  const completed = { ...tasks[0], status: ImportExportTaskStatus.SUCCESS, progress: 100, updatedAt: 40000 };
+  const store = createStore({
+    getTaskList: async (params) => {
+      if (params.status) return page([]);
+      return params.pageSize > 10 ? page([completed, ...tasks.slice(1)]) : page(tasks.slice(1, 11), true);
+    },
+    getTaskDetails: async () => { requested.resolve(); return details.promise; },
+  });
+  try {
+    seed(store);
+    const polling = store.getState().getTaskList();
+    await requested.promise;
+    await store.getState().loadMoreTasks();
+    details.resolve(tasks[0]);
+    await polling;
+    assert.equal(store.getState().taskList.length, 20);
+    assert.equal(store.getState().taskListPageSize, 20);
+    assert.equal(store.getState().taskList.find((task) => task.id === 1)?.status, ImportExportTaskStatus.SUCCESS);
+    assert.equal(store.getState().activeTaskCount, 0);
+  } finally { store.getState().stopTaskListPolling(); }
+}
+
+async function deletionRejectsOldPollingAndPagination() {
+  const recent = deferred<TaskPage>();
+  const more = deferred<TaskPage>();
+  const store = createStore(apiWith(async (params) => {
+    if (params.status) return page([]);
+    return params.pageSize > 10 ? more.promise : recent.promise;
+  }));
+  try {
+    seed(store);
+    const loading = store.getState().loadMoreTasks();
+    const polling = store.getState().getTaskList();
+    store.getState().removeTask(2);
+    recent.resolve(page(tasks.slice(0, 10), true));
+    more.resolve(page(tasks));
+    await Promise.all([loading, polling]);
+    assert.equal(store.getState().taskList.some((task) => task.id === 2), false);
+    assert.equal(store.getState().taskListLoadingMore, false);
+  } finally { store.getState().stopTaskListPolling(); }
+}
+
+async function oldCloseResponseCannotFinishNewLoad() {
+  const old = deferred<TaskPage>();
+  const current = deferred<TaskPage>();
+  let calls = 0;
+  const store = createStore(apiWith(() => (++calls === 1 ? old.promise : current.promise)));
+  try {
+    seed(store);
+    const oldLoad = store.getState().loadMoreTasks();
+    store.getState().setTaskCenterOpen(false);
+    assert.equal(store.getState().taskListLoadingMore, false);
+    store.getState().setTaskCenterOpen(true);
+    const newLoad = store.getState().loadMoreTasks();
+    old.reject(new Error('old request failed after closing'));
+    await oldLoad;
+    assert.equal(store.getState().taskListLoadingMore, true);
+    current.resolve(page(tasks));
+    await newLoad;
+    assert.equal(store.getState().taskList.length, 20);
+    assert.equal(store.getState().taskListLoadingMore, false);
+  } finally { store.getState().stopTaskListPolling(); }
+}
+
+async function loadFailureCanRetryWithoutDuplicateRequests() {
+  const first = deferred<TaskPage>();
+  let calls = 0;
+  const store = createStore(apiWith(() => (++calls === 1 ? first.promise : Promise.resolve(page(tasks)))));
+  try {
+    seed(store);
+    const failed = store.getState().loadMoreTasks();
+    await store.getState().loadMoreTasks();
+    assert.equal(calls, 1);
+    first.reject(new Error('temporary failure'));
+    await assert.rejects(failed, /temporary failure/);
+    assert.equal(store.getState().taskListPageSize, 10);
+    assert.equal(store.getState().taskListLoadingMore, false);
+    await store.getState().loadMoreTasks();
+    assert.equal(store.getState().taskList.length, 20);
+    assert.equal(calls, 2);
+  } finally { store.getState().stopTaskListPolling(); }
+}
+
+async function run() {
+  for (const scenario of [slowLoadSurvivesAutomaticPolling, stalePageKeepsCompletionFromPolling,
+    slowRecoveryKeepsNewlyLoadedHistoryAndCompletion, deletionRejectsOldPollingAndPagination,
+    oldCloseResponseCannotFinishNewLoad, loadFailureCanRetryWithoutDuplicateRequests]) {
+    await scenario();
+    console.log(`ok - ${scenario.name}`);
+  }
+}
+
+run().catch((error) => { console.error(error); process.exitCode = 1; });
diff --git a/chat2db-community-client/src/store/importExport/taskCenterUtils.test.ts b/chat2db-community-client/src/store/importExport/taskCenterUtils.test.ts
index 2486efa379..7643bf0ccd 100644
--- a/chat2db-community-client/src/store/importExport/taskCenterUtils.test.ts
+++ b/chat2db-community-client/src/store/importExport/taskCenterUtils.test.ts
@@ -10,6 +10,7 @@ import {
   mergeTasks,
   reconcileCompletedTaskNotifications,
   shouldKeepTaskPolling,
+  shouldRefreshImportTargetTable,
   shouldRetryTaskPolling,
 } from './taskCenterUtils';
 import { ErrorCode } from '@/constants/request';
@@ -99,6 +100,25 @@ function testTaskMerge() {
   assert.equal(tasks[1].progress, 50);
 }
 
+function testTaskMergePreservesLatestRevision() {
+  const oldTask = { ...task(1, ImportExportTaskStatus.RUNNING, '2026-08-06T10:00:00Z', 20), updatedAt: 1000 };
+  const latestTask = { ...oldTask, progress: 80, updatedAt: '1970-01-01T00:00:02.000Z' };
+  assert.deepEqual(mergeTasks([latestTask], [oldTask]), [latestTask]);
+  assert.deepEqual(mergeTasks([oldTask], [latestTask]), [latestTask]);
+
+  const terminalStatuses = [
+    ImportExportTaskStatus.SUCCESS, ImportExportTaskStatus.FAILED, ImportExportTaskStatus.CANCELLED,
+  ];
+  for (const status of terminalStatuses) {
+    const terminal = { ...oldTask, status, progress: 100 };
+    assert.deepEqual(mergeTasks([terminal], [latestTask]), [terminal]);
+    assert.deepEqual(mergeTasks([latestTask], [terminal]), [terminal]);
+  }
+
+  const withoutRevision = task(1, ImportExportTaskStatus.SUCCESS, '2026-08-06T10:00:00Z', 100);
+  assert.deepEqual(mergeTasks([withoutRevision], [oldTask]), [withoutRevision]);
+}
+
 function testEventMerge() {
   const events = mergeTaskEvents([event(1, 'created'), event(2, 'old')], [event(3, 'finished'), event(2, 'running')]);
 
@@ -171,12 +191,45 @@ function testCompletedTaskNotifications() {
   assert.deepEqual(afterDeletion.newlyCompletedTaskIds, []);
 }
 
+function testImportTargetRefreshWaitsForTerminalImportResult() {
+  const runningImport = {
+    ...task(10, ImportExportTaskStatus.RUNNING, '2026-08-06T10:00:00Z', 45),
+    type: ImportExportTaskType.DATA_FILE_IMPORT,
+    target: {
+      dataSourceId: 7,
+      databaseName: 'app',
+      tableName: 'orders',
+    },
+  };
+  const successfulImport = {
+    ...runningImport,
+    status: ImportExportTaskStatus.SUCCESS,
+    progress: 100,
+  };
+  const failedImport = {
+    ...runningImport,
+    status: ImportExportTaskStatus.FAILED,
+  };
+  const activeExport = {
+    ...runningImport,
+    type: ImportExportTaskType.TABLE_DATA_EXPORT,
+  };
+
+  assert.equal(shouldRefreshImportTargetTable(undefined, runningImport), false);
+  assert.equal(shouldRefreshImportTargetTable(undefined, successfulImport), true);
+  assert.equal(shouldRefreshImportTargetTable(runningImport, activeExport), false);
+  assert.equal(shouldRefreshImportTargetTable(runningImport, failedImport), false);
+  assert.equal(shouldRefreshImportTargetTable(runningImport, successfulImport), true);
+  assert.equal(shouldRefreshImportTargetTable(successfulImport, successfulImport), false);
+}
+
 void testActiveTaskPagination().then(async () => {
   await testCompletedTrackedTaskOutsideRecentPage();
   testTaskMerge();
+  testTaskMergePreservesLatestRevision();
   testEventMerge();
   testPollingDelay();
   testPollingRetryPolicy();
   testCompletedTaskNotifications();
-  console.log('Task center utility tests passed');
+  testImportTargetRefreshWaitsForTerminalImportResult();
 });
diff --git a/chat2db-community-client/src/store/importExport/taskCenterUtils.ts b/chat2db-community-client/src/store/importExport/taskCenterUtils.ts
index 5c9ab6651b..50c1bfc7dc 100644
--- a/chat2db-community-client/src/store/importExport/taskCenterUtils.ts
+++ b/chat2db-community-client/src/store/importExport/taskCenterUtils.ts
@@ -1,4 +1,4 @@
-import { ImportExportTaskStatus } from '@/constants/importExport';
+import { ImportExportTaskStatus, ImportExportTaskType } from '@/constants/importExport';
 import { ErrorCode } from '@/constants/request';
 import { ImportExportTaskDetails, ImportExportTaskEvent } from '@/typings/importExport';
 
@@ -8,6 +8,7 @@ export const TASK_EVENT_INITIAL_PAGE_SIZE = 10;
 export const TASK_EVENT_PAGE_SIZE = 200;
 export const ACTIVE_TASK_POLL_INTERVAL = 1000;
 export const FAILED_TASK_POLL_INTERVAL = 1500;
+export const IMPORT_TARGET_TABLE_REFRESH_EVENT = 'chat2db:import-target-table-refresh';
 
 export type TaskStatusById = Record<string, ImportExportTaskStatus>;
 
@@ -16,12 +17,41 @@ export interface TaskNotificationCursor {
   taskId: number;
 }
 
+export interface TaskListLoadMoreRequest {
+  stateGeneration: number;
+  requestGeneration: number;
+}
+
+export const createTaskListRequestCoordinator = () => {
+  let stateGeneration = 0;
+  let loadMoreRequestGeneration = 0;
+
+  return {
+    invalidateState: () => {
+      stateGeneration += 1;
+    },
+    beginLoadMoreRequest: (): TaskListLoadMoreRequest => {
+      loadMoreRequestGeneration += 1;
+      return {
+        stateGeneration,
+        requestGeneration: loadMoreRequestGeneration,
+      };
+    },
+    canApplyLoadMoreResponse: (request: TaskListLoadMoreRequest) =>
+      request.stateGeneration === stateGeneration && request.requestGeneration === loadMoreRequestGeneration,
+    isLatestLoadMoreRequest: (request: TaskListLoadMoreRequest) =>
+      request.requestGeneration === loadMoreRequestGeneration,
+  };
+};
+
 const TERMINAL_TASK_STATUSES = new Set([
   ImportExportTaskStatus.SUCCESS,
   ImportExportTaskStatus.FAILED,
   ImportExportTaskStatus.CANCELLED,
 ]);
 
+const IMPORT_TASK_TYPES = new Set([ImportExportTaskType.DATA_FILE_IMPORT, ImportExportTaskType.SQL_FILE_IMPORT]);
+
 const NON_RETRYABLE_POLLING_ERRORS = new Set<string>([
   ErrorCode.NeedLoggedIn,
   ErrorCode.OfflineInvalidTrial,
@@ -64,7 +94,16 @@ export const listAllTasksByStatus = async (
 
 export const mergeTasks = (...taskGroups: ImportExportTaskDetails[][]) => {
   const tasksById = new Map<number, ImportExportTaskDetails>();
-  taskGroups.flat().forEach((task) => tasksById.set(task.id, task));
+  taskGroups.flat().forEach((task) => {
+    const previous = tasksById.get(task.id);
+    if (previous) {
+      const previousTerminal = TERMINAL_TASK_STATUSES.has(previous.status);
+      const incomingTerminal = TERMINAL_TASK_STATUSES.has(task.status);
+      if (previousTerminal && !incomingTerminal) return;
+      if (previousTerminal === incomingTerminal && taskUpdateTime(task) < taskUpdateTime(previous)) return;
+    }
+    tasksById.set(task.id, task);
+  });
   return [...tasksById.values()].sort((left, right) => {
     const leftCreatedAt = new Date(left.createdAt).getTime() || 0;
     const rightCreatedAt = new Date(right.createdAt).getTime() || 0;
@@ -72,6 +111,9 @@ export const mergeTasks = (...taskGroups: ImportExportTaskDetails[][]) => {
   });
 };
 
+const taskUpdateTime = (task: ImportExportTaskDetails) =>
+  new Date(task.updatedAt ?? task.finishedAt ?? task.startedAt ?? task.createdAt).getTime() || 0;
+
 export const loadMissingTrackedTasks = async (
   trackedTaskIds: number[],
   visibleTasks: ImportExportTaskDetails[],
@@ -159,3 +201,14 @@ export const shouldRetryTaskPolling = (error: unknown): boolean => {
   const errorCode = (error as { errorCode?: unknown }).errorCode;
   return typeof errorCode !== 'string' || !NON_RETRYABLE_POLLING_ERRORS.has(errorCode);
 };
+
+export const shouldRefreshImportTargetTable = (
+  previousTask: ImportExportTaskDetails | undefined,
+  currentTask: ImportExportTaskDetails,
+) => {
+  if (!IMPORT_TASK_TYPES.has(currentTask.type)) return false;
+  if (!currentTask.target?.dataSourceId || !currentTask.target?.tableName) return false;
+  if (currentTask.status !== ImportExportTaskStatus.SUCCESS) return false;
+  if (previousTask && previousTask.id !== currentTask.id) return false;
+  return previousTask?.status !== ImportExportTaskStatus.SUCCESS;
+};
diff --git a/chat2db-community-client/src/store/tree/dataSourceMutationRefresh.test.ts b/chat2db-community-client/src/store/tree/dataSourceMutationRefresh.test.ts
index 1eee769028..e178a82054 100644
--- a/chat2db-community-client/src/store/tree/dataSourceMutationRefresh.test.ts
+++ b/chat2db-community-client/src/store/tree/dataSourceMutationRefresh.test.ts
@@ -1,4 +1,5 @@
 import assert from 'node:assert/strict';
+import type { TreeNodeData } from '@/typings';
 import { hydrateDataSourceAfterMutation } from './dataSourceMutationRefresh';
 
 async function testUsesCanonicalNodeLoadedAfterMutation() {
@@ -10,8 +11,8 @@ async function testUsesCanonicalNodeLoadedAfterMutation() {
       storageType: 'CLOUD',
       hasPermission: true,
     },
-  } as any;
-  let dataSourceList: any[] | null = null;
+  } as TreeNodeData;
+  let dataSourceList: TreeNodeData[] | null = null;
 
   const result = await hydrateDataSourceAfterMutation(42, {
     refreshTreeData: async () => {
@@ -20,6 +21,7 @@ async function testUsesCanonicalNodeLoadedAfterMutation() {
       return true;
     },
     getDataSourceList: () => dataSourceList,
+    expandParent: (node) => events.push(`expand:${String(node.key)}`),
     setSelectedKeys: (keys) => events.push(`select:${String(keys[0])}`),
     setScrollTargetKey: (key) => events.push(`scroll:${String(key)}`),
     loadData: async (node) => {
@@ -30,6 +32,7 @@ async function testUsesCanonicalNodeLoadedAfterMutation() {
   assert.equal(result, canonicalNode);
   assert.deepEqual(events, [
     'refresh',
+    'expand:dataSource_42',
     'select:dataSource_42',
     'scroll:dataSource_42',
     'load:dataSource_42',
@@ -63,7 +66,7 @@ async function testStopsWhenRefreshIsNotCommitted() {
     extraParams: {
       dataSourceId: 42,
     },
-  } as any;
+  } as TreeNodeData;
 
   const result = await hydrateDataSourceAfterMutation(42, {
     refreshTreeData: async () => {
@@ -85,15 +88,18 @@ async function testStopsWhenRefreshIsNotCommitted() {
   assert.deepEqual(events, ['refresh']);
 }
 
-async function testPropagatesRefreshFailure() {
+async function testRefreshFailureDoesNotRejectSuccessfulSave() {
   const events: string[] = [];
-  const refreshError = new Error('refresh failed');
-
-  await assert.rejects(
-    hydrateDataSourceAfterMutation(42, {
+  const originalWarn = console.warn;
+  const warnings: unknown[] = [];
+  console.warn = (...args: unknown[]) => {
+    warnings.push(args[0]);
+  };
+  try {
+    const result = await hydrateDataSourceAfterMutation(42, {
       refreshTreeData: async () => {
         events.push('refresh');
-        throw refreshError;
+        throw new Error('refresh failed');
       },
       getDataSourceList: () => {
         events.push('read');
@@ -104,22 +110,49 @@ async function testPropagatesRefreshFailure() {
       loadData: async () => {
         events.push('load');
       },
-    }),
-    (error) => error === refreshError,
-  );
-  assert.deepEqual(events, ['refresh']);
+    });
+
+    assert.equal(result, null, 'a failed post-save refresh must resolve, not reject');
+    assert.deepEqual(events, ['refresh']);
+    assert.equal(warnings.length, 1, 'the refresh failure is logged once');
+  } finally {
+    console.warn = originalWarn;
+  }
 }
 
-Promise.all([
-  testUsesCanonicalNodeLoadedAfterMutation(),
-  testDoesNotReuseSparseMutationNodeWhenRefreshMisses(),
-  testStopsWhenRefreshIsNotCommitted(),
-  testPropagatesRefreshFailure(),
-])
-  .then(() => {
-    console.log('Data source mutation refresh tests passed');
-  })
-  .catch((error) => {
-    console.error(error);
-    process.exitCode = 1;
-  });
+async function testChildLoadFailureDoesNotRejectSuccessfulSave() {
+  const events: string[] = [];
+  const canonicalNode = { key: 'dataSource_42', extraParams: { dataSourceId: 42 } };
+  const originalWarn = console.warn;
+  const error = new Error('child load failed');
+  const warnings: unknown[] = [];
+  console.warn = (_message, cause) => warnings.push(cause);
+  try {
+    const result = await hydrateDataSourceAfterMutation(42, {
+      refreshTreeData: async () => true,
+      getDataSourceList: () => [canonicalNode as TreeNodeData],
+      setSelectedKeys: () => events.push('select'),
+      setScrollTargetKey: () => events.push('scroll'),
+      loadData: async () => { throw error; },
+    });
+    assert.equal(result, null);
+    assert.deepEqual(events, ['select', 'scroll']);
+    assert.deepEqual(warnings, [error]);
+  } finally {
+    console.warn = originalWarn;
+  }
+}
+
+async function run() {
+  await testUsesCanonicalNodeLoadedAfterMutation();
+  await testDoesNotReuseSparseMutationNodeWhenRefreshMisses();
+  await testStopsWhenRefreshIsNotCommitted();
+  await testRefreshFailureDoesNotRejectSuccessfulSave();
+  await testChildLoadFailureDoesNotRejectSuccessfulSave();
+  console.log('Data source mutation refresh tests passed');
+}
+
+run().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});
diff --git a/chat2db-community-client/src/store/tree/dataSourceMutationRefresh.ts b/chat2db-community-client/src/store/tree/dataSourceMutationRefresh.ts
index 654f902381..92cc0ac669 100644
--- a/chat2db-community-client/src/store/tree/dataSourceMutationRefresh.ts
+++ b/chat2db-community-client/src/store/tree/dataSourceMutationRefresh.ts
@@ -4,6 +4,7 @@ import type { Key } from 'react';
 interface DataSourceMutationRefreshDependencies {
   refreshTreeData: () => Promise<boolean>;
   getDataSourceList: () => TreeNodeData[] | null;
+  expandParent?: (node: TreeNodeData) => void;
   setSelectedKeys: (keys: Key[]) => void;
   setScrollTargetKey: (key: Key | null) => void;
   loadData: (node: TreeNodeData) => Promise<unknown>;
@@ -13,21 +14,28 @@ export async function hydrateDataSourceAfterMutation(
   dataSourceId: number,
   dependencies: DataSourceMutationRefreshDependencies,
 ): Promise<TreeNodeData | null> {
-  const refreshed = await dependencies.refreshTreeData();
-  if (!refreshed) {
-    return null;
-  }
+  try {
+    const refreshed = await dependencies.refreshTreeData();
+    if (!refreshed) {
+      return null;
+    }
 
-  const dataSource =
-    dependencies
-      .getDataSourceList()
-      ?.find((node) => node.extraParams?.dataSourceId === dataSourceId) ?? null;
-  if (!dataSource) {
+    const dataSource =
+      dependencies
+        .getDataSourceList()
+        ?.find((node) => node.extraParams?.dataSourceId === dataSourceId) ?? null;
+    if (!dataSource) {
+      return null;
+    }
+
+    dependencies.expandParent?.(dataSource);
+    dependencies.setSelectedKeys([dataSource.key]);
+    dependencies.setScrollTargetKey(dataSource.key);
+    await dependencies.loadData(dataSource);
+    return dataSource;
+  } catch (error) {
+    // Saving already succeeded; a refresh failure must not be reported as a failed save.
+    console.warn('Failed to refresh the datasource tree after a successful save', error);
     return null;
   }
-
-  dependencies.setSelectedKeys([dataSource.key]);
-  dependencies.setScrollTargetKey(dataSource.key);
-  await dependencies.loadData(dataSource);
-  return dataSource;
 }
diff --git a/chat2db-community-client/src/store/tree/hiddenTreeNodeState.test.ts b/chat2db-community-client/src/store/tree/hiddenTreeNodeState.test.ts
index dbdaf53e61..d4200ab233 100644
--- a/chat2db-community-client/src/store/tree/hiddenTreeNodeState.test.ts
+++ b/chat2db-community-client/src/store/tree/hiddenTreeNodeState.test.ts
@@ -58,10 +58,10 @@ async function testConcurrentChangesPreserveInitializedData() {
         state = value;
       },
     );
-    const currentState: Record<number, string[]> = state || {};
-    const nextIds = applyHiddenTreeNodeChanges(currentState[1] || [], changedKeys);
-    state = { ...currentState, 1: nextIds };
     await coordinator.write(async () => {
+      const currentState: Record<number, string[]> = state || {};
+      const nextIds = applyHiddenTreeNodeChanges(currentState[1] || [], changedKeys);
+      state = { ...currentState, 1: nextIds };
       persistedValues.push([...nextIds]);
     });
   };
@@ -203,6 +203,92 @@ async function testFailedWriteDoesNotBlockLaterWrites() {
   assert.deepEqual(events, ['failed', 'successful']);
 }
 
+async function testForcedRereadSeesAnotherWindowChanges() {
+  const coordinator = new HiddenTreeNodeStateCoordinator<Record<number, string[]>>();
+  const reads: string[][] = [];
+  const commits: Record<number, string[]>[] = [];
+
+  const firstInitialization = coordinator.initialize(
+    async () => {
+      reads.push(['first']);
+      return { 1: ['first'] };
+    },
+    (value) => commits.push(value),
+  );
+  assert.equal(await firstInitialization, true);
+
+  const secondInitialization = coordinator.initialize(
+    async () => {
+      reads.push(['second']);
+      return { 1: ['second'] };
+    },
+    (value) => commits.push(value),
+    true,
+  );
+
+  assert.equal(await secondInitialization, true);
+  assert.deepEqual(reads, [['first'], ['second']]);
+  assert.deepEqual(commits, [{ 1: ['first'] }, { 1: ['second'] }]);
+}
+
+async function testOverlappingRefreshesAndChangesPreserveFreshHiddenIds() {
+  const coordinator = new HiddenTreeNodeStateCoordinator<Record<number, string[]>>();
+  let state = { 1: ['ALPHA'], 2: ['other'] };
+  await coordinator.initialize(async () => state, (value) => { state = value; });
+  const read = deferred<typeof state>();
+  let reads = 0;
+  const refresh = () => coordinator.initialize(() => { reads++; return read.promise; },
+    (value) => { state = value; }, true);
+  const first = refresh();
+  await nextMicrotask();
+  const changes = ['BETA', 'GAMMA'].map((key) => coordinator.write(async () => {
+    state = { ...state, 1: applyHiddenTreeNodeChanges(state[1], { add: [key], delete: [] }) };
+  }));
+  const second = refresh();
+  assert.equal(first, second, 'repeated refreshes must join the current read');
+  assert.deepEqual(state, { 1: ['ALPHA'], 2: ['other'] }, 'refresh keeps the last known state');
+  read.resolve({ 1: ['ALPHA', 'external'], 2: ['other'] });
+  await Promise.all([first, second, ...changes]);
+  assert.equal(reads, 1);
+  assert.deepEqual(state, { 1: ['ALPHA', 'external', 'BETA', 'GAMMA'], 2: ['other'] });
+}
+
+async function testRefreshAfterQueuedWriteReadsThePersistedChange() {
+  const coordinator = new HiddenTreeNodeStateCoordinator<string[]>();
+  let persisted = ['ALPHA'];
+  let state = persisted;
+  const read = () => coordinator.initialize(async () => persisted, (value) => { state = value; }, true);
+  await read();
+  const gate = deferred<void>();
+  const write = coordinator.write(async () => {
+    await gate.promise;
+    persisted = ['ALPHA', 'BETA'];
+  });
+  const refresh = read();
+  gate.resolve();
+  await Promise.all([write, refresh]);
+  assert.deepEqual(state, ['ALPHA', 'BETA']);
+}
+
+async function testFailedRefreshPreservesStateAndBlocksItsWaitingWrite() {
+  const coordinator = new HiddenTreeNodeStateCoordinator<string[]>();
+  let state = ['ALPHA'];
+  await coordinator.initialize(async () => state, (value) => { state = value; });
+  const gate = deferred<string[]>();
+  const refresh = coordinator.initialize(() => gate.promise, (value) => { state = value; }, true);
+  let wrote = false;
+  const write = coordinator.write(async () => { wrote = true; });
+  const failedRefresh = assert.rejects(refresh, /read failed/);
+  const failedWrite = assert.rejects(write, /read failed/);
+  gate.reject(new Error('read failed'));
+  await Promise.all([failedRefresh, failedWrite]);
+  assert.deepEqual(state, ['ALPHA']);
+  assert.equal(wrote, false);
+  assert.equal(await coordinator.initialize(async () => ['ALPHA', 'external'],
+    (value) => { state = value; }), true, 'a failed refresh remains retryable');
+  assert.deepEqual(state, ['ALPHA', 'external']);
+}
+
 async function run() {
   await testWriteWaitsForPendingInitialization();
   await testConcurrentChangesPreserveInitializedData();
@@ -211,6 +297,10 @@ async function run() {
   await testResetWaitsForWritesBeforeReadingAgain();
   await testInitializedStateDoesNotReadAgain();
   await testFailedWriteDoesNotBlockLaterWrites();
+  await testForcedRereadSeesAnotherWindowChanges();
+  await testOverlappingRefreshesAndChangesPreserveFreshHiddenIds();
+  await testRefreshAfterQueuedWriteReadsThePersistedChange();
+  await testFailedRefreshPreservesStateAndBlocksItsWaitingWrite();
 }
 
 run().catch((error) => {
diff --git a/chat2db-community-client/src/store/tree/hiddenTreeNodeState.ts b/chat2db-community-client/src/store/tree/hiddenTreeNodeState.ts
index 7669c03182..0bfda63263 100644
--- a/chat2db-community-client/src/store/tree/hiddenTreeNodeState.ts
+++ b/chat2db-community-client/src/store/tree/hiddenTreeNodeState.ts
@@ -7,14 +7,16 @@ export class HiddenTreeNodeStateCoordinator<T> {
 
   private writeQueue: Promise<void> = Promise.resolve();
 
-  initialize(read: () => Promise<T>, commit: (value: T) => void): Promise<boolean> {
-    if (this.initialized) {
-      return Promise.resolve(false);
+  initialize(read: () => Promise<T>, commit: (value: T) => void, force = false): Promise<boolean> {
+    if (force) {
+      this.initialized = false;
     }
-
     if (this.pendingInitialization) {
       return this.pendingInitialization;
     }
+    if (this.initialized) {
+      return Promise.resolve(false);
+    }
 
     const revision = this.revision;
     const initialization = this.writeQueue
diff --git a/chat2db-community-client/src/store/tree/index.tsx b/chat2db-community-client/src/store/tree/index.tsx
index 6860329e24..97157e543f 100644
--- a/chat2db-community-client/src/store/tree/index.tsx
+++ b/chat2db-community-client/src/store/tree/index.tsx
@@ -124,7 +124,7 @@ export interface TreeAction {
   setTreeData: (treeData: TreeState['treeData'] | any) => void;
   getTreeData: (props?: { refresh?: boolean; force?: boolean; throwOnError?: boolean }) => Promise<boolean>;
   refreshTreeData: () => Promise<boolean>;
-  refreshDataSourceAfterMutation: (dataSourceId: number) => Promise<void>;
+  refreshDataSourceAfterMutation: (dataSourceId: number, options?: { expandParent?: boolean }) => Promise<void>;
   // Database structure synchronization
   schemaSync: () => void;
   setSelectedKeys: (selectedKeys: TreeState['selectedKeys']) => void;
@@ -162,7 +162,7 @@ export interface TreeAction {
   updateOriginalTitleByNodeId: (nodeKey: string, originalTitle: string) => void;
   // Get the child nodes under a certain node. If the child node is undefined, request the child node.
   getChildrenByNodeId: (nodeId: string) => TreeNodeData[];
-  initHiddenTreeNodeIds: () => void;
+  initHiddenTreeNodeIds: (force?: boolean) => Promise<boolean>;
   addOrDeleteShowTreeNodeIds: (
     dataSourceId: number,
     changedKeys?: {
@@ -219,10 +219,19 @@ export const createTreeAction: StateCreator<TreeStore, [['zustand/devtools', nev
       refreshNode: (node) => get().handleLoadData(node, { refresh: true, preserveInteraction: true }),
       refreshRoot: () => get().getTreeData({ refresh: true }),
     }),
-  refreshDataSourceAfterMutation: async (dataSourceId) => {
+  refreshDataSourceAfterMutation: async (dataSourceId, options) => {
     await hydrateDataSourceAfterMutation(dataSourceId, {
       refreshTreeData: () => get().getTreeData({ refresh: true, throwOnError: true }),
       getDataSourceList: () => get().dataSourceList,
+      expandParent: options?.expandParent
+        ? (dataSource) => {
+            const treeData = get().treeData;
+            const parentNode = treeData ? getParentNode(dataSource.key, treeData) : null;
+            if (parentNode) {
+              get().setExpandedKeys(appendExpandedTreeKey(get().expandedKeys, parentNode.key));
+            }
+          }
+        : undefined,
       setSelectedKeys: get().setSelectedKeys,
       setScrollTargetKey: get().setScrollTargetKey,
       loadData: (node) => get().handleLoadData(node),
@@ -254,7 +263,8 @@ export const createTreeAction: StateCreator<TreeStore, [['zustand/devtools', nev
         priority: refresh ? 1 : 0,
       },
       async (isCurrent): Promise<RootTreeLoadResult> => {
-        get().initHiddenTreeNodeIds();
+        void get().initHiddenTreeNodeIds(refresh)
+          .catch(() => undefined);
         const result = await loadNamespaceTree(() => connectionService.getNamespaceList({ refresh }));
         if (!isCurrent()) {
           return { committed: false };
@@ -803,21 +813,11 @@ export const createTreeAction: StateCreator<TreeStore, [['zustand/devtools', nev
     const curNode = findNode(nodeId, newTreeData);
     return curNode?.children || [];
   },
-  initHiddenTreeNodeIds: () => {
-    if (get().hiddenTreeNodeIds !== null) {
-      return;
-    }
-    void hiddenTreeNodeStateCoordinator
-      .initialize(
-        () => dataSourceTreeService.getTreeHiddenTreeNodeIds(),
-        (hiddenTreeNodeIds) => {
-          if (get().hiddenTreeNodeIds === null) {
-            set({ hiddenTreeNodeIds });
-          }
-        },
-      )
-      .catch(() => undefined);
-  },
+  initHiddenTreeNodeIds: (force = false) => hiddenTreeNodeStateCoordinator.initialize(
+    () => dataSourceTreeService.getTreeHiddenTreeNodeIds(),
+    (hiddenTreeNodeIds) => set({ hiddenTreeNodeIds }),
+    force,
+  ),
   addOrDeleteShowTreeNodeIds: (
     dataSourceId: number,
     changedKeys?: {
@@ -827,29 +827,21 @@ export const createTreeAction: StateCreator<TreeStore, [['zustand/devtools', nev
   ) => {
     const lifecycleVersion = treeStoreLifecycleVersion;
     const applyChanges = async () => {
-      await hiddenTreeNodeStateCoordinator.initialize(
-        () => dataSourceTreeService.getTreeHiddenTreeNodeIds(),
-        (hiddenTreeNodeIds) => {
-          if (get().hiddenTreeNodeIds === null) {
-            set({ hiddenTreeNodeIds });
-          }
-        },
-      );
-      if (lifecycleVersion !== treeStoreLifecycleVersion) {
-        return;
-      }
-
-      const hiddenTreeNodeIds = get().hiddenTreeNodeIds || {};
-      const nextIds = applyHiddenTreeNodeChanges(hiddenTreeNodeIds[dataSourceId] || [], changedKeys);
-      set({
-        hiddenTreeNodeIds: {
-          ...hiddenTreeNodeIds,
-          [dataSourceId]: nextIds,
-        },
+      await get().initHiddenTreeNodeIds();
+      await hiddenTreeNodeStateCoordinator.write(async () => {
+        if (lifecycleVersion !== treeStoreLifecycleVersion) {
+          return;
+        }
+        const hiddenTreeNodeIds = get().hiddenTreeNodeIds || {};
+        const nextIds = applyHiddenTreeNodeChanges(hiddenTreeNodeIds[dataSourceId] || [], changedKeys);
+        set({
+          hiddenTreeNodeIds: {
+            ...hiddenTreeNodeIds,
+            [dataSourceId]: nextIds,
+          },
+        });
+        await dataSourceTreeService.updateHiddenTreeNodeIds(dataSourceId, nextIds);
       });
-      await hiddenTreeNodeStateCoordinator.write(() =>
-        dataSourceTreeService.updateHiddenTreeNodeIds(dataSourceId, nextIds),
-      );
     };
 
     void applyChanges()
diff --git a/chat2db-community-client/src/store/workspace/store.ts b/chat2db-community-client/src/store/workspace/store.ts
index afb7f668ec..34939ccb87 100644
--- a/chat2db-community-client/src/store/workspace/store.ts
+++ b/chat2db-community-client/src/store/workspace/store.ts
@@ -1,5 +1,5 @@
 import { clientRuntime } from '@client-runtime';
-import { PersistOptions, devtools, persist } from 'zustand/middleware';
+import { createJSONStorage, PersistOptions, devtools, persist } from 'zustand/middleware';
 import { shallow } from 'zustand/shallow';
 import { createWithEqualityFn } from 'zustand/traditional';
 import { StateCreator } from 'zustand/vanilla';
@@ -13,6 +13,8 @@ import {
   getHydratedWorkspaceLayout,
   getPersistableWorkspaceLayout,
   getPersistableWorkspaceTabList,
+  createSafeWorkspaceStorage,
+  sanitizePersistedWorkspaceTabsState,
 } from './utils/workspaceTabPersistence';
 
 type WorkspaceAction = CommonAction & ConfigAction & ConsoleAction & ModalAction;
@@ -39,6 +41,8 @@ type GlobalPersist = Pick<
 // local-storage Options
 const persistOptions: PersistOptions<WorkspaceStore, GlobalPersist> = {
   name: clientRuntime.workspaceStoreName,
+  version: 1,
+  storage: createJSONStorage<GlobalPersist>(() => createSafeWorkspaceStorage(localStorage)),
   partialize: (state) => {
     const workspaceTabList = getPersistableWorkspaceTabList(state.workspaceTabList);
     return {
@@ -53,8 +57,9 @@ const persistOptions: PersistOptions<WorkspaceStore, GlobalPersist> = {
       recentlyClosedWorkspaceTabs: getPersistableWorkspaceTabList(state.recentlyClosedWorkspaceTabs) || [],
     };
   },
+  migrate: (persistedState) => sanitizePersistedWorkspaceTabsState((persistedState || {}) as GlobalPersist),
   merge: (persistedState, currentState) => {
-    const storedState = (persistedState || {}) as Partial<GlobalPersist>;
+    const storedState = sanitizePersistedWorkspaceTabsState((persistedState || {}) as Partial<GlobalPersist>);
     return {
       ...currentState,
       ...storedState,
diff --git a/chat2db-community-client/src/store/workspace/utils/localFileWorkspaceTab.test.ts b/chat2db-community-client/src/store/workspace/utils/localFileWorkspaceTab.test.ts
index df1e886b02..87d9157dd7 100644
--- a/chat2db-community-client/src/store/workspace/utils/localFileWorkspaceTab.test.ts
+++ b/chat2db-community-client/src/store/workspace/utils/localFileWorkspaceTab.test.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { WorkspaceTabType } from '@/constants/workspace';
 import type { IBoundInfo, IWorkspaceTab } from '@/typings/workspace';
-import { refreshLocalFileWorkspaceTab } from './localFileWorkspaceTab';
+import { getRestoredLocalFileReadRequest, refreshLocalFileWorkspaceTab } from './localFileWorkspaceTab';
 
 const originalUniqueData = Object.freeze({
   filePath: '/tmp/report.pdf',
@@ -65,4 +65,41 @@ assert.equal(
   'a closed target tab must not fall back to another tab with the same path',
 );
 
+const restoredReadRequest = getRestoredLocalFileReadRequest({
+  id: 'restored-sql',
+  type: WorkspaceTabType.LocalSQLFile,
+  title: 'restored.sql',
+  uniqueData: {
+    filePath: '/tmp/root/restored.sql',
+    fileExtension: 'sql',
+    fileRootToken: 'root-token',
+    fileRelativePath: 'nested/restored.sql',
+    fileCharset: 'GB18030',
+  },
+});
+assert.deepEqual(
+  restoredReadRequest,
+  {
+    filePath: '/tmp/root/restored.sql',
+    fileExtension: 'sql',
+    context: {
+      rootToken: 'root-token',
+      relativePath: 'nested/restored.sql',
+      charset: 'GB18030',
+      workspaceTabId: 'restored-sql',
+    },
+  },
+  'restored local files must preserve directory access and encoding context',
+);
+assert.equal(
+  getRestoredLocalFileReadRequest({
+    id: 'live-sql',
+    type: WorkspaceTabType.LocalSQLFile,
+    title: 'live.sql',
+    uniqueData: { filePath: '/tmp/live.sql', ddl: 'select 1' },
+  }),
+  undefined,
+  'live local files with content must not be reloaded from disk',
+);
+
 console.log('local file workspace tab tests passed');
diff --git a/chat2db-community-client/src/store/workspace/utils/localFileWorkspaceTab.ts b/chat2db-community-client/src/store/workspace/utils/localFileWorkspaceTab.ts
index b4fb94f833..77823333e5 100644
--- a/chat2db-community-client/src/store/workspace/utils/localFileWorkspaceTab.ts
+++ b/chat2db-community-client/src/store/workspace/utils/localFileWorkspaceTab.ts
@@ -1,4 +1,22 @@
 import type { IBoundInfo, IWorkspaceTab } from '@/typings/workspace';
+import { WorkspaceTabType } from '@/constants/workspace';
+
+export function getRestoredLocalFileReadRequest(tab: IWorkspaceTab) {
+  const file = tab.uniqueData;
+  if (tab.type !== WorkspaceTabType.LocalSQLFile || !file?.filePath || file.ddl !== undefined) {
+    return undefined;
+  }
+  return {
+    filePath: file.filePath,
+    fileExtension: file.fileExtension,
+    context: {
+      rootToken: file.fileRootToken,
+      relativePath: file.fileRelativePath,
+      charset: file.fileCharset,
+      workspaceTabId: tab.id,
+    },
+  };
+}
 
 export function refreshLocalFileWorkspaceTab(
   workspaceTabList: IWorkspaceTab[] | null | undefined,
diff --git a/chat2db-community-client/src/store/workspace/utils/workspaceTabPersistence.test.ts b/chat2db-community-client/src/store/workspace/utils/workspaceTabPersistence.test.ts
index 231d1df57a..578d2b4a6e 100644
--- a/chat2db-community-client/src/store/workspace/utils/workspaceTabPersistence.test.ts
+++ b/chat2db-community-client/src/store/workspace/utils/workspaceTabPersistence.test.ts
@@ -6,6 +6,8 @@ import {
   getPersistableActiveConsoleId,
   getPersistableWorkspaceLayout,
   getPersistableWorkspaceTabList,
+  createSafeWorkspaceStorage,
+  sanitizePersistedWorkspaceTabsState,
 } from './workspaceTabPersistence';
 
 const tabs: IWorkspaceTab[] = [
@@ -51,8 +53,43 @@ assert.deepEqual(
 );
 assert.deepEqual(
   getPersistableWorkspaceTabList(tabs)?.[0].uniqueData,
-  tabs[0].uniqueData,
-  'local file charset and BOM metadata must survive workspace persistence',
+  {
+    filePath: '/tmp/README.md',
+    fileExtension: 'md',
+    fileCharset: 'UTF-8',
+    fileBom: true,
+  },
+  'local file metadata must survive workspace persistence without its content',
+);
+assert.equal(tabs[0].uniqueData?.ddl, '# Hello', 'persistence filtering must not modify live editor state');
+
+const largeLocalFileContent = 'x'.repeat(Math.ceil(2.8 * 1024 * 1024));
+const largeLocalFileTabs: IWorkspaceTab[] = ['sql', 'md', 'txt', 'json'].map((extension) => ({
+  id: `large-${extension}`,
+  type: WorkspaceTabType.LocalSQLFile,
+  title: `large.${extension}`,
+  uniqueData: {
+    filePath: `/tmp/large.${extension}`,
+    fileExtension: extension,
+    fileCharset: 'UTF-8',
+    ddl: largeLocalFileContent,
+  },
+}));
+const persistedLargeLocalFiles = getPersistableWorkspaceTabList(largeLocalFileTabs);
+assert.deepEqual(
+  persistedLargeLocalFiles?.map((tab) => tab.uniqueData?.ddl),
+  [undefined, undefined, undefined, undefined],
+  'all local text file types must omit their content from workspace localStorage',
+);
+assert.equal(
+  JSON.stringify(persistedLargeLocalFiles).length < 4096,
+  true,
+  'large local files must persist only a small metadata payload',
+);
+assert.equal(
+  largeLocalFileTabs.every((tab) => tab.uniqueData?.ddl === largeLocalFileContent),
+  true,
+  'persistence filtering must preserve every live local editor value',
 );
 
 const consoleTabs: IWorkspaceTab[] = Array.from({ length: 101 }, (_, index) => ({
@@ -104,6 +141,49 @@ assert.deepEqual(
   'shared non-circular values must remain available in each persisted tab',
 );
 
+const storageWriteErrors: unknown[] = [];
+let failStorageWrites = true;
+let storedWorkspaceValue: string | undefined;
+const safeStorage = createSafeWorkspaceStorage(
+  {
+    getItem: () => null,
+    setItem: (_name, value) => {
+      if (failStorageWrites) {
+        throw new DOMException('Quota exceeded', 'QuotaExceededError');
+      }
+      storedWorkspaceValue = value;
+    },
+    removeItem: () => undefined,
+  },
+  (error) => storageWriteErrors.push(error),
+);
+assert.doesNotThrow(
+  () => safeStorage.setItem('Chat2DB_Workspace_Store', '{}'),
+  'workspace persistence failures must not interrupt UI state updates',
+);
+assert.equal(storageWriteErrors.length, 1, 'workspace persistence failures must still be reported');
+failStorageWrites = false;
+safeStorage.setItem('Chat2DB_Workspace_Store', '{"state":{}}');
+assert.equal(storedWorkspaceValue, '{"state":{}}', 'workspace persistence must recover after a failed write');
+
+const sanitizedLegacyState = sanitizePersistedWorkspaceTabsState({
+  workspaceTabList: largeLocalFileTabs,
+  activeConsoleId: 'large-sql',
+  recentlyClosedWorkspaceTabs: largeLocalFileTabs,
+  currentConnectionDetails: { dataSourceId: 42 },
+});
+assert.equal(
+  JSON.stringify(sanitizedLegacyState).includes(largeLocalFileContent),
+  false,
+  'legacy workspace migration must remove local file content from open and recently closed tabs',
+);
+assert.equal(sanitizedLegacyState.activeConsoleId, 'large-sql', 'legacy workspace migration must retain the active tab');
+assert.deepEqual(
+  sanitizedLegacyState.currentConnectionDetails,
+  { dataSourceId: 42 },
+  'legacy workspace migration must preserve unrelated persisted state',
+);
+
 const circularPanelState: Record<string, unknown> = {};
 circularPanelState.self = circularPanelState;
 const persistableLayout = getPersistableWorkspaceLayout({
diff --git a/chat2db-community-client/src/store/workspace/utils/workspaceTabPersistence.ts b/chat2db-community-client/src/store/workspace/utils/workspaceTabPersistence.ts
index e1e253cfe0..3da4915630 100644
--- a/chat2db-community-client/src/store/workspace/utils/workspaceTabPersistence.ts
+++ b/chat2db-community-client/src/store/workspace/utils/workspaceTabPersistence.ts
@@ -1,5 +1,6 @@
 import { WorkspaceTabType } from '@/constants/workspace';
 import { IWorkspaceTab } from '@/typings/workspace';
+import type { StateStorage } from 'zustand/middleware';
 import { initConfigState, type ConfigState } from '../slices/config/initialState';
 
 /**
@@ -15,6 +16,17 @@ function capPersistedTabs(tabs: IWorkspaceTab[]): IWorkspaceTab[] {
   return tabs.length > MAX_PERSISTED_TABS ? tabs.slice(-MAX_PERSISTED_TABS) : tabs;
 }
 
+function stripLocalFileContent(tab: IWorkspaceTab): IWorkspaceTab {
+  if (tab.type !== WorkspaceTabType.LocalSQLFile || !tab.uniqueData) {
+    return tab;
+  }
+  const { ddl: _ddl, ...uniqueData } = tab.uniqueData;
+  return {
+    ...tab,
+    uniqueData,
+  };
+}
+
 function createPersistenceReplacer() {
   const ancestors: unknown[] = [];
 
@@ -76,9 +88,9 @@ export function getPersistableWorkspaceTabList(workspaceTabList?: IWorkspaceTab[
     return workspaceTabList || null;
   }
 
-  const persistableTabs = workspaceTabList.filter(
-    (tab) => tab.type !== WorkspaceTabType.Terminal && !tab.uniqueData?.filePreviewMimeType,
-  );
+  const persistableTabs = workspaceTabList
+    .filter((tab) => tab.type !== WorkspaceTabType.Terminal && !tab.uniqueData?.filePreviewMimeType)
+    .map(stripLocalFileContent);
   const cappedTabs = capPersistedTabs(persistableTabs);
 
   try {
@@ -92,6 +104,23 @@ export function getPersistableWorkspaceTabList(workspaceTabList?: IWorkspaceTab[
   }
 }
 
+export function createSafeWorkspaceStorage(
+  storage: StateStorage,
+  onWriteError: (error: unknown) => void = (error) => console.error('Failed to persist workspace state', error),
+): StateStorage {
+  return {
+    getItem: (name) => storage.getItem(name),
+    setItem: (name, value) => {
+      try {
+        return storage.setItem(name, value);
+      } catch (error) {
+        onWriteError(error);
+      }
+    },
+    removeItem: (name) => storage.removeItem(name),
+  };
+}
+
 export function getPersistableActiveConsoleId(params: {
   activeConsoleId?: string | number | null;
   workspaceTabList?: IWorkspaceTab[] | null;
@@ -105,3 +134,22 @@ export function getPersistableActiveConsoleId(params: {
   }
   return workspaceTabList[0].id;
 }
+
+export interface PersistedWorkspaceTabsState {
+  workspaceTabList?: IWorkspaceTab[] | null;
+  activeConsoleId?: string | number | null;
+  recentlyClosedWorkspaceTabs?: IWorkspaceTab[] | null;
+}
+
+export function sanitizePersistedWorkspaceTabsState<T extends PersistedWorkspaceTabsState>(state: T) {
+  const workspaceTabList = getPersistableWorkspaceTabList(state.workspaceTabList);
+  return {
+    ...state,
+    workspaceTabList,
+    activeConsoleId: getPersistableActiveConsoleId({
+      activeConsoleId: state.activeConsoleId,
+      workspaceTabList,
+    }),
+    recentlyClosedWorkspaceTabs: getPersistableWorkspaceTabList(state.recentlyClosedWorkspaceTabs) || [],
+  };
+}
diff --git a/chat2db-community-client/src/typings/editTable.ts b/chat2db-community-client/src/typings/editTable.ts
index 2f97ffee20..0da647eb40 100644
--- a/chat2db-community-client/src/typings/editTable.ts
+++ b/chat2db-community-client/src/typings/editTable.ts
@@ -38,6 +38,7 @@ export interface IColumnItemNew {
   ordinalPosition: number | null; // location
   nullable: NullableType | null; //Is it empty
   generatedColumn: string | null; // Whether to generate columns
+  visible?: boolean | null; // Column visibility (MySQL 8.0.23+)
 
   charSetName: string | null; // Character set name
   collationName: string | null; // collation name
@@ -71,6 +72,7 @@ export interface IIndexItem {
   comment?: string | null;
   type: any | null;
   method?: string | null;
+  visible?: boolean | null;
   columnList: IIndexIncludeColumnItem[];
   editStatus: EditColumnOperationType | null; // Operation type
 }
diff --git a/chat2db-community-client/src/typings/importExport.ts b/chat2db-community-client/src/typings/importExport.ts
index f778ff7c97..b47ed78e24 100644
--- a/chat2db-community-client/src/typings/importExport.ts
+++ b/chat2db-community-client/src/typings/importExport.ts
@@ -40,3 +40,22 @@ export interface ImportExportTaskEvent {
   details?: Record<string, unknown>;
   createdAt: number | string;
 }
+
+export interface ICsvOptions {
+  encoding: string;
+  delimiter: string;
+  quote: string;
+  escape: string;
+  newline: 'LF' | 'CRLF' | 'CR';
+  hasHeader: boolean;
+  emptyAsNull: boolean;
+  headerRow: number;
+  dataStartRow: number;
+  dataEndRow?: number;
+  dateOrder: 'YMD' | 'YDM' | 'MDY' | 'MYD' | 'DMY' | 'DYM';
+  dateTimeOrder: 'DATE_TIME' | 'TIME_DATE' | 'DATE_TIME_TIMEZONE' | 'TIME_DATE_TIMEZONE' | 'TIME_TIMEZONE_DATE';
+  dateDelimiter: string;
+  yearDelimiter: string;
+  timeDelimiter: string;
+  decimalSymbol: '.' | ',';
+}
diff --git a/chat2db-community-client/src/utils/dataSourceWatermark.test.ts b/chat2db-community-client/src/utils/dataSourceWatermark.test.ts
index 08888b4c9b..6f35d98cad 100644
--- a/chat2db-community-client/src/utils/dataSourceWatermark.test.ts
+++ b/chat2db-community-client/src/utils/dataSourceWatermark.test.ts
@@ -1,5 +1,6 @@
 import assert from 'node:assert/strict';
 import {
+  DENSE_WATERMARK_MIN_HEIGHT,
   getDataSourceWatermarkContent,
   getDataSourceWatermarkLayout,
   LARGE_WATERMARK_MIN_HEIGHT,
@@ -14,6 +15,16 @@ assert.deepEqual(getDataSourceWatermarkLayout(LARGE_WATERMARK_MIN_WIDTH, LARGE_W
   columns: 2,
   rows: 2,
 });
+assert.deepEqual(getDataSourceWatermarkLayout(LARGE_WATERMARK_MIN_WIDTH, DENSE_WATERMARK_MIN_HEIGHT), {
+  itemCount: 9,
+  columns: 3,
+  rows: 3,
+});
+assert.deepEqual(getDataSourceWatermarkLayout(LARGE_WATERMARK_MIN_WIDTH, DENSE_WATERMARK_MIN_HEIGHT - 1), {
+  itemCount: 4,
+  columns: 2,
+  rows: 2,
+});
 assert.deepEqual(getDataSourceWatermarkLayout(LARGE_WATERMARK_MIN_WIDTH - 1, LARGE_WATERMARK_MIN_HEIGHT), {
   itemCount: 2,
   columns: 2,
diff --git a/chat2db-community-client/src/utils/dataSourceWatermark.ts b/chat2db-community-client/src/utils/dataSourceWatermark.ts
index fddc7bae1c..2339bc9a26 100644
--- a/chat2db-community-client/src/utils/dataSourceWatermark.ts
+++ b/chat2db-community-client/src/utils/dataSourceWatermark.ts
@@ -8,13 +8,14 @@ export interface DataSourceWatermarkContent {
 }
 
 export interface DataSourceWatermarkLayout {
-  itemCount: 1 | 2 | 4;
-  columns: 1 | 2;
-  rows: 1 | 2;
+  itemCount: 1 | 2 | 4 | 9;
+  columns: 1 | 2 | 3;
+  rows: 1 | 2 | 3;
 }
 
 export const LARGE_WATERMARK_MIN_WIDTH = 720;
 export const LARGE_WATERMARK_MIN_HEIGHT = 360;
+export const DENSE_WATERMARK_MIN_HEIGHT = 480;
 
 export function getDataSourceWatermarkLayout(width?: number, height?: number): DataSourceWatermarkLayout {
   const measuredWidth = width ?? 0;
@@ -22,6 +23,9 @@ export function getDataSourceWatermarkLayout(width?: number, height?: number): D
   if (!measuredWidth || !measuredHeight) {
     return { itemCount: 1, columns: 1, rows: 1 };
   }
+  if (measuredWidth >= LARGE_WATERMARK_MIN_WIDTH && measuredHeight >= DENSE_WATERMARK_MIN_HEIGHT) {
+    return { itemCount: 9, columns: 3, rows: 3 };
+  }
   if (measuredWidth >= LARGE_WATERMARK_MIN_WIDTH && measuredHeight >= LARGE_WATERMARK_MIN_HEIGHT) {
     return { itemCount: 4, columns: 2, rows: 2 };
   }
diff --git a/chat2db-community-client/src/utils/databaseJudgments.test.ts b/chat2db-community-client/src/utils/databaseJudgments.test.ts
index bcd0712397..ac6c8d1166 100644
--- a/chat2db-community-client/src/utils/databaseJudgments.test.ts
+++ b/chat2db-community-client/src/utils/databaseJudgments.test.ts
@@ -1,41 +1,35 @@
 import assert from 'node:assert/strict';
 import { DatabaseTypeCode } from '@/constants/common';
-import { IdentifierQuoteMode } from '@/constants/databaseCapabilities';
-import { EditColumnOperationType } from '@/constants/editTable';
+import { DatabaseCapability, IdentifierQuoteMode } from '@/constants/databaseCapabilities';
 import {
-  canCreateDatabase,
-  canCreateSchema,
-  canSetCreateDatabaseCharset,
-  canSetCreateDatabaseCollation,
-  canDeleteDatabase,
-  canDeleteSchema,
-  canExportData,
-  canExportSqlFile,
-  canGenerateJavaClass,
-  canImportData,
-  canRunSqlFile,
-  canUseAccountManage,
-  canUseBackendCompletion,
-  canUseRoutineOperation,
   getDatabaseSupport,
   getOpenTableIdentifierQuoteMode,
   getSqlCompletionIdentifierQuoteMode,
-  isMongodbTreeDataSource,
-  isRedisTreeDataSource,
-  isSqliteExistingColumnReadonly,
+  isDatabaseCapabilitySupported,
   quoteOpenTableIdentifier,
   quoteSqlCompletionIdentifier,
-  shouldHideOracleIndexColumn,
-  shouldShowMysqlIndexMethod,
-  shouldShowMysqlTableBaseInfo,
-  shouldShowSqliteIncludeCollation,
-  shouldShowSqlServerSparse,
 } from './databaseJudgments';
 
+const assertCapability = (
+  databaseType: DatabaseTypeCode | string | null | undefined,
+  capability: DatabaseCapability,
+  expected: boolean,
+) => {
+  assert.equal(
+    isDatabaseCapabilitySupported(databaseType, capability),
+    expected,
+    `${String(databaseType)} ${capability}`,
+  );
+};
+
 assert.deepEqual(getDatabaseSupport(DatabaseTypeCode.MYSQL), {
   supportDatabase: true,
   supportSchema: false,
 });
+assert.deepEqual(getDatabaseSupport(DatabaseTypeCode.HIVE), {
+  supportDatabase: true,
+  supportSchema: false,
+});
 assert.deepEqual(getDatabaseSupport(DatabaseTypeCode.ORACLE), {
   supportDatabase: false,
   supportSchema: true,
@@ -49,30 +43,32 @@ assert.deepEqual(getDatabaseSupport('oscar_db'), {
   supportSchema: true,
 });
 
-assert.equal(canUseRoutineOperation(DatabaseTypeCode.MYSQL), true);
-assert.equal(canUseRoutineOperation('mysql'), true);
-assert.equal(canUseRoutineOperation(DatabaseTypeCode.POSTGRESQL), false);
-assert.equal(canUseAccountManage(DatabaseTypeCode.MYSQL), true);
-assert.equal(canUseAccountManage(DatabaseTypeCode.ORACLE), false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.ROUTINE_OPERATION, true);
+assertCapability('mysql', DatabaseCapability.ROUTINE_OPERATION, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.ROUTINE_OPERATION, false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.ACCOUNT_MANAGEMENT, true);
+assertCapability(DatabaseTypeCode.ORACLE, DatabaseCapability.ACCOUNT_MANAGEMENT, false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.ACTIVE_TRANSACTION_INSPECTION, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.ACTIVE_TRANSACTION_INSPECTION, false);
 
-assert.equal(canDeleteDatabase(DatabaseTypeCode.MYSQL), true);
-assert.equal(canDeleteDatabase(DatabaseTypeCode.POSTGRESQL), true);
-assert.equal(canDeleteDatabase(DatabaseTypeCode.ORACLE), false);
-assert.equal(canDeleteSchema(DatabaseTypeCode.POSTGRESQL), true);
-assert.equal(canDeleteSchema(DatabaseTypeCode.MYSQL), false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.DATABASE_DELETE, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.DATABASE_DELETE, true);
+assertCapability(DatabaseTypeCode.ORACLE, DatabaseCapability.DATABASE_DELETE, false);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.SCHEMA_DELETE, true);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.SCHEMA_DELETE, false);
 
-assert.equal(canCreateDatabase(DatabaseTypeCode.H2), false);
-assert.equal(canCreateDatabase(DatabaseTypeCode.MYSQL), true);
-assert.equal(canSetCreateDatabaseCharset(DatabaseTypeCode.MYSQL), true);
-assert.equal(canSetCreateDatabaseCharset(DatabaseTypeCode.POSTGRESQL), false);
-assert.equal(canSetCreateDatabaseCharset(DatabaseTypeCode.SQLITE), false);
-assert.equal(canSetCreateDatabaseCollation(DatabaseTypeCode.MYSQL), true);
-assert.equal(canSetCreateDatabaseCollation(DatabaseTypeCode.POSTGRESQL), false);
-assert.equal(canSetCreateDatabaseCollation(DatabaseTypeCode.SQLITE), false);
-assert.equal(canCreateSchema(DatabaseTypeCode.ORACLE), false);
-assert.equal(canCreateSchema(DatabaseTypeCode.OSCAR), false);
-assert.equal(canCreateSchema(DatabaseTypeCode.POSTGRESQL), true);
-assert.equal(canCreateSchema('oscar_db'), true);
+assertCapability(DatabaseTypeCode.H2, DatabaseCapability.DATABASE_CREATE, false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.DATABASE_CREATE, true);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.DATABASE_CREATE_CHARSET, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.DATABASE_CREATE_CHARSET, false);
+assertCapability(DatabaseTypeCode.SQLITE, DatabaseCapability.DATABASE_CREATE_CHARSET, false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.DATABASE_CREATE_COLLATION, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.DATABASE_CREATE_COLLATION, false);
+assertCapability(DatabaseTypeCode.SQLITE, DatabaseCapability.DATABASE_CREATE_COLLATION, false);
+assertCapability(DatabaseTypeCode.ORACLE, DatabaseCapability.SCHEMA_CREATE, false);
+assertCapability(DatabaseTypeCode.OSCAR, DatabaseCapability.SCHEMA_CREATE, false);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.SCHEMA_CREATE, true);
+assertCapability('oscar_db', DatabaseCapability.SCHEMA_CREATE, true);
 
 for (const databaseType of [
   DatabaseTypeCode.REDIS,
@@ -84,22 +80,41 @@ for (const databaseType of [
   DatabaseTypeCode.KINGBASE,
   DatabaseTypeCode.HIVE,
 ]) {
-  assert.equal(canRunSqlFile(databaseType), false, `${databaseType} cannot run SQL files`);
-  assert.equal(canExportSqlFile(databaseType), false, `${databaseType} cannot export SQL files`);
-  assert.equal(canExportData(databaseType), false, `${databaseType} cannot export data`);
-  assert.equal(canImportData(databaseType), false, `${databaseType} cannot import data`);
+  assertCapability(databaseType, DatabaseCapability.IMPORT_EXPORT, false);
 }
-assert.equal(canRunSqlFile(DatabaseTypeCode.MYSQL), true);
-assert.equal(canExportSqlFile(DatabaseTypeCode.MYSQL), true);
-assert.equal(canExportData(DatabaseTypeCode.MYSQL), true);
-assert.equal(canImportData(DatabaseTypeCode.MYSQL), true);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.IMPORT_EXPORT, true);
 
-assert.equal(canGenerateJavaClass(DatabaseTypeCode.MYSQL), true);
-assert.equal(canGenerateJavaClass(DatabaseTypeCode.ORACLE), true);
-assert.equal(canGenerateJavaClass(DatabaseTypeCode.REDIS), false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.JAVA_CLASS_GENERATION, true);
+assertCapability(DatabaseTypeCode.ORACLE, DatabaseCapability.JAVA_CLASS_GENERATION, true);
+assertCapability(DatabaseTypeCode.REDIS, DatabaseCapability.JAVA_CLASS_GENERATION, false);
 
-assert.equal(canUseBackendCompletion(DatabaseTypeCode.MYSQL), true);
-assert.equal(canUseBackendCompletion(DatabaseTypeCode.POSTGRESQL), false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.BACKEND_COMPLETION, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.BACKEND_COMPLETION, false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.BACKEND_EDITOR_HINTS, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.BACKEND_EDITOR_HINTS, true);
+assertCapability(DatabaseTypeCode.GAUSSDB, DatabaseCapability.BACKEND_EDITOR_HINTS, true);
+assertCapability(DatabaseTypeCode.SQLSERVER, DatabaseCapability.BACKEND_EDITOR_HINTS, false);
+
+assertCapability(DatabaseTypeCode.REDIS, DatabaseCapability.REDIS_TREE, true);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.REDIS_TREE, false);
+assertCapability(DatabaseTypeCode.MONGODB, DatabaseCapability.MONGODB_TREE, true);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.MONGODB_TREE, false);
+
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.TABLE_EDITOR_BASE_INFO, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.TABLE_EDITOR_BASE_INFO, false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.TABLE_EDITOR_INDEX_METHOD, true);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.TABLE_EDITOR_COLUMN_VISIBILITY, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.TABLE_EDITOR_COLUMN_VISIBILITY, false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.TABLE_EDITOR_INDEX_VISIBILITY, true);
+assertCapability(DatabaseTypeCode.POSTGRESQL, DatabaseCapability.TABLE_EDITOR_INDEX_VISIBILITY, false);
+assertCapability(DatabaseTypeCode.ORACLE, DatabaseCapability.TABLE_EDITOR_INDEX_COLUMN, false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.TABLE_EDITOR_INDEX_COLUMN, true);
+assertCapability(DatabaseTypeCode.SQLITE, DatabaseCapability.TABLE_EDITOR_INCLUDE_COLLATION, true);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.TABLE_EDITOR_INCLUDE_COLLATION, false);
+assertCapability(DatabaseTypeCode.SQLITE, DatabaseCapability.TABLE_EDITOR_EXISTING_COLUMN_EDIT, false);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.TABLE_EDITOR_EXISTING_COLUMN_EDIT, true);
+assertCapability(DatabaseTypeCode.SQLSERVER, DatabaseCapability.TABLE_EDITOR_SPARSE_COLUMN, true);
+assertCapability(DatabaseTypeCode.MYSQL, DatabaseCapability.TABLE_EDITOR_SPARSE_COLUMN, false);
 
 assert.equal(getOpenTableIdentifierQuoteMode(DatabaseTypeCode.POSTGRESQL), IdentifierQuoteMode.DOUBLE_QUOTE);
 assert.equal(getOpenTableIdentifierQuoteMode(DatabaseTypeCode.SQLSERVER), IdentifierQuoteMode.SQUARE_BRACKET);
@@ -115,20 +130,4 @@ assert.equal(getSqlCompletionIdentifierQuoteMode(DatabaseTypeCode.OCEANBASE), Id
 assert.equal(quoteSqlCompletionIdentifier('User Table', DatabaseTypeCode.OCEANBASE_ORACLE), '"User Table"');
 assert.equal(quoteSqlCompletionIdentifier('User Table', DatabaseTypeCode.OCEANBASE), '`User Table`');
 
-assert.equal(isRedisTreeDataSource(DatabaseTypeCode.REDIS), true);
-assert.equal(isRedisTreeDataSource(DatabaseTypeCode.MYSQL), false);
-assert.equal(isMongodbTreeDataSource(DatabaseTypeCode.MONGODB), true);
-assert.equal(isMongodbTreeDataSource(DatabaseTypeCode.MYSQL), false);
-
-assert.equal(shouldShowMysqlTableBaseInfo(DatabaseTypeCode.MYSQL), true);
-assert.equal(shouldShowMysqlTableBaseInfo(DatabaseTypeCode.POSTGRESQL), false);
-assert.equal(shouldShowMysqlIndexMethod(DatabaseTypeCode.MYSQL), true);
-assert.equal(shouldHideOracleIndexColumn(DatabaseTypeCode.ORACLE), true);
-assert.equal(shouldShowSqliteIncludeCollation(DatabaseTypeCode.SQLITE), true);
-assert.equal(isSqliteExistingColumnReadonly(DatabaseTypeCode.SQLITE, EditColumnOperationType.Modify), true);
-assert.equal(isSqliteExistingColumnReadonly(DatabaseTypeCode.SQLITE, EditColumnOperationType.Add), false);
-assert.equal(isSqliteExistingColumnReadonly(DatabaseTypeCode.MYSQL, EditColumnOperationType.Modify), false);
-assert.equal(shouldShowSqlServerSparse(DatabaseTypeCode.SQLSERVER), true);
-assert.equal(shouldShowSqlServerSparse(DatabaseTypeCode.MYSQL), false);
-
 console.log('databaseJudgments.test.ts: all assertions passed');
diff --git a/chat2db-community-client/src/utils/databaseJudgments.ts b/chat2db-community-client/src/utils/databaseJudgments.ts
index 4e8aa6ab67..1b55d282ac 100644
--- a/chat2db-community-client/src/utils/databaseJudgments.ts
+++ b/chat2db-community-client/src/utils/databaseJudgments.ts
@@ -1,10 +1,160 @@
 import { DatabaseTypeCode } from '@/constants/common';
-import { databaseCapabilities, IdentifierQuoteMode } from '@/constants/databaseCapabilities';
+import { DatabaseCapability, IdentifierQuoteMode } from '@/constants/databaseCapabilities';
 import { getDatabaseInfo, normalizeDatabaseType } from '@/constants/database';
-import { EditColumnOperationType } from '@/constants/editTable';
 
 type DatabaseTypeInput = DatabaseTypeCode | string | null | undefined;
 
+type DatabaseCapabilityJudgment = (
+  | {
+      implementedBy: readonly DatabaseTypeCode[];
+      implementedByDefaultExcept?: never;
+    }
+  | {
+      implementedBy?: never;
+      implementedByDefaultExcept: readonly DatabaseTypeCode[];
+    }
+) & {
+  normalizeDatabaseType?: boolean;
+};
+
+const databaseJudgments: Record<DatabaseCapability, DatabaseCapabilityJudgment> = {
+  [DatabaseCapability.ROUTINE_OPERATION]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+    normalizeDatabaseType: true,
+  },
+  [DatabaseCapability.ACCOUNT_MANAGEMENT]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+    normalizeDatabaseType: true,
+  },
+  [DatabaseCapability.ACTIVE_TRANSACTION_INSPECTION]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+  },
+  [DatabaseCapability.DATABASE_DELETE]: {
+    implementedBy: [DatabaseTypeCode.MYSQL, DatabaseTypeCode.POSTGRESQL],
+  },
+  [DatabaseCapability.SCHEMA_DELETE]: {
+    implementedBy: [DatabaseTypeCode.POSTGRESQL],
+  },
+  [DatabaseCapability.DATABASE_CREATE]: {
+    implementedByDefaultExcept: [DatabaseTypeCode.H2],
+  },
+  [DatabaseCapability.DATABASE_CREATE_CHARSET]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+  },
+  [DatabaseCapability.DATABASE_CREATE_COLLATION]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+  },
+  [DatabaseCapability.SCHEMA_CREATE]: {
+    implementedByDefaultExcept: [DatabaseTypeCode.ORACLE, DatabaseTypeCode.OSCAR],
+  },
+  [DatabaseCapability.IMPORT_EXPORT]: {
+    implementedByDefaultExcept: [
+      DatabaseTypeCode.REDIS,
+      DatabaseTypeCode.H2,
+      DatabaseTypeCode.PRESTO,
+      DatabaseTypeCode.MONGODB,
+      DatabaseTypeCode.SNOWFLAKE,
+      DatabaseTypeCode.KYLIN,
+      DatabaseTypeCode.KINGBASE,
+      DatabaseTypeCode.HIVE,
+    ],
+  },
+  [DatabaseCapability.JAVA_CLASS_GENERATION]: {
+    implementedBy: [
+      DatabaseTypeCode.CLICKHOUSE,
+      DatabaseTypeCode.DB2,
+      DatabaseTypeCode.DM,
+      DatabaseTypeCode.KINGBASE,
+      DatabaseTypeCode.POSTGRESQL,
+      DatabaseTypeCode.SQLITE,
+      DatabaseTypeCode.SQLSERVER,
+      DatabaseTypeCode.MYSQL,
+      DatabaseTypeCode.ORACLE,
+    ],
+  },
+  [DatabaseCapability.BACKEND_COMPLETION]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+  },
+  [DatabaseCapability.BACKEND_EDITOR_HINTS]: {
+    implementedBy: [DatabaseTypeCode.MYSQL, DatabaseTypeCode.POSTGRESQL, DatabaseTypeCode.GAUSSDB],
+  },
+  [DatabaseCapability.TABLE_EDITOR_BASE_INFO]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+  },
+  [DatabaseCapability.TABLE_EDITOR_INDEX_METHOD]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+  },
+  [DatabaseCapability.TABLE_EDITOR_COLUMN_VISIBILITY]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+  },
+  [DatabaseCapability.TABLE_EDITOR_INDEX_VISIBILITY]: {
+    implementedBy: [DatabaseTypeCode.MYSQL],
+  },
+  [DatabaseCapability.TABLE_EDITOR_INDEX_COLUMN]: {
+    implementedByDefaultExcept: [DatabaseTypeCode.ORACLE],
+  },
+  [DatabaseCapability.TABLE_EDITOR_INCLUDE_COLLATION]: {
+    implementedBy: [DatabaseTypeCode.SQLITE],
+  },
+  [DatabaseCapability.TABLE_EDITOR_EXISTING_COLUMN_EDIT]: {
+    implementedByDefaultExcept: [DatabaseTypeCode.SQLITE],
+  },
+  [DatabaseCapability.TABLE_EDITOR_SPARSE_COLUMN]: {
+    implementedBy: [DatabaseTypeCode.SQLSERVER],
+  },
+  [DatabaseCapability.REDIS_TREE]: {
+    implementedBy: [DatabaseTypeCode.REDIS],
+  },
+  [DatabaseCapability.MONGODB_TREE]: {
+    implementedBy: [DatabaseTypeCode.MONGODB],
+  },
+};
+
+const openTableIdentifierQuoteJudgments: Partial<Record<IdentifierQuoteMode, readonly DatabaseTypeCode[]>> = {
+  [IdentifierQuoteMode.DOUBLE_QUOTE]: [
+    DatabaseTypeCode.ORACLE,
+    DatabaseTypeCode.OSCAR,
+    DatabaseTypeCode.SQLITE,
+    DatabaseTypeCode.POSTGRESQL,
+    DatabaseTypeCode.H2,
+    DatabaseTypeCode.DB2,
+    DatabaseTypeCode.KINGBASE,
+    DatabaseTypeCode.DM,
+  ],
+  [IdentifierQuoteMode.SQUARE_BRACKET]: [DatabaseTypeCode.SQLSERVER],
+  [IdentifierQuoteMode.BACKTICK]: [DatabaseTypeCode.MYSQL, DatabaseTypeCode.CLICKHOUSE, DatabaseTypeCode.MARIADB],
+};
+
+const sqlCompletionIdentifierQuoteJudgments: Partial<Record<IdentifierQuoteMode, readonly DatabaseTypeCode[]>> = {
+  [IdentifierQuoteMode.DOUBLE_QUOTE]: [
+    DatabaseTypeCode.POSTGRESQL,
+    DatabaseTypeCode.ORACLE,
+    DatabaseTypeCode.OSCAR,
+    DatabaseTypeCode.DB2,
+    DatabaseTypeCode.DM,
+    DatabaseTypeCode.H2,
+    DatabaseTypeCode.SQLITE,
+    DatabaseTypeCode.OCEANBASE_ORACLE,
+    DatabaseTypeCode.KINGBASE,
+    DatabaseTypeCode.SNOWFLAKE,
+    DatabaseTypeCode.OPENGAUSS,
+    DatabaseTypeCode.SUNDB,
+    DatabaseTypeCode.COCKROACHDB,
+    DatabaseTypeCode.KYLIN,
+    DatabaseTypeCode.XUGUDB,
+    DatabaseTypeCode.PRESTO,
+  ],
+  [IdentifierQuoteMode.SQUARE_BRACKET]: [DatabaseTypeCode.SQLSERVER],
+  [IdentifierQuoteMode.BACKTICK]: [
+    DatabaseTypeCode.MYSQL,
+    DatabaseTypeCode.MARIADB,
+    DatabaseTypeCode.TIDB,
+    DatabaseTypeCode.CLICKHOUSE,
+    DatabaseTypeCode.OCEANBASE,
+    DatabaseTypeCode.HIVE,
+  ],
+};
+
 const normalize = (databaseType?: DatabaseTypeInput): DatabaseTypeCode | undefined => {
   return normalizeDatabaseType(databaseType) as DatabaseTypeCode | undefined;
 };
@@ -18,6 +168,19 @@ const containsNormalized = (databaseTypes: readonly DatabaseTypeCode[], database
   return !!normalizedType && databaseTypes.includes(normalizedType);
 };
 
+export const isDatabaseCapabilitySupported = (
+  databaseType: DatabaseTypeInput,
+  capability: DatabaseCapability,
+): boolean => {
+  const judgment = databaseJudgments[capability];
+  const usesAllowList = judgment.implementedBy !== undefined;
+  const databaseTypes = usesAllowList ? judgment.implementedBy : judgment.implementedByDefaultExcept;
+  const matches = judgment.normalizeDatabaseType
+    ? containsNormalized(databaseTypes, databaseType)
+    : containsStrict(databaseTypes, databaseType);
+  return usesAllowList ? matches : !matches;
+};
+
 const getIdentifierQuoteModeFromConfig = (
   config: Partial<Record<IdentifierQuoteMode, readonly DatabaseTypeCode[]>>,
   databaseType?: DatabaseTypeInput,
@@ -47,72 +210,12 @@ export const getDatabaseSupport = (databaseType?: DatabaseTypeInput) => {
   };
 };
 
-export const canUseRoutineOperation = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsNormalized(databaseCapabilities.routineOperationSupported, databaseType);
-};
-
-export const canUseAccountManage = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsNormalized(databaseCapabilities.accountManageSupported, databaseType);
-};
-
-export const canDeleteDatabase = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.databaseDeleteSupported, databaseType);
-};
-
-export const canDeleteSchema = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.schemaDeleteSupported, databaseType);
-};
-
-export const canCreateDatabase = (databaseType?: DatabaseTypeInput): boolean => {
-  return !containsStrict(databaseCapabilities.createDatabaseUnsupported, databaseType);
-};
-
-export const canSetCreateDatabaseCharset = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.createDatabaseCharsetSupported, databaseType);
-};
-
-export const canSetCreateDatabaseCollation = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.createDatabaseCollationSupported, databaseType);
-};
-
-export const canCreateSchema = (databaseType?: DatabaseTypeInput): boolean => {
-  return !containsStrict(databaseCapabilities.createSchemaUnsupported, databaseType);
-};
-
-export const canRunSqlFile = (databaseType?: DatabaseTypeInput): boolean => {
-  return !containsStrict(databaseCapabilities.importExportUnsupported, databaseType);
-};
-
-export const canExportSqlFile = (databaseType?: DatabaseTypeInput): boolean => {
-  return !containsStrict(databaseCapabilities.importExportUnsupported, databaseType);
-};
-
-export const canExportData = (databaseType?: DatabaseTypeInput): boolean => {
-  return !containsStrict(databaseCapabilities.importExportUnsupported, databaseType);
-};
-
-export const canImportData = (databaseType?: DatabaseTypeInput): boolean => {
-  return !containsStrict(databaseCapabilities.importExportUnsupported, databaseType);
-};
-
-export const canGenerateJavaClass = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.generateJavaClassSupported, databaseType);
-};
-
-export const canUseBackendCompletion = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.backendCompletionSupported, databaseType);
-};
-
-export const canUseBackendEditorHints = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.backendEditorHintsSupported, databaseType);
-};
-
 export const getOpenTableIdentifierQuoteMode = (databaseType?: DatabaseTypeInput): IdentifierQuoteMode => {
-  return getIdentifierQuoteModeFromConfig(databaseCapabilities.openTableIdentifierQuote, databaseType);
+  return getIdentifierQuoteModeFromConfig(openTableIdentifierQuoteJudgments, databaseType);
 };
 
 export const getSqlCompletionIdentifierQuoteMode = (databaseType?: DatabaseTypeInput): IdentifierQuoteMode => {
-  return getIdentifierQuoteModeFromConfig(databaseCapabilities.sqlCompletionIdentifierQuote, databaseType);
+  return getIdentifierQuoteModeFromConfig(sqlCompletionIdentifierQuoteJudgments, databaseType);
 };
 
 export const quoteIdentifierByMode = (name: string, quoteMode: IdentifierQuoteMode): string => {
@@ -135,41 +238,3 @@ export const quoteOpenTableIdentifier = (name: string, databaseType?: DatabaseTy
 export const quoteSqlCompletionIdentifier = (name: string, databaseType?: DatabaseTypeInput): string => {
   return quoteIdentifierByMode(name, getSqlCompletionIdentifierQuoteMode(databaseType));
 };
-
-export const isRedisTreeDataSource = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.redisTreeDataSourceTypes, databaseType);
-};
-
-export const isMongodbTreeDataSource = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.mongodbTreeDataSourceTypes, databaseType);
-};
-
-export const shouldShowMysqlTableBaseInfo = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.tableEditorMysqlBaseInfoSupported, databaseType);
-};
-
-export const shouldShowMysqlIndexMethod = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.tableEditorMysqlIndexMethodSupported, databaseType);
-};
-
-export const shouldHideOracleIndexColumn = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.tableEditorOracleIndexColumnHidden, databaseType);
-};
-
-export const shouldShowSqliteIncludeCollation = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.tableEditorSqliteIncludeCollationSupported, databaseType);
-};
-
-export const isSqliteExistingColumnReadonly = (
-  databaseType?: DatabaseTypeInput,
-  editStatus?: EditColumnOperationType | null,
-): boolean => {
-  return (
-    containsStrict(databaseCapabilities.tableEditorSqliteExistingColumnReadonly, databaseType) &&
-    editStatus !== EditColumnOperationType.Add
-  );
-};
-
-export const shouldShowSqlServerSparse = (databaseType?: DatabaseTypeInput): boolean => {
-  return containsStrict(databaseCapabilities.tableEditorSqlServerSparseSupported, databaseType);
-};
diff --git a/chat2db-community-client/src/utils/dynamicDatabaseRegistry.test.ts b/chat2db-community-client/src/utils/dynamicDatabaseRegistry.test.ts
index df28b19ccb..6b479724c7 100644
--- a/chat2db-community-client/src/utils/dynamicDatabaseRegistry.test.ts
+++ b/chat2db-community-client/src/utils/dynamicDatabaseRegistry.test.ts
@@ -67,6 +67,11 @@ const freshRegistries = () => ({
   assert.equal(byName('port').defaultValue, '8812');
   assert.equal(byName('host').defaultValue, 'localhost');
   assert.equal(byName('database').defaultValue, 'qdb');
+  assert.equal(byName('alias').labelName['zh-CN'], '名称');
+  assert.equal(byName('host').labelName['zh-CN'], '主机');
+  assert.equal(byName('authenticationType').labelName['zh-CN'], '身份验证');
+  assert.equal(byName('database').labelName['zh-CN'], '数据库');
+  assert.equal(byName('url').labelName['zh-CN'], 'URL');
   assert.equal(config.baseInfo.template, 'jdbc:postgresql://{host}:{port}/{database}');
   const match = 'jdbc:postgresql://myhost:5555/mydb'.match(config.baseInfo.pattern);
   assert.equal(match?.[1], 'myhost');
diff --git a/chat2db-community-client/src/utils/dynamicDatabaseRegistry.ts b/chat2db-community-client/src/utils/dynamicDatabaseRegistry.ts
index a43735f1be..991e0212da 100644
--- a/chat2db-community-client/src/utils/dynamicDatabaseRegistry.ts
+++ b/chat2db-community-client/src/utils/dynamicDatabaseRegistry.ts
@@ -1,5 +1,9 @@
 import { AuthenticationType, InputType } from '@/components/ConnectionEdit/config/enum';
-import type { IConnectionConfig, IFormItem } from '@/components/ConnectionEdit/config/types';
+import type {
+  IConnectionConfig,
+  IFormItem,
+  ILocalizedConnectionText,
+} from '@/components/ConnectionEdit/config/types';
 import type { ISupportedDatabaseSummary } from '@/service/supportedDatabase';
 import type { IDatabase } from '@/typings';
 
@@ -15,8 +19,73 @@ import type { IDatabase } from '@/typings';
 /** Fallback glyph from the shared colourful sprite; has a -dark variant. */
 export const DYNAMIC_DATABASE_ICON = 'icon-colourful-table';
 
-const localized = (text: string) =>
-  ({ 'en-US': text, 'zh-CN': text, 'ja-JP': text, 'es-ES': text, 'ko-KR': text }) as any;
+const CONNECTION_FORM_LABELS: Record<string, ILocalizedConnectionText> = {
+  Name: {
+    'en-US': 'Name',
+    'zh-CN': '名称',
+    'ja-JP': '名前',
+    'es-ES': 'Nombre',
+    'ko-KR': '이름',
+  },
+  Host: {
+    'en-US': 'Host',
+    'zh-CN': '主机',
+    'ja-JP': 'ホスト',
+    'es-ES': 'Host',
+    'ko-KR': '호스트',
+  },
+  Authentication: {
+    'en-US': 'Authentication',
+    'zh-CN': '身份验证',
+    'ja-JP': '認証',
+    'es-ES': 'Autenticación',
+    'ko-KR': '인증',
+  },
+  User: {
+    'en-US': 'User',
+    'zh-CN': '用户名',
+    'ja-JP': 'ユーザー名',
+    'es-ES': 'Usuario',
+    'ko-KR': '사용자',
+  },
+  Password: {
+    'en-US': 'Password',
+    'zh-CN': '密码',
+    'ja-JP': 'パスワード',
+    'es-ES': 'Contraseña',
+    'ko-KR': '비밀번호',
+  },
+  Database: {
+    'en-US': 'Database',
+    'zh-CN': '数据库',
+    'ja-JP': 'データベース',
+    'es-ES': 'Base de datos',
+    'ko-KR': '데이터베이스',
+  },
+  URL: {
+    'en-US': 'URL',
+    'zh-CN': 'URL',
+    'ja-JP': 'URL',
+    'es-ES': 'URL',
+    'ko-KR': 'URL',
+  },
+  File: {
+    'en-US': 'File',
+    'zh-CN': '文件',
+    'ja-JP': 'ファイル',
+    'es-ES': 'Archivo',
+    'ko-KR': '파일',
+  },
+};
+
+const localized = (text: string): ILocalizedConnectionText =>
+  CONNECTION_FORM_LABELS[text] || {
+    'en-US': text,
+    'zh-CN': text,
+    'ja-JP': text,
+    'es-ES': text,
+    'ko-KR': text,
+  };
 
 export interface SharedFormItems {
   envItem: IFormItem;
diff --git a/chat2db-community-client/src/utils/editorCloseConfirmation.tsx b/chat2db-community-client/src/utils/editorCloseConfirmation.tsx
index f2456444ac..b586711341 100644
--- a/chat2db-community-client/src/utils/editorCloseConfirmation.tsx
+++ b/chat2db-community-client/src/utils/editorCloseConfirmation.tsx
@@ -8,6 +8,7 @@ import {
   confirmDirtyEditorTabs,
   isEditorCloseConfirmationEnabled,
   prepareEditorsForApplicationExit,
+  waitForPendingEditorTabs,
   type EditorCloseDecision,
   type EditorCloseGuardMap,
   type EditorCloseGuardRef,
@@ -74,16 +75,20 @@ function requestEditorCloseDecision(tab: IWorkspaceTab, editor: EditorCloseGuard
 }
 
 export async function confirmDirtyWorkspaceEditors(tabs: IWorkspaceTab[], editorList: EditorCloseGuardMap) {
-  if (
-    isEditorCloseConfirmationEnabled(useGlobalStore.getState().editorSettings) &&
-    !(await confirmDirtyEditorTabs(tabs, editorList, requestEditorCloseDecision))
-  ) {
+  if (!isEditorCloseConfirmationEnabled(useGlobalStore.getState().editorSettings)) {
+    return waitForPendingEditorTabs(tabs, editorList);
+  }
+  if (!(await confirmDirtyEditorTabs(tabs, editorList, requestEditorCloseDecision))) {
     return false;
   }
 
   return true;
 }
 
+export function waitForPendingWorkspaceEditors(tabs: IWorkspaceTab[], editorList: EditorCloseGuardMap) {
+  return waitForPendingEditorTabs(tabs, editorList);
+}
+
 export async function prepareWorkspaceEditorsForApplicationExit(
   tabs: IWorkspaceTab[],
   editorList: EditorCloseGuardMap,
diff --git a/chat2db-community-client/src/utils/editorCloseGuard.test.ts b/chat2db-community-client/src/utils/editorCloseGuard.test.ts
index a896cc2c99..421d98758d 100644
--- a/chat2db-community-client/src/utils/editorCloseGuard.test.ts
+++ b/chat2db-community-client/src/utils/editorCloseGuard.test.ts
@@ -44,6 +44,44 @@ async function run() {
   );
   assert.equal(decisionCount, 0, 'clean editors close without confirmation');
 
+  let releasePendingSave!: () => void;
+  const pendingSave = new Promise<void>((resolve) => {
+    releasePendingSave = resolve;
+  });
+  let pendingCloseResolved = false;
+  const pendingClose = confirmDirtyEditorTabs(
+    [editorOne],
+    {
+      [editorOne.id]: {
+        waitForPendingSave: () => pendingSave,
+        hasUnsavedChangesBeforeClose: () => false,
+      },
+    },
+    async () => 'cancel',
+  ).then((result) => {
+    pendingCloseResolved = true;
+    return result;
+  });
+  await Promise.resolve();
+  assert.equal(pendingCloseResolved, false, 'close waits for an in-flight save before checking dirty state');
+  releasePendingSave();
+  assert.equal(await pendingClose, true);
+
+  assert.equal(
+    await confirmDirtyEditorTabs([editorOne], {}, async () => 'discard'),
+    false,
+    'editable tabs without a close guard fail closed',
+  );
+  assert.equal(
+    await confirmDirtyEditorTabs(
+      [{ id: 'preview', type: WorkspaceTabType.LocalSQLFile, title: 'Preview', uniqueData: { filePreviewMimeType: 'image/png' } }],
+      {},
+      async () => 'cancel',
+    ),
+    true,
+    'non-editable previews do not require a close guard',
+  );
+
   const discarded = await confirmDirtyEditorTabs(
     [editorOne],
     {
@@ -131,10 +169,31 @@ async function run() {
   assert.equal(persistedDrafts, 1, 'application exit flushes recoverable console drafts');
   assert.equal(applicationExitPrompts, 1, 'only non-auto-saved editors require an application-exit prompt');
 
+  let exitPendingSaveWaited = false;
+  assert.equal(
+    await prepareEditorsForApplicationExit(
+      [editorTwo],
+      {
+        [editorTwo.id]: {
+          waitForPendingSave: async () => {
+            exitPendingSaveWaited = true;
+          },
+          hasUnsavedChangesBeforeClose: () => true,
+        },
+      },
+      async () => 'cancel',
+      false,
+    ),
+    true,
+  );
+  assert.equal(exitPendingSaveWaited, true, 'application exit drains pending saves even when prompts are disabled');
+
   const workspaceTabsSource = readFileSync('src/pages/main/workspace/components/WorkspaceTabs/index.tsx', 'utf8');
   const consoleActionSource = readFileSync('src/store/workspace/slices/console/action.ts', 'utf8');
   const editorSource = readFileSync('src/components/SQLEditor/editor/SQLEditorWithOperation/index.tsx', 'utf8');
   const confirmationSource = readFileSync('src/utils/editorCloseConfirmation.tsx', 'utf8');
+  const markdownSource = readFileSync('src/pages/main/workspace/components/WorkspaceTabs/FilePreviewTab.tsx', 'utf8');
+  const localFileTreeSource = readFileSync('src/pages/main/workspace/components/LocalSQLFileTree/index.tsx', 'utf8');
   assert.match(
     workspaceTabsSource,
     /beforeRemove=\{confirmWorkspaceTabItemsClose\}/,
@@ -152,6 +211,15 @@ async function run() {
   );
   assert.match(editorSource, /hasUnsavedChangesBeforeClose/, 'editor refs expose dirty-state detection');
   assert.match(editorSource, /saveBeforeClose/, 'editor refs expose a real save operation');
+  assert.match(markdownSource, /setEditorToList\(workspaceTabId, markdownCloseGuard\)/, 'markdown files register a close guard');
+  assert.match(localFileTreeSource, /confirmWorkspaceFileTabsBeforeRemoval/, 'file deletion checks open dirty files');
+  assert.match(localFileTreeSource, /waitForPendingWorkspaceEditors/, 'file rename waits for pending writes');
+  assert.match(markdownSource, /shortcutBindingToMonacoKeybinding/, 'markdown uses the configured save shortcut');
+  assert.doesNotMatch(
+    markdownSource,
+    /monaco\.KeyMod\.CtrlCmd\s*\|\s*monaco\.KeyCode\.KeyS/,
+    'markdown must not retain a hard-coded save shortcut',
+  );
   assert.match(
     confirmationSource,
     /const footerButtonStyle = \{ marginInlineStart: 0 \}/,
diff --git a/chat2db-community-client/src/utils/editorCloseGuard.ts b/chat2db-community-client/src/utils/editorCloseGuard.ts
index bbed4c92a9..469f846fd5 100644
--- a/chat2db-community-client/src/utils/editorCloseGuard.ts
+++ b/chat2db-community-client/src/utils/editorCloseGuard.ts
@@ -1,27 +1,53 @@
 import type { EditorSettings } from '@/components/SQLEditor';
 import type { IWorkspaceTab } from '@/typings';
+import { WorkspaceTabType } from '@/constants/workspace';
 
 export type EditorCloseDecision = 'save' | 'saved' | 'discard' | 'cancel';
 
 export interface EditorCloseGuardRef {
   hasUnsavedChangesBeforeClose?: () => boolean;
   saveBeforeClose?: () => Promise<boolean>;
+  waitForPendingSave?: () => Promise<void>;
   persistBeforeApplicationExit?: () => Promise<boolean>;
 }
 
 export type EditorCloseGuardMap = Record<string | number, EditorCloseGuardRef | undefined>;
 
+function requiresEditorCloseGuard(tab: IWorkspaceTab) {
+  return (
+    tab.type === WorkspaceTabType.CONSOLE ||
+    (tab.type === WorkspaceTabType.LocalSQLFile && !tab.uniqueData?.filePreviewMimeType)
+  );
+}
+
 export const isEditorCloseConfirmationEnabled = (settings?: Partial<EditorSettings>) =>
   settings?.confirmBeforeClose ?? true;
 
-export async function confirmDirtyEditorTabs(
+export async function waitForPendingEditorTabs(tabs: IWorkspaceTab[], editorList: EditorCloseGuardMap) {
+  for (const tab of tabs) {
+    const editor = editorList[tab.id];
+    if (!editor) {
+      if (requiresEditorCloseGuard(tab)) {
+        return false;
+      }
+      continue;
+    }
+    await editor.waitForPendingSave?.();
+  }
+  return true;
+}
+
+async function confirmDirtyEditorTabsAfterPending(
   tabs: IWorkspaceTab[],
   editorList: EditorCloseGuardMap,
   requestDecision: (tab: IWorkspaceTab, editor: EditorCloseGuardRef) => Promise<EditorCloseDecision>,
 ) {
   for (const tab of tabs) {
     const editor = editorList[tab.id];
-    if (!editor?.hasUnsavedChangesBeforeClose?.()) {
+    if (!editor) {
+      continue;
+    }
+    if (!editor.hasUnsavedChangesBeforeClose?.()) {
       continue;
     }
 
@@ -35,16 +61,29 @@ export async function confirmDirtyEditorTabs(
       }
     }
   }
-
   return true;
 }
 
+export async function confirmDirtyEditorTabs(
+  tabs: IWorkspaceTab[],
+  editorList: EditorCloseGuardMap,
+  requestDecision: (tab: IWorkspaceTab, editor: EditorCloseGuardRef) => Promise<EditorCloseDecision>,
+) {
+  if (!(await waitForPendingEditorTabs(tabs, editorList))) {
+    return false;
+  }
+  return confirmDirtyEditorTabsAfterPending(tabs, editorList, requestDecision);
+}
+
 export async function prepareEditorsForApplicationExit(
   tabs: IWorkspaceTab[],
   editorList: EditorCloseGuardMap,
   requestDecision: (tab: IWorkspaceTab, editor: EditorCloseGuardRef) => Promise<EditorCloseDecision>,
   confirmDirtyEditors: boolean,
 ) {
+  if (!(await waitForPendingEditorTabs(tabs, editorList))) {
+    return false;
+  }
   const tabsRequiringConfirmation: IWorkspaceTab[] = [];
   for (const tab of tabs) {
     const editor = editorList[tab.id];
@@ -59,5 +98,5 @@ export async function prepareEditorsForApplicationExit(
   if (!confirmDirtyEditors) {
     return true;
   }
-  return confirmDirtyEditorTabs(tabsRequiringConfirmation, editorList, requestDecision);
+  return confirmDirtyEditorTabsAfterPending(tabsRequiringConfirmation, editorList, requestDecision);
 }
diff --git a/chat2db-community-client/src/utils/file.ts b/chat2db-community-client/src/utils/file.ts
index bfc26ba753..f100bb6692 100644
--- a/chat2db-community-client/src/utils/file.ts
+++ b/chat2db-community-client/src/utils/file.ts
@@ -12,6 +12,11 @@ import type { LocalFileEncodingMetadata } from '@/utils/localFileEncoding';
 import { staticMessage } from '@chat2db/ui';
 import i18n from '@/i18n';
 import { getDownloadFilename } from './downloadFilename';
+import {
+  localFileSaveCoordinator,
+  type LocalFileSaveRequest,
+  type LocalFileSaveResult,
+} from './localFileSaveCoordinator';
 
 export type LargeCellDownloadFormat = 'raw' | 'text' | 'hex';
 
@@ -70,6 +75,19 @@ export async function downloadLargeCellValue(largeValueId: string, format: Large
 }
 
 // Update file content
+export function saveLocalFileContent(params: LocalFileSaveRequest): Promise<LocalFileSaveResult> {
+  return localFileSaveCoordinator.save(params, async (request) => {
+    const updated = await jcefApi.updateFileContent(request);
+    if (updated !== true) {
+      throw new Error('Failed to update local file');
+    }
+  });
+}
+
+export function waitForLocalFileSave(filePath: string) {
+  return localFileSaveCoordinator.waitForIdle(filePath);
+}
+
 export function updateFileContent({
   filePath,
   fileContent,
@@ -79,12 +97,7 @@ export function updateFileContent({
   filePath: string;
   fileContent: string;
 } & LocalFileEncodingMetadata) {
-  return jcefApi.updateFileContent({ filePath, fileContent, charset, bom }).then((updated) => {
-    if (updated !== true) {
-      throw new Error('Failed to update local file');
-    }
-    return updated;
-  });
+  return saveLocalFileContent({ filePath, fileContent, charset, bom }).then(() => true);
 }
 
 interface SavedDesktopFile {
diff --git a/chat2db-community-client/src/utils/localFileSaveCoordinator.test.ts b/chat2db-community-client/src/utils/localFileSaveCoordinator.test.ts
new file mode 100644
index 0000000000..24c85da392
--- /dev/null
+++ b/chat2db-community-client/src/utils/localFileSaveCoordinator.test.ts
@@ -0,0 +1,151 @@
+import assert from 'node:assert/strict';
+import { getLocalFileSaveKey, LocalFileSaveCoordinator } from './localFileSaveCoordinator';
+
+function deferred() {
+  let resolve!: () => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<void>((done, fail) => {
+    resolve = done;
+    reject = fail;
+  });
+  return { promise, resolve, reject };
+}
+
+async function testSavesAreSerializedAndCoalesced() {
+  const coordinator = new LocalFileSaveCoordinator();
+  const firstGate = deferred();
+  const calls: string[] = [];
+  const mutation = async ({ fileContent }: { fileContent: string }) => {
+    calls.push(`start:${fileContent}`);
+    if (fileContent === 'first') {
+      await firstGate.promise;
+    }
+    calls.push(`end:${fileContent}`);
+  };
+  const latestMutation = async ({ fileContent }: { fileContent: string }) => {
+    calls.push(`latest-start:${fileContent}`);
+    calls.push(`latest-end:${fileContent}`);
+  };
+
+  const first = coordinator.save({ filePath: '/tmp/query.sql', fileContent: 'first' }, mutation);
+  const second = coordinator.save({ filePath: '/tmp/query.sql', fileContent: 'second' }, latestMutation);
+  await Promise.resolve();
+  assert.deepEqual(calls, ['start:first']);
+
+  firstGate.resolve();
+  assert.deepEqual(await first, { filePath: '/tmp/query.sql', fileContent: 'second' });
+  assert.deepEqual(await second, { filePath: '/tmp/query.sql', fileContent: 'second' });
+  assert.deepEqual(calls, ['start:first', 'end:first', 'latest-start:second', 'latest-end:second']);
+}
+
+async function testDifferentPathsCanRunIndependently() {
+  const coordinator = new LocalFileSaveCoordinator();
+  const firstGate = deferred();
+  const calls: string[] = [];
+  const mutation = async ({ filePath }: { filePath: string }) => {
+    calls.push(`start:${filePath}`);
+    if (filePath.endsWith('first.sql')) {
+      await firstGate.promise;
+    }
+    calls.push(`end:${filePath}`);
+  };
+
+  const first = coordinator.save({ filePath: '/tmp/first.sql', fileContent: '1' }, mutation);
+  const second = coordinator.save({ filePath: '/tmp/second.sql', fileContent: '2' }, mutation);
+  await second;
+  assert.deepEqual(calls, ['start:/tmp/first.sql', 'start:/tmp/second.sql', 'end:/tmp/second.sql']);
+  firstGate.resolve();
+  await first;
+}
+
+async function testEquivalentPathsShareSaveOrder() {
+  const coordinator = new LocalFileSaveCoordinator(false);
+  const firstGate = deferred();
+  const calls: string[] = [];
+  const mutation = async ({ fileContent }: { fileContent: string }) => {
+    calls.push(`start:${fileContent}`);
+    if (fileContent === 'first') {
+      await firstGate.promise;
+    }
+    calls.push(`end:${fileContent}`);
+  };
+
+  const first = coordinator.save({ filePath: '/work/dir/../query.sql', fileContent: 'first' }, mutation);
+  const second = coordinator.save({ filePath: '/work/query.sql', fileContent: 'second' }, mutation);
+  await Promise.resolve();
+  assert.deepEqual(calls, ['start:first']);
+
+  firstGate.resolve();
+  assert.equal((await first).fileContent, 'second');
+  assert.equal((await second).fileContent, 'second');
+  assert.deepEqual(calls, ['start:first', 'end:first', 'start:second', 'end:second']);
+}
+
+async function testFailureRejectsCurrentBatchAndAllowsRetry() {
+  const coordinator = new LocalFileSaveCoordinator();
+  let attempts = 0;
+  const mutation = async () => {
+    attempts += 1;
+    if (attempts === 1) {
+      throw new Error('expected failure');
+    }
+  };
+
+  await assert.rejects(
+    coordinator.save({ filePath: '/tmp/failure.sql', fileContent: 'bad' }, mutation),
+    /expected failure/,
+  );
+  const result = await coordinator.save({ filePath: '/tmp/failure.sql', fileContent: 'retry' }, mutation);
+  assert.equal(result.fileContent, 'retry');
+  assert.equal(attempts, 2);
+}
+
+async function testWaitForIdleIncludesQueuedSaves() {
+  const coordinator = new LocalFileSaveCoordinator();
+  const firstGate = deferred();
+  let idle = false;
+  const mutation = async () => firstGate.promise;
+
+  const save = coordinator.save({ filePath: '/tmp/pending.sql', fileContent: 'pending' }, mutation);
+  void coordinator.waitForIdle('/tmp/pending.sql').then(() => {
+    idle = true;
+  });
+  await Promise.resolve();
+  assert.equal(idle, false, 'pending writes keep the file busy');
+
+  firstGate.resolve();
+  await save;
+  await coordinator.waitForIdle('/tmp/pending.sql');
+  assert.equal(idle, true, 'the idle barrier resolves after the save queue drains');
+}
+
+async function run() {
+  assert.equal(getLocalFileSaveKey('/work/dir/../query.sql'), '/work/query.sql');
+  assert.equal(getLocalFileSaveKey('/tmp//query.sql'), '/tmp/query.sql');
+  assert.equal(getLocalFileSaveKey('/tmp/query.sql/'), '/tmp/query.sql');
+  assert.equal(getLocalFileSaveKey('C:\\SQL\\..\\Query.sql', true), 'c:/query.sql');
+  assert.equal(getLocalFileSaveKey('\\\\SERVER\\Share\\dir\\..\\Query.sql', true), '//server/share/query.sql');
+  assert.notEqual(
+    getLocalFileSaveKey('/tmp/a\\b.sql'),
+    getLocalFileSaveKey('/tmp/a/b.sql'),
+    'POSIX backslashes must remain valid file-name characters',
+  );
+  assert.notEqual(
+    getLocalFileSaveKey('/tmp/query.sql'),
+    getLocalFileSaveKey('/tmp/query.sql '),
+    'valid trailing spaces must not merge distinct files',
+  );
+  assert.notEqual(
+    getLocalFileSaveKey('/tmp/query.sql'),
+    getLocalFileSaveKey('/tmp/query.sql.'),
+    'POSIX trailing dots remain part of the file name',
+  );
+  await testSavesAreSerializedAndCoalesced();
+  await testDifferentPathsCanRunIndependently();
+  await testEquivalentPathsShareSaveOrder();
+  await testFailureRejectsCurrentBatchAndAllowsRetry();
+  await testWaitForIdleIncludesQueuedSaves();
+  console.log('local file save coordinator tests passed');
+}
+
+void run();
diff --git a/chat2db-community-client/src/utils/localFileSaveCoordinator.ts b/chat2db-community-client/src/utils/localFileSaveCoordinator.ts
new file mode 100644
index 0000000000..9ee40d0d28
--- /dev/null
+++ b/chat2db-community-client/src/utils/localFileSaveCoordinator.ts
@@ -0,0 +1,138 @@
+export interface LocalFileSaveRequest {
+  filePath: string;
+  fileContent: string;
+  charset?: string;
+  bom?: boolean;
+}
+
+export interface LocalFileSaveResult {
+  filePath: string;
+  fileContent: string;
+}
+
+type LocalFileSaveMutation = (request: LocalFileSaveRequest) => Promise<unknown>;
+
+interface SaveWaiter {
+  resolve: (result: LocalFileSaveResult) => void;
+  reject: (error: unknown) => void;
+}
+
+interface PendingSave {
+  request: LocalFileSaveRequest;
+  mutation: LocalFileSaveMutation;
+  waiters: SaveWaiter[];
+}
+
+interface FileSaveState {
+  pending?: PendingSave;
+  draining: boolean;
+  idle: Promise<void>;
+  resolveIdle: () => void;
+}
+
+export function getLocalFileSaveKey(filePath: string, isWindows = false) {
+  const path = isWindows ? filePath.replace(/\\/g, '/') : filePath;
+  const drive = isWindows ? /^([a-zA-Z]:)(\/?)(.*)$/.exec(path) : null;
+  const unc = isWindows && path.startsWith('//');
+  const absolute = unc || !!drive?.[2] || (!drive && path.startsWith('/'));
+  const prefix = unc ? '//' : drive?.[1] || (absolute ? '/' : '');
+  const remainder = unc ? path.replace(/^\/+/, '') : drive ? drive[3] : path.replace(/^\/+/, '');
+  const minimumDepth = unc ? 2 : 0;
+  const segments: string[] = [];
+
+  remainder.split('/').forEach((segment) => {
+    if (!segment || segment === '.') {
+      return;
+    }
+    if (segment === '..') {
+      if (segments.length > minimumDepth && segments[segments.length - 1] !== '..') {
+        segments.pop();
+      } else if (!absolute) {
+        segments.push(segment);
+      }
+      return;
+    }
+    segments.push(segment);
+  });
+
+  const separator = drive && absolute ? '/' : '';
+  const normalizedPath = `${prefix}${separator}${segments.join('/')}`;
+  return isWindows ? normalizedPath.toLowerCase() : normalizedPath;
+}
+
+export class LocalFileSaveCoordinator {
+  private readonly states = new Map<string, FileSaveState>();
+
+  constructor(private readonly isWindows = false) {}
+
+  save(request: LocalFileSaveRequest, mutation: LocalFileSaveMutation) {
+    const key = getLocalFileSaveKey(request.filePath, this.isWindows);
+    let state = this.states.get(key);
+    if (!state) {
+      let resolveIdle!: () => void;
+      const idle = new Promise<void>((resolve) => {
+        resolveIdle = resolve;
+      });
+      state = { draining: false, idle, resolveIdle };
+      this.states.set(key, state);
+    }
+
+    return new Promise<LocalFileSaveResult>((resolve, reject) => {
+      if (state!.pending) {
+        state!.pending.request = request;
+        state!.pending.mutation = mutation;
+        state!.pending.waiters.push({ resolve, reject });
+      } else {
+        state!.pending = {
+          request,
+          mutation,
+          waiters: [{ resolve, reject }],
+        };
+      }
+      if (!state!.draining) {
+        state!.draining = true;
+        void this.drain(key, state!);
+      }
+    });
+  }
+
+  waitForIdle(filePath: string) {
+    return this.states.get(getLocalFileSaveKey(filePath, this.isWindows))?.idle ?? Promise.resolve();
+  }
+
+  private async drain(key: string, state: FileSaveState) {
+    while (state.pending) {
+      const pending = state.pending;
+      state.pending = undefined;
+      try {
+        await pending.mutation(pending.request);
+        if (state.pending) {
+          state.pending.waiters.push(...pending.waiters);
+          continue;
+        }
+        const result = {
+          filePath: pending.request.filePath,
+          fileContent: pending.request.fileContent,
+        };
+        pending.waiters.forEach(({ resolve }) => resolve(result));
+      } catch (error) {
+        if (state.pending) {
+          state.pending.waiters.push(...pending.waiters);
+          continue;
+        }
+        pending.waiters.forEach(({ reject }) => reject(error));
+      }
+    }
+
+    state.draining = false;
+    state.resolveIdle();
+    if (!state.pending) {
+      this.states.delete(key);
+    }
+  }
+}
+
+const isWindowsRuntime =
+  typeof navigator !== 'undefined' && /windows|win32|wow32|win64|wow64/i.test(navigator.userAgent);
+
+export const localFileSaveCoordinator = new LocalFileSaveCoordinator(isWindowsRuntime);
diff --git a/chat2db-community-client/src/utils/monaco.test.ts b/chat2db-community-client/src/utils/monaco.test.ts
index 03708852dc..a70038e518 100644
--- a/chat2db-community-client/src/utils/monaco.test.ts
+++ b/chat2db-community-client/src/utils/monaco.test.ts
@@ -10,6 +10,8 @@ const run = async () => {
   assert.equal(isMonacoCancellationError('Canceled'), true);
   assert.equal(isMonacoCancellationError({ name: 'Canceled', message: 'Canceled' }), true);
   assert.equal(isMonacoCancellationError(new Error('Canceled')), true);
+  assert.equal(isMonacoCancellationError(Object.assign(new Error('Canceled'), { code: 'ERR_CANCELED' })), true);
+  assert.equal(isMonacoCancellationError({ name: 'CanceledError' }), true);
   assert.equal(isMonacoCancellationError(new Error('boom')), false);
   assert.equal(isSuggestWidgetVisible(null), false);
   assert.equal(isSuggestWidgetVisible({ getContribution: () => null }), false);
diff --git a/chat2db-community-client/src/utils/monaco.ts b/chat2db-community-client/src/utils/monaco.ts
index 6b5a48b7a4..d1d8064dbb 100644
--- a/chat2db-community-client/src/utils/monaco.ts
+++ b/chat2db-community-client/src/utils/monaco.ts
@@ -30,16 +30,22 @@ const createWorkerProxyUrl = (workerUrl: string) => {
 };
 
 export const isMonacoCancellationError = (reason: unknown) => {
-  if (reason === 'Canceled') {
-    return true;
+  if (typeof reason === 'string') {
+    return reason === 'Canceled' || reason === 'CanceledError';
   }
 
   if (!reason || typeof reason !== 'object') {
     return false;
   }
 
-  const error = reason as { name?: unknown; message?: unknown };
-  return error.name === 'Canceled' || error.message === 'Canceled';
+  const error = reason as { name?: unknown; message?: unknown; code?: unknown };
+  return (
+    error.name === 'Canceled' ||
+    error.name === 'CanceledError' ||
+    error.message === 'Canceled' ||
+    error.message === 'CanceledError' ||
+    error.code === 'ERR_CANCELED'
+  );
 };
 
 export const runMonacoDisposalSafely = (task: () => unknown) => {
diff --git a/chat2db-community-client/src/utils/savedConsoleDirty.test.ts b/chat2db-community-client/src/utils/savedConsoleDirty.test.ts
new file mode 100644
index 0000000000..0743d2df5a
--- /dev/null
+++ b/chat2db-community-client/src/utils/savedConsoleDirty.test.ts
@@ -0,0 +1,17 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { hasUnsavedSavedConsoleChanges } from './savedConsoleDirty';
+
+assert.equal(hasUnsavedSavedConsoleChanges('', false, ''), false);
+assert.equal(hasUnsavedSavedConsoleChanges('select 1', false, ''), true);
+assert.equal(hasUnsavedSavedConsoleChanges('select 1', true, 'select 1'), false);
+assert.equal(hasUnsavedSavedConsoleChanges('', true, 'select 1'), true);
+assert.equal(hasUnsavedSavedConsoleChanges('', true, ''), false);
+
+const saveEditorDataSource = readFileSync('src/components/SQLEditor/hooks/useSaveEditorData.ts', 'utf8');
+assert.doesNotMatch(
+  saveEditorDataSource,
+  /lastSyncConsole\.current\s*=\s*null/,
+  'tab activation changes must preserve the persisted console baseline',
+);
+console.log('saved console dirty tests passed');
diff --git a/chat2db-community-client/src/utils/savedConsoleDirty.ts b/chat2db-community-client/src/utils/savedConsoleDirty.ts
new file mode 100644
index 0000000000..30d25437a5
--- /dev/null
+++ b/chat2db-community-client/src/utils/savedConsoleDirty.ts
@@ -0,0 +1,10 @@
+export function hasUnsavedSavedConsoleChanges(
+  value: string,
+  hasSavedSqlRecord: boolean,
+  lastSyncValue: string,
+) {
+  if (!hasSavedSqlRecord) {
+    return Boolean(value.trim());
+  }
+  return value !== lastSyncValue;
+}
diff --git a/chat2db-community-client/src/utils/shortcutDispatch.test.ts b/chat2db-community-client/src/utils/shortcutDispatch.test.ts
new file mode 100644
index 0000000000..b25718193e
--- /dev/null
+++ b/chat2db-community-client/src/utils/shortcutDispatch.test.ts
@@ -0,0 +1,87 @@
+import assert from 'node:assert/strict';
+
+const globalObj = globalThis as unknown as Record<string, unknown>;
+globalObj.__RUNTIME_ENV__ = 'community';
+globalObj.__ENV__ = 'test';
+globalObj.window = {};
+
+if (typeof globalThis.navigator === 'undefined') {
+  Object.defineProperty(globalThis, 'navigator', {
+    value: { userAgent: 'Mac' },
+    configurable: true,
+  });
+}
+
+async function run() {
+  const [{ getEffectiveShortcutConfigMap, ShortcutAction, ShortcutScope }, { resolveShortcutDispatch }] =
+    await Promise.all([import('@/constants/shortcut'), import('./shortcutDispatch')]);
+  const event = {
+    key: 's',
+    code: 'KeyS',
+    metaKey: false,
+    ctrlKey: true,
+    altKey: false,
+    shiftKey: false,
+  } as KeyboardEvent;
+  const shortcutConfig = getEffectiveShortcutConfigMap({
+    [ShortcutAction.SqlSave]: { binding: 'Ctrl + S' },
+  });
+
+  assert.deepEqual(
+    resolveShortcutDispatch(event, shortcutConfig, { editableTarget: false, workspaceSaveAllowed: true }),
+    { kind: 'workspace-save' },
+    'non-editor workspace focus routes the save shortcut to the active editor',
+  );
+  assert.equal(
+    resolveShortcutDispatch(event, shortcutConfig, { editableTarget: true, workspaceSaveAllowed: true }),
+    undefined,
+    'editor-owned shortcuts remain inside the editor',
+  );
+  assert.equal(
+    resolveShortcutDispatch(event, shortcutConfig, { editableTarget: false, workspaceSaveAllowed: false }),
+    undefined,
+    'workspace save must not affect a hidden editor from another page',
+  );
+
+  const conflictingConfig = getEffectiveShortcutConfigMap({
+    [ShortcutAction.SqlSave]: { binding: 'Ctrl + S' },
+    [ShortcutAction.SwitchToChat]: { binding: 'Ctrl + S' },
+  });
+  assert.deepEqual(
+    resolveShortcutDispatch(event, conflictingConfig, { editableTarget: false, workspaceSaveAllowed: true }),
+    { kind: 'global', action: ShortcutAction.SwitchToChat },
+    'global shortcuts retain precedence over a SQL-editor shortcut with the same binding',
+  );
+
+  const fileTreeConfig = getEffectiveShortcutConfigMap({
+    [ShortcutAction.SqlSave]: { binding: 'Ctrl + S' },
+    [ShortcutAction.LocalSqlFileTreeDelete]: { binding: 'Ctrl + S' },
+  });
+  assert.equal(
+    resolveShortcutDispatch(event, fileTreeConfig, {
+      activeScope: ShortcutScope.LocalSqlFileTree,
+      editableTarget: false,
+      workspaceSaveAllowed: true,
+    }),
+    undefined,
+    'a focused scope owns its binding before the workspace save fallback',
+  );
+
+  const resultSetConfig = getEffectiveShortcutConfigMap({
+    [ShortcutAction.SqlSave]: { binding: 'Ctrl + S' },
+    [ShortcutAction.ResultSubmit]: { binding: 'Ctrl + S' },
+  });
+  assert.equal(
+    resolveShortcutDispatch(event, resultSetConfig, {
+      activeScope: ShortcutScope.ResultSet,
+      editableTarget: false,
+      workspaceSaveAllowed: true,
+    }),
+    undefined,
+    'the result set submit shortcut must not fall through to workspace console save',
+  );
+
+  console.log('shortcut dispatch tests passed');
+}
+
+void run();
diff --git a/chat2db-community-client/src/utils/shortcutDispatch.ts b/chat2db-community-client/src/utils/shortcutDispatch.ts
index b70ed768eb..a4c44f0804 100644
--- a/chat2db-community-client/src/utils/shortcutDispatch.ts
+++ b/chat2db-community-client/src/utils/shortcutDispatch.ts
@@ -1,4 +1,9 @@
-import { ShortcutAction } from '@/constants/shortcut';
+import {
+  ShortcutAction,
+  ShortcutScope,
+  isShortcutEventMatch,
+  type EffectiveShortcutConfig,
+} from '@/constants/shortcut';
 import { canHandleWebFrameZoom } from './jcefZoom';
 
 const WEB_FRAME_ZOOM_ACTIONS = new Set<ShortcutAction>([
@@ -7,6 +12,57 @@ const WEB_FRAME_ZOOM_ACTIONS = new Set<ShortcutAction>([
   ShortcutAction.ZoomReset,
 ]);
 
+export type ShortcutDispatchResolution =
+  | { kind: 'global'; action: ShortcutAction }
+  | { kind: 'workspace-save' };
+
+export function resolveShortcutDispatch(
+  event: KeyboardEvent,
+  shortcutConfig: Record<ShortcutAction, EffectiveShortcutConfig>,
+  options: {
+    activeScope?: ShortcutScope;
+    editableTarget: boolean;
+    workspaceSaveAllowed: boolean;
+  },
+): ShortcutDispatchResolution | undefined {
+  const scopedShortcut = options.activeScope
+    ? Object.values(shortcutConfig).find(
+        (config) =>
+          config.scope === options.activeScope &&
+          !config.disabled &&
+          isShortcutEventMatch(event, config.binding),
+      )
+    : undefined;
+  if (scopedShortcut) {
+    return undefined;
+  }
+
+  const globalShortcut = Object.values(shortcutConfig).find(
+    (config) =>
+      config.scope === ShortcutScope.Global &&
+      !config.disabled &&
+      isShortcutEventMatch(event, config.binding),
+  );
+  if (globalShortcut) {
+    if (options.editableTarget && !globalShortcut.allowInEditable) {
+      return undefined;
+    }
+    return { kind: 'global', action: globalShortcut.action };
+  }
+
+  const saveShortcut = shortcutConfig[ShortcutAction.SqlSave];
+  if (
+    !options.editableTarget &&
+    options.workspaceSaveAllowed &&
+    !saveShortcut.disabled &&
+    isShortcutEventMatch(event, saveShortcut.binding)
+  ) {
+    return { kind: 'workspace-save' };
+  }
+
+  return undefined;
+}
+
 export function prepareGlobalShortcutHandling(
   event: Pick<KeyboardEvent, 'preventDefault'>,
   action: ShortcutAction,
diff --git a/chat2db-community-client/src/utils/shortcutManager.ts b/chat2db-community-client/src/utils/shortcutManager.ts
index 5a5dbcfd96..3339c5a3f0 100644
--- a/chat2db-community-client/src/utils/shortcutManager.ts
+++ b/chat2db-community-client/src/utils/shortcutManager.ts
@@ -7,12 +7,11 @@ import {
   ShortcutOverrides,
   ShortcutScope,
   getEffectiveShortcutConfigMap,
-  isShortcutEventMatch,
 } from '@/constants/shortcut';
 import { useAIStore } from '@/store/ai';
 import { requestCloseActiveResultTab } from '@/service/resultTabShortcut';
 import { handleWebFrameZoom, WebFrameZoomType } from './jcefZoom';
-import { prepareGlobalShortcutHandling } from './shortcutDispatch';
+import { prepareGlobalShortcutHandling, resolveShortcutDispatch } from './shortcutDispatch';
 import { AppTitleBarAction, requestAppTitleBarAction } from './appTitleBarAction';
 
 const NON_TEXT_INPUT_TYPES = new Set([
@@ -49,6 +48,18 @@ function isEditableElement(target: EventTarget | null): boolean {
   return editable.isContentEditable;
 }
 
+function getShortcutScope(target: EventTarget | null) {
+  if (!(target instanceof HTMLElement)) {
+    return undefined;
+  }
+  const scope = target.closest<HTMLElement>('[data-shortcut-scope]')?.dataset.shortcutScope;
+  return Object.values(ShortcutScope).includes(scope as ShortcutScope) ? (scope as ShortcutScope) : undefined;
+}
+
+function isWorkspaceSaveSurface(target: EventTarget | null) {
+  return target instanceof HTMLElement && !!target.closest('[data-workspace-shortcut-surface="true"]');
+}
+
 class ShortcutManager {
   private static instance: ShortcutManager;
   private cleanup: (() => void) | null = null;
@@ -104,6 +115,18 @@ class ShortcutManager {
     handelCreateConsole();
   }
 
+  private handleSaveActiveWorkspaceTab(): void {
+    const { activeConsoleId, editorList } = useWorkspaceStore.getState();
+    const editor =
+      activeConsoleId === null || activeConsoleId === undefined ? undefined : editorList?.[activeConsoleId];
+    if (!editor?.saveBeforeClose) {
+      return;
+    }
+    void editor.saveBeforeClose().catch((error) => {
+      console.error('active workspace save failed', error);
+    });
+  }
+
   private handleArouseAIAssistant(): void {
     const { showPanel, setShowPanel } = useAIStore.getState();
     setShowPanel(!showPanel);
@@ -159,22 +182,26 @@ class ShortcutManager {
   private handleKeyDown = (e: KeyboardEvent): void => {
     const isFromEditable = isEditableElement(e.target);
 
-    const { shortcutOverrides } = useGlobalStore.getState();
+    const { shortcutOverrides, mainPageActiveTab, settingPageActiveTab } = useGlobalStore.getState();
     const shortcutConfig = getEffectiveShortcutConfigMap(shortcutOverrides as ShortcutOverrides);
-
-    const matchedConfig = Object.values(shortcutConfig).find((config) => {
-      return config.scope === ShortcutScope.Global && !config.disabled && isShortcutEventMatch(e, config.binding);
+    const resolution = resolveShortcutDispatch(e, shortcutConfig, {
+      activeScope: getShortcutScope(e.target),
+      editableTarget: isFromEditable,
+      workspaceSaveAllowed:
+        mainPageActiveTab === 'workspace' &&
+        settingPageActiveTab === false &&
+        isWorkspaceSaveSurface(e.target),
     });
-
-    if (!matchedConfig) {
+    if (!resolution) {
       return;
     }
-
-    if (isFromEditable && !matchedConfig.allowInEditable) {
+    if (resolution.kind === 'workspace-save') {
+      e.preventDefault();
+      this.handleSaveActiveWorkspaceTab();
       return;
     }
 
-    const action = matchedConfig.action as ShortcutAction;
+    const action = resolution.action;
 
     if (!prepareGlobalShortcutHandling(e, action)) {
       return;
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/ai/AiBusinessContextResult.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/ai/AiBusinessContextResult.java
deleted file mode 100644
index d9ff5d66c7..0000000000
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/ai/AiBusinessContextResult.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package ai.chat2db.community.domain.api.model.ai;
-
-import ai.chat2db.community.domain.api.model.request.ai.AiSelectedKnowledge;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class AiBusinessContextResult {
-
-    private String structuredContext;
-
-    private List<AiSelectedKnowledge> selectedKnowledge = new ArrayList<>();
-
-    public static AiBusinessContextResult empty() {
-        return new AiBusinessContextResult(null, List.of());
-    }
-}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/ai/AiChatMessage.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/ai/AiChatMessage.java
index 6fc0641a83..c52b03b657 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/ai/AiChatMessage.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/ai/AiChatMessage.java
@@ -1,6 +1,6 @@
 package ai.chat2db.community.domain.api.model.ai;
 
-import ai.chat2db.community.domain.api.model.request.ai.AiSelectedKnowledge;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -8,6 +8,7 @@
 import java.util.List;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AiChatMessage {
 
     private String id;
@@ -22,7 +23,5 @@ public class AiChatMessage {
 
     private List<ChatAttachment> attachments = new ArrayList<>();
 
-    private List<AiSelectedKnowledge> selectedKnowledge = new ArrayList<>();
-
     private LocalDateTime gmtCreate;
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/datasource/SSHInfo.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/datasource/SSHInfo.java
index a043bcf759..e8e5600300 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/datasource/SSHInfo.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/datasource/SSHInfo.java
@@ -81,4 +81,14 @@ public int hashCode() {
         return Objects.hash(use, hostName, port, userName, localPort, authenticationType, password, keyFile, passphrase,
             rHost, rPort);
     }
+
+    @Override
+    public String toString() {
+        // Exclude password/passphrase/keyFile so SSH connection/port-forwarding error
+        // logs do not leak credentials. Lombok @Data would otherwise include them.
+        return "SSHInfo(use=" + use + ", hostName=" + hostName + ", port=" + port
+                + ", userName=" + userName + ", localPort=" + localPort
+                + ", authenticationType=" + authenticationType
+                + ", rHost=" + rHost + ", rPort=" + rPort + ")";
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/db/ImportPreview.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/db/ImportPreview.java
new file mode 100644
index 0000000000..834dca5fdf
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/db/ImportPreview.java
@@ -0,0 +1,28 @@
+package ai.chat2db.community.domain.api.model.db;
+
+import ai.chat2db.community.domain.api.model.task.ImportColumnMapping;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImportPreview {
+
+    private List<String> sourceColumns;
+
+    private List<List<String>> previewData;
+
+    private String targetTableName;
+
+    private List<ImportTargetColumn> targetColumns;
+
+    private List<ImportColumnMapping> suggestedMapping;
+
+    private int previewLimit;
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/db/ImportTargetColumn.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/db/ImportTargetColumn.java
new file mode 100644
index 0000000000..a733d2ccac
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/db/ImportTargetColumn.java
@@ -0,0 +1,25 @@
+package ai.chat2db.community.domain.api.model.db;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImportTargetColumn {
+
+    private String name;
+
+    private String dataType;
+
+    private boolean nullable;
+
+    private boolean autoIncrement;
+
+    private String defaultValue;
+
+    private String comment;
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/db/MappedImportExecution.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/db/MappedImportExecution.java
new file mode 100644
index 0000000000..79354248c0
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/db/MappedImportExecution.java
@@ -0,0 +1,34 @@
+package ai.chat2db.community.domain.api.model.db;
+
+import ai.chat2db.community.domain.api.model.task.ImportColumnMapping;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.domain.api.model.task.UnmappedTargetStrategy;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MappedImportExecution {
+
+    private Long dataSourceId;
+
+    private String databaseName;
+
+    private String schemaName;
+
+    private String tableName;
+
+    private String fileId;
+
+    private CsvOptions csvOptions;
+
+    private List<ImportColumnMapping> mappings;
+
+    private UnmappedTargetStrategy unmappedTarget;
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/metadata/TableColumn.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/metadata/TableColumn.java
index 656ee2ce49..22fc48dda7 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/metadata/TableColumn.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/metadata/TableColumn.java
@@ -161,6 +161,8 @@ public class TableColumn implements Serializable {
 
     private Boolean generatedColumn;
 
+    private Boolean visible;
+
 
     private String extent;
 
@@ -185,11 +187,11 @@ public boolean equals(Object o) {
         if (this == o) { return true;}
         if (o == null || getClass() != o.getClass()) { return false;}
         TableColumn that = (TableColumn) o;
-        return Objects.equals(name, that.name) && Objects.equals(tableName, that.tableName) && Objects.equals(columnType, that.columnType) && Objects.equals(defaultValue, that.defaultValue) && Objects.equals(autoIncrement, that.autoIncrement) && Objects.equals(comment, that.comment) && Objects.equals(columnSize, that.columnSize) && Objects.equals(decimalDigits, that.decimalDigits) && Objects.equals(numPrecRadix, that.numPrecRadix) && Objects.equals(sqlDataType, that.sqlDataType) && Objects.equals(ordinalPosition, that.ordinalPosition) && Objects.equals(nullable, that.nullable) && Objects.equals(extent, that.extent) && Objects.equals(charSetName, that.charSetName) && Objects.equals(collationName, that.collationName) && Objects.equals(value, that.value) && Objects.equals(unit, that.unit) && Objects.equals(sparse, that.sparse) && Objects.equals(defaultConstraintName, that.defaultConstraintName) && Objects.equals(seed, that.seed) && Objects.equals(increment, that.increment);
+        return Objects.equals(name, that.name) && Objects.equals(tableName, that.tableName) && Objects.equals(columnType, that.columnType) && Objects.equals(defaultValue, that.defaultValue) && Objects.equals(autoIncrement, that.autoIncrement) && Objects.equals(comment, that.comment) && Objects.equals(columnSize, that.columnSize) && Objects.equals(decimalDigits, that.decimalDigits) && Objects.equals(numPrecRadix, that.numPrecRadix) && Objects.equals(sqlDataType, that.sqlDataType) && Objects.equals(ordinalPosition, that.ordinalPosition) && Objects.equals(nullable, that.nullable) && Objects.equals(visible, that.visible) && Objects.equals(extent, that.extent) && Objects.equals(charSetName, that.charSetName) && Objects.equals(collationName, that.collationName) && Objects.equals(value, that.value) && Objects.equals(unit, that.unit) && Objects.equals(sparse, that.sparse) && Objects.equals(defaultConstraintName, that.defaultConstraintName) && Objects.equals(seed, that.seed) && Objects.equals(increment, that.increment);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, tableName, columnType, defaultValue, autoIncrement, comment, columnSize, decimalDigits, numPrecRadix, sqlDataType, ordinalPosition, nullable, extent, charSetName, collationName, value, unit, sparse, defaultConstraintName, seed, increment);
+        return Objects.hash(name, tableName, columnType, defaultValue, autoIncrement, comment, columnSize, decimalDigits, numPrecRadix, sqlDataType, ordinalPosition, nullable, visible, extent, charSetName, collationName, value, unit, sparse, defaultConstraintName, seed, increment);
     }
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/metadata/TableIndex.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/metadata/TableIndex.java
index 1f4016e73e..65d5d7b835 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/metadata/TableIndex.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/metadata/TableIndex.java
@@ -72,8 +72,7 @@ public class TableIndex implements Serializable {
 
     private String method;
 
-
-
+    private Boolean visible;
 
 
     private String foreignSchemaName;
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiBusinessContextBuildRequest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiBusinessContextBuildRequest.java
deleted file mode 100644
index d2bd8ca446..0000000000
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiBusinessContextBuildRequest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package ai.chat2db.community.domain.api.model.request.ai;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class AiBusinessContextBuildRequest {
-
-    private Long dataSourceId;
-
-    private String databaseName;
-
-    private String schemaName;
-
-    private List<AiSelectedKnowledge> selectedKnowledge = new ArrayList<>();
-}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiChatMessageAddRequest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiChatMessageAddRequest.java
index d5f2074332..4b92c3775f 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiChatMessageAddRequest.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiChatMessageAddRequest.java
@@ -25,5 +25,4 @@ public class AiChatMessageAddRequest {
 
     private List<ChatAttachment> attachments;
 
-    private List<AiSelectedKnowledge> selectedKnowledge;
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiSelectedKnowledge.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiSelectedKnowledge.java
deleted file mode 100644
index 095433ef16..0000000000
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/ai/AiSelectedKnowledge.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ai.chat2db.community.domain.api.model.request.ai;
-
-import lombok.Data;
-
-@Data
-public class AiSelectedKnowledge {
-
-    private Long id;
-
-    private String type;
-
-    private String key;
-
-    private String value;
-}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/operation/OpsOperationLogPageQueryRequest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/operation/OpsOperationLogPageQueryRequest.java
index b6047f40e3..e12ebcc305 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/operation/OpsOperationLogPageQueryRequest.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/request/operation/OpsOperationLogPageQueryRequest.java
@@ -24,4 +24,7 @@ public class OpsOperationLogPageQueryRequest extends PageQueryParam {
 
 
     private String schemaName;
+
+
+    private String operationType;
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/CsvOptions.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/CsvOptions.java
new file mode 100644
index 0000000000..a8a05f7ccb
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/CsvOptions.java
@@ -0,0 +1,258 @@
+package ai.chat2db.community.domain.api.model.task;
+
+import ai.chat2db.community.tools.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.nio.charset.Charset;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CsvOptions {
+
+    public static final String DEFAULT_ENCODING = "UTF-8";
+    public static final String AUTO_ENCODING = "AUTO";
+    public static final String DEFAULT_DELIMITER = ",";
+    public static final String DEFAULT_QUOTE = "\"";
+    public static final String DEFAULT_ESCAPE = "\"";
+    public static final String DEFAULT_NEWLINE = "LF";
+    public static final String DEFAULT_DATE_ORDER = "YMD";
+    public static final String DEFAULT_DATE_TIME_ORDER = "DATE_TIME";
+    public static final String DEFAULT_DATE_DELIMITER = "-";
+    public static final String DEFAULT_TIME_DELIMITER = ":";
+    public static final String DEFAULT_DECIMAL_SYMBOL = ".";
+
+    private static final Set<String> SUPPORTED_NEWLINES = Set.of("LF", "CRLF", "CR");
+    private static final Set<String> SUPPORTED_DATE_ORDERS = Set.of("YMD", "YDM", "MDY", "MYD", "DMY", "DYM");
+    private static final Set<String> SUPPORTED_DATE_TIME_ORDERS = Set.of(
+            "DATE_TIME", "TIME_DATE", "DATE_TIME_TIMEZONE", "TIME_DATE_TIMEZONE", "TIME_TIMEZONE_DATE");
+
+    private String encoding;
+
+    private String delimiter;
+
+    private String quote;
+
+    private String escape;
+
+    private String newline;
+
+    private Boolean hasHeader;
+
+    private Boolean emptyAsNull;
+
+    private Integer headerRow;
+
+    private Integer dataStartRow;
+
+    private Integer dataEndRow;
+
+    private String dateOrder;
+
+    private String dateTimeOrder;
+
+    private String dateDelimiter;
+
+    private String yearDelimiter;
+
+    private String timeDelimiter;
+
+    private String decimalSymbol;
+
+    public static CsvOptions defaults() {
+        return CsvOptions.builder()
+                .encoding(DEFAULT_ENCODING)
+                .delimiter(DEFAULT_DELIMITER)
+                .quote(DEFAULT_QUOTE)
+                .escape(DEFAULT_ESCAPE)
+                .newline(DEFAULT_NEWLINE)
+                .hasHeader(true)
+                .emptyAsNull(true)
+                .headerRow(1)
+                .dataStartRow(2)
+                .dateOrder(DEFAULT_DATE_ORDER)
+                .dateTimeOrder(DEFAULT_DATE_TIME_ORDER)
+                .dateDelimiter(DEFAULT_DATE_DELIMITER)
+                .yearDelimiter(DEFAULT_DATE_DELIMITER)
+                .timeDelimiter(DEFAULT_TIME_DELIMITER)
+                .decimalSymbol(DEFAULT_DECIMAL_SYMBOL)
+                .build();
+    }
+
+    public static CsvOptions fromMap(Map<String, Object> values) {
+        CsvOptions defaults = defaults();
+        if (values == null || values.isEmpty()) {
+            return defaults.validate();
+        }
+        CsvOptions options = CsvOptions.builder()
+                .encoding(stringValue(values.get("encoding"), defaults.getEncoding()))
+                .delimiter(stringValue(values.get("delimiter"), defaults.getDelimiter()))
+                .quote(stringValue(values.get("quote"), defaults.getQuote()))
+                .escape(stringValue(values.get("escape"), defaults.getEscape()))
+                .newline(stringValue(values.get("newline"), defaults.getNewline()))
+                .hasHeader(booleanValue(values.get("hasHeader"), defaults.getHasHeader()))
+                .emptyAsNull(booleanValue(values.get("emptyAsNull"), defaults.getEmptyAsNull()))
+                .headerRow(integerValue(values.get("headerRow")))
+                .dataStartRow(integerValue(values.get("dataStartRow")))
+                .dataEndRow(integerValue(values.get("dataEndRow")))
+                .dateOrder(stringValue(values.get("dateOrder"), defaults.getDateOrder()))
+                .dateTimeOrder(stringValue(values.get("dateTimeOrder"), defaults.getDateTimeOrder()))
+                .dateDelimiter(stringValue(values.get("dateDelimiter"), defaults.getDateDelimiter()))
+                .yearDelimiter(stringValue(values.get("yearDelimiter"), defaults.getYearDelimiter()))
+                .timeDelimiter(stringValue(values.get("timeDelimiter"), defaults.getTimeDelimiter()))
+                .decimalSymbol(stringValue(values.get("decimalSymbol"), defaults.getDecimalSymbol()))
+                .build();
+        return options.validate();
+    }
+
+    public CsvOptions validate() {
+        CsvOptions options;
+        try {
+            options = normalized();
+        } catch (Exception e) {
+            throw new BusinessException("import.preview.invalidEncoding", new Object[]{encoding}, e);
+        }
+        if (!isSingleTextCharacter(options.delimiter)
+                || !SUPPORTED_NEWLINES.contains(options.newline)
+                || !isSingleTextCharacter(options.quote)
+                || !isSingleTextCharacter(options.escape)
+                || options.delimiter.equals(options.quote)
+                || options.delimiter.equals(options.escape)
+                || !SUPPORTED_DATE_ORDERS.contains(options.dateOrder)
+                || !SUPPORTED_DATE_TIME_ORDERS.contains(options.dateTimeOrder)
+                || !isSingleTextCharacter(options.dateDelimiter)
+                || !isSingleTextCharacter(options.yearDelimiter)
+                || !isSingleTextCharacter(options.timeDelimiter)
+                || !(".".equals(options.decimalSymbol) || ",".equals(options.decimalSymbol))
+                || options.headerRow < 1 || options.dataStartRow < 1
+                || options.dataEndRow != null && options.dataEndRow < options.dataStartRow
+                || Boolean.TRUE.equals(options.hasHeader) && options.headerRow >= options.dataStartRow) {
+            throw new BusinessException("import.preview.invalidCsvOptions");
+        }
+        if (!AUTO_ENCODING.equals(options.encoding)) {
+            try {
+                Charset.forName(options.encoding);
+            } catch (Exception e) {
+                throw new BusinessException("import.preview.invalidEncoding", new Object[]{options.encoding}, e);
+            }
+        }
+        return options;
+    }
+
+    public Map<String, Object> toMap() {
+        CsvOptions options = validate();
+        Map<String, Object> values = new LinkedHashMap<>();
+        values.put("encoding", options.encoding);
+        values.put("delimiter", options.delimiter);
+        values.put("quote", options.quote);
+        values.put("escape", options.escape);
+        values.put("newline", options.newline);
+        values.put("hasHeader", options.hasHeader);
+        values.put("emptyAsNull", options.emptyAsNull);
+        values.put("headerRow", options.headerRow);
+        values.put("dataStartRow", options.dataStartRow);
+        values.put("dataEndRow", options.dataEndRow);
+        values.put("dateOrder", options.dateOrder);
+        values.put("dateTimeOrder", options.dateTimeOrder);
+        values.put("dateDelimiter", options.dateDelimiter);
+        values.put("yearDelimiter", options.yearDelimiter);
+        values.put("timeDelimiter", options.timeDelimiter);
+        values.put("decimalSymbol", options.decimalSymbol);
+        return values;
+    }
+
+    public String rowSeparator() {
+        return switch (validate().newline) {
+            case "CRLF" -> "\r\n";
+            case "CR" -> "\r";
+            default -> "\n";
+        };
+    }
+
+    private CsvOptions normalized() {
+        CsvOptions defaults = defaults();
+        boolean normalizedHasHeader = hasHeader == null ? defaults.hasHeader : hasHeader;
+        int normalizedHeaderRow = headerRow == null ? defaults.headerRow : headerRow;
+        int normalizedDataStartRow = dataStartRow == null
+                ? (normalizedHasHeader ? normalizedHeaderRow + 1 : 1) : dataStartRow;
+        return CsvOptions.builder()
+                .encoding(normalizeEncoding(StringUtils.defaultIfBlank(encoding, defaults.encoding)))
+                .delimiter(StringUtils.defaultIfEmpty(delimiter, defaults.delimiter))
+                .quote(StringUtils.defaultIfEmpty(quote, defaults.quote))
+                .escape(StringUtils.defaultIfEmpty(escape, defaults.escape))
+                .newline(StringUtils.defaultIfBlank(newline, defaults.newline).trim().toUpperCase(Locale.ROOT))
+                .hasHeader(normalizedHasHeader)
+                .emptyAsNull(emptyAsNull == null ? defaults.emptyAsNull : emptyAsNull)
+                .headerRow(normalizedHeaderRow)
+                .dataStartRow(normalizedDataStartRow)
+                .dataEndRow(dataEndRow)
+                .dateOrder(normalizeOption(dateOrder, defaults.dateOrder))
+                .dateTimeOrder(normalizeOption(dateTimeOrder, defaults.dateTimeOrder))
+                .dateDelimiter(StringUtils.defaultIfEmpty(dateDelimiter, defaults.dateDelimiter))
+                .yearDelimiter(StringUtils.defaultIfEmpty(yearDelimiter,
+                        StringUtils.defaultIfEmpty(dateDelimiter, defaults.dateDelimiter)))
+                .timeDelimiter(StringUtils.defaultIfEmpty(timeDelimiter, defaults.timeDelimiter))
+                .decimalSymbol(StringUtils.defaultIfEmpty(decimalSymbol, defaults.decimalSymbol))
+                .build();
+    }
+
+    private static String normalizeOption(String value, String defaultValue) {
+        return StringUtils.defaultIfBlank(value, defaultValue).trim().toUpperCase(Locale.ROOT);
+    }
+
+    private static String normalizeEncoding(String value) {
+        String normalized = value.trim().toUpperCase(Locale.ROOT);
+        if (AUTO_ENCODING.equals(normalized)) {
+            return AUTO_ENCODING;
+        }
+        return Charset.forName(value.trim()).name().toUpperCase(Locale.ROOT);
+    }
+
+    private static boolean isSingleTextCharacter(String value) {
+        return value != null && value.length() == 1 && value.charAt(0) != '\n' && value.charAt(0) != '\r';
+    }
+
+    private static String stringValue(Object value, String defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof String stringValue) {
+            return stringValue;
+        }
+        throw new BusinessException("import.preview.invalidCsvOptions");
+    }
+
+    private static Boolean booleanValue(Object value, Boolean defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        if (value instanceof Boolean booleanValue) {
+            return booleanValue;
+        }
+        throw new BusinessException("import.preview.invalidCsvOptions");
+    }
+
+    private static Integer integerValue(Object value) {
+        if (value == null) {
+            return null;
+        }
+        if (value instanceof Number number) {
+            long longValue = number.longValue();
+            if (longValue < Integer.MIN_VALUE || longValue > Integer.MAX_VALUE
+                    || number.doubleValue() != longValue) {
+                throw new BusinessException("import.preview.invalidCsvOptions");
+            }
+            return (int) longValue;
+        }
+        throw new BusinessException("import.preview.invalidCsvOptions");
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/ImportColumnMapping.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/ImportColumnMapping.java
new file mode 100644
index 0000000000..af113eba66
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/ImportColumnMapping.java
@@ -0,0 +1,17 @@
+package ai.chat2db.community.domain.api.model.task;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImportColumnMapping {
+
+    private String sourceColumn;
+
+    private String targetColumn;
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/ImportTaskSpec.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/ImportTaskSpec.java
index 873cb6b84b..983dfcf2ac 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/ImportTaskSpec.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/ImportTaskSpec.java
@@ -5,6 +5,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -19,9 +21,19 @@ public class ImportTaskSpec implements TaskSpec {
 
     private String sourceFile;
 
+    /** Opaque ID of a server-staged source file, when the import originated from preview. */
+    private String importFileId;
+
     private String displayFileName;
 
     private String format;
 
     private String dataTimeFormat;
+
+    private CsvOptions csvOptions;
+
+    /** Optional mapping supplied by the import-preview workflow. */
+    private List<ImportColumnMapping> columnMappings;
+
+    private UnmappedTargetStrategy unmappedTarget;
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/TaskEventCode.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/TaskEventCode.java
index 9533ec2014..11e2d3f749 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/TaskEventCode.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/TaskEventCode.java
@@ -7,6 +7,7 @@ public enum TaskEventCode {
     TASK_SUCCEEDED,
     TASK_FAILED,
     ARTIFACT_PREPARED,
+    ARTIFACT_PUBLICATION_STARTED,
     ARTIFACT_PUBLISHED,
     ARTIFACT_CLEANUP_COMPLETED,
     APPLICATION_TERMINATED,
@@ -24,5 +25,9 @@ public enum TaskEventCode {
     FILE_WRITE_COMPLETED,
     ROWS_EXPORTED,
     BATCH_EXECUTED,
+    IMPORT_BATCH_FAILED,
+    IMPORT_PREPARING,
+    TARGET_METADATA_LOADED,
+    IMPORT_COMPLETED,
     OBJECT_SKIPPED
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/UnmappedTargetStrategy.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/UnmappedTargetStrategy.java
new file mode 100644
index 0000000000..5c8fb3522f
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/task/UnmappedTargetStrategy.java
@@ -0,0 +1,6 @@
+package ai.chat2db.community.domain.api.model.task;
+
+public enum UnmappedTargetStrategy {
+    DEFAULT,
+    NULL
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/transaction/ActiveTransaction.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/transaction/ActiveTransaction.java
new file mode 100644
index 0000000000..0caf3d4dc4
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/model/transaction/ActiveTransaction.java
@@ -0,0 +1,75 @@
+package ai.chat2db.community.domain.api.model.transaction;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class ActiveTransaction {
+
+    public enum QueryState {
+        VISIBLE,
+        UNAVAILABLE
+    }
+
+    public enum SessionState {
+        LIVE,
+        DISAPPEARED_OR_HIDDEN
+    }
+
+    public enum LockMetadataState {
+        AVAILABLE,
+        UNAVAILABLE
+    }
+
+    public enum LockMetadataSource {
+        MYSQL_80_PERFORMANCE_SCHEMA,
+        MYSQL_57_INFORMATION_SCHEMA
+    }
+
+    private String trxId;
+    private String state;
+    private Timestamp startedAt;
+    private Long ageSeconds;
+    private String isolationLevel;
+    private Long rowsLocked;
+    private Long rowsModified;
+    private Long lockStructs;
+    private Long threadId;
+    private String user;
+    private String host;
+    private String db;
+    private String query;
+    private QueryState queryState;
+    private Boolean sessionAvailable;
+    private SessionState sessionState;
+    private Boolean canOpenSession;
+    private String connectionInspectionSql;
+    private String waitingLockId;
+    private String blockingLockId;
+    private String blockingTrxId;
+    private Long waitingPerformanceSchemaThreadId;
+    private Long blockingPerformanceSchemaThreadId;
+    private Long blockingThreadId;
+    private Boolean blockingSessionAvailable;
+    private Boolean canOpenBlockingSession;
+    private String blockingConnectionInspectionSql;
+    private String blockingUser;
+    private String blockingHost;
+    private String blockingDb;
+    private String waitingObject;
+    private String waitingIndex;
+    private String waitingLockType;
+    private String waitingLockMode;
+    private String waitingLockStatus;
+    private String waitingLockData;
+    private String blockingObject;
+    private String blockingIndex;
+    private String blockingLockType;
+    private String blockingLockMode;
+    private String blockingLockStatus;
+    private String blockingLockData;
+    private Boolean lockWaitAvailable;
+    private LockMetadataState lockMetadataState;
+    private LockMetadataSource lockMetadataSource;
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/ai/IAiBusinessContextService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/ai/IAiBusinessContextService.java
deleted file mode 100644
index 83d6ede1f8..0000000000
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/ai/IAiBusinessContextService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package ai.chat2db.community.domain.api.service.ai;
-
-import ai.chat2db.community.domain.api.model.ai.AiBusinessContextResult;
-import ai.chat2db.community.domain.api.model.request.ai.AiBusinessContextBuildRequest;
-
-/**
- * Builds structured business context for AI requests.
- */
-public interface IAiBusinessContextService {
-
-    /**
-     * Resolves untrusted knowledge references and builds structured AI business context.
-     *
-     * @param aiBusinessContextBuildRequest AI business context build parameters.
-     * @return server-resolved context and the trusted knowledge snapshot.
-     */
-    AiBusinessContextResult resolve(AiBusinessContextBuildRequest aiBusinessContextBuildRequest);
-}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/ai/IAiChatHistoryService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/ai/IAiChatHistoryService.java
index 364ec78b6d..a27b4bd74b 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/ai/IAiChatHistoryService.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/ai/IAiChatHistoryService.java
@@ -35,6 +35,15 @@ public interface IAiChatHistoryService {
      */
     List<AiChatSession> listSessions(Long userId);
 
+    /**
+     * Renames an AI chat session without changing its activity time.
+     *
+     * @param sessionId chat session identifier.
+     * @param userId user identifier that owns the session.
+     * @param title new session title.
+     */
+    void renameSession(String sessionId, Long userId, String title);
+
     /**
      * Lists persisted messages for an AI chat session.
      *
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbActiveTransactionService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbActiveTransactionService.java
new file mode 100644
index 0000000000..8e9507612f
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbActiveTransactionService.java
@@ -0,0 +1,20 @@
+package ai.chat2db.community.domain.api.service.db;
+
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction;
+
+import java.util.List;
+
+/**
+ * Inspects active InnoDB transactions (MYSQL-OPS-002). Read-only; requires
+ * {@code PROCESS} for full visibility of other users' transactions and SQL text.
+ */
+public interface IDbActiveTransactionService {
+
+    /**
+     * Lists active InnoDB transactions with their state, age, isolation level, lock
+     * counters, owning thread, user, host, database, and current SQL (when visible).
+     *
+     * @return active transactions, empty when no transaction is active.
+     */
+    List<ActiveTransaction> activeTransactions();
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbImportPreviewService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbImportPreviewService.java
new file mode 100644
index 0000000000..edbec2b18d
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbImportPreviewService.java
@@ -0,0 +1,33 @@
+package ai.chat2db.community.domain.api.service.db;
+
+import ai.chat2db.community.domain.api.model.db.ImportPreview;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+
+import java.io.File;
+
+/**
+ * Database-independent, bounded import preview with column mapping. The preview accepts
+ * only a server-staged file, never a client-supplied filesystem path.
+ */
+public interface IDbImportPreviewService {
+
+    /**
+     * Parses a bounded number of rows from a CSV/XLS/XLSX file and returns source fields,
+     * target table columns, preview rows, and a suggested mapping by exact name match.
+     * Never writes any data.
+     *
+     * @param dataSourceId the datasource id.
+     * @param databaseName the database name.
+     * @param schemaName   the schema name.
+     * @param tableName    the target table name.
+     * @param file         a previously staged upload (extension selects the parser).
+     * @return preview model.
+     */
+    ImportPreview preview(Long dataSourceId, String databaseName, String schemaName,
+                          String tableName, File file);
+
+    default ImportPreview preview(Long dataSourceId, String databaseName, String schemaName,
+                                  String tableName, File file, CsvOptions csvOptions) {
+        return preview(dataSourceId, databaseName, schemaName, tableName, file);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbMappedImportService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbMappedImportService.java
new file mode 100644
index 0000000000..db6121bb28
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbMappedImportService.java
@@ -0,0 +1,8 @@
+package ai.chat2db.community.domain.api.service.db;
+
+import ai.chat2db.community.domain.api.model.db.MappedImportExecution;
+
+public interface IDbMappedImportService {
+
+    Long submit(MappedImportExecution execution);
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbTableService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbTableService.java
index 1adc8fdee4..1c4fdc1d7a 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbTableService.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/db/IDbTableService.java
@@ -153,6 +153,9 @@ public interface IDbTableService {
      */
     void truncateTable(DbTableQueryRequest dbTableQueryRequest);
 
+    /** Returns a suggested target name without creating a table or copying data. */
+    String prepareCopyTable(String tableName);
+
     /**
      * Copies a table in the current connection scope.
      *
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/file/IImportFileStagingService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/file/IImportFileStagingService.java
new file mode 100644
index 0000000000..efbf3c05c0
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/file/IImportFileStagingService.java
@@ -0,0 +1,21 @@
+package ai.chat2db.community.domain.api.service.file;
+
+import java.io.File;
+
+/**
+ * Stores browser uploads under opaque server-controlled IDs until an import task finishes.
+ */
+public interface IImportFileStagingService {
+
+    /** Copies a validated upload into server-managed staging and returns its opaque ID. */
+    String stage(File file, String originalFileName);
+
+    /** Resolves an opaque ID to its server-controlled file. */
+    File resolve(String fileId);
+
+    /** Protects a staged file from normal expiry cleanup while an asynchronous task owns it. */
+    void claimForTask(String fileId);
+
+    /** Deletes a staged file after task completion or failed submission. */
+    void release(String fileId);
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/task/ArtifactService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/task/ArtifactService.java
new file mode 100644
index 0000000000..c9cfbeaa07
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/task/ArtifactService.java
@@ -0,0 +1,39 @@
+package ai.chat2db.community.domain.api.service.task;
+
+import ai.chat2db.community.domain.api.model.task.ArtifactDraft;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.function.Consumer;
+
+/** Manages task output files and their temporary staging paths. */
+public interface ArtifactService {
+    ArtifactDraft createDraft(Long taskId, String outputDirectory, String fileName, String mediaType);
+
+    String publish(ArtifactDraft draft);
+
+    /**
+     * Records the owned destination for recovery. Implementations that copy file contents
+     * must notify the listener after creating the destination and before writing any bytes.
+     * The default preserves compatibility with implementations that publish a complete file.
+     */
+    default String publish(ArtifactDraft draft, Consumer<String> onTargetCreated) {
+        String artifactId = publish(draft);
+        try {
+            onTargetCreated.accept(artifactId);
+            return artifactId;
+        } catch (RuntimeException | Error e) {
+            deletePublished(artifactId);
+            throw e;
+        }
+    }
+
+    void deleteDraft(ArtifactDraft draft);
+
+    void deletePublished(String artifactId);
+
+    /** Stages a file only when the destination is absent; an already staged file is left in place. */
+    void stageForDeletion(Path original, Path staged) throws IOException;
+
+    boolean cleanupInterruptedArtifact(Long taskId, String temporaryPath, String publishedPath);
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/task/IImportTaskSubmissionService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/task/IImportTaskSubmissionService.java
new file mode 100644
index 0000000000..d88a3e1f08
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/task/IImportTaskSubmissionService.java
@@ -0,0 +1,8 @@
+package ai.chat2db.community.domain.api.service.task;
+
+import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+
+public interface IImportTaskSubmissionService {
+
+    Long submit(ImportTaskSpec spec, String stagedFileId);
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/task/TaskDeletionService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/task/TaskDeletionService.java
new file mode 100644
index 0000000000..3789253fe2
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-api/src/main/java/ai/chat2db/community/domain/api/service/task/TaskDeletionService.java
@@ -0,0 +1,17 @@
+package ai.chat2db.community.domain.api.service.task;
+
+import ai.chat2db.community.domain.api.model.task.Task;
+
+import java.io.File;
+
+/** Coordinates durable deletion of terminal tasks and their output files. */
+public interface TaskDeletionService {
+    /** Registers and attempts deletion of an owned terminal task. */
+    void delete(Task task);
+
+    /** Retries unfinished deletions within the automatic attempt limit. */
+    void retryPendingDeletions();
+
+    /** Resolves the task's output, including a file waiting for deletion. */
+    File resolveArtifact(Task task);
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiBusinessContextServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiBusinessContextServiceImpl.java
deleted file mode 100644
index 62aa253eff..0000000000
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiBusinessContextServiceImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ai.chat2db.community.domain.core.impl.ai;
-
-import ai.chat2db.community.domain.api.model.ai.AiBusinessContextResult;
-import ai.chat2db.community.domain.api.model.request.ai.AiBusinessContextBuildRequest;
-import ai.chat2db.community.domain.api.service.ai.IAiBusinessContextService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class AiBusinessContextServiceImpl implements IAiBusinessContextService {
-
-    @Override
-    public AiBusinessContextResult resolve(AiBusinessContextBuildRequest request) {
-        return AiBusinessContextResult.empty();
-    }
-}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiChatHistoryServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiChatHistoryServiceImpl.java
index 7990a6ab18..b3f97b4061 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiChatHistoryServiceImpl.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiChatHistoryServiceImpl.java
@@ -4,7 +4,6 @@
 import ai.chat2db.community.domain.api.model.ai.AiChatSession;
 import ai.chat2db.community.domain.api.model.ai.ChatAttachment;
 import ai.chat2db.community.domain.api.model.request.ai.AiChatMessageAddRequest;
-import ai.chat2db.community.domain.api.model.request.ai.AiSelectedKnowledge;
 import ai.chat2db.community.domain.api.service.ai.IAiChatHistoryService;
 import ai.chat2db.community.tools.exception.BusinessException;
 import ai.chat2db.community.tools.util.ConfigUtils;
@@ -65,9 +64,7 @@ public AiChatMessage addMessage(AiChatMessageAddRequest addAiChatMessageRequest)
         String content = addAiChatMessageRequest == null ? null : addAiChatMessageRequest.getContent();
         String reasoningContent = addAiChatMessageRequest == null ? null : addAiChatMessageRequest.getReasoningContent();
         List<ChatAttachment> attachments = addAiChatMessageRequest == null ? null : addAiChatMessageRequest.getAttachments();
-        List<AiSelectedKnowledge> selectedKnowledge = addAiChatMessageRequest == null
-                ? null : addAiChatMessageRequest.getSelectedKnowledge();
-        return addMessageLocal(sessionId, userId, role, content, reasoningContent, attachments, selectedKnowledge);
+        return addMessageLocal(sessionId, userId, role, content, reasoningContent, attachments);
     }
 
 
@@ -76,6 +73,11 @@ public List<AiChatSession> listSessions(Long userId) {
         return listSessionsLocal(userId);
     }
 
+    @Override
+    public void renameSession(String sessionId, Long userId, String title) {
+        renameSessionLocal(sessionId, userId, title);
+    }
+
 
     @Override
     public List<AiChatMessage> getMessages(String sessionId, Long userId) {
@@ -119,8 +121,7 @@ private synchronized AiChatSession createSessionLocal(Long userId, String title)
 
     private synchronized AiChatMessage addMessageLocal(String sessionId, Long userId, String role, String content,
                                                        String reasoningContent,
-                                                       List<ChatAttachment> attachments,
-                                                       List<AiSelectedKnowledge> selectedKnowledge) {
+                                                       List<ChatAttachment> attachments) {
         if (!ownsSession(userId, sessionId)) {
             throw new BusinessException("ai.chat.history.sessionNotOwned", new Object[]{sessionId});
         }
@@ -133,9 +134,6 @@ private synchronized AiChatMessage addMessageLocal(String sessionId, Long userId
         if (attachments != null) {
             message.setAttachments(new ArrayList<>(attachments));
         }
-        if (selectedKnowledge != null) {
-            message.setSelectedKnowledge(new ArrayList<>(selectedKnowledge));
-        }
         message.setGmtCreate(LocalDateTime.now());
 
         List<AiChatMessage> messages = loadMessages(sessionId);
@@ -152,6 +150,17 @@ private synchronized List<AiChatSession> listSessionsLocal(Long userId) {
                 .collect(Collectors.toList());
     }
 
+    private synchronized void renameSessionLocal(String sessionId, Long userId, String title) {
+        List<AiChatSession> sessions = loadSessions(userId);
+        AiChatSession session = sessions.stream()
+                .filter(item -> Objects.equals(item.getId(), sessionId))
+                .findFirst()
+                .orElseThrow(() -> new BusinessException(
+                        "ai.chat.history.sessionNotOwned", new Object[]{sessionId}));
+        session.setTitle(title.trim());
+        persistSessions(userId, sessions);
+    }
+
     private synchronized List<AiChatMessage> getMessagesLocal(String sessionId, Long userId) {
         if (!ownsSession(userId, sessionId)) {
             return new ArrayList<>();
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/CsvParser.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/CsvParser.java
new file mode 100644
index 0000000000..3a65a2847c
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/CsvParser.java
@@ -0,0 +1,493 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.tools.exception.BusinessException;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PushbackReader;
+import java.io.PushbackInputStream;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Strict CSV parser shared by the import preview and execution paths. */
+public final class CsvParser {
+
+    static final String DEFAULT_ENCODING = CsvOptions.DEFAULT_ENCODING;
+    private static final List<String> AUTO_ENCODINGS = List.of(
+            CsvOptions.DEFAULT_ENCODING, "GB18030", "windows-1252", "ISO-8859-1");
+    private final CsvOptions options;
+    private final char delimiter;
+    private final char quote;
+    private final char escape;
+    private final boolean hasHeader;
+    private final boolean emptyAsNull;
+
+    CsvParser(String encoding, String delimiter, String quote, String escape, boolean hasHeader, boolean emptyAsNull) {
+        this(CsvOptions.builder()
+                .encoding(encoding)
+                .delimiter(delimiter)
+                .quote(quote)
+                .escape(escape)
+                .hasHeader(hasHeader)
+                .emptyAsNull(emptyAsNull)
+                .build());
+    }
+
+    public CsvParser(CsvOptions options) {
+        this.options = (options == null ? CsvOptions.defaults() : options).validate();
+        String delimiter = this.options.getDelimiter();
+        String quote = this.options.getQuote();
+        String escape = this.options.getEscape();
+        this.delimiter = delimiter.charAt(0);
+        this.quote = quote.charAt(0);
+        this.escape = escape.charAt(0);
+        this.hasHeader = Boolean.TRUE.equals(this.options.getHasHeader());
+        this.emptyAsNull = Boolean.TRUE.equals(this.options.getEmptyAsNull());
+    }
+
+    CsvResult parse(byte[] bytes, int limit) {
+        return parse(new OneByteInputStream(bytes), limit);
+    }
+
+    public CsvResult parse(Path path, int limit) {
+        if (!CsvOptions.AUTO_ENCODING.equals(options.getEncoding()) || hasBom(path)) {
+            return parseOnce(path, limit);
+        }
+        return parseWithAutoEncoding(path, limit);
+    }
+
+    /** Validates the complete file, then streams rows without retaining them in memory. */
+    public void forEachRow(Path path, RowConsumer rowConsumer, Runnable cancellationChecker) {
+        Objects.requireNonNull(rowConsumer, "rowConsumer");
+        Runnable checker = cancellationChecker == null ? () -> { } : cancellationChecker;
+        CsvParser validatedParser = validatedParser(path, checker);
+        validatedParser.parseOnce(path, Integer.MAX_VALUE, rowConsumer, checker);
+    }
+
+    private CsvParser validatedParser(Path path, Runnable cancellationChecker) {
+        if (!CsvOptions.AUTO_ENCODING.equals(options.getEncoding()) || hasBom(path)) {
+            parseOnce(path, Integer.MAX_VALUE, ignored -> { }, cancellationChecker);
+            return this;
+        }
+        for (String encoding : AUTO_ENCODINGS) {
+            CsvParser candidate = withEncoding(encoding);
+            try {
+                candidate.parseOnce(path, Integer.MAX_VALUE, ignored -> { }, cancellationChecker);
+                return candidate;
+            } catch (BusinessException e) {
+                if (!"import.preview.invalidEncodingLine".equals(e.getCode())) {
+                    throw e;
+                }
+            }
+        }
+        throw new BusinessException("import.preview.invalidEncoding", new Object[]{CsvOptions.AUTO_ENCODING});
+    }
+
+    private CsvResult parseWithAutoEncoding(Path path, int limit) {
+        for (String encoding : AUTO_ENCODINGS) {
+            try {
+                return withEncoding(encoding).parseOnce(path, limit);
+            } catch (BusinessException e) {
+                if (!"import.preview.invalidEncodingLine".equals(e.getCode())) {
+                    throw e;
+                }
+            }
+        }
+        throw new BusinessException("import.preview.invalidEncoding", new Object[]{CsvOptions.AUTO_ENCODING});
+    }
+
+    private CsvResult parseOnce(Path path, int limit) {
+        return parseOnce(path, limit, null, () -> { });
+    }
+
+    private CsvResult parseOnce(Path path, int limit, RowConsumer rowConsumer, Runnable cancellationChecker) {
+        try (InputStream inputStream = new BufferedInputStream(Files.newInputStream(path))) {
+            return parse(inputStream, limit, rowConsumer, cancellationChecker);
+        } catch (BusinessException e) {
+            throw e;
+        } catch (IOException e) {
+            throw new BusinessException("import.preview.fileUnreadable", new Object[]{e.getMessage()}, e);
+        }
+    }
+
+    private CsvParser withEncoding(String encoding) {
+        return new CsvParser(CsvOptions.builder()
+                .encoding(encoding)
+                .delimiter(options.getDelimiter())
+                .quote(options.getQuote())
+                .escape(options.getEscape())
+                .newline(options.getNewline())
+                .hasHeader(options.getHasHeader())
+                .emptyAsNull(options.getEmptyAsNull())
+                .headerRow(options.getHeaderRow())
+                .dataStartRow(options.getDataStartRow())
+                .dataEndRow(options.getDataEndRow())
+                .dateOrder(options.getDateOrder())
+                .dateTimeOrder(options.getDateTimeOrder())
+                .dateDelimiter(options.getDateDelimiter())
+                .yearDelimiter(options.getYearDelimiter())
+                .timeDelimiter(options.getTimeDelimiter())
+                .decimalSymbol(options.getDecimalSymbol())
+                .build());
+    }
+
+    private static boolean hasBom(Path path) {
+        try (InputStream inputStream = Files.newInputStream(path)) {
+            int first = inputStream.read();
+            int second = inputStream.read();
+            int third = inputStream.read();
+            return first == 0xEF && second == 0xBB && third == 0xBF
+                    || first == 0xFF && second == 0xFE
+                    || first == 0xFE && second == 0xFF;
+        } catch (IOException e) {
+            throw new BusinessException("import.preview.fileUnreadable", new Object[]{e.getMessage()}, e);
+        }
+    }
+
+    public CsvResult parse(InputStream inputStream, int limit) {
+        return parse(inputStream, limit, null, () -> { });
+    }
+
+    private CsvResult parse(InputStream inputStream, int limit, RowConsumer rowConsumer, Runnable cancellationChecker) {
+        try {
+            BomAwareInput bomAwareInput = detectBom(new LineBoundedInputStream(inputStream));
+            CharsetDecoder decoder = bomAwareInput.charset().newDecoder()
+                    .onMalformedInput(CodingErrorAction.REPORT)
+                    .onUnmappableCharacter(CodingErrorAction.REPORT);
+            return parse(new InputStreamReader(bomAwareInput.inputStream(), decoder), limit, rowConsumer,
+                    cancellationChecker);
+        } catch (BusinessException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new BusinessException("import.preview.invalidEncoding", new Object[]{options.getEncoding()}, e);
+        }
+    }
+
+    CsvResult parse(Reader reader, int limit) {
+        return parse(reader, limit, null, () -> { });
+    }
+
+    private CsvResult parse(Reader reader, int limit, RowConsumer rowConsumer, Runnable cancellationChecker) {
+        try {
+            return parseRows(reader, limit, rowConsumer, cancellationChecker);
+        } catch (BusinessException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new BusinessException("import.preview.invalidEncoding", new Object[]{options.getEncoding()}, e);
+        }
+    }
+
+    private CsvResult parseRows(Reader reader, int limit, RowConsumer rowConsumer, Runnable cancellationChecker) {
+        List<Map<Integer, CsvCell>> cellRows = new ArrayList<>();
+        List<CsvCell> fields = new ArrayList<>();
+        StringBuilder field = new StringBuilder();
+        PushbackReader pushbackReader = new PushbackReader(reader, 1);
+        boolean inQuotedField = false;
+        boolean justClosedQuote = false;
+        boolean atStartOfField = true;
+        boolean quotedField = false;
+        int line = 1;
+        int quoteStartLine = 1;
+        int rowCount = 0;
+        int charactersUntilCancellationCheck = 8192;
+        cancellationChecker.run();
+        if (limit <= 0) {
+            return result(cellRows);
+        }
+        try {
+            int next;
+            while ((next = pushbackReader.read()) != -1) {
+                if (--charactersUntilCancellationCheck == 0) {
+                    cancellationChecker.run();
+                    charactersUntilCancellationCheck = 8192;
+                }
+                char current = (char) next;
+                if (inQuotedField) {
+                    if (escape != quote && current == escape) {
+                        int following = pushbackReader.read();
+                        if (following == -1) {
+                            throw malformedCsv(line);
+                        }
+                        char escaped = (char) following;
+                        if (escaped == quote || escaped == escape) {
+                            field.append(escaped);
+                        } else {
+                            field.append(current);
+                            field.append(escaped);
+                            if (escaped == '\n') {
+                                line++;
+                            } else if (escaped == '\r') {
+                                line++;
+                                int afterReturn = pushbackReader.read();
+                                if (afterReturn == '\n') {
+                                    field.append('\n');
+                                } else if (afterReturn != -1) {
+                                    pushbackReader.unread(afterReturn);
+                                }
+                            }
+                        }
+                    } else if (current == quote) {
+                        int following = pushbackReader.read();
+                        if (escape == quote && following == quote) {
+                            field.append(quote);
+                        } else {
+                            if (following != -1) {
+                                pushbackReader.unread(following);
+                            }
+                            inQuotedField = false;
+                            justClosedQuote = true;
+                        }
+                    } else {
+                        field.append(current);
+                        if (current == '\n') {
+                            line++;
+                        } else if (current == '\r') {
+                            line++;
+                            int following = pushbackReader.read();
+                            if (following == '\n') {
+                                field.append('\n');
+                            } else if (following != -1) {
+                                pushbackReader.unread(following);
+                            }
+                        }
+                    }
+                    continue;
+                }
+                if (justClosedQuote && current != delimiter && current != '\n' && current != '\r') {
+                    throw malformedCsv(line);
+                }
+                if (current == quote) {
+                    if (!atStartOfField) {
+                        throw malformedCsv(line);
+                    }
+                    inQuotedField = true;
+                    quoteStartLine = line;
+                    atStartOfField = false;
+                    quotedField = true;
+                    continue;
+                }
+                if (current == delimiter) {
+                    fields.add(fieldValue(field, quotedField));
+                    field.setLength(0);
+                    justClosedQuote = false;
+                    atStartOfField = true;
+                    quotedField = false;
+                    continue;
+                }
+                if (current == '\n' || current == '\r') {
+                    if (current == '\r') {
+                        int following = pushbackReader.read();
+                        if (following != '\n' && following != -1) {
+                            pushbackReader.unread(following);
+                        }
+                    }
+                    fields.add(fieldValue(field, quotedField));
+                    Map<Integer, CsvCell> completedRow = row(fields);
+                    emitRow(cellRows, completedRow, rowConsumer);
+                    rowCount++;
+                    cancellationChecker.run();
+                    if (rowCount >= limit) {
+                        return result(cellRows);
+                    }
+                    fields = new ArrayList<>();
+                    field.setLength(0);
+                    line++;
+                    justClosedQuote = false;
+                    atStartOfField = true;
+                    quotedField = false;
+                    continue;
+                }
+                field.append(current);
+                atStartOfField = false;
+            }
+        } catch (CharacterCodingException e) {
+            throw new BusinessException("import.preview.invalidEncodingLine", new Object[]{options.getEncoding(), line}, e);
+        } catch (BusinessException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (IOException e) {
+            throw new BusinessException("import.preview.parseFailed", new Object[]{e.getMessage()}, e);
+        } catch (Exception e) {
+            throw new BusinessException("import.preview.parseFailed", new Object[]{e.getMessage()}, e);
+        }
+        if (inQuotedField) {
+            throw new BusinessException("import.preview.unclosedQuote", new Object[]{quoteStartLine});
+        }
+        if (!fields.isEmpty() || field.length() > 0 || quotedField || justClosedQuote) {
+            fields.add(fieldValue(field, quotedField));
+            emitRow(cellRows, row(fields), rowConsumer);
+        }
+        cancellationChecker.run();
+        return result(cellRows);
+    }
+
+    private static void emitRow(List<Map<Integer, CsvCell>> cellRows, Map<Integer, CsvCell> row,
+            RowConsumer rowConsumer) {
+        if (rowConsumer == null) {
+            cellRows.add(row);
+            return;
+        }
+        Map<Integer, String> values = new LinkedHashMap<>();
+        row.forEach((index, cell) -> values.put(index, cell == null ? null : cell.value()));
+        rowConsumer.accept(values);
+    }
+
+    private CsvCell fieldValue(StringBuilder field, boolean quoted) {
+        String value = emptyAsNull && field.length() == 0 && !quoted ? null : field.toString();
+        return new CsvCell(value, quoted);
+    }
+
+    private static BusinessException malformedCsv(int line) {
+        return new BusinessException("import.preview.malformedCsv", new Object[]{line});
+    }
+
+    private static Map<Integer, CsvCell> row(List<CsvCell> values) {
+        Map<Integer, CsvCell> row = new LinkedHashMap<>();
+        for (int index = 0; index < values.size(); index++) {
+            row.put(index, values.get(index));
+        }
+        return row;
+    }
+
+    private CsvResult result(List<Map<Integer, CsvCell>> cellRows) {
+        List<Map<Integer, String>> rows = new ArrayList<>(cellRows.size());
+        for (Map<Integer, CsvCell> cellRow : cellRows) {
+            Map<Integer, String> row = new LinkedHashMap<>();
+            cellRow.forEach((index, cell) -> row.put(index, cell == null ? null : cell.value()));
+            rows.add(row);
+        }
+        return new CsvResult(rows, cellRows, hasHeader ? 1 : 0);
+    }
+
+    private BomAwareInput detectBom(InputStream inputStream) throws IOException {
+        PushbackInputStream pushbackInputStream = new PushbackInputStream(inputStream, 4);
+        byte[] bom = new byte[4];
+        int read = 0;
+        while (read < bom.length) {
+            int next = pushbackInputStream.read();
+            if (next == -1) {
+                break;
+            }
+            bom[read++] = (byte) next;
+        }
+        int unread = read;
+        Charset charset = defaultCharset();
+        if (read >= 3 && (bom[0] & 0xff) == 0xEF && (bom[1] & 0xff) == 0xBB && (bom[2] & 0xff) == 0xBF) {
+            charset = Charset.forName("UTF-8");
+            unread = read - 3;
+            if (unread > 0) {
+                pushbackInputStream.unread(bom, 3, unread);
+            }
+        } else if (read >= 2 && (bom[0] & 0xff) == 0xFF && (bom[1] & 0xff) == 0xFE) {
+            charset = Charset.forName("UTF-16LE");
+            unread = read - 2;
+            if (unread > 0) {
+                pushbackInputStream.unread(bom, 2, unread);
+            }
+        } else if (read >= 2 && (bom[0] & 0xff) == 0xFE && (bom[1] & 0xff) == 0xFF) {
+            charset = Charset.forName("UTF-16BE");
+            unread = read - 2;
+            if (unread > 0) {
+                pushbackInputStream.unread(bom, 2, unread);
+            }
+        } else if (read > 0) {
+            pushbackInputStream.unread(bom, 0, read);
+        }
+        return new BomAwareInput(pushbackInputStream, charset);
+    }
+
+    private Charset defaultCharset() {
+        if (CsvOptions.AUTO_ENCODING.equals(options.getEncoding())) {
+            return Charset.forName(DEFAULT_ENCODING);
+        }
+        return Charset.forName(options.getEncoding());
+    }
+
+    public record CsvCell(String value, boolean quoted) {
+    }
+
+    public record CsvResult(List<Map<Integer, String>> rows, List<Map<Integer, CsvCell>> cells, int headerRowCount) {
+    }
+
+    @FunctionalInterface
+    public interface RowConsumer {
+        void accept(Map<Integer, String> row);
+    }
+
+    private record BomAwareInput(InputStream inputStream, Charset charset) {
+    }
+
+    private static final class OneByteInputStream extends InputStream {
+        private final byte[] bytes;
+        private int position;
+
+        private OneByteInputStream(byte[] bytes) {
+            this.bytes = bytes;
+        }
+
+        @Override
+        public int read() throws IOException {
+            return position >= bytes.length ? -1 : bytes[position++] & 0xff;
+        }
+
+        @Override
+        public int read(byte[] buffer, int offset, int length) throws IOException {
+            if (position >= bytes.length) {
+                return -1;
+            }
+            buffer[offset] = bytes[position++];
+            return 1;
+        }
+    }
+
+    /** Lets the decoder read in batches without prefetching bytes from a later source line. */
+    private static final class LineBoundedInputStream extends InputStream {
+        private final InputStream inputStream;
+
+        private LineBoundedInputStream(InputStream inputStream) {
+            this.inputStream = inputStream;
+        }
+
+        @Override
+        public int read() throws IOException {
+            return inputStream.read();
+        }
+
+        @Override
+        public int read(byte[] buffer, int offset, int length) throws IOException {
+            if (length == 0) {
+                return 0;
+            }
+            int count = 0;
+            while (count < length) {
+                int next = inputStream.read();
+                if (next == -1) {
+                    return count == 0 ? -1 : count;
+                }
+                buffer[offset + count++] = (byte) next;
+                if (next == '\n' || next == '\r') {
+                    break;
+                }
+            }
+            return count;
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbActiveTransactionServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbActiveTransactionServiceImpl.java
new file mode 100644
index 0000000000..160044ccdb
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbActiveTransactionServiceImpl.java
@@ -0,0 +1,23 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction;
+import ai.chat2db.community.domain.api.service.db.IDbActiveTransactionService;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.spi.IActiveTransactionManager;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DbActiveTransactionServiceImpl implements IDbActiveTransactionService {
+
+    @Override
+    public List<ActiveTransaction> activeTransactions() {
+        IActiveTransactionManager manager = Chat2DBContext.getActiveTransactionManager();
+        if (manager == null) {
+            throw new BusinessException("activeTransaction.inspection.unsupported");
+        }
+        return manager.activeTransactions(Chat2DBContext.getConnection());
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbDatabaseServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbDatabaseServiceImpl.java
index 9c247cd38d..5a5b0ff885 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbDatabaseServiceImpl.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbDatabaseServiceImpl.java
@@ -178,7 +178,8 @@ private void sortSchema(List<Schema> schemas, Connection connection) {
         try {
             ulr = connection.getMetaData().getURL();
         } catch (SQLException e) {
-            throw new IllegalStateException("Failed to read JDBC URL while sorting schemas", e);
+            log.debug("JDBC driver does not expose its URL; skip schema ordering", e);
+            return;
         }
         int num = -1;
         for (int i = 0; i < schemas.size(); i++) {
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbImportPreviewServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbImportPreviewServiceImpl.java
new file mode 100644
index 0000000000..0c55beed54
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbImportPreviewServiceImpl.java
@@ -0,0 +1,128 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.model.db.ImportPreview;
+import ai.chat2db.community.domain.api.model.db.ImportTargetColumn;
+import ai.chat2db.community.domain.api.model.task.ImportColumnMapping;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.domain.api.service.db.IDbImportPreviewService;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import ai.chat2db.spi.model.request.TableMetadataRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Database-independent import preview. File parsing is delegated by format; this service
+ * resolves target metadata, suggests mappings, and assembles a bounded preview.
+ */
+@Service
+public class DbImportPreviewServiceImpl implements IDbImportPreviewService {
+
+    private static final int PREVIEW_ROW_LIMIT = 10;
+
+    private final ImportPreviewFileParser fileParser;
+
+    public DbImportPreviewServiceImpl(ImportPreviewFileParser fileParser) {
+        this.fileParser = fileParser;
+    }
+
+    @Override
+    public ImportPreview preview(Long dataSourceId, String databaseName, String schemaName,
+                                 String tableName, File file) {
+        return preview(dataSourceId, databaseName, schemaName, tableName, file, null);
+    }
+
+    @Override
+    public ImportPreview preview(Long dataSourceId, String databaseName, String schemaName,
+                                 String tableName, File file, CsvOptions csvOptions) {
+        ImportPreviewFileParser.ParsedRows parsedRows = fileParser.parse(file, PREVIEW_ROW_LIMIT, csvOptions);
+        if (parsedRows.header().isEmpty()) {
+            throw new BusinessException("import.preview.emptyFile");
+        }
+        Map<Integer, String> header = parsedRows.header();
+        List<String> sourceNames = new ArrayList<>();
+        for (int i = 0; i < header.size(); i++) {
+            String name = StringUtils.defaultIfBlank(header.get(i), "column_" + (i + 1));
+            sourceNames.add(name);
+        }
+        requireUniqueSourceColumns(sourceNames);
+
+        List<List<String>> previewData = new ArrayList<>();
+        for (Map<Integer, String> row : parsedRows.data()) {
+            List<String> values = new ArrayList<>();
+            for (int columnIndex = 0; columnIndex < sourceNames.size(); columnIndex++) {
+                values.add(StringUtils.defaultString(row.get(columnIndex)));
+            }
+            previewData.add(values);
+        }
+
+        TableMetadataRequest targetRequest = TrustedMetadataRequestResolver.table(dataSourceId, databaseName, schemaName,
+                tableName);
+        List<ImportTargetColumn> targetColumns = targetColumns(targetRequest);
+        List<ImportColumnMapping> suggested = new ArrayList<>();
+        if (parsedRows.syntheticHeader()) {
+            List<ImportTargetColumn> importableTargets = targetColumns.stream()
+                    .filter(target -> !target.isAutoIncrement())
+                    .toList();
+            for (int index = 0; index < Math.min(sourceNames.size(), importableTargets.size()); index++) {
+                suggested.add(ImportColumnMapping.builder()
+                        .sourceColumn(sourceNames.get(index))
+                        .targetColumn(importableTargets.get(index).getName())
+                        .build());
+            }
+        } else {
+            for (String source : sourceNames) {
+                targetColumns.stream()
+                        .filter(target -> StringUtils.equalsIgnoreCase(target.getName(), source))
+                        .findFirst()
+                        .map(target -> ImportColumnMapping.builder()
+                                .sourceColumn(source)
+                                .targetColumn(target.getName())
+                                .build())
+                        .ifPresent(suggested::add);
+            }
+        }
+
+        return ImportPreview.builder()
+                .sourceColumns(sourceNames)
+                .previewData(previewData)
+                .targetTableName(targetRequest.getTableName())
+                .targetColumns(targetColumns)
+                .suggestedMapping(suggested)
+                .previewLimit(PREVIEW_ROW_LIMIT)
+                .build();
+    }
+
+    private static List<ImportTargetColumn> targetColumns(TableMetadataRequest target) {
+        Connection connection = Chat2DBContext.getConnection();
+        return Chat2DBContext.getDbMetaData().columns(connection,
+                        target).stream()
+                .map(column -> ImportTargetColumn.builder()
+                        .name(column.getName())
+                        .dataType(column.getColumnType())
+                        .nullable(column.getNullable() != null && column.getNullable() == 1)
+                        .autoIncrement(Boolean.TRUE.equals(column.getAutoIncrement()))
+                        .defaultValue(column.getDefaultValue())
+                        .comment(column.getComment())
+                        .build())
+                .toList();
+    }
+
+    private static void requireUniqueSourceColumns(List<String> sourceColumns) {
+        HashSet<String> names = new HashSet<>();
+        for (String sourceColumn : sourceColumns) {
+            if (!names.add(sourceColumn.toUpperCase(Locale.ROOT))) {
+                throw new BusinessException("import.preview.duplicateSourceColumns", new Object[]{sourceColumn});
+            }
+        }
+    }
+
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbMappedImportServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbMappedImportServiceImpl.java
new file mode 100644
index 0000000000..41f6900b44
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbMappedImportServiceImpl.java
@@ -0,0 +1,130 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.model.db.ImportPreview;
+import ai.chat2db.community.domain.api.model.db.ImportTargetColumn;
+import ai.chat2db.community.domain.api.model.db.MappedImportExecution;
+import ai.chat2db.community.domain.api.model.task.ImportColumnMapping;
+import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+import ai.chat2db.community.domain.api.model.task.TaskTargetSnapshot;
+import ai.chat2db.community.domain.api.model.task.TaskType;
+import ai.chat2db.community.domain.api.model.task.UnmappedTargetStrategy;
+import ai.chat2db.community.domain.api.service.db.IDbImportPreviewService;
+import ai.chat2db.community.domain.api.service.db.IDbMappedImportService;
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
+import ai.chat2db.community.domain.api.service.task.IImportTaskSubmissionService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Service
+public class DbMappedImportServiceImpl implements IDbMappedImportService {
+
+    private final IDbImportPreviewService importPreviewService;
+
+    private final IImportFileStagingService importFileStagingService;
+
+    private final IImportTaskSubmissionService importTaskSubmissionService;
+
+    public DbMappedImportServiceImpl(IDbImportPreviewService importPreviewService,
+            IImportFileStagingService importFileStagingService,
+            IImportTaskSubmissionService importTaskSubmissionService) {
+        this.importPreviewService = importPreviewService;
+        this.importFileStagingService = importFileStagingService;
+        this.importTaskSubmissionService = importTaskSubmissionService;
+    }
+
+    @Override
+    public Long submit(MappedImportExecution execution) {
+        List<ImportColumnMapping> mappings = execution.getMappings();
+        if (mappings == null || mappings.isEmpty()) {
+            throw new IllegalArgumentException("At least one source column must be mapped");
+        }
+        validateUniqueMappings(mappings);
+        File file = importFileStagingService.resolve(execution.getFileId());
+        ImportPreview preview = importPreviewService.preview(execution.getDataSourceId(), execution.getDatabaseName(),
+                execution.getSchemaName(), execution.getTableName(), file, execution.getCsvOptions());
+        validateMappings(mappings, preview);
+        UnmappedTargetStrategy strategy = execution.getUnmappedTarget() == null
+                ? UnmappedTargetStrategy.DEFAULT : execution.getUnmappedTarget();
+        validateRequiredColumns(mappings, preview, strategy);
+
+        ImportTaskSpec spec = ImportTaskSpec.builder()
+                .taskType(TaskType.DATA_FILE_IMPORT.name())
+                .taskName("Import " + preview.getTargetTableName())
+                .target(TaskTargetSnapshot.builder()
+                        .dataSourceId(execution.getDataSourceId())
+                        .databaseName(execution.getDatabaseName())
+                        .schemaName(execution.getSchemaName())
+                        .tableName(preview.getTargetTableName())
+                        .build())
+                .sourceFile(file.getAbsolutePath())
+                .importFileId(execution.getFileId())
+                .displayFileName(file.getName())
+                .format(extension(file.getName()))
+                .csvOptions(execution.getCsvOptions())
+                .columnMappings(mappings)
+                .unmappedTarget(strategy)
+                .build();
+        return importTaskSubmissionService.submit(spec, execution.getFileId());
+    }
+
+    private static void validateUniqueMappings(List<ImportColumnMapping> mappings) {
+        Set<String> sourceColumns = new HashSet<>();
+        Set<String> targetColumns = new HashSet<>();
+        for (ImportColumnMapping mapping : mappings) {
+            if (mapping == null || !sourceColumns.add(normalizeColumn(mapping.getSourceColumn()))
+                    || !targetColumns.add(normalizeColumn(mapping.getTargetColumn()))) {
+                throw new IllegalArgumentException("Duplicate or invalid import column mapping");
+            }
+        }
+    }
+
+    private static void validateMappings(List<ImportColumnMapping> mappings, ImportPreview preview) {
+        Set<String> sourceColumns = preview.getSourceColumns().stream()
+                .map(DbMappedImportServiceImpl::normalizeColumn)
+                .collect(Collectors.toSet());
+        Set<String> targetColumns = preview.getTargetColumns().stream()
+                .map(ImportTargetColumn::getName)
+                .map(DbMappedImportServiceImpl::normalizeColumn)
+                .collect(Collectors.toSet());
+        for (ImportColumnMapping mapping : mappings) {
+            if (!sourceColumns.contains(normalizeColumn(mapping.getSourceColumn()))
+                    || !targetColumns.contains(normalizeColumn(mapping.getTargetColumn()))) {
+                throw new IllegalArgumentException("Import column mapping does not match the preview");
+            }
+        }
+    }
+
+    private static void validateRequiredColumns(List<ImportColumnMapping> mappings, ImportPreview preview,
+            UnmappedTargetStrategy strategy) {
+        Set<String> mappedTargets = mappings.stream()
+                .map(ImportColumnMapping::getTargetColumn)
+                .map(DbMappedImportServiceImpl::normalizeColumn)
+                .collect(Collectors.toSet());
+        boolean missingRequiredColumn = preview.getTargetColumns().stream()
+                .filter(column -> !column.isNullable() && !column.isAutoIncrement())
+                .filter(column -> !mappedTargets.contains(normalizeColumn(column.getName())))
+                .anyMatch(column -> strategy == UnmappedTargetStrategy.NULL || column.getDefaultValue() == null);
+        if (missingRequiredColumn) {
+            throw new IllegalArgumentException("Required import target column is not mapped");
+        }
+    }
+
+    private static String normalizeColumn(String columnName) {
+        if (StringUtils.isBlank(columnName)) {
+            throw new IllegalArgumentException("Import column mapping must not be blank");
+        }
+        return columnName.toUpperCase(Locale.ROOT);
+    }
+
+    private static String extension(String fileName) {
+        int dot = fileName.lastIndexOf('.');
+        return dot < 0 ? "" : fileName.substring(dot + 1).toUpperCase(Locale.ROOT);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbTableServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbTableServiceImpl.java
index f1baafdf43..9cd54af759 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbTableServiceImpl.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbTableServiceImpl.java
@@ -20,6 +20,7 @@
 import ai.chat2db.community.domain.core.impl.db.extension.MetadataAccessPolicyManager;
 import ai.chat2db.community.domain.core.util.ListSorter;
 import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.community.tools.util.ExceptionUtils;
 import ai.chat2db.spi.IDbManager;
 import ai.chat2db.spi.IDbMetaData;
 import ai.chat2db.spi.ISqlBuilder;
@@ -333,11 +334,9 @@ public void dropTable(DbTableQueryRequest param) {
     @Override
     public void truncateTable(DbTableQueryRequest param) {
         try {
-            IDbMetaData metaData = Chat2DBContext.getDbMetaData();
             Connection connection = Chat2DBContext.getConnection();
-            String name = metaData.getMetaDataName(param.getTableName());
             String sql = Chat2DBContext.getDbManager()
-                    .truncateTable(connection, param.getDatabaseName(), param.getSchemaName(), name);
+                    .truncateTable(connection, param.getDatabaseName(), param.getSchemaName(), param.getTableName());
             DefaultSQLExecutor.getInstance().execute(connection, sql, resultSet -> null);
         } catch (Exception e) {
             log.error("truncate table error", e);
@@ -345,25 +344,27 @@ public void truncateTable(DbTableQueryRequest param) {
         }
     }
 
+    @Override
+    public String prepareCopyTable(String tableName) {
+        String suffix = "_copy_" + DateUtil.format(new Date(), "MMddHHmmss");
+        return StringUtils.left(tableName, 32 - suffix.length()) + suffix;
+    }
+
     @Override
     public void copyTable(DbTableCopyRequest param) {
         try {
-            IDbMetaData metaData = Chat2DBContext.getDbMetaData();
             String newName = param.getNewName();
             if (StringUtils.isBlank(newName)) {
-                newName = param.getTableName() + "_copy_" + DateUtil.format(new Date(), "MMddHHmmss");
-                if (newName.length() > 32) {
-                    newName = newName.substring(0, 32);
-                }
+                newName = prepareCopyTable(param.getTableName());
             }
-            String tableName = metaData.getMetaDataName(param.getTableName());
-            String newTableName = metaData.getMetaDataName(newName);
             Chat2DBContext.getDbManager().copyTable(
                     Chat2DBContext.getConnection(),
-                    param.getDatabaseName(), param.getSchemaName(), tableName, newTableName, param.isCopyData());
+                    param.getDatabaseName(), param.getSchemaName(), param.getTableName(), newName, param.isCopyData());
         } catch (Exception e) {
             log.error("copy table error", e);
-            throw new BusinessException("copy table error", new Object[]{e.getMessage()}, e);
+            Throwable cause = ExceptionUtils.getRootCause(e);
+            String reason = StringUtils.defaultIfBlank(cause.getMessage(), cause.getClass().getSimpleName());
+            throw new BusinessException("table.copy.failed", new Object[]{reason}, e);
         }
     }
 
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/ImportPreviewFileParser.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/ImportPreviewFileParser.java
new file mode 100644
index 0000000000..4a560f804b
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/ImportPreviewFileParser.java
@@ -0,0 +1,91 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.tools.exception.BusinessException;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+@Slf4j
+@Component
+public final class ImportPreviewFileParser {
+
+    ParsedRows parse(File file, int limit, CsvOptions csvOptions) {
+        return isCsv(file) ? parseCsv(file, limit, csvOptions) : parseExcel(file, limit);
+    }
+
+    private ParsedRows parseCsv(File file, int limit, CsvOptions csvOptions) {
+        CsvOptions options = (csvOptions == null ? CsvOptions.defaults() : csvOptions).validate();
+        try {
+            int previewEndRow = options.getDataStartRow() + limit - 1;
+            if (options.getDataEndRow() != null) {
+                previewEndRow = Math.min(previewEndRow, options.getDataEndRow());
+            }
+            int parseLimit = Math.max(previewEndRow,
+                    Boolean.TRUE.equals(options.getHasHeader()) ? options.getHeaderRow() : 0);
+            List<Map<Integer, String>> rows = new CsvParser(options).parse(file.toPath(), parseLimit).rows();
+            if (rows.isEmpty()) {
+                return ParsedRows.empty();
+            }
+            int firstDataIndex = options.getDataStartRow() - 1;
+            int dataEndIndex = Math.min(rows.size(), previewEndRow);
+            List<Map<Integer, String>> data = firstDataIndex >= dataEndIndex
+                    ? List.of() : rows.subList(firstDataIndex, dataEndIndex);
+            if (Boolean.TRUE.equals(options.getHasHeader())) {
+                int headerIndex = options.getHeaderRow() - 1;
+                return headerIndex >= rows.size()
+                        ? ParsedRows.empty() : new ParsedRows(rows.get(headerIndex), data, false);
+            }
+            return new ParsedRows(syntheticHeader(data), data, true);
+        } catch (BusinessException e) {
+            throw e;
+        } catch (Exception e) {
+            log.warn("CSV import preview parse failed for {}", file, e);
+            throw new BusinessException("import.preview.parseFailed", new Object[]{e.getMessage()}, e);
+        }
+    }
+
+    private ParsedRows parseExcel(File file, int limit) {
+        try {
+            ImportPreviewListener listener = new ImportPreviewListener(limit);
+            EasyExcel.read(file, listener).excelType(excelType(file)).sheet().headRowNumber(1).doRead();
+            List<Map<Integer, String>> rows = listener.rows();
+            return rows.isEmpty() ? ParsedRows.empty()
+                    : new ParsedRows(rows.get(0), rows.subList(1, rows.size()), false);
+        } catch (Exception e) {
+            log.warn("Excel import preview parse failed for {}", file, e);
+            throw new BusinessException("import.preview.parseFailed", new Object[]{e.getMessage()}, e);
+        }
+    }
+
+    private static Map<Integer, String> syntheticHeader(List<Map<Integer, String>> data) {
+        int columnCount = data.stream().mapToInt(Map::size).max().orElse(0);
+        Map<Integer, String> header = new LinkedHashMap<>();
+        for (int index = 0; index < columnCount; index++) {
+            header.put(index, "column_" + (index + 1));
+        }
+        return header;
+    }
+
+    private static boolean isCsv(File file) {
+        return file != null && file.getName().toLowerCase(Locale.ROOT).endsWith(".csv");
+    }
+
+    private static ExcelTypeEnum excelType(File file) {
+        return file.getName().toLowerCase(Locale.ROOT).endsWith(".xls")
+                ? ExcelTypeEnum.XLS : ExcelTypeEnum.XLSX;
+    }
+
+    record ParsedRows(Map<Integer, String> header, List<Map<Integer, String>> data, boolean syntheticHeader) {
+        private static ParsedRows empty() {
+            return new ParsedRows(Map.of(), List.of(), false);
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/ImportPreviewListener.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/ImportPreviewListener.java
new file mode 100644
index 0000000000..881a48acbb
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/ImportPreviewListener.java
@@ -0,0 +1,52 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+final class ImportPreviewListener extends AnalysisEventListener<Map<Integer, String>> {
+
+    private final int limit;
+
+    private final List<Map<Integer, String>> rows = new ArrayList<>();
+
+    ImportPreviewListener(int limit) {
+        this.limit = limit;
+    }
+
+    @Override
+    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+        rows.add(normalize(headMap));
+    }
+
+    @Override
+    public void invoke(Map<Integer, String> data, AnalysisContext context) {
+        rows.add(normalize(data));
+    }
+
+    @Override
+    public boolean hasNext(AnalysisContext context) {
+        return rows.size() <= limit;
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        // EasyExcel owns the input stream.
+    }
+
+    List<Map<Integer, String>> rows() {
+        return rows;
+    }
+
+    private static Map<Integer, String> normalize(Map<Integer, String> values) {
+        Map<Integer, String> normalized = new LinkedHashMap<>();
+        if (values != null) {
+            values.forEach((index, value) -> normalized.put(index, value == null ? "" : value));
+        }
+        return normalized;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/TrustedMetadataRequestResolver.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/TrustedMetadataRequestResolver.java
new file mode 100644
index 0000000000..a225bc06d2
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/TrustedMetadataRequestResolver.java
@@ -0,0 +1,79 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.model.metadata.Table;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.spi.IDbMetaData;
+import ai.chat2db.spi.ISQLIdentifierProcessor;
+import ai.chat2db.spi.model.datasource.ConnectInfo;
+import ai.chat2db.spi.model.request.TableMetadataRequest;
+import ai.chat2db.spi.model.request.TablesRequest;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import org.apache.commons.lang3.StringUtils;
+
+import java.sql.Connection;
+import java.util.List;
+import java.util.Objects;
+
+final class TrustedMetadataRequestResolver {
+
+    private TrustedMetadataRequestResolver() {
+    }
+
+    static TableMetadataRequest table(Long requestDataSourceId, String requestDatabaseName,
+            String requestSchemaName, String requestTableName) {
+        ConnectInfo connectInfo = Chat2DBContext.getConnectInfo();
+        if (connectInfo == null) {
+            throw new BusinessException("connection.error");
+        }
+        if (requestDataSourceId == null || !Objects.equals(requestDataSourceId, connectInfo.getDataSourceId())) {
+            throw new BusinessException("common.permissionDenied");
+        }
+
+        String trustedDatabaseName = StringUtils.trimToNull(connectInfo.getDatabaseName());
+        String trustedSchemaName = StringUtils.trimToNull(connectInfo.getSchemaName());
+        requireMatchesTrusted(requestDatabaseName, trustedDatabaseName);
+        requireMatchesTrusted(requestSchemaName, trustedSchemaName);
+
+        String requestedTableName = normalizeIdentifier(requestTableName);
+        if (requestedTableName == null) {
+            throw new BusinessException("common.paramError");
+        }
+        String trustedTableName = resolveTableName(trustedDatabaseName, trustedSchemaName, requestedTableName);
+        return new TableMetadataRequest(trustedDatabaseName, trustedSchemaName, trustedTableName);
+    }
+
+    private static String resolveTableName(String databaseName, String schemaName, String requestedTableName) {
+        IDbMetaData metaData = Chat2DBContext.getDbMetaData();
+        Connection connection = Chat2DBContext.getConnection();
+        List<String> matchingNames = metaData.tables(connection, new TablesRequest(databaseName, schemaName, null))
+                .stream()
+                .filter(Objects::nonNull)
+                .map(Table::getName)
+                .filter(StringUtils::isNotBlank)
+                .filter(name -> StringUtils.equalsIgnoreCase(name, requestedTableName))
+                .toList();
+        return matchingNames.stream()
+                .filter(name -> StringUtils.equals(name, requestedTableName))
+                .findFirst()
+                .orElseGet(() -> matchingNames.size() == 1 ? matchingNames.get(0) : missingTable());
+    }
+
+    private static String missingTable() {
+        throw new BusinessException("common.paramError");
+    }
+
+    private static void requireMatchesTrusted(String requestValue, String trustedValue) {
+        String normalizedRequest = normalizeIdentifier(requestValue);
+        if (StringUtils.isBlank(normalizedRequest)) {
+            return;
+        }
+        if (!Objects.equals(normalizedRequest, trustedValue)) {
+            throw new BusinessException("common.permissionDenied");
+        }
+    }
+
+    private static String normalizeIdentifier(String identifier) {
+        ISQLIdentifierProcessor identifierProcessor = Chat2DBContext.getDbMetaData().getSQLIdentifierProcessor();
+        return identifierProcessor.removeIdentifierQuote(StringUtils.trimToNull(identifier));
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/file/ImportFileStagingService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/file/ImportFileStagingService.java
new file mode 100644
index 0000000000..5dbc1c13e7
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/file/ImportFileStagingService.java
@@ -0,0 +1,208 @@
+package ai.chat2db.community.domain.core.impl.file;
+
+import ai.chat2db.community.domain.api.model.task.TaskFileFormat;
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.community.tools.util.ConfigUtils;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
+
+/**
+ * Owns server-side import uploads between the HTTP request and asynchronous task execution.
+ */
+@Component
+public class ImportFileStagingService implements IImportFileStagingService {
+    private static final String STAGING_DIRECTORY_NAME = "import-preview";
+    private static final Pattern FILE_ID_PATTERN = Pattern.compile(
+            "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
+    private static final Set<String> ALLOWED_EXTENSIONS = Set.of(
+            TaskFileFormat.CSV.name().toLowerCase(Locale.ROOT),
+            TaskFileFormat.XLS.name().toLowerCase(Locale.ROOT),
+            TaskFileFormat.XLSX.name().toLowerCase(Locale.ROOT),
+            TaskFileFormat.JSON.name().toLowerCase(Locale.ROOT),
+            TaskFileFormat.SQL.name().toLowerCase(Locale.ROOT));
+    private static final Duration MAX_AGE = Duration.ofHours(24);
+    private static final Duration CLAIMED_MAX_AGE = Duration.ofDays(7);
+    private static final long MAX_SIZE_BYTES = 50L * 1024 * 1024;
+
+    private final Map<String, Instant> claimedFiles = new ConcurrentHashMap<>();
+
+    @Override
+    public String stage(File file, String originalFileName) {
+        validateSource(file, originalFileName);
+        cleanupExpiredFiles();
+        String id = UUID.randomUUID().toString();
+        String extension = extension(originalFileName);
+        try {
+            Path source = file.toPath().toRealPath(LinkOption.NOFOLLOW_LINKS);
+            if (!Files.isRegularFile(source, LinkOption.NOFOLLOW_LINKS) || !Files.isReadable(source)) {
+                throw new IOException("file is not readable");
+            }
+            Path stagingDirectory = stagingDirectory();
+            Files.createDirectories(stagingDirectory);
+            Path target = stagingTarget(id, extension);
+            if (!target.getParent().equals(stagingDirectory)) {
+                throw new IOException("invalid staging target");
+            }
+            Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException e) {
+            throw new BusinessException("import.preview.fileUnreadable", new Object[]{e.getMessage()}, e);
+        }
+        return id;
+    }
+
+    @Override
+    public File resolve(String fileId) {
+        if (!isFileId(fileId)) {
+            throw new BusinessException("import.preview.fileUnreadable");
+        }
+        cleanupExpiredFiles();
+        try {
+            Path file = stagedFile(fileId).toRealPath(LinkOption.NOFOLLOW_LINKS);
+            if (!file.getParent().equals(stagingDirectory())
+                    || !Files.isRegularFile(file, LinkOption.NOFOLLOW_LINKS) || !Files.isReadable(file)) {
+                throw new BusinessException("import.preview.fileUnreadable");
+            }
+            return file.toFile();
+        } catch (IOException e) {
+            throw new BusinessException("import.preview.fileUnreadable", new Object[]{e.getMessage()}, e);
+        }
+    }
+
+    @Override
+    public void claimForTask(String fileId) {
+        resolve(fileId);
+        claimedFiles.put(fileId, Instant.now());
+    }
+
+    @Override
+    public void release(String fileId) {
+        if (!isFileId(fileId)) {
+            return;
+        }
+        claimedFiles.remove(fileId);
+        for (String extension : ALLOWED_EXTENSIONS) {
+            try {
+                deleteQuietly(stagingTarget(fileId, extension));
+            } catch (BusinessException ignored) {
+                // Cleanup does not change the task outcome once execution has completed.
+            }
+        }
+    }
+
+    private static void validateSource(File file, String originalFileName) {
+        if (file == null || !file.isFile() || !file.canRead() || file.length() > MAX_SIZE_BYTES
+                || !ALLOWED_EXTENSIONS.contains(extension(originalFileName))) {
+            throw new BusinessException("import.preview.fileUnreadable");
+        }
+    }
+
+    private static String extension(String fileName) {
+        if (fileName == null) {
+            return "";
+        }
+        int dot = fileName.lastIndexOf('.');
+        return dot < 1 ? "" : fileName.substring(dot + 1).toLowerCase(Locale.ROOT);
+    }
+
+    private static Path stagingDirectory() {
+        return Path.of(ConfigUtils.getBasePath(), STAGING_DIRECTORY_NAME).normalize().toAbsolutePath();
+    }
+
+    private static Path stagingTarget(String id, String extension) {
+        if (!isFileId(id) || !ALLOWED_EXTENSIONS.contains(extension)) {
+            throw new BusinessException("import.preview.fileUnreadable");
+        }
+        Path directory = stagingDirectory();
+        Path file = directory.resolve(id + "." + extension).normalize();
+        if (!file.getParent().equals(directory)) {
+            throw new BusinessException("import.preview.fileUnreadable");
+        }
+        return file;
+    }
+
+    private static Path stagedFile(String id) throws IOException {
+        if (!isFileId(id)) {
+            throw new BusinessException("import.preview.fileUnreadable");
+        }
+        Path directory = stagingDirectory();
+        if (!Files.isDirectory(directory)) {
+            throw new BusinessException("import.preview.fileUnreadable");
+        }
+        try (var files = Files.list(directory)) {
+            return files.filter(ImportFileStagingService::isStagedImportFile)
+                    .filter(path -> id.equals(stagedFileId(path)))
+                    .findFirst()
+                    .orElseThrow(() -> new BusinessException("import.preview.fileUnreadable"));
+        }
+    }
+
+    private void cleanupExpiredFiles() {
+        try {
+            if (!Files.isDirectory(stagingDirectory())) {
+                return;
+            }
+            Instant deadline = Instant.now().minus(MAX_AGE);
+            try (var files = Files.list(stagingDirectory())) {
+                files.filter(ImportFileStagingService::isStagedImportFile)
+                        .filter(path -> isExpired(path, deadline)).filter(this::canDelete)
+                        .forEach(ImportFileStagingService::deleteQuietly);
+            }
+        } catch (IOException ignored) {
+            // Stale staging files are best-effort cleanup; a valid current file must remain usable.
+        }
+    }
+
+    private boolean canDelete(Path path) {
+        String id = stagedFileId(path);
+        Instant claimedAt = claimedFiles.get(id);
+        return claimedAt == null || claimedAt.isBefore(Instant.now().minus(CLAIMED_MAX_AGE));
+    }
+
+    private static boolean isFileId(String fileId) {
+        return fileId != null && FILE_ID_PATTERN.matcher(fileId).matches();
+    }
+
+    private static boolean isExpired(Path path, Instant deadline) {
+        try {
+            return Files.getLastModifiedTime(path).toInstant().isBefore(deadline);
+        } catch (IOException ignored) {
+            return false;
+        }
+    }
+
+    private static void deleteQuietly(Path path) {
+        try {
+            Files.deleteIfExists(path);
+        } catch (IOException ignored) {
+            // Best effort only.
+        }
+    }
+
+    private static boolean isStagedImportFile(Path path) {
+        String name = path.getFileName().toString();
+        int dot = name.lastIndexOf('.');
+        return dot == 36 && isFileId(name.substring(0, dot))
+                && ALLOWED_EXTENSIONS.contains(name.substring(dot + 1).toLowerCase(Locale.ROOT));
+    }
+
+    private static String stagedFileId(Path path) {
+        String name = path.getFileName().toString();
+        int dot = name.lastIndexOf('.');
+        return dot < 0 ? name : name.substring(0, dot);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ncx/TaskNcxImportServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ncx/TaskNcxImportServiceImpl.java
index e751072513..0b06d87c47 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ncx/TaskNcxImportServiceImpl.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ncx/TaskNcxImportServiceImpl.java
@@ -145,7 +145,10 @@ public NcxImportResponse dbpUploadFile(File file) {
                             zipFile);
                     projects.add(projectName);
                     File json = new File(config + File.separator + ExportConstants.CONFIG_DATASOURCE_FILE);
-                    JSONObject jsonObject = JSON.parseObject(new FileInputStream(json));
+                    JSONObject jsonObject;
+                    try (FileInputStream fis = new FileInputStream(json)) {
+                        jsonObject = JSON.parseObject(fis);
+                    }
                     JSONObject connections = jsonObject.getJSONObject(ExportConstants.DIR_CONNECTIONS);
                     Set<String> keys = connections.keySet();
                     for (String key : keys) {
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/ArtifactService.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/ArtifactServiceImpl.java
similarity index 63%
rename from chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/ArtifactService.java
rename to chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/ArtifactServiceImpl.java
index 2a248f8c05..605af524cf 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/ArtifactService.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/ArtifactServiceImpl.java
@@ -1,32 +1,33 @@
 package ai.chat2db.community.domain.core.impl.task;
 
 import ai.chat2db.community.domain.api.model.task.ArtifactDraft;
-import ai.chat2db.community.domain.api.model.task.TaskConstants;
-import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.community.domain.api.service.task.ArtifactService;
 import ai.chat2db.community.tools.util.ConfigUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.AtomicMoveNotSupportedException;
+import java.io.OutputStream;
+import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
 
 @Component
-public class ArtifactService {
+public class ArtifactServiceImpl implements ArtifactService {
 
     private static final String DRAFT_FILE_SUFFIX = ".part";
 
-    private static final String DELETION_FILE_MARKER = ".task-delete-";
-
     private final Set<Path> reservedTargets = ConcurrentHashMap.newKeySet();
 
-    ArtifactDraft createDraft(Long taskId, String outputDirectory, String fileName, String mediaType) {
+    @Override
+    public ArtifactDraft createDraft(Long taskId, String outputDirectory, String fileName, String mediaType) {
         File directory = resolveDirectory(outputDirectory);
         if (!directory.exists() && !directory.mkdirs()) {
             throw new IllegalStateException("Could not create artifact directory");
@@ -42,7 +43,13 @@ ArtifactDraft createDraft(Long taskId, String outputDirectory, String fileName,
                 .build();
     }
 
-    String publish(ArtifactDraft draft) {
+    @Override
+    public String publish(ArtifactDraft draft) {
+        return publish(draft, artifactId -> {});
+    }
+
+    @Override
+    public String publish(ArtifactDraft draft, Consumer<String> onTargetCreated) {
         if (draft == null) {
             throw new IllegalArgumentException("Artifact draft is incomplete");
         }
@@ -51,16 +58,26 @@ String publish(ArtifactDraft draft) {
                 throw new IllegalArgumentException("Artifact draft is incomplete");
             }
             Path source = draft.getTemporaryFile().toPath();
-            Path target = draft.getTargetFile().toPath();
             if (!Files.isRegularFile(source) || !Files.isReadable(source)) {
                 throw new IllegalStateException("Artifact draft is not readable");
             }
+            OutputStream output = createTarget(draft);
+            Path target = draft.getTargetFile().toPath();
             try {
-                Files.move(source, target, StandardCopyOption.ATOMIC_MOVE);
-            } catch (AtomicMoveNotSupportedException e) {
-                Files.move(source, target);
+                try (output) {
+                    onTargetCreated.accept(target.toAbsolutePath().toString());
+                    copyArtifact(source, output);
+                }
+                Files.delete(source);
+                return target.toAbsolutePath().toString();
+            } catch (IOException | RuntimeException | Error e) {
+                try {
+                    Files.deleteIfExists(target);
+                } catch (IOException cleanupFailure) {
+                    e.addSuppressed(cleanupFailure);
+                }
+                throw e;
             }
-            return target.toAbsolutePath().toString();
         } catch (IOException e) {
             throw new IllegalStateException("Could not publish artifact", e);
         } finally {
@@ -68,7 +85,25 @@ String publish(ArtifactDraft draft) {
         }
     }
 
-    void deleteDraft(ArtifactDraft draft) {
+    private OutputStream createTarget(ArtifactDraft draft) throws IOException {
+        File requestedTarget = draft.getTargetFile().getAbsoluteFile();
+        while (true) {
+            try {
+                // CREATE_NEW checks and creates atomically, including existing symbolic links.
+                return Files.newOutputStream(draft.getTargetFile().toPath(), StandardOpenOption.CREATE_NEW);
+            } catch (FileAlreadyExistsException e) {
+                releaseTarget(draft);
+                draft.setTargetFile(reserveAvailableTarget(requestedTarget.getParentFile(), requestedTarget.getName()));
+            }
+        }
+    }
+
+    void copyArtifact(Path source, OutputStream output) throws IOException {
+        Files.copy(source, output);
+    }
+
+    @Override
+    public void deleteDraft(ArtifactDraft draft) {
         if (draft == null) {
             return;
         }
@@ -83,7 +118,8 @@ void deleteDraft(ArtifactDraft draft) {
         }
     }
 
-    void deletePublished(String artifactId) {
+    @Override
+    public void deletePublished(String artifactId) {
         if (StringUtils.isBlank(artifactId)) {
             return;
         }
@@ -94,50 +130,18 @@ void deletePublished(String artifactId) {
         }
     }
 
-    PublishedArtifactDeletion stagePublishedDeletion(String artifactId) {
-        if (StringUtils.isBlank(artifactId)) {
-            return PublishedArtifactDeletion.empty();
-        }
-        Path original = Path.of(artifactId).toAbsolutePath().normalize();
-        if (!Files.exists(original)) {
-            return PublishedArtifactDeletion.empty();
-        }
-        if (!Files.isRegularFile(original)) {
-            throw artifactDeletionFailure(artifactId, null);
-        }
-        Path staged = original.resolveSibling("." + original.getFileName()
-                + DELETION_FILE_MARKER + UUID.randomUUID());
-        try {
-            move(original, staged);
-            return new PublishedArtifactDeletion(original, staged);
-        } catch (Exception e) {
-            throw artifactDeletionFailure(artifactId, e);
-        }
-    }
-
-    void commitPublishedDeletion(PublishedArtifactDeletion deletion) {
-        if (deletion == null || deletion.stagedPath() == null) {
-            return;
-        }
-        try {
-            Files.deleteIfExists(deletion.stagedPath());
-        } catch (Exception e) {
-            throw artifactDeletionFailure(deletion.originalPath().toString(), e);
-        }
-    }
-
-    void restorePublishedDeletion(PublishedArtifactDeletion deletion) {
-        if (deletion == null || deletion.stagedPath() == null || !Files.exists(deletion.stagedPath())) {
-            return;
-        }
-        try {
-            move(deletion.stagedPath(), deletion.originalPath());
-        } catch (Exception e) {
-            throw artifactDeletionFailure(deletion.originalPath().toString(), e);
+    @Override
+    public void stageForDeletion(Path original, Path staged) throws IOException {
+        if (Files.notExists(staged) && Files.exists(original)) {
+            if (!Files.isRegularFile(original)) {
+                throw new IOException("Task artifact is not a regular file: " + original);
+            }
+            Files.move(original, staged);
         }
     }
 
-    boolean cleanupInterruptedArtifact(Long taskId, String temporaryPath, String publishedPath) {
+    @Override
+    public boolean cleanupInterruptedArtifact(Long taskId, String temporaryPath, String publishedPath) {
         boolean cleaned = true;
         if (StringUtils.isNotBlank(temporaryPath)) {
             Path temporary = Path.of(temporaryPath).toAbsolutePath().normalize();
@@ -179,14 +183,14 @@ private File reserveAvailableTarget(File directory, String fileName) {
             String candidateName = index == 0 ? fileName : baseName + "_" + index + suffix;
             File candidate = new File(directory, candidateName);
             Path candidatePath = candidate.toPath().toAbsolutePath().normalize();
-            if (!Files.exists(candidatePath) && reservedTargets.add(candidatePath)) {
+            if (!Files.exists(candidatePath, LinkOption.NOFOLLOW_LINKS) && reservedTargets.add(candidatePath)) {
                 return candidate;
             }
         }
         while (true) {
             File candidate = new File(directory, baseName + "_" + UUID.randomUUID() + suffix);
             Path candidatePath = candidate.toPath().toAbsolutePath().normalize();
-            if (!Files.exists(candidatePath) && reservedTargets.add(candidatePath)) {
+            if (!Files.exists(candidatePath, LinkOption.NOFOLLOW_LINKS) && reservedTargets.add(candidatePath)) {
                 return candidate;
             }
         }
@@ -214,23 +218,4 @@ private boolean deleteQuietly(Path path) {
         }
     }
 
-    private void move(Path source, Path target) throws IOException {
-        try {
-            Files.move(source, target, StandardCopyOption.ATOMIC_MOVE);
-        } catch (AtomicMoveNotSupportedException e) {
-            Files.move(source, target);
-        }
-    }
-
-    private BusinessException artifactDeletionFailure(String artifactId, Exception cause) {
-        return new BusinessException(TaskConstants.DELETE_ARTIFACT_FAILED_MESSAGE_CODE,
-                new Object[]{artifactId}, cause);
-    }
-
-    record PublishedArtifactDeletion(Path originalPath, Path stagedPath) {
-
-        private static PublishedArtifactDeletion empty() {
-            return new PublishedArtifactDeletion(null, null);
-        }
-    }
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/ImportTaskSubmissionServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/ImportTaskSubmissionServiceImpl.java
new file mode 100644
index 0000000000..cb3724d39c
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/ImportTaskSubmissionServiceImpl.java
@@ -0,0 +1,42 @@
+package ai.chat2db.community.domain.core.impl.task;
+
+import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
+import ai.chat2db.community.domain.api.service.task.IImportTaskSubmissionService;
+import ai.chat2db.community.domain.api.service.task.TaskService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+
+@Service
+public class ImportTaskSubmissionServiceImpl implements IImportTaskSubmissionService {
+
+    private final TaskService taskService;
+
+    private final IImportFileStagingService importFileStagingService;
+
+    public ImportTaskSubmissionServiceImpl(TaskService taskService,
+            IImportFileStagingService importFileStagingService) {
+        this.taskService = taskService;
+        this.importFileStagingService = importFileStagingService;
+    }
+
+    @Override
+    public Long submit(ImportTaskSpec spec, String stagedFileId) {
+        if (StringUtils.isBlank(stagedFileId)) {
+            return taskService.submitImport(spec);
+        }
+
+        File stagedFile = importFileStagingService.resolve(stagedFileId);
+        importFileStagingService.claimForTask(stagedFileId);
+        spec.setSourceFile(stagedFile.getAbsolutePath());
+        spec.setImportFileId(stagedFileId);
+        try {
+            return taskService.submitImport(spec);
+        } catch (RuntimeException e) {
+            importFileStagingService.release(stagedFileId);
+            throw e;
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManager.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManager.java
index 25a4f3791a..add6cbae07 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManager.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManager.java
@@ -1,22 +1,23 @@
 package ai.chat2db.community.domain.core.impl.task;
 
+import ai.chat2db.community.domain.api.model.task.ExportTaskSpec;
+import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
 import ai.chat2db.community.domain.api.model.task.Task;
 import ai.chat2db.community.domain.api.model.task.TaskConstants;
 import ai.chat2db.community.domain.api.model.task.TaskErrorCode;
 import ai.chat2db.community.domain.api.model.task.TaskEvent;
 import ai.chat2db.community.domain.api.model.task.TaskEventCode;
 import ai.chat2db.community.domain.api.model.task.TaskEventLevel;
-import ai.chat2db.community.domain.api.model.task.ExportTaskSpec;
-import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
 import ai.chat2db.community.domain.api.model.task.TaskSpec;
+import ai.chat2db.community.domain.api.model.task.TaskStage;
 import ai.chat2db.community.domain.api.model.task.TaskStatus;
 import ai.chat2db.community.domain.api.model.task.TaskStatusPatch;
-import ai.chat2db.community.domain.api.model.task.TaskStage;
 import ai.chat2db.community.domain.api.model.task.TaskTargetSnapshot;
 import ai.chat2db.community.domain.api.model.task.TaskType;
 import ai.chat2db.community.domain.api.model.task.extension.TaskExecutionContext;
 import ai.chat2db.community.domain.api.model.task.extension.TaskOperation;
 import ai.chat2db.community.domain.api.model.task.extension.TaskSubmissionContext;
+import ai.chat2db.community.domain.api.service.task.ArtifactService;
 import ai.chat2db.community.domain.api.service.task.TaskExecutor;
 import ai.chat2db.community.domain.api.service.task.TaskStorage;
 import ai.chat2db.community.domain.core.converter.ConnectionContextConverter;
@@ -261,7 +262,8 @@ private void cleanupInterruptedArtifacts(Long taskId) {
                 Map<String, Object> details = event.getDetails();
                 if (TaskEventCode.ARTIFACT_PREPARED.name().equals(event.getCode())) {
                     temporaryPath = detail(details, TaskConstants.ARTIFACT_TEMPORARY_PATH_DETAIL_KEY);
-                } else if (TaskEventCode.ARTIFACT_PUBLISHED.name().equals(event.getCode())) {
+                } else if (TaskEventCode.ARTIFACT_PUBLICATION_STARTED.name().equals(event.getCode())
+                        || TaskEventCode.ARTIFACT_PUBLISHED.name().equals(event.getCode())) {
                     publishedPath = detail(details, TaskConstants.ARTIFACT_ID_DETAIL_KEY);
                 }
             }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/PendingTaskDeletion.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/PendingTaskDeletion.java
new file mode 100644
index 0000000000..34e63b5d4e
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/PendingTaskDeletion.java
@@ -0,0 +1,54 @@
+package ai.chat2db.community.domain.core.impl.task;
+
+import ai.chat2db.community.domain.api.model.task.Task;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.nio.file.Path;
+import java.util.UUID;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+class PendingTaskDeletion {
+    private Long taskId;
+    private String originalPath;
+    private String stagedPath;
+    private int attempts;
+    private String lastError;
+
+    static PendingTaskDeletion create(Task task) {
+        PendingTaskDeletion deletion = new PendingTaskDeletion();
+        deletion.taskId = task.getId();
+        if (StringUtils.isNotBlank(task.getArtifactId())) {
+            Path original = Path.of(task.getArtifactId()).toAbsolutePath().normalize();
+            deletion.originalPath = original.toString();
+            deletion.stagedPath = original.resolveSibling("." + original.getFileName()
+                    + ".task-delete-" + UUID.randomUUID()).toString();
+        }
+        return deletion;
+    }
+
+    void beginAttempt() {
+        attempts++;
+        lastError = null;
+    }
+
+    void recordFailure(Exception error) {
+        lastError = error.toString();
+    }
+
+    boolean hasArtifact() {
+        return stagedPath != null;
+    }
+
+    Path originalFile() {
+        return Path.of(originalPath);
+    }
+
+    Path stagedFile() {
+        return Path.of(stagedPath);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskDeletionServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskDeletionServiceImpl.java
new file mode 100644
index 0000000000..bb6fccdd87
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskDeletionServiceImpl.java
@@ -0,0 +1,139 @@
+package ai.chat2db.community.domain.core.impl.task;
+
+import ai.chat2db.community.domain.api.model.task.Task;
+import ai.chat2db.community.domain.api.model.task.TaskConstants;
+import ai.chat2db.community.domain.api.service.task.ArtifactService;
+import ai.chat2db.community.domain.api.service.task.TaskDeletionService;
+import ai.chat2db.community.domain.api.service.task.TaskStorage;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.community.tools.exception.DataNotFoundException;
+import ai.chat2db.community.tools.util.ConfigUtils;
+import ai.chat2db.community.tools.util.JsonFileUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@Service
+public class TaskDeletionServiceImpl implements TaskDeletionService {
+    static final int MAX_DELETION_ATTEMPTS = 3;
+
+    private final TaskStorage storage;
+    private final ArtifactService artifacts;
+    private final File queueFile;
+
+    @Autowired
+    public TaskDeletionServiceImpl(TaskStorage storage, ArtifactService artifacts) {
+        this(storage, artifacts, new File(ConfigUtils.getEnvBasePath(), "task-artifact-deletions.json"));
+    }
+
+    TaskDeletionServiceImpl(TaskStorage storage, ArtifactService artifacts, File queueFile) {
+        this.storage = storage;
+        this.artifacts = artifacts;
+        this.queueFile = queueFile;
+    }
+
+    @Override
+    public synchronized void delete(Task task) {
+        if (storage.get(task.getId()).isEmpty()) {
+            throw new DataNotFoundException();
+        }
+        try {
+            List<PendingTaskDeletion> pending = readQueue();
+            PendingTaskDeletion deletion = pending.stream()
+                    .filter(entry -> Objects.equals(entry.getTaskId(), task.getId())).findFirst().orElse(null);
+            if (deletion == null) {
+                deletion = PendingTaskDeletion.create(task);
+                pending.add(deletion);
+            }
+            if (!attemptDeletion(pending, deletion)) {
+                throw new IOException(deletion.getLastError());
+            }
+        } catch (Exception e) {
+            throw new BusinessException(TaskConstants.DELETE_ARTIFACT_FAILED_MESSAGE_CODE,
+                    new Object[]{task.getArtifactId()}, e);
+        }
+    }
+
+    @Override
+    public synchronized void retryPendingDeletions() {
+        List<PendingTaskDeletion> pending;
+        try {
+            pending = readQueue();
+        } catch (Exception e) {
+            log.error("Could not read pending task deletions from {}", queueFile, e);
+            return;
+        }
+        for (PendingTaskDeletion deletion : List.copyOf(pending)) {
+            try {
+                if (isComplete(deletion)) {
+                    pending.remove(deletion);
+                    JsonFileUtils.writeAtomically(queueFile, pending);
+                } else if (deletion.getAttempts() < MAX_DELETION_ATTEMPTS) {
+                    attemptDeletion(pending, deletion);
+                }
+            } catch (Exception e) {
+                log.error("Could not process pending deletion for task {}", deletion.getTaskId(), e);
+            }
+        }
+    }
+
+    private boolean attemptDeletion(List<PendingTaskDeletion> pending, PendingTaskDeletion deletion) throws IOException {
+        deletion.beginAttempt();
+        JsonFileUtils.writeAtomically(queueFile, pending);
+        try {
+            executeDeletion(deletion);
+            pending.remove(deletion);
+        } catch (Exception e) {
+            deletion.recordFailure(e);
+            log.warn("Could not delete task {} on attempt {}", deletion.getTaskId(), deletion.getAttempts(), e);
+        }
+        JsonFileUtils.writeAtomically(queueFile, pending);
+        return deletion.getLastError() == null;
+    }
+
+    private void executeDeletion(PendingTaskDeletion deletion) throws IOException {
+        if (storage.get(deletion.getTaskId()).isPresent()) {
+            if (deletion.hasArtifact()) {
+                artifacts.stageForDeletion(deletion.originalFile(), deletion.stagedFile());
+            }
+            if (!storage.deleteTerminalTask(deletion.getTaskId(), null)) {
+                throw new IOException("Task is not terminal: " + deletion.getTaskId());
+            }
+        }
+        // The original filename may now belong to a newer export; only delete the staged file.
+        if (deletion.hasArtifact()) {
+            Files.deleteIfExists(deletion.stagedFile());
+        }
+    }
+
+    private boolean isComplete(PendingTaskDeletion deletion) {
+        return storage.get(deletion.getTaskId()).isEmpty()
+                && (!deletion.hasArtifact() || Files.notExists(deletion.stagedFile()));
+    }
+
+    @Override
+    public synchronized File resolveArtifact(Task task) {
+        for (PendingTaskDeletion deletion : readQueue()) {
+            if (Objects.equals(task.getId(), deletion.getTaskId()) && deletion.hasArtifact()
+                    && Files.exists(deletion.stagedFile())) {
+                return deletion.stagedFile().toFile();
+            }
+        }
+        return new File(task.getArtifactId());
+    }
+
+    private List<PendingTaskDeletion> readQueue() {
+        List<PendingTaskDeletion> pending = JsonFileUtils.readArray(queueFile, PendingTaskDeletion.class);
+        if (pending.stream().anyMatch(entry -> entry == null || entry.getTaskId() == null)) {
+            throw new IllegalStateException("Invalid task deletion queue: " + queueFile);
+        }
+        return pending;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskExecutionContextImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskExecutionContextImpl.java
index e0c16be2df..c37118a01a 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskExecutionContextImpl.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskExecutionContextImpl.java
@@ -7,6 +7,7 @@
 import ai.chat2db.community.domain.api.model.task.TaskEventCode;
 import ai.chat2db.community.domain.api.model.task.TaskEventLevel;
 import ai.chat2db.community.domain.api.model.task.TaskProgress;
+import ai.chat2db.community.domain.api.service.task.ArtifactService;
 import ai.chat2db.community.domain.api.service.task.TaskCancelable;
 import ai.chat2db.community.domain.api.service.task.TaskExecutionContext;
 import ai.chat2db.community.domain.api.service.task.TaskStorage;
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskRunner.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskRunner.java
index d55623ca87..58e83f9626 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskRunner.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskRunner.java
@@ -9,9 +9,10 @@
 import ai.chat2db.community.domain.api.model.task.TaskEventLevel;
 import ai.chat2db.community.domain.api.model.task.TaskExecutionException;
 import ai.chat2db.community.domain.api.model.task.TaskSpec;
+import ai.chat2db.community.domain.api.model.task.TaskStage;
 import ai.chat2db.community.domain.api.model.task.TaskStatus;
 import ai.chat2db.community.domain.api.model.task.TaskStatusPatch;
-import ai.chat2db.community.domain.api.model.task.TaskStage;
+import ai.chat2db.community.domain.api.service.task.ArtifactService;
 import ai.chat2db.community.domain.api.service.task.TaskExecutor;
 import ai.chat2db.community.domain.api.service.task.TaskStorage;
 import ai.chat2db.community.domain.core.impl.task.extension.TaskExtensionManager;
@@ -75,12 +76,17 @@ public void run() {
             logArtifactWritten(executionContext, draft);
             completeSuccessfully(draft);
         } catch (TaskCancelledException | CancellationException e) {
-            completeCancelled(executionContext.artifactDraft());
+            if (isCancellationRequested()) {
+                completeCancelled(executionContext.artifactDraft());
+            } else {
+                completeFailed(TaskErrorCode.TASK_INTERNAL_ERROR.name(), "Task execution failed", null, e,
+                        executionContext.artifactDraft());
+            }
         } catch (TaskExecutionException e) {
             completeFailed(e.getCode(), e.publicMessage(), e.getSafeReason(), e,
                     executionContext.artifactDraft());
         } catch (Throwable e) {
-            if (runningTask.cancellationToken().isCancelled() || Thread.currentThread().isInterrupted()) {
+            if (isCancellationRequested()) {
                 completeCancelled(executionContext.artifactDraft());
             } else {
                 completeFailed(TaskErrorCode.TASK_INTERNAL_ERROR.name(), "Task execution failed", null, e,
@@ -98,6 +104,10 @@ public void run() {
         }
     }
 
+    private boolean isCancellationRequested() {
+        return runningTask.cancellationToken().isCancelled();
+    }
+
     private void logArtifactWritten(TaskExecutionContextImpl executionContext, ArtifactDraft draft) {
         if (draft == null) {
             return;
@@ -144,7 +154,14 @@ private void completeSuccessfully(ArtifactDraft draft) {
                 return;
             }
             if (draft != null) {
-                artifactId = artifactService.publish(draft);
+                artifactId = artifactService.publish(draft, target -> taskStorage.appendEvent(TaskEvent.builder()
+                        .taskId(submission.taskId())
+                        .level(TaskEventLevel.INFO.name())
+                        .code(TaskEventCode.ARTIFACT_PUBLICATION_STARTED.name())
+                        .stage(TaskStage.FINALIZING.name())
+                        .message("Saving export file")
+                        .details(Map.of(TaskConstants.ARTIFACT_ID_DETAIL_KEY, target))
+                        .build()));
                 taskStorage.appendEvent(TaskEvent.builder()
                         .taskId(submission.taskId())
                         .level(TaskEventLevel.INFO.name())
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskServiceImpl.java
index 2ea4aa3c69..67717235d0 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskServiceImpl.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/TaskServiceImpl.java
@@ -11,8 +11,9 @@
 import ai.chat2db.community.domain.api.model.task.TaskEventLevel;
 import ai.chat2db.community.domain.api.model.task.TaskQuery;
 import ai.chat2db.community.domain.api.model.task.TaskSpec;
-import ai.chat2db.community.domain.api.model.task.TaskStatus;
 import ai.chat2db.community.domain.api.model.task.TaskStage;
+import ai.chat2db.community.domain.api.model.task.TaskStatus;
+import ai.chat2db.community.domain.api.service.task.TaskDeletionService;
 import ai.chat2db.community.domain.api.service.task.TaskService;
 import ai.chat2db.community.domain.api.service.task.TaskStorage;
 import ai.chat2db.community.tools.exception.BusinessException;
@@ -21,7 +22,7 @@
 import ai.chat2db.community.tools.util.ContextUtils;
 import ai.chat2db.spi.model.datasource.ConnectInfo;
 import ai.chat2db.spi.sql.Chat2DBContext;
-import com.google.common.util.concurrent.Striped;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -29,23 +30,25 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.locks.Lock;
 
 @Service
 public class TaskServiceImpl implements TaskService {
 
-    private final Striped<Lock> deletionLocks = Striped.lazyWeakLock(64);
-
     private final TaskStorage taskStorage;
 
     private final LocalTaskManager localTaskManager;
 
-    private final ArtifactService artifactService;
+    private final TaskDeletionService deletionService;
 
-    public TaskServiceImpl(TaskStorage taskStorage, LocalTaskManager localTaskManager, ArtifactService artifactService) {
+    public TaskServiceImpl(TaskStorage taskStorage, LocalTaskManager localTaskManager, TaskDeletionService deletionService) {
         this.taskStorage = taskStorage;
         this.localTaskManager = localTaskManager;
-        this.artifactService = artifactService;
+        this.deletionService = deletionService;
+    }
+
+    @PostConstruct
+    void recoverInterruptedArtifactDeletions() {
+        deletionService.retryPendingDeletions();
     }
 
     @Override
@@ -91,34 +94,14 @@ public List<TaskEvent> listEventsBefore(Long taskId, Long beforeSequence, int li
 
     @Override
     public void delete(Long taskId) {
-        Lock deletionLock = deletionLocks.get(taskId);
-        deletionLock.lock();
-        try {
-            Task task = get(taskId);
-            if (task == null) {
-                throw new DataNotFoundException();
-            }
-            if (!TaskStatus.isTerminal(task.getStatus())) {
-                throw new BusinessException(TaskConstants.DELETE_ACTIVE_FORBIDDEN_MESSAGE_CODE);
-            }
-            ArtifactService.PublishedArtifactDeletion deletion =
-                    artifactService.stagePublishedDeletion(task.getArtifactId());
-            try {
-                if (!taskStorage.deleteTerminalTask(taskId,
-                        () -> artifactService.commitPublishedDeletion(deletion))) {
-                    throw new DataNotFoundException();
-                }
-            } catch (RuntimeException e) {
-                try {
-                    artifactService.restorePublishedDeletion(deletion);
-                } catch (RuntimeException rollbackFailure) {
-                    e.addSuppressed(rollbackFailure);
-                }
-                throw e;
-            }
-        } finally {
-            deletionLock.unlock();
+        Task task = get(taskId);
+        if (task == null) {
+            throw new DataNotFoundException();
+        }
+        if (!TaskStatus.isTerminal(task.getStatus())) {
+            throw new BusinessException(TaskConstants.DELETE_ACTIVE_FORBIDDEN_MESSAGE_CODE);
         }
+        deletionService.delete(task);
     }
 
     @Override
@@ -145,11 +128,12 @@ public TaskDownload resolveArtifact(Long taskId) {
                 || StringUtils.isBlank(task.getArtifactId())) {
             throw new DataNotFoundException();
         }
-        File file = new File(task.getArtifactId());
+        File file = deletionService.resolveArtifact(task);
         if (!file.isFile() || !file.canRead()) {
             throw new DataNotFoundException();
         }
-        return TaskDownload.builder().fileName(file.getName()).fileUri(file.toURI().toString()).build();
+        return TaskDownload.builder().fileName(new File(task.getArtifactId()).getName())
+                .fileUri(file.toURI().toString()).build();
     }
 
     private <S extends TaskSpec> Long submit(S spec) {
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/executor/DataFileImportTaskExecutor.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/executor/DataFileImportTaskExecutor.java
index db423a616b..520fd7b5a5 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/executor/DataFileImportTaskExecutor.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/executor/DataFileImportTaskExecutor.java
@@ -5,17 +5,23 @@
 import ai.chat2db.community.domain.api.model.task.TaskErrorCode;
 import ai.chat2db.community.domain.api.model.task.TaskExecutionException;
 import ai.chat2db.community.domain.api.model.task.TaskFileFormat;
+import ai.chat2db.community.domain.api.model.task.TaskEventCode;
 import ai.chat2db.community.domain.api.model.task.TaskStage;
 import ai.chat2db.community.domain.api.model.task.TaskType;
 import ai.chat2db.community.domain.api.service.task.TaskExecutionContext;
 import ai.chat2db.community.domain.api.service.task.TaskExecutor;
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
 import ai.chat2db.community.domain.core.impl.task.imports.IImportStrategy;
 import ai.chat2db.community.domain.core.impl.task.imports.ImportFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @Component
 public class DataFileImportTaskExecutor implements TaskExecutor<ImportTaskSpec> {
 
+    @Autowired
+    private IImportFileStagingService importFileStagingService;
+
     @Override
     public String taskType() {
         return TaskType.DATA_FILE_IMPORT.name();
@@ -36,14 +42,20 @@ public void execute(ImportTaskSpec spec, TaskExecutionContext context) {
                         "Unsupported data import format");
             }
             context.reportProgress(5, TaskStage.READING.name(), "Preparing data import");
+            context.logInfo(TaskEventCode.IMPORT_PREPARING.name(), "Preparing data import");
             IImportStrategy strategy = ImportFactory.get(format);
             strategy.run(spec, context);
             context.reportProgress(95, TaskStage.IMPORTING.name(), "Data import completed");
+            context.logInfo(TaskEventCode.IMPORT_COMPLETED.name(), "Data import completed");
         } catch (TaskCancelledException | TaskExecutionException e) {
             throw e;
         } catch (Exception e) {
             throw new TaskExecutionException(TaskErrorCode.IMPORT_FAILED.name(),
                     "Could not import data file", e);
+        } finally {
+            if (spec.getImportFileId() != null) {
+                importFileStagingService.release(spec.getImportFileId());
+            }
         }
     }
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/executor/SqlFileImportTaskExecutor.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/executor/SqlFileImportTaskExecutor.java
index cf8973f04d..940f47f614 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/executor/SqlFileImportTaskExecutor.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/executor/SqlFileImportTaskExecutor.java
@@ -7,6 +7,7 @@
 import ai.chat2db.community.domain.api.model.task.TaskFileFormat;
 import ai.chat2db.community.domain.api.model.task.TaskStage;
 import ai.chat2db.community.domain.api.model.task.TaskType;
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
 import ai.chat2db.community.domain.api.service.task.TaskExecutionContext;
 import ai.chat2db.community.domain.api.service.task.TaskExecutor;
 import ai.chat2db.community.domain.core.impl.task.imports.ImportFactory;
@@ -15,6 +16,12 @@
 @Component
 public class SqlFileImportTaskExecutor implements TaskExecutor<ImportTaskSpec> {
 
+    private final IImportFileStagingService importFileStagingService;
+
+    public SqlFileImportTaskExecutor(IImportFileStagingService importFileStagingService) {
+        this.importFileStagingService = importFileStagingService;
+    }
+
     @Override
     public String taskType() {
         return TaskType.SQL_FILE_IMPORT.name();
@@ -42,6 +49,10 @@ public void execute(ImportTaskSpec spec, TaskExecutionContext context) {
         } catch (Exception e) {
             throw new TaskExecutionException(TaskErrorCode.IMPORT_FAILED.name(),
                     "Could not import SQL file", e);
+        } finally {
+            if (spec.getImportFileId() != null) {
+                importFileStagingService.release(spec.getImportFileId());
+            }
         }
     }
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/BaseImporter.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/BaseImporter.java
index 0e102ed5fc..05fb295edd 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/BaseImporter.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/BaseImporter.java
@@ -11,6 +11,8 @@
 import ai.chat2db.community.domain.api.model.value.SQLDataValue;
 import ai.chat2db.community.domain.api.model.metadata.TableColumn;
 import ai.chat2db.community.domain.api.service.task.TaskExecutionContext;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.community.tools.util.I18nUtils;
 import ai.chat2db.spi.sql.Chat2DBContext;
 import ai.chat2db.spi.model.datasource.ConnectInfo;
 import ai.chat2db.spi.model.request.TableMetadataRequest;
@@ -35,11 +37,14 @@ public void run(ImportTaskSpec spec, TaskExecutionContext context) {
                             spec.getTarget().getTableName()));
             context.checkCancelled();
             context.reportProgress(20, TaskStage.READING.name(), "Target table metadata loaded");
+            context.logInfo(TaskEventCode.TARGET_METADATA_LOADED.name(), "Target table metadata loaded");
             context.logInfo(TaskEventCode.FILE_READ_STARTED.name(), "Reading import file");
             doImportData(spec, context, tableColumns);
             context.logInfo(TaskEventCode.FILE_READ_COMPLETED.name(), "Import file read completed");
         } catch (TaskCancelledException | TaskExecutionException e) {
             throw e;
+        } catch (BusinessException e) {
+            throw new TaskExecutionException(e.getCode(), I18nUtils.getMessage(e.getCode(), e.getArgs()), e);
         } catch (Exception e) {
             log.error("Could not import data file", e);
             throw new TaskExecutionException(TaskErrorCode.IMPORT_FAILED.name(),
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/BaseExcelImporter.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/BaseExcelImporter.java
index f973298469..7958050975 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/BaseExcelImporter.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/BaseExcelImporter.java
@@ -2,8 +2,14 @@
 
 import ai.chat2db.community.domain.core.impl.task.imports.BaseImporter;
 import ai.chat2db.community.domain.core.impl.task.imports.ImportSqlExecutor;
+import ai.chat2db.community.domain.api.model.task.TaskConstants;
+import ai.chat2db.community.domain.api.model.task.TaskCancelledException;
 import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+import ai.chat2db.community.domain.api.model.task.ImportColumnMapping;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
 import ai.chat2db.community.domain.api.model.task.TaskEventCode;
+import ai.chat2db.community.domain.api.model.task.TaskStage;
+import ai.chat2db.community.domain.api.model.task.UnmappedTargetStrategy;
 import ai.chat2db.community.domain.api.service.task.TaskExecutionContext;
 import ai.chat2db.spi.ISqlBuilder;
 import ai.chat2db.spi.IValueProcessor;
@@ -37,7 +43,6 @@ protected void doImportData(ImportTaskSpec spec, TaskExecutionContext context, L
                 .headRowNumber(1)
                 .doRead();
         context.checkCancelled();
-
     }
 
     protected abstract ExcelTypeEnum getExcelType();
@@ -54,12 +59,18 @@ public class NoModelDataListener extends AnalysisEventListener<Map<Integer, Stri
 
         private Map<String, Integer> headMap;
 
+        private Map<String, Integer> mappedHeadMap;
+
         private List<TableColumn> tableColumns;
 
         private List<String> tableColumnList;
 
         private List<String> sqlList;
 
+        private long successCount;
+
+        private long skippedCount;
+
         private static final int BATCH_SIZE = 1000;
 
         private final IValueProcessor valueProcessor;
@@ -70,6 +81,10 @@ public class NoModelDataListener extends AnalysisEventListener<Map<Integer, Stri
 
         private final ImportSqlExecutor sqlExecutor;
 
+        private final CsvOptions csvOptions;
+
+        private long sourceRowNumber;
+
         public NoModelDataListener(ImportTaskSpec spec, TaskExecutionContext taskContext,
                 List<TableColumn> columns) {
             this.spec = spec;
@@ -79,14 +94,19 @@ public NoModelDataListener(ImportTaskSpec spec, TaskExecutionContext taskContext
             this.connectInfo = Chat2DBContext.getConnectInfo();
             this.sqlBuilder = Chat2DBContext.getSqlBuilder();
             this.sqlExecutor = new ImportSqlExecutor(taskContext);
+            this.csvOptions = spec.getCsvOptions() == null ? null : spec.getCsvOptions().validate();
         }
 
 
         @Override
         public void invokeHead(Map<Integer, ReadCellData<?>> headMap, AnalysisContext context) {
+            acceptHead(ConverterUtils.convertToStringMap(headMap, context));
+        }
+
+        void acceptHead(Map<Integer, String> map) {
             this.taskContext.checkCancelled();
-            Map<Integer, String> map = ConverterUtils.convertToStringMap(headMap, context);
             this.headMap = invertMap(map);
+            this.mappedHeadMap = mappedHeadMap();
             this.tableColumns = getTableColumns(columns, this.headMap);
         }
 
@@ -94,7 +114,7 @@ private List<TableColumn> getTableColumns(List<TableColumn> columns, Map<String,
             List<TableColumn> tableColumns = new ArrayList<>();
             this.tableColumnList = new ArrayList<>();
             for (TableColumn column : columns) {
-                if (headMap.containsKey(column.getName().toUpperCase(Locale.ROOT))) {
+                if (shouldInclude(column)) {
                     tableColumns.add(column);
                     this.tableColumnList.add(column.getName());
                 }
@@ -117,8 +137,18 @@ private Map<String, Integer> invertMap(Map<Integer, String> map) {
 
         @Override
         public void invoke(Map<Integer, String> data, AnalysisContext context) {
+            acceptRow(data);
+        }
+
+        void acceptRow(Map<Integer, String> data) {
+            acceptRow(data, 0);
+        }
+
+        void acceptRow(Map<Integer, String> data, long sourceRowNumber) {
             this.taskContext.checkCancelled();
+            this.sourceRowNumber = sourceRowNumber;
             if (data == null || data.isEmpty()) {
+                skippedCount++;
                 return;
             }
             List<String> values = getValueList(data);
@@ -126,6 +156,7 @@ public void invoke(Map<Integer, String> data, AnalysisContext context) {
             String sql = getInsertSql(values);
 
             if (StringUtils.isBlank(sql)) {
+                skippedCount++;
                 return;
             }
             if (sqlList == null) {
@@ -142,7 +173,7 @@ public void invoke(Map<Integer, String> data, AnalysisContext context) {
         private List<String> getValueList(Map<Integer, String> data) {
             List<String> values = new ArrayList<>();
             for (TableColumn column : tableColumns) {
-                Integer index = headMap.get(column.getName().toUpperCase(Locale.ROOT));
+                Integer index = sourceIndex(column.getName());
                 if (index == null) {
                     values.add(null);
                     continue;
@@ -151,6 +182,9 @@ private List<String> getValueList(Map<Integer, String> data) {
                 if (value == null) {
                     values.add(null);
                 } else {
+                    if (csvOptions != null) {
+                        value = CsvImportValueNormalizer.normalize(value, column, csvOptions, sourceRowNumber);
+                    }
                     String stringValue = valueProcessor.getSqlValueString(getSQLDataValue(value, column));
                     values.add(stringValue);
                 }
@@ -158,6 +192,41 @@ private List<String> getValueList(Map<Integer, String> data) {
             return values;
         }
 
+        private Map<String, Integer> mappedHeadMap() {
+            Map<String, Integer> mapped = new HashMap<>();
+            if (spec.getColumnMappings() == null) {
+                return mapped;
+            }
+            for (ImportColumnMapping mapping : spec.getColumnMappings()) {
+                String source = mapping.getSourceColumn();
+                String target = mapping.getTargetColumn();
+                Integer sourceIndex = headMap.get(source == null ? null : source.toUpperCase(Locale.ROOT));
+                if (sourceIndex != null && StringUtils.isNotBlank(target)) {
+                    mapped.put(target.toUpperCase(Locale.ROOT), sourceIndex);
+                }
+            }
+            return mapped;
+        }
+
+        private Integer sourceIndex(String targetColumn) {
+            String target = targetColumn.toUpperCase(Locale.ROOT);
+            if (spec.getColumnMappings() != null) {
+                return mappedHeadMap.get(target);
+            }
+            return headMap.get(target);
+        }
+
+        private boolean shouldInclude(TableColumn column) {
+            if (spec.getColumnMappings() == null) {
+                return sourceIndex(column.getName()) != null;
+            }
+            if (sourceIndex(column.getName()) != null) {
+                return true;
+            }
+            return spec.getUnmappedTarget() == UnmappedTargetStrategy.NULL
+                    && !Boolean.TRUE.equals(column.getAutoIncrement());
+        }
+
         private String getInsertSql(List<String> values) {
             return sqlBuilder.dml().buildInsert(SingleInsertSqlRequest.builder()
                     .databaseName(connectInfo.getDatabaseName())
@@ -170,6 +239,10 @@ private String getInsertSql(List<String> values) {
 
         @Override
         public void doAfterAllAnalysed(AnalysisContext context) {
+            finish();
+        }
+
+        void finish() {
             this.taskContext.checkCancelled();
             executeBatchInsert();
         }
@@ -179,10 +252,30 @@ private void executeBatchInsert() {
             if (sqlList != null && !sqlList.isEmpty()) {
                 taskContext.logInfo(TaskEventCode.BATCH_EXECUTED.name(),
                         String.format("Executing batch insert: %s", sqlList.size()));
-                sqlExecutor.executeBatch(sqlList);
+                int statementCount = sqlList.size();
+                try {
+                    sqlExecutor.executeBatch(sqlList);
+                    successCount += statementCount;
+                    reportImportProgress();
+                } catch (TaskCancelledException e) {
+                    throw e;
+                } catch (Exception e) {
+                    taskContext.logError(TaskEventCode.IMPORT_BATCH_FAILED.name(), "Could not import batch", Map.of(
+                            "statementCount", statementCount,
+                            "message", StringUtils.defaultString(e.getMessage())));
+                    throw e;
+                }
             }
             sqlList = new ArrayList<>();
         }
+
+        private void reportImportProgress() {
+            long processedRows = successCount + skippedCount;
+            int progress = (int) Math.min(TaskConstants.MAX_RUNNING_PROGRESS,
+                    20 + Math.min(70, processedRows / 100));
+            taskContext.reportProgress(progress, TaskStage.IMPORTING.name(),
+                    String.format("Imported %s rows", successCount));
+        }
     }
 
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CSVImporter.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CSVImporter.java
index 18521796ca..bdd2422daf 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CSVImporter.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CSVImporter.java
@@ -1,11 +1,73 @@
 package ai.chat2db.community.domain.core.impl.task.imports.excel;
 
+import ai.chat2db.community.domain.api.model.metadata.TableColumn;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+import ai.chat2db.community.domain.api.service.task.TaskExecutionContext;
+import ai.chat2db.community.domain.core.impl.db.CsvParser;
 import ai.chat2db.community.domain.core.impl.task.imports.IImportStrategy;
 import com.alibaba.excel.support.ExcelTypeEnum;
 
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.List;
 
 public class CSVImporter extends BaseExcelImporter implements IImportStrategy {
 
+    @Override
+    protected void doImportData(ImportTaskSpec spec, TaskExecutionContext context, List<TableColumn> columns) {
+        CsvOptions options = (spec.getCsvOptions() == null ? CsvOptions.defaults() : spec.getCsvOptions()).validate();
+        NoModelDataListener listener = new NoModelDataListener(spec, context, columns);
+        boolean[] initialized = {false};
+        int[] sourceRow = {0};
+        new CsvParser(options).forEachRow(Path.of(spec.getSourceFile()), row -> {
+            int rowNumber = ++sourceRow[0];
+            if (Boolean.TRUE.equals(options.getHasHeader()) && rowNumber == options.getHeaderRow()) {
+                initialized[0] = true;
+                listener.acceptHead(row);
+                return;
+            }
+            if (rowNumber < options.getDataStartRow()
+                    || options.getDataEndRow() != null && rowNumber > options.getDataEndRow()) {
+                return;
+            }
+            if (!initialized[0]) {
+                initialized[0] = true;
+                listener.acceptHead(syntheticHeader(Math.max(row.size(), mappedSourceColumnCount(spec))));
+            }
+            listener.acceptRow(row, rowNumber);
+        }, context::checkCancelled);
+        if (initialized[0]) {
+            listener.finish();
+        }
+    }
+
+    private static Map<Integer, String> syntheticHeader(int columnCount) {
+        Map<Integer, String> header = new LinkedHashMap<>();
+        for (int index = 0; index < columnCount; index++) {
+            header.put(index, "column_" + (index + 1));
+        }
+        return header;
+    }
+
+    private static int mappedSourceColumnCount(ImportTaskSpec spec) {
+        if (spec.getColumnMappings() == null) {
+            return 0;
+        }
+        return spec.getColumnMappings().stream()
+                .map(mapping -> mapping.getSourceColumn())
+                .filter(source -> source != null && source.startsWith("column_"))
+                .mapToInt(source -> {
+                    try {
+                        return Integer.parseInt(source.substring("column_".length()));
+                    } catch (NumberFormatException ignored) {
+                        return 0;
+                    }
+                })
+                .max()
+                .orElse(0);
+    }
 
     @Override
     protected ExcelTypeEnum getExcelType() {
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CsvImportValueNormalizer.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CsvImportValueNormalizer.java
new file mode 100644
index 0000000000..1f4ff57b0c
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CsvImportValueNormalizer.java
@@ -0,0 +1,237 @@
+package ai.chat2db.community.domain.core.impl.task.imports.excel;
+
+import ai.chat2db.community.domain.api.model.metadata.TableColumn;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.tools.exception.BusinessException;
+
+import java.sql.Types;
+import java.time.DateTimeException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Month;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.TextStyle;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+final class CsvImportValueNormalizer {
+
+    private static final Map<String, Integer> MONTHS = monthNames();
+    private static final Set<String> NUMERIC_TYPES = Set.of(
+            "BIGINT", "DECIMAL", "DOUBLE", "DOUBLE PRECISION", "FLOAT", "INT", "INTEGER",
+            "MEDIUMINT", "NUMBER", "NUMERIC", "REAL", "SMALLINT", "TINYINT");
+
+    private CsvImportValueNormalizer() {
+    }
+
+    static String normalize(String value, TableColumn column, CsvOptions options, long sourceRow) {
+        if (value == null || column == null) {
+            return value;
+        }
+        try {
+            return switch (valueKind(column)) {
+                case DATE -> parseDate(value, options).toString();
+                case TIME -> parseTime(value, options).toString();
+                case TIMESTAMP -> parseDateTime(value, options).dateTime().toString().replace('T', ' ');
+                case TIMESTAMP_WITH_TIMEZONE -> formatOffsetDateTime(parseDateTime(value, options));
+                case NUMBER -> normalizeNumber(value, options);
+                case TEXT -> value;
+            };
+        } catch (RuntimeException e) {
+            String displayValue = value.length() > 80 ? value.substring(0, 80) + "..." : value;
+            throw new BusinessException("import.csv.invalidValue",
+                    new Object[]{sourceRow, column.getName(), displayValue}, e);
+        }
+    }
+
+    private static ValueKind valueKind(TableColumn column) {
+        Integer dataType = column.getDataType();
+        if (dataType != null) {
+            switch (dataType) {
+                case Types.DATE:
+                    return ValueKind.DATE;
+                case Types.TIME, Types.TIME_WITH_TIMEZONE:
+                    return ValueKind.TIME;
+                case Types.TIMESTAMP:
+                    return ValueKind.TIMESTAMP;
+                case Types.TIMESTAMP_WITH_TIMEZONE:
+                    return ValueKind.TIMESTAMP_WITH_TIMEZONE;
+                case Types.BIGINT, Types.DECIMAL, Types.DOUBLE, Types.FLOAT, Types.INTEGER,
+                        Types.NUMERIC, Types.REAL, Types.SMALLINT, Types.TINYINT:
+                    return ValueKind.NUMBER;
+                default:
+                    break;
+            }
+        }
+        String columnType = column.getColumnType();
+        if (columnType == null) {
+            return ValueKind.TEXT;
+        }
+        String type = columnType.trim().toUpperCase(Locale.ROOT);
+        int parameterStart = type.indexOf('(');
+        if (parameterStart >= 0) {
+            type = type.substring(0, parameterStart).trim();
+        }
+        if (type.endsWith(" UNSIGNED")) {
+            type = type.substring(0, type.length() - " UNSIGNED".length()).trim();
+        }
+        if (type.contains("TIMESTAMP") || "DATETIME".equals(type)) {
+            return type.contains("TIME ZONE") ? ValueKind.TIMESTAMP_WITH_TIMEZONE : ValueKind.TIMESTAMP;
+        }
+        if (type.startsWith("TIME")) {
+            return ValueKind.TIME;
+        }
+        if ("DATE".equals(type)) {
+            return ValueKind.DATE;
+        }
+        if (NUMERIC_TYPES.contains(type)) {
+            return ValueKind.NUMBER;
+        }
+        return ValueKind.TEXT;
+    }
+
+    private static String normalizeNumber(String value, CsvOptions options) {
+        if (!",".equals(options.getDecimalSymbol())) {
+            return value;
+        }
+        if (value.indexOf('.') >= 0 && value.indexOf(',') >= 0) {
+            throw new IllegalArgumentException("ambiguous decimal value");
+        }
+        return value.replace(',', '.');
+    }
+
+    private static ParsedDateTime parseDateTime(String value, CsvOptions options) {
+        List<String> tokens = new ArrayList<>(Arrays.asList(value.trim().split("\\s+", -1)));
+        if (options.getDateTimeOrder().startsWith("DATE_TIME") && !tokens.isEmpty()) {
+            int separator = tokens.get(0).indexOf('T');
+            if (separator > 0) {
+                String date = tokens.get(0).substring(0, separator);
+                String time = tokens.get(0).substring(separator + 1);
+                tokens.set(0, date);
+                tokens.add(1, time);
+            } else if (tokens.size() == 1 && "DATE_TIME".equals(options.getDateTimeOrder())) {
+                return new ParsedDateTime(LocalDateTime.of(parseDate(tokens.get(0), options), LocalTime.MIDNIGHT),
+                        null);
+            }
+        }
+        String[] parts = tokens.toArray(String[]::new);
+        return switch (options.getDateTimeOrder()) {
+            case "TIME_DATE" -> parsedDateTime(parts, 1, 0, -1, options);
+            case "DATE_TIME_TIMEZONE" -> parsedDateTime(parts, 0, 1, 2, options);
+            case "TIME_DATE_TIMEZONE" -> parsedDateTime(parts, 1, 0, 2, options);
+            case "TIME_TIMEZONE_DATE" -> parsedDateTime(parts, 2, 0, 1, options);
+            default -> parsedDateTime(parts, 0, 1, -1, options);
+        };
+    }
+
+    private static ParsedDateTime parsedDateTime(String[] parts, int dateIndex, int timeIndex, int zoneIndex,
+            CsvOptions options) {
+        int expectedParts = zoneIndex < 0 ? 2 : 3;
+        if (parts.length != expectedParts) {
+            throw new IllegalArgumentException("date-time value does not match configured order");
+        }
+        ZoneOffset offset = zoneIndex < 0 ? null : ZoneOffset.of(parts[zoneIndex]);
+        return new ParsedDateTime(LocalDateTime.of(parseDate(parts[dateIndex], options),
+                parseTime(parts[timeIndex], options)), offset);
+    }
+
+    private static String formatOffsetDateTime(ParsedDateTime parsed) {
+        if (parsed.offset() == null) {
+            return parsed.dateTime().toString().replace('T', ' ');
+        }
+        return OffsetDateTime.of(parsed.dateTime(), parsed.offset()).toString().replace('T', ' ');
+    }
+
+    private static LocalDate parseDate(String value, CsvOptions options) {
+        String order = options.getDateOrder();
+        String[] components = splitDate(value.trim(), order, options);
+        Map<Character, String> values = new HashMap<>();
+        for (int index = 0; index < order.length(); index++) {
+            values.put(order.charAt(index), components[index]);
+        }
+        int year = parseYear(values.get('Y'));
+        int month = parseMonth(values.get('M'));
+        int day = Integer.parseInt(values.get('D'));
+        return LocalDate.of(year, month, day);
+    }
+
+    private static String[] splitDate(String value, String order, CsvOptions options) {
+        String firstSeparator = separator(order.charAt(0), order.charAt(1), options);
+        String secondSeparator = separator(order.charAt(1), order.charAt(2), options);
+        Pattern pattern = Pattern.compile("^(.+?)" + Pattern.quote(firstSeparator) + "(.+?)"
+                + Pattern.quote(secondSeparator) + "(.+?)$");
+        Matcher matcher = pattern.matcher(value);
+        if (!matcher.matches()) {
+            throw new IllegalArgumentException("date does not match configured delimiters");
+        }
+        return new String[]{matcher.group(1), matcher.group(2), matcher.group(3)};
+    }
+
+    private static String separator(char left, char right, CsvOptions options) {
+        return left == 'Y' || right == 'Y' ? options.getYearDelimiter() : options.getDateDelimiter();
+    }
+
+    private static LocalTime parseTime(String value, CsvOptions options) {
+        String[] parts = value.trim().split(Pattern.quote(options.getTimeDelimiter()), -1);
+        if (parts.length < 2 || parts.length > 3) {
+            throw new IllegalArgumentException("time does not match configured delimiter");
+        }
+        int hour = Integer.parseInt(parts[0]);
+        int minute = Integer.parseInt(parts[1]);
+        if (parts.length == 2) {
+            return LocalTime.of(hour, minute);
+        }
+        String[] seconds = parts[2].split("\\.", 2);
+        int second = Integer.parseInt(seconds[0]);
+        int nanos = seconds.length == 1 ? 0 : Integer.parseInt((seconds[1] + "000000000").substring(0, 9));
+        return LocalTime.of(hour, minute, second, nanos);
+    }
+
+    private static int parseYear(String value) {
+        int year = Integer.parseInt(value);
+        return value.length() == 2 ? 2000 + year : year;
+    }
+
+    private static int parseMonth(String value) {
+        if (value.chars().allMatch(Character::isDigit)) {
+            return Integer.parseInt(value);
+        }
+        Integer month = MONTHS.get(value.toLowerCase(Locale.ROOT));
+        if (month == null) {
+            throw new DateTimeException("unknown month");
+        }
+        return month;
+    }
+
+    private static Map<String, Integer> monthNames() {
+        Map<String, Integer> names = new HashMap<>();
+        for (Month month : Month.values()) {
+            names.put(month.getDisplayName(TextStyle.SHORT, Locale.ENGLISH).toLowerCase(Locale.ROOT),
+                    month.getValue());
+            names.put(month.getDisplayName(TextStyle.FULL, Locale.ENGLISH).toLowerCase(Locale.ROOT),
+                    month.getValue());
+        }
+        return names;
+    }
+
+    private record ParsedDateTime(LocalDateTime dateTime, ZoneOffset offset) {
+    }
+
+    private enum ValueKind {
+        DATE,
+        TIME,
+        TIMESTAMP,
+        TIMESTAMP_WITH_TIMEZONE,
+        NUMBER,
+        TEXT
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiBusinessContextServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiBusinessContextServiceImplTest.java
deleted file mode 100644
index c84efd0ea6..0000000000
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiBusinessContextServiceImplTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package ai.chat2db.community.domain.core.impl.ai;
-
-import ai.chat2db.community.domain.api.model.ai.AiBusinessContextResult;
-import ai.chat2db.community.domain.api.model.request.ai.AiBusinessContextBuildRequest;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class AiBusinessContextServiceImplTest {
-
-    @Test
-    void communityDoesNotResolveEnterpriseKnowledge() {
-        AiBusinessContextResult result = new AiBusinessContextServiceImpl().resolve(new AiBusinessContextBuildRequest());
-        assertNull(result.getStructuredContext());
-        assertTrue(result.getSelectedKnowledge().isEmpty());
-    }
-}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiChatHistoryServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiChatHistoryServiceImplTest.java
index a91ece658d..5717ccac52 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiChatHistoryServiceImplTest.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiChatHistoryServiceImplTest.java
@@ -2,7 +2,6 @@
 
 import ai.chat2db.community.domain.api.model.ai.AiChatSession;
 import ai.chat2db.community.domain.api.model.request.ai.AiChatMessageAddRequest;
-import ai.chat2db.community.domain.api.model.request.ai.AiSelectedKnowledge;
 import ai.chat2db.community.tools.exception.BusinessException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
@@ -12,6 +11,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -75,28 +75,43 @@ void addMessageRejectsAnotherUsersSession() throws Exception {
     }
 
     @Test
-    void selectedKnowledgeSurvivesHistoryPersistenceAndReload() {
+    void renameSessionPersistsWithoutChangingActivityTime() {
         ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules();
         AiChatHistoryServiceImpl service = new AiChatHistoryServiceImpl(objectMapper, tempDirectory);
-        AiChatSession session = service.createSession(OWNER_ID, "knowledge session");
-        AiChatMessageAddRequest request = addRequest(session.getId(), OWNER_ID, "查询三全水饺销量");
-        AiSelectedKnowledge knowledge = new AiSelectedKnowledge();
-        knowledge.setId(186L);
-        knowledge.setType("KNOWLEDGE_TERM");
-        knowledge.setKey("三全水饺");
-        knowledge.setValue("三全食品旗下水饺产品集合");
-        request.setSelectedKnowledge(List.of(knowledge));
-
-        service.addMessage(request);
+        AiChatSession session = service.createSession(OWNER_ID, "original title");
+        LocalDateTime originalModifiedTime = session.getGmtModified();
+
+        service.renameSession(session.getId(), OWNER_ID, "  renamed title  ");
+
         AiChatHistoryServiceImpl reloadedService = new AiChatHistoryServiceImpl(objectMapper, tempDirectory);
+        AiChatSession renamed = reloadedService.listSessions(OWNER_ID).get(0);
+        assertEquals("renamed title", renamed.getTitle());
+        assertEquals(originalModifiedTime, renamed.getGmtModified());
+    }
+
+    @Test
+    void renameSessionRejectsAnotherUsersSession() {
+        AiChatHistoryServiceImpl service = new AiChatHistoryServiceImpl(
+                new ObjectMapper().findAndRegisterModules(), tempDirectory);
+        AiChatSession session = service.createSession(OWNER_ID, "owner title");
+
+        BusinessException exception = assertThrows(BusinessException.class,
+                () -> service.renameSession(session.getId(), OTHER_USER_ID, "intruder title"));
+
+        assertEquals("ai.chat.history.sessionNotOwned", exception.getCode());
+        assertEquals("owner title", service.listSessions(OWNER_ID).get(0).getTitle());
+    }
+
+    @Test
+    void messageHistoryIgnoresRetiredExtensionFields() throws Exception {
+        ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules();
+
+        AiChatHistoryServiceImpl.MessagesFile file = objectMapper.readValue("""
+                {"messages":[{"id":"message-1","role":"user","content":"hello","retiredExtension":[]}]}
+                """, AiChatHistoryServiceImpl.MessagesFile.class);
 
-        assertEquals(1, reloadedService.getMessages(session.getId(), OWNER_ID).size());
-        AiSelectedKnowledge restored = reloadedService.getMessages(session.getId(), OWNER_ID)
-                .get(0).getSelectedKnowledge().get(0);
-        assertEquals(186L, restored.getId());
-        assertEquals("KNOWLEDGE_TERM", restored.getType());
-        assertEquals("三全水饺", restored.getKey());
-        assertEquals("三全食品旗下水饺产品集合", restored.getValue());
+        assertEquals(1, file.getMessages().size());
+        assertEquals("hello", file.getMessages().get(0).getContent());
     }
 
     private AiChatMessageAddRequest addRequest(String sessionId, Long userId, String content) {
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/CsvParserTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/CsvParserTest.java
new file mode 100644
index 0000000000..d9e9904cc1
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/CsvParserTest.java
@@ -0,0 +1,233 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.tools.exception.BusinessException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class CsvParserTest {
+
+    @Test
+    void parsesQuotedDelimitersAndEmbeddedNewlines() {
+        CsvParser parser = new CsvParser("UTF-8", ";", "\"", "\"", true, true);
+
+        CsvParser.CsvResult result = parser.parse("name;note\r\nAda;\"first; second\nline\"\r\n".getBytes(), 50);
+
+        assertEquals(2, result.rows().size());
+        assertEquals("first; second\nline", result.rows().get(1).get(1));
+    }
+
+    @Test
+    void decodesTheSelectedCharsetAndRejectsUnclosedQuotes() {
+        CsvParser gb18030 = new CsvParser("GB18030", ",", "\"", "\"", true, true);
+        assertEquals("中文", gb18030.parse("name\n中文\n".getBytes(Charset.forName("GB18030")), 50)
+                .rows().get(1).get(0));
+
+        CsvParser utf8 = new CsvParser("UTF-8", ",", "\"", "\"", true, true);
+        assertThrows(BusinessException.class, () -> utf8.parse("name\n\"unterminated".getBytes(), 50));
+    }
+
+    @Test
+    void parsesValidatedFileBytes() {
+        CsvParser parser = new CsvParser("UTF-8", ",", "\"", "\"", true, true);
+
+        CsvParser.CsvResult result = parser.parse("name\nAda\n".getBytes(Charset.forName("UTF-8")), 50);
+
+        assertEquals("Ada", result.rows().get(1).get(0));
+    }
+
+    @Test
+    void rejectsCsvOptionsOutsideTheSupportedImportContract() {
+        assertEquals("import.preview.invalidCsvOptions",
+                assertThrows(BusinessException.class,
+                        () -> new CsvParser("UTF-8", ",,", "\"", "\"", true, true)).getCode());
+        assertEquals("import.preview.invalidCsvOptions",
+                assertThrows(BusinessException.class,
+                        () -> new CsvParser("UTF-8", ",", ",", ",", true, true)).getCode());
+        assertEquals("import.preview.invalidEncoding",
+                assertThrows(BusinessException.class,
+                        () -> new CsvParser("NO_SUCH_CHARSET", ",", "\"", "\"", true, true)).getCode());
+        assertEquals("UTF-16", CsvOptions.builder().encoding("UTF-16").build().validate().getEncoding());
+        assertEquals("MYD", CsvOptions.builder().dateOrder("myd").build().validate().getDateOrder());
+        assertEquals("TIME_TIMEZONE_DATE", CsvOptions.builder().dateTimeOrder("time_timezone_date")
+                .build().validate().getDateTimeOrder());
+        assertEquals("import.preview.invalidCsvOptions",
+                assertThrows(BusinessException.class,
+                        () -> CsvOptions.builder().headerRow(3).dataStartRow(2).build().validate()).getCode());
+        assertEquals("import.preview.invalidCsvOptions",
+                assertThrows(BusinessException.class,
+                        () -> CsvOptions.builder().dataStartRow(4).dataEndRow(3).build().validate()).getCode());
+    }
+
+    @Test
+    void reportsSourceLineForMalformedEncodingAndQuoting() {
+        CsvParser parser = new CsvParser("UTF-8", ",", "\"", "\"", true, true);
+        byte[] validPrefix = "name\nAda\n".getBytes(StandardCharsets.UTF_8);
+        byte[] invalidUtf8 = java.util.Arrays.copyOf(validPrefix, validPrefix.length + 2);
+        invalidUtf8[invalidUtf8.length - 2] = (byte) 0xC3;
+        invalidUtf8[invalidUtf8.length - 1] = (byte) 0x28;
+
+        BusinessException encoding = assertThrows(BusinessException.class, () -> parser.parse(invalidUtf8, 50));
+        assertEquals("import.preview.invalidEncodingLine", encoding.getCode());
+        assertEquals(3, encoding.getArgs()[1]);
+
+        BusinessException quote = assertThrows(BusinessException.class,
+                () -> parser.parse(new StringReader("name,note\nAda,\"ok\"x\n"), 50));
+        assertEquals("import.preview.malformedCsv", quote.getCode());
+        assertEquals(2, quote.getArgs()[0]);
+    }
+
+    @Test
+    void appliesEmptyAsNullConsistentlyForCsvRows() {
+        CsvParser emptyAsNull = new CsvParser("UTF-8", ",", "\"", "\"", true, true);
+        assertEquals(null, emptyAsNull.parse("name,note\nAda,\n".getBytes(StandardCharsets.UTF_8), 50)
+                .rows().get(1).get(1));
+
+        CsvParser emptyAsText = new CsvParser("UTF-8", ",", "\"", "\"", true, false);
+        assertEquals("", emptyAsText.parse("name,note\nAda,\n".getBytes(StandardCharsets.UTF_8), 50)
+                .rows().get(1).get(1));
+    }
+
+    @Test
+    void detectsUtfBomAndKeepsQuotedEmptyDistinctFromNull() {
+        CsvParser parser = new CsvParser("AUTO", ",", "\"", "\"", true, true);
+        byte[] body = "name,note\nAda,\"\"\nGrace,\n".getBytes(StandardCharsets.UTF_16LE);
+        byte[] bytes = new byte[body.length + 2];
+        bytes[0] = (byte) 0xFF;
+        bytes[1] = (byte) 0xFE;
+        System.arraycopy(body, 0, bytes, 2, body.length);
+
+        CsvParser.CsvResult result = parser.parse(bytes, 50);
+
+        assertEquals("name", result.rows().get(0).get(0));
+        assertEquals("", result.rows().get(1).get(1));
+        assertEquals(null, result.rows().get(2).get(1));
+    }
+
+    @Test
+    void autoDetectionFallsBackFromUtf8ToGb18030(@TempDir Path directory) throws Exception {
+        Path path = directory.resolve("gb18030.csv");
+        Files.write(path, "name\n中文\n".getBytes(Charset.forName("GB18030")));
+
+        CsvParser.CsvResult result = new CsvParser("AUTO", ",", "\"", "\"", true, true).parse(path, 50);
+
+        assertEquals("中文", result.rows().get(1).get(0));
+        BusinessException invalidUtf8 = assertThrows(BusinessException.class,
+                () -> new CsvParser("UTF-8", ",", "\"", "\"", true, true).parse(path, 50));
+        assertEquals("import.preview.invalidEncodingLine", invalidUtf8.getCode());
+        assertEquals(2, invalidUtf8.getArgs()[1]);
+    }
+
+    @Test
+    void autoDetectionFallsBackToLatin1(@TempDir Path directory) throws Exception {
+        Path path = directory.resolve("latin1.csv");
+        Files.write(path, "name\nn café\n".getBytes(Charset.forName("ISO-8859-1")));
+
+        CsvParser.CsvResult result = new CsvParser(CsvOptions.builder().encoding("AUTO").build())
+                .parse(path, 50);
+
+        assertEquals("n café", result.rows().get(1).get(0));
+    }
+
+    @Test
+    void autoDetectionFallsBackToWindows1252(@TempDir Path directory) throws Exception {
+        Path path = directory.resolve("windows-1252.csv");
+        Files.write(path, "name\n“quoted”\n".getBytes(Charset.forName("windows-1252")));
+
+        CsvParser.CsvResult result = new CsvParser(CsvOptions.builder().encoding("AUTO").build())
+                .parse(path, 50);
+
+        assertEquals("“quoted”", result.rows().get(1).get(0));
+    }
+
+    @Test
+    void supportsBackslashEscapedQuotesWhenConfigured() {
+        CsvParser parser = new CsvParser("UTF-8", ",", "\"", "\\", true, true);
+
+        CsvParser.CsvResult result = parser.parse("name,note\nAda,\"hello \\\"db\\\"\"\n".getBytes(StandardCharsets.UTF_8),
+                50);
+
+        assertEquals("hello \"db\"", result.rows().get(1).get(1));
+    }
+
+    @Test
+    void preservesLiteralBackslashesWhenTheyDoNotEscapeQuoteOrEscape() {
+        CsvParser parser = new CsvParser("UTF-8", ",", "\"", "\\", true, true);
+
+        CsvParser.CsvResult result = parser.parse("name,path\nAda,\"C:\\temp\\new\"\n".getBytes(StandardCharsets.UTF_8),
+                50);
+
+        assertEquals("C:\\temp\\new", result.rows().get(1).get(1));
+    }
+
+    @Test
+    void keepsFinalSingleColumnQuotedEmptyRow() {
+        CsvParser parser = new CsvParser("UTF-8", ",", "\"", "\"", false, true);
+
+        CsvParser.CsvResult result = parser.parse("\"\"".getBytes(StandardCharsets.UTF_8), 50);
+
+        assertEquals(1, result.rows().size());
+        assertEquals("", result.rows().get(0).get(0));
+    }
+
+    @Test
+    void validatesCompleteFileBeforeStreamingAnyRows(@TempDir Path directory) throws Exception {
+        Path path = directory.resolve("invalid-tail.csv");
+        Files.writeString(path, "name,note\nAda,ok\nGrace,\"unterminated");
+        List<String> names = new ArrayList<>();
+
+        BusinessException error = assertThrows(BusinessException.class,
+                () -> new CsvParser(CsvOptions.defaults()).forEachRow(path,
+                        row -> names.add(row.get(0)), () -> { }));
+
+        assertEquals("import.preview.unclosedQuote", error.getCode());
+        assertEquals(List.of(), names);
+    }
+
+    @Test
+    void streamsEveryRowAndChecksCancellation(@TempDir Path directory) throws Exception {
+        Path path = directory.resolve("rows.csv");
+        StringBuilder csv = new StringBuilder("id,name\n");
+        for (int index = 0; index < 10_000; index++) {
+            csv.append(index).append(",name-").append(index).append('\n');
+        }
+        Files.writeString(path, csv);
+        AtomicInteger rows = new AtomicInteger();
+        AtomicInteger cancellationChecks = new AtomicInteger();
+
+        new CsvParser(CsvOptions.defaults()).forEachRow(path, row -> rows.incrementAndGet(),
+                cancellationChecks::incrementAndGet);
+
+        assertEquals(10_001, rows.get());
+        org.junit.jupiter.api.Assertions.assertTrue(cancellationChecks.get() > rows.get());
+    }
+
+    @Test
+    void propagatesCancellationBeforeRowsAreDelivered(@TempDir Path directory) throws Exception {
+        Path path = directory.resolve("cancel.csv");
+        Files.writeString(path, "id,name\n1,Ada\n2,Grace\n");
+        AtomicInteger checks = new AtomicInteger();
+        AtomicInteger rows = new AtomicInteger();
+
+        assertThrows(IllegalStateException.class,
+                () -> new CsvParser(CsvOptions.defaults()).forEachRow(path, row -> rows.incrementAndGet(), () -> {
+                    if (checks.incrementAndGet() == 2) {
+                        throw new IllegalStateException("cancelled");
+                    }
+                }));
+
+        assertEquals(0, rows.get());
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbActiveTransactionServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbActiveTransactionServiceImplTest.java
new file mode 100644
index 0000000000..ac69650a6f
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbActiveTransactionServiceImplTest.java
@@ -0,0 +1,98 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.config.DBConfig;
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.spi.IActiveTransactionManager;
+import ai.chat2db.spi.IPlugin;
+import ai.chat2db.spi.model.datasource.ConnectInfo;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class DbActiveTransactionServiceImplTest {
+
+    private static final String DB_TYPE = "ACTIVE_TRANSACTION_TEST";
+
+    @AfterEach
+    void tearDown() {
+        Chat2DBContext.removeContext();
+        Chat2DBContext.PLUGIN_MAP.remove(DB_TYPE);
+    }
+
+    @Test
+    void delegatesInspectionToCurrentDatabasePlugin() {
+        AtomicBoolean called = new AtomicBoolean();
+        ActiveTransaction expected = new ActiveTransaction();
+        expected.setTrxId("421337");
+        bindContext(new IActiveTransactionManager() {
+            @Override
+            public List<ActiveTransaction> activeTransactions(Connection connection) {
+                called.set(true);
+                assertNotNull(connection);
+                return List.of(expected);
+            }
+        });
+
+        List<ActiveTransaction> transactions = new DbActiveTransactionServiceImpl().activeTransactions();
+
+        assertTrue(called.get());
+        assertEquals(List.of(expected), transactions);
+    }
+
+    @Test
+    void rejectsPluginWithoutActiveTransactionCapability() {
+        bindContext(null);
+
+        BusinessException exception = assertThrows(BusinessException.class,
+                () -> new DbActiveTransactionServiceImpl().activeTransactions());
+
+        assertEquals("activeTransaction.inspection.unsupported", exception.getCode());
+    }
+
+    private static void bindContext(IActiveTransactionManager manager) {
+        Chat2DBContext.PLUGIN_MAP.put(DB_TYPE, new IPlugin() {
+            @Override
+            public DBConfig getDBConfig() {
+                DBConfig config = new DBConfig();
+                config.setDbType(DB_TYPE);
+                return config;
+            }
+
+            @Override
+            public IActiveTransactionManager getActiveTransactionManager() {
+                return manager;
+            }
+        });
+        Connection connection = (Connection) Proxy.newProxyInstance(
+                DbActiveTransactionServiceImplTest.class.getClassLoader(),
+                new Class<?>[]{Connection.class},
+                (proxy, method, args) -> {
+                    if ("isClosed".equals(method.getName())) {
+                        return false;
+                    }
+                    if ("close".equals(method.getName())) {
+                        return null;
+                    }
+                    if (method.getReturnType() == boolean.class) {
+                        return false;
+                    }
+                    return null;
+                });
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setDataSourceId(42L);
+        connectInfo.setDbType(DB_TYPE);
+        connectInfo.setConnection(connection);
+        Chat2DBContext.putContext(connectInfo);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbDatabaseServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbDatabaseServiceImplTest.java
new file mode 100644
index 0000000000..f4f16278da
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbDatabaseServiceImplTest.java
@@ -0,0 +1,89 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.model.metadata.Schema;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class DbDatabaseServiceImplTest {
+
+    @Test
+    void unsupportedJdbcUrlDoesNotDiscardSchemas() throws Throwable {
+        List<Schema> schemas = new ArrayList<>();
+        schemas.add(Schema.builder().name("analytics").build());
+        schemas.add(Schema.builder().name("default").build());
+
+        invokeSortSchema(new DbDatabaseServiceImpl(), schemas, connectionWithoutUrl());
+
+        assertEquals(List.of("analytics", "default"), schemas.stream().map(Schema::getName).toList());
+    }
+
+    private static void invokeSortSchema(DbDatabaseServiceImpl service, List<Schema> schemas,
+                                         Connection connection) throws Throwable {
+        Method method = DbDatabaseServiceImpl.class.getDeclaredMethod("sortSchema", List.class, Connection.class);
+        method.setAccessible(true);
+        try {
+            method.invoke(service, schemas, connection);
+        } catch (InvocationTargetException exception) {
+            throw exception.getCause();
+        }
+    }
+
+    private static Connection connectionWithoutUrl() {
+        DatabaseMetaData metaData = proxy(DatabaseMetaData.class, (proxy, method, args) -> {
+            if ("getURL".equals(method.getName())) {
+                throw new SQLException("Method not supported");
+            }
+            return defaultValue(method.getReturnType());
+        });
+        return proxy(Connection.class, (proxy, method, args) -> {
+            if ("getMetaData".equals(method.getName())) {
+                return metaData;
+            }
+            return defaultValue(method.getReturnType());
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> T proxy(Class<T> type, InvocationHandler handler) {
+        return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class<?>[]{type}, handler);
+    }
+
+    private static Object defaultValue(Class<?> type) {
+        if (!type.isPrimitive()) {
+            return null;
+        }
+        if (type == boolean.class) {
+            return false;
+        }
+        if (type == char.class) {
+            return '\0';
+        }
+        if (type == byte.class) {
+            return (byte) 0;
+        }
+        if (type == short.class) {
+            return (short) 0;
+        }
+        if (type == int.class) {
+            return 0;
+        }
+        if (type == long.class) {
+            return 0L;
+        }
+        if (type == float.class) {
+            return 0F;
+        }
+        return 0D;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbImportPreviewServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbImportPreviewServiceImplTest.java
new file mode 100644
index 0000000000..ea6d8201d5
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbImportPreviewServiceImplTest.java
@@ -0,0 +1,307 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.File;
+import java.lang.reflect.Proxy;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.sql.Connection;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+import ai.chat2db.community.domain.api.config.DBConfig;
+import ai.chat2db.community.domain.api.config.DriverConfig;
+import ai.chat2db.community.domain.api.model.db.ImportPreview;
+import ai.chat2db.community.domain.api.model.metadata.TableColumn;
+import ai.chat2db.community.domain.api.model.metadata.Table;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.spi.DefaultMetaService;
+import ai.chat2db.spi.DefaultSQLIdentifierProcessor;
+import ai.chat2db.spi.IDbMetaData;
+import ai.chat2db.spi.IPlugin;
+import ai.chat2db.spi.ISQLIdentifierProcessor;
+import ai.chat2db.spi.model.datasource.ConnectInfo;
+import ai.chat2db.spi.model.request.TableMetadataRequest;
+import ai.chat2db.spi.model.request.TablesRequest;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+class DbImportPreviewServiceImplTest {
+
+    private static final String DB_TYPE = "IMPORT_PREVIEW_METADATA_TEST";
+    private static final long DATA_SOURCE_ID = 930_101L;
+    private static final String DATABASE = "app";
+
+    private final RecordingMetaData metaData = new RecordingMetaData();
+
+    private IPlugin previousPlugin;
+
+    @BeforeEach
+    void setUp() {
+        DBConfig config = new DBConfig();
+        config.setDbType(DB_TYPE);
+        config.setDefaultDriverConfig(new DriverConfig());
+        config.setSupportDatabase(true);
+        config.setSupportSchema(false);
+        previousPlugin = Chat2DBContext.PLUGIN_MAP.put(DB_TYPE, plugin(config));
+        Chat2DBContext.putContext(connectInfo());
+    }
+
+    @AfterEach
+    void tearDown() {
+        Chat2DBContext.removeContext();
+        if (previousPlugin == null) {
+            Chat2DBContext.PLUGIN_MAP.remove(DB_TYPE);
+        } else {
+            Chat2DBContext.PLUGIN_MAP.put(DB_TYPE, previousPlugin);
+        }
+    }
+
+    @Test
+    void previewCanonicalizesTableCaseWithoutLosingTargetColumns(@TempDir Path directory)
+            throws Exception {
+        ImportPreview preview = service()
+                .preview(DATA_SOURCE_ID, DATABASE, null, "ORDERS", csv(directory));
+
+        assertEquals(1, metaData.requests.size());
+        TableMetadataRequest request = metaData.requests.get(0);
+        assertEquals(DATABASE, request.getDatabaseName());
+        assertEquals(null, request.getSchemaName());
+        assertEquals("orders", request.getTableName());
+        assertEquals("orders", preview.getTargetTableName());
+        assertEquals(1, preview.getTargetColumns().size());
+        assertEquals("Contact name", preview.getTargetColumns().get(0).getComment());
+    }
+
+    @Test
+    void previewAcceptsPunctuationInARealTableName(@TempDir Path directory) throws Exception {
+        metaData.tableName = "order.items";
+
+        ImportPreview preview = service()
+                .preview(DATA_SOURCE_ID, DATABASE, null, "order.items", csv(directory));
+
+        assertEquals("order.items", preview.getTargetTableName());
+        assertEquals("order.items", metaData.requests.get(0).getTableName());
+    }
+
+    @Test
+    void previewUsesDialectIdentifierProcessor(@TempDir Path directory) throws Exception {
+        metaData.identifierProcessor = new DefaultSQLIdentifierProcessor() {
+            @Override
+            public String removeIdentifierQuote(String identifier) {
+                return identifier != null && identifier.startsWith("<") && identifier.endsWith(">")
+                        ? identifier.substring(1, identifier.length() - 1) : identifier;
+            }
+        };
+
+        ImportPreview preview = service()
+                .preview(DATA_SOURCE_ID, "<app>", null, "<orders>", csv(directory));
+
+        assertEquals("orders", preview.getTargetTableName());
+        assertEquals("orders", metaData.requests.get(0).getTableName());
+    }
+
+    @Test
+    void previewUsesSchemaForDatabasesThatSupportSchemas(@TempDir Path directory) throws Exception {
+        Chat2DBContext.getDBConfig().setSupportSchema(true);
+        Chat2DBContext.getConnectInfo().setSchemaName("public");
+
+        service()
+                .preview(DATA_SOURCE_ID, DATABASE, "public", "orders", csv(directory));
+
+        TableMetadataRequest request = metaData.requests.get(0);
+        assertEquals(DATABASE, request.getDatabaseName());
+        assertEquals("public", request.getSchemaName());
+        assertEquals("orders", request.getTableName());
+    }
+
+    @Test
+    void previewRejectsDatabaseMismatchBeforeMetadataLookup(@TempDir Path directory) throws Exception {
+        assertThrows(BusinessException.class, () -> service()
+                .preview(DATA_SOURCE_ID, "other", null, "orders", csv(directory)));
+
+        assertEquals(0, metaData.tablesRequests);
+        assertEquals(0, metaData.requests.size());
+    }
+
+    @Test
+    void previewRejectsTableNameThatDoesNotExist(@TempDir Path directory) throws Exception {
+        assertThrows(BusinessException.class, () -> service()
+                .preview(DATA_SOURCE_ID, DATABASE, null, "orders%", csv(directory)));
+
+        assertEquals(1, metaData.tablesRequests);
+        assertEquals(0, metaData.requests.size());
+    }
+
+    @Test
+    void previewKeepsOnlyTheConfiguredNumberOfDataRows(@TempDir Path directory) throws Exception {
+        StringBuilder content = new StringBuilder("Name\n");
+        for (int row = 1; row <= 100; row++) {
+            content.append("row-").append(row).append('\n');
+        }
+        Path path = directory.resolve("large-orders.csv");
+        Files.writeString(path, content, StandardCharsets.UTF_8);
+
+        ImportPreview preview = service()
+                .preview(DATA_SOURCE_ID, DATABASE, null, "orders", path.toFile());
+
+        assertEquals(10, preview.getPreviewLimit());
+        assertEquals(List.of("Name"), preview.getSourceColumns());
+        assertEquals(10, preview.getPreviewData().size());
+        assertEquals(List.of("row-1"), preview.getPreviewData().get(0));
+        assertEquals(List.of("row-10"), preview.getPreviewData().get(9));
+    }
+
+    @Test
+    void previewRejectsDuplicateSourceColumnsIgnoringCase(@TempDir Path directory) throws Exception {
+        Path path = directory.resolve("duplicate-columns.csv");
+        Files.writeString(path, "Name,name\nAlice,Bob\n", StandardCharsets.UTF_8);
+
+        assertThrows(BusinessException.class, () -> service()
+                .preview(DATA_SOURCE_ID, DATABASE, null, "orders", path.toFile()));
+
+        assertEquals(0, metaData.tablesRequests);
+        assertEquals(0, metaData.requests.size());
+    }
+
+    @Test
+    void previewMapsHeaderlessColumnsByPositionAndSkipsAutoIncrementTargets(@TempDir Path directory)
+            throws Exception {
+        metaData.columns = List.of(
+                TableColumn.builder().name("id").columnType("BIGINT").autoIncrement(true).build(),
+                TableColumn.builder().name("name").columnType("VARCHAR").build(),
+                TableColumn.builder().name("email").columnType("VARCHAR").build());
+        Path path = directory.resolve("headerless.csv");
+        Files.writeString(path, "Alice,alice@example.com,extra\n", StandardCharsets.UTF_8);
+
+        ImportPreview preview = service().preview(DATA_SOURCE_ID, DATABASE, null,
+                "orders", path.toFile(), CsvOptions.builder().hasHeader(false).build());
+
+        assertEquals(List.of("column_1", "column_2", "column_3"), preview.getSourceColumns());
+        assertEquals(2, preview.getSuggestedMapping().size());
+        assertEquals("column_1", preview.getSuggestedMapping().get(0).getSourceColumn());
+        assertEquals("name", preview.getSuggestedMapping().get(0).getTargetColumn());
+        assertEquals("column_2", preview.getSuggestedMapping().get(1).getSourceColumn());
+        assertEquals("email", preview.getSuggestedMapping().get(1).getTargetColumn());
+    }
+
+    @Test
+    void previewUsesCsvDelimiterEncodingAndHeaderOptions(@TempDir Path directory) throws Exception {
+        Path path = directory.resolve("custom.csv");
+        Files.write(path, "Alice;olá\n".getBytes(java.nio.charset.Charset.forName("ISO-8859-1")));
+        CsvOptions options = CsvOptions.builder()
+                .encoding("ISO-8859-1")
+                .delimiter(";")
+                .quote("\"")
+                .escape("\"")
+                .hasHeader(false)
+                .emptyAsNull(false)
+                .build();
+
+        ImportPreview preview = service()
+                .preview(DATA_SOURCE_ID, DATABASE, null, "orders", path.toFile(), options);
+
+        assertEquals(List.of("column_1", "column_2"), preview.getSourceColumns());
+        assertEquals(List.of("Alice", "olá"), preview.getPreviewData().get(0));
+    }
+
+    @Test
+    void previewUsesConfiguredHeaderAndDataRowRange(@TempDir Path directory) throws Exception {
+        Path path = directory.resolve("row-range.csv");
+        Files.writeString(path, "Generated report\nName,Note\nAlice,first\nBob,second\nFooter,ignored\n");
+        CsvOptions options = CsvOptions.builder()
+                .headerRow(2)
+                .dataStartRow(3)
+                .dataEndRow(4)
+                .build();
+
+        ImportPreview preview = service()
+                .preview(DATA_SOURCE_ID, DATABASE, null, "orders", path.toFile(), options);
+
+        assertEquals(List.of("Name", "Note"), preview.getSourceColumns());
+        assertEquals(List.of(List.of("Alice", "first"), List.of("Bob", "second")), preview.getPreviewData());
+    }
+
+    private File csv(Path directory) throws Exception {
+        Path path = directory.resolve("orders.csv");
+        Files.writeString(path, "Name\nAlice\n", StandardCharsets.UTF_8);
+        return path.toFile();
+    }
+
+    private DbImportPreviewServiceImpl service() {
+        return new DbImportPreviewServiceImpl(new ImportPreviewFileParser());
+    }
+
+    private IPlugin plugin(DBConfig config) {
+        return new IPlugin() {
+            @Override
+            public DBConfig getDBConfig() {
+                return config;
+            }
+
+            @Override
+            public IDbMetaData getDbMetaData() {
+                return metaData;
+            }
+        };
+    }
+
+    private ConnectInfo connectInfo() {
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setDataSourceId(DATA_SOURCE_ID);
+        connectInfo.setDbType(DB_TYPE);
+        connectInfo.setDatabaseName(DATABASE);
+        connectInfo.setConnection(connection());
+        connectInfo.setDriverConfig(new DriverConfig());
+        return connectInfo;
+    }
+
+    private Connection connection() {
+        return (Connection) Proxy.newProxyInstance(Connection.class.getClassLoader(),
+                new Class<?>[]{Connection.class}, (proxy, method, arguments) -> switch (method.getName()) {
+                    case "isClosed" -> false;
+                    case "isValid" -> true;
+                    case "close" -> null;
+                    case "toString" -> "ImportPreviewMetadataTestConnection";
+                    case "hashCode" -> System.identityHashCode(proxy);
+                    case "equals" -> proxy == arguments[0];
+                    default -> null;
+                });
+    }
+
+    private static final class RecordingMetaData extends DefaultMetaService {
+
+        private final List<TableMetadataRequest> requests = new ArrayList<>();
+        private int tablesRequests;
+        private String tableName = "orders";
+        private ISQLIdentifierProcessor identifierProcessor = new DefaultSQLIdentifierProcessor();
+        private List<TableColumn> columns = List.of(TableColumn.builder().name("name").columnType("VARCHAR")
+                .dataType(Types.VARCHAR).comment("Contact name").build());
+
+        @Override
+        public ISQLIdentifierProcessor getSQLIdentifierProcessor() {
+            return identifierProcessor;
+        }
+
+        @Override
+        public List<Table> tables(Connection connection, TablesRequest request) {
+            tablesRequests++;
+            return List.of(Table.builder().databaseName(request.getDatabaseName())
+                    .schemaName(request.getSchemaName()).name(tableName).build());
+        }
+
+        @Override
+        public List<TableColumn> columns(Connection connection, TableMetadataRequest request) {
+            requests.add(request);
+            return columns;
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbMappedImportServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbMappedImportServiceImplTest.java
new file mode 100644
index 0000000000..fc203e1ba8
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbMappedImportServiceImplTest.java
@@ -0,0 +1,145 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import ai.chat2db.community.domain.api.model.db.ImportPreview;
+import ai.chat2db.community.domain.api.model.db.ImportTargetColumn;
+import ai.chat2db.community.domain.api.model.db.MappedImportExecution;
+import ai.chat2db.community.domain.api.model.task.ImportColumnMapping;
+import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+import ai.chat2db.community.domain.api.model.task.UnmappedTargetStrategy;
+import ai.chat2db.community.domain.api.service.db.IDbImportPreviewService;
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
+import ai.chat2db.community.domain.api.service.task.IImportTaskSubmissionService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class DbMappedImportServiceImplTest {
+
+    @Test
+    void submitsValidatedMappingWithCanonicalTarget(@TempDir Path directory) throws Exception {
+        RecordingStagingService stagingService = stagingService(directory);
+        AtomicReference<ImportTaskSpec> submitted = new AtomicReference<>();
+        DbMappedImportServiceImpl service = service(stagingService, preview("Orders", target("name")), submitted);
+
+        assertEquals(42L, service.submit(execution(mapping("Name", "name"))));
+
+        ImportTaskSpec spec = submitted.get();
+        assertEquals("Orders", spec.getTarget().getTableName());
+        assertEquals(stagingService.file.getAbsolutePath(), spec.getSourceFile());
+        assertEquals("file-id", spec.getImportFileId());
+    }
+
+    @Test
+    void rejectsDuplicateTargetsBeforeClaimingFile(@TempDir Path directory) throws Exception {
+        RecordingStagingService stagingService = stagingService(directory);
+        DbMappedImportServiceImpl service = service(stagingService, preview("orders", target("name")),
+                new AtomicReference<>());
+
+        assertThrows(IllegalArgumentException.class, () -> service.submit(execution(List.of(
+                mapping("name", "name"), mapping("email", "NAME")))));
+
+    }
+
+    @Test
+    void rejectsMappingThatIsNotInCurrentPreview(@TempDir Path directory) throws Exception {
+        RecordingStagingService stagingService = stagingService(directory);
+        DbMappedImportServiceImpl service = service(stagingService, preview("orders", target("name")),
+                new AtomicReference<>());
+
+        assertThrows(IllegalArgumentException.class,
+                () -> service.submit(execution(mapping("missing", "name"))));
+
+    }
+
+    @Test
+    void rejectsMissingRequiredTargetBeforeClaimingFile(@TempDir Path directory) throws Exception {
+        RecordingStagingService stagingService = stagingService(directory);
+        ImportTargetColumn required = ImportTargetColumn.builder().name("required_code").build();
+        DbMappedImportServiceImpl service = service(stagingService,
+                preview("orders", target("name"), required), new AtomicReference<>());
+        MappedImportExecution execution = execution(mapping("Name", "name"));
+        execution.setUnmappedTarget(UnmappedTargetStrategy.DEFAULT);
+
+        assertThrows(IllegalArgumentException.class, () -> service.submit(execution));
+
+    }
+
+    private static DbMappedImportServiceImpl service(RecordingStagingService stagingService,
+            IDbImportPreviewService previewService, AtomicReference<ImportTaskSpec> submitted) {
+        IImportTaskSubmissionService submissionService = (spec, stagedFileId) -> {
+            submitted.set(spec);
+            assertEquals("file-id", stagedFileId);
+            return 42L;
+        };
+        return new DbMappedImportServiceImpl(previewService, stagingService, submissionService);
+    }
+
+    private static IDbImportPreviewService preview(String tableName, ImportTargetColumn... targetColumns) {
+        return (dataSourceId, databaseName, schemaName, requestedTableName, file) -> ImportPreview.builder()
+                .sourceColumns(List.of("Name", "email"))
+                .targetTableName(tableName)
+                .targetColumns(List.of(targetColumns))
+                .build();
+    }
+
+    private static MappedImportExecution execution(ImportColumnMapping... mappings) {
+        return execution(List.of(mappings));
+    }
+
+    private static MappedImportExecution execution(List<ImportColumnMapping> mappings) {
+        return MappedImportExecution.builder()
+                .dataSourceId(7L)
+                .databaseName("app")
+                .schemaName("public")
+                .tableName("orders")
+                .fileId("file-id")
+                .mappings(mappings)
+                .build();
+    }
+
+    private static ImportColumnMapping mapping(String source, String target) {
+        return ImportColumnMapping.builder().sourceColumn(source).targetColumn(target).build();
+    }
+
+    private static ImportTargetColumn target(String name) {
+        return ImportTargetColumn.builder().name(name).nullable(true).build();
+    }
+
+    private static RecordingStagingService stagingService(Path directory) throws Exception {
+        return new RecordingStagingService(Files.writeString(directory.resolve("file-id.csv"), "Name\nAda\n").toFile());
+    }
+
+    private static final class RecordingStagingService implements IImportFileStagingService {
+
+        private final File file;
+        private RecordingStagingService(File file) {
+            this.file = file;
+        }
+
+        @Override
+        public String stage(File source, String originalFileName) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public File resolve(String fileId) {
+            return file;
+        }
+
+        @Override
+        public void claimForTask(String fileId) {
+        }
+
+        @Override
+        public void release(String fileId) {
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbTableServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbTableServiceImplTest.java
index 384e78c7f7..7e3ff508e4 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbTableServiceImplTest.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/DbTableServiceImplTest.java
@@ -1,13 +1,27 @@
 package ai.chat2db.community.domain.core.impl.db;
 
 import ai.chat2db.community.domain.api.config.DBConfig;
+import ai.chat2db.community.domain.api.config.DriverConfig;
+import ai.chat2db.community.domain.api.config.TableBuilderConfig;
+import ai.chat2db.community.domain.api.enums.plugin.EditStatusEnum;
+import ai.chat2db.community.domain.api.model.metadata.Table;
+import ai.chat2db.community.domain.api.model.metadata.TableColumn;
+import ai.chat2db.community.domain.api.model.sql.Sql;
+import ai.chat2db.spi.DefaultMetaService;
+import ai.chat2db.spi.DefaultSqlBuilder;
+import ai.chat2db.spi.IDbMetaData;
 import ai.chat2db.spi.IPlugin;
+import ai.chat2db.spi.ISqlBuilder;
+import ai.chat2db.spi.model.datasource.ConnectInfo;
 import ai.chat2db.spi.sql.Chat2DBContext;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 class DbTableServiceImplTest {
 
@@ -25,7 +39,32 @@ void setUp() {
         dbConfig.setSimpleCreateTable(CREATE_EXAMPLE);
         dbConfig.setSimpleAlterTable(ALTER_EXAMPLE);
 
-        previousPlugin = Chat2DBContext.PLUGIN_MAP.put(TEST_DB_TYPE, () -> dbConfig);
+        ISqlBuilder sqlBuilder = new DefaultSqlBuilder() {
+            @Override
+            public String buildAlterTable(Table oldTable, Table newTable) {
+                return EditStatusEnum.MODIFY.name().equals(newTable.getColumnList().get(0).getEditStatus())
+                        ? "ALTER TABLE sample_table MODIFY COLUMN content VARCHAR(255) INVISIBLE"
+                        : "";
+            }
+        };
+        IPlugin plugin = new IPlugin() {
+            @Override
+            public DBConfig getDBConfig() {
+                return dbConfig;
+            }
+
+            @Override
+            public IDbMetaData getDbMetaData() {
+                return new DefaultMetaService() {
+                    @Override
+                    public ISqlBuilder getSqlBuilder() {
+                        return sqlBuilder;
+                    }
+                };
+            }
+        };
+
+        previousPlugin = Chat2DBContext.PLUGIN_MAP.put(TEST_DB_TYPE, plugin);
         Chat2DBContext.removeContext();
         tableService = new DbTableServiceImpl(null);
     }
@@ -49,4 +88,40 @@ void createTableExampleUsesRequestedDatabaseTypeWithoutConnectionContext() {
     void alterTableExampleUsesRequestedDatabaseTypeWithoutConnectionContext() {
         assertEquals(ALTER_EXAMPLE, tableService.alterTableExample(TEST_DB_TYPE));
     }
+
+    @Test
+    void columnVisibilityChangeKeepsModifyStatusWhenBuildingSql() {
+        putTestContext();
+        Table oldTable = tableWithColumn(true, null);
+        Table newTable = tableWithColumn(false, EditStatusEnum.MODIFY.name());
+
+        List<Sql> sqlList = tableService.buildSql(oldTable, newTable, TableBuilderConfig.defaultConfig());
+
+        assertFalse(sqlList.get(0).getSql().isBlank());
+    }
+
+    private static void putTestContext() {
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setDbType(TEST_DB_TYPE);
+        DriverConfig driverConfig = new DriverConfig();
+        driverConfig.setDbType(TEST_DB_TYPE);
+        connectInfo.setDriverConfig(driverConfig);
+        Chat2DBContext.putContext(connectInfo);
+    }
+
+    private static Table tableWithColumn(Boolean visible, String editStatus) {
+        return Table.builder()
+                .name("sample_table")
+                .columnList(List.of(TableColumn.builder()
+                        .name("content")
+                        .oldName("content")
+                        .columnType("VARCHAR")
+                        .columnSize(255)
+                        .nullable(0)
+                        .visible(visible)
+                        .editStatus(editStatus)
+                        .build()))
+                .indexList(List.of())
+                .build();
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/ImportPreviewFileParserTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/ImportPreviewFileParserTest.java
new file mode 100644
index 0000000000..ff357df60f
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/db/ImportPreviewFileParserTest.java
@@ -0,0 +1,40 @@
+package ai.chat2db.community.domain.core.impl.db;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Path;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ImportPreviewFileParserTest {
+
+    @Test
+    void parsesXlsWithoutCsvOptions(@TempDir Path directory) {
+        assertExcelPreview(directory.resolve("contacts.xls"), ExcelTypeEnum.XLS);
+    }
+
+    @Test
+    void parsesXlsxWithoutCsvOptions(@TempDir Path directory) {
+        assertExcelPreview(directory.resolve("contacts.xlsx"), ExcelTypeEnum.XLSX);
+    }
+
+    private void assertExcelPreview(Path path, ExcelTypeEnum type) {
+        EasyExcel.write(path.toFile())
+                .excelType(type)
+                .head(List.of(List.of("Name"), List.of("Age")))
+                .sheet()
+                .doWrite(List.of(List.of("Alice", 30), List.of("Bob", 31)));
+
+        ImportPreviewFileParser.ParsedRows result = new ImportPreviewFileParser().parse(path.toFile(), 10, null);
+
+        assertEquals(List.of("Name", "Age"), List.copyOf(result.header().values()));
+        assertEquals("Alice", result.data().get(0).get(0));
+        assertEquals("30", result.data().get(0).get(1));
+        assertEquals("Bob", result.data().get(1).get(0));
+        assertEquals(false, result.syntheticHeader());
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/file/ImportFileStagingServiceTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/file/ImportFileStagingServiceTest.java
new file mode 100644
index 0000000000..50cb906b33
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/file/ImportFileStagingServiceTest.java
@@ -0,0 +1,76 @@
+package ai.chat2db.community.domain.core.impl.file;
+
+import ai.chat2db.community.tools.exception.BusinessException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ImportFileStagingServiceTest {
+
+    @TempDir
+    private Path tempDirectory;
+
+    private final String originalUserHome = System.getProperty("user.home");
+
+    @AfterEach
+    void restoreUserHome() {
+        System.setProperty("user.home", originalUserHome);
+    }
+
+    @Test
+    void registersResolvesAndReleasesOnlyStagedImportFile() throws Exception {
+        System.setProperty("user.home", tempDirectory.toString());
+        ImportFileStagingService stagingService = new ImportFileStagingService();
+        File source = Files.writeString(tempDirectory.resolve("source.csv"), "id,name\n1,Ada\n").toFile();
+
+        String fileId = stagingService.stage(source, "input.csv");
+        File resolved = stagingService.resolve(fileId);
+
+        assertTrue(resolved.isFile());
+        assertEquals(fileId + ".csv", resolved.getName());
+        assertTrue(resolved.toPath().normalize().toAbsolutePath().startsWith(tempDirectory));
+
+        stagingService.release(fileId);
+
+        assertFalse(Files.exists(resolved.toPath()));
+    }
+
+    @Test
+    void rejectsInvalidFileId() {
+        System.setProperty("user.home", tempDirectory.toString());
+
+        assertThrows(BusinessException.class, () -> new ImportFileStagingService().resolve("../outside"));
+    }
+
+    @Test
+    void acceptsEverySupportedWebImportFormat() throws Exception {
+        System.setProperty("user.home", tempDirectory.toString());
+        ImportFileStagingService stagingService = new ImportFileStagingService();
+
+        for (String extension : new String[] {"csv", "xls", "xlsx", "json", "sql"}) {
+            File source = Files.writeString(tempDirectory.resolve("source." + extension), "test").toFile();
+            String fileId = stagingService.stage(source, "input." + extension);
+            File resolved = stagingService.resolve(fileId);
+
+            assertEquals(fileId + "." + extension, resolved.getName());
+            stagingService.release(fileId);
+        }
+    }
+
+    @Test
+    void rejectsUnsupportedImportFormat() throws Exception {
+        System.setProperty("user.home", tempDirectory.toString());
+        File source = Files.writeString(tempDirectory.resolve("source.zip"), "test").toFile();
+
+        assertThrows(BusinessException.class, () -> new ImportFileStagingService().stage(source, "input.zip"));
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/ArtifactServiceTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/ArtifactServiceTest.java
index f8e449f058..5d2389a3ad 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/ArtifactServiceTest.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/ArtifactServiceTest.java
@@ -1,44 +1,34 @@
 package ai.chat2db.community.domain.core.impl.task;
 
-import ai.chat2db.community.domain.api.model.PageResponse;
-import ai.chat2db.community.domain.api.model.task.Task;
-import ai.chat2db.community.domain.api.model.task.TaskConstants;
-import ai.chat2db.community.domain.api.model.task.TaskEvent;
-import ai.chat2db.community.domain.api.model.task.TaskProgress;
-import ai.chat2db.community.domain.api.model.task.TaskQuery;
-import ai.chat2db.community.domain.api.model.task.TaskStatus;
-import ai.chat2db.community.domain.api.model.task.TaskStatusPatch;
-import ai.chat2db.community.domain.api.service.task.TaskStorage;
-import ai.chat2db.community.tools.exception.BusinessException;
-import ai.chat2db.community.tools.exception.DataNotFoundException;
+import ai.chat2db.community.domain.api.service.task.ArtifactService;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ArtifactServiceTest {
-
     @TempDir
     Path tempDirectory;
 
     @Test
     void concurrentDraftsReserveDifferentTargetsAndPublishIndependently() throws IOException {
-        ArtifactService service = new ArtifactService();
+        ArtifactService service = new ArtifactServiceImpl();
         var first = service.createDraft(1L, tempDirectory.toString(), "export.csv", "text/csv");
         var second = service.createDraft(2L, tempDirectory.toString(), "export.csv", "text/csv");
         assertNotEquals(first.getTargetFile(), second.getTargetFile());
@@ -57,7 +47,7 @@ void concurrentDraftsReserveDifferentTargetsAndPublishIndependently() throws IOE
 
     @Test
     void failedPublicationReleasesReservedTarget() {
-        ArtifactService service = new ArtifactService();
+        ArtifactService service = new ArtifactServiceImpl();
         var failed = service.createDraft(1L, tempDirectory.toString(), "export.csv", "text/csv");
 
         assertThrows(IllegalStateException.class, () -> service.publish(failed));
@@ -68,221 +58,115 @@ void failedPublicationReleasesReservedTarget() {
     }
 
     @Test
-    void taskDeletionRemovesPublishedArtifactBeforeTaskRecord() throws IOException {
-        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "value");
-        RecordingTaskStorage storage = new RecordingTaskStorage(Task.builder()
-                .id(1L)
-                .status(TaskStatus.SUCCESS.name())
-                .artifactId(artifact.toString())
-                .build());
-
-        new TaskServiceImpl(storage, null, new ArtifactService()).delete(1L);
-
-        assertFalse(Files.exists(artifact));
-        assertTrue(storage.deleted);
-        assertTrue(storage.get(1L).isEmpty());
-    }
-
-    @Test
-    void artifactDeletionFailurePreservesTaskRecord() throws IOException {
-        Path nonEmptyDirectory = Files.createDirectory(tempDirectory.resolve("artifact-directory"));
-        Files.writeString(nonEmptyDirectory.resolve("child"), "value");
-        RecordingTaskStorage storage = new RecordingTaskStorage(Task.builder()
-                .id(1L)
-                .status(TaskStatus.SUCCESS.name())
-                .artifactId(nonEmptyDirectory.toString())
-                .build());
-
-        BusinessException exception = assertThrows(BusinessException.class,
-                () -> new TaskServiceImpl(storage, null, new ArtifactService()).delete(1L));
-
-        assertEquals(TaskConstants.DELETE_ARTIFACT_FAILED_MESSAGE_CODE, exception.getCode());
-        assertFalse(storage.deleted);
-        assertTrue(storage.get(1L).isPresent());
-    }
-
-    @Test
-    void taskStorageDeletionFailureRestoresPublishedArtifact() throws IOException {
-        Path artifact = Files.writeString(tempDirectory.resolve("recover.csv"), "value");
-        RecordingTaskStorage storage = new RecordingTaskStorage(Task.builder()
-                .id(1L)
-                .status(TaskStatus.SUCCESS.name())
-                .artifactId(artifact.toString())
-                .build());
-        storage.failDeletion = true;
-
-        assertThrows(IllegalStateException.class,
-                () -> new TaskServiceImpl(storage, null, new ArtifactService()).delete(1L));
-
-        assertEquals("value", Files.readString(artifact));
-        assertTrue(storage.get(1L).isPresent());
+    void publicationPreservesFileCreatedAfterReservation() throws IOException {
+        ArtifactService service = new ArtifactServiceImpl();
+        var draft = service.createDraft(1L, tempDirectory.toString(), "export.csv", "text/csv");
+        Files.writeString(draft.getTemporaryFile().toPath(), "exported");
+        Files.writeString(draft.getTargetFile().toPath(), "user file");
+        Files.createDirectory(tempDirectory.resolve("export_1.csv"));
+
+        Path published = Path.of(service.publish(draft, artifactId -> {
+            assertTrue(Path.of(artifactId).toFile().isFile());
+            assertEquals(0, Path.of(artifactId).toFile().length());
+        }));
+
+        assertEquals("export_2.csv", published.getFileName().toString());
+        assertEquals(published, draft.getTargetFile().toPath());
+        assertEquals("exported", Files.readString(published));
+        assertEquals("user file", Files.readString(tempDirectory.resolve("export.csv")));
+        assertTrue(Files.isDirectory(tempDirectory.resolve("export_1.csv")));
+        assertFalse(Files.exists(draft.getTemporaryFile().toPath()));
     }
 
     @Test
-    void artifactCommitFailureRestoresTaskAndPublishedArtifact() throws IOException {
-        Path artifact = Files.writeString(tempDirectory.resolve("commit-failure.csv"), "value");
-        RecordingTaskStorage storage = new RecordingTaskStorage(Task.builder()
-                .id(1L)
-                .status(TaskStatus.SUCCESS.name())
-                .artifactId(artifact.toString())
-                .build());
-        ArtifactService artifactService = new ArtifactService() {
-            @Override
-            void commitPublishedDeletion(PublishedArtifactDeletion deletion) {
-                throw new IllegalStateException("Could not commit artifact deletion");
-            }
-        };
-
-        assertThrows(IllegalStateException.class,
-                () -> new TaskServiceImpl(storage, null, artifactService).delete(1L));
-
-        assertEquals("value", Files.readString(artifact));
-        assertTrue(storage.get(1L).isPresent());
+    @EnabledOnOs({OS.MAC, OS.LINUX})
+    void danglingSymlinkIsAnOccupiedName() throws IOException {
+        ArtifactService service = new ArtifactServiceImpl();
+        var draft = service.createDraft(1L, tempDirectory.toString(), "export.csv", "text/csv");
+        Files.writeString(draft.getTemporaryFile().toPath(), "exported");
+        Path missing = tempDirectory.resolve("missing.csv");
+        Files.createSymbolicLink(draft.getTargetFile().toPath(), missing);
+
+        Path published = Path.of(service.publish(draft));
+
+        assertEquals("export_1.csv", published.getFileName().toString());
+        assertEquals("exported", Files.readString(published));
+        assertTrue(Files.isSymbolicLink(tempDirectory.resolve("export.csv")));
+        assertFalse(Files.exists(missing));
     }
 
     @Test
-    void concurrentDeletionCannotRestoreAnOrphanArtifact() throws Exception {
-        Path artifact = Files.writeString(tempDirectory.resolve("concurrent.csv"), "value");
-        RecordingTaskStorage storage = new RecordingTaskStorage(Task.builder()
-                .id(1L)
-                .status(TaskStatus.SUCCESS.name())
-                .artifactId(artifact.toString())
-                .build());
-        TaskServiceImpl service = new TaskServiceImpl(storage, null, new ArtifactService());
-        ExecutorService executor = Executors.newFixedThreadPool(2);
+    void independentServicesCanPublishTheSameNameConcurrently() throws Exception {
+        ArtifactService first = new ArtifactServiceImpl();
+        ArtifactService second = new ArtifactServiceImpl();
+        var firstDraft = first.createDraft(1L, tempDirectory.toString(), "export.csv", "text/csv");
+        var secondDraft = second.createDraft(2L, tempDirectory.toString(), "export.csv", "text/csv");
+        assertEquals(firstDraft.getTargetFile(), secondDraft.getTargetFile());
+        Files.writeString(firstDraft.getTemporaryFile().toPath(), "first");
+        Files.writeString(secondDraft.getTemporaryFile().toPath(), "second");
+        var executor = Executors.newFixedThreadPool(2);
         CountDownLatch start = new CountDownLatch(1);
-        AtomicInteger deleted = new AtomicInteger();
-        AtomicInteger alreadyDeleted = new AtomicInteger();
         try {
-            Future<?> first = executor.submit(() -> {
-                start.await();
-                try {
-                    service.delete(1L);
-                    deleted.incrementAndGet();
-                } catch (DataNotFoundException ignored) {
-                    alreadyDeleted.incrementAndGet();
-                }
-                return null;
+            var firstResult = executor.submit(() -> {
+                assertTrue(start.await(5, TimeUnit.SECONDS));
+                return first.publish(firstDraft);
             });
-            Future<?> second = executor.submit(() -> {
-                start.await();
-                try {
-                    service.delete(1L);
-                    deleted.incrementAndGet();
-                } catch (DataNotFoundException ignored) {
-                    alreadyDeleted.incrementAndGet();
-                }
-                return null;
+            var secondResult = executor.submit(() -> {
+                assertTrue(start.await(5, TimeUnit.SECONDS));
+                return second.publish(secondDraft);
             });
             start.countDown();
-            first.get();
-            second.get();
+            Path firstPath = Path.of(firstResult.get(5, TimeUnit.SECONDS));
+            Path secondPath = Path.of(secondResult.get(5, TimeUnit.SECONDS));
+            assertNotEquals(firstPath, secondPath);
+            assertEquals("first", Files.readString(firstPath));
+            assertEquals("second", Files.readString(secondPath));
+            assertFalse(Files.exists(firstDraft.getTemporaryFile().toPath()));
+            assertFalse(Files.exists(secondDraft.getTemporaryFile().toPath()));
         } finally {
             executor.shutdownNow();
-        }
-
-        assertEquals(1, deleted.get());
-        assertEquals(1, alreadyDeleted.get());
-        assertTrue(storage.get(1L).isEmpty());
-        assertFalse(Files.exists(artifact));
-        try (var files = Files.list(tempDirectory)) {
-            assertTrue(files.noneMatch(path -> path.getFileName().toString().contains(".task-delete-")));
+            assertTrue(executor.awaitTermination(5, TimeUnit.SECONDS));
         }
     }
 
     @Test
-    void activeTaskDeletionIsRejectedBeforeArtifactDeletion() throws IOException {
-        Path artifact = Files.writeString(tempDirectory.resolve("running.csv"), "value");
-        RecordingTaskStorage storage = new RecordingTaskStorage(Task.builder()
-                .id(1L)
-                .status(TaskStatus.RUNNING.name())
-                .artifactId(artifact.toString())
-                .build());
-
-        BusinessException exception = assertThrows(BusinessException.class,
-                () -> new TaskServiceImpl(storage, null, new ArtifactService()).delete(1L));
-
-        assertEquals(TaskConstants.DELETE_ACTIVE_FORBIDDEN_MESSAGE_CODE, exception.getCode());
-        assertTrue(Files.exists(artifact));
-        assertFalse(storage.deleted);
-    }
-
-    private static final class RecordingTaskStorage implements TaskStorage {
-
-        private Task task;
-
-        private boolean deleted;
-
-        private boolean failDeletion;
-
-        private RecordingTaskStorage(Task task) {
-            this.task = task;
-        }
-
-        @Override
-        public synchronized Optional<Task> get(Long taskId) {
-            return Optional.ofNullable(task);
-        }
-
-        @Override
-        public synchronized boolean deleteTerminalTask(Long taskId, Runnable commitAction) {
-            if (failDeletion) {
-                throw new IllegalStateException("Could not delete task record");
-            }
-            deleted = task != null && TaskStatus.isTerminal(task.getStatus());
-            if (deleted) {
-                Task deletedTask = task;
-                task = null;
-                try {
-                    commitAction.run();
-                } catch (RuntimeException e) {
-                    task = deletedTask;
-                    deleted = false;
-                    throw e;
-                }
+    void copyFailureRemovesOnlyTheCreatedTargetAndDoesNotRetry() throws IOException {
+        IOException failure = new FileAlreadyExistsException("copy failure, not a name collision");
+        ArtifactService service = new ArtifactServiceImpl() {
+            @Override
+            void copyArtifact(Path source, OutputStream output) throws IOException {
+                output.write('x');
+                throw failure;
             }
-            return deleted;
-        }
-
-        @Override
-        public Task create(Task task, TaskEvent createdEvent) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public PageResponse<Task> list(TaskQuery query) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean compareAndSetStatus(Long taskId, String expectedStatus, String targetStatus,
-                TaskStatusPatch patch, TaskEvent lifecycleEvent) {
-            throw new UnsupportedOperationException();
-        }
+        };
+        var draft = service.createDraft(1L, tempDirectory.toString(), "export.csv", "text/csv");
+        Files.writeString(draft.getTemporaryFile().toPath(), "complete draft");
+        Files.writeString(draft.getTargetFile().toPath(), "user file");
 
-        @Override
-        public boolean updateProgressIfRunning(Long taskId, TaskProgress progress) {
-            throw new UnsupportedOperationException();
-        }
+        var thrown = assertThrows(IllegalStateException.class, () -> service.publish(draft));
 
-        @Override
-        public TaskEvent appendEvent(TaskEvent event) {
-            throw new UnsupportedOperationException();
-        }
+        assertSame(failure, thrown.getCause());
+        assertEquals("user file", Files.readString(tempDirectory.resolve("export.csv")));
+        assertEquals("complete draft", Files.readString(draft.getTemporaryFile().toPath()));
+        assertFalse(Files.exists(draft.getTargetFile().toPath()));
+        assertEquals("export_1.csv", draft.getTargetFile().getName());
+        var replacement = service.createDraft(2L, tempDirectory.toString(), "export.csv", "text/csv");
+        assertEquals(draft.getTargetFile(), replacement.getTargetFile());
+        service.deleteDraft(replacement);
+    }
 
-        @Override
-        public List<TaskEvent> listEvents(Long taskId, long afterSequence, int limit) {
-            throw new UnsupportedOperationException();
-        }
+    @Test
+    void recoveryRecordFailureStopsPublicationAndKeepsDraft() throws IOException {
+        ArtifactService service = new ArtifactServiceImpl();
+        var draft = service.createDraft(1L, tempDirectory.toString(), "export.csv", "text/csv");
+        Files.writeString(draft.getTemporaryFile().toPath(), "complete draft");
+        RuntimeException failure = new IllegalStateException("could not persist recovery record");
 
-        @Override
-        public List<TaskEvent> listEventsBefore(Long taskId, Long beforeSequence, int limit) {
-            throw new UnsupportedOperationException();
-        }
+        assertSame(failure, assertThrows(IllegalStateException.class,
+                () -> service.publish(draft, artifactId -> { throw failure; })));
 
-        @Override
-        public List<Task> listNonTerminalTasks() {
-            throw new UnsupportedOperationException();
-        }
+        assertFalse(Files.exists(draft.getTargetFile().toPath()));
+        assertEquals("complete draft", Files.readString(draft.getTemporaryFile().toPath()));
     }
+
 }
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/ImportTaskSubmissionServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/ImportTaskSubmissionServiceImplTest.java
new file mode 100644
index 0000000000..f23c777666
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/ImportTaskSubmissionServiceImplTest.java
@@ -0,0 +1,115 @@
+package ai.chat2db.community.domain.core.impl.task;
+
+import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
+import ai.chat2db.community.domain.api.service.task.TaskService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.lang.reflect.Proxy;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ImportTaskSubmissionServiceImplTest {
+
+    @Test
+    void preservesDesktopSourceWhenNoStagedFileIdIsPresent() {
+        RecordingStagingService stagingService = new RecordingStagingService(null);
+        AtomicReference<ImportTaskSpec> submitted = new AtomicReference<>();
+        ImportTaskSubmissionServiceImpl service = service(stagingService, submitted, null);
+        ImportTaskSpec spec = ImportTaskSpec.builder().sourceFile("/desktop/users.json").build();
+
+        assertEquals(42L, service.submit(spec, null));
+
+        assertEquals("/desktop/users.json", submitted.get().getSourceFile());
+        assertFalse(stagingService.resolved);
+        assertFalse(stagingService.claimed);
+    }
+
+    @Test
+    void resolvesAndClaimsServerStagedFile(@TempDir Path directory) throws Exception {
+        File stagedFile = Files.writeString(directory.resolve("file-id.json"), "[]").toFile();
+        RecordingStagingService stagingService = new RecordingStagingService(stagedFile);
+        AtomicReference<ImportTaskSpec> submitted = new AtomicReference<>();
+        ImportTaskSubmissionServiceImpl service = service(stagingService, submitted, null);
+
+        assertEquals(42L, service.submit(new ImportTaskSpec(), "file-id"));
+
+        assertTrue(stagingService.resolved);
+        assertTrue(stagingService.claimed);
+        assertFalse(stagingService.released);
+        assertEquals(stagedFile.getAbsolutePath(), submitted.get().getSourceFile());
+        assertEquals("file-id", submitted.get().getImportFileId());
+    }
+
+    @Test
+    void releasesClaimedFileWhenTaskSubmissionFails(@TempDir Path directory) throws Exception {
+        File stagedFile = Files.writeString(directory.resolve("file-id.sql"), "select 1").toFile();
+        RecordingStagingService stagingService = new RecordingStagingService(stagedFile);
+        ImportTaskSubmissionServiceImpl service = service(stagingService, new AtomicReference<>(),
+                new IllegalStateException("failed"));
+
+        assertThrows(IllegalStateException.class,
+                () -> service.submit(new ImportTaskSpec(), "file-id"));
+
+        assertTrue(stagingService.claimed);
+        assertTrue(stagingService.released);
+    }
+
+    private static ImportTaskSubmissionServiceImpl service(RecordingStagingService stagingService,
+            AtomicReference<ImportTaskSpec> submitted, RuntimeException failure) {
+        TaskService taskService = (TaskService) Proxy.newProxyInstance(
+                ImportTaskSubmissionServiceImplTest.class.getClassLoader(), new Class<?>[] {TaskService.class},
+                (proxy, method, arguments) -> {
+                    if ("submitImport".equals(method.getName())) {
+                        submitted.set((ImportTaskSpec) arguments[0]);
+                        if (failure != null) {
+                            throw failure;
+                        }
+                        return 42L;
+                    }
+                    throw new UnsupportedOperationException(method.getName());
+                });
+        return new ImportTaskSubmissionServiceImpl(taskService, stagingService);
+    }
+
+    private static final class RecordingStagingService implements IImportFileStagingService {
+
+        private final File file;
+        private boolean resolved;
+        private boolean claimed;
+        private boolean released;
+
+        private RecordingStagingService(File file) {
+            this.file = file;
+        }
+
+        @Override
+        public String stage(File source, String originalFileName) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public File resolve(String fileId) {
+            resolved = true;
+            return file;
+        }
+
+        @Override
+        public void claimForTask(String fileId) {
+            claimed = true;
+        }
+
+        @Override
+        public void release(String fileId) {
+            released = true;
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManagerTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManagerTest.java
index dc1f1fe5ef..da0ad1e723 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManagerTest.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/LocalTaskManagerTest.java
@@ -27,6 +27,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -37,6 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
@@ -164,6 +167,34 @@ void executionExceptionCannotBeOverwrittenBySuccess() throws Exception {
         assertEquals(1, storage.terminalTransitionCount());
     }
 
+    @Test
+    void unexpectedExecutorCancellationExceptionFailsRunningTask() throws Exception {
+        TestTaskStorage storage = new TestTaskStorage();
+        taskManager = manager(storage, (spec, context) -> {
+            Thread.currentThread().interrupt();
+            throw new CancellationException("Executor stopped without a cancellation request");
+        });
+        Task task = newTask();
+
+        taskManager.submit(task, event(TaskEventCode.TASK_CREATED.name()), spec(), null, null);
+
+        assertUnexpectedCancellationFailed(storage, task);
+    }
+
+    @Test
+    void unexpectedExecutionGuardCancellationExceptionFailsRunningTask() throws Exception {
+        TestTaskStorage storage = new TestTaskStorage();
+        TaskExtensionManager extensionManager = new TaskExtensionManager(List.of(), List.of(context -> {
+            throw new CancellationException("Guard stopped without a cancellation request");
+        }));
+        taskManager = manager(storage, (spec, context) -> {}, extensionManager);
+        Task task = newTask();
+
+        taskManager.submit(task, event(TaskEventCode.TASK_CREATED.name()), spec(), null, null);
+
+        assertUnexpectedCancellationFailed(storage, task);
+    }
+
     @Test
     void executionExceptionDetailsUseBoundedSingleLineReason() throws Exception {
         TestTaskStorage storage = new TestTaskStorage();
@@ -282,7 +313,7 @@ public DriverConfig getDriverConfig() {
                 new TaskSubmission<>(task.getId(), spec(), null, invalidConnectInfo,
                         new TaskSubmissionContext(task.getId(), TaskType.QUERY_RESULT_EXPORT, null,
                                 null, null, List.of(), TaskOperation.EXPORT).toExecutionContext()),
-                runningTask, registry, storage, executor, new ArtifactService(), emptyExtensionManager());
+                runningTask, registry, storage, executor, new ArtifactServiceImpl(), emptyExtensionManager());
 
         runner.run();
 
@@ -340,8 +371,9 @@ void startupReconciliationDoesNotResubmitInterruptedTask() {
         assertEquals(0, taskManager.activeTaskCount(null, null));
     }
 
-    @Test
-    void startupReconciliationCleansPreparedAndPublishedArtifactPaths() throws Exception {
+    @ParameterizedTest
+    @EnumSource(value = TaskEventCode.class, names = {"ARTIFACT_PUBLICATION_STARTED", "ARTIFACT_PUBLISHED"})
+    void startupReconciliationCleansPreparedAndPublishedArtifactPaths(TaskEventCode publicationEvent) throws Exception {
         TestTaskStorage storage = new TestTaskStorage();
         Task task = storage.create(newTask(), event(TaskEventCode.TASK_CREATED.name()));
         Path temporary = Files.writeString(
@@ -359,7 +391,7 @@ void startupReconciliationCleansPreparedAndPublishedArtifactPaths() throws Excep
         storage.appendEvent(TaskEvent.builder()
                 .taskId(task.getId())
                 .level(TaskEventLevel.INFO.name())
-                .code(TaskEventCode.ARTIFACT_PUBLISHED.name())
+                .code(publicationEvent.name())
                 .message("Artifact published")
                 .details(Map.of(TaskConstants.ARTIFACT_ID_DETAIL_KEY, target.toString()))
                 .build());
@@ -433,7 +465,19 @@ void startupReconciliationRetriesCleanupForExitFailedTask() throws Exception {
 
     @Test
     void artifactPreparationIsPersistedBeforePublication() throws Exception {
-        TestTaskStorage storage = new TestTaskStorage();
+        AtomicReference<String> recordedTarget = new AtomicReference<>();
+        TestTaskStorage storage = new TestTaskStorage() {
+            @Override
+            public synchronized TaskEvent appendEvent(TaskEvent event) {
+                if (TaskEventCode.ARTIFACT_PUBLICATION_STARTED.name().equals(event.getCode())) {
+                    String target = (String) event.getDetails().get(TaskConstants.ARTIFACT_ID_DETAIL_KEY);
+                    assertTrue(Path.of(target).toFile().isFile());
+                    assertEquals(0, Path.of(target).toFile().length());
+                    recordedTarget.set(target);
+                }
+                return super.appendEvent(event);
+            }
+        };
         taskManager = manager(storage, (spec, context) -> {
             context.createArtifact(tempDirectory.toString(), "export.csv", "text/csv");
             context.write("value");
@@ -443,10 +487,15 @@ void artifactPreparationIsPersistedBeforePublication() throws Exception {
         taskManager.submit(task, event(TaskEventCode.TASK_CREATED.name()), spec(), null, null);
 
         assertTrue(storage.awaitTerminal());
+        Task completed = storage.get(task.getId()).orElseThrow();
+        assertEquals(TaskStatus.SUCCESS.name(), completed.getStatus());
+        assertEquals(completed.getArtifactId(), recordedTarget.get());
         List<String> codes = storage.listEvents(task.getId(), 0, 100).stream()
                 .map(TaskEvent::getCode)
                 .toList();
         assertTrue(codes.indexOf(TaskEventCode.ARTIFACT_PREPARED.name())
+                < codes.indexOf(TaskEventCode.ARTIFACT_PUBLICATION_STARTED.name()));
+        assertTrue(codes.indexOf(TaskEventCode.ARTIFACT_PUBLICATION_STARTED.name())
                 < codes.indexOf(TaskEventCode.ARTIFACT_PUBLISHED.name()));
         assertTrue(codes.indexOf(TaskEventCode.ARTIFACT_PUBLISHED.name())
                 < codes.indexOf(TaskEventCode.TASK_SUCCEEDED.name()));
@@ -475,7 +524,7 @@ public void execute(ExportTaskSpec spec, TaskExecutionContext context) {
                 execution.execute(spec, context);
             }
         };
-        return new LocalTaskManager(storage, new TaskExecutorRegistry(List.of(executor)), new ArtifactService(),
+        return new LocalTaskManager(storage, new TaskExecutorRegistry(List.of(executor)), new ArtifactServiceImpl(),
                 new ConnectionContextConverter(), extensionManager, 1, 4);
     }
 
@@ -507,12 +556,21 @@ private TaskEvent event(String code) {
                 .build();
     }
 
+    private void assertUnexpectedCancellationFailed(TestTaskStorage storage, Task task) throws InterruptedException {
+        assertTrue(storage.awaitTerminal());
+        Task failed = storage.get(task.getId()).orElseThrow();
+        assertEquals(TaskStatus.FAILED.name(), failed.getStatus());
+        assertEquals(TaskErrorCode.TASK_INTERNAL_ERROR.name(), failed.getErrorCode());
+        assertEquals("Task execution failed", failed.getErrorMessage());
+        assertEquals(1, storage.terminalTransitionCount());
+    }
+
     @FunctionalInterface
     private interface TestExecution {
         void execute(ExportTaskSpec spec, TaskExecutionContext context);
     }
 
-    private static final class TestTaskStorage implements TaskStorage {
+    private static class TestTaskStorage implements TaskStorage {
 
         private final AtomicLong ids = new AtomicLong();
         private final Map<Long, Task> tasks = new LinkedHashMap<>();
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskDeletionServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskDeletionServiceImplTest.java
new file mode 100644
index 0000000000..01d3b986f9
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskDeletionServiceImplTest.java
@@ -0,0 +1,494 @@
+package ai.chat2db.community.domain.core.impl.task;
+
+import ai.chat2db.community.domain.api.model.PageResponse;
+import ai.chat2db.community.domain.api.model.task.Task;
+import ai.chat2db.community.domain.api.model.task.TaskEvent;
+import ai.chat2db.community.domain.api.model.task.TaskProgress;
+import ai.chat2db.community.domain.api.model.task.TaskQuery;
+import ai.chat2db.community.domain.api.model.task.TaskStatus;
+import ai.chat2db.community.domain.api.model.task.TaskStatusPatch;
+import ai.chat2db.community.domain.api.service.task.ArtifactService;
+import ai.chat2db.community.domain.api.service.task.TaskDeletionService;
+import ai.chat2db.community.domain.api.service.task.TaskStorage;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.community.tools.exception.DataNotFoundException;
+import com.alibaba.fastjson2.JSON;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class TaskDeletionServiceImplTest {
+    @TempDir
+    Path tempDirectory;
+
+    private File journalFile() {
+        return tempDirectory.resolve("task-artifact-deletions.json").toFile();
+    }
+
+    @Test
+    void springResolvesServicesThroughTheirInterfaces() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("spring.csv"), "value");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        try (var context = new AnnotationConfigApplicationContext()) {
+            context.registerBean(TaskStorage.class, () -> storage);
+            context.register(ArtifactServiceImpl.class, TaskDeletionServiceImpl.class);
+            context.refresh();
+            ArtifactService files = context.getBean(ArtifactService.class);
+            TaskDeletionService deletions = context.getBean(TaskDeletionService.class);
+            assertEquals(ArtifactServiceImpl.class, files.getClass());
+            deletions.delete(task(1L, artifact));
+        }
+        assertTrue(storage.get(1L).isEmpty());
+        assertFalse(Files.exists(artifact));
+    }
+
+    @Test
+    void successfulDeletionRemovesTaskArtifactAndArrayEntry() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "value");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        tasks(storage).delete(1L);
+        assertTrue(storage.get(1L).isEmpty());
+        assertFalse(Files.exists(artifact));
+        assertEquals("[]", Files.readString(journalFile().toPath()));
+    }
+
+    @Test
+    void tasksWithoutArtifactsAlsoUseTheDeletionQueue() throws IOException {
+        RecordingTaskStorage storage = storage(1L, null);
+        storage.beforeDelete = () -> assertEquals(1, queue().get(0).getAttempts());
+        tasks(storage).delete(1L);
+        assertTrue(storage.get(1L).isEmpty());
+        assertEquals("[]", Files.readString(journalFile().toPath()));
+    }
+
+    @Test
+    void storageFailureLeavesStagedFileAndRestartCompletesDeletion() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "old export");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        storage.failDeletion = true;
+        TaskServiceImpl service = tasks(storage);
+        assertThrows(BusinessException.class, () -> service.delete(1L));
+        var pending = queue().get(0);
+        assertEquals(1, pending.getAttempts());
+        assertTrue(pending.getLastError().contains("storage unavailable"));
+        assertFalse(Files.exists(artifact));
+        assertEquals("old export", Files.readString(Path.of(pending.getStagedPath())));
+        Files.writeString(artifact, "new export");
+        var download = service.resolveArtifact(1L);
+        assertEquals("export.csv", download.getFileName());
+        assertEquals("old export", Files.readString(Path.of(URI.create(download.getFileUri()))));
+
+        storage.failDeletion = false;
+        tasks(storage).recoverInterruptedArtifactDeletions();
+        assertTrue(storage.get(1L).isEmpty());
+        assertEquals("new export", Files.readString(artifact));
+        assertFalse(Files.exists(Path.of(pending.getStagedPath())));
+        assertTrue(queue().isEmpty());
+    }
+
+    @Test
+    void restartResumesIntentWrittenBeforeTheFileWasStaged() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "value");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        var pending = intent(1L, artifact, 1);
+        writeQueue(pending);
+        tasks(storage).recoverInterruptedArtifactDeletions();
+        assertFalse(Files.exists(artifact));
+        assertFalse(Files.exists(Path.of(pending.getStagedPath())));
+        assertTrue(storage.get(1L).isEmpty());
+        assertTrue(queue().isEmpty());
+    }
+
+    @Test
+    void restartAfterTaskRemovalOnlyDeletesTheUniqueStagedFile() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "new export");
+        var pending = intent(1L, artifact, 1);
+        Files.writeString(Path.of(pending.getStagedPath()), "old export");
+        writeQueue(pending);
+        tasks(new RecordingTaskStorage()).recoverInterruptedArtifactDeletions();
+        assertEquals("new export", Files.readString(artifact));
+        assertFalse(Files.exists(Path.of(pending.getStagedPath())));
+        assertTrue(queue().isEmpty());
+    }
+
+    @Test
+    void missingArtifactIsAlreadyDeleted() throws IOException {
+        Path missing = tempDirectory.resolve("missing.csv");
+        RecordingTaskStorage storage = storage(1L, missing);
+        tasks(storage).delete(1L);
+        assertTrue(storage.get(1L).isEmpty());
+        assertTrue(queue().isEmpty());
+    }
+
+    @Test
+    void repeatedStartupFailuresStopAtTheAttemptLimitAndKeepTheirError() throws IOException {
+        Path directory = Files.createDirectory(tempDirectory.resolve("not-a-file"));
+        Files.writeString(directory.resolve("child"), "keep");
+        RecordingTaskStorage storage = storage(1L, directory);
+        assertThrows(BusinessException.class, () -> tasks(storage).delete(1L));
+        for (int startup = 0; startup < 5; startup++) {
+            tasks(storage).recoverInterruptedArtifactDeletions();
+        }
+        var failed = queue().get(0);
+        assertEquals(TaskDeletionServiceImpl.MAX_DELETION_ATTEMPTS, failed.getAttempts());
+        assertTrue(failed.getLastError().contains("not a regular file"));
+        assertTrue(storage.get(1L).isPresent());
+        assertEquals("keep", Files.readString(directory.resolve("child")));
+    }
+
+    @Test
+    void anExplicitDeleteCanRetryAnExhaustedEntryAfterTheProblemIsFixed() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "value");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        writeQueue(intent(1L, artifact, TaskDeletionServiceImpl.MAX_DELETION_ATTEMPTS));
+        tasks(storage).delete(1L);
+        assertTrue(storage.get(1L).isEmpty());
+        assertFalse(Files.exists(artifact));
+        assertTrue(queue().isEmpty());
+    }
+
+    @Test
+    void undeletableStagedFileKeepsItsErrorWithoutRestoringTheRemovedTask() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "new export");
+        var pending = intent(1L, artifact, 0);
+        Path staged = Files.createDirectory(Path.of(pending.getStagedPath()));
+        Files.writeString(staged.resolve("child"), "keep");
+        writeQueue(pending);
+        RecordingTaskStorage storage = new RecordingTaskStorage();
+        for (int startup = 0; startup < 5; startup++) {
+            tasks(storage).recoverInterruptedArtifactDeletions();
+        }
+        assertTrue(storage.get(1L).isEmpty());
+        assertEquals(TaskDeletionServiceImpl.MAX_DELETION_ATTEMPTS, queue().get(0).getAttempts());
+        assertTrue(queue().get(0).getLastError().contains("DirectoryNotEmptyException"));
+        assertEquals("new export", Files.readString(artifact));
+        assertEquals("keep", Files.readString(staged.resolve("child")));
+    }
+
+    @Test
+    void oneExhaustedEntryDoesNotBlockOtherPendingDeletions() throws IOException {
+        Path first = Files.writeString(tempDirectory.resolve("first.csv"), "first");
+        Path second = Files.writeString(tempDirectory.resolve("second.csv"), "second");
+        RecordingTaskStorage storage = storage(1L, first);
+        storage.tasks.put(2L, task(2L, second));
+        writeQueue(intent(1L, first, TaskDeletionServiceImpl.MAX_DELETION_ATTEMPTS), intent(2L, second, 0));
+        tasks(storage).recoverInterruptedArtifactDeletions();
+        assertTrue(Files.exists(first));
+        assertTrue(storage.get(1L).isPresent());
+        assertFalse(Files.exists(second));
+        assertTrue(storage.get(2L).isEmpty());
+        assertEquals(List.of(1L), queue().stream().map(PendingTaskDeletion::getTaskId).toList());
+    }
+
+    @Test
+    void alreadyCompletedDeletionIsRemovedEvenAtTheAttemptLimit() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "new export");
+        writeQueue(intent(1L, artifact, TaskDeletionServiceImpl.MAX_DELETION_ATTEMPTS));
+        tasks(new RecordingTaskStorage()).recoverInterruptedArtifactDeletions();
+        assertTrue(queue().isEmpty());
+        assertEquals("new export", Files.readString(artifact));
+    }
+
+    @Test
+    void queueWriteFailurePreventsAnyDeletion() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "value");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        Files.createDirectory(tempDirectory.resolve(journalFile().getName() + ".part"));
+        assertThrows(BusinessException.class, () -> tasks(storage).delete(1L));
+        assertEquals("value", Files.readString(artifact));
+        assertTrue(storage.get(1L).isPresent());
+        assertFalse(journalFile().exists());
+    }
+
+    @Test
+    void queueCleanupFailureDoesNotRestoreADeletedTask() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "old export");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        Path blockedWrite = tempDirectory.resolve(journalFile().getName() + ".part");
+        storage.afterDelete = () -> assertDoesNotThrow(() -> Files.createDirectory(blockedWrite));
+        assertThrows(BusinessException.class, () -> tasks(storage).delete(1L));
+        assertTrue(storage.get(1L).isEmpty());
+        assertFalse(Files.exists(artifact));
+        assertEquals(1, queue().size());
+        Files.delete(blockedWrite);
+        Files.writeString(artifact, "new export");
+        tasks(storage).recoverInterruptedArtifactDeletions();
+        assertEquals("new export", Files.readString(artifact));
+        assertTrue(queue().isEmpty());
+    }
+
+    @Test
+    void corruptQueueIsPreservedAndPreventsNewDestructiveWork() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "value");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        Files.writeString(journalFile().toPath(), "broken JSON");
+        assertThrows(BusinessException.class, () -> tasks(storage).delete(1L));
+        tasks(storage).recoverInterruptedArtifactDeletions();
+        assertEquals("broken JSON", Files.readString(journalFile().toPath()));
+        assertEquals("value", Files.readString(artifact));
+        assertTrue(storage.get(1L).isPresent());
+    }
+
+    @Test
+    void concurrentFailedDeletesKeepBothEntriesInTheSameArray() throws Exception {
+        Path first = Files.writeString(tempDirectory.resolve("first.csv"), "first");
+        Path second = Files.writeString(tempDirectory.resolve("second.csv"), "second");
+        RecordingTaskStorage storage = storage(1L, first);
+        storage.tasks.put(2L, task(2L, second));
+        storage.failDeletion = true;
+        TaskServiceImpl service = tasks(storage);
+        var executor = Executors.newFixedThreadPool(2);
+        var start = new CountDownLatch(1);
+        try {
+            var jobs = List.of(1L, 2L).stream().map(id -> executor.submit(() -> {
+                start.await();
+                assertThrows(BusinessException.class, () -> service.delete(id));
+                return null;
+            })).toList();
+            start.countDown();
+            for (var job : jobs) {
+                job.get();
+            }
+        } finally {
+            executor.shutdownNow();
+        }
+        assertEquals(List.of(1L, 2L), queue().stream().map(PendingTaskDeletion::getTaskId).sorted().toList());
+        assertTrue(queue().stream().allMatch(entry -> entry.getAttempts() == 1 && entry.getLastError() != null));
+        storage.failDeletion = false;
+        tasks(storage).recoverInterruptedArtifactDeletions();
+        assertTrue(queue().isEmpty());
+        assertTrue(storage.tasks.isEmpty());
+    }
+
+    @Test
+    void activeTasksAndUnownedTasksNeverEnterTheDeletionQueue() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "value");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        storage.tasks.get(1L).setStatus(TaskStatus.RUNNING.name());
+        assertThrows(BusinessException.class, () -> tasks(storage).delete(1L));
+        storage.tasks.get(1L).setStatus(TaskStatus.SUCCESS.name());
+        storage.tasks.get(1L).setUserId(123L);
+        assertThrows(DataNotFoundException.class, () -> tasks(storage).delete(1L));
+        assertFalse(journalFile().exists());
+        assertEquals("value", Files.readString(artifact));
+    }
+
+    @Test
+    void concurrentDeletionOfTheSameTaskCommitsOnlyOnce() throws Exception {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "value");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        AtomicInteger commits = new AtomicInteger();
+        storage.afterDelete = commits::incrementAndGet;
+        TaskServiceImpl service = tasks(storage);
+        var executor = Executors.newFixedThreadPool(2);
+        var start = new CountDownLatch(1);
+        try {
+            var jobs = List.of(1, 2).stream().map(ignored -> executor.submit(() -> {
+                start.await();
+                try {
+                    service.delete(1L);
+                    return true;
+                } catch (DataNotFoundException alreadyDeleted) {
+                    return false;
+                }
+            })).toList();
+            start.countDown();
+            int successes = 0;
+            for (var job : jobs) {
+                successes += job.get() ? 1 : 0;
+            }
+            assertEquals(1, successes);
+        } finally {
+            executor.shutdownNow();
+        }
+        assertEquals(1, commits.get());
+        assertTrue(storage.get(1L).isEmpty());
+        assertFalse(Files.exists(artifact));
+        assertTrue(queue().isEmpty());
+    }
+
+    @Test
+    void abruptTerminationAfterStagingLeavesDurableWorkForRestart() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "old export");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        storage.beforeDelete = () -> { throw new AssertionError("simulated process termination"); };
+
+        assertThrows(AssertionError.class, () -> tasks(storage).delete(1L));
+
+        PendingTaskDeletion pending = queue().get(0);
+        assertEquals(1, pending.getAttempts());
+        assertTrue(storage.get(1L).isPresent());
+        assertFalse(Files.exists(artifact));
+        assertEquals("old export", Files.readString(pending.stagedFile()));
+        storage.beforeDelete = () -> {};
+        Files.writeString(artifact, "new export");
+        tasks(storage).recoverInterruptedArtifactDeletions();
+        assertTrue(storage.get(1L).isEmpty());
+        assertFalse(Files.exists(pending.stagedFile()));
+        assertEquals("new export", Files.readString(artifact));
+        assertTrue(queue().isEmpty());
+    }
+
+    @Test
+    void simultaneousStorageAndQueueWriteFailureStillLeavesRecoverableIntent() throws IOException {
+        Path artifact = Files.writeString(tempDirectory.resolve("export.csv"), "old export");
+        RecordingTaskStorage storage = storage(1L, artifact);
+        Path blockedWrite = tempDirectory.resolve(journalFile().getName() + ".part");
+        storage.beforeDelete = () -> assertDoesNotThrow(() -> Files.createDirectory(blockedWrite));
+        storage.failDeletion = true;
+
+        assertThrows(BusinessException.class, () -> tasks(storage).delete(1L));
+
+        PendingTaskDeletion pending = queue().get(0);
+        assertEquals(1, pending.getAttempts());
+        assertTrue(storage.get(1L).isPresent());
+        assertEquals("old export", Files.readString(pending.stagedFile()));
+        Files.delete(blockedWrite);
+        storage.beforeDelete = () -> {};
+        storage.failDeletion = false;
+        Files.writeString(artifact, "new export");
+        tasks(storage).recoverInterruptedArtifactDeletions();
+        assertTrue(storage.get(1L).isEmpty());
+        assertFalse(Files.exists(pending.stagedFile()));
+        assertEquals("new export", Files.readString(artifact));
+        assertTrue(queue().isEmpty());
+    }
+
+    @Test
+    void aFailedAttemptDoesNotPreventTheNextEntryFromCompleting() throws IOException {
+        Path invalidArtifact = Files.createDirectory(tempDirectory.resolve("not-a-file"));
+        Path validArtifact = Files.writeString(tempDirectory.resolve("export.csv"), "value");
+        RecordingTaskStorage storage = storage(1L, invalidArtifact);
+        storage.tasks.put(2L, task(2L, validArtifact));
+        writeQueue(intent(1L, invalidArtifact, 0), intent(2L, validArtifact, 0));
+
+        tasks(storage).recoverInterruptedArtifactDeletions();
+
+        assertEquals(1, queue().size());
+        assertEquals(1L, queue().get(0).getTaskId());
+        assertEquals(1, queue().get(0).getAttempts());
+        assertTrue(queue().get(0).getLastError().contains("not a regular file"));
+        assertTrue(storage.get(1L).isPresent());
+        assertTrue(storage.get(2L).isEmpty());
+        assertFalse(Files.exists(validArtifact));
+    }
+
+    private TaskServiceImpl tasks(RecordingTaskStorage storage) {
+        return new TaskServiceImpl(storage, null, new TaskDeletionServiceImpl(storage, new ArtifactServiceImpl(), journalFile()));
+    }
+
+    private Task task(Long id, Path artifact) {
+        return Task.builder().id(id).status(TaskStatus.SUCCESS.name())
+                .artifactId(artifact == null ? null : artifact.toString()).build();
+    }
+
+    private RecordingTaskStorage storage(Long id, Path artifact) {
+        RecordingTaskStorage storage = new RecordingTaskStorage();
+        storage.tasks.put(id, task(id, artifact));
+        return storage;
+    }
+
+    private PendingTaskDeletion intent(Long id, Path artifact, int attempts) {
+        return new PendingTaskDeletion(id, artifact.toString(),
+                artifact.resolveSibling("." + artifact.getFileName() + ".task-delete-" + id).toString(), attempts, null);
+    }
+
+    private void writeQueue(PendingTaskDeletion... pending) throws IOException {
+        Files.writeString(journalFile().toPath(), JSON.toJSONString(List.of(pending)));
+    }
+
+    private List<PendingTaskDeletion> queue() {
+        return assertDoesNotThrow(() -> JSON.parseArray(Files.readString(journalFile().toPath()),
+                PendingTaskDeletion.class));
+    }
+
+    private static final class RecordingTaskStorage implements TaskStorage {
+        private final Map<Long, Task> tasks = new LinkedHashMap<>();
+        private boolean failDeletion;
+        private Runnable beforeDelete = () -> {};
+        private Runnable afterDelete = () -> {};
+
+        @Override
+        public synchronized Optional<Task> get(Long id) {
+            return Optional.ofNullable(tasks.get(id));
+        }
+
+        @Override
+        public synchronized boolean deleteTerminalTask(Long id, Runnable commitAction) {
+            beforeDelete.run();
+            if (failDeletion) {
+                throw new IllegalStateException("storage unavailable");
+            }
+            Task task = tasks.get(id);
+            if (task == null || !TaskStatus.isTerminal(task.getStatus())) {
+                return false;
+            }
+            tasks.remove(id);
+            afterDelete.run();
+            if (commitAction != null) {
+                commitAction.run();
+            }
+            return true;
+        }
+
+        @Override
+        public Task create(Task task, TaskEvent event) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public PageResponse<Task> list(TaskQuery query) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean compareAndSetStatus(Long id, String expected, String target,
+                TaskStatusPatch patch, TaskEvent event) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean updateProgressIfRunning(Long id, TaskProgress progress) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public TaskEvent appendEvent(TaskEvent event) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public List<TaskEvent> listEvents(Long id, long after, int limit) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public List<TaskEvent> listEventsBefore(Long id, Long before, int limit) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public List<Task> listNonTerminalTasks() {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskExecutorRegistryTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskExecutorRegistryTest.java
index 985d9f94e9..6725c93f90 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskExecutorRegistryTest.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskExecutorRegistryTest.java
@@ -15,6 +15,7 @@
 import ai.chat2db.community.domain.api.model.task.TaskType;
 import ai.chat2db.community.domain.api.model.task.extension.TaskOperation;
 import ai.chat2db.community.domain.api.model.task.extension.TaskSubmissionContext;
+import ai.chat2db.community.domain.api.service.task.ArtifactService;
 import ai.chat2db.community.domain.api.service.task.TaskExecutionContext;
 import ai.chat2db.community.domain.api.service.task.TaskExecutor;
 import ai.chat2db.community.domain.api.service.task.TaskStorage;
@@ -117,10 +118,11 @@ void artifactPublishFailureDoesNotMarkTaskSuccessful(@TempDir Path tempDirectory
                     draftReference.set(draft);
                     context.write("value");
                 });
-        ArtifactService failingArtifactService = new ArtifactService() {
+        ArtifactService failingArtifactService = new ArtifactServiceImpl() {
             @Override
-            String publish(ArtifactDraft ignored) {
-                throw new IllegalStateException("Publish failed");
+            void copyArtifact(Path source, java.io.OutputStream output) throws IOException {
+                output.write('x');
+                throw new IOException("Publish failed");
             }
         };
         TaskRunner<ExportTaskSpec> runner = new TaskRunner<>(
@@ -146,9 +148,9 @@ private TaskServiceImpl taskService(RecordingTaskStorage storage) {
                 exportExecutor(TaskType.QUERY_RESULT_EXPORT.name(),
                         (spec, context) -> {}),
                 importExecutor(TaskType.DATA_FILE_IMPORT.name())));
-        taskManager = new LocalTaskManager(storage, registry, new ArtifactService(),
+        taskManager = new LocalTaskManager(storage, registry, new ArtifactServiceImpl(),
                 new ConnectionContextConverter(), emptyExtensionManager(), 1, 1);
-        return new TaskServiceImpl(storage, taskManager, new ArtifactService());
+        return new TaskServiceImpl(storage, taskManager, new TaskDeletionServiceImpl(storage, new ArtifactServiceImpl()));
     }
 
     private TaskExtensionManager emptyExtensionManager() {
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskServiceImplTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskServiceImplTest.java
index 1af57c5bfb..2bdffbe84c 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskServiceImplTest.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/TaskServiceImplTest.java
@@ -49,7 +49,7 @@ void everyTaskReadAndMutationIsIsolatedByUserAndOrganization() throws Exception
                 task(1L, 10L, 100L, ownedArtifact),
                 task(2L, 20L, 100L, otherUserArtifact),
                 task(3L, 10L, 200L, otherOrganizationArtifact)));
-        TaskServiceImpl service = new TaskServiceImpl(storage, null, new ArtifactService());
+        TaskServiceImpl service = new TaskServiceImpl(storage, null, new TaskDeletionServiceImpl(storage, new ArtifactServiceImpl()));
         ContextUtils.setContext(Context.builder()
                 .loginUser(LoginUser.builder().id(10L).build())
                 .organizationId(100L)
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/executor/SqlFileImportTaskExecutorTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/executor/SqlFileImportTaskExecutorTest.java
new file mode 100644
index 0000000000..36f3520898
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/executor/SqlFileImportTaskExecutorTest.java
@@ -0,0 +1,58 @@
+package ai.chat2db.community.domain.core.impl.task.executor;
+
+import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+import ai.chat2db.community.domain.api.model.task.TaskExecutionException;
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class SqlFileImportTaskExecutorTest {
+
+    @Test
+    void releasesStagedFileWhenExecutionFails(@TempDir Path tempDirectory) throws Exception {
+        File source = Files.writeString(tempDirectory.resolve("input.sql"), "select 1").toFile();
+        RecordingImportFileStagingService stagingService = new RecordingImportFileStagingService();
+        ImportTaskSpec spec = ImportTaskSpec.builder()
+                .sourceFile(source.getAbsolutePath())
+                .format("JSON")
+                .importFileId("staged-file-id")
+                .build();
+
+        assertThrows(TaskExecutionException.class,
+                () -> new SqlFileImportTaskExecutor(stagingService).execute(spec, null));
+
+        assertEquals("staged-file-id", stagingService.releasedFileId);
+    }
+
+    private static final class RecordingImportFileStagingService implements IImportFileStagingService {
+
+        private String releasedFileId;
+
+        @Override
+        public String stage(File file, String originalFileName) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public File resolve(String fileId) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void claimForTask(String fileId) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void release(String fileId) {
+            releasedFileId = fileId;
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CSVImporterColumnMappingTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CSVImporterColumnMappingTest.java
new file mode 100644
index 0000000000..4596ca81b2
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CSVImporterColumnMappingTest.java
@@ -0,0 +1,315 @@
+package ai.chat2db.community.domain.core.impl.task.imports.excel;
+
+import ai.chat2db.community.domain.api.config.DBConfig;
+import ai.chat2db.community.domain.api.config.DriverConfig;
+import ai.chat2db.community.domain.api.model.metadata.TableColumn;
+import ai.chat2db.community.domain.api.model.task.ArtifactDraft;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.domain.api.model.task.ImportColumnMapping;
+import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+import ai.chat2db.community.domain.api.model.task.TaskTargetSnapshot;
+import ai.chat2db.community.domain.api.model.task.UnmappedTargetStrategy;
+import ai.chat2db.community.domain.api.service.task.TaskCancelable;
+import ai.chat2db.community.domain.api.service.task.TaskExecutionContext;
+import ai.chat2db.spi.DefaultMetaService;
+import ai.chat2db.spi.IDbMetaData;
+import ai.chat2db.spi.IPlugin;
+import ai.chat2db.spi.model.datasource.ConnectInfo;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import com.alibaba.excel.EasyExcel;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Path;
+import java.nio.file.Files;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class CSVImporterColumnMappingTest {
+
+    private static final String TEST_DB_TYPE = "CSV_IMPORT_MAPPING_TEST";
+
+    private IPlugin previousPlugin;
+
+    private Connection connection;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        previousPlugin = Chat2DBContext.PLUGIN_MAP.put(TEST_DB_TYPE, plugin());
+        connection = DriverManager.getConnection(
+                "jdbc:h2:mem:csv_import_mapping_" + System.nanoTime() + ";MODE=MySQL;DB_CLOSE_DELAY=-1");
+        try (Statement statement = connection.createStatement()) {
+            statement.execute("CREATE TABLE orders ("
+                    + "id INT AUTO_INCREMENT PRIMARY KEY, "
+                    + "name VARCHAR(64) NOT NULL, "
+                    + "status VARCHAR(16) DEFAULT 'NEW', "
+                    + "note VARCHAR(64))");
+            statement.execute("CREATE TABLE formatted_rows ("
+                    + "name VARCHAR(64) NOT NULL, event_date DATE, event_time TIMESTAMP, amount DECIMAL(10,2))");
+        }
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setDataSourceId(7L);
+        connectInfo.setDbType(TEST_DB_TYPE);
+        connectInfo.setConnection(connection);
+        connectInfo.setDriverConfig(new DriverConfig());
+        Chat2DBContext.putContext(connectInfo);
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        Chat2DBContext.removeContext();
+        if (connection != null && !connection.isClosed()) {
+            connection.close();
+        }
+        if (previousPlugin == null) {
+            Chat2DBContext.PLUGIN_MAP.remove(TEST_DB_TYPE);
+        } else {
+            Chat2DBContext.PLUGIN_MAP.put(TEST_DB_TYPE, previousPlugin);
+        }
+    }
+
+    @Test
+    void explicitMappingOmitsDefaultColumnsAndExecutesRows(@TempDir Path directory)
+            throws Exception {
+        Path input = directory.resolve("orders.xlsx");
+        EasyExcel.write(input.toFile())
+                .head(List.of(List.of("Full Name")))
+                .sheet()
+                .doWrite(List.of(List.of("Alice"), List.of("Bob")));
+        ImportTaskSpec spec = ImportTaskSpec.builder()
+                .sourceFile(input.toString())
+                .target(TaskTargetSnapshot.builder().tableName("orders").build())
+                .columnMappings(List.of(ImportColumnMapping.builder()
+                        .sourceColumn("Full Name").targetColumn("name").build()))
+                .unmappedTarget(UnmappedTargetStrategy.DEFAULT)
+                .build();
+        RecordingTaskExecutionContext taskContext = new RecordingTaskExecutionContext();
+
+        new XLSXImporter().doImportData(spec, taskContext, columns());
+
+        assertEquals(List.of(2), taskContext.batchStatementCounts(), taskContext.events().toString());
+        try (Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery(
+                        "SELECT name, status, note FROM orders ORDER BY id")) {
+            resultSet.next();
+            assertEquals("Alice", resultSet.getString("name"));
+            assertEquals("NEW", resultSet.getString("status"));
+            assertEquals(null, resultSet.getString("note"));
+            resultSet.next();
+            assertEquals("Bob", resultSet.getString("name"));
+            assertEquals("NEW", resultSet.getString("status"));
+            assertEquals(null, resultSet.getString("note"));
+        }
+    }
+
+    @Test
+    void nullStrategyWritesNullInsteadOfUsingColumnDefault(@TempDir Path directory) throws Exception {
+        Path input = directory.resolve("orders-null.xlsx");
+        EasyExcel.write(input.toFile())
+                .head(List.of(List.of("Full Name")))
+                .sheet()
+                .doWrite(List.of(List.of("Alice")));
+        ImportTaskSpec spec = ImportTaskSpec.builder()
+                .sourceFile(input.toString())
+                .target(TaskTargetSnapshot.builder().tableName("orders").build())
+                .columnMappings(List.of(ImportColumnMapping.builder()
+                        .sourceColumn("Full Name").targetColumn("name").build()))
+                .unmappedTarget(UnmappedTargetStrategy.NULL)
+                .build();
+
+        new XLSXImporter().doImportData(spec, new RecordingTaskExecutionContext(), columns());
+
+        try (Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery("SELECT status, note FROM orders")) {
+            resultSet.next();
+            assertEquals(null, resultSet.getString("status"));
+            assertEquals(null, resultSet.getString("note"));
+        }
+    }
+
+    @Test
+    void csvOptionsDriveExecutionWithoutChangingFormulaPrefixedData(@TempDir Path directory) throws Exception {
+        Path input = directory.resolve("orders.csv");
+        Files.writeString(input, "Full Name;Note\nAlice;=1+1\n");
+        ImportTaskSpec spec = ImportTaskSpec.builder()
+                .sourceFile(input.toString())
+                .target(TaskTargetSnapshot.builder().tableName("orders").build())
+                .csvOptions(CsvOptions.builder()
+                        .encoding("UTF-8")
+                        .delimiter(";")
+                        .quote("\"")
+                        .escape("\"")
+                        .hasHeader(true)
+                        .emptyAsNull(true)
+                        .build())
+                .columnMappings(List.of(
+                        ImportColumnMapping.builder().sourceColumn("Full Name").targetColumn("name").build(),
+                        ImportColumnMapping.builder().sourceColumn("Note").targetColumn("note").build()))
+                .unmappedTarget(UnmappedTargetStrategy.DEFAULT)
+                .build();
+
+        new CSVImporter().doImportData(spec, new RecordingTaskExecutionContext(), columns());
+
+        try (Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery("SELECT name, note FROM orders")) {
+            resultSet.next();
+            assertEquals("Alice", resultSet.getString("name"));
+            assertEquals("=1+1", resultSet.getString("note"));
+        }
+    }
+
+    @Test
+    void csvRowRangeAndFormatsDriveThePersistedValues(@TempDir Path directory) throws Exception {
+        Path input = directory.resolve("formatted.csv");
+        Files.writeString(input, "Generated report\n"
+                + "name,event_date,event_time,amount\n"
+                + "Alice,24/8/23,24/August/2023 15:30:38,\"12,50\"\n"
+                + "Skipped,25/8/23,25/August/2023 16:30:38,\"99,99\"\n");
+        ImportTaskSpec spec = ImportTaskSpec.builder()
+                .sourceFile(input.toString())
+                .target(TaskTargetSnapshot.builder().tableName("formatted_rows").build())
+                .csvOptions(CsvOptions.builder()
+                        .headerRow(2)
+                        .dataStartRow(3)
+                        .dataEndRow(3)
+                        .dateOrder("DMY")
+                        .dateTimeOrder("DATE_TIME")
+                        .dateDelimiter("/")
+                        .timeDelimiter(":")
+                        .decimalSymbol(",")
+                        .build())
+                .columnMappings(List.of(
+                        ImportColumnMapping.builder().sourceColumn("name").targetColumn("name").build(),
+                        ImportColumnMapping.builder().sourceColumn("event_date").targetColumn("event_date").build(),
+                        ImportColumnMapping.builder().sourceColumn("event_time").targetColumn("event_time").build(),
+                        ImportColumnMapping.builder().sourceColumn("amount").targetColumn("amount").build()))
+                .unmappedTarget(UnmappedTargetStrategy.DEFAULT)
+                .build();
+        List<TableColumn> targetColumns = List.of(
+                TableColumn.builder().name("name").columnType("VARCHAR").dataType(Types.VARCHAR).build(),
+                TableColumn.builder().name("event_date").columnType("DATE").dataType(Types.DATE).build(),
+                TableColumn.builder().name("event_time").columnType("TIMESTAMP").dataType(Types.TIMESTAMP).build(),
+                TableColumn.builder().name("amount").columnType("DECIMAL").dataType(Types.DECIMAL).build());
+
+        new CSVImporter().doImportData(spec, new RecordingTaskExecutionContext(), targetColumns);
+
+        try (Statement statement = connection.createStatement();
+                ResultSet resultSet = statement.executeQuery(
+                        "SELECT name, event_date, event_time, amount FROM formatted_rows")) {
+            resultSet.next();
+            assertEquals("Alice", resultSet.getString("name"));
+            assertEquals("2023-08-24", resultSet.getString("event_date"));
+            assertEquals("2023-08-24 15:30:38", resultSet.getString("event_time"));
+            assertEquals("12.50", resultSet.getString("amount"));
+            assertEquals(false, resultSet.next());
+        }
+    }
+
+    private static List<TableColumn> columns() {
+        return List.of(
+                TableColumn.builder().name("id").columnType("INTEGER").dataType(Types.INTEGER)
+                        .autoIncrement(true).build(),
+                TableColumn.builder().name("name").columnType("VARCHAR").dataType(Types.VARCHAR)
+                        .build(),
+                TableColumn.builder().name("status").columnType("VARCHAR").dataType(Types.VARCHAR)
+                        .defaultValue("'NEW'").build(),
+                TableColumn.builder().name("note").columnType("VARCHAR").dataType(Types.VARCHAR)
+                        .build());
+    }
+
+    private IPlugin plugin() {
+        DBConfig config = new DBConfig();
+        config.setDbType(TEST_DB_TYPE);
+        config.setDefaultDriverConfig(new DriverConfig());
+        IDbMetaData metaData = new DefaultMetaService();
+        return new IPlugin() {
+            @Override
+            public DBConfig getDBConfig() {
+                return config;
+            }
+
+            @Override
+            public IDbMetaData getDbMetaData() {
+                return metaData;
+            }
+        };
+    }
+
+    private static final class RecordingTaskExecutionContext implements TaskExecutionContext {
+
+        private final List<Integer> batchStatementCounts = new ArrayList<>();
+
+        private final List<String> events = new ArrayList<>();
+
+        private List<Integer> batchStatementCounts() {
+            return batchStatementCounts;
+        }
+
+        private List<String> events() {
+            return events;
+        }
+
+        @Override
+        public void reportProgress(int progress, String stage, String message) {
+        }
+
+        @Override
+        public void logInfo(String code, String message) {
+            events.add(code + ":" + message);
+        }
+
+        @Override
+        public void logInfo(String code, String message, Map<String, Object> details) {
+            events.add(code + ":" + message + ":" + details);
+            if ("BATCH_EXECUTED".equals(code)) {
+                batchStatementCounts.add((Integer) details.get("statementCount"));
+            }
+        }
+
+        @Override
+        public void logWarn(String code, String message, Map<String, Object> details) {
+            events.add(code + ":" + message + ":" + details);
+        }
+
+        @Override
+        public void logError(String code, String message, Map<String, Object> details) {
+            events.add(code + ":" + message + ":" + details);
+        }
+
+        @Override
+        public void checkCancelled() {
+        }
+
+        @Override
+        public void registerCancelable(TaskCancelable resource) {
+        }
+
+        @Override
+        public ArtifactDraft createArtifact(String outputDirectory, String fileName, String mediaType) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void write(String content) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void onStatementCreated(Statement statement) {
+        }
+
+        @Override
+        public void onStatementClosed(Statement statement) {
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CsvImportValueNormalizerTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CsvImportValueNormalizerTest.java
new file mode 100644
index 0000000000..7e056bb8bb
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/task/imports/excel/CsvImportValueNormalizerTest.java
@@ -0,0 +1,107 @@
+package ai.chat2db.community.domain.core.impl.task.imports.excel;
+
+import ai.chat2db.community.domain.api.model.metadata.TableColumn;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.tools.exception.BusinessException;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Types;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class CsvImportValueNormalizerTest {
+
+    @Test
+    void normalizesConfiguredDateTimeAndDecimalFormats() {
+        CsvOptions options = CsvOptions.builder()
+                .dateOrder("DMY")
+                .dateTimeOrder("DATE_TIME")
+                .dateDelimiter("/")
+                .timeDelimiter(":")
+                .decimalSymbol(",")
+                .build().validate();
+
+        assertEquals("2023-08-24", normalize("24/August/23", Types.DATE, options));
+        assertEquals("2023-08-24 15:30:38", normalize("24/8/2023 15:30:38", Types.TIMESTAMP, options));
+        assertEquals("15:30:38", normalize("15:30:38", Types.TIME, options));
+        assertEquals("12.50", normalize("12,50", Types.DECIMAL, options));
+    }
+
+    @Test
+    void supportsTimeFirstAndASeparateYearDelimiter() {
+        CsvOptions options = CsvOptions.builder()
+                .dateOrder("DMY")
+                .dateTimeOrder("TIME_DATE")
+                .dateDelimiter("/")
+                .yearDelimiter("-")
+                .timeDelimiter(".")
+                .build().validate();
+
+        assertEquals("2023-08-24 15:30:38", normalize("15.30.38 24/8-2023", Types.TIMESTAMP, options));
+    }
+
+    @Test
+    void supportsEveryDateComponentAndTimezonePosition() {
+        CsvOptions monthYearDay = CsvOptions.builder()
+                .dateOrder("MYD").dateDelimiter("/").build().validate();
+        assertEquals("2023-08-24", normalize("August/23/24", Types.DATE, monthYearDay));
+
+        CsvOptions timeZoneDate = CsvOptions.builder()
+                .dateOrder("DMY")
+                .dateTimeOrder("TIME_TIMEZONE_DATE")
+                .dateDelimiter("/")
+                .timeDelimiter(":")
+                .build().validate();
+        assertEquals("2023-08-24 15:30:38+08:00",
+                normalize("15:30:38 +08:00 24/8/23", Types.TIMESTAMP_WITH_TIMEZONE, timeZoneDate));
+    }
+
+    @Test
+    void reportsTheSourceRowColumnAndValueForInvalidTypedData() {
+        CsvOptions options = CsvOptions.builder().dateOrder("YMD").dateDelimiter("-").build().validate();
+        TableColumn column = TableColumn.builder().name("created_at").dataType(Types.DATE).build();
+
+        BusinessException error = assertThrows(BusinessException.class,
+                () -> CsvImportValueNormalizer.normalize("24/8/2023", column, options, 7));
+
+        assertEquals("import.csv.invalidValue", error.getCode());
+        assertEquals(7L, error.getArgs()[0]);
+        assertEquals("created_at", error.getArgs()[1]);
+        assertEquals("24/8/2023", error.getArgs()[2]);
+    }
+
+    @Test
+    void fallsBackToDatabaseColumnTypeWhenJdbcTypeIsMissing() {
+        CsvOptions options = CsvOptions.builder()
+                .dateOrder("YDM")
+                .dateTimeOrder("TIME_DATE")
+                .dateDelimiter("/")
+                .timeDelimiter(".")
+                .decimalSymbol(",")
+                .build().validate();
+
+        assertEquals("2023-08-24", normalizeByColumnType("2023/24/8", "DATE", options));
+        assertEquals("2023-08-24 15:30:38",
+                normalizeByColumnType("15.30.38 2023/24/8", "TIMESTAMP", options));
+        assertEquals("12.50", normalizeByColumnType("12,50", "DECIMAL(10,2)", options));
+    }
+
+    @Test
+    void keepsDefaultIsoAndDateOnlyTimestampFormsCompatible() {
+        CsvOptions options = CsvOptions.defaults().validate();
+
+        assertEquals("2023-08-24 15:30:38", normalize("2023-08-24T15:30:38", Types.TIMESTAMP, options));
+        assertEquals("2023-08-24 00:00", normalize("2023-08-24", Types.TIMESTAMP, options));
+    }
+
+    private static String normalize(String value, int type, CsvOptions options) {
+        TableColumn column = TableColumn.builder().name("value").dataType(type).build();
+        return CsvImportValueNormalizer.normalize(value, column, options, 2);
+    }
+
+    private static String normalizeByColumnType(String value, String columnType, CsvOptions options) {
+        TableColumn column = TableColumn.builder().name("value").columnType(columnType).build();
+        return CsvImportValueNormalizer.normalize(value, column, options, 2);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/frame/MainJFrame.java b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/frame/MainJFrame.java
index aaddd6befe..fe8f27b27f 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/frame/MainJFrame.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/frame/MainJFrame.java
@@ -107,6 +107,7 @@ public class MainJFrame extends JFrame {
     private Component browserUI_;
     private JCefAppConfig jcefAppConfig_;
     private volatile boolean windowFullScreen = false;
+    private volatile boolean showWindowOnStartup = true;
     private static final ObjectMapper objectMapper = new ObjectMapper();
     private final Map<Pair<String, String>, IJcefActionHandler> actionHandlers = new HashMap<>();
     private static final String appName;
@@ -165,23 +166,24 @@ public static MainJFrame getInstance() {
             }
         }
     }
-    private static void handleNewUri(String uriString) {
-        SwingUtilities.invokeLater(() -> {
-            if (JcefContext.getInstance().getFrame_() != null) {
-                if (uriString != null) {
-                    JcefContext.getInstance().getFrame_().processUri(UriUtil.processInput(uriString));
-                    JcefContext.getInstance().getFrame_().toFront();
-                    JcefContext.getInstance().getFrame_().requestFocus();
-                }
-            } else {
-                log.error("Error: application is not initialized; cannot process URI: {}", uriString);
+    public void handleLaunchRequest(String argument) {
+        if (StringUtils.isNotEmpty(argument)) {
+            try {
+                processUri(UriUtil.processInput(argument));
+            } catch (RuntimeException exception) {
+                log.error("Cannot handle desktop launch argument", exception);
             }
-        });
+        }
+        setVisible(true);
+        setExtendedState(getExtendedState() & ~Frame.ICONIFIED);
+        toFront();
+        requestFocus();
     }
     public void start(String[] args) {
-        if (!OS.isMacintosh() && !SingleInstanceUtil.registerInstance(args, MainJFrame::handleNewUri)) {
-            System.exit(0);
-        }
+        start(args, true);
+    }
+    public void start(String[] args, boolean showWindowOnStartup) {
+        this.showWindowOnStartup = showWindowOnStartup;
         UrlProtocolRegistrarUtil.register();
         initPreProcessor();
         initializeCefApp(args);
@@ -807,9 +809,17 @@ public void mouseMoved(MouseEvent e) {
                 }
             }
         });
+        createBrowserImmediatelyForHiddenStartup(browser_, showWindowOnStartup);
         log.info("4. CefBrowser and UI component creation completed.");
     }
 
+    static void createBrowserImmediatelyForHiddenStartup(CefBrowser browser, boolean showWindowOnStartup) {
+        if (!showWindowOnStartup) {
+            // Windowed JCEF normally creates the browser when Swing makes its component displayable.
+            browser.createImmediately();
+        }
+    }
+
     private static String resolveWebFrontendUrl() {
         String configuredUrl = System.getProperty(WEB_FRONTEND_URL_PROPERTY);
         return StringUtils.isBlank(configuredUrl) ? WEB_FRONTEND_URL : configuredUrl;
@@ -847,7 +857,9 @@ public void windowGainedFocus(WindowEvent e) {
             public void windowLostFocus(WindowEvent e) {
             }
         });
-        this.setVisible(true);
+        if (showWindowOnStartup) {
+            this.setVisible(true);
+        }
         writeDesktopReadyMarker();
         log.info("5. JFrame initialization completed.");
     }
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/handler/biz/SqlDirectoryTreeStore.java b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/handler/biz/SqlDirectoryTreeStore.java
index 8843648e33..0252e11cc5 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/handler/biz/SqlDirectoryTreeStore.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/handler/biz/SqlDirectoryTreeStore.java
@@ -1,5 +1,7 @@
 package ai.chat2db.community.jcef.handler.biz;
 
+import ai.chat2db.community.jcef.utils.OSOperateUtil;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileAlreadyExistsException;
@@ -167,6 +169,15 @@ static Map<String, Object> saveFile(String rootToken, String parentRelativePath,
 
     static Map<String, Object> renameChild(String rootToken, String relativePath, String rawName)
             throws IOException {
+        Path operationPath = getOperationPath(getRoot(rootToken), relativePath);
+        return OSOperateUtil.withLocalFileOperationLock(
+                operationPath,
+                ignored -> renameChildLocked(rootToken, relativePath, rawName)
+        );
+    }
+
+    private static Map<String, Object> renameChildLocked(String rootToken, String relativePath, String rawName)
+            throws IOException {
         Path root = getRoot(rootToken);
         Path source = resolveInRoot(root, relativePath);
         if (source.equals(root)) {
@@ -214,6 +225,14 @@ static Map<String, Object> renameChild(String rootToken, String relativePath, St
     }
 
     static Map<String, Object> deleteChild(String rootToken, String relativePath) throws IOException {
+        Path operationPath = getOperationPath(getRoot(rootToken), relativePath);
+        return OSOperateUtil.withLocalFileOperationLock(
+                operationPath,
+                ignored -> deleteChildLocked(rootToken, relativePath)
+        );
+    }
+
+    private static Map<String, Object> deleteChildLocked(String rootToken, String relativePath) throws IOException {
         Path root = getRoot(rootToken);
         Path target = resolveInRoot(root, relativePath);
         if (target.equals(root)) {
@@ -434,12 +453,17 @@ private static String toRelativePath(Path root, Path target) {
         return root.relativize(target).toString();
     }
 
-    private static Path resolveInRoot(Path root, String relativePath) throws IOException {
+    private static Path getOperationPath(Path root, String relativePath) {
         String pathText = relativePath == null ? "" : relativePath;
         Path target = pathText.isEmpty() ? root : root.resolve(pathText).normalize();
         if (!target.startsWith(root)) {
             throw new IllegalArgumentException("Path is outside of the selected SQL directory");
         }
+        return target;
+    }
+
+    private static Path resolveInRoot(Path root, String relativePath) throws IOException {
+        Path target = getOperationPath(root, relativePath);
         Path current = root;
         Path relativeTarget = root.relativize(target);
         for (Path segment : relativeTarget) {
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/handler/biz/WebIsReadyHandler.java b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/handler/biz/WebIsReadyHandler.java
index 4afb86ac04..5169928ffc 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/handler/biz/WebIsReadyHandler.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/handler/biz/WebIsReadyHandler.java
@@ -4,7 +4,9 @@
 import ai.chat2db.community.jcef.annotation.JcefAction;
 import ai.chat2db.community.jcef.builder.ResponseBuilder;
 import ai.chat2db.community.jcef.event.manager.FileOpenEventManager;
+import ai.chat2db.community.jcef.frame.MainJFrame;
 import ai.chat2db.community.jcef.utils.ApplicationExitCoordinator;
+import ai.chat2db.community.jcef.utils.SingleInstanceUtil;
 import ai.chat2db.community.tools.console.ConsoleMessage;
 import ai.chat2db.community.tools.console.ConsoleResult;
 import org.cef.callback.CefQueryCallback;
@@ -18,6 +20,7 @@ public class WebIsReadyHandler implements IJcefActionHandler{
     public void handle(ConsoleMessage consoleMessage, ConsoleResult wsResult, CefQueryCallback callback) throws Exception {
         FileOpenEventManager.markAppReady();
         ApplicationExitCoordinator.markFrontendReady();
+        SingleInstanceUtil.onReady(MainJFrame.getInstance()::handleLaunchRequest);
         ResponseBuilder.buildSuccessJcef(Map.of("data", true), callback);
     }
 }
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/terminal/TerminalSessionManager.java b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/terminal/TerminalSessionManager.java
index 77755da6be..a17fdd7b2c 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/terminal/TerminalSessionManager.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/terminal/TerminalSessionManager.java
@@ -51,7 +51,34 @@ public static Map<String, Object> create(Path directory, int columns, int rows)
     }
 
     public static Map<String, Object> create(Path directory, int columns, int rows, String shellId) throws IOException {
-        return create(directory, columns, rows, resolveShell(shellId));
+        return create(
+                directory,
+                columns,
+                rows,
+                resolveShellCandidates(shellId),
+                TerminalSessionManager::defaultProcessFactory
+        );
+    }
+
+    static Map<String, Object> create(Path directory, int columns, int rows, List<ShellCommand> candidates,
+                                      TerminalProcessFactory processFactory) throws IOException {
+        Path cwd = resolveTerminalDirectory(directory);
+        IOException lastFailure = null;
+        for (ShellCommand shell : candidates) {
+            try {
+                return createSession(cwd, columns, rows, shell, processFactory);
+            } catch (IOException failure) {
+                // Some corporate security suites (e.g. QiAnXin) deny process creation for
+                // powershell.exe even though the binary is present in PATH. Treat a spawn-time
+                // failure as "this shell cannot be invoked" and try the next candidate so the
+                // terminal still opens via, for example, cmd.exe.
+                lastFailure = failure;
+                log.warn("Unable to start terminal shell [{}]", shell.displayName(), failure);
+            }
+        }
+        throw lastFailure != null
+                ? lastFailure
+                : new IOException("No terminal shell is available");
     }
 
     public static Map<String, Object> createInUserHome(int columns, int rows, String shellId) throws IOException {
@@ -66,11 +93,25 @@ static Path resolveUserHomeDirectory(String configuredUserHome) {
     }
 
     private static Map<String, Object> create(Path directory, int columns, int rows, ShellCommand shell) throws IOException {
+        return createSession(
+                resolveTerminalDirectory(directory),
+                columns,
+                rows,
+                shell,
+                TerminalSessionManager::defaultProcessFactory
+        );
+    }
+
+    private static Path resolveTerminalDirectory(Path directory) throws IOException {
         Path cwd = directory.toRealPath();
         if (!Files.isDirectory(cwd)) {
             throw new IllegalArgumentException("Terminal working directory is not available");
         }
+        return cwd;
+    }
 
+    private static Map<String, Object> createSession(Path cwd, int columns, int rows, ShellCommand shell,
+                                                     TerminalProcessFactory processFactory) throws IOException {
         Map<String, String> environment = new HashMap<>(System.getenv());
         environment.put("TERM", "xterm-256color");
         environment.put("COLORTERM", "truecolor");
@@ -80,14 +121,13 @@ private static Map<String, Object> create(Path directory, int columns, int rows,
             applyShellColorEnvironment(environment, shell);
         }
 
-        PtyProcess process = new PtyProcessBuilder(shell.command().toArray(String[]::new))
-                .setDirectory(cwd.toString())
-                .setEnvironment(environment)
-                .setInitialColumns(Math.max(columns, 20))
-                .setInitialRows(Math.max(rows, 5))
-                .setRedirectErrorStream(true)
-                .setWindowsAnsiColorEnabled(true)
-                .start();
+        PtyProcess process = processFactory.create(
+                shell.command().toArray(String[]::new),
+                cwd.toString(),
+                environment,
+                Math.max(columns, 20),
+                Math.max(rows, 5)
+        );
 
         String sessionId = UUID.randomUUID().toString();
         TerminalSession session = new TerminalSession(sessionId, cwd, shell, process);
@@ -102,6 +142,18 @@ private static Map<String, Object> create(Path directory, int columns, int rows,
         return result;
     }
 
+    static PtyProcess defaultProcessFactory(String[] command, String directory, Map<String, String> environment,
+                                            int columns, int rows) throws IOException {
+        return new PtyProcessBuilder(command)
+                .setDirectory(directory)
+                .setEnvironment(environment)
+                .setInitialColumns(columns)
+                .setInitialRows(rows)
+                .setRedirectErrorStream(true)
+                .setWindowsAnsiColorEnabled(true)
+                .start();
+    }
+
     static boolean applyColorEnvironment(Map<String, String> environment) {
         // Selecting a Chat2DB terminal theme is an explicit color opt-in. Keep
         // the override scoped to this child process and avoid exposing CLI tools
@@ -226,6 +278,19 @@ private static TerminalSession requireKnownSession(String sessionId) {
         return session;
     }
 
+    static List<ShellCommand> resolveShellCandidates(String requestedShellId) {
+        String shellId = requestedShellId == null || requestedShellId.isBlank()
+                ? "system"
+                : requestedShellId.toLowerCase(Locale.ROOT);
+        if ("system".equals(shellId)) {
+            // The default shell may be denied at runtime (e.g. powershell.exe blocked by a
+            // corporate security suite). Return the ordered fallback chain so create(...) can
+            // move on to cmd.exe when an earlier candidate cannot be started.
+            return resolveSystemShellCandidates(normalizedOsName());
+        }
+        return List.of(resolveShell(shellId));
+    }
+
     private static ShellCommand resolveShell(String requestedShellId) {
         String shellId = requestedShellId == null || requestedShellId.isBlank()
                 ? "system"
@@ -243,33 +308,43 @@ private static ShellCommand resolveShell(String requestedShellId) {
                     "Windows PowerShell",
                     requireCommand(os, "Windows PowerShell", "powershell.exe")
             );
-            case "cmd" -> new ShellCommand(
-                    "cmd",
-                    List.of(requireCommand(os, "Command Prompt", resolveCommandPrompt())),
-                    "Command Prompt",
-                    ShellFamily.CMD
-            );
+            case "cmd" -> commandPrompt("cmd", requireCommand(os, "Command Prompt", resolveCommandPrompt()));
             default -> throw new IllegalArgumentException("Unsupported terminal shell: " + shellId);
         };
     }
 
     private static ShellCommand resolveSystemShell(String os) {
+        return resolveSystemShellCandidates(os).get(0);
+    }
+
+    private static List<ShellCommand> resolveSystemShellCandidates(String os) {
+        return resolveSystemShellCandidates(os, TerminalSessionManager::findCommand);
+    }
+
+    static List<ShellCommand> resolveSystemShellCandidates(String os, CommandResolver resolver) {
         if (isWindows(os)) {
-            String pwsh = findCommand(os, "pwsh.exe", "pwsh");
+            List<ShellCommand> candidates = new ArrayList<>();
+            String pwsh = resolver.find(os, "pwsh.exe", "pwsh");
             if (pwsh != null) {
-                return powerShell("system", "PowerShell 7", pwsh);
+                candidates.add(powerShell("system", "PowerShell 7", pwsh));
             }
-            String powerShell = findCommand(os, "powershell.exe");
+            String powerShell = resolver.find(os, "powershell.exe");
             if (powerShell != null) {
-                return powerShell("system", "Windows PowerShell", powerShell);
+                candidates.add(powerShell("system", "Windows PowerShell", powerShell));
             }
-            return new ShellCommand(
-                    "system",
-                    List.of(requireCommand(os, "Command Prompt", resolveCommandPrompt())),
-                    "Command Prompt",
-                    ShellFamily.CMD
-            );
+            // Keep cmd.exe as the last resort so a blocked PowerShell still yields a usable shell.
+            String cmd = resolver.find(os, resolveCommandPrompt());
+            candidates.add(commandPrompt("system", cmd == null ? resolveCommandPrompt() : cmd));
+            return candidates;
         }
+        return List.of(resolveNonWindowsSystemShell(os));
+    }
+
+    private static ShellCommand commandPrompt(String id, String command) {
+        return new ShellCommand(id, List.of(command), "Command Prompt", ShellFamily.CMD);
+    }
+
+    private static ShellCommand resolveNonWindowsSystemShell(String os) {
         String configuredShell = System.getenv("SHELL");
         if (configuredShell != null && Files.isExecutable(Path.of(configuredShell))) {
             return unixShell("system", Path.of(configuredShell).getFileName().toString(), configuredShell);
@@ -387,12 +462,23 @@ static void resetEventPublisherForTests() {
         eventPublisher = JCEF_EVENT_PUBLISHER;
     }
 
+    @FunctionalInterface
+    interface CommandResolver {
+        String find(String os, String... candidates);
+    }
+
+    @FunctionalInterface
+    interface TerminalProcessFactory {
+        PtyProcess create(String[] command, String directory, Map<String, String> environment,
+                          int columns, int rows) throws IOException;
+    }
+
     @FunctionalInterface
     interface TerminalEventPublisher {
         void publish(String sessionId, ActionTypeEnum actionType, Map<String, Object> message);
     }
 
-    private enum ShellFamily {
+    enum ShellFamily {
         BASH,
         ZSH,
         POWERSHELL,
@@ -400,7 +486,7 @@ private enum ShellFamily {
         OTHER
     }
 
-    private record ShellCommand(String id, List<String> command, String displayName, ShellFamily family) {
+    record ShellCommand(String id, List<String> command, String displayName, ShellFamily family) {
     }
 
     private static final class TerminalSession {
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/update/Updater.java b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/update/Updater.java
index 06d2ade03f..d614554bed 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/update/Updater.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/update/Updater.java
@@ -144,10 +144,12 @@ public void restartApp() throws IOException {
         ApplicationExitCoordinator.request(ApplicationExitCoordinator.ExitAction.RESTART.name());
     }
 
-    public void restartAppNow() throws IOException {
+    public boolean restartAppNow() throws IOException {
         if (prepareRestart()) {
             System.exit(0);
+            return true;
         }
+        return false;
     }
 
     public boolean prepareRestart() throws IOException {
@@ -798,7 +800,7 @@ public void triggerInstallationWithAuxiliaryProcess() {
         ApplicationExitCoordinator.request(ApplicationExitCoordinator.ExitAction.INSTALL_UPDATE.name());
     }
 
-    public void triggerInstallationWithAuxiliaryProcessNow() {
+    public boolean triggerInstallationWithAuxiliaryProcessNow() {
         progressDialog.appendLog("Preparing for update via auxiliary process...");
         try {
             UpdatePlan plan = new UpdatePlan();
@@ -825,10 +827,12 @@ public void triggerInstallationWithAuxiliaryProcessNow() {
             } catch (InterruptedException ignored) {
             }
             System.exit(0);
+            return true;
 
         } catch (Exception e) {
             log.error("Failed to launch auxiliary updater process", e);
             progressDialog.appendLog("FATAL ERROR: Could not start the update process. " + e.getMessage());
+            return false;
         }
     }
 
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/ApplicationExitCoordinator.java b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/ApplicationExitCoordinator.java
index 443f7dfbd5..58842eaddf 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/ApplicationExitCoordinator.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/ApplicationExitCoordinator.java
@@ -44,10 +44,7 @@ private ApplicationExitCoordinator() {
     }
 
     public static boolean request(String action) {
-        return request(action, UUID.randomUUID().toString(), () -> {
-            execute(action);
-            return true;
-        });
+        return request(action, UUID.randomUUID().toString(), () -> execute(action));
     }
 
     public static boolean request(String action, String operationId, BooleanSupplier confirmedAction) {
@@ -59,6 +56,7 @@ static boolean request(String action, String operationId, BooleanSupplier confir
         ExitAction validatedAction = requireAction(action);
         String validatedOperationId = requireOperationId(operationId);
         Objects.requireNonNull(confirmedAction, "Confirmed exit action is required");
+        confirmedAction = SingleInstanceUtil.guardExit(confirmedAction);
         if (!FRONTEND_READY.get()) {
             return confirmedAction.getAsBoolean();
         }
@@ -149,18 +147,21 @@ private static PendingExit takePendingExit(String operationId) {
         }
     }
 
-    private static void execute(String action) {
-        switch (requireAction(action)) {
-            case CLOSE -> OSOperateUtil.closeWindows(JcefContext.getInstance().getFrame_());
+    private static boolean execute(String action) {
+        return switch (requireAction(action)) {
+            case CLOSE -> {
+                OSOperateUtil.closeWindows(JcefContext.getInstance().getFrame_());
+                yield true;
+            }
             case RESTART -> {
                 try {
-                    Updater.getInstance().restartAppNow();
+                    yield Updater.getInstance().restartAppNow();
                 } catch (IOException e) {
                     throw new IllegalStateException("Could not restart the application", e);
                 }
             }
             case INSTALL_UPDATE -> Updater.getInstance().triggerInstallationWithAuxiliaryProcessNow();
-        }
+        };
     }
 
     private static ExitAction requireAction(String action) {
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/OSOperateUtil.java b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/OSOperateUtil.java
index 5340ad946b..ddb39b63fe 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/OSOperateUtil.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/OSOperateUtil.java
@@ -24,11 +24,15 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.*;
 import java.util.Timer;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 import java.util.prefs.Preferences;
@@ -37,6 +41,8 @@
 @Slf4j
 public class OSOperateUtil {
 
+    private static final ConcurrentMap<Path, FileOperationLock> FILE_OPERATION_LOCKS = new ConcurrentHashMap<>();
+
 
     public static void openFileManager(String filePath) {
         try {
@@ -299,23 +305,59 @@ public static Map<String, Object> updateFileContent(
             throw new IllegalArgumentException("File path and content must not be empty");
         }
 
-        Path path = Paths.get(filePath);
-        if (!Files.exists(path)) {
-            throw new FileNotFoundException("File not found: " + filePath);
-        }
+        return withLocalFileOperationLock(Paths.get(filePath), path -> {
+            if (!Files.exists(path)) {
+                throw new FileNotFoundException("File not found: " + filePath);
+            }
 
-        LocalTextFileCodec.DecodedText existingFile = null;
-        if (charset == null || bom == null) {
-            existingFile = LocalTextFileCodec.read(path, charset);
+            LocalTextFileCodec.DecodedText existingFile = null;
+            if (charset == null || bom == null) {
+                existingFile = LocalTextFileCodec.read(path, charset);
+            }
+            Charset targetCharset = charset != null ? charset : Charset.forName(existingFile.charset());
+            boolean includeBom = bom != null ? bom : existingFile.bom();
+            LocalTextFileCodec.write(path, fileContent, targetCharset, includeBom);
+
+            Map<String, Object> result = new HashMap<>();
+            result.put("path", path.toString());
+            result.put("size", Files.size(path));
+            return result;
+        });
+    }
+
+    public static <T> T withLocalFileOperationLock(Path requestedPath, LocalFileOperation<T> operation)
+            throws IOException {
+        Objects.requireNonNull(requestedPath, "File operation path is required");
+        Objects.requireNonNull(operation, "File operation is required");
+        Path path = requestedPath.toAbsolutePath().normalize();
+        Path lockKey = Files.exists(path, LinkOption.NOFOLLOW_LINKS) ? path.toRealPath() : path;
+        FileOperationLock operationLock = FILE_OPERATION_LOCKS.compute(lockKey, (ignored, current) -> {
+            FileOperationLock next = current == null ? new FileOperationLock() : current;
+            next.references.incrementAndGet();
+            return next;
+        });
+        try {
+            synchronized (operationLock.monitor) {
+                return operation.execute(path);
+            }
+        } finally {
+            FILE_OPERATION_LOCKS.computeIfPresent(lockKey, (ignored, current) -> {
+                if (current != operationLock || current.references.decrementAndGet() > 0) {
+                    return current;
+                }
+                return null;
+            });
         }
-        Charset targetCharset = charset != null ? charset : Charset.forName(existingFile.charset());
-        boolean includeBom = bom != null ? bom : existingFile.bom();
-        LocalTextFileCodec.write(path, fileContent, targetCharset, includeBom);
+    }
 
-        Map<String, Object> result = new HashMap<>();
-        result.put("path", path.toAbsolutePath().toString());
-        result.put("size", Files.size(path));
-        return result;
+    @FunctionalInterface
+    public interface LocalFileOperation<T> {
+        T execute(Path path) throws IOException;
+    }
+
+    private static final class FileOperationLock {
+        private final Object monitor = new Object();
+        private final AtomicInteger references = new AtomicInteger();
     }
 
 
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/SingleInstanceUtil.java b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/SingleInstanceUtil.java
index 638640091b..9a62a3bc92 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/SingleInstanceUtil.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/java/ai/chat2db/community/jcef/utils/SingleInstanceUtil.java
@@ -1,143 +1,457 @@
 package ai.chat2db.community.jcef.utils;
 
-import ai.chat2db.community.jcef.event.manager.FileOpenEventManager;
-import ai.chat2db.community.tools.util.ConfigUtils;
+import ai.chat2db.community.tools.runtime.ProductRuntimeIdentityProvider;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.cef.OS;
 
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.channels.OverlappingFileLockException;
-import java.nio.file.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.StandardWatchEventKinds;
+import java.nio.file.WatchKey;
+import java.nio.file.WatchService;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
+import java.time.Duration;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 
+import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.WRITE;
 
 @Slf4j
 public final class SingleInstanceUtil {
-
-    private static final Path LOCK_FILE_PATH;
-    private static final Path IPC_FILE_PATH;
-    private static FileChannel lockChannel;
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final Duration EXIT_TIMEOUT = Duration.ofMinutes(2);
+    private static final int MAX_REQUEST_BYTES = 1024 * 1024;
+    private static final Object REQUEST_LOCK = new Object();
+    private static final Queue<LaunchRequest> PENDING = new ConcurrentLinkedQueue<>();
+    private static final ScheduledThreadPoolExecutor SOCKET_DEADLINES = new ScheduledThreadPoolExecutor(1, action -> {
+        Thread thread = new Thread(action, "chat2db-instance-deadlines");
+        thread.setDaemon(true);
+        return thread;
+    });
+    static {
+        SOCKET_DEADLINES.setRemoveOnCancelPolicy(true);
+    }
+    private static long requestVersion;
     private static FileLock fileLock;
+    private static volatile Consumer<String> argumentConsumer;
+    private static volatile ServerSocket ipcServer;
+    private static volatile boolean shuttingDown;
 
-    static {
-        String lockFileName = "app.lock";
-        String ipcFileName = "app.ipc";
-        String basePath = ConfigUtils.getBasePath();
-        LOCK_FILE_PATH = Paths.get(basePath, lockFileName);
-        IPC_FILE_PATH = Paths.get(basePath, ipcFileName);
+    private SingleInstanceUtil() {
     }
 
+    public static boolean registerDesktopInstance(String[] args) {
+        if (!requiresInstanceLock(System.getProperty("chat2db.mode"),
+                System.getProperty("chat2db.gui"), System.getProperty("chat2db.runtime.mode"),
+                Boolean.getBoolean("chat2db.cli.runtime"), OS.isMacintosh())) {
+            return true;
+        }
+        try {
+            return registerInstance(Path.of(System.getProperty("user.home"),
+                    ProductRuntimeIdentityProvider.current().stateDirectoryName()), args);
+        } catch (IOException exception) {
+            log.error("Cannot initialize the desktop instance", exception);
+            JOptionPane.showMessageDialog(null, exception.getLocalizedMessage(),
+                    ProductRuntimeIdentityProvider.current().displayName(), JOptionPane.ERROR_MESSAGE);
+            System.exit(1);
+            return false;
+        }
+    }
 
-    private SingleInstanceUtil() {}
+    static boolean requiresInstanceLock(String mode, String gui, String runtime, boolean cli, boolean mac) {
+        return "DESKTOP".equalsIgnoreCase(mode) && !"false".equalsIgnoreCase(gui)
+                && !"cli".equalsIgnoreCase(runtime) && !cli && !mac;
+    }
 
+    static boolean registerInstance(Path directory, String[] args) throws IOException {
+        return registerInstance(directory, args, EXIT_TIMEOUT);
+    }
 
-    public static boolean registerInstance(String[] args, Consumer<String> argumentConsumer) {
-        try {
-            Files.createDirectories(LOCK_FILE_PATH.getParent());
-            lockChannel = FileChannel.open(LOCK_FILE_PATH, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
-            fileLock = lockChannel.tryLock();
-
-            if (fileLock == null) {
-                log.info("Lock file is held by another instance. Sending arguments to it.");
-                if (args != null && args.length > 0) {
-                    sendArgumentToFirstInstance(args[0]);
+    static synchronized boolean registerInstance(Path directory, String[] args, Duration timeout) throws IOException {
+        long deadline = System.nanoTime() + timeout.toNanos();
+        if (fileLock != null && fileLock.isValid()) {
+            return true;
+        }
+        Files.createDirectories(directory);
+        String argument = launchArgument(args);
+        // Publish the receiver before another new launcher can inspect its endpoint.
+        try (FileChannel launchChannel = FileChannel.open(directory.resolve("app.launch.lock"), CREATE, WRITE);
+             FileLock launchLock = acquireLaunchLock(launchChannel, deadline)) {
+            FileChannel channel = FileChannel.open(directory.resolve("app.lock"), CREATE, WRITE);
+            boolean primary = false;
+            try {
+                boolean checkedLegacy = false;
+                boolean waitingForExit = false;
+                while (true) {
+                    remainingMillis(deadline);
+                    FileLock lock;
+                    try {
+                        lock = channel.tryLock();
+                    } catch (OverlappingFileLockException ignored) {
+                        lock = null;
+                    }
+                    if (lock != null) {
+                        startReceiver(directory, argument);
+                        // FileLock retains its channel until all JVM shutdown hooks finish.
+                        fileLock = lock;
+                        primary = true;
+                        return true;
+                    }
+                    Endpoint endpoint = readEndpoint(directory);
+                    if (endpoint == null) {
+                        if (!checkedLegacy) {
+                            checkedLegacy = true;
+                            continue;
+                        }
+                        publish(directory.resolve("app.ipc"), argument.getBytes(StandardCharsets.UTF_8));
+                        return false;
+                    }
+                    if (forward(endpoint, argument, deadline)) {
+                        return false;
+                    }
+                    if (!waitingForExit) {
+                        log.info("Waiting for the previous desktop instance to exit.");
+                        waitingForExit = true;
+                    }
+                    pause(deadline);
                 }
-                lockChannel.close();
-                return false;
+            } finally {
+                if (!primary) {
+                    channel.close();
+                }
+            }
+        }
+    }
+
+    private static FileLock acquireLaunchLock(FileChannel channel, long deadline) throws IOException {
+        while (true) {
+            remainingMillis(deadline);
+            FileLock lock = channel.tryLock();
+            if (lock != null) {
+                return lock;
             }
+            pause(deadline);
+        }
+    }
+
+    private static int remainingMillis(long deadline) throws IOException {
+        if (Thread.currentThread().isInterrupted()) {
+            throw new IOException("Interrupted while waiting for the running application");
+        }
+        long remaining = deadline - System.nanoTime();
+        if (remaining <= 0) {
+            throw new SocketTimeoutException("Timed out waiting for desktop instance startup or shutdown");
+        }
+        return (int) Math.min(Integer.MAX_VALUE, Math.max(1, TimeUnit.NANOSECONDS.toMillis(remaining)));
+    }
+
+    private static void pause(long deadline) throws IOException {
+        try {
+            Thread.sleep(Math.min(50, remainingMillis(deadline)));
+        } catch (InterruptedException exception) {
+            Thread.currentThread().interrupt();
+            throw new IOException("Interrupted while waiting for the running application", exception);
+        }
+    }
+
+    private static void startReceiver(Path directory, String initialArgument) throws IOException {
+        Path legacyIpc = directory.resolve("app.ipc");
+        IpcVersion lastWrite = ipcVersion(legacyIpc);
+        ServerSocket server = new ServerSocket(0, 50, InetAddress.getByName("127.0.0.1"));
+        WatchService watcher;
+        try {
+            watcher = directory.getFileSystem().newWatchService();
+        } catch (IOException exception) {
+            server.close();
+            throw exception;
+        }
+        try {
+            directory.register(watcher, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_MODIFY);
+            ProcessHandle process = ProcessHandle.current();
+            Endpoint endpoint = new Endpoint(process.pid(), process.info().startInstant().toString(),
+                    server.getLocalPort(), UUID.randomUUID().toString());
+            publish(directory.resolve("app.ipc.endpoint"), MAPPER.writeValueAsBytes(endpoint));
+            ipcServer = server;
+            accept(new LaunchRequest(initialArgument, false));
+            Runtime.getRuntime().addShutdownHook(new Thread(SingleInstanceUtil::closeReceiver, "chat2db-instance-exit"));
+            startDaemon("chat2db-instance-receiver", () -> receive(server, endpoint.token()));
+            startDaemon("chat2db-instance-requests", () -> dispatch(legacyIpc, watcher, lastWrite));
             log.info("Successfully acquired the instance lock.");
-            addShutdownHook();
-            startIpcListener(argumentConsumer);
-            if (args.length > 0) {
-                if (args[0].startsWith("chat2db-")) {
-                    return true;
+        } catch (IOException | RuntimeException exception) {
+            server.close();
+            watcher.close();
+            throw exception;
+        }
+    }
+
+    public static void onReady(Consumer<String> consumer) {
+        // The consumer runs on the EDT and must finish its window handoff before returning.
+        synchronized (REQUEST_LOCK) {
+            argumentConsumer = Objects.requireNonNull(consumer);
+        }
+    }
+
+    /** Capture before exit confirmation; return true only after exit has been started or scheduled. */
+    public static BooleanSupplier guardExit(BooleanSupplier action) {
+        final long version;
+        synchronized (REQUEST_LOCK) {
+            version = requestVersion;
+        }
+        return () -> {
+            if (ipcServer == null) {
+                return action.getAsBoolean();
+            }
+            synchronized (REQUEST_LOCK) {
+                // An initial launch can be cancelled before readiness; forwarded requests were ACKed.
+                boolean pendingDelivery = PENDING.stream().anyMatch(request -> request.forwarded() || argumentConsumer != null);
+                if (shuttingDown || version != requestVersion || pendingDelivery) {
+                    return false;
                 }
-                Path path = Paths.get(args[0]);
-                if (Files.exists(path)) {
-                    String filePath = path.toAbsolutePath().toString();
-                    FileOpenEventManager.stashFileOpenEvent(filePath);
+                shuttingDown = true;
+            }
+            boolean exiting = false;
+            try {
+                exiting = action.getAsBoolean();
+                return exiting;
+            } finally {
+                if (!exiting) {
+                    synchronized (REQUEST_LOCK) {
+                        shuttingDown = false;
+                    }
                 }
             }
-            return true;
+        };
+    }
 
-        } catch (OverlappingFileLockException e) {
-            log.info("Another instance is running (OverlappingFileLockException). Sending arguments.");
-            if (args != null && args.length > 0) {
-                sendArgumentToFirstInstance(args[0]);
+    private static boolean accept(LaunchRequest request) {
+        synchronized (REQUEST_LOCK) {
+            if (shuttingDown) {
+                return false;
             }
-            return false;
-        } catch (IOException e) {
-            log.error("An I/O error occurred during single instance registration. Starting as a new instance.", e);
+            PENDING.add(request);
+            requestVersion++;
             return true;
         }
     }
 
+    private static void closeReceiver() {
+        synchronized (REQUEST_LOCK) {
+            shuttingDown = true;
+        }
+        ServerSocket server = ipcServer;
+        if (server != null) {
+            try {
+                server.close();
+            } catch (IOException exception) {
+                log.warn("Cannot close desktop instance receiver", exception);
+            }
+        }
+    }
+
+    private static Endpoint readEndpoint(Path directory) throws IOException {
+        Path path = directory.resolve("app.ipc.endpoint");
+        if (!Files.exists(path)) {
+            return null;
+        }
+        Endpoint endpoint = MAPPER.readValue(path.toFile(), Endpoint.class);
+        return ProcessHandle.of(endpoint.pid()).filter(ProcessHandle::isAlive)
+                .filter(process -> endpoint.startedAt().equals(process.info().startInstant().toString()))
+                .map(process -> endpoint).orElse(null);
+    }
 
-    private static void addShutdownHook() {
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+    private static boolean forward(Endpoint endpoint, String argument, long deadline) throws IOException {
+        try (Socket socket = new Socket(Proxy.NO_PROXY)) {
+            try {
+                socket.connect(new InetSocketAddress("127.0.0.1", endpoint.port()), Math.min(500, remainingMillis(deadline)));
+            } catch (IOException exception) {
+                return false;
+            }
+            ScheduledFuture<?> expiry = closeAfter(socket, Math.min(5000, remainingMillis(deadline)));
             try {
-                if (fileLock != null && fileLock.isValid()) {
-                    fileLock.release();
+                DataOutputStream output = new DataOutputStream(socket.getOutputStream());
+                output.writeUTF(endpoint.token());
+                byte[] request = argument.getBytes(StandardCharsets.UTF_8);
+                if (request.length > MAX_REQUEST_BYTES) {
+                    throw new IOException("Desktop launch request is too large");
                 }
-                if (lockChannel != null && lockChannel.isOpen()) {
-                    lockChannel.close();
+                output.writeInt(request.length);
+                output.write(request);
+                output.flush();
+                // Never retry an ambiguous write: only an explicit refusal is safe to retry.
+                return new DataInputStream(socket.getInputStream()).readBoolean();
+            } finally {
+                expiry.cancel(false);
+            }
+        }
+    }
+
+    private static ScheduledFuture<?> closeAfter(Socket socket, int milliseconds) {
+        return SOCKET_DEADLINES.schedule(() -> {
+            try {
+                socket.close();
+            } catch (IOException exception) {
+                log.debug("Cannot close expired desktop IPC connection", exception);
+            }
+        }, milliseconds, TimeUnit.MILLISECONDS);
+    }
+
+    private static void receive(ServerSocket server, String token) {
+        while (!server.isClosed()) {
+            try (Socket socket = server.accept()) {
+                // Bound the entire frame, including clients that keep sending partial data.
+                ScheduledFuture<?> expiry = closeAfter(socket, 2000);
+                try {
+                    DataInputStream input = new DataInputStream(socket.getInputStream());
+                    if (!token.equals(input.readUTF())) {
+                        continue;
+                    }
+                    int length = input.readInt();
+                    if (length < 0 || length > MAX_REQUEST_BYTES) {
+                        continue;
+                    }
+                    byte[] request = new byte[length];
+                    input.readFully(request);
+                    boolean accepted = accept(new LaunchRequest(new String(request, StandardCharsets.UTF_8), true));
+                    DataOutputStream output = new DataOutputStream(socket.getOutputStream());
+                    output.writeBoolean(accepted);
+                    output.flush();
+                } finally {
+                    expiry.cancel(false);
+                }
+            } catch (SocketTimeoutException ignored) {
+                // An incomplete client must not prevent subsequent launches from connecting.
+            } catch (IOException exception) {
+                if (!server.isClosed()) {
+                    log.warn("Cannot receive desktop launch request", exception);
                 }
-                Files.deleteIfExists(LOCK_FILE_PATH);
-                Files.deleteIfExists(IPC_FILE_PATH);
-                log.info("Instance lock released and cleanup complete.");
-            } catch (IOException e) {
-                log.warn("Error during lock file cleanup.", e);
             }
-        }));
+        }
     }
 
+    private static String launchArgument(String[] args) {
+        if (args.length == 0 || args[0].startsWith("-")) {
+            return "";
+        }
+        String value = args[0];
+        return value.startsWith(ProductRuntimeIdentityProvider.current().protocolScheme() + "://")
+                ? value : Path.of(value).toAbsolutePath().normalize().toString();
+    }
 
-    private static void startIpcListener(Consumer<String> argumentConsumer) {
-        new Thread(() -> {
-            try (WatchService watchService = FileSystems.getDefault().newWatchService()) {
-                Path parentDir = IPC_FILE_PATH.getParent();
-                parentDir.register(watchService, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_MODIFY);
-                log.info("IPC listener started, watching for changes to {}", IPC_FILE_PATH.getFileName());
+    private static void publish(Path path, byte[] content) throws IOException {
+        Path temporary = Files.createTempFile(path.getParent(), "app.ipc-", ".tmp");
+        try {
+            Files.write(temporary, content);
+            Files.move(temporary, path, ATOMIC_MOVE, REPLACE_EXISTING);
+        } finally {
+            Files.deleteIfExists(temporary);
+        }
+    }
 
-                while (true) {
-                    WatchKey key = watchService.take();
-                    TimeUnit.MILLISECONDS.sleep(100);
-                    for (WatchEvent<?> event : key.pollEvents()) {
-                        Path changedFile = (Path) event.context();
-                        if (changedFile.getFileName().equals(IPC_FILE_PATH.getFileName())) {
-                            try {
-                                String argument = Files.readString(IPC_FILE_PATH);
-                                if (StringUtils.isNotBlank(argument)) {
-                                    log.info("Received argument from another instance: {}", argument);
-                                    argumentConsumer.accept(argument);
-                                }
-                            } catch (IOException e) {
-                                log.warn("Error reading IPC file.", e);
+    private static IpcVersion ipcVersion(Path ipc) throws IOException {
+        try {
+            BasicFileAttributes attributes = Files.readAttributes(ipc, BasicFileAttributes.class);
+            return new IpcVersion(attributes.fileKey(), attributes.lastModifiedTime());
+        } catch (NoSuchFileException ignored) {
+            return null;
+        }
+    }
+
+    private static void dispatch(Path ipc, WatchService watcher, IpcVersion lastWrite) {
+        boolean failed = false;
+        boolean deliveryFailed = false;
+        boolean ipcChanged = false;
+        String lastArgument = null;
+        try (watcher) {
+            while (!ipcServer.isClosed()) {
+                try {
+                    IpcVersion modified = ipcVersion(ipc);
+                    if (modified != null && (ipcChanged || !modified.equals(lastWrite))) {
+                        String argument = Files.readString(ipc);
+                        if (modified.equals(ipcVersion(ipc))) {
+                            boolean alreadyRead = modified.equals(lastWrite) && Objects.equals(argument, lastArgument);
+                            if (alreadyRead || accept(new LaunchRequest(argument, true))) {
+                                lastWrite = modified;
+                                lastArgument = argument;
+                                ipcChanged = false;
                             }
                         }
                     }
-                    if (!key.reset()) {
-                        log.warn("WatchKey is no longer valid. IPC listener is shutting down.");
-                        break;
+                    failed = false;
+                } catch (IOException exception) {
+                    if (!failed) {
+                        log.warn("Cannot read legacy desktop launch request; waiting for recovery", exception);
                     }
+                    failed = true;
+                }
+                try {
+                    Consumer<String> handler = argumentConsumer;
+                    while (handler != null && !shuttingDown && !PENDING.isEmpty()) {
+                        String argument = PENDING.element().argument();
+                        // Keep ownership until the window callback has actually finished on the EDT.
+                        SwingUtilities.invokeAndWait(() -> handler.accept(argument));
+                        PENDING.remove();
+                    }
+                    deliveryFailed = false;
+                } catch (InvocationTargetException | RuntimeException exception) {
+                    if (!deliveryFailed) {
+                        log.warn("Cannot dispatch desktop launch request; waiting for recovery", exception);
+                    }
+                    deliveryFailed = true;
+                }
+                WatchKey key = watcher.poll(100, TimeUnit.MILLISECONDS);
+                if (key != null) {
+                    ipcChanged |= key.pollEvents().stream().anyMatch(event -> ipc.getFileName().equals(event.context()));
+                    key.reset();
                 }
-            } catch (IOException | InterruptedException e) {
-                log.error("IPC listener thread was interrupted or failed.", e);
-                Thread.currentThread().interrupt();
             }
-        }).start();
+        } catch (IOException | RuntimeException exception) {
+            log.error("Desktop launch dispatch failed", exception);
+        } catch (InterruptedException exception) {
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    private static void startDaemon(String name, Runnable action) {
+        Thread thread = new Thread(action, name);
+        thread.setDaemon(true);
+        thread.start();
     }
 
+    private record Endpoint(long pid, String startedAt, int port, String token) {
+    }
 
-    private static void sendArgumentToFirstInstance(String argument) {
-        try {
-            Files.writeString(IPC_FILE_PATH, argument, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
-            log.info("Successfully sent argument '{}' to the first instance.", argument);
-        } catch (IOException e) {
-            log.error("Failed to send argument to the first instance.", e);
-        }
+    private record LaunchRequest(String argument, boolean forwarded) {
+    }
+
+    private record IpcVersion(Object fileKey, FileTime modifiedTime) {
     }
 }
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages.properties
index f5d038af90..7bc588d29f 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=View Changelog
 
 fileChooser.select.dir.title=Please select a directory
 fileChooser.select.file.title=Please select a save location
+mysql.activeTransaction.processPrivilegeRequired=PROCESS privilege is required to inspect active InnoDB transactions
+activeTransaction.inspection.unsupported=The current datasource does not support active transaction inspection
+import.preview.invalidCsvOptions=Unsupported CSV options
+import.preview.invalidEncoding=Unsupported CSV encoding: {0}
+import.preview.invalidEncodingLine=CSV is not valid {0} near line {1}
+import.preview.malformedCsv=CSV line {0} cannot be parsed. Check that the encoding, delimiter, text qualifier, and escape settings above match the file.
+import.preview.unclosedQuote=CSV has an unclosed quote starting at line {0}
+import.csv.invalidValue=CSV row {0}, column "{1}" cannot convert value "{2}". Check the date, time, and decimal format settings.
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_en.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_en.properties
index f5d038af90..7bc588d29f 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_en.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_en.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=View Changelog
 
 fileChooser.select.dir.title=Please select a directory
 fileChooser.select.file.title=Please select a save location
+mysql.activeTransaction.processPrivilegeRequired=PROCESS privilege is required to inspect active InnoDB transactions
+activeTransaction.inspection.unsupported=The current datasource does not support active transaction inspection
+import.preview.invalidCsvOptions=Unsupported CSV options
+import.preview.invalidEncoding=Unsupported CSV encoding: {0}
+import.preview.invalidEncodingLine=CSV is not valid {0} near line {1}
+import.preview.malformedCsv=CSV line {0} cannot be parsed. Check that the encoding, delimiter, text qualifier, and escape settings above match the file.
+import.preview.unclosedQuote=CSV has an unclosed quote starting at line {0}
+import.csv.invalidValue=CSV row {0}, column "{1}" cannot convert value "{2}". Check the date, time, and decimal format settings.
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_en_US.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_en_US.properties
index f5d038af90..7bc588d29f 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_en_US.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_en_US.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=View Changelog
 
 fileChooser.select.dir.title=Please select a directory
 fileChooser.select.file.title=Please select a save location
+mysql.activeTransaction.processPrivilegeRequired=PROCESS privilege is required to inspect active InnoDB transactions
+activeTransaction.inspection.unsupported=The current datasource does not support active transaction inspection
+import.preview.invalidCsvOptions=Unsupported CSV options
+import.preview.invalidEncoding=Unsupported CSV encoding: {0}
+import.preview.invalidEncodingLine=CSV is not valid {0} near line {1}
+import.preview.malformedCsv=CSV line {0} cannot be parsed. Check that the encoding, delimiter, text qualifier, and escape settings above match the file.
+import.preview.unclosedQuote=CSV has an unclosed quote starting at line {0}
+import.csv.invalidValue=CSV row {0}, column "{1}" cannot convert value "{2}". Check the date, time, and decimal format settings.
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_es.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_es.properties
index 78e9b5df84..a85c304e29 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_es.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_es.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=Ver registro de cambios
 
 fileChooser.select.dir.title=Seleccione un directorio
 fileChooser.select.file.title=Seleccione una ubicación para guardar
+mysql.activeTransaction.processPrivilegeRequired=Se requiere el privilegio PROCESS para inspeccionar transacciones InnoDB activas
+activeTransaction.inspection.unsupported=La fuente de datos actual no admite la inspección de transacciones activas
+import.preview.invalidCsvOptions=Opciones CSV no compatibles
+import.preview.invalidEncoding=Codificación CSV no compatible: {0}
+import.preview.invalidEncodingLine=El CSV no es {0} válido cerca de la línea {1}
+import.preview.malformedCsv=No se puede analizar la línea {0} del CSV. Compruebe que la codificación, el delimitador, el calificador de texto y la configuración de escape de arriba coincidan con el archivo.
+import.preview.unclosedQuote=El CSV tiene una comilla sin cerrar desde la línea {0}
+import.csv.invalidValue=No se puede convertir el valor "{2}" de la fila {0}, columna "{1}" del CSV. Revise la configuración de fecha, hora y formato decimal.
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_es_ES.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_es_ES.properties
index 78e9b5df84..a85c304e29 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_es_ES.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_es_ES.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=Ver registro de cambios
 
 fileChooser.select.dir.title=Seleccione un directorio
 fileChooser.select.file.title=Seleccione una ubicación para guardar
+mysql.activeTransaction.processPrivilegeRequired=Se requiere el privilegio PROCESS para inspeccionar transacciones InnoDB activas
+activeTransaction.inspection.unsupported=La fuente de datos actual no admite la inspección de transacciones activas
+import.preview.invalidCsvOptions=Opciones CSV no compatibles
+import.preview.invalidEncoding=Codificación CSV no compatible: {0}
+import.preview.invalidEncodingLine=El CSV no es {0} válido cerca de la línea {1}
+import.preview.malformedCsv=No se puede analizar la línea {0} del CSV. Compruebe que la codificación, el delimitador, el calificador de texto y la configuración de escape de arriba coincidan con el archivo.
+import.preview.unclosedQuote=El CSV tiene una comilla sin cerrar desde la línea {0}
+import.csv.invalidValue=No se puede convertir el valor "{2}" de la fila {0}, columna "{1}" del CSV. Revise la configuración de fecha, hora y formato decimal.
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ja.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ja.properties
index 438ba8b068..2eb0ed3aa7 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ja.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ja.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=変更履歴を表示
 
 fileChooser.select.dir.title=ディレクトリを選択してください
 fileChooser.select.file.title=保存先を選択してください
+mysql.activeTransaction.processPrivilegeRequired=アクティブな InnoDB トランザクションの確認には PROCESS 権限が必要です
+activeTransaction.inspection.unsupported=現在のデータソースはアクティブトランザクションの確認に対応していません
+import.preview.invalidCsvOptions=サポートされていない CSV オプションです
+import.preview.invalidEncoding=サポートされていない CSV エンコーディングです: {0}
+import.preview.invalidEncodingLine=CSV は {1} 行目付近で有効な {0} ではありません
+import.preview.malformedCsv=CSV の {0} 行目を解析できません。上の文字コード、区切り文字、テキスト修飾子、エスケープ設定がファイルと一致しているか確認してください。
+import.preview.unclosedQuote=CSV の {0} 行目から始まる引用符が閉じられていません
+import.csv.invalidValue=CSV の {0} 行目、列「{1}」の値「{2}」を変換できません。日付、時刻、小数形式の設定を確認してください。
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ja_JP.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ja_JP.properties
index 438ba8b068..2eb0ed3aa7 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ja_JP.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ja_JP.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=変更履歴を表示
 
 fileChooser.select.dir.title=ディレクトリを選択してください
 fileChooser.select.file.title=保存先を選択してください
+mysql.activeTransaction.processPrivilegeRequired=アクティブな InnoDB トランザクションの確認には PROCESS 権限が必要です
+activeTransaction.inspection.unsupported=現在のデータソースはアクティブトランザクションの確認に対応していません
+import.preview.invalidCsvOptions=サポートされていない CSV オプションです
+import.preview.invalidEncoding=サポートされていない CSV エンコーディングです: {0}
+import.preview.invalidEncodingLine=CSV は {1} 行目付近で有効な {0} ではありません
+import.preview.malformedCsv=CSV の {0} 行目を解析できません。上の文字コード、区切り文字、テキスト修飾子、エスケープ設定がファイルと一致しているか確認してください。
+import.preview.unclosedQuote=CSV の {0} 行目から始まる引用符が閉じられていません
+import.csv.invalidValue=CSV の {0} 行目、列「{1}」の値「{2}」を変換できません。日付、時刻、小数形式の設定を確認してください。
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ko.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ko.properties
index 649b421d70..0f9341b0ff 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ko.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ko.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=변경 로그 보기
 
 fileChooser.select.dir.title=디렉터리를 선택해 주세요
 fileChooser.select.file.title=저장 위치를 선택해 주세요
+mysql.activeTransaction.processPrivilegeRequired=활성 InnoDB 트랜잭션을 확인하려면 PROCESS 권한이 필요합니다
+activeTransaction.inspection.unsupported=현재 데이터 소스는 활성 트랜잭션 검사를 지원하지 않습니다
+import.preview.invalidCsvOptions=지원되지 않는 CSV 옵션입니다
+import.preview.invalidEncoding=지원되지 않는 CSV 인코딩입니다: {0}
+import.preview.invalidEncodingLine=CSV가 {1}행 부근에서 유효한 {0} 형식이 아닙니다
+import.preview.malformedCsv=CSV {0}행을 해석할 수 없습니다. 위의 인코딩, 구분자, 텍스트 한정자 및 이스케이프 설정이 파일과 일치하는지 확인하세요.
+import.preview.unclosedQuote=CSV의 {0}행에서 시작한 따옴표가 닫히지 않았습니다
+import.csv.invalidValue=CSV {0}행, "{1}" 열의 값 "{2}"을 변환할 수 없습니다. 날짜, 시간 및 소수점 형식 설정을 확인하세요.
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ko_KR.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ko_KR.properties
index 649b421d70..0f9341b0ff 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ko_KR.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_ko_KR.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=변경 로그 보기
 
 fileChooser.select.dir.title=디렉터리를 선택해 주세요
 fileChooser.select.file.title=저장 위치를 선택해 주세요
+mysql.activeTransaction.processPrivilegeRequired=활성 InnoDB 트랜잭션을 확인하려면 PROCESS 권한이 필요합니다
+activeTransaction.inspection.unsupported=현재 데이터 소스는 활성 트랜잭션 검사를 지원하지 않습니다
+import.preview.invalidCsvOptions=지원되지 않는 CSV 옵션입니다
+import.preview.invalidEncoding=지원되지 않는 CSV 인코딩입니다: {0}
+import.preview.invalidEncodingLine=CSV가 {1}행 부근에서 유효한 {0} 형식이 아닙니다
+import.preview.malformedCsv=CSV {0}행을 해석할 수 없습니다. 위의 인코딩, 구분자, 텍스트 한정자 및 이스케이프 설정이 파일과 일치하는지 확인하세요.
+import.preview.unclosedQuote=CSV의 {0}행에서 시작한 따옴표가 닫히지 않았습니다
+import.csv.invalidValue=CSV {0}행, "{1}" 열의 값 "{2}"을 변환할 수 없습니다. 날짜, 시간 및 소수점 형식 설정을 확인하세요.
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh.properties
index b83391d90a..f4a1e37295 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=查看更改日志
 
 fileChooser.select.dir.title=请选择一个目录
 fileChooser.select.file.title=请选择保存位置
+mysql.activeTransaction.processPrivilegeRequired=查看活动 InnoDB 事务需要 PROCESS 权限
+activeTransaction.inspection.unsupported=当前数据源不支持活动事务检查
+import.preview.invalidCsvOptions=不支持的 CSV 选项
+import.preview.invalidEncoding=不支持的 CSV 编码：{0}
+import.preview.invalidEncodingLine=CSV 在第 {1} 行附近不是有效的 {0} 编码
+import.preview.malformedCsv=CSV 第 {0} 行无法解析，请检查上方的编码、分隔符、文本限定符和转义方式是否与文件一致。
+import.preview.unclosedQuote=CSV 存在从第 {0} 行开始未闭合的引号
+import.csv.invalidValue=CSV 第 {0} 行的列“{1}”无法转换值“{2}”，请检查日期、时间和小数格式设置。
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_CN.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_CN.properties
index b83391d90a..f4a1e37295 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_CN.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_CN.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=查看更改日志
 
 fileChooser.select.dir.title=请选择一个目录
 fileChooser.select.file.title=请选择保存位置
+mysql.activeTransaction.processPrivilegeRequired=查看活动 InnoDB 事务需要 PROCESS 权限
+activeTransaction.inspection.unsupported=当前数据源不支持活动事务检查
+import.preview.invalidCsvOptions=不支持的 CSV 选项
+import.preview.invalidEncoding=不支持的 CSV 编码：{0}
+import.preview.invalidEncodingLine=CSV 在第 {1} 行附近不是有效的 {0} 编码
+import.preview.malformedCsv=CSV 第 {0} 行无法解析，请检查上方的编码、分隔符、文本限定符和转义方式是否与文件一致。
+import.preview.unclosedQuote=CSV 存在从第 {0} 行开始未闭合的引号
+import.csv.invalidValue=CSV 第 {0} 行的列“{1}”无法转换值“{2}”，请检查日期、时间和小数格式设置。
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_Hans.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_Hans.properties
index b83391d90a..f4a1e37295 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_Hans.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_Hans.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=查看更改日志
 
 fileChooser.select.dir.title=请选择一个目录
 fileChooser.select.file.title=请选择保存位置
+mysql.activeTransaction.processPrivilegeRequired=查看活动 InnoDB 事务需要 PROCESS 权限
+activeTransaction.inspection.unsupported=当前数据源不支持活动事务检查
+import.preview.invalidCsvOptions=不支持的 CSV 选项
+import.preview.invalidEncoding=不支持的 CSV 编码：{0}
+import.preview.invalidEncodingLine=CSV 在第 {1} 行附近不是有效的 {0} 编码
+import.preview.malformedCsv=CSV 第 {0} 行无法解析，请检查上方的编码、分隔符、文本限定符和转义方式是否与文件一致。
+import.preview.unclosedQuote=CSV 存在从第 {0} 行开始未闭合的引号
+import.csv.invalidValue=CSV 第 {0} 行的列“{1}”无法转换值“{2}”，请检查日期、时间和小数格式设置。
diff --git a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_Hans_CN.properties b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_Hans_CN.properties
index b83391d90a..f4a1e37295 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_Hans_CN.properties
+++ b/chat2db-community-server/chat2db-community-jcef/src/main/resources/i18n/messages_zh_Hans_CN.properties
@@ -17,3 +17,11 @@ menu.help.viewChangelog=查看更改日志
 
 fileChooser.select.dir.title=请选择一个目录
 fileChooser.select.file.title=请选择保存位置
+mysql.activeTransaction.processPrivilegeRequired=查看活动 InnoDB 事务需要 PROCESS 权限
+activeTransaction.inspection.unsupported=当前数据源不支持活动事务检查
+import.preview.invalidCsvOptions=不支持的 CSV 选项
+import.preview.invalidEncoding=不支持的 CSV 编码：{0}
+import.preview.invalidEncodingLine=CSV 在第 {1} 行附近不是有效的 {0} 编码
+import.preview.malformedCsv=CSV 第 {0} 行无法解析，请检查上方的编码、分隔符、文本限定符和转义方式是否与文件一致。
+import.preview.unclosedQuote=CSV 存在从第 {0} 行开始未闭合的引号
+import.csv.invalidValue=CSV 第 {0} 行的列“{1}”无法转换值“{2}”，请检查日期、时间和小数格式设置。
diff --git a/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/frame/MainJFrameTest.java b/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/frame/MainJFrameTest.java
new file mode 100644
index 0000000000..a5d8dad9e3
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/frame/MainJFrameTest.java
@@ -0,0 +1,46 @@
+package ai.chat2db.community.jcef.frame;
+
+import org.cef.browser.CefBrowser;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Proxy;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MainJFrameTest {
+
+    @Test
+    void shouldCreateBrowserImmediatelyForHiddenStartup() {
+        AtomicInteger immediateCreationCount = new AtomicInteger();
+        CefBrowser browser = recordingBrowser(immediateCreationCount);
+
+        MainJFrame.createBrowserImmediatelyForHiddenStartup(browser, false);
+
+        assertEquals(1, immediateCreationCount.get());
+    }
+
+    @Test
+    void shouldKeepLazyBrowserCreationForVisibleStartup() {
+        AtomicInteger immediateCreationCount = new AtomicInteger();
+        CefBrowser browser = recordingBrowser(immediateCreationCount);
+
+        MainJFrame.createBrowserImmediatelyForHiddenStartup(browser, true);
+
+        assertEquals(0, immediateCreationCount.get());
+    }
+
+    private static CefBrowser recordingBrowser(AtomicInteger immediateCreationCount) {
+        return (CefBrowser) Proxy.newProxyInstance(
+                CefBrowser.class.getClassLoader(),
+                new Class<?>[]{CefBrowser.class},
+                (proxy, method, args) -> {
+                    if ("createImmediately".equals(method.getName())) {
+                        immediateCreationCount.incrementAndGet();
+                        return null;
+                    }
+                    throw new UnsupportedOperationException(method.getName());
+                }
+        );
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/terminal/TerminalSessionManagerTest.java b/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/terminal/TerminalSessionManagerTest.java
index d8e7f3d371..35e34258b1 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/terminal/TerminalSessionManagerTest.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/terminal/TerminalSessionManagerTest.java
@@ -3,19 +3,25 @@
 import ai.chat2db.community.jcef.enums.ActionTypeEnum;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class TerminalSessionManagerTest {
@@ -23,7 +29,7 @@ class TerminalSessionManagerTest {
     Path directory;
 
     @AfterEach
-    void resetPublisher() {
+    void resetAfterEach() {
         TerminalSessionManager.resetEventPublisherForTests();
     }
 
@@ -45,10 +51,8 @@ void createsResizableInteractiveSessionInRequestedDirectory() throws Exception {
     }
 
     @Test
+    @DisabledOnOs(OS.WINDOWS)
     void reportsRunningChildProcessAsBusy() throws Exception {
-        if (System.getProperty("os.name", "").toLowerCase(Locale.ROOT).contains("win")) {
-            return;
-        }
         Map<String, Object> session = TerminalSessionManager.create(directory, 80, 24);
         String sessionId = (String) session.get("sessionId");
         try {
@@ -88,6 +92,19 @@ void resolvesConfiguredUserHomeForDefaultTerminalDirectory() {
         assertEquals(directory, TerminalSessionManager.resolveUserHomeDirectory(directory.toString()));
     }
 
+    @Test
+    void resolvesDefaultShellCandidatesForCurrentOs() {
+        assertFalse(TerminalSessionManager.resolveShellCandidates("system").isEmpty());
+        assertFalse(TerminalSessionManager.resolveShellCandidates(null).isEmpty());
+        assertFalse(TerminalSessionManager.resolveShellCandidates("").isEmpty());
+    }
+
+    @Test
+    void rejectsUnknownShellCandidates() {
+        assertThrows(IllegalArgumentException.class,
+                () -> TerminalSessionManager.resolveShellCandidates("not-a-shell"));
+    }
+
     @Test
     void exposesSystemDefaultAndInstalledShells() {
         Map<String, Object> capabilities = TerminalSessionManager.capabilities();
@@ -122,10 +139,8 @@ void enablesCompatibleColorHints() {
     }
 
     @Test
+    @DisabledOnOs(OS.WINDOWS)
     void batchesLargeOutputAndWaitsForAcknowledgement() throws Exception {
-        if (System.getProperty("os.name", "").toLowerCase(Locale.ROOT).contains("win")) {
-            return;
-        }
         List<String> batches = new CopyOnWriteArrayList<>();
         List<Long> sequences = new CopyOnWriteArrayList<>();
         TerminalSessionManager.setEventPublisherForTests((sessionId, actionType, message) -> {
@@ -161,4 +176,154 @@ void batchesLargeOutputAndWaitsForAcknowledgement() throws Exception {
             TerminalSessionManager.kill(sessionId);
         }
     }
+
+    @Test
+    void windowsSystemShellsFallBackPwshThenPowerShellThenCmd() {
+        List<TerminalSessionManager.ShellCommand> candidates =
+                TerminalSessionManager.resolveSystemShellCandidates("windows 11", (os, names) -> {
+                    for (String name : names) {
+                        if (name.contains("pwsh")) {
+                            return "C:/pwsh.exe";
+                        }
+                        if (name.contains("powershell")) {
+                            return "C:/powershell.exe";
+                        }
+                        if (name.equals("cmd.exe")) {
+                            return "C:/Windows/System32/cmd.exe";
+                        }
+                    }
+                    return null;
+                });
+        assertEquals(
+                List.of("PowerShell 7", "Windows PowerShell", "Command Prompt"),
+                candidates.stream().map(TerminalSessionManager.ShellCommand::displayName)
+                        .collect(java.util.stream.Collectors.toList()));
+        assertTrue(candidates.stream().allMatch(candidate -> "system".equals(candidate.id())));
+        assertEquals(TerminalSessionManager.ShellFamily.CMD,
+                candidates.get(candidates.size() - 1).family());
+    }
+
+    @Test
+    void windowsSystemShellsKeepCmdWhenPowershellIsUnavailable() {
+        List<TerminalSessionManager.ShellCommand> candidates =
+                TerminalSessionManager.resolveSystemShellCandidates("windows 11", (os, names) -> null);
+
+        assertEquals(1, candidates.size());
+        assertEquals("system", candidates.get(0).id());
+        assertEquals("Command Prompt", candidates.get(0).displayName());
+        assertEquals(TerminalSessionManager.ShellFamily.CMD, candidates.get(0).family());
+    }
+
+    @Test
+    @EnabledOnOs(OS.WINDOWS)
+    void windowsSystemShellFallsBackToCmdWhenPowershellSpawnBlocked() throws Exception {
+        AtomicInteger attempts = new AtomicInteger();
+        TerminalSessionManager.ShellCommand blocked = new TerminalSessionManager.ShellCommand(
+                "system",
+                List.of("powershell.exe"),
+                "Windows PowerShell",
+                TerminalSessionManager.ShellFamily.POWERSHELL
+        );
+        TerminalSessionManager.ShellCommand fallback = new TerminalSessionManager.ShellCommand(
+                "system",
+                List.of(System.getenv().getOrDefault("ComSpec", "cmd.exe")),
+                "Command Prompt",
+                TerminalSessionManager.ShellFamily.CMD
+        );
+        Map<String, Object> session = TerminalSessionManager.create(
+                directory,
+                80,
+                24,
+                List.of(blocked, fallback),
+                (command, dir, env, columns, rows) -> {
+                    attempts.incrementAndGet();
+                    if (!command[0].toLowerCase(Locale.ROOT).contains("cmd")) {
+                        throw new IOException("blocked");
+                    }
+                    return TerminalSessionManager.defaultProcessFactory(command, dir, env, columns, rows);
+                }
+        );
+        String sessionId = (String) session.get("sessionId");
+        try {
+            assertNotNull(sessionId);
+            assertEquals(2, attempts.get());
+            assertEquals("Command Prompt", session.get("shell"));
+            assertEquals("system", session.get("shellId"));
+            assertTrue((Boolean) TerminalSessionManager.status(sessionId).get("alive"));
+        } finally {
+            TerminalSessionManager.kill(sessionId);
+        }
+    }
+
+    @Test
+    void fallsBackToNextShellWhenSpawnFails() throws Exception {
+        AtomicInteger attempts = new AtomicInteger();
+        TerminalSessionManager.ShellCommand blocked = new TerminalSessionManager.ShellCommand(
+                "blocked", List.of("powershell.exe"), "Windows PowerShell", TerminalSessionManager.ShellFamily.POWERSHELL);
+        TerminalSessionManager.ShellCommand fallback =
+                TerminalSessionManager.resolveShellCandidates("system").get(0);
+        Map<String, Object> session = TerminalSessionManager.create(
+                directory,
+                80,
+                24,
+                List.of(blocked, fallback),
+                (command, dir, env, columns, rows) -> {
+                    if (attempts.getAndIncrement() == 0) {
+                        throw new IOException("powershell blocked by security software");
+                    }
+                    return TerminalSessionManager.defaultProcessFactory(command, dir, env, columns, rows);
+                }
+        );
+        String sessionId = (String) session.get("sessionId");
+        try {
+            assertNotNull(sessionId);
+            assertEquals("system", session.get("shellId"));
+            assertEquals(2, attempts.get());
+            assertTrue((Boolean) TerminalSessionManager.status(sessionId).get("alive"));
+        } finally {
+            TerminalSessionManager.kill(sessionId);
+        }
+    }
+
+    @Test
+    void throwsWhenNoCandidateCanStart() {
+        AtomicInteger attempts = new AtomicInteger();
+        TerminalSessionManager.ShellCommand blocked = new TerminalSessionManager.ShellCommand(
+                "blocked", List.of("powershell.exe"), "Windows PowerShell", TerminalSessionManager.ShellFamily.POWERSHELL);
+        TerminalSessionManager.ShellCommand cmd = new TerminalSessionManager.ShellCommand(
+                "cmd", List.of("cmd.exe"), "Command Prompt", TerminalSessionManager.ShellFamily.CMD);
+        IOException exception = assertThrows(IOException.class,
+                () -> TerminalSessionManager.create(
+                        directory,
+                        80,
+                        24,
+                        List.of(blocked, cmd),
+                        (command, dir, env, columns, rows) -> {
+                            attempts.incrementAndGet();
+                            throw new IOException("blocked");
+                        }
+                ));
+        assertEquals("blocked", exception.getMessage());
+        assertEquals(2, attempts.get());
+    }
+
+    @Test
+    void doesNotRetryShellsWhenWorkingDirectoryIsUnavailable() {
+        AtomicInteger attempts = new AtomicInteger();
+        TerminalSessionManager.ShellCommand shell = new TerminalSessionManager.ShellCommand(
+                "shell", List.of("shell"), "Shell", TerminalSessionManager.ShellFamily.OTHER);
+
+        assertThrows(IOException.class,
+                () -> TerminalSessionManager.create(
+                        directory.resolve("missing"),
+                        80,
+                        24,
+                        List.of(shell, shell),
+                        (command, dir, env, columns, rows) -> {
+                            attempts.incrementAndGet();
+                            throw new IOException("should not start");
+                        }
+                ));
+        assertEquals(0, attempts.get());
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/utils/LocalTextFileCodecTest.java b/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/utils/LocalTextFileCodecTest.java
index 0992f4dc19..97ccbdc0a1 100644
--- a/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/utils/LocalTextFileCodecTest.java
+++ b/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/utils/LocalTextFileCodecTest.java
@@ -3,11 +3,17 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -116,6 +122,46 @@ void shouldDetectExistingEncodingForLegacyUpdateRequests() throws Exception {
         assertArrayEquals(updated.getBytes(GB18030), Files.readAllBytes(file));
     }
 
+    @Test
+    void shouldWaitForAnExistingFileOperationBeforeUpdating() throws Exception {
+        Path file = tempDir.resolve("serialized.sql");
+        Files.writeString(file, "first", StandardCharsets.UTF_8);
+        CountDownLatch operationStarted = new CountDownLatch(1);
+        CountDownLatch releaseOperation = new CountDownLatch(1);
+        CountDownLatch updateStarted = new CountDownLatch(1);
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        try {
+            Future<?> operation = executor.submit(() -> OSOperateUtil.withLocalFileOperationLock(file, ignored -> {
+                operationStarted.countDown();
+                try {
+                    if (!releaseOperation.await(5, TimeUnit.SECONDS)) {
+                        throw new IOException("Timed out waiting to release the file operation");
+                    }
+                } catch (InterruptedException exception) {
+                    Thread.currentThread().interrupt();
+                    throw new IOException("Interrupted while holding the file operation", exception);
+                }
+                return null;
+            }));
+            assertTrue(operationStarted.await(5, TimeUnit.SECONDS));
+
+            Future<?> update = executor.submit(() -> {
+                updateStarted.countDown();
+                return OSOperateUtil.updateFileContent(file.toString(), "second", StandardCharsets.UTF_8, false);
+            });
+            assertTrue(updateStarted.await(5, TimeUnit.SECONDS));
+            assertFalse(update.isDone());
+
+            releaseOperation.countDown();
+            operation.get(5, TimeUnit.SECONDS);
+            update.get(5, TimeUnit.SECONDS);
+            assertEquals("second", Files.readString(file, StandardCharsets.UTF_8));
+        } finally {
+            releaseOperation.countDown();
+            executor.shutdownNow();
+        }
+    }
+
     private void assertDetected(
             String fileName,
             byte[] bytes,
diff --git a/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/utils/SingleInstanceUtilTest.java b/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/utils/SingleInstanceUtilTest.java
new file mode 100644
index 0000000000..f6c2d4abaa
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-jcef/src/test/java/ai/chat2db/community/jcef/utils/SingleInstanceUtilTest.java
@@ -0,0 +1,1005 @@
+package ai.chat2db.community.jcef.utils;
+
+import ai.chat2db.community.jcef.context.JcefContext;
+import ai.chat2db.community.jcef.frame.MainJFrame;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.cef.browser.CefBrowser;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.DataOutputStream;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URI;
+import java.lang.reflect.Field;
+import java.lang.reflect.Proxy;
+import java.nio.charset.StandardCharsets;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileTime;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
+import javax.swing.SwingUtilities;
+
+import static java.nio.file.StandardOpenOption.APPEND;
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.WRITE;
+import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static org.junit.jupiter.api.Assertions.*;
+
+class SingleInstanceUtilTest {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+    @TempDir Path temporary;
+    private final List<Child> children = new ArrayList<>();
+
+    @AfterEach
+    void stopChildren() throws Exception {
+        for (Child child : children) {
+            if (child.process.isAlive()) {
+                try {
+                    child.command("STOP");
+                } catch (IOException ignored) {
+                    child.process.destroy();
+                }
+            }
+        }
+        for (Child child : children) {
+            if (!child.process.waitFor(10, TimeUnit.SECONDS)) {
+                child.process.destroyForcibly();
+            }
+            assertTrue(child.process.waitFor(10, TimeUnit.SECONDS), "Test process did not exit");
+            child.outputReader.join(10000);
+            assertFalse(child.outputReader.isAlive(), "Process output reader did not finish");
+            assertNull(child.outputFailure, "Process output collection failed");
+            child.process.getOutputStream().close();
+            child.process.getInputStream().close();
+            child.process.getErrorStream().close();
+        }
+    }
+
+    @Test
+    void secondaryNeverStartsServicesWithMcpEnabledOrDisabled() throws Exception {
+        for (boolean mcp : List.of(false, true)) {
+            Path state = temporary.resolve("state-" + mcp);
+            Child primary = start(state, mcp ? 0 : -1);
+            primary.awaitPrimary();
+            Child secondary = start(state, primary.port());
+            secondary.awaitSecondary();
+            assertFalse(Files.exists(secondary.directory.resolve("initialized")));
+            assertTrue(primary.process.isAlive());
+        }
+    }
+
+    @Test
+    void simultaneousLaunchesInitializeOnlyOneProcess() throws Exception {
+        Path state = temporary.resolve("state");
+        Child first = start(state, -1);
+        Child second = start(state, -1);
+        await(() -> Files.exists(first.status()) && Files.exists(second.status()));
+        List<String> statuses = List.of(Files.readString(first.status()), Files.readString(second.status()));
+        assertEquals(1, statuses.stream().filter("PRIMARY"::equals).count());
+        assertEquals(1, statuses.stream().filter("SECONDARY"::equals).count());
+    }
+
+    @Test
+    void receivedLaunchRequestsWaitForWindowReadiness() throws Exception {
+        Path state = temporary.resolve("state");
+        Path firstFile = Files.writeString(temporary.resolve("first file.sql"), "select 1");
+        Path secondFile = Files.writeString(temporary.resolve("second file.sql"), "select 2");
+        Child primary = start(state, -1, firstFile.toString());
+        primary.awaitPrimary();
+        start(state, -1, secondFile.toString()).awaitSecondary();
+        assertFalse(Files.exists(primary.received()));
+
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 2);
+        List<String> received = readRequests(primary.received());
+        assertEquals(firstFile.toString(), received.get(0));
+        assertEquals(secondFile.toString(), received.get(1));
+    }
+
+    @Test
+    void subsequentFileAndProtocolRequestsKeepWorking() throws Exception {
+        Path state = temporary.resolve("state");
+        Path sql = Files.writeString(temporary.resolve("query.sql"), "select 1");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        List<String> arguments = List.of(sql.toString(), "chat2db-community://open?console=test", sql.toString());
+        for (int index = 0; index < arguments.size(); index++) {
+            start(state, -1, arguments.get(index)).awaitSecondary();
+            int expected = index + 2;
+            await(() -> lineCount(primary.received()) == expected);
+            assertEquals(arguments.get(index), readRequests(primary.received()).get(index + 1));
+        }
+    }
+
+    @Test
+    void repeatedRegistrationDoesNotReplayArguments() throws Exception {
+        Path state = temporary.resolve("state");
+        Path sql = Files.writeString(temporary.resolve("initial.sql"), "select 1");
+        Child primary = start(state, -1, sql.toString());
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        primary.command("REGISTER_AGAIN");
+        await(() -> Files.exists(primary.directory.resolve("registered-again")));
+        assertEquals("true", Files.readString(primary.directory.resolve("registered-again")));
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 2);
+        assertEquals(sql.toString(), readRequests(primary.received()).get(0));
+        assertEquals("", readRequests(primary.received()).get(1));
+    }
+
+    @Test
+    void doubleClickWithoutArgumentsStillRequestsActivation() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 2);
+        assertTrue(readRequests(primary.received()).stream().allMatch(String::isEmpty));
+    }
+
+    @Test
+    void sameTimestampReplacementsDeliverChangedAndRepeatedArgumentsOnce() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        FileTime timestamp = FileTime.fromMillis(System.currentTimeMillis() - 10000);
+        List<String> arguments = List.of("first.sql", "second.sql", "second.sql", "", "");
+        for (int index = 0; index < arguments.size(); index++) {
+            Path replacement = Files.createTempFile(state, "ipc-", ".tmp");
+            Files.writeString(replacement, arguments.get(index));
+            Files.setLastModifiedTime(replacement, timestamp);
+            Files.move(replacement, state.resolve("app.ipc"), ATOMIC_MOVE, REPLACE_EXISTING);
+            int expectedCount = index + 2;
+            await(() -> lineCount(primary.received()) == expectedCount);
+            assertEquals(arguments.get(index), readRequests(primary.received()).get(index + 1));
+            Thread.sleep(250);
+            assertEquals(expectedCount, lineCount(primary.received()), "Late file events repeated a request");
+        }
+    }
+
+    @Test
+    void inPlaceWriteWithTheSameTimestampIsDetectedFromFileEvents() throws Exception {
+        Path state = temporary.resolve("state");
+        Path ipc = state.resolve("app.ipc");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        primary.command("PAUSE_NEXT_DELIVERY");
+        await(() -> Files.exists(primary.directory.resolve("pause-enabled")));
+        publish(ipc, "first.sql");
+        await(() -> Files.exists(primary.directory.resolve("delivery-paused")));
+        FileTime timestamp = Files.getLastModifiedTime(ipc);
+        try {
+            Files.writeString(ipc, "other.sql");
+            Files.setLastModifiedTime(ipc, timestamp);
+        } finally {
+            primary.command("RESUME_DELIVERY");
+        }
+        await(() -> lineCount(primary.received()) == 3);
+        assertEquals("other.sql", readRequests(primary.received()).get(2));
+        Thread.sleep(300);
+        assertEquals(3, lineCount(primary.received()));
+    }
+
+    @Test
+    void lockRemainsHeldUntilShutdownHooksAndServicesFinish() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, 0);
+        primary.awaitPrimary();
+        int port = primary.port();
+        primary.command("EXIT");
+        await(() -> Files.exists(primary.directory.resolve("stopping")));
+        Child restarted = start(state, port);
+        await(() -> restarted.output().contains("Waiting for the previous desktop instance to exit"));
+        assertFalse(Files.exists(restarted.status()), "New instance initialized before the old process exited");
+        Files.createFile(primary.directory.resolve("allow-exit"));
+        assertTrue(primary.process.waitFor(10, TimeUnit.SECONDS));
+        assertTrue(Files.exists(state.resolve("app.lock")));
+
+        restarted.awaitPrimary();
+        assertEquals(port, restarted.port());
+    }
+
+    @Test
+    void concurrentRequestsAreConfirmedBeforeWindowReadinessWithoutOverwriting() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        List<String> expected = new ArrayList<>();
+        List<Child> senders = new ArrayList<>();
+        for (int index = 0; index < 12; index++) {
+            Path file = Files.writeString(temporary.resolve("file-" + index + ".sql"), "select " + index);
+            expected.add(file.toString());
+            senders.add(start(state, -1, file.toString()));
+        }
+        for (Child sender : senders) { sender.awaitSecondary(); }
+        assertFalse(Files.exists(primary.received()));
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 13);
+        assertEquals(expected.stream().sorted().toList(),
+                readRequests(primary.received()).subList(1, 13).stream().sorted().toList());
+        assertFalse(Files.exists(state.resolve("app.ipc")), "Current senders still used the shared mailbox");
+    }
+
+    @Test
+    void blockedWindowDispatchDoesNotBlockReceiptOrLoseRepeatedRequests() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        primary.command("PAUSE_NEXT_DELIVERY");
+        await(() -> Files.exists(primary.directory.resolve("pause-enabled")));
+        start(state, -1).awaitSecondary();
+        await(() -> Files.exists(primary.directory.resolve("delivery-paused")));
+        String file = Files.writeString(temporary.resolve("repeated.sql"), "select 1").toString();
+        List<String> expected = List.of(file, "", "chat2db-community://open?console=test", file, "", file);
+        try {
+            List<Child> senders = new ArrayList<>();
+            for (String argument : expected) {
+                senders.add(argument.isEmpty() ? start(state, -1) : start(state, -1, argument));
+            }
+            for (Child sender : senders) { sender.awaitSecondary(); }
+            assertEquals(2, lineCount(primary.received()));
+        } finally {
+            primary.command("RESUME_DELIVERY");
+        }
+        await(() -> lineCount(primary.received()) == expected.size() + 2);
+        assertEquals(expected.stream().sorted().toList(),
+                readRequests(primary.received()).subList(2, 8).stream().sorted().toList());
+    }
+
+    @Test
+    void receiverRejectsWrongTokensAndSurvivesIncompleteRequests() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        var endpoint = MAPPER.readTree(state.resolve("app.ipc.endpoint").toFile());
+        try (Socket socket = new Socket("127.0.0.1", endpoint.get("port").asInt())) {
+            socket.setSoTimeout(5000);
+            DataOutputStream output = new DataOutputStream(socket.getOutputStream());
+            output.writeUTF("wrong-token");
+            output.flush();
+            assertEquals(-1, socket.getInputStream().read());
+        }
+        try (Socket socket = new Socket("127.0.0.1", endpoint.get("port").asInt())) {
+            socket.setSoTimeout(5000);
+            DataOutputStream output = new DataOutputStream(socket.getOutputStream());
+            output.writeUTF(endpoint.get("token").asText());
+            output.writeInt(10);
+            output.writeByte(1);
+            output.flush();
+            assertEquals(-1, socket.getInputStream().read());
+        }
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 2);
+    }
+
+    @Test
+    void acknowledgedRequestsPreventExitUntilWindowHandoffCompletes() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        String file = temporary.resolve("queued.sql").toString();
+        start(state, -1, file).awaitSecondary();
+        assertExitResult(primary, "TRY_EXIT", "false");
+        assertFalse(Files.exists(primary.directory.resolve("exit-action")));
+        primary.command("READY_FRAME");
+        await(() -> lineCount(primary.received()) == 2);
+        assertEquals(List.of("", file), readRequests(primary.received()));
+        assertExitResult(primary, "TRY_EXIT", "true");
+        assertTrue(Files.exists(primary.directory.resolve("exit-action")));
+    }
+
+    @Test
+    void initialStartupCanBeCancelledBeforeReadinessWithoutReopeningTheWindow() throws Exception {
+        for (String initial : List.of("", temporary.resolve("initial.sql").toString())) {
+            Child primary = initial.isEmpty() ? start(temporary.resolve("empty-state"), -1)
+                    : start(temporary.resolve("file-state"), -1, initial);
+            primary.awaitPrimary();
+            assertExitResult(primary, "TRY_EXIT", "true");
+            primary.command("READY_FRAME");
+            primary.command("EDT_BARRIER");
+            await(() -> Files.exists(primary.directory.resolve("edt-barrier")));
+            Thread.sleep(300);
+            assertFalse(Files.exists(primary.received()), "Cancelled startup reopened its window");
+        }
+    }
+
+    @Test
+    void exitOnEdtCannotDiscardAnAcknowledgedEdtPendingRequestOrDeadlock() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY_FRAME");
+        await(() -> lineCount(primary.received()) == 1);
+        primary.command("BLOCK_EDT");
+        await(() -> Files.exists(primary.directory.resolve("edt-blocked")));
+        String file = temporary.resolve("on-edt.sql").toString();
+        start(state, -1, file).awaitSecondary();
+        assertEquals(1, lineCount(primary.received()));
+        assertExitResult(primary, "RESUME_EDT_AND_EXIT", "false");
+        await(() -> lineCount(primary.received()) == 2);
+        assertEquals(file, readRequests(primary.received()).get(1));
+        assertExitResult(primary, "TRY_EXIT", "true");
+    }
+
+    @Test
+    void realWindowHandlerFailuresRemainPendingAndAreRetriedOnEdt() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY_FRAME");
+        await(() -> lineCount(primary.received()) == 1);
+        primary.command("FAIL_FRAME");
+        await(() -> Files.exists(primary.directory.resolve("frame-failing")));
+        String file = temporary.resolve("retry.sql").toString();
+        start(state, -1, file).awaitSecondary();
+        await(() -> primary.output().contains("Cannot dispatch desktop launch request"));
+        assertExitResult(primary, "TRY_EXIT", "false");
+        primary.command("RECOVER_FRAME");
+        await(() -> lineCount(primary.received()) == 2);
+        assertEquals(List.of("", file), readRequests(primary.received()));
+    }
+
+    @Test
+    void unsupportedAndMalformedProtocolArgumentsDoNotBlockLaterLaunchesOrExit() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY_FRAME");
+        await(() -> lineCount(primary.received()) == 1);
+        for (String argument : List.of("chat2db-community://restart", "chat2db-community://invalid space")) {
+            start(state, -1, argument).awaitSecondary();
+        }
+        String file = temporary.resolve("after-invalid.sql").toString();
+        start(state, -1, file).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 4);
+        assertEquals(List.of("", "", "", file), readRequests(primary.received()));
+        assertTrue(primary.output().contains("Cannot handle desktop launch argument"));
+        assertExitResult(primary, "TRY_EXIT", "true");
+    }
+
+    @Test
+    void aNewLaunchInvalidatesPendingCloseRestartAndUpdateConfirmations() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        int expected = 1;
+        for (String action : List.of("CLOSE", "RESTART", "INSTALL_UPDATE")) {
+            primary.command("REQUEST_" + action);
+            await(() -> Files.exists(primary.directory.resolve("exit-requested")));
+            Files.delete(primary.directory.resolve("exit-requested"));
+            start(state, -1).awaitSecondary();
+            int count = ++expected;
+            await(() -> lineCount(primary.received()) == count);
+            assertExitResult(primary, "CONFIRM_EXIT", "false");
+            assertFalse(Files.exists(primary.directory.resolve("exit-action")));
+        }
+    }
+
+    @Test
+    void cancelledFailedAndRejectedExitsLeaveReceiptAndDispatchAvailable() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        primary.command("REQUEST_CLOSE");
+        await(() -> Files.exists(primary.directory.resolve("exit-requested")));
+        assertExitResult(primary, "CANCEL_EXIT", "true");
+        int expected = 1;
+        for (String command : List.of("REJECT_EXIT", "FAIL_EXIT", "REJECT_EXIT")) {
+            assertExitResult(primary, command, "false");
+            start(state, -1).awaitSecondary();
+            int count = ++expected;
+            await(() -> lineCount(primary.received()) == count);
+        }
+        assertExitResult(primary, "TRY_EXIT", "true");
+        Child next = start(state, -1);
+        await(() -> next.output().contains("Waiting for the previous desktop instance to exit"));
+        assertFalse(Files.exists(next.status()));
+        primary.command("STOP");
+        assertTrue(primary.process.waitFor(10, TimeUnit.SECONDS));
+        next.awaitPrimary();
+    }
+
+    @Test
+    void launchLockAcquisitionUsesTheOperationDeadline() throws Exception {
+        Path state = Files.createDirectories(temporary.resolve("state"));
+        try (FileChannel channel = FileChannel.open(state.resolve("app.launch.lock"), CREATE, WRITE);
+             FileLock ignored = channel.lock()) {
+            Child sender = start(ShortDeadlineProcess.class, state, -1, null);
+            assertTrue(sender.process.waitFor(5, TimeUnit.SECONDS), sender::output);
+            assertNotEquals(0, sender.process.exitValue());
+            assertTrue(sender.output().contains("Timed out waiting for desktop instance"), sender::output);
+            assertFalse(Files.exists(sender.directory.resolve("initialized")));
+        }
+        start(state, -1).awaitPrimary();
+    }
+
+    @Test
+    void legacyRequestDuringAFailedExitIsDeliveredAfterRecovery() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        primary.command("HOLD_FAILED_EXIT");
+        await(() -> Files.exists(primary.directory.resolve("exit-running")));
+        String file = temporary.resolve("legacy-during-exit.sql").toString();
+        publish(state.resolve("app.ipc"), file);
+        Thread.sleep(500);
+        assertEquals(1, lineCount(primary.received()));
+        Files.createFile(primary.directory.resolve("resume-exit"));
+        await(() -> Files.exists(primary.directory.resolve("exit-result")));
+        assertEquals("false", Files.readString(primary.directory.resolve("exit-result")));
+        await(() -> lineCount(primary.received()) == 2);
+        assertEquals(file, readRequests(primary.received()).get(1));
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 3);
+    }
+
+    @Test
+    void readinessArrivingDuringAFailedExitIsRetainedForRecovery() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("HOLD_FAILED_EXIT");
+        await(() -> Files.exists(primary.directory.resolve("exit-running")));
+        primary.command("READY_FRAME");
+        primary.command("EDT_BARRIER");
+        await(() -> Files.exists(primary.directory.resolve("edt-barrier")));
+        assertFalse(Files.exists(primary.received()));
+        Files.createFile(primary.directory.resolve("resume-exit"));
+        await(() -> Files.exists(primary.directory.resolve("exit-result")));
+        assertEquals("false", Files.readString(primary.directory.resolve("exit-result")));
+        await(() -> lineCount(primary.received()) == 1);
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 2);
+    }
+
+    @Test
+    void launchLockWaitHonorsThreadInterruption() throws Exception {
+        Path state = Files.createDirectories(temporary.resolve("state"));
+        try (FileChannel channel = FileChannel.open(state.resolve("app.launch.lock"), CREATE, WRITE);
+             FileLock ignored = channel.lock()) {
+            Child sender = start(ShortDeadlineProcess.class, state, -1, null, "interrupt");
+            assertTrue(sender.process.waitFor(5, TimeUnit.SECONDS), sender::output);
+            assertNotEquals(0, sender.process.exitValue());
+            assertTrue(sender.output().contains("Interrupted while waiting"), sender::output);
+        }
+    }
+
+    @Test
+    void slowPartialAuthenticationAndPayloadCannotStarveAnOverlappingLauncher() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        var endpoint = MAPPER.readTree(state.resolve("app.ipc.endpoint").toFile());
+        int expected = 1;
+        for (boolean authenticated : List.of(false, true)) {
+            try (Socket slow = new Socket("127.0.0.1", endpoint.get("port").asInt())) {
+                DataOutputStream output = new DataOutputStream(slow.getOutputStream());
+                if (authenticated) {
+                    output.writeUTF(endpoint.get("token").asText());
+                    output.writeInt(64);
+                } else {
+                    output.writeShort(64);
+                }
+                output.writeByte(1);
+                output.flush();
+                Thread drip = new Thread(() -> {
+                    try {
+                        for (int index = 0; index < 30; index++) {
+                            Thread.sleep(300);
+                            output.writeByte(1);
+                            output.flush();
+                        }
+                    } catch (IOException ignored) {
+                    } catch (InterruptedException exception) {
+                        Thread.currentThread().interrupt();
+                    }
+                });
+                drip.start();
+                try {
+                    Child healthy = start(state, -1);
+                    healthy.awaitSecondary();
+                    int count = ++expected;
+                    await(() -> lineCount(primary.received()) == count);
+                    slow.setSoTimeout(1000);
+                    assertEquals(-1, slow.getInputStream().read());
+                } finally {
+                    drip.interrupt();
+                    drip.join(2000);
+                    assertFalse(drip.isAlive());
+                }
+            }
+        }
+    }
+
+    private void assertExitResult(Child primary, String command, String expected) throws Exception {
+        Path result = primary.directory.resolve("exit-result");
+        Files.deleteIfExists(result);
+        primary.command(command);
+        await(() -> Files.exists(result));
+        assertEquals(expected, Files.readString(result), primary::output);
+    }
+
+    @Test
+    void aFailedDeliveryIsRetriedWithoutStoppingOtherRequests() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        primary.command("FAIL_NEXT_DELIVERY");
+        await(() -> Files.exists(primary.directory.resolve("failure-enabled")));
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 2);
+        assertTrue(primary.output().contains("Cannot dispatch desktop launch request"));
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 3);
+    }
+
+    @Test
+    void operatingSystemReleasesLockAfterCrash() throws Exception {
+        Path state = temporary.resolve("state");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("CRASH");
+        assertTrue(primary.process.waitFor(10, TimeUnit.SECONDS));
+        start(state, -1).awaitPrimary();
+    }
+
+    @Test
+    void invalidLockLocationDoesNotStartAnUnprotectedInstance() throws Exception {
+        Path state = Files.writeString(temporary.resolve("not-a-directory"), "test");
+        Child child = start(state, -1);
+        assertTrue(child.process.waitFor(10, TimeUnit.SECONDS));
+        assertNotEquals(0, child.process.exitValue());
+        assertFalse(Files.exists(child.directory.resolve("initialized")));
+    }
+
+    @Test
+    void onlyDesktopGuiRuntimeUsesTheInstanceGate() {
+        assertTrue(SingleInstanceUtil.requiresInstanceLock("DESKTOP", null, "community", false, false));
+        assertTrue(SingleInstanceUtil.requiresInstanceLock("DESKTOP", "true", "extension", false, false));
+        assertFalse(SingleInstanceUtil.requiresInstanceLock("DESKTOP", "false", "community", false, false));
+        assertFalse(SingleInstanceUtil.requiresInstanceLock("DESKTOP", "true", "cli", false, false));
+        assertFalse(SingleInstanceUtil.requiresInstanceLock("DESKTOP", "true", "community", true, false));
+        assertFalse(SingleInstanceUtil.requiresInstanceLock(null, null, "community", false, false));
+        assertFalse(SingleInstanceUtil.requiresInstanceLock("DESKTOP", "true", "community", false, true));
+    }
+
+    @Test
+    void relativeFileNamedLikeAProtocolUsesTheSendersDirectory() throws Exception {
+        Path state = temporary.resolve("state");
+        Path sender = Files.createDirectories(temporary.resolve("sender"));
+        Path sql = Files.writeString(sender.resolve("chat2db-export.sql"), "select 1");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        start(InstanceProcess.class, state, -1, sender, sql.getFileName().toString()).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 2);
+        String argument = readRequests(primary.received()).get(1);
+        assertTrue(Path.of(argument).isAbsolute());
+        assertTrue(Files.isSameFile(sql, Path.of(argument)));
+    }
+
+    @Test
+    void ipcReadFailureDoesNotStopTheListenerOrRepeatRequests() throws Exception {
+        Path state = temporary.resolve("state");
+        Path ipc = state.resolve("app.ipc");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        Files.createDirectory(ipc);
+        try {
+            primary.command("READY");
+            await(() -> primary.output().contains("waiting for recovery"));
+        } finally {
+            Files.delete(ipc);
+        }
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 2);
+        Thread.sleep(300);
+        assertEquals(2, lineCount(primary.received()), "Unchanged IPC content was delivered twice");
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 3);
+    }
+
+    @Test
+    void legacySenderRequestsAreRetainedUntilTheNewWindowIsReady() throws Exception {
+        Path state = temporary.resolve("state");
+        Path sql = Files.writeString(temporary.resolve("legacy.sql"), "select 1");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        Files.writeString(state.resolve("app.ipc"), sql.toString());
+        Thread.sleep(300);
+        assertFalse(Files.exists(primary.received()));
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 2);
+        assertTrue(readRequests(primary.received()).contains(sql.toString()));
+    }
+
+    @Test
+    void newSenderUsesTheLegacyOwnersProtocol() throws Exception {
+        Path state = temporary.resolve("state");
+        Path sql = Files.writeString(temporary.resolve("legacy.sql"), "select 1");
+        Child legacy = start(LegacyInstanceProcess.class, state, -1, null);
+        legacy.awaitPrimary();
+        start(state, -1, sql.toString()).awaitSecondary();
+        await(() -> lineCount(legacy.received()) == 1);
+        assertEquals(sql.toString(), readRequests(legacy.received()).get(0));
+        assertFalse(Files.exists(state.resolve("app.ipc.d")), "New sender queued a request the old owner cannot read");
+    }
+
+    @Test
+    void staleLegacyRequestIsNotReplayedWhenStartingANewInstance() throws Exception {
+        Path state = Files.createDirectories(temporary.resolve("state"));
+        Files.writeString(state.resolve("app.ipc"), "chat2db-community://open?console=old");
+        Child primary = start(state, -1);
+        primary.awaitPrimary();
+        primary.command("READY");
+        await(() -> lineCount(primary.received()) == 1);
+        start(state, -1).awaitSecondary();
+        await(() -> lineCount(primary.received()) == 2);
+        assertTrue(readRequests(primary.received()).stream().allMatch(String::isEmpty));
+    }
+
+    private Child start(Path state, int port, String... arguments) throws Exception {
+        return start(InstanceProcess.class, state, port, null, arguments);
+    }
+
+    private Child start(Class<?> mainClass, Path state, int port, Path workingDirectory, String... arguments) throws Exception {
+        Path directory = Files.createTempDirectory(temporary, "process-");
+        String executable = System.getProperty("os.name").startsWith("Windows") ? "java.exe" : "java";
+        List<String> command = new ArrayList<>(List.of(
+                Path.of(System.getProperty("java.home"), "bin", executable).toString(),
+                "-Duser.home=" + directory,
+                "-DsocksProxyHost=127.0.0.1", "-DsocksProxyPort=1", "-DsocksNonProxyHosts=",
+                "-cp", System.getProperty("surefire.test.class.path", System.getProperty("java.class.path")),
+                mainClass.getName(), state.toString(), directory.toString(), String.valueOf(port)));
+        command.addAll(Arrays.asList(arguments));
+        Path argumentFile = directory.resolve("java.args");
+        Files.write(argumentFile, command.subList(1, command.size()).stream()
+                .map(value -> "\"" + value.replace("\\", "\\\\").replace("\"", "\\\"") + "\"").toList());
+        Process process = new ProcessBuilder(command.get(0), "@" + argumentFile).redirectErrorStream(true)
+                .directory(workingDirectory == null ? directory.toFile() : workingDirectory.toFile()).start();
+        Child child = new Child(process, directory);
+        children.add(child);
+        return child;
+    }
+
+    private static long lineCount(Path path) {
+        try {
+            return Files.readAllLines(path).size();
+        } catch (Exception ignored) {
+            return 0;
+        }
+    }
+
+    private static List<String> readRequests(Path path) throws Exception {
+        List<String> result = new ArrayList<>();
+        for (String line : Files.readAllLines(path)) {
+            result.add(MAPPER.readValue(line, String.class));
+        }
+        return result;
+    }
+
+    private static void await(BooleanSupplier condition) throws Exception {
+        long deadline = System.nanoTime() + Duration.ofSeconds(15).toNanos();
+        while (!condition.getAsBoolean() && System.nanoTime() < deadline) {
+            Thread.sleep(25);
+        }
+        assertTrue(condition.getAsBoolean(), "Timed out waiting for subprocess");
+    }
+
+    private static final class Child {
+        private final Process process;
+        private final Path directory;
+        private final ByteArrayOutputStream output = new ByteArrayOutputStream();
+        private final Thread outputReader;
+        private volatile IOException outputFailure;
+
+        private Child(Process process, Path directory) {
+            this.process = process;
+            this.directory = directory;
+            outputReader = new Thread(() -> {
+                try {
+                    process.getInputStream().transferTo(output);
+                } catch (IOException exception) {
+                    outputFailure = exception;
+                }
+            }, "instance-test-output");
+            outputReader.setDaemon(true);
+            outputReader.start();
+        }
+
+        Path status() { return directory.resolve("status"); }
+        Path received() { return directory.resolve("received.jsonl"); }
+        int port() throws Exception { return Integer.parseInt(Files.readString(directory.resolve("initialized"))); }
+
+        void awaitPrimary() throws Exception {
+            await(() -> Files.exists(status()) || !process.isAlive());
+            assertTrue(Files.exists(status()), () -> "Child failed: " + output());
+            assertEquals("PRIMARY", Files.readString(status()), this::output);
+        }
+
+        void awaitSecondary() throws Exception {
+            assertTrue(process.waitFor(15, TimeUnit.SECONDS), this::output);
+            assertEquals(0, process.exitValue(), this::output);
+            assertEquals("SECONDARY", Files.readString(status()), this::output);
+        }
+
+        void command(String command) throws Exception {
+            process.getOutputStream().write((command + "\n").getBytes(StandardCharsets.UTF_8));
+            process.getOutputStream().flush();
+        }
+
+        String output() {
+            return output.toString(StandardCharsets.UTF_8);
+        }
+    }
+
+    private static void publish(Path path, String value) throws IOException {
+        Path temporary = Files.createTempFile(path.getParent(), "status-", ".tmp");
+        Files.writeString(temporary, value);
+        Files.move(temporary, path, ATOMIC_MOVE, REPLACE_EXISTING);
+    }
+
+    public static final class InstanceProcess {
+        public static void main(String[] args) throws Exception {
+            Path directory = Path.of(args[1]);
+            if (!SingleInstanceUtil.registerInstance(Path.of(args[0]), Arrays.copyOfRange(args, 3, args.length))) {
+                publish(directory.resolve("status"), "SECONDARY");
+                return;
+            }
+            int port = Integer.parseInt(args[2]);
+            ServerSocket server = port < 0 ? null : new ServerSocket(port, 1, InetAddress.getLoopbackAddress());
+            publish(directory.resolve("initialized"), String.valueOf(server == null ? -1 : server.getLocalPort()));
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                try {
+                    Files.createFile(directory.resolve("stopping"));
+                    await(() -> Files.exists(directory.resolve("allow-exit")));
+                    if (server != null) { server.close(); }
+                } catch (Exception exception) { throw new RuntimeException(exception); }
+            }));
+            publish(directory.resolve("status"), "PRIMARY");
+            AtomicReference<CountDownLatch> deliveryPause = new AtomicReference<>();
+            AtomicBoolean failNextDelivery = new AtomicBoolean();
+            AtomicReference<CountDownLatch> edtPause = new AtomicReference<>();
+            LaunchFrame frame = LaunchFrame.create(directory);
+            BufferedReader input = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
+            String command;
+            while ((command = input.readLine()) != null) {
+                switch (command) {
+                    case "READY_FRAME" -> SingleInstanceUtil.onReady(frame::handleLaunchRequest);
+                    case "EDT_BARRIER" -> SwingUtilities.invokeAndWait(() -> {
+                        try { Files.createFile(directory.resolve("edt-barrier")); }
+                        catch (IOException exception) { throw new RuntimeException(exception); }
+                    });
+                    case "FAIL_FRAME" -> {
+                        frame.fail = true;
+                        Files.createFile(directory.resolve("frame-failing"));
+                    }
+                    case "RECOVER_FRAME" -> frame.fail = false;
+                    case "BLOCK_EDT" -> {
+                        CountDownLatch pause = new CountDownLatch(1);
+                        edtPause.set(pause);
+                        SwingUtilities.invokeLater(() -> {
+                            try {
+                                Files.createFile(directory.resolve("edt-blocked"));
+                                if (!pause.await(10, TimeUnit.SECONDS)) {
+                                    throw new IllegalStateException("EDT was not resumed");
+                                }
+                                attemptExit(directory, "TRY_EXIT");
+                            } catch (Exception exception) { throw new RuntimeException(exception); }
+                        });
+                    }
+                    case "RESUME_EDT_AND_EXIT" -> edtPause.get().countDown();
+                    case "TRY_EXIT", "FAIL_EXIT", "REJECT_EXIT" -> attemptExit(directory, command);
+                    case "HOLD_FAILED_EXIT" -> new Thread(() -> {
+                        try { attemptExit(directory, "HOLD_FAILED_EXIT"); }
+                        catch (Exception exception) { throw new RuntimeException(exception); }
+                    }).start();
+                    case "REQUEST_CLOSE", "REQUEST_RESTART", "REQUEST_INSTALL_UPDATE" -> {
+                        Field browser = JcefContext.class.getDeclaredField("browser_");
+                        browser.setAccessible(true);
+                        browser.set(JcefContext.getInstance(), Proxy.newProxyInstance(
+                                CefBrowser.class.getClassLoader(), new Class<?>[]{CefBrowser.class},
+                                (proxy, method, parameters) -> null));
+                        ApplicationExitCoordinator.markFrontendReady();
+                        if (!ApplicationExitCoordinator.request(command.substring(8), "test-exit", () -> {
+                            try { Files.createFile(directory.resolve("exit-action")); }
+                            catch (IOException exception) { throw new RuntimeException(exception); }
+                            return true;
+                        }, 30000) || !ApplicationExitCoordinator.acknowledge("test-exit")) {
+                            throw new IllegalStateException("Exit request was not accepted");
+                        }
+                        Files.createFile(directory.resolve("exit-requested"));
+                    }
+                    case "CONFIRM_EXIT" -> publish(directory.resolve("exit-result"),
+                            String.valueOf(ApplicationExitCoordinator.confirm("test-exit")));
+                    case "CANCEL_EXIT" -> publish(directory.resolve("exit-result"),
+                            String.valueOf(ApplicationExitCoordinator.cancel("test-exit")));
+                    case "READY" -> SingleInstanceUtil.onReady(argument -> {
+                        if (!SwingUtilities.isEventDispatchThread()) {
+                            throw new IllegalStateException("Window handler must run on EDT");
+                        }
+                        if (failNextDelivery.getAndSet(false)) {
+                            throw new IllegalStateException("Injected dispatch failure");
+                        }
+                        try {
+                            Files.writeString(directory.resolve("received.jsonl"),
+                                    MAPPER.writeValueAsString(argument) + "\n", CREATE, APPEND);
+                            CountDownLatch pause = deliveryPause.get();
+                            if (pause != null) {
+                                Files.createFile(directory.resolve("delivery-paused"));
+                                if (!pause.await(15, TimeUnit.SECONDS)) {
+                                    throw new IllegalStateException("Test did not resume delivery");
+                                }
+                            }
+                        } catch (Exception exception) { throw new RuntimeException(exception); }
+                    });
+                    case "EXIT" -> System.exit(0);
+                    case "PAUSE_NEXT_DELIVERY" -> {
+                        deliveryPause.set(new CountDownLatch(1));
+                        Files.createFile(directory.resolve("pause-enabled"));
+                    }
+                    case "RESUME_DELIVERY" -> deliveryPause.getAndSet(null).countDown();
+                    case "FAIL_NEXT_DELIVERY" -> {
+                        failNextDelivery.set(true);
+                        Files.createFile(directory.resolve("failure-enabled"));
+                    }
+                    case "REGISTER_AGAIN" -> publish(directory.resolve("registered-again"), String.valueOf(
+                            SingleInstanceUtil.registerInstance(Path.of(args[0]), Arrays.copyOfRange(args, 3, args.length))));
+                    case "STOP" -> {
+                        Files.writeString(directory.resolve("allow-exit"), "");
+                        System.exit(0);
+                    }
+                    case "CRASH" -> Runtime.getRuntime().halt(0);
+                    default -> throw new IllegalArgumentException(command);
+                }
+            }
+        }
+
+        private static void attemptExit(Path directory, String command) throws Exception {
+            ApplicationExitCoordinator.markFrontendUnavailable();
+            boolean result;
+            try {
+                result = ApplicationExitCoordinator.request("CLOSE", "immediate-exit", () -> {
+                    try {
+                        if ("HOLD_FAILED_EXIT".equals(command)) {
+                            Files.createFile(directory.resolve("exit-running"));
+                            long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(10);
+                            while (!Files.exists(directory.resolve("resume-exit")) && System.nanoTime() < deadline) {
+                                Thread.sleep(25);
+                            }
+                            return false;
+                        }
+                        if (!"TRY_EXIT".equals(command)) {
+                            Thread.sleep(300);
+                            if ("FAIL_EXIT".equals(command)) {
+                                throw new IllegalStateException("Injected exit failure");
+                            }
+                            return false;
+                        }
+                        Files.createFile(directory.resolve("exit-action"));
+                        return true;
+                    } catch (IOException | InterruptedException exception) { throw new RuntimeException(exception); }
+                });
+            } catch (IllegalStateException exception) {
+                if (!"FAIL_EXIT".equals(command)) { throw exception; }
+                result = false;
+            }
+            publish(directory.resolve("exit-result"), String.valueOf(result));
+        }
+    }
+
+    public static final class ShortDeadlineProcess {
+        public static void main(String[] args) throws Exception {
+            if (args.length > 3) {
+                Thread main = Thread.currentThread();
+                new Thread(() -> {
+                    try { Thread.sleep(100); }
+                    catch (InterruptedException exception) { throw new RuntimeException(exception); }
+                    main.interrupt();
+                }).start();
+            }
+            SingleInstanceUtil.registerInstance(Path.of(args[0]), new String[0], Duration.ofMillis(400));
+            publish(Path.of(args[1]).resolve("initialized"), "unexpected");
+        }
+    }
+
+    // Exercise the real window handler without constructing native AWT/JCEF resources.
+    public static final class LaunchFrame extends MainJFrame {
+        private Path directory;
+        private String argument;
+        private volatile boolean fail;
+
+        static LaunchFrame create(Path directory) throws Exception {
+            Field field = sun.misc.Unsafe.class.getDeclaredField("theUnsafe");
+            field.setAccessible(true);
+            LaunchFrame frame = (LaunchFrame) ((sun.misc.Unsafe) field.get(null)).allocateInstance(LaunchFrame.class);
+            frame.directory = directory;
+            return frame;
+        }
+
+        @Override public void processUri(URI uri) {
+            if (uri == null || !"file".equals(uri.getScheme())) {
+                super.processUri(uri);
+            } else {
+                argument = Path.of(uri).toString();
+            }
+        }
+        @Override public void setVisible(boolean visible) {
+            if (!SwingUtilities.isEventDispatchThread()) { throw new IllegalStateException("Not on EDT"); }
+            if (fail) { throw new IllegalStateException("Injected window handoff failure"); }
+            try {
+                Files.writeString(directory.resolve("received.jsonl"),
+                        MAPPER.writeValueAsString(argument == null ? "" : argument) + "\n", CREATE, APPEND);
+            } catch (IOException exception) { throw new RuntimeException(exception); }
+            argument = null;
+        }
+        @Override public void setExtendedState(int state) { }
+        @Override public int getExtendedState() { return java.awt.Frame.ICONIFIED; }
+        @Override public void toFront() { }
+        @Override public void requestFocus() { }
+    }
+
+    public static final class LegacyInstanceProcess {
+        public static void main(String[] args) throws Exception {
+            Path state = Files.createDirectories(Path.of(args[0]));
+            Path directory = Path.of(args[1]);
+            try (FileChannel channel = FileChannel.open(state.resolve("app.lock"), CREATE, WRITE);
+                 FileLock lock = channel.lock()) {
+                publish(directory.resolve("initialized"), "-1");
+                publish(directory.resolve("status"), "PRIMARY");
+                Thread listener = new Thread(() -> {
+                    try {
+                        Path ipc = state.resolve("app.ipc");
+                        while (!Files.exists(ipc)) { Thread.sleep(25); }
+                        Files.writeString(directory.resolve("received.jsonl"),
+                                MAPPER.writeValueAsString(Files.readString(ipc)) + "\n");
+                    } catch (Exception exception) { throw new RuntimeException(exception); }
+                });
+                listener.setDaemon(true);
+                listener.start();
+                new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)).readLine();
+            }
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManager.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManager.java
index d9871798f2..c97a64d1bd 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManager.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManager.java
@@ -10,6 +10,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -93,37 +95,44 @@ public Connection getConnection(ConnectInfo connectInfo) {
     }
 
     private String setDatabaseInJdbcUrl(ConnectInfo connectInfo) {
-        String schemaName = connectInfo.getSchemaName();
-        String url = connectInfo.getUrl();
-        if (StringUtils.isBlank(schemaName)) {
+        return replaceDatabaseInJdbcUrl(connectInfo.getUrl(), connectInfo.getSchemaName());
+    }
+
+    static String replaceDatabaseInJdbcUrl(String url, String schemaName) {
+        if (StringUtils.isBlank(url) || StringUtils.isBlank(schemaName)) {
             return url;
         }
-        String connectAddress = connectInfo.getHost() + ":" + connectInfo.getPort();
-        String[] addressSplit = url.split(connectAddress);
-        if(addressSplit == null){
+
+        int queryStart = url.indexOf('?');
+        int fragmentStart = url.indexOf('#');
+        int suffixStart = queryStart >= 0 ? queryStart : url.length();
+        if (fragmentStart >= 0) {
+            suffixStart = Math.min(suffixStart, fragmentStart);
+        }
+        int authorityStart = url.indexOf("://");
+        if (authorityStart < 0 || authorityStart + 3 >= suffixStart) {
             return url;
         }
-        StringBuilder newUrl = new StringBuilder();
-        newUrl.append(addressSplit[0]).append(connectAddress).append("/").append(schemaName);
-        if (addressSplit.length == 2) {
-            if (StringUtils.isNotBlank(addressSplit[1])) {
-                String[] param = addressSplit[1].split("\\?");
-                if (param.length == 2) {
-                    newUrl.append("?").append(param[1]);
-                }
-            }
+
+        // The path starts at the first '/' after the authority. A '/' inside userinfo is only
+        // expressible URL-encoded (%2F, RFC 3986); a raw one there is unparseable and must not
+        // be second-guessed, otherwise legal paths containing '@' would be misread as userinfo.
+        int pathStart = url.indexOf('/', authorityStart + 3);
+        if (pathStart < 0 || pathStart >= suffixStart) {
+            pathStart = suffixStart;
         }
-        return newUrl.toString();
+        String encodedSchemaName = URLEncoder.encode(schemaName, StandardCharsets.UTF_8).replace("+", "%20");
+        return url.substring(0, pathStart) + "/" + encodedSchemaName + url.substring(suffixStart);
     }
 
     @Override
     public String dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
-        return "DROP TABLE IF EXISTS " + qualifiedTableName(databaseName, schemaName, tableName, false);
+        return "DROP TABLE IF EXISTS " + qualifiedTableName(databaseName, schemaName, tableName);
     }
 
     @Override
     public String truncateTable(Connection connection, String databaseName, String schemaName, String tableName) {
-        return "TRUNCATE TABLE " + qualifiedTableName(databaseName, schemaName, tableName, true);
+        return "TRUNCATE TABLE " + qualifiedTableName(databaseName, schemaName, tableName);
     }
 
     @Override
@@ -135,8 +144,8 @@ public void copyTable(Connection connection, String databaseName, String schemaN
 
     static List<String> buildCopyTableStatements(String databaseName, String schemaName, String tableName,
                                                   String newTableName, boolean copyData) {
-        String source = qualifiedTableName(databaseName, schemaName, tableName, true);
-        String target = qualifiedTableName(databaseName, schemaName, newTableName, true);
+        String source = qualifiedTableName(databaseName, schemaName, tableName);
+        String target = qualifiedTableName(databaseName, schemaName, newTableName);
         List<String> statements = new ArrayList<>();
         statements.add("CREATE TABLE " + target + " AS " + source);
         if (copyData) {
@@ -145,21 +154,13 @@ static List<String> buildCopyTableStatements(String databaseName, String schemaN
         return statements;
     }
 
-    private static String qualifiedTableName(String databaseName, String schemaName, String tableName,
-                                             boolean normalizeQuotedTable) {
+    private static String qualifiedTableName(String databaseName, String schemaName, String tableName) {
         String qualifier = StringUtils.isNotBlank(schemaName) ? schemaName : databaseName;
-        String normalizedTable = normalizeQuotedTable ? normalizeQuotedIdentifier(tableName) : tableName;
         if (StringUtils.isBlank(qualifier)) {
-            return ClickHouseIdentifierProcessor.INSTANCE.quoteIdentifierAlways(normalizedTable);
+            return ClickHouseIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableName);
         }
         return ClickHouseIdentifierProcessor.INSTANCE.quoteIdentifierAlways(qualifier)
-                + "." + ClickHouseIdentifierProcessor.INSTANCE.quoteIdentifierAlways(normalizedTable);
+                + "." + ClickHouseIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableName);
     }
 
-    private static String normalizeQuotedIdentifier(String identifier) {
-        if (ClickHouseIdentifierProcessor.INSTANCE.isQuoteIdentifier(identifier)) {
-            return ClickHouseIdentifierProcessor.INSTANCE.removeIdentifierQuote(identifier);
-        }
-        return identifier;
-    }
 }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManagerConnectionUrlEncodingTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManagerConnectionUrlEncodingTest.java
new file mode 100644
index 0000000000..447e27c56f
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManagerConnectionUrlEncodingTest.java
@@ -0,0 +1,84 @@
+package ai.chat2db.plugin.clickhouse;
+
+import ai.chat2db.spi.model.datasource.ConnectInfo;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Method;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ClickHouseDBManagerConnectionUrlEncodingTest {
+
+    @Test
+    void encodesReservedUrlDelimitersInDatabaseName() throws Exception {
+        assertEquals(
+                "jdbc:clickhouse://localhost:8123/analytics%2Feast%3Fmode%23blue?ssl=true",
+                rewriteDatabase("analytics/east?mode#blue")
+        );
+    }
+
+    @Test
+    void encodesSpacesAndUnicodeInDatabaseName() throws Exception {
+        assertEquals(
+                "jdbc:clickhouse://localhost:8123/%E5%88%86%E6%9E%90%20%E5%BA%93?ssl=true",
+                rewriteDatabase("分析 库")
+        );
+    }
+
+    @Test
+    void encodesLiteralPercentAndPlusInDatabaseName() throws Exception {
+        assertEquals(
+                "jdbc:clickhouse://localhost:8123/already%252F%2Bname?ssl=true",
+                rewriteDatabase("already%2F+name")
+        );
+    }
+
+    @Test
+    void encodesDatabaseSegmentWhilePreservingIpv6AuthorityQueryAndFragment() {
+        assertEquals(
+                "jdbc:clickhouse://[2001:db8::1]:8123/analytics%2Feast%3Fmode%23blue?ssl=true#replica/tag",
+                ClickHouseDBManager.replaceDatabaseInJdbcUrl(
+                        "jdbc:clickhouse://[2001:db8::1]:8123/default?ssl=true#replica/tag",
+                        "analytics/east?mode#blue")
+        );
+    }
+
+    @Test
+    void rewritesPathBehindEncodedUserInfo() {
+        assertEquals(
+                "jdbc:clickhouse://user%2Fp:pass@host:8123/newdb",
+                ClickHouseDBManager.replaceDatabaseInJdbcUrl(
+                        "jdbc:clickhouse://user%2Fp:pass@host:8123/olddb", "newdb")
+        );
+    }
+
+    @Test
+    void rewritesPathSegmentContainingAtSign() {
+        assertEquals(
+                "jdbc:clickhouse://host:8123/newdb",
+                ClickHouseDBManager.replaceDatabaseInJdbcUrl(
+                        "jdbc:clickhouse://host:8123/db@x", "newdb")
+        );
+    }
+
+    @Test
+    void keepsStarLiteralAndEncodesTildeInDatabaseName() {
+        assertEquals(
+                "jdbc:clickhouse://host:8123/a*b%7Ec",
+                ClickHouseDBManager.replaceDatabaseInJdbcUrl(
+                        "jdbc:clickhouse://host:8123/olddb", "a*b~c")
+        );
+    }
+
+    private static String rewriteDatabase(String databaseName) throws Exception {
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setUrl("jdbc:clickhouse://localhost:8123/default?ssl=true");
+        connectInfo.setHost("localhost");
+        connectInfo.setPort(8123);
+        connectInfo.setSchemaName(databaseName);
+
+        Method method = ClickHouseDBManager.class.getDeclaredMethod("setDatabaseInJdbcUrl", ConnectInfo.class);
+        method.setAccessible(true);
+        return (String) method.invoke(new ClickHouseDBManager(), connectInfo);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManagerConnectionUrlTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManagerConnectionUrlTest.java
new file mode 100644
index 0000000000..2a6db0556f
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManagerConnectionUrlTest.java
@@ -0,0 +1,59 @@
+package ai.chat2db.plugin.clickhouse;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ClickHouseDBManagerConnectionUrlTest {
+
+    @Test
+    void replacesDatabasePathForBracketedIpv6AndPreservesQueryAndFragment() {
+        assertEquals(
+                "jdbc:clickhouse://[2001:db8::1]:8123/analytics?ssl=true#replica/tag",
+                ClickHouseDBManager.replaceDatabaseInJdbcUrl(
+                        "jdbc:clickhouse://[2001:db8::1]:8123/default?ssl=true#replica/tag",
+                        "analytics")
+        );
+    }
+
+    @Test
+    void repeatedReplacementIsIdempotent() {
+        String expected = "jdbc:clickhouse://[2001:db8::1]:8123/analytics?ssl=true";
+        String first = ClickHouseDBManager.replaceDatabaseInJdbcUrl(
+                "jdbc:clickhouse://[2001:db8::1]:8123/default?ssl=true",
+                "analytics");
+
+        assertEquals(expected, first);
+        assertEquals(expected, ClickHouseDBManager.replaceDatabaseInJdbcUrl(first, "analytics"));
+    }
+
+    @Test
+    void appendsDatabasePathWhenHostnameUrlHasNoPath() {
+        assertEquals(
+                "jdbc:clickhouse://clickhouse.example:8123/analytics",
+                ClickHouseDBManager.replaceDatabaseInJdbcUrl(
+                        "jdbc:clickhouse://clickhouse.example:8123",
+                        "analytics")
+        );
+    }
+
+    @Test
+    void appendsDatabasePathBeforeFragmentWhenUrlHasNoPath() {
+        assertEquals(
+                "jdbc:clickhouse://clickhouse.example:8123/analytics#replica/tag",
+                ClickHouseDBManager.replaceDatabaseInJdbcUrl(
+                        "jdbc:clickhouse://clickhouse.example:8123#replica/tag",
+                        "analytics")
+        );
+    }
+
+    @Test
+    void replacesExistingDatabasePathAndPreservesFragment() {
+        assertEquals(
+                "jdbc:clickhouse://clickhouse.example:8123/analytics#replica/tag",
+                ClickHouseDBManager.replaceDatabaseInJdbcUrl(
+                        "jdbc:clickhouse://clickhouse.example:8123/default#replica/tag",
+                        "analytics")
+        );
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseIdentifierProcessorTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseIdentifierProcessorTest.java
index 87539cf970..4ff5e30113 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseIdentifierProcessorTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-clickhouse/src/test/java/ai/chat2db/plugin/clickhouse/ClickHouseIdentifierProcessorTest.java
@@ -450,19 +450,17 @@ void shouldEscapeInheritedBuilderIdentifierPaths() {
     @Test
     void shouldBuildSchemaQualifiedManagerStatementsOnce() throws Exception {
         ClickHouseDBManager manager = new ClickHouseDBManager();
-        String source = ClickHouseIdentifierProcessor.INSTANCE.quoteIdentifierAlways("ord`ers");
-        String target = ClickHouseIdentifierProcessor.INSTANCE.quoteIdentifierAlways("ord`ers_copy");
 
         assertEquals("DROP TABLE IF EXISTS `analytics`.`ord``ers`",
                 manager.dropTable(null, null, "analytics", "ord`ers"));
         assertEquals("DROP TABLE IF EXISTS ```analytics```.```orders```",
                 manager.dropTable(null, null, "`analytics`", "`orders`"));
         assertEquals("TRUNCATE TABLE `analytics`.`ord``ers`",
-                manager.truncateTable(null, null, "analytics", source));
+                manager.truncateTable(null, null, "analytics", "ord`ers"));
         assertEquals(List.of(
                         "CREATE TABLE `analytics`.`ord``ers_copy` AS `analytics`.`ord``ers`",
                         "INSERT INTO `analytics`.`ord``ers_copy` SELECT * FROM `analytics`.`ord``ers`"),
-                ClickHouseDBManager.buildCopyTableStatements(null, "analytics", source, target, true));
+                ClickHouseDBManager.buildCopyTableStatements(null, "analytics", "ord`ers", "ord`ers_copy", true));
     }
 
     @Test
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/main/java/ai/chat2db/plugin/db2/constant/DB2DBManagerConstants.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/main/java/ai/chat2db/plugin/db2/constant/DB2DBManagerConstants.java
index bfe7bae428..396f8fed4b 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/main/java/ai/chat2db/plugin/db2/constant/DB2DBManagerConstants.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/main/java/ai/chat2db/plugin/db2/constant/DB2DBManagerConstants.java
@@ -20,10 +20,10 @@
 
 public final class DB2DBManagerConstants {
 
-    public static final String SQL_SELECT_GENERATE_TABLE_DDL_SQL = "select %s.GENERATE_TABLE_DDL('%s', '%s') as sql from %s;";
-    public static final String SQL_SELECT_SYSCAT_TRIGGERS_TRIGSCHEMA = "select * from SYSCAT.TRIGGERS where TRIGSCHEMA = '%s';";
-    public static final String SQL_SELECT_TEXT_SYSCAT_ROUTINES_ROUTINESCHEMA = "select TEXT from syscat.routines where ROUTINESCHEMA='%s';";
-    public static final String SQL_SELECT_TEXT_SYSCAT_VIEWS_VIEWSCHEMA = "select TEXT from syscat.views where VIEWSCHEMA='%s';";
+    public static final String SQL_SELECT_GENERATE_TABLE_DDL_SQL = "select %s.GENERATE_TABLE_DDL('%s', '%s') as sql from %s";
+    public static final String SQL_SELECT_SYSCAT_TRIGGERS_TRIGSCHEMA = "select * from SYSCAT.TRIGGERS where TRIGSCHEMA = '%s'";
+    public static final String SQL_SELECT_TEXT_SYSCAT_ROUTINES_ROUTINESCHEMA = "select TEXT from syscat.routines where ROUTINESCHEMA='%s'";
+    public static final String SQL_SELECT_TEXT_SYSCAT_VIEWS_VIEWSCHEMA = "select TEXT from syscat.views where VIEWSCHEMA='%s'";
     public static final String SQL_SET_SCHEMA = "SET SCHEMA \"%s\"";
     public static final String SQL_DROP_TABLE = "DROP TABLE %s";
     public static final String SQL_COPY_TABLE = "CREATE TABLE %s LIKE %s INCLUDING INDEXES";
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/main/java/ai/chat2db/plugin/db2/constant/DB2MetaDataConstants.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/main/java/ai/chat2db/plugin/db2/constant/DB2MetaDataConstants.java
index 66115777ae..d6163dd44c 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/main/java/ai/chat2db/plugin/db2/constant/DB2MetaDataConstants.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/main/java/ai/chat2db/plugin/db2/constant/DB2MetaDataConstants.java
@@ -35,8 +35,8 @@ public final class DB2MetaDataConstants {
     public static final String GET_DDL_SQL = "select SQL_STMT from SYSTOOLS.DB2LOOK_INFO where OP_TOKEN =  ? order by OP_SEQUENCE ASC";
     public static final String CLEAN_DDL_TOKEN = "CALL SYSPROC.DB2LK_CLEAN_TABLE(?)";
     public static final String IDX_SQL = "SELECT i.INDNAME, i.UNIQUERULE, i.REMARKS, ic.COLNAME, ic.COLSEQ, ic.COLORDER FROM SYSCAT.INDEXES i JOIN SYSCAT.INDEXCOLUSE ic ON i.INDNAME = ic.INDNAME AND i.INDSCHEMA = ic.INDSCHEMA WHERE i.TABNAME = '%s' AND i.INDSCHEMA = '%s' ORDER BY i.INDNAME, ic.COLSEQ";
-    public static final String VIEW_DDL_SQL = "select TEXT from syscat.views where VIEWSCHEMA='%s' and VIEWNAME='%s';";
-    public static final String ROUTINE_DDL_SQL = "select TEXT from syscat.routines where ROUTINESCHEMA='%s' and ROUTINENAME='%s' and ROUTINETYPE='%s';";
+    public static final String VIEW_DDL_SQL = "select TEXT from syscat.views where VIEWSCHEMA='%s' and VIEWNAME='%s'";
+    public static final String ROUTINE_DDL_SQL = "select TEXT from syscat.routines where ROUTINESCHEMA='%s' and ROUTINENAME='%s' and ROUTINETYPE='%s'";
     public static final List<String> SYSTEM_SCHEMAS = List.of("NULLID", "SQLJ", "SYSCAT", "SYSFUN", "SYSIBM",
             "SYSIBMADM", "SYSIBMINTERNAL", "SYSIBMTS", "SYSPROC", "SYSPUBLIC", "SYSSTAT", "SYSTOOLS");
 
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/test/java/ai/chat2db/plugin/db2/DB2SqlConstantsTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/test/java/ai/chat2db/plugin/db2/DB2SqlConstantsTest.java
new file mode 100644
index 0000000000..d7fbcce7e4
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-db2/src/test/java/ai/chat2db/plugin/db2/DB2SqlConstantsTest.java
@@ -0,0 +1,59 @@
+package ai.chat2db.plugin.db2;
+
+import ai.chat2db.plugin.db2.constant.DB2DBManagerConstants;
+import ai.chat2db.plugin.db2.constant.DB2MetaDataConstants;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * DB2 JDBC rejects a trailing statement terminator (";") with SQLCODE -104
+ * (SQLSTATE 42601, ERRMC ... END-OF-STATEMENT) because prepareStatement and
+ * Statement.execute accept exactly one statement. These guards keep every
+ * JDBC-executable DB2 constant terminator-free; see issue #2703 where opening
+ * a stored procedure failed because ROUTINE_DDL_SQL ended with ";".
+ */
+class DB2SqlConstantsTest {
+
+    @Test
+    void routineAndViewDdlQueriesAreExecutableSingleStatements() {
+        assertEquals(
+                "select TEXT from syscat.routines where ROUTINESCHEMA='MALCA0' and ROUTINENAME='P_ADS' and ROUTINETYPE='P'",
+                String.format(DB2MetaDataConstants.ROUTINE_DDL_SQL, "MALCA0", "P_ADS", 'P'));
+        assertEquals(
+                "select TEXT from syscat.routines where ROUTINESCHEMA='MALCA0' and ROUTINENAME='F_ADS' and ROUTINETYPE='F'",
+                String.format(DB2MetaDataConstants.ROUTINE_DDL_SQL, "MALCA0", "F_ADS", 'F'));
+        assertEquals(
+                "select TEXT from syscat.views where VIEWSCHEMA='MALCA0' and VIEWNAME='V_ADS'",
+                String.format(DB2MetaDataConstants.VIEW_DDL_SQL, "MALCA0", "V_ADS"));
+    }
+
+    @Test
+    void jdbcExecutableConstantsCarryNoStatementTerminator() {
+        List<String> offenders = new ArrayList<>();
+        for (Class<?> constantsClass : List.of(DB2MetaDataConstants.class, DB2DBManagerConstants.class)) {
+            for (Field field : constantsClass.getDeclaredFields()) {
+                if (!Modifier.isStatic(field.getModifiers()) || field.getType() != String.class) {
+                    continue;
+                }
+                field.setAccessible(true);
+                try {
+                    String value = (String) field.get(null);
+                    if (value != null && value.trim().endsWith(";")) {
+                        offenders.add(constantsClass.getSimpleName() + "." + field.getName());
+                    }
+                } catch (IllegalAccessException ignored) {
+                    // unreachable for static fields with setAccessible
+                }
+            }
+        }
+        assertTrue(offenders.isEmpty(),
+                "DB2 JDBC raises SQLCODE -104 for a trailing ';' — offending constants: " + offenders);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/pom.xml b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/pom.xml
index 4a90701922..03a9e0ad88 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/pom.xml
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/pom.xml
@@ -15,10 +15,6 @@
             <groupId>ai.chat2db</groupId>
             <artifactId>chat2db-community-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ai.chat2db</groupId>
-            <artifactId>chat2db-community-oracle</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -40,5 +36,24 @@
                 <directory>src/main/resources</directory>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-maven-plugin</artifactId>
+                <version>${antlr4.version}</version>
+                <configuration>
+                    <sourceDirectory>${project.basedir}/src/main/antlr4</sourceDirectory>
+                    <outputDirectory>${project.build.directory}/generated-sources/antlr4</outputDirectory>
+                    <visitor>true</visitor>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>antlr4</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/antlr4/ai/chat2db/plugin/dm/parser/base/DMLexer.g4 b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/antlr4/ai/chat2db/plugin/dm/parser/base/DMLexer.g4
new file mode 100644
index 0000000000..eeec06f463
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/antlr4/ai/chat2db/plugin/dm/parser/base/DMLexer.g4
@@ -0,0 +1,2524 @@
+/**
+ * Oracle(c) PL/SQL 11g Parser
+ *
+ * Adapted for Dameng (DM) SQL parsing in Chat2DB Community.
+ * Derived from the Oracle PL/SQL grammar; dialect-specific rules such as
+ * EXPLAIN may differ from the upstream Oracle grammar.
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ * Copyright (c) 2015-2019 Ivan Kochurkin (KvanTTT, kvanttt@gmail.com, Positive Technologies).
+ * Copyright (c) 2017 Mark Adams <madams51703@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
+// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
+// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true
+
+lexer grammar DMLexer;
+
+options {
+    superClass = DMLexerBase;
+    caseInsensitive = true;
+}
+
+@lexer::postinclude {
+#include <DMLexerBase.h>
+}
+
+ABORT                          : 'ABORT';
+ABS                            : 'ABS';
+ABSENT                         : 'ABSENT';
+ACCESS                         : 'ACCESS';
+ACCESSED                       : 'ACCESSED';
+ACCESSIBLE                     : 'ACCESSIBLE';
+ACCOUNT                        : 'ACCOUNT';
+ACL                            : 'ACL';
+ACOS                           : 'ACOS';
+ACROSS                         : 'ACROSS';
+ACTION                         : 'ACTION';
+ACTIONS                        : 'ACTIONS';
+ACTIVATE                       : 'ACTIVATE';
+ACTIVE                         : 'ACTIVE';
+ACTIVE_COMPONENT               : 'ACTIVE_COMPONENT';
+ACTIVE_DATA                    : 'ACTIVE_DATA';
+ACTIVE_FUNCTION                : 'ACTIVE_FUNCTION';
+ACTIVE_TAG                     : 'ACTIVE_TAG';
+ACTIVITY                       : 'ACTIVITY';
+ADAPTIVE_PLAN                  : 'ADAPTIVE_PLAN';
+ADD                            : 'ADD';
+ADD_COLUMN                     : 'ADD_COLUMN';
+ADD_GROUP                      : 'ADD_GROUP';
+ADD_MONTHS                     : 'ADD_MONTHS';
+ADJ_DATE                       : 'ADJ_DATE';
+ADMIN                          : 'ADMIN';
+ADMINISTER                     : 'ADMINISTER';
+ADMINISTRATOR                  : 'ADMINISTRATOR';
+ADVANCED                       : 'ADVANCED';
+ADVISE                         : 'ADVISE';
+ADVISOR                        : 'ADVISOR';
+AFD_DISKSTRING                 : 'AFD_DISKSTRING';
+AFTER                          : 'AFTER';
+AGENT                          : 'AGENT';
+AGGREGATE                      : 'AGGREGATE';
+A_LETTER                       : 'A';
+ALIAS                          : 'ALIAS';
+ALL                            : 'ALL';
+ALLOCATE                       : 'ALLOCATE';
+ALLOW                          : 'ALLOW';
+ALL_ROWS                       : 'ALL_ROWS';
+ALTER                          : 'ALTER';
+ALTERNATE                      : 'ALTERNATE';
+ALWAYS                         : 'ALWAYS';
+ANALYTIC                       : 'ANALYTIC';
+ANALYZE                        : 'ANALYZE';
+ANCESTOR                       : 'ANCESTOR';
+ANCILLARY                      : 'ANCILLARY';
+AND                            : 'AND';
+AND_EQUAL                      : 'AND_EQUAL';
+ANOMALY                        : 'ANOMALY';
+ANSI_REARCH                    : 'ANSI_REARCH';
+ANTIJOIN                       : 'ANTIJOIN';
+ANY                            : 'ANY';
+ANYSCHEMA                      : 'ANYSCHEMA';
+APPEND                         : 'APPEND';
+APPENDCHILDXML                 : 'APPENDCHILDXML';
+APPEND_VALUES                  : 'APPEND_VALUES';
+APPLICATION                    : 'APPLICATION';
+APPLY                          : 'APPLY';
+APPROX_COUNT_DISTINCT          : 'APPROX_COUNT_DISTINCT';
+ARCHIVAL                       : 'ARCHIVAL';
+ARCHIVE                        : 'ARCHIVE';
+ARCHIVED                       : 'ARCHIVED';
+ARCHIVELOG                     : 'ARCHIVELOG';
+ARRAY                          : 'ARRAY';
+AS                             : 'AS';
+ASC                            : 'ASC';
+ASCII                          : 'ASCII';
+ASCIISTR                       : 'ASCIISTR';
+ASIN                           : 'ASIN';
+ASIS                           : 'ASIS';
+ASSEMBLY                       : 'ASSEMBLY';
+ASSIGN                         : 'ASSIGN';
+ASSOCIATE                      : 'ASSOCIATE';
+ASYNC                          : 'ASYNC';
+ASYNCHRONOUS                   : 'ASYNCHRONOUS';
+ATAN2                          : 'ATAN2';
+ATAN                           : 'ATAN';
+AT                             : 'AT';
+ATTRIBUTE                      : 'ATTRIBUTE';
+ATTRIBUTES                     : 'ATTRIBUTES';
+AUDIT                          : 'AUDIT';
+AUTHENTICATED                  : 'AUTHENTICATED';
+AUTHENTICATION                 : 'AUTHENTICATION';
+AUTHID                         : 'AUTHID';
+AUTHORIZATION                  : 'AUTHORIZATION';
+AUTOALLOCATE                   : 'AUTOALLOCATE';
+AUTO                           : 'AUTO';
+AUTOBACKUP                     : 'AUTOBACKUP';
+AUTOEXTEND                     : 'AUTOEXTEND';
+AUTO_LOGIN                     : 'AUTO_LOGIN';
+AUTOMATIC                      : 'AUTOMATIC';
+AUTONOMOUS_TRANSACTION         : 'AUTONOMOUS_TRANSACTION';
+AUTO_REOPTIMIZE                : 'AUTO_REOPTIMIZE';
+AVAILABILITY                   : 'AVAILABILITY';
+AVRO                           : 'AVRO';
+BACKGROUND                     : 'BACKGROUND';
+BACKINGFILE                    : 'BACKINGFILE';
+BACKUP                         : 'BACKUP';
+BACKUPS                        : 'BACKUPS';
+BACKUPSET                      : 'BACKUPSET';
+BASIC                          : 'BASIC';
+BASICFILE                      : 'BASICFILE';
+BATCH                          : 'BATCH';
+BATCHSIZE                      : 'BATCHSIZE';
+BATCH_TABLE_ACCESS_BY_ROWID    : 'BATCH_TABLE_ACCESS_BY_ROWID';
+BECOME                         : 'BECOME';
+BEFORE                         : 'BEFORE';
+BEGIN                          : 'BEGIN';
+BEGINNING                      : 'BEGINNING';
+BEGIN_OUTLINE_DATA             : 'BEGIN_OUTLINE_DATA';
+BEHALF                         : 'BEHALF';
+BEQUEATH                       : 'BEQUEATH';
+BETWEEN                        : 'BETWEEN';
+BFILE                          : 'BFILE';
+BFILENAME                      : 'BFILENAME';
+BIGFILE                        : 'BIGFILE';
+BINARY                         : 'BINARY';
+BINARY_DOUBLE                  : 'BINARY_DOUBLE';
+BINARY_DOUBLE_INFINITY         : 'BINARY_DOUBLE_INFINITY';
+BINARY_DOUBLE_NAN              : 'BINARY_DOUBLE_NAN';
+BINARY_FLOAT                   : 'BINARY_FLOAT';
+BINARY_FLOAT_INFINITY          : 'BINARY_FLOAT_INFINITY';
+BINARY_FLOAT_NAN               : 'BINARY_FLOAT_NAN';
+BINARY_INTEGER                 : 'BINARY_INTEGER';
+BIND_AWARE                     : 'BIND_AWARE';
+BINDING                        : 'BINDING';
+BIN_TO_NUM                     : 'BIN_TO_NUM';
+BITAND                         : 'BITAND';
+BITMAP_AND                     : 'BITMAP_AND';
+BITMAP                         : 'BITMAP';
+BITMAPS                        : 'BITMAPS';
+BITMAP_TREE                    : 'BITMAP_TREE';
+BITS                           : 'BITS';
+BLOB                           : 'BLOB';
+BLOCK                          : 'BLOCK';
+BLOCK_RANGE                    : 'BLOCK_RANGE';
+BLOCKS                         : 'BLOCKS';
+BLOCKSIZE                      : 'BLOCKSIZE';
+BODY                           : 'BODY';
+BOOLEAN                        : 'BOOLEAN';
+BOTH                           : 'BOTH';
+BOUND                          : 'BOUND';
+BRANCH                         : 'BRANCH';
+BREADTH                        : 'BREADTH';
+BROADCAST                      : 'BROADCAST';
+BSON                           : 'BSON';
+BUFFER                         : 'BUFFER';
+BUFFER_CACHE                   : 'BUFFER_CACHE';
+BUFFER_POOL                    : 'BUFFER_POOL';
+BUILD                          : 'BUILD';
+BULK                           : 'BULK';
+BY                             : 'BY';
+BYPASS_RECURSIVE_CHECK         : 'BYPASS_RECURSIVE_CHECK';
+BYPASS_UJVC                    : 'BYPASS_UJVC';
+BYTE                           : 'BYTE';
+CACHE                          : 'CACHE';
+CACHE_CB                       : 'CACHE_CB';
+CACHE_INSTANCES                : 'CACHE_INSTANCES';
+CACHE_TEMP_TABLE               : 'CACHE_TEMP_TABLE';
+CACHING                        : 'CACHING';
+CALCULATED                     : 'CALCULATED';
+CALLBACK                       : 'CALLBACK';
+CALL                           : 'CALL';
+CANCEL                         : 'CANCEL';
+CANONICAL                      : 'CANONICAL';
+CAPACITY                       : 'CAPACITY';
+CAPTION                        : 'CAPTION';
+CARDINALITY                    : 'CARDINALITY';
+CASCADE                        : 'CASCADE';
+CASE                           : 'CASE';
+CAST                           : 'CAST';
+CASESENSITIVE                  : 'CASE-SENSITIVE';
+CATEGORY                       : 'CATEGORY';
+CDBDEFAULT                     : 'CDB$DEFAULT';
+CEIL                           : 'CEIL';
+CELL_FLASH_CACHE               : 'CELL_FLASH_CACHE';
+CERTIFICATE                    : 'CERTIFICATE';
+CFILE                          : 'CFILE';
+CHAINED                        : 'CHAINED';
+CHANGE                         : 'CHANGE';
+CHANGETRACKING                 : 'CHANGETRACKING';
+CHANGE_DUPKEY_ERROR_INDEX      : 'CHANGE_DUPKEY_ERROR_INDEX';
+CHARACTER                      : 'CHARACTER';
+CHAR                           : 'CHAR';
+CHAR_CS                        : 'CHAR_CS';
+CHARTOROWID                    : 'CHARTOROWID';
+CHECK_ACL_REWRITE              : 'CHECK_ACL_REWRITE';
+CHECK                          : 'CHECK';
+CHECKPOINT                     : 'CHECKPOINT';
+CHILD                          : 'CHILD';
+CHOOSE                         : 'CHOOSE';
+CHR                            : 'CHR';
+CHUNK                          : 'CHUNK';
+CLASS                          : 'CLASS';
+CLASSIFICATION                 : 'CLASSIFICATION';
+CLASSIFIER                     : 'CLASSIFIER';
+CLAUSE                         : 'CLAUSE';
+CLEAN                          : 'CLEAN';
+CLEANUP                        : 'CLEANUP';
+CLEAR                          : 'CLEAR';
+C_LETTER                       : 'C';
+CLIENT                         : 'CLIENT';
+CLOB                           : 'CLOB';
+CLONE                          : 'CLONE';
+CLOSE_CACHED_OPEN_CURSORS      : 'CLOSE_CACHED_OPEN_CURSORS';
+CLOSE                          : 'CLOSE';
+CLUSTER_BY_ROWID               : 'CLUSTER_BY_ROWID';
+CLUSTER                        : 'CLUSTER';
+CLUSTER_DETAILS                : 'CLUSTER_DETAILS';
+CLUSTER_DISTANCE               : 'CLUSTER_DISTANCE';
+CLUSTER_ID                     : 'CLUSTER_ID';
+CLUSTERING                     : 'CLUSTERING';
+CLUSTERING_FACTOR              : 'CLUSTERING_FACTOR';
+CLUSTER_PROBABILITY            : 'CLUSTER_PROBABILITY';
+CLUSTER_SET                    : 'CLUSTER_SET';
+COALESCE                       : 'COALESCE';
+COALESCE_SQ                    : 'COALESCE_SQ';
+COARSE                         : 'COARSE';
+CO_AUTH_IND                    : 'CO_AUTH_IND';
+COLD                           : 'COLD';
+COLLECT                        : 'COLLECT';
+COLUMNAR                       : 'COLUMNAR';
+COLUMN_AUTH_INDICATOR          : 'COLUMN_AUTH_INDICATOR';
+COLUMN                         : 'COLUMN';
+COLUMNS                        : 'COLUMNS';
+COLUMN_STATS                   : 'COLUMN_STATS';
+COLUMN_VALUE                   : 'COLUMN_VALUE';
+COMMENT                        : 'COMMENT';
+COMMIT                         : 'COMMIT';
+COMMITTED                      : 'COMMITTED';
+COMMON                         : 'COMMON';
+COMMON_DATA                    : 'COMMON_DATA';
+COMPACT                        : 'COMPACT';
+COMPATIBILITY                  : 'COMPATIBILITY';
+COMPILE                        : 'COMPILE';
+COMPLETE                       : 'COMPLETE';
+COMPLIANCE                     : 'COMPLIANCE';
+COMPONENT                      : 'COMPONENT';
+COMPONENTS                     : 'COMPONENTS';
+COMPOSE                        : 'COMPOSE';
+COMPOSITE                      : 'COMPOSITE';
+COMPOSITE_LIMIT                : 'COMPOSITE_LIMIT';
+COMPOUND                       : 'COMPOUND';
+COMPRESS                       : 'COMPRESS';
+COMPUTE                        : 'COMPUTE';
+CONCAT                         : 'CONCAT';
+CON_DBID_TO_ID                 : 'CON_DBID_TO_ID';
+CONDITIONAL                    : 'CONDITIONAL';
+CONDITION                      : 'CONDITION';
+CONFIRM                        : 'CONFIRM';
+CONFORMING                     : 'CONFORMING';
+CON_GUID_TO_ID                 : 'CON_GUID_TO_ID';
+CON_ID                         : 'CON_ID';
+CON_NAME_TO_ID                 : 'CON_NAME_TO_ID';
+CONNECT_BY_CB_WHR_ONLY         : 'CONNECT_BY_CB_WHR_ONLY';
+CONNECT_BY_COMBINE_SW          : 'CONNECT_BY_COMBINE_SW';
+CONNECT_BY_COST_BASED          : 'CONNECT_BY_COST_BASED';
+CONNECT_BY_ELIM_DUPS           : 'CONNECT_BY_ELIM_DUPS';
+CONNECT_BY_FILTERING           : 'CONNECT_BY_FILTERING';
+CONNECT_BY_ISCYCLE             : 'CONNECT_BY_ISCYCLE';
+CONNECT_BY_ISLEAF              : 'CONNECT_BY_ISLEAF';
+CONNECT_BY_ROOT                : 'CONNECT_BY_ROOT';
+CONNECT                        : 'CONNECT';
+CONNECT_TIME                   : 'CONNECT_TIME';
+CONSIDER                       : 'CONSIDER';
+CONSISTENT                     : 'CONSISTENT';
+CONSTANT                       : 'CONSTANT';
+CONST                          : 'CONST';
+CONSTRAINT                     : 'CONSTRAINT';
+CONSTRAINTS                    : 'CONSTRAINTS';
+CONSTRUCTOR                    : 'CONSTRUCTOR';
+CONTAINER                      : 'CONTAINER';
+CONTAINERS                     : 'CONTAINERS';
+CONTAINERS_DEFAULT             : 'CONTAINERS_DEFAULT';
+CONTAINER_DATA                 : 'CONTAINER_DATA';
+CONTAINER_MAP                  : 'CONTAINER_MAP';
+CONTENT                        : 'CONTENT';
+CONTENTS                       : 'CONTENTS';
+CONTEXT                        : 'CONTEXT';
+CONTINUE                       : 'CONTINUE';
+CONTROLFILE                    : 'CONTROLFILE';
+CON_UID_TO_ID                  : 'CON_UID_TO_ID';
+CONVERT                        : 'CONVERT';
+CONVERSION                     : 'CONVERSION';
+COOKIE                         : 'COOKIE';
+COPY                           : 'COPY';
+CORR_K                         : 'CORR_K';
+CORR_S                         : 'CORR_S';
+CORRUPTION                     : 'CORRUPTION';
+CORRUPT_XID_ALL                : 'CORRUPT_XID_ALL';
+CORRUPT_XID                    : 'CORRUPT_XID';
+COS                            : 'COS';
+COSH                           : 'COSH';
+COST                           : 'COST';
+COST_XML_QUERY_REWRITE         : 'COST_XML_QUERY_REWRITE';
+COUNT                          : 'COUNT';
+COVAR_POP                      : 'COVAR_POP';
+COVAR_SAMP                     : 'COVAR_SAMP';
+CPU_COSTING                    : 'CPU_COSTING';
+CPU_PER_CALL                   : 'CPU_PER_CALL';
+CPU_PER_SESSION                : 'CPU_PER_SESSION';
+CRASH                          : 'CRASH';
+CREATE                         : 'CREATE';
+CREATE_FILE_DEST               : 'CREATE_FILE_DEST';
+CREATE_STORED_OUTLINES         : 'CREATE_STORED_OUTLINES';
+CREATION                       : 'CREATION';
+CREDENTIAL                     : 'CREDENTIAL';
+CRITICAL                       : 'CRITICAL';
+CROSS                          : 'CROSS';
+CROSSEDITION                   : 'CROSSEDITION';
+CSCONVERT                      : 'CSCONVERT';
+CUBE_AJ                        : 'CUBE_AJ';
+CUBE                           : 'CUBE';
+CUBE_GB                        : 'CUBE_GB';
+CUBE_SJ                        : 'CUBE_SJ';
+CUME_DISTM                     : 'CUME_DISTM';
+CURRENT                        : 'CURRENT';
+CURRENT_DATE                   : 'CURRENT_DATE';
+CURRENT_SCHEMA                 : 'CURRENT_SCHEMA';
+CURRENT_TIME                   : 'CURRENT_TIME';
+CURRENT_TIMESTAMP              : 'CURRENT_TIMESTAMP';
+CURRENT_USER                   : 'CURRENT_USER';
+CURRENTV                       : 'CURRENTV';
+CURSOR                         : 'CURSOR';
+CURSOR_SHARING_EXACT           : 'CURSOR_SHARING_EXACT';
+CURSOR_SPECIFIC_SEGMENT        : 'CURSOR_SPECIFIC_SEGMENT';
+CUSTOMDATUM                    : 'CUSTOMDATUM';
+CV                             : 'CV';
+CYCLE                          : 'CYCLE';
+DANGLING                       : 'DANGLING';
+DATABASE                       : 'DATABASE';
+DATA                           : 'DATA';
+DATAFILE                       : 'DATAFILE';
+DATAFILES                      : 'DATAFILES';
+DATAGUARDCONFIG                : 'DATAGUARDCONFIG';
+DATAMOVEMENT                   : 'DATAMOVEMENT';
+DATAOBJNO                      : 'DATAOBJNO';
+DATAOBJ_TO_MAT_PARTITION       : 'DATAOBJ_TO_MAT_PARTITION';
+DATAOBJ_TO_PARTITION           : 'DATAOBJ_TO_PARTITION';
+DATAPUMP                       : 'DATAPUMP';
+DATA_SECURITY_REWRITE_LIMIT    : 'DATA_SECURITY_REWRITE_LIMIT';
+DATE                           : 'DATE';
+DATE_MODE                      : 'DATE_MODE';
+DAY                            : 'DAY';
+DAYS                           : 'DAYS';
+DBA                            : 'DBA';
+DBA_RECYCLEBIN                 : 'DBA_RECYCLEBIN';
+DBMS_STATS                     : 'DBMS_STATS';
+DB_ROLE_CHANGE                 : 'DB_ROLE_CHANGE';
+DBTIMEZONE                     : 'DBTIMEZONE';
+DB_UNIQUE_NAME                 : 'DB_UNIQUE_NAME';
+DB_VERSION                     : 'DB_VERSION';
+DDL                            : 'DDL';
+DEALLOCATE                     : 'DEALLOCATE';
+DEBUG                          : 'DEBUG';
+DEBUGGER                       : 'DEBUGGER';
+DEC                            : 'DEC';
+DECIMAL                        : 'DECIMAL';
+DECLARE                        : 'DECLARE';
+DECOMPOSE                      : 'DECOMPOSE';
+DECORRELATE                    : 'DECORRELATE';
+DECR                           : 'DECR';
+DECREMENT                      : 'DECREMENT';
+DECRYPT                        : 'DECRYPT';
+DEDUPLICATE                    : 'DEDUPLICATE';
+DEFAULT                        : 'DEFAULT';
+DEFAULTS                       : 'DEFAULTS';
+DEFAULT_COLLATION              : 'DEFAULT_COLLATION';
+DEFAULT_CREDENTIAL             : 'DEFAULT_CREDENTIAL';
+DEFERRABLE                     : 'DEFERRABLE';
+DEFERRED                       : 'DEFERRED';
+DEFINED                        : 'DEFINED';
+DEFINE                         : 'DEFINE';
+DEFINER                        : 'DEFINER';
+DEGREE                         : 'DEGREE';
+DELAY                          : 'DELAY';
+DELEGATE                       : 'DELEGATE';
+DELETE_ALL                     : 'DELETE_ALL';
+DELETE                         : 'DELETE';
+DELETEXML                      : 'DELETEXML';
+DEMAND                         : 'DEMAND';
+DENSE_RANKM                    : 'DENSE_RANKM';
+DEPENDENT                      : 'DEPENDENT';
+DEPRECATE                      : 'DEPRECATE';
+DEPTH                          : 'DEPTH';
+DEQUEUE                        : 'DEQUEUE';
+DEREF                          : 'DEREF';
+DEREF_NO_REWRITE               : 'DEREF_NO_REWRITE';
+DESC                           : 'DESC';
+DESCRIPTION                    : 'DESCRIPTION';
+DESTROY                        : 'DESTROY';
+DETACHED                       : 'DETACHED';
+DETERMINES                     : 'DETERMINES';
+DETERMINISTIC                  : 'DETERMINISTIC';
+DICTIONARY                     : 'DICTIONARY';
+DIMENSION                      : 'DIMENSION';
+DIMENSIONS                     : 'DIMENSIONS';
+DIRECT_LOAD                    : 'DIRECT_LOAD';
+DIRECTORY                      : 'DIRECTORY';
+DIRECT_PATH                    : 'DIRECT_PATH';
+DISABLE_ALL                    : 'DISABLE_ALL';
+DISABLE                        : 'DISABLE';
+DISABLE_PARALLEL_DML           : 'DISABLE_PARALLEL_DML';
+DISABLE_PRESET                 : 'DISABLE_PRESET';
+DISABLE_RPKE                   : 'DISABLE_RPKE';
+DISALLOW                       : 'DISALLOW';
+DISASSOCIATE                   : 'DISASSOCIATE';
+DISCARD                        : 'DISCARD';
+DISCONNECT                     : 'DISCONNECT';
+DISK                           : 'DISK';
+DISKGROUP                      : 'DISKGROUP';
+DISKGROUP_PLUS                 : '\'+ DISKGROUP';
+DISKS                          : 'DISKS';
+DISMOUNT                       : 'DISMOUNT';
+DISTINCT                       : 'DISTINCT';
+DISTINGUISHED                  : 'DISTINGUISHED';
+DISTRIBUTED                    : 'DISTRIBUTED';
+DISTRIBUTE                     : 'DISTRIBUTE';
+DML                            : 'DML';
+DML_UPDATE                     : 'DML_UPDATE';
+DOCFIDELITY                    : 'DOCFIDELITY';
+DOCUMENT                       : 'DOCUMENT';
+DOLLAR_ELSE                    : '$ELSE';
+DOLLAR_ELSIF                   : '$ELSIF';
+DOLLAR_END                     : '$END';
+DOLLAR_ERROR                   : '$ERROR';
+DOLLAR_IF                      : '$IF';
+DOLLAR_THEN                    : '$THEN';
+DOMAIN_INDEX_FILTER            : 'DOMAIN_INDEX_FILTER';
+DOMAIN_INDEX_NO_SORT           : 'DOMAIN_INDEX_NO_SORT';
+DOMAIN_INDEX_SORT              : 'DOMAIN_INDEX_SORT';
+DOUBLE                         : 'DOUBLE';
+DOWNGRADE                      : 'DOWNGRADE';
+DRIVING_SITE                   : 'DRIVING_SITE';
+DROP_COLUMN                    : 'DROP_COLUMN';
+DROP                           : 'DROP';
+DROP_GROUP                     : 'DROP_GROUP';
+DSINTERVAL_UNCONSTRAINED       : 'DSINTERVAL_UNCONSTRAINED';
+DST_UPGRADE_INSERT_CONV        : 'DST_UPGRADE_INSERT_CONV';
+DUMP                           : 'DUMP';
+DUMPSET                        : 'DUMPSET';
+DUPLICATE                      : 'DUPLICATE';
+DV                             : 'DV';
+DYNAMIC                        : 'DYNAMIC';
+DYNAMIC_SAMPLING               : 'DYNAMIC_SAMPLING';
+DYNAMIC_SAMPLING_EST_CDN       : 'DYNAMIC_SAMPLING_EST_CDN';
+E_LETTER                       : 'E';
+EACH                           : 'EACH';
+EDITIONABLE                    : 'EDITIONABLE';
+EDITION                        : 'EDITION';
+EDITIONING                     : 'EDITIONING';
+EDITIONS                       : 'EDITIONS';
+ELEMENT                        : 'ELEMENT';
+ELIM_GROUPBY                   : 'ELIM_GROUPBY';
+ELIMINATE_JOIN                 : 'ELIMINATE_JOIN';
+ELIMINATE_OBY                  : 'ELIMINATE_OBY';
+ELIMINATE_OUTER_JOIN           : 'ELIMINATE_OUTER_JOIN';
+ELSE                           : 'ELSE';
+ELSIF                          : 'ELSIF';
+EM                             : 'EM';
+EMPTY_BLOB                     : 'EMPTY_BLOB';
+EMPTY_CLOB                     : 'EMPTY_CLOB';
+EMPTY_                         : 'EMPTY';
+ENABLE_ALL                     : 'ENABLE_ALL';
+ENABLE                         : 'ENABLE';
+ENABLE_PARALLEL_DML            : 'ENABLE_PARALLEL_DML';
+ENABLE_PRESET                  : 'ENABLE_PRESET';
+ENCODING                       : 'ENCODING';
+ENCRYPT                        : 'ENCRYPT';
+ENCRYPTION                     : 'ENCRYPTION';
+END                            : 'END';
+END_OUTLINE_DATA               : 'END_OUTLINE_DATA';
+ENFORCED                       : 'ENFORCED';
+ENFORCE                        : 'ENFORCE';
+ENQUEUE                        : 'ENQUEUE';
+ENTERPRISE                     : 'ENTERPRISE';
+ENTITYESCAPING                 : 'ENTITYESCAPING';
+ENTRY                          : 'ENTRY';
+EQUIPART                       : 'EQUIPART';
+ERR                            : 'ERR';
+ERROR_ARGUMENT                 : 'ERROR_ARGUMENT';
+ERROR                          : 'ERROR';
+ERROR_ON_OVERLAP_TIME          : 'ERROR_ON_OVERLAP_TIME';
+ERRORS                         : 'ERRORS';
+ERROR_INDEX                    : 'ERROR_INDEX';
+ERROR_CODE                     : 'ERROR_CODE';
+ESCAPE                         : 'ESCAPE';
+ESTIMATE                       : 'ESTIMATE';
+EVAL                           : 'EVAL';
+EVALNAME                       : 'EVALNAME';
+EVALUATE                       : 'EVALUATE';
+EVALUATION                     : 'EVALUATION';
+EVENTS                         : 'EVENTS';
+EVERY                          : 'EVERY';
+EXCEPT                         : 'EXCEPT';
+EXCEPTION                      : 'EXCEPTION';
+EXCEPTION_INIT                 : 'EXCEPTION_INIT';
+EXCEPTIONS                     : 'EXCEPTIONS';
+EXCHANGE                       : 'EXCHANGE';
+EXCLUDE                        : 'EXCLUDE';
+EXCLUDING                      : 'EXCLUDING';
+EXCLUSIVE                      : 'EXCLUSIVE';
+EXECUTE                        : 'EXECUTE';
+EXEMPT                         : 'EXEMPT';
+EXISTING                       : 'EXISTING';
+EXISTS                         : 'EXISTS';
+EXISTSNODE                     : 'EXISTSNODE';
+EXIT                           : 'EXIT';
+EXPAND_GSET_TO_UNION           : 'EXPAND_GSET_TO_UNION';
+EXPAND_TABLE                   : 'EXPAND_TABLE';
+EXP                            : 'EXP';
+EXPIRE                         : 'EXPIRE';
+EXPLAIN                        : 'EXPLAIN';
+EXPLOSION                      : 'EXPLOSION';
+EXPORT                         : 'EXPORT';
+EXPR_CORR_CHECK                : 'EXPR_CORR_CHECK';
+EXPRESS                        : 'EXPRESS';
+EXTENDS                        : 'EXTENDS';
+EXTENT                         : 'EXTENT';
+EXTENTS                        : 'EXTENTS';
+EXTERNAL                       : 'EXTERNAL';
+EXTERNALLY                     : 'EXTERNALLY';
+EXTRACTCLOBXML                 : 'EXTRACTCLOBXML';
+EXTRACT                        : 'EXTRACT';
+EXTRACTVALUE                   : 'EXTRACTVALUE';
+EXTRA                          : 'EXTRA';
+FACILITY                       : 'FACILITY';
+FACT                           : 'FACT';
+FACTOR                         : 'FACTOR';
+FACTORIZE_JOIN                 : 'FACTORIZE_JOIN';
+FAILED                         : 'FAILED';
+FAILED_LOGIN_ATTEMPTS          : 'FAILED_LOGIN_ATTEMPTS';
+FAILGROUP                      : 'FAILGROUP';
+FAILOVER                       : 'FAILOVER';
+FAILURE                        : 'FAILURE';
+FALSE                          : 'FALSE';
+FAMILY                         : 'FAMILY';
+FAR                            : 'FAR';
+FAST                           : 'FAST';
+FASTSTART                      : 'FASTSTART';
+FBTSCAN                        : 'FBTSCAN';
+FEATURE                        : 'FEATURE';
+FEATURE_DETAILS                : 'FEATURE_DETAILS';
+FEATURE_ID                     : 'FEATURE_ID';
+FEATURE_SET                    : 'FEATURE_SET';
+FEATURE_VALUE                  : 'FEATURE_VALUE';
+FETCH                          : 'FETCH';
+FILE                           : 'FILE';
+FILE_NAME_CONVERT              : 'FILE_NAME_CONVERT';
+FILEGROUP                      : 'FILEGROUP';
+FILESTORE                      : 'FILESTORE';
+FILESYSTEM_LIKE_LOGGING        : 'FILESYSTEM_LIKE_LOGGING';
+FILTER                         : 'FILTER';
+FINAL                          : 'FINAL';
+FINE                           : 'FINE';
+FINISH                         : 'FINISH';
+FIRST                          : 'FIRST';
+FIRSTM                         : 'FIRSTM';
+FIRST_ROWS                     : 'FIRST_ROWS';
+FIRST_VALUE                    : 'FIRST_VALUE';
+FIXED_VIEW_DATA                : 'FIXED_VIEW_DATA';
+FLAGGER                        : 'FLAGGER';
+FLASHBACK                      : 'FLASHBACK';
+FLASH_CACHE                    : 'FLASH_CACHE';
+FLOAT                          : 'FLOAT';
+FLOB                           : 'FLOB';
+FLEX                           : 'FLEX';
+FLOOR                          : 'FLOOR';
+FLUSH                          : 'FLUSH';
+FOLDER                         : 'FOLDER';
+FOLLOWING                      : 'FOLLOWING';
+FOLLOWS                        : 'FOLLOWS';
+FORALL                         : 'FORALL';
+FORCE                          : 'FORCE';
+FORCE_XML_QUERY_REWRITE        : 'FORCE_XML_QUERY_REWRITE';
+FOREIGN                        : 'FOREIGN';
+FOREVER                        : 'FOREVER';
+FOR                            : 'FOR';
+FORMAT                         : 'FORMAT';
+FORWARD                        : 'FORWARD';
+FRAGMENT_NUMBER                : 'FRAGMENT_NUMBER';
+FREELIST                       : 'FREELIST';
+FREELISTS                      : 'FREELISTS';
+FREEPOOLS                      : 'FREEPOOLS';
+FRESH                          : 'FRESH';
+FROM                           : 'FROM';
+FROM_TZ                        : 'FROM_TZ';
+FULL                           : 'FULL';
+FULL_OUTER_JOIN_TO_OUTER       : 'FULL_OUTER_JOIN_TO_OUTER';
+FUNCTION                       : 'FUNCTION';
+FUNCTIONS                      : 'FUNCTIONS';
+FTP                            : 'FTP';
+G_LETTER                       : 'G';
+GATHER_OPTIMIZER_STATISTICS    : 'GATHER_OPTIMIZER_STATISTICS';
+GATHER_PLAN_STATISTICS         : 'GATHER_PLAN_STATISTICS';
+GBY_CONC_ROLLUP                : 'GBY_CONC_ROLLUP';
+GBY_PUSHDOWN                   : 'GBY_PUSHDOWN';
+GENERATED                      : 'GENERATED';
+GET                            : 'GET';
+GLOBAL                         : 'GLOBAL';
+GLOBALLY                       : 'GLOBALLY';
+GLOBAL_NAME                    : 'GLOBAL_NAME';
+GLOBAL_TOPIC_ENABLED           : 'GLOBAL_TOPIC_ENABLED';
+GOTO                           : 'GOTO';
+GRANT                          : 'GRANT';
+GROUP_BY                       : 'GROUP_BY';
+GROUP                          : 'GROUP';
+GROUP_ID                       : 'GROUP_ID';
+GROUPING                       : 'GROUPING';
+GROUPING_ID                    : 'GROUPING_ID';
+GROUPS                         : 'GROUPS';
+GUARANTEED                     : 'GUARANTEED';
+GUARANTEE                      : 'GUARANTEE';
+GUARD                          : 'GUARD';
+HALF_YEARS                     : 'HALF_YEARS';
+HASH_AJ                        : 'HASH_AJ';
+HASH                           : 'HASH';
+HASHKEYS                       : 'HASHKEYS';
+HASH_SJ                        : 'HASH_SJ';
+HAVING                         : 'HAVING';
+HEADER                         : 'HEADER';
+HEAP                           : 'HEAP';
+HELP                           : 'HELP';
+HEXTORAW                       : 'HEXTORAW';
+HEXTOREF                       : 'HEXTOREF';
+HIDDEN_KEYWORD                 : 'HIDDEN';
+HIDE                           : 'HIDE';
+HIER_ORDER                     : 'HIER_ORDER';
+HIERARCHICAL                   : 'HIERARCHICAL';
+HIERARCHIES                    : 'HIERARCHIES';
+HIERARCHY                      : 'HIERARCHY';
+HIGH                           : 'HIGH';
+HINTSET_BEGIN                  : 'HINTSET_BEGIN';
+HINTSET_END                    : 'HINTSET_END';
+HOT                            : 'HOT';
+HOUR                           : 'HOUR';
+HOURS                          : 'HOURS';
+HTTP                           : 'HTTP';
+HWM_BROKERED                   : 'HWM_BROKERED';
+HYBRID                         : 'HYBRID';
+H_LETTER                       : 'H';
+IDENTIFIED                     : 'IDENTIFIED';
+IDENTIFIER                     : 'IDENTIFIER';
+IDENTITY                       : 'IDENTITY';
+IDGENERATORS                   : 'IDGENERATORS';
+ID                             : 'ID';
+IDLE_TIME                      : 'IDLE_TIME';
+IF                             : 'IF';
+IGNORE                         : 'IGNORE';
+IGNORE_OPTIM_EMBEDDED_HINTS    : 'IGNORE_OPTIM_EMBEDDED_HINTS';
+IGNORE_ROW_ON_DUPKEY_INDEX     : 'IGNORE_ROW_ON_DUPKEY_INDEX';
+IGNORE_WHERE_CLAUSE            : 'IGNORE_WHERE_CLAUSE';
+ILM                            : 'ILM';
+IMMEDIATE                      : 'IMMEDIATE';
+IMPACT                         : 'IMPACT';
+IMPORT                         : 'IMPORT';
+INACTIVE                       : 'INACTIVE';
+INACTIVE_ACCOUNT_TIME          : 'INACTIVE_ACCOUNT_TIME';
+INCLUDE                        : 'INCLUDE';
+INCLUDE_VERSION                : 'INCLUDE_VERSION';
+INCLUDING                      : 'INCLUDING';
+INCREMENTAL                    : 'INCREMENTAL';
+INCREMENT                      : 'INCREMENT';
+INCR                           : 'INCR';
+INDENT                         : 'INDENT';
+INDEX_ASC                      : 'INDEX_ASC';
+INDEX_COMBINE                  : 'INDEX_COMBINE';
+INDEX_DESC                     : 'INDEX_DESC';
+INDEXED                        : 'INDEXED';
+INDEXES                        : 'INDEXES';
+INDEX_FFS                      : 'INDEX_FFS';
+INDEX_FILTER                   : 'INDEX_FILTER';
+INDEX                          : 'INDEX';
+INDEXING                       : 'INDEXING';
+INDEX_JOIN                     : 'INDEX_JOIN';
+INDEX_ROWS                     : 'INDEX_ROWS';
+INDEX_RRS                      : 'INDEX_RRS';
+INDEX_RS_ASC                   : 'INDEX_RS_ASC';
+INDEX_RS_DESC                  : 'INDEX_RS_DESC';
+INDEX_RS                       : 'INDEX_RS';
+INDEX_SCAN                     : 'INDEX_SCAN';
+INDEX_SKIP_SCAN                : 'INDEX_SKIP_SCAN';
+INDEX_SS_ASC                   : 'INDEX_SS_ASC';
+INDEX_SS_DESC                  : 'INDEX_SS_DESC';
+INDEX_SS                       : 'INDEX_SS';
+INDEX_STATS                    : 'INDEX_STATS';
+INDEXTYPE                      : 'INDEXTYPE';
+INDEXTYPES                     : 'INDEXTYPES';
+INDICATOR                      : 'INDICATOR';
+INDICES                        : 'INDICES';
+INFINITE                       : 'INFINITE';
+INFORMATIONAL                  : 'INFORMATIONAL';
+INHERIT                        : 'INHERIT';
+IN                             : 'IN';
+INITCAP                        : 'INITCAP';
+INITIAL                        : 'INITIAL';
+INITIALIZED                    : 'INITIALIZED';
+INITIALLY                      : 'INITIALLY';
+INITRANS                       : 'INITRANS';
+INLINE                         : 'INLINE';
+INLINE_XMLTYPE_NT              : 'INLINE_XMLTYPE_NT';
+INMEMORY                       : 'INMEMORY';
+IN_MEMORY_METADATA             : 'IN_MEMORY_METADATA';
+INMEMORY_PRUNING               : 'INMEMORY_PRUNING';
+INNER                          : 'INNER';
+INOUT                          : 'INOUT';
+INPLACE                        : 'INPLACE';
+INSERTCHILDXMLAFTER            : 'INSERTCHILDXMLAFTER';
+INSERTCHILDXMLBEFORE           : 'INSERTCHILDXMLBEFORE';
+INSERTCHILDXML                 : 'INSERTCHILDXML';
+INSERT                         : 'INSERT';
+INSERTXMLAFTER                 : 'INSERTXMLAFTER';
+INSERTXMLBEFORE                : 'INSERTXMLBEFORE';
+INSTANCE                       : 'INSTANCE';
+INSTANCES                      : 'INSTANCES';
+INSTANTIABLE                   : 'INSTANTIABLE';
+INSTANTLY                      : 'INSTANTLY';
+INSTEAD                        : 'INSTEAD';
+INSTR2                         : 'INSTR2';
+INSTR4                         : 'INSTR4';
+INSTRB                         : 'INSTRB';
+INSTRC                         : 'INSTRC';
+INSTR                          : 'INSTR';
+INTEGER                        : 'INTEGER';
+INTERLEAVED                    : 'INTERLEAVED';
+INTERMEDIATE                   : 'INTERMEDIATE';
+INTERNAL_CONVERT               : 'INTERNAL_CONVERT';
+INTERNAL_USE                   : 'INTERNAL_USE';
+INTERPRETED                    : 'INTERPRETED';
+INTERSECT                      : 'INTERSECT';
+INTERVAL                       : 'INTERVAL';
+INT                            : 'INT';
+INTO                           : 'INTO';
+INVALIDATE                     : 'INVALIDATE';
+INVALIDATION                   : 'INVALIDATION';
+INVISIBLE                      : 'INVISIBLE';
+IN_XQUERY                      : 'IN_XQUERY';
+IS                             : 'IS';
+IS_LEAF                        : 'IS_LEAF';
+ISOLATION                      : 'ISOLATION';
+ISOLATION_LEVEL                : 'ISOLATION_LEVEL';
+ITERATE                        : 'ITERATE';
+ITERATION_NUMBER               : 'ITERATION_NUMBER';
+JAVA                           : 'JAVA';
+JOB                            : 'JOB';
+JOIN                           : 'JOIN';
+JSON_ARRAYAGG                  : 'JSON_ARRAYAGG';
+JSON_ARRAY                     : 'JSON_ARRAY';
+JSON_EQUAL                     : 'JSON_EQUAL';
+JSON_EXISTS2                   : 'JSON_EXISTS2';
+JSON_EXISTS                    : 'JSON_EXISTS';
+JSONGET                        : 'JSONGET';
+JSON                           : 'JSON';
+JSON_OBJECTAGG                 : 'JSON_OBJECTAGG';
+JSON_OBJECT                    : 'JSON_OBJECT';
+JSONPARSE                      : 'JSONPARSE';
+JSON_QUERY                     : 'JSON_QUERY';
+JSON_SERIALIZE                 : 'JSON_SERIALIZE';
+JSON_TABLE                     : 'JSON_TABLE';
+JSON_TEXTCONTAINS2             : 'JSON_TEXTCONTAINS2';
+JSON_TEXTCONTAINS              : 'JSON_TEXTCONTAINS';
+JSON_TRANSFORM                 : 'JSON_TRANSFORM';
+JSON_VALUE                     : 'JSON_VALUE';
+K_LETTER                       : 'K';
+KEEP_DUPLICATES                : 'KEEP_DUPLICATES';
+KEEP                           : 'KEEP';
+KERBEROS                       : 'KERBEROS';
+KEY                            : 'KEY';
+KEY_LENGTH                     : 'KEY_LENGTH';
+KEYSIZE                        : 'KEYSIZE';
+KEYS                           : 'KEYS';
+KEYSTORE                       : 'KEYSTORE';
+KILL                           : 'KILL';
+LABEL                          : 'LABEL';
+LANGUAGE                       : 'LANGUAGE';
+LAST_DAY                       : 'LAST_DAY';
+LAST                           : 'LAST';
+LAST_VALUE                     : 'LAST_VALUE';
+LATERAL                        : 'LATERAL';
+LAX                            : 'LAX';
+LAYER                          : 'LAYER';
+LDAP_REGISTRATION_ENABLED      : 'LDAP_REGISTRATION_ENABLED';
+LDAP_REGISTRATION              : 'LDAP_REGISTRATION';
+LDAP_REG_SYNC_INTERVAL         : 'LDAP_REG_SYNC_INTERVAL';
+LEAF                           : 'LEAF';
+LEAD_CDB                       : 'LEAD_CDB';
+LEAD_CDB_URI                   : 'LEAD_CDB_URI';
+LEADING                        : 'LEADING';
+LEFT                           : 'LEFT';
+LENGTH2                        : 'LENGTH2';
+LENGTH4                        : 'LENGTH4';
+LENGTHB                        : 'LENGTHB';
+LENGTHC                        : 'LENGTHC';
+LENGTH                         : 'LENGTH';
+LESS                           : 'LESS';
+LEVEL                          : 'LEVEL';
+LEVEL_NAME                     : 'LEVEL_NAME';
+LEVELS                         : 'LEVELS';
+LIBRARY                        : 'LIBRARY';
+LIFECYCLE                      : 'LIFECYCLE';
+LIFE                           : 'LIFE';
+LIFETIME                       : 'LIFETIME';
+LIKE2                          : 'LIKE2';
+LIKE4                          : 'LIKE4';
+LIKEC                          : 'LIKEC';
+LIKE_EXPAND                    : 'LIKE_EXPAND';
+LIKE                           : 'LIKE';
+LIMIT                          : 'LIMIT';
+LINEAR                         : 'LINEAR';
+LINK                           : 'LINK';
+LIST                           : 'LIST';
+LN                             : 'LN';
+LNNVL                          : 'LNNVL';
+LOAD                           : 'LOAD';
+LOB                            : 'LOB';
+LOBNVL                         : 'LOBNVL';
+LOBS                           : 'LOBS';
+LOCAL_INDEXES                  : 'LOCAL_INDEXES';
+LOCAL                          : 'LOCAL';
+LOCALTIME                      : 'LOCALTIME';
+LOCALTIMESTAMP                 : 'LOCALTIMESTAMP';
+LOCATION                       : 'LOCATION';
+LOCATOR                        : 'LOCATOR';
+LOCKDOWN                       : 'LOCKDOWN';
+LOCKED                         : 'LOCKED';
+LOCKING                        : 'LOCKING';
+LOCK                           : 'LOCK';
+LOGFILE                        : 'LOGFILE';
+LOGFILES                       : 'LOGFILES';
+LOGGING                        : 'LOGGING';
+LOGICAL                        : 'LOGICAL';
+LOGICAL_READS_PER_CALL         : 'LOGICAL_READS_PER_CALL';
+LOGICAL_READS_PER_SESSION      : 'LOGICAL_READS_PER_SESSION';
+LOG                            : 'LOG';
+LOGMINING                      : 'LOGMINING';
+LOGOFF                         : 'LOGOFF';
+LOGON                          : 'LOGON';
+LOG_READ_ONLY_VIOLATIONS       : 'LOG_READ_ONLY_VIOLATIONS';
+LONG                           : 'LONG';
+LOOP                           : 'LOOP';
+LOST                           : 'LOST';
+LOWER                          : 'LOWER';
+LOW                            : 'LOW';
+LPAD                           : 'LPAD';
+LTRIM                          : 'LTRIM';
+M_LETTER                       : 'M';
+MAIN                           : 'MAIN';
+MAKE_REF                       : 'MAKE_REF';
+MANAGED                        : 'MANAGED';
+MANAGE                         : 'MANAGE';
+MANAGEMENT                     : 'MANAGEMENT';
+MANAGER                        : 'MANAGER';
+MANDATORY                      : 'MANDATORY';
+MANUAL                         : 'MANUAL';
+MAP                            : 'MAP';
+MAPPING                        : 'MAPPING';
+MASTER                         : 'MASTER';
+MATCHED                        : 'MATCHED';
+MATCHES                        : 'MATCHES';
+MATCH                          : 'MATCH';
+MATCH_NUMBER                   : 'MATCH_NUMBER';
+MATCH_RECOGNIZE                : 'MATCH_RECOGNIZE';
+MATERIALIZED                   : 'MATERIALIZED';
+MATERIALIZE                    : 'MATERIALIZE';
+MAXARCHLOGS                    : 'MAXARCHLOGS';
+MAXDATAFILES                   : 'MAXDATAFILES';
+MAXEXTENTS                     : 'MAXEXTENTS';
+MAXIMIZE                       : 'MAXIMIZE';
+MAXINSTANCES                   : 'MAXINSTANCES';
+MAXLOGFILES                    : 'MAXLOGFILES';
+MAXLOGHISTORY                  : 'MAXLOGHISTORY';
+MAXLOGMEMBERS                  : 'MAXLOGMEMBERS';
+MAX_SHARED_TEMP_SIZE           : 'MAX_SHARED_TEMP_SIZE';
+MAXSIZE                        : 'MAXSIZE';
+MAXTRANS                       : 'MAXTRANS';
+MAXVALUE                       : 'MAXVALUE';
+MEASURE                        : 'MEASURE';
+MEASURES                       : 'MEASURES';
+MEDIUM                         : 'MEDIUM';
+MEMBER                         : 'MEMBER';
+MEMBER_CAPTION                 : 'MEMBER_CAPTION';
+MEMBER_DESCRIPTION             : 'MEMBER_DESCRIPTION';
+MEMBER_NAME                    : 'MEMBER_NAME';
+MEMBER_UNIQUE_NAME             : 'MEMBER_UNIQUE_NAME';
+MEMCOMPRESS                    : 'MEMCOMPRESS';
+MEMORY                         : 'MEMORY';
+MERGEACTIONS                   : 'MERGE$ACTIONS';
+MERGE_AJ                       : 'MERGE_AJ';
+MERGE_CONST_ON                 : 'MERGE_CONST_ON';
+MERGE                          : 'MERGE';
+MERGE_SJ                       : 'MERGE_SJ';
+METADATA                       : 'METADATA';
+METHOD                         : 'METHOD';
+MIGRATE                        : 'MIGRATE';
+MIGRATION                      : 'MIGRATION';
+MINEXTENTS                     : 'MINEXTENTS';
+MINIMIZE                       : 'MINIMIZE';
+MINIMUM                        : 'MINIMUM';
+MINING                         : 'MINING';
+MINUS                          : 'MINUS';
+MINUS_NULL                     : 'MINUS_NULL';
+MINUTE                         : 'MINUTE';
+MINUTES                        : 'MINUTES';
+MINVALUE                       : 'MINVALUE';
+MIRRORCOLD                     : 'MIRRORCOLD';
+MIRRORHOT                      : 'MIRRORHOT';
+MIRROR                         : 'MIRROR';
+MISSING                        : 'MISSING';
+MISMATCH                       : 'MISMATCH';
+MLSLABEL                       : 'MLSLABEL';
+MODEL_COMPILE_SUBQUERY         : 'MODEL_COMPILE_SUBQUERY';
+MODEL_DONTVERIFY_UNIQUENESS    : 'MODEL_DONTVERIFY_UNIQUENESS';
+MODEL_DYNAMIC_SUBQUERY         : 'MODEL_DYNAMIC_SUBQUERY';
+MODEL_MIN_ANALYSIS             : 'MODEL_MIN_ANALYSIS';
+MODEL                          : 'MODEL';
+MODEL_NB                       : 'MODEL_NB';
+MODEL_NO_ANALYSIS              : 'MODEL_NO_ANALYSIS';
+MODEL_PBY                      : 'MODEL_PBY';
+MODEL_PUSH_REF                 : 'MODEL_PUSH_REF';
+MODEL_SV                       : 'MODEL_SV';
+MODE                           : 'MODE';
+MODIFICATION                   : 'MODIFICATION';
+MODIFY_COLUMN_TYPE             : 'MODIFY_COLUMN_TYPE';
+MODIFY                         : 'MODIFY';
+MOD                            : 'MOD';
+MODULE                         : 'MODULE';
+MONITORING                     : 'MONITORING';
+MONITOR                        : 'MONITOR';
+MONTH                          : 'MONTH';
+MONTHS_BETWEEN                 : 'MONTHS_BETWEEN';
+MONTHS                         : 'MONTHS';
+MOUNT                          : 'MOUNT';
+MOUNTPATH                      : 'MOUNTPATH';
+MOUNTPOINT                     : 'MOUNTPOINT';
+MOVEMENT                       : 'MOVEMENT';
+MOVE                           : 'MOVE';
+MULTIDIMENSIONAL               : 'MULTIDIMENSIONAL';
+MULTISET                       : 'MULTISET';
+MV_MERGE                       : 'MV_MERGE';
+NAMED                          : 'NAMED';
+NAME                           : 'NAME';
+NAMESPACE                      : 'NAMESPACE';
+NAN                            : 'NAN';
+NANVL                          : 'NANVL';
+NATIONAL                       : 'NATIONAL';
+NATIVE_FULL_OUTER_JOIN         : 'NATIVE_FULL_OUTER_JOIN';
+NATIVE                         : 'NATIVE';
+NATURAL                        : 'NATURAL';
+NATURALN                       : 'NATURALN';
+NAV                            : 'NAV';
+NCHAR_CS                       : 'NCHAR_CS';
+NCHAR                          : 'NCHAR';
+NCHR                           : 'NCHR';
+NCLOB                          : 'NCLOB';
+NEEDED                         : 'NEEDED';
+NEG                            : 'NEG';
+NESTED                         : 'NESTED';
+NESTED_TABLE_FAST_INSERT       : 'NESTED_TABLE_FAST_INSERT';
+NESTED_TABLE_GET_REFS          : 'NESTED_TABLE_GET_REFS';
+NESTED_TABLE_ID                : 'NESTED_TABLE_ID';
+NESTED_TABLE_SET_REFS          : 'NESTED_TABLE_SET_REFS';
+NESTED_TABLE_SET_SETID         : 'NESTED_TABLE_SET_SETID';
+NETWORK                        : 'NETWORK';
+NEVER                          : 'NEVER';
+NEW                            : 'NEW';
+NEW_TIME                       : 'NEW_TIME';
+NEXT_DAY                       : 'NEXT_DAY';
+NEXT                           : 'NEXT';
+NL_AJ                          : 'NL_AJ';
+NLJ_BATCHING                   : 'NLJ_BATCHING';
+NLJ_INDEX_FILTER               : 'NLJ_INDEX_FILTER';
+NLJ_INDEX_SCAN                 : 'NLJ_INDEX_SCAN';
+NLJ_PREFETCH                   : 'NLJ_PREFETCH';
+NLS_CALENDAR                   : 'NLS_CALENDAR';
+NLS_CHARACTERSET               : 'NLS_CHARACTERSET';
+NLS_CHARSET_DECL_LEN           : 'NLS_CHARSET_DECL_LEN';
+NLS_CHARSET_ID                 : 'NLS_CHARSET_ID';
+NLS_CHARSET_NAME               : 'NLS_CHARSET_NAME';
+NLS_COMP                       : 'NLS_COMP';
+NLS_CURRENCY                   : 'NLS_CURRENCY';
+NLS_DATE_FORMAT                : 'NLS_DATE_FORMAT';
+NLS_DATE_LANGUAGE              : 'NLS_DATE_LANGUAGE';
+NLS_INITCAP                    : 'NLS_INITCAP';
+NLS_ISO_CURRENCY               : 'NLS_ISO_CURRENCY';
+NL_SJ                          : 'NL_SJ';
+NLS_LANG                       : 'NLS_LANG';
+NLS_LANGUAGE                   : 'NLS_LANGUAGE';
+NLS_LENGTH_SEMANTICS           : 'NLS_LENGTH_SEMANTICS';
+NLS_LOWER                      : 'NLS_LOWER';
+NLS_NCHAR_CONV_EXCP            : 'NLS_NCHAR_CONV_EXCP';
+NLS_NUMERIC_CHARACTERS         : 'NLS_NUMERIC_CHARACTERS';
+NLS_SORT                       : 'NLS_SORT';
+NLSSORT                        : 'NLSSORT';
+NLS_SPECIAL_CHARS              : 'NLS_SPECIAL_CHARS';
+NLS_TERRITORY                  : 'NLS_TERRITORY';
+NLS_UPPER                      : 'NLS_UPPER';
+NO_ACCESS                      : 'NO_ACCESS';
+NO_ADAPTIVE_PLAN               : 'NO_ADAPTIVE_PLAN';
+NO_ANSI_REARCH                 : 'NO_ANSI_REARCH';
+NOAPPEND                       : 'NOAPPEND';
+NOARCHIVELOG                   : 'NOARCHIVELOG';
+NOAUDIT                        : 'NOAUDIT';
+NO_AUTO_REOPTIMIZE             : 'NO_AUTO_REOPTIMIZE';
+NO_BASETABLE_MULTIMV_REWRITE   : 'NO_BASETABLE_MULTIMV_REWRITE';
+NO_BATCH_TABLE_ACCESS_BY_ROWID : 'NO_BATCH_TABLE_ACCESS_BY_ROWID';
+NO_BIND_AWARE                  : 'NO_BIND_AWARE';
+NO_BUFFER                      : 'NO_BUFFER';
+NOCACHE                        : 'NOCACHE';
+NO_CARTESIAN                   : 'NO_CARTESIAN';
+NO_CHECK_ACL_REWRITE           : 'NO_CHECK_ACL_REWRITE';
+NO_CLUSTER_BY_ROWID            : 'NO_CLUSTER_BY_ROWID';
+NO_CLUSTERING                  : 'NO_CLUSTERING';
+NO_COALESCE_SQ                 : 'NO_COALESCE_SQ';
+NO_COMMON_DATA                 : 'NO_COMMON_DATA';
+NOCOMPRESS                     : 'NOCOMPRESS';
+NO_CONNECT_BY_CB_WHR_ONLY      : 'NO_CONNECT_BY_CB_WHR_ONLY';
+NO_CONNECT_BY_COMBINE_SW       : 'NO_CONNECT_BY_COMBINE_SW';
+NO_CONNECT_BY_COST_BASED       : 'NO_CONNECT_BY_COST_BASED';
+NO_CONNECT_BY_ELIM_DUPS        : 'NO_CONNECT_BY_ELIM_DUPS';
+NO_CONNECT_BY_FILTERING        : 'NO_CONNECT_BY_FILTERING';
+NOCOPY                         : 'NOCOPY';
+NO_COST_XML_QUERY_REWRITE      : 'NO_COST_XML_QUERY_REWRITE';
+NO_CPU_COSTING                 : 'NO_CPU_COSTING';
+NOCPU_COSTING                  : 'NOCPU_COSTING';
+NOCYCLE                        : 'NOCYCLE';
+NO_DATA_SECURITY_REWRITE       : 'NO_DATA_SECURITY_REWRITE';
+NO_DECORRELATE                 : 'NO_DECORRELATE';
+NODELAY                        : 'NODELAY';
+NO_DOMAIN_INDEX_FILTER         : 'NO_DOMAIN_INDEX_FILTER';
+NO_DST_UPGRADE_INSERT_CONV     : 'NO_DST_UPGRADE_INSERT_CONV';
+NO_ELIM_GROUPBY                : 'NO_ELIM_GROUPBY';
+NO_ELIMINATE_JOIN              : 'NO_ELIMINATE_JOIN';
+NO_ELIMINATE_OBY               : 'NO_ELIMINATE_OBY';
+NO_ELIMINATE_OUTER_JOIN        : 'NO_ELIMINATE_OUTER_JOIN';
+NOENTITYESCAPING               : 'NOENTITYESCAPING';
+NO_EXPAND_GSET_TO_UNION        : 'NO_EXPAND_GSET_TO_UNION';
+NO_EXPAND                      : 'NO_EXPAND';
+NO_EXPAND_TABLE                : 'NO_EXPAND_TABLE';
+NO_FACT                        : 'NO_FACT';
+NO_FACTORIZE_JOIN              : 'NO_FACTORIZE_JOIN';
+NO_FILTERING                   : 'NO_FILTERING';
+NOFORCE                        : 'NOFORCE';
+NO_FULL_OUTER_JOIN_TO_OUTER    : 'NO_FULL_OUTER_JOIN_TO_OUTER';
+NO_GATHER_OPTIMIZER_STATISTICS : 'NO_GATHER_OPTIMIZER_STATISTICS';
+NO_GBY_PUSHDOWN                : 'NO_GBY_PUSHDOWN';
+NOGUARANTEE                    : 'NOGUARANTEE';
+NO_INDEX_FFS                   : 'NO_INDEX_FFS';
+NO_INDEX                       : 'NO_INDEX';
+NO_INDEX_SS                    : 'NO_INDEX_SS';
+NO_INMEMORY                    : 'NO_INMEMORY';
+NO_INMEMORY_PRUNING            : 'NO_INMEMORY_PRUNING';
+NOKEEP                         : 'NOKEEP';
+NOSCALE                        : 'NOSCALE';
+NO_LOAD                        : 'NO_LOAD';
+NOLOCAL                        : 'NOLOCAL';
+NOLOGGING                      : 'NOLOGGING';
+NOMAPPING                      : 'NOMAPPING';
+NOMAXVALUE                     : 'NOMAXVALUE';
+NO_MERGE                       : 'NO_MERGE';
+NOMINIMIZE                     : 'NOMINIMIZE';
+NOMINVALUE                     : 'NOMINVALUE';
+NO_MODEL_PUSH_REF              : 'NO_MODEL_PUSH_REF';
+NO_MONITORING                  : 'NO_MONITORING';
+NOMONITORING                   : 'NOMONITORING';
+NO_MONITOR                     : 'NO_MONITOR';
+NO_MULTIMV_REWRITE             : 'NO_MULTIMV_REWRITE';
+NO_NATIVE_FULL_OUTER_JOIN      : 'NO_NATIVE_FULL_OUTER_JOIN';
+NONBLOCKING                    : 'NONBLOCKING';
+NONEDITIONABLE                 : 'NONEDITIONABLE';
+NONE                           : 'NONE';
+NO_NLJ_BATCHING                : 'NO_NLJ_BATCHING';
+NO_NLJ_PREFETCH                : 'NO_NLJ_PREFETCH';
+NO                             : 'NO';
+NONSCHEMA                      : 'NONSCHEMA';
+NO_OBJECT_LINK                 : 'NO_OBJECT_LINK';
+NOORDER                        : 'NOORDER';
+NO_ORDER_ROLLUPS               : 'NO_ORDER_ROLLUPS';
+NO_OUTER_JOIN_TO_ANTI          : 'NO_OUTER_JOIN_TO_ANTI';
+NO_OUTER_JOIN_TO_INNER         : 'NO_OUTER_JOIN_TO_INNER';
+NOOVERRIDE                     : 'NOOVERRIDE';
+NO_PARALLEL_INDEX              : 'NO_PARALLEL_INDEX';
+NOPARALLEL_INDEX               : 'NOPARALLEL_INDEX';
+NO_PARALLEL                    : 'NO_PARALLEL';
+NOPARALLEL                     : 'NOPARALLEL';
+NO_PARTIAL_COMMIT              : 'NO_PARTIAL_COMMIT';
+NO_PARTIAL_JOIN                : 'NO_PARTIAL_JOIN';
+NO_PARTIAL_ROLLUP_PUSHDOWN     : 'NO_PARTIAL_ROLLUP_PUSHDOWN';
+NOPARTITION                    : 'NOPARTITION';
+NO_PLACE_DISTINCT              : 'NO_PLACE_DISTINCT';
+NO_PLACE_GROUP_BY              : 'NO_PLACE_GROUP_BY';
+NO_PQ_CONCURRENT_UNION         : 'NO_PQ_CONCURRENT_UNION';
+NO_PQ_MAP                      : 'NO_PQ_MAP';
+NOPROMPT                       : 'NOPROMPT';
+NO_PQ_REPLICATE                : 'NO_PQ_REPLICATE';
+NO_PQ_SKEW                     : 'NO_PQ_SKEW';
+NO_PRUNE_GSETS                 : 'NO_PRUNE_GSETS';
+NO_PULL_PRED                   : 'NO_PULL_PRED';
+NO_PUSH_PRED                   : 'NO_PUSH_PRED';
+NO_PUSH_SUBQ                   : 'NO_PUSH_SUBQ';
+NO_PX_FAULT_TOLERANCE          : 'NO_PX_FAULT_TOLERANCE';
+NO_PX_JOIN_FILTER              : 'NO_PX_JOIN_FILTER';
+NO_QKN_BUFF                    : 'NO_QKN_BUFF';
+NO_QUERY_TRANSFORMATION        : 'NO_QUERY_TRANSFORMATION';
+NO_REF_CASCADE                 : 'NO_REF_CASCADE';
+NORELOCATE                     : 'NORELOCATE';
+NORELY                         : 'NORELY';
+NOREPAIR                       : 'NOREPAIR';
+NOREPLAY                       : 'NOREPLAY';
+NORESETLOGS                    : 'NORESETLOGS';
+NO_RESULT_CACHE                : 'NO_RESULT_CACHE';
+NOREVERSE                      : 'NOREVERSE';
+NO_REWRITE                     : 'NO_REWRITE';
+NOREWRITE                      : 'NOREWRITE';
+NORMAL                         : 'NORMAL';
+NO_ROOT_SW_FOR_LOCAL           : 'NO_ROOT_SW_FOR_LOCAL';
+NOROWDEPENDENCIES              : 'NOROWDEPENDENCIES';
+NOSCHEMACHECK                  : 'NOSCHEMACHECK';
+NOSEGMENT                      : 'NOSEGMENT';
+NO_SEMIJOIN                    : 'NO_SEMIJOIN';
+NO_SEMI_TO_INNER               : 'NO_SEMI_TO_INNER';
+NO_SET_TO_JOIN                 : 'NO_SET_TO_JOIN';
+NOSORT                         : 'NOSORT';
+NO_SQL_TRANSLATION             : 'NO_SQL_TRANSLATION';
+NO_SQL_TUNE                    : 'NO_SQL_TUNE';
+NO_STAR_TRANSFORMATION         : 'NO_STAR_TRANSFORMATION';
+NO_STATEMENT_QUEUING           : 'NO_STATEMENT_QUEUING';
+NO_STATS_GSETS                 : 'NO_STATS_GSETS';
+NOSTRICT                       : 'NOSTRICT';
+NO_SUBQUERY_PRUNING            : 'NO_SUBQUERY_PRUNING';
+NO_SUBSTRB_PAD                 : 'NO_SUBSTRB_PAD';
+NO_SWAP_JOIN_INPUTS            : 'NO_SWAP_JOIN_INPUTS';
+NOSWITCH                       : 'NOSWITCH';
+NO_TABLE_LOOKUP_BY_NL          : 'NO_TABLE_LOOKUP_BY_NL';
+NO_TEMP_TABLE                  : 'NO_TEMP_TABLE';
+NOTHING                        : 'NOTHING';
+NOTIFICATION                   : 'NOTIFICATION';
+NOT                            : 'NOT';
+NO_TRANSFORM_DISTINCT_AGG      : 'NO_TRANSFORM_DISTINCT_AGG';
+NO_UNNEST                      : 'NO_UNNEST';
+NO_USE_CUBE                    : 'NO_USE_CUBE';
+NO_USE_HASH_AGGREGATION        : 'NO_USE_HASH_AGGREGATION';
+NO_USE_HASH_GBY_FOR_PUSHDOWN   : 'NO_USE_HASH_GBY_FOR_PUSHDOWN';
+NO_USE_HASH                    : 'NO_USE_HASH';
+NO_USE_INVISIBLE_INDEXES       : 'NO_USE_INVISIBLE_INDEXES';
+NO_USE_MERGE                   : 'NO_USE_MERGE';
+NO_USE_NL                      : 'NO_USE_NL';
+NO_USE_VECTOR_AGGREGATION      : 'NO_USE_VECTOR_AGGREGATION';
+NOVALIDATE                     : 'NOVALIDATE';
+NO_VECTOR_TRANSFORM_DIMS       : 'NO_VECTOR_TRANSFORM_DIMS';
+NO_VECTOR_TRANSFORM_FACT       : 'NO_VECTOR_TRANSFORM_FACT';
+NO_VECTOR_TRANSFORM            : 'NO_VECTOR_TRANSFORM';
+NOWAIT                         : 'NOWAIT';
+NO_XDB_FASTPATH_INSERT         : 'NO_XDB_FASTPATH_INSERT';
+NO_XML_DML_REWRITE             : 'NO_XML_DML_REWRITE';
+NO_XMLINDEX_REWRITE_IN_SELECT  : 'NO_XMLINDEX_REWRITE_IN_SELECT';
+NO_XMLINDEX_REWRITE            : 'NO_XMLINDEX_REWRITE';
+NO_XML_QUERY_REWRITE           : 'NO_XML_QUERY_REWRITE';
+NO_ZONEMAP                     : 'NO_ZONEMAP';
+NTH_VALUE                      : 'NTH_VALUE';
+NULLIF                         : 'NULLIF';
+NULL_                          : 'NULL';
+NULLS                          : 'NULLS';
+NUMBER                         : 'NUMBER';
+NUMERIC                        : 'NUMERIC';
+NUM_INDEX_KEYS                 : 'NUM_INDEX_KEYS';
+NUMTODSINTERVAL                : 'NUMTODSINTERVAL';
+NUMTOYMINTERVAL                : 'NUMTOYMINTERVAL';
+NVARCHAR2                      : 'NVARCHAR2';
+NVL2                           : 'NVL2';
+OBJECT2XML                     : 'OBJECT2XML';
+OBJECT                         : 'OBJECT';
+OBJ_ID                         : 'OBJ_ID';
+OBJNO                          : 'OBJNO';
+OBJNO_REUSE                    : 'OBJNO_REUSE';
+OCCURENCES                     : 'OCCURENCES';
+OFFLINE                        : 'OFFLINE';
+OFF                            : 'OFF';
+OFFSET                         : 'OFFSET';
+OF                             : 'OF';
+OIDINDEX                       : 'OIDINDEX';
+OID                            : 'OID';
+OLAP                           : 'OLAP';
+OLD                            : 'OLD';
+OLD_PUSH_PRED                  : 'OLD_PUSH_PRED';
+OLS                            : 'OLS';
+OLTP                           : 'OLTP';
+OMIT                           : 'OMIT';
+ONE                            : 'ONE';
+ONLINE                         : 'ONLINE';
+ONLINELOG                      : 'ONLINELOG';
+ONLY                           : 'ONLY';
+ON                             : 'ON';
+OPAQUE                         : 'OPAQUE';
+OPAQUE_TRANSFORM               : 'OPAQUE_TRANSFORM';
+OPAQUE_XCANONICAL              : 'OPAQUE_XCANONICAL';
+OPCODE                         : 'OPCODE';
+OPEN                           : 'OPEN';
+OPERATIONS                     : 'OPERATIONS';
+OPERATOR                       : 'OPERATOR';
+OPT_ESTIMATE                   : 'OPT_ESTIMATE';
+OPTIMAL                        : 'OPTIMAL';
+OPTIMIZE                       : 'OPTIMIZE';
+OPTIMIZER_FEATURES_ENABLE      : 'OPTIMIZER_FEATURES_ENABLE';
+OPTIMIZER_GOAL                 : 'OPTIMIZER_GOAL';
+OPTION                         : 'OPTION';
+OPT_PARAM                      : 'OPT_PARAM';
+ORA_BRANCH                     : 'ORA_BRANCH';
+ORA_CHECK_ACL                  : 'ORA_CHECK_ACL';
+ORA_CHECK_PRIVILEGE            : 'ORA_CHECK_PRIVILEGE';
+ORA_CLUSTERING                 : 'ORA_CLUSTERING';
+ORADATA                        : 'ORADATA';
+ORADEBUG                       : 'ORADEBUG';
+ORA_DST_AFFECTED               : 'ORA_DST_AFFECTED';
+ORA_DST_CONVERT                : 'ORA_DST_CONVERT';
+ORA_DST_ERROR                  : 'ORA_DST_ERROR';
+ORA_GET_ACLIDS                 : 'ORA_GET_ACLIDS';
+ORA_GET_PRIVILEGES             : 'ORA_GET_PRIVILEGES';
+ORA_HASH                       : 'ORA_HASH';
+ORA_INVOKING_USERID            : 'ORA_INVOKING_USERID';
+ORA_INVOKING_USER              : 'ORA_INVOKING_USER';
+ORA_INVOKING_XS_USER_GUID      : 'ORA_INVOKING_XS_USER_GUID';
+ORA_INVOKING_XS_USER           : 'ORA_INVOKING_XS_USER';
+ORA_RAWCOMPARE                 : 'ORA_RAWCOMPARE';
+ORA_RAWCONCAT                  : 'ORA_RAWCONCAT';
+ORA_ROWSCN                     : 'ORA_ROWSCN';
+ORA_ROWSCN_RAW                 : 'ORA_ROWSCN_RAW';
+ORA_ROWVERSION                 : 'ORA_ROWVERSION';
+ORA_TABVERSION                 : 'ORA_TABVERSION';
+ORA_WRITE_TIME                 : 'ORA_WRITE_TIME';
+ORDERED                        : 'ORDERED';
+ORDERED_PREDICATES             : 'ORDERED_PREDICATES';
+ORDER                          : 'ORDER';
+ORDINALITY                     : 'ORDINALITY';
+OR_EXPAND                      : 'OR_EXPAND';
+ORGANIZATION                   : 'ORGANIZATION';
+OR                             : 'OR';
+OR_PREDICATES                  : 'OR_PREDICATES';
+OSERROR                        : 'OSERROR';
+OTHER                          : 'OTHER';
+OUTER_JOIN_TO_ANTI             : 'OUTER_JOIN_TO_ANTI';
+OUTER_JOIN_TO_INNER            : 'OUTER_JOIN_TO_INNER';
+OUTER                          : 'OUTER';
+OUTLINE_LEAF                   : 'OUTLINE_LEAF';
+OUTLINE                        : 'OUTLINE';
+OUT_OF_LINE                    : 'OUT_OF_LINE';
+OUT                            : 'OUT';
+OVERFLOW_NOMOVE                : 'OVERFLOW_NOMOVE';
+OVERFLOW                       : 'OVERFLOW';
+OVERLAPS                       : 'OVERLAPS';
+OVER                           : 'OVER';
+OVERRIDING                     : 'OVERRIDING';
+OWNER                          : 'OWNER';
+OWNERSHIP                      : 'OWNERSHIP';
+OWN                            : 'OWN';
+P_LETTER                       : 'P';
+PACKAGE                        : 'PACKAGE';
+PACKAGES                       : 'PACKAGES';
+PARALLEL_ENABLE                : 'PARALLEL_ENABLE';
+PARALLEL_INDEX                 : 'PARALLEL_INDEX';
+PARALLEL                       : 'PARALLEL';
+PARAMETERFILE                  : 'PARAMETERFILE';
+PARAMETERS                     : 'PARAMETERS';
+PARAM                          : 'PARAM';
+PARENT                         : 'PARENT';
+PARENT_LEVEL_NAME              : 'PARENT_LEVEL_NAME';
+PARENT_UNIQUE_NAME             : 'PARENT_UNIQUE_NAME';
+PARITY                         : 'PARITY';
+PARTIAL_JOIN                   : 'PARTIAL_JOIN';
+PARTIALLY                      : 'PARTIALLY';
+PARTIAL                        : 'PARTIAL';
+PARTIAL_ROLLUP_PUSHDOWN        : 'PARTIAL_ROLLUP_PUSHDOWN';
+PARTITION_HASH                 : 'PARTITION_HASH';
+PARTITION_LIST                 : 'PARTITION_LIST';
+PARTITION                      : 'PARTITION';
+PARTITION_RANGE                : 'PARTITION_RANGE';
+PARTITIONS                     : 'PARTITIONS';
+PARTNUMINST                    : 'PART$NUM$INST';
+PASSING                        : 'PASSING';
+PASSWORD_GRACE_TIME            : 'PASSWORD_GRACE_TIME';
+PASSWORD_LIFE_TIME             : 'PASSWORD_LIFE_TIME';
+PASSWORD_LOCK_TIME             : 'PASSWORD_LOCK_TIME';
+PASSWORD                       : 'PASSWORD';
+PASSWORD_REUSE_MAX             : 'PASSWORD_REUSE_MAX';
+PASSWORD_REUSE_TIME            : 'PASSWORD_REUSE_TIME';
+PASSWORD_ROLLOVER_TIME         : 'PASSWORD_ROLLOVER_TIME';
+PASSWORD_VERIFY_FUNCTION       : 'PASSWORD_VERIFY_FUNCTION';
+PAST                           : 'PAST';
+PATCH                          : 'PATCH';
+PATH                           : 'PATH';
+PATH_PREFIX                    : 'PATH_PREFIX';
+PATHS                          : 'PATHS';
+PATTERN                        : 'PATTERN';
+PBL_HS_BEGIN                   : 'PBL_HS_BEGIN';
+PBL_HS_END                     : 'PBL_HS_END';
+PCTFREE                        : 'PCTFREE';
+PCTINCREASE                    : 'PCTINCREASE';
+PCTTHRESHOLD                   : 'PCTTHRESHOLD';
+PCTUSED                        : 'PCTUSED';
+PCTVERSION                     : 'PCTVERSION';
+PENDING                        : 'PENDING';
+PERCENT_FOUND                  : '%' SPACE* 'FOUND';
+PERCENT_ISOPEN                 : '%' SPACE* 'ISOPEN';
+PERCENT_NOTFOUND               : '%' SPACE* 'NOTFOUND';
+PERCENT_KEYWORD                : 'PERCENT';
+PERCENT_RANKM                  : 'PERCENT_RANKM';
+PERCENT_ROWCOUNT               : '%' SPACE* 'ROWCOUNT';
+PERCENT_ROWTYPE                : '%' SPACE* 'ROWTYPE';
+PERCENT_TYPE                   : '%' SPACE* 'TYPE';
+PERCENT_BULK_EXCEPTIONS        : '%' SPACE* 'BULK_EXCEPTIONS';
+PERCENT_BULK_ROWCOUNT          : '%' SPACE* 'BULK_ROWCOUNT';
+PERFORMANCE                    : 'PERFORMANCE';
+PERIOD_KEYWORD                 : 'PERIOD';
+PERMANENT                      : 'PERMANENT';
+PERMISSION                     : 'PERMISSION';
+PERMUTE                        : 'PERMUTE';
+PER                            : 'PER';
+PFILE                          : 'PFILE';
+PHYSICAL                       : 'PHYSICAL';
+PIKEY                          : 'PIKEY';
+PIPELINED                      : 'PIPELINED';
+PIPE                           : 'PIPE';
+PIV_GB                         : 'PIV_GB';
+PIVOT                          : 'PIVOT';
+PIV_SSF                        : 'PIV_SSF';
+PLACE_DISTINCT                 : 'PLACE_DISTINCT';
+PLACE_GROUP_BY                 : 'PLACE_GROUP_BY';
+PLAN                           : 'PLAN';
+PLSCOPE_SETTINGS               : 'PLSCOPE_SETTINGS';
+PLS_INTEGER                    : 'PLS_INTEGER';
+PLSQL_CCFLAGS                  : 'PLSQL_CCFLAGS';
+PLSQL_CODE_TYPE                : 'PLSQL_CODE_TYPE';
+PLSQL_DEBUG                    : 'PLSQL_DEBUG';
+PLSQL_OPTIMIZE_LEVEL           : 'PLSQL_OPTIMIZE_LEVEL';
+PLSQL_WARNINGS                 : 'PLSQL_WARNINGS';
+PLUGGABLE                      : 'PLUGGABLE';
+PMEM                           : 'PMEM';
+POINT                          : 'POINT';
+POLICY                         : 'POLICY';
+POOL_16K                       : 'POOL_16K';
+POOL_2K                        : 'POOL_2K';
+POOL_32K                       : 'POOL_32K';
+POOL_4K                        : 'POOL_4K';
+POOL_8K                        : 'POOL_8K';
+POSITIVEN                      : 'POSITIVEN';
+POSITIVE                       : 'POSITIVE';
+POST_TRANSACTION               : 'POST_TRANSACTION';
+POWERMULTISET_BY_CARDINALITY   : 'POWERMULTISET_BY_CARDINALITY';
+POWERMULTISET                  : 'POWERMULTISET';
+POWER                          : 'POWER';
+PQ_CONCURRENT_UNION            : 'PQ_CONCURRENT_UNION';
+PQ_DISTRIBUTE                  : 'PQ_DISTRIBUTE';
+PQ_DISTRIBUTE_WINDOW           : 'PQ_DISTRIBUTE_WINDOW';
+PQ_FILTER                      : 'PQ_FILTER';
+PQ_MAP                         : 'PQ_MAP';
+PQ_NOMAP                       : 'PQ_NOMAP';
+PQ_REPLICATE                   : 'PQ_REPLICATE';
+PQ_SKEW                        : 'PQ_SKEW';
+PRAGMA                         : 'PRAGMA';
+PREBUILT                       : 'PREBUILT';
+PRECEDES                       : 'PRECEDES';
+PRECEDING                      : 'PRECEDING';
+PRECISION                      : 'PRECISION';
+PRECOMPUTE_SUBQUERY            : 'PRECOMPUTE_SUBQUERY';
+PREDICATE_REORDERS             : 'PREDICATE_REORDERS';
+PRELOAD                        : 'PRELOAD';
+PREPARE                        : 'PREPARE';
+PRESENTNNV                     : 'PRESENTNNV';
+PRESENT                        : 'PRESENT';
+PRESENTV                       : 'PRESENTV';
+PRESERVE_OID                   : 'PRESERVE_OID';
+PRESERVE                       : 'PRESERVE';
+PRETTY                         : 'PRETTY';
+PREVIOUS                       : 'PREVIOUS';
+PREV                           : 'PREV';
+PRIMARY                        : 'PRIMARY';
+PRINTBLOBTOCLOB                : 'PRINTBLOBTOCLOB';
+PRIORITY                       : 'PRIORITY';
+PRIOR                          : 'PRIOR';
+PRIVATE                        : 'PRIVATE';
+PRIVATE_SGA                    : 'PRIVATE_SGA';
+PRIVILEGED                     : 'PRIVILEGED';
+PRIVILEGE                      : 'PRIVILEGE';
+PRIVILEGES                     : 'PRIVILEGES';
+PROCEDURAL                     : 'PROCEDURAL';
+PROCEDURE                      : 'PROCEDURE';
+PROCESS                        : 'PROCESS';
+PROFILE                        : 'PROFILE';
+PROGRAM                        : 'PROGRAM';
+PROJECT                        : 'PROJECT';
+PROPAGATE                      : 'PROPAGATE';
+PROPERTY                       : 'PROPERTY';
+PROTECTED                      : 'PROTECTED';
+PROTECTION                     : 'PROTECTION';
+PROTOCOL                       : 'PROTOCOL';
+PROXY                          : 'PROXY';
+PRUNING                        : 'PRUNING';
+PUBLIC                         : 'PUBLIC';
+PULL_PRED                      : 'PULL_PRED';
+PURGE                          : 'PURGE';
+PUSH_PRED                      : 'PUSH_PRED';
+PUSH_SUBQ                      : 'PUSH_SUBQ';
+PX_FAULT_TOLERANCE             : 'PX_FAULT_TOLERANCE';
+PX_GRANULE                     : 'PX_GRANULE';
+PX_JOIN_FILTER                 : 'PX_JOIN_FILTER';
+QB_NAME                        : 'QB_NAME';
+QUARTERS                       : 'QUARTERS';
+QUERY_BLOCK                    : 'QUERY_BLOCK';
+QUERY                          : 'QUERY';
+QUEUE_CURR                     : 'QUEUE_CURR';
+QUEUE                          : 'QUEUE';
+QUEUE_ROWP                     : 'QUEUE_ROWP';
+QUIESCE                        : 'QUIESCE';
+QUORUM                         : 'QUORUM';
+QUOTA                          : 'QUOTA';
+QUOTAGROUP                     : 'QUOTAGROUP';
+RAISE                          : 'RAISE';
+RANDOM_LOCAL                   : 'RANDOM_LOCAL';
+RANDOM                         : 'RANDOM';
+RANGE                          : 'RANGE';
+RANKM                          : 'RANKM';
+RAPIDLY                        : 'RAPIDLY';
+RAW                            : 'RAW';
+RAWTOHEX                       : 'RAWTOHEX';
+RAWTONHEX                      : 'RAWTONHEX';
+RBA                            : 'RBA';
+RBO_OUTLINE                    : 'RBO_OUTLINE';
+RDBA                           : 'RDBA';
+READ                           : 'READ';
+READS                          : 'READS';
+REALM                          : 'REALM';
+REAL                           : 'REAL';
+REBALANCE                      : 'REBALANCE';
+REBUILD                        : 'REBUILD';
+RECORD                         : 'RECORD';
+RECORDS_PER_BLOCK              : 'RECORDS_PER_BLOCK';
+RECOVERABLE                    : 'RECOVERABLE';
+RECOVER                        : 'RECOVER';
+RECOVERY                       : 'RECOVERY';
+RECYCLEBIN                     : 'RECYCLEBIN';
+RECYCLE                        : 'RECYCLE';
+REDACTION                      : 'REDACTION';
+REDEFINE                       : 'REDEFINE';
+REDO                           : 'REDO';
+REDUCED                        : 'REDUCED';
+REDUNDANCY                     : 'REDUNDANCY';
+REF_CASCADE_CURSOR             : 'REF_CASCADE_CURSOR';
+REFERENCED                     : 'REFERENCED';
+REFERENCE                      : 'REFERENCE';
+REFERENCES                     : 'REFERENCES';
+REFERENCING                    : 'REFERENCING';
+REF                            : 'REF';
+REFRESH                        : 'REFRESH';
+REFTOHEX                       : 'REFTOHEX';
+REGEXP_COUNT                   : 'REGEXP_COUNT';
+REGEXP_INSTR                   : 'REGEXP_INSTR';
+REGEXP_LIKE                    : 'REGEXP_LIKE';
+REGEXP_REPLACE                 : 'REGEXP_REPLACE';
+REGEXP_SUBSTR                  : 'REGEXP_SUBSTR';
+REGISTER                       : 'REGISTER';
+REGR_AVGX                      : 'REGR_AVGX';
+REGR_AVGY                      : 'REGR_AVGY';
+REGR_COUNT                     : 'REGR_COUNT';
+REGR_INTERCEPT                 : 'REGR_INTERCEPT';
+REGR_R2                        : 'REGR_R2';
+REGR_SLOPE                     : 'REGR_SLOPE';
+REGR_SXX                       : 'REGR_SXX';
+REGR_SXY                       : 'REGR_SXY';
+REGR_SYY                       : 'REGR_SYY';
+REGULAR                        : 'REGULAR';
+REJECT                         : 'REJECT';
+REKEY                          : 'REKEY';
+RELATIONAL                     : 'RELATIONAL';
+RELIES_ON                      : 'RELIES_ON';
+RELOCATE                       : 'RELOCATE';
+RELY                           : 'RELY';
+REMAINDER                      : 'REMAINDER';
+REMOTE                         : 'REMOTE';
+REMOTE_MAPPED                  : 'REMOTE_MAPPED';
+REMOVE                         : 'REMOVE';
+RENAME                         : 'RENAME';
+REPAIR                         : 'REPAIR';
+REPEAT                         : 'REPEAT';
+REPLACE                        : 'REPLACE';
+REPLICATION                    : 'REPLICATION';
+REQUIRED                       : 'REQUIRED';
+RESETLOGS                      : 'RESETLOGS';
+RESET                          : 'RESET';
+RESIZE                         : 'RESIZE';
+RESOLVE                        : 'RESOLVE';
+RESOLVER                       : 'RESOLVER';
+RESOURCE                       : 'RESOURCE';
+RESPECT                        : 'RESPECT';
+RESTART                        : 'RESTART';
+RESTORE_AS_INTERVALS           : 'RESTORE_AS_INTERVALS';
+RESTORE                        : 'RESTORE';
+RESTRICT_ALL_REF_CONS          : 'RESTRICT_ALL_REF_CONS';
+RESTRICTED                     : 'RESTRICTED';
+RESTRICT_REFERENCES            : 'RESTRICT_REFERENCES';
+RESTRICT                       : 'RESTRICT';
+RESULT_CACHE                   : 'RESULT_CACHE';
+RESULT                         : 'RESULT';
+RESUMABLE                      : 'RESUMABLE';
+RESUME                         : 'RESUME';
+RETENTION                      : 'RETENTION';
+RETRY_ON_ROW_CHANGE            : 'RETRY_ON_ROW_CHANGE';
+RETURNING                      : 'RETURNING';
+RETURN                         : 'RETURN';
+REUSE                          : 'REUSE';
+REVERSE                        : 'REVERSE';
+REVOKE                         : 'REVOKE';
+REWRITE_OR_ERROR               : 'REWRITE_OR_ERROR';
+REWRITE                        : 'REWRITE';
+RIGHT                          : 'RIGHT';
+ROLE                           : 'ROLE';
+ROLESET                        : 'ROLESET';
+ROLES                          : 'ROLES';
+ROLLBACK                       : 'ROLLBACK';
+ROLLING                        : 'ROLLING';
+ROLLUP                         : 'ROLLUP';
+ROWDEPENDENCIES                : 'ROWDEPENDENCIES';
+ROWID_MAPPING_TABLE            : 'ROWID_MAPPING_TABLE';
+ROWID                          : 'ROWID';
+ROWIDTOCHAR                    : 'ROWIDTOCHAR';
+ROWIDTONCHAR                   : 'ROWIDTONCHAR';
+ROW_LENGTH                     : 'ROW_LENGTH';
+ROWNUM                         : 'ROWNUM';
+ROW                            : 'ROW';
+ROWS                           : 'ROWS';
+RPAD                           : 'RPAD';
+RTRIM                          : 'RTRIM';
+RULE                           : 'RULE';
+RULES                          : 'RULES';
+RUNNING                        : 'RUNNING';
+SALT                           : 'SALT';
+SAMPLE                         : 'SAMPLE';
+SAVE_AS_INTERVALS              : 'SAVE_AS_INTERVALS';
+SAVEPOINT                      : 'SAVEPOINT';
+SAVE                           : 'SAVE';
+SB4                            : 'SB4';
+SCALE_ROWS                     : 'SCALE_ROWS';
+SCALE                          : 'SCALE';
+SCAN_INSTANCES                 : 'SCAN_INSTANCES';
+SCAN                           : 'SCAN';
+SCHEDULER                      : 'SCHEDULER';
+SCHEMACHECK                    : 'SCHEMACHECK';
+SCHEMA                         : 'SCHEMA';
+SCN_ASCENDING                  : 'SCN_ASCENDING';
+SCN                            : 'SCN';
+SCOPE                          : 'SCOPE';
+SCRUB                          : 'SCRUB';
+SD_ALL                         : 'SD_ALL';
+SD_INHIBIT                     : 'SD_INHIBIT';
+SDO_GEOM_MBR                   : 'SDO_GEOM_MBR';
+SDO_GEOMETRY                   : 'SDO_GEOMETRY';
+SD_SHOW                        : 'SD_SHOW';
+SEARCH                         : 'SEARCH';
+SECOND                         : 'SECOND';
+SECONDS                        : 'SECONDS';
+SECRET                         : 'SECRET';
+SECUREFILE_DBA                 : 'SECUREFILE_DBA';
+SECUREFILE                     : 'SECUREFILE';
+SECURITY                       : 'SECURITY';
+SEED                           : 'SEED';
+SEG_BLOCK                      : 'SEG_BLOCK';
+SEG_FILE                       : 'SEG_FILE';
+SEGMENT                        : 'SEGMENT';
+SELECTIVITY                    : 'SELECTIVITY';
+SELECT                         : 'SELECT';
+SELF                           : 'SELF';
+SEMIJOIN_DRIVER                : 'SEMIJOIN_DRIVER';
+SEMIJOIN                       : 'SEMIJOIN';
+SEMI_TO_INNER                  : 'SEMI_TO_INNER';
+SEQUENCED                      : 'SEQUENCED';
+SEQUENCE                       : 'SEQUENCE';
+SEQUENTIAL                     : 'SEQUENTIAL';
+SEQ                            : 'SEQ';
+SERIALIZABLE                   : 'SERIALIZABLE';
+SERIALLY_REUSABLE              : 'SERIALLY_REUSABLE';
+SERIAL                         : 'SERIAL';
+SERVERERROR                    : 'SERVERERROR';
+SERVICE_NAME_CONVERT           : 'SERVICE_NAME_CONVERT';
+SERVICE                        : 'SERVICE';
+SERVICES                       : 'SERVICES';
+SESSION_CACHED_CURSORS         : 'SESSION_CACHED_CURSORS';
+SESSION                        : 'SESSION';
+SESSIONS_PER_USER              : 'SESSIONS_PER_USER';
+SESSIONTIMEZONE                : 'SESSIONTIMEZONE';
+SESSIONTZNAME                  : 'SESSIONTZNAME';
+SET                            : 'SET';
+SETS                           : 'SETS';
+SETTINGS                       : 'SETTINGS';
+SET_TO_JOIN                    : 'SET_TO_JOIN';
+SEVERE                         : 'SEVERE';
+SHARDSPACE                     : 'SHARDSPACE';
+SHARED_POOL                    : 'SHARED_POOL';
+SHARED                         : 'SHARED';
+SHARE                          : 'SHARE';
+SHARING                        : 'SHARING';
+SHELFLIFE                      : 'SHELFLIFE';
+SHOW                           : 'SHOW';
+SHRINK                         : 'SHRINK';
+SHUTDOWN                       : 'SHUTDOWN';
+SIBLINGS                       : 'SIBLINGS';
+SID                            : 'SID';
+SITE                           : 'SITE';
+SIGNAL_COMPONENT               : 'SIGNAL_COMPONENT';
+SIGNAL_FUNCTION                : 'SIGNAL_FUNCTION';
+SIGN                           : 'SIGN';
+SIGNTYPE                       : 'SIGNTYPE';
+SIMPLE_INTEGER                 : 'SIMPLE_INTEGER';
+SIMPLE                         : 'SIMPLE';
+SINGLE                         : 'SINGLE';
+SINGLETASK                     : 'SINGLETASK';
+SINH                           : 'SINH';
+SIN                            : 'SIN';
+SIZE                           : 'SIZE';
+SKIP_EXT_OPTIMIZER             : 'SKIP_EXT_OPTIMIZER';
+SKIP_                          : 'SKIP';
+SKIP_UNQ_UNUSABLE_IDX          : 'SKIP_UNQ_UNUSABLE_IDX';
+SKIP_UNUSABLE_INDEXES          : 'SKIP_UNUSABLE_INDEXES';
+SMALLFILE                      : 'SMALLFILE';
+SMALLINT                       : 'SMALLINT';
+SNAPSHOT                       : 'SNAPSHOT';
+SOME                           : 'SOME';
+SORT                           : 'SORT';
+SOUNDEX                        : 'SOUNDEX';
+SOURCE_FILE_DIRECTORY          : 'SOURCE_FILE_DIRECTORY';
+SOURCE_FILE_NAME_CONVERT       : 'SOURCE_FILE_NAME_CONVERT';
+SOURCE                         : 'SOURCE';
+SPACE_KEYWORD                  : 'SPACE';
+SPECIFICATION                  : 'SPECIFICATION';
+SPFILE                         : 'SPFILE';
+SPLIT                          : 'SPLIT';
+SPREADSHEET                    : 'SPREADSHEET';
+SQLDATA                        : 'SQLDATA';
+SQLERROR                       : 'SQLERROR';
+SQLLDR                         : 'SQLLDR';
+SQL                            : 'SQL';
+FILE_EXT                       : 'PKB' | 'PKS';
+SQL_MACRO                      : 'SQL_MACRO';
+SQL_TRACE                      : 'SQL_TRACE';
+SQL_TRANSLATION_PROFILE        : 'SQL_TRANSLATION_PROFILE';
+SQRT                           : 'SQRT';
+STALE                          : 'STALE';
+STANDALONE                     : 'STANDALONE';
+STANDARD                       : 'STANDARD';
+STANDARD_HASH                  : 'STANDARD_HASH';
+STANDBY_MAX_DATA_DELAY         : 'STANDBY_MAX_DATA_DELAY';
+STANDBYS                       : 'STANDBYS';
+STANDBY                        : 'STANDBY';
+STAR                           : 'STAR';
+STAR_TRANSFORMATION            : 'STAR_TRANSFORMATION';
+START                          : 'START';
+STARTUP                        : 'STARTUP';
+STATEMENT_ID                   : 'STATEMENT_ID';
+STATEMENT_QUEUING              : 'STATEMENT_QUEUING';
+STATEMENTS                     : 'STATEMENTS';
+STATEMENT                      : 'STATEMENT';
+STATE                          : 'STATE';
+STATIC                         : 'STATIC';
+STATISTICS                     : 'STATISTICS';
+STATS_BINOMIAL_TEST            : 'STATS_BINOMIAL_TEST';
+STATS_CROSSTAB                 : 'STATS_CROSSTAB';
+STATS_F_TEST                   : 'STATS_F_TEST';
+STATS_KS_TEST                  : 'STATS_KS_TEST';
+STATS_MODE                     : 'STATS_MODE';
+STATS_MW_TEST                  : 'STATS_MW_TEST';
+STATS_ONE_WAY_ANOVA            : 'STATS_ONE_WAY_ANOVA';
+STATS_T_TEST_INDEP             : 'STATS_T_TEST_INDEP';
+STATS_T_TEST_INDEPU            : 'STATS_T_TEST_INDEPU';
+STATS_T_TEST_ONE               : 'STATS_T_TEST_ONE';
+STATS_T_TEST_PAIRED            : 'STATS_T_TEST_PAIRED';
+STATS_WSR_TEST                 : 'STATS_WSR_TEST';
+STDDEV_POP                     : 'STDDEV_POP';
+STDDEV_SAMP                    : 'STDDEV_SAMP';
+STOP                           : 'STOP';
+STORAGE                        : 'STORAGE';
+STORE                          : 'STORE';
+STREAMS                        : 'STREAMS';
+STREAM                         : 'STREAM';
+STRICT                         : 'STRICT';
+STRING                         : 'STRING';
+STRIPE_COLUMNS                 : 'STRIPE_COLUMNS';
+STRIPE_WIDTH                   : 'STRIPE_WIDTH';
+STRIP                          : 'STRIP';
+STRUCTURE                      : 'STRUCTURE';
+SUBMULTISET                    : 'SUBMULTISET';
+SUBPARTITION_REL               : 'SUBPARTITION_REL';
+SUBPARTITIONS                  : 'SUBPARTITIONS';
+SUBPARTITION                   : 'SUBPARTITION';
+SUBQUERIES                     : 'SUBQUERIES';
+SUBQUERY_PRUNING               : 'SUBQUERY_PRUNING';
+SUBSCRIBE                      : 'SUBSCRIBE';
+SUBSET                         : 'SUBSET';
+SUBSTITUTABLE                  : 'SUBSTITUTABLE';
+SUBSTR2                        : 'SUBSTR2';
+SUBSTR4                        : 'SUBSTR4';
+SUBSTRB                        : 'SUBSTRB';
+SUBSTRC                        : 'SUBSTRC';
+SUBTYPE                        : 'SUBTYPE';
+SUCCESSFUL                     : 'SUCCESSFUL';
+SUCCESS                        : 'SUCCESS';
+SUMMARY                        : 'SUMMARY';
+SUPPLEMENTAL                   : 'SUPPLEMENTAL';
+SUSPEND                        : 'SUSPEND';
+SWAP_JOIN_INPUTS               : 'SWAP_JOIN_INPUTS';
+SWITCHOVER                     : 'SWITCHOVER';
+SWITCH                         : 'SWITCH';
+SYNCHRONOUS                    : 'SYNCHRONOUS';
+SYNC                           : 'SYNC';
+SYNONYM                        : 'SYNONYM';
+SYS                            : 'SYS';
+SYSASM                         : 'SYSASM';
+SYS_AUDIT                      : 'SYS_AUDIT';
+SYSAUX                         : 'SYSAUX';
+SYSBACKUP                      : 'SYSBACKUP';
+SYS_CHECKACL                   : 'SYS_CHECKACL';
+SYS_CHECK_PRIVILEGE            : 'SYS_CHECK_PRIVILEGE';
+SYS_CONNECT_BY_PATH            : 'SYS_CONNECT_BY_PATH';
+SYS_CONTEXT                    : 'SYS_CONTEXT';
+SYSDATE                        : 'SYSDATE';
+SYSDBA                         : 'SYSDBA';
+SYS_DBURIGEN                   : 'SYS_DBURIGEN';
+SYSDG                          : 'SYSDG';
+SYS_DL_CURSOR                  : 'SYS_DL_CURSOR';
+SYS_DM_RXFORM_CHR              : 'SYS_DM_RXFORM_CHR';
+SYS_DM_RXFORM_NUM              : 'SYS_DM_RXFORM_NUM';
+SYS_DOM_COMPARE                : 'SYS_DOM_COMPARE';
+SYS_DST_PRIM2SEC               : 'SYS_DST_PRIM2SEC';
+SYS_DST_SEC2PRIM               : 'SYS_DST_SEC2PRIM';
+SYS_ET_BFILE_TO_RAW            : 'SYS_ET_BFILE_TO_RAW';
+SYS_ET_BLOB_TO_IMAGE           : 'SYS_ET_BLOB_TO_IMAGE';
+SYS_ET_IMAGE_TO_BLOB           : 'SYS_ET_IMAGE_TO_BLOB';
+SYS_ET_RAW_TO_BFILE            : 'SYS_ET_RAW_TO_BFILE';
+SYS_EXTPDTXT                   : 'SYS_EXTPDTXT';
+SYS_EXTRACT_UTC                : 'SYS_EXTRACT_UTC';
+SYS_FBT_INSDEL                 : 'SYS_FBT_INSDEL';
+SYS_FILTER_ACLS                : 'SYS_FILTER_ACLS';
+SYS_FNMATCHES                  : 'SYS_FNMATCHES';
+SYS_FNREPLACE                  : 'SYS_FNREPLACE';
+SYS_GET_ACLIDS                 : 'SYS_GET_ACLIDS';
+SYS_GET_COL_ACLIDS             : 'SYS_GET_COL_ACLIDS';
+SYS_GET_PRIVILEGES             : 'SYS_GET_PRIVILEGES';
+SYS_GETTOKENID                 : 'SYS_GETTOKENID';
+SYS_GETXTIVAL                  : 'SYS_GETXTIVAL';
+SYS_GUID                       : 'SYS_GUID';
+SYSGUID                        : 'SYSGUID';
+SYSKM                          : 'SYSKM';
+SYS_MAKE_XMLNODEID             : 'SYS_MAKE_XMLNODEID';
+SYS_MAKEXML                    : 'SYS_MAKEXML';
+SYS_MKXMLATTR                  : 'SYS_MKXMLATTR';
+SYS_MKXTI                      : 'SYS_MKXTI';
+SYSOBJ                         : 'SYSOBJ';
+SYS_OP_ADT2BIN                 : 'SYS_OP_ADT2BIN';
+SYS_OP_ADTCONS                 : 'SYS_OP_ADTCONS';
+SYS_OP_ALSCRVAL                : 'SYS_OP_ALSCRVAL';
+SYS_OP_ATG                     : 'SYS_OP_ATG';
+SYS_OP_BIN2ADT                 : 'SYS_OP_BIN2ADT';
+SYS_OP_BITVEC                  : 'SYS_OP_BITVEC';
+SYS_OP_BL2R                    : 'SYS_OP_BL2R';
+SYS_OP_BLOOM_FILTER_LIST       : 'SYS_OP_BLOOM_FILTER_LIST';
+SYS_OP_BLOOM_FILTER            : 'SYS_OP_BLOOM_FILTER';
+SYS_OP_C2C                     : 'SYS_OP_C2C';
+SYS_OP_CAST                    : 'SYS_OP_CAST';
+SYS_OP_CEG                     : 'SYS_OP_CEG';
+SYS_OP_CL2C                    : 'SYS_OP_CL2C';
+SYS_OP_COMBINED_HASH           : 'SYS_OP_COMBINED_HASH';
+SYS_OP_COMP                    : 'SYS_OP_COMP';
+SYS_OP_CONVERT                 : 'SYS_OP_CONVERT';
+SYS_OP_COUNTCHG                : 'SYS_OP_COUNTCHG';
+SYS_OP_CSCONV                  : 'SYS_OP_CSCONV';
+SYS_OP_CSCONVTEST              : 'SYS_OP_CSCONVTEST';
+SYS_OP_CSR                     : 'SYS_OP_CSR';
+SYS_OP_CSX_PATCH               : 'SYS_OP_CSX_PATCH';
+SYS_OP_CYCLED_SEQ              : 'SYS_OP_CYCLED_SEQ';
+SYS_OP_DECOMP                  : 'SYS_OP_DECOMP';
+SYS_OP_DESCEND                 : 'SYS_OP_DESCEND';
+SYS_OP_DISTINCT                : 'SYS_OP_DISTINCT';
+SYS_OP_DRA                     : 'SYS_OP_DRA';
+SYS_OP_DUMP                    : 'SYS_OP_DUMP';
+SYS_OP_DV_CHECK                : 'SYS_OP_DV_CHECK';
+SYS_OP_ENFORCE_NOT_NULL        : 'SYS_OP_ENFORCE_NOT_NULL$';
+SYSOPER                        : 'SYSOPER';
+SYS_OP_EXTRACT                 : 'SYS_OP_EXTRACT';
+SYS_OP_GROUPING                : 'SYS_OP_GROUPING';
+SYS_OP_GUID                    : 'SYS_OP_GUID';
+SYS_OP_HASH                    : 'SYS_OP_HASH';
+SYS_OP_IIX                     : 'SYS_OP_IIX';
+SYS_OP_ITR                     : 'SYS_OP_ITR';
+SYS_OP_KEY_VECTOR_CREATE       : 'SYS_OP_KEY_VECTOR_CREATE';
+SYS_OP_KEY_VECTOR_FILTER_LIST  : 'SYS_OP_KEY_VECTOR_FILTER_LIST';
+SYS_OP_KEY_VECTOR_FILTER       : 'SYS_OP_KEY_VECTOR_FILTER';
+SYS_OP_KEY_VECTOR_SUCCEEDED    : 'SYS_OP_KEY_VECTOR_SUCCEEDED';
+SYS_OP_KEY_VECTOR_USE          : 'SYS_OP_KEY_VECTOR_USE';
+SYS_OP_LBID                    : 'SYS_OP_LBID';
+SYS_OP_LOBLOC2BLOB             : 'SYS_OP_LOBLOC2BLOB';
+SYS_OP_LOBLOC2CLOB             : 'SYS_OP_LOBLOC2CLOB';
+SYS_OP_LOBLOC2ID               : 'SYS_OP_LOBLOC2ID';
+SYS_OP_LOBLOC2NCLOB            : 'SYS_OP_LOBLOC2NCLOB';
+SYS_OP_LOBLOC2TYP              : 'SYS_OP_LOBLOC2TYP';
+SYS_OP_LSVI                    : 'SYS_OP_LSVI';
+SYS_OP_LVL                     : 'SYS_OP_LVL';
+SYS_OP_MAKEOID                 : 'SYS_OP_MAKEOID';
+SYS_OP_MAP_NONNULL             : 'SYS_OP_MAP_NONNULL';
+SYS_OP_MSR                     : 'SYS_OP_MSR';
+SYS_OP_NICOMBINE               : 'SYS_OP_NICOMBINE';
+SYS_OP_NIEXTRACT               : 'SYS_OP_NIEXTRACT';
+SYS_OP_NII                     : 'SYS_OP_NII';
+SYS_OP_NIX                     : 'SYS_OP_NIX';
+SYS_OP_NOEXPAND                : 'SYS_OP_NOEXPAND';
+SYS_OP_NTCIMG                  : 'SYS_OP_NTCIMG$';
+SYS_OP_NUMTORAW                : 'SYS_OP_NUMTORAW';
+SYS_OP_OIDVALUE                : 'SYS_OP_OIDVALUE';
+SYS_OP_OPNSIZE                 : 'SYS_OP_OPNSIZE';
+SYS_OP_PAR_1                   : 'SYS_OP_PAR_1';
+SYS_OP_PARGID_1                : 'SYS_OP_PARGID_1';
+SYS_OP_PARGID                  : 'SYS_OP_PARGID';
+SYS_OP_PAR                     : 'SYS_OP_PAR';
+SYS_OP_PART_ID                 : 'SYS_OP_PART_ID';
+SYS_OP_PIVOT                   : 'SYS_OP_PIVOT';
+SYS_OP_R2O                     : 'SYS_OP_R2O';
+SYS_OP_RAWTONUM                : 'SYS_OP_RAWTONUM';
+SYS_OP_RDTM                    : 'SYS_OP_RDTM';
+SYS_OP_REF                     : 'SYS_OP_REF';
+SYS_OP_RMTD                    : 'SYS_OP_RMTD';
+SYS_OP_ROWIDTOOBJ              : 'SYS_OP_ROWIDTOOBJ';
+SYS_OP_RPB                     : 'SYS_OP_RPB';
+SYS_OPTLOBPRBSC                : 'SYS_OPTLOBPRBSC';
+SYS_OP_TOSETID                 : 'SYS_OP_TOSETID';
+SYS_OP_TPR                     : 'SYS_OP_TPR';
+SYS_OP_TRTB                    : 'SYS_OP_TRTB';
+SYS_OPTXICMP                   : 'SYS_OPTXICMP';
+SYS_OPTXQCASTASNQ              : 'SYS_OPTXQCASTASNQ';
+SYS_OP_UNDESCEND               : 'SYS_OP_UNDESCEND';
+SYS_OP_VECAND                  : 'SYS_OP_VECAND';
+SYS_OP_VECBIT                  : 'SYS_OP_VECBIT';
+SYS_OP_VECOR                   : 'SYS_OP_VECOR';
+SYS_OP_VECXOR                  : 'SYS_OP_VECXOR';
+SYS_OP_VERSION                 : 'SYS_OP_VERSION';
+SYS_OP_VREF                    : 'SYS_OP_VREF';
+SYS_OP_VVD                     : 'SYS_OP_VVD';
+SYS_OP_XMLCONS_FOR_CSX         : 'SYS_OP_XMLCONS_FOR_CSX';
+SYS_OP_XPTHATG                 : 'SYS_OP_XPTHATG';
+SYS_OP_XPTHIDX                 : 'SYS_OP_XPTHIDX';
+SYS_OP_XPTHOP                  : 'SYS_OP_XPTHOP';
+SYS_OP_XTXT2SQLT               : 'SYS_OP_XTXT2SQLT';
+SYS_OP_ZONE_ID                 : 'SYS_OP_ZONE_ID';
+SYS_ORDERKEY_DEPTH             : 'SYS_ORDERKEY_DEPTH';
+SYS_ORDERKEY_MAXCHILD          : 'SYS_ORDERKEY_MAXCHILD';
+SYS_ORDERKEY_PARENT            : 'SYS_ORDERKEY_PARENT';
+SYS_PARALLEL_TXN               : 'SYS_PARALLEL_TXN';
+SYS_PATHID_IS_ATTR             : 'SYS_PATHID_IS_ATTR';
+SYS_PATHID_IS_NMSPC            : 'SYS_PATHID_IS_NMSPC';
+SYS_PATHID_LASTNAME            : 'SYS_PATHID_LASTNAME';
+SYS_PATHID_LASTNMSPC           : 'SYS_PATHID_LASTNMSPC';
+SYS_PATH_REVERSE               : 'SYS_PATH_REVERSE';
+SYS_PXQEXTRACT                 : 'SYS_PXQEXTRACT';
+SYS_RAW_TO_XSID                : 'SYS_RAW_TO_XSID';
+SYS_RID_ORDER                  : 'SYS_RID_ORDER';
+SYS_ROW_DELTA                  : 'SYS_ROW_DELTA';
+SYS_SC_2_XMLT                  : 'SYS_SC_2_XMLT';
+SYS_SYNRCIREDO                 : 'SYS_SYNRCIREDO';
+SYSTEM_DEFINED                 : 'SYSTEM_DEFINED';
+SYSTEM                         : 'SYSTEM';
+SYSTIMESTAMP                   : 'SYSTIMESTAMP';
+SYS_TYPEID                     : 'SYS_TYPEID';
+SYS_UMAKEXML                   : 'SYS_UMAKEXML';
+SYS_XMLANALYZE                 : 'SYS_XMLANALYZE';
+SYS_XMLCONTAINS                : 'SYS_XMLCONTAINS';
+SYS_XMLCONV                    : 'SYS_XMLCONV';
+SYS_XMLEXNSURI                 : 'SYS_XMLEXNSURI';
+SYS_XMLGEN                     : 'SYS_XMLGEN';
+SYS_XMLI_LOC_ISNODE            : 'SYS_XMLI_LOC_ISNODE';
+SYS_XMLI_LOC_ISTEXT            : 'SYS_XMLI_LOC_ISTEXT';
+SYS_XMLINSTR                   : 'SYS_XMLINSTR';
+SYS_XMLLOCATOR_GETSVAL         : 'SYS_XMLLOCATOR_GETSVAL';
+SYS_XMLNODEID_GETCID           : 'SYS_XMLNODEID_GETCID';
+SYS_XMLNODEID_GETLOCATOR       : 'SYS_XMLNODEID_GETLOCATOR';
+SYS_XMLNODEID_GETOKEY          : 'SYS_XMLNODEID_GETOKEY';
+SYS_XMLNODEID_GETPATHID        : 'SYS_XMLNODEID_GETPATHID';
+SYS_XMLNODEID_GETPTRID         : 'SYS_XMLNODEID_GETPTRID';
+SYS_XMLNODEID_GETRID           : 'SYS_XMLNODEID_GETRID';
+SYS_XMLNODEID_GETSVAL          : 'SYS_XMLNODEID_GETSVAL';
+SYS_XMLNODEID_GETTID           : 'SYS_XMLNODEID_GETTID';
+SYS_XMLNODEID                  : 'SYS_XMLNODEID';
+SYS_XMLT_2_SC                  : 'SYS_XMLT_2_SC';
+SYS_XMLTRANSLATE               : 'SYS_XMLTRANSLATE';
+SYS_XMLTYPE2SQL                : 'SYS_XMLTYPE2SQL';
+SYS_XQ_ASQLCNV                 : 'SYS_XQ_ASQLCNV';
+SYS_XQ_ATOMCNVCHK              : 'SYS_XQ_ATOMCNVCHK';
+SYS_XQBASEURI                  : 'SYS_XQBASEURI';
+SYS_XQCASTABLEERRH             : 'SYS_XQCASTABLEERRH';
+SYS_XQCODEP2STR                : 'SYS_XQCODEP2STR';
+SYS_XQCODEPEQ                  : 'SYS_XQCODEPEQ';
+SYS_XQCON2SEQ                  : 'SYS_XQCON2SEQ';
+SYS_XQCONCAT                   : 'SYS_XQCONCAT';
+SYS_XQDELETE                   : 'SYS_XQDELETE';
+SYS_XQDFLTCOLATION             : 'SYS_XQDFLTCOLATION';
+SYS_XQDOC                      : 'SYS_XQDOC';
+SYS_XQDOCURI                   : 'SYS_XQDOCURI';
+SYS_XQDURDIV                   : 'SYS_XQDURDIV';
+SYS_XQED4URI                   : 'SYS_XQED4URI';
+SYS_XQENDSWITH                 : 'SYS_XQENDSWITH';
+SYS_XQERRH                     : 'SYS_XQERRH';
+SYS_XQERR                      : 'SYS_XQERR';
+SYS_XQESHTMLURI                : 'SYS_XQESHTMLURI';
+SYS_XQEXLOBVAL                 : 'SYS_XQEXLOBVAL';
+SYS_XQEXSTWRP                  : 'SYS_XQEXSTWRP';
+SYS_XQEXTRACT                  : 'SYS_XQEXTRACT';
+SYS_XQEXTRREF                  : 'SYS_XQEXTRREF';
+SYS_XQEXVAL                    : 'SYS_XQEXVAL';
+SYS_XQFB2STR                   : 'SYS_XQFB2STR';
+SYS_XQFNBOOL                   : 'SYS_XQFNBOOL';
+SYS_XQFNCMP                    : 'SYS_XQFNCMP';
+SYS_XQFNDATIM                  : 'SYS_XQFNDATIM';
+SYS_XQFNLNAME                  : 'SYS_XQFNLNAME';
+SYS_XQFNNM                     : 'SYS_XQFNNM';
+SYS_XQFNNSURI                  : 'SYS_XQFNNSURI';
+SYS_XQFNPREDTRUTH              : 'SYS_XQFNPREDTRUTH';
+SYS_XQFNQNM                    : 'SYS_XQFNQNM';
+SYS_XQFNROOT                   : 'SYS_XQFNROOT';
+SYS_XQFORMATNUM                : 'SYS_XQFORMATNUM';
+SYS_XQFTCONTAIN                : 'SYS_XQFTCONTAIN';
+SYS_XQFUNCR                    : 'SYS_XQFUNCR';
+SYS_XQGETCONTENT               : 'SYS_XQGETCONTENT';
+SYS_XQINDXOF                   : 'SYS_XQINDXOF';
+SYS_XQINSERT                   : 'SYS_XQINSERT';
+SYS_XQINSPFX                   : 'SYS_XQINSPFX';
+SYS_XQIRI2URI                  : 'SYS_XQIRI2URI';
+SYS_XQLANG                     : 'SYS_XQLANG';
+SYS_XQLLNMFRMQNM               : 'SYS_XQLLNMFRMQNM';
+SYS_XQMKNODEREF                : 'SYS_XQMKNODEREF';
+SYS_XQNILLED                   : 'SYS_XQNILLED';
+SYS_XQNODENAME                 : 'SYS_XQNODENAME';
+SYS_XQNORMSPACE                : 'SYS_XQNORMSPACE';
+SYS_XQNORMUCODE                : 'SYS_XQNORMUCODE';
+SYS_XQ_NRNG                    : 'SYS_XQ_NRNG';
+SYS_XQNSP4PFX                  : 'SYS_XQNSP4PFX';
+SYS_XQNSPFRMQNM                : 'SYS_XQNSPFRMQNM';
+SYS_XQPFXFRMQNM                : 'SYS_XQPFXFRMQNM';
+SYS_XQ_PKSQL2XML               : 'SYS_XQ_PKSQL2XML';
+SYS_XQPOLYABS                  : 'SYS_XQPOLYABS';
+SYS_XQPOLYADD                  : 'SYS_XQPOLYADD';
+SYS_XQPOLYCEL                  : 'SYS_XQPOLYCEL';
+SYS_XQPOLYCSTBL                : 'SYS_XQPOLYCSTBL';
+SYS_XQPOLYCST                  : 'SYS_XQPOLYCST';
+SYS_XQPOLYDIV                  : 'SYS_XQPOLYDIV';
+SYS_XQPOLYFLR                  : 'SYS_XQPOLYFLR';
+SYS_XQPOLYMOD                  : 'SYS_XQPOLYMOD';
+SYS_XQPOLYMUL                  : 'SYS_XQPOLYMUL';
+SYS_XQPOLYRND                  : 'SYS_XQPOLYRND';
+SYS_XQPOLYSQRT                 : 'SYS_XQPOLYSQRT';
+SYS_XQPOLYSUB                  : 'SYS_XQPOLYSUB';
+SYS_XQPOLYUMUS                 : 'SYS_XQPOLYUMUS';
+SYS_XQPOLYUPLS                 : 'SYS_XQPOLYUPLS';
+SYS_XQPOLYVEQ                  : 'SYS_XQPOLYVEQ';
+SYS_XQPOLYVGE                  : 'SYS_XQPOLYVGE';
+SYS_XQPOLYVGT                  : 'SYS_XQPOLYVGT';
+SYS_XQPOLYVLE                  : 'SYS_XQPOLYVLE';
+SYS_XQPOLYVLT                  : 'SYS_XQPOLYVLT';
+SYS_XQPOLYVNE                  : 'SYS_XQPOLYVNE';
+SYS_XQREF2VAL                  : 'SYS_XQREF2VAL';
+SYS_XQRENAME                   : 'SYS_XQRENAME';
+SYS_XQREPLACE                  : 'SYS_XQREPLACE';
+SYS_XQRESVURI                  : 'SYS_XQRESVURI';
+SYS_XQRNDHALF2EVN              : 'SYS_XQRNDHALF2EVN';
+SYS_XQRSLVQNM                  : 'SYS_XQRSLVQNM';
+SYS_XQRYENVPGET                : 'SYS_XQRYENVPGET';
+SYS_XQRYVARGET                 : 'SYS_XQRYVARGET';
+SYS_XQRYWRP                    : 'SYS_XQRYWRP';
+SYS_XQSEQ2CON4XC               : 'SYS_XQSEQ2CON4XC';
+SYS_XQSEQ2CON                  : 'SYS_XQSEQ2CON';
+SYS_XQSEQDEEPEQ                : 'SYS_XQSEQDEEPEQ';
+SYS_XQSEQINSB                  : 'SYS_XQSEQINSB';
+SYS_XQSEQRM                    : 'SYS_XQSEQRM';
+SYS_XQSEQRVS                   : 'SYS_XQSEQRVS';
+SYS_XQSEQSUB                   : 'SYS_XQSEQSUB';
+SYS_XQSEQTYPMATCH              : 'SYS_XQSEQTYPMATCH';
+SYS_XQSTARTSWITH               : 'SYS_XQSTARTSWITH';
+SYS_XQSTATBURI                 : 'SYS_XQSTATBURI';
+SYS_XQSTR2CODEP                : 'SYS_XQSTR2CODEP';
+SYS_XQSTRJOIN                  : 'SYS_XQSTRJOIN';
+SYS_XQSUBSTRAFT                : 'SYS_XQSUBSTRAFT';
+SYS_XQSUBSTRBEF                : 'SYS_XQSUBSTRBEF';
+SYS_XQTOKENIZE                 : 'SYS_XQTOKENIZE';
+SYS_XQTREATAS                  : 'SYS_XQTREATAS';
+SYS_XQ_UPKXML2SQL              : 'SYS_XQ_UPKXML2SQL';
+SYS_XQXFORM                    : 'SYS_XQXFORM';
+SYS_XSID_TO_RAW                : 'SYS_XSID_TO_RAW';
+SYS_ZMAP_FILTER                : 'SYS_ZMAP_FILTER';
+SYS_ZMAP_REFRESH               : 'SYS_ZMAP_REFRESH';
+T_LETTER                       : 'T';
+TABLE_LOOKUP_BY_NL             : 'TABLE_LOOKUP_BY_NL';
+TABLESPACE_NO                  : 'TABLESPACE_NO';
+TABLESPACE                     : 'TABLESPACE';
+TABLES                         : 'TABLES';
+TABLE_STATS                    : 'TABLE_STATS';
+TABLE                          : 'TABLE';
+TABNO                          : 'TABNO';
+TAG                            : 'TAG';
+TANH                           : 'TANH';
+TAN                            : 'TAN';
+TBLORIDXPARTNUM                : 'TBL$OR$IDX$PART$NUM';
+TEMPFILE                       : 'TEMPFILE';
+TEMPLATE                       : 'TEMPLATE';
+TEMPORARY                      : 'TEMPORARY';
+TEMP_TABLE                     : 'TEMP_TABLE';
+TEST                           : 'TEST';
+TEXT                           : 'TEXT';
+THAN                           : 'THAN';
+THEN                           : 'THEN';
+THE                            : 'THE';
+THREAD                         : 'THREAD';
+THROUGH                        : 'THROUGH';
+TIER                           : 'TIER';
+TIES                           : 'TIES';
+TIMEOUT                        : 'TIMEOUT';
+TIMESTAMP_LTZ_UNCONSTRAINED    : 'TIMESTAMP_LTZ_UNCONSTRAINED';
+TIMESTAMP                      : 'TIMESTAMP';
+TIMESTAMP_TZ_UNCONSTRAINED     : 'TIMESTAMP_TZ_UNCONSTRAINED';
+TIMESTAMP_UNCONSTRAINED        : 'TIMESTAMP_UNCONSTRAINED';
+TIMES                          : 'TIMES';
+TIME                           : 'TIME';
+TIMEZONE                       : 'TIMEZONE';
+TIMEZONE_ABBR                  : 'TIMEZONE_ABBR';
+TIMEZONE_HOUR                  : 'TIMEZONE_HOUR';
+TIMEZONE_MINUTE                : 'TIMEZONE_MINUTE';
+TIMEZONE_OFFSET                : 'TIMEZONE_OFFSET';
+TIMEZONE_REGION                : 'TIMEZONE_REGION';
+TIME_ZONE                      : 'TIME_ZONE';
+TIMING                         : 'TIMING';
+TIV_GB                         : 'TIV_GB';
+TIV_SSF                        : 'TIV_SSF';
+TO_ACLID                       : 'TO_ACLID';
+TO_BINARY_DOUBLE               : 'TO_BINARY_DOUBLE';
+TO_BINARY_FLOAT                : 'TO_BINARY_FLOAT';
+TO_BLOB                        : 'TO_BLOB';
+TO_CLOB                        : 'TO_CLOB';
+TO_DSINTERVAL                  : 'TO_DSINTERVAL';
+TO_LOB                         : 'TO_LOB';
+TO_MULTI_BYTE                  : 'TO_MULTI_BYTE';
+TO_NCHAR                       : 'TO_NCHAR';
+TO_NCLOB                       : 'TO_NCLOB';
+TO_NUMBER                      : 'TO_NUMBER';
+TOPLEVEL                       : 'TOPLEVEL';
+TO_SINGLE_BYTE                 : 'TO_SINGLE_BYTE';
+TO_TIMESTAMP                   : 'TO_TIMESTAMP';
+TO_TIMESTAMP_TZ                : 'TO_TIMESTAMP_TZ';
+TO_TIME                        : 'TO_TIME';
+TO_TIME_TZ                     : 'TO_TIME_TZ';
+TO                             : 'TO';
+TO_YMINTERVAL                  : 'TO_YMINTERVAL';
+TRACE                          : 'TRACE';
+TRACING                        : 'TRACING';
+TRACKING                       : 'TRACKING';
+TRAILING                       : 'TRAILING';
+TRANSACTION                    : 'TRANSACTION';
+TRANSFORM                      : 'TRANSFORM';
+TRANSFORM_DISTINCT_AGG         : 'TRANSFORM_DISTINCT_AGG';
+TRANSITIONAL                   : 'TRANSITIONAL';
+TRANSITION                     : 'TRANSITION';
+TRANSLATE                      : 'TRANSLATE';
+TRANSLATION                    : 'TRANSLATION';
+TREAT                          : 'TREAT';
+TRIGGERS                       : 'TRIGGERS';
+TRIGGER                        : 'TRIGGER';
+TRUE                           : 'TRUE';
+TRUNCATE                       : 'TRUNCATE';
+TRUNC                          : 'TRUNC';
+TRUSTED                        : 'TRUSTED';
+TRUST                          : 'TRUST';
+TUNING                         : 'TUNING';
+TX                             : 'TX';
+TYPES                          : 'TYPES';
+TYPE                           : 'TYPE';
+TZ_OFFSET                      : 'TZ_OFFSET';
+UB2                            : 'UB2';
+UBA                            : 'UBA';
+UCS2                           : 'UCS2';
+UID                            : 'UID';
+UNARCHIVED                     : 'UNARCHIVED';
+UNBOUNDED                      : 'UNBOUNDED';
+UNBOUND                        : 'UNBOUND';
+UNCONDITIONAL                  : 'UNCONDITIONAL';
+UNDER                          : 'UNDER';
+UNDO                           : 'UNDO';
+UNDROP                         : 'UNDROP';
+UNIFORM                        : 'UNIFORM';
+UNION                          : 'UNION';
+UNIQUE                         : 'UNIQUE';
+UNISTR                         : 'UNISTR';
+UNLIMITED                      : 'UNLIMITED';
+UNLOAD                         : 'UNLOAD';
+UNLOCK                         : 'UNLOCK';
+UNMATCHED                      : 'UNMATCHED';
+UNNEST_INNERJ_DISTINCT_VIEW    : 'UNNEST_INNERJ_DISTINCT_VIEW';
+UNNEST_NOSEMIJ_NODISTINCTVIEW  : 'UNNEST_NOSEMIJ_NODISTINCTVIEW';
+UNNEST_SEMIJ_VIEW              : 'UNNEST_SEMIJ_VIEW';
+UNNEST                         : 'UNNEST';
+UNPACKED                       : 'UNPACKED';
+UNPIVOT                        : 'UNPIVOT';
+UNPLUG                         : 'UNPLUG';
+UNPROTECTED                    : 'UNPROTECTED';
+UNQUIESCE                      : 'UNQUIESCE';
+UNRECOVERABLE                  : 'UNRECOVERABLE';
+UNRESTRICTED                   : 'UNRESTRICTED';
+UNSUBSCRIBE                    : 'UNSUBSCRIBE';
+UNTIL                          : 'UNTIL';
+UNUSABLE                       : 'UNUSABLE';
+UNUSED                         : 'UNUSED';
+UPDATABLE                      : 'UPDATABLE';
+UPDATED                        : 'UPDATED';
+UPDATE                         : 'UPDATE';
+UPDATEXML                      : 'UPDATEXML';
+UPD_INDEXES                    : 'UPD_INDEXES';
+UPD_JOININDEX                  : 'UPD_JOININDEX';
+UPGRADE                        : 'UPGRADE';
+UPPER                          : 'UPPER';
+UPSERT                         : 'UPSERT';
+UROWID                         : 'UROWID';
+USABLE                         : 'USABLE';
+USAGE                          : 'USAGE';
+USE_ANTI                       : 'USE_ANTI';
+USE_CONCAT                     : 'USE_CONCAT';
+USE_CUBE                       : 'USE_CUBE';
+USE_HASH_AGGREGATION           : 'USE_HASH_AGGREGATION';
+USE_HASH_GBY_FOR_PUSHDOWN      : 'USE_HASH_GBY_FOR_PUSHDOWN';
+USE_HASH                       : 'USE_HASH';
+USE_HIDDEN_PARTITIONS          : 'USE_HIDDEN_PARTITIONS';
+USE_INVISIBLE_INDEXES          : 'USE_INVISIBLE_INDEXES';
+USE_MERGE_CARTESIAN            : 'USE_MERGE_CARTESIAN';
+USE_MERGE                      : 'USE_MERGE';
+USE_NL                         : 'USE_NL';
+USE_NL_WITH_INDEX              : 'USE_NL_WITH_INDEX';
+USE_PRIVATE_OUTLINES           : 'USE_PRIVATE_OUTLINES';
+USER_DATA                      : 'USER_DATA';
+USER_DEFINED                   : 'USER_DEFINED';
+USERENV                        : 'USERENV';
+USERGROUP                      : 'USERGROUP';
+USER_RECYCLEBIN                : 'USER_RECYCLEBIN';
+USERS                          : 'USERS';
+USER_TABLESPACES               : 'USER_TABLESPACES';
+USER                           : 'USER';
+USE_SEMI                       : 'USE_SEMI';
+USE_STORED_OUTLINES            : 'USE_STORED_OUTLINES';
+USE_TTT_FOR_GSETS              : 'USE_TTT_FOR_GSETS';
+USE                            : 'USE';
+USE_VECTOR_AGGREGATION         : 'USE_VECTOR_AGGREGATION';
+USE_WEAK_NAME_RESL             : 'USE_WEAK_NAME_RESL';
+USING_NO_EXPAND                : 'USING_NO_EXPAND';
+USING_NLS_COMP                 : 'USING_NLS_COMP';
+USING                          : 'USING';
+UTF16BE                        : 'UTF16BE';
+UTF16LE                        : 'UTF16LE';
+UTF32                          : 'UTF32';
+UTF8                           : 'UTF8';
+V1                             : 'V1';
+V2                             : 'V2';
+VALIDATE                       : 'VALIDATE';
+VALIDATE_CONVERSION            : 'VALIDATE_CONVERSION';
+VALIDATION                     : 'VALIDATION';
+VALID_TIME_END                 : 'VALID_TIME_END';
+VALUES                         : 'VALUES';
+VALUE                          : 'VALUE';
+VARCHAR2                       : 'VARCHAR2';
+VARCHAR                        : 'VARCHAR';
+VARIABLE                       : 'VARIABLE';
+VAR_POP                        : 'VAR_POP';
+VARRAYS                        : 'VARRAYS';
+VARRAY                         : 'VARRAY';
+VAR_SAMP                       : 'VAR_SAMP';
+VARYING                        : 'VARYING';
+VECTOR_READ_TRACE              : 'VECTOR_READ_TRACE';
+VECTOR_READ                    : 'VECTOR_READ';
+VECTOR_TRANSFORM_DIMS          : 'VECTOR_TRANSFORM_DIMS';
+VECTOR_TRANSFORM_FACT          : 'VECTOR_TRANSFORM_FACT';
+VECTOR_TRANSFORM               : 'VECTOR_TRANSFORM';
+VERIFIER                       : 'VERIFIER';
+VERIFY                         : 'VERIFY';
+VERSIONING                     : 'VERSIONING';
+VERSIONS_ENDSCN                : 'VERSIONS_ENDSCN';
+VERSIONS_ENDTIME               : 'VERSIONS_ENDTIME';
+VERSIONS_OPERATION             : 'VERSIONS_OPERATION';
+VERSIONS_STARTSCN              : 'VERSIONS_STARTSCN';
+VERSIONS_STARTTIME             : 'VERSIONS_STARTTIME';
+VERSIONS                       : 'VERSIONS';
+VERSIONS_XID                   : 'VERSIONS_XID';
+VERSION                        : 'VERSION';
+VIEW                           : 'VIEW';
+VIOLATION                      : 'VIOLATION';
+VIRTUAL                        : 'VIRTUAL';
+VISIBILITY                     : 'VISIBILITY';
+VISIBLE                        : 'VISIBLE';
+VOLUME                         : 'VOLUME';
+VSIZE                          : 'VSIZE';
+WAIT                           : 'WAIT';
+WALLET                         : 'WALLET';
+WARNING                        : 'WARNING';
+WEEKS                          : 'WEEKS';
+WEEK                           : 'WEEK';
+WELLFORMED                     : 'WELLFORMED';
+WHENEVER                       : 'WHENEVER';
+WHEN                           : 'WHEN';
+WHERE                          : 'WHERE';
+WHILE                          : 'WHILE';
+WHITESPACE                     : 'WHITESPACE';
+WIDTH_BUCKET                   : 'WIDTH_BUCKET';
+WITHIN                         : 'WITHIN';
+WITHOUT                        : 'WITHOUT';
+WITH_PLSQL                     : 'WITH_PLSQL';
+WITH                           : 'WITH';
+WORK                           : 'WORK';
+WRAPPED                        : 'WRAPPED';
+WRAPPER                        : 'WRAPPER';
+WRITE                          : 'WRITE';
+XDB_FASTPATH_INSERT            : 'XDB_FASTPATH_INSERT';
+XDB                            : 'XDB';
+X_DYN_PRUNE                    : 'X_DYN_PRUNE';
+XID                            : 'XID';
+XML2OBJECT                     : 'XML2OBJECT';
+XMLAGG                         : 'XMLAGG';
+XMLATTRIBUTES                  : 'XMLATTRIBUTES';
+XMLCAST                        : 'XMLCAST';
+XMLCDATA                       : 'XMLCDATA';
+XMLCOLATTVAL                   : 'XMLCOLATTVAL';
+XMLCOMMENT                     : 'XMLCOMMENT';
+XMLCONCAT                      : 'XMLCONCAT';
+XMLDIFF                        : 'XMLDIFF';
+XML_DML_RWT_STMT               : 'XML_DML_RWT_STMT';
+XMLELEMENT                     : 'XMLELEMENT';
+XMLEXISTS2                     : 'XMLEXISTS2';
+XMLEXISTS                      : 'XMLEXISTS';
+XMLFOREST                      : 'XMLFOREST';
+XMLINDEX                       : 'XMLINDEX';
+XMLINDEX_REWRITE_IN_SELECT     : 'XMLINDEX_REWRITE_IN_SELECT';
+XMLINDEX_REWRITE               : 'XMLINDEX_REWRITE';
+XMLINDEX_SEL_IDX_TBL           : 'XMLINDEX_SEL_IDX_TBL';
+XMLISNODE                      : 'XMLISNODE';
+XMLISVALID                     : 'XMLISVALID';
+XMLNAMESPACES                  : 'XMLNAMESPACES';
+XMLPARSE                       : 'XMLPARSE';
+XMLPATCH                       : 'XMLPATCH';
+XMLPI                          : 'XMLPI';
+XMLQUERYVAL                    : 'XMLQUERYVAL';
+XMLQUERY                       : 'XMLQUERY';
+XMLROOT                        : 'XMLROOT';
+XMLSCHEMA                      : 'XMLSCHEMA';
+XMLSERIALIZE                   : 'XMLSERIALIZE';
+XMLTABLE                       : 'XMLTABLE';
+XMLTRANSFORMBLOB               : 'XMLTRANSFORMBLOB';
+XMLTRANSFORM                   : 'XMLTRANSFORM';
+XMLTYPE                        : 'XMLTYPE';
+SYSXMLTYPE                     : '"SYS"."XMLTYPE"';
+XML                            : 'XML';
+XPATHTABLE                     : 'XPATHTABLE';
+XS_SYS_CONTEXT                 : 'XS_SYS_CONTEXT';
+XS                             : 'XS';
+XTRANSPORT                     : 'XTRANSPORT';
+YEARS                          : 'YEARS';
+YEAR                           : 'YEAR';
+YES                            : 'YES';
+YMINTERVAL_UNCONSTRAINED       : 'YMINTERVAL_UNCONSTRAINED';
+ZONEMAP                        : 'ZONEMAP';
+ZONE                           : 'ZONE';
+PREDICTION                     : 'PREDICTION';
+PREDICTION_BOUNDS              : 'PREDICTION_BOUNDS';
+PREDICTION_COST                : 'PREDICTION_COST';
+PREDICTION_DETAILS             : 'PREDICTION_DETAILS';
+PREDICTION_PROBABILITY         : 'PREDICTION_PROBABILITY';
+PREDICTION_SET                 : 'PREDICTION_SET';
+
+BLOCKCHAIN      : 'BLOCKCHAIN';
+COLLATE         : 'COLLATE';
+COLLATION       : 'COLLATION';
+DEFINITION      : 'DEFINITION';
+DUPLICATED      : 'DUPLICATED';
+EXTENDED        : 'EXTENDED';
+HASHING         : 'HASHING';
+IDLE            : 'IDLE';
+IMMUTABLE       : 'IMMUTABLE';
+ORACLE_DATAPUMP : 'ORACLE_DATAPUMP';
+ORACLE_HDFS     : 'ORACLE_HDFS';
+ORACLE_HIVE     : 'ORACLE_HIVE';
+ORACLE_LOADER   : 'ORACLE_LOADER';
+SHA2_512_Q      : '"SHA2_512"';
+SHARDED         : 'SHARDED';
+V1_Q            : '"V1"';
+
+ISOLATE   : 'ISOLATE';
+ROOT      : 'ROOT';
+UNITE     : 'UNITE';
+ALGORITHM : 'ALGORITHM';
+
+CUME_DIST       : 'CUME_DIST';
+DENSE_RANK      : 'DENSE_RANK';
+LISTAGG         : 'LISTAGG';
+PERCENT_RANK    : 'PERCENT_RANK';
+PERCENTILE_CONT : 'PERCENTILE_CONT';
+PERCENTILE_DISC : 'PERCENTILE_DISC';
+RANK            : 'RANK';
+
+AVG              : 'AVG';
+CORR             : 'CORR';
+COVAR_           : 'COVAR_';
+DECODE           : 'DECODE';
+LAG              : 'LAG';
+LAG_DIFF         : 'LAG_DIFF';
+LAG_DIFF_PERCENT : 'LAG_DIFF_PERCENT';
+LEAD             : 'LEAD';
+MAX              : 'MAX';
+MEDIAN           : 'MEDIAN';
+MEMOPTIMIZE      : 'MEMOPTIMIZE';
+MIN              : 'MIN';
+NTILE            : 'NTILE';
+NVL              : 'NVL';
+RATIO_TO_REPORT  : 'RATIO_TO_REPORT';
+REGR_            : 'REGR_';
+ROUND            : 'ROUND';
+ROW_NUMBER       : 'ROW_NUMBER';
+SUBSTR           : 'SUBSTR';
+TO_CHAR          : 'TO_CHAR';
+TRIM             : 'TRIM';
+SUM              : 'SUM';
+STDDEV           : 'STDDEV';
+VAR_             : 'VAR_';
+VARIANCE         : 'VARIANCE';
+LEAST            : 'LEAST';
+GREATEST         : 'GREATEST';
+TO_DATE          : 'TO_DATE';
+
+CHARSETID   : 'CHARSETID';
+CHARSETFORM : 'CHARSETFORM';
+DURATION    : 'DURATION';
+EXTEND      : 'EXTEND';
+MAXLEN      : 'MAXLEN';
+PERSISTABLE : 'PERSISTABLE';
+POLYMORPHIC : 'POLYMORPHIC';
+STRUCT      : 'STRUCT';
+TDO         : 'TDO';
+WM_CONCAT   : 'WM_CONCAT';
+
+// Rule #358 <NATIONAL_CHAR_STRING_LIT> - subtoken typecast in <REGULAR_ID>, it also incorporates <character_representation>
+//  Lowercase 'n' is a usual addition to the standard
+
+NATIONAL_CHAR_STRING_LIT: 'N' '\'' (~('\'' | '\r' | '\n') | '\'' '\'' | NEWLINE)* '\'';
+
+//  Rule #040 <BIT_STRING_LIT> - subtoken typecast in <REGULAR_ID>
+//  Lowercase 'b' is a usual addition to the standard
+
+BIT_STRING_LIT: 'B' ('\'' [01]* '\'')+;
+
+//  Rule #284 <HEX_STRING_LIT> - subtoken typecast in <REGULAR_ID>
+//  Lowercase 'x' is a usual addition to the standard
+
+HEX_STRING_LIT : 'X' ('\'' [A-F0-9]* '\'')+;
+DOUBLE_PERIOD  : '..';
+PERIOD         : '.';
+
+//{ Rule #238 <EXACT_NUM_LIT>
+//  This rule is a bit tricky - it resolves the ambiguity with <PERIOD>
+//  It also incorporates <mantisa> and <exponent> for the <APPROXIMATE_NUM_LIT>
+//  Rule #501 <signed_integer> was incorporated directly in the token <APPROXIMATE_NUM_LIT>
+//  See also the rule #617 <unsigned_num_lit>
+/*
+    : (
+            UNSIGNED_INTEGER
+            ( '.' UNSIGNED_INTEGER
+            | {$type = UNSIGNED_INTEGER;}
+            ) ( E ('+' | '-')? UNSIGNED_INTEGER {$type = APPROXIMATE_NUM_LIT;} )?
+    | '.' UNSIGNED_INTEGER ( E ('+' | '-')? UNSIGNED_INTEGER {$type = APPROXIMATE_NUM_LIT;} )?
+    )
+    (D | F)?
+    ;*/
+
+UNSIGNED_INTEGER    : [0-9]+;
+APPROXIMATE_NUM_LIT : FLOAT_FRAGMENT ('E' ('+' | '-')? (FLOAT_FRAGMENT | [0-9]+))? ('D' | 'F')?;
+
+// Rule #--- <CHAR_STRING> is a base for Rule #065 <char_string_lit> , it incorporates <character_representation>
+// and a superfluous subtoken typecasting of the "QUOTE"
+CHAR_STRING: '\'' (~('\'' | '\r' | '\n') | '\'' '\'' | NEWLINE)* '\'';
+
+// See https://livesql.oracle.com/apex/livesql/file/content_CIREYU9EA54EOKQ7LAMZKRF6P.html
+// TODO: context sensitive string quotes (any characted after quote)
+CHAR_STRING_PERL:
+    'Q' '\'' (
+        QS_ANGLE
+        | QS_BRACE
+        | QS_BRACK
+        | QS_PAREN
+        | QS_EXCLAM
+        | QS_SHARP
+        | QS_QUOTE
+        | QS_DQUOTE
+        | QS_TILDA
+        | QS_SOLIDUS
+        | QS_RSOLIDUS
+    ) '\'' -> type(CHAR_STRING)
+;
+fragment QS_ANGLE    : '<' .*? '>';
+fragment QS_BRACE    : '{' .*? '}';
+fragment QS_BRACK    : '[' .*? ']';
+fragment QS_PAREN    : '(' .*? ')';
+fragment QS_EXCLAM   : '!' .*? '!';
+fragment QS_SHARP    : '#' .*? '#';
+fragment QS_QUOTE    : '\'' .*? '\'';
+fragment QS_DQUOTE   : '"' .*? '"';
+fragment QS_TILDA    : '~' .*? '~';
+fragment QS_SOLIDUS  : '/' .*? '/';
+fragment QS_RSOLIDUS : '\\' .*? '\\';
+
+DELIMITED_ID: '"' (~ [\u0000"] | '"' '"')+ '"';
+
+PERCENT         : '%';
+AMPERSAND       : '&';
+LEFT_PAREN      : '(';
+RIGHT_PAREN     : ')';
+DOUBLE_ASTERISK : '**';
+ASTERISK        : '*';
+PLUS_SIGN       : '+';
+MINUS_SIGN      : '-';
+COMMA           : ',';
+SOLIDUS         : '/';
+AT_SIGN         : '@';
+ASSIGN_OP       : ':=';
+HASH_OP         : '#';
+
+SQ: '\'';
+
+BINDVAR:
+    ':' SIMPLE_LETTER (SIMPLE_LETTER | [0-9] | '_')*
+    | ':' DELIMITED_ID // not used in SQL but spotted in v$sqltext when using cursor_sharing
+    | ':' UNSIGNED_INTEGER
+    | QUESTION_MARK // not in SQL, not in DM, not in OCI, use this for JDBC
+;
+
+NOT_EQUAL_OP              : '!=' | '<>' | '^=' | '~=';
+CARRET_OPERATOR_PART      : '^';
+TILDE_OPERATOR_PART       : '~';
+EXCLAMATION_OPERATOR_PART : '!';
+GREATER_THAN_OP           : '>';
+LESS_THAN_OP              : '<';
+COLON                     : ':';
+SEMICOLON                 : ';';
+
+BAR       : '|';
+EQUALS_OP : '=';
+
+LEFT_BRACKET  : '[';
+RIGHT_BRACKET : ']';
+
+INTRODUCER: '_';
+
+// Comments https://docs.oracle.com/cd/E11882_01/server.112/e41084/sql_elements006.htm
+
+SINGLE_LINE_COMMENT : '--' ~('\r' | '\n')* NEWLINE_EOF -> channel(HIDDEN);
+MULTI_LINE_COMMENT  : '/*' .*? '*/'                    -> channel(HIDDEN);
+// https://docs.oracle.com/cd/E11882_01/server.112/e16604/ch_twelve034.htm#SQPUG054
+REMARK_COMMENT:
+    'REM' {this.IsNewlineAtPos(-4)}? 'ARK'? (' ' ~('\r' | '\n')*)? NEWLINE_EOF -> channel(HIDDEN)
+;
+
+// https://docs.oracle.com/cd/E11882_01/server.112/e16604/ch_twelve032.htm#SQPUG052
+PROMPT_MESSAGE: 'PRO' {this.IsNewlineAtPos(-4)}? 'MPT'? (' ' ~('\r' | '\n')*)? NEWLINE_EOF;
+
+// TODO: should starts with newline
+START_CMD: // https://docs.oracle.com/cd/B19306_01/server.102/b14357/ch12002.htm
+    '@' '@'?
+; // https://docs.oracle.com/cd/B19306_01/server.102/b14357/ch12003.htm
+
+REGULAR_ID: SIMPLE_LETTER (SIMPLE_LETTER | '$' | '_' | '#' | [0-9])*;
+
+INQUIRY_DIRECTIVE: '$$' (SIMPLE_LETTER | '_')+;
+
+SPACES: [ \t\r\n]+ -> channel(HIDDEN);
+
+// Fragment rules
+
+fragment NEWLINE_EOF    : NEWLINE | EOF;
+fragment QUESTION_MARK  : '?';
+fragment SIMPLE_LETTER  : [\p{Letter}];
+fragment FLOAT_FRAGMENT : UNSIGNED_INTEGER* '.'? UNSIGNED_INTEGER+;
+fragment NEWLINE        : '\r'? '\n';
+fragment SPACE          : [ \t];
\ No newline at end of file
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/antlr4/ai/chat2db/plugin/dm/parser/base/DMParser.g4 b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/antlr4/ai/chat2db/plugin/dm/parser/base/DMParser.g4
new file mode 100644
index 0000000000..9fedbcb821
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/antlr4/ai/chat2db/plugin/dm/parser/base/DMParser.g4
@@ -0,0 +1,9730 @@
+/**
+ * Oracle(c) PL/SQL 11g Parser
+ *
+ * Adapted for Dameng (DM) SQL parsing in Chat2DB Community.
+ * Derived from the Oracle PL/SQL grammar; dialect-specific rules such as
+ * EXPLAIN may differ from the upstream Oracle grammar.
+ *
+ * Copyright (c) 2009-2011 Alexandre Porcelli <alexandre.porcelli@gmail.com>
+ * Copyright (c) 2015-2019 Ivan Kochurkin (KvanTTT, kvanttt@gmail.com, Positive Technologies).
+ * Copyright (c) 2017-2018 Mark Adams <madams51703@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// $antlr-format alignTrailingComments true, columnLimit 150, minEmptyLines 1, maxEmptyLinesToKeep 1, reflowComments false, useTab false
+// $antlr-format allowShortRulesOnASingleLine false, allowShortBlocksOnASingleLine true, alignSemicolons hanging, alignColons hanging
+
+parser grammar DMParser;
+
+options {
+    tokenVocab = DMLexer;
+    superClass = DMParserBase;
+}
+
+@parser::postinclude {
+#include <DMParserBase.h>
+}
+
+sql_script
+    : sql_plus_command_no_semicolon? (
+        (sql_plus_command | unit_statement) (SEMICOLON+ '/'* (sql_plus_command | unit_statement))* SEMICOLON* '/'*
+    ) EOF
+    ;
+
+unit_statement
+    : alter_analytic_view
+    | alter_attribute_dimension
+    | alter_audit_policy
+    | alter_cluster
+    | alter_database
+    | alter_database_link
+    | alter_dimension
+    | alter_diskgroup
+    | alter_flashback_archive
+    | alter_function
+    | alter_hierarchy
+    | alter_index
+    | alter_inmemory_join_group
+    | alter_java
+    | alter_library
+    | alter_lockdown_profile
+    | alter_materialized_view
+    | alter_materialized_view_log
+    | alter_materialized_zonemap
+    | alter_operator
+    | alter_outline
+    | alter_package
+    | alter_pmem_filestore
+    | alter_procedure
+    | alter_resource_cost
+    | alter_role
+    | alter_rollback_segment
+    | alter_sequence
+    | alter_session
+    | alter_synonym
+    | alter_table
+    | alter_tablespace
+    | alter_tablespace_set
+    | alter_trigger
+    | alter_type
+    | alter_user
+    | alter_view
+    | call_statement
+    | create_analytic_view
+    | create_attribute_dimension
+    | create_audit_policy
+    | create_cluster
+    | create_context
+    | create_controlfile
+    | create_database
+    | create_database_link
+    | create_dimension
+    | create_directory
+    | create_diskgroup
+    | create_edition
+    | create_flashback_archive
+    | create_function_body
+    | create_hierarchy
+    | create_index
+    | create_inmemory_join_group
+    | create_java
+    | create_library
+    | create_lockdown_profile
+    | create_materialized_view
+    | create_materialized_view_log
+    | create_materialized_zonemap
+    | create_operator
+    | create_outline
+    | create_package
+    | create_package_body
+    | create_pmem_filestore
+    | create_procedure_body
+    | create_profile
+    | create_restore_point
+    | create_role
+    | create_rollback_segment
+    | create_sequence
+    | create_spfile
+    | create_synonym
+    | create_table
+    | create_tablespace
+    | create_tablespace_set
+    | create_trigger
+    | create_type
+    | create_user
+    | create_view
+    | drop_analytic_view
+    | drop_attribute_dimension
+    | drop_audit_policy
+    | drop_cluster
+    | drop_context
+    | drop_database
+    | drop_database_link
+    | drop_directory
+    | drop_diskgroup
+    | drop_edition
+    | drop_flashback_archive
+    | drop_function
+    | drop_hierarchy
+    | drop_index
+    | drop_indextype
+    | drop_inmemory_join_group
+    | drop_java
+    | drop_library
+    | drop_lockdown_profile
+    | drop_materialized_view
+    | drop_materialized_zonemap
+    | drop_operator
+    | drop_outline
+    | drop_package
+    | drop_pmem_filestore
+    | drop_procedure
+    | drop_restore_point
+    | drop_role
+    | drop_rollback_segment
+    | drop_sequence
+    | drop_synonym
+    | drop_table
+    | drop_tablespace
+    | drop_tablespace_set
+    | drop_trigger
+    | drop_type
+    | drop_user
+    | drop_view
+    | administer_key_management
+    | analyze
+    | anonymous_block
+    | associate_statistics
+    | audit_traditional
+    | comment_on_column
+    | comment_on_materialized
+    | comment_on_table
+    | data_manipulation_language_statements
+    | disassociate_statistics
+    | flashback_table
+    | grant_statement
+    | noaudit_statement
+    | purge_statement
+    | rename_object
+    | revoke_statement
+    | transaction_control_statements
+    | truncate_cluster
+    | truncate_table
+    | unified_auditing
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-DISKGROUP.html
+alter_diskgroup
+    : ALTER DISKGROUP (
+        id_expression (
+            ((add_disk_clause | drop_disk_clause)+ | resize_disk_clause) rebalance_diskgroup_clause?
+            | (
+                replace_disk_clause
+                | rename_disk_clause
+                | disk_online_clause
+                | disk_offline_clause
+                | rebalance_diskgroup_clause
+                | check_diskgroup_clause
+                | diskgroup_template_clauses
+                | diskgroup_directory_clauses
+                | diskgroup_alias_clauses
+                | diskgroup_volume_clauses
+                | diskgroup_attributes
+                | drop_diskgroup_file_clause
+                | convert_redundancy_clause
+                | usergroup_clauses
+                | user_clauses
+                | file_permissions_clause
+                | file_owner_clause
+                | scrub_clause
+                | quotagroup_clauses
+                | filegroup_clauses
+            )
+        )
+        | (id_expression (',' id_expression)* | ALL) (
+            undrop_disk_clause
+            | diskgroup_availability
+            | enable_disable_volume
+        )
+    )
+    ;
+
+add_disk_clause
+    : ADD (
+        (SITE sn = id_expression)? quorum_regular? (FAILGROUP fgn = id_expression)? DISK qualified_disk_clause (
+            ',' qualified_disk_clause
+        )*
+    )+
+    ;
+
+drop_disk_clause
+    : DROP (
+        quorum_regular? DISK id_expression force_noforce? (',' id_expression force_noforce?)*
+        | DISKS IN quorum_regular? FAILGROUP id_expression force_noforce? (
+            ',' id_expression force_noforce?
+        )*
+    )
+    ;
+
+resize_disk_clause
+    : RESIZE ALL (SIZE size_clause)?
+    ;
+
+replace_disk_clause
+    : REPLACE DISK id_expression WITH CHAR_STRING force_noforce? (
+        ',' id_expression WITH CHAR_STRING force_noforce?
+    )* (POWER numeric)? wait_nowait?
+    ;
+
+wait_nowait
+    : WAIT
+    | NOWAIT
+    ;
+
+rename_disk_clause
+    : RENAME (
+        DISK id_expression TO id_expression (',' id_expression TO id_expression)*
+        | DISKS ALL
+    )
+    ;
+
+disk_online_clause
+    : ONLINE (
+        (
+            quorum_regular? DISK id_expression (',' id_expression)*
+            | DISKS IN quorum_regular? FAILGROUP id_expression (',' id_expression)*
+        )+
+        | ALL
+    ) (POWER numeric)? wait_nowait?
+    ;
+
+disk_offline_clause
+    : OFFLINE (
+        quorum_regular? DISK id_expression (',' id_expression)*
+        | DISKS IN quorum_regular? FAILGROUP id_expression (',' id_expression)*
+    ) timeout_clause?
+    ;
+
+timeout_clause
+    : DROP AFTER numeric (M_LETTER | H_LETTER)
+    ;
+
+rebalance_diskgroup_clause
+    : REBALANCE (
+        ((WITH | WITHOUT) phase+)? (POWER numeric) (WAIT | NOWAIT)?
+        | MODIFY POWER numeric?
+    )
+    ;
+
+phase
+    : id_expression //TODO
+    ;
+
+check_diskgroup_clause
+    : CHECK ALL? (REPAIR | NOREPAIR)? //inconsistent documentation
+    ;
+
+diskgroup_template_clauses
+    : (ADD | MODIFY) TEMPLATE id_expression qualified_template_clause (
+        ',' id_expression qualified_template_clause
+    )*
+    | DROP TEMPLATE id_expression (',' id_expression)*
+    ;
+
+qualified_template_clause
+    : ATTRIBUTES '(' redundancy_clause? striping_clause? ')' //inconsistent documentation
+    ;
+
+redundancy_clause
+    : MIRROR
+    | HIGH
+    | UNPROTECTED
+    | PARITY
+    | DOUBLE
+    ;
+
+striping_clause
+    : FINE
+    | COARSE
+    ;
+
+force_noforce
+    : FORCE
+    | NOFORCE
+    ;
+
+diskgroup_directory_clauses
+    : ADD DIRECTORY filename (',' filename)*
+    | DROP DIRECTORY filename force_noforce? (',' filename force_noforce?)*
+    | RENAME DIRECTORY dir_name TO dir_name (',' dir_name TO dir_name)*
+    ;
+
+dir_name
+    : CHAR_STRING
+    ;
+
+diskgroup_alias_clauses
+    : ADD ALIAS CHAR_STRING FOR CHAR_STRING (',' CHAR_STRING FOR CHAR_STRING)*
+    | DROP ALIAS CHAR_STRING (',' CHAR_STRING)*
+    | RENAME ALIAS CHAR_STRING TO CHAR_STRING (',' CHAR_STRING TO CHAR_STRING)*
+    ;
+
+diskgroup_volume_clauses
+    : add_volume_clause
+    | modify_volume_clause
+    | RESIZE VOLUME id_expression SIZE size_clause
+    | DROP VOLUME id_expression
+    ;
+
+add_volume_clause
+    : ADD VOLUME id_expression SIZE size_clause redundancy_clause? (
+        STRIPE_WIDTH numeric (K_LETTER | M_LETTER)
+    )? (STRIPE_COLUMNS numeric)?
+    ;
+
+modify_volume_clause
+    : MODIFY VOLUME id_expression (MOUNTPATH CHAR_STRING)? (USAGE CHAR_STRING)?
+    ;
+
+diskgroup_attributes
+    : SET ATTRIBUTE CHAR_STRING '=' CHAR_STRING
+    ;
+
+modify_diskgroup_file
+    : MODIFY FILE CHAR_STRING ATTRIBUTE '(' disk_region_clause ')' (
+        ',' CHAR_STRING ATTRIBUTE '(' disk_region_clause ')'
+    )*
+    ;
+
+disk_region_clause
+    :
+    ;
+
+drop_diskgroup_file_clause
+    : DROP FILE filename (',' filename)*
+    ;
+
+convert_redundancy_clause
+    : CONVERT REDUNDANCY TO FLEX
+    ;
+
+usergroup_clauses
+    : ADD USERGROUP CHAR_STRING WITH MEMBER CHAR_STRING (',' CHAR_STRING)*
+    | MODIFY USERGROUP CHAR_STRING (ADD | DROP) MEMBER CHAR_STRING (',' CHAR_STRING)*
+    | DROP USERGROUP CHAR_STRING
+    ;
+
+user_clauses
+    : ADD USER CHAR_STRING (',' CHAR_STRING)*
+    | DROP USER CHAR_STRING (',' CHAR_STRING)* CASCADE?
+    | REPLACE USER CHAR_STRING WITH CHAR_STRING (',' CHAR_STRING WITH CHAR_STRING)*
+    ;
+
+file_permissions_clause
+    : SET PERMISSION (OWNER | GROUP | OTHER) '=' (NONE | READ (ONLY | WRITE)) (
+        ',' (OWNER | GROUP | OTHER) '=' (NONE | READ (ONLY | WRITE))
+    )* FOR FILE CHAR_STRING (',' CHAR_STRING)*
+    ;
+
+file_owner_clause
+    : SET OWNERSHIP (OWNER | GROUP) '=' CHAR_STRING (',' (OWNER | GROUP) '=' CHAR_STRING)* FOR FILE CHAR_STRING (
+        ',' CHAR_STRING
+    )*
+    ;
+
+scrub_clause
+    : SCRUB (FILE CHAR_STRING | DISK id_expression)? (REPAIR | NOREPAIR)? (
+        POWER (AUTO | LOW | HIGH | MAX)
+    )? wait_nowait? force_noforce? STOP?
+    ;
+
+quotagroup_clauses
+    : ADD QUOTAGROUP id_expression (SET property_name '=' property_value)?
+    | MODIFY QUOTAGROUP id_expression SET property_name '=' property_value
+    | MOVE QUOTAGROUP id_expression TO id_expression
+    | DROP QUOTAGROUP id_expression
+    ;
+
+property_name
+    : id_expression
+    ;
+
+property_value
+    : id_expression
+    ;
+
+filegroup_clauses
+    : add_filegroup_clause
+    | modify_filegroup_clause
+    | move_to_filegroup_clause
+    | drop_filegroup_clause
+    ;
+
+add_filegroup_clause
+    : ADD FILEGROUP id_expression ((DATABASE | CLUSTER | VOLUME) id_expression | TEMPLATE) (
+        FROM TEMPLATE id_expression
+    )? (SET CHAR_STRING '=' CHAR_STRING)?
+    ;
+
+modify_filegroup_clause
+    : MODIFY FILEGROUP id_expression SET CHAR_STRING '=' CHAR_STRING
+    ;
+
+move_to_filegroup_clause
+    : MOVE FILE CHAR_STRING TO FILEGROUP id_expression
+    ;
+
+drop_filegroup_clause
+    : DROP FILEGROUP id_expression CASCADE?
+    ;
+
+quorum_regular
+    : QUORUM
+    | REGULAR
+    ;
+
+undrop_disk_clause
+    : UNDROP DISKS
+    ;
+
+diskgroup_availability
+    : MOUNT (RESTRICTED | NORMAL)? (FORCE | NOFORCE)?
+    | DISMOUNT (FORCE | NOFORCE)?
+    ;
+
+enable_disable_volume
+    : (ENABLE | DISABLE) VOLUME (id_expression (',' id_expression)* | ALL)
+    ;
+
+// DDL -> SQL Statements for Stored PL/SQL Units
+
+// Function DDLs
+
+drop_function
+    : DROP FUNCTION function_name
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-FLASHBACK-ARCHIVE.html
+alter_flashback_archive
+    : ALTER FLASHBACK ARCHIVE fa = id_expression (
+        SET DEFAULT
+        | (ADD | MODIFY) TABLESPACE ts = id_expression flashback_archive_quota?
+        | REMOVE TABLESPACE rts = id_expression
+        | MODIFY /*RETENTION*/ flashback_archive_retention // inconsistent documentation
+        | PURGE (ALL | BEFORE (SCN expression | TIMESTAMP expression))
+        | NO? OPTIMIZE DATA
+    )
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-HIERARCHY.html
+alter_hierarchy
+    : ALTER HIERARCHY (schema_name '.')? hn = id_expression (
+        RENAME TO nhn = id_expression
+        | COMPILE
+    )
+    ;
+
+alter_function
+    : ALTER FUNCTION function_name (
+        EDITIONABLE
+        | NONEDITIONABLE
+        | COMPILE DEBUG? compiler_parameters_clause* (REUSE SETTINGS)?
+    )
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-JAVA.html
+alter_java
+    : ALTER JAVA (SOURCE | CLASS) (schema_name '.')? o = id_expression (
+        RESOLVER '(' ('(' match_string ','? (schema_name | '-') ')')+ ')'
+    )? (COMPILE | RESOLVE | invoker_rights_clause)
+    ;
+
+match_string
+    : DELIMITED_ID
+    | '*'
+    ;
+
+create_function_body
+    : CREATE (OR REPLACE)? (EDITIONABLE | NONEDITIONABLE)? FUNCTION function_name (
+        '(' parameter (',' parameter)* ')'
+    )? RETURN type_spec (SHARING '=' (METADATA | NONE))? (
+        invoker_rights_clause
+        | accessible_by_clause
+        | default_collation_clause
+        | parallel_enable_clause
+        | result_cache_clause
+        | PIPELINED
+        | DETERMINISTIC
+    )* (
+        ((IS | AS) (DECLARE? seq_of_declare_specs? body | call_spec))
+        | aggregate_clause
+        | pipelined_using_clause
+        | sql_macro_body
+    )
+    ;
+
+sql_macro_body
+    : SQL_MACRO IS BEGIN RETURN quoted_string SEMICOLON END
+    ;
+
+// Creation Function - Specific Clauses
+
+parallel_enable_clause
+    : PARALLEL_ENABLE partition_by_clause?
+    ;
+
+partition_by_clause
+    : '(' PARTITION expression BY (ANY | (HASH | RANGE | LIST) paren_column_list) streaming_clause? ')'
+    ;
+
+result_cache_clause
+    : RESULT_CACHE relies_on_part? ('(' MODE (DEFAULT | FORCE ) ')')?
+    ;
+
+accessible_by_clause
+    : ACCESSIBLE BY '(' accessor (',' accessor)* ')'
+    ;
+
+default_collation_clause
+    : DEFAULT COLLATION USING_NLS_COMP
+    ;
+
+aggregate_clause
+    : AGGREGATE USING implementation_type_name
+    ;
+
+pipelined_using_clause
+    : PIPELINED ((ROW | TABLE) POLYMORPHIC)? USING implementation_type_name
+    ;
+
+accessor
+    : unitKind = (FUNCTION | PROCEDURE | PACKAGE | TRIGGER | TYPE) function_name
+    ;
+
+relies_on_part
+    : RELIES_ON '(' tableview_name (',' tableview_name)* ')'
+    ;
+
+streaming_clause
+    : (ORDER | CLUSTER) expression BY paren_column_list
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-OUTLINE.html
+alter_outline
+    : ALTER OUTLINE (PUBLIC | PRIVATE)? o = id_expression outline_options+
+    ;
+
+outline_options
+    : REBUILD
+    | RENAME TO non = id_expression
+    | CHANGE CATEGORY TO ncn = id_expression
+    | ENABLE
+    | DISABLE
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-LOCKDOWN-PROFILE.html
+alter_lockdown_profile
+    : ALTER LOCKDOWN PROFILE id_expression (
+        lockdown_feature
+        | lockdown_options
+        | lockdown_statements
+    ) (USERS '=' (ALL | COMMON | LOCAL))?
+    ;
+
+lockdown_feature
+    : disable_enable FEATURE ('=' '(' string_list ')' | ALL (EXCEPT '=' '(' string_list ')')?)
+    ;
+
+lockdown_options
+    : disable_enable OPTION ('=' '(' string_list ')' | ALL (EXCEPT '=' '(' string_list ')')?)
+    ;
+
+lockdown_statements
+    : disable_enable STATEMENT (
+        '=' '(' string_list ')'
+        | '=' '(' CHAR_STRING ')' statement_clauses
+        | ALL (EXCEPT '=' '(' string_list ')')?
+    )
+    ;
+
+statement_clauses
+    : CLAUSE (
+        '=' '(' string_list ')'
+        | '=' '(' CHAR_STRING ')' clause_options
+        | ALL (EXCEPT '=' '(' string_list ')')?
+    )
+    ;
+
+clause_options
+    : OPTION (
+        '=' '(' string_list ')'
+        | '=' '(' CHAR_STRING ')' option_values+
+        | ALL (EXCEPT '=' '(' string_list ')')?
+    )
+    ;
+
+option_values
+    : VALUE '=' '(' string_list ')'
+    | (MINVALUE | MAXVALUE) '=' CHAR_STRING
+    ;
+
+string_list
+    : CHAR_STRING (',' CHAR_STRING)*
+    ;
+
+disable_enable
+    : DISABLE
+    | ENABLE
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-LOCKDOWN-PROFILE.html
+drop_lockdown_profile
+    : DROP LOCKDOWN PROFILE p = id_expression
+    ;
+
+// Package DDLs
+
+drop_package
+    : DROP PACKAGE BODY? (schema_object_name '.')? package_name
+    ;
+
+alter_package
+    : ALTER PACKAGE package_name COMPILE DEBUG? (PACKAGE | BODY | SPECIFICATION)? compiler_parameters_clause* (
+        REUSE SETTINGS
+    )?
+    ;
+
+create_package
+    : CREATE (OR REPLACE)? (EDITIONABLE | NONEDITIONABLE)? PACKAGE (schema_object_name '.')? package_name invoker_rights_clause? (
+        IS
+        | AS
+    ) package_obj_spec* END package_name?
+    ;
+
+create_package_body
+    : CREATE (OR REPLACE)? (EDITIONABLE | NONEDITIONABLE)? PACKAGE BODY (schema_object_name '.')? package_name (
+        IS
+        | AS
+    ) package_obj_body*? (BEGIN seq_of_statements (EXCEPTION exception_handler+)?)? END package_name?
+    ;
+
+// Create Package Specific Clauses
+
+package_obj_spec
+    : pragma_declaration
+    | exception_declaration
+    | procedure_spec
+    | function_spec
+    | variable_declaration
+    | subtype_declaration
+    | cursor_declaration
+    | type_declaration
+    ;
+
+procedure_spec
+    : PROCEDURE identifier ('(' parameter ( ',' parameter)* ')')? (
+        accessible_by_clause
+        | PARALLEL_ENABLE
+    )* ';'
+    ;
+
+function_spec
+    : FUNCTION identifier ('(' parameter ( ',' parameter)* ')')? RETURN type_spec (
+        DETERMINISTIC
+        | PIPELINED
+        | parallel_enable_clause
+        | RESULT_CACHE
+        | streaming_clause
+    )* ';'
+    ;
+
+package_obj_body
+    : pragma_declaration
+    | exception_declaration
+    | procedure_spec
+    | function_spec
+    | subtype_declaration
+    | cursor_declaration
+    | variable_declaration
+    | type_declaration
+    | procedure_body
+    | function_body
+    | selection_directive
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/alter-pmem-filestore.html
+alter_pmem_filestore
+    : ALTER PMEM FILESTORE fsn = id_expression (
+        RESIZE size_clause
+        | autoextend_clause
+        | MOUNT (MOUNTPOINT file_path)? (BACKINGFILE filename)? FORCE? //inconsistent documentation
+        | DISMOUNT
+    )
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/drop-pmem-filestore.html
+drop_pmem_filestore
+    : DROP PMEM FILESTORE fsn = id_expression ((FORCE? INCLUDING | EXCLUDING) CONTENTS)?
+    ;
+
+// Procedure DDLs
+
+drop_procedure
+    : DROP PROCEDURE procedure_name
+    ;
+
+alter_procedure
+    : ALTER PROCEDURE procedure_name COMPILE DEBUG? compiler_parameters_clause* (REUSE SETTINGS)?
+    ;
+
+function_body
+    : FUNCTION identifier ('(' parameter (',' parameter)* ')')? RETURN type_spec (
+        PIPELINED
+        | DETERMINISTIC
+        | invoker_rights_clause
+        | parallel_enable_clause
+        | result_cache_clause
+        | streaming_clause
+            // see example in section "How Table Functions Stream their Input Data" on streaming_clause in DM 9i: https://docs.oracle.com/cd/B10501_01/appdev.920/a96624/08_subs.htm#20554
+    )* (
+        ( (IS | AS) (DECLARE? seq_of_declare_specs? body | call_spec))
+        | (PIPELINED | AGGREGATE) USING implementation_type_name
+    ) ';'
+    ;
+
+procedure_body
+    : PROCEDURE identifier ('(' parameter (',' parameter)* ')')? (
+        accessible_by_clause
+        | PARALLEL_ENABLE
+    )* (IS | AS) (DECLARE? seq_of_declare_specs? body | call_spec | EXTERNAL) ';'
+    ;
+
+create_procedure_body
+    : CREATE (OR REPLACE)? PROCEDURE procedure_name ('(' parameter (',' parameter)* ')')? invoker_rights_clause? PARALLEL_ENABLE? (
+        IS
+        | AS
+    ) (DECLARE? seq_of_declare_specs? body | call_spec | EXTERNAL)
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-RESOURCE-COST.html
+alter_resource_cost
+    : ALTER RESOURCE COST (
+        (CPU_PER_SESSION | CONNECT_TIME | LOGICAL_READS_PER_SESSION | PRIVATE_SGA) UNSIGNED_INTEGER
+    )+
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-OUTLINE.html
+drop_outline
+    : DROP OUTLINE o = id_expression
+    ;
+
+// Rollback Segment DDLs
+
+//https://docs.oracle.com/cd/E11882_01/server.112/e41084/statements_2011.htm#SQLRF00816
+alter_rollback_segment
+    : ALTER ROLLBACK SEGMENT rollback_segment_name (
+        ONLINE
+        | OFFLINE
+        | storage_clause
+        | SHRINK (TO size_clause)?
+    )
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-RESTORE-POINT.html
+drop_restore_point
+    : DROP RESTORE POINT rp = id_expression (FOR PLUGGABLE DATABASE pdb = id_expression)?
+    ;
+
+drop_rollback_segment
+    : DROP ROLLBACK SEGMENT rollback_segment_name
+    ;
+
+drop_role
+    : DROP ROLE role_name
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/create-pmem-filestore.html
+create_pmem_filestore
+    : CREATE PMEM FILESTORE fsn = id_expression pmem_filestore_options+
+    ;
+
+pmem_filestore_options
+    : MOUNTPOINT file_path
+    | BACKINGFILE filename REUSE?
+    | (SIZE | BLOCKSIZE) size_clause
+    | autoextend_clause
+    ;
+
+file_path
+    : CHAR_STRING
+    ;
+
+create_rollback_segment
+    : CREATE PUBLIC? ROLLBACK SEGMENT rollback_segment_name (
+        TABLESPACE tablespace
+        | storage_clause
+    )*
+    ;
+
+// Trigger DDLs
+
+drop_trigger
+    : DROP TRIGGER trigger_name
+    ;
+
+alter_trigger
+    : ALTER TRIGGER alter_trigger_name = trigger_name (
+        (ENABLE | DISABLE)
+        | RENAME TO rename_trigger_name = trigger_name
+        | COMPILE DEBUG? compiler_parameters_clause* (REUSE SETTINGS)?
+    )
+    ;
+
+create_trigger
+    : CREATE (OR REPLACE)? EDITIONABLE? TRIGGER trigger_name (
+        simple_dml_trigger
+        | compound_dml_trigger
+        | non_dml_trigger
+    ) trigger_follows_clause? (ENABLE | DISABLE)? trigger_when_clause? trigger_body
+    ;
+
+trigger_follows_clause
+    : FOLLOWS trigger_name (',' trigger_name)*
+    ;
+
+trigger_when_clause
+    : WHEN '(' condition ')'
+    ;
+
+// Create Trigger Specific Clauses
+
+simple_dml_trigger
+    : (BEFORE | AFTER | INSTEAD OF) dml_event_clause referencing_clause? for_each_row?
+    ;
+
+for_each_row
+    : FOR EACH ROW
+    ;
+
+compound_dml_trigger
+    : FOR dml_event_clause referencing_clause?
+    ;
+
+non_dml_trigger
+    : (BEFORE | AFTER) non_dml_event (OR non_dml_event)* ON (DATABASE | (schema_name '.')? SCHEMA)
+    ;
+
+trigger_body
+    : compound_trigger_block
+    | CALL identifier
+    | trigger_block
+    ;
+
+routine_clause
+    : routine_name function_argument?
+    ;
+
+compound_trigger_block
+    : COMPOUND TRIGGER seq_of_declare_specs? timing_point_section+ END trigger_name?
+    ;
+
+timing_point_section
+    : bk = BEFORE STATEMENT IS tps_block BEFORE STATEMENT ';'
+    | bk = BEFORE EACH ROW IS tps_block BEFORE EACH ROW ';'
+    | ak = AFTER STATEMENT IS tps_block AFTER STATEMENT ';'
+    | ak = AFTER EACH ROW IS tps_block AFTER EACH ROW ';'
+    ;
+
+non_dml_event
+    : ALTER
+    | ANALYZE
+    | ASSOCIATE STATISTICS
+    | AUDIT
+    | COMMENT
+    | CREATE
+    | DISASSOCIATE STATISTICS
+    | DROP
+    | GRANT
+    | NOAUDIT
+    | RENAME
+    | REVOKE
+    | TRUNCATE
+    | DDL
+    | STARTUP
+    | SHUTDOWN
+    | DB_ROLE_CHANGE
+    | LOGON
+    | LOGOFF
+    | SERVERERROR
+    | SUSPEND
+    | DATABASE
+    | SCHEMA
+    | FOLLOWS
+    ;
+
+dml_event_clause
+    : dml_event_element (OR dml_event_element)* ON dml_event_nested_clause? tableview_name
+    ;
+
+dml_event_element
+    : (DELETE | INSERT | UPDATE) (OF column_list)?
+    ;
+
+dml_event_nested_clause
+    : NESTED TABLE tableview_name OF
+    ;
+
+referencing_clause
+    : (REFERENCING referencing_element | REFERENCES) referencing_element*
+    ;
+
+referencing_element
+    : (NEW | OLD | PARENT) column_alias
+    ;
+
+// DDLs
+
+drop_type
+    : DROP TYPE BODY? type_name (FORCE | VALIDATE)?
+    ;
+
+alter_type
+    : ALTER TYPE type_name (
+        compile_type_clause
+        | replace_type_clause
+        //TODO | {input.LT(2).getText().equalsIgnoreCase("attribute")}? alter_attribute_definition
+        | alter_method_spec
+        | alter_collection_clauses
+        | modifier_clause
+        | overriding_subprogram_spec
+    ) dependent_handling_clause?
+    ;
+
+// Alter Type Specific Clauses
+
+compile_type_clause
+    : COMPILE DEBUG? (SPECIFICATION | BODY)? compiler_parameters_clause* (REUSE SETTINGS)?
+    ;
+
+replace_type_clause
+    : REPLACE invoker_rights_clause? AS OBJECT '(' object_member_spec (',' object_member_spec)* ')'
+    ;
+
+alter_method_spec
+    : alter_method_element (',' alter_method_element)*
+    ;
+
+alter_method_element
+    : (ADD | DROP) (map_order_function_spec | subprogram_spec)
+    ;
+
+alter_attribute_definition
+    : (ADD | MODIFY | DROP) ATTRIBUTE (
+        attribute_definition
+        | '(' attribute_definition (',' attribute_definition)* ')'
+    )
+    ;
+
+attribute_definition
+    : attribute_name type_spec?
+    ;
+
+alter_collection_clauses
+    : MODIFY (LIMIT expression | ELEMENT TYPE type_spec)
+    ;
+
+dependent_handling_clause
+    : INVALIDATE
+    | CASCADE (CONVERT TO SUBSTITUTABLE | NOT? INCLUDING TABLE DATA)? dependent_exceptions_part?
+    ;
+
+dependent_exceptions_part
+    : FORCE? EXCEPTIONS INTO tableview_name
+    ;
+
+create_type
+    : CREATE (OR REPLACE)? TYPE (type_definition | type_body)
+    ;
+
+// Create Type Specific Clauses
+
+type_definition
+    : type_name (OID CHAR_STRING)? FORCE? object_type_def?
+    ;
+
+object_type_def
+    : invoker_rights_clause? (object_as_part | object_under_part) sqlj_object_type? (
+        '(' object_member_spec (',' object_member_spec)* ')'
+    )? modifier_clause*
+    ;
+
+object_as_part
+    : (IS | AS) (OBJECT | varray_type_def | nested_table_type_def)
+    ;
+
+object_under_part
+    : UNDER type_spec
+    ;
+
+nested_table_type_def
+    : TABLE OF type_spec (NOT NULL_)?
+    ;
+
+sqlj_object_type
+    : EXTERNAL NAME expression LANGUAGE JAVA USING (SQLDATA | CUSTOMDATUM | ORADATA)
+    ;
+
+type_body
+    : BODY type_name (IS | AS) (type_body_elements)+ END
+    ;
+
+type_body_elements
+    : map_order_func_declaration
+    | subprog_decl_in_type
+    | overriding_subprogram_spec
+    ;
+
+map_order_func_declaration
+    : (MAP | ORDER) MEMBER func_decl_in_type
+    ;
+
+subprog_decl_in_type
+    : (MEMBER | STATIC) (proc_decl_in_type | func_decl_in_type | constructor_declaration)
+    ;
+
+proc_decl_in_type
+    : PROCEDURE procedure_name '(' type_elements_parameter (',' type_elements_parameter)* ')' (
+        IS
+        | AS
+    ) (call_spec | DECLARE? seq_of_declare_specs? body ';')
+    ;
+
+func_decl_in_type
+    : FUNCTION function_name ('(' type_elements_parameter (',' type_elements_parameter)* ')')? RETURN type_spec (
+        IS
+        | AS
+    ) (call_spec | DECLARE? seq_of_declare_specs? body ';')
+    ;
+
+constructor_declaration
+    : FINAL? INSTANTIABLE? CONSTRUCTOR FUNCTION type_spec (
+        '(' (SELF IN OUT type_spec ',') type_elements_parameter (',' type_elements_parameter)* ')'
+    )? RETURN SELF AS RESULT (IS | AS) (call_spec | DECLARE? seq_of_declare_specs? body ';')
+    ;
+
+// Common Type Clauses
+
+modifier_clause
+    : NOT? (INSTANTIABLE | FINAL | OVERRIDING)
+    ;
+
+object_member_spec
+    : identifier type_spec sqlj_object_type_attr?
+    | element_spec
+    ;
+
+sqlj_object_type_attr
+    : EXTERNAL NAME expression
+    ;
+
+element_spec
+    : modifier_clause? element_spec_options+ (',' pragma_clause)?
+    ;
+
+element_spec_options
+    : subprogram_spec
+    | constructor_spec
+    | map_order_function_spec
+    ;
+
+subprogram_spec
+    : (MEMBER | STATIC) (type_procedure_spec | type_function_spec)
+    ;
+
+// TODO: should be refactored such as Procedure body and Function body, maybe Type_Function_Body and overriding_function_body
+overriding_subprogram_spec
+    : OVERRIDING MEMBER overriding_function_spec
+    ;
+
+overriding_function_spec
+    : FUNCTION function_name ('(' type_elements_parameter (',' type_elements_parameter)* ')')? RETURN (
+        type_spec
+        | SELF AS RESULT
+    ) (PIPELINED? (IS | AS) (DECLARE? seq_of_declare_specs? body))? ';'?
+    ;
+
+type_procedure_spec
+    : PROCEDURE procedure_name '(' type_elements_parameter (',' type_elements_parameter)* ')' (
+        (IS | AS) call_spec
+    )?
+    ;
+
+type_function_spec
+    : FUNCTION function_name ('(' type_elements_parameter (',' type_elements_parameter)* ')')? RETURN (
+        type_spec
+        | SELF AS RESULT
+    ) ((IS | AS) call_spec | EXTERNAL VARIABLE? NAME expression)?
+    ;
+
+constructor_spec
+    : FINAL? INSTANTIABLE? CONSTRUCTOR FUNCTION type_spec (
+        '(' (SELF IN OUT type_spec ',') type_elements_parameter (',' type_elements_parameter)* ')'
+    )? RETURN SELF AS RESULT ((IS | AS) call_spec)?
+    ;
+
+map_order_function_spec
+    : (MAP | ORDER) MEMBER type_function_spec
+    ;
+
+pragma_clause
+    : PRAGMA RESTRICT_REFERENCES '(' pragma_elements (',' pragma_elements)* ')'
+    ;
+
+pragma_elements
+    : identifier
+    | DEFAULT
+    ;
+
+type_elements_parameter
+    : parameter_name type_spec
+    ;
+
+// Sequence DDLs
+
+drop_sequence
+    : DROP SEQUENCE sequence_name
+    ;
+
+alter_sequence
+    : ALTER SEQUENCE sequence_name sequence_spec+
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-SESSION.html
+alter_session
+    : ALTER SESSION (
+        ADVISE ( COMMIT | ROLLBACK | NOTHING)
+        | CLOSE DATABASE LINK parameter_name
+        | enable_or_disable COMMIT IN PROCEDURE
+        | enable_or_disable GUARD
+        | (enable_or_disable | FORCE) PARALLEL (DML | DDL | QUERY) (
+            PARALLEL (literal | parameter_name)
+        )?
+        | SET alter_session_set_clause
+    )
+    ;
+
+alter_session_set_clause
+    : (parameter_name '=' parameter_value)+
+    | EDITION '=' en = id_expression
+    | CONTAINER '=' cn = id_expression (SERVICE '=' sn = id_expression)?
+    | ROW ARCHIVAL VISIBILITY '=' (ACTIVE | ALL)
+    | DEFAULT_COLLATION '=' (c = id_expression | NONE)
+    ;
+
+create_sequence
+    : CREATE SEQUENCE sequence_name (sequence_start_clause | sequence_spec)*
+    ;
+
+// Common Sequence
+
+sequence_spec
+    : INCREMENT BY UNSIGNED_INTEGER
+    | MAXVALUE UNSIGNED_INTEGER
+    | NOMAXVALUE
+    | MINVALUE UNSIGNED_INTEGER
+    | NOMINVALUE
+    | CYCLE
+    | NOCYCLE
+    | CACHE UNSIGNED_INTEGER
+    | NOCACHE
+    | ORDER
+    | NOORDER
+    ;
+
+sequence_start_clause
+    : START WITH UNSIGNED_INTEGER
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-ANALYTIC-VIEW.html
+create_analytic_view
+    : CREATE (OR REPLACE)? (NOFORCE | FORCE)? ANALYTIC VIEW av = id_expression (
+        SHARING '=' (METADATA | NONE)
+    )? classification_clause* cav_using_clause? dim_by_clause? measures_clause? default_measure_clause? default_aggregate_clause? cache_clause?
+        fact_columns_clause? qry_transform_clause?
+    ;
+
+classification_clause
+    // : (CAPTION c=quoted_string)? (DESCRIPTION d=quoted_string)? classification_item*
+    // to handle - 'rule contains a closure with at least one alternative that can match an empty string'
+    : (caption_clause description_clause? | caption_clause? description_clause) classification_item*
+    | caption_clause? description_clause? classification_item+
+    ;
+
+caption_clause
+    : CAPTION c = quoted_string
+    ;
+
+description_clause
+    : DESCRIPTION d = quoted_string
+    ;
+
+classification_item
+    : CLASSIFICATION cn = id_expression (VALUE cv = quoted_string)? (LANGUAGE language)?
+    ;
+
+language
+    : NULL_
+    | nls = id_expression
+    ;
+
+cav_using_clause
+    : USING (schema_name '.')? t = id_expression REMOTE? (AS? ta = id_expression)?
+    ;
+
+dim_by_clause
+    : DIMENSION BY '(' dim_key (',' dim_key)* ')'
+    ;
+
+dim_key
+    : dim_ref classification_clause* KEY (
+        '(' (a = id_expression '.')? f = column_name (',' (a = id_expression '.')? f = column_name)* ')'
+        | (a = id_expression '.')? f = column_name
+    ) REFERENCES DISTINCT? ('(' attribute_name (',' attribute_name) ')' | attribute_name) HIERARCHIES '(' hier_ref (
+        ',' hier_ref
+    )* ')'
+    ;
+
+dim_ref
+    : (schema_name '.')? ad = id_expression (AS? da = id_expression)?
+    ;
+
+hier_ref
+    : (schema_name '.')? h = id_expression (AS? ha = id_expression)? DEFAULT?
+    ;
+
+measures_clause
+    : MEASURES '(' av_measure (',' av_measure)* ')'
+    ;
+
+av_measure
+    : mn = id_expression (base_meas_clause | calc_meas_clause)? //classification_clause*
+    ;
+
+base_meas_clause
+    : FACT /*FOR MEASURE*/ bm = id_expression meas_aggregate_clause? //FIXME inconsistent documentation
+    ;
+
+meas_aggregate_clause
+    : AGGREGATE BY aggregate_function_name
+    ;
+
+calc_meas_clause
+    : /*m=id_expression*/ AS '(' expression ')' //FIXME inconsistent documentation
+    ;
+
+default_measure_clause
+    : DEFAULT MEASURE m = id_expression
+    ;
+
+default_aggregate_clause
+    : DEFAULT AGGREGATE BY aggregate_function_name
+    ;
+
+cache_clause
+    : CACHE cache_specification (',' cache_specification)*
+    ;
+
+cache_specification
+    : MEASURE GROUP (
+        ALL
+        | '(' id_expression (',' id_expression)* ')' levels_clause (',' levels_clause)*
+    )
+    ;
+
+levels_clause
+    : LEVELS '(' level_specification (',' level_specification)* ')' level_group_type
+    ;
+
+level_specification
+    : '(' ((d = id_expression '.')? h = id_expression '.')? l = id_expression ')'
+    ;
+
+level_group_type
+    : DYNAMIC
+    | MATERIALIZED (USING (schema_name '.')? t = id_expression)?
+    ;
+
+fact_columns_clause
+    : FACT COLUMN f = column_name (AS? fa = id_expression (',' AS? fa = id_expression)*)?
+    ;
+
+qry_transform_clause
+    : ENABLE QUERY TRANSFORM (RELY | NORELY)?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-ATTRIBUTE-DIMENSION.html
+create_attribute_dimension
+    : CREATE (OR REPLACE)? (NOFORCE | FORCE)? ATTRIBUTE DIMENSION (schema_name '.')? ad = id_expression (
+        SHARING '=' (METADATA | NONE)
+    )? classification_clause* (DIMENSION TYPE (STANDARD | TIME))? ad_using_clause attributes_clause ad_level_clause+ all_clause?
+    ;
+
+ad_using_clause
+    : USING source_clause (',' source_clause)* join_path_clause*
+    ;
+
+source_clause
+    : (schema_name '.')? ftov = id_expression REMOTE? (AS? a = id_expression)?
+    ;
+
+join_path_clause
+    : JOIN PATH jpn = id_expression ON join_condition
+    ;
+
+join_condition
+    : join_condition_item (AND join_condition_item)*
+    ;
+
+join_condition_item
+    : (a = id_expression '.')? column_name '=' (b = id_expression '.')? column_name
+    ;
+
+attributes_clause
+    : ATTRIBUTES '(' ad_attributes_clause (',' ad_attributes_clause)* ')'
+    ;
+
+ad_attributes_clause
+    : (a = id_expression '.')? column_name (AS? an = id_expression)? classification_clause*
+    ;
+
+ad_level_clause
+    : LEVEL l = id_expression (NOT NULL_ | SKIP_ WHEN NULL_)? (
+        LEVEL TYPE (
+            STANDARD
+            | YEARS
+            | HALF_YEARS
+            | QUARTERS
+            | MONTHS
+            | WEEKS
+            | DAYS
+            | HOURS
+            | MINUTES
+            | SECONDS
+        )
+    )? classification_clause* //inconsistent documentation - LEVEL TYPE goes after the classification_clause rule
+    key_clause alternate_key_clause? (MEMBER NAME expression)? (MEMBER CAPTION expression)? (
+        MEMBER DESCRIPTION expression
+    )? (ORDER BY (MIN | MAX)? dim_order_clause (',' (MIN | MAX)? dim_order_clause)*)? (
+        DETERMINES '(' id_expression (',' id_expression)* ')'
+    )?
+    ;
+
+key_clause
+    : KEY (a = id_expression | '(' id_expression (',' id_expression)* ')')
+    ;
+
+alternate_key_clause
+    : ALTERNATE key_clause
+    ;
+
+dim_order_clause
+    : a = id_expression (ASC | DESC)? (NULLS (FIRST | LAST))?
+    ;
+
+all_clause
+    : ALL MEMBER (
+        NAME expression (MEMBER CAPTION expression)?
+        | CAPTION expression (MEMBER DESCRIPTION expression)?
+        | DESCRIPTION expression
+    )
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-AUDIT-POLICY-Unified-Auditing.html
+create_audit_policy
+    : CREATE AUDIT POLICY p = id_expression privilege_audit_clause? action_audit_clause? role_audit_clause? (
+        WHEN quoted_string EVALUATE PER (STATEMENT | SESSION | INSTANCE)
+    )? (ONLY TOPLEVEL)? container_clause?
+    ;
+
+privilege_audit_clause
+    : PRIVILEGES system_privilege (',' system_privilege)*
+    ;
+
+action_audit_clause
+    : (standard_actions | component_actions | system_actions)+
+    ;
+
+system_actions
+    : ACTIONS system_privilege (',' system_privilege)*
+    ;
+
+standard_actions
+    : ACTIONS actions_clause (',' actions_clause)*
+    ;
+
+actions_clause
+    : (object_action | ALL) ON (
+        DIRECTORY directory_name
+        | (MINING MODEL)? (schema_name '.')? id_expression
+    )
+    | (system_action | ALL)
+    ;
+
+object_action
+    : ALTER
+    | GRANT
+    | READ
+    | EXECUTE
+    | AUDIT
+    | COMMENT
+    | DELETE
+    | INDEX
+    | INSERT
+    | LOCK
+    | SELECT
+    | UPDATE
+    | FLASHBACK
+    | RENAME
+    ;
+
+system_action
+    : id_expression // SELECT name FROM AUDITABLE_SYSTEM_ACTIONS WHERE component = 'Standard';
+    | (CREATE | ALTER | DROP) JAVA
+    | LOCK TABLE
+    | (READ | WRITE | EXECUTE) DIRECTORY
+    ;
+
+component_actions
+    : ACTIONS COMPONENT '=' (
+        (DATAPUMP | DIRECT_LOAD | OLS | XS) component_action (',' component_action)*
+        | DV component_action ON id_expression (',' component_action ON id_expression)*
+        | PROTOCOL (FTP | HTTP | AUTHENTICATION)
+    )
+    ;
+
+component_action
+    : id_expression // SELECT name FROM auditable_system_actions WHERE component = 'Datapump';
+    ;
+
+role_audit_clause
+    : ROLES role_name (',' role_name)*
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-CONTROLFILE.html
+create_controlfile
+    : CREATE CONTROLFILE REUSE? SET? DATABASE d = id_expression logfile_clause? (
+        RESETLOGS
+        | NORESETLOGS
+    ) (DATAFILE file_specification (',' file_specification)*)? controlfile_options* character_set_clause?
+    ;
+
+controlfile_options
+    : MAXLOGFILES numeric
+    | MAXLOGMEMBERS numeric
+    | MAXLOGHISTORY numeric
+    | MAXDATAFILES numeric
+    | MAXINSTANCES numeric
+    | ARCHIVELOG
+    | NOARCHIVELOG
+    | FORCE LOGGING
+    | SET STANDBY NOLOGGING FOR (DATA AVAILABILITY | LOAD PERFORMANCE)
+    ;
+
+logfile_clause
+    : LOGFILE (GROUP? numeric)? file_specification (',' (GROUP? numeric)? file_specification)*
+    ;
+
+character_set_clause
+    : CHARACTER SET cs = id_expression
+    ;
+
+file_specification
+    : datafile_tempfile_spec
+    | redo_log_file_spec
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-DISKGROUP.html
+create_diskgroup
+    : CREATE DISKGROUP id_expression (
+        (HIGH | NORMAL | FLEX | EXTENDED (SITE sn = id_expression)? | EXTERNAL) REDUNDANCY
+    )? (
+        quorum_regular? (FAILGROUP fg = id_expression)? DISK qualified_disk_clause (
+            ',' qualified_disk_clause
+        )*
+    )+ (ATTRIBUTE an = CHAR_STRING '=' av = CHAR_STRING (',' CHAR_STRING '=' CHAR_STRING)*)?
+    ;
+
+qualified_disk_clause
+    : ss = CHAR_STRING (NAME dn = id_expression)? (SIZE size_clause)? force_noforce?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-EDITION.html
+create_edition
+    : CREATE EDITION e = id_expression (AS CHILD OF pe = id_expression)?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-FLASHBACK-ARCHIVE.html
+create_flashback_archive
+    : CREATE FLASHBACK ARCHIVE DEFAULT? fa = id_expression TABLESPACE ts = id_expression flashback_archive_quota? (
+        NO? OPTIMIZE DATA
+    )? flashback_archive_retention
+    ;
+
+flashback_archive_quota
+    : QUOTA UNSIGNED_INTEGER (M_LETTER | G_LETTER | T_LETTER | P_LETTER | E_LETTER)
+    ;
+
+flashback_archive_retention
+    : RETENTION UNSIGNED_INTEGER (YEAR | MONTH | DAY)
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-HIERARCHY.html
+create_hierarchy
+    : CREATE (OR REPLACE)? (NO? FORCE)? HIERARCHY (schema_name '.')? h = id_expression (
+        SHARING '=' (METADATA | NONE)
+    )? classification_clause* hier_using_clause level_hier_clause hier_attrs_clause?
+    ;
+
+hier_using_clause
+    : USING (schema_name '.')? ad = id_expression
+    ;
+
+level_hier_clause
+    : '(' (l = id_expression (CHILD OF)?)+ ')'
+    ;
+
+hier_attrs_clause
+    : HIERARCHICAL ATTRIBUTES '(' hier_attr_clause ')'
+    ;
+
+hier_attr_clause
+    : hier_attr_name classification_clause*
+    ;
+
+hier_attr_name
+    : MEMBER_NAME
+    | MEMBER_UNIQUE_NAME
+    | MEMBER_CAPTION
+    | MEMBER_DESCRIPTION
+    | LEVEL_NAME
+    | HIER_ORDER
+    | DEPTH
+    | IS_LEAF
+    | PARENT_LEVEL_NAME
+    | PARENT_UNIQUE_NAME
+    ;
+
+create_index
+    : CREATE (UNIQUE | BITMAP)? INDEX index_name (IF NOT EXISTS)? ON (
+        cluster_index_clause
+        | table_index_clause
+        | bitmap_join_index_clause
+    ) (USABLE | UNUSABLE)? ((DEFERRED | IMMEDIATE) INVALIDATION)?
+    ;
+
+cluster_index_clause
+    : CLUSTER cluster_name index_attributes?
+    ;
+
+cluster_name
+    : (id_expression '.')? id_expression
+    ;
+
+table_index_clause
+    : tableview_name table_alias? '(' index_expr (ASC | DESC)? (',' index_expr (ASC | DESC)?)* ')' index_properties?
+    ;
+
+bitmap_join_index_clause
+    : tableview_name '(' (tableview_name | table_alias)? column_name (ASC | DESC)? (
+        ',' (tableview_name | table_alias)? column_name (ASC | DESC)?
+    )* ')' FROM tableview_name table_alias (',' tableview_name table_alias)* where_clause local_partitioned_index? index_attributes?
+    ;
+
+index_expr
+    : column_name
+    | expression
+    ;
+
+index_properties
+    : (global_partitioned_index | local_partitioned_index | index_attributes)+
+    | INDEXTYPE IS (domain_index_clause | xmlindex_clause)
+    ;
+
+domain_index_clause
+    : indextype local_domain_index_clause? parallel_clause? (PARAMETERS '(' odci_parameters ')')?
+    ;
+
+local_domain_index_clause
+    : LOCAL (
+        '(' PARTITION partition_name (PARAMETERS '(' odci_parameters ')')? (
+            ',' PARTITION partition_name (PARAMETERS '(' odci_parameters ')')?
+        )* ')'
+    )?
+    ;
+
+xmlindex_clause
+    : (XDB '.')? XMLINDEX local_xmlindex_clause? parallel_clause? //TODO xmlindex_parameters_clause?
+    ;
+
+local_xmlindex_clause
+    : LOCAL (
+        '(' PARTITION partition_name (
+            ',' PARTITION partition_name //TODO xmlindex_parameters_clause?
+        )* ')'
+    )?
+    ;
+
+global_partitioned_index
+    : GLOBAL PARTITION BY (
+        RANGE '(' column_name (',' column_name)* ')' '(' index_partitioning_clause (
+            ',' index_partitioning_clause
+        )* ')'
+        | HASH '(' column_name (',' column_name)* ')' (
+            individual_hash_partitions
+            | hash_partitions_by_quantity
+        )
+    )
+    ;
+
+index_partitioning_clause
+    : PARTITION partition_name? VALUES LESS THAN '(' index_partitioning_values_list ')' segment_attributes_clause?
+    ;
+
+index_partitioning_values_list
+    : literal (',' literal)*
+    | TIMESTAMP literal (',' TIMESTAMP literal)*
+    ;
+
+local_partitioned_index
+    : LOCAL (
+        on_range_partitioned_table
+        | on_list_partitioned_table
+        | on_hash_partitioned_table
+        | on_comp_partitioned_table
+    )?
+    ;
+
+on_range_partitioned_table
+    : '(' partitioned_table (',' partitioned_table)* ')'
+    ;
+
+on_list_partitioned_table
+    : '(' partitioned_table (',' partitioned_table)* ')'
+    ;
+
+partitioned_table
+    : PARTITION partition_name? (segment_attributes_clause | key_compression)* UNUSABLE?
+    ;
+
+on_hash_partitioned_table
+    : STORE IN '(' tablespace (',' tablespace)* ')'
+    | '(' on_hash_partitioned_clause (',' on_hash_partitioned_clause)* ')'
+    ;
+
+on_hash_partitioned_clause
+    : PARTITION partition_name? (TABLESPACE tablespace)? key_compression? UNUSABLE?
+    ;
+
+on_comp_partitioned_table
+    : (STORE IN '(' tablespace (',' tablespace)* ')')? '(' on_comp_partitioned_clause (
+        ',' on_comp_partitioned_clause
+    )* ')'
+    ;
+
+on_comp_partitioned_clause
+    : PARTITION partition_name? (segment_attributes_clause | key_compression)* UNUSABLE index_subpartition_clause?
+    ;
+
+index_subpartition_clause
+    : STORE IN '(' tablespace (',' tablespace)* ')'
+    | '(' index_subpartition_subclause (',' index_subpartition_subclause)* ')'
+    ;
+
+index_subpartition_subclause
+    : SUBPARTITION subpartition_name? (TABLESPACE tablespace)? key_compression? UNUSABLE?
+    ;
+
+odci_parameters
+    : CHAR_STRING
+    ;
+
+indextype
+    : (id_expression '.')? id_expression
+    ;
+
+//https://docs.oracle.com/cd/E11882_01/server.112/e41084/statements_1010.htm#SQLRF00805
+alter_index
+    : ALTER INDEX index_name (alter_index_ops_set1 | alter_index_ops_set2)
+    ;
+
+alter_index_ops_set1
+    : (
+        deallocate_unused_clause
+        | allocate_extent_clause
+        | shrink_clause
+        | parallel_clause
+        | physical_attributes_clause
+        | logging_clause
+    )+
+    ;
+
+alter_index_ops_set2
+    : rebuild_clause
+    | PARAMETERS '(' odci_parameters ')'
+    | COMPILE
+    | enable_or_disable
+    | UNUSABLE
+    | visible_or_invisible
+    | RENAME TO new_index_name
+    | COALESCE
+    | monitoring_nomonitoring USAGE
+    | UPDATE BLOCK REFERENCES
+    | alter_index_partitioning
+    ;
+
+visible_or_invisible
+    : VISIBLE
+    | INVISIBLE
+    ;
+
+monitoring_nomonitoring
+    : MONITORING
+    | NOMONITORING
+    ;
+
+rebuild_clause
+    : REBUILD (PARTITION partition_name | SUBPARTITION subpartition_name | REVERSE | NOREVERSE)? (
+        parallel_clause
+        | TABLESPACE tablespace
+        | PARAMETERS '(' odci_parameters ')'
+        //TODO        | xmlindex_parameters_clause
+        | ONLINE
+        | physical_attributes_clause
+        | key_compression
+        | logging_clause
+    )*
+    ;
+
+alter_index_partitioning
+    : modify_index_default_attrs
+    | add_hash_index_partition
+    | modify_index_partition
+    | rename_index_partition
+    | drop_index_partition
+    | split_index_partition
+    | coalesce_index_partition
+    | modify_index_subpartition
+    ;
+
+modify_index_default_attrs
+    : MODIFY DEFAULT ATTRIBUTES (FOR PARTITION partition_name)? (
+        physical_attributes_clause
+        | TABLESPACE (tablespace | DEFAULT)
+        | logging_clause
+    )
+    ;
+
+add_hash_index_partition
+    : ADD PARTITION partition_name? (TABLESPACE tablespace)? key_compression? parallel_clause?
+    ;
+
+coalesce_index_partition
+    : COALESCE PARTITION parallel_clause?
+    ;
+
+modify_index_partition
+    : MODIFY PARTITION partition_name (
+        modify_index_partitions_ops+
+        | PARAMETERS '(' odci_parameters ')'
+        | COALESCE
+        | UPDATE BLOCK REFERENCES
+        | UNUSABLE
+    )
+    ;
+
+modify_index_partitions_ops
+    : deallocate_unused_clause
+    | allocate_extent_clause
+    | physical_attributes_clause
+    | logging_clause
+    | key_compression
+    ;
+
+rename_index_partition
+    : RENAME (PARTITION partition_name | SUBPARTITION subpartition_name) TO new_partition_name
+    ;
+
+drop_index_partition
+    : DROP PARTITION partition_name
+    ;
+
+split_index_partition
+    : SPLIT PARTITION partition_name_old AT '(' literal (',' literal)* ')' (
+        INTO '(' index_partition_description ',' index_partition_description ')'
+    )? parallel_clause?
+    ;
+
+index_partition_description
+    : PARTITION (
+        partition_name (
+            (segment_attributes_clause | key_compression)+
+            | PARAMETERS '(' odci_parameters ')'
+        ) UNUSABLE?
+    )?
+    ;
+
+modify_index_subpartition
+    : MODIFY SUBPARTITION subpartition_name (
+        UNUSABLE
+        | allocate_extent_clause
+        | deallocate_unused_clause
+    )
+    ;
+
+partition_name_old
+    : partition_name
+    ;
+
+new_partition_name
+    : partition_name
+    ;
+
+new_index_name
+    : index_name
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-INMEMORY-JOIN-GROUP.html
+alter_inmemory_join_group
+    : ALTER INMEMORY JOIN GROUP (schema_name '.')? jg = id_expression (ADD | REMOVE) '(' (
+        schema_name '.'
+    )? t = id_expression '(' c = id_expression ')' ')'
+    ;
+
+create_user
+    : CREATE USER user_object_name (IF NOT EXISTS)? (
+        identified_by
+        | identified_other_clause
+        | user_tablespace_clause
+        | quota_clause
+        | profile_clause
+        | password_expire_clause
+        | user_lock_clause
+        | user_editions_clause
+        | container_clause
+    )+
+    ;
+
+// The standard clauses only permit one user per statement.
+// The proxy clause allows multiple users for a proxy designation.
+alter_user
+    : ALTER USER user_object_name (
+        alter_identified_by
+        | identified_other_clause
+        | user_tablespace_clause
+        | quota_clause
+        | profile_clause
+        | user_default_role_clause
+        | password_expire_clause
+        | user_lock_clause
+        | alter_user_editions_clause
+        | container_clause
+        | container_data_clause
+    )+
+    | user_object_name (',' user_object_name)* proxy_clause
+    ;
+
+drop_user
+    : DROP USER user_object_name (IF EXISTS)? CASCADE?
+    ;
+
+alter_identified_by
+    : identified_by (REPLACE id_expression)?
+    ;
+
+identified_by
+    : IDENTIFIED BY id_expression
+    ;
+
+identified_other_clause
+    : IDENTIFIED (EXTERNALLY | GLOBALLY) (AS quoted_string)?
+    ;
+
+user_tablespace_clause
+    : (DEFAULT | TEMPORARY) TABLESPACE id_expression
+    ;
+
+quota_clause
+    : QUOTA (size_clause | UNLIMITED) ON id_expression
+    ;
+
+profile_clause
+    : PROFILE id_expression
+    ;
+
+role_clause
+    : role_name (',' role_name)*
+    | ALL (EXCEPT role_name (',' role_name)*)*
+    ;
+
+user_default_role_clause
+    : DEFAULT ROLE (NONE | role_clause)
+    ;
+
+password_expire_clause
+    : PASSWORD EXPIRE
+    ;
+
+user_lock_clause
+    : ACCOUNT (LOCK | UNLOCK)
+    ;
+
+user_editions_clause
+    : ENABLE EDITIONS
+    ;
+
+alter_user_editions_clause
+    : user_editions_clause (FOR regular_id (',' regular_id)*)? FORCE?
+    ;
+
+proxy_clause
+    : REVOKE CONNECT THROUGH (ENTERPRISE USERS | user_object_name)
+    | GRANT CONNECT THROUGH (
+        ENTERPRISE USERS
+        | user_object_name (WITH (NO ROLES | ROLE role_clause))? (AUTHENTICATION REQUIRED)? (
+            AUTHENTICATED USING (PASSWORD | CERTIFICATE | DISTINGUISHED NAME)
+        )?
+    )
+    ;
+
+container_names
+    : LEFT_PAREN id_expression (',' id_expression)* RIGHT_PAREN
+    ;
+
+set_container_data
+    : SET CONTAINER_DATA EQUALS_OP (ALL | DEFAULT | container_names)
+    ;
+
+add_rem_container_data
+    : (ADD | REMOVE) CONTAINER_DATA EQUALS_OP container_names
+    ;
+
+container_data_clause
+    : set_container_data
+    | add_rem_container_data (FOR container_tableview_name)?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ADMINISTER-KEY-MANAGEMENT.html
+administer_key_management
+    : ADMINISTER KEY MANAGEMENT (
+        keystore_management_clauses
+        | key_management_clauses
+        | secret_management_clauses
+        | zero_downtime_software_patching_clauses
+    )
+    ;
+
+keystore_management_clauses
+    : create_keystore
+    | open_keystore
+    | close_keystore
+    | backup_keystore
+    | alter_keystore_password
+    | merge_into_new_keystore
+    | merge_into_existing_keystore
+    | isolate_keystore
+    | unite_keystore
+    ;
+
+create_keystore
+    : CREATE (
+        KEYSTORE ksl = CHAR_STRING
+        | LOCAL? AUTO_LOGIN KEYSTORE FROM KEYSTORE ksl = CHAR_STRING
+    ) IDENTIFIED BY keystore_password
+    ;
+
+open_keystore
+    : SET KEYSTORE OPEN force_keystore? identified_by_store container_clause?
+    ;
+
+force_keystore
+    : FORCE KEYSTORE
+    ;
+
+close_keystore
+    : SET KEYSTORE CLOSE identified_by_store? container_clause?
+    ;
+
+backup_keystore
+    : BACKUP KEYSTORE (USING bi = CHAR_STRING)? force_keystore? identified_by_store (
+        TO ksl = CHAR_STRING
+    )?
+    ;
+
+alter_keystore_password
+    : ALTER KEYSTORE PASSWORD force_keystore? IDENTIFIED BY o = keystore_password SET n = keystore_password with_backup_clause?
+    ;
+
+merge_into_new_keystore
+    : MERGE KEYSTORE ksl1 = CHAR_STRING identified_by_password_clause? AND KEYSTORE ksl2 = CHAR_STRING identified_by_password_clause? INTO NEW
+        KEYSTORE ksl2 = CHAR_STRING identified_by_password_clause
+    ;
+
+merge_into_existing_keystore
+    : MERGE KEYSTORE ksl1 = CHAR_STRING identified_by_password_clause? INTO EXISTING KEYSTORE ksl2 = CHAR_STRING identified_by_password_clause
+        with_backup_clause?
+    ;
+
+isolate_keystore
+    : FORCE? ISOLATE KEYSTORE IDENTIFIED BY i = keystore_password FROM ROOT KEYSTORE force_keystore? identified_by_store with_backup_clause?
+    ;
+
+unite_keystore
+    : UNITE KEYSTORE IDENTIFIED BY i = keystore_password WITH ROOT KEYSTORE force_keystore? identified_by_store with_backup_clause?
+    ;
+
+key_management_clauses
+    : set_key
+    | create_key
+    | use_key
+    | set_key_tag
+    | export_keys
+    | import_keys
+    | migrate_keys
+    | reverse_migrate_keys
+    | move_keys
+    ;
+
+set_key
+    : SET ENCRYPTION? KEY ((mkid ':')? mk)? using_tag_clause? using_algorithm_clause? force_keystore? identified_by_store with_backup_clause?
+        container_clause?
+    ;
+
+create_key
+    : CREATE ENCRYPTION? KEY ((mkid ':')? mk)? using_tag_clause? using_algorithm_clause? force_keystore? identified_by_store with_backup_clause?
+        container_clause?
+    ;
+
+mkid
+    : CHAR_STRING
+    ;
+
+mk
+    : CHAR_STRING
+    ;
+
+use_key
+    : USE ENCRYPTION? KEY k = CHAR_STRING using_tag_clause? force_keystore? identified_by_store with_backup_clause?
+    ;
+
+set_key_tag
+    : SET TAG t = CHAR_STRING FOR k = CHAR_STRING force_keystore? identified_by_store with_backup_clause?
+    ;
+
+export_keys
+    : EXPORT ENCRYPTION? KEYS WITH SECRET secret TO filename force_keystore? identified_by_store (
+        WITH IDENTIFIER IN (CHAR_STRING (',' CHAR_STRING)* | '(' subquery ')')
+    )?
+    ;
+
+import_keys
+    : IMPORT ENCRYPTION? KEYS WITH SECRET secret FROM filename force_keystore? identified_by_store with_backup_clause?
+    ;
+
+migrate_keys
+    : SET ENCRYPTION? KEY IDENTIFIED BY hsm = secret force_keystore? MIGRATE USING keystore_password with_backup_clause?
+    ;
+
+reverse_migrate_keys
+    : SET ENCRYPTION? KEY IDENTIFIED BY s = secret force_keystore? REVERSE MIGRATE USING hsm = secret
+    ;
+
+move_keys
+    : MOVE ENCRYPTION? KEYS TO NEW KEYSTORE ksl1 = CHAR_STRING IDENTIFIED BY ksp1 = keystore_password FROM FORCE? KEYSTORE IDENTIFIED BY ksp =
+        keystore_password (WITH IDENTIFIER IN (CHAR_STRING (',' CHAR_STRING)* | subquery))? with_backup_clause?
+    ;
+
+identified_by_store
+    : IDENTIFIED BY (EXTERNAL STORE | keystore_password)
+    ;
+
+using_algorithm_clause
+    : USING ALGORITHM ea = CHAR_STRING
+    ;
+
+using_tag_clause
+    : USING TAG t = CHAR_STRING
+    ;
+
+secret_management_clauses
+    : add_update_secret
+    | delete_secret
+    | add_update_secret_seps
+    | delete_secret_seps
+    ;
+
+add_update_secret
+    : (ADD | UPDATE) SECRET s = CHAR_STRING FOR CLIENT ci = CHAR_STRING using_tag_clause? force_keystore? identified_by_store? with_backup_clause?
+    ;
+
+delete_secret
+    : DELETE SECRET FOR CLIENT ci = CHAR_STRING force_keystore? identified_by_store with_backup_clause?
+    ;
+
+add_update_secret_seps
+    : (ADD | UPDATE) SECRET s = CHAR_STRING FOR CLIENT ci = CHAR_STRING using_tag_clause? TO LOCAL? AUTO_LOGIN KEYSTORE directory_path
+    ;
+
+delete_secret_seps
+    : DELETE SECRET s = CHAR_STRING SQ FOR CLIENT ci = CHAR_STRING FROM LOCAL? AUTO_LOGIN KEYSTORE directory_path
+    ;
+
+zero_downtime_software_patching_clauses
+    : SWITCHOVER TO? LIBRARY path FOR ALL CONTAINERS //inconsistent documentation
+    ;
+
+with_backup_clause
+    : WITH BACKUP (USING bi = CHAR_STRING)?
+    ;
+
+identified_by_password_clause
+    : IDENTIFIED BY keystore_password
+    ;
+
+keystore_password
+    : DELIMITED_ID
+    ;
+
+path
+    : CHAR_STRING
+    ;
+
+secret
+    : DELIMITED_ID
+    ;
+
+// https://docs.oracle.com/cd/E11882_01/server.112/e41084/statements_4005.htm#SQLRF01105
+analyze
+    : (
+        ANALYZE (TABLE tableview_name | INDEX index_name) partition_extention_clause?
+        | ANALYZE CLUSTER cluster_name
+    ) (validation_clauses | LIST CHAINED ROWS into_clause1? | DELETE SYSTEM? STATISTICS)
+    ;
+
+partition_extention_clause
+    : PARTITION (
+        '(' partition_name ')'
+        | FOR '(' partition_key_value (',' partition_key_value)* ')'
+    )
+    | SUBPARTITION (
+        '(' subpartition_name ')'
+        | FOR '(' subpartition_key_value (',' subpartition_key_value)* ')'
+    )
+    ;
+
+validation_clauses
+    : VALIDATE REF UPDATE (SET DANGLING TO NULL_)?
+    | VALIDATE STRUCTURE (CASCADE FAST | CASCADE online_or_offline? into_clause? | CASCADE)? online_or_offline? into_clause?
+    ;
+
+compute_clauses
+    : COMPUTE SYSTEM? STATISTICS for_clause?
+    ;
+
+for_clause
+    : FOR (
+        TABLE for_clause*
+        | ALL (INDEXED? COLUMNS (SIZE UNSIGNED_INTEGER)? for_clause* | LOCAL? INDEXES)
+        | COLUMNS (SIZE UNSIGNED_INTEGER)? (column_name SIZE UNSIGNED_INTEGER)+ for_clause*
+    )
+    ;
+
+online_or_offline
+    : OFFLINE
+    | ONLINE
+    ;
+
+into_clause1
+    : INTO tableview_name?
+    ;
+
+//Making assumption on partition ad subpartition key value clauses
+partition_key_value
+    : literal
+    | TIMESTAMP quoted_string
+    ;
+
+subpartition_key_value
+    : literal
+    | TIMESTAMP quoted_string
+    ;
+
+//https://docs.oracle.com/cd/E11882_01/server.112/e41084/statements_4006.htm#SQLRF01106
+associate_statistics
+    : ASSOCIATE STATISTICS WITH (column_association | function_association) storage_table_clause?
+    ;
+
+column_association
+    : COLUMNS tableview_name '.' column_name (',' tableview_name '.' column_name)* using_statistics_type
+    ;
+
+function_association
+    : (
+        FUNCTIONS function_name (',' function_name)*
+        | PACKAGES package_name (',' package_name)*
+        | TYPES type_name (',' type_name)*
+        | INDEXES index_name (',' index_name)*
+        | INDEXTYPES indextype_name (',' indextype_name)*
+    ) (
+        using_statistics_type
+        | default_cost_clause (',' default_selectivity_clause)?
+        | default_selectivity_clause (',' default_cost_clause)?
+    )
+    ;
+
+indextype_name
+    : id_expression
+    ;
+
+using_statistics_type
+    : USING (statistics_type_name | NULL_)
+    ;
+
+statistics_type_name
+    : regular_id
+    ;
+
+default_cost_clause
+    : DEFAULT COST '(' cpu_cost ',' io_cost ',' network_cost ')'
+    ;
+
+cpu_cost
+    : UNSIGNED_INTEGER
+    ;
+
+io_cost
+    : UNSIGNED_INTEGER
+    ;
+
+network_cost
+    : UNSIGNED_INTEGER
+    ;
+
+default_selectivity_clause
+    : DEFAULT SELECTIVITY default_selectivity
+    ;
+
+default_selectivity
+    : UNSIGNED_INTEGER
+    ;
+
+storage_table_clause
+    : WITH (SYSTEM | USER) MANAGED STORAGE TABLES
+    ;
+
+// https://docs.oracle.com/database/121/SQLRF/statements_4008.htm#SQLRF56110
+unified_auditing
+    : {this.isVersion12()}? AUDIT (
+        POLICY policy_name ((BY | EXCEPT) audit_user (',' audit_user)*)? (WHENEVER NOT? SUCCESSFUL)?
+        | CONTEXT NAMESPACE oracle_namespace ATTRIBUTES attribute_name (',' attribute_name)* (
+            BY audit_user (',' audit_user)*
+        )?
+    )
+    ;
+
+policy_name
+    : identifier
+    ;
+
+// https://docs.oracle.com/cd/E11882_01/server.112/e41084/statements_4007.htm#SQLRF01107
+// https://docs.oracle.com/database/121/SQLRF/statements_4007.htm#SQLRF01107
+
+audit_traditional
+    : AUDIT (
+        audit_operation_clause (auditing_by_clause | IN SESSION CURRENT)?
+        | audit_schema_object_clause
+        | NETWORK
+        | audit_direct_path
+    ) (BY (SESSION | ACCESS))? (WHENEVER NOT? SUCCESSFUL)? audit_container_clause?
+    ;
+
+audit_direct_path
+    : {this.isVersion12()}? DIRECT_PATH auditing_by_clause
+    ;
+
+audit_container_clause
+    : {this.isVersion12()}? (CONTAINER EQUALS_OP (CURRENT | ALL))
+    ;
+
+audit_operation_clause
+    : (
+        (sql_statement_shortcut | ALL STATEMENTS?) (',' (sql_statement_shortcut | ALL STATEMENTS?))*
+        | (system_privilege | ALL PRIVILEGES) (',' (system_privilege | ALL PRIVILEGES))*
+    )
+    ;
+
+auditing_by_clause
+    : BY audit_user (',' audit_user)*
+    ;
+
+audit_user
+    : regular_id
+    ;
+
+audit_schema_object_clause
+    : (sql_operation (',' sql_operation)* | ALL) auditing_on_clause
+    ;
+
+sql_operation
+    : ALTER
+    | AUDIT
+    | COMMENT
+    | DELETE
+    | EXECUTE
+    | FLASHBACK
+    | GRANT
+    | INDEX
+    | INSERT
+    | LOCK
+    | READ
+    | RENAME
+    | SELECT
+    | UPDATE
+    ;
+
+auditing_on_clause
+    : ON (
+        object_name
+        | DIRECTORY regular_id
+        | MINING MODEL model_name
+        | {this.isVersion12()}? SQL TRANSLATION PROFILE profile_name
+        | DEFAULT
+    )
+    ;
+
+model_name
+    : (id_expression '.')? id_expression
+    ;
+
+object_name
+    : (id_expression '.')? id_expression
+    ;
+
+profile_name
+    : (id_expression '.')? id_expression
+    ;
+
+sql_statement_shortcut
+    : ALTER SYSTEM
+    | CLUSTER
+    | CONTEXT
+    | DATABASE LINK
+    | DIMENSION
+    | DIRECTORY
+    | INDEX
+    | MATERIALIZED VIEW
+    | NOT EXISTS
+    | OUTLINE
+    | {this.isVersion12()}? PLUGGABLE DATABASE
+    | PROCEDURE
+    | PROFILE
+    | PUBLIC DATABASE LINK
+    | PUBLIC SYNONYM
+    | ROLE
+    | ROLLBACK SEGMENT
+    | SEQUENCE
+    | SESSION
+    | SYNONYM
+    | SYSTEM AUDIT
+    | SYSTEM GRANT
+    | TABLE
+    | TABLESPACE
+    | TRIGGER
+    | TYPE
+    | USER
+    | VIEW
+    | ALTER SEQUENCE
+    | ALTER TABLE
+    | COMMENT TABLE
+    | DELETE TABLE
+    | EXECUTE PROCEDURE
+    | GRANT DIRECTORY
+    | GRANT PROCEDURE
+    | GRANT SEQUENCE
+    | GRANT TABLE
+    | GRANT TYPE
+    | INSERT TABLE
+    | LOCK TABLE
+    | SELECT SEQUENCE
+    | SELECT TABLE
+    | UPDATE TABLE
+    ;
+
+drop_index
+    : DROP INDEX index_name (IF EXISTS)?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DISASSOCIATE-STATISTICS.html
+disassociate_statistics
+    : DISASSOCIATE STATISTICS FROM (
+        COLUMNS (schema_name '.')? tb = id_expression '.' c = id_expression (
+            ',' (schema_name '.')? tb = id_expression '.' c = id_expression
+        )*
+        | FUNCTIONS (schema_name '.')? fn = id_expression (
+            ',' (schema_name '.')? fn = id_expression
+        )*
+        | PACKAGES (schema_name '.')? pkg = id_expression (
+            ',' (schema_name '.')? pkg = id_expression
+        )*
+        | TYPES (schema_name '.')? t = id_expression (',' (schema_name '.')? t = id_expression)*
+        | INDEXES (schema_name '.')? ix = id_expression (',' (schema_name '.')? ix = id_expression)*
+        | INDEXTYPES (schema_name '.')? it = id_expression (
+            ',' (schema_name '.')? it = id_expression
+        )*
+    ) FORCE?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-INDEXTYPE.html
+drop_indextype
+    : DROP INDEXTYPE (schema_name '.')? it = id_expression FORCE?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-INMEMORY-JOIN-GROUP.html
+drop_inmemory_join_group
+    : DROP INMEMORY JOIN GROUP (schema_name '.')? jg = id_expression
+    ;
+
+flashback_table
+    : FLASHBACK TABLE tableview_name (',' tableview_name)* TO (
+        ((SCN | TIMESTAMP) expression | RESTORE POINT restore_point) ((ENABLE | DISABLE) TRIGGERS)?
+        | BEFORE DROP (RENAME TO tableview_name)?
+    )
+    ;
+
+restore_point
+    : identifier ('.' id_expression)*
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/PURGE.html
+purge_statement
+    : PURGE (
+        (TABLE | INDEX) id_expression
+        | TABLESPACE SET? ts = id_expression (USER u = id_expression)?
+        | RECYCLEBIN
+        | DBA_RECYCLEBIN
+    )
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/NOAUDIT-Traditional-Auditing.html
+noaudit_statement
+    : NOAUDIT (
+        audit_operation_clause auditing_by_clause?
+        | audit_schema_object_clause
+        | NETWORK
+        | DIRECT_PATH LOAD auditing_by_clause?
+    ) (WHENEVER NOT? SUCCESSFUL)? container_clause?
+    ;
+
+rename_object
+    : RENAME object_name TO object_name
+    ;
+
+grant_statement
+    : GRANT (','? (role_name | system_privilege | object_privilege paren_column_list?))+ (
+        ON grant_object_name
+    )? TO (grantee_name | PUBLIC) (',' (grantee_name | PUBLIC))* (WITH (ADMIN | DELEGATE) OPTION)? (
+        WITH HIERARCHY OPTION
+    )? (WITH GRANT OPTION)? container_clause?
+    ;
+
+container_clause
+    : CONTAINER EQUALS_OP (CURRENT | ALL)
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/REVOKE.html
+revoke_statement
+    : REVOKE (
+        (revoke_system_privilege | revoke_object_privileges) container_clause?
+        | revoke_roles_from_programs
+    )
+    ;
+
+revoke_system_privilege
+    : (system_privilege | role_name | ALL PRIVILEGES) FROM revokee_clause
+    ;
+
+revokee_clause
+    : (id_expression | PUBLIC) (',' (id_expression | PUBLIC))*
+    ;
+
+revoke_object_privileges
+    : (object_privilege | ALL PRIVILEGES?) (',' (object_privilege | ALL PRIVILEGES?))* on_object_clause FROM revokee_clause (
+        CASCADE CONSTRAINTS
+        | FORCE
+    )?
+    ;
+
+on_object_clause
+    : ON (
+        (schema_name '.')? o = id_expression
+        | USER id_expression (',' id_expression)*
+        | DIRECTORY directory_name
+        | EDITION edition_name
+        | MINING MODEL (schema_name '.')? mmn = id_expression
+        | JAVA (SOURCE | RESOURCE) (schema_name '.')? o2 = id_expression
+        | SQL TRANSLATION PROFILE (schema_name '.')? p = id_expression
+    )
+    ;
+
+revoke_roles_from_programs
+    : (role_name (',' role_name)* | ALL) FROM program_unit (',' program_unit)*
+    ;
+
+program_unit
+    : (FUNCTION | PROCEDURE | PACKAGE) (schema_name '.')? id_expression
+    ;
+
+create_dimension
+    : CREATE DIMENSION identifier level_clause+ (
+        hierarchy_clause
+        | attribute_clause
+        | extended_attribute_clause
+    )+
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-DIRECTORY.html
+create_directory
+    : CREATE (OR REPLACE)? DIRECTORY directory_name (SHARING '=' (METADATA | NONE))? AS directory_path
+    ;
+
+directory_name
+    : regular_id
+    ;
+
+directory_path
+    : CHAR_STRING
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-INMEMORY-JOIN-GROUP.html
+create_inmemory_join_group
+    : CREATE INMEMORY JOIN GROUP (schema_name '.')? jg = id_expression '(' (schema_name '.')? t = id_expression '(' c = id_expression ')' (
+        ',' (schema_name '.')? t = id_expression '(' c = id_expression ')'
+    )+ ')'
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-HIERARCHY.html
+drop_hierarchy
+    : DROP HIERARCHY (schema_name '.')? hn = id_expression
+    ;
+
+// https://docs.oracle.com/cd/E11882_01/appdev.112/e25519/alter_library.htm#LNPLS99946
+// https://docs.oracle.com/database/121/LNPLS/alter_library.htm#LNPLS99946
+alter_library
+    : ALTER LIBRARY library_name (
+        COMPILE library_debug? compiler_parameters_clause* (REUSE SETTINGS)?
+        | library_editionable
+    )
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-JAVA.html
+drop_java
+    : DROP JAVA (SOURCE | CLASS | RESOURCE) (schema_name '.')? id_expression
+    ;
+
+drop_library
+    : DROP LIBRARY library_name
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-JAVA.html
+create_java
+    : CREATE (OR REPLACE)? (AND (RESOLVE | COMPILE))? NOFORCE? JAVA (
+        (SOURCE | RESOURCE) NAMED (schema_name '.')? pn = id_expression
+        | CLASS (SCHEMA id_expression)?
+    ) (SHARING '=' (METADATA | NONE))? invoker_rights_clause? (
+        RESOLVER '(' ('(' CHAR_STRING ','? (sn = id_expression | '-') ')')+ ')'
+    )? (
+        USING (
+            BFILE '(' d = id_expression ',' filename ')'
+            | (CLOB | BLOB | BFILE) subquery
+            | CHAR_STRING
+        )
+        | AS CHAR_STRING
+    )
+    ;
+
+create_library
+    : CREATE (OR REPLACE)? (EDITIONABLE | NONEDITIONABLE)? LIBRARY plsql_library_source
+    ;
+
+plsql_library_source
+    : library_name (IS | AS) quoted_string (IN directory_name)? (AGENT quoted_string)? (
+        CREDENTIAL credential_name
+    )?
+    ;
+
+credential_name
+    : (id_expression '.')? id_expression
+    ;
+
+library_editionable
+    : {this.isVersion12()}? (EDITIONABLE | NONEDITIONABLE)
+    ;
+
+library_debug
+    : {this.isVersion12()}? DEBUG
+    ;
+
+compiler_parameters_clause
+    : parameter_name EQUALS_OP parameter_value
+    ;
+
+parameter_value
+    : regular_id
+    | CHAR_STRING
+    ;
+
+library_name
+    : (regular_id '.')? regular_id
+    ;
+
+alter_dimension
+    : ALTER DIMENSION identifier (
+        (ADD (level_clause | hierarchy_clause | attribute_clause | extended_attribute_clause))+
+        | (
+            DROP (
+                LEVEL identifier (RESTRICT | CASCADE)?
+                | HIERARCHY identifier
+                | ATTRIBUTE identifier (
+                    LEVEL identifier (COLUMN column_name (',' COLUMN column_name)*)?
+                )?
+            )
+        )+
+        | COMPILE
+    )
+    ;
+
+level_clause
+    : LEVEL identifier IS (
+        table_name '.' column_name
+        | '(' table_name '.' column_name (',' table_name '.' column_name)* ')'
+    ) (SKIP_ WHEN NULL_)?
+    ;
+
+hierarchy_clause
+    : HIERARCHY identifier '(' identifier (CHILD OF identifier)+ dimension_join_clause? ')'
+    ;
+
+dimension_join_clause
+    : (JOIN KEY column_one_or_more_sub_clause REFERENCES identifier)+
+    ;
+
+attribute_clause
+    : (ATTRIBUTE identifier DETERMINES column_one_or_more_sub_clause)+
+    ;
+
+extended_attribute_clause
+    : ATTRIBUTE identifier (LEVEL identifier DETERMINES column_one_or_more_sub_clause)+
+    ;
+
+column_one_or_more_sub_clause
+    : column_name
+    | '(' column_name (',' column_name)* ')'
+    ;
+
+// https://docs.oracle.com/cd/E11882_01/server.112/e41084/statements_4004.htm#SQLRF01104
+// https://docs.oracle.com/database/121/SQLRF/statements_4004.htm#SQLRF01104
+alter_view
+    : ALTER VIEW tableview_name (
+        ADD out_of_line_constraint
+        | MODIFY CONSTRAINT constraint_name (RELY | NORELY)
+        | DROP (
+            CONSTRAINT constraint_name
+            | PRIMARY KEY
+            | UNIQUE '(' column_name (',' column_name)* ')'
+        )
+        | COMPILE
+        | READ (ONLY | WRITE)
+        | alter_view_editionable?
+    )
+    ;
+
+alter_view_editionable
+    : {this.isVersion12()}? (EDITIONABLE | NONEDITIONABLE)
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-VIEW.html
+create_view
+    : CREATE (OR REPLACE)? (NO? FORCE)? editioning_clause? VIEW (schema_name '.')? v = id_expression (
+        IF NOT EXISTS
+    )? (SHARING '=' (METADATA | EXTENDED? DATA | NONE))? view_options? (
+        DEFAULT COLLATION cn = id_expression
+    )? (BEQUEATH (CURRENT_USER | DEFINER))? AS select_only_statement subquery_restriction_clause? (
+        CONTAINER_MAP
+        | CONTAINERS_DEFAULT
+    )?
+    ;
+
+editioning_clause
+    : EDITIONING
+    | EDITIONABLE EDITIONING?
+    | NONEDITIONABLE
+    ;
+
+view_options
+    : view_alias_constraint
+    | object_view_clause
+    | xmltype_view_clause
+    ;
+
+view_alias_constraint
+    : '(' (','? (table_alias inline_constraint* | out_of_line_constraint))+ ')'
+    ;
+
+object_view_clause
+    : OF (schema_name '.')? tn = id_expression (
+        WITH OBJECT (IDENTIFIER | ID) (DEFAULT | '(' REGULAR_ID (',' REGULAR_ID)* ')')
+        | UNDER (schema_name '.')? sv = id_expression
+    ) ('(' (','? (out_of_line_constraint | REGULAR_ID inline_constraint))+ ')')*
+    ;
+
+inline_constraint
+    : (CONSTRAINT constraint_name)? (
+        NOT? NULL_
+        | UNIQUE
+        | PRIMARY KEY
+        | references_clause
+        | check_constraint
+    ) constraint_state?
+    ;
+
+inline_ref_constraint
+    : SCOPE IS tableview_name
+    | WITH ROWID
+    | (CONSTRAINT constraint_name)? references_clause constraint_state?
+    ;
+
+out_of_line_ref_constraint
+    : SCOPE FOR '(' ref_col_or_attr = regular_id ')' IS tableview_name
+    | REF '(' ref_col_or_attr = regular_id ')' WITH ROWID
+    | (CONSTRAINT constraint_name)? FOREIGN KEY '(' (','? ref_col_or_attr = regular_id)+ ')' references_clause constraint_state?
+    ;
+
+out_of_line_constraint
+    : (
+        ((CONSTRAINT | CONSTRAINTS) constraint_name)? (
+            UNIQUE '(' column_name (',' column_name)* ')'
+            | PRIMARY KEY '(' column_name (',' column_name)* ')'
+            | foreign_key_clause
+            | CHECK '(' condition ')'
+        )
+    ) constraint_state?
+    ;
+
+constraint_state
+    : (
+        NOT? DEFERRABLE
+        | INITIALLY (IMMEDIATE | DEFERRED)
+        | (RELY | NORELY)
+        | (ENABLE | DISABLE)
+        | (VALIDATE | NOVALIDATE)
+        | using_index_clause
+    )+
+    ;
+
+xmltype_view_clause
+    : OF XMLTYPE xml_schema_spec? WITH OBJECT (IDENTIFIER | ID) (
+        DEFAULT
+        | '(' expression (',' expression)* ')'
+    )
+    ;
+
+xml_schema_spec
+    : (XMLSCHEMA xml_schema_url)? ELEMENT (element | xml_schema_url '#' element) (
+        STORE ALL VARRAYS AS (LOBS | TABLES)
+    )? (allow_or_disallow NONSCHEMA)? (allow_or_disallow ANYSCHEMA)?
+    ;
+
+xml_schema_url
+    : DELIMITED_ID
+    ;
+
+element
+    : DELIMITED_ID
+    ;
+
+alter_tablespace
+    : ALTER TABLESPACE tablespace (
+        DEFAULT table_compression? storage_clause?
+        | MINIMUM EXTENT size_clause
+        | RESIZE size_clause
+        | COALESCE
+        | SHRINK SPACE_KEYWORD (KEEP size_clause)?
+        | RENAME TO new_tablespace_name
+        | begin_or_end BACKUP
+        | datafile_tempfile_clauses
+        | tablespace_logging_clauses
+        | tablespace_group_clause
+        | tablespace_state_clauses
+        | autoextend_clause
+        | flashback_mode_clause
+        | tablespace_retention_clause
+    )
+    ;
+
+datafile_tempfile_clauses
+    : ADD (datafile_specification | tempfile_specification)
+    | DROP (DATAFILE | TEMPFILE) (filename | UNSIGNED_INTEGER) (KEEP size_clause)?
+    | SHRINK TEMPFILE (filename | UNSIGNED_INTEGER) (KEEP size_clause)?
+    | RENAME DATAFILE filename (',' filename)* TO filename (',' filename)*
+    | (DATAFILE | TEMPFILE) (online_or_offline)
+    ;
+
+tablespace_logging_clauses
+    : logging_clause
+    | NO? FORCE LOGGING
+    ;
+
+tablespace_group_clause
+    : TABLESPACE GROUP (tablespace_group_name | CHAR_STRING)
+    ;
+
+tablespace_group_name
+    : regular_id
+    ;
+
+tablespace_state_clauses
+    : ONLINE
+    | OFFLINE (NORMAL | TEMPORARY | IMMEDIATE)?
+    | READ (ONLY | WRITE)
+    | PERMANENT
+    | TEMPORARY
+    ;
+
+flashback_mode_clause
+    : FLASHBACK (ON | OFF)
+    ;
+
+new_tablespace_name
+    : tablespace
+    ;
+
+create_tablespace
+    : CREATE (BIGFILE | SMALLFILE)? (
+        permanent_tablespace_clause
+        | temporary_tablespace_clause
+        | undo_tablespace_clause
+    )
+    ;
+
+permanent_tablespace_clause
+    : TABLESPACE id_expression (IF NOT EXISTS)? datafile_specification? (
+        MINIMUM EXTENT size_clause
+        | BLOCKSIZE size_clause
+        | logging_clause
+        | FORCE LOGGING
+        | (ONLINE | OFFLINE)
+        | ENCRYPTION tablespace_encryption_spec
+        | DEFAULT //TODO table_compression? storage_clause?
+        | extent_management_clause
+        | segment_management_clause
+        | flashback_mode_clause
+    )*
+    ;
+
+tablespace_encryption_spec
+    : USING encrypt_algorithm = CHAR_STRING
+    ;
+
+logging_clause
+    : LOGGING
+    | NOLOGGING
+    | FILESYSTEM_LIKE_LOGGING
+    ;
+
+extent_management_clause
+    : EXTENT MANAGEMENT LOCAL (AUTOALLOCATE | UNIFORM (SIZE size_clause)?)?
+    ;
+
+segment_management_clause
+    : SEGMENT SPACE_KEYWORD MANAGEMENT (AUTO | MANUAL)
+    ;
+
+temporary_tablespace_clause
+    : TEMPORARY TABLESPACE tablespace_name = id_expression (IF NOT EXISTS)? tempfile_specification? tablespace_group_clause? extent_management_clause?
+    ;
+
+undo_tablespace_clause
+    : UNDO TABLESPACE tablespace_name = id_expression (IF NOT EXISTS)? datafile_specification? extent_management_clause? tablespace_retention_clause?
+    ;
+
+tablespace_retention_clause
+    : RETENTION (GUARANTEE | NOGUARANTEE)
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-TABLESPACE-SET.html
+create_tablespace_set
+    : CREATE TABLESPACE SET tss = id_expression (IN SHARDSPACE ss = id_expression)? (
+        USING TEMPLATE '(' (DATAFILE file_specification (',' file_specification)*)? permanent_tablespace_attrs+ ')'
+    )?
+    ;
+
+permanent_tablespace_attrs
+    : MINIMUM EXTENT size_clause
+    | BLOCKSIZE numeric K_LETTER?
+    | logging_clause
+    | FORCE LOGGING
+    | tablespace_encryption_clause
+    | default_tablespace_params
+    | ONLINE
+    | OFFLINE
+    | extent_management_clause
+    | segment_management_clause
+    | flashback_mode_clause
+    | lost_write_protection
+    ;
+
+tablespace_encryption_clause
+    : ENCRYPTION (tablespace_encryption_spec? ENCRYPT | DECRYPT)
+    ;
+
+default_tablespace_params
+    : DEFAULT default_table_compression? default_index_compression? inmmemory_clause? ilm_clause? storage_clause?
+    ;
+
+default_table_compression
+    : TABLE (COMPRESS FOR (OLTP | QUERY low_high | ARCHIVE low_high) | NOCOMPRESS)
+    ;
+
+low_high
+    : LOW
+    | HIGH
+    ;
+
+default_index_compression
+    : INDEX (COMPRESS ADVANCED low_high | NOCOMPRESS)
+    ;
+
+inmmemory_clause
+    : INMEMORY inmemory_attributes? (
+        TEXT (
+            column_name (',' column_name)*
+            | column_name USING policy_name (',' column_name USING policy_name)*
+        )
+    )?
+    | NO INMEMORY
+    ;
+
+// asm_filename is just a charater string.  Would need to parse the string
+// to find diskgroup...
+datafile_specification
+    : DATAFILE (','? datafile_tempfile_spec)
+    ;
+
+tempfile_specification
+    : TEMPFILE (','? datafile_tempfile_spec)
+    ;
+
+datafile_tempfile_spec
+    : CHAR_STRING? (SIZE size_clause)? REUSE? autoextend_clause?
+    ;
+
+redo_log_file_spec
+    : (filename | '(' filename (',' filename)* ')') (SIZE size_clause)? (BLOCKSIZE size_clause)? REUSE?
+    ;
+
+autoextend_clause
+    : AUTOEXTEND (OFF | ON (NEXT size_clause)? maxsize_clause?)
+    ;
+
+maxsize_clause
+    : MAXSIZE (UNLIMITED | size_clause)
+    ;
+
+build_clause
+    : BUILD (IMMEDIATE | DEFERRED)
+    ;
+
+parallel_clause
+    : NOPARALLEL
+    | PARALLEL parallel_count = UNSIGNED_INTEGER?
+    ;
+
+alter_materialized_view
+    : ALTER MATERIALIZED VIEW tableview_name (
+        physical_attributes_clause
+        | modify_mv_column_clause
+        | table_compression
+        | lob_storage_clause (',' lob_storage_clause)*
+        | modify_lob_storage_clause (',' modify_lob_storage_clause)*
+        //TODO | alter_table_partitioning
+        | parallel_clause
+        | logging_clause
+        | allocate_extent_clause
+        | deallocate_unused_clause
+        | shrink_clause
+        | (cache_or_nocache)
+    )? alter_iot_clauses? (USING INDEX physical_attributes_clause)? alter_mv_option1? (
+        enable_or_disable QUERY REWRITE
+        | COMPILE
+        | CONSIDER FRESH
+    )?
+    ;
+
+alter_mv_option1
+    : alter_mv_refresh
+    //TODO  | MODIFY scoped_table_ref_constraint
+    ;
+
+alter_mv_refresh
+    : REFRESH (
+        FAST
+        | COMPLETE
+        | FORCE
+        | ON (DEMAND | COMMIT)
+        | START WITH expression
+        | NEXT expression
+        | WITH PRIMARY KEY
+        | USING DEFAULT? MASTER ROLLBACK SEGMENT rollback_segment?
+        | USING (ENFORCED | TRUSTED) CONSTRAINTS
+    )+
+    ;
+
+rollback_segment
+    : regular_id
+    ;
+
+modify_mv_column_clause
+    : MODIFY '(' column_name (ENCRYPT encryption_spec | DECRYPT)? ')'
+    ;
+
+alter_materialized_view_log
+    : ALTER MATERIALIZED VIEW LOG FORCE? ON tableview_name (
+        physical_attributes_clause
+        | add_mv_log_column_clause
+        //TODO | alter_table_partitioning
+        | parallel_clause
+        | logging_clause
+        | allocate_extent_clause
+        | shrink_clause
+        | move_mv_log_clause
+        | cache_or_nocache
+    )? mv_log_augmentation? mv_log_purge_clause?
+    ;
+
+add_mv_log_column_clause
+    : ADD '(' column_name ')'
+    ;
+
+move_mv_log_clause
+    : MOVE segment_attributes_clause parallel_clause?
+    ;
+
+mv_log_augmentation
+    : ADD (
+        (OBJECT ID | PRIMARY KEY | ROWID | SEQUENCE) ('(' column_name (',' column_name)* ')')?
+        | '(' column_name (',' column_name)* ')'
+    ) new_values_clause?
+    ;
+
+// Should bound this to just date/time expr
+datetime_expr
+    : expression
+    ;
+
+// Should bound this to just interval expr
+interval_expr
+    : expression
+    ;
+
+synchronous_or_asynchronous
+    : SYNCHRONOUS
+    | ASYNCHRONOUS
+    ;
+
+including_or_excluding
+    : INCLUDING
+    | EXCLUDING
+    ;
+
+create_materialized_view_log
+    : CREATE MATERIALIZED VIEW LOG ON tableview_name (
+        (
+            physical_attributes_clause
+            | TABLESPACE tablespace_name = id_expression
+            | logging_clause
+            | (CACHE | NOCACHE)
+        )+
+    )? parallel_clause?
+    // table_partitioning_clauses TODO
+    (
+        WITH (','? ( OBJECT ID | PRIMARY KEY | ROWID | SEQUENCE | COMMIT SCN))* (
+            '(' ( ','? regular_id)+ ')' new_values_clause?
+        )? mv_log_purge_clause?
+    )*
+    ;
+
+new_values_clause
+    : (INCLUDING | EXCLUDING) NEW VALUES
+    ;
+
+mv_log_purge_clause
+    : PURGE (
+        IMMEDIATE (SYNCHRONOUS | ASYNCHRONOUS)?
+        // |START WITH CLAUSES TODO
+    )
+    ;
+
+create_materialized_zonemap
+    : CREATE MATERIALIZED ZONEMAP zonemap_name (LEFT_PAREN column_list RIGHT_PAREN)? zonemap_attributes? zonemap_refresh_clause? (
+        (ENABLE | DISABLE) PRUNING
+    )? (create_zonemap_on_table | create_zonemap_as_subquery)
+    ;
+
+alter_materialized_zonemap
+    : ALTER MATERIALIZED ZONEMAP zonemap_name (
+        zonemap_attributes
+        | zonemap_refresh_clause
+        | (ENABLE | DISABLE) PRUNING
+        | COMPILE
+        | REBUILD
+        | UNUSABLE
+    )
+    ;
+
+drop_materialized_zonemap
+    : DROP MATERIALIZED ZONEMAP zonemap_name
+    ;
+
+zonemap_refresh_clause
+    : REFRESH (FAST | COMPILE | FORCE)? (
+        ON (DEMAND | COMMIT | LOAD | DATA MOVEMENT | LOAD DATA MOVEMENT)
+    )?
+    ;
+
+zonemap_attributes
+    : (
+        PCTFREE numeric
+        | PCTUSED numeric
+        | SCALE numeric
+        | TABLESPACE tablespace
+        | (CACHE | NOCACHE)
+    )+
+    ;
+
+zonemap_name
+    : identifier ('.' id_expression)?
+    ;
+
+operator_name
+    : identifier ('.' id_expression)?
+    ;
+
+operator_function_name
+    : identifier ('.' id_expression)*
+    ;
+
+create_zonemap_on_table
+    : ON tableview_name LEFT_PAREN column_list RIGHT_PAREN
+    ;
+
+create_zonemap_as_subquery
+    : AS subquery
+    ;
+
+alter_operator
+    : ALTER OPERATOR operator_name (add_binding_clause | drop_binding_clause | COMPILE)
+    ;
+
+drop_operator
+    : DROP OPERATOR operator_name FORCE?
+    ;
+
+create_operator
+    : CREATE (OR REPLACE)? OPERATOR operator_name BINDING binding_clause (COMMA binding_clause)* (
+        SHARING '=' (METADATA | NONE)
+    )?
+    ;
+
+binding_clause
+    : LEFT_PAREN datatype (COMMA datatype)* RIGHT_PAREN RETURN LEFT_PAREN? datatype RIGHT_PAREN? implementation_clause? using_function_clause
+    ;
+
+add_binding_clause
+    : ADD BINDING binding_clause
+    ;
+
+implementation_clause
+    : ANCILLARY TO primary_operator_list
+    | operator_context_clause
+    ;
+
+primary_operator_list
+    : primary_operator_item (COMMA primary_operator_item)*
+    ;
+
+primary_operator_item
+    : schema_object_name LEFT_PAREN datatype (COMMA datatype)* RIGHT_PAREN
+    ;
+
+operator_context_clause
+    : WITH INDEX CONTEXT COMMA SCAN CONTEXT implementation_type_name (COMPUTE ANCILLARY DATA)? (
+        WITH COLUMN CONTEXT
+    )?
+    ;
+
+using_function_clause
+    : USING operator_function_name
+    ;
+
+drop_binding_clause
+    : DROP BINDING LEFT_PAREN datatype (COMMA datatype)* RIGHT_PAREN FORCE?
+    ;
+
+create_materialized_view
+    : CREATE MATERIALIZED VIEW tableview_name (OF type_name)? (
+        '(' (scoped_table_ref_constraint | mv_column_alias) (
+            ',' (scoped_table_ref_constraint | mv_column_alias)
+        )* ')'
+    )? (
+        ON PREBUILT TABLE ( (WITH | WITHOUT) REDUCED PRECISION)?
+        | physical_properties? (CACHE | NOCACHE)? parallel_clause? build_clause?
+    ) (
+        USING INDEX ((physical_attributes_clause | TABLESPACE mv_tablespace = id_expression)+)*
+        | USING NO INDEX
+    )? create_mv_refresh? (FOR UPDATE)? ((DISABLE | ENABLE) QUERY REWRITE)? AS select_only_statement
+    ;
+
+scoped_table_ref_constraint
+    : SCOPE FOR '(' ref_column_or_attribute = identifier ')' IS (schema_name '.')? scope_table_name_or_c_alias = identifier
+    ;
+
+mv_column_alias
+    : (identifier | quoted_string) (ENCRYPT encryption_spec)?
+    ;
+
+create_mv_refresh
+    : (
+        NEVER REFRESH
+        | REFRESH (
+            (FAST | COMPLETE | FORCE)
+            | ON (DEMAND | COMMIT)
+            | (START WITH | NEXT) //date goes here TODO
+            | WITH (PRIMARY KEY | ROWID)
+            | USING (
+                DEFAULT (MASTER | LOCAL)? ROLLBACK SEGMENT
+                | (MASTER | LOCAL)? ROLLBACK SEGMENT rb_segment = REGULAR_ID
+            )
+            | USING (ENFORCED | TRUSTED) CONSTRAINTS
+        )+
+    )
+    ;
+
+drop_materialized_view
+    : DROP MATERIALIZED VIEW tableview_name (PRESERVE TABLE)?
+    ;
+
+create_context
+    : CREATE (OR REPLACE)? CONTEXT oracle_namespace USING (schema_object_name '.')? package_name (
+        INITIALIZED (EXTERNALLY | GLOBALLY)
+        | ACCESSED GLOBALLY
+    )?
+    ;
+
+oracle_namespace
+    : id_expression
+    ;
+
+//https://docs.oracle.com/cd/E11882_01/server.112/e41084/statements_5001.htm#SQLRF01201
+create_cluster
+    : CREATE CLUSTER cluster_name '(' column_name datatype SORT? (',' column_name datatype SORT?)* ')' (
+        physical_attributes_clause
+        | SIZE size_clause
+        | TABLESPACE tablespace
+        | INDEX
+        | (SINGLE TABLE)? HASHKEYS UNSIGNED_INTEGER (HASH IS expression)?
+    )* parallel_clause? (ROWDEPENDENCIES | NOROWDEPENDENCIES)? (CACHE | NOCACHE)?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-PROFILE.html
+create_profile
+    : CREATE MANDATORY? PROFILE p = id_expression LIMIT (resource_parameters | password_parameters)+ container_clause?
+    ;
+
+resource_parameters
+    : (
+        SESSIONS_PER_USER
+        | CPU_PER_SESSION
+        | CPU_PER_CALL
+        | CONNECT_TIME
+        | IDLE_TIME
+        | LOGICAL_READS_PER_SESSION
+        | LOGICAL_READS_PER_CALL
+        | COMPOSITE_LIMIT
+    ) (UNSIGNED_INTEGER | UNLIMITED | DEFAULT)
+    | PRIVATE_SGA (size_clause | UNLIMITED | DEFAULT)
+    ;
+
+password_parameters
+    : (
+        FAILED_LOGIN_ATTEMPTS
+        | PASSWORD_LIFE_TIME
+        | PASSWORD_REUSE_TIME
+        | PASSWORD_REUSE_MAX
+        | PASSWORD_LOCK_TIME
+        | PASSWORD_GRACE_TIME
+        | INACTIVE_ACCOUNT_TIME
+    ) (expression | UNLIMITED | DEFAULT)
+    | PASSWORD_VERIFY_FUNCTION (function_name | NULL_ | DEFAULT)
+    | PASSWORD_ROLLOVER_TIME (expression | DEFAULT)
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-LOCKDOWN-PROFILE.html
+create_lockdown_profile
+    : CREATE LOCKDOWN PROFILE id_expression (static_base_profile | dynamic_base_profile)?
+    ;
+
+static_base_profile
+    : FROM bp = id_expression
+    ;
+
+dynamic_base_profile
+    : INCLUDING bp = id_expression
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-OUTLINE.html
+create_outline
+    : CREATE (OR REPLACE)? (PUBLIC | PRIVATE)? OUTLINE (o = id_expression)? (
+        FROM (PUBLIC | PRIVATE)? so = id_expression
+    )? (FOR CATEGORY c = id_expression)? (ON statement)?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-RESTORE-POINT.html
+create_restore_point
+    : CREATE CLEAN? RESTORE POINT rp = id_expression (FOR PLUGGABLE DATABASE pdb = id_expression)? (
+        AS OF (TIMESTAMP | SCN) expression
+    )? (PRESERVE | GUARANTEE FLASHBACK DATABASE)?
+    ;
+
+create_role
+    : CREATE ROLE role_name role_identified_clause? container_clause?
+    ;
+
+create_table
+    : CREATE (
+        (GLOBAL | PRIVATE) TEMPORARY
+        | SHARDED
+        | DUPLICATED
+        | IMMUTABLE? BLOCKCHAIN
+        | IMMUTABLE
+    )? TABLE (schema_name '.')? table_name (IF NOT EXISTS)? (
+        SHARING '=' (METADATA | EXTENDED? DATA | NONE)
+    )? (relational_table | xmltype_table | object_table) memoptimize_read_write_clause? (
+        PARENT tableview_name
+    )? (USAGE QUEUE)?
+    ;
+
+xmltype_table
+    : OF XMLTYPE ('(' object_properties ')')? (XMLTYPE xmltype_storage)? xmlschema_spec? xmltype_virtual_columns? (
+        ON COMMIT (DELETE | PRESERVE) ROWS
+    )? oid_clause? oid_index_clause? physical_properties? table_properties
+    ;
+
+xmltype_virtual_columns
+    : VIRTUAL COLUMNS '(' column_name AS '(' expression ')' (',' column_name AS '(' expression ')')* ')'
+    ;
+
+xmltype_column_properties
+    : XMLTYPE COLUMN? column_name xmltype_storage? xmlschema_spec?
+    ;
+
+xmltype_storage
+    : STORE AS (
+        OBJECT RELATIONAL
+        | (SECUREFILE | BASICFILE)? (CLOB | BINARY XML) (
+            lob_segname ('(' (TABLESPACE tablespace_name = id_expression)? lob_parameters storage_clause?')')?
+            | '(' (TABLESPACE tablespace_name = id_expression)? lob_parameters storage_clause? ')'
+        )?
+    )
+    | STORE VARRAYS AS (LOBS | TABLES)
+    ;
+
+xmlschema_spec
+    : (XMLSCHEMA DELIMITED_ID)? (ELEMENT DELIMITED_ID)? (allow_or_disallow NONSCHEMA)? (
+        allow_or_disallow ANYSCHEMA
+    )?
+    ;
+
+object_table
+    : OF (schema_name '.')? object_type object_table_substitution? (
+        '(' object_properties (',' object_properties)* ')'
+    )? (ON COMMIT (DELETE | PRESERVE) ROWS)? oid_clause? oid_index_clause? physical_properties? table_properties
+    ;
+
+object_type
+    : regular_id
+    ;
+
+oid_index_clause
+    : OIDINDEX index_name? '(' (physical_attributes_clause | TABLESPACE tablespace)+ ')'
+    ;
+
+oid_clause
+    : OBJECT IDENTIFIER IS (SYSTEM GENERATED | PRIMARY KEY)
+    ;
+
+object_properties
+    : (column_name | attribute_name) (DEFAULT expression)? (
+        inline_constraint (',' inline_constraint)*
+        | inline_ref_constraint
+    )?
+    | out_of_line_constraint
+    | out_of_line_ref_constraint
+    | supplemental_logging_props
+    ;
+
+object_table_substitution
+    : NOT? SUBSTITUTABLE AT ALL LEVELS
+    ;
+
+relational_table
+    : ('(' relational_property (',' relational_property)* ')')? immutable_table_clauses blockchain_table_clauses? (
+        DEFAULT COLLATION collation_name
+    )? (ON COMMIT (DROP | PRESERVE) DEFINITION)? (ON COMMIT (DELETE | PRESERVE) ROWS)? physical_properties? table_properties
+    ;
+
+immutable_table_clauses
+    : immutable_table_no_drop_clause? immutable_table_no_delete_clause?
+    ;
+
+immutable_table_no_drop_clause
+    : NO DROP (UNTIL numeric DAYS IDLE)?
+    ;
+
+immutable_table_no_delete_clause
+    : NO DELETE (LOCKED? | UNTIL numeric DAYS AFTER INSERT LOCKED?)
+    ;
+
+blockchain_table_clauses
+    : blockchain_drop_table_clause blockchain_row_retention_clause blockchain_hash_and_data_format_clause
+    ;
+
+blockchain_drop_table_clause
+    : NO DROP (UNTIL numeric DAYS IDLE)?
+    ;
+
+blockchain_row_retention_clause
+    : NO DELETE (LOCKED? | UNTIL numeric DAYS AFTER INSERT LOCKED?)
+    ;
+
+blockchain_hash_and_data_format_clause
+    : HASHING USING SHA2_512_Q VERSION V1_Q
+    ;
+
+collation_name
+    : identifier
+    ;
+
+table_properties
+    : column_properties? read_only_clause? indexing_clause? table_partitioning_clauses? attribute_clustering_clause? (
+        CACHE
+        | NOCACHE
+    )? result_cache_clause? parallel_clause? monitoring_nomonitoring? (ROWDEPENDENCIES | NOROWDEPENDENCIES)? enable_disable_clause* row_movement_clause?
+        logical_replication_clause? flashback_archive_clause? physical_properties? (ROW ARCHIVAL)? (
+        AS select_only_statement
+        | FOR EXCHANGE WITH TABLE (schema_name '.')? table_name
+    )?
+    ;
+
+read_only_clause
+    : READ (ONLY | WRITE)
+    ;
+
+indexing_clause
+    : INDEXING (ON | OFF)
+    ;
+
+attribute_clustering_clause
+    : CLUSTERING clustering_join? cluster_clause (yes_no? ON LOAD)? (yes_no? ON DATA MOVEMENT)? zonemap_clause?
+    ;
+
+clustering_join
+    : (schema_name '.')? table_name clustering_join_item (',' clustering_join_item)*
+    ;
+
+clustering_join_item
+    : JOIN (schema_name '.')? table_name ON '(' equijoin_condition ')'
+    ;
+
+equijoin_condition
+    : expression
+    ;
+
+cluster_clause
+    : BY (LINEAR | INTERLEAVED)? ORDER clustering_columns
+    ;
+
+clustering_columns
+    : clustering_column_group
+    | '(' clustering_column_group (',' clustering_column_group)* ')'
+    ;
+
+clustering_column_group
+    : '(' column_name (',' column_name)* ')'
+    ;
+
+yes_no
+    : YES
+    | NO
+    ;
+
+zonemap_clause
+    : WITH MATERIALIZED ZONEMAP ('(' zonemap_name ')')?
+    | WITHOUT MATERIALIZED ZONEMAP
+    ;
+
+logical_replication_clause
+    : DISABLE LOGICAL REPLICATION
+    | ENABLE LOGICAL REPLICATION ((ALL | ALLOW NOVALIDATE) KEYS)?
+    ;
+
+table_name
+    : identifier
+    ;
+
+relational_property
+    : column_definition
+    | virtual_column_definition
+    | period_definition
+    | out_of_line_constraint
+    | out_of_line_ref_constraint
+    | supplemental_logging_props
+    ;
+
+table_partitioning_clauses
+    : range_partitions
+    | list_partitions
+    | hash_partitions
+    | composite_range_partitions
+    | composite_list_partitions
+    | composite_hash_partitions
+    | reference_partitioning
+    | system_partitioning
+    ;
+
+range_partitions
+    : PARTITION BY RANGE '(' column_name (',' column_name)* ')' (
+        INTERVAL '(' expression ')' (STORE IN '(' tablespace (',' tablespace)* ')')?
+    )? '(' PARTITION partition_name? range_values_clause table_partition_description (
+        ',' PARTITION partition_name? range_values_clause table_partition_description
+    )* ')'
+    ;
+
+list_partitions
+    : PARTITION BY LIST '(' column_name ')' '(' PARTITION partition_name? list_values_clause table_partition_description (
+        ',' PARTITION partition_name? list_values_clause table_partition_description
+    )* ')'
+    ;
+
+hash_partitions
+    : PARTITION BY HASH '(' column_name (',' column_name)* ')' (
+        individual_hash_partitions
+        | hash_partitions_by_quantity
+    )
+    ;
+
+individual_hash_partitions
+    : '(' PARTITION partition_name? partitioning_storage_clause? (
+        ',' PARTITION partition_name? partitioning_storage_clause?
+    )* ')'
+    ;
+
+hash_partitions_by_quantity
+    : PARTITIONS hash_partition_quantity (STORE IN '(' tablespace (',' tablespace)* ')')? (
+        table_compression
+        | key_compression
+    )? (OVERFLOW STORE IN '(' tablespace (',' tablespace)* ')')?
+    ;
+
+hash_partition_quantity
+    : UNSIGNED_INTEGER
+    ;
+
+composite_range_partitions
+    : PARTITION BY RANGE '(' column_name (',' column_name)* ')' (
+        INTERVAL '(' expression ')' (STORE IN '(' tablespace (',' tablespace)* ')')?
+    )? (subpartition_by_range | subpartition_by_list | subpartition_by_hash) '(' range_partition_desc (
+        ',' range_partition_desc
+    )* ')'
+    ;
+
+composite_list_partitions
+    : PARTITION BY LIST '(' column_name ')' (
+        subpartition_by_range
+        | subpartition_by_list
+        | subpartition_by_hash
+    ) '(' list_partition_desc (',' list_partition_desc)* ')'
+    ;
+
+composite_hash_partitions
+    : PARTITION BY HASH '(' (',' column_name)+ ')' (
+        subpartition_by_range
+        | subpartition_by_list
+        | subpartition_by_hash
+    ) (individual_hash_partitions | hash_partitions_by_quantity)
+    ;
+
+reference_partitioning
+    : PARTITION BY REFERENCE '(' regular_id ')' (
+        '(' reference_partition_desc (',' reference_partition_desc)* ')'
+    )?
+    ;
+
+reference_partition_desc
+    : PARTITION partition_name? table_partition_description
+    ;
+
+system_partitioning
+    : PARTITION BY SYSTEM (
+        PARTITIONS UNSIGNED_INTEGER
+        | reference_partition_desc (',' reference_partition_desc)*
+    )?
+    ;
+
+range_partition_desc
+    : PARTITION partition_name? range_values_clause? table_partition_description (
+        (
+            '(' (
+                range_subpartition_desc (',' range_subpartition_desc)*
+                | list_subpartition_desc (',' list_subpartition_desc)*
+                | individual_hash_subparts (',' individual_hash_subparts)*
+            ) ')'
+            | hash_subparts_by_quantity
+        )
+    )?
+    ;
+
+list_partition_desc
+    : PARTITION partition_name? list_values_clause? table_partition_description (
+        (
+            '(' (
+                range_subpartition_desc (',' range_subpartition_desc)*
+                | list_subpartition_desc (',' list_subpartition_desc)*
+                | individual_hash_subparts (',' individual_hash_subparts)*
+            ) ')'
+            | hash_subparts_by_quantity
+        )
+    )?
+    ;
+
+subpartition_template
+    : SUBPARTITION TEMPLATE (
+        (
+            '(' (
+                range_subpartition_desc (',' range_subpartition_desc)*
+                | list_subpartition_desc (',' list_subpartition_desc)*
+                | individual_hash_subparts (',' individual_hash_subparts)*
+            ) ')'
+            | hash_subpartition_quantity
+        )
+    )
+    ;
+
+hash_subpartition_quantity
+    : UNSIGNED_INTEGER
+    ;
+
+subpartition_by_range
+    : SUBPARTITION BY RANGE '(' column_name (',' column_name)* ')' subpartition_template?
+    ;
+
+subpartition_by_list
+    : SUBPARTITION BY LIST '(' column_name ')' subpartition_template?
+    ;
+
+subpartition_by_hash
+    : SUBPARTITION BY HASH '(' column_name (',' column_name)* ')' (
+        SUBPARTITIONS UNSIGNED_INTEGER (STORE IN '(' tablespace (',' tablespace)* ')')?
+        | subpartition_template
+    )?
+    ;
+
+subpartition_name
+    : partition_name
+    ;
+
+range_subpartition_desc
+    : SUBPARTITION subpartition_name? range_values_clause partitioning_storage_clause?
+    ;
+
+list_subpartition_desc
+    : SUBPARTITION subpartition_name? list_values_clause partitioning_storage_clause?
+    ;
+
+individual_hash_subparts
+    : SUBPARTITION subpartition_name? partitioning_storage_clause?
+    ;
+
+hash_subparts_by_quantity
+    : SUBPARTITIONS UNSIGNED_INTEGER (STORE IN '(' tablespace (',' tablespace)* ')')?
+    ;
+
+range_values_clause
+    : VALUES LESS THAN '(' range_values_list ')'
+    ;
+
+range_values_list
+    : literal (',' literal)*
+    | TIMESTAMP literal (',' TIMESTAMP literal)*
+    ;
+
+list_values_clause
+    : VALUES '(' (literal (',' literal)* | TIMESTAMP literal (',' TIMESTAMP literal)* | DEFAULT) ')'
+    ;
+
+table_partition_description
+    : deferred_segment_creation? segment_attributes_clause? (table_compression | key_compression)? (
+        OVERFLOW segment_attributes_clause?
+    )? (lob_storage_clause | varray_col_properties | nested_table_col_properties)*
+    ;
+
+partitioning_storage_clause
+    : (
+        TABLESPACE tablespace
+        | OVERFLOW (TABLESPACE tablespace)?
+        | table_compression
+        | key_compression
+        | lob_partitioning_storage
+        | VARRAY varray_item STORE AS (BASICFILE | SECUREFILE)? LOB lob_segname
+    )+
+    ;
+
+lob_partitioning_storage
+    : LOB '(' lob_item ')' STORE AS (BASICFILE | SECUREFILE)? (
+        lob_segname ('(' TABLESPACE tablespace ')')?
+        | '(' TABLESPACE tablespace ')'
+    )
+    ;
+
+datatype_null_enable
+    : column_name datatype SORT? (DEFAULT expression)? (
+        ENCRYPT (USING CHAR_STRING)? (IDENTIFIED BY REGULAR_ID)? CHAR_STRING? (NO? SALT)?
+    )? (NOT NULL_)? (ENABLE | DISABLE)?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/size_clause.html
+// Technically, this should only allow 'K' | 'M' | 'G' | 'T' | 'P' | 'E'
+// but having issues with examples/numbers01.sql line 11 "sysdate -1m"
+size_clause
+    : UNSIGNED_INTEGER (K_LETTER | M_LETTER | G_LETTER | T_LETTER | P_LETTER | E_LETTER)?
+    ;
+
+table_compression
+    : COMPRESS (BASIC | FOR ( OLTP | (QUERY | ARCHIVE) (LOW | HIGH)?))?
+    | NOCOMPRESS
+    ;
+
+// avoid to match an empty string in
+inmemory_table_clause
+    : inmemory_column_clause+
+    | (INMEMORY inmemory_attributes? | NO INMEMORY) inmemory_column_clause*
+    ;
+
+// avoid to match an empty string in
+inmemory_attributes
+    : inmemory_memcompress inmemory_priority? inmemory_distribute? inmemory_duplicate?
+    | inmemory_priority inmemory_distribute? inmemory_duplicate?
+    | inmemory_distribute inmemory_duplicate?
+    | inmemory_duplicate
+    ;
+
+inmemory_memcompress
+    : MEMCOMPRESS FOR (DML | (QUERY | CAPACITY) (LOW | HIGH)?)
+    | NO MEMCOMPRESS
+    ;
+
+inmemory_priority
+    : PRIORITY (NONE | LOW | MEDIUM | HIGH | CRITICAL)
+    ;
+
+inmemory_distribute
+    : DISTRIBUTE (AUTO | BY (ROWID RANGE | PARTITION | SUBPARTITION))? (
+        FOR SERVICE (DEFAULT | ALL | identifier | NONE)
+    )?
+    ;
+
+inmemory_duplicate
+    : DUPLICATE ALL?
+    | NO DUPLICATE
+    ;
+
+inmemory_column_clause
+    : (INMEMORY inmemory_memcompress? | NO INMEMORY) '(' column_list ')'
+    ;
+
+physical_attributes_clause
+    : (
+        PCTFREE pctfree = UNSIGNED_INTEGER
+        | PCTUSED pctused = UNSIGNED_INTEGER
+        | INITRANS inittrans = UNSIGNED_INTEGER
+        | MAXTRANS maxtrans = UNSIGNED_INTEGER
+        | COMPUTE STATISTICS
+        | storage_clause
+        | compute_clauses
+    )+
+    ;
+
+storage_clause
+    : STORAGE '(' (
+        INITIAL initial_size = size_clause
+        | NEXT next_size = size_clause
+        | MINEXTENTS minextents = (UNSIGNED_INTEGER | UNLIMITED)
+        | MAXEXTENTS minextents = (UNSIGNED_INTEGER | UNLIMITED)
+        | PCTINCREASE pctincrease = UNSIGNED_INTEGER
+        | FREELISTS freelists = UNSIGNED_INTEGER
+        | FREELIST GROUPS freelist_groups = UNSIGNED_INTEGER
+        | OPTIMAL (size_clause | NULL_)
+        | BUFFER_POOL (KEEP | RECYCLE | DEFAULT)
+        | FLASH_CACHE (KEEP | NONE | DEFAULT)
+        | CELL_FLASH_CACHE (KEEP | NONE | DEFAULT)
+        | ENCRYPT
+    )+ ')'
+    ;
+
+deferred_segment_creation
+    : SEGMENT CREATION (IMMEDIATE | DEFERRED)
+    ;
+
+segment_attributes_clause
+    : (
+        physical_attributes_clause
+        | TABLESPACE (tablespace_name = id_expression | SET? identifier)
+        | table_compression
+        | logging_clause
+    )+
+    ;
+
+physical_properties
+    : deferred_segment_creation? segment_attributes_clause table_compression? inmemory_table_clause? ilm_clause?
+    | deferred_segment_creation? (
+        ORGANIZATION (
+            HEAP segment_attributes_clause? heap_org_table_clause
+            | INDEX segment_attributes_clause? index_org_table_clause
+            | EXTERNAL external_table_clause
+        )
+        | EXTERNAL PARTITION ATTRIBUTES external_table_clause (REJECT LIMIT)?
+    )
+    | CLUSTER cluster_name '(' column_name (',' column_name)* ')'
+    ;
+
+ilm_clause
+    : ILM (
+        ADD POLICY ilm_policy_clause
+        | (DELETE | ENABLE | DISABLE) POLICY ilm_policy_clause
+        | DELETE_ALL
+        | ENABLE_ALL
+        | DISABLE_ALL
+    )
+    ;
+
+ilm_policy_clause
+    : ilm_compression_policy
+    | ilm_tiering_policy
+    | ilm_inmemory_policy
+    ;
+
+ilm_compression_policy
+    : table_compression segment_group ilm_after_on
+    | ((ROW | COLUMN) STORE COMPRESS (ADVANCED | FOR QUERY)) ROW AFTER ilm_time_period OF NO MODIFICATION
+    ;
+
+ilm_tiering_policy
+    : TIER TO tablespace (
+        segment_group? (ON function_name)?
+        | READ ONLY segment_group? ilm_after_on
+    )
+    ;
+
+ilm_after_on
+    : AFTER ilm_time_period OF (NO (ACCESS | MODIFICATION) | CREATION)
+    | ON function_name
+    ;
+
+segment_group
+    : SEGMENT
+    | GROUP
+    ;
+
+ilm_inmemory_policy
+    : (SET INMEMORY inmemory_attributes? | MODIFY INMEMORY inmemory_memcompress | NO INMEMORY) SEGMENT? ilm_after_on
+    ;
+
+ilm_time_period
+    : numeric (DAY | DAYS | MONTH | MONTHS | YEAR | YEARS)
+    ;
+
+heap_org_table_clause
+    : table_compression? inmemory_table_clause? ilm_clause?
+    ;
+
+external_table_clause
+    : '(' (TYPE access_driver_type)? external_table_data_props ')' (
+        REJECT LIMIT (numeric | UNLIMITED)
+    )? inmemory_table_clause?
+    ;
+
+access_driver_type
+    : ORACLE_LOADER
+    | ORACLE_DATAPUMP
+    | ORACLE_HDFS
+    | ORACLE_HIVE
+    ;
+
+external_table_data_props
+    : (DEFAULT DIRECTORY directory_name)? (
+        ACCESS PARAMETERS (
+            '(' CHAR_STRING ')'
+            | '(' opaque_format_spec ')'
+            | USING CLOB select_only_statement
+        )
+    )? (LOCATION '(' directory_name COLON CHAR_STRING (',' directory_name COLON CHAR_STRING)* ')')?
+    ;
+
+opaque_format_spec
+    : //TODO https://docs.oracle.com/en/database/oracle/oracle-database/21/sutil/oracle-external-tables.html
+    ;
+
+row_movement_clause
+    : (ENABLE | DISABLE)? ROW MOVEMENT
+    ;
+
+flashback_archive_clause
+    : FLASHBACK ARCHIVE fa = id_expression?
+    | NO FLASHBACK ARCHIVE
+    ;
+
+log_grp
+    : UNSIGNED_INTEGER
+    ;
+
+supplemental_table_logging
+    : ADD SUPPLEMENTAL LOG (supplemental_log_grp_clause | supplemental_id_key_clause) (
+        ',' SUPPLEMENTAL LOG (supplemental_log_grp_clause | supplemental_id_key_clause)
+    )*
+    | DROP SUPPLEMENTAL LOG (supplemental_id_key_clause | GROUP log_grp) (
+        ',' SUPPLEMENTAL LOG (supplemental_id_key_clause | GROUP log_grp)
+    )*
+    ;
+
+supplemental_log_grp_clause
+    : GROUP log_grp '(' regular_id (NO LOG)? (',' regular_id (NO LOG)?)* ')' ALWAYS?
+    ;
+
+supplemental_id_key_clause
+    : DATA '(' (','? ( ALL | PRIMARY KEY | UNIQUE | FOREIGN KEY))+ ')' COLUMNS
+    ;
+
+allocate_extent_clause
+    : ALLOCATE EXTENT (
+        '(' (
+            SIZE size_clause
+            | DATAFILE datafile = CHAR_STRING
+            | INSTANCE inst_num = UNSIGNED_INTEGER
+        )+ ')'
+    )?
+    ;
+
+deallocate_unused_clause
+    : DEALLOCATE UNUSED (KEEP size_clause)?
+    ;
+
+shrink_clause
+    : SHRINK SPACE_KEYWORD COMPACT? CASCADE?
+    ;
+
+records_per_block_clause
+    : (MINIMIZE | NOMINIMIZE)? RECORDS_PER_BLOCK
+    ;
+
+upgrade_table_clause
+    : UPGRADE (NOT? INCLUDING DATA) column_properties
+    ;
+
+truncate_table
+    : TRUNCATE TABLE tableview_name PURGE?
+    ;
+
+drop_table
+    : DROP TABLE tableview_name (IF EXISTS)? PURGE?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-TABLESPACE.html
+drop_tablespace
+    : DROP TABLESPACE ts = id_expression (IF EXISTS)? ((DROP | KEEP) QUOTA?)? including_contents_clause?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-TABLESPACE-SET.html
+drop_tablespace_set
+    : DROP TABLESPACE SET tss = id_expression including_contents_clause?
+    ;
+
+including_contents_clause
+    : INCLUDING CONTENTS ((AND | KEEP) DATAFILES)? (CASCADE CONSTRAINTS)?
+    ;
+
+drop_view
+    : DROP VIEW tableview_name (IF EXISTS)? (CASCADE CONSTRAINT)?
+    ;
+
+comment_on_column
+    : COMMENT ON COLUMN column_name IS quoted_string
+    ;
+
+enable_or_disable
+    : ENABLE
+    | DISABLE
+    ;
+
+allow_or_disallow
+    : ALLOW
+    | DISALLOW
+    ;
+
+// Synonym DDL Clauses
+
+alter_synonym
+    : ALTER PUBLIC? SYNONYM (schema_name '.')? synonym_name (
+        EDITIONABLE
+        | NONEDITIONABLE
+        | COMPILE
+    )
+    ;
+
+create_synonym
+    // Synonym's schema cannot be specified for public synonyms
+    : CREATE (OR REPLACE)? PUBLIC SYNONYM synonym_name FOR (schema_name PERIOD)? schema_object_name (
+        AT_SIGN link_name
+    )?
+    | CREATE (OR REPLACE)? SYNONYM (schema_name PERIOD)? synonym_name FOR (schema_name PERIOD)? schema_object_name (
+        AT_SIGN (schema_name PERIOD)? link_name
+    )?
+    ;
+
+drop_synonym
+    : DROP PUBLIC? SYNONYM (schema_name '.')? synonym_name FORCE?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-SPFILE.html
+create_spfile
+    : CREATE SPFILE ('=' spfile_name)? FROM (PFILE ('=' pfile_name)? (AS COPY)? | MEMORY)
+    ;
+
+spfile_name
+    : CHAR_STRING
+    ;
+
+pfile_name
+    : CHAR_STRING
+    ;
+
+comment_on_table
+    : COMMENT ON TABLE tableview_name IS quoted_string
+    ;
+
+comment_on_materialized
+    : COMMENT ON MATERIALIZED VIEW tableview_name IS quoted_string
+    ;
+
+alter_analytic_view
+    : ALTER ANALYTIC VIEW (schema_name '.')? av = id_expression (
+        RENAME TO id_expression
+        | COMPILE
+        | alter_add_cache_clause
+        | alter_drop_cache_clause
+    )
+    ;
+
+alter_add_cache_clause
+    : ADD CACHE MEASURE GROUP '(' (ALL | measure_list)? ')' LEVELS '(' levels_item (
+        ',' levels_item
+    )* ')'
+    ;
+
+levels_item
+    : ((d = id_expression '.')? h = id_expression '.')? l = id_expression
+    ;
+
+measure_list
+    : id_expression (',' id_expression)*
+    ;
+
+alter_drop_cache_clause
+    : DROP CACHE MEASURE GROUP '(' (ALL | measure_list)? ')' LEVELS '(' levels_item (
+        ',' levels_item
+    )* ')'
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-ATTRIBUTE-DIMENSION.html
+alter_attribute_dimension
+    : ALTER ATTRIBUTE DIMENSION (schema_name '.')? ad = id_expression (
+        RENAME TO nad = id_expression
+        | COMPILE
+    )
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-AUDIT-POLICY-Unified-Auditing.html
+alter_audit_policy
+    : ALTER AUDIT POLICY p = id_expression ADD? (
+        privilege_audit_clause? action_audit_clause? role_audit_clause?
+        | (ONLY TOPLEVEL)?
+    ) DROP? (privilege_audit_clause? action_audit_clause? role_audit_clause? | (ONLY TOPLEVEL)?) (
+        CONDITION (DROP | CHAR_STRING EVALUATE PER (STATEMENT | SESSION | INSTANCE))
+    )?
+    ;
+
+alter_cluster
+    : ALTER CLUSTER cluster_name (
+        physical_attributes_clause
+        | SIZE size_clause
+        | allocate_extent_clause
+        | deallocate_unused_clause
+        | cache_or_nocache
+    )+ parallel_clause?
+    ;
+
+drop_analytic_view
+    : DROP ANALYTIC VIEW (schema_name '.')? av = id_expression
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-ATTRIBUTE-DIMENSION.html
+drop_attribute_dimension
+    : DROP ATTRIBUTE DIMENSION (schema_name '.')? ad = id_expression
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-AUDIT-POLICY-Unified-Auditing.html
+drop_audit_policy
+    : DROP AUDIT POLICY p = id_expression
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-FLASHBACK-ARCHIVE.html
+drop_flashback_archive
+    : DROP FLASHBACK ARCHIVE fa = id_expression
+    ;
+
+drop_cluster
+    : DROP CLUSTER cluster_name (INCLUDING TABLES (CASCADE CONSTRAINTS)?)?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-CONTEXT.html
+drop_context
+    : DROP CONTEXT ns = id_expression
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-DIRECTORY.html
+drop_directory
+    : DROP DIRECTORY dn = id_expression
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-DISKGROUP.html
+drop_diskgroup
+    : DROP DISKGROUP dgn = id_expression ((FORCE? INCLUDING | EXCLUDING) CONTENTS)?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-EDITION.html
+drop_edition
+    : DROP EDITION e = id_expression CASCADE?
+    ;
+
+truncate_cluster
+    : TRUNCATE CLUSTER cluster_name ((DROP | REUSE) STORAGE)?
+    ;
+
+cache_or_nocache
+    : CACHE
+    | NOCACHE
+    ;
+
+database_name
+    : id_expression
+    ;
+
+alter_database
+    : ALTER database_clause (
+        startup_clauses
+        | recovery_clauses
+        | database_file_clauses
+        | logfile_clauses
+        | controlfile_clauses
+        | standby_database_clauses
+        | default_settings_clause
+        | instance_clauses
+        | security_clause
+        | prepare_clause
+        | drop_mirror_clause
+        | lost_write_protection
+        | cdb_fleet_clauses
+        | property_clauses
+        | replay_upgrade_clauses
+    )
+    ;
+
+database_clause
+    : PLUGGABLE? DATABASE database_name?
+    ;
+
+startup_clauses
+    : MOUNT ((STANDBY | CLONE) DATABASE)?
+    | OPEN (READ WRITE)? resetlogs_or_noresetlogs? upgrade_or_downgrade?
+    | OPEN READ ONLY
+    ;
+
+resetlogs_or_noresetlogs
+    : RESETLOGS
+    | NORESETLOGS
+    ;
+
+upgrade_or_downgrade
+    : UPGRADE
+    | DOWNGRADE
+    ;
+
+recovery_clauses
+    : general_recovery
+    | managed_standby_recovery
+    | begin_or_end BACKUP
+    ;
+
+begin_or_end
+    : BEGIN
+    | END
+    ;
+
+general_recovery
+    : RECOVER AUTOMATIC? (FROM CHAR_STRING)? (
+        (full_database_recovery | partial_database_recovery | LOGFILE CHAR_STRING)? (
+            (TEST | ALLOW UNSIGNED_INTEGER CORRUPTION | parallel_clause)+
+        )?
+        | CONTINUE DEFAULT?
+        | CANCEL
+    )
+    ;
+
+//Need to come back to
+full_database_recovery
+    : STANDBY? DATABASE (
+        (
+            UNTIL (CANCEL | TIME CHAR_STRING | CHANGE UNSIGNED_INTEGER | CONSISTENT)
+            | USING BACKUP CONTROLFILE
+            | SNAPSHOT TIME CHAR_STRING
+        )+
+    )?
+    ;
+
+partial_database_recovery
+    : TABLESPACE tablespace (',' tablespace)*
+    | DATAFILE CHAR_STRING
+    | filenumber (',' CHAR_STRING | filenumber)*
+    | partial_database_recovery_10g
+    ;
+
+partial_database_recovery_10g
+    : {this.isVersion10()}? STANDBY (
+        TABLESPACE tablespace (',' tablespace)*
+        | DATAFILE CHAR_STRING
+        | filenumber (',' CHAR_STRING | filenumber)*
+    ) UNTIL (CONSISTENT WITH)? CONTROLFILE
+    ;
+
+managed_standby_recovery
+    : RECOVER (
+        MANAGED STANDBY DATABASE (
+            (
+                USING CURRENT LOGFILE
+                | DISCONNECT (FROM SESSION)?
+                | NODELAY
+                | UNTIL CHANGE UNSIGNED_INTEGER
+                | UNTIL CONSISTENT
+                | parallel_clause
+            )+
+            | FINISH
+            | CANCEL
+        )?
+        | TO LOGICAL STANDBY (db_name | KEEP IDENTITY)
+    )
+    ;
+
+db_name
+    : regular_id
+    ;
+
+database_file_clauses
+    : RENAME FILE filename (',' filename)* TO filename
+    | create_datafile_clause
+    | alter_datafile_clause
+    | alter_tempfile_clause
+    | move_datafile_clause
+    ;
+
+create_datafile_clause
+    : CREATE DATAFILE (filename | filenumber) (',' (filename | filenumber))* (
+        AS (
+            //TODO (','? file_specification)+ |
+            NEW
+        )
+    )?
+    ;
+
+alter_datafile_clause
+    : DATAFILE (filename | filenumber) (',' (filename | filenumber))* (
+        ONLINE
+        | OFFLINE (FOR DROP)?
+        | RESIZE size_clause
+        | autoextend_clause
+        | END BACKUP
+    )
+    ;
+
+alter_tempfile_clause
+    : TEMPFILE (filename | filenumber) (',' (filename | filenumber))* (
+        RESIZE size_clause
+        | autoextend_clause
+        | DROP (INCLUDING DATAFILES)
+        | ONLINE
+        | OFFLINE
+    )
+    ;
+
+move_datafile_clause
+    : MOVE DATAFILE (filename | filenumber) (',' (filename | filenumber))* (TO filename)? REUSE? KEEP?
+    ;
+
+logfile_clauses
+    : (ARCHIVELOG MANUAL? | NOARCHIVELOG)
+    | NO? FORCE LOGGING
+    | SET STANDBY NOLOGGING FOR (DATA AVAILABILITY | LOAD PERFORMANCE)
+    | RENAME FILE filename (',' filename)* TO filename
+    | CLEAR UNARCHIVED? LOGFILE logfile_descriptor (',' logfile_descriptor)* (
+        UNRECOVERABLE DATAFILE
+    )?
+    | add_logfile_clauses
+    | drop_logfile_clauses
+    | switch_logfile_clause
+    | supplemental_db_logging
+    ;
+
+add_logfile_clauses
+    : ADD STANDBY? LOGFILE (
+        (INSTANCE CHAR_STRING | THREAD UNSIGNED_INTEGER)? group_redo_logfile+
+        | MEMBER filename REUSE? (',' filename REUSE?)* TO logfile_descriptor (
+            ',' logfile_descriptor
+        )*
+    )
+    ;
+
+group_redo_logfile
+    : (GROUP UNSIGNED_INTEGER)? redo_log_file_spec
+    ;
+
+drop_logfile_clauses
+    : DROP STANDBY? LOGFILE (
+        logfile_descriptor (',' logfile_descriptor)*
+        | MEMBER filename (',' filename)*
+    )
+    ;
+
+switch_logfile_clause
+    : SWITCH ALL LOGFILES TO BLOCKSIZE UNSIGNED_INTEGER
+    ;
+
+supplemental_db_logging
+    : add_or_drop SUPPLEMENTAL LOG (DATA | supplemental_id_key_clause | supplemental_plsql_clause)
+    ;
+
+add_or_drop
+    : ADD
+    | DROP
+    ;
+
+supplemental_plsql_clause
+    : DATA FOR PROCEDURAL REPLICATION
+    ;
+
+logfile_descriptor
+    : GROUP UNSIGNED_INTEGER
+    | '(' filename (',' filename)* ')'
+    | filename
+    ;
+
+controlfile_clauses
+    : CREATE (LOGICAL | PHYSICAL)? STANDBY CONTROLFILE AS filename REUSE?
+    | BACKUP CONTROLFILE TO (filename REUSE? | trace_file_clause)
+    ;
+
+trace_file_clause
+    : TRACE (AS filename REUSE?)? (RESETLOGS | NORESETLOGS)?
+    ;
+
+standby_database_clauses
+    : (
+        activate_standby_db_clause
+        | maximize_standby_db_clause
+        | register_logfile_clause
+        | commit_switchover_clause
+        | start_standby_clause
+        | stop_standby_clause
+        | convert_database_clause
+    ) parallel_clause?
+    ;
+
+activate_standby_db_clause
+    : ACTIVATE (PHYSICAL | LOGICAL)? STANDBY DATABASE (FINISH APPLY)?
+    ;
+
+maximize_standby_db_clause
+    : SET STANDBY DATABASE TO MAXIMIZE (PROTECTION | AVAILABILITY | PERFORMANCE)
+    ;
+
+register_logfile_clause
+    : REGISTER (OR REPLACE)? (PHYSICAL | LOGICAL) LOGFILE //TODO (','? file_specification)+
+    //TODO   (FOR logminer_session_name)?
+    ;
+
+commit_switchover_clause
+    : (PREPARE | COMMIT) TO SWITCHOVER (
+        (
+            TO (
+                ((PHYSICAL | LOGICAL)? PRIMARY | PHYSICAL? STANDBY) (
+                    (WITH | WITHOUT)? SESSION SHUTDOWN (WAIT | NOWAIT)
+                )?
+                | LOGICAL STANDBY
+            )
+            | LOGICAL STANDBY
+        )
+        | CANCEL
+    )?
+    ;
+
+start_standby_clause
+    : START LOGICAL STANDBY APPLY IMMEDIATE? NODELAY? (
+        NEW PRIMARY regular_id
+        | INITIAL scn_value = UNSIGNED_INTEGER?
+        | SKIP_ FAILED TRANSACTION
+        | FINISH
+    )?
+    ;
+
+stop_standby_clause
+    : (STOP | ABORT) LOGICAL STANDBY APPLY
+    ;
+
+convert_database_clause
+    : CONVERT TO (PHYSICAL | SNAPSHOT) STANDBY
+    ;
+
+default_settings_clause
+    : DEFAULT EDITION EQUALS_OP edition_name
+    | SET DEFAULT (BIGFILE | SMALLFILE) TABLESPACE
+    | DEFAULT TABLESPACE tablespace
+    | DEFAULT TEMPORARY TABLESPACE (tablespace | tablespace_group_name)
+    | RENAME GLOBAL_NAME TO database ('.' domain)+
+    | ENABLE BLOCK CHANGE TRACKING (USING FILE filename REUSE?)?
+    | DISABLE BLOCK CHANGE TRACKING
+    | flashback_mode_clause
+    | set_time_zone_clause
+    ;
+
+set_time_zone_clause
+    : SET TIMEZONE EQUALS_OP CHAR_STRING
+    ;
+
+instance_clauses
+    : enable_or_disable INSTANCE CHAR_STRING
+    ;
+
+security_clause
+    : GUARD (ALL | STANDBY | NONE)
+    ;
+
+domain
+    : id_expression
+    ;
+
+database
+    : id_expression
+    ;
+
+edition_name
+    : regular_id
+    ;
+
+filenumber
+    : UNSIGNED_INTEGER
+    ;
+
+filename
+    : CHAR_STRING
+    ;
+
+prepare_clause
+    : PREPARE MIRROR COPY c = id_expression (WITH (UNPROTECTED | MIRROR | HIGH) REDUNDANCY)? (
+        FOR DATABASE id_expression
+    )?
+    ;
+
+drop_mirror_clause
+    : DROP MIRROR COPY mn = id_expression
+    ;
+
+lost_write_protection
+    : (ENABLE | DISABLE | REMOVE | SUSPEND) LOST WRITE PROTECTION
+    ;
+
+cdb_fleet_clauses
+    : lead_cdb_clause
+    | lead_cdb_uri_clause
+    ;
+
+lead_cdb_clause
+    : SET LEAD_CDB '=' (TRUE | FALSE)
+    ;
+
+lead_cdb_uri_clause
+    : SET LEAD_CDB_URI '=' CHAR_STRING
+    ;
+
+property_clauses
+    : PROPERTY (SET | REMOVE) DEFAULT_CREDENTIAL '=' qcn = id_expression
+    ;
+
+replay_upgrade_clauses
+    : UPGRADE SYNC (ON | OFF)
+    ;
+
+alter_database_link
+    : ALTER SHARED? PUBLIC? DATABASE LINK local_link_name (
+        CONNECT TO user_object_name IDENTIFIED BY password_value link_authentication?
+        | link_authentication
+    )
+    ;
+
+password_value
+    : id_expression
+    | numeric
+    | VALUES CHAR_STRING
+    ;
+
+link_authentication
+    : AUTHENTICATED BY user_object_name IDENTIFIED BY password_value
+    ;
+
+// added by zrh
+create_database
+    : CREATE DATABASE database_name (
+        USER (SYS | SYSTEM) IDENTIFIED BY password_value
+        | CONTROLFILE REUSE
+        | (MAXDATAFILES | MAXINSTANCES) UNSIGNED_INTEGER
+        | NATIONAL? CHARACTER SET char_set_name
+        | SET DEFAULT (BIGFILE | SMALLFILE) TABLESPACE
+        | database_logging_clauses
+        | tablespace_clauses
+        | set_time_zone_clause
+        | (BIGFILE | SMALLFILE)? USER_DATA TABLESPACE tablespace_group_name DATAFILE datafile_tempfile_spec (
+            ',' datafile_tempfile_spec
+        )*
+        | enable_pluggable_database
+    )+
+    ;
+
+database_logging_clauses
+    : LOGFILE database_logging_sub_clause (',' database_logging_sub_clause)*
+    | (MAXLOGFILES | MAXLOGMEMBERS | MAXLOGHISTORY) UNSIGNED_INTEGER
+    | ARCHIVELOG
+    | NOARCHIVELOG
+    | FORCE LOGGING
+    ;
+
+database_logging_sub_clause
+    : (GROUP UNSIGNED_INTEGER)? file_specification
+    ;
+
+tablespace_clauses
+    : EXTENT MANAGEMENT LOCAL
+    | SYSAUX? DATAFILE file_specification (',' file_specification)*
+    | default_tablespace
+    | default_temp_tablespace
+    | undo_tablespace
+    ;
+
+enable_pluggable_database
+    : ENABLE PLUGGABLE DATABASE (
+        SEED file_name_convert? (SYSTEM tablespace_datafile_clauses)? (
+            SYSAUX tablespace_datafile_clauses
+        )?
+    )? undo_mode_clause?
+    ;
+
+file_name_convert
+    : FILE_NAME_CONVERT EQUALS_OP (
+        '(' filename_convert_sub_clause (',' filename_convert_sub_clause)* ')'
+        | NONE
+    )
+    ;
+
+filename_convert_sub_clause
+    : CHAR_STRING (',' CHAR_STRING)?
+    ;
+
+tablespace_datafile_clauses
+    : DATAFILES (SIZE size_clause | autoextend_clause)+
+    ;
+
+undo_mode_clause
+    : LOCAL UNDO (ON | OFF)
+    ;
+
+default_tablespace
+    : DEFAULT TABLESPACE tablespace (DATAFILE datafile_tempfile_spec)? extent_management_clause?
+    ;
+
+default_temp_tablespace
+    : (BIGFILE | SMALLFILE)? DEFAULT (
+        TEMPORARY TABLESPACE
+        | LOCAL TEMPORARY TABLESPACE FOR (ALL | LEAF)
+    ) tablespace (TEMPFILE file_specification (',' file_specification)*)? extent_management_clause?
+    ;
+
+undo_tablespace
+    : (BIGFILE | SMALLFILE)? UNDO TABLESPACE tablespace (
+        DATAFILE file_specification (',' file_specification)*
+    )?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/DROP-DATABASE.html
+drop_database
+    : DROP DATABASE (INCLUDING BACKUPS)? NOPROMPT?
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-DATABASE-LINK.html
+create_database_link
+    : CREATE SHARED? PUBLIC? DATABASE LINK link_name (
+        CONNECT TO (
+            CURRENT_USER
+            | user_object_name IDENTIFIED BY password_value link_authentication?
+        )
+        | link_authentication
+    )* (USING CHAR_STRING)?
+    ;
+
+drop_database_link
+    : DROP PUBLIC? DATABASE LINK link_name
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/ALTER-TABLESPACE-SET.html
+alter_tablespace_set
+    : ALTER TABLESPACE SET tss = id_expression alter_tablespace_attrs
+    ;
+
+alter_tablespace_attrs
+    : default_tablespace_params
+    | MINIMUM EXTENT size_clause
+    | RESIZE size_clause
+    | COALESCE
+    | SHRINK SPACE_KEYWORD (KEEP size_clause)?
+    | RENAME TO nts = id_expression
+    | (BEGIN | END) BACKUP
+    | datafile_tempfile_clauses
+    | tablespace_logging_clauses
+    | tablespace_group_clause
+    | tablespace_state_clauses
+    | autoextend_clause
+    | flashback_mode_clause
+    | tablespace_retention_clause
+    | alter_tablespace_encryption
+    | lost_write_protection
+    ;
+
+alter_tablespace_encryption
+    : ENCRYPTION (
+        OFFLINE (tablespace_encryption_spec? ENCRYPT | DECRYPT)
+        | ONLINE (tablespace_encryption_spec? (ENCRYPT | REKEY) | DECRYPT) ts_file_name_convert?
+        | FINISH (ENCRYPT | REKEY | DECRYPT) ts_file_name_convert?
+    )
+    ;
+
+ts_file_name_convert
+    : FILE_NAME_CONVERT '=' '(' CHAR_STRING ',' CHAR_STRING (',' CHAR_STRING ',' CHAR_STRING)* ')' KEEP?
+    ;
+
+alter_role
+    : ALTER ROLE role_name role_identified_clause container_clause?
+    ;
+
+role_identified_clause
+    : NOT IDENTIFIED
+    | IDENTIFIED (
+        BY identifier
+        | USING identifier ('.' id_expression)?
+        | EXTERNALLY
+        | GLOBALLY (AS CHAR_STRING)?
+    )
+    ;
+
+alter_table
+    : ALTER TABLE tableview_name memoptimize_read_write_clause* (
+        | alter_table_properties
+        | constraint_clauses
+        | column_clauses
+        | alter_table_partitioning
+        //TODO      | alter_external_table
+        | move_table_clause
+    ) ((enable_disable_clause | enable_or_disable (TABLE LOCK | ALL TRIGGERS))+)?
+    ;
+
+memoptimize_read_write_clause
+    : NO? MEMOPTIMIZE FOR (READ | WRITE)
+    ;
+
+alter_table_properties
+    : alter_table_properties_1
+    | RENAME TO tableview_name
+    | shrink_clause
+    | READ ONLY
+    | READ WRITE
+    | REKEY CHAR_STRING
+    ;
+
+alter_table_partitioning
+    : add_table_partition
+    | drop_table_partition
+    | merge_table_partition
+    | modify_table_partition
+    | split_table_partition
+    | truncate_table_partition
+    | exchange_table_partition
+    | coalesce_table_partition
+    | alter_interval_partition
+    ;
+
+add_table_partition
+    : ADD (
+        range_partition_desc
+        | list_partition_desc
+        | PARTITION partition_name? (TABLESPACE tablespace)? key_compression? UNUSABLE?
+    )
+    ;
+
+drop_table_partition
+    : DROP (partition_extended_names | subpartition_extended_names) (
+        update_index_clauses parallel_clause?
+    )?
+    ;
+
+merge_table_partition
+    : MERGE PARTITION partition_name AND partition_name INTO PARTITION partition_name
+    ;
+
+modify_table_partition
+    : MODIFY (
+        PARTITION partition_name ((ADD | DROP) list_values_clause)? (ADD range_subpartition_desc)? (
+            REBUILD? UNUSABLE LOCAL INDEXES
+        )? shrink_clause?
+        | range_partitions
+    )
+    ;
+
+split_table_partition
+    : SPLIT partition_extended_names (
+        AT '(' literal (',' literal)* ')' INTO '(' range_partition_desc (',' range_partition_desc)* ')'
+        | INTO '(' (
+            range_partition_desc (',' range_partition_desc)*
+            | list_partition_desc (',' list_partition_desc)*
+        ) ')'
+    ) (update_global_index_clause | update_index_clauses)?
+    ;
+
+truncate_table_partition
+    : TRUNCATE (partition_extended_names | subpartition_extended_names) (
+        (DROP ALL? | REUSE)? STORAGE
+    )? CASCADE? (update_index_clauses parallel_clause?)?
+    ;
+
+exchange_table_partition
+    : EXCHANGE PARTITION partition_name WITH TABLE tableview_name ((INCLUDING | EXCLUDING) INDEXES)? (
+        (WITH | WITHOUT) VALIDATION
+    )?
+    ;
+
+coalesce_table_partition
+    : COALESCE PARTITION parallel_clause? (allow_or_disallow CLUSTERING)?
+    ;
+
+alter_interval_partition
+    : SET INTERVAL '(' (constant | expression)? ')'
+    ;
+
+partition_extended_names
+    : (PARTITION | PARTITIONS) (
+        partition_name (',' partition_name)*
+        | '(' partition_name (',' partition_name)* ')'
+        | FOR '('? partition_key_value (',' partition_key_value)* ')'?
+    )
+    ;
+
+subpartition_extended_names
+    : (SUBPARTITION | SUBPARTITIONS) (
+        partition_name (UPDATE INDEXES)?
+        | '(' partition_name (',' partition_name)* ')'
+        | FOR '('? subpartition_key_value (',' subpartition_key_value)* ')'?
+    )
+    ;
+
+alter_table_properties_1
+    : (
+        physical_attributes_clause
+        | logging_clause
+        | table_compression
+        | inmemory_table_clause
+        | supplemental_table_logging
+        | allocate_extent_clause
+        | deallocate_unused_clause
+        | (CACHE | NOCACHE)
+        | RESULT_CACHE '(' MODE (DEFAULT | FORCE) ')'
+        | upgrade_table_clause
+        | records_per_block_clause
+        | parallel_clause
+        | row_movement_clause
+        | flashback_archive_clause
+    )+ alter_iot_clauses?
+    ;
+
+alter_iot_clauses
+    : index_org_table_clause
+    | alter_overflow_clause
+    | alter_mapping_table_clause
+    | COALESCE
+    ;
+
+alter_mapping_table_clause
+    : MAPPING TABLE (allocate_extent_clause | deallocate_unused_clause)
+    ;
+
+alter_overflow_clause
+    : add_overflow_clause
+    | OVERFLOW (
+        segment_attributes_clause
+        | allocate_extent_clause
+        | shrink_clause
+        | deallocate_unused_clause
+    )+
+    ;
+
+add_overflow_clause
+    : ADD OVERFLOW segment_attributes_clause? (
+        '(' PARTITION segment_attributes_clause? (',' PARTITION segment_attributes_clause?)* ')'
+    )?
+    ;
+
+update_index_clauses
+    : update_global_index_clause
+    | update_all_indexes_clause
+    ;
+
+update_global_index_clause
+    : (UPDATE | INVALIDATE) GLOBAL INDEXES
+    ;
+
+update_all_indexes_clause
+    : UPDATE INDEXES ('(' update_all_indexes_index_clause ')')?
+    ;
+
+update_all_indexes_index_clause
+    : index_name '(' (update_index_partition | update_index_subpartition) ')' (
+        ',' update_all_indexes_clause
+    )*
+    ;
+
+update_index_partition
+    : index_partition_description index_subpartition_clause? (',' update_index_partition)*
+    ;
+
+update_index_subpartition
+    : SUBPARTITION subpartition_name? (TABLESPACE tablespace)? (',' update_index_subpartition)*
+    ;
+
+enable_disable_clause
+    : (ENABLE | DISABLE) (VALIDATE | NOVALIDATE)? (
+        UNIQUE '(' column_name (',' column_name)* ')'
+        | PRIMARY KEY
+        | CONSTRAINT constraint_name
+    ) using_index_clause? exceptions_clause? CASCADE? ((KEEP | DROP) INDEX)?
+    ;
+
+using_index_clause
+    : USING INDEX (index_name | '(' create_index ')' | index_attributes)?
+    ;
+
+index_attributes
+    : (
+        physical_attributes_clause
+        | logging_clause
+        | TABLESPACE (tablespace | DEFAULT)
+        | key_compression
+        | sort_or_nosort
+        | REVERSE
+        | visible_or_invisible
+        | parallel_clause
+    )+
+    ;
+
+sort_or_nosort
+    : SORT
+    | NOSORT
+    ;
+
+exceptions_clause
+    : EXCEPTIONS INTO tableview_name
+    ;
+
+move_table_clause
+    : MOVE ONLINE? segment_attributes_clause? table_compression? index_org_table_clause? (
+        lob_storage_clause
+        | varray_col_properties
+    )* parallel_clause?
+    ;
+
+index_org_table_clause
+    : (mapping_table_clause | PCTTHRESHOLD UNSIGNED_INTEGER | key_compression)+ index_org_overflow_clause?
+    | index_org_overflow_clause // rule move_table_clause contains an optional block with at least one alternative that can match an empty string
+    ;
+
+mapping_table_clause
+    : MAPPING TABLE
+    | NOMAPPING
+    ;
+
+key_compression
+    : NOCOMPRESS
+    | COMPRESS UNSIGNED_INTEGER
+    ;
+
+index_org_overflow_clause
+    : (INCLUDING column_name)? OVERFLOW segment_attributes_clause?
+    ;
+
+column_clauses
+    : add_modify_drop_column_clauses
+    | rename_column_clause
+    | modify_collection_retrieval
+    | modify_lob_storage_clause
+    ;
+
+modify_collection_retrieval
+    : MODIFY NESTED TABLE collection_item RETURN AS (LOCATOR | VALUE)
+    ;
+
+collection_item
+    : tableview_name
+    ;
+
+rename_column_clause
+    : RENAME COLUMN old_column_name TO new_column_name
+    ;
+
+old_column_name
+    : column_name
+    ;
+
+new_column_name
+    : column_name
+    ;
+
+add_modify_drop_column_clauses
+    : (constraint_clauses | add_column_clause | modify_column_clauses | drop_column_clause)+
+    ;
+
+drop_column_clause
+    : SET UNUSED (COLUMN column_name | ('(' column_name (',' column_name)* ')')) (
+        CASCADE CONSTRAINTS
+        | INVALIDATE
+    )*
+    | DROP (COLUMN column_name | '(' column_name (',' column_name)* ')') (
+        CASCADE CONSTRAINTS
+        | INVALIDATE
+    )* (CHECKPOINT UNSIGNED_INTEGER)?
+    | DROP (UNUSED COLUMNS | COLUMNS CONTINUE) (CHECKPOINT UNSIGNED_INTEGER)
+    ;
+
+modify_column_clauses
+    : MODIFY (
+        '(' modify_col_properties (',' modify_col_properties)* ')'
+        | '(' modify_col_visibility (',' modify_col_visibility)* ')'
+        | modify_col_properties
+        | modify_col_visibility
+        | modify_col_substitutable
+    )
+    ;
+
+modify_col_properties
+    : column_name datatype? (DEFAULT expression)? (ENCRYPT encryption_spec | DECRYPT)? inline_constraint* lob_storage_clause?
+    //TODO alter_xmlschema_clause
+    ;
+
+modify_col_visibility
+    : column_name (VISIBLE | INVISIBLE)
+    ;
+
+modify_col_substitutable
+    : COLUMN column_name NOT? SUBSTITUTABLE AT ALL LEVELS FORCE?
+    ;
+
+add_column_clause
+    : ADD (
+        '(' (column_definition | virtual_column_definition) (
+            ',' (column_definition | virtual_column_definition)
+        )* ')'
+        | ( column_definition | virtual_column_definition)
+    ) column_properties?
+    //TODO       (','? out_of_line_part_storage )
+    ;
+
+alter_varray_col_properties
+    : MODIFY VARRAY varray_item '(' modify_lob_parameters ')'
+    ;
+
+varray_col_properties
+    : VARRAY varray_item (
+        substitutable_column_clause? varray_storage_clause
+        | substitutable_column_clause
+    )
+    ;
+
+varray_storage_clause
+    : STORE AS (SECUREFILE | BASICFILE)? LOB (
+        lob_segname? '(' lob_storage_parameters ')'
+        | lob_segname
+    )
+    ;
+
+lob_segname
+    : regular_id
+    ;
+
+lob_item
+    : regular_id
+    | quoted_string
+    | DELIMITED_ID
+    ;
+
+lob_storage_parameters
+    : TABLESPACE tablespace_name = id_expression
+    | (lob_parameters storage_clause?)
+    | storage_clause
+    ;
+
+lob_storage_clause
+    : LOB (
+        '(' lob_item (',' lob_item)* ')' STORE AS (
+            (SECUREFILE | BASICFILE)
+            | '(' lob_storage_parameters* ')'
+        )+
+        | '(' lob_item ')' STORE AS (
+            (SECUREFILE | BASICFILE)
+            | lob_segname
+            | '(' lob_storage_parameters* ')'
+        )+
+    )
+    ;
+
+modify_lob_storage_clause
+    : MODIFY LOB '(' lob_item ')' '(' modify_lob_parameters ')'
+    ;
+
+modify_lob_parameters
+    : (
+        storage_clause
+        | (PCTVERSION | FREEPOOLS) UNSIGNED_INTEGER
+        | REBUILD FREEPOOLS
+        | lob_retention_clause
+        | lob_deduplicate_clause
+        | lob_compression_clause
+        | ENCRYPT encryption_spec
+        | DECRYPT
+        | CACHE
+        | (CACHE | NOCACHE | CACHE READS) logging_clause?
+        | allocate_extent_clause
+        | shrink_clause
+        | deallocate_unused_clause
+    )+
+    ;
+
+lob_parameters
+    : (
+        (ENABLE | DISABLE) STORAGE IN ROW UNSIGNED_INTEGER?
+        | CHUNK UNSIGNED_INTEGER
+        | PCTVERSION UNSIGNED_INTEGER
+        | FREEPOOLS UNSIGNED_INTEGER
+        | lob_retention_clause
+        | lob_deduplicate_clause
+        | lob_compression_clause
+        | ENCRYPT encryption_spec
+        | DECRYPT
+        | (CACHE | NOCACHE | CACHE READS) logging_clause?
+    )+
+    ;
+
+lob_deduplicate_clause
+    : DEDUPLICATE
+    | KEEP_DUPLICATES
+    ;
+
+lob_compression_clause
+    : NOCOMPRESS
+    | COMPRESS (HIGH | MEDIUM | LOW)?
+    ;
+
+lob_retention_clause
+    : RETENTION (MAX | MIN UNSIGNED_INTEGER | AUTO | NONE)?
+    ;
+
+encryption_spec
+    : (USING CHAR_STRING)? (IDENTIFIED BY REGULAR_ID)? CHAR_STRING? (NO? SALT)?
+    ;
+
+tablespace
+    : id_expression
+    ;
+
+varray_item
+    : (id_expression '.')? (id_expression '.')? id_expression
+    ;
+
+column_properties
+    : (
+        object_type_col_properties
+        | nested_table_col_properties
+        | (varray_col_properties | lob_storage_clause) (
+            '(' lob_partition_storage (',' lob_partition_storage)* ')'
+        )? //TODO '(' ( ','? lob_partition_storage)+ ')'
+        | xmltype_column_properties
+    )+
+    ;
+
+lob_partition_storage
+    : LOB (
+        '(' lob_item (',' lob_item) ')' STORE AS (
+            (SECUREFILE | BASICFILE)
+            | '(' lob_storage_parameters ')'
+        )+
+        | '(' lob_item ')' STORE AS (
+            (SECUREFILE | BASICFILE)
+            | lob_segname
+            | '(' lob_storage_parameters ')'
+        )+
+    )
+    ;
+
+period_definition
+    : {this.isVersion12()}? PERIOD FOR column_name ('(' start_time_column ',' end_time_column ')')?
+    ;
+
+start_time_column
+    : column_name
+    ;
+
+end_time_column
+    : column_name
+    ;
+
+column_definition
+    : column_name ((datatype | regular_id) (COLLATE column_collation_name)?)? SORT? (
+        VISIBLE
+        | INVISIBLE
+    )? (DEFAULT (ON NULL_)? expression | identity_clause)? (ENCRYPT encryption_spec)? (
+        inline_constraint+
+        | inline_ref_constraint
+    )?
+    ;
+
+column_collation_name
+    : id_expression
+    ;
+
+identity_clause
+    : GENERATED (ALWAYS | BY DEFAULT (ON NULL_)?)? AS IDENTITY identity_options_parentheses?
+    ;
+
+//https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/CREATE-TABLE.html#GUID-F9CE0CC3-13AE-4744-A43C-EAC7A71AAAB6
+// NOTE to identity options
+// according to the SQL Reference, identity_options be nested in parentheses.
+// But statements without parentheses can also be executed successfully on a oracle database.
+// See this issue for more details: https://github.com/antlr/grammars-v4/issues/3183
+identity_options_parentheses
+    : identity_options+
+    | '(' identity_options+ ')'
+    ;
+
+identity_options
+    : START WITH (numeric | LIMIT VALUE)
+    | INCREMENT BY numeric
+    | MAXVALUE numeric
+    | NOMAXVALUE
+    | MINVALUE numeric
+    | NOMINVALUE
+    | CYCLE
+    | NOCYCLE
+    | CACHE numeric
+    | NOCACHE
+    | ORDER
+    | NOORDER
+    | NOKEEP
+    | NOSCALE
+    ;
+
+virtual_column_definition
+    : column_name (datatype COLLATE column_collation_name)? (VISIBLE | INVISIBLE)? autogenerated_sequence_definition? VIRTUAL?
+        evaluation_edition_clause? (UNUSABLE BEFORE (CURRENT EDITION | EDITION edition_name))? (
+        UNUSABLE BEGINNING WITH ((CURRENT | NULL_) EDITION | EDITION edition_name)
+    )? inline_constraint*
+    ;
+
+autogenerated_sequence_definition
+    : GENERATED (ALWAYS | BY DEFAULT (ON NULL_)?)? AS IDENTITY (
+        '(' (sequence_start_clause | sequence_spec)* ')'
+    )?
+    ;
+
+evaluation_edition_clause
+    : EVALUATE USING ((CURRENT | NULL_) EDITION | EDITION edition_name)
+    ;
+
+out_of_line_part_storage
+    : PARTITION partition_name
+    ;
+
+nested_table_col_properties
+    : NESTED TABLE (nested_item | COLUMN_VALUE) substitutable_column_clause? (LOCAL | GLOBAL)? STORE AS tableview_name (
+        '(' ('(' object_properties ')' | physical_properties | column_properties)+ ')'
+    )? (RETURN AS? (LOCATOR | VALUE))?
+    ;
+
+nested_item
+    : regular_id
+    ;
+
+substitutable_column_clause
+    : ELEMENT? IS OF TYPE? '(' type_name ')'
+    | NOT? SUBSTITUTABLE AT ALL LEVELS
+    ;
+
+partition_name
+    : regular_id
+    | DELIMITED_ID
+    ;
+
+supplemental_logging_props
+    : SUPPLEMENTAL LOG (supplemental_log_grp_clause | supplemental_id_key_clause)
+    ;
+
+column_or_attribute
+    : regular_id
+    ;
+
+object_type_col_properties
+    : COLUMN column = regular_id substitutable_column_clause
+    ;
+
+constraint_clauses
+    : ADD '(' (out_of_line_constraint (',' out_of_line_constraint)* | out_of_line_ref_constraint) ')'
+    | ADD (out_of_line_constraint | out_of_line_ref_constraint)
+    | MODIFY (
+        CONSTRAINT constraint_name
+        | PRIMARY KEY
+        | UNIQUE '(' column_name (',' column_name)* ')'
+    ) constraint_state CASCADE?
+    | RENAME CONSTRAINT old_constraint_name TO new_constraint_name
+    | drop_constraint_clause+
+    ;
+
+old_constraint_name
+    : constraint_name
+    ;
+
+new_constraint_name
+    : constraint_name
+    ;
+
+drop_constraint_clause
+    : DROP (
+        PRIMARY KEY
+        | UNIQUE '(' column_name (',' column_name)* ')'
+        | CONSTRAINT constraint_name
+    ) CASCADE? ((KEY | DROP) INDEX)? ONLINE?
+    ;
+
+add_constraint
+    : ADD (CONSTRAINT constraint_name)? add_constraint_clause (
+        ',' (CONSTRAINT constraint_name)? add_constraint_clause
+    )+
+    ;
+
+add_constraint_clause
+    : primary_key_clause
+    | foreign_key_clause
+    | unique_key_clause
+    | check_constraint
+    ;
+
+check_constraint
+    : CHECK '(' condition ')' DISABLE?
+    ;
+
+drop_constraint
+    : DROP CONSTRAINT constraint_name
+    ;
+
+enable_constraint
+    : ENABLE CONSTRAINT constraint_name
+    ;
+
+disable_constraint
+    : DISABLE CONSTRAINT constraint_name
+    ;
+
+foreign_key_clause
+    : FOREIGN KEY paren_column_list references_clause on_delete_clause?
+    ;
+
+references_clause
+    : REFERENCES tableview_name paren_column_list? (ON DELETE (CASCADE | SET NULL_))?
+    ;
+
+on_delete_clause
+    : ON DELETE (CASCADE | SET NULL_)
+    ;
+
+unique_key_clause
+    : UNIQUE paren_column_list using_index_clause?
+    ;
+
+primary_key_clause
+    : PRIMARY KEY paren_column_list using_index_clause?
+    ;
+
+// Anonymous PL/SQL code block
+
+anonymous_block
+    : (DECLARE seq_of_declare_specs)? BEGIN seq_of_statements (EXCEPTION exception_handler+)? END
+    ;
+
+// Common DDL Clauses
+
+invoker_rights_clause
+    : AUTHID (CURRENT_USER | DEFINER)
+    ;
+
+call_spec
+    : java_spec
+    | c_spec
+    ;
+
+// Call Spec Specific Clauses
+
+java_spec
+    : LANGUAGE JAVA NAME CHAR_STRING
+    ;
+
+c_spec
+    : (LANGUAGE C_LETTER | EXTERNAL) (
+        NAME id_expression LIBRARY identifier
+        | LIBRARY identifier (NAME id_expression)?
+    ) c_agent_in_clause? (WITH CONTEXT)? c_parameters_clause?
+    ;
+
+c_agent_in_clause
+    : AGENT IN '(' expressions ')'
+    ;
+
+c_parameters_clause
+    : PARAMETERS '(' c_external_parameter (',' c_external_parameter)* ')'
+    ;
+
+c_external_parameter
+    : CONTEXT
+    | SELF (TDO | c_property)?
+    | (parameter_name | RETURN) c_property? (BY REFERENCE)? external_datatype = regular_id?
+    ;
+
+c_property
+    : INDICATOR (STRUCT | TDO)?
+    | LENGTH
+    | DURATION
+    | MAXLEN
+    | CHARSETID
+    | CHARSETFORM
+    ;
+
+parameter
+    : parameter_name (IN | OUT | INOUT | NOCOPY)* type_spec? default_value_part?
+    ;
+
+default_value_part
+    : (ASSIGN_OP | DEFAULT) expression
+    ;
+
+// Elements Declarations
+
+seq_of_declare_specs
+    : declare_spec+
+    ;
+
+declare_spec
+    : pragma_declaration
+    | exception_declaration
+    | procedure_spec
+    | function_spec
+    | variable_declaration
+    | subtype_declaration
+    | cursor_declaration
+    | type_declaration
+    | procedure_body
+    | function_body
+    | selection_directive
+    ;
+
+// incorporates constant_declaration
+variable_declaration
+    : identifier CONSTANT? type_spec (NOT? NULL_)? default_value_part? ';'
+    ;
+
+subtype_declaration
+    : SUBTYPE identifier IS type_spec (RANGE expression '..' expression)? (NOT NULL_)? ';'
+    ;
+
+// cursor_declaration incorportates curscursor_body and cursor_spec
+
+cursor_declaration
+    : CURSOR identifier ('(' parameter_spec (',' parameter_spec)* ')')? (RETURN type_spec)? (
+        IS select_statement
+    )? ';'
+    ;
+
+parameter_spec
+    : parameter_name (IN? type_spec)? default_value_part?
+    ;
+
+exception_declaration
+    : identifier EXCEPTION ';'
+    ;
+
+pragma_declaration
+    : PRAGMA (
+        SERIALLY_REUSABLE
+        | AUTONOMOUS_TRANSACTION
+        | EXCEPTION_INIT '(' exception_name ',' numeric_negative ')'
+        | INLINE '(' id1 = identifier ',' expression ')'
+        | RESTRICT_REFERENCES '(' (identifier | DEFAULT) (',' identifier)+ ')'
+        | DEPRECATE '(' identifier ( ',' CHAR_STRING)? ')'
+    ) ';'
+    ;
+
+// Record Declaration Specific Clauses
+
+// incorporates ref_cursor_type_definition
+
+record_type_def
+    : RECORD '(' field_spec (',' field_spec)* ')'
+    ;
+
+field_spec
+    : column_name type_spec? (NOT NULL_)? default_value_part?
+    ;
+
+ref_cursor_type_def
+    : REF CURSOR (RETURN type_spec)?
+    ;
+
+type_declaration
+    : TYPE identifier IS (table_type_def | varray_type_def | record_type_def | ref_cursor_type_def) ';'
+    ;
+
+table_type_def
+    : TABLE OF type_spec (NOT NULL_)? table_indexed_by_part?
+    ;
+
+table_indexed_by_part
+    : (idx1 = INDEXED | idx2 = INDEX) BY type_spec
+    ;
+
+//https://docs.oracle.com/en/database/oracle/oracle-database/21/lnpls/collection-variable.html#GUID-89A1863C-65A1-40CF-9392-86E9FDC21BE9
+varray_type_def
+    : (VARRAY | VARYING? ARRAY) '(' expression ')' OF type_spec (NOT NULL_)?
+    ;
+
+// Statements
+
+seq_of_statements
+    : (pragma_declaration* statement (';' | EOF) | label_declaration | selection_directive)+
+    ;
+
+label_declaration
+    : ltp1 = '<' '<' label_name '>' '>'
+    ;
+
+statement
+    : body
+    | block
+    | assignment_statement
+    | continue_statement
+    | exit_statement
+    | goto_statement
+    | if_statement
+    | loop_statement
+    | forall_statement
+    | null_statement
+    | raise_statement
+    | return_statement
+    | case_statement
+    | sql_statement
+    | call_statement
+    | pipe_row_statement
+    ;
+
+swallow_to_semi
+    : ~';'+
+    ;
+
+assignment_statement
+    : (general_element | bind_variable) ASSIGN_OP expression
+    ;
+
+continue_statement
+    : CONTINUE label_name? (WHEN condition)?
+    ;
+
+exit_statement
+    : EXIT label_name? (WHEN condition)?
+    ;
+
+goto_statement
+    : GOTO label_name
+    ;
+
+if_statement
+    : IF condition THEN seq_of_statements elsif_part* else_part? END IF
+    ;
+
+elsif_part
+    : ELSIF condition THEN seq_of_statements
+    ;
+
+else_part
+    : ELSE seq_of_statements
+    ;
+
+loop_statement
+    : label_declaration? (WHILE condition | FOR cursor_loop_param)? LOOP seq_of_statements END LOOP label_name?
+    ;
+
+// Loop Specific Clause
+
+cursor_loop_param
+    : index_name IN REVERSE? lower_bound range_separator = '..' upper_bound
+    | record_name IN (cursor_name ('(' expressions? ')')? | '(' select_statement ')')
+    ;
+
+//https://docs.oracle.com/en/database/oracle/oracle-database/21/lnpls/FORALL-statement.html#GUID-C45B8241-F9DF-4C93-8577-C840A25963DB
+forall_statement
+    : FORALL index_name IN bounds_clause (SAVE EXCEPTIONS)? data_manipulation_language_statements
+    ;
+
+bounds_clause
+    : lower_bound '..' upper_bound
+    | INDICES OF general_element between_bound?
+    | VALUES OF index_name
+    ;
+
+between_bound
+    : BETWEEN lower_bound AND upper_bound
+    ;
+
+lower_bound
+    : concatenation
+    ;
+
+upper_bound
+    : concatenation
+    ;
+
+null_statement
+    : NULL_
+    ;
+
+raise_statement
+    : RAISE exception_name?
+    ;
+
+return_statement
+    : RETURN expression?
+    ;
+
+call_statement
+    : CALL? routine_name function_argument? ('.' routine_name function_argument?)* (
+        INTO bind_variable
+    )?
+    ;
+
+pipe_row_statement
+    : PIPE ROW '(' expression ')'
+    ;
+
+selection_directive
+    : DOLLAR_IF condition DOLLAR_THEN selection_directive_body (
+        DOLLAR_ELSIF selection_directive_body
+    )* (DOLLAR_ELSE selection_directive_body)? DOLLAR_END
+    ;
+
+error_directive
+    : DOLLAR_ERROR concatenation DOLLAR_END
+    ;
+
+selection_directive_body
+    : (
+        pragma_declaration? statement ';'
+        | variable_declaration
+        | error_directive
+        | function_body
+        | procedure_body
+    )+
+    ;
+
+body
+    : BEGIN seq_of_statements? (EXCEPTION exception_handler+)? END label_name?
+    ;
+
+// Body Specific Clause
+
+exception_handler
+    : WHEN exception_name (OR exception_name)* THEN seq_of_statements
+    ;
+
+trigger_block
+    : (DECLARE declare_spec*)? body?
+    ;
+
+tps_block
+    : declare_spec* body
+    ;
+
+block
+    : (DECLARE declare_spec*)? body
+    ;
+
+// SQL Statements
+
+sql_statement
+    : execute_immediate
+    | data_manipulation_language_statements
+    | cursor_manipulation_statements
+    | transaction_control_statements
+    | collection_method_call
+    ;
+
+execute_immediate
+    : EXECUTE IMMEDIATE expression (
+        into_clause using_clause?
+        | using_clause dynamic_returning_clause?
+        | dynamic_returning_clause
+    )?
+    ;
+
+// Execute Immediate Specific Clause
+
+dynamic_returning_clause
+    : (RETURNING | RETURN) into_clause
+    ;
+
+// DML Statements
+
+data_manipulation_language_statements
+    : merge_statement
+    | lock_table_statement
+    | select_statement
+    | update_statement
+    | delete_statement
+    | insert_statement
+    | explain_statement
+    ;
+
+// Cursor Manipulation Statements
+
+cursor_manipulation_statements
+    : close_statement
+    | open_statement
+    | fetch_statement
+    | open_for_statement
+    ;
+
+close_statement
+    : CLOSE cursor_name
+    ;
+
+open_statement
+    : OPEN cursor_name ('(' expressions? ')')?
+    ;
+
+fetch_statement
+    : FETCH cursor_name (
+        it1 = INTO variable_or_collection (',' variable_or_collection)*
+        | BULK COLLECT INTO variable_or_collection (',' variable_or_collection)* (
+            LIMIT (numeric | variable_or_collection)
+        )?
+    )
+    ;
+
+variable_or_collection
+    : variable_name
+    | collection_expression
+    ;
+
+open_for_statement
+    : OPEN variable_name FOR (select_statement | expression) using_clause?
+    ;
+
+// Transaction Control SQL Statements
+
+transaction_control_statements
+    : set_transaction_command
+    | set_constraint_command
+    | commit_statement
+    | rollback_statement
+    | savepoint_statement
+    ;
+
+set_transaction_command
+    : SET TRANSACTION (
+        READ (ONLY | WRITE)
+        | ISOLATION LEVEL (SERIALIZABLE | READ COMMITTED)
+        | USE ROLLBACK SEGMENT rollback_segment_name
+    )? (NAME quoted_string)?
+    ;
+
+set_constraint_command
+    : SET (CONSTRAINT | CONSTRAINTS) (ALL | constraint_name (',' constraint_name)*) (
+        IMMEDIATE
+        | DEFERRED
+    )
+    ;
+
+// https://docs.oracle.com/cd/E18283_01/server.112/e17118/statements_4010.htm#SQLRF01110
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/COMMIT.html
+commit_statement
+    : COMMIT WORK? write_clause? (
+        COMMENT CHAR_STRING write_clause?
+        | FORCE (CHAR_STRING (',' numeric)? | CORRUPT_XID CHAR_STRING | CORRUPT_XID_ALL)
+    )?
+    ;
+
+write_clause
+    : WRITE (WAIT | NOWAIT)? (IMMEDIATE | BATCH)?
+    ;
+
+rollback_statement
+    : ROLLBACK WORK? (TO SAVEPOINT? savepoint_name | FORCE quoted_string)?
+    ;
+
+savepoint_statement
+    : SAVEPOINT savepoint_name
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/19/lnpls/collection-method.html#GUID-7AF1A3C4-D04B-4F91-9D7B-C92C75E3A300
+collection_method_call // collection methods invocation that could be used as a statement
+    : expression '.' (
+        (DELETE | EXTEND) ('(' index += expression (',' index += expression)* ')')?
+        | TRIM ('(' index += expression ')')?
+    )
+    ;
+
+// Dml
+
+/* TODO
+//SHOULD BE OVERRIDEN!
+compilation_unit
+    : seq_of_statements* EOF
+    ;
+
+//SHOULD BE OVERRIDEN!
+seq_of_statements
+    : select_statement
+    | update_statement
+    | delete_statement
+    | insert_statement
+    | lock_table_statement
+    | merge_statement
+    | explain_statement
+//    | case_statement[true]
+    ;
+*/
+
+explain_statement
+    : EXPLAIN (
+        select_statement
+        | update_statement
+        | delete_statement
+        | insert_statement
+        | merge_statement
+    )
+    ;
+
+select_only_statement
+    : with_clause? subquery
+    ;
+
+select_statement
+    : select_only_statement (for_update_clause | order_by_clause | offset_clause | fetch_clause)*
+    ;
+
+// Select Specific Clauses
+with_clause
+    : WITH (function_body | procedure_body)* with_factoring_clause (',' with_factoring_clause)*
+    | WITH (function_body | procedure_body)+ (with_factoring_clause (',' with_factoring_clause)*)?
+    ;
+
+with_factoring_clause
+    : subquery_factoring_clause
+    | subav_factoring_clause
+    ;
+
+subquery_factoring_clause
+    : query_name paren_column_list? AS '(' subquery order_by_clause? ')' search_clause? cycle_clause?
+    ;
+
+search_clause
+    : SEARCH (DEPTH | BREADTH) FIRST BY column_name ASC? DESC? (NULLS FIRST)? (NULLS LAST)? (
+        ',' column_name ASC? DESC? (NULLS FIRST)? (NULLS LAST)?
+    )* SET column_name
+    ;
+
+cycle_clause
+    : CYCLE column_list SET column_name TO expression DEFAULT expression
+    ;
+
+subav_factoring_clause
+    : subav_name = id_expression ANALYTIC VIEW AS '(' subav_clause ')'
+    ;
+
+subav_clause
+    : USING subav_name = object_name hierarchies_clause? filter_clauses? add_calcs_clause?
+    ;
+
+hierarchies_clause
+    : HIERARCHIES '(' hier_alias += object_name (',' hier_alias += object_name)* ')'
+    ;
+
+filter_clauses
+    : FILTER FACT '(' filter_clause (',' filter_clause)* ')'
+    ;
+
+filter_clause
+    : (MEASURES | hier_alias = object_name) TO condition
+    ;
+
+add_calcs_clause
+    : ADD MEASURES '(' add_calc_meas_clause (',' add_calc_meas_clause)* ')'
+    ;
+
+add_calc_meas_clause
+    : meas_name = id_expression AS '(' expression ')'
+    ;
+
+subquery
+    : subquery_basic_elements subquery_operation_part*
+    ;
+
+subquery_basic_elements
+    : query_block
+    | '(' subquery ')'
+    ;
+
+subquery_operation_part
+    : (UNION ALL? | INTERSECT | MINUS) subquery_basic_elements
+    ;
+
+query_block
+    : SELECT (DISTINCT | UNIQUE | ALL)? selected_list into_clause? from_clause? where_clause? (
+        hierarchical_query_clause
+        | group_by_clause
+    )* model_clause? order_by_clause? offset_clause? fetch_clause?
+    ;
+
+selected_list
+    : '*'
+    | select_list_elements (',' select_list_elements)*
+    ;
+
+from_clause
+    : FROM table_ref_list
+    ;
+
+select_list_elements
+    : tableview_name '.' ASTERISK
+    | expression column_alias?
+    ;
+
+table_ref_list
+    : table_ref (',' table_ref)*
+    ;
+
+// NOTE to PIVOT clause
+// according the SQL reference this should not be possible
+// according to he reality it is. Here we probably apply pivot/unpivot onto whole join clause
+// eventhough it is not enclosed in parenthesis. See pivot examples 09,10,11
+
+table_ref
+    : table_ref_aux join_clause* (pivot_clause | unpivot_clause)?
+    ;
+
+table_ref_aux
+    : table_ref_aux_internal flashback_query_clause* (/*{isTableAlias()}?*/ table_alias)?
+    ;
+
+table_ref_aux_internal
+    : dml_table_expression_clause (pivot_clause | unpivot_clause)?                # table_ref_aux_internal_one
+    | '(' table_ref subquery_operation_part* ')' (pivot_clause | unpivot_clause)? # table_ref_aux_internal_two
+    | ONLY '(' dml_table_expression_clause ')'                                    # table_ref_aux_internal_thre
+    ;
+
+join_clause
+    : query_partition_clause? (CROSS | NATURAL)? (INNER | outer_join_type)? JOIN table_ref_aux query_partition_clause? (
+        join_on_part
+        | join_using_part
+    )*
+    | (CROSS | OUTER) APPLY table_ref_aux
+    ;
+
+join_on_part
+    : ON condition
+    ;
+
+join_using_part
+    : USING paren_column_list
+    ;
+
+outer_join_type
+    : (FULL | LEFT | RIGHT) OUTER?
+    ;
+
+query_partition_clause
+    : PARTITION BY (('(' (subquery | expressions)? ')') | expressions)
+    ;
+
+flashback_query_clause
+    : VERSIONS (PERIOD_KEYWORD FOR column_name BETWEEN | BETWEEN (SCN | TIMESTAMP)) expression AND expression
+    | AS OF ((SCN | TIMESTAMP | SNAPSHOT) expression | PERIOD_KEYWORD FOR column_name expression)
+    ;
+
+pivot_clause
+    : PIVOT XML? '(' pivot_element (',' pivot_element)* pivot_for_clause pivot_in_clause ')'
+    ;
+
+pivot_element
+    : (numeric_function | aggregate_function_name '(' expression ')') column_alias?
+    ;
+
+pivot_for_clause
+    : FOR (column_name | paren_column_list)
+    ;
+
+pivot_in_clause
+    : IN '(' (subquery | ANY (',' ANY)* | pivot_in_clause_element (',' pivot_in_clause_element)*) ')'
+    ;
+
+pivot_in_clause_element
+    : pivot_in_clause_elements column_alias?
+    ;
+
+pivot_in_clause_elements
+    : expression
+    | '(' expressions? ')'
+    ;
+
+unpivot_clause
+    : UNPIVOT ((INCLUDE | EXCLUDE) NULLS)? '(' (column_name | paren_column_list) pivot_for_clause unpivot_in_clause ')'
+    ;
+
+unpivot_in_clause
+    : IN '(' unpivot_in_elements (',' unpivot_in_elements)* ')'
+    ;
+
+unpivot_in_elements
+    : (column_name | paren_column_list) (AS (constant | '(' constant (',' constant)* ')'))?
+    ;
+
+hierarchical_query_clause
+    : CONNECT BY NOCYCLE? condition start_part?
+    | start_part CONNECT BY NOCYCLE? condition
+    ;
+
+start_part
+    : START WITH condition
+    ;
+
+group_by_clause
+    : GROUP BY group_by_elements (',' group_by_elements)* having_clause?
+    | having_clause (GROUP BY group_by_elements (',' group_by_elements)*)?
+    ;
+
+group_by_elements
+    : grouping_sets_clause
+    | rollup_cube_clause
+    | expression
+    ;
+
+rollup_cube_clause
+    : (ROLLUP | CUBE) '(' grouping_sets_elements (',' grouping_sets_elements)* ')'
+    ;
+
+grouping_sets_clause
+    : GROUPING SETS '(' grouping_sets_elements (',' grouping_sets_elements)* ')'
+    ;
+
+grouping_sets_elements
+    : rollup_cube_clause
+    | '(' expressions? ')'
+    | expression
+    ;
+
+having_clause
+    : HAVING condition
+    ;
+
+model_clause
+    : MODEL cell_reference_options* return_rows_clause? reference_model* main_model
+    ;
+
+cell_reference_options
+    : (IGNORE | KEEP) NAV
+    | UNIQUE (DIMENSION | SINGLE REFERENCE)
+    ;
+
+return_rows_clause
+    : RETURN (UPDATED | ALL) ROWS
+    ;
+
+reference_model
+    : REFERENCE reference_model_name ON '(' subquery ')' model_column_clauses cell_reference_options*
+    ;
+
+main_model
+    : (MAIN main_model_name)? model_column_clauses cell_reference_options* model_rules_clause
+    ;
+
+model_column_clauses
+    : model_column_partition_part? DIMENSION BY model_column_list MEASURES model_column_list
+    ;
+
+model_column_partition_part
+    : PARTITION BY model_column_list
+    ;
+
+model_column_list
+    : '(' model_column (',' model_column)* ')'
+    ;
+
+model_column
+    : (expression | query_block) column_alias?
+    ;
+
+model_rules_clause
+    : model_rules_part? '(' (model_rules_element (',' model_rules_element)*)? ')'
+    ;
+
+model_rules_part
+    : RULES (UPDATE | UPSERT ALL?)? ((AUTOMATIC | SEQUENTIAL) ORDER)? model_iterate_clause?
+    ;
+
+model_rules_element
+    : (UPDATE | UPSERT ALL?)? cell_assignment order_by_clause? '=' expression
+    ;
+
+cell_assignment
+    : model_expression
+    ;
+
+model_iterate_clause
+    : ITERATE '(' expression ')' until_part?
+    ;
+
+until_part
+    : UNTIL '(' condition ')'
+    ;
+
+order_by_clause
+    : ORDER SIBLINGS? BY order_by_elements (',' order_by_elements)*
+    ;
+
+order_by_elements
+    : expression (ASC | DESC)? (NULLS (FIRST | LAST))?
+    ;
+
+offset_clause
+    : OFFSET expression (ROW | ROWS)
+    ;
+
+fetch_clause
+    : FETCH (FIRST | NEXT) (expression PERCENT_KEYWORD?)? (ROW | ROWS) (ONLY | WITH TIES)
+    ;
+
+for_update_clause
+    : FOR UPDATE for_update_of_part? for_update_options?
+    ;
+
+for_update_of_part
+    : OF column_list
+    ;
+
+for_update_options
+    : SKIP_ LOCKED
+    | NOWAIT
+    | WAIT expression
+    ;
+
+update_statement
+    : UPDATE general_table_ref update_set_clause where_clause? static_returning_clause? error_logging_clause?
+    ;
+
+// Update Specific Clauses
+
+update_set_clause
+    : SET (
+        column_based_update_set_clause (',' column_based_update_set_clause)*
+        | VALUE '(' identifier ')' '=' expression
+    )
+    ;
+
+column_based_update_set_clause
+    : column_name '=' expression
+    | paren_column_list '=' subquery
+    ;
+
+delete_statement
+    : DELETE FROM? general_table_ref where_clause? static_returning_clause? error_logging_clause?
+    ;
+
+insert_statement
+    : INSERT (single_table_insert | multi_table_insert)
+    ;
+
+// Insert Specific Clauses
+
+single_table_insert
+    : insert_into_clause (values_clause static_returning_clause? | select_statement) error_logging_clause?
+    ;
+
+multi_table_insert
+    : (ALL multi_table_element+ | conditional_insert_clause) select_statement
+    ;
+
+multi_table_element
+    : insert_into_clause values_clause? error_logging_clause?
+    ;
+
+conditional_insert_clause
+    : (ALL | FIRST)? conditional_insert_when_part+ conditional_insert_else_part?
+    ;
+
+conditional_insert_when_part
+    : WHEN condition THEN multi_table_element+
+    ;
+
+conditional_insert_else_part
+    : ELSE multi_table_element+
+    ;
+
+insert_into_clause
+    : INTO general_table_ref paren_column_list?
+    ;
+
+values_clause
+    : VALUES (REGULAR_ID | '(' expressions ')' | collection_expression)
+    ;
+
+merge_statement
+    : MERGE INTO tableview_name table_alias? USING selected_tableview ON '(' condition ')' (
+        merge_update_clause merge_insert_clause?
+        | merge_insert_clause merge_update_clause?
+    )? error_logging_clause?
+    ;
+
+// Merge Specific Clauses
+
+merge_update_clause
+    : WHEN MATCHED THEN UPDATE SET merge_element (',' merge_element)* where_clause? merge_update_delete_part?
+    ;
+
+merge_element
+    : column_name '=' expression
+    ;
+
+merge_update_delete_part
+    : DELETE where_clause
+    ;
+
+merge_insert_clause
+    : WHEN NOT MATCHED THEN INSERT paren_column_list? values_clause where_clause?
+    ;
+
+selected_tableview
+    : (tableview_name | '(' select_statement ')') table_alias?
+    ;
+
+lock_table_statement
+    : LOCK TABLE lock_table_element (',' lock_table_element)* IN lock_mode MODE wait_nowait_part?
+    ;
+
+wait_nowait_part
+    : WAIT expression
+    | NOWAIT
+    ;
+
+// Lock Specific Clauses
+
+lock_table_element
+    : tableview_name partition_extension_clause?
+    ;
+
+lock_mode
+    : ROW SHARE
+    | ROW EXCLUSIVE
+    | SHARE UPDATE?
+    | SHARE ROW EXCLUSIVE
+    | EXCLUSIVE
+    ;
+
+// Common DDL Clauses
+
+general_table_ref
+    : (dml_table_expression_clause | ONLY '(' dml_table_expression_clause ')') table_alias?
+    ;
+
+static_returning_clause
+    : (RETURNING | RETURN) expressions into_clause
+    ;
+
+error_logging_clause
+    : LOG ERRORS error_logging_into_part? expression? error_logging_reject_part?
+    ;
+
+error_logging_into_part
+    : INTO tableview_name
+    ;
+
+error_logging_reject_part
+    : REJECT LIMIT (UNLIMITED | expression)
+    ;
+
+dml_table_expression_clause
+    : table_collection_expression
+    | '(' select_statement subquery_restriction_clause? ')'
+    | tableview_name hierarchies_clause? sample_clause?
+    | json_table_clause (AS identifier)?
+    | LATERAL '(' subquery subquery_restriction_clause? ')'
+    ;
+
+table_collection_expression
+    : (TABLE | THE) ('(' subquery ')' | '(' expression ')' outer_join_sign?)
+    ;
+
+subquery_restriction_clause
+    : WITH (READ ONLY | CHECK OPTION (CONSTRAINT constraint_name)?)
+    ;
+
+sample_clause
+    : SAMPLE BLOCK? '(' expression (',' expression)? ')' seed_part?
+    ;
+
+seed_part
+    : SEED '(' expression ')'
+    ;
+
+// Expression & Condition
+
+condition
+    : expression
+    | JSON_EQUAL '(' expressions ')'
+    ;
+
+expressions
+    : expression (',' expression)*
+    ;
+
+expression
+    : cursor_expression
+    | logical_expression
+    ;
+
+cursor_expression
+    : CURSOR '(' subquery ')'
+    ;
+
+logical_expression
+    : unary_logical_expression
+    | logical_expression AND logical_expression
+    | logical_expression OR logical_expression
+    ;
+
+unary_logical_expression
+    : NOT? multiset_expression unary_logical_operation?
+    ;
+
+unary_logical_operation
+    : IS NOT? logical_operation
+    ;
+
+logical_operation
+    : (
+        NULL_
+        | NAN
+        | PRESENT
+        | INFINITE
+        | A_LETTER SET
+        | EMPTY_
+        | OF TYPE? '(' ONLY? type_spec (',' type_spec)* ')'
+        | JSON (FORMAT JSON)? (STRICT | LAX)? ((WITH | WITHOUT) UNIQUE KEYS)?
+    )
+    ;
+
+multiset_expression
+    : relational_expression (multiset_type = (MEMBER | SUBMULTISET) OF? concatenation)?
+    | multiset_expression MULTISET multiset_operator = (EXCEPT | INTERSECT | UNION) (
+        ALL
+        | DISTINCT
+    )? relational_expression
+    ;
+
+relational_expression
+    : relational_expression relational_operator relational_expression
+    | compound_expression
+    ;
+
+compound_expression
+    : concatenation (
+        NOT? (
+            IN in_elements
+            | BETWEEN between_elements
+            | like_type = (LIKE | LIKEC | LIKE2 | LIKE4) concatenation (ESCAPE concatenation)?
+        )
+    )?
+    ;
+
+relational_operator
+    : '='
+    | (NOT_EQUAL_OP | '<' '>' | '!' '=' | '^' '=')
+    | ('<' | '>') '='?
+    ;
+
+in_elements
+    : '(' subquery ')'
+    | '(' concatenation (',' concatenation)* ')'
+    | constant
+    | bind_variable
+    | general_element
+    ;
+
+between_elements
+    : concatenation AND concatenation
+    ;
+
+concatenation
+    : model_expression (AT (LOCAL | TIME ZONE concatenation) | interval_expression)? (
+        ON OVERFLOW (TRUNCATE | ERROR)
+    )?
+    | concatenation op = DOUBLE_ASTERISK concatenation
+    | concatenation op = (ASTERISK | SOLIDUS | MOD) concatenation
+    | concatenation op = (PLUS_SIGN | MINUS_SIGN) concatenation
+    | concatenation BAR BAR concatenation
+    | concatenation COLLATE column_collation_name
+    ;
+
+interval_expression
+    : DAY ('(' concatenation ')')? TO SECOND ('(' concatenation ')')?
+    | YEAR ('(' concatenation ')')? TO MONTH
+    | concatenation (SECOND | DAY | MONTH | YEAR)?
+    ;
+
+model_expression
+    : unary_expression ('[' model_expression_element ']')?
+    ;
+
+model_expression_element
+    : (ANY | expression) (',' (ANY | expression))*
+    | single_column_for_loop (',' single_column_for_loop)*
+    | multi_column_for_loop
+    ;
+
+single_column_for_loop
+    : FOR column_name (
+        IN '(' expressions? ')'
+        | (LIKE expression)? FROM fromExpr = expression TO toExpr = expression action_type = (
+            INCREMENT
+            | DECREMENT
+        ) action_expr = expression
+    )
+    ;
+
+multi_column_for_loop
+    : FOR paren_column_list IN '(' (subquery | '(' expressions? ')') ')'
+    ;
+
+unary_expression
+    : ('-' | '+') unary_expression
+    | PRIOR unary_expression
+    | CONNECT_BY_ROOT unary_expression
+    | /*TODO {input.LT(1).getText().equalsIgnoreCase("new") && !input.LT(2).getText().equals(".")}?*/ NEW unary_expression
+    | DISTINCT unary_expression
+    | ALL unary_expression
+    | /*TODO{(input.LA(1) == CASE || input.LA(2) == CASE)}?*/ case_statement /*[false]*/
+    | unary_expression '.' (
+        (COUNT | FIRST | LAST | LIMIT)
+        | (EXISTS | NEXT | PRIOR) '(' index += expression ')'
+    )
+    | quantified_expression
+    | standard_function
+    | atom
+    | implicit_cursor_expression
+    ;
+
+// https://docs.oracle.com/en/database/oracle/oracle-database/21/lnpls/plsql-optimization-and-tuning.html#GUID-DAF46F06-EF3F-4B1A-A518-5238B80C69FA
+implicit_cursor_expression
+    : SQL (
+        PERCENT_BULK_ROWCOUNT '(' index = expression ')'
+        | PERCENT_BULK_EXCEPTIONS ('.' COUNT | '(' expression ')' '.' (ERROR_INDEX | ERROR_CODE))
+    )
+    ;
+
+collection_expression
+    : collation_name '(' expression ')' ('.' general_element_part)*
+    ;
+
+case_statement /*TODO [boolean isStatementParameter]
+TODO scope    {
+    boolean isStatement;
+}
+@init    {$case_statement::isStatement = $isStatementParameter;}*/
+    : searched_case_statement
+    | simple_case_statement
+    ;
+
+// CASE
+
+simple_case_statement
+    : label_declaration? ck1 = CASE expression simple_case_when_part+ case_else_part? END CASE? label_name?
+    ;
+
+simple_case_when_part
+    : WHEN expression THEN (/*TODO{$case_statement::isStatement}?*/ seq_of_statements | expression)
+    ;
+
+searched_case_statement
+    : label_declaration? ck1 = CASE searched_case_when_part+ case_else_part? END CASE? label_name?
+    ;
+
+searched_case_when_part
+    : WHEN condition THEN (/*TODO{$case_statement::isStatement}?*/ seq_of_statements | expression)
+    ;
+
+case_else_part
+    : ELSE (/*{$case_statement::isStatement}?*/ seq_of_statements | expression)
+    ;
+
+atom
+    : bind_variable
+    | constant
+    | inquiry_directive
+    | general_element outer_join_sign?
+    | '(' subquery ')' subquery_operation_part*
+    | '(' expressions ')'
+    ;
+
+quantified_expression
+    : (SOME | EXISTS | ALL | ANY) (
+        '(' select_only_statement ')'
+        | '(' expression (',' expression)* ')'
+    )
+    ;
+
+string_function
+    : SUBSTR '(' expression ',' expression (',' expression)? ')'
+    | TO_CHAR '(' (table_element | standard_function | expression) (',' quoted_string)? (
+        ',' quoted_string
+    )? ')'
+    | DECODE '(' expressions ')'
+    | CHR '(' concatenation USING NCHAR_CS ')'
+    | NVL '(' expression ',' expression ')'
+    | TRIM '(' ((LEADING | TRAILING | BOTH)? expression? FROM)? concatenation ')'
+    | TO_DATE '(' (table_element | standard_function | expression) (
+        DEFAULT concatenation ON CONVERSION ERROR
+    )? (',' quoted_string (',' quoted_string)?)? ')'
+    ;
+
+standard_function
+    : string_function
+    | numeric_function_wrapper
+    | json_function
+    | other_function
+    ;
+
+//see as https://docs.oracle.com/en/database/oracle/oracle-database/21/sqlrf/JSON_ARRAY.html#GUID-46CDB3AF-5795-455B-85A8-764528CEC43B
+json_function
+    : JSON_ARRAY '(' json_array_element (',' json_array_element)* json_on_null_clause? json_return_clause? STRICT? ')'
+    | JSON_ARRAYAGG '(' expression (FORMAT JSON)? order_by_clause? json_on_null_clause? json_return_clause? STRICT? ')'
+    | JSON_OBJECT '(' json_object_content ')'
+    | JSON_OBJECTAGG '(' KEY? expression VALUE expression ((NULL_ | ABSENT) ON NULL_)? (
+        RETURNING (VARCHAR2 ('(' UNSIGNED_INTEGER ( BYTE | CHAR)? ')')? | CLOB | BLOB)
+    )? STRICT? (WITH UNIQUE KEYS)? ')'
+    | JSON_QUERY '(' expression (FORMAT JSON)? ',' CHAR_STRING json_query_returning_clause json_query_wrapper_clause? json_query_on_error_clause?
+        json_query_on_empty_clause? ')'
+    | JSON_SERIALIZE '(' CHAR_STRING (RETURNING json_query_return_type)? PRETTY? ASCII? TRUNCATE? (
+        (NULL_ | ERROR | EMPTY_ (ARRAY | OBJECT)) ON ERROR
+    )? ')'
+    | JSON_TRANSFORM '(' expression ',' json_transform_op (',' json_transform_op)* ')'
+    | JSON_VALUE '(' expression (FORMAT JSON)? (
+        ',' CHAR_STRING? json_value_return_clause? ((ERROR | NULL_ | DEFAULT literal)? ON ERROR)? (
+            (ERROR | NULL_ | DEFAULT literal)? ON EMPTY_
+        )? json_value_on_mismatch_clause? ')'
+    )?
+    ;
+
+json_object_content
+    : (json_object_entry (',' json_object_entry)* | '*') json_on_null_clause? json_return_clause? STRICT? (
+        WITH UNIQUE KEYS
+    )?
+    ;
+
+json_object_entry
+    : (KEY? expression (VALUE | IS)? expression | expression ':' expression | identifier) (
+        FORMAT JSON
+    )?
+    ;
+
+json_table_clause
+    : JSON_TABLE '(' expression (FORMAT JSON)? (',' CHAR_STRING)? ((ERROR | NULL_) ON ERROR)? (
+        (EMPTY_ | NULL_) ON EMPTY_
+    )? json_column_clause? ')'
+    ;
+
+json_array_element
+    : (expression | CHAR_STRING | NULL_ | UNSIGNED_INTEGER | json_function) (FORMAT JSON)?
+    ;
+
+json_on_null_clause
+    : (NULL_ | ABSENT) ON NULL_
+    ;
+
+json_return_clause
+    : RETURNING (VARCHAR2 ('(' UNSIGNED_INTEGER ( BYTE | CHAR)? ')')? | CLOB | BLOB)
+    ;
+
+json_transform_op
+    : REMOVE CHAR_STRING ((IGNORE | ERROR)? ON MISSING)?
+    | INSERT CHAR_STRING '=' CHAR_STRING ((REPLACE | IGNORE | ERROR) ON EXISTING)? (
+        (NULL_ | IGNORE | ERROR | REMOVE)? ON NULL_
+    )?
+    | REPLACE CHAR_STRING '=' CHAR_STRING ((CREATE | IGNORE | ERROR) ON MISSING)? (
+        (NULL_ | IGNORE | ERROR)? ON NULL_
+    )?
+    | expression (FORMAT JSON)?
+    | APPEND CHAR_STRING '=' CHAR_STRING ((CREATE | IGNORE | ERROR) ON MISSING)? (
+        (NULL_ | IGNORE | ERROR)? ON NULL_
+    )?
+    | SET CHAR_STRING '=' expression (FORMAT JSON)? ((REPLACE | IGNORE | ERROR) ON EXISTING)? (
+        (CREATE | IGNORE | ERROR) ON MISSING
+    )? ((NULL_ | IGNORE | ERROR)? ON NULL_)?
+    ;
+
+json_column_clause
+    : COLUMNS '(' json_column_definition (',' json_column_definition)* ')'
+    ;
+
+json_column_definition
+    : expression json_value_return_type? (EXISTS? PATH CHAR_STRING | TRUNCATE (PATH CHAR_STRING)?)? json_query_on_error_clause?
+        json_query_on_empty_clause?
+    | expression json_query_return_type? TRUNCATE? FORMAT JSON json_query_wrapper_clause? PATH CHAR_STRING
+    | NESTED PATH? expression ('[' ASTERISK ']')? json_column_clause
+    | expression FOR ORDINALITY
+    ;
+
+json_query_returning_clause
+    : (RETURNING json_query_return_type)? PRETTY? ASCII?
+    ;
+
+json_query_return_type
+    : VARCHAR2 ('(' UNSIGNED_INTEGER ( BYTE | CHAR)? ')')?
+    | CLOB
+    | BLOB
+    ;
+
+json_query_wrapper_clause
+    : (WITHOUT ARRAY? WRAPPER)
+    | (WITH (UNCONDITIONAL | CONDITIONAL)? ARRAY? WRAPPER)
+    ;
+
+json_query_on_error_clause
+    : (ERROR | NULL_ | EMPTY_ | EMPTY_ ARRAY | EMPTY_ OBJECT)? ON ERROR
+    ;
+
+json_query_on_empty_clause
+    : (ERROR | NULL_ | EMPTY_ | EMPTY_ ARRAY | EMPTY_ OBJECT)? ON EMPTY_
+    ;
+
+json_value_return_clause
+    : RETURNING json_value_return_type? ASCII?
+    ;
+
+json_value_return_type
+    : VARCHAR2 ('(' UNSIGNED_INTEGER ( BYTE | CHAR)? ')')? TRUNCATE?
+    | CLOB
+    | DATE
+    | NUMBER ('(' INTEGER (',' INTEGER)? ')')?
+    | TIMESTAMP (WITH TIMEZONE)?
+    | SDO_GEOMETRY
+    | expression (USING CASESENSITIVE MAPPING)?
+    ;
+
+json_value_on_mismatch_clause
+    : (IGNORE | ERROR | NULL_) ON MISMATCH ('(' MISSING DATA | EXTRA DATA | TYPE ERROR ')')?
+    ;
+
+literal
+    : CHAR_STRING
+    | string_function
+    | numeric
+    | MAXVALUE
+    ;
+
+numeric_function_wrapper
+    : numeric_function (single_column_for_loop | multi_column_for_loop)?
+    ;
+
+numeric_function
+    : SUM '(' (DISTINCT | ALL)? expression ')'
+    | COUNT '(' (ASTERISK | ((DISTINCT | UNIQUE | ALL)? concatenation)?) ')' over_clause?
+    | ROUND '(' expression (',' UNSIGNED_INTEGER)? ')'
+    | AVG '(' (DISTINCT | ALL)? expression ')'
+    | MAX '(' (DISTINCT | ALL)? expression ')'
+    | LEAST '(' expressions ')'
+    | GREATEST '(' expressions ')'
+    ;
+
+listagg_overflow_clause
+    : ON OVERFLOW (ERROR | TRUNCATE) CHAR_STRING? ((WITH | WITHOUT) COUNT)?
+    ;
+
+other_function
+    : over_clause_keyword function_argument_analytic over_clause?
+    | /*TODO stantard_function_enabling_using*/ regular_id function_argument_modeling using_clause?
+    | COUNT '(' (ASTERISK | (DISTINCT | UNIQUE | ALL)? concatenation) ')' over_clause?
+    | (CAST | XMLCAST) '(' (MULTISET '(' subquery ')' | concatenation) AS type_spec (
+        DEFAULT concatenation ON CONVERSION ERROR
+    )? (',' quoted_string (',' quoted_string)?)? ')'
+    | COALESCE '(' table_element (',' (numeric | quoted_string))? ')'
+    | COLLECT '(' (DISTINCT | UNIQUE)? concatenation collect_order_by_part? ')'
+    | within_or_over_clause_keyword function_argument within_or_over_part+
+    | LISTAGG '(' (ALL | DISTINCT | UNIQUE)? argument (',' string_delimiter)? listagg_overflow_clause? ')' (
+        WITHIN GROUP '(' order_by_clause ')'
+    )? over_clause?
+    | cursor_name (PERCENT_ISOPEN | PERCENT_FOUND | PERCENT_NOTFOUND | PERCENT_ROWCOUNT)
+    | DECOMPOSE '(' concatenation (CANONICAL | COMPATIBILITY)? ')'
+    | EXTRACT '(' regular_id FROM concatenation ')'
+    | (FIRST_VALUE | LAST_VALUE) function_argument_analytic respect_or_ignore_nulls? over_clause
+    | (LEAD | LAG) function_argument_analytic respect_or_ignore_nulls? over_clause
+    | standard_prediction_function_keyword '(' expressions cost_matrix_clause? using_clause? ')'
+    | (TO_BINARY_DOUBLE | TO_BINARY_FLOAT | TO_NUMBER | TO_TIMESTAMP | TO_TIMESTAMP_TZ) '(' concatenation (
+        DEFAULT concatenation ON CONVERSION ERROR
+    )? (',' quoted_string (',' quoted_string)?)? ')'
+    | (TO_DSINTERVAL | TO_YMINTERVAL) '(' concatenation (DEFAULT concatenation ON CONVERSION ERROR)? ')'
+    | TRANSLATE '(' expression (USING (CHAR_CS | NCHAR_CS))? (',' expression)* ')'
+    | TREAT '(' expression AS REF? type_spec ')' ('.' general_element_part)*
+    | TRIM '(' ((LEADING | TRAILING | BOTH)? quoted_string? FROM)? concatenation ')'
+    | VALIDATE_CONVERSION '(' concatenation AS type_spec (',' quoted_string (',' quoted_string)?)? ')'
+    | XMLAGG '(' expression order_by_clause? ')' ('.' general_element_part)*
+    | (XMLCOLATTVAL | XMLFOREST) '(' xml_multiuse_expression_element (
+        ',' xml_multiuse_expression_element
+    )* ')' ('.' general_element_part)*
+    | XMLELEMENT '(' (ENTITYESCAPING | NOENTITYESCAPING)? (NAME | EVALNAME)? expression (
+        /*TODO{input.LT(2).getText().equalsIgnoreCase("xmlattributes")}?*/ ',' xml_attributes_clause
+    )? (',' expression column_alias?)* ')' ('.' general_element_part)*
+    | XMLEXISTS '(' expression xml_passing_clause? ')'
+    | XMLPARSE '(' (DOCUMENT | CONTENT) concatenation WELLFORMED? ')' ('.' general_element_part)*
+    | XMLPI '(' (NAME identifier | EVALNAME concatenation) (',' concatenation)? ')' (
+        '.' general_element_part
+    )*
+    | XMLQUERY '(' concatenation xml_passing_clause? RETURNING CONTENT (NULL_ ON EMPTY_)? ')' (
+        '.' general_element_part
+    )*
+    | XMLROOT '(' concatenation (',' xmlroot_param_version_part)? (
+        ',' xmlroot_param_standalone_part
+    )? ')' ('.' general_element_part)*
+    | XMLSERIALIZE '(' (DOCUMENT | CONTENT) concatenation (AS type_spec)? xmlserialize_param_enconding_part? xmlserialize_param_version_part?
+        xmlserialize_param_ident_part? ((HIDE | SHOW) DEFAULTS)? ')' ('.' general_element_part)?
+    | TIME CHAR_STRING
+    | xmltable
+    ;
+
+over_clause_keyword
+    : AVG
+    | CORR
+    | LAG_DIFF
+    | LAG_DIFF_PERCENT
+    | MAX
+    | MEDIAN
+    | MIN
+    | NTH_VALUE
+    | NTILE
+    | RATIO_TO_REPORT
+    | ROW_NUMBER
+    | SUM
+    | VARIANCE
+    | REGR_
+    | STDDEV
+    | VAR_
+    | VAR_POP
+    | COVAR_
+    | WM_CONCAT
+    ;
+
+within_or_over_clause_keyword
+    : CUME_DIST
+    | DENSE_RANK
+    | PERCENT_RANK
+    | PERCENTILE_CONT
+    | PERCENTILE_DISC
+    | RANK
+    ;
+
+standard_prediction_function_keyword
+    : PREDICTION
+    | PREDICTION_BOUNDS
+    | PREDICTION_COST
+    | PREDICTION_DETAILS
+    | PREDICTION_PROBABILITY
+    | PREDICTION_SET
+    ;
+
+over_clause
+    : OVER '(' (
+        query_partition_clause? (order_by_clause windowing_clause?)?
+        | HIERARCHY th = id_expression OFFSET numeric (ACROSS ANCESTOR AT LEVEL id_expression)?
+    ) ')'
+    ;
+
+windowing_clause
+    : windowing_type (BETWEEN windowing_elements AND windowing_elements | windowing_elements)
+    ;
+
+windowing_type
+    : ROWS
+    | RANGE
+    ;
+
+windowing_elements
+    : UNBOUNDED PRECEDING
+    | CURRENT ROW
+    | concatenation (PRECEDING | FOLLOWING)
+    ;
+
+using_clause
+    : USING (ASTERISK | using_element (',' using_element)*)
+    ;
+
+using_element
+    : (IN OUT? | OUT)? select_list_elements
+    ;
+
+collect_order_by_part
+    : ORDER BY concatenation (',' concatenation)*
+    ;
+
+within_or_over_part
+    : WITHIN GROUP '(' order_by_clause ')'
+    | over_clause
+    ;
+
+string_delimiter
+    : CHAR_STRING
+    | string_function
+    | string_delimiter BAR BAR string_delimiter
+    | '(' string_delimiter ')'
+    | id_expression
+    ;
+
+cost_matrix_clause
+    : COST (
+        MODEL AUTO?
+        | '(' cost_class_name (',' cost_class_name)* ')' VALUES '(' expressions? ')'
+    )
+    ;
+
+xml_passing_clause
+    : PASSING (BY VALUE)? expression column_alias? (',' expression column_alias?)*
+    ;
+
+xml_attributes_clause
+    : XMLATTRIBUTES '(' (ENTITYESCAPING | NOENTITYESCAPING)? (SCHEMACHECK | NOSCHEMACHECK)? xml_multiuse_expression_element (
+        ',' xml_multiuse_expression_element
+    )* ')'
+    ;
+
+xml_namespaces_clause
+    : XMLNAMESPACES '(' (concatenation column_alias)? (',' concatenation column_alias)* xml_general_default_part? ')'
+    ;
+
+xml_table_column
+    : xml_column_name (FOR ORDINALITY | type_spec (PATH concatenation)? xml_general_default_part?)
+    ;
+
+xml_general_default_part
+    : DEFAULT concatenation
+    ;
+
+xml_multiuse_expression_element
+    : expression (AS (id_expression | EVALNAME concatenation))?
+    ;
+
+xmlroot_param_version_part
+    : VERSION (NO VALUE | expression)
+    ;
+
+xmlroot_param_standalone_part
+    : STANDALONE (YES | NO VALUE?)
+    ;
+
+xmlserialize_param_enconding_part
+    : ENCODING concatenation
+    ;
+
+xmlserialize_param_version_part
+    : VERSION concatenation
+    ;
+
+xmlserialize_param_ident_part
+    : NO INDENT
+    | INDENT (SIZE '=' concatenation)?
+    ;
+
+// SqlPlus
+
+sql_plus_command_no_semicolon
+    : set_command
+    ;
+
+sql_plus_command
+    : EXIT
+    | PROMPT_MESSAGE
+    | SHOW (ERR | ERRORS)
+    | whenever_command
+    | timing_command
+    | start_command
+    ;
+
+start_command
+    : START_CMD id_expression PERIOD (SQL | FILE_EXT)
+    ;
+
+whenever_command
+    : WHENEVER (SQLERROR | OSERROR) (
+        EXIT (SUCCESS | FAILURE | WARNING | variable_name | numeric) (COMMIT | ROLLBACK)?
+        | CONTINUE (COMMIT | ROLLBACK | NONE)?
+    )
+    ;
+
+set_command
+    : SET regular_id (CHAR_STRING | ON | OFF | /*EXACT_NUM_LIT*/ numeric | regular_id)
+    ;
+
+timing_command
+    : TIMING (START timing_text = id_expression* | SHOW | STOP)?
+    ;
+
+// Common
+
+partition_extension_clause
+    : (SUBPARTITION | PARTITION) FOR? '(' expressions? ')'
+    ;
+
+column_alias
+    : AS? (identifier | quoted_string)
+    | AS
+    ;
+
+table_alias
+    : identifier
+    | quoted_string
+    ;
+
+where_clause
+    : WHERE (CURRENT OF cursor_name | condition | quantitative_where_stmt)
+    ;
+
+quantitative_where_stmt
+    : expression relational_operator (SOME | ALL | ANY) '(' expression (',' expression)* ')'
+    ;
+
+into_clause
+    : (BULK COLLECT)? INTO (general_element | bind_variable) (
+        ',' (general_element | bind_variable)
+    )*
+    ;
+
+// Common Named Elements
+
+xml_column_name
+    : identifier
+    | quoted_string
+    ;
+
+cost_class_name
+    : identifier
+    ;
+
+attribute_name
+    : identifier
+    ;
+
+savepoint_name
+    : identifier
+    ;
+
+rollback_segment_name
+    : identifier
+    ;
+
+table_var_name
+    : identifier
+    ;
+
+schema_name
+    : identifier
+    ;
+
+routine_name
+    : identifier ('.' id_expression)* ('@' link_name)?
+    ;
+
+package_name
+    : identifier
+    ;
+
+implementation_type_name
+    : identifier ('.' id_expression)?
+    ;
+
+parameter_name
+    : identifier
+    ;
+
+reference_model_name
+    : identifier
+    ;
+
+main_model_name
+    : identifier
+    ;
+
+container_tableview_name
+    : identifier ('.' id_expression)?
+    ;
+
+aggregate_function_name
+    : identifier ('.' id_expression)*
+    ;
+
+query_name
+    : identifier
+    ;
+
+grantee_name
+    : id_expression identified_by?
+    ;
+
+role_name
+    : id_expression
+    | CONNECT
+    ;
+
+constraint_name
+    : identifier ('.' id_expression)* ('@' link_name)?
+    ;
+
+label_name
+    : id_expression
+    ;
+
+type_name
+    : id_expression ('.' id_expression)*
+    ;
+
+sequence_name
+    : id_expression ('.' id_expression)*
+    ;
+
+exception_name
+    : identifier ('.' id_expression)*
+    ;
+
+function_name
+    : identifier ('.' id_expression)?
+    ;
+
+procedure_name
+    : identifier ('.' id_expression)?
+    ;
+
+trigger_name
+    : identifier ('.' id_expression)?
+    ;
+
+variable_name
+    : (INTRODUCER char_set_name)? id_expression ('.' id_expression)?
+    | bind_variable
+    ;
+
+index_name
+    : identifier ('.' id_expression)?
+    ;
+
+cursor_name
+    : general_element
+    | bind_variable
+    ;
+
+record_name
+    : identifier
+    | bind_variable
+    ;
+
+collection_name
+    : identifier ('.' id_expression)?
+    ;
+
+link_name
+    : database ('.' domain)* (AT_SIGN connection_qualifier)?
+    ;
+
+local_link_name
+    : identifier
+    ;
+
+connection_qualifier
+    : identifier
+    ;
+
+column_name
+    : identifier ('.' id_expression)*
+    ;
+
+tableview_name
+    : identifier ('.' id_expression)? (
+        AT_SIGN link_name
+        | /*TODO{!(input.LA(2) == BY)}?*/ partition_extension_clause
+    )?
+    | xmltable outer_join_sign?
+    ;
+
+xmltable
+    : XMLTABLE '(' (xml_namespaces_clause ',')? concatenation xml_passing_clause? (
+        COLUMNS xml_table_column (',' xml_table_column)*
+    )? ')' ('.' general_element_part)?
+    ;
+
+char_set_name
+    : id_expression ('.' id_expression)*
+    ;
+
+synonym_name
+    : identifier
+    ;
+
+// Represents a valid DB object name in DDL commands which are valid for several DB (or schema) objects.
+// For instance, create synonym ... for <DB object name>, or rename <old DB object name> to <new DB object name>.
+// Both are valid for sequences, tables, views, etc.
+schema_object_name
+    : id_expression
+    ;
+
+dir_object_name
+    : id_expression
+    ;
+
+user_object_name
+    : id_expression
+    ;
+
+grant_object_name
+    : tableview_name
+    | USER user_object_name (',' user_object_name)*
+    | DIRECTORY dir_object_name
+    | EDITION schema_object_name
+    | MINING MODEL schema_object_name
+    | JAVA (SOURCE | RESOURCE) schema_object_name
+    | SQL TRANSLATION PROFILE schema_object_name
+    ;
+
+column_list
+    : column_name (',' column_name)*
+    ;
+
+paren_column_list
+    : LEFT_PAREN column_list RIGHT_PAREN
+    ;
+
+// PL/SQL Specs
+
+// NOTE: In reality this applies to aggregate functions only
+keep_clause
+    : KEEP '(' DENSE_RANK (FIRST | LAST) (query_partition_clause | order_by_clause) ')' over_clause?
+    ;
+
+function_argument
+    : '(' (argument (',' argument)*)? ')' keep_clause?
+    ;
+
+function_argument_analytic
+    : '(' (argument respect_or_ignore_nulls? (',' argument respect_or_ignore_nulls?)*)? ')' keep_clause?
+    ;
+
+function_argument_modeling
+    : '(' column_name (',' (numeric | NULL_) (',' (numeric | NULL_))?)? USING (
+        tableview_name '.' ASTERISK
+        | ASTERISK
+        | expression column_alias? (',' expression column_alias?)*
+    ) ')' keep_clause?
+    ;
+
+respect_or_ignore_nulls
+    : (RESPECT | IGNORE) NULLS
+    ;
+
+argument
+    : (identifier '=' '>')? expression
+    ;
+
+type_spec
+    : datatype
+    | REF? type_name (PERCENT_ROWTYPE | PERCENT_TYPE)?
+    ;
+
+datatype
+    : native_datatype_element precision_part? (WITH LOCAL? TIME ZONE | CHARACTER SET char_set_name)?
+    | INTERVAL (YEAR | DAY) ('(' expression ')')? TO (MONTH | SECOND) ('(' expression ')')?
+    ;
+
+precision_part
+    : '(' (numeric | ASTERISK) (',' (numeric | numeric_negative))? (CHAR | BYTE)? ')'
+    ;
+
+native_datatype_element
+    : BINARY_INTEGER
+    | PLS_INTEGER
+    | NATURAL
+    | BINARY_FLOAT
+    | BINARY_DOUBLE
+    | NATURALN
+    | POSITIVE
+    | POSITIVEN
+    | SIGNTYPE
+    | SIMPLE_INTEGER
+    | NVARCHAR2
+    | DEC
+    | INTEGER
+    | INT
+    | NUMERIC
+    | SMALLINT
+    | NUMBER
+    | DECIMAL
+    | DOUBLE PRECISION?
+    | FLOAT
+    | REAL
+    | NCHAR
+    | LONG RAW?
+    | CHAR
+    | CHARACTER
+    | VARCHAR2
+    | VARCHAR
+    | STRING
+    | RAW
+    | BOOLEAN
+    | DATE
+    | ROWID
+    | UROWID
+    | YEAR
+    | MONTH
+    | DAY
+    | HOUR
+    | MINUTE
+    | SECOND
+    | TIMEZONE_HOUR
+    | TIMEZONE_MINUTE
+    | TIMEZONE_REGION
+    | TIMEZONE_ABBR
+    | TIMESTAMP
+    | TIMESTAMP_UNCONSTRAINED
+    | TIMESTAMP_TZ_UNCONSTRAINED
+    | TIMESTAMP_LTZ_UNCONSTRAINED
+    | YMINTERVAL_UNCONSTRAINED
+    | DSINTERVAL_UNCONSTRAINED
+    | BFILE
+    | BLOB
+    | CLOB
+    | NCLOB
+    | MLSLABEL
+    | XMLTYPE
+    | SYSXMLTYPE
+    ;
+
+bind_variable
+    : (BINDVAR | ':' UNSIGNED_INTEGER)
+    // Pro*C/C++ indicator variables
+    (INDICATOR? (BINDVAR | ':' UNSIGNED_INTEGER))? ('.' general_element_part)*
+    ;
+
+general_element
+    : general_element_part
+    | general_element ('.' general_element_part)+
+    | '(' general_element ')'
+    ;
+
+general_element_part
+    : (INTRODUCER char_set_name)? id_expression ('@' link_name)? function_argument*
+    ;
+
+table_element
+    : (INTRODUCER char_set_name)? id_expression ('.' id_expression)*
+    ;
+
+object_privilege
+    : ALL PRIVILEGES?
+    | ALTER
+    | DEBUG
+    | DELETE
+    | EXECUTE
+    | FLASHBACK ARCHIVE
+    | INDEX
+    | INHERIT PRIVILEGES
+    | INSERT
+    | KEEP SEQUENCE
+    | MERGE VIEW
+    | ON COMMIT REFRESH
+    | QUERY REWRITE
+    | READ
+    | REFERENCES
+    | SELECT
+    | TRANSLATE SQL
+    | UNDER
+    | UPDATE
+    | USE
+    | WRITE
+    ;
+
+//Ordered by type rather than alphabetically
+system_privilege
+    : ALL PRIVILEGES
+    | ADVISOR
+    | ADMINISTER ANY? SQL TUNING SET
+    | (ALTER | CREATE | DROP) ANY SQL PROFILE
+    | ADMINISTER SQL MANAGEMENT OBJECT
+    | CREATE ANY? CLUSTER
+    | (ALTER | DROP) ANY CLUSTER
+    | (CREATE | DROP) ANY CONTEXT
+    | EXEMPT REDACTION POLICY
+    | ALTER DATABASE
+    | (ALTER | CREATE) PUBLIC? DATABASE LINK
+    | DROP PUBLIC DATABASE LINK
+    | DEBUG CONNECT SESSION
+    | DEBUG ANY PROCEDURE
+    | ANALYZE ANY DICTIONARY
+    | CREATE ANY? DIMENSION
+    | (ALTER | DROP) ANY DIMENSION
+    | (CREATE | DROP) ANY DIRECTORY
+    | (CREATE | DROP) ANY EDITION
+    | FLASHBACK (ARCHIVE ADMINISTER | ANY TABLE)
+    | (ALTER | CREATE | DROP) ANY INDEX
+    | CREATE ANY? INDEXTYPE
+    | (ALTER | DROP | EXECUTE) ANY INDEXTYPE
+    | CREATE (ANY | EXTERNAL)? JOB
+    | EXECUTE ANY (CLASS | PROGRAM)
+    | MANAGE SCHEDULER
+    | ADMINISTER KEY MANAGEMENT
+    | CREATE ANY? LIBRARY
+    | (ALTER | DROP | EXECUTE) ANY LIBRARY
+    | LOGMINING
+    | CREATE ANY? MATERIALIZED VIEW
+    | (ALTER | DROP) ANY MATERIALIZED VIEW
+    | GLOBAL? QUERY REWRITE
+    | ON COMMIT REFRESH
+    | CREATE ANY? MINING MODEL
+    | (ALTER | DROP | SELECT | COMMENT) ANY MINING MODEL
+    | CREATE ANY? CUBE
+    | (ALTER | DROP | SELECT | UPDATE) ANY CUBE
+    | CREATE ANY? MEASURE FOLDER
+    | (DELETE | DROP | INSERT) ANY MEASURE FOLDER
+    | CREATE ANY? CUBE DIMENSION
+    | (ALTER | DELETE | DROP | INSERT | SELECT | UPDATE) ANY CUBE DIMENSION
+    | CREATE ANY? CUBE BUILD PROCESS
+    | (DROP | UPDATE) ANY CUBE BUILD PROCESS
+    | CREATE ANY? OPERATOR
+    | (ALTER | DROP | EXECUTE) ANY OPERATOR
+    | (CREATE | ALTER | DROP) ANY OUTLINE
+    | CREATE PLUGGABLE DATABASE
+    | SET CONTAINER
+    | CREATE ANY? PROCEDURE
+    | (ALTER | DROP | EXECUTE) ANY PROCEDURE
+    | (CREATE | ALTER | DROP) PROFILE
+    | CREATE ROLE
+    | (ALTER | DROP | GRANT) ANY ROLE
+    | (CREATE | ALTER | DROP) ROLLBACK SEGMENT
+    | CREATE ANY? SEQUENCE
+    | (ALTER | DROP | SELECT) ANY SEQUENCE
+    | (ALTER | CREATE | RESTRICTED) SESSION
+    | ALTER RESOURCE COST
+    | CREATE ANY? SQL TRANSLATION PROFILE
+    | (ALTER | DROP | USE) ANY SQL TRANSLATION PROFILE
+    | TRANSLATE ANY SQL
+    | CREATE ANY? SYNONYM
+    | DROP ANY SYNONYM
+    | (CREATE | DROP) PUBLIC SYNONYM
+    | CREATE ANY? TABLE
+    | (ALTER | BACKUP | COMMENT | DELETE | DROP | INSERT | LOCK | READ | SELECT | UPDATE) ANY TABLE
+    | (CREATE | ALTER | DROP | MANAGE | UNLIMITED) TABLESPACE
+    | CREATE ANY? TRIGGER
+    | (ALTER | DROP) ANY TRIGGER
+    | ADMINISTER DATABASE TRIGGER
+    | CREATE ANY? TYPE
+    | (ALTER | DROP | EXECUTE | UNDER) ANY TYPE
+    | (CREATE | ALTER | DROP) USER
+    | CREATE ANY? VIEW
+    | (DROP | UNDER | MERGE) ANY VIEW
+    | (ANALYZE | AUDIT) ANY
+    | BECOME USER
+    | CHANGE NOTIFICATION
+    | EXEMPT ACCESS POLICY
+    | FORCE ANY? TRANSACTION
+    | GRANT ANY OBJECT? PRIVILEGE
+    | INHERIT ANY PRIVILEGES
+    | KEEP DATE TIME
+    | KEEP SYSGUID
+    | PURGE DBA_RECYCLEBIN
+    | RESUMABLE
+    | SELECT ANY (DICTIONARY | TRANSACTION)
+    | SYSBACKUP
+    | SYSDBA
+    | SYSDG
+    | SYSKM
+    | SYSOPER
+    ;
+
+// $>
+
+// $<Lexer Mappings
+
+constant
+    : TIMESTAMP (quoted_string | bind_variable) (AT TIME ZONE quoted_string)?
+    | INTERVAL (quoted_string | bind_variable | general_element_part) (
+        YEAR
+        | MONTH
+        | DAY
+        | HOUR
+        | MINUTE
+        | SECOND
+    ) ('(' (UNSIGNED_INTEGER | bind_variable) (',' (UNSIGNED_INTEGER | bind_variable))? ')')? (
+        TO (DAY | HOUR | MINUTE | SECOND ('(' (UNSIGNED_INTEGER | bind_variable) ')')?)
+    )?
+    | numeric
+    | DATE quoted_string
+    | quoted_string
+    | NULL_
+    | TRUE
+    | FALSE
+    | DBTIMEZONE
+    | SESSIONTIMEZONE
+    | MINVALUE
+    | MAXVALUE
+    | DEFAULT
+    ;
+
+numeric
+    : UNSIGNED_INTEGER '.'?
+    | APPROXIMATE_NUM_LIT
+    ;
+
+numeric_negative
+    : MINUS_SIGN numeric
+    ;
+
+quoted_string
+    : CHAR_STRING
+    //| CHAR_STRING_PERL
+    | NATIONAL_CHAR_STRING_LIT
+    ;
+
+identifier
+    : (INTRODUCER char_set_name)? id_expression
+    ;
+
+id_expression
+    : regular_id
+    | DELIMITED_ID
+    ;
+
+inquiry_directive
+    : INQUIRY_DIRECTIVE
+    ;
+
+outer_join_sign
+    : '(' '+' ')'
+    ;
+
+regular_id
+    : non_reserved_keywords_pre12c
+    | non_reserved_keywords_in_12c
+    | non_reserved_keywords_in_18c
+    | REGULAR_ID
+    | ABSENT
+    | A_LETTER
+    | AGENT
+    | AGGREGATE
+    | ANALYZE
+    | AUTONOMOUS_TRANSACTION
+    | BACKINGFILE
+    | BATCH
+    | BINARY_INTEGER
+    | BOOLEAN
+    | C_LETTER
+    | CHAR
+    | CHARSETID
+    | CHARSETFORM
+    | CLUSTER
+    | CONSTRUCTOR
+    | CUSTOMDATUM
+    | CASESENSITIVE
+    | DECIMAL
+    | DELETE
+    | DEPRECATE
+    | DETERMINISTIC
+    | DSINTERVAL_UNCONSTRAINED
+    | DURATION
+    | E_LETTER
+    | ERROR_INDEX
+    | ERROR_CODE
+    | E_LETTER
+    | ERR
+    | EXCEPTION
+    | EXCEPTION_INIT
+    | EXCEPTIONS
+    | EXISTS
+    | EXIT
+    | EXTEND
+    | FILESTORE
+    | FLOAT
+    | FORALL
+    | G_LETTER
+    | INDICES
+    | INOUT
+    | INTEGER
+    | JSON_TRANSFORM
+    | K_LETTER
+    | LANGUAGE
+    | LONG
+    | LOOP
+    | MAXLEN
+    | MOUNTPOINT
+    | M_LETTER
+    | MISSING
+    | MISMATCH
+    | NUMBER
+    | ORADATA
+    | OSERROR
+    | OUT
+    | OVERRIDING
+    | P_LETTER
+    | PARALLEL_ENABLE
+    | PIPELINED
+    | PLS_INTEGER
+    | PMEM
+    | POSITIVE
+    | POSITIVEN
+    | PRAGMA
+    | PUBLIC
+    | RAISE
+    | RAW
+    | RECORD
+    | REF
+    | RENAME
+    | RESTRICT_REFERENCES
+    | RESULT
+    | SDO_GEOMETRY
+    | SELF
+    | SERIALLY_REUSABLE
+    | SET
+    | SEQ
+    | SHARDSPACE
+    | SIGNTYPE
+    | SIMPLE_INTEGER
+    | SMALLINT
+    | STRUCT
+    | SQLDATA
+    | SQLERROR
+    | SUBTYPE
+    | T_LETTER
+    | TDO
+    | TIMESTAMP_LTZ_UNCONSTRAINED
+    | TIMESTAMP_TZ_UNCONSTRAINED
+    | TIMESTAMP_UNCONSTRAINED
+    | TIMEZONE
+    | TRIGGER
+    | VARCHAR
+    | VARCHAR2
+    | VARIABLE
+    | WARNING
+    | WHILE
+    | WM_CONCAT
+    | XMLAGG
+    | YMINTERVAL_UNCONSTRAINED
+    | REGR_
+    | VAR_
+    | VALUE
+    | COVAR_
+    | ERROR_INDEX
+    | ERROR_CODE
+    ;
+
+non_reserved_keywords_in_18c
+    : PERSISTABLE
+    | POLYMORPHIC
+    ;
+
+non_reserved_keywords_in_12c
+    : ACL
+    | ACCESSIBLE
+    | ACROSS
+    | ACTION
+    | ACTIONS
+    | ACTIVE
+    | ACTIVE_DATA
+    | ACTIVITY
+    | ADAPTIVE_PLAN
+    | ADVANCED
+    | AFD_DISKSTRING
+    | ALTERNATE
+    | ALGORITHM
+    | ANALYTIC
+    | ANCESTOR
+    | ANOMALY
+    | ANSI_REARCH
+    | APPLICATION
+    | APPROX_COUNT_DISTINCT
+    | ARCHIVAL
+    | ARCHIVED
+    | ASIS
+    | ASSIGN
+    | AUTO_LOGIN
+    | AUTO_REOPTIMIZE
+    | AVRO
+    | BACKGROUND
+    | BACKUPS
+    | BATCHSIZE
+    | BATCH_TABLE_ACCESS_BY_ROWID
+    | BEGINNING
+    | BEQUEATH
+    | BITMAP_AND
+    | BLOCKCHAIN
+    | BSON
+    | CACHING
+    | CALCULATED
+    | CALLBACK
+    | CAPACITY
+    | CAPTION
+    | CDBDEFAULT
+    | CLASSIFICATION
+    | CLASSIFIER
+    | CLAUSE
+    | CLEAN
+    | CLEANUP
+    | CLIENT
+    | CLUSTERING
+    | CLUSTER_DETAILS
+    | CLUSTER_DISTANCE
+    | COLLATE
+    | COLLATION
+    | COMMON
+    | COMMON_DATA
+    | COMPONENT
+    | COMPONENTS
+    | CONDITION
+    | CONDITIONAL
+    | CONTAINERS
+    | CONTAINERS_DEFAULT
+    | CONTAINER_DATA
+    | CONTAINER_MAP
+    | CONVERSION
+    | CON_DBID_TO_ID
+    | CON_GUID_TO_ID
+    | CON_ID
+    | CON_NAME_TO_ID
+    | CON_UID_TO_ID
+    | COOKIE
+    | COPY
+    | CREATE_FILE_DEST
+    | CREDENTIAL
+    | CRITICAL
+    | CUBE_AJ
+    | CUBE_SJ
+    | DATAMOVEMENT
+    | DATAOBJ_TO_MAT_PARTITION
+    | DATAPUMP
+    | DATA_SECURITY_REWRITE_LIMIT
+    | DAYS
+    | DB_UNIQUE_NAME
+    | DECORRELATE
+    | DEFAULT_CREDENTIAL
+    | DEFAULT_COLLATION
+    | DEFINE
+    | DEFINITION
+    | DELEGATE
+    | DELETE_ALL
+    | DESCRIPTION
+    | DESTROY
+    | DIMENSIONS
+    | DISABLE_ALL
+    | DISABLE_PARALLEL_DML
+    | DISCARD
+    | DISTRIBUTE
+    | DUPLICATE
+    | DUPLICATED
+    | DV
+    | EDITIONABLE
+    | ELIM_GROUPBY
+    | EM
+    | ENABLE_ALL
+    | ENABLE_PARALLEL_DML
+    | EQUIPART
+    | EVAL
+    | EVALUATE
+    | EXISTING
+    | EXPRESS
+    | EXTENDED
+    | EXTRACTCLOBXML
+    | FACTOR
+    | FAILOVER
+    | FAILURE
+    | FAMILY
+    | FAR
+    | FASTSTART
+    | FEATURE
+    | FEATURE_DETAILS
+    | FETCH
+    | FILE_NAME_CONVERT
+    | FILEGROUP
+    | FIXED_VIEW_DATA
+    | FLEX
+    | FORMAT
+    | FTP
+    | GATHER_OPTIMIZER_STATISTICS
+    | GET
+    | HALF_YEARS
+    | HASHING
+    | HIER_ORDER
+    | HIERARCHICAL
+    | HOURS
+    | HTTP
+    | H_LETTER
+    | IDLE
+    | ILM
+    | IMMUTABLE
+    | INACTIVE
+    | INACTIVE_ACCOUNT_TIME
+    | INDEXING
+    | INHERIT
+    | INMEMORY
+    | INMEMORY_PRUNING
+    | INPLACE
+    | INTERLEAVED
+    | INVALIDATION
+    | ISOLATE
+    | IS_LEAF
+    | JSON
+    | JSONGET
+    | JSONPARSE
+    | JSON_ARRAY
+    | JSON_ARRAYAGG
+    | JSON_EQUAL
+    | JSON_EXISTS
+    | JSON_EXISTS2
+    | JSON_OBJECT
+    | JSON_OBJECTAGG
+    | JSON_QUERY
+    | JSON_SERIALIZE
+    | JSON_TABLE
+    | JSON_TEXTCONTAINS
+    | JSON_TEXTCONTAINS2
+    | JSON_VALUE
+    | KEYSTORE
+    | LABEL
+    | LAX
+    | LEAD_CDB
+    | LEAD_CDB_URI
+    | LEVEL_NAME
+    | LIFECYCLE
+    | LINEAR
+    | LOCKDOWN
+    | LOCKING
+    | LOGMINING
+    | LOST
+    | MANDATORY
+    | MAP
+    | MATCH
+    | MATCHES
+    | MATCH_NUMBER
+    | MATCH_RECOGNIZE
+    | MAX_SHARED_TEMP_SIZE
+    | MEMCOMPRESS
+    | METADATA
+    | MEMBER_CAPTION
+    | MEMBER_DESCRIPTION
+    | MEMBER_NAME
+    | MEMBER_UNIQUE_NAME
+    | MEMOPTIMIZE
+    | MINUTES
+    | MODEL_NB
+    | MODEL_SV
+    | MODIFICATION
+    | MODULE
+    | MONTHS
+    | MULTIDIMENSIONAL
+    | NEG
+    | NOCOPY
+    | NOKEEP
+    | NONEDITIONABLE
+    | NOPARTITION
+    | NORELOCATE
+    | NOREPLAY
+    | NO_ADAPTIVE_PLAN
+    | NO_ANSI_REARCH
+    | NO_AUTO_REOPTIMIZE
+    | NO_BATCH_TABLE_ACCESS_BY_ROWID
+    | NO_CLUSTERING
+    | NO_COMMON_DATA
+    | NO_DATA_SECURITY_REWRITE
+    | NO_DECORRELATE
+    | NO_ELIM_GROUPBY
+    | NO_GATHER_OPTIMIZER_STATISTICS
+    | NO_INMEMORY
+    | NO_INMEMORY_PRUNING
+    | NO_OBJECT_LINK
+    | NO_PARTIAL_JOIN
+    | NO_PARTIAL_ROLLUP_PUSHDOWN
+    | NO_PQ_CONCURRENT_UNION
+    | NO_PQ_REPLICATE
+    | NO_PQ_SKEW
+    | NOPROMPT
+    | NO_PX_FAULT_TOLERANCE
+    | NO_ROOT_SW_FOR_LOCAL
+    | NO_SQL_TRANSLATION
+    | NO_USE_CUBE
+    | NO_USE_VECTOR_AGGREGATION
+    | NO_VECTOR_TRANSFORM
+    | NO_VECTOR_TRANSFORM_DIMS
+    | NO_VECTOR_TRANSFORM_FACT
+    | NO_ZONEMAP
+    | OBJ_ID
+    | OFFSET
+    | OLS
+    | OMIT
+    | ONE
+    | ORACLE_DATAPUMP
+    | ORACLE_HDFS
+    | ORACLE_HIVE
+    | ORACLE_LOADER
+    | ORA_CHECK_ACL
+    | ORA_CHECK_PRIVILEGE
+    | ORA_CLUSTERING
+    | ORA_INVOKING_USER
+    | ORA_INVOKING_USERID
+    | ORA_INVOKING_XS_USER
+    | ORA_INVOKING_XS_USER_GUID
+    | ORA_RAWCOMPARE
+    | ORA_RAWCONCAT
+    | ORA_WRITE_TIME
+    | PARENT_LEVEL_NAME
+    | PARENT_UNIQUE_NAME
+    | PASSWORD_ROLLOVER_TIME
+    | PARTIAL
+    | PARTIAL_JOIN
+    | PARTIAL_ROLLUP_PUSHDOWN
+    | PAST
+    | PATCH
+    | PATH_PREFIX
+    | PATTERN
+    | PER
+    | PERIOD
+    | PERIOD_KEYWORD
+    | PERMUTE
+    | PLUGGABLE
+    | POOL_16K
+    | POOL_2K
+    | POOL_32K
+    | POOL_4K
+    | POOL_8K
+    | PQ_CONCURRENT_UNION
+    | PQ_DISTRIBUTE_WINDOW
+    | PQ_FILTER
+    | PQ_REPLICATE
+    | PQ_SKEW
+    | PRELOAD
+    | PRETTY
+    | PREV
+    | PRINTBLOBTOCLOB
+    | PRIORITY
+    | PRIVILEGED
+    | PROPERTY
+    | PROTOCOL
+    | PROXY
+    | PRUNING
+    | PX_FAULT_TOLERANCE
+    | QUARTERS
+    | QUOTAGROUP
+    | REALM
+    | REDEFINE
+    | RELOCATE
+    | REMOTE
+    | RESTART
+    | ROLESET
+    | ROWID_MAPPING_TABLE
+    | RUNNING
+    | SAVE
+    | SCRUB
+    | SDO_GEOM_MBR
+    | SECONDS
+    | SECRET
+    | SERIAL
+    | SERVICES
+    | SERVICE_NAME_CONVERT
+    | SHARDED
+    | SHARING
+    | SHELFLIFE
+    | SITE
+    | SOURCE_FILE_DIRECTORY
+    | SOURCE_FILE_NAME_CONVERT
+    | SQL_TRANSLATION_PROFILE
+    | STANDARD
+    | STANDARD_HASH
+    | STANDBYS
+    | STATE
+    | STATEMENT
+    | STREAM
+    | SUBSCRIBE
+    | SUBSET
+    | SUCCESS
+    | SYS
+    | SYSBACKUP
+    | SYSDG
+    | SYSGUID
+    | SYSKM
+    | SYSOBJ
+    | SYS_CHECK_PRIVILEGE
+    | SYS_GET_COL_ACLIDS
+    | SYS_MKXTI
+    | SYS_OP_CYCLED_SEQ
+    | SYS_OP_HASH
+    | SYS_OP_KEY_VECTOR_CREATE
+    | SYS_OP_KEY_VECTOR_FILTER
+    | SYS_OP_KEY_VECTOR_FILTER_LIST
+    | SYS_OP_KEY_VECTOR_SUCCEEDED
+    | SYS_OP_KEY_VECTOR_USE
+    | SYS_OP_PART_ID
+    | SYS_OP_ZONE_ID
+    | SYS_RAW_TO_XSID
+    | SYS_XSID_TO_RAW
+    | SYS_ZMAP_FILTER
+    | SYS_ZMAP_REFRESH
+    | TAG
+    | TEXT
+    | TIER
+    | TIES
+    | TO_ACLID
+    | TRANSFORM
+    | TRANSLATION
+    | TRUST
+    | UCS2
+    | UNCONDITIONAL
+    | UNITE
+    | UNMATCHED
+    | UNPLUG
+    | UNSUBSCRIBE
+    | USABLE
+    | USER_DATA
+    | USER_TABLESPACES
+    | USE_CUBE
+    | USE_HIDDEN_PARTITIONS
+    | USE_VECTOR_AGGREGATION
+    | USING_NO_EXPAND
+    | USING_NLS_COMP
+    | UTF16BE
+    | UTF16LE
+    | UTF32
+    | UTF8
+    | V1
+    | V2
+    | VALIDATE_CONVERSION
+    | VALID_TIME_END
+    | VECTOR_TRANSFORM
+    | VECTOR_TRANSFORM_DIMS
+    | VECTOR_TRANSFORM_FACT
+    | VERIFIER
+    | VIOLATION
+    | VISIBILITY
+    | WEEK
+    | WEEKS
+    | WITH_PLSQL
+    | WRAPPER
+    | XS
+    | YEARS
+    | ZONEMAP
+    ;
+
+non_reserved_keywords_pre12c
+    : ABORT
+    | ABS
+    | ACCESSED
+    | ACCESS
+    | ACCOUNT
+    | ACOS
+    | ACTIVATE
+    | ACTIVE_COMPONENT
+    | ACTIVE_FUNCTION
+    | ACTIVE_TAG
+    | ADD_COLUMN
+    | ADD_GROUP
+    | ADD_MONTHS
+    | ADD
+    | ADJ_DATE
+    | ADMINISTER
+    | ADMINISTRATOR
+    | ADMIN
+    | ADVISE
+    | ADVISOR
+    | AFTER
+    | ALIAS
+    | ALLOCATE
+    | ALLOW
+    | ALL_ROWS
+    | ALWAYS
+    | ANALYZE
+    | ANCILLARY
+    | AND_EQUAL
+    | ANTIJOIN
+    | ANYSCHEMA
+    | APPENDCHILDXML
+    | APPEND
+    | APPEND_VALUES
+    | APPLY
+    | ARCHIVELOG
+    | ARCHIVE
+    | ARRAY
+    | ASCII
+    | ASCIISTR
+    | ASIN
+    | ASSEMBLY
+    | ASSOCIATE
+    | ASYNCHRONOUS
+    | ASYNC
+    | ATAN2
+    | ATAN
+    | AT
+    | ATTRIBUTE
+    | ATTRIBUTES
+    | AUTHENTICATED
+    | AUTHENTICATION
+    | AUTHID
+    | AUTHORIZATION
+    | AUTOALLOCATE
+    | AUTOEXTEND
+    | AUTOMATIC
+    | AUTO
+    | AVAILABILITY
+    | AVG
+    | BACKUP
+    | BASICFILE
+    | BASIC
+    | BATCH
+    | BECOME
+    | BEFORE
+    | BEGIN
+    | BEGIN_OUTLINE_DATA
+    | BEHALF
+    | BFILE
+    | BFILENAME
+    | BIGFILE
+    | BINARY_DOUBLE_INFINITY
+    | BINARY_DOUBLE
+    | BINARY_DOUBLE_NAN
+    | BINARY_FLOAT_INFINITY
+    | BINARY_FLOAT
+    | BINARY_FLOAT_NAN
+    | BINARY
+    | BIND_AWARE
+    | BINDING
+    | BIN_TO_NUM
+    | BITAND
+    | BITMAP
+    | BITMAPS
+    | BITMAP_TREE
+    | BITS
+    | BLOB
+    | BLOCK
+    | BLOCK_RANGE
+    | BLOCKSIZE
+    | BLOCKS
+    | BODY
+    | BOTH
+    | BOUND
+    | BRANCH
+    | BREADTH
+    | BROADCAST
+    | BUFFER_CACHE
+    | BUFFER
+    | BUFFER_POOL
+    | BUILD
+    | BULK
+    | BYPASS_RECURSIVE_CHECK
+    | BYPASS_UJVC
+    | BYTE
+    | CACHE_CB
+    | CACHE_INSTANCES
+    | CACHE
+    | CACHE_TEMP_TABLE
+    | CALL
+    | CANCEL
+    | CARDINALITY
+    | CASCADE
+    | CASE
+    | CAST
+    | CATEGORY
+    | CEIL
+    | CELL_FLASH_CACHE
+    | CERTIFICATE
+    | CFILE
+    | CHAINED
+    | CHANGE_DUPKEY_ERROR_INDEX
+    | CHANGE
+    | CHARACTER
+    | CHAR_CS
+    | CHARTOROWID
+    | CHECK_ACL_REWRITE
+    | CHECKPOINT
+    | CHILD
+    | CHOOSE
+    | CHR
+    | CHUNK
+    | CLASS
+    | CLEAR
+    | CLOB
+    | CLONE
+    | CLOSE_CACHED_OPEN_CURSORS
+    | CLOSE
+    | CLUSTER_BY_ROWID
+    | CLUSTER_ID
+    | CLUSTERING_FACTOR
+    | CLUSTER_PROBABILITY
+    | CLUSTER_SET
+    | COALESCE
+    | COALESCE_SQ
+    | COARSE
+    | CO_AUTH_IND
+    | COLD
+    | COLLECT
+    | COLUMNAR
+    | COLUMN_AUTH_INDICATOR
+    | COLUMN
+    | COLUMNS
+    | COLUMN_STATS
+    | COLUMN_VALUE
+    | COMMENT
+    | COMMIT
+    | COMMITTED
+    | COMPACT
+    | COMPATIBILITY
+    | COMPILE
+    | COMPLETE
+    | COMPLIANCE
+    | COMPOSE
+    | COMPOSITE_LIMIT
+    | COMPOSITE
+    | COMPOUND
+    | COMPUTE
+    | CONCAT
+    | CONFIRM
+    | CONFORMING
+    | CONNECT_BY_CB_WHR_ONLY
+    | CONNECT_BY_COMBINE_SW
+    | CONNECT_BY_COST_BASED
+    | CONNECT_BY_ELIM_DUPS
+    | CONNECT_BY_FILTERING
+    | CONNECT_BY_ISCYCLE
+    | CONNECT_BY_ISLEAF
+    | CONNECT_BY_ROOT
+    | CONNECT_TIME
+    | CONSIDER
+    | CONSISTENT
+    | CONSTANT
+    | CONST
+    | CONSTRAINT
+    | CONSTRAINTS
+    | CONTAINER
+    | CONTENT
+    | CONTENTS
+    | CONTEXT
+    | CONTINUE
+    | CONTROLFILE
+    | CONVERT
+    | CORR_K
+    | CORR
+    | CORR_S
+    | CORRUPTION
+    | CORRUPT_XID_ALL
+    | CORRUPT_XID
+    | COSH
+    | COS
+    | COST
+    | COST_XML_QUERY_REWRITE
+    | COUNT
+    | COVAR_POP
+    | COVAR_SAMP
+    | CPU_COSTING
+    | CPU_PER_CALL
+    | CPU_PER_SESSION
+    | CRASH
+    | CREATE_STORED_OUTLINES
+    | CREATION
+    | CROSSEDITION
+    | CROSS
+    | CSCONVERT
+    | CUBE_GB
+    | CUBE
+    | CUME_DISTM
+    | CUME_DIST
+    | CURRENT_DATE
+    | CURRENT
+    | CURRENT_SCHEMA
+    | CURRENT_TIME
+    | CURRENT_TIMESTAMP
+    | CURRENT_USER
+    | CURRENTV
+    | CURSOR
+    | CURSOR_SHARING_EXACT
+    | CURSOR_SPECIFIC_SEGMENT
+    | CV
+    | CYCLE
+    | DANGLING
+    | DATABASE
+    | DATAFILE
+    | DATAFILES
+    | DATA
+    | DATAOBJNO
+    | DATAOBJ_TO_PARTITION
+    | DATE_MODE
+    | DAY
+    | DBA
+    | DBA_RECYCLEBIN
+    | DBMS_STATS
+    | DB_ROLE_CHANGE
+    | DBTIMEZONE
+    | DB_VERSION
+    | DDL
+    | DEALLOCATE
+    | DEBUGGER
+    | DEBUG
+    | DECLARE
+    | DEC
+    | DECOMPOSE
+    | DECREMENT
+    | DECR
+    | DECRYPT
+    | DEDUPLICATE
+    | DEFAULTS
+    | DEFERRABLE
+    | DEFERRED
+    | DEFINED
+    | DEFINER
+    | DEGREE
+    | DELAY
+    | DELETEXML
+    | DEMAND
+    | DENSE_RANKM
+    | DENSE_RANK
+    | DEPENDENT
+    | DEPTH
+    | DEQUEUE
+    | DEREF
+    | DEREF_NO_REWRITE
+    | DETACHED
+    | DETERMINES
+    | DICTIONARY
+    | DIMENSION
+    | DIRECT_LOAD
+    | DIRECTORY
+    | DIRECT_PATH
+    | DISABLE
+    | DISABLE_PRESET
+    | DISABLE_RPKE
+    | DISALLOW
+    | DISASSOCIATE
+    | DISCONNECT
+    | DISKGROUP
+    | DISK
+    | DISKS
+    | DISMOUNT
+    | DISTINGUISHED
+    | DISTRIBUTED
+    | DML
+    | DML_UPDATE
+    | DOCFIDELITY
+    | DOCUMENT
+    | DOMAIN_INDEX_FILTER
+    | DOMAIN_INDEX_NO_SORT
+    | DOMAIN_INDEX_SORT
+    | DOUBLE
+    | DOWNGRADE
+    | DRIVING_SITE
+    | DROP_COLUMN
+    | DROP_GROUP
+    | DST_UPGRADE_INSERT_CONV
+    | DUMP
+    | DYNAMIC
+    | DYNAMIC_SAMPLING_EST_CDN
+    | DYNAMIC_SAMPLING
+    | EACH
+    | EDITIONING
+    | EDITION
+    | EDITIONS
+    | ELEMENT
+    | ELIMINATE_JOIN
+    | ELIMINATE_OBY
+    | ELIMINATE_OUTER_JOIN
+    | EMPTY_BLOB
+    | EMPTY_CLOB
+    | EMPTY_
+    | ENABLE
+    | ENABLE_PRESET
+    | ENCODING
+    | ENCRYPTION
+    | ENCRYPT
+    | END_OUTLINE_DATA
+    | ENFORCED
+    | ENFORCE
+    | ENQUEUE
+    | ENTERPRISE
+    | ENTITYESCAPING
+    | ENTRY
+    | ERROR_ARGUMENT
+    | ERROR
+    | ERROR_ON_OVERLAP_TIME
+    | ERRORS
+    | ESCAPE
+    | ESTIMATE
+    | EVALNAME
+    | EVALUATION
+    | EVENTS
+    | EVERY
+    | EXCEPTIONS
+    | EXCEPT
+    | EXCHANGE
+    | EXCLUDE
+    | EXCLUDING
+    | EXECUTE
+    | EXEMPT
+    | EXISTSNODE
+    | EXPAND_GSET_TO_UNION
+    | EXPAND_TABLE
+    | EXPIRE
+    | EXPLAIN
+    | EXPLOSION
+    | EXP
+    | EXPORT
+    | EXPR_CORR_CHECK
+    | EXTENDS
+    | EXTENT
+    | EXTENTS
+    | EXTERNALLY
+    | EXTERNAL
+    | EXTRACT
+    | EXTRACTVALUE
+    | EXTRA
+    | FACILITY
+    | FACT
+    | FACTORIZE_JOIN
+    | FAILED_LOGIN_ATTEMPTS
+    | FAILED
+    | FAILGROUP
+    | FALSE
+    | FAST
+    | FBTSCAN
+    | FEATURE_ID
+    | FEATURE_SET
+    | FEATURE_VALUE
+    | FILE
+    | FILESYSTEM_LIKE_LOGGING
+    | FILTER
+    | FINAL
+    | FINE
+    | FINISH
+    | FIRSTM
+    | FIRST
+    | FIRST_ROWS
+    | FIRST_VALUE
+    | FLAGGER
+    | FLASHBACK
+    | FLASH_CACHE
+    | FLOB
+    | FLOOR
+    | FLUSH
+    | FOLDER
+    | FOLLOWING
+    | FOLLOWS
+    | FORCE
+    | FORCE_XML_QUERY_REWRITE
+    | FOREIGN
+    | FOREVER
+    | FORWARD
+    | FRAGMENT_NUMBER
+    | FREELIST
+    | FREELISTS
+    | FREEPOOLS
+    | FRESH
+    | FROM_TZ
+    | FULL
+    | FULL_OUTER_JOIN_TO_OUTER
+    | FUNCTION
+    | FUNCTIONS
+    | GATHER_PLAN_STATISTICS
+    | GBY_CONC_ROLLUP
+    | GBY_PUSHDOWN
+    | GENERATED
+    | GLOBALLY
+    | GLOBAL
+    | GLOBAL_NAME
+    | GLOBAL_TOPIC_ENABLED
+    | GREATEST
+    | GROUP_BY
+    | GROUP_ID
+    | GROUPING_ID
+    | GROUPING
+    | GROUPS
+    | GUARANTEED
+    | GUARANTEE
+    | GUARD
+    | HASH_AJ
+    | HASHKEYS
+    | HASH
+    | HASH_SJ
+    | HEADER
+    | HEAP
+    | HELP
+    | HEXTORAW
+    | HEXTOREF
+    | HIDDEN_KEYWORD
+    | HIDE
+    | HIERARCHY
+    | HIGH
+    | HINTSET_BEGIN
+    | HINTSET_END
+    | HOT
+    | HOUR
+    | HWM_BROKERED
+    | HYBRID
+    | IDENTIFIER
+    | IDENTITY
+    | IDGENERATORS
+    | IDLE_TIME
+    | ID
+    | IF
+    | IGNORE
+    | IGNORE_OPTIM_EMBEDDED_HINTS
+    | IGNORE_ROW_ON_DUPKEY_INDEX
+    | IGNORE_WHERE_CLAUSE
+    | IMMEDIATE
+    | IMPACT
+    | IMPORT
+    | INCLUDE
+    | INCLUDE_VERSION
+    | INCLUDING
+    | INCREMENTAL
+    | INCREMENT
+    | INCR
+    | INDENT
+    | INDEX_ASC
+    | INDEX_COMBINE
+    | INDEX_DESC
+    | INDEXED
+    | INDEXES
+    | INDEX_FFS
+    | INDEX_FILTER
+    | INDEX_JOIN
+    | INDEX_ROWS
+    | INDEX_RRS
+    | INDEX_RS_ASC
+    | INDEX_RS_DESC
+    | INDEX_RS
+    | INDEX_SCAN
+    | INDEX_SKIP_SCAN
+    | INDEX_SS_ASC
+    | INDEX_SS_DESC
+    | INDEX_SS
+    | INDEX_STATS
+    | INDEXTYPE
+    | INDEXTYPES
+    | INDICATOR
+    | INFINITE
+    | INFORMATIONAL
+    | INITCAP
+    | INITIALIZED
+    | INITIALLY
+    | INITIAL
+    | INITRANS
+    | INLINE
+    | INLINE_XMLTYPE_NT
+    | IN_MEMORY_METADATA
+    | INNER
+    | INSERTCHILDXMLAFTER
+    | INSERTCHILDXMLBEFORE
+    | INSERTCHILDXML
+    | INSERTXMLAFTER
+    | INSERTXMLBEFORE
+    | INSTANCE
+    | INSTANCES
+    | INSTANTIABLE
+    | INSTANTLY
+    | INSTEAD
+    | INSTR2
+    | INSTR4
+    | INSTRB
+    | INSTRC
+    | INSTR
+    | INTERMEDIATE
+    | INTERNAL_CONVERT
+    | INTERNAL_USE
+    | INTERPRETED
+    | INTERVAL
+    | INT
+    | INVALIDATE
+    | INVISIBLE
+    | IN_XQUERY
+    | ISOLATION_LEVEL
+    | ISOLATION
+    | ITERATE
+    | ITERATION_NUMBER
+    | JAVA
+    | JOB
+    | JOIN
+    | KEEP_DUPLICATES
+    | KEEP
+    | KERBEROS
+    | KEY_LENGTH
+    | KEY
+    | KEYSIZE
+    | KEYS
+    | KILL
+    | LAG
+    | LAST_DAY
+    | LAST
+    | LAST_VALUE
+    | LATERAL
+    | LAYER
+    | LDAP_REGISTRATION_ENABLED
+    | LDAP_REGISTRATION
+    | LDAP_REG_SYNC_INTERVAL
+    | LEADING
+    | LEAD
+    | LEAF
+    | LEAST
+    | LEFT
+    | LENGTH2
+    | LENGTH4
+    | LENGTHB
+    | LENGTHC
+    | LENGTH
+    | LESS
+    | LEVEL
+    | LEVELS
+    | LIBRARY
+    | LIFE
+    | LIFETIME
+    | LIKE2
+    | LIKE4
+    | LIKEC
+    | LIKE_EXPAND
+    | LIMIT
+    | LINK
+    | LISTAGG
+    | LIST
+    | LN
+    | LNNVL
+    | LOAD
+    | LOB
+    | LOBNVL
+    | LOBS
+    | LOCAL_INDEXES
+    | LOCAL
+    | LOCALTIME
+    | LOCALTIMESTAMP
+    | LOCATION
+    | LOCATOR
+    | LOCKED
+    | LOGFILE
+    | LOGFILES
+    | LOGGING
+    | LOGICAL
+    | LOGICAL_READS_PER_CALL
+    | LOGICAL_READS_PER_SESSION
+    | LOG
+    | LOGOFF
+    | LOGON
+    | LOG_READ_ONLY_VIOLATIONS
+    | LOWER
+    | LOW
+    | LPAD
+    | LTRIM
+    | MAIN
+    | MAKE_REF
+    | MANAGED
+    | MANAGEMENT
+    | MANAGE
+    | MANAGER
+    | MANUAL
+    | MAPPING
+    | MASTER
+    | MATCHED
+    | MATERIALIZED
+    | MATERIALIZE
+    | MAXARCHLOGS
+    | MAXDATAFILES
+    | MAXEXTENTS
+    | MAXIMIZE
+    | MAXINSTANCES
+    | MAXLOGFILES
+    | MAXLOGHISTORY
+    | MAXLOGMEMBERS
+    | MAX
+    | MAXSIZE
+    | MAXTRANS
+    | MAXVALUE
+    | MEASURE
+    | MEASURES
+    | MEDIAN
+    | MEDIUM
+    | MEMBER
+    | MEMOPTIMIZE
+    | MEMORY
+    | MERGEACTIONS
+    | MERGE_AJ
+    | MERGE_CONST_ON
+    | MERGE
+    | MERGE_SJ
+    | METHOD
+    | MIGRATE
+    | MIGRATION
+    | MINEXTENTS
+    | MINIMIZE
+    | MINIMUM
+    | MINING
+    | MIN
+    | MINUS_NULL
+    | MINUTE
+    | MINVALUE
+    | MIRRORCOLD
+    | MIRRORHOT
+    | MIRROR
+    | MLSLABEL
+    | MODEL_COMPILE_SUBQUERY
+    | MODEL_DONTVERIFY_UNIQUENESS
+    | MODEL_DYNAMIC_SUBQUERY
+    | MODEL_MIN_ANALYSIS
+    | MODEL
+    | MODEL_NO_ANALYSIS
+    | MODEL_PBY
+    | MODEL_PUSH_REF
+    | MODIFY_COLUMN_TYPE
+    | MODIFY
+    | MOD
+    | MONITORING
+    | MONITOR
+    | MONTH
+    | MONTHS_BETWEEN
+    | MOUNT
+    | MOUNTPATH
+    | MOVEMENT
+    | MOVE
+    | MULTISET
+    | MV_MERGE
+    | NAMED
+    | NAME
+    | NAMESPACE
+    | NAN
+    | NANVL
+    | NATIONAL
+    | NATIVE_FULL_OUTER_JOIN
+    | NATIVE
+    | NATURAL
+    | NAV
+    | NCHAR_CS
+    | NCHAR
+    | NCHR
+    | NCLOB
+    | NEEDED
+    | NESTED
+    | NESTED_TABLE_FAST_INSERT
+    | NESTED_TABLE_GET_REFS
+    | NESTED_TABLE_ID
+    | NESTED_TABLE_SET_REFS
+    | NESTED_TABLE_SET_SETID
+    | NETWORK
+    | NEVER
+    | NEW
+    | NEW_TIME
+    | NEXT_DAY
+    | NEXT
+    | NL_AJ
+    | NLJ_BATCHING
+    | NLJ_INDEX_FILTER
+    | NLJ_INDEX_SCAN
+    | NLJ_PREFETCH
+    | NLS_CALENDAR
+    | NLS_CHARACTERSET
+    | NLS_CHARSET_DECL_LEN
+    | NLS_CHARSET_ID
+    | NLS_CHARSET_NAME
+    | NLS_COMP
+    | NLS_CURRENCY
+    | NLS_DATE_FORMAT
+    | NLS_DATE_LANGUAGE
+    | NLS_INITCAP
+    | NLS_ISO_CURRENCY
+    | NL_SJ
+    | NLS_LANG
+    | NLS_LANGUAGE
+    | NLS_LENGTH_SEMANTICS
+    | NLS_LOWER
+    | NLS_NCHAR_CONV_EXCP
+    | NLS_NUMERIC_CHARACTERS
+    | NLS_SORT
+    | NLSSORT
+    | NLS_SPECIAL_CHARS
+    | NLS_TERRITORY
+    | NLS_UPPER
+    | NO_ACCESS
+    | NOAPPEND
+    | NOARCHIVELOG
+    | NOAUDIT
+    | NO_BASETABLE_MULTIMV_REWRITE
+    | NO_BIND_AWARE
+    | NO_BUFFER
+    | NOCACHE
+    | NO_CARTESIAN
+    | NO_CHECK_ACL_REWRITE
+    | NO_CLUSTER_BY_ROWID
+    | NO_COALESCE_SQ
+    | NO_CONNECT_BY_CB_WHR_ONLY
+    | NO_CONNECT_BY_COMBINE_SW
+    | NO_CONNECT_BY_COST_BASED
+    | NO_CONNECT_BY_ELIM_DUPS
+    | NO_CONNECT_BY_FILTERING
+    | NO_COST_XML_QUERY_REWRITE
+    | NO_CPU_COSTING
+    | NOCPU_COSTING
+    | NOCYCLE
+    | NODELAY
+    | NO_DOMAIN_INDEX_FILTER
+    | NO_DST_UPGRADE_INSERT_CONV
+    | NO_ELIMINATE_JOIN
+    | NO_ELIMINATE_OBY
+    | NO_ELIMINATE_OUTER_JOIN
+    | NOENTITYESCAPING
+    | NO_EXPAND_GSET_TO_UNION
+    | NO_EXPAND
+    | NO_EXPAND_TABLE
+    | NO_FACT
+    | NO_FACTORIZE_JOIN
+    | NO_FILTERING
+    | NOFORCE
+    | NO_FULL_OUTER_JOIN_TO_OUTER
+    | NO_GBY_PUSHDOWN
+    | NOGUARANTEE
+    | NO_INDEX_FFS
+    | NO_INDEX
+    | NO_INDEX_SS
+    | NO_LOAD
+    | NOLOCAL
+    | NOLOGGING
+    | NOMAPPING
+    | NOMAXVALUE
+    | NO_MERGE
+    | NOMINIMIZE
+    | NOMINVALUE
+    | NO_MODEL_PUSH_REF
+    | NO_MONITORING
+    | NOMONITORING
+    | NO_MONITOR
+    | NO_MULTIMV_REWRITE
+    | NO
+    | NO_NATIVE_FULL_OUTER_JOIN
+    | NONBLOCKING
+    | NONE
+    | NO_NLJ_BATCHING
+    | NO_NLJ_PREFETCH
+    | NONSCHEMA
+    | NOORDER
+    | NO_ORDER_ROLLUPS
+    | NO_OUTER_JOIN_TO_ANTI
+    | NO_OUTER_JOIN_TO_INNER
+    | NOOVERRIDE
+    | NO_PARALLEL_INDEX
+    | NOPARALLEL_INDEX
+    | NO_PARALLEL
+    | NOPARALLEL
+    | NO_PARTIAL_COMMIT
+    | NO_PLACE_DISTINCT
+    | NO_PLACE_GROUP_BY
+    | NO_PQ_MAP
+    | NO_PRUNE_GSETS
+    | NO_PULL_PRED
+    | NO_PUSH_PRED
+    | NO_PUSH_SUBQ
+    | NO_PX_JOIN_FILTER
+    | NO_QKN_BUFF
+    | NO_QUERY_TRANSFORMATION
+    | NO_REF_CASCADE
+    | NORELY
+    | NOREPAIR
+    | NORESETLOGS
+    | NO_RESULT_CACHE
+    | NOREVERSE
+    | NO_REWRITE
+    | NOREWRITE
+    | NORMAL
+    | NOROWDEPENDENCIES
+    | NOSCHEMACHECK
+    | NOSEGMENT
+    | NO_SEMIJOIN
+    | NO_SEMI_TO_INNER
+    | NO_SET_TO_JOIN
+    | NOSORT
+    | NO_SQL_TUNE
+    | NO_STAR_TRANSFORMATION
+    | NO_STATEMENT_QUEUING
+    | NO_STATS_GSETS
+    | NOSTRICT
+    | NO_SUBQUERY_PRUNING
+    | NO_SUBSTRB_PAD
+    | NO_SWAP_JOIN_INPUTS
+    | NOSWITCH
+    | NO_TABLE_LOOKUP_BY_NL
+    | NO_TEMP_TABLE
+    | NOTHING
+    | NOTIFICATION
+    | NO_TRANSFORM_DISTINCT_AGG
+    | NO_UNNEST
+    | NO_USE_HASH_AGGREGATION
+    | NO_USE_HASH_GBY_FOR_PUSHDOWN
+    | NO_USE_HASH
+    | NO_USE_INVISIBLE_INDEXES
+    | NO_USE_MERGE
+    | NO_USE_NL
+    | NOVALIDATE
+    | NO_XDB_FASTPATH_INSERT
+    | NO_XML_DML_REWRITE
+    | NO_XMLINDEX_REWRITE_IN_SELECT
+    | NO_XMLINDEX_REWRITE
+    | NO_XML_QUERY_REWRITE
+    | NTH_VALUE
+    | NTILE
+    | NULLIF
+    | NULLS
+    | NUMERIC
+    | NUM_INDEX_KEYS
+    | NUMTODSINTERVAL
+    | NUMTOYMINTERVAL
+    | NVARCHAR2
+    | NVL2
+    | NVL
+    | OBJECT2XML
+    | OBJECT
+    | OBJNO
+    | OBJNO_REUSE
+    | OCCURENCES
+    | OFFLINE
+    | OFF
+    | OIDINDEX
+    | OID
+    | OLAP
+    | OLD
+    | OLD_PUSH_PRED
+    | OLTP
+    | ONLINE
+    | ONLY
+    | OPAQUE
+    | OPAQUE_TRANSFORM
+    | OPAQUE_XCANONICAL
+    | OPCODE
+    | OPEN
+    | OPERATIONS
+    | OPERATOR
+    | OPT_ESTIMATE
+    | OPTIMAL
+    | OPTIMIZE
+    | OPTIMIZER_FEATURES_ENABLE
+    | OPTIMIZER_GOAL
+    | OPT_PARAM
+    | ORA_BRANCH
+    | ORADEBUG
+    | ORA_DST_AFFECTED
+    | ORA_DST_CONVERT
+    | ORA_DST_ERROR
+    | ORA_GET_ACLIDS
+    | ORA_GET_PRIVILEGES
+    | ORA_HASH
+    | ORA_ROWSCN
+    | ORA_ROWSCN_RAW
+    | ORA_ROWVERSION
+    | ORA_TABVERSION
+    | ORDERED
+    | ORDERED_PREDICATES
+    | ORDINALITY
+    | OR_EXPAND
+    | ORGANIZATION
+    | OR_PREDICATES
+    | OTHER
+    | OUTER_JOIN_TO_ANTI
+    | OUTER_JOIN_TO_INNER
+    | OUTER
+    | OUTLINE_LEAF
+    | OUTLINE
+    | OUT_OF_LINE
+    | OVERFLOW
+    | OVERFLOW_NOMOVE
+    | OVERLAPS
+    | OVER
+    | OWNER
+    | OWNERSHIP
+    | OWN
+    | PACKAGE
+    | PACKAGES
+    | PARALLEL_INDEX
+    | PARALLEL
+    | PARAMETERS
+    | PARAM
+    | PARENT
+    | PARITY
+    | PARTIALLY
+    | PARTITION_HASH
+    | PARTITION_LIST
+    | PARTITION
+    | PARTITION_RANGE
+    | PARTITIONS
+    | PARTNUMINST
+    | PASSING
+    | PASSWORD_GRACE_TIME
+    | PASSWORD_LIFE_TIME
+    | PASSWORD_LOCK_TIME
+    | PASSWORD
+    | PASSWORD_REUSE_MAX
+    | PASSWORD_REUSE_TIME
+    | PASSWORD_VERIFY_FUNCTION
+    | PATH
+    | PATHS
+    | PBL_HS_BEGIN
+    | PBL_HS_END
+    | PCTINCREASE
+    | PCTTHRESHOLD
+    | PCTUSED
+    | PCTVERSION
+    | PENDING
+    | PERCENTILE_CONT
+    | PERCENTILE_DISC
+    | PERCENT_KEYWORD
+    | PERCENT_RANKM
+    | PERCENT_RANK
+    | PERFORMANCE
+    | PERMANENT
+    | PERMISSION
+    | PFILE
+    | PHYSICAL
+    | PIKEY
+    | PIV_GB
+    | PIVOT
+    | PIV_SSF
+    | PLACE_DISTINCT
+    | PLACE_GROUP_BY
+    | PLAN
+    | PLSCOPE_SETTINGS
+    | PLSQL_CCFLAGS
+    | PLSQL_CODE_TYPE
+    | PLSQL_DEBUG
+    | PLSQL_OPTIMIZE_LEVEL
+    | PLSQL_WARNINGS
+    | POINT
+    | POLICY
+    | POST_TRANSACTION
+    | POWERMULTISET_BY_CARDINALITY
+    | POWERMULTISET
+    | POWER
+    | PQ_DISTRIBUTE
+    | PQ_MAP
+    | PQ_NOMAP
+    | PREBUILT
+    | PRECEDES
+    | PRECEDING
+    | PRECISION
+    | PRECOMPUTE_SUBQUERY
+    | PREDICATE_REORDERS
+    | PREDICTION_BOUNDS
+    | PREDICTION_COST
+    | PREDICTION_DETAILS
+    | PREDICTION
+    | PREDICTION_PROBABILITY
+    | PREDICTION_SET
+    | PREPARE
+    | PRESENT
+    | PRESENTNNV
+    | PRESENTV
+    | PRESERVE
+    | PRESERVE_OID
+    | PREVIOUS
+    | PRIMARY
+    | PRIVATE
+    | PRIVATE_SGA
+    | PRIVILEGE
+    | PRIVILEGES
+    | PROCEDURAL
+    | PROCEDURE
+    | PROCESS
+    | PROFILE
+    | PROGRAM
+    | PROJECT
+    | PROPAGATE
+    | PROTECTED
+    | PROTECTION
+    | PULL_PRED
+    | PURGE
+    | PUSH_PRED
+    | PUSH_SUBQ
+    | PX_GRANULE
+    | PX_JOIN_FILTER
+    | QB_NAME
+    | QUERY_BLOCK
+    | QUERY
+    | QUEUE_CURR
+    | QUEUE
+    | QUEUE_ROWP
+    | QUIESCE
+    | QUORUM
+    | QUOTA
+    | RANDOM_LOCAL
+    | RANDOM
+    | RANGE
+    | RANKM
+    | RANK
+    | RAPIDLY
+    | RATIO_TO_REPORT
+    | RAWTOHEX
+    | RAWTONHEX
+    | RBA
+    | RBO_OUTLINE
+    | RDBA
+    | READ
+    | READS
+    | REAL
+    | REBALANCE
+    | REBUILD
+    | RECORDS_PER_BLOCK
+    | RECOVERABLE
+    | RECOVER
+    | RECOVERY
+    | RECYCLEBIN
+    | RECYCLE
+    | REDACTION
+    | REDO
+    | REDUCED
+    | REDUNDANCY
+    | REF_CASCADE_CURSOR
+    | REFERENCED
+    | REFERENCE
+    | REFERENCES
+    | REFERENCING
+    | REF
+    | REFRESH
+    | REFTOHEX
+    | REGEXP_COUNT
+    | REGEXP_INSTR
+    | REGEXP_LIKE
+    | REGEXP_REPLACE
+    | REGEXP_SUBSTR
+    | REGISTER
+    | REGR_AVGX
+    | REGR_AVGY
+    | REGR_COUNT
+    | REGR_INTERCEPT
+    | REGR_R2
+    | REGR_SLOPE
+    | REGR_SXX
+    | REGR_SXY
+    | REGR_SYY
+    | REGULAR
+    | REJECT
+    | REKEY
+    | RELATIONAL
+    | RELY
+    | REMAINDER
+    | REMOTE_MAPPED
+    | REMOVE
+    | REPAIR
+    | REPEAT
+    | REPLACE
+    | REPLICATION
+    | REQUIRED
+    | RESETLOGS
+    | RESET
+    | RESIZE
+    | RESOLVE
+    | RESOLVER
+    | RESPECT
+    | RESTORE_AS_INTERVALS
+    | RESTORE
+    | RESTRICT_ALL_REF_CONS
+    | RESTRICTED
+    | RESTRICT
+    | RESULT_CACHE
+    | RESUMABLE
+    | RESUME
+    | RETENTION
+    | RETRY_ON_ROW_CHANGE
+    | RETURNING
+    | RETURN
+    | REUSE
+    | REVERSE
+    | REWRITE
+    | REWRITE_OR_ERROR
+    | RIGHT
+    | ROLE
+    | ROLES
+    | ROLLBACK
+    | ROLLING
+    | ROLLUP
+    | ROOT
+    | ROUND
+    | ROWDEPENDENCIES
+    | ROWID
+    | ROWIDTOCHAR
+    | ROWIDTONCHAR
+    | ROW_LENGTH
+    | ROW
+    | ROW_NUMBER
+    | ROWNUM
+    | ROWS
+    | RPAD
+    | RTRIM
+    | RULE
+    | RULES
+    | SALT
+    | SAMPLE
+    | SAVE_AS_INTERVALS
+    | SAVEPOINT
+    | SB4
+    | SCALE
+    | SCALE_ROWS
+    | SCAN_INSTANCES
+    | SCAN
+    | SCHEDULER
+    | SCHEMACHECK
+    | SCHEMA
+    | SCN_ASCENDING
+    | SCN
+    | SCOPE
+    | SD_ALL
+    | SD_INHIBIT
+    | SD_SHOW
+    | SEARCH
+    | SECOND
+    | SECUREFILE_DBA
+    | SECUREFILE
+    | SECURITY
+    | SEED
+    | SEG_BLOCK
+    | SEG_FILE
+    | SEGMENT
+    | SELECTIVITY
+    | SEMIJOIN_DRIVER
+    | SEMIJOIN
+    | SEMI_TO_INNER
+    | SEQUENCED
+    | SEQUENCE
+    | SEQUENTIAL
+    | SERIALIZABLE
+    | SERVERERROR
+    | SERVICE
+    | SESSION_CACHED_CURSORS
+    | SESSION
+    | SESSIONS_PER_USER
+    | SESSIONTIMEZONE
+    | SESSIONTZNAME
+    | SETS
+    | SETTINGS
+    | SET_TO_JOIN
+    | SEVERE
+    | SHARED
+    | SHARED_POOL
+    | SHOW
+    | SHRINK
+    | SHUTDOWN
+    | SIBLINGS
+    | SID
+    | SIGNAL_COMPONENT
+    | SIGNAL_FUNCTION
+    | SIGN
+    | SIMPLE
+    | SINGLE
+    | SINGLETASK
+    | SINH
+    | SIN
+    | SKIP_EXT_OPTIMIZER
+    | SKIP_
+    | SKIP_UNQ_UNUSABLE_IDX
+    | SKIP_UNUSABLE_INDEXES
+    | SMALLFILE
+    | SNAPSHOT
+    | SOME
+    | SORT
+    | SOUNDEX
+    | SOURCE
+    | SPACE_KEYWORD
+    | SPECIFICATION
+    | SPFILE
+    | SPLIT
+    | SPREADSHEET
+    | SQLLDR
+    | SQL
+    | SQL_TRACE
+    | SQL_MACRO
+    | SQRT
+    | STALE
+    | STANDALONE
+    | STANDBY_MAX_DATA_DELAY
+    | STANDBY
+    | STAR
+    | STAR_TRANSFORMATION
+    | STARTUP
+    | STATEMENT_ID
+    | STATEMENT_QUEUING
+    | STATEMENTS
+    | STATIC
+    | STATISTICS
+    | STATS_BINOMIAL_TEST
+    | STATS_CROSSTAB
+    | STATS_F_TEST
+    | STATS_KS_TEST
+    | STATS_MODE
+    | STATS_MW_TEST
+    | STATS_ONE_WAY_ANOVA
+    | STATS_T_TEST_INDEP
+    | STATS_T_TEST_INDEPU
+    | STATS_T_TEST_ONE
+    | STATS_T_TEST_PAIRED
+    | STATS_WSR_TEST
+    | STDDEV
+    | STDDEV_POP
+    | STDDEV_SAMP
+    | STOP
+    | STORAGE
+    | STORE
+    | STREAMS
+    | STRICT
+    | STRING
+    | STRIPE_COLUMNS
+    | STRIPE_WIDTH
+    | STRIP
+    | STRUCTURE
+    | SUBMULTISET
+    | SUBPARTITION
+    | SUBPARTITION_REL
+    | SUBPARTITIONS
+    | SUBQUERIES
+    | SUBQUERY_PRUNING
+    | SUBSTITUTABLE
+    | SUBSTR2
+    | SUBSTR4
+    | SUBSTRB
+    | SUBSTRC
+    | SUBSTR
+    | SUCCESSFUL
+    | SUMMARY
+    | SUM
+    | SUPPLEMENTAL
+    | SUSPEND
+    | SWAP_JOIN_INPUTS
+    | SWITCH
+    | SWITCHOVER
+    | SYNCHRONOUS
+    | SYNC
+    | SYS
+    | SYSASM
+    | SYS_AUDIT
+    | SYSAUX
+    | SYS_CHECKACL
+    | SYS_CONNECT_BY_PATH
+    | SYS_CONTEXT
+    | SYSDATE
+    | SYSDBA
+    | SYS_DBURIGEN
+    | SYS_DL_CURSOR
+    | SYS_DM_RXFORM_CHR
+    | SYS_DM_RXFORM_NUM
+    | SYS_DOM_COMPARE
+    | SYS_DST_PRIM2SEC
+    | SYS_DST_SEC2PRIM
+    | SYS_ET_BFILE_TO_RAW
+    | SYS_ET_BLOB_TO_IMAGE
+    | SYS_ET_IMAGE_TO_BLOB
+    | SYS_ET_RAW_TO_BFILE
+    | SYS_EXTPDTXT
+    | SYS_EXTRACT_UTC
+    | SYS_FBT_INSDEL
+    | SYS_FILTER_ACLS
+    | SYS_FNMATCHES
+    | SYS_FNREPLACE
+    | SYS_GET_ACLIDS
+    | SYS_GET_PRIVILEGES
+    | SYS_GETTOKENID
+    | SYS_GETXTIVAL
+    | SYS_GUID
+    | SYS_MAKEXML
+    | SYS_MAKE_XMLNODEID
+    | SYS_MKXMLATTR
+    | SYS_OP_ADT2BIN
+    | SYS_OP_ADTCONS
+    | SYS_OP_ALSCRVAL
+    | SYS_OP_ATG
+    | SYS_OP_BIN2ADT
+    | SYS_OP_BITVEC
+    | SYS_OP_BL2R
+    | SYS_OP_BLOOM_FILTER_LIST
+    | SYS_OP_BLOOM_FILTER
+    | SYS_OP_C2C
+    | SYS_OP_CAST
+    | SYS_OP_CEG
+    | SYS_OP_CL2C
+    | SYS_OP_COMBINED_HASH
+    | SYS_OP_COMP
+    | SYS_OP_CONVERT
+    | SYS_OP_COUNTCHG
+    | SYS_OP_CSCONV
+    | SYS_OP_CSCONVTEST
+    | SYS_OP_CSR
+    | SYS_OP_CSX_PATCH
+    | SYS_OP_DECOMP
+    | SYS_OP_DESCEND
+    | SYS_OP_DISTINCT
+    | SYS_OP_DRA
+    | SYS_OP_DUMP
+    | SYS_OP_DV_CHECK
+    | SYS_OP_ENFORCE_NOT_NULL
+    | SYSOPER
+    | SYS_OP_EXTRACT
+    | SYS_OP_GROUPING
+    | SYS_OP_GUID
+    | SYS_OP_IIX
+    | SYS_OP_ITR
+    | SYS_OP_LBID
+    | SYS_OP_LOBLOC2BLOB
+    | SYS_OP_LOBLOC2CLOB
+    | SYS_OP_LOBLOC2ID
+    | SYS_OP_LOBLOC2NCLOB
+    | SYS_OP_LOBLOC2TYP
+    | SYS_OP_LSVI
+    | SYS_OP_LVL
+    | SYS_OP_MAKEOID
+    | SYS_OP_MAP_NONNULL
+    | SYS_OP_MSR
+    | SYS_OP_NICOMBINE
+    | SYS_OP_NIEXTRACT
+    | SYS_OP_NII
+    | SYS_OP_NIX
+    | SYS_OP_NOEXPAND
+    | SYS_OP_NTCIMG
+    | SYS_OP_NUMTORAW
+    | SYS_OP_OIDVALUE
+    | SYS_OP_OPNSIZE
+    | SYS_OP_PAR_1
+    | SYS_OP_PARGID_1
+    | SYS_OP_PARGID
+    | SYS_OP_PAR
+    | SYS_OP_PIVOT
+    | SYS_OP_R2O
+    | SYS_OP_RAWTONUM
+    | SYS_OP_RDTM
+    | SYS_OP_REF
+    | SYS_OP_RMTD
+    | SYS_OP_ROWIDTOOBJ
+    | SYS_OP_RPB
+    | SYS_OPTLOBPRBSC
+    | SYS_OP_TOSETID
+    | SYS_OP_TPR
+    | SYS_OP_TRTB
+    | SYS_OPTXICMP
+    | SYS_OPTXQCASTASNQ
+    | SYS_OP_UNDESCEND
+    | SYS_OP_VECAND
+    | SYS_OP_VECBIT
+    | SYS_OP_VECOR
+    | SYS_OP_VECXOR
+    | SYS_OP_VERSION
+    | SYS_OP_VREF
+    | SYS_OP_VVD
+    | SYS_OP_XMLCONS_FOR_CSX
+    | SYS_OP_XPTHATG
+    | SYS_OP_XPTHIDX
+    | SYS_OP_XPTHOP
+    | SYS_OP_XTXT2SQLT
+    | SYS_ORDERKEY_DEPTH
+    | SYS_ORDERKEY_MAXCHILD
+    | SYS_ORDERKEY_PARENT
+    | SYS_PARALLEL_TXN
+    | SYS_PATHID_IS_ATTR
+    | SYS_PATHID_IS_NMSPC
+    | SYS_PATHID_LASTNAME
+    | SYS_PATHID_LASTNMSPC
+    | SYS_PATH_REVERSE
+    | SYS_PXQEXTRACT
+    | SYS_RID_ORDER
+    | SYS_ROW_DELTA
+    | SYS_SC_2_XMLT
+    | SYS_SYNRCIREDO
+    | SYSTEM_DEFINED
+    | SYSTEM
+    | SYSTIMESTAMP
+    | SYS_TYPEID
+    | SYS_UMAKEXML
+    | SYS_XMLANALYZE
+    | SYS_XMLCONTAINS
+    | SYS_XMLCONV
+    | SYS_XMLEXNSURI
+    | SYS_XMLGEN
+    | SYS_XMLI_LOC_ISNODE
+    | SYS_XMLI_LOC_ISTEXT
+    | SYS_XMLINSTR
+    | SYS_XMLLOCATOR_GETSVAL
+    | SYS_XMLNODEID_GETCID
+    | SYS_XMLNODEID_GETLOCATOR
+    | SYS_XMLNODEID_GETOKEY
+    | SYS_XMLNODEID_GETPATHID
+    | SYS_XMLNODEID_GETPTRID
+    | SYS_XMLNODEID_GETRID
+    | SYS_XMLNODEID_GETSVAL
+    | SYS_XMLNODEID_GETTID
+    | SYS_XMLNODEID
+    | SYS_XMLT_2_SC
+    | SYS_XMLTRANSLATE
+    | SYS_XMLTYPE2SQL
+    | SYS_XQ_ASQLCNV
+    | SYS_XQ_ATOMCNVCHK
+    | SYS_XQBASEURI
+    | SYS_XQCASTABLEERRH
+    | SYS_XQCODEP2STR
+    | SYS_XQCODEPEQ
+    | SYS_XQCON2SEQ
+    | SYS_XQCONCAT
+    | SYS_XQDELETE
+    | SYS_XQDFLTCOLATION
+    | SYS_XQDOC
+    | SYS_XQDOCURI
+    | SYS_XQDURDIV
+    | SYS_XQED4URI
+    | SYS_XQENDSWITH
+    | SYS_XQERRH
+    | SYS_XQERR
+    | SYS_XQESHTMLURI
+    | SYS_XQEXLOBVAL
+    | SYS_XQEXSTWRP
+    | SYS_XQEXTRACT
+    | SYS_XQEXTRREF
+    | SYS_XQEXVAL
+    | SYS_XQFB2STR
+    | SYS_XQFNBOOL
+    | SYS_XQFNCMP
+    | SYS_XQFNDATIM
+    | SYS_XQFNLNAME
+    | SYS_XQFNNM
+    | SYS_XQFNNSURI
+    | SYS_XQFNPREDTRUTH
+    | SYS_XQFNQNM
+    | SYS_XQFNROOT
+    | SYS_XQFORMATNUM
+    | SYS_XQFTCONTAIN
+    | SYS_XQFUNCR
+    | SYS_XQGETCONTENT
+    | SYS_XQINDXOF
+    | SYS_XQINSERT
+    | SYS_XQINSPFX
+    | SYS_XQIRI2URI
+    | SYS_XQLANG
+    | SYS_XQLLNMFRMQNM
+    | SYS_XQMKNODEREF
+    | SYS_XQNILLED
+    | SYS_XQNODENAME
+    | SYS_XQNORMSPACE
+    | SYS_XQNORMUCODE
+    | SYS_XQ_NRNG
+    | SYS_XQNSP4PFX
+    | SYS_XQNSPFRMQNM
+    | SYS_XQPFXFRMQNM
+    | SYS_XQ_PKSQL2XML
+    | SYS_XQPOLYABS
+    | SYS_XQPOLYADD
+    | SYS_XQPOLYCEL
+    | SYS_XQPOLYCSTBL
+    | SYS_XQPOLYCST
+    | SYS_XQPOLYDIV
+    | SYS_XQPOLYFLR
+    | SYS_XQPOLYMOD
+    | SYS_XQPOLYMUL
+    | SYS_XQPOLYRND
+    | SYS_XQPOLYSQRT
+    | SYS_XQPOLYSUB
+    | SYS_XQPOLYUMUS
+    | SYS_XQPOLYUPLS
+    | SYS_XQPOLYVEQ
+    | SYS_XQPOLYVGE
+    | SYS_XQPOLYVGT
+    | SYS_XQPOLYVLE
+    | SYS_XQPOLYVLT
+    | SYS_XQPOLYVNE
+    | SYS_XQREF2VAL
+    | SYS_XQRENAME
+    | SYS_XQREPLACE
+    | SYS_XQRESVURI
+    | SYS_XQRNDHALF2EVN
+    | SYS_XQRSLVQNM
+    | SYS_XQRYENVPGET
+    | SYS_XQRYVARGET
+    | SYS_XQRYWRP
+    | SYS_XQSEQ2CON4XC
+    | SYS_XQSEQ2CON
+    | SYS_XQSEQDEEPEQ
+    | SYS_XQSEQINSB
+    | SYS_XQSEQRM
+    | SYS_XQSEQRVS
+    | SYS_XQSEQSUB
+    | SYS_XQSEQTYPMATCH
+    | SYS_XQSTARTSWITH
+    | SYS_XQSTATBURI
+    | SYS_XQSTR2CODEP
+    | SYS_XQSTRJOIN
+    | SYS_XQSUBSTRAFT
+    | SYS_XQSUBSTRBEF
+    | SYS_XQTOKENIZE
+    | SYS_XQTREATAS
+    | SYS_XQ_UPKXML2SQL
+    | SYS_XQXFORM
+    | TABLE
+    | TABLE_LOOKUP_BY_NL
+    | TABLES
+    | TABLESPACE
+    | TABLESPACE_NO
+    | TABLE_STATS
+    | TABNO
+    | TANH
+    | TAN
+    | TBLORIDXPARTNUM
+    | TEMPFILE
+    | TEMPLATE
+    | TEMPORARY
+    | TEMP_TABLE
+    | TEST
+    | THAN
+    | THE
+    | THEN
+    | THREAD
+    | THROUGH
+    | TIME
+    | TIMING
+    | TIMEOUT
+    | TIMES
+    | TIMESTAMP
+    | TIMEZONE_ABBR
+    | TIMEZONE_HOUR
+    | TIMEZONE_MINUTE
+    | TIME_ZONE
+    | TIMEZONE_OFFSET
+    | TIMEZONE_REGION
+    | TIV_GB
+    | TIV_SSF
+    | TO_BINARY_DOUBLE
+    | TO_BINARY_FLOAT
+    | TO_BLOB
+    | TO_CHAR
+    | TO_CLOB
+    | TO_DATE
+    | TO_DSINTERVAL
+    | TO_LOB
+    | TO_MULTI_BYTE
+    | TO_NCHAR
+    | TO_NCLOB
+    | TO_NUMBER
+    | TOPLEVEL
+    | TO_SINGLE_BYTE
+    | TO_TIME
+    | TO_TIMESTAMP
+    | TO_TIMESTAMP_TZ
+    | TO_TIME_TZ
+    | TO_YMINTERVAL
+    | TRACE
+    | TRACING
+    | TRACKING
+    | TRAILING
+    | TRANSACTION
+    | TRANSFORM_DISTINCT_AGG
+    | TRANSITIONAL
+    | TRANSITION
+    | TRANSLATE
+    | TREAT
+    | TRIGGERS
+    | TRIM
+    | TRUE
+    | TRUNCATE
+    | TRUNC
+    | TRUSTED
+    | TUNING
+    | TX
+    | TYPE
+    | TYPES
+    | TZ_OFFSET
+    | UB2
+    | UBA
+    | UID
+    | UNARCHIVED
+    | UNBOUNDED
+    | UNBOUND
+    | UNDER
+    | UNDO
+    | UNDROP
+    | UNIFORM
+    | UNISTR
+    | UNLIMITED
+    | UNLOAD
+    | UNLOCK
+    | UNNEST_INNERJ_DISTINCT_VIEW
+    | UNNEST
+    | UNNEST_NOSEMIJ_NODISTINCTVIEW
+    | UNNEST_SEMIJ_VIEW
+    | UNPACKED
+    | UNPIVOT
+    | UNPROTECTED
+    | UNQUIESCE
+    | UNRECOVERABLE
+    | UNRESTRICTED
+    | UNTIL
+    | UNUSABLE
+    | UNUSED
+    | UPDATABLE
+    | UPDATED
+    | UPDATEXML
+    | UPD_INDEXES
+    | UPD_JOININDEX
+    | UPGRADE
+    | UPPER
+    | UPSERT
+    | UROWID
+    | USAGE
+    | USE_ANTI
+    | USE_CONCAT
+    | USE_HASH_AGGREGATION
+    | USE_HASH_GBY_FOR_PUSHDOWN
+    | USE_HASH
+    | USE_INVISIBLE_INDEXES
+    | USE_MERGE_CARTESIAN
+    | USE_MERGE
+    | USE
+    | USE_NL
+    | USE_NL_WITH_INDEX
+    | USE_PRIVATE_OUTLINES
+    | USER_DEFINED
+    | USERENV
+    | USERGROUP
+    | USER
+    | USER_RECYCLEBIN
+    | USERS
+    | USE_SEMI
+    | USE_STORED_OUTLINES
+    | USE_TTT_FOR_GSETS
+    | USE_WEAK_NAME_RESL
+    | USING
+    | VALIDATE
+    | VALIDATION
+    | VALUE
+    | VARIANCE
+    | VAR_POP
+    | VARRAY
+    | VARRAYS
+    | VAR_SAMP
+    | VARYING
+    | VECTOR_READ
+    | VECTOR_READ_TRACE
+    | VERIFY
+    | VERSIONING
+    | VERSION
+    | VERSIONS_ENDSCN
+    | VERSIONS_ENDTIME
+    | VERSIONS
+    | VERSIONS_OPERATION
+    | VERSIONS_STARTSCN
+    | VERSIONS_STARTTIME
+    | VERSIONS_XID
+    | VIRTUAL
+    | VISIBLE
+    | VOLUME
+    | VSIZE
+    | WAIT
+    | WALLET
+    | WELLFORMED
+    | WHENEVER
+    | WHEN
+    | WHITESPACE
+    | WIDTH_BUCKET
+    | WITHIN
+    | WITHOUT
+    | WORK
+    | WRAPPED
+    | WRITE
+    | XDB_FASTPATH_INSERT
+    | X_DYN_PRUNE
+    | XID
+    | XML2OBJECT
+    | XMLATTRIBUTES
+    | XMLCAST
+    | XMLCDATA
+    | XMLCOLATTVAL
+    | XMLCOMMENT
+    | XMLCONCAT
+    | XMLDIFF
+    | XML_DML_RWT_STMT
+    | XMLELEMENT
+    | XMLEXISTS2
+    | XMLEXISTS
+    | XMLFOREST
+    | XMLINDEX_REWRITE_IN_SELECT
+    | XMLINDEX_REWRITE
+    | XMLINDEX_SEL_IDX_TBL
+    | XMLISNODE
+    | XMLISVALID
+    | XML
+    | XMLNAMESPACES
+    | XMLPARSE
+    | XMLPATCH
+    | XMLPI
+    | XMLQUERY
+    | XMLQUERYVAL
+    | XMLROOT
+    | XMLSCHEMA
+    | XMLSERIALIZE
+    | XMLTABLE
+    | XMLTRANSFORMBLOB
+    | XMLTRANSFORM
+    | XMLTYPE
+    | XPATHTABLE
+    | XS_SYS_CONTEXT
+    | YEAR
+    | YES
+    | ZONE
+    ;
+
+string_function_name
+    : CHR
+    | DECODE
+    | SUBSTR
+    | TO_CHAR
+    | TRIM
+    ;
+
+numeric_function_name
+    : AVG
+    | COUNT
+    | NVL
+    | ROUND
+    | SUM
+    ;
\ No newline at end of file
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMCommandExecutor.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMCommandExecutor.java
new file mode 100644
index 0000000000..57df8e7e5e
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMCommandExecutor.java
@@ -0,0 +1,139 @@
+package ai.chat2db.plugin.dm;
+
+import ai.chat2db.community.domain.api.enums.plugin.SqlTypeEnum;
+import ai.chat2db.community.domain.api.model.result.ExecuteResponse;
+import ai.chat2db.community.domain.api.model.result.ExecutionContext;
+import ai.chat2db.community.domain.api.model.result.Header;
+import ai.chat2db.community.domain.api.model.result.ResultCell;
+import ai.chat2db.community.domain.api.model.sql.SimpleSqlStatement;
+import ai.chat2db.community.domain.api.service.db.ISqlExecutionCancellation;
+import ai.chat2db.community.domain.api.service.db.ISqlExecutionResultConsumer;
+import ai.chat2db.community.domain.api.service.db.ISqlExecutionStatementListener;
+import ai.chat2db.plugin.dm.parser.DMExecutableSql;
+import ai.chat2db.plugin.dm.parser.DMSqlParser;
+import ai.chat2db.spi.DefaultSQLExecutor;
+import ai.chat2db.spi.model.ExecutionTiming;
+import ai.chat2db.spi.sql.Chat2DBContext;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public final class DMCommandExecutor extends DefaultSQLExecutor {
+
+    public static final DMCommandExecutor INSTANCE = new DMCommandExecutor();
+
+    private final DMSqlParser parser = new DMSqlParser();
+
+    private final DMExplainClient explainClient = new DMExplainClient();
+
+    private DMCommandExecutor() {
+    }
+
+    @Override
+    protected List<ExecuteResponse> executeMulti(SimpleSqlStatement statement, Connection connection,
+                                                 boolean limitRowSize, Integer offset, Integer count,
+                                                 Integer resultSetId, ExecutionContext executionContext)
+            throws SQLException {
+        DMExecutableSql parsed = parseExecutableSql(statement.getSql());
+        if (!parsed.isExplain()) {
+            return super.executeMulti(statement, connection, limitRowSize, offset, count, resultSetId, executionContext);
+        }
+
+        markStatementAsExplain(statement);
+        Chat2DBContext.guardStatement(parsed.originalSql());
+        long startedAtEpochMs = System.currentTimeMillis();
+        long executeStartedNanos = System.nanoTime();
+        String plan = explainClient.getExplainInfo(connection, parsed.executableSql());
+        long executeDurationNanos = ExecutionTiming.elapsedNanos(executeStartedNanos);
+        return List.of(buildExplainResponse(parsed, plan, executionContext, startedAtEpochMs, executeDurationNanos));
+    }
+
+    @Override
+    protected List<ExecuteResponse> executeMultiStreaming(SimpleSqlStatement statement, Connection connection,
+                                                          boolean limitRowSize, Integer offset, Integer count,
+                                                          Integer resultSetId, ISqlExecutionResultConsumer consumer,
+                                                          ISqlExecutionStatementListener statementListener,
+                                                          ISqlExecutionCancellation cancellation, SqlTypeEnum sqlType,
+                                                          String originalSql, int pageNo, int pageSize,
+                                                          AtomicInteger streamResultSequence, int statementSequence,
+                                                          ExecutionContext executionContext)
+            throws SQLException {
+        DMExecutableSql parsed = parseExecutableSql(statement.getSql());
+        if (!parsed.isExplain()) {
+            return super.executeMultiStreaming(statement, connection, limitRowSize, offset, count, resultSetId,
+                    consumer, statementListener, cancellation, sqlType, originalSql, pageNo, pageSize,
+                    streamResultSequence, statementSequence, executionContext);
+        }
+
+        markStatementAsExplain(statement);
+        checkCanceled(cancellation);
+        Chat2DBContext.guardStatement(parsed.originalSql());
+        long startedAtEpochMs = System.currentTimeMillis();
+        long executeStartedNanos = System.nanoTime();
+        String plan = explainClient.getExplainInfo(connection, parsed.executableSql());
+        long executeDurationNanos = ExecutionTiming.elapsedNanos(executeStartedNanos);
+        checkCanceled(cancellation);
+
+        ExecuteResponse response = buildExplainResponse(
+                parsed, plan, executionContext, startedAtEpochMs, executeDurationNanos);
+        response.setPageNo(pageNo);
+        response.setPageSize(response.getDataList().size());
+        response.setHasNextPage(Boolean.FALSE);
+        response.setFuzzyTotal(Integer.toString(response.getDataList().size()));
+        publishMaterializedQueryResult(response, consumer, streamResultSequence, statementSequence, pageNo, pageSize);
+        return List.of(response);
+    }
+
+    private void markStatementAsExplain(SimpleSqlStatement statement) {
+        // Outer execute/executeStreaming overwrite response.sqlType from statement.sqlType
+        // after setExplain() rewrote the SQL text without updating the type.
+        statement.setSqlType(ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum.EXPLAIN.name());
+    }
+
+    private DMExecutableSql parseExecutableSql(String sql) throws SQLException {
+        try {
+            return parser.parseExecutableSql(sql);
+        } catch (IllegalArgumentException e) {
+            // Keep EXPLAIN off the default JDBC path when the DM grammar cannot classify it.
+            throw new SQLException(e.getMessage(), e);
+        }
+    }
+
+    private ExecuteResponse buildExplainResponse(DMExecutableSql parsed, String plan,
+                                                 ExecutionContext executionContext,
+                                                 long startedAtEpochMs, long executeDurationNanos) {
+        List<Header> headerList = new ArrayList<>();
+        headerList.add(Header.builder()
+                .name("Execution Plan")
+                .dataType("VARCHAR")
+                .build());
+
+        List<ResultCell> row = new ArrayList<>();
+        row.add(ResultCell.of(plan));
+
+        List<List<ResultCell>> dataList = new ArrayList<>();
+        dataList.add(row);
+
+        return ExecuteResponse.builder()
+                .success(Boolean.TRUE)
+                .sql(parsed.originalSql())
+                .originalSql(parsed.originalSql())
+                .sqlType(ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum.EXPLAIN.name())
+                .headerList(headerList)
+                .dataList(dataList)
+                .hasNextPage(Boolean.FALSE)
+                .executionContext(executionContext)
+                .executionMetrics(ExecutionTiming.complete(
+                        ExecutionTiming.started(startedAtEpochMs), executeDurationNanos, 0L, 1))
+                .build();
+    }
+
+    private void checkCanceled(ISqlExecutionCancellation cancellation) throws SQLException {
+        if (cancellation != null && cancellation.isCanceled()) {
+            throw new SQLException("SQL execution canceled");
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMDBManager.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMDBManager.java
index 1425b4aa6d..9770d91d83 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMDBManager.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMDBManager.java
@@ -242,8 +242,8 @@ public void connectDatabase(Connection connection, String database) {
     @Override
     public void copyTable(Connection connection, String databaseName, String schemaName, String tableName,
                           String newTableName, boolean copyData) throws SQLException {
-        String source = qualifiedName(schemaName, tableName, true);
-        String target = qualifiedName(schemaName, newTableName, true);
+        String source = qualifiedName(schemaName, tableName);
+        String target = qualifiedName(schemaName, newTableName);
         String sql;
         if (copyData) {
             sql = "CREATE TABLE " + target + " AS SELECT * FROM " + source;
@@ -255,27 +255,20 @@ public void copyTable(Connection connection, String databaseName, String schemaN
 
     @Override
     public String dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
-        return String.format(SQL_DROP_TABLE_EXISTS, qualifiedName(schemaName, tableName, false));
+        return String.format(SQL_DROP_TABLE_EXISTS, qualifiedName(schemaName, tableName));
     }
 
     @Override
     public String truncateTable(Connection connection, String databaseName, String schemaName, String tableName) {
-        return "TRUNCATE TABLE " + qualifiedName(schemaName, tableName, true);
+        return "TRUNCATE TABLE " + qualifiedName(schemaName, tableName);
     }
 
-    private static String qualifiedName(String schemaName, String objectName, boolean normalizeQuotedObject) {
-        String normalizedObject = normalizeQuotedObject ? normalizeQuotedIdentifier(objectName) : objectName;
-        String quotedObject = DMIdentifierProcessor.INSTANCE.quoteIdentifierAlways(normalizedObject);
+    private static String qualifiedName(String schemaName, String objectName) {
+        String quotedObject = DMIdentifierProcessor.INSTANCE.quoteIdentifierAlways(objectName);
         if (StringUtils.isBlank(schemaName)) {
             return quotedObject;
         }
         return DMIdentifierProcessor.INSTANCE.quoteIdentifierAlways(schemaName) + "." + quotedObject;
     }
 
-    private static String normalizeQuotedIdentifier(String identifier) {
-        if (DMIdentifierProcessor.INSTANCE.isQuoteIdentifier(identifier)) {
-            return DMIdentifierProcessor.INSTANCE.removeIdentifierQuote(identifier);
-        }
-        return identifier;
-    }
 }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMExplainClient.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMExplainClient.java
new file mode 100644
index 0000000000..d78139a3e5
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMExplainClient.java
@@ -0,0 +1,76 @@
+package ai.chat2db.plugin.dm;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+final class DMExplainClient {
+
+    String getExplainInfo(Connection connection, String sql) throws SQLException {
+        try {
+            Object dmConnection = resolveDmConnection(connection);
+            ClassLoader driverClassLoader = classLoaderOf(dmConnection);
+            Class<?> dmConnectionClass = Class.forName("dm.jdbc.driver.DmdbConnection", true, driverClassLoader);
+            Method method = dmConnectionClass.getMethod("getExplainInfo", String.class);
+            return (String) method.invoke(dmConnection, sql);
+        } catch (InvocationTargetException e) {
+            Throwable cause = e.getTargetException();
+            if (cause instanceof SQLException sqlException) {
+                throw sqlException;
+            }
+            throw new SQLException("DM getExplainInfo failed", cause);
+        } catch (ReflectiveOperationException e) {
+            throw new SQLException("DM JDBC driver does not support getExplainInfo", e);
+        }
+    }
+
+    private Object resolveDmConnection(Connection connection) throws SQLException, ClassNotFoundException {
+        Connection unwrapped = safeUnwrapConnection(connection);
+        ClassLoader driverClassLoader = classLoaderOf(unwrapped);
+        Class<?> dmConnectionClass = Class.forName("dm.jdbc.driver.DmdbConnection", true, driverClassLoader);
+
+        if (dmConnectionClass.isInstance(connection)) {
+            return connection;
+        }
+        if (dmConnectionClass.isInstance(unwrapped)) {
+            return unwrapped;
+        }
+
+        Object fromOuter = safeUnwrapAs(connection, dmConnectionClass);
+        if (fromOuter != null) {
+            return fromOuter;
+        }
+        Object fromInner = safeUnwrapAs(unwrapped, dmConnectionClass);
+        if (fromInner != null) {
+            return fromInner;
+        }
+        throw new SQLException("DM JDBC driver does not support getExplainInfo");
+    }
+
+    private Connection safeUnwrapConnection(Connection connection) {
+        try {
+            Connection unwrapped = connection.unwrap(Connection.class);
+            return unwrapped == null ? connection : unwrapped;
+        } catch (SQLException e) {
+            return connection;
+        }
+    }
+
+    private Object safeUnwrapAs(Connection connection, Class<?> dmConnectionClass) {
+        try {
+            return connection.unwrap(dmConnectionClass.asSubclass(Connection.class));
+        } catch (SQLException e) {
+            return null;
+        }
+    }
+
+    private ClassLoader classLoaderOf(Object target) {
+        ClassLoader loader = target.getClass().getClassLoader();
+        if (loader != null) {
+            return loader;
+        }
+        ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+        return contextLoader == null ? DMExplainClient.class.getClassLoader() : contextLoader;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java
index 7bac616c98..18a73bf648 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java
@@ -6,6 +6,7 @@
 import ai.chat2db.plugin.dm.enums.type.DMDefaultValueEnum;
 import ai.chat2db.plugin.dm.enums.type.DMIndexTypeEnum;
 import ai.chat2db.plugin.dm.value.DMValueProcessor;
+import ai.chat2db.spi.ICommandExecutor;
 import ai.chat2db.spi.IDbMetaData;
 import ai.chat2db.spi.ISQLIdentifierProcessor;
 import ai.chat2db.spi.ISqlBuilder;
@@ -297,6 +298,11 @@ public ISqlBuilder getSqlBuilder() {
         return new DMSqlBuilder();
     }
 
+    @Override
+    public ICommandExecutor getCommandExecutor() {
+        return DMCommandExecutor.INSTANCE;
+    }
+
     @Override
     public TableMeta getTableMeta(String databaseName, String schemaName, String tableName) {
         return TableMeta.builder()
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/builder/DMSqlBuilder.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/builder/DMSqlBuilder.java
index 3df748d0e0..3894b9bb19 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/builder/DMSqlBuilder.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/builder/DMSqlBuilder.java
@@ -1,5 +1,7 @@
 package ai.chat2db.plugin.dm.builder;
 
+import ai.chat2db.plugin.dm.parser.DMExecutableSql;
+import ai.chat2db.plugin.dm.parser.DMSqlParser;
 import ai.chat2db.spi.constant.SQLConstants;
 
 import ai.chat2db.plugin.dm.identifier.DMIdentifierProcessor;
@@ -32,6 +34,8 @@
 import static ai.chat2db.plugin.dm.constant.DMSqlBuilderConstants.*;
 public class DMSqlBuilder  extends DefaultSqlBuilder {
 
+    private final DMSqlParser parser = new DMSqlParser();
+
     @Override
     public String quoteIdentifier(String identifier) {
         return DMIdentifierProcessor.INSTANCE.quoteIdentifierAlways(identifier);
@@ -292,6 +296,12 @@ public String buildCreateSchema(Schema schema) {
         return sqlBuilder.toString();
     }
 
+    @Override
+    public String buildExplain(String sql) {
+        DMExecutableSql executableSql = parser.parseExecutableSql(sql);
+        return executableSql.isExplain() ? sql : SQLConstants.EXPLAIN_SQL_PREFIX + sql;
+    }
+
     private static String quoteStringLiteral(String value) {
         return DMIdentifierProcessor.INSTANCE.quoteStringLiteral(value);
     }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMDialect.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMDialect.java
new file mode 100644
index 0000000000..db5f7cf57d
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMDialect.java
@@ -0,0 +1,83 @@
+package ai.chat2db.plugin.dm.parser;
+
+import ai.chat2db.spi.parser.dialect.AbstractSQLDialect;
+import ai.chat2db.plugin.dm.parser.base.DMLexer;
+import ai.chat2db.plugin.dm.parser.rule.manager.DMRuleManager;
+import ai.chat2db.spi.IRuleManager;
+
+import java.util.Set;
+
+public class DMDialect extends AbstractSQLDialect {
+    private static final IRuleManager ORACLE_RULE_MANAGER = new DMRuleManager();
+
+    private static final Set<Integer> ORACLE_COMMENT_TOKENS = Set.of(DMLexer.SINGLE_LINE_COMMENT, DMLexer.MULTI_LINE_COMMENT);
+
+    private static final Set<String> SQL_START_KEYWORDS = Set.of(
+            "SELECT", "INSERT", "UPDATE", "DELETE", "ALTER", "DROP",
+            "ADMINISTER", "ANALYZE", "BEGIN", "COMMIT", "CREATE",
+            "DECLARE", "EXECUTE", "GRANT", "RENAME", "REVOKE",
+            "SAVEPOINT", "TRUNCATE", "LOCK", "NOAUDIT", "PURGE",
+            "EXPLAIN", "FLASHBACK", "ASSOCIATE", "AUDIT", "MERGE",
+            "ROLLBACK", "DISASSOCIATE", ";", "COMMENT",
+            "WITH", "EXIT", "PROMPT_MESSAGE", "SHOW", "WHENEVER",
+            "TIMING", "START_CMD"
+    );
+
+    @Override
+    public Set<Integer> getCommentTokens() {
+        return ORACLE_COMMENT_TOKENS;
+    }
+
+    @Override
+    public boolean isComment(int tokenType) {
+        return getCommentTokens().contains(tokenType);
+    }
+
+    @Override
+    public Set<String> getSqlStartKeywords() {
+        return SQL_START_KEYWORDS;
+    }
+
+
+    @Override
+    public Set<String> getBlockHeaderPrefixes() {
+        Set<String> blockHeaderPrefixes = super.getBlockHeaderPrefixes();
+        blockHeaderPrefixes.add("COMPOUND");
+        return blockHeaderPrefixes;
+    }
+
+    @Override
+    public Set<String> getIndependentBlockHeaders() {
+        Set<String> independentBlockHeaders = super.getIndependentBlockHeaders();
+        independentBlockHeaders.add("DECLARE");
+        return independentBlockHeaders;
+    }
+
+    @Override
+    public Set<String> getDependentBlockHeaders() {
+        Set<String> dependentBlockHeaders = super.getDependentBlockHeaders();
+        dependentBlockHeaders.add("PACKAGE");
+        return dependentBlockHeaders;
+    }
+
+    @Override
+    public Set<String> getInnerBlockPrefix() {
+        Set<String> innerBlockPrefix = super.getInnerBlockPrefix();
+        innerBlockPrefix.add("AS");
+        innerBlockPrefix.add("IS");
+        return innerBlockPrefix;
+    }
+
+    @Override
+    public Set<String> getPackageBodyInnerBlockHeaders() {
+        Set<String> packageBodyInnerBlockHeaders = super.getPackageBodyInnerBlockHeaders();
+        packageBodyInnerBlockHeaders.add("FUNCTION");
+        packageBodyInnerBlockHeaders.add("PROCEDURE");
+        return packageBodyInnerBlockHeaders;
+    }
+
+    @Override
+    public IRuleManager getRuleManager() {
+        return ORACLE_RULE_MANAGER;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMExecutableSql.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMExecutableSql.java
new file mode 100644
index 0000000000..59f2b3f264
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMExecutableSql.java
@@ -0,0 +1,10 @@
+package ai.chat2db.plugin.dm.parser;
+
+import ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum;
+
+public record DMExecutableSql(String sqlType, String originalSql, String executableSql) {
+
+    public boolean isExplain() {
+        return SqlTypeEnum.EXPLAIN.name().equals(sqlType);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMExecutionVisitor.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMExecutionVisitor.java
new file mode 100644
index 0000000000..649fec706f
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMExecutionVisitor.java
@@ -0,0 +1,49 @@
+package ai.chat2db.plugin.dm.parser;
+
+import ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum;
+import ai.chat2db.plugin.dm.parser.base.DMParser;
+import ai.chat2db.plugin.dm.parser.base.DMParserBaseVisitor;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.ParserRuleContext;
+
+public class DMExecutionVisitor extends DMParserBaseVisitor<DMExecutableSql> {
+
+    private final CommonTokenStream tokens;
+
+    private final String originalSql;
+
+    private DMExecutableSql result;
+
+    public DMExecutionVisitor(CommonTokenStream tokens, String originalSql) {
+        this.tokens = tokens;
+        this.originalSql = originalSql;
+    }
+
+    @Override
+    public DMExecutableSql visitSql_script(DMParser.Sql_scriptContext ctx) {
+        visitChildren(ctx);
+        return result == null ? new DMExecutableSql(SqlTypeEnum.OTHER.name(), originalSql, originalSql) : result;
+    }
+
+    @Override
+    public DMExecutableSql visitExplain_statement(DMParser.Explain_statementContext ctx) {
+        ParserRuleContext innerStatement = firstNonNull(
+                ctx.select_statement(),
+                ctx.update_statement(),
+                ctx.delete_statement(),
+                ctx.insert_statement(),
+                ctx.merge_statement());
+        String executableSql = innerStatement == null ? originalSql : tokens.getText(innerStatement.getSourceInterval());
+        result = new DMExecutableSql(SqlTypeEnum.EXPLAIN.name(), originalSql, executableSql);
+        return result;
+    }
+
+    private ParserRuleContext firstNonNull(ParserRuleContext... candidates) {
+        for (ParserRuleContext candidate : candidates) {
+            if (candidate != null) {
+                return candidate;
+            }
+        }
+        return null;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMSqlParser.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMSqlParser.java
index 9b66a16999..59b1c02b2c 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMSqlParser.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/DMSqlParser.java
@@ -1,6 +1,487 @@
 package ai.chat2db.plugin.dm.parser;
 
-import ai.chat2db.plugin.oracle.parser.OracleSqlParser;
+import ai.chat2db.spi.DefaultSQLFileSplitter;
+import ai.chat2db.spi.constant.SQLConstants;
+import ai.chat2db.community.domain.api.enums.parser.FileSizeUnitEnum;
+import ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum;
+import ai.chat2db.community.domain.api.model.parser.statement.Statement;
+import ai.chat2db.community.domain.api.model.parser.statement.StatementContext;
+import ai.chat2db.plugin.dm.parser.base.DMLexer;
+import ai.chat2db.plugin.dm.parser.base.DMParser;
+import ai.chat2db.plugin.dm.parser.base.DMParserBaseVisitor;
+import ai.chat2db.plugin.dm.parser.error.strategy.DMErrorStrategy;
+import ai.chat2db.plugin.dm.parser.visitor.DMCreateTableVisitor;
+import ai.chat2db.plugin.dm.parser.visitor.DMParserVisitor;
+import ai.chat2db.plugin.dm.parser.visitor.DMSimpleParserVisitor;
+import ai.chat2db.plugin.dm.parser.visitor.DMValidTableVisitor;
+import ai.chat2db.spi.parser.AbstractSqlParser;
+import ai.chat2db.community.domain.api.service.task.ITaskProgressListener;
+import ai.chat2db.spi.IRuleManager;
+import ai.chat2db.community.domain.api.service.db.ISqlBatchHandler;
+import ai.chat2db.spi.util.TokenUtil;
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.misc.ParseCancellationException;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
-public class DMSqlParser extends OracleSqlParser {
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class DMSqlParser extends AbstractSqlParser<DMParser, DMDialect> {
+
+
+    public DMSqlParser() {
+        super(new DMParser(null), new DMDialect());
+    }
+
+    @Override
+    protected Lexer createLexer(CharStream charStream) {
+        return new DMLexer(charStream);
+    }
+
+
+    @Override
+    protected ParseTree parserRoot(DMParser parser) {
+        return parser.sql_script();
+    }
+
+    @Override
+    protected StatementContext createStatementContext(CommonTokenStream tokenStream, SqlTypeEnum sqlTypeEnum) {
+        StatementContext statementContext = new StatementContext(tokenStream);
+        statementContext.setRecoverSet(DMErrorStrategy.recoverSet);
+        DMParserBaseVisitor visitor = createVisitor(statementContext, sqlTypeEnum);
+        statementContext.setVisitor(visitor);
+        return statementContext;
+    }
+
+
+    private DMParserBaseVisitor createVisitor(StatementContext statementContext, SqlTypeEnum sqlTypeEnum) {
+        return switch (sqlTypeEnum) {
+            case SIMPLE -> new DMSimpleParserVisitor(statementContext);
+            case CREATE_TABLE -> new DMCreateTableVisitor(statementContext);
+            case VALID_TABLE -> new DMValidTableVisitor(statementContext);
+            default -> new DMParserVisitor(statementContext);
+        };
+    }
+
+    /**
+     * Classifies an executable statement for the DM command executor.
+     * Ordinary SQL only pays for a cheap lexer scan of the first keyword;
+     * a full ANTLR parse runs only when that keyword is {@code EXPLAIN}.
+     * Parse failures for EXPLAIN never silently fall back to JDBC.
+     */
+    public DMExecutableSql parseExecutableSql(String sql) {
+        if (StringUtils.isBlank(sql)) {
+            return new DMExecutableSql(SqlTypeEnum.OTHER.name(), sql, sql);
+        }
+        DMLexer lexer = new DMLexer(CharStreams.fromString(sql));
+        CommonTokenStream tokens = new CommonTokenStream(lexer);
+        tokens.fill();
+        if (!isExplainLeadingKeyword(tokens)) {
+            return new DMExecutableSql(SqlTypeEnum.OTHER.name(), sql, sql);
+        }
+
+        DMParser parser = new DMParser(tokens);
+        parser.removeErrorListeners();
+        parser.setErrorHandler(new BailErrorStrategy());
+        try {
+            DMExecutableSql parsed = new DMExecutionVisitor(tokens, sql).visit(parser.sql_script());
+            if (parsed == null || !parsed.isExplain()) {
+                throw new IllegalArgumentException("Failed to parse DM EXPLAIN statement");
+            }
+            return parsed;
+        } catch (ParseCancellationException e) {
+            throw new IllegalArgumentException("Failed to parse DM EXPLAIN statement", e);
+        }
+    }
+
+    private boolean isExplainLeadingKeyword(CommonTokenStream tokens) {
+        for (Token token : tokens.getTokens()) {
+            if (token.getType() == Token.EOF) {
+                break;
+            }
+            if (!TokenUtil.hasValuableText(token) || dialect.isComment(token.getType())) {
+                continue;
+            }
+            return token.getType() == DMLexer.EXPLAIN;
+        }
+        return false;
+    }
+
+    @Override
+    public List<Statement> parserSqlScript(String sql) {
+        Lexer lexer = getLexer(sql);
+        CommonTokenStream tokenStream = createTokenStream(lexer);
+        tokenStream.fill();
+        List<Token> tokens = tokenStream.getTokens();
+
+        List<Statement> statements = new ArrayList<>();
+        IRuleManager ruleManager = dialect.getRuleManager();
+        Token firstToken = null;
+        Token lastToken = null;
+        Token firstKeyword = null;
+        Token lastKeyword = null;
+        boolean encounteredBlockHeaderPrefix = false;
+        SqlScriptBlockContext curBlock = null;
+        for (int i = 0; i < tokens.size(); i++) {
+            Token token = tokens.get(i);
+            int tokenType = token.getType();
+            if (tokenType == Token.EOF) {
+                break;
+            }
+            String currentTokenText = token.getText().trim();
+            if (!TokenUtil.hasValuableText(token)) {
+                continue;
+            } else if (dialect.isComment(tokenType)) {
+                continue;
+            } else if (tokenType == DMLexer.SOLIDUS && Objects.isNull(firstToken)) {
+                continue;
+            }
+            if (dialect.isStatementDelimiter(currentTokenText) && Objects.isNull(curBlock)) {
+                if (Objects.isNull(firstToken)) {
+                    continue;
+                }
+                Statement statement = getStatement(tokenStream, firstToken, lastToken);
+                String originalSql = statement.getOriginalSql();
+                if (StringUtils.isNotBlank(originalSql)) {
+                    String trimSql = originalSql.trim();
+                    if (trimSql.endsWith("/")) {
+                        String substring = trimSql.substring(0, trimSql.length() - 1);
+                        if (Objects.nonNull(lastKeyword)) {
+                            if ("END".equalsIgnoreCase(lastKeyword.getText())) {
+                                substring += ";";
+                            }
+                        }
+                        statement.setSql(substring);
+                    }
+                }
+                statements.add(statement);
+                firstToken = null;
+                lastToken = null;
+                firstKeyword = null;
+                lastKeyword = null;
+                curBlock = null;
+                encounteredBlockHeaderPrefix = false;
+                continue;
+            }
+            if (Objects.isNull(firstToken)) {
+                firstToken = token;
+            }
+            if (currentTokenText.length() == 1) {
+                if (StringUtils.equalsAnyIgnoreCase(currentTokenText,
+                        SQLConstants.OPEN_PARENTHESIS,
+                        SQLConstants.OPEN_CURLY_BRACE,
+                        SQLConstants.OPEN_SQUARE_BRACKET)) {
+                    curBlock = new SqlScriptBlockContext(curBlock);
+                }
+                if (StringUtils.equalsAnyIgnoreCase(currentTokenText,
+                        SQLConstants.CLOSE_PARENTHESIS,
+                        SQLConstants.CLOSE_CURLY_BRACE,
+                        SQLConstants.CLOSE_SQUARE_BRACKET)) {
+                    if (Objects.nonNull(curBlock)) {
+                        curBlock = curBlock.parent;
+                    }
+                }
+            }
+            if (dialect.isBlockHeaderPrefix(currentTokenText)) {
+                encounteredBlockHeaderPrefix = true;
+                lastToken = token;
+                firstKeyword = token;
+                lastKeyword = token;
+                continue;
+            }
+
+            if (encounteredBlockHeaderPrefix) {
+                if (dialect.isDependentBlockHeader(currentTokenText)) {
+                    boolean isBlockHeader = true;
+                    if (Objects.nonNull(ruleManager)) {
+                        isBlockHeader = ruleManager.matchRules(tokens, i);
+                    }
+                    if (isBlockHeader) {
+                        curBlock = new SqlScriptBlockContext(curBlock, true);
+                        lastToken = token;
+                        lastKeyword = token;
+                        encounteredBlockHeaderPrefix = false;
+                    }
+                    continue;
+                }
+            } else {
+                if (dialect.isIndependentBlockHeader(currentTokenText) && Objects.isNull(curBlock)) {
+                    curBlock = new SqlScriptBlockContext(null, true);
+                    if (Objects.isNull(firstKeyword)) {
+                        firstKeyword = token;
+                    }
+                    lastToken = token;
+                    lastKeyword = token;
+                    continue;
+                }
+                if (Objects.nonNull(curBlock)
+                        && dialect.isPackageBodyInnerBlockHeader(currentTokenText)
+                        && Objects.nonNull(ruleManager)
+                        && ruleManager.matchRules(tokens, i)) {
+                    curBlock = new SqlScriptBlockContext(curBlock, true);
+                    lastToken = token;
+                    lastKeyword = token;
+                    continue;
+
+                }
+            }
+
+            if (dialect.isBlockBegin(currentTokenText)) {
+                if (Objects.nonNull(lastToken) && dialect.isBlockEnd(lastToken.getText())) {
+                    lastToken = token;
+                    continue;
+                } else {
+                    boolean isBlock = true;
+                    if (Objects.nonNull(ruleManager)) {
+                        isBlock = ruleManager.matchRules(tokens, i);
+                    }
+                    if (isBlock) {
+                        if (Objects.nonNull(curBlock) && curBlock.isHeader) {
+                            curBlock = curBlock.parent;
+                        }
+                        curBlock = new SqlScriptBlockContext(curBlock);
+                    }
+                }
+            } else if (dialect.isBlockEnd(currentTokenText)) {
+                if (Objects.nonNull(curBlock)) {
+                    curBlock = curBlock.parent;
+                }
+            }
+
+
+            lastToken = token;
+            if (dialect.isKeyword(currentTokenText)) {
+                if (Objects.isNull(firstKeyword)) {
+                    firstKeyword = token;
+                }
+                lastKeyword = token;
+            }
+
+        }
+
+        return statements;
+    }
+
+    @Override
+    public int parserSqlScript(File file, ITaskProgressListener progressListener, ISqlBatchHandler sqlBatchHandler) {
+        try (DefaultSQLFileSplitter safeSQLFileSplitter = new DefaultSQLFileSplitter(10, FileSizeUnitEnum.MB, file, StandardCharsets.UTF_8)) {
+            String content;
+            Lexer lexer = new DMLexer(null);
+            CharStream charStream = null;
+            long bytesRead = 0L;
+            int statementCount = 0;
+            List<Token> currentTokens = new ArrayList<>(50);
+            IRuleManager ruleManager = dialect.getRuleManager();
+            while (StringUtils.isNotBlank(content = safeSQLFileSplitter.nextContent())) {
+                if (CollectionUtils.isNotEmpty(currentTokens)) {
+                    String leftTokens = currentTokens.stream().map(Token::getText).collect(Collectors.joining());
+                    charStream = CharStreams.fromString(leftTokens + content);
+                    currentTokens.clear();
+                } else {
+                    charStream = CharStreams.fromString(content);
+                }
+                lexer.setInputStream(charStream);
+                UnbufferedTokenStream<Token> tokenStream = createUnbufferedTokenStream(lexer);
+                boolean encounteredBlockHeaderPrefix = false;
+                boolean encounteredOpenParenthesis = false;
+                Token firstToken = null;
+                Token lastToken = null;
+                Token firstKeyword = null;
+                Token lastKeyword = null;
+                SqlScriptBlockContext curBlock = null;
+                while (tokenStream.LA(1) != Token.EOF) {
+                    Token token = tokenStream.LT(1);
+                    int tokenType = token.getType();
+                    String text = token.getText();
+                    bytesRead += text.getBytes().length;
+                    String currentTokenText = text.trim();
+                    if (!TokenUtil.hasValuableText(token) || dialect.isComment(tokenType)) {
+                        if (Objects.nonNull(firstToken)) {
+                            currentTokens.add(token);
+                        }
+                        tokenStream.consume();
+                        continue;
+                    } else if (tokenType == DMLexer.SOLIDUS && Objects.isNull(firstToken)) {
+                        tokenStream.consume();
+                        continue;
+                    }
+                    if (dialect.isStatementDelimiter(currentTokenText) && Objects.isNull(curBlock)) {
+                        if (Objects.isNull(firstToken)) {
+                            tokenStream.consume();
+                            continue;
+                        }
+                        Statement statement = getStatement(currentTokens);
+                        String originalSql = statement.getOriginalSql();
+                        if (StringUtils.isNotBlank(originalSql)) {
+                            String trimSql = originalSql.trim();
+                            if (trimSql.endsWith("/")) {
+                                String substring = trimSql.substring(0, trimSql.length() - 1);
+                                if (Objects.nonNull(lastKeyword)) {
+                                    if ("END".equalsIgnoreCase(lastKeyword.getText())) {
+                                        substring += ";";
+                                    }
+                                }
+                                statement.setSql(substring);
+                            }
+                        }
+                        sqlBatchHandler.handle(statement);
+                        statementCount++;
+                        firstToken = null;
+                        lastToken = null;
+                        firstKeyword = null;
+                        lastKeyword = null;
+                        curBlock = null;
+                        encounteredBlockHeaderPrefix = false;
+                        currentTokens.clear();
+                        tokenStream.consume();
+                        progressListener.onProgress(bytesRead, statementCount);
+                        continue;
+                    }
+                    if (Objects.isNull(firstToken)) {
+                        firstToken = token;
+                    }
+                    currentTokens.add(token);
+                    if (currentTokenText.length() == 1) {
+                        if (SQLConstants.OPEN_PARENTHESIS.equalsIgnoreCase(currentTokenText)) {
+                            encounteredOpenParenthesis = true;
+                            curBlock = new SqlScriptBlockContext(curBlock);
+
+                        } else if (StringUtils.equalsAnyIgnoreCase(currentTokenText,
+                                SQLConstants.OPEN_CURLY_BRACE,
+                                SQLConstants.OPEN_SQUARE_BRACKET)) {
+                            curBlock = new SqlScriptBlockContext(curBlock);
+                        } else if (SQLConstants.CLOSE_PARENTHESIS.equalsIgnoreCase(currentTokenText)) {
+                            encounteredOpenParenthesis = false;
+                            if (Objects.nonNull(curBlock)) {
+                                curBlock = curBlock.parent;
+                            }
+                        }
+                        else if (StringUtils.equalsAnyIgnoreCase(currentTokenText,
+                                SQLConstants.CLOSE_CURLY_BRACE,
+                                SQLConstants.CLOSE_SQUARE_BRACKET)) {
+                            if (Objects.nonNull(curBlock)) {
+                                curBlock = curBlock.parent;
+                            }
+                        }
+                    }
+                    if (dialect.isBlockHeaderPrefix(currentTokenText)) {
+                        encounteredBlockHeaderPrefix = true;
+                        lastToken = token;
+                        firstKeyword = token;
+                        lastKeyword = token;
+                        tokenStream.consume();
+                        continue;
+                    }
+
+                    if (encounteredBlockHeaderPrefix) {
+                        if (dialect.isDependentBlockHeader(currentTokenText)) {
+                            boolean isBlockHeader = true;
+                            if (Objects.nonNull(ruleManager)) {
+                                isBlockHeader = ruleManager.matchRules(tokenStream);
+                            }
+                            if (isBlockHeader) {
+                                curBlock = new SqlScriptBlockContext(curBlock, true);
+                                lastToken = token;
+                                lastKeyword = token;
+                                encounteredBlockHeaderPrefix = false;
+                            }
+                            tokenStream.consume();
+                            continue;
+                        }
+                    } else {
+                        if (dialect.isIndependentBlockHeader(currentTokenText) && Objects.isNull(curBlock)) {
+                            curBlock = new SqlScriptBlockContext(null, true);
+                            if (Objects.isNull(firstKeyword)) {
+                                firstKeyword = token;
+                            }
+                            lastToken = token;
+                            lastKeyword = token;
+                            tokenStream.consume();
+                            continue;
+                        }
+                        if (Objects.nonNull(curBlock)
+                                && dialect.isPackageBodyInnerBlockHeader(currentTokenText)
+                                && Objects.nonNull(ruleManager)
+                                && ruleManager.matchRules(tokenStream)) {
+                            if (encounteredOpenParenthesis && DMLexer.PROCEDURE == tokenType) {
+                                if (checkLastValuableToken(currentTokens, DMLexer.LEFT_PAREN)) {
+                                    lastToken = token;
+                                    lastKeyword = token;
+                                    tokenStream.consume();
+                                    continue;
+                                }
+                            } else {
+                                curBlock = new SqlScriptBlockContext(curBlock, true);
+                                lastToken = token;
+                                lastKeyword = token;
+                                tokenStream.consume();
+                                continue;
+                            }
+
+                        }
+                    }
+
+                    if (dialect.isBlockBegin(currentTokenText)) {
+                        if (Objects.nonNull(lastToken) && dialect.isBlockEnd(lastToken.getText())) {
+                            lastToken = token;
+                            tokenStream.consume();
+                            continue;
+                        } else {
+                            boolean isBlock = true;
+                            if (Objects.nonNull(ruleManager)) {
+                                isBlock = ruleManager.matchRules(tokenStream);
+                            }
+                            if (isBlock) {
+                                if (Objects.nonNull(curBlock) && curBlock.isHeader) {
+                                    curBlock = curBlock.parent;
+                                }
+                                curBlock = new SqlScriptBlockContext(curBlock);
+                            }
+                        }
+                    } else if (dialect.isBlockEnd(currentTokenText)) {
+                        if (Objects.nonNull(curBlock)) {
+                            curBlock = curBlock.parent;
+                        }
+                    }
+
+
+                    lastToken = token;
+                    if (dialect.isKeyword(currentTokenText)) {
+                        if (Objects.isNull(firstKeyword)) {
+                            firstKeyword = token;
+                        }
+                        lastKeyword = token;
+                    }
+                    tokenStream.consume();
+                }
+            }
+            if (CollectionUtils.isNotEmpty(currentTokens)) {
+                Statement statement = getStatement(currentTokens);
+                sqlBatchHandler.handle(statement);
+                statementCount++;
+                currentTokens.clear();
+                progressListener.onProgress(bytesRead, statementCount);
+            }
+            sqlBatchHandler.flush();
+            return statementCount;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private boolean checkLastValuableToken(List<Token> currentTokens, Integer targetTokenType) {
+        for (int i = currentTokens.size() - 1; i > 0; i--) {
+            Token token = currentTokens.get(i);
+            if (TokenUtil.hasValuableText(token)) {
+                return token.getType() == targetTokenType;
+            }
+        }
+        return false;
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/base/DMLexerBase.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/base/DMLexerBase.java
new file mode 100644
index 0000000000..1f0aed6db7
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/base/DMLexerBase.java
@@ -0,0 +1,20 @@
+package ai.chat2db.plugin.dm.parser.base;
+
+import org.antlr.v4.runtime.*;
+
+public abstract class DMLexerBase extends Lexer
+{
+    public DMLexerBase self;
+
+    public DMLexerBase(CharStream input)
+    {
+        super(input);
+        self = this;
+    }
+
+    protected boolean IsNewlineAtPos(int pos)
+    {
+        int la = _input.LA(pos);
+        return la == -1 || la == '\n';
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/base/DMParserBase.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/base/DMParserBase.java
new file mode 100644
index 0000000000..4eb7b4bd69
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/base/DMParserBase.java
@@ -0,0 +1,31 @@
+package ai.chat2db.plugin.dm.parser.base;
+
+import org.antlr.v4.runtime.*;
+
+public abstract class DMParserBase extends Parser
+{
+    private boolean _isVersion12 = true;
+    private boolean _isVersion10 = true;
+    public DMParserBase self;
+
+    public DMParserBase(TokenStream input) {
+        super(input);
+        self = this;
+    }
+
+    public boolean isVersion12() {
+        return _isVersion12;
+    }
+
+    public void setVersion12(boolean value) {
+        _isVersion12 = value;
+    }
+
+    public boolean isVersion10() {
+        return _isVersion10;
+    }
+
+    public void setVersion10(boolean value) {
+        _isVersion10 = value;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/error/strategy/DMErrorStrategy.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/error/strategy/DMErrorStrategy.java
new file mode 100644
index 0000000000..7990007e99
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/error/strategy/DMErrorStrategy.java
@@ -0,0 +1,29 @@
+package ai.chat2db.plugin.dm.parser.error.strategy;
+
+import ai.chat2db.spi.parser.error.strategy.BaseErrorStrategy;
+import ai.chat2db.plugin.dm.parser.base.DMParser;
+import org.antlr.v4.runtime.misc.IntervalSet;
+
+public class DMErrorStrategy extends BaseErrorStrategy {
+
+    private static final int[] stmtBeginToken = new int[]{
+            DMParser.SELECT, DMParser.INSERT, DMParser.UPDATE,
+            DMParser.DELETE, DMParser.ALTER, DMParser.DROP,
+            DMParser.ADMINISTER, DMParser.ANALYZE, DMParser.BEGIN,
+            DMParser.COMMIT, DMParser.CREATE, DMParser.DECLARE,
+            DMParser.EXECUTE, DMParser.GRANT, DMParser.RENAME,
+            DMParser.REVOKE, DMParser.SAVEPOINT, DMParser.TRUNCATE,
+            DMParser.LOCK, DMParser.NOAUDIT, DMParser.PURGE,
+            DMParser.EXPLAIN, DMParser.FLASHBACK, DMParser.ASSOCIATE,
+            DMParser.AUDIT, DMParser.MERGE, DMParser.ROLLBACK,
+            DMParser.DISASSOCIATE,  DMParser.SEMICOLON,
+            DMParser.COMMENT,DMParser.WITH,DMParser.EXIT,
+            DMParser.PROMPT_MESSAGE,DMParser.SHOW,DMParser.WHENEVER,
+            DMParser.TIMING,DMParser.START_CMD,
+
+    };
+
+    public static final IntervalSet recoverSet = new IntervalSet(stmtBeginToken);
+
+
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/listener/DMSelectListener.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/listener/DMSelectListener.java
new file mode 100644
index 0000000000..bba126c913
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/listener/DMSelectListener.java
@@ -0,0 +1,209 @@
+package ai.chat2db.plugin.dm.parser.listener;
+
+import ai.chat2db.community.domain.api.enums.parser.IdentifierTypeEnum;
+import ai.chat2db.community.domain.api.model.parser.info.ColumnInfo;
+import ai.chat2db.community.domain.api.model.parser.info.TableInfo;
+import ai.chat2db.community.domain.api.model.parser.statement.Statement;
+import ai.chat2db.community.domain.api.model.parser.statement.StatementContext;
+import ai.chat2db.community.domain.api.model.parser.token.Identifier;
+import ai.chat2db.plugin.dm.parser.base.DMParser;
+import ai.chat2db.plugin.dm.parser.base.DMParserBaseListener;
+import ai.chat2db.spi.util.SqlStringUtil;
+import ai.chat2db.spi.util.TokenUtil;
+import io.vavr.control.Try;
+import lombok.extern.slf4j.Slf4j;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.ParseTreeWalker;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import java.util.*;
+
+@Slf4j
+public class DMSelectListener extends DMParserBaseListener {
+
+
+    private final StatementContext context;
+
+    private Map<TableInfo, String> tableAliasMap = new HashMap<>();
+
+    private Map<ColumnInfo, String> columnAliasMap = new HashMap<>();
+
+    public DMSelectListener(StatementContext context) {
+        this.context = context;
+    }
+
+    public void parserSelectStatement(ParseTree parseTree) {
+        tableAliasMap = new HashMap<>();
+        columnAliasMap = new HashMap<>();
+        ParseTreeWalker parseTreeWalker = new ParseTreeWalker();
+        parseTreeWalker.walk(this, parseTree);
+    }
+
+
+    @Override
+    public void exitSelect_statement(DMParser.Select_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        currentStatement.setColumnAliasMap(columnAliasMap);
+        currentStatement.setTableAliasMap(tableAliasMap);
+    }
+
+    @Override
+    public void enterSelected_list(DMParser.Selected_listContext ctx) {
+        TerminalNode asterisk = ctx.ASTERISK();
+        if (Objects.nonNull(asterisk)) {
+            columnAliasMap.put(
+                    ColumnInfo.builder().column("*").build(), null
+            );
+        }
+    }
+
+    @Override
+    public void enterSelect_list_elements(DMParser.Select_list_elementsContext ctx) {
+        TerminalNode asterisk = ctx.ASTERISK();
+        if (asterisk != null) {
+            String schema = null, table = null;
+            DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+            if (tableviewNameContext != null) {
+                String text = tableviewNameContext.getText();
+                String[] split = text.split("\\.");
+                int length = split.length;
+                if (length == 2) {
+                    schema = SqlStringUtil.removeQuote(split[0]);
+                }
+                table = SqlStringUtil.removeQuote(split[length - 1]);
+            }
+            columnAliasMap.put(
+                    ColumnInfo.builder().schema(schema).table(table).column("*").build(), null
+            );
+            return;
+        }
+        Try.of(() -> {
+            DMParser.Column_aliasContext columnAliasContext = ctx.column_alias();
+            DMParser.ExpressionContext expression = ctx.expression();
+            if (Objects.isNull(expression)) {
+                return null;
+            }
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            CommonTokenStream commonTokenStream = context.getCommonTokenStream();
+            Token database = null, table = null, column = null, alias = null;
+            String schemaText = null, tableText = null, columnText = null, aliasText = null;
+            ColumnInfo columnInfo;
+            List<Token> defaultChannelToken = TokenUtil.getParserRuleTokensOnDefault(commonTokenStream, expression);
+            int dotCount = defaultChannelToken.stream()
+                    .mapToInt(token -> (int) token.getText().chars().filter(ch -> ch == '.').count())
+                    .sum();
+            int defaultTokenSize = defaultChannelToken.size();
+            if (dotCount == 0) {
+                if (defaultTokenSize == 2) {
+                    alias = defaultChannelToken.get(1);
+                    aliasText = SqlStringUtil.removeQuote(alias.getText());
+                }
+                if (defaultTokenSize > 0) {
+                    column = defaultChannelToken.get(0);
+                    columnText = SqlStringUtil.removeQuote(column.getText());
+                }
+
+            } else if (dotCount == 1) {
+                if (defaultTokenSize - 1 == 3) {
+                    alias = defaultChannelToken.get(3);
+                    aliasText = SqlStringUtil.removeQuote(alias.getText());
+                }
+                if (defaultTokenSize > 2) {
+                    table = defaultChannelToken.get(0);
+                    column = defaultChannelToken.get(2);
+                    tableText = SqlStringUtil.removeQuote(table.getText());
+                    columnText = SqlStringUtil.removeQuote(column.getText());
+                }
+            } else if (dotCount == 2) {
+                if (defaultTokenSize - 2 == 4) {
+                    alias = defaultChannelToken.get(5);
+                    aliasText = SqlStringUtil.removeQuote(alias.getText());
+                }
+                if (defaultTokenSize > 4) {
+                    database = defaultChannelToken.get(0);
+                    table = defaultChannelToken.get(2);
+                    column = defaultChannelToken.get(4);
+                    schemaText = SqlStringUtil.removeQuote(database.getText());
+                    tableText = SqlStringUtil.removeQuote(table.getText());
+                    columnText = SqlStringUtil.removeQuote(column.getText());
+                }
+            }
+            if (Objects.isNull(alias) && Objects.nonNull(columnAliasContext)) {
+                alias = columnAliasContext.stop;
+                aliasText = SqlStringUtil.removeQuote(columnAliasContext.getText());
+            }
+
+            if (Objects.nonNull(column)) {
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(columnText);
+                identifier.setIdentifierType(IdentifierTypeEnum.COLUMN.name());
+                identifier.setFirstToken(column);
+                identifier.setIdentifierSchema(schemaText);
+                identifier.setIdentifierTable(tableText);
+                columnInfo = ColumnInfo.builder().schema(schemaText).table(tableText).column(columnText).build();
+                if (Objects.nonNull(alias)) {
+                    aliasText = alias.getText();
+                }
+                columnAliasMap.put(columnInfo, aliasText);
+            }
+            return null;
+
+        }).onFailure(e -> {
+            log.error("enter select list error", e);
+        });
+
+    }
+
+
+    @Override
+    public void enterTable_ref_aux(DMParser.Table_ref_auxContext ctx) {
+        Try.of(() -> {
+            DMParser.Table_ref_aux_internalContext tableRefAuxInternalContext = ctx.table_ref_aux_internal();
+            if (Objects.isNull(tableRefAuxInternalContext)) {
+                return null;
+            }
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            CommonTokenStream commonTokenStream = context.getCommonTokenStream();
+            Token database = null, table, alias = null;
+            String schemaText = null, tableText, aliasText = null;
+            TableInfo tableInfo;
+            DMParser.Table_aliasContext tableAliasContext = ctx.table_alias();
+            if (Objects.nonNull(tableAliasContext)) {
+                alias = tableAliasContext.stop;
+                aliasText = SqlStringUtil.removeQuote(tableAliasContext.getText());
+            }
+            List<Token> defaultChannelTokens = TokenUtil.getParserRuleTokensOnDefault(commonTokenStream, tableRefAuxInternalContext);
+            int dotCount = defaultChannelTokens.stream()
+                    .mapToInt(token -> (int) token.getText().chars().filter(ch -> ch == '.').count())
+                    .sum();
+            if (dotCount == 1) {
+                database = defaultChannelTokens.get(0);
+                schemaText = SqlStringUtil.removeQuote(database.getText());
+            }
+            table = defaultChannelTokens.get(defaultChannelTokens.size() - 1);
+            tableText = SqlStringUtil.removeQuote(table.getText());
+
+            if (Objects.nonNull(database)) {
+
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), database);
+            }
+            tableInfo = TableInfo.builder().schema(schemaText).table(tableText).build();
+            if (Objects.nonNull(alias)) {
+                aliasText = alias.getText();
+            }
+            tableAliasMap.put(tableInfo, aliasText);
+            return null;
+        }).onFailure(e -> log.error("enter table ref aux error", e));
+    }
+
+
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/DMRulePredicate.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/DMRulePredicate.java
new file mode 100644
index 0000000000..d572d2ef30
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/DMRulePredicate.java
@@ -0,0 +1,26 @@
+package ai.chat2db.plugin.dm.parser.rule;
+
+import ai.chat2db.spi.parser.AbstractRulePredicate;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+
+import java.util.List;
+
+public abstract class DMRulePredicate extends AbstractRulePredicate {
+
+
+    @Override
+    public boolean matches(List<Token> tokens, int currentIndex) {
+        return true;
+    }
+
+    @Override
+    public boolean needUpgradeBlock(List<Token> tokens, int currentIndex) {
+        return false;
+    }
+
+    @Override
+    public boolean matches(TokenStream tokenStream) {
+        return true;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/manager/DMRuleManager.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/manager/DMRuleManager.java
new file mode 100644
index 0000000000..118d7d6114
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/manager/DMRuleManager.java
@@ -0,0 +1,30 @@
+package ai.chat2db.plugin.dm.parser.rule.manager;
+
+import ai.chat2db.plugin.dm.parser.rule.predicate.*;
+import ai.chat2db.spi.parser.AbstractRuleManager;
+import ai.chat2db.spi.IRulePredicate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DMRuleManager extends AbstractRuleManager {
+
+
+    private static final Map<String, IRulePredicate> RULE_PREDICATES = new HashMap<>();
+
+    static {
+        RULE_PREDICATES.put("PACKAGE", new DMCreatePackagePredicate(1));
+        RULE_PREDICATES.put("IF", new DMIfBlockPredicate(20));
+        RULE_PREDICATES.put("FUNCTION",new DMCreateFunctionPredicate(100));
+        RULE_PREDICATES.put("PROCEDURE", new DMCreateProcedurePredicate(100));
+        RULE_PREDICATES.put(("BEGIN"),new DMBeginBlockPredicate(1));
+    }
+
+
+    @Override
+    public Map<String, IRulePredicate> getRules() {
+        return RULE_PREDICATES;
+    }
+
+
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMBeginBlockPredicate.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMBeginBlockPredicate.java
new file mode 100644
index 0000000000..25079d3629
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMBeginBlockPredicate.java
@@ -0,0 +1,32 @@
+package ai.chat2db.plugin.dm.parser.rule.predicate;
+
+import ai.chat2db.plugin.dm.parser.base.DMLexer;
+import ai.chat2db.plugin.dm.parser.rule.DMRulePredicate;
+import lombok.NoArgsConstructor;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+
+import java.util.List;
+import java.util.Set;
+
+@NoArgsConstructor
+public class DMBeginBlockPredicate extends DMRulePredicate {
+
+
+    public DMBeginBlockPredicate(int lookAheadTokens) {
+        this.lookaheadTokens = lookAheadTokens;
+    }
+
+    private static final Set<Integer> MATCH_TOKENS = Set.of(DMLexer.BACKUP, DMLexer.RETURN);
+
+    @Override
+    public boolean matches(List<Token> tokens, int currentIndex) {
+        return getNthValidTokenWithMatch(tokens, currentIndex, 1, Set.of("BACKUP", "RETURN")) == -1;
+
+    }
+
+    @Override
+    public boolean matches(TokenStream tokenStream) {
+        return getNthValidTokenWithMatch(tokenStream, 1, MATCH_TOKENS) == -1;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMCreateFunctionPredicate.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMCreateFunctionPredicate.java
new file mode 100644
index 0000000000..7e75870be6
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMCreateFunctionPredicate.java
@@ -0,0 +1,92 @@
+package ai.chat2db.plugin.dm.parser.rule.predicate;
+
+import ai.chat2db.plugin.dm.parser.base.DMLexer;
+import ai.chat2db.plugin.dm.parser.rule.DMRulePredicate;
+import ai.chat2db.spi.util.TokenUtil;
+import lombok.NoArgsConstructor;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+
+
+@NoArgsConstructor
+public class DMCreateFunctionPredicate extends DMRulePredicate {
+
+
+    public DMCreateFunctionPredicate(int lookAheadTokens) {
+        this.lookaheadTokens = lookAheadTokens;
+    }
+
+    @Override
+    public boolean matches(List<Token> tokens, int currentIndex) {
+        if (lookaheadTokens == 0) {
+            lookaheadTokens = tokens.size();
+        }
+        int lookaheadIndex = currentIndex + 1;
+        int valuableTokenFound = 0;
+
+        boolean encounteredIsOrAs = false;
+        while (lookaheadIndex < tokens.size() && valuableTokenFound < lookaheadTokens) {
+            Token token = tokens.get(lookaheadIndex);
+            if (!TokenUtil.hasValuableText(token)) {
+                lookaheadIndex++;
+                continue;
+            }
+            lookaheadIndex++;
+            valuableTokenFound++;
+            String text = token.getText().trim();
+            if (StringUtils.equalsAnyIgnoreCase(text, "IS", "AS")) {
+                encounteredIsOrAs = true;
+            } else if ("BEGIN".equalsIgnoreCase(text)) {
+                return true;
+            } else if (!encounteredIsOrAs && ";".equalsIgnoreCase(text)) {
+                return false;
+            } else if ("LANGUAGE".equalsIgnoreCase(text)) {
+                return false;
+            }
+
+        }
+        return false;
+
+    }
+
+    @Override
+    public boolean matches(TokenStream tokenStream) {
+
+        int valuableTokenFound = 0;
+        int offset = 2;
+        boolean encounteredIsOrAs = false;
+
+        while (valuableTokenFound < lookaheadTokens) {
+            Token token = tokenStream.LT(offset);
+            int tokenType = token.getType();
+            if (tokenType == Token.EOF) {
+                return false;
+            }
+
+            if (!TokenUtil.hasValuableText(token)) {
+                offset++;
+                continue;
+            }
+
+            valuableTokenFound++;
+            String text = token.getText().trim();
+            if (DMLexer.AS == tokenType || DMLexer.IS == tokenType) {
+                encounteredIsOrAs = true;
+            } else if (DMLexer.BEGIN == tokenType) {
+                return true;
+            } else if (!encounteredIsOrAs && DMLexer.SEMICOLON == tokenType) {
+                return false;
+            } else if (DMLexer.LANGUAGE == tokenType) {
+                return false;
+            }
+
+            offset++;
+        }
+
+        return false;
+    }
+
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMCreatePackagePredicate.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMCreatePackagePredicate.java
new file mode 100644
index 0000000000..cc9890ae7c
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMCreatePackagePredicate.java
@@ -0,0 +1,38 @@
+package ai.chat2db.plugin.dm.parser.rule.predicate;
+
+import ai.chat2db.plugin.dm.parser.rule.DMRulePredicate;
+import ai.chat2db.spi.util.TokenUtil;
+import org.antlr.v4.runtime.Token;
+
+import java.util.List;
+
+public class DMCreatePackagePredicate extends DMRulePredicate {
+
+
+    public DMCreatePackagePredicate(int lookAheadTokens) {
+       this.lookaheadTokens = lookAheadTokens;
+    }
+
+
+    @Override
+    public boolean needUpgradeBlock(List<Token> tokens, int currentIndex) {
+        int lookaheadIndex = currentIndex + 1;
+        int valuableTokenFound = 0;
+        while (lookaheadIndex < tokens.size() && valuableTokenFound < lookaheadTokens) {
+            Token token = tokens.get(lookaheadIndex);
+            if (!TokenUtil.hasValuableText(token)) {
+                lookaheadIndex++;
+                continue;
+            }
+            valuableTokenFound++;
+            String text = token.getText().trim();
+            if (valuableTokenFound == 1 && "BODY".equalsIgnoreCase(text)) {
+                return false;
+            }
+            lookaheadIndex++;
+
+        }
+
+        return true;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMCreateProcedurePredicate.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMCreateProcedurePredicate.java
new file mode 100644
index 0000000000..04b11d5cbe
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMCreateProcedurePredicate.java
@@ -0,0 +1,106 @@
+package ai.chat2db.plugin.dm.parser.rule.predicate;
+
+import ai.chat2db.plugin.dm.parser.base.DMLexer;
+import ai.chat2db.plugin.dm.parser.rule.DMRulePredicate;
+import ai.chat2db.spi.util.TokenUtil;
+import lombok.NoArgsConstructor;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+
+@NoArgsConstructor
+public class DMCreateProcedurePredicate extends DMRulePredicate {
+
+
+    public DMCreateProcedurePredicate(int lookAheadTokens) {
+        this.lookaheadTokens = lookAheadTokens;
+    }
+
+
+    @Override
+    public boolean matches(List<Token> tokens, int currentIndex) {
+        if (lookaheadTokens == 0) {
+            lookaheadTokens = tokens.size();
+        }
+        int lookaheadIndex = currentIndex + 1;
+        int valuableTokenFound = 0;
+
+        boolean encounteredIsOrAs = false;
+        boolean previousIsLeftParen = getNthValidTokenWithMatchBackward(tokens, currentIndex, 1, "(") != -1;
+
+        while (lookaheadIndex < tokens.size() && valuableTokenFound < lookaheadTokens) {
+            Token token = tokens.get(lookaheadIndex);
+            if (!TokenUtil.hasValuableText(token)) {
+                lookaheadIndex++;
+                continue;
+            }
+            lookaheadIndex++;
+            valuableTokenFound++;
+            String text = token.getText().trim();
+            if (StringUtils.equalsAnyIgnoreCase(text, "IS", "AS")) {
+                encounteredIsOrAs = true;
+            } else if ("BEGIN".equalsIgnoreCase(text)) {
+                return true;
+            } else if (!encounteredIsOrAs && ";".equalsIgnoreCase(text)) {
+                return false;
+            } else if ("LANGUAGE".equalsIgnoreCase(text)) {
+                return false;
+            } else if ("EXTERNAL".equalsIgnoreCase(text)) {
+                return false;
+            } else if (previousIsLeftParen && ")".equalsIgnoreCase(text)) {
+                return false;
+            }
+
+        }
+        return false;
+
+    }
+
+
+    @Override
+    public boolean matches(TokenStream tokenStream) {
+
+        int offset = 2;
+        int valuableTokenFound = 0;
+
+        boolean encounteredIsOrAs = false;
+
+
+        while (valuableTokenFound < lookaheadTokens) {
+            Token token = tokenStream.LT(offset);
+            int tokenType = token.getType();
+            if (tokenType == Token.EOF) {
+                return false;
+            }
+            if (!TokenUtil.hasValuableText(token)) {
+                offset++;
+                continue;
+            }
+
+            valuableTokenFound++;
+            switch (tokenType) {
+                case DMLexer.IS:
+                case DMLexer.AS:
+                    encounteredIsOrAs = true;
+                    break;
+                case DMLexer.BEGIN:
+                    return true;
+                case DMLexer.SEMICOLON:
+                    if (!encounteredIsOrAs) {
+                        return false;
+                    }
+                    break;
+                case DMLexer.LANGUAGE:
+                case DMLexer.EXTERNAL:
+                    return false;
+            }
+
+            offset++;
+        }
+        return false;
+    }
+
+
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMIfBlockPredicate.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMIfBlockPredicate.java
new file mode 100644
index 0000000000..411fd74bbb
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/rule/predicate/DMIfBlockPredicate.java
@@ -0,0 +1,50 @@
+package ai.chat2db.plugin.dm.parser.rule.predicate;
+
+import ai.chat2db.plugin.dm.parser.base.DMLexer;
+import ai.chat2db.plugin.dm.parser.rule.DMRulePredicate;
+import ai.chat2db.spi.util.TokenUtil;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+
+import java.util.List;
+import java.util.Set;
+
+public class DMIfBlockPredicate extends DMRulePredicate {
+
+    public DMIfBlockPredicate(int lookAheadTokens) {
+        this.lookaheadTokens = lookAheadTokens;
+    }
+
+    private static final Set<Integer> MATCH_TOKENS = Set.of(DMLexer.NOT, DMLexer.EXISTS);
+
+    @Override
+    public boolean matches(List<Token> tokens, int currentIndex) {
+        int lookaheadIndex = currentIndex + 1;
+        int valuableTokenFound = 0;
+
+        while (lookaheadIndex < tokens.size() && valuableTokenFound < lookaheadTokens) {
+            Token token = tokens.get(lookaheadIndex);
+            if (!TokenUtil.hasValuableText(token)) {
+                lookaheadIndex++;
+                continue;
+            }
+            valuableTokenFound++;
+            String text = token.getText().trim();
+            if ("THEN".equalsIgnoreCase(text)) {
+                return true;
+            } else if ("NOT".equalsIgnoreCase(text) && valuableTokenFound == 1) {
+                return false;
+            } else if ("EXISTS".equalsIgnoreCase(text) && valuableTokenFound == 1) {
+                return false;
+            }
+            lookaheadIndex++;
+
+        }
+        return false;
+    }
+
+    @Override
+    public boolean matches(TokenStream tokenStream) {
+        return getNthValidTokenWithMatch(tokenStream, 1, MATCH_TOKENS) == -1;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMCreateTableVisitor.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMCreateTableVisitor.java
new file mode 100644
index 0000000000..9a8be76d55
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMCreateTableVisitor.java
@@ -0,0 +1,13 @@
+package ai.chat2db.plugin.dm.parser.visitor;
+
+import ai.chat2db.community.domain.api.model.parser.statement.StatementContext;
+import ai.chat2db.plugin.dm.parser.base.DMParserBaseVisitor;
+
+public class DMCreateTableVisitor extends DMParserBaseVisitor<Void> {
+
+    private StatementContext context;
+
+    public DMCreateTableVisitor(StatementContext context) {
+        this.context = context;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMParserVisitor.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMParserVisitor.java
new file mode 100644
index 0000000000..f58273c14c
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMParserVisitor.java
@@ -0,0 +1,1075 @@
+package ai.chat2db.plugin.dm.parser.visitor;
+
+import ai.chat2db.community.domain.api.enums.parser.IdentifierTypeEnum;
+import ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum;
+import ai.chat2db.community.domain.api.enums.parser.StatementValidTypeEnum;
+import ai.chat2db.community.domain.api.model.parser.statement.Statement;
+import ai.chat2db.community.domain.api.model.parser.statement.StatementContext;
+import ai.chat2db.community.domain.api.model.parser.statement.insert.InsertRowTokenRange;
+import ai.chat2db.community.domain.api.model.parser.token.Identifier;
+import ai.chat2db.plugin.dm.parser.base.DMParser;
+import ai.chat2db.plugin.dm.parser.base.DMParserBaseVisitor;
+import ai.chat2db.spi.util.InsertValueTokenUtil;
+import ai.chat2db.spi.util.SqlCommentUtil;
+import ai.chat2db.spi.util.SqlStringUtil;
+import ai.chat2db.spi.util.TokenUtil;
+import io.vavr.control.Try;
+import lombok.extern.slf4j.Slf4j;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+public class DMParserVisitor extends DMParserBaseVisitor<Void> {
+
+    private final StatementContext context;
+
+    public DMParserVisitor(StatementContext context) {
+        this.context = context;
+    }
+
+
+    @Override
+    public Void visitSql_script(DMParser.Sql_scriptContext ctx) {
+
+        List<DMParser.Unit_statementContext> unitStatement = ctx.unit_statement();
+        TokenStream commonTokenStream = context.getCommonTokenStream();
+        for (int i = 0; i < unitStatement.size(); i++) {
+            DMParser.Unit_statementContext child = unitStatement.get(i);
+            Statement statement = new Statement();
+            int sqlCommentSearchStartIndex = 0;
+            if (i != 0) {
+                DMParser.Unit_statementContext unitStatementContext = unitStatement.get(i - 1);
+                if (Objects.nonNull(unitStatementContext)) {
+                    sqlCommentSearchStartIndex = unitStatementContext.getStop().getTokenIndex();
+
+                }
+            }
+            int sqlCommentSearchEndIndex = child.getStart().getTokenIndex();
+            String sqlComment = SqlCommentUtil.searchSqlComment(sqlCommentSearchStartIndex, sqlCommentSearchEndIndex, commonTokenStream);
+            statement.setComment(sqlComment);
+            context.setCurrentStatement(statement);
+            statement.setStatementType(StatementValidTypeEnum.VALID.name());
+            String sql = "";
+            if (StringUtils.isNotBlank(sqlComment)) {
+                sql = "--" + " " + sqlComment + "\n";
+            }
+            sql += commonTokenStream.getText(child.getSourceInterval());
+            statement.setSql(sql);
+            statement.setFirstToken(child.getStart());
+            statement.setLastToken(child.getStop());
+            context.addStatement(statement);
+            visit(child);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitExplain_statement(DMParser.Explain_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.EXPLAIN.name());
+        return null;
+    }
+
+    @Override
+    public Void visitAlter_table(DMParser.Alter_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_TABLE.name());
+        DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+        visitTableViewName(tableviewNameContext, IdentifierTypeEnum.TABLE);
+        return null;
+    }
+
+    @Override
+    public Void visitSelect_statement(DMParser.Select_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.SELECT.name());
+        return super.visitSelect_statement(ctx);
+    }
+
+
+    @Override
+    public Void visitCreate_function_body(DMParser.Create_function_bodyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_FUNCTION.name());
+        String sql = currentStatement.getSql();
+        if (!sql.endsWith(";")) {
+            sql = sql + ";";
+            currentStatement.setSql(sql);
+        }
+        return super.visitCreate_function_body(ctx);
+    }
+
+
+    @Override
+    public Void visitAnonymous_block(DMParser.Anonymous_blockContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ANONYMOUS_BLOCK.name());
+        String sql = currentStatement.getSql();
+        if (!sql.endsWith(";")) {
+            sql = sql + ";";
+            currentStatement.setSql(sql);
+        }
+        return super.visitAnonymous_block(ctx);
+    }
+
+    @Override
+    public Void visitFunction_name(DMParser.Function_nameContext ctx) {
+        Try.run(() -> {
+            Token start = ctx.getStart();
+            Token stop = ctx.getStop();
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return;
+            }
+            if (start.getTokenIndex() == stop.getTokenIndex()) {
+                currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                        IdentifierTypeEnum.FUNCTION.name(), start);
+            } else {
+                String schemaText = SqlStringUtil.removeQuote(start.getText());
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), start);
+                Identifier identifier = new Identifier();
+                String functionText = SqlStringUtil.removeQuote(stop.getText());
+                identifier.setIdentifierName(functionText);
+                identifier.setIdentifierType(IdentifierTypeEnum.FUNCTION.name());
+                identifier.setFirstToken(stop);
+                identifier.setIdentifierSchema(schemaText);
+                currentStatement.addIdentifier(identifier);
+            }
+        }).onFailure(e -> {
+            log.error("visitFunction_name error", e);
+        });
+        return super.visitFunction_name(ctx);
+    }
+
+    @Override
+    public Void visitCreate_procedure_body(DMParser.Create_procedure_bodyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_PROCEDURE.name());
+        String sql = currentStatement.getSql();
+        if (!sql.endsWith(";")) {
+            sql = sql + ";";
+            currentStatement.setSql(sql);
+        }
+        return super.visitCreate_procedure_body(ctx);
+    }
+
+    @Override
+    public Void visitProcedure_name(DMParser.Procedure_nameContext ctx) {
+        Try.run(() -> {
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return;
+            }
+            Token start = ctx.getStart();
+            Token stop = ctx.getStop();
+            if (start.getTokenIndex() == stop.getTokenIndex()) {
+                currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                        IdentifierTypeEnum.PROCEDURE.name(), start);
+            } else {
+                String schemaText = SqlStringUtil.removeQuote(start.getText());
+
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), start);
+                String procedureText = SqlStringUtil.removeQuote(stop.getText());
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(procedureText);
+                identifier.setIdentifierType(IdentifierTypeEnum.PROCEDURE.name());
+                identifier.setFirstToken(stop);
+                identifier.setIdentifierSchema(schemaText);
+
+                currentStatement.addIdentifier(identifier);
+            }
+        }).onFailure(e -> {
+            log.error("visitProcedure_name error", e);
+        });
+        return super.visitProcedure_name(ctx);
+    }
+
+    @Override
+    public Void visitCreate_trigger(DMParser.Create_triggerContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_TRIGGER.name());
+        String sql = currentStatement.getSql();
+        if (!sql.endsWith(";")) {
+            sql = sql + ";";
+            currentStatement.setSql(sql);
+        }
+        return super.visitCreate_trigger(ctx);
+    }
+
+    @Override
+    public Void visitTrigger_name(DMParser.Trigger_nameContext ctx) {
+        Try.run(() -> {
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return;
+            }
+            Token start = ctx.getStart();
+            Token stop = ctx.getStop();
+            if (start.getTokenIndex() == stop.getTokenIndex()) {
+                currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                        IdentifierTypeEnum.TRIGGER.name(), start);
+            } else {
+                String schemaText = SqlStringUtil.removeQuote(start.getText());
+
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), start);
+                String triggerText = SqlStringUtil.removeQuote(stop.getText());
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(triggerText);
+                identifier.setIdentifierType(IdentifierTypeEnum.TRIGGER.name());
+                identifier.setFirstToken(stop);
+                identifier.setIdentifierSchema(schemaText);
+
+                currentStatement.addIdentifier(identifier);
+            }
+        }).onFailure(e -> {
+            log.error("visitTrigger_name error", e);
+        });
+        return super.visitTrigger_name(ctx);
+    }
+
+    @Override
+    public Void visitCreate_index(DMParser.Create_indexContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_INDEX.name());
+        DMParser.Table_index_clauseContext tableIndexClauseContext = ctx.table_index_clause();
+        if (Objects.nonNull(tableIndexClauseContext)) {
+            DMParser.Tableview_nameContext tableviewNameContext = tableIndexClauseContext.tableview_name();
+            visitTableViewName(tableviewNameContext, IdentifierTypeEnum.TABLE);
+        }
+        return super.visitCreate_index(ctx);
+    }
+
+    @Override
+    public Void visitIndex_name(DMParser.Index_nameContext ctx) {
+        Try.run(() -> {
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return;
+            }
+            Token start = ctx.getStart();
+            Token stop = ctx.getStop();
+            if (start.getTokenIndex() == stop.getTokenIndex()) {
+                currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                        IdentifierTypeEnum.INDEX.name(), start);
+            } else {
+                String tableText = SqlStringUtil.removeQuote(start.getText());
+
+                currentStatement.addIdentifier(tableText,
+                        IdentifierTypeEnum.TABLE.name(), start);
+                String indexText = SqlStringUtil.removeQuote(stop.getText());
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(indexText);
+                identifier.setIdentifierType(IdentifierTypeEnum.INDEX.name());
+                identifier.setFirstToken(stop);
+                identifier.setIdentifierTable(tableText);
+
+                currentStatement.addIdentifier(identifier);
+            }
+        }).onFailure(e -> {
+            log.error("visitIndex_name error", e);
+        });
+        return super.visitIndex_name(ctx);
+    }
+
+    private void visitTableViewName(DMParser.Tableview_nameContext ctx, IdentifierTypeEnum identifierTypeEnum) {
+        Try.run(() -> {
+            if (Objects.nonNull(ctx)) {
+                Token start = ctx.getStart();
+                Token stop = ctx.getStop();
+                Statement currentStatement = context.getCurrentStatement();
+                if (Objects.isNull(currentStatement)) {
+                    return;
+                }
+                if (start.getTokenIndex() == stop.getTokenIndex()) {
+                    currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                            identifierTypeEnum.name(), start);
+                } else {
+                    String schemaText = SqlStringUtil.removeQuote(start.getText());
+
+                    currentStatement.addIdentifier(schemaText,
+                            IdentifierTypeEnum.SCHEMA.name(), start);
+                    String tableViewText = SqlStringUtil.removeQuote(stop.getText());
+                    Identifier identifier = new Identifier();
+                    identifier.setIdentifierName(tableViewText);
+                    identifier.setIdentifierType(identifierTypeEnum.name());
+                    identifier.setFirstToken(stop);
+                    identifier.setIdentifierSchema(schemaText);
+
+                    currentStatement.addIdentifier(identifier);
+                }
+            }
+        }).onFailure(e -> log.error("visitTableViewName error", e));
+
+    }
+
+
+    @Override
+    public Void visitCreate_user(DMParser.Create_userContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_USER.name());
+        DMParser.User_object_nameContext userObjectNameContext = ctx.user_object_name();
+        if (Objects.nonNull(userObjectNameContext)) {
+            Token start = userObjectNameContext.getStart();
+            currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                    IdentifierTypeEnum.USER.name(), start);
+        }
+        return super.visitCreate_user(ctx);
+    }
+
+
+    @Override
+    public Void visitCreate_view(DMParser.Create_viewContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_VIEW.name());
+        Try.run(() -> {
+            DMParser.Schema_nameContext schemaNameContext = ctx.schema_name();
+            String schemaText = null;
+            if (Objects.nonNull(schemaNameContext)) {
+                Token start = schemaNameContext.getStart();
+                schemaText = SqlStringUtil.removeQuote(start.getText());
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), start);
+            }
+            DMParser.Id_expressionContext idExpressionContext = ctx.id_expression(0);
+            if (Objects.nonNull(idExpressionContext)) {
+                Token start = idExpressionContext.getStart();
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(SqlStringUtil.removeQuote(start.getText()));
+                identifier.setIdentifierType(IdentifierTypeEnum.VIEW.name());
+                identifier.setFirstToken(start);
+                identifier.setIdentifierSchema(schemaText);
+                currentStatement.addIdentifier(identifier);
+            }
+        }).onFailure(e -> {
+            log.error("visitCreate_view error", e);
+        });
+
+        return super.visitCreate_view(ctx);
+    }
+
+
+    @Override
+    public Void visitCreate_role(DMParser.Create_roleContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_ROLE.name());
+        DMParser.Role_nameContext roleNameContext = ctx.role_name();
+        if (Objects.nonNull(roleNameContext)) {
+            Token start = roleNameContext.getStart();
+            currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                    IdentifierTypeEnum.ROLE.name(), start);
+        }
+        return super.visitCreate_role(ctx);
+    }
+
+    @Override
+    public Void visitCreate_table(DMParser.Create_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_TABLE.name());
+        return super.visitCreate_table(ctx);
+    }
+
+    @Override
+    public Void visitTable_name(DMParser.Table_nameContext ctx) {
+        Try.run(() -> {
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return;
+            }
+            Token start = ctx.getStart();
+            Token stop = ctx.getStop();
+            if (start.getTokenIndex() == stop.getTokenIndex()) {
+                currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                        IdentifierTypeEnum.TABLE.name(), start);
+            } else {
+                String schemaText = SqlStringUtil.removeQuote(start.getText());
+
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), start);
+                String tableText = SqlStringUtil.removeQuote(stop.getText());
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(tableText);
+                identifier.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+                identifier.setFirstToken(stop);
+                identifier.setIdentifierSchema(schemaText);
+
+                currentStatement.addIdentifier(identifier);
+            }
+        }).onFailure(e -> {
+            log.error("visitTable_name error", e);
+        });
+
+        return super.visitTable_name(ctx);
+    }
+
+    @Override
+    public Void visitSchema_name(DMParser.Schema_nameContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        Token start = ctx.getStart();
+        currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                IdentifierTypeEnum.SCHEMA.name(), start);
+        return super.visitSchema_name(ctx);
+    }
+
+    @Override
+    public Void visitCreate_database(DMParser.Create_databaseContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_DATABASE.name());
+        return super.visitCreate_database(ctx);
+    }
+
+    @Override
+    public Void visitDatabase_name(DMParser.Database_nameContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        Token start = ctx.getStart();
+        currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                IdentifierTypeEnum.SCHEMA.name(), start);
+        return super.visitDatabase_name(ctx);
+    }
+
+    @Override
+    public Void visitDrop_function(DMParser.Drop_functionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_FUNCTION.name());
+        return super.visitDrop_function(ctx);
+    }
+
+    @Override
+    public Void visitDrop_procedure(DMParser.Drop_procedureContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_PROCEDURE.name());
+        return super.visitDrop_procedure(ctx);
+    }
+
+    @Override
+    public Void visitDrop_role(DMParser.Drop_roleContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_ROLE.name());
+        DMParser.Role_nameContext roleNameContext = ctx.role_name();
+        if (Objects.nonNull(roleNameContext)) {
+            Token start = roleNameContext.getStart();
+            currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                    IdentifierTypeEnum.ROLE.name(), start);
+        }
+        return super.visitDrop_role(ctx);
+    }
+
+    @Override
+    public Void visitDrop_trigger(DMParser.Drop_triggerContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_TRIGGER.name());
+        return super.visitDrop_trigger(ctx);
+    }
+
+
+    @Override
+    public Void visitDrop_user(DMParser.Drop_userContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_USER.name());
+        DMParser.User_object_nameContext userObjectNameContext = ctx.user_object_name();
+        if (Objects.nonNull(userObjectNameContext)) {
+            Token start = userObjectNameContext.getStart();
+            currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                    IdentifierTypeEnum.USER.name(), start);
+        }
+        return super.visitDrop_user(ctx);
+    }
+
+    @Override
+    public Void visitDrop_index(DMParser.Drop_indexContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_INDEX.name());
+        return super.visitDrop_index(ctx);
+    }
+
+
+    @Override
+    public Void visitDrop_table(DMParser.Drop_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_TABLE.name());
+        DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+        visitTableViewName(tableviewNameContext, IdentifierTypeEnum.TABLE);
+        return super.visitDrop_table(ctx);
+    }
+
+
+    @Override
+    public Void visitDrop_view(DMParser.Drop_viewContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_VIEW.name());
+        DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+        visitTableViewName(tableviewNameContext, IdentifierTypeEnum.VIEW);
+        return super.visitDrop_view(ctx);
+    }
+
+
+    @Override
+    public Void visitAlter_session(DMParser.Alter_sessionContext ctx) {
+
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        DMParser.Alter_session_set_clauseContext alterSessionSetClauseContext = ctx.alter_session_set_clause();
+        if (Objects.isNull(alterSessionSetClauseContext)
+                || alterSessionSetClauseContext.parameter_name().isEmpty()
+                || !"CURRENT_SCHEMA".equalsIgnoreCase(
+                        alterSessionSetClauseContext.parameter_name(0).getText())) {
+            return super.visitAlter_session(ctx);
+        }
+        currentStatement.setType(SqlTypeEnum.SET_SCHEMA.name());
+        Try.run(() -> {
+            DMParser.Parameter_valueContext parameterValueContext = alterSessionSetClauseContext.parameter_value(0);
+            if (Objects.nonNull(parameterValueContext)) {
+                String schemaText = SqlStringUtil.removeQuote(parameterValueContext.getText());
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), parameterValueContext.getStart());
+            }
+        }).onFailure(e -> {
+            log.error("alter session error", e);
+        });
+        return super.visitAlter_session(ctx);
+    }
+
+    @Override
+    public Void visitDml_table_expression_clause(DMParser.Dml_table_expression_clauseContext ctx) {
+        DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+        visitTableViewName(tableviewNameContext, IdentifierTypeEnum.TABLE);
+        return super.visitDml_table_expression_clause(ctx);
+    }
+
+    @Override
+    public Void visitUpdate_statement(DMParser.Update_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.UPDATE.name());
+        return super.visitUpdate_statement(ctx);
+    }
+
+    @Override
+    public Void visitInsert_statement(DMParser.Insert_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.INSERT.name());
+        visitInsertValueMappings(context, ctx);
+        return super.visitInsert_statement(ctx);
+    }
+
+    static void visitInsertValueMappings(StatementContext context, DMParser.Insert_statementContext ctx) {
+        Try.run(() -> {
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement) || Objects.isNull(ctx)) {
+                return;
+            }
+            DMParser.Single_table_insertContext singleTableInsertContext = ctx.single_table_insert();
+            if (Objects.isNull(singleTableInsertContext)) {
+                return;
+            }
+            DMParser.Insert_into_clauseContext insertIntoClauseContext = singleTableInsertContext.insert_into_clause();
+            DMParser.Values_clauseContext valuesClauseContext = singleTableInsertContext.values_clause();
+            if (Objects.isNull(insertIntoClauseContext)) {
+                return;
+            }
+            DMParser.Paren_column_listContext columnListContext = insertIntoClauseContext.paren_column_list();
+            DMParser.ExpressionsContext expressionsContext = Objects.nonNull(valuesClauseContext)
+                    ? valuesClauseContext.expressions() : null;
+            if (Objects.isNull(columnListContext) || Objects.isNull(columnListContext.column_list())) {
+                return;
+            }
+            List<DMParser.Column_nameContext> columnContexts = columnListContext.column_list().column_name();
+            if (CollectionUtils.isEmpty(columnContexts)) {
+                return;
+            }
+            List<InsertRowTokenRange> rowTokenRanges = getInsertRowTokenRanges(context, ctx, valuesClauseContext);
+            if (rowTokenRanges.isEmpty()) {
+                return;
+            }
+            Token rowFirstToken = rowTokenRanges.get(0).getFirstToken();
+            Token rowLastToken = rowTokenRanges.get(0).getLastToken();
+            List<DMParser.ExpressionContext> valueContexts = Objects.nonNull(expressionsContext)
+                    ? expressionsContext.expression() : List.of();
+
+            int columnSize = Math.min(columnContexts.size(), valueContexts.size());
+            for (int columnIndex = 0; columnIndex < columnSize; columnIndex++) {
+                DMParser.Column_nameContext columnContext = columnContexts.get(columnIndex);
+                DMParser.ExpressionContext expressionContext = valueContexts.get(columnIndex);
+                if (Objects.isNull(columnContext) || Objects.isNull(expressionContext)) {
+                    continue;
+                }
+                currentStatement.addInsertValueMapping(columnContext.getStart(), columnContext.getStop(),
+                        expressionContext.getStart(), expressionContext.getStop(), rowFirstToken, rowLastToken,
+                        0, columnIndex);
+            }
+            for (int columnIndex = columnSize; columnIndex < columnContexts.size(); columnIndex++) {
+                DMParser.Column_nameContext columnContext = columnContexts.get(columnIndex);
+                if (Objects.isNull(columnContext)) {
+                    continue;
+                }
+                currentStatement.addUnmappedInsertColumn(columnContext.getStart(), columnContext.getStop(),
+                        rowFirstToken, rowLastToken, 0, columnIndex);
+            }
+            for (int valueIndex = columnSize; valueIndex < valueContexts.size(); valueIndex++) {
+                DMParser.ExpressionContext expressionContext = valueContexts.get(valueIndex);
+                if (Objects.isNull(expressionContext)) {
+                    continue;
+                }
+                currentStatement.addUnmappedInsertValue(expressionContext.getStart(), expressionContext.getStop(),
+                        rowFirstToken, rowLastToken, 0, valueIndex);
+            }
+        }).onFailure(e -> log.error("oracle visitInsertValueMappings error", e));
+    }
+
+    private static List<InsertRowTokenRange> getInsertRowTokenRanges(StatementContext context,
+                                                                     DMParser.Insert_statementContext ctx,
+                                                                     DMParser.Values_clauseContext valuesClauseContext) {
+        List<InsertRowTokenRange> rowTokenRanges = List.of();
+        if (Objects.nonNull(valuesClauseContext)) {
+            Token rowFirstToken = Objects.nonNull(valuesClauseContext.LEFT_PAREN())
+                    ? valuesClauseContext.LEFT_PAREN().getSymbol() : valuesClauseContext.getStart();
+            Token rowLastToken = Objects.nonNull(valuesClauseContext.RIGHT_PAREN())
+                    ? valuesClauseContext.RIGHT_PAREN().getSymbol() : valuesClauseContext.getStop();
+            rowTokenRanges = InsertValueTokenUtil.singleRowTokenRange(rowFirstToken, rowLastToken);
+        }
+        if (!rowTokenRanges.isEmpty()) {
+            return rowTokenRanges;
+        }
+        return InsertValueTokenUtil.searchValuesRowTokenRanges(context, ctx.getStart(), ctx.getStop());
+    }
+
+    @Override
+    public Void visitDelete_statement(DMParser.Delete_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DELETE.name());
+        return super.visitDelete_statement(ctx);
+    }
+
+    @Override
+    public Void visitColumn_name(DMParser.Column_nameContext ctx) {
+        Try.of(() -> {
+            DMParser.IdentifierContext identifier = ctx.identifier();
+            if (Objects.isNull(identifier)) {
+                return null;
+            }
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            List<DMParser.Id_expressionContext> idExpressionContexts = ctx.id_expression();
+            if (CollectionUtils.isEmpty(idExpressionContexts)) {
+                currentStatement.addIdentifier(SqlStringUtil.removeQuote(identifier.getText()),
+                        IdentifierTypeEnum.COLUMN.name(), identifier.getStart());
+            } else {
+                String schemaText = null, tableText = null, columnText = null;
+                Token databaseToken = null, tableToken = null, columnToken = null;
+                if (idExpressionContexts.size() == 2) {
+                    databaseToken = identifier.getStart();
+                    tableToken = idExpressionContexts.get(0).getStop();
+                    columnToken = idExpressionContexts.get(1).getStop();
+                    schemaText = SqlStringUtil.removeQuote(SqlStringUtil.removeQuote(identifier.getText()));
+                    tableText = SqlStringUtil.removeQuote(SqlStringUtil.removeQuote(idExpressionContexts.get(0).getText()));
+                    columnText = SqlStringUtil.removeQuote(SqlStringUtil.removeQuote(idExpressionContexts.get(1).getText()));
+                } else if (idExpressionContexts.size() == 1) {
+                    tableToken = identifier.getStop();
+                    columnToken = idExpressionContexts.get(0).getStop();
+                    tableText = SqlStringUtil.removeQuote(SqlStringUtil.removeQuote(identifier.getText()));
+                    columnText = SqlStringUtil.removeQuote(SqlStringUtil.removeQuote(idExpressionContexts.get(0).getText()));
+                }
+
+                if (Objects.nonNull(databaseToken)) {
+
+                    currentStatement.addIdentifier(schemaText,
+                            IdentifierTypeEnum.SCHEMA.name(), databaseToken);
+                }
+                if (Objects.nonNull(tableToken)) {
+                    Identifier identifier1 = new Identifier();
+                    identifier1.setIdentifierName(tableText);
+                    identifier1.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+                    identifier1.setFirstToken(tableToken);
+                    identifier1.setIdentifierDatabase(schemaText);
+
+                    currentStatement.addIdentifier(identifier1);
+                }
+                if (Objects.nonNull(columnToken)) {
+                    Identifier identifier1 = new Identifier();
+                    identifier1.setIdentifierName(columnText);
+                    identifier1.setIdentifierType(IdentifierTypeEnum.COLUMN.name());
+                    identifier1.setFirstToken(columnToken);
+                    identifier1.setIdentifierDatabase(schemaText);
+                    identifier1.setIdentifierTable(tableText);
+                    currentStatement.addIdentifier(identifier1);
+                }
+            }
+            return null;
+        }).onFailure(e -> {
+            log.error("visitColumn_name error", e);
+        });
+
+        return null;
+    }
+
+
+    @Override
+    public Void visitSelect_list_elements(DMParser.Select_list_elementsContext ctx) {
+        Try.of(() -> {
+            DMParser.Column_aliasContext columnAliasContext = ctx.column_alias();
+            DMParser.ExpressionContext expression = ctx.expression();
+            if (Objects.isNull(expression)) {
+                return null;
+            }
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            CommonTokenStream commonTokenStream = context.getCommonTokenStream();
+            Token database = null, table = null, column = null, alias = null;
+            String schemaText = null, tableText = null, columnText = null, aliasText = null;
+            List<Token> defaultChannelToken = TokenUtil.getParserRuleTokensOnDefault(commonTokenStream, expression);
+            int dotCount = defaultChannelToken.stream()
+                    .mapToInt(token -> (int) token.getText().chars().filter(ch -> ch == '.').count())
+                    .sum();
+            int defaultTokenSize = defaultChannelToken.size();
+            if (dotCount == 0) {
+                if (defaultTokenSize == 2) {
+                    alias = defaultChannelToken.get(1);
+                    aliasText = SqlStringUtil.removeQuote(alias.getText());
+                }
+                if (defaultTokenSize > 0) {
+                    column = defaultChannelToken.get(0);
+                    columnText = SqlStringUtil.removeQuote(column.getText());
+                }
+
+            } else if (dotCount == 1) {
+                if (defaultTokenSize - 1 == 3) {
+                    alias = defaultChannelToken.get(3);
+                    aliasText = SqlStringUtil.removeQuote(alias.getText());
+                }
+                if (defaultTokenSize > 2) {
+                    table = defaultChannelToken.get(0);
+                    column = defaultChannelToken.get(2);
+                    tableText = SqlStringUtil.removeQuote(table.getText());
+                    columnText = SqlStringUtil.removeQuote(column.getText());
+                }
+            } else if (dotCount == 2) {
+                if (defaultTokenSize - 2 == 4) {
+                    alias = defaultChannelToken.get(5);
+                    aliasText = SqlStringUtil.removeQuote(alias.getText());
+                }
+                if (defaultTokenSize > 4) {
+                    database = defaultChannelToken.get(0);
+                    table = defaultChannelToken.get(2);
+                    column = defaultChannelToken.get(4);
+                    schemaText = SqlStringUtil.removeQuote(database.getText());
+                    tableText = SqlStringUtil.removeQuote(table.getText());
+                    columnText = SqlStringUtil.removeQuote(column.getText());
+                }
+            }
+            if (Objects.isNull(alias) && Objects.nonNull(columnAliasContext)) {
+                alias = columnAliasContext.stop;
+                aliasText = SqlStringUtil.removeQuote(columnAliasContext.getText());
+            }
+            if (Objects.nonNull(database)) {
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), database);
+            }
+            if (Objects.nonNull(table)) {
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(tableText);
+                identifier.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+                identifier.setFirstToken(table);
+                identifier.setIdentifierSchema(schemaText);
+
+                currentStatement.addIdentifier(identifier);
+            }
+            if (Objects.nonNull(column)) {
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(columnText);
+                identifier.setIdentifierType(IdentifierTypeEnum.COLUMN.name());
+                identifier.setFirstToken(column);
+                identifier.setIdentifierSchema(schemaText);
+                identifier.setIdentifierTable(tableText);
+                if (Objects.nonNull(alias)) {
+                    identifier.setIdentifierAlias(aliasText);
+                    identifier.setLastToken(alias);
+                }
+                currentStatement.addIdentifier(identifier);
+            }
+            return null;
+
+        }).onFailure(e -> {
+            log.error("visit select list error", e);
+        });
+
+        return null;
+    }
+
+
+    @Override
+    public Void visitTable_ref_aux(DMParser.Table_ref_auxContext ctx) {
+        if (ctx.getStart().getText().equalsIgnoreCase("(")) {
+            return super.visitTable_ref_aux(ctx);
+        }
+        Try.of(() -> {
+            DMParser.Table_ref_aux_internalContext tableRefAuxInternalContext = ctx.table_ref_aux_internal();
+            if (Objects.isNull(tableRefAuxInternalContext)) {
+                return null;
+            }
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            CommonTokenStream commonTokenStream = context.getCommonTokenStream();
+            Token database = null, table, alias = null;
+            String schemaText = null, tableText, aliasText = null;
+            DMParser.Table_aliasContext tableAliasContext = ctx.table_alias();
+            if (Objects.nonNull(tableAliasContext)) {
+                alias = tableAliasContext.stop;
+                aliasText = SqlStringUtil.removeQuote(tableAliasContext.getText());
+            }
+            List<Token> defaultChannelTokens = TokenUtil.getParserRuleTokensOnDefault(commonTokenStream, tableRefAuxInternalContext);
+            int dotCount = defaultChannelTokens.stream()
+                    .mapToInt(token -> (int) token.getText().chars().filter(ch -> ch == '.').count())
+                    .sum();
+            if (dotCount == 1) {
+                database = defaultChannelTokens.get(0);
+                schemaText = SqlStringUtil.removeQuote(database.getText());
+            }
+            table = defaultChannelTokens.get(defaultChannelTokens.size() - 1);
+            tableText = SqlStringUtil.removeQuote(table.getText());
+
+            if (Objects.nonNull(database)) {
+
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), database);
+            }
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierName(tableText);
+            identifier.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+            identifier.setFirstToken(table);
+            identifier.setIdentifierSchema(schemaText);
+            if (Objects.nonNull(alias)) {
+                identifier.setIdentifierAlias(aliasText);
+                identifier.setLastToken(alias);
+            }
+            currentStatement.addIdentifier(identifier);
+            return null;
+        }).onFailure(e -> log.error("visit table ref aux error", e));
+        return null;
+    }
+
+    @Override
+    public Void visitJoin_on_part(DMParser.Join_on_partContext ctx) {
+        Try.of(() -> {
+            DMParser.ConditionContext condition = ctx.condition();
+            if (Objects.isNull(condition)) {
+                return null;
+            }
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            CommonTokenStream commonTokenStream = context.getCommonTokenStream();
+            List<Token> defaultChannelTokens = TokenUtil.getParserRuleTokensOnDefault(commonTokenStream, condition);
+            List<List<Token>> tokenLists = TokenUtil.splitTokensBySymbolText(defaultChannelTokens, "=");
+            for (List<Token> tokenList : tokenLists) {
+                int size = tokenList.size();
+                if (size == 5) {
+                    Token database = tokenList.get(0);
+                    Token table = tokenList.get(2);
+                    Token column = tokenList.get(4);
+                    String schemaText = SqlStringUtil.removeQuote(database.getText());
+                    String tableText = SqlStringUtil.removeQuote(table.getText());
+                    String columnText = SqlStringUtil.removeQuote(column.getText());
+                    currentStatement.addIdentifier(schemaText,
+                            IdentifierTypeEnum.SCHEMA.name(), database);
+                    Identifier identifier = new Identifier();
+                    identifier.setIdentifierName(tableText);
+                    identifier.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+                    identifier.setFirstToken(table);
+                    identifier.setIdentifierSchema(schemaText);
+
+                    currentStatement.addIdentifier(identifier);
+                    Identifier identifier1 = new Identifier();
+                    identifier1.setIdentifierName(columnText);
+                    identifier1.setIdentifierType(IdentifierTypeEnum.COLUMN.name());
+                    identifier1.setFirstToken(column);
+                    identifier1.setIdentifierDatabase(schemaText);
+                    identifier1.setIdentifierTable(tableText);
+                    currentStatement.addIdentifier(identifier1);
+                } else if (size == 3) {
+                    Token table = tokenList.get(0);
+                    Token column = tokenList.get(2);
+                    String tableText = SqlStringUtil.removeQuote(table.getText());
+                    String columnText = SqlStringUtil.removeQuote(column.getText());
+                    Identifier identifier = new Identifier();
+                    identifier.setIdentifierName(tableText);
+                    identifier.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+                    identifier.setFirstToken(table);
+
+                    currentStatement.addIdentifier(identifier);
+                    Identifier identifier1 = new Identifier();
+                    identifier1.setIdentifierName(columnText);
+                    identifier1.setIdentifierType(IdentifierTypeEnum.COLUMN.name());
+                    identifier1.setFirstToken(column);
+                    identifier1.setIdentifierTable(tableText);
+                    currentStatement.addIdentifier(identifier1);
+                }
+            }
+
+            return null;
+        }).onFailure(e -> {
+            log.error("visit join on part error", e);
+        });
+
+        return null;
+    }
+
+
+    @Override
+    public Void visitColumn_definition(DMParser.Column_definitionContext ctx) {
+        Try.of(() -> {
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            DMParser.Column_nameContext columnNameContext = ctx.column_name();
+            if (Objects.isNull(columnNameContext)) {
+                return null;
+            }
+            String columnName = context.getText(columnNameContext.getSourceInterval());
+            if (StringUtils.isBlank(columnName)) {
+                return null;
+            }
+            String[] split = columnName.split("\\.");
+            columnName = split[split.length - 1];
+            DMParser.DatatypeContext datatype = ctx.datatype();
+            if (Objects.isNull(datatype)) {
+                return null;
+            }
+            String datatypeText = datatype.getText();
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierName(SqlStringUtil.removeQuote(columnName));
+            identifier.setIdentifierType(IdentifierTypeEnum.COLUMN.name());
+            identifier.setIdentifierDataType(datatypeText);
+
+            currentStatement.addIdentifier(identifier);
+            return null;
+        }).onFailure(e -> log.error("visit column definition error", e));
+
+        return null;
+    }
+
+    @Override
+    public Void visitCall_statement(DMParser.Call_statementContext ctx) {
+        Try.of(() -> {
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            DMParser.Routine_nameContext routineNameContext = ctx.routine_name(0);
+            if (Objects.isNull(routineNameContext)) {
+                return null;
+            }
+            Token start = routineNameContext.getStart();
+            Token stop = routineNameContext.getStop();
+            if (start.getTokenIndex() != stop.getTokenIndex()) {
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(SqlStringUtil.removeQuote(start.getText()));
+                identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+                identifier.setFirstToken(start);
+
+                currentStatement.addIdentifier(identifier);
+            }
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierName(SqlStringUtil.removeQuote(stop.getText()));
+            identifier.setIdentifierType(IdentifierTypeEnum.PROCEDURE.name());
+            identifier.setFirstToken(stop);
+            currentStatement.addIdentifier(identifier);
+            return null;
+        }).onFailure(e -> log.error("visit call statement error", e));
+        return null;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMSimpleParserVisitor.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMSimpleParserVisitor.java
new file mode 100644
index 0000000000..b8fa570f9c
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMSimpleParserVisitor.java
@@ -0,0 +1,464 @@
+package ai.chat2db.plugin.dm.parser.visitor;
+
+import ai.chat2db.community.domain.api.enums.parser.IdentifierTypeEnum;
+import ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum;
+import ai.chat2db.community.domain.api.enums.parser.StatementValidTypeEnum;
+import ai.chat2db.community.domain.api.model.parser.statement.Statement;
+import ai.chat2db.community.domain.api.model.parser.statement.StatementContext;
+import ai.chat2db.community.domain.api.model.parser.token.Identifier;
+import ai.chat2db.plugin.dm.parser.base.DMParser;
+import ai.chat2db.plugin.dm.parser.base.DMParserBaseVisitor;
+import ai.chat2db.spi.util.SqlCommentUtil;
+import ai.chat2db.spi.util.SqlStringUtil;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+
+import java.util.List;
+import java.util.Objects;
+
+
+public class DMSimpleParserVisitor extends DMParserBaseVisitor<Void> {
+
+    private final StatementContext context;
+
+    public DMSimpleParserVisitor(StatementContext context) {
+        this.context = context;
+    }
+
+    @Override
+    public Void visitSql_script(DMParser.Sql_scriptContext ctx) {
+
+        List<DMParser.Unit_statementContext> unitStatement = ctx.unit_statement();
+        TokenStream commonTokenStream = context.getCommonTokenStream();
+        for (int i = 0; i < unitStatement.size(); i++) {
+            DMParser.Unit_statementContext child = unitStatement.get(i);
+            Statement statement = new Statement();
+            int sqlCommentSearchStartIndex = 0;
+            if (i != 0) {
+                DMParser.Unit_statementContext unitStatementContext = unitStatement.get(i - 1);
+                if (Objects.nonNull(unitStatementContext)) {
+                    sqlCommentSearchStartIndex = unitStatementContext.getStop().getTokenIndex();
+
+                }
+            }
+            int sqlCommentSearchEndIndex = child.getStart().getTokenIndex();
+            String sqlComment = SqlCommentUtil.searchSqlComment(sqlCommentSearchStartIndex, sqlCommentSearchEndIndex, commonTokenStream);
+            statement.setComment(sqlComment);
+            context.setCurrentStatement(statement);
+            statement.setStatementType(StatementValidTypeEnum.VALID.name());
+            statement.setSql(commonTokenStream.getText(child.getSourceInterval()));
+            statement.setFirstToken(child.getStart());
+            statement.setLastToken(child.getStop());
+            context.addStatement(statement);
+            visit(child);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitSelect_statement(DMParser.Select_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.SELECT.name());
+        return null;
+    }
+
+    @Override
+    public Void visitExplain_statement(DMParser.Explain_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.EXPLAIN.name());
+        return null;
+    }
+
+    @Override
+    public Void visitAnonymous_block(DMParser.Anonymous_blockContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ANONYMOUS_BLOCK.name());
+        String sql = currentStatement.getSql();
+        if (!sql.endsWith(";")) {
+            sql = sql + ";";
+            currentStatement.setSql(sql);
+        }
+        return super.visitAnonymous_block(ctx);
+    }
+
+    @Override
+    public Void visitCreate_function_body(DMParser.Create_function_bodyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_FUNCTION.name());
+        String sql = currentStatement.getSql();
+        if (!sql.endsWith(";")) {
+            sql = sql + ";";
+            currentStatement.setSql(sql);
+        }
+        return super.visitCreate_function_body(ctx);
+    }
+
+    @Override
+    public Void visitCreate_procedure_body(DMParser.Create_procedure_bodyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_PROCEDURE.name());
+        String sql = currentStatement.getSql();
+        if (!sql.endsWith(";")) {
+            sql = sql + ";";
+            currentStatement.setSql(sql);
+        }
+        return super.visitCreate_procedure_body(ctx);
+    }
+
+    @Override
+    public Void visitCreate_trigger(DMParser.Create_triggerContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_TRIGGER.name());
+        String sql = currentStatement.getSql();
+        if (!sql.endsWith(";")) {
+            sql = sql + ";";
+            currentStatement.setSql(sql);
+        }
+        return super.visitCreate_trigger(ctx);
+    }
+
+    @Override
+    public Void visitCreate_index(DMParser.Create_indexContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_INDEX.name());
+        return null;
+    }
+
+    @Override
+    public Void visitCreate_user(DMParser.Create_userContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_USER.name());
+        currentStatement.addIdentifier(new Identifier());
+        return null;
+    }
+
+
+    @Override
+    public Void visitCreate_view(DMParser.Create_viewContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_VIEW.name());
+        DMParser.Schema_nameContext schemaNameContext = ctx.schema_name();
+        String schemaText;
+        if (Objects.nonNull(schemaNameContext)) {
+            Token start = schemaNameContext.getStart();
+            schemaText = SqlStringUtil.removeQuote(start.getText());
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierSchema(schemaText);
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+
+            currentStatement.addIdentifier(identifier);
+        } else {
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+            currentStatement.addIdentifier(identifier);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitCreate_role(DMParser.Create_roleContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_ROLE.name());
+        currentStatement.addIdentifier(new Identifier());
+        return null;
+    }
+
+    @Override
+    public Void visitCreate_table(DMParser.Create_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_TABLE.name());
+        DMParser.Schema_nameContext schemaNameContext = ctx.schema_name();
+        if (Objects.nonNull(schemaNameContext)) {
+            Token start = schemaNameContext.getStart();
+            String schemaText = SqlStringUtil.removeQuote(start.getText());
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierSchema(schemaText);
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+
+            currentStatement.addIdentifier(identifier);
+        } else {
+            currentStatement.addIdentifier(new Identifier());
+        }
+        return super.visitCreate_table(ctx);
+    }
+
+    @Override
+    public Void visitCreate_database(DMParser.Create_databaseContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_DATABASE.name());
+        currentStatement.addIdentifier(new Identifier());
+        return null;
+    }
+
+
+    @Override
+    public Void visitDrop_function(DMParser.Drop_functionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_FUNCTION.name());
+        return super.visitDrop_function(ctx);
+    }
+
+    @Override
+    public Void visitDrop_procedure(DMParser.Drop_procedureContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_PROCEDURE.name());
+        return super.visitDrop_procedure(ctx);
+    }
+
+    @Override
+    public Void visitDrop_role(DMParser.Drop_roleContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_ROLE.name());
+        return null;
+    }
+
+    @Override
+    public Void visitDrop_trigger(DMParser.Drop_triggerContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_TRIGGER.name());
+        return super.visitDrop_trigger(ctx);
+    }
+
+
+    @Override
+    public Void visitDrop_user(DMParser.Drop_userContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_USER.name());
+        currentStatement.addIdentifier(new Identifier());
+
+        return null;
+    }
+
+    @Override
+    public Void visitDrop_index(DMParser.Drop_indexContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_INDEX.name());
+        return null;
+    }
+
+    @Override
+    public Void visitDrop_table(DMParser.Drop_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_TABLE.name());
+        DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+        visitTableViewName(tableviewNameContext);
+        return null;
+    }
+
+
+    @Override
+    public Void visitDrop_view(DMParser.Drop_viewContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_VIEW.name());
+        DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+        visitTableViewName(tableviewNameContext);
+        return super.visitDrop_view(ctx);
+    }
+
+    @Override
+    public Void visitAlter_session(DMParser.Alter_sessionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        DMParser.Alter_session_set_clauseContext alterSessionSetClauseContext = ctx.alter_session_set_clause();
+        if (Objects.isNull(alterSessionSetClauseContext)
+                || alterSessionSetClauseContext.parameter_name().isEmpty()
+                || !"CURRENT_SCHEMA".equalsIgnoreCase(
+                        alterSessionSetClauseContext.parameter_name(0).getText())) {
+            return super.visitAlter_session(ctx);
+        }
+        currentStatement.setType(SqlTypeEnum.SET_SCHEMA.name());
+        DMParser.Parameter_valueContext parameterValueContext = alterSessionSetClauseContext.parameter_value(0);
+        if (Objects.nonNull(parameterValueContext)) {
+            Identifier identifier = new Identifier();
+            String schemaText = SqlStringUtil.removeQuote(parameterValueContext.getText());
+            identifier.setIdentifierSchema(schemaText);
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+            currentStatement.addIdentifier(identifier);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitUpdate_statement(DMParser.Update_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.UPDATE.name());
+        return null;
+    }
+
+    @Override
+    public Void visitInsert_statement(DMParser.Insert_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.INSERT.name());
+        DMParserVisitor.visitInsertValueMappings(context, ctx);
+        return null;
+    }
+
+    @Override
+    public Void visitDelete_statement(DMParser.Delete_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DELETE.name());
+        return null;
+    }
+
+    private void visitTableViewName(DMParser.Tableview_nameContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return;
+        }
+        if (Objects.nonNull(ctx)) {
+            Token start = ctx.getStart();
+            Token stop = ctx.getStop();
+            if (start.getTokenIndex() != stop.getTokenIndex()) {
+                String schemaText = SqlStringUtil.removeQuote(start.getText());
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+                identifier.setIdentifierSchema(schemaText);
+                currentStatement.addIdentifier(identifier);
+            } else {
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+                currentStatement.addIdentifier(identifier);
+            }
+
+        }
+    }
+
+    @Override
+    public Void visitFunction_name(DMParser.Function_nameContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        Token start = ctx.getStart();
+        Token stop = ctx.getStop();
+        if (start.getTokenIndex() != stop.getTokenIndex()) {
+            String schemaText = SqlStringUtil.removeQuote(start.getText());
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+            identifier.setIdentifierSchema(schemaText);
+            currentStatement.addIdentifier(identifier);
+        } else {
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+            currentStatement.addIdentifier(identifier);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitProcedure_name(DMParser.Procedure_nameContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        Token start = ctx.getStart();
+        Token stop = ctx.getStop();
+        if (start.getTokenIndex() != stop.getTokenIndex()) {
+            String schemaText = SqlStringUtil.removeQuote(start.getText());
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+            identifier.setIdentifierSchema(schemaText);
+            currentStatement.addIdentifier(identifier);
+        } else {
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+            currentStatement.addIdentifier(identifier);
+        }
+        return null;
+    }
+
+    @Override
+    public Void visitTrigger_name(DMParser.Trigger_nameContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        Token start = ctx.getStart();
+        Token stop = ctx.getStop();
+        if (start.getTokenIndex() != stop.getTokenIndex()) {
+            String schemaText = SqlStringUtil.removeQuote(start.getText());
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+            identifier.setIdentifierSchema(schemaText);
+            currentStatement.addIdentifier(identifier);
+        } else {
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierType(IdentifierTypeEnum.SCHEMA.name());
+            currentStatement.addIdentifier(identifier);
+        }
+        return null;
+    }
+
+
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMValidTableVisitor.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMValidTableVisitor.java
new file mode 100644
index 0000000000..5179a28333
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/main/java/ai/chat2db/plugin/dm/parser/visitor/DMValidTableVisitor.java
@@ -0,0 +1,1207 @@
+package ai.chat2db.plugin.dm.parser.visitor;
+
+import ai.chat2db.community.domain.api.enums.parser.IdentifierTypeEnum;
+import ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum;
+import ai.chat2db.community.domain.api.enums.parser.StatementValidTypeEnum;
+import ai.chat2db.community.domain.api.model.parser.statement.Statement;
+import ai.chat2db.community.domain.api.model.parser.statement.StatementContext;
+import ai.chat2db.community.domain.api.model.parser.token.Identifier;
+import ai.chat2db.plugin.dm.parser.base.DMParser;
+import ai.chat2db.plugin.dm.parser.base.DMParserBaseVisitor;
+import ai.chat2db.plugin.dm.parser.listener.DMSelectListener;
+import ai.chat2db.spi.util.SqlStringUtil;
+import ai.chat2db.spi.util.TokenUtil;
+import io.vavr.control.Try;
+import lombok.extern.slf4j.Slf4j;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+public class DMValidTableVisitor extends DMParserBaseVisitor<Void> {
+
+    private final StatementContext context;
+
+    private final DMSelectListener oracleSelectListener;
+
+    public DMValidTableVisitor(StatementContext context) {
+        this.context = context;
+        oracleSelectListener = new DMSelectListener(context);
+    }
+
+
+    @Override
+    public Void visitSql_script(DMParser.Sql_scriptContext ctx) {
+
+        List<DMParser.Unit_statementContext> unitStatement = ctx.unit_statement();
+        TokenStream commonTokenStream = context.getCommonTokenStream();
+        for (DMParser.Unit_statementContext child : unitStatement) {
+            Statement statement = new Statement();
+            context.setCurrentStatement(statement);
+            statement.setStatementType(StatementValidTypeEnum.VALID.name());
+            statement.setSql(commonTokenStream.getText(child.getSourceInterval()));
+            statement.setFirstToken(child.getStart());
+            statement.setLastToken(child.getStop());
+            context.addStatement(statement);
+            visit(child);
+        }
+        return null;
+    }
+
+
+    @Override
+    public Void visitTruncate_table(DMParser.Truncate_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.TRUNCATE_TABLE.name());
+        return null;
+    }
+
+    @Override
+    public Void visitDml_table_expression_clause(DMParser.Dml_table_expression_clauseContext ctx) {
+        DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+        visitTableViewName(tableviewNameContext, IdentifierTypeEnum.TABLE);
+        return super.visitDml_table_expression_clause(ctx);
+    }
+    @Override
+    public Void visitDrop_table(DMParser.Drop_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_TABLE.name());
+        DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+        visitTableViewName(tableviewNameContext, IdentifierTypeEnum.TABLE);
+        return super.visitDrop_table(ctx);
+    }
+
+    @Override
+    public Void visitCreate_table(DMParser.Create_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_TABLE.name());
+        return null;
+    }
+
+    @Override
+    public Void visitTable_name(DMParser.Table_nameContext ctx) {
+        Try.run(() -> {
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return;
+            }
+            Token start = ctx.getStart();
+            Token stop = ctx.getStop();
+            if (start.getTokenIndex() == stop.getTokenIndex()) {
+                currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                        IdentifierTypeEnum.TABLE.name(), start);
+            } else {
+                String schemaText = SqlStringUtil.removeQuote(start.getText());
+
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), start);
+                String tableText = SqlStringUtil.removeQuote(stop.getText());
+                Identifier identifier = new Identifier();
+                identifier.setIdentifierName(tableText);
+                identifier.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+                identifier.setFirstToken(stop);
+                identifier.setIdentifierSchema(schemaText);
+
+                currentStatement.addIdentifier(identifier);
+            }
+        }).onFailure(e -> {
+            log.error("visitTable_name error", e);
+        });
+
+        return super.visitTable_name(ctx);
+    }
+
+    @Override
+    public Void visitTable_ref_aux(DMParser.Table_ref_auxContext ctx) {
+        Try.of(() -> {
+            DMParser.Table_ref_aux_internalContext tableRefAuxInternalContext = ctx.table_ref_aux_internal();
+            if (Objects.isNull(tableRefAuxInternalContext)) {
+                return null;
+            }
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            CommonTokenStream commonTokenStream = context.getCommonTokenStream();
+            Token database = null, table, alias = null;
+            String schemaText = null, tableText, aliasText = null;
+            DMParser.Table_aliasContext tableAliasContext = ctx.table_alias();
+            if (Objects.nonNull(tableAliasContext)) {
+                alias = tableAliasContext.stop;
+                aliasText = SqlStringUtil.removeQuote(tableAliasContext.getText());
+            }
+            List<Token> defaultChannelTokens = TokenUtil.getParserRuleTokensOnDefault(commonTokenStream, tableRefAuxInternalContext);
+            int dotCount = defaultChannelTokens.stream()
+                    .mapToInt(token -> (int) token.getText().chars().filter(ch -> ch == '.').count())
+                    .sum();
+            if (dotCount == 1) {
+                database = defaultChannelTokens.get(0);
+                schemaText = SqlStringUtil.removeQuote(database.getText());
+            }
+            table = defaultChannelTokens.get(defaultChannelTokens.size() - 1);
+            tableText = SqlStringUtil.removeQuote(table.getText());
+
+            if (Objects.nonNull(database)) {
+
+                currentStatement.addIdentifier(schemaText,
+                        IdentifierTypeEnum.SCHEMA.name(), database);
+            }
+            Identifier identifier = new Identifier();
+            identifier.setIdentifierName(tableText);
+            identifier.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+            identifier.setFirstToken(table);
+            identifier.setIdentifierSchema(schemaText);
+            if (Objects.nonNull(alias)) {
+                identifier.setIdentifierAlias(aliasText);
+                identifier.setLastToken(alias);
+            }
+            currentStatement.addIdentifier(identifier);
+            return null;
+        }).onFailure(e -> log.error("visit table ref aux error", e));
+
+        return null;
+    }
+
+    @Override
+    public Void visitJoin_on_part(DMParser.Join_on_partContext ctx) {
+        Try.of(() -> {
+            DMParser.ConditionContext condition = ctx.condition();
+            if (Objects.isNull(condition)) {
+                return null;
+            }
+            Statement currentStatement = context.getCurrentStatement();
+            if (Objects.isNull(currentStatement)) {
+                return null;
+            }
+            CommonTokenStream commonTokenStream = context.getCommonTokenStream();
+            List<Token> defaultChannelTokens = TokenUtil.getParserRuleTokensOnDefault(commonTokenStream, condition);
+            List<List<Token>> tokenLists = TokenUtil.splitTokensBySymbolText(defaultChannelTokens, "=");
+            for (List<Token> tokenList : tokenLists) {
+                int size = tokenList.size();
+                if (size == 5) {
+                    Token database = tokenList.get(0);
+                    Token table = tokenList.get(2);
+                    Token column = tokenList.get(4);
+                    String schemaText = SqlStringUtil.removeQuote(database.getText());
+                    String tableText = SqlStringUtil.removeQuote(table.getText());
+                    String columnText = SqlStringUtil.removeQuote(column.getText());
+                    currentStatement.addIdentifier(schemaText,
+                            IdentifierTypeEnum.SCHEMA.name(), database);
+                    Identifier identifier = new Identifier();
+                    identifier.setIdentifierName(tableText);
+                    identifier.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+                    identifier.setFirstToken(table);
+                    identifier.setIdentifierSchema(schemaText);
+
+                    currentStatement.addIdentifier(identifier);
+                    Identifier identifier1 = new Identifier();
+                    identifier1.setIdentifierName(columnText);
+                    identifier1.setIdentifierType(IdentifierTypeEnum.COLUMN.name());
+                    identifier1.setFirstToken(column);
+                    identifier1.setIdentifierDatabase(schemaText);
+                    identifier1.setIdentifierTable(tableText);
+                    currentStatement.addIdentifier(identifier1);
+                } else if (size == 3) {
+                    Token table = tokenList.get(0);
+                    Token column = tokenList.get(2);
+                    String tableText = SqlStringUtil.removeQuote(table.getText());
+                    String columnText = SqlStringUtil.removeQuote(column.getText());
+                    Identifier identifier = new Identifier();
+                    identifier.setIdentifierName(tableText);
+                    identifier.setIdentifierType(IdentifierTypeEnum.TABLE.name());
+                    identifier.setFirstToken(table);
+
+                    currentStatement.addIdentifier(identifier);
+                    Identifier identifier1 = new Identifier();
+                    identifier1.setIdentifierName(columnText);
+                    identifier1.setIdentifierType(IdentifierTypeEnum.COLUMN.name());
+                    identifier1.setFirstToken(column);
+                    identifier1.setIdentifierTable(tableText);
+                    currentStatement.addIdentifier(identifier1);
+                }
+            }
+
+            return null;
+        }).onFailure(e -> {
+            log.error("visit join on part error", e);
+        });
+
+        return null;
+    }
+
+
+    @Override
+    public Void visitAlter_view(DMParser.Alter_viewContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_VIEW.name());
+        return super.visitAlter_view(ctx);
+    }
+
+    @Override
+    public Void visitAlter_analytic_view(DMParser.Alter_analytic_viewContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_ANALYTIC_VIEW.name());
+        return super.visitAlter_analytic_view(ctx);
+    }
+
+    @Override
+    public Void visitAlter_attribute_dimension(DMParser.Alter_attribute_dimensionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_ATTRIBUTE_DIMENSION.name());
+        return super.visitAlter_attribute_dimension(ctx);
+    }
+
+
+    @Override
+    public Void visitAlter_audit_policy(DMParser.Alter_audit_policyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_AUDIT_POLICY.name());
+        return super.visitAlter_audit_policy(ctx);
+    }
+
+    @Override
+    public Void visitAlter_cluster(DMParser.Alter_clusterContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_CLUSTER.name());
+        return super.visitAlter_cluster(ctx);
+    }
+
+
+    @Override
+    public Void visitAlter_database(DMParser.Alter_databaseContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_DATABASE.name());
+        return super.visitAlter_database(ctx);
+    }
+
+
+    @Override
+    public Void visitAlter_database_link(DMParser.Alter_database_linkContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_DATABASE_LINK.name());
+        return super.visitAlter_database_link(ctx);
+    }
+
+    @Override
+    public Void visitAlter_dimension(DMParser.Alter_dimensionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_DIMENSION.name());
+        return super.visitAlter_dimension(ctx);
+    }
+
+
+    @Override
+    public Void visitAlter_diskgroup(DMParser.Alter_diskgroupContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_DISKGROUP.name());
+        return super.visitAlter_diskgroup(ctx);
+    }
+
+    @Override
+    public Void visitAlter_flashback_archive(DMParser.Alter_flashback_archiveContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_FLASHBACK_ARCHIVE.name());
+        return super.visitAlter_flashback_archive(ctx);
+    }
+
+    @Override
+    public Void visitAlter_function(DMParser.Alter_functionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_FUNCTION.name());
+        return super.visitAlter_function(ctx);
+    }
+
+    @Override
+    public Void visitAlter_hierarchy(DMParser.Alter_hierarchyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_HIERARCHY.name());
+        return super.visitAlter_hierarchy(ctx);
+    }
+
+    @Override
+    public Void visitAlter_index(DMParser.Alter_indexContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_INDEX.name());
+        return super.visitAlter_index(ctx);
+    }
+
+
+    @Override
+    public Void visitAlter_inmemory_join_group(DMParser.Alter_inmemory_join_groupContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_INMEMORY_JOIN_GROUP.name());
+        return super.visitAlter_inmemory_join_group(ctx);
+    }
+
+    @Override
+    public Void visitAlter_java(DMParser.Alter_javaContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_JAVA.name());
+        return super.visitAlter_java(ctx);
+    }
+
+    @Override
+    public Void visitAlter_library(DMParser.Alter_libraryContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_LIBRARY.name());
+        return super.visitAlter_library(ctx);
+    }
+
+    @Override
+    public Void visitAlter_lockdown_profile(DMParser.Alter_lockdown_profileContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_LOCKDOWN_PROFILE.name());
+        return super.visitAlter_lockdown_profile(ctx);
+    }
+
+    @Override
+    public Void visitAlter_materialized_view(DMParser.Alter_materialized_viewContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_MATERIALIZED_VIEW.name());
+        return super.visitAlter_materialized_view(ctx);
+    }
+
+    @Override
+    public Void visitAlter_materialized_view_log(DMParser.Alter_materialized_view_logContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_MATERIALIZED_VIEW_LOG.name());
+        return super.visitAlter_materialized_view_log(ctx);
+    }
+
+    @Override
+    public Void visitAlter_materialized_zonemap(DMParser.Alter_materialized_zonemapContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_MATERIALIZED_ZONEMAP.name());
+        return super.visitAlter_materialized_zonemap(ctx);
+    }
+
+    @Override
+    public Void visitAlter_operator(DMParser.Alter_operatorContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_OPERATOR.name());
+        return super.visitAlter_operator(ctx);
+    }
+
+    @Override
+    public Void visitAlter_outline(DMParser.Alter_outlineContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_OUTLINE.name());
+        return super.visitAlter_outline(ctx);
+    }
+
+    @Override
+    public Void visitAlter_package(DMParser.Alter_packageContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_PACKAGE.name());
+        return super.visitAlter_package(ctx);
+    }
+
+
+    @Override
+    public Void visitAlter_pmem_filestore(DMParser.Alter_pmem_filestoreContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_PMEM_FILESTORE.name());
+        return super.visitAlter_pmem_filestore(ctx);
+    }
+
+    @Override
+    public Void visitAlter_procedure(DMParser.Alter_procedureContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_PROCEDURE.name());
+        return super.visitAlter_procedure(ctx);
+    }
+
+
+    @Override
+    public Void visitAlter_resource_cost(DMParser.Alter_resource_costContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_RESOURCE_COST.name());
+        return super.visitAlter_resource_cost(ctx);
+    }
+
+    @Override
+    public Void visitAlter_role(DMParser.Alter_roleContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_ROLE.name());
+        return super.visitAlter_role(ctx);
+    }
+
+    @Override
+    public Void visitAlter_rollback_segment(DMParser.Alter_rollback_segmentContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_ROLLBACK_SEGMENT.name());
+        return super.visitAlter_rollback_segment(ctx);
+    }
+
+    @Override
+    public Void visitAlter_sequence(DMParser.Alter_sequenceContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_SEQUENCE.name());
+        return super.visitAlter_sequence(ctx);
+    }
+
+    @Override
+    public Void visitAlter_session(DMParser.Alter_sessionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_SESSION.name());
+        return super.visitAlter_session(ctx);
+    }
+
+    @Override
+    public Void visitAlter_synonym(DMParser.Alter_synonymContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_SYNONYM.name());
+        return super.visitAlter_synonym(ctx);
+    }
+
+    @Override
+    public Void visitAlter_table(DMParser.Alter_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_TABLE.name());
+        DMParser.Tableview_nameContext tableviewNameContext = ctx.tableview_name();
+        visitTableViewName(tableviewNameContext, IdentifierTypeEnum.TABLE);
+        return null;
+    }
+    private void visitTableViewName(DMParser.Tableview_nameContext ctx, IdentifierTypeEnum identifierTypeEnum) {
+        Try.run(() -> {
+            if (Objects.nonNull(ctx)) {
+                Token start = ctx.getStart();
+                Token stop = ctx.getStop();
+                Statement currentStatement = context.getCurrentStatement();
+                if (Objects.isNull(currentStatement)) {
+                    return;
+                }
+                if (start.getTokenIndex() == stop.getTokenIndex()) {
+                    currentStatement.addIdentifier(SqlStringUtil.removeQuote(start.getText()),
+                            identifierTypeEnum.name(), start);
+                } else {
+                    String schemaText = SqlStringUtil.removeQuote(start.getText());
+
+                    currentStatement.addIdentifier(schemaText,
+                            IdentifierTypeEnum.SCHEMA.name(), start);
+                    String tableViewText = SqlStringUtil.removeQuote(stop.getText());
+                    Identifier identifier = new Identifier();
+                    identifier.setIdentifierName(tableViewText);
+                    identifier.setIdentifierType(identifierTypeEnum.name());
+                    identifier.setFirstToken(stop);
+                    identifier.setIdentifierSchema(schemaText);
+
+                    currentStatement.addIdentifier(identifier);
+                }
+            }
+        }).onFailure(e -> log.error("visitTableViewName error", e));
+
+    }
+
+
+    @Override
+    public Void visitAlter_tablespace(DMParser.Alter_tablespaceContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_TABLESPACE.name());
+        return super.visitAlter_tablespace(ctx);
+    }
+
+    @Override
+    public Void visitAlter_tablespace_set(DMParser.Alter_tablespace_setContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_TABLESPACE_SET.name());
+        return super.visitAlter_tablespace_set(ctx);
+    }
+
+    @Override
+    public Void visitAlter_trigger(DMParser.Alter_triggerContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_TRIGGER.name());
+        return super.visitAlter_trigger(ctx);
+    }
+
+    @Override
+    public Void visitAlter_type(DMParser.Alter_typeContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_TYPE.name());
+        return super.visitAlter_type(ctx);
+    }
+
+    @Override
+    public Void visitAlter_user(DMParser.Alter_userContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.ALTER_USER.name());
+        return super.visitAlter_user(ctx);
+    }
+
+
+    @Override
+    public Void visitCall_statement(DMParser.Call_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CALL_PROC.name());
+        return super.visitCall_statement(ctx);
+    }
+
+    @Override
+    public Void visitCreate_analytic_view(DMParser.Create_analytic_viewContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_ANALYTIC_VIEW.name());
+        return super.visitCreate_analytic_view(ctx);
+    }
+
+    @Override
+    public Void visitCreate_attribute_dimension(DMParser.Create_attribute_dimensionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_ATTRIBUTE_DIMENSION.name());
+        return super.visitCreate_attribute_dimension(ctx);
+    }
+
+    @Override
+    public Void visitCreate_audit_policy(DMParser.Create_audit_policyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_AUDIT_POLICY.name());
+        return super.visitCreate_audit_policy(ctx);
+    }
+
+    @Override
+    public Void visitCreate_cluster(DMParser.Create_clusterContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_CLUSTER.name());
+        return super.visitCreate_cluster(ctx);
+    }
+
+    @Override
+    public Void visitCreate_context(DMParser.Create_contextContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_CONTEXT.name());
+        return super.visitCreate_context(ctx);
+    }
+
+    @Override
+    public Void visitCreate_controlfile(DMParser.Create_controlfileContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_CONTROLFILE.name());
+        return super.visitCreate_controlfile(ctx);
+    }
+
+    @Override
+    public Void visitCreate_diskgroup(DMParser.Create_diskgroupContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_DISKGROUP.name());
+        return super.visitCreate_diskgroup(ctx);
+    }
+
+    @Override
+    public Void visitCreate_edition(DMParser.Create_editionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_EDITION.name());
+        return super.visitCreate_edition(ctx);
+    }
+
+    @Override
+    public Void visitCreate_flashback_archive(DMParser.Create_flashback_archiveContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_FLASHBACK_ARCHIVE.name());
+        return super.visitCreate_flashback_archive(ctx);
+    }
+
+    @Override
+    public Void visitCreate_hierarchy(DMParser.Create_hierarchyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_HIERARCHY.name());
+        return super.visitCreate_hierarchy(ctx);
+    }
+
+    @Override
+    public Void visitCreate_inmemory_join_group(DMParser.Create_inmemory_join_groupContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_INMEMORY_JOIN_GROUP.name());
+        return super.visitCreate_inmemory_join_group(ctx);
+    }
+
+    @Override
+    public Void visitCreate_java(DMParser.Create_javaContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_JAVA.name());
+        return super.visitCreate_java(ctx);
+    }
+
+    @Override
+    public Void visitCreate_library(DMParser.Create_libraryContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_LIBRARY.name());
+        return super.visitCreate_library(ctx);
+    }
+
+    @Override
+    public Void visitCreate_lockdown_profile(DMParser.Create_lockdown_profileContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_LOCKDOWN_PROFILE.name());
+        return super.visitCreate_lockdown_profile(ctx);
+    }
+
+    @Override
+    public Void visitCreate_operator(DMParser.Create_operatorContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_OPERATOR.name());
+        return super.visitCreate_operator(ctx);
+    }
+
+    @Override
+    public Void visitCreate_outline(DMParser.Create_outlineContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_OUTLINE.name());
+        return super.visitCreate_outline(ctx);
+    }
+
+    @Override
+    public Void visitCreate_restore_point(DMParser.Create_restore_pointContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_RESTORE_POINT.name());
+        return super.visitCreate_restore_point(ctx);
+    }
+
+    @Override
+    public Void visitCreate_spfile(DMParser.Create_spfileContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.CREATE_SPFILE.name());
+        return super.visitCreate_spfile(ctx);
+    }
+
+    @Override
+    public Void visitDrop_analytic_view(DMParser.Drop_analytic_viewContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_ANALYTIC_VIEW.name());
+        return super.visitDrop_analytic_view(ctx);
+    }
+
+    @Override
+    public Void visitDrop_attribute_dimension(DMParser.Drop_attribute_dimensionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_ATTRIBUTE_DIMENSION.name());
+        return super.visitDrop_attribute_dimension(ctx);
+    }
+
+    @Override
+    public Void visitDrop_audit_policy(DMParser.Drop_audit_policyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_AUDIT_POLICY.name());
+        return super.visitDrop_audit_policy(ctx);
+    }
+
+    @Override
+    public Void visitDrop_cluster(DMParser.Drop_clusterContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_CLUSTER.name());
+        return super.visitDrop_cluster(ctx);
+    }
+
+    @Override
+    public Void visitDrop_context(DMParser.Drop_contextContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_CONTEXT.name());
+        return super.visitDrop_context(ctx);
+    }
+
+    @Override
+    public Void visitDrop_directory(DMParser.Drop_directoryContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_DIRECTORY.name());
+        return super.visitDrop_directory(ctx);
+    }
+
+    @Override
+    public Void visitDrop_diskgroup(DMParser.Drop_diskgroupContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_DISKGROUP.name());
+        return super.visitDrop_diskgroup(ctx);
+    }
+
+    @Override
+    public Void visitDrop_edition(DMParser.Drop_editionContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_EDITION.name());
+        return super.visitDrop_edition(ctx);
+    }
+
+    @Override
+    public Void visitDrop_flashback_archive(DMParser.Drop_flashback_archiveContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_FLASHBACK_ARCHIVE.name());
+        return super.visitDrop_flashback_archive(ctx);
+    }
+
+    @Override
+    public Void visitDrop_hierarchy(DMParser.Drop_hierarchyContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_HIERARCHY.name());
+        return super.visitDrop_hierarchy(ctx);
+    }
+
+    @Override
+    public Void visitDrop_inmemory_join_group(DMParser.Drop_inmemory_join_groupContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_INMEMORY_JOIN_GROUP.name());
+        return super.visitDrop_inmemory_join_group(ctx);
+    }
+
+    @Override
+    public Void visitDrop_java(DMParser.Drop_javaContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_JAVA.name());
+        return super.visitDrop_java(ctx);
+    }
+
+    @Override
+    public Void visitDrop_library(DMParser.Drop_libraryContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_LIBRARY.name());
+        return super.visitDrop_library(ctx);
+    }
+
+    @Override
+    public Void visitDrop_lockdown_profile(DMParser.Drop_lockdown_profileContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_LOCKDOWN_PROFILE.name());
+        return super.visitDrop_lockdown_profile(ctx);
+    }
+
+    @Override
+    public Void visitDrop_operator(DMParser.Drop_operatorContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_OPERATOR.name());
+        return super.visitDrop_operator(ctx);
+    }
+
+    @Override
+    public Void visitDrop_outline(DMParser.Drop_outlineContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_OUTLINE.name());
+        return super.visitDrop_outline(ctx);
+    }
+
+    @Override
+    public Void visitDrop_restore_point(DMParser.Drop_restore_pointContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DROP_RESTORE_POINT.name());
+        return super.visitDrop_restore_point(ctx);
+    }
+
+    @Override
+    public Void visitComment_on_column(DMParser.Comment_on_columnContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.COMMENT_ON_COLUMN.name());
+        return super.visitComment_on_column(ctx);
+    }
+
+    @Override
+    public Void visitComment_on_table(DMParser.Comment_on_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.COMMENT_ON_TABLE.name());
+        return super.visitComment_on_table(ctx);
+    }
+
+    @Override
+    public Void visitComment_on_materialized(DMParser.Comment_on_materializedContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.COMMENT_ON_MATERIALIZED.name());
+        return super.visitComment_on_materialized(ctx);
+    }
+
+    @Override
+    public Void visitDisassociate_statistics(DMParser.Disassociate_statisticsContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DISASSOCIATE_STATISTICS.name());
+        return super.visitDisassociate_statistics(ctx);
+    }
+
+    @Override
+    public Void visitFlashback_table(DMParser.Flashback_tableContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.FLASHBACK_TABLE.name());
+        return super.visitFlashback_table(ctx);
+    }
+
+    @Override
+    public Void visitGrant_statement(DMParser.Grant_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.GRANT.name());
+        return super.visitGrant_statement(ctx);
+    }
+
+    @Override
+    public Void visitNoaudit_statement(DMParser.Noaudit_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.NOAUDIT.name());
+        return super.visitNoaudit_statement(ctx);
+    }
+
+    @Override
+    public Void visitPurge_statement(DMParser.Purge_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.PURGE.name());
+        return super.visitPurge_statement(ctx);
+    }
+
+    @Override
+    public Void visitRename_object(DMParser.Rename_objectContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.RENAME.name());
+        return super.visitRename_object(ctx);
+    }
+
+    @Override
+    public Void visitRevoke_statement(DMParser.Revoke_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.REVOKE.name());
+        return super.visitRevoke_statement(ctx);
+    }
+
+    @Override
+    public Void visitTruncate_cluster(DMParser.Truncate_clusterContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.TRUNCATE_CLUSTER.name());
+        return super.visitTruncate_cluster(ctx);
+    }
+
+    @Override
+    public Void visitUnified_auditing(DMParser.Unified_auditingContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.UNIFIED_AUDIT.name());
+        return super.visitUnified_auditing(ctx);
+    }
+
+    @Override
+    public Void visitSelect_statement(DMParser.Select_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.SELECT.name());
+        oracleSelectListener.parserSelectStatement(ctx);
+        return null;
+    }
+
+    @Override
+    public Void visitInsert_statement(DMParser.Insert_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.INSERT.name());
+        return super.visitInsert_statement(ctx);
+    }
+
+    @Override
+    public Void visitDelete_statement(DMParser.Delete_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.DELETE.name());
+        return super.visitDelete_statement(ctx);
+    }
+
+    @Override
+    public Void visitUpdate_statement(DMParser.Update_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.UPDATE.name());
+        return super.visitUpdate_statement(ctx);
+    }
+
+    @Override
+    public Void visitMerge_statement(DMParser.Merge_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.MERGE.name());
+        return super.visitMerge_statement(ctx);
+    }
+
+    @Override
+    public Void visitLock_table_statement(DMParser.Lock_table_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.LOCK_TABLES.name());
+        return super.visitLock_table_statement(ctx);
+    }
+
+
+    @Override
+    public Void visitExplain_statement(DMParser.Explain_statementContext ctx) {
+        Statement currentStatement = context.getCurrentStatement();
+        if (Objects.isNull(currentStatement)) {
+            return null;
+        }
+        currentStatement.setType(SqlTypeEnum.EXPLAIN.name());
+        return null;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMCommandExecutorTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMCommandExecutorTest.java
new file mode 100644
index 0000000000..723bf42ca9
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMCommandExecutorTest.java
@@ -0,0 +1,638 @@
+package ai.chat2db.plugin.dm;
+
+import ai.chat2db.community.domain.api.model.result.ExecuteResponse;
+import ai.chat2db.community.domain.api.model.result.ExecutionContext;
+import ai.chat2db.community.domain.api.model.result.ResultCell;
+import ai.chat2db.community.domain.api.config.DriverConfig;
+import ai.chat2db.community.domain.api.enums.plugin.SqlTypeEnum;
+import ai.chat2db.community.domain.api.model.sql.SqlExecuteRequest;
+import ai.chat2db.community.domain.api.model.sql.SimpleSqlStatement;
+import ai.chat2db.community.tools.util.I18nUtils;
+import ai.chat2db.community.domain.api.service.db.ISqlExecutionCancellation;
+import ai.chat2db.community.domain.api.service.db.ISqlExecutionResultConsumer;
+import ai.chat2db.community.domain.api.service.db.ISqlExecutionStatementListener;
+import ai.chat2db.spi.IPlugin;
+import ai.chat2db.spi.model.datasource.ConnectInfo;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import ai.chat2db.spi.sql.ConnectionPool;
+import ai.chat2db.plugin.dm.builder.DMSqlBuilder;
+import ai.chat2db.plugin.dm.parser.DMExecutableSql;
+import ai.chat2db.plugin.dm.parser.DMSqlParser;
+import dm.jdbc.driver.DmdbConnection;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.MessageSource;
+import org.springframework.context.MessageSourceResolvable;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class DMCommandExecutorTest {
+
+    private static final long DATA_SOURCE_ID = 2762L;
+
+    private IPlugin previousPlugin;
+
+    private boolean contextBound;
+
+    @BeforeAll
+    static void setUpI18n() throws Exception {
+        Field field = I18nUtils.class.getDeclaredField("messageSourceStatic");
+        field.setAccessible(true);
+        field.set(null, new MessageSource() {
+            @Override
+            public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) {
+                return defaultMessage == null ? code : defaultMessage;
+            }
+
+            @Override
+            public String getMessage(String code, Object[] args, Locale locale) {
+                return code;
+            }
+
+            @Override
+            public String getMessage(MessageSourceResolvable resolvable, Locale locale) {
+                String[] codes = resolvable.getCodes();
+                return codes == null || codes.length == 0 ? resolvable.getDefaultMessage() : codes[0];
+            }
+        });
+    }
+
+    @AfterEach
+    void tearDownContext() {
+        if (!contextBound) {
+            return;
+        }
+        Chat2DBContext.removeContext();
+        ConnectionPool.removeConnection(DATA_SOURCE_ID);
+        if (previousPlugin == null) {
+            Chat2DBContext.PLUGIN_MAP.remove("DM");
+        } else {
+            Chat2DBContext.PLUGIN_MAP.put("DM", previousPlugin);
+        }
+        contextBound = false;
+        previousPlugin = null;
+    }
+
+    @Test
+    void allDmSqlShouldUseDmExecutor() {
+        assertSame(DMCommandExecutor.INSTANCE, new DMMetaData().getCommandExecutor());
+    }
+
+    @Test
+    void parserShouldRecognizeExplicitExplainAndReturnInnerSql() {
+        DMExecutableSql result = new DMSqlParser().parseExecutableSql("EXPLAIN SELECT * FROM SYSOBJECTS");
+
+        assertTrue(result.isExplain());
+        assertEquals("SELECT * FROM SYSOBJECTS", result.executableSql());
+    }
+
+    @Test
+    void builderShouldNotAddExplainTwice() {
+        assertEquals("EXPLAIN SELECT * FROM SYSOBJECTS",
+                new DMSqlBuilder().buildExplain("EXPLAIN SELECT * FROM SYSOBJECTS"));
+    }
+
+    @Test
+    void ordinarySqlShouldDelegateToDefaultExecutionInsideDmExecutor() throws Exception {
+        try (Connection connection = DriverManager.getConnection("jdbc:h2:mem:dm_executor_select")) {
+            putContext(connection);
+            List<ExecuteResponse> results = executeMulti("SELECT 1 AS ID", connection);
+
+            assertEquals(1, results.size());
+            assertEquals("1", results.get(0).getDataList().get(0).get(0).getValue());
+        }
+    }
+
+    @Test
+    void explainShouldCallGetExplainInfoInsteadOfPreparedStatementExecute() throws Exception {
+        Connection connection = dmExplainConnection();
+
+        List<ExecuteResponse> results = executeMulti("EXPLAIN SELECT * FROM SYSOBJECTS", connection);
+
+        assertEquals(1, results.size());
+        assertEquals("plan for: SELECT * FROM SYSOBJECTS", results.get(0).getDataList().get(0).get(0).getValue());
+    }
+
+    @Test
+    void explainButtonShouldBuildExplainOnceAndCallGetExplainInfo() throws Exception {
+        Connection connection = dmExplainConnection();
+        putContext(connection);
+
+        SqlExecuteRequest request = request("SELECT * FROM SYSOBJECTS");
+        request.setExplain(true);
+
+        List<ExecuteResponse> results = DMCommandExecutor.INSTANCE.execute(request);
+
+        assertEquals(1, results.size());
+        assertEquals(ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum.EXPLAIN.name(),
+                results.get(0).getSqlType());
+        // non-streaming path will add row-number, so plan is in the 2nd column.
+        assertEquals("plan for: SELECT * FROM SYSOBJECTS", results.get(0).getDataList().get(0).get(1).getValue());
+        assertNotNull(results.get(0).getExecutionMetrics());
+        assertNotNull(results.get(0).getExecutionMetrics().getTotalDurationMs());
+        assertEquals(1, results.get(0).getExecutionMetrics().getFetchedRowCount());
+    }
+
+    @Test
+    void explainButtonStreamingShouldKeepSqlTypeExplain() throws Exception {
+        Connection connection = dmExplainConnection();
+        putContext(connection);
+
+        SqlExecuteRequest request = request("SELECT * FROM SYSOBJECTS");
+        request.setExplain(true);
+        CapturingResultConsumer consumer = new CapturingResultConsumer();
+
+        DMCommandExecutor.INSTANCE.executeStreaming(request, consumer, null, () -> false);
+
+        assertEquals(1, consumer.resultStartedCount);
+        assertEquals(0, consumer.resultStartedRowCount);
+        assertEquals(1, consumer.rowsEventCount);
+        assertEquals(1, consumer.receivedRows.size());
+        assertEquals("plan for: SELECT * FROM SYSOBJECTS", consumer.receivedRows.get(0).get(1).getValue());
+        assertEquals(1, consumer.resultFinished.size());
+        assertEquals(ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum.EXPLAIN.name(),
+                consumer.resultFinished.get(0).getSqlType());
+        assertNotNull(consumer.resultFinished.get(0).getExecutionMetrics());
+        assertEquals(1, consumer.resultFinished.get(0).getExecutionMetrics().getFetchedRowCount());
+    }
+
+    @Test
+    void shouldStreamExplainPlanWithRowNumber() throws Exception {
+        Connection connection = dmExplainConnection();
+        putContext(connection);
+
+        SqlExecuteRequest request = request("EXPLAIN SELECT * FROM SYSOBJECTS");
+        CapturingResultConsumer consumer = new CapturingResultConsumer();
+
+        DMCommandExecutor.INSTANCE.executeStreaming(request, consumer, null, () -> false);
+
+        // Outer executeStreaming owns the single resultFinished; publishMaterializedQueryResult must not duplicate it.
+        assertEquals(1, consumer.resultFinished.size());
+        assertEquals(1, consumer.resultStartedCount);
+        assertEquals(0, consumer.resultStartedRowCount);
+        assertEquals(1, consumer.rowsEventCount);
+        assertEquals(1, consumer.receivedRows.size());
+        assertEquals("plan for: SELECT * FROM SYSOBJECTS", consumer.receivedRows.get(0).get(1).getValue());
+
+        ExecuteResponse response = consumer.resultFinished.get(0);
+        assertEquals(ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum.EXPLAIN.name(), response.getSqlType());
+        assertTrue(response.getHeaderList().size() >= 2);
+        assertEquals("Execution Plan", response.getHeaderList().get(response.getHeaderList().size() - 1).getName());
+        assertEquals("plan for: SELECT * FROM SYSOBJECTS", response.getDataList().get(0).get(1).getValue());
+        assertNotNull(response.getExecutionMetrics());
+        assertNotNull(response.getExecutionMetrics().getTotalDurationMs());
+        assertEquals(1, response.getExecutionMetrics().getFetchedRowCount());
+    }
+
+    @Test
+    void ordinarySqlShouldSkipFullAntlrParseAtExecutorEntry() {
+        DMExecutableSql parsed = new DMSqlParser().parseExecutableSql("SELECT 1 AS ID FROM DUAL");
+
+        assertTrue(!parsed.isExplain());
+        assertEquals("SELECT 1 AS ID FROM DUAL", parsed.executableSql());
+    }
+
+    @Test
+    void invalidExplainShouldNotFallBackToJdbcPath() {
+        assertThrows(IllegalArgumentException.class,
+                () -> new DMSqlParser().parseExecutableSql("EXPLAIN PLAN FOR SELECT 1 FROM DUAL"));
+    }
+
+    @Test
+    void explainShouldWorkThroughStatementGuardAndConnectionOnlyWrapper() throws Exception {
+        List<String> guardedSql = new ArrayList<>();
+        Connection dmdb = dmExplainConnection();
+        Connection poolWrapped = connectionOnlyWrapper(dmdb);
+        putContext(poolWrapped);
+
+        try (Chat2DBContext.StatementGuardScope ignored = Chat2DBContext.bindStatementGuard(guardedSql::add)) {
+            SqlExecuteRequest request = request("EXPLAIN SELECT * FROM SYSOBJECTS");
+            List<ExecuteResponse> results = DMCommandExecutor.INSTANCE.execute(request);
+
+            assertEquals(1, results.size());
+            assertEquals("plan for: SELECT * FROM SYSOBJECTS", results.get(0).getDataList().get(0).get(1).getValue());
+            assertTrue(guardedSql.contains("EXPLAIN SELECT * FROM SYSOBJECTS"));
+        }
+    }
+
+    @Test
+    void shouldHandleMultiStatementsWithExplainAndNormalSelect() throws Exception {
+        try (Connection h2Connection = DriverManager.getConnection("jdbc:h2:mem:dm_multi_statement")) {
+            Connection hybrid = dmHybridConnection(h2Connection);
+            putContext(hybrid);
+
+            SqlExecuteRequest request = request("EXPLAIN SELECT * FROM SYSOBJECTS; SELECT 1 AS ID");
+            request.setExplain(false);
+            request.setSingle(false);
+
+            List<ExecuteResponse> results = DMCommandExecutor.INSTANCE.execute(request);
+
+            // Should return at least 2 execute results: one EXPLAIN plan and one SELECT result.
+            assertTrue(results.size() >= 2);
+
+            String explainPlan = results.stream()
+                    .flatMap(r -> r.getDataList().stream())
+                    .filter(row -> row.size() >= 2 && "plan for: SELECT * FROM SYSOBJECTS".equals(row.get(1).getValue()))
+                    .map(row -> row.get(1).getValue())
+                    .findFirst()
+                    .orElse(null);
+            assertEquals("plan for: SELECT * FROM SYSOBJECTS", explainPlan);
+
+            String selectValue = results.stream()
+                    .flatMap(r -> r.getDataList().stream())
+                    .filter(row -> row.size() >= 2 && "1".equals(row.get(1).getValue()))
+                    .map(row -> row.get(1).getValue())
+                    .findFirst()
+                    .orElse(null);
+            assertEquals("1", selectValue);
+        }
+    }
+
+    @Test
+    void streamingCancellationShouldStopAfterSecondCancellationCheck() throws Exception {
+        Connection connection = dmExplainConnection();
+
+        CapturingResultConsumer consumer = new CapturingResultConsumer();
+        AtomicInteger streamResultSequence = new AtomicInteger(0);
+        ISqlExecutionCancellation cancellation = () -> streamResultSequence.incrementAndGet() >= 2;
+
+        SimpleSqlStatement statement = new SimpleSqlStatement("EXPLAIN SELECT * FROM SYSOBJECTS");
+
+        var method = DMCommandExecutor.class.getDeclaredMethod("executeMultiStreaming",
+                SimpleSqlStatement.class,
+                Connection.class,
+                boolean.class,
+                Integer.class,
+                Integer.class,
+                Integer.class,
+                ISqlExecutionResultConsumer.class,
+                ISqlExecutionStatementListener.class,
+                ISqlExecutionCancellation.class,
+                SqlTypeEnum.class,
+                String.class,
+                int.class,
+                int.class,
+                AtomicInteger.class,
+                int.class,
+                ExecutionContext.class);
+        method.setAccessible(true);
+
+        InvocationTargetException exception = assertThrows(InvocationTargetException.class,
+                () -> method.invoke(DMCommandExecutor.INSTANCE,
+                        statement,
+                        connection,
+                        true,
+                        0,
+                        10,
+                        null,
+                        consumer,
+                        null,
+                        cancellation,
+                        null,
+                        statement.getSql(),
+                        1,
+                        10,
+                        streamResultSequence,
+                        1,
+                        null));
+        assertTrue(exception.getCause() instanceof SQLException);
+        assertEquals(0, consumer.resultFinished.size());
+        assertEquals(0, consumer.rowsEventCount);
+    }
+
+    @Test
+    void explainShouldResolveDmdbConnectionFromIndependentDriverClassLoader() throws Exception {
+        try (URLClassLoader driverClassLoader = newDriverIsolatingClassLoader()) {
+            Class<?> isolatedDmConnection = Class.forName(
+                    "dm.jdbc.driver.DmdbConnection", true, driverClassLoader);
+            assertNotSame(DmdbConnection.class, isolatedDmConnection,
+                    "driver ClassLoader must define its own DmdbConnection type");
+
+            Connection connection = (Connection) Proxy.newProxyInstance(
+                    driverClassLoader,
+                    new Class<?>[]{Connection.class, isolatedDmConnection},
+                    (proxy, method, args) -> switch (method.getName()) {
+                        case "unwrap" -> unwrap(proxy, (Class<?>) args[0]);
+                        case "isWrapperFor" -> ((Class<?>) args[0]).isInstance(proxy);
+                        case "getExplainInfo" -> "isolated-plan:" + args[0];
+                        case "isClosed" -> false;
+                        default -> defaultValue(method.getReturnType());
+                    });
+
+            assertNotSame(getClass().getClassLoader(), connection.getClass().getClassLoader());
+            putContext(connection);
+
+            List<ExecuteResponse> results = DMCommandExecutor.INSTANCE.execute(
+                    request("EXPLAIN SELECT * FROM SYSOBJECTS"));
+
+            assertEquals(1, results.size());
+            assertEquals("isolated-plan:SELECT * FROM SYSOBJECTS",
+                    results.get(0).getDataList().get(0).get(1).getValue());
+        }
+    }
+
+    @Test
+    void explainDriverSqlExceptionShouldSurfaceOnNonStreamingPath() throws Exception {
+        Connection connection = dmExplainConnectionThrowing(
+                new SQLException("DM-EXPLAIN-ERR-2762", "HY000", 2762));
+        putContext(connection);
+
+        List<ExecuteResponse> results = DMCommandExecutor.INSTANCE.execute(
+                request("EXPLAIN SELECT * FROM SYSOBJECTS"));
+
+        assertEquals(1, results.size());
+        assertEquals(Boolean.FALSE, results.get(0).getSuccess());
+        assertTrue(results.get(0).getMessage().contains("DM-EXPLAIN-ERR-2762"));
+    }
+
+    @Test
+    void explainDriverSqlExceptionShouldFinishStreamingPath() throws Exception {
+        Connection connection = dmExplainConnectionThrowing(
+                new SQLException("DM-EXPLAIN-ERR-STREAM", "HY000", 2763));
+        putContext(connection);
+
+        CapturingResultConsumer consumer = new CapturingResultConsumer();
+        DMCommandExecutor.INSTANCE.executeStreaming(
+                request("EXPLAIN SELECT * FROM SYSOBJECTS"), consumer, null, () -> false);
+
+        assertEquals(0, consumer.resultStartedCount);
+        assertEquals(0, consumer.rowsEventCount);
+        assertEquals(1, consumer.statementFinishedCount);
+        assertEquals(1, consumer.resultFinished.size());
+        ExecuteResponse finished = consumer.resultFinished.get(0);
+        assertEquals(Boolean.FALSE, finished.getSuccess());
+        assertTrue(finished.getMessage().contains("DM-EXPLAIN-ERR-STREAM"));
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<ExecuteResponse> executeMulti(String sql, Connection connection) throws Exception {
+        Method method = DMCommandExecutor.class.getDeclaredMethod("executeMulti", SimpleSqlStatement.class,
+                Connection.class, boolean.class, Integer.class, Integer.class, Integer.class,
+                ai.chat2db.community.domain.api.model.result.ExecutionContext.class);
+        method.setAccessible(true);
+        return (List<ExecuteResponse>) method.invoke(DMCommandExecutor.INSTANCE,
+                new SimpleSqlStatement(sql), connection, true, 0, 10, null, null);
+    }
+
+    private Connection dmExplainConnection() {
+        return dmExplainConnection(null);
+    }
+
+    private Connection dmExplainConnectionThrowing(SQLException failure) {
+        return dmExplainConnection(failure);
+    }
+
+    private Connection dmExplainConnection(SQLException failure) {
+        return (Connection) Proxy.newProxyInstance(getClass().getClassLoader(),
+                new Class<?>[]{Connection.class, DmdbConnection.class},
+                (proxy, method, args) -> {
+                    if ("getExplainInfo".equals(method.getName())) {
+                        if (failure != null) {
+                            throw failure;
+                        }
+                        return "plan for: " + args[0];
+                    }
+                    return switch (method.getName()) {
+                        case "unwrap" -> unwrap(proxy, (Class<?>) args[0]);
+                        case "isWrapperFor" -> ((Class<?>) args[0]).isInstance(proxy);
+                        case "isClosed" -> false;
+                        default -> defaultValue(method.getReturnType());
+                    };
+                });
+    }
+
+    /**
+     * Child-first loader that defines {@code dm.jdbc.driver.*} from its own URLs,
+     * mimicking Chat2DB's independent JDBC driver ClassLoader.
+     */
+    private URLClassLoader newDriverIsolatingClassLoader() throws Exception {
+        URL classResource = getClass().getClassLoader().getResource("dm/jdbc/driver/DmdbConnection.class");
+        assertNotNull(classResource, "test stub DmdbConnection.class must be on the test classpath");
+
+        Path root = Files.createTempDirectory("dm-driver-isolation");
+        Path packageDir = root.resolve("dm/jdbc/driver");
+        Files.createDirectories(packageDir);
+        try (var in = classResource.openStream()) {
+            Files.copy(in, packageDir.resolve("DmdbConnection.class"));
+        }
+
+        return new URLClassLoader(new URL[]{root.toUri().toURL()}, getClass().getClassLoader()) {
+            @Override
+            protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+                if (name.startsWith("dm.jdbc.driver.")) {
+                    Class<?> loaded = findLoadedClass(name);
+                    if (loaded == null) {
+                        loaded = findClass(name);
+                    }
+                    if (resolve) {
+                        resolveClass(loaded);
+                    }
+                    return loaded;
+                }
+                return super.loadClass(name, resolve);
+            }
+        };
+    }
+
+    private Connection dmHybridConnection(Connection delegate) {
+        return (Connection) Proxy.newProxyInstance(getClass().getClassLoader(),
+                new Class<?>[]{Connection.class, DmdbConnection.class},
+                (proxy, method, args) -> {
+                    String name = method.getName();
+                    if ("getExplainInfo".equals(name)) {
+                        return "plan for: " + args[0];
+                    }
+                    if ("unwrap".equals(name)) {
+                        Class<?> target = (Class<?>) args[0];
+                        if (target == Connection.class || target.isInstance(proxy) || target == DmdbConnection.class) {
+                            return proxy;
+                        }
+                        return delegate.unwrap(target);
+                    }
+                    if ("isWrapperFor".equals(name)) {
+                        Class<?> target = (Class<?>) args[0];
+                        return target == Connection.class || target == DmdbConnection.class
+                                || target.isInstance(proxy) || delegate.isWrapperFor(target);
+                    }
+                    if ("isClosed".equals(name)) {
+                        return delegate.isClosed();
+                    }
+                    if (method.getDeclaringClass() == Object.class) {
+                        return switch (name) {
+                            case "equals" -> proxy == args[0];
+                            case "hashCode" -> System.identityHashCode(proxy);
+                            case "toString" -> "DMHybridConnection";
+                            default -> throw new IllegalStateException("Unexpected Object method: " + name);
+                        };
+                    }
+                    return method.invoke(delegate, args);
+                });
+    }
+
+    private Connection connectionOnlyWrapper(Connection delegate) {
+        return (Connection) Proxy.newProxyInstance(getClass().getClassLoader(),
+                new Class<?>[]{Connection.class},
+                (proxy, method, args) -> {
+                    String name = method.getName();
+                    if ("unwrap".equals(name)) {
+                        Class<?> target = (Class<?>) args[0];
+                        if (target == Connection.class) {
+                            return proxy;
+                        }
+                        if (target.isInstance(delegate) || target == DmdbConnection.class) {
+                            return delegate;
+                        }
+                        return delegate.unwrap(target);
+                    }
+                    if ("isWrapperFor".equals(name)) {
+                        Class<?> target = (Class<?>) args[0];
+                        return target == Connection.class
+                                || target.isInstance(delegate)
+                                || target == DmdbConnection.class
+                                || delegate.isWrapperFor(target);
+                    }
+                    if (method.getDeclaringClass() == Object.class) {
+                        return switch (name) {
+                            case "equals" -> proxy == args[0];
+                            case "hashCode" -> System.identityHashCode(proxy);
+                            case "toString" -> "ConnectionOnlyWrapper";
+                            default -> throw new IllegalStateException("Unexpected Object method: " + name);
+                        };
+                    }
+                    return method.invoke(delegate, args);
+                });
+    }
+
+    private void putContext(Connection connection) {
+        previousPlugin = Chat2DBContext.PLUGIN_MAP.put("DM", new DMPlugin());
+        contextBound = true;
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setDataSourceId(DATA_SOURCE_ID);
+        connectInfo.setConsoleId(1L);
+        connectInfo.setDbType("DM");
+        connectInfo.setDatabaseName("");
+        connectInfo.setSchemaName("SYSDBA");
+        connectInfo.setUrl("jdbc:test:dm");
+        connectInfo.setConnection(connection);
+        DriverConfig driverConfig = new DriverConfig();
+        driverConfig.setDbType("DM");
+        connectInfo.setDriverConfig(driverConfig);
+        Chat2DBContext.putContext(connectInfo);
+    }
+
+    private SqlExecuteRequest request(String sql) {
+        SqlExecuteRequest request = new SqlExecuteRequest();
+        request.setScript(sql);
+        request.setConsoleId(1L);
+        request.setDataSourceId(DATA_SOURCE_ID);
+        request.setDatabaseName("");
+        request.setSchemaName("SYSDBA");
+        request.setPageNo(1);
+        request.setPageSize(10);
+        request.setErrorContinue(Boolean.TRUE);
+        return request;
+    }
+
+    private Object unwrap(Object proxy, Class<?> targetClass) throws SQLException {
+        if (targetClass.isInstance(proxy) || targetClass == Connection.class) {
+            return proxy;
+        }
+        throw new SQLException("Unsupported unwrap target: " + targetClass.getName());
+    }
+
+    private Object defaultValue(Class<?> returnType) {
+        if (!returnType.isPrimitive()) {
+            return null;
+        }
+        if (returnType == boolean.class) {
+            return false;
+        }
+        if (returnType == int.class) {
+            return 0;
+        }
+        if (returnType == long.class) {
+            return 0L;
+        }
+        if (returnType == double.class) {
+            return 0D;
+        }
+        if (returnType == float.class) {
+            return 0F;
+        }
+        if (returnType == short.class) {
+            return (short) 0;
+        }
+        if (returnType == byte.class) {
+            return (byte) 0;
+        }
+        if (returnType == char.class) {
+            return '\0';
+        }
+        return null;
+    }
+
+    private static final class CapturingResultConsumer implements ISqlExecutionResultConsumer {
+
+        private int resultStartedCount;
+        /** Row count carried on resultStarted; should stay 0 for materialized explain streaming. */
+        private int resultStartedRowCount;
+        private int rowsEventCount;
+        private int statementFinishedCount;
+        private final List<List<ResultCell>> receivedRows = new ArrayList<>();
+        private final List<ExecuteResponse> resultFinished = new ArrayList<>();
+
+        @Override
+        public void statementStarted(String sql, String originalSql, String comment) {
+        }
+
+        @Override
+        public void resultStarted(ExecuteResponse result) {
+            resultStartedCount++;
+            resultStartedRowCount = result.getDataList() == null ? 0 : result.getDataList().size();
+        }
+
+        @Override
+        public void rows(ExecuteResponse result, List<List<ResultCell>> rows) {
+            rowsEventCount++;
+            receivedRows.addAll(rows);
+        }
+
+        @Override
+        public void resultFinished(ExecuteResponse result) {
+            resultFinished.add(result);
+        }
+
+        @Override
+        public void updateCount(ExecuteResponse result) {
+        }
+
+        @Override
+        public void statementFinished(String sql, long duration) {
+            statementFinishedCount++;
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMIdentifierProcessorTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMIdentifierProcessorTest.java
index d5a8833709..cec56eebb0 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMIdentifierProcessorTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMIdentifierProcessorTest.java
@@ -128,7 +128,7 @@ void managerUsesSchemaQualifiedNames() throws Exception {
         assertEquals("DROP TABLE IF EXISTS \"SA\"\"LES\".\"ORDERS\"",
                 manager.dropTable(null, "ignored_database", "SA\"LES", "ORDERS"));
         assertEquals("TRUNCATE TABLE \"SA\"\"LES\".\"OR\"\"DERS\"",
-                manager.truncateTable(null, "ignored_database", "SA\"LES", "\"OR\"\"DERS\""));
+                manager.truncateTable(null, "ignored_database", "SA\"LES", "OR\"DERS"));
         assertEquals("DROP TABLE IF EXISTS \"T\"\"; DROP TABLE U; --\"",
                 manager.dropTable(null, null, null, "T\"; DROP TABLE U; --"));
     }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMSqlParserTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMSqlParserTest.java
new file mode 100644
index 0000000000..98fd157248
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/ai/chat2db/plugin/dm/DMSqlParserTest.java
@@ -0,0 +1,52 @@
+package ai.chat2db.plugin.dm;
+
+import ai.chat2db.community.domain.api.enums.parser.SqlTypeEnum;
+import ai.chat2db.community.domain.api.model.parser.result.SqlParserResponse;
+import ai.chat2db.community.domain.api.model.parser.statement.Statement;
+import ai.chat2db.plugin.dm.parser.DMSqlParser;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class DMSqlParserTest {
+
+    @ParameterizedTest(name = "{index}: {0}")
+    @MethodSource("explainStatements")
+    void parserStatementsShouldPreserveExplainAsOuterStatementType(String sql) {
+        assertExplainType(new DMSqlParser().parserStatements(sql), sql);
+    }
+
+    @ParameterizedTest(name = "{index}: {0}")
+    @MethodSource("explainStatements")
+    void simpleParserStatementsShouldPreserveExplainAsOuterStatementType(String sql) {
+        assertExplainType(new DMSqlParser().simpleParserStatements(sql), sql);
+    }
+
+    @ParameterizedTest(name = "{index}: {0}")
+    @MethodSource("explainStatements")
+    void validTableStatementsShouldPreserveExplainAsOuterStatementType(String sql) {
+        assertExplainType(new DMSqlParser().validTableStatements(sql), sql);
+    }
+
+    private static Stream<String> explainStatements() {
+        return Stream.of(
+                "EXPLAIN SELECT * FROM SYSOBJECTS",
+                "EXPLAIN UPDATE SYSOBJECTS SET NAME = 'UPDATED' WHERE ID = 1",
+                "EXPLAIN DELETE FROM SYSOBJECTS WHERE ID = 1",
+                "EXPLAIN INSERT INTO SYSOBJECTS (ID, NAME) VALUES (1, 'CREATED')",
+                "EXPLAIN MERGE INTO TARGET_TABLE T USING SOURCE_TABLE S ON (T.ID = S.ID) "
+                        + "WHEN MATCHED THEN UPDATE SET T.NAME = S.NAME"
+        );
+    }
+
+    private void assertExplainType(SqlParserResponse response, String sql) {
+        List<Statement> statements = response.getStatements();
+
+        assertEquals(1, statements.size(), sql);
+        assertEquals(SqlTypeEnum.EXPLAIN.name(), statements.get(0).getType(), sql);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/dm/jdbc/driver/DmdbConnection.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/dm/jdbc/driver/DmdbConnection.java
new file mode 100644
index 0000000000..13c008c300
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-dm/src/test/java/dm/jdbc/driver/DmdbConnection.java
@@ -0,0 +1,9 @@
+package dm.jdbc.driver;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public interface DmdbConnection extends Connection {
+
+    String getExplainInfo(String sql) throws SQLException;
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/main/java/ai/chat2db/plugin/hive/HiveMetaData.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/main/java/ai/chat2db/plugin/hive/HiveMetaData.java
index 8d3bfb38f9..75c787ea06 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/main/java/ai/chat2db/plugin/hive/HiveMetaData.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/main/java/ai/chat2db/plugin/hive/HiveMetaData.java
@@ -19,7 +19,6 @@
 import ai.chat2db.spi.model.value.*;
 import ai.chat2db.community.domain.api.model.view.*;
 import ai.chat2db.spi.DefaultSQLExecutor;
-import com.google.common.collect.Lists;
 import jakarta.validation.constraints.NotEmpty;
 import org.apache.commons.lang3.StringUtils;
 
@@ -38,27 +37,30 @@ public ISQLIdentifierProcessor getSQLIdentifierProcessor() {
 
     @Override
     public List<Database> databases(Connection connection) {
-        return Lists.newArrayList();
-    }
-
-    @Override
-    public List<Schema> schemas(Connection connection, String databaseName) {
-        List<Schema> schemas = new ArrayList<>();
-        return DefaultSQLExecutor.getInstance().execute(connection,SQL_SHOW_DATABASES, resultSet -> {
+        List<Database> databases = new ArrayList<>();
+        return DefaultSQLExecutor.getInstance().execute(connection, SQL_SHOW_DATABASES, resultSet -> {
             try {
                 while (resultSet.next()) {
-                    String schenaNane = resultSet.getString("database_name");
-                    Schema schema = new Schema();
-                    schema.setName(schenaNane);
-                    schemas.add(schema);
+                    String databaseName = resultSet.getString("database_name");
+                    if (StringUtils.isBlank(databaseName)) {
+                        continue;
+                    }
+                    Database database = new Database();
+                    database.setName(databaseName);
+                    databases.add(database);
                 }
             } catch (SQLException e) {
                 throw new RuntimeException(e);
             }
-            return schemas;
+            return databases;
         });
     }
 
+    @Override
+    public List<Schema> schemas(Connection connection, String databaseName) {
+        return Collections.emptyList();
+    }
+
     @Override
     public String tableDDL(Connection connection, @NotEmpty String databaseName, String schemaName,
                            @NotEmpty String tableName) {
@@ -81,7 +83,7 @@ public String tableDDL(Connection connection, @NotEmpty String databaseName, Str
 
     @Override
     public String getMetaDataName(String... names) {
-        return Arrays.stream(names).skip(1).filter(name -> StringUtils.isNotBlank(name))
+        return Arrays.stream(names).filter(name -> StringUtils.isNotBlank(name))
                 .map(HiveIdentifierProcessor.INSTANCE::quoteIdentifierAlways)
                 .collect(Collectors.joining("."));
     }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/main/resources/ai/chat2db/plugin/hive/hive.json b/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/main/resources/ai/chat2db/plugin/hive/hive.json
index b7ceb2e721..b61ffc6bf9 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/main/resources/ai/chat2db/plugin/hive/hive.json
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/main/resources/ai/chat2db/plugin/hive/hive.json
@@ -1,7 +1,7 @@
 {
   "dbType": "HIVE",
-  "supportDatabase": false,
-  "supportSchema": true,
+  "supportDatabase": true,
+  "supportSchema": false,
   "driverConfigList": [
     {
       "url": "jdbc:hive2://localhost:10000/",
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/test/java/ai/chat2db/plugin/hive/HiveIdentifierProcessorTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/test/java/ai/chat2db/plugin/hive/HiveIdentifierProcessorTest.java
index e7ad7a72ed..1023e0a591 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/test/java/ai/chat2db/plugin/hive/HiveIdentifierProcessorTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/test/java/ai/chat2db/plugin/hive/HiveIdentifierProcessorTest.java
@@ -262,7 +262,7 @@ void dropTableQuotesIdentifier() {
     void metaDataFormatAndNameQuoteIdentifiers() {
         assertEquals("`a``b`", HiveMetaData.format("a`b"));
         assertEquals("`a``; DROP TABLE b; --`", HiveMetaData.format("a`; DROP TABLE b; --"));
-        assertEquals("`db`.`a``b`", new HiveMetaData().getMetaDataName("ignored", "db", "a`b"));
+        assertEquals("`db`.`a``b`", new HiveMetaData().getQualifiedTableName("db", null, "a`b"));
     }
 
     @Test
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/test/java/ai/chat2db/plugin/hive/HiveMetaDataTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/test/java/ai/chat2db/plugin/hive/HiveMetaDataTest.java
new file mode 100644
index 0000000000..5805b59da3
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-hive/src/test/java/ai/chat2db/plugin/hive/HiveMetaDataTest.java
@@ -0,0 +1,109 @@
+package ai.chat2db.plugin.hive;
+
+import ai.chat2db.community.domain.api.config.DBConfig;
+import ai.chat2db.community.domain.api.model.metadata.Database;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class HiveMetaDataTest {
+
+    @Test
+    void configExposesHiveNamespacesAsDatabases() {
+        DBConfig config = new HivePlugin().getDBConfig();
+
+        assertTrue(config.isSupportDatabase());
+        assertFalse(config.isSupportSchema());
+    }
+
+    @Test
+    void databasesReadsShowDatabasesResult() {
+        AtomicReference<String> executedSql = new AtomicReference<>();
+        Connection connection = connectionWithDatabaseRows(List.of("analytics", "default"), executedSql);
+
+        List<Database> databases = new HiveMetaData().databases(connection);
+
+        assertEquals("show databases", executedSql.get());
+        assertEquals(List.of("analytics", "default"), databases.stream().map(Database::getName).toList());
+    }
+
+    @Test
+    void schemasAreEmptyBecauseHiveHasNoSeparateSchemaNamespace() {
+        assertTrue(new HiveMetaData().schemas(null, "analytics").isEmpty());
+    }
+
+    @Test
+    void qualifiedTableNameKeepsHiveDatabasePrefix() {
+        HiveMetaData metaData = new HiveMetaData();
+
+        assertEquals("`analytics`.`events`", metaData.getQualifiedTableName("analytics", null, "events"));
+        assertEquals("`events`", metaData.getQualifiedTableName(null, null, "events"));
+    }
+
+    private static Connection connectionWithDatabaseRows(List<String> names, AtomicReference<String> executedSql) {
+        AtomicInteger row = new AtomicInteger(-1);
+        ResultSet resultSet = proxy(ResultSet.class, (proxy, method, args) -> switch (method.getName()) {
+            case "next" -> row.incrementAndGet() < names.size();
+            case "getString" -> names.get(row.get());
+            case "close" -> null;
+            default -> defaultValue(method.getReturnType());
+        });
+        PreparedStatement statement = proxy(PreparedStatement.class, (proxy, method, args) -> switch (method.getName()) {
+            case "execute" -> true;
+            case "getResultSet" -> resultSet;
+            case "close" -> null;
+            default -> defaultValue(method.getReturnType());
+        });
+        return proxy(Connection.class, (proxy, method, args) -> {
+            if ("prepareStatement".equals(method.getName())) {
+                executedSql.set((String) args[0]);
+                return statement;
+            }
+            return defaultValue(method.getReturnType());
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> T proxy(Class<T> type, InvocationHandler handler) {
+        return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class<?>[]{type}, handler);
+    }
+
+    private static Object defaultValue(Class<?> type) {
+        if (!type.isPrimitive()) {
+            return null;
+        }
+        if (type == boolean.class) {
+            return false;
+        }
+        if (type == char.class) {
+            return '\0';
+        }
+        if (type == byte.class) {
+            return (byte) 0;
+        }
+        if (type == short.class) {
+            return (short) 0;
+        }
+        if (type == int.class) {
+            return 0;
+        }
+        if (type == long.class) {
+            return 0L;
+        }
+        if (type == float.class) {
+            return 0F;
+        }
+        return 0D;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/main/java/ai/chat2db/plugin/kingbase/KingBaseMetaData.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/main/java/ai/chat2db/plugin/kingbase/KingBaseMetaData.java
index 02b5e0d19a..9026b88602 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/main/java/ai/chat2db/plugin/kingbase/KingBaseMetaData.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/main/java/ai/chat2db/plugin/kingbase/KingBaseMetaData.java
@@ -27,6 +27,7 @@
 
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -235,160 +236,50 @@ public String tableDDL(Connection connection, String databaseName, String schema
                     }
                     return parentTableInfo;
                 });
+        StringBuilder autoIncrementDDL = new StringBuilder();
         int columnCount;
         if (!partitionInfo[0]) {
             columnCount = DefaultSQLExecutor.getInstance().preExecute(connection, COLUMN_SQL, new String[]{schemaName, tableName}, resultSet -> {
+                // Catalog attributes vary by server capability; a.* never references absent attributes.
+                Set<String> attributes = new HashSet<>();
+                ResultSetMetaData metadata = resultSet.getMetaData();
+                for (int i = 1; i <= metadata.getColumnCount(); i++) {
+                    attributes.add(metadata.getColumnLabel(i).toLowerCase(Locale.ROOT));
+                }
                 int total = 0;
                 while (resultSet.next()) {
-                    total++;
-                    String columnName = resultSet.getString("column_name");
+                    if (total++ > 0) {
+                        ddlBuilder.append(",\n");
+                    }
+                    String columnName = resultSet.getString("attname");
                     String dataType = resultSet.getString("data_type");
                     String columnDefault = resultSet.getString("column_default");
-                    String udtName = resultSet.getString("udt_name");
-                    String identityGeneration = resultSet.getString("identity_generation");
-                    boolean isNullable = "YES".equals(resultSet.getString("is_nullable"));
-                    boolean isIdentity = "YES".equals(resultSet.getString("is_identity"));
-                    int identityIncrement = resultSet.getInt("identity_increment");
-                    int identityStart = resultSet.getInt("identity_start");
-                    int characterMaximumLength = resultSet.getInt("character_maximum_length");
-                    int numericPrecision = resultSet.getInt("numeric_precision");
-                    int numericScale = resultSet.getInt("numeric_scale");
-                    int datetimePrecision = resultSet.getInt("datetime_precision");
-                    ddlBuilder.append("\t").append(columnName).append("  ").append("\t");
-
-
-                    if ("ARRAY".equals(dataType)) {
-                        if (udtName.contains(KingBaseColumnTypeEnum.INT4.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.INTEGER.getColumnType().getTypeName().toLowerCase()).append("[]");
-                        }
-
-
- else if (udtName.contains(KingBaseColumnTypeEnum.TEXT.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.TEXT.getColumnType().getTypeName().toLowerCase()).append("[]");
-                        }
-
- else if (udtName.substring(1).equals(KingBaseColumnTypeEnum.BIT.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.BIT.getColumnType().getTypeName().toLowerCase()).append("[]");
-                        } else if (udtName.substring(1).equals(KingBaseColumnTypeEnum.TIME.name().toLowerCase())) {
-                            ddlBuilder.append("time without time zone").append("[]");
-                        } else if (udtName.substring(1).equals(KingBaseColumnTypeEnum.TIMESTAMP.name().toLowerCase())) {
-                            ddlBuilder.append("timestamp without time zone").append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.TIMETZ.name().toLowerCase())) {
-                            ddlBuilder.append("time with time zone").append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.TIMESTAMPTZ.name().toLowerCase())) {
-                            ddlBuilder.append("timestamp with time zone").append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.PATH.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.PATH.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.POINT.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.POINT.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.LINE.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.LINE.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.BOX.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.BOX.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.LSEG.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.LSEG.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.POLYGON.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.POLYGON.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.CIRCLE.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.CIRCLE.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.CIDR.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.CIDR.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.INET.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.INET.name().toLowerCase()).append("[]");
-                        } else if (udtName.substring(1).equals(KingBaseColumnTypeEnum.MACADDR.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.MACADDR.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains("macaddr8")) {
-                            ddlBuilder.append("macaddr8").append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.XML.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.XML.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.TSQUERY.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.TSQUERY.name().toLowerCase()).append("[]");
-                        } else if (udtName.contains(KingBaseColumnTypeEnum.TSVECTOR.name().toLowerCase())) {
-                            ddlBuilder.append(KingBaseColumnTypeEnum.TSVECTOR.name().toLowerCase()).append("[]");
-                        } else {
-                            ddlBuilder.append(dataType);
-                        }
-                    } else if (dataType.equalsIgnoreCase("bpchar")) {
-                        ddlBuilder.append(KingBaseColumnTypeEnum.CHAR.name().toLowerCase());
-                        if (characterMaximumLength > 0 && characterMaximumLength != 1) {
-                            ddlBuilder.append("(").append(characterMaximumLength).append(")");
-                        }
-                    } else if (dataType.equalsIgnoreCase("pg_catalog.bit")) {
-                        ddlBuilder.append(KingBaseColumnTypeEnum.BIT.name().toLowerCase());
-                        if (characterMaximumLength > 0 && characterMaximumLength != 1) {
-                            ddlBuilder.append("(").append(characterMaximumLength).append(")");
-                        }
-                    } else if (KingBaseColumnTypeEnum.BIT.name().toLowerCase().equals(dataType)) {
-                        ddlBuilder.append(udtName);
-                        if (characterMaximumLength > 0 && characterMaximumLength != 1) {
-                            ddlBuilder.append("(").append(characterMaximumLength).append(")");
-                        }
-                    }
-
-
- else if ("USER-DEFINED".equals(dataType)) {
-                        dataType = format(udtName);
-                        ddlBuilder.append(dataType);
-
-                    } else if (KingBaseColumnTypeEnum.TIMETZ.getColumnType().getTypeName().toLowerCase().equals(udtName)) {
-                        if (datetimePrecision >= 0 && datetimePrecision != 6) {
-                            dataType = "time" + "(" + datetimePrecision + ")" + " with time zone";
-                        }
-                        ddlBuilder.append(dataType);
-
-                    } else if (KingBaseColumnTypeEnum.TIMESTAMPTZ.getColumnType().getTypeName().toLowerCase().equals(udtName)) {
-                        if (datetimePrecision >= 0 && datetimePrecision != 6) {
-                            dataType = "timestamp" + "(" + datetimePrecision + ")" + " with time zone";
-                        }
-                        ddlBuilder.append(dataType);
-                    } else if (KingBaseColumnTypeEnum.TIMESTAMP.name().toLowerCase().equals(udtName)) {
-                        ddlBuilder.append(udtName);
-                        if (datetimePrecision >= 0 && datetimePrecision != 6) {
-                            ddlBuilder.append("(").append(datetimePrecision).append(")");
-                        }
-                    } else if (KingBaseColumnTypeEnum.INTERVAL.name().toLowerCase().equals(udtName)) {
-                        ddlBuilder.append(udtName);
-                        if (datetimePrecision >= 0 && datetimePrecision != 6) {
-                            ddlBuilder.append("(").append(datetimePrecision).append(")");
-                        }
-                    } else if (KingBaseColumnTypeEnum.TIME.name().toLowerCase().equals(udtName)) {
-                        ddlBuilder.append(udtName);
-                        if (datetimePrecision >= 0 && datetimePrecision != 6) {
-                            ddlBuilder.append("(").append(datetimePrecision).append(")");
-                        }
-                    } else if (KingBaseColumnTypeEnum.CHARACTER.name().toLowerCase().equals(dataType)) {
-                        ddlBuilder.append(KingBaseColumnTypeEnum.CHAR.name().toLowerCase());
-                        if (characterMaximumLength > 1) {
-                            ddlBuilder.append("(").append(characterMaximumLength).append(")");
-                        }
-                    } else if (KingBaseColumnTypeEnum.NUMERIC.name().toLowerCase().equals(dataType)) {
-                        ddlBuilder.append(dataType);
-                        if (numericPrecision > 0) {
-                            ddlBuilder.append("(").append(numericPrecision);
-                            if (numericScale != 0) {
-                                ddlBuilder.append(",").append(numericScale);
-                            }
-                            ddlBuilder.append(")");
-                        }
-                    } else {
-                        ddlBuilder.append(dataType);
-                        if (isIdentity) {
-                            ddlBuilder.append(" generated ").append(identityGeneration.toLowerCase()).append(" as identity");
-                            if (!(identityStart == 1 && identityIncrement == 1)) {
-                                ddlBuilder.append(" (start with ").append(identityStart).append(" increment by ").append(identityIncrement).append(")");
-                            }
-                        }
-                    }
-                    if (StringUtils.isNotBlank(columnDefault) && !isIdentity) {
+                    String identity = attributes.contains("attidentity") ? resultSet.getString("attidentity") : "";
+                    String generated = attributes.contains("attgenerated") ? resultSet.getString("attgenerated") : "";
+                    ddlBuilder.append("\t").append(format(columnName)).append("  \t").append(dataType);
+                    if ("i".equals(identity)) {
+                        appendAutoIncrement(connection, formatTableName, columnName, autoIncrementDDL);
+                    } else if (StringUtils.isNotBlank(identity)) {
+                        String generation = switch (identity) {
+                            case "a" -> "always";
+                            case "d" -> "by default";
+                            default -> throw new SQLException("Unsupported identity kind: " + identity);
+                        };
+                        ddlBuilder.append(" generated ").append(generation).append(" as identity");
+                        appendIdentityOptions(connection, formatTableName, columnName, ddlBuilder);
+                    } else if (StringUtils.isNotBlank(generated)) {
+                        String storage = switch (generated) {
+                            case "s" -> "stored";
+                            case "v" -> "virtual";
+                            default -> throw new SQLException("Unsupported generated column kind: " + generated);
+                        };
+                        ddlBuilder.append(" generated always as (").append(columnDefault).append(") ").append(storage);
+                    } else if (StringUtils.isNotBlank(columnDefault)) {
                         ddlBuilder.append(" default ").append(columnDefault);
                     }
-                    if (!isNullable && !isIdentity) {
+                    if (resultSet.getBoolean("attnotnull")) {
                         ddlBuilder.append(" not null");
                     }
-
-                    if (!resultSet.isLast()) {
-                        ddlBuilder.append(",\n");
-                    }
                 }
                 return total;
             });
@@ -467,6 +358,7 @@ else if ("USER-DEFINED".equals(dataType)) {
             });
         }
 
+        ddlBuilder.append(autoIncrementDDL);
         List<Table> tables = this.tables(connection, databaseName, schemaName, tableName);
         if (CollectionUtils.isNotEmpty(tables) && tables.size() == 1) {
             Table table = tables.get(0);
@@ -519,6 +411,52 @@ else if ("USER-DEFINED".equals(dataType)) {
 
 
 
+    private void appendIdentityOptions(Connection connection, String tableName, String columnName, StringBuilder ddl) {
+        DefaultSQLExecutor.getInstance().preExecute(connection, IDENTITY_SEQUENCE_SQL, new String[]{tableName, columnName}, resultSet -> {
+            if (!resultSet.next()) {
+                throw new SQLException("Identity sequence metadata is missing");
+            }
+            ddl.append(" (");
+            appendSequenceOptions(resultSet, ddl);
+            ddl.append(")");
+        });
+    }
+
+    private void appendAutoIncrement(Connection connection, String tableName, String columnName, StringBuilder ddl) {
+        DefaultSQLExecutor.getInstance().preExecute(connection, IDENTITY_SEQUENCE_SQL, new String[]{tableName, columnName}, resultSet -> {
+            if (!resultSet.next()) {
+                throw new SQLException("Auto-increment sequence metadata is missing");
+            }
+            String sequenceName = getMetaDataName(resultSet.getString("sequence_schema"), resultSet.getString("sequence_name"));
+            // Match sys_dump: attach AUTO_INCREMENT after keys, then restore its current counter.
+            ddl.append("alter table ").append(tableName).append(" alter column ").append(format(columnName))
+                    .append(" add auto_increment (sequence name ").append(sequenceName).append(" ");
+            appendSequenceOptions(resultSet, ddl);
+            ddl.append(")");
+            DefaultSQLExecutor.getInstance().execute(connection, SEQUENCE_STATE_SQL.formatted(sequenceName), state -> {
+                if (!state.next()) {
+                    throw new SQLException("Auto-increment sequence state is missing");
+                }
+                long nextValue = state.getLong("next_value");
+                if (nextValue > 0) {
+                    ddl.append(", auto_increment = ").append(nextValue);
+                }
+                ddl.append(";\nselect pg_catalog.setval('").append(getSQLIdentifierProcessor().escapeString(sequenceName))
+                        .append("', ").append(state.getLong("last_value")).append(", ")
+                        .append(state.getBoolean("is_called")).append(");\n");
+            });
+        });
+    }
+
+    private void appendSequenceOptions(ResultSet resultSet, StringBuilder ddl) throws SQLException {
+        ddl.append("start with ").append(resultSet.getLong("seqstart"))
+                .append(" increment by ").append(resultSet.getLong("seqincrement"))
+                .append(" minvalue ").append(resultSet.getLong("seqmin"))
+                .append(" maxvalue ").append(resultSet.getLong("seqmax"))
+                .append(" cache ").append(resultSet.getLong("seqcache"))
+                .append(resultSet.getBoolean("seqcycle") ? " cycle" : " no cycle");
+    }
+
     @Override
     public List<TableIndex> indexes(Connection connection, String databaseName, String schemaName, String tableName) {
         List<TableIndex> indexes = super.indexes(connection, databaseName, schemaName, tableName);
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/main/java/ai/chat2db/plugin/kingbase/constant/SqlConstant.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/main/java/ai/chat2db/plugin/kingbase/constant/SqlConstant.java
index 6ab66b177e..817e31da63 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/main/java/ai/chat2db/plugin/kingbase/constant/SqlConstant.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/main/java/ai/chat2db/plugin/kingbase/constant/SqlConstant.java
@@ -235,30 +235,41 @@ pg_attribute a ON (c.oid = a.attrelid AND a.attnum > 0 AND a.attnum = d.objsubid
                                                             AND n.nspname = ?
                                                             AND c.relname = ?
                                                           ORDER BY 2 desc;""";
+    // MySQL enums (typtype 'l') owned by a column need their name preserved for default casts.
     public static final String COLUMN_SQL = """
-                                            SELECT quote_ident(c.column_name) as column_name ,
-                                                   c.data_type,
-                                                   c.udt_name,
-                                                   quote_ident(c.udt_schema) as udt_schema,
-                                                   c.character_maximum_length,
-                                                   c.is_nullable,
-                                                   c.column_default,
-                                                   c.numeric_precision,
-                                                   c.numeric_scale,
-                                                   c.datetime_precision,
-                                                   c.is_identity,
-                                                   c.identity_start,
-                                                   c.identity_increment,
-                                                   c.identity_maximum,
-                                                   c.identity_minimum,
-                                                   c.identity_cycle,
-                                                   c.identity_generation,
-                                                   c.is_generated,
-                                                   c.generation_expression,
-                                                   c.identity_increment
-                                            FROM information_schema.columns c
-                                            WHERE (table_schema, table_name) = (?, ?)
-                                            ORDER BY ordinal_position;""";
+                                            SELECT a.*,
+                                                   CASE WHEN t.typtype = 'l' AND EXISTS (
+                                                       SELECT 1 FROM pg_catalog.pg_depend dep
+                                                       WHERE dep.classid = 'pg_catalog.pg_type'::pg_catalog.regclass
+                                                         AND dep.objid = t.oid
+                                                         AND dep.refclassid = 'pg_catalog.pg_class'::pg_catalog.regclass
+                                                         AND dep.refobjid = a.attrelid AND dep.refobjsubid = a.attnum
+                                                         AND dep.deptype = 'a'
+                                                   ) THEN pg_catalog.format('ENUM(%s) NAMES %I.%I',
+                                                       (SELECT pg_catalog.string_agg(pg_catalog.quote_literal(e.enumlabel), ', ' ORDER BY e.enumsortorder)
+                                                        FROM pg_catalog.pg_enum e WHERE e.enumtypid = t.oid), tn.nspname, t.typname)
+                                                   ELSE pg_catalog.format_type(a.atttypid, a.atttypmod) END AS data_type,
+                                                   pg_catalog.pg_get_expr(d.adbin, d.adrelid) AS column_default
+                                            FROM pg_catalog.pg_attribute a
+                                            JOIN pg_catalog.pg_class c ON c.oid = a.attrelid
+                                            JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+                                            JOIN pg_catalog.pg_type t ON t.oid = a.atttypid
+                                            JOIN pg_catalog.pg_namespace tn ON tn.oid = t.typnamespace
+                                            LEFT JOIN pg_catalog.pg_attrdef d ON d.adrelid = a.attrelid AND d.adnum = a.attnum
+                                            WHERE n.nspname = ? AND c.relname = ?
+                                              AND a.attnum > 0 AND NOT a.attisdropped
+                                              AND (pg_catalog.pg_has_role(c.relowner, 'USAGE')
+                                                   OR pg_catalog.has_column_privilege(c.oid, a.attnum, 'SELECT, INSERT, UPDATE, REFERENCES'))
+                                            ORDER BY a.attnum;""";
+    public static final String IDENTITY_SEQUENCE_SQL = """
+                                                       SELECT seqstart, seqincrement, seqmin, seqmax, seqcache, seqcycle,
+                                                              n.nspname AS sequence_schema, c.relname AS sequence_name
+                                                       FROM pg_catalog.pg_sequence s
+                                                       JOIN pg_catalog.pg_class c ON c.oid = s.seqrelid
+                                                       JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+                                                       WHERE seqrelid = pg_catalog.pg_get_serial_sequence(?, ?)::pg_catalog.regclass;
+                                                       """;
+    public static final String SEQUENCE_STATE_SQL = "SELECT last_value, next_value, is_called FROM %s";
     public static final String TABLE_INDEX_COMMENT_SQL = """
                                                          SELECT quote_ident(n.nspname)                           as schema_name,
                                                                 quote_ident(t.relname)                           AS table_name,
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/test/java/ai/chat2db/plugin/kingbase/KingBaseTableDDLTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/test/java/ai/chat2db/plugin/kingbase/KingBaseTableDDLTest.java
new file mode 100644
index 0000000000..d44009dccd
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-kingbase/src/test/java/ai/chat2db/plugin/kingbase/KingBaseTableDDLTest.java
@@ -0,0 +1,250 @@
+package ai.chat2db.plugin.kingbase;
+
+import ai.chat2db.community.domain.api.model.metadata.Table;
+import ai.chat2db.community.domain.api.model.metadata.TableColumn;
+import org.junit.jupiter.api.Test;
+
+import javax.sql.rowset.CachedRowSet;
+import javax.sql.rowset.RowSetMetaDataImpl;
+import javax.sql.rowset.RowSetProvider;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static ai.chat2db.plugin.kingbase.constant.SqlConstant.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+class KingBaseTableDDLTest {
+    private static final String[] BASIC_COLUMNS = {"attname", "data_type", "column_default", "attnotnull"};
+    private static final String[] IDENTITY_COLUMNS = {"attname", "data_type", "column_default", "attnotnull", "attidentity"};
+    private static final String[] GENERATED_COLUMNS = {"attname", "data_type", "column_default", "attnotnull", "attgenerated"};
+    private static final String[] SEQUENCE_COLUMNS = {"seqstart", "seqincrement", "seqmin", "seqmax", "seqcache", "seqcycle"};
+
+    @Test
+    void mysqlAutoIncrementPreservesSequenceNameAndCounterAfterKeys() throws Exception {
+        for (boolean called : List.of(false, true)) {
+            Fixture fixture = new Fixture(rows(IDENTITY_COLUMNS, new Object[]{"id", "bigint", null, true, "i"}));
+            fixture.results.put(IDENTITY_SEQUENCE_SQL, rows(new String[]{"seqstart", "seqincrement", "seqmin", "seqmax",
+                            "seqcache", "seqcycle", "sequence_schema", "sequence_name"},
+                    new Object[]{1L, 1L, 1L, Long.MAX_VALUE, 1L, false, "sch\"ema", "seq'\"name"}));
+            String stateQuery = SEQUENCE_STATE_SQL.formatted("\"sch\"\"ema\".\"seq'\"\"name\"");
+            fixture.results.put(stateQuery, rows(new String[]{"last_value", "next_value", "is_called"},
+                    new Object[]{3_000_000_000L, 4_000_000_000L, called}));
+            String indexDDL = "CREATE INDEX id_idx ON \"app\".\"orders\" (id)";
+            fixture.results.put(INDEX_SQL, rows(new String[]{"INDEXNAME", "INDEXDEF"}, new Object[]{"id_idx", indexDDL}));
+
+            String ddl = fixture.export("app", "orders");
+
+            String attach = "alter table \"app\".\"orders\" alter column \"id\" add auto_increment"
+                    + " (sequence name \"sch\"\"ema\".\"seq'\"\"name\" start with 1 increment by 1 minvalue 1"
+                    + " maxvalue 9223372036854775807 cache 1 no cycle), auto_increment = 4000000000;";
+            assertTrue(ddl.contains(attach), ddl);
+            assertTrue(ddl.indexOf(indexDDL) < ddl.indexOf(attach), ddl);
+            assertTrue(ddl.contains("select pg_catalog.setval('\"sch\"\"ema\".\"seq''\"\"name\"', 3000000000, " + called + ");"), ddl);
+            assertTrue(fixture.executed.contains(stateQuery));
+        }
+    }
+
+    @Test
+    void preservesAttachedEnumNameAndDefaultCast() throws Exception {
+        String type = "ENUM('open', 'O''Brien') NAMES public.\"Enum_123\"";
+        Fixture fixture = new Fixture(rows(BASIC_COLUMNS,
+                new Object[]{"state", type, "'open'::public.\"Enum_123\"", false}));
+
+        String ddl = fixture.export("app", "orders");
+
+        assertTrue(ddl.contains("\"state\"  \t" + type + " default 'open'::public.\"Enum_123\""), ddl);
+    }
+
+    @Test
+    void exportsTypesAndDefaultsWithoutInformationSchemaOrOptionalCatalogAttributes() throws Exception {
+        Fixture fixture = new Fixture(rows(BASIC_COLUMNS,
+                new Object[]{"select", "character varying(37)", "'O''Brien'::character varying", true},
+                new Object[]{"amount", "numeric(18,4)", "0.1250", false},
+                new Object[]{"tags", "integer[]", null, false},
+                new Object[]{"state", "\"Types\".\"OrderState\"", null, true},
+                new Object[]{"created_at", "timestamp(3) with time zone", "CURRENT_TIMESTAMP", false},
+                new Object[]{"serial_id", "bigint", "nextval('app.id_seq'::regclass)", true}));
+
+        String ddl = fixture.export("app", "orders");
+
+        assertTrue(ddl.contains("\"select\"  \tcharacter varying(37) default 'O''Brien'::character varying not null,\n"), ddl);
+        assertTrue(ddl.contains("\"amount\"  \tnumeric(18,4) default 0.1250,\n"), ddl);
+        assertTrue(ddl.contains("\"tags\"  \tinteger[],\n"), ddl);
+        assertTrue(ddl.contains("\"state\"  \t\"Types\".\"OrderState\" not null,\n"), ddl);
+        assertTrue(ddl.contains("\"created_at\"  \ttimestamp(3) with time zone default CURRENT_TIMESTAMP,\n"), ddl);
+        assertTrue(ddl.contains("\"serial_id\"  \tbigint default nextval('app.id_seq'::regclass) not null\n)"), ddl);
+        assertFalse(fixture.executed.contains(IDENTITY_SEQUENCE_SQL));
+        assertEquals(List.of("app", "orders"), fixture.parameters.get(COLUMN_SQL));
+    }
+
+    @Test
+    void preservesIdentityModeAndLargeSequenceOptionsWithQuotedIdentifiers() throws Exception {
+        for (String identity : List.of("a", "d")) {
+            Fixture fixture = new Fixture(rows(IDENTITY_COLUMNS,
+                    new Object[]{"id\"value", "bigint", null, true, identity}));
+            fixture.results.put(IDENTITY_SEQUENCE_SQL, rows(SEQUENCE_COLUMNS,
+                    new Object[]{3_000_000_000L, -2L, -9_000_000_000L, 9_000_000_000L, 32L, true}));
+
+            String ddl = fixture.export("sch\"ema", "tab'le");
+
+            assertTrue(ddl.startsWith("create table \"sch\"\"ema\".\"tab'le\""), ddl);
+            assertTrue(ddl.contains("\"id\"\"value\"  \tbigint generated "
+                    + (identity.equals("a") ? "always" : "by default")
+                    + " as identity (start with 3000000000 increment by -2 minvalue -9000000000"
+                    + " maxvalue 9000000000 cache 32 cycle) not null"), ddl);
+            assertEquals(List.of("\"sch\"\"ema\".\"tab'le\"", "id\"value"), fixture.parameters.get(IDENTITY_SEQUENCE_SQL));
+        }
+    }
+
+    @Test
+    void detectsUppercaseMetadataLabelsAndPreservesNonCyclingIdentity() throws Exception {
+        Fixture fixture = new Fixture(rows(new String[]{"ATTNAME", "DATA_TYPE", "COLUMN_DEFAULT", "ATTNOTNULL", "ATTIDENTITY"},
+                new Object[]{"id", "integer", null, true, "d"}));
+        fixture.results.put(IDENTITY_SEQUENCE_SQL, rows(SEQUENCE_COLUMNS,
+                new Object[]{1L, 1L, 1L, 2_147_483_647L, 1L, false}));
+
+        assertTrue(fixture.export("app", "orders").contains("cache 1 no cycle) not null"));
+    }
+
+    @Test
+    void preservesGeneratedExpressionsInsteadOfExportingThemAsDefaults() throws Exception {
+        for (String generated : List.of("s", "v")) {
+            Fixture fixture = new Fixture(rows(GENERATED_COLUMNS,
+                    new Object[]{"total", "numeric(18,4)", "(price * quantity)", true, generated}));
+
+            String ddl = fixture.export("app", "orders");
+
+            assertTrue(ddl.contains("generated always as ((price * quantity)) "
+                    + (generated.equals("s") ? "stored" : "virtual") + " not null"), ddl);
+            assertFalse(ddl.contains(" default "), ddl);
+            assertFalse(fixture.executed.contains(IDENTITY_SEQUENCE_SQL));
+        }
+    }
+
+    @Test
+    void preservesConstraintsAfterTheLastColumn() throws Exception {
+        Fixture fixture = new Fixture(rows(BASIC_COLUMNS, new Object[]{"id", "integer", null, true}));
+        fixture.results.put(CONSTRAINT_SQL_VERSION_UNDER_ELEVEN,
+                rows(new String[]{"CONSTRAINT_NAME", "CONSTRAINT_DEFINITION"}, new Object[]{"orders_pk", "PRIMARY KEY (id)"}));
+
+        String ddl = fixture.export("app", "orders");
+
+        assertTrue(ddl.contains("\"id\"  \tinteger not null,\n\t constraint \"orders_pk\" PRIMARY KEY (id)"), ddl);
+    }
+
+    @Test
+    void failsWhenIdentitySequenceCannotBeReadInsteadOfChangingItsDefinition() throws Exception {
+        Fixture fixture = new Fixture(rows(IDENTITY_COLUMNS, new Object[]{"id", "integer", null, true, "a"}));
+
+        RuntimeException error = assertThrows(RuntimeException.class, () -> fixture.export("app", "orders"));
+
+        Throwable cause = error;
+        while (cause.getCause() != null) {
+            cause = cause.getCause();
+        }
+        assertEquals("Identity sequence metadata is missing", cause.getMessage());
+    }
+
+    private static CachedRowSet rows(String[] columns, Object[]... values) throws SQLException {
+        CachedRowSet rows = RowSetProvider.newFactory().createCachedRowSet();
+        RowSetMetaDataImpl metadata = new RowSetMetaDataImpl();
+        metadata.setColumnCount(columns.length);
+        for (int i = 0; i < columns.length; i++) {
+            metadata.setColumnName(i + 1, columns[i]);
+            metadata.setColumnLabel(i + 1, columns[i]);
+            Object sample = values.length == 0 ? null : values[0][i];
+            metadata.setColumnType(i + 1, sample instanceof Boolean ? Types.BOOLEAN : sample instanceof Long ? Types.BIGINT : Types.VARCHAR);
+        }
+        rows.setMetaData(metadata);
+        for (int i = values.length - 1; i >= 0; i--) {
+            rows.moveToInsertRow();
+            for (int j = 0; j < columns.length; j++) {
+                if (values[i][j] == null) {
+                    rows.updateNull(j + 1);
+                } else {
+                    rows.updateObject(j + 1, values[i][j]);
+                }
+            }
+            rows.insertRow();
+            rows.moveToCurrentRow();
+        }
+        rows.beforeFirst();
+        return rows;
+    }
+
+    private static <T> T proxy(Class<T> type, InvocationHandler handler) {
+        return type.cast(Proxy.newProxyInstance(type.getClassLoader(), new Class<?>[]{type}, handler));
+    }
+
+    private static final class Fixture {
+        private static final Set<String> QUERIES = Set.of(COLUMN_SQL, IDENTITY_SEQUENCE_SQL, TABLE_OPTION_SQL,
+                CONSTRAINT_SQL_VERSION_UNDER_ELEVEN, TABLE_OWNER_SQL, TABLE_PRIVILEGE_SQL, has_parent_table_sql,
+                INDEX_SQL, TABLE_INDEX_COMMENT_SQL);
+        private final Map<String, ResultSet> results = new HashMap<>();
+        private final Map<String, List<String>> parameters = new HashMap<>();
+        private final List<String> executed = new ArrayList<>();
+
+        private Fixture(ResultSet columns) {
+            results.put(COLUMN_SQL, columns);
+        }
+
+        private String export(String schema, String table) {
+            DatabaseMetaData metadata = proxy(DatabaseMetaData.class, (p, method, args) -> {
+                if (method.getName().equals("getDatabaseProductVersion")) {
+                    return "9.0";
+                }
+                throw new UnsupportedOperationException(method.getName());
+            });
+            Connection connection = proxy(Connection.class, (p, method, args) -> switch (method.getName()) {
+                case "getMetaData" -> metadata;
+                case "prepareStatement" -> statement((String) args[0]);
+                default -> throw new UnsupportedOperationException(method.getName());
+            });
+            KingBaseMetaData kingbase = new KingBaseMetaData() {
+                @Override
+                public List<Table> tables(Connection connection, String databaseName, String schemaName, String tableName) {
+                    return List.of();
+                }
+
+                @Override
+                public List<TableColumn> columns(Connection connection, String databaseName, String schemaName, String tableName) {
+                    return List.of();
+                }
+            };
+            return kingbase.tableDDL(connection, "test", schema, table);
+        }
+
+        private PreparedStatement statement(String sql) throws SQLException {
+            assertTrue(QUERIES.contains(sql) || results.containsKey(sql), "Unexpected query: " + sql);
+            assertFalse(sql.contains("information_schema.columns"), "The compatibility view must not be required");
+            ResultSet result = results.containsKey(sql) ? results.get(sql) : rows(new String[]{"unused"});
+            List<String> bindings = new ArrayList<>();
+            parameters.put(sql, bindings);
+            return proxy(PreparedStatement.class, (p, method, args) -> switch (method.getName()) {
+                case "setString" -> {
+                    assertEquals(bindings.size() + 1, args[0]);
+                    bindings.add((String) args[1]);
+                    yield null;
+                }
+                case "execute" -> {
+                    executed.add(sql);
+                    yield true;
+                }
+                case "getResultSet" -> result;
+                case "close" -> null;
+                default -> throw new UnsupportedOperationException(method.getName());
+            });
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlActiveTransactionManager.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlActiveTransactionManager.java
new file mode 100644
index 0000000000..ecac3229f8
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlActiveTransactionManager.java
@@ -0,0 +1,226 @@
+package ai.chat2db.plugin.mysql;
+
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction;
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction.LockMetadataSource;
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction.LockMetadataState;
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction.QueryState;
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction.SessionState;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.spi.DefaultSQLExecutor;
+import ai.chat2db.spi.IActiveTransactionManager;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import static ai.chat2db.plugin.mysql.constant.MysqlActiveTransactionConstants.*;
+
+public class MysqlActiveTransactionManager implements IActiveTransactionManager {
+
+    @Override
+    public List<ActiveTransaction> activeTransactions(Connection connection) {
+        LockMetadataQuery lockMetadataQuery = resolveLockMetadataQuery(connection);
+        try {
+            return executeActiveTransactions(connection, lockMetadataQuery);
+        } catch (RuntimeException exception) {
+            if (lockMetadataQuery.available() && hasMissingOrDeniedMetadataError(exception)) {
+                return activeTransactionsWithoutLockMetadata(connection);
+            }
+            throw sanitizeActiveTransactionQueryException(exception);
+        }
+    }
+
+    private List<ActiveTransaction> activeTransactionsWithoutLockMetadata(Connection connection) {
+        try {
+            return executeActiveTransactions(connection, unavailableLockMetadataQuery());
+        } catch (RuntimeException exception) {
+            throw sanitizeActiveTransactionQueryException(exception);
+        }
+    }
+
+    private static List<ActiveTransaction> executeActiveTransactions(
+            Connection connection,
+            LockMetadataQuery lockMetadataQuery
+    ) {
+        return DefaultSQLExecutor.getInstance().execute(connection, lockMetadataQuery.sql(), resultSet -> {
+            List<ActiveTransaction> transactions = new ArrayList<>();
+            while (resultSet.next()) {
+                transactions.add(readTransaction(resultSet, lockMetadataQuery));
+            }
+            return transactions;
+        });
+    }
+
+    static ActiveTransaction readTransaction(ResultSet resultSet, LockMetadataQuery lockMetadataQuery)
+            throws SQLException {
+        ActiveTransaction transaction = new ActiveTransaction();
+        transaction.setTrxId(resultSet.getString(RESULT_TRX_ID));
+        transaction.setState(resultSet.getString(RESULT_TRX_STATE));
+        transaction.setStartedAt(resultSet.getTimestamp(RESULT_TRX_STARTED));
+        transaction.setAgeSeconds(nullableLong(resultSet, RESULT_TRX_AGE_SECONDS));
+        transaction.setIsolationLevel(resultSet.getString(RESULT_TRX_ISOLATION_LEVEL));
+        transaction.setRowsLocked(nullableLong(resultSet, RESULT_TRX_ROWS_LOCKED));
+        transaction.setRowsModified(nullableLong(resultSet, RESULT_TRX_ROWS_MODIFIED));
+        transaction.setLockStructs(nullableLong(resultSet, RESULT_TRX_LOCK_STRUCTS));
+        Long threadId = nullableLong(resultSet, RESULT_TRX_MYSQL_THREAD_ID);
+        transaction.setThreadId(threadId);
+        transaction.setUser(resultSet.getString(RESULT_PROCESS_USER));
+        transaction.setHost(resultSet.getString(RESULT_PROCESS_HOST));
+        transaction.setDb(resultSet.getString(RESULT_PROCESS_DB));
+        String query = resultSet.getString(RESULT_TRX_QUERY);
+        transaction.setQuery(query);
+        Long processId = nullableLong(resultSet, RESULT_PROCESS_ID);
+        transaction.setSessionAvailable(processId != null);
+        transaction.setSessionState(processId == null ? SessionState.DISAPPEARED_OR_HIDDEN : SessionState.LIVE);
+        boolean canOpenSession = processId != null && threadId != null;
+        transaction.setCanOpenSession(canOpenSession);
+        transaction.setConnectionInspectionSql(canOpenSession ? connectionInspectionSql(threadId) : null);
+        transaction.setQueryState(query == null ? QueryState.UNAVAILABLE : QueryState.VISIBLE);
+        transaction.setLockMetadataState(lockMetadataQuery.available()
+                ? LockMetadataState.AVAILABLE : LockMetadataState.UNAVAILABLE);
+        transaction.setLockMetadataSource(lockMetadataQuery.source());
+        putLockWait(transaction, resultSet);
+        return transaction;
+    }
+
+    private static void putLockWait(ActiveTransaction transaction, ResultSet resultSet) throws SQLException {
+        Long blockingThreadId = nullableLong(resultSet, RESULT_BLOCKING_THREAD_ID);
+        Long blockingProcessId = nullableLong(resultSet, RESULT_BLOCKING_PROCESS_ID);
+        String waitingLockId = resultSet.getString(RESULT_REQUESTING_LOCK_ID);
+        String blockingLockId = resultSet.getString(RESULT_BLOCKING_LOCK_ID);
+        transaction.setWaitingLockId(waitingLockId);
+        transaction.setBlockingLockId(blockingLockId);
+        transaction.setBlockingTrxId(resultSet.getString(RESULT_BLOCKING_TRX_ID));
+        transaction.setWaitingPerformanceSchemaThreadId(nullableLong(resultSet, RESULT_REQUESTING_PS_THREAD_ID));
+        transaction.setBlockingPerformanceSchemaThreadId(nullableLong(resultSet, RESULT_BLOCKING_PS_THREAD_ID));
+        transaction.setBlockingThreadId(blockingThreadId);
+        transaction.setBlockingSessionAvailable(blockingProcessId != null);
+        boolean canOpenBlockingSession = blockingProcessId != null && blockingThreadId != null;
+        transaction.setCanOpenBlockingSession(canOpenBlockingSession);
+        transaction.setBlockingConnectionInspectionSql(
+                canOpenBlockingSession ? connectionInspectionSql(blockingThreadId) : null);
+        transaction.setBlockingUser(resultSet.getString(RESULT_BLOCKING_USER));
+        transaction.setBlockingHost(resultSet.getString(RESULT_BLOCKING_HOST));
+        transaction.setBlockingDb(resultSet.getString(RESULT_BLOCKING_DB));
+        transaction.setWaitingObject(lockObject(resultSet, RESULT_WAITING_OBJECT_SCHEMA, RESULT_WAITING_OBJECT_NAME));
+        transaction.setWaitingIndex(resultSet.getString(RESULT_WAITING_INDEX_NAME));
+        transaction.setWaitingLockType(resultSet.getString(RESULT_WAITING_LOCK_TYPE));
+        transaction.setWaitingLockMode(resultSet.getString(RESULT_WAITING_LOCK_MODE));
+        transaction.setWaitingLockStatus(resultSet.getString(RESULT_WAITING_LOCK_STATUS));
+        transaction.setWaitingLockData(resultSet.getString(RESULT_WAITING_LOCK_DATA));
+        transaction.setBlockingObject(lockObject(
+                resultSet,
+                RESULT_BLOCKING_OBJECT_SCHEMA,
+                RESULT_BLOCKING_OBJECT_NAME
+        ));
+        transaction.setBlockingIndex(resultSet.getString(RESULT_BLOCKING_INDEX_NAME));
+        transaction.setBlockingLockType(resultSet.getString(RESULT_BLOCKING_LOCK_TYPE));
+        transaction.setBlockingLockMode(resultSet.getString(RESULT_BLOCKING_LOCK_MODE));
+        transaction.setBlockingLockStatus(resultSet.getString(RESULT_BLOCKING_LOCK_STATUS));
+        transaction.setBlockingLockData(resultSet.getString(RESULT_BLOCKING_LOCK_DATA));
+        transaction.setLockWaitAvailable(waitingLockId != null || blockingLockId != null);
+    }
+
+    private static String lockObject(ResultSet resultSet, String schemaColumn, String objectColumn) throws SQLException {
+        String schema = resultSet.getString(schemaColumn);
+        String object = resultSet.getString(objectColumn);
+        if (schema == null || schema.isBlank()) {
+            return object;
+        }
+        if (object == null || object.isBlank()) {
+            return schema;
+        }
+        return schema + QUALIFIED_NAME_SEPARATOR + object;
+    }
+
+    private static Long nullableLong(ResultSet resultSet, String column) throws SQLException {
+        long value = resultSet.getLong(column);
+        return resultSet.wasNull() ? null : value;
+    }
+
+    static String connectionInspectionSql(Long connectionId) {
+        return String.format(SQL_CONNECTION_INSPECTION, connectionId);
+    }
+
+    private static LockMetadataQuery resolveLockMetadataQuery(Connection connection) {
+        try {
+            executeProbe(connection, SQL_PROBE_MYSQL80_LOCKS);
+            return new LockMetadataQuery(activeTransactionSql(LOCK_COLUMNS_80, LOCK_JOIN_80),
+                    true, LockMetadataSource.MYSQL_80_PERFORMANCE_SCHEMA);
+        } catch (RuntimeException exception) {
+            if (!hasMissingOrDeniedMetadataError(exception)) {
+                throw exception;
+            }
+        }
+
+        try {
+            executeProbe(connection, SQL_PROBE_MYSQL57_LOCKS);
+            return new LockMetadataQuery(activeTransactionSql(LOCK_COLUMNS_57, LOCK_JOIN_57),
+                    true, LockMetadataSource.MYSQL_57_INFORMATION_SCHEMA);
+        } catch (RuntimeException exception) {
+            if (!hasMissingOrDeniedMetadataError(exception)) {
+                throw exception;
+            }
+            return unavailableLockMetadataQuery();
+        }
+    }
+
+    private static void executeProbe(Connection connection, String sql) {
+        DefaultSQLExecutor.getInstance().execute(connection, sql, resultSet -> null);
+    }
+
+    static String activeTransactionSql(String lockColumns, String lockJoin) {
+        return String.format(SQL_ACTIVE_TRANSACTIONS, lockColumns, lockJoin);
+    }
+
+    static LockMetadataQuery unavailableLockMetadataQuery() {
+        return new LockMetadataQuery(activeTransactionSql(LOCK_COLUMNS_UNAVAILABLE, LOCK_JOIN_UNAVAILABLE),
+                false, null);
+    }
+
+    static boolean hasProcessPrivilegeError(Throwable throwable) {
+        Throwable current = throwable;
+        while (current != null) {
+            if (current instanceof SQLException sqlException
+                    && (sqlException.getErrorCode() == MYSQL_ERROR_SPECIFIC_ACCESS_DENIED
+                    || normalizedMessage(sqlException).contains(PROCESS_PRIVILEGE_MESSAGE_MARKER))) {
+                return true;
+            }
+            current = current.getCause();
+        }
+        return false;
+    }
+
+    static boolean hasMissingOrDeniedMetadataError(Throwable throwable) {
+        Throwable current = throwable;
+        while (current != null) {
+            if (current instanceof SQLException sqlException) {
+                String normalized = normalizedMessage(sqlException);
+                if (LOCK_METADATA_UNAVAILABLE_ERROR_CODES.contains(sqlException.getErrorCode())
+                        || LOCK_METADATA_UNAVAILABLE_MESSAGE_MARKERS.stream().anyMatch(normalized::contains)) {
+                    return true;
+                }
+            }
+            current = current.getCause();
+        }
+        return false;
+    }
+
+    static RuntimeException sanitizeActiveTransactionQueryException(RuntimeException exception) {
+        if (hasProcessPrivilegeError(exception)) {
+            return new BusinessException(ERROR_CODE_PROCESS_PRIVILEGE_REQUIRED, null, exception);
+        }
+        return exception;
+    }
+
+    private static String normalizedMessage(SQLException exception) {
+        String message = exception.getMessage();
+        return message == null ? EMPTY_ERROR_MESSAGE : message.toUpperCase(Locale.ROOT);
+    }
+
+    record LockMetadataQuery(String sql, boolean available, LockMetadataSource source) {
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java
index d70cc28ab0..06848bf3c5 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java
@@ -240,8 +240,10 @@ public List<TableColumn> columns(Connection connection, String databaseName, Str
                 column.setName(resultSet.getString(FIELD_COLUMN_NAME_UPPER));
                 column.setColumnType(resultSet.getString(FIELD_DATA_TYPE).toUpperCase());
                 column.setDefaultValue(resultSet.getString(FIELD_COLUMN_DEFAULT));
-                column.setAutoIncrement(resultSet.getString(FIELD_EXTRA).contains(SQL_AUTO_INCREMENT));
-                column.setOnUpdateCurrentTimestamp(resultSet.getString(FIELD_EXTRA).contains(SQL_ON_UPDATE_CURRENT_TIMESTAMP));
+                String columnExtra = StringUtils.defaultString(resultSet.getString(FIELD_EXTRA));
+                column.setAutoIncrement(columnExtra.contains(SQL_AUTO_INCREMENT));
+                column.setOnUpdateCurrentTimestamp(columnExtra.contains(SQL_ON_UPDATE_CURRENT_TIMESTAMP));
+                column.setVisible(!columnExtra.contains(SQL_INVISIBLE));
                 column.setComment(resultSet.getString(FIELD_COLUMN_COMMENT));
                 column.setPrimaryKey(SQL_PRIMARY_KEY_FLAG.equalsIgnoreCase(resultSet.getString(FIELD_COLUMN_KEY)));
                 column.setNullable(SQL_YES.equalsIgnoreCase(resultSet.getString(FIELD_IS_NULLABLE)) ? 1 : 0);
@@ -344,6 +346,11 @@ public List<TableIndex> indexes(Connection connection, String databaseName, Stri
                         log.error(LOG_INDEX_COMMENT_FAILED, keyName, e);
                         index.setComment(resultSet.getString(FIELD_INDEX_COMMENT_FALLBACK));
                     }
+                    try {
+                        index.setVisible(INDEX_VISIBLE_VALUE.equalsIgnoreCase(resultSet.getString(FIELD_IS_VISIBLE)));
+                    } catch (SQLException e) {
+                        index.setVisible(Boolean.TRUE);
+                    }
                     List<TableIndexColumn> tableIndexColumns = new ArrayList<>();
                     tableIndexColumns.add(getTableIndexColumn(resultSet));
                     index.setColumnList(tableIndexColumns);
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlPlugin.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlPlugin.java
index ed966c07b6..782c407062 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlPlugin.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlPlugin.java
@@ -4,6 +4,7 @@
 import ai.chat2db.community.domain.api.model.metadata.TableColumn;
 import ai.chat2db.community.domain.api.model.result.ResultSetEditorMetadata;
 import ai.chat2db.spi.IAccountManager;
+import ai.chat2db.spi.IActiveTransactionManager;
 import ai.chat2db.spi.IDbManager;
 import ai.chat2db.spi.IDbMetaData;
 import ai.chat2db.spi.IPlugin;
@@ -44,6 +45,11 @@ public IRoutineManager getRoutineManager() {
         return new MysqlRoutineManager();
     }
 
+    @Override
+    public IActiveTransactionManager getActiveTransactionManager() {
+        return new MysqlActiveTransactionManager();
+    }
+
     private static final class NativeMysqlMetaData extends MysqlMetaData {
 
         @Override
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlVersionSupport.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlVersionSupport.java
new file mode 100644
index 0000000000..1458a23b4b
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlVersionSupport.java
@@ -0,0 +1,70 @@
+package ai.chat2db.plugin.mysql;
+
+import ai.chat2db.spi.sql.Chat2DBContext;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class MysqlVersionSupport {
+
+    private static final Pattern VERSION_PREFIX = Pattern.compile("^(\\d+)\\.(\\d+)(?:\\.(\\d+))?.*");
+
+    private MysqlVersionSupport() {
+    }
+
+    public static boolean supportsInvisibleColumns(String dbVersion) {
+        MysqlVersion version = parseMysqlVersion(dbVersion);
+        if (version == null) {
+            return false;
+        }
+        return version.major() > 8
+                || version.major() == 8 && (version.minor() > 0
+                || version.minor() == 0 && version.patch() >= 23);
+    }
+
+    public static boolean currentVersionDisallowsInvisibleColumns() {
+        return !supportsInvisibleColumns(getCurrentDbVersion());
+    }
+
+    public static boolean supportsInvisibleIndexes(String dbVersion) {
+        MysqlVersion version = parseMysqlVersion(dbVersion);
+        return version != null && version.major() >= 8;
+    }
+
+    public static boolean currentVersionDisallowsInvisibleIndexes() {
+        String dbVersion = getCurrentDbVersion();
+        return !supportsInvisibleIndexes(dbVersion);
+    }
+
+    public static String getCurrentDbVersion() {
+        if (Chat2DBContext.getConnectInfo() == null) {
+            return null;
+        }
+        try {
+            return Chat2DBContext.getDbVersion();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private static MysqlVersion parseMysqlVersion(String dbVersion) {
+        if (StringUtils.isBlank(dbVersion)) {
+            return null;
+        }
+        String normalized = dbVersion.trim();
+        if (normalized.toLowerCase(Locale.ROOT).contains("mariadb")) {
+            return null;
+        }
+        Matcher matcher = VERSION_PREFIX.matcher(normalized);
+        if (!matcher.matches()) {
+            return null;
+        }
+        int patch = matcher.group(3) == null ? 0 : Integer.parseInt(matcher.group(3));
+        return new MysqlVersion(Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)), patch);
+    }
+
+    private record MysqlVersion(int major, int minor, int patch) {
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java
index a5118f556a..63e39169d5 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java
@@ -1,6 +1,7 @@
 package ai.chat2db.plugin.mysql.builder;
 
 import ai.chat2db.plugin.mysql.MysqlSqlGuards;
+import ai.chat2db.plugin.mysql.MysqlVersionSupport;
 import ai.chat2db.plugin.mysql.identifier.MysqlIdentifierProcessor;
 import ai.chat2db.plugin.mysql.enums.MysqlViewAlgorithmOptionEnum;
 import ai.chat2db.plugin.mysql.enums.MysqlViewCheckOptionEnum;
@@ -52,6 +53,11 @@
 
 public class MysqlSqlBuilder extends DefaultSqlBuilder {
 
+    private static final String INVISIBLE_COLUMN_UNSUPPORTED_MESSAGE =
+            "MySQL invisible columns require MySQL 8.0.23 or later";
+    private static final String INVISIBLE_INDEX_UNSUPPORTED_MESSAGE =
+            "MySQL invisible indexes require MySQL 8.0 or later";
+
     @Override
     public String quoteIdentifier(String identifier) {
         return quoteMysqlIdentifier(identifier);
@@ -86,6 +92,7 @@ public String buildCreateTable(Table table, TableBuilderConfig tableBuilderConfi
             if (typeEnum == null) {
                 continue;
             }
+            rejectInvisibleColumnIfUnsupported(null, column);
             script.append(SQLConstants.TAB).append(typeEnum.buildCreateColumnSql(column)).append(SQLConstants.COMMA_LINE_SEPARATOR);
         }
         List<TableIndex> indexList = table.getIndexList();
@@ -100,6 +107,7 @@ public String buildCreateTable(Table table, TableBuilderConfig tableBuilderConfi
             if (mysqlIndexTypeEnum == null) {
                 continue;
             }
+            rejectInvisibleIndexIfUnsupported(null, tableIndex, mysqlIndexTypeEnum);
             script.append(SQLConstants.TAB).append(mysqlIndexTypeEnum.buildIndexScript(tableIndex)).append(SQLConstants.COMMA_LINE_SEPARATOR);
         }
 
@@ -188,11 +196,14 @@ public String buildAlterTable(Table oldTable, Table newTable) {
                 if (typeEnum == null) {
                     continue;
                 }
+                boolean forceVisibleKeyword = isColumnVisibilityChangedToVisible(oldTable, tableColumn);
+                rejectInvisibleColumnIfUnsupported(oldTable, tableColumn);
                 if (moved || added) {
-                    script.append(SQLConstants.TAB).append(typeEnum.buildModifyColumn(tableColumn, true, findPrevious(tableColumn, newTable)))
+                    script.append(SQLConstants.TAB).append(typeEnum.buildModifyColumn(tableColumn, true,
+                                    findPrevious(tableColumn, newTable), forceVisibleKeyword))
                             .append(SQLConstants.COMMA_LINE_SEPARATOR);
                 } else {
-                    script.append(SQLConstants.TAB).append(typeEnum.buildModifyColumn(tableColumn)).append(SQLConstants.COMMA_LINE_SEPARATOR);
+                    script.append(SQLConstants.TAB).append(typeEnum.buildModifyColumn(tableColumn, forceVisibleKeyword)).append(SQLConstants.COMMA_LINE_SEPARATOR);
                 }
             }
         }
@@ -202,7 +213,19 @@ public String buildAlterTable(Table oldTable, Table newTable) {
                 if (mysqlIndexTypeEnum == null) {
                     continue;
                 }
-                script.append(SQLConstants.TAB).append(mysqlIndexTypeEnum.buildModifyIndex(tableIndex)).append(SQLConstants.COMMA_LINE_SEPARATOR);
+                rejectInvisibleIndexIfUnsupported(oldTable, tableIndex, mysqlIndexTypeEnum);
+                if (EditStatusEnum.MODIFY.name().equals(tableIndex.getEditStatus())
+                        && !MysqlIndexTypeEnum.PRIMARY_KEY.equals(mysqlIndexTypeEnum)
+                        && onlyIndexVisibilityChanged(oldTable, tableIndex)) {
+                    // Visibility-only change: use the lightweight ALTER INDEX ... VISIBLE/INVISIBLE
+                    // instead of dropping and rebuilding the whole index. The primary key can
+                    // never be invisible, so it is excluded above.
+                    script.append(SQLConstants.TAB).append(mysqlIndexTypeEnum.buildAlterIndexVisibility(tableIndex))
+                            .append(SQLConstants.COMMA_LINE_SEPARATOR);
+                } else {
+                    script.append(SQLConstants.TAB).append(mysqlIndexTypeEnum.buildModifyIndex(tableIndex))
+                            .append(SQLConstants.COMMA_LINE_SEPARATOR);
+                }
             }
         }
 
@@ -216,6 +239,82 @@ public String buildAlterTable(Table oldTable, Table newTable) {
 
     }
 
+    /**
+     * Returns true when the modified index differs from the stored one only in visibility,
+     * so the lightweight {@code ALTER INDEX ... VISIBLE/INVISIBLE} can be used instead of
+     * dropping and rebuilding the index.
+     */
+    private static boolean onlyIndexVisibilityChanged(Table oldTable, TableIndex newIndex) {
+        TableIndex oldIndex = oldTable.getIndexList() == null ? null : oldTable.getIndexList().stream()
+                .filter(idx -> StringUtils.equals(idx.getName(), newIndex.getName()))
+                .findFirst()
+                .orElse(null);
+        if (oldIndex == null) {
+            return false;
+        }
+        if (Objects.equals(oldIndex.getVisible(), newIndex.getVisible())) {
+            return false;
+        }
+        return indexDefinitionsMatchExceptVisibility(oldIndex, newIndex);
+    }
+
+    private static void rejectInvisibleIndexIfUnsupported(Table oldTable, TableIndex newIndex,
+            MysqlIndexTypeEnum indexType) {
+        if (MysqlIndexTypeEnum.PRIMARY_KEY.equals(indexType)) {
+            return;
+        }
+        if (!usesInvisibleIndexFeature(oldTable, newIndex)) {
+            return;
+        }
+        if (MysqlVersionSupport.currentVersionDisallowsInvisibleIndexes()) {
+            throw new IllegalArgumentException(INVISIBLE_INDEX_UNSUPPORTED_MESSAGE);
+        }
+    }
+
+    private static boolean usesInvisibleIndexFeature(Table oldTable, TableIndex newIndex) {
+        if (Boolean.FALSE.equals(newIndex.getVisible())) {
+            return true;
+        }
+        TableIndex oldIndex = findOldIndex(oldTable, newIndex);
+        return oldIndex != null
+                && newIndex.getVisible() != null
+                && !Objects.equals(oldIndex.getVisible(), newIndex.getVisible());
+    }
+
+    private static TableIndex findOldIndex(Table oldTable, TableIndex newIndex) {
+        if (oldTable == null || oldTable.getIndexList() == null) {
+            return null;
+        }
+        String sourceName = StringUtils.defaultIfBlank(newIndex.getOldName(), newIndex.getName());
+        return oldTable.getIndexList().stream()
+                .filter(idx -> StringUtils.equals(idx.getName(), sourceName))
+                .findFirst()
+                .orElse(null);
+    }
+
+    private static boolean indexDefinitionsMatchExceptVisibility(TableIndex oldIndex, TableIndex newIndex) {
+        return StringUtils.equalsIgnoreCase(oldIndex.getType(), newIndex.getType())
+                && StringUtils.equals(oldIndex.getComment(), newIndex.getComment())
+                && StringUtils.equalsIgnoreCase(StringUtils.trimToEmpty(oldIndex.getMethod()),
+                        StringUtils.trimToEmpty(newIndex.getMethod()))
+                && indexColumnDefinitions(oldIndex).equals(indexColumnDefinitions(newIndex));
+    }
+
+    private static List<IndexColumnDefinition> indexColumnDefinitions(TableIndex tableIndex) {
+        if (tableIndex.getColumnList() == null) {
+            return Collections.emptyList();
+        }
+        return tableIndex.getColumnList().stream()
+                .map(column -> new IndexColumnDefinition(
+                        column.getColumnName(),
+                        StringUtils.trimToEmpty(column.getAscOrDesc()).toUpperCase(Locale.ROOT),
+                        column.getSubPart()))
+                .collect(Collectors.toList());
+    }
+
+    private record IndexColumnDefinition(String columnName, String ascOrDesc, Long subPart) {
+    }
+
     private String findPrevious(TableColumn tableColumn, Table newTable) {
         int index = newTable.getColumnList().indexOf(tableColumn);
         if (index == 0) {
@@ -229,6 +328,43 @@ private String findPrevious(TableColumn tableColumn, Table newTable) {
         return PREVIOUS_COLUMN_NOT_FOUND;
     }
 
+    private static void rejectInvisibleColumnIfUnsupported(Table oldTable, TableColumn newColumn) {
+        if (!usesInvisibleColumnFeature(oldTable, newColumn)) {
+            return;
+        }
+        if (MysqlVersionSupport.currentVersionDisallowsInvisibleColumns()) {
+            throw new IllegalArgumentException(INVISIBLE_COLUMN_UNSUPPORTED_MESSAGE);
+        }
+    }
+
+    private static boolean usesInvisibleColumnFeature(Table oldTable, TableColumn newColumn) {
+        if (Boolean.FALSE.equals(newColumn.getVisible())) {
+            return true;
+        }
+        TableColumn oldColumn = findOldColumn(oldTable, newColumn);
+        return oldColumn != null
+                && newColumn.getVisible() != null
+                && !Objects.equals(oldColumn.getVisible(), newColumn.getVisible());
+    }
+
+    private static boolean isColumnVisibilityChangedToVisible(Table oldTable, TableColumn newColumn) {
+        TableColumn oldColumn = findOldColumn(oldTable, newColumn);
+        return oldColumn != null
+                && Boolean.FALSE.equals(oldColumn.getVisible())
+                && Boolean.TRUE.equals(newColumn.getVisible());
+    }
+
+    private static TableColumn findOldColumn(Table oldTable, TableColumn newColumn) {
+        if (oldTable == null || oldTable.getColumnList() == null) {
+            return null;
+        }
+        String sourceName = StringUtils.defaultIfBlank(newColumn.getOldName(), newColumn.getName());
+        return oldTable.getColumnList().stream()
+                .filter(column -> StringUtils.equals(column.getName(), sourceName))
+                .findFirst()
+                .orElse(null);
+    }
+
     @Override
     protected String appendSingleRowLimit(String operationType, String tableName, String whereClause, String sql) {
         return sql + SQL_LIMIT_ONE_SUFFIX;
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/completion/locate/MysqlSqlCompletionStatementLocator.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/completion/locate/MysqlSqlCompletionStatementLocator.java
index 1976a0a701..1f4378c797 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/completion/locate/MysqlSqlCompletionStatementLocator.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/completion/locate/MysqlSqlCompletionStatementLocator.java
@@ -113,6 +113,11 @@ public SqlCompletionStatementWindow locate(SqlCompletionInputCleanResponse input
                     SqlCompletionStatementWindowTypeEnum.EMPTY_STATEMENT.name());
         }
 
+        List<Token> tokens = MysqlSqlCompletionTokenUtil.tokens(parseSql);
+        if (canUseTokenWindow(tokens) && !hasUnsafeLexerErrors(sourceSql)) {
+            return tokenFallbackWindow(sourceSql, parseSql, cursor, tokens, List.of());
+        }
+
         ParserWindowResult rawResult = parseWindow(parseSql, cursor, StatementWindowAuthorityEnum.RAW_PARSE);
         if (rawResult.proof().isPresent() && rawResult.syntaxErrors() == 0) {
             return toWindow(sourceSql, parseSql, rawResult.proof().get(), cursor);
@@ -146,9 +151,16 @@ private Optional<StatementWindowProof> probeProof(String parseSql, int cursor, b
     }
 
     private SqlCompletionStatementWindow tokenFallbackWindow(String sourceSql, String parseSql, int cursor) {
-        CommonTokenStream tokenStream = MysqlSqlCompletionTokenUtil.tokenStream(parseSql);
-        List<Token> tokens = tokenStream.getTokens();
+        List<Token> tokens = MysqlSqlCompletionTokenUtil.tokens(parseSql);
         List<RoutineWindow> routineWindows = findRoutineWindows(tokens, parseSql);
+        return tokenFallbackWindow(sourceSql, parseSql, cursor, tokens, routineWindows);
+    }
+
+    private SqlCompletionStatementWindow tokenFallbackWindow(String sourceSql,
+                                                              String parseSql,
+                                                              int cursor,
+                                                              List<Token> tokens,
+                                                              List<RoutineWindow> routineWindows) {
         RoutineWindow routineWindow = containingRoutineWindow(routineWindows, cursor);
         if (Objects.nonNull(routineWindow)) {
             return new SqlCompletionStatementWindow(
@@ -185,6 +197,52 @@ private SqlCompletionStatementWindow tokenFallbackWindow(String sourceSql, Strin
                 type.name());
     }
 
+    private boolean canUseTokenWindow(List<Token> tokens) {
+        boolean hasStatementSeparator = false;
+        int parenthesisDepth = 0;
+        int topLevelStatementStarts = 0;
+        boolean balancedParentheses = true;
+        for (Token token : tokens) {
+            if (!MysqlSqlCompletionTokenUtil.isDefaultToken(token)) {
+                continue;
+            }
+            int tokenType = token.getType();
+            if (tokenType == MySqlLexer.SEMI) {
+                hasStatementSeparator = true;
+                continue;
+            }
+            if (tokenType == MySqlLexer.CREATE || tokenType == MySqlLexer.DELIMITER_STATEMENT) {
+                return false;
+            }
+            if (tokenType == MySqlLexer.LR_BRACKET) {
+                parenthesisDepth++;
+                continue;
+            }
+            if (tokenType == MySqlLexer.RR_BRACKET) {
+                if (parenthesisDepth == 0) {
+                    balancedParentheses = false;
+                } else {
+                    parenthesisDepth--;
+                }
+                continue;
+            }
+            if (parenthesisDepth == 0 && isSqlStatementStartToken(tokenType)) {
+                topLevelStatementStarts++;
+            }
+        }
+        return balancedParentheses && parenthesisDepth == 0
+                && (hasStatementSeparator || topLevelStatementStarts == 1);
+    }
+
+    private boolean hasUnsafeLexerErrors(String sourceSql) {
+        for (Token token : MysqlSqlCompletionTokenUtil.tokens(sourceSql)) {
+            if (token.getChannel() == MySqlLexer.ERRORCHANNEL && !"?".equals(token.getText())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private ParserWindowResult parseWindow(String sql, int cursor, StatementWindowAuthorityEnum authority) {
         CommonTokenStream tokenStream = MysqlSqlCompletionTokenUtil.tokenStream(sql);
         ParsedRoot parsedRoot = parseRoot(tokenStream);
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlActiveTransactionConstants.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlActiveTransactionConstants.java
new file mode 100644
index 0000000000..faf882070e
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlActiveTransactionConstants.java
@@ -0,0 +1,171 @@
+package ai.chat2db.plugin.mysql.constant;
+
+import java.util.List;
+import java.util.Set;
+
+public final class MysqlActiveTransactionConstants {
+
+    public static final String RESULT_TRX_ID = "trx_id";
+    public static final String RESULT_TRX_STATE = "trx_state";
+    public static final String RESULT_TRX_STARTED = "trx_started";
+    public static final String RESULT_TRX_AGE_SECONDS = "trx_age_seconds";
+    public static final String RESULT_TRX_ISOLATION_LEVEL = "trx_isolation_level";
+    public static final String RESULT_TRX_ROWS_LOCKED = "trx_rows_locked";
+    public static final String RESULT_TRX_ROWS_MODIFIED = "trx_rows_modified";
+    public static final String RESULT_TRX_LOCK_STRUCTS = "trx_lock_structs";
+    public static final String RESULT_TRX_MYSQL_THREAD_ID = "trx_mysql_thread_id";
+    public static final String RESULT_TRX_QUERY = "trx_query";
+    public static final String RESULT_PROCESS_ID = "process_id";
+    public static final String RESULT_PROCESS_USER = "process_user";
+    public static final String RESULT_PROCESS_HOST = "process_host";
+    public static final String RESULT_PROCESS_DB = "process_db";
+    public static final String RESULT_REQUESTING_LOCK_ID = "requesting_lock_id";
+    public static final String RESULT_BLOCKING_LOCK_ID = "blocking_lock_id";
+    public static final String RESULT_BLOCKING_TRX_ID = "blocking_trx_id";
+    public static final String RESULT_REQUESTING_PS_THREAD_ID = "requesting_ps_thread_id";
+    public static final String RESULT_BLOCKING_PS_THREAD_ID = "blocking_ps_thread_id";
+    public static final String RESULT_BLOCKING_THREAD_ID = "blocking_thread_id";
+    public static final String RESULT_BLOCKING_PROCESS_ID = "blocking_process_id";
+    public static final String RESULT_BLOCKING_USER = "blocking_user";
+    public static final String RESULT_BLOCKING_HOST = "blocking_host";
+    public static final String RESULT_BLOCKING_DB = "blocking_db";
+    public static final String RESULT_WAITING_OBJECT_SCHEMA = "waiting_object_schema";
+    public static final String RESULT_WAITING_OBJECT_NAME = "waiting_object_name";
+    public static final String RESULT_WAITING_INDEX_NAME = "waiting_index_name";
+    public static final String RESULT_WAITING_LOCK_TYPE = "waiting_lock_type";
+    public static final String RESULT_WAITING_LOCK_MODE = "waiting_lock_mode";
+    public static final String RESULT_WAITING_LOCK_STATUS = "waiting_lock_status";
+    public static final String RESULT_WAITING_LOCK_DATA = "waiting_lock_data";
+    public static final String RESULT_BLOCKING_OBJECT_SCHEMA = "blocking_object_schema";
+    public static final String RESULT_BLOCKING_OBJECT_NAME = "blocking_object_name";
+    public static final String RESULT_BLOCKING_INDEX_NAME = "blocking_index_name";
+    public static final String RESULT_BLOCKING_LOCK_TYPE = "blocking_lock_type";
+    public static final String RESULT_BLOCKING_LOCK_MODE = "blocking_lock_mode";
+    public static final String RESULT_BLOCKING_LOCK_STATUS = "blocking_lock_status";
+    public static final String RESULT_BLOCKING_LOCK_DATA = "blocking_lock_data";
+
+    public static final String SQL_ACTIVE_TRANSACTIONS =
+            "SELECT t.trx_id, t.trx_state, t.trx_started, "
+                    + "TIMESTAMPDIFF(SECOND, t.trx_started, NOW()) AS trx_age_seconds, "
+                    + "t.trx_isolation_level, t.trx_rows_locked, t.trx_rows_modified, "
+                    + "t.trx_lock_structs, t.trx_mysql_thread_id, "
+                    + "p.ID AS process_id, p.USER AS process_user, p.HOST AS process_host, p.DB AS process_db, "
+                    + "t.trx_query, "
+                    + "%s "
+                    + "FROM information_schema.innodb_trx t "
+                    + "LEFT JOIN information_schema.processlist p ON t.trx_mysql_thread_id = p.ID "
+                    + "%s "
+                    + "ORDER BY t.trx_started";
+
+    public static final String LOCK_COLUMNS_80 =
+            "w.requesting_lock_id, w.blocking_lock_id, w.blocking_trx_id, "
+                    + "w.requesting_ps_thread_id, w.blocking_ps_thread_id, "
+                    + "w.waiting_object_schema, w.waiting_object_name, w.waiting_index_name, "
+                    + "w.waiting_lock_type, w.waiting_lock_mode, w.waiting_lock_status, w.waiting_lock_data, "
+                    + "w.blocking_object_schema, w.blocking_object_name, w.blocking_index_name, "
+                    + "w.blocking_lock_type, w.blocking_lock_mode, w.blocking_lock_status, w.blocking_lock_data, "
+                    + "bt.trx_mysql_thread_id AS blocking_thread_id, bp.ID AS blocking_process_id, "
+                    + "bp.USER AS blocking_user, bp.HOST AS blocking_host, bp.DB AS blocking_db";
+
+    public static final String LOCK_JOIN_80 =
+            "LEFT JOIN ("
+                    + "SELECT dlw.REQUESTING_ENGINE_TRANSACTION_ID AS requesting_trx_id, "
+                    + "dlw.REQUESTING_ENGINE_LOCK_ID AS requesting_lock_id, "
+                    + "dlw.BLOCKING_ENGINE_LOCK_ID AS blocking_lock_id, "
+                    + "dlw.BLOCKING_ENGINE_TRANSACTION_ID AS blocking_trx_id, "
+                    + "dlw.REQUESTING_THREAD_ID AS requesting_ps_thread_id, "
+                    + "dlw.BLOCKING_THREAD_ID AS blocking_ps_thread_id, "
+                    + "rl.OBJECT_SCHEMA AS waiting_object_schema, rl.OBJECT_NAME AS waiting_object_name, "
+                    + "rl.INDEX_NAME AS waiting_index_name, rl.LOCK_TYPE AS waiting_lock_type, "
+                    + "rl.LOCK_MODE AS waiting_lock_mode, rl.LOCK_STATUS AS waiting_lock_status, "
+                    + "rl.LOCK_DATA AS waiting_lock_data, "
+                    + "bl.OBJECT_SCHEMA AS blocking_object_schema, bl.OBJECT_NAME AS blocking_object_name, "
+                    + "bl.INDEX_NAME AS blocking_index_name, bl.LOCK_TYPE AS blocking_lock_type, "
+                    + "bl.LOCK_MODE AS blocking_lock_mode, bl.LOCK_STATUS AS blocking_lock_status, "
+                    + "bl.LOCK_DATA AS blocking_lock_data "
+                    + "FROM performance_schema.data_lock_waits dlw "
+                    + "LEFT JOIN performance_schema.data_locks rl "
+                    + "ON dlw.REQUESTING_ENGINE_LOCK_ID = rl.ENGINE_LOCK_ID "
+                    + "AND dlw.ENGINE = rl.ENGINE "
+                    + "LEFT JOIN performance_schema.data_locks bl "
+                    + "ON dlw.BLOCKING_ENGINE_LOCK_ID = bl.ENGINE_LOCK_ID "
+                    + "AND dlw.ENGINE = bl.ENGINE"
+                    + ") w ON w.requesting_trx_id = t.trx_id "
+                    + "LEFT JOIN information_schema.innodb_trx bt ON bt.trx_id = w.blocking_trx_id "
+                    + "LEFT JOIN information_schema.processlist bp ON bt.trx_mysql_thread_id = bp.ID";
+
+    public static final String LOCK_COLUMNS_57 =
+            "w.requesting_lock_id, w.blocking_lock_id, w.blocking_trx_id, "
+                    + "NULL AS requesting_ps_thread_id, NULL AS blocking_ps_thread_id, "
+                    + "NULL AS waiting_object_schema, w.waiting_object_name, w.waiting_index_name, "
+                    + "w.waiting_lock_type, w.waiting_lock_mode, NULL AS waiting_lock_status, w.waiting_lock_data, "
+                    + "NULL AS blocking_object_schema, w.blocking_object_name, w.blocking_index_name, "
+                    + "w.blocking_lock_type, w.blocking_lock_mode, NULL AS blocking_lock_status, w.blocking_lock_data, "
+                    + "bt.trx_mysql_thread_id AS blocking_thread_id, bp.ID AS blocking_process_id, "
+                    + "bp.USER AS blocking_user, bp.HOST AS blocking_host, bp.DB AS blocking_db";
+
+    public static final String LOCK_JOIN_57 =
+            "LEFT JOIN ("
+                    + "SELECT lw.requesting_trx_id, lw.requested_lock_id AS requesting_lock_id, "
+                    + "lw.blocking_lock_id, lw.blocking_trx_id, "
+                    + "rl.lock_table AS waiting_object_name, rl.lock_index AS waiting_index_name, "
+                    + "rl.lock_type AS waiting_lock_type, rl.lock_mode AS waiting_lock_mode, "
+                    + "rl.lock_data AS waiting_lock_data, "
+                    + "bl.lock_table AS blocking_object_name, bl.lock_index AS blocking_index_name, "
+                    + "bl.lock_type AS blocking_lock_type, bl.lock_mode AS blocking_lock_mode, "
+                    + "bl.lock_data AS blocking_lock_data "
+                    + "FROM information_schema.innodb_lock_waits lw "
+                    + "LEFT JOIN information_schema.innodb_locks rl ON lw.requested_lock_id = rl.lock_id "
+                    + "LEFT JOIN information_schema.innodb_locks bl ON lw.blocking_lock_id = bl.lock_id"
+                    + ") w ON w.requesting_trx_id = t.trx_id "
+                    + "LEFT JOIN information_schema.innodb_trx bt ON bt.trx_id = w.blocking_trx_id "
+                    + "LEFT JOIN information_schema.processlist bp ON bt.trx_mysql_thread_id = bp.ID";
+
+    public static final String LOCK_COLUMNS_UNAVAILABLE =
+            "NULL AS requesting_lock_id, NULL AS blocking_lock_id, NULL AS blocking_trx_id, "
+                    + "NULL AS requesting_ps_thread_id, NULL AS blocking_ps_thread_id, "
+                    + "NULL AS waiting_object_schema, NULL AS waiting_object_name, NULL AS waiting_index_name, "
+                    + "NULL AS waiting_lock_type, NULL AS waiting_lock_mode, NULL AS waiting_lock_status, "
+                    + "NULL AS waiting_lock_data, "
+                    + "NULL AS blocking_object_schema, NULL AS blocking_object_name, NULL AS blocking_index_name, "
+                    + "NULL AS blocking_lock_type, NULL AS blocking_lock_mode, NULL AS blocking_lock_status, "
+                    + "NULL AS blocking_lock_data, "
+                    + "NULL AS blocking_thread_id, NULL AS blocking_process_id, "
+                    + "NULL AS blocking_user, NULL AS blocking_host, NULL AS blocking_db";
+
+    public static final String SQL_PROBE_MYSQL80_LOCKS =
+            "SELECT 1 FROM performance_schema.data_lock_waits WHERE 1 = 0";
+    public static final String SQL_PROBE_MYSQL57_LOCKS =
+            "SELECT 1 FROM information_schema.innodb_lock_waits WHERE 1 = 0";
+    public static final String SQL_CONNECTION_INSPECTION =
+            "SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO\n"
+                    + "FROM information_schema.PROCESSLIST\n"
+                    + "WHERE ID = %d;";
+
+    public static final String ERROR_CODE_PROCESS_PRIVILEGE_REQUIRED =
+            "mysql.activeTransaction.processPrivilegeRequired";
+    public static final int MYSQL_ERROR_TABLE_ACCESS_DENIED = 1142;
+    public static final int MYSQL_ERROR_TABLE_NOT_FOUND = 1146;
+    public static final int MYSQL_ERROR_SPECIFIC_ACCESS_DENIED = 1227;
+    public static final Set<Integer> LOCK_METADATA_UNAVAILABLE_ERROR_CODES = Set.of(
+            MYSQL_ERROR_TABLE_ACCESS_DENIED,
+            MYSQL_ERROR_TABLE_NOT_FOUND,
+            MYSQL_ERROR_SPECIFIC_ACCESS_DENIED
+    );
+    public static final String PROCESS_PRIVILEGE_MESSAGE_MARKER = "PROCESS";
+    public static final List<String> LOCK_METADATA_UNAVAILABLE_MESSAGE_MARKERS = List.of(
+            "DATA_LOCK",
+            "INNODB_LOCK",
+            "PERFORMANCE_SCHEMA",
+            "COMMAND DENIED",
+            "DOESN'T EXIST",
+            "DOES NOT EXIST",
+            PROCESS_PRIVILEGE_MESSAGE_MARKER
+    );
+    public static final String LOCK_JOIN_UNAVAILABLE = "";
+    public static final String EMPTY_ERROR_MESSAGE = "";
+    public static final String QUALIFIED_NAME_SEPARATOR = ".";
+
+    private MysqlActiveTransactionConstants() {
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlMetaDataConstants.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlMetaDataConstants.java
index e1c6318c38..95250de02a 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlMetaDataConstants.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlMetaDataConstants.java
@@ -71,6 +71,8 @@ public final class MysqlMetaDataConstants {
     public static final String FIELD_INDEX_COMMENT = "Index_comment";
     public static final String FIELD_INDEX_COMMENT_FALLBACK = "Comment";
     public static final String FIELD_INDEX_TYPE = "Index_type";
+    public static final String FIELD_IS_VISIBLE = "Visible";
+    public static final String INDEX_VISIBLE_VALUE = "YES";
     public static final String FIELD_IS_NULLABLE = "IS_NULLABLE";
     public static final String FIELD_KEY_NAME = "Key_name";
     public static final String FIELD_NAME = "Name";
@@ -111,6 +113,7 @@ public final class MysqlMetaDataConstants {
     public static final String SQL_DOT = ".";
     public static final String SQL_ENUM_TYPE = "ENUM";
     public static final String SQL_FULLTEXT_INDEX_TYPE = "FULLTEXT";
+    public static final String SQL_INVISIBLE = "INVISIBLE";
     public static final String SQL_METADATA_QUOTE = "`";
     public static final String SQL_NAME_SIZE_CLOSE = ")";
     public static final String SQL_NAME_SIZE_OPEN = "(";
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlSqlConstants.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlSqlConstants.java
index b71ef69e2b..f2b0a764ec 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlSqlConstants.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/constant/MysqlSqlConstants.java
@@ -35,6 +35,9 @@ public final class MysqlSqlConstants {
     public static final String SQL_DROP_TABLE_TEMPLATE = "DROP TABLE %s";
     public static final String SQL_DROP_USER = "DROP USER ";
     public static final String SQL_DROP_VIEW_TEMPLATE = "DROP VIEW %s";
+    public static final String SQL_INVISIBLE = "INVISIBLE";
+    public static final String SQL_VISIBLE = "VISIBLE";
+    public static final String SQL_ALTER_INDEX = "ALTER INDEX ";
     public static final String SQL_ENGINE_ASSIGNMENT = "ENGINE=";
     public static final String SQL_FIRST_TERMINATOR = " FIRST;\n";
     public static final String SQL_FROM = " FROM ";
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/enums/type/MysqlColumnTypeEnum.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/enums/type/MysqlColumnTypeEnum.java
index 922aa24e3f..e6c4e33554 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/enums/type/MysqlColumnTypeEnum.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/enums/type/MysqlColumnTypeEnum.java
@@ -17,6 +17,8 @@
 
 import static ai.chat2db.plugin.mysql.constant.MysqlSqlConstants.SQL_COMMENT_KEYWORD;
 import static ai.chat2db.plugin.mysql.constant.MysqlSqlConstants.SQL_COMMENT_SPACE_SINGLE_QUOTE;
+import static ai.chat2db.plugin.mysql.constant.MysqlSqlConstants.SQL_INVISIBLE;
+import static ai.chat2db.plugin.mysql.constant.MysqlSqlConstants.SQL_VISIBLE;
 
 import static ai.chat2db.plugin.mysql.constant.MysqlColumnTypeEnumConstants.*;
 @Getter
@@ -122,7 +124,6 @@ public enum MysqlColumnTypeEnum implements IColumnBuilder {
 
     JSON("JSON", false, false, true, false, false, false, true, false, false, false, false);
 
-
     private ColumnType columnType;
 
     public static MysqlColumnTypeEnum getByType(String dataType) {
@@ -160,6 +161,10 @@ public String buildDefaultColumn(TableColumn column, boolean comment) {
 
     @Override
     public String buildCreateColumnSql(TableColumn column) {
+        return buildCreateColumnSql(column, false);
+    }
+
+    public String buildCreateColumnSql(TableColumn column, boolean forceVisibleKeyword) {
         MysqlColumnTypeEnum type = COLUMN_TYPE_MAP.get(column.getColumnType().toUpperCase());
         if (type == null) {
             return buildDefaultColumn(column,true);
@@ -184,6 +189,14 @@ public String buildCreateColumnSql(TableColumn column) {
 
         script.append(buildAutoIncrement(column, type)).append(" ");
 
+        // MySQL column grammar puts VISIBLE/INVISIBLE before COMMENT; emitting it after the
+        // comment produces ERROR 1064 for columns that carry a comment.
+        if (column.getVisible() != null && !column.getVisible()) {
+            script.append(SQL_INVISIBLE).append(" ");
+        } else if (forceVisibleKeyword && Boolean.TRUE.equals(column.getVisible())) {
+            script.append(SQL_VISIBLE).append(" ");
+        }
+
         script.append(buildComment(column, type)).append(" ");
 
         return script.toString();
@@ -237,48 +250,56 @@ private String buildCollation(TableColumn column, MysqlColumnTypeEnum type) {
 
     @Override
     public String buildModifyColumn(TableColumn tableColumn) {
+        return buildModifyColumn(tableColumn, false);
+    }
 
+    public String buildModifyColumn(TableColumn tableColumn, boolean forceVisibleKeyword) {
         if (EditStatusEnum.DELETE.name().equals(tableColumn.getEditStatus())) {
             return StringUtils.join("DROP COLUMN ", MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableColumn.getName()));
         }
         if (EditStatusEnum.ADD.name().equals(tableColumn.getEditStatus())) {
-            return StringUtils.join("ADD COLUMN ", buildCreateColumnSql(tableColumn));
+            return StringUtils.join("ADD COLUMN ", buildCreateColumnSql(tableColumn, forceVisibleKeyword));
         }
         if (EditStatusEnum.MODIFY.name().equals(tableColumn.getEditStatus())) {
             if (!StringUtils.equalsIgnoreCase(tableColumn.getOldName(), tableColumn.getName())) {
-                return StringUtils.join("CHANGE COLUMN ", MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableColumn.getOldName()), " ", buildCreateColumnSql(tableColumn));
+                return StringUtils.join("CHANGE COLUMN ", MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableColumn.getOldName()), " ", buildCreateColumnSql(tableColumn, forceVisibleKeyword));
             } else {
-                return StringUtils.join("MODIFY COLUMN ", buildCreateColumnSql(tableColumn));
+                return StringUtils.join("MODIFY COLUMN ", buildCreateColumnSql(tableColumn, forceVisibleKeyword));
             }
         }
         return "";
     }
 
     public String buildModifyColumn(TableColumn tableColumn, boolean isMove, String columnName) {
+        return buildModifyColumn(tableColumn, isMove, columnName, false);
+    }
+
+    public String buildModifyColumn(TableColumn tableColumn, boolean isMove, String columnName,
+            boolean forceVisibleKeyword) {
         if (EditStatusEnum.DELETE.name().equals(tableColumn.getEditStatus())) {
             return StringUtils.join("DROP COLUMN ", MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableColumn.getName()));
         }
         if (EditStatusEnum.ADD.name().equals(tableColumn.getEditStatus())) {
             if (isMove) {
                 if (columnName.equals("-1")) {
-                    return StringUtils.join("ADD COLUMN ", buildCreateColumnSql(tableColumn), " FIRST");
+                    return StringUtils.join("ADD COLUMN ", buildCreateColumnSql(tableColumn, forceVisibleKeyword), " FIRST");
                 } else {
-                    return StringUtils.join("ADD COLUMN ", buildCreateColumnSql(tableColumn), " AFTER ", MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(columnName));
+                    return StringUtils.join("ADD COLUMN ", buildCreateColumnSql(tableColumn, forceVisibleKeyword), " AFTER ", MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(columnName));
                 }
             }
-            return StringUtils.join("ADD COLUMN ", buildCreateColumnSql(tableColumn));
+            return StringUtils.join("ADD COLUMN ", buildCreateColumnSql(tableColumn, forceVisibleKeyword));
         }
         if (EditStatusEnum.MODIFY.name().equals(tableColumn.getEditStatus())) {
             String sql;
             if (!StringUtils.equalsIgnoreCase(tableColumn.getOldName(), tableColumn.getName())) {
-                sql = StringUtils.join("CHANGE COLUMN ", MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableColumn.getOldName()), " ", buildCreateColumnSql(tableColumn));
+                sql = StringUtils.join("CHANGE COLUMN ", MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableColumn.getOldName()), " ", buildCreateColumnSql(tableColumn, forceVisibleKeyword));
             } else {
-                sql = StringUtils.join("MODIFY COLUMN ", buildCreateColumnSql(tableColumn));
+                sql = StringUtils.join("MODIFY COLUMN ", buildCreateColumnSql(tableColumn, forceVisibleKeyword));
             }
             return appendColumnPosition(sql, isMove, columnName);
         }
         if (isMove) {
-            return appendColumnPosition(StringUtils.join("MODIFY COLUMN ", buildCreateColumnSql(tableColumn)), true,
+            return appendColumnPosition(StringUtils.join("MODIFY COLUMN ", buildCreateColumnSql(tableColumn, forceVisibleKeyword)), true,
                     columnName);
         }
         return "";
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/enums/type/MysqlIndexTypeEnum.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/enums/type/MysqlIndexTypeEnum.java
index e1d541923c..9979e140c4 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/enums/type/MysqlIndexTypeEnum.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/main/java/ai/chat2db/plugin/mysql/enums/type/MysqlIndexTypeEnum.java
@@ -7,6 +7,7 @@
 import ai.chat2db.community.domain.api.model.metadata.TableIndex;
 import ai.chat2db.community.domain.api.model.metadata.TableIndexColumn;
 import lombok.Getter;
+import ai.chat2db.spi.constant.SQLConstants;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
@@ -15,6 +16,9 @@
 
 import static ai.chat2db.plugin.mysql.constant.MysqlSqlConstants.SQL_COMMENT_SPACE_SINGLE_QUOTE;
 import static ai.chat2db.plugin.mysql.constant.MysqlSqlConstants.SQL_DROP_PRIMARY_KEY;
+import static ai.chat2db.plugin.mysql.constant.MysqlSqlConstants.SQL_INVISIBLE;
+import static ai.chat2db.plugin.mysql.constant.MysqlSqlConstants.SQL_ALTER_INDEX;
+import static ai.chat2db.plugin.mysql.constant.MysqlSqlConstants.SQL_VISIBLE;
 
 @Getter
 public enum MysqlIndexTypeEnum {
@@ -79,6 +83,11 @@ public String buildIndexScript(TableIndex tableIndex) {
             script.append(" ").append(indexComment);
         }
 
+        if (tableIndex.getVisible() != null && !tableIndex.getVisible()
+                && !PRIMARY_KEY.equals(this)) {
+            script.append(SQLConstants.SPACE).append(SQL_INVISIBLE);
+        }
+
         return script.toString();
     }
 
@@ -108,6 +117,9 @@ private String buildIndexColumn(TableIndex tableIndex) {
         for (TableIndexColumn column : tableIndex.getColumnList()) {
             if(StringUtils.isNotBlank(column.getColumnName())) {
                 script.append(MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(column.getColumnName()));
+                if (column.getSubPart() != null && column.getSubPart() > 0) {
+                    script.append("(").append(column.getSubPart()).append(")");
+                }
                 if (!StringUtils.isBlank(column.getAscOrDesc()) && !PRIMARY_KEY.equals(this)) {
                     script.append(" ").append(MysqlSqlGuards.requireAscOrDesc(column.getAscOrDesc()));
                 }
@@ -140,6 +152,13 @@ public String buildModifyIndex(TableIndex tableIndex) {
         return "";
     }
 
+    public String buildAlterIndexVisibility(TableIndex tableIndex) {
+        String visibility = Boolean.FALSE.equals(tableIndex.getVisible()) ? SQL_INVISIBLE : SQL_VISIBLE;
+        return StringUtils.join(SQL_ALTER_INDEX,
+                MysqlIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableIndex.getName()),
+                SQLConstants.SPACE, visibility);
+    }
+
     private String buildDropIndex(TableIndex tableIndex) {
         if (MysqlIndexTypeEnum.PRIMARY_KEY.getName().equals(tableIndex.getType())) {
             return StringUtils.join(SQL_DROP_PRIMARY_KEY);
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlActiveTransactionManagerTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlActiveTransactionManagerTest.java
new file mode 100644
index 0000000000..b82ed53678
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlActiveTransactionManagerTest.java
@@ -0,0 +1,205 @@
+package ai.chat2db.plugin.mysql;
+
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction;
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction.LockMetadataSource;
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction.LockMetadataState;
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction.QueryState;
+import ai.chat2db.community.tools.exception.BusinessException;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.lang.reflect.Proxy;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static ai.chat2db.plugin.mysql.constant.MysqlActiveTransactionConstants.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class MysqlActiveTransactionManagerTest {
+
+    @Test
+    void recognizesProcessPrivilegeFailuresThroughWrappedCauses() {
+        SQLException denied = new SQLException(
+                "Access denied; you need (at least one of) the PROCESS privilege",
+                "42000",
+                MYSQL_ERROR_SPECIFIC_ACCESS_DENIED);
+
+        assertTrue(MysqlActiveTransactionManager.hasProcessPrivilegeError(
+                new IllegalStateException("execution failed", denied)));
+        assertFalse(MysqlActiveTransactionManager.hasProcessPrivilegeError(
+                new SQLException("table not found", "42S02", MYSQL_ERROR_TABLE_NOT_FOUND)));
+    }
+
+    @Test
+    void buildsLiveTransactionQueryWithMySql80LockWaitMetadata() {
+        String sql = MysqlActiveTransactionManager.activeTransactionSql("w.requesting_lock_id", "JOIN wait_table w");
+
+        assertTrue(sql.contains("FROM information_schema.innodb_trx t"));
+        assertTrue(sql.contains("LEFT JOIN information_schema.processlist p ON t.trx_mysql_thread_id = p.ID"));
+        assertTrue(sql.contains("w.requesting_lock_id"));
+        assertTrue(sql.contains("JOIN wait_table w"));
+        assertTrue(sql.contains("ORDER BY t.trx_started"));
+    }
+
+    @Test
+    void unavailableLockMetadataQueryKeepsLiveTransactionSource() {
+        MysqlActiveTransactionManager.LockMetadataQuery query =
+                MysqlActiveTransactionManager.unavailableLockMetadataQuery();
+
+        assertFalse(query.available());
+        assertTrue(query.sql().contains("FROM information_schema.innodb_trx t"));
+        assertTrue(query.sql().contains("NULL AS blocking_trx_id"));
+        assertTrue(query.sql().contains("LEFT JOIN information_schema.processlist p"));
+        assertTrue(query.sql().contains("ORDER BY t.trx_started"));
+    }
+
+    @Test
+    void recognizesMissingOrDeniedLockMetadataFailures() {
+        assertTrue(MysqlActiveTransactionManager.hasMissingOrDeniedMetadataError(
+                new SQLException("Table 'performance_schema.data_lock_waits' doesn't exist",
+                        "42S02", MYSQL_ERROR_TABLE_NOT_FOUND)));
+        assertTrue(MysqlActiveTransactionManager.hasMissingOrDeniedMetadataError(
+                new SQLException("SELECT command denied to user for table 'data_locks'",
+                        "42000", MYSQL_ERROR_TABLE_ACCESS_DENIED)));
+        assertFalse(MysqlActiveTransactionManager.hasMissingOrDeniedMetadataError(
+                new SQLException("Syntax error", "42000", 1064)));
+    }
+
+    @Test
+    void mapsResultSetToTypedTransactionResponse() throws SQLException {
+        ResultSet resultSet = resultSet(Map.ofEntries(
+                Map.entry(RESULT_TRX_ID, "421337"),
+                Map.entry(RESULT_TRX_STATE, "LOCK WAIT"),
+                Map.entry(RESULT_TRX_STARTED, Timestamp.valueOf("2026-08-31 12:00:00")),
+                Map.entry(RESULT_TRX_AGE_SECONDS, 12L),
+                Map.entry(RESULT_TRX_ISOLATION_LEVEL, "REPEATABLE READ"),
+                Map.entry(RESULT_TRX_ROWS_LOCKED, 1L),
+                Map.entry(RESULT_TRX_ROWS_MODIFIED, 0L),
+                Map.entry(RESULT_TRX_LOCK_STRUCTS, 2L),
+                Map.entry(RESULT_TRX_MYSQL_THREAD_ID, 45L),
+                Map.entry(RESULT_PROCESS_ID, 45L),
+                Map.entry(RESULT_PROCESS_USER, "ops002_user"),
+                Map.entry(RESULT_PROCESS_HOST, "127.0.0.1:50000"),
+                Map.entry(RESULT_PROCESS_DB, "ops002_test"),
+                Map.entry(RESULT_REQUESTING_LOCK_ID, "421337:7:3:2"),
+                Map.entry(RESULT_BLOCKING_LOCK_ID, "421336:7:3:2"),
+                Map.entry(RESULT_BLOCKING_TRX_ID, "421336"),
+                Map.entry(RESULT_BLOCKING_THREAD_ID, 44L),
+                Map.entry(RESULT_BLOCKING_PROCESS_ID, 44L)
+        ));
+
+        ActiveTransaction transaction = MysqlActiveTransactionManager.readTransaction(
+                resultSet,
+                new MysqlActiveTransactionManager.LockMetadataQuery(
+                        "SELECT ...", true, LockMetadataSource.MYSQL_80_PERFORMANCE_SCHEMA)
+        );
+
+        assertEquals("421337", transaction.getTrxId());
+        assertEquals(45L, transaction.getThreadId());
+        assertEquals(QueryState.UNAVAILABLE, transaction.getQueryState());
+        assertEquals(LockMetadataState.AVAILABLE, transaction.getLockMetadataState());
+        assertEquals(LockMetadataSource.MYSQL_80_PERFORMANCE_SCHEMA, transaction.getLockMetadataSource());
+        assertTrue(transaction.getCanOpenSession());
+        assertEquals("SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO\n"
+                + "FROM information_schema.PROCESSLIST\nWHERE ID = 45;",
+                transaction.getConnectionInspectionSql());
+        assertTrue(transaction.getLockWaitAvailable());
+        assertEquals(44L, transaction.getBlockingThreadId());
+        assertEquals("SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO\n"
+                + "FROM information_schema.PROCESSLIST\nWHERE ID = 44;",
+                transaction.getBlockingConnectionInspectionSql());
+        assertNull(transaction.getQuery());
+    }
+
+    @Test
+    void unavailableConnectionsDoNotExposeInspectionSql() throws SQLException {
+        ResultSet resultSet = resultSet(Map.ofEntries(
+                Map.entry(RESULT_TRX_ID, "421338"),
+                Map.entry(RESULT_TRX_STATE, "RUNNING"),
+                Map.entry(RESULT_TRX_STARTED, Timestamp.valueOf("2026-08-31 12:00:00")),
+                Map.entry(RESULT_TRX_MYSQL_THREAD_ID, 46L)
+        ));
+
+        ActiveTransaction transaction = MysqlActiveTransactionManager.readTransaction(
+                resultSet,
+                MysqlActiveTransactionManager.unavailableLockMetadataQuery()
+        );
+
+        assertFalse(transaction.getCanOpenSession());
+        assertNull(transaction.getConnectionInspectionSql());
+        assertFalse(transaction.getCanOpenBlockingSession());
+        assertNull(transaction.getBlockingConnectionInspectionSql());
+    }
+
+    @Test
+    void fallbackProcessPrivilegeFailureUsesSanitizedBusinessCode() {
+        RuntimeException executionFailure = new IllegalStateException("execution failed",
+                new SQLException("Access denied; you need (at least one of) the PROCESS privilege",
+                        "42000", MYSQL_ERROR_SPECIFIC_ACCESS_DENIED));
+
+        BusinessException exception = assertThrows(BusinessException.class, () -> {
+            throw MysqlActiveTransactionManager.sanitizeActiveTransactionQueryException(executionFailure);
+        });
+
+        assertEquals(ERROR_CODE_PROCESS_PRIVILEGE_REQUIRED, exception.getCode());
+        assertSame(executionFailure, exception.getCause());
+    }
+
+    @Test
+    void managerDoesNotInlineSqlOrResultColumnNames() throws IOException {
+        Path sourcePath = Path.of(
+                System.getProperty("basedir"),
+                "src/main/java/ai/chat2db/plugin/mysql/MysqlActiveTransactionManager.java"
+        );
+        String source = Files.readString(sourcePath);
+
+        assertFalse(source.contains("resultSet.getString(\""));
+        assertFalse(source.contains("resultSet.getTimestamp(\""));
+        assertFalse(source.contains("nullableLong(resultSet, \""));
+        assertFalse(source.contains("information_schema"));
+        assertFalse(source.contains("performance_schema"));
+    }
+
+    @Test
+    void nonProcessFallbackFailureRemainsOriginalRuntimeException() {
+        RuntimeException executionFailure = new IllegalStateException("syntax error",
+                new SQLException("Syntax error", "42000", 1064));
+
+        assertSame(executionFailure,
+                MysqlActiveTransactionManager.sanitizeActiveTransactionQueryException(executionFailure));
+    }
+
+    private static ResultSet resultSet(Map<String, Object> values) {
+        AtomicBoolean wasNull = new AtomicBoolean();
+        return (ResultSet) Proxy.newProxyInstance(
+                MysqlActiveTransactionManagerTest.class.getClassLoader(),
+                new Class<?>[]{ResultSet.class},
+                (proxy, method, arguments) -> {
+                    if ("wasNull".equals(method.getName())) {
+                        return wasNull.get();
+                    }
+                    if (arguments != null && arguments.length == 1 && arguments[0] instanceof String column) {
+                        Object value = values.get(column);
+                        wasNull.set(value == null);
+                        return switch (method.getName()) {
+                            case "getString" -> value == null ? null : value.toString();
+                            case "getTimestamp" -> value;
+                            case "getLong" -> value == null ? 0L : ((Number) value).longValue();
+                            default -> throw new UnsupportedOperationException(method.getName());
+                        };
+                    }
+                    throw new UnsupportedOperationException(method.getName());
+                }
+        );
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlMetaDataColumnTypeTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlMetaDataColumnTypeTest.java
index 200e833226..a0edd0c89e 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlMetaDataColumnTypeTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlMetaDataColumnTypeTest.java
@@ -1,9 +1,20 @@
 package ai.chat2db.plugin.mysql;
 
+import ai.chat2db.community.domain.api.model.metadata.TableColumn;
 import org.junit.jupiter.api.Test;
 
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.List;
+import java.util.Map;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class MysqlMetaDataColumnTypeTest {
 
@@ -13,4 +24,104 @@ void extractsArgumentsThroughTheOuterClosingParenthesis() {
         assertEquals("10,2", MysqlMetaData.extractColumnTypeArguments("decimal(10,2) unsigned"));
         assertNull(MysqlMetaData.extractColumnTypeArguments("varchar"));
     }
+
+    @Test
+    void mapsOrdinaryColumnWhenExtraMetadataIsNull() {
+        MysqlMetaData metaData = new MysqlMetaData();
+        Connection connection = connectionWithColumnRow(Map.of(
+                "COLUMN_NAME", "name",
+                "DATA_TYPE", "varchar",
+                "COLUMN_TYPE", "varchar(64)",
+                "IS_NULLABLE", "YES",
+                "COLUMN_KEY", "",
+                "COLUMN_COMMENT", "",
+                "CHARACTER_SET_NAME", "utf8mb4",
+                "COLLATION_NAME", "utf8mb4_general_ci"
+        ));
+
+        List<TableColumn> columns = assertDoesNotThrow(() -> metaData.columns(connection, "app", null, "users"));
+
+        assertEquals(1, columns.size());
+        TableColumn column = columns.get(0);
+        assertEquals("name", column.getName());
+        assertEquals("VARCHAR", column.getColumnType());
+        assertFalse(column.getAutoIncrement());
+        assertFalse(column.getOnUpdateCurrentTimestamp());
+        assertTrue(column.getVisible());
+    }
+
+    @Test
+    void mapsInvisibleColumnFromExtraMetadata() {
+        MysqlMetaData metaData = new MysqlMetaData();
+        Connection connection = connectionWithColumnRow(Map.of(
+                "COLUMN_NAME", "name",
+                "DATA_TYPE", "varchar",
+                "COLUMN_TYPE", "varchar(64)",
+                "IS_NULLABLE", "YES",
+                "COLUMN_KEY", "",
+                "EXTRA", "INVISIBLE",
+                "COLUMN_COMMENT", "",
+                "CHARACTER_SET_NAME", "utf8mb4",
+                "COLLATION_NAME", "utf8mb4_general_ci"
+        ));
+
+        List<TableColumn> columns = metaData.columns(connection, "app", null, "users");
+
+        assertEquals(1, columns.size());
+        assertFalse(columns.get(0).getVisible());
+    }
+
+    private static Connection connectionWithColumnRow(Map<String, String> row) {
+        ResultSet resultSet = (ResultSet) Proxy.newProxyInstance(MysqlMetaDataColumnTypeTest.class.getClassLoader(),
+                new Class<?>[] {ResultSet.class}, new SingleRowResultSet(row));
+        PreparedStatement preparedStatement = (PreparedStatement) Proxy.newProxyInstance(
+                MysqlMetaDataColumnTypeTest.class.getClassLoader(), new Class<?>[] {PreparedStatement.class},
+                (proxy, method, args) -> switch (method.getName()) {
+                    case "execute" -> true;
+                    case "getResultSet" -> resultSet;
+                    default -> defaultValue(method.getReturnType());
+                });
+        return (Connection) Proxy.newProxyInstance(MysqlMetaDataColumnTypeTest.class.getClassLoader(),
+                new Class<?>[] {Connection.class}, (proxy, method, args) -> {
+                    if ("prepareStatement".equals(method.getName())) {
+                        return preparedStatement;
+                    }
+                    return defaultValue(method.getReturnType());
+                });
+    }
+
+    private static class SingleRowResultSet implements java.lang.reflect.InvocationHandler {
+        private final Map<String, String> row;
+        private boolean read;
+
+        private SingleRowResultSet(Map<String, String> row) {
+            this.row = row;
+        }
+
+        @Override
+        public Object invoke(Object proxy, java.lang.reflect.Method method, Object[] args) {
+            return switch (method.getName()) {
+                case "next" -> {
+                    boolean hasNext = !read;
+                    read = true;
+                    yield hasNext;
+                }
+                case "getString" -> row.get(args[0]);
+                default -> defaultValue(method.getReturnType());
+            };
+        }
+    }
+
+    private static Object defaultValue(Class<?> type) {
+        if (!type.isPrimitive()) {
+            return null;
+        }
+        if (type == boolean.class) {
+            return false;
+        }
+        if (type == char.class) {
+            return '\0';
+        }
+        return 0;
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlVersionSupportTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlVersionSupportTest.java
new file mode 100644
index 0000000000..86c7448a51
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/MysqlVersionSupportTest.java
@@ -0,0 +1,44 @@
+package ai.chat2db.plugin.mysql;
+
+import ai.chat2db.spi.sql.Chat2DBContext;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class MysqlVersionSupportTest {
+
+    @org.junit.jupiter.api.AfterEach
+    void clearContext() {
+        Chat2DBContext.removeContext();
+    }
+
+    @Test
+    void shouldGateInvisibleColumnsAtMysql8023() {
+        assertFalse(MysqlVersionSupport.supportsInvisibleColumns("5.7.44-log"));
+        assertFalse(MysqlVersionSupport.supportsInvisibleColumns("8.0.22"));
+        assertTrue(MysqlVersionSupport.supportsInvisibleColumns("8.0.23"));
+        assertTrue(MysqlVersionSupport.supportsInvisibleColumns("8.4.0-commercial"));
+        assertFalse(MysqlVersionSupport.supportsInvisibleColumns("10.6.0-MariaDB"));
+        assertFalse(MysqlVersionSupport.supportsInvisibleColumns(null));
+    }
+
+    @Test
+    void shouldGateInvisibleIndexesAtMysqlEight() {
+        assertFalse(MysqlVersionSupport.supportsInvisibleIndexes("5.7.44-log"));
+        assertTrue(MysqlVersionSupport.supportsInvisibleIndexes("8.0.11"));
+        assertTrue(MysqlVersionSupport.supportsInvisibleIndexes("8.4.0-commercial"));
+        assertFalse(MysqlVersionSupport.supportsInvisibleIndexes("10.6.0-MariaDB"));
+        assertFalse(MysqlVersionSupport.supportsInvisibleIndexes(null));
+    }
+
+    @Test
+    void shouldDisallowInvisibleIndexesWhenVersionIsUnknown() {
+        assertTrue(MysqlVersionSupport.currentVersionDisallowsInvisibleIndexes());
+    }
+
+    @Test
+    void shouldDisallowInvisibleColumnsWhenVersionIsUnknown() {
+        assertTrue(MysqlVersionSupport.currentVersionDisallowsInvisibleColumns());
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilderTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilderTest.java
index 799c15a13e..f0369836d6 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilderTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilderTest.java
@@ -21,6 +21,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class MysqlSqlBuilderTest {
@@ -213,6 +214,174 @@ void shouldBuildAlterSqlWithIndexMethodWhenAddingMysqlIndexes() {
                 + "\tADD INDEX `idx_column2` (`id` ASC) USING BTREE;", sql);
     }
 
+    @Test
+    void shouldPreviewColumnTransitionToInvisible() {
+        withMysqlVersion("8.0.23", () -> {
+            MysqlSqlBuilder builder = new MysqlSqlBuilder();
+            Table oldTable = mysqlTable(List.of(mysqlVarcharColumn("content", "content", null, true)));
+            Table newTable = mysqlTable(List.of(mysqlVarcharColumn("content", "content",
+                    EditStatusEnum.MODIFY.name(), false)));
+
+            String sql = builder.ddl().table().buildAlterTable(oldTable, newTable);
+
+            assertTrue(normalizeWhitespace(sql)
+                    .contains("MODIFY COLUMN `content` VARCHAR(255) NOT NULL INVISIBLE"), sql);
+        });
+    }
+
+    @Test
+    void shouldPreviewColumnTransitionToVisible() {
+        withMysqlVersion("8.0.23", () -> {
+            MysqlSqlBuilder builder = new MysqlSqlBuilder();
+            Table oldTable = mysqlTable(List.of(mysqlVarcharColumn("content", "content", null, false)));
+            Table newTable = mysqlTable(List.of(mysqlVarcharColumn("content", "content",
+                    EditStatusEnum.MODIFY.name(), true)));
+
+            String sql = builder.ddl().table().buildAlterTable(oldTable, newTable);
+
+            assertTrue(normalizeWhitespace(sql)
+                    .contains("MODIFY COLUMN `content` VARCHAR(255) NOT NULL VISIBLE"), sql);
+        });
+    }
+
+    @Test
+    void shouldPlaceInvisibleBeforeCommentInColumnDefinition() {
+        TableColumn column = mysqlVarcharColumn("content", "content", null, false);
+        column.setComment("content note");
+
+        String sql = MysqlColumnTypeEnum.VARCHAR.buildCreateColumnSql(column);
+
+        assertEquals("`content` VARCHAR(255) NOT NULL INVISIBLE COMMENT 'content note'", normalizeWhitespace(sql));
+    }
+
+    @Test
+    void shouldPlaceVisibleBeforeCommentInColumnDefinition() {
+        TableColumn column = mysqlVarcharColumn("content", "content", EditStatusEnum.MODIFY.name(), true);
+        column.setComment("content note");
+
+        String sql = MysqlColumnTypeEnum.VARCHAR.buildCreateColumnSql(column, true);
+
+        assertEquals("`content` VARCHAR(255) NOT NULL VISIBLE COMMENT 'content note'", normalizeWhitespace(sql));
+    }
+
+    @Test
+    void shouldRejectInvisibleColumnWhenCreatingOnMysql8022() {
+        withMysqlVersion("8.0.22", () -> {
+            Table table = Table.builder()
+                    .databaseName("test_db")
+                    .name("sample_table")
+                    .columnList(List.of(mysqlVarcharColumn("content", "content", null, false)))
+                    .indexList(List.of())
+                    .build();
+
+            IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                    () -> new MysqlSqlBuilder().ddl().table().buildCreateTable(table,
+                            TableBuilderConfig.defaultConfig()));
+
+            assertEquals("MySQL invisible columns require MySQL 8.0.23 or later", exception.getMessage());
+        });
+    }
+
+    @Test
+    void shouldRejectVisibleColumnTransitionOnMysql8022() {
+        withMysqlVersion("8.0.22", () -> {
+            MysqlSqlBuilder builder = new MysqlSqlBuilder();
+            Table oldTable = mysqlTable(List.of(mysqlVarcharColumn("content", "content", null, false)));
+            Table newTable = mysqlTable(List.of(mysqlVarcharColumn("content", "content",
+                    EditStatusEnum.MODIFY.name(), true)));
+
+            IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                    () -> builder.ddl().table().buildAlterTable(oldTable, newTable));
+
+            assertEquals("MySQL invisible columns require MySQL 8.0.23 or later", exception.getMessage());
+        });
+    }
+
+    @Test
+    void shouldRebuildIndexWhenVisibilityAndMethodChangeTogether() {
+        withMysqlVersion("8.0.36", () -> {
+            MysqlSqlBuilder builder = new MysqlSqlBuilder();
+            Table oldTable = mysqlTableWithIndexes(List.of(mysqlIndex("idx_content", "BTREE", true,
+                    List.of(mysqlIndexColumn("content", "ASC", null)))));
+            Table newTable = mysqlTableWithIndexes(List.of(mysqlModifiedIndex("idx_content", "HASH", false,
+                    List.of(mysqlIndexColumn("content", "ASC", null)))));
+
+            String sql = builder.ddl().table().buildAlterTable(oldTable, newTable);
+
+            assertEquals("ALTER TABLE `test_db`.`sample_table`\n"
+                    + "\tDROP INDEX `idx_content`,\n"
+                    + "ADD INDEX `idx_content` (`content` ASC) USING HASH INVISIBLE;", sql);
+        });
+    }
+
+    @Test
+    void shouldUseLightweightAlterForVisibilityOnlyChange() {
+        withMysqlVersion("8.0.36", () -> {
+            MysqlSqlBuilder builder = new MysqlSqlBuilder();
+            Table oldTable = mysqlTableWithIndexes(List.of(mysqlIndex("idx_content", "BTREE", true,
+                    List.of(mysqlIndexColumn("content", "ASC", 16L)))));
+            Table newTable = mysqlTableWithIndexes(List.of(mysqlModifiedIndex("idx_content", "BTREE", false,
+                    List.of(mysqlIndexColumn("content", "ASC", 16L)))));
+
+            String sql = builder.ddl().table().buildAlterTable(oldTable, newTable);
+
+            assertEquals("ALTER TABLE `test_db`.`sample_table`\n"
+                    + "\tALTER INDEX `idx_content` INVISIBLE;", sql);
+        });
+    }
+
+    @Test
+    void shouldRejectInvisibleIndexWhenCreatingOnMysql57() {
+        withMysqlVersion("5.7.44", () -> {
+            Table table = Table.builder()
+                    .databaseName("test_db")
+                    .name("sample_table")
+                    .columnList(List.of(mysqlVarcharColumn("content", "content", null)))
+                    .indexList(List.of(mysqlIndex("idx_content", "BTREE", false,
+                            List.of(mysqlIndexColumn("content", "ASC", null)))))
+                    .build();
+
+            IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                    () -> new MysqlSqlBuilder().ddl().table().buildCreateTable(table,
+                            TableBuilderConfig.defaultConfig()));
+
+            assertEquals("MySQL invisible indexes require MySQL 8.0 or later", exception.getMessage());
+        });
+    }
+
+    @Test
+    void shouldRejectInvisibleIndexVisibilityChangeOnMysql57() {
+        withMysqlVersion("5.7.44", () -> {
+            MysqlSqlBuilder builder = new MysqlSqlBuilder();
+            Table oldTable = mysqlTableWithIndexes(List.of(mysqlIndex("idx_content", "BTREE", true,
+                    List.of(mysqlIndexColumn("content", "ASC", null)))));
+            Table newTable = mysqlTableWithIndexes(List.of(mysqlModifiedIndex("idx_content", "BTREE", false,
+                    List.of(mysqlIndexColumn("content", "ASC", null)))));
+
+            IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                    () -> builder.ddl().table().buildAlterTable(oldTable, newTable));
+
+            assertEquals("MySQL invisible indexes require MySQL 8.0 or later", exception.getMessage());
+        });
+    }
+
+    @Test
+    void shouldRebuildIndexWhenVisibilityAndPrefixLengthChangeTogether() {
+        withMysqlVersion("8.0.36", () -> {
+            MysqlSqlBuilder builder = new MysqlSqlBuilder();
+            Table oldTable = mysqlTableWithIndexes(List.of(mysqlIndex("idx_content", "BTREE", true,
+                    List.of(mysqlIndexColumn("content", "ASC", 16L)))));
+            Table newTable = mysqlTableWithIndexes(List.of(mysqlModifiedIndex("idx_content", "BTREE", false,
+                    List.of(mysqlIndexColumn("content", "ASC", 32L)))));
+
+            String sql = builder.ddl().table().buildAlterTable(oldTable, newTable);
+
+            assertEquals("ALTER TABLE `test_db`.`sample_table`\n"
+                    + "\tDROP INDEX `idx_content`,\n"
+                    + "ADD INDEX `idx_content` (`content`(32) ASC) USING BTREE INVISIBLE;", sql);
+        });
+    }
+
     @Test
     void shouldKeepTargetPositionWhenRenamingAndMovingColumn() {
         MysqlSqlBuilder builder = new MysqlSqlBuilder();
@@ -277,16 +446,81 @@ private static Table mysqlTable(List<TableColumn> columns) {
                 .build();
     }
 
+    private static Table mysqlTableWithIndexes(List<TableIndex> indexes) {
+        return Table.builder()
+                .databaseName("test_db")
+                .name("sample_table")
+                .columnList(List.of())
+                .indexList(indexes)
+                .build();
+    }
+
+    private static TableIndex mysqlIndex(String name, String method, Boolean visible, List<TableIndexColumn> columns) {
+        return TableIndex.builder()
+                .name(name)
+                .oldName(name)
+                .type("Normal")
+                .method(method)
+                .visible(visible)
+                .columnList(columns)
+                .build();
+    }
+
+    private static TableIndex mysqlModifiedIndex(String name, String method, Boolean visible,
+            List<TableIndexColumn> columns) {
+        return TableIndex.builder()
+                .name(name)
+                .oldName(name)
+                .type("Normal")
+                .method(method)
+                .visible(visible)
+                .editStatus(EditStatusEnum.MODIFY.name())
+                .columnList(columns)
+                .build();
+    }
+
+    private static TableIndexColumn mysqlIndexColumn(String name, String ascOrDesc, Long subPart) {
+        return TableIndexColumn.builder()
+                .columnName(name)
+                .ascOrDesc(ascOrDesc)
+                .subPart(subPart)
+                .build();
+    }
+
     private static TableColumn mysqlVarcharColumn(String name, String oldName, String editStatus) {
+        return mysqlVarcharColumn(name, oldName, editStatus, null);
+    }
+
+    private static TableColumn mysqlVarcharColumn(String name, String oldName, String editStatus, Boolean visible) {
         return TableColumn.builder()
                 .name(name)
                 .oldName(oldName)
                 .columnType("VARCHAR")
                 .columnSize(255)
                 .editStatus(editStatus)
+                .visible(visible)
                 .build();
     }
 
+    private static String normalizeWhitespace(String sql) {
+        return sql.replaceAll("\\s+", " ").trim();
+    }
+
+    private static void withMysqlVersion(String dbVersion, Runnable runnable) {
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setDbType("MYSQL");
+        connectInfo.setDbVersion(dbVersion);
+        DriverConfig driverConfig = new DriverConfig();
+        driverConfig.setDbType("MYSQL");
+        connectInfo.setDriverConfig(driverConfig);
+        Chat2DBContext.putContext(connectInfo);
+        try {
+            runnable.run();
+        } finally {
+            Chat2DBContext.removeContext();
+        }
+    }
+
     @Test
     void shouldPreserveMultilineStringCellValueWhenBuildingUpdateSqlByQuery() {
         ConnectInfo connectInfo = new ConnectInfo();
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/completion/MysqlSqlCompletionPerformanceTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/completion/MysqlSqlCompletionPerformanceTest.java
new file mode 100644
index 0000000000..2b2e19c606
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/completion/MysqlSqlCompletionPerformanceTest.java
@@ -0,0 +1,201 @@
+package ai.chat2db.plugin.mysql.completion;
+
+import ai.chat2db.community.domain.api.enums.completion.SqlCompletionCandidateTypeEnum;
+import ai.chat2db.community.domain.api.model.completion.SqlCompletionCandidate;
+import ai.chat2db.community.domain.api.model.completion.request.DbSqlCompletionMetadataRequest;
+import ai.chat2db.community.domain.api.model.completion.request.DbSqlCompletionRequest;
+import ai.chat2db.community.domain.api.model.completion.result.SqlCompletionMetadataResponse;
+import ai.chat2db.community.domain.api.model.completion.result.SqlCompletionResponse;
+import ai.chat2db.community.domain.api.service.db.ISqlCompletionMetadataProvider;
+import ai.chat2db.spi.parser.completion.SqlCompletionDialectComponents;
+import ai.chat2db.spi.parser.completion.SqlCompletionPipelineState;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+
+class MysqlSqlCompletionPerformanceTest {
+
+    private static final int WARMUP_RUNS = 1;
+    private static final int MEASURED_RUNS = 2;
+    private static final long MAX_SINGLE_COMPLETION_NANOS = TimeUnit.SECONDS.toNanos(5);
+
+    private final SqlCompletionDialectComponents components = new MysqlSqlCompletionDialect().components();
+
+    @Test
+    void largeSqlCompletionStaysWithinPerformanceBudget() {
+        List<PerformanceCase> cases = List.of(
+                new PerformanceCase("single_statement_200_lines_166_ids", singleStatement(200, 166), false),
+                new PerformanceCase("multi_statement_200_history_166_ids", multiStatement(200, 166), true),
+                new PerformanceCase("multi_statement_200_history_500_ids", multiStatement(200, 500), true),
+                new PerformanceCase("multi_statement_200_history_1000_ids", multiStatement(200, 1000), true));
+
+        for (PerformanceCase performanceCase : cases) {
+            CountingMetadataProvider metadataProvider = new CountingMetadataProvider();
+            DbSqlCompletionRequest request = DbSqlCompletionRequest.of(
+                    performanceCase.sql(), performanceCase.sql().length(), "MYSQL", 0, metadataProvider);
+            for (int index = 0; index < WARMUP_RUNS; index++) {
+                measure(request);
+            }
+            metadataProvider.reset();
+
+            PipelineMeasurement lastMeasurement = null;
+            for (int index = 0; index < MEASURED_RUNS; index++) {
+                lastMeasurement = measure(request);
+                Assertions.assertTrue(lastMeasurement.totalNanos() < MAX_SINGLE_COMPLETION_NANOS,
+                        performanceCase.name());
+            }
+
+            Assertions.assertNotNull(lastMeasurement);
+            Assertions.assertTrue(lastMeasurement.totalNanos() > 0, performanceCase.name());
+            Assertions.assertFalse(lastMeasurement.stageNanos().isEmpty(), performanceCase.name());
+            SqlCompletionResponse result = lastMeasurement.state().result();
+            Assertions.assertEquals("SUCCESS", result.getStatus(), performanceCase.name());
+            Assertions.assertFalse(result.getCandidates().isEmpty(), performanceCase.name());
+            Assertions.assertTrue(lastMeasurement.state().window().sourceSql().length() <= performanceCase.sql().length(),
+                    performanceCase.name());
+            if (performanceCase.hasHistory()) {
+                Assertions.assertTrue(lastMeasurement.state().window().sourceStartOffset() > 0,
+                        performanceCase.name());
+            }
+            Assertions.assertTrue(metadataProvider.totalCalls() > 0, performanceCase.name());
+        }
+    }
+
+    private PipelineMeasurement measure(DbSqlCompletionRequest request) {
+        Map<String, Long> stageNanos = new LinkedHashMap<>();
+        long totalStartedAtNanos = System.nanoTime();
+        SqlCompletionPipelineState state = SqlCompletionPipelineState.start(request);
+
+        long stageStartedAtNanos = System.nanoTime();
+        state = state.withInput(components.inputCleaner().clean(state));
+        stageNanos.put("input", elapsed(stageStartedAtNanos));
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withWindow(components.statementLocator().locate(state));
+        stageNanos.put("statementWindow", elapsed(stageStartedAtNanos));
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withCursorContext(components.cursorAnalyzer().analyze(state));
+        stageNanos.put("cursor", elapsed(stageStartedAtNanos));
+        if (state.cursorContext() == null) {
+            return new PipelineMeasurement(state.withResult(SqlCompletionResponse.empty()), stageNanos,
+                    elapsed(totalStartedAtNanos));
+        }
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withDummySql(components.dummyBuilder().build(state));
+        stageNanos.put("dummySql", elapsed(stageStartedAtNanos));
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withLocalContext(components.localContextCollector().collect(state));
+        stageNanos.put("localContext", elapsed(stageStartedAtNanos));
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withC3Result(components.c3Collector().collect(state));
+        stageNanos.put("c3", elapsed(stageStartedAtNanos));
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withRuleEvidence(components.ruleEvidenceCollector().collect(state));
+        stageNanos.put("ruleEvidence", elapsed(stageStartedAtNanos));
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withSlots(components.slotClassifier().classify(state));
+        stageNanos.put("slots", elapsed(stageStartedAtNanos));
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withIntents(components.intentResolver().resolve(state));
+        stageNanos.put("intents", elapsed(stageStartedAtNanos));
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withCandidatePlan(components.candidatePlanner().plan(state));
+        stageNanos.put("candidatePlan", elapsed(stageStartedAtNanos));
+
+        stageStartedAtNanos = System.nanoTime();
+        state = state.withResult(components.presentationProcessor().process(state));
+        stageNanos.put("presentation", elapsed(stageStartedAtNanos));
+        return new PipelineMeasurement(state, stageNanos, elapsed(totalStartedAtNanos));
+    }
+
+    private static long elapsed(long startedAtNanos) {
+        return Math.max(0L, System.nanoTime() - startedAtNanos);
+    }
+
+    private static String singleStatement(int targetLineCount, int idCount) {
+        StringBuilder sql = currentStatementPrefix(idCount);
+        int lineCount = 2 + idCount / 10;
+        while (lineCount < targetLineCount - 1) {
+            sql.append("-- filler\n");
+            lineCount++;
+        }
+        return sql.append("and na").toString();
+    }
+
+    private static String multiStatement(int historyStatementCount, int idCount) {
+        StringBuilder sql = new StringBuilder();
+        for (int index = 0; index < historyStatementCount; index++) {
+            sql.append("select * from archive_").append(index).append(";\n");
+        }
+        return sql.append(currentStatementPrefix(idCount)).append("and na").toString();
+    }
+
+    private static StringBuilder currentStatementPrefix(int idCount) {
+        StringBuilder sql = new StringBuilder("select * from orders where id in (\n");
+        for (int index = 0; index < idCount; index++) {
+            if (index > 0) {
+                sql.append(',');
+            }
+            sql.append(index);
+            if (index % 10 == 9) {
+                sql.append('\n');
+            }
+        }
+        return sql.append(")\n");
+    }
+
+    private record PerformanceCase(String name, String sql, boolean hasHistory) {
+    }
+
+    private record PipelineMeasurement(SqlCompletionPipelineState state,
+                                       Map<String, Long> stageNanos,
+                                       long totalNanos) {
+    }
+
+    private static final class CountingMetadataProvider implements ISqlCompletionMetadataProvider {
+
+        private final Map<String, Integer> counts = new LinkedHashMap<>();
+
+        @Override
+        public SqlCompletionMetadataResponse list(DbSqlCompletionMetadataRequest request) {
+            counts.merge(request.type(), 1, Integer::sum);
+            SqlCompletionCandidateTypeEnum type = SqlCompletionCandidateTypeEnum.from(request.type());
+            if (type == SqlCompletionCandidateTypeEnum.COLUMN) {
+                return SqlCompletionMetadataResponse.of(List.of(column("name"), column("status")));
+            }
+            if (type == SqlCompletionCandidateTypeEnum.DATABASE) {
+                return SqlCompletionMetadataResponse.of(List.of(
+                        SqlCompletionCandidate.of(SqlCompletionCandidateTypeEnum.DATABASE, "app")));
+            }
+            return SqlCompletionMetadataResponse.of(new ArrayList<>());
+        }
+
+        private static SqlCompletionCandidate column(String name) {
+            SqlCompletionCandidate candidate = SqlCompletionCandidate.of(SqlCompletionCandidateTypeEnum.COLUMN, name);
+            candidate.setColumnName(name);
+            candidate.setTableName("orders");
+            return candidate;
+        }
+
+        private int totalCalls() {
+            return counts.values().stream().mapToInt(Integer::intValue).sum();
+        }
+
+        private void reset() {
+            counts.clear();
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/completion/locate/MysqlSqlCompletionStatementLocatorTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/completion/locate/MysqlSqlCompletionStatementLocatorTest.java
index f115840e5c..837556512f 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/completion/locate/MysqlSqlCompletionStatementLocatorTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-mysql/src/test/java/ai/chat2db/plugin/mysql/completion/locate/MysqlSqlCompletionStatementLocatorTest.java
@@ -179,6 +179,98 @@ void ignoresSemicolonInsideLineCommentBeforeCursor() {
         assertCurrentWindow(window, sql, 0, sql.length());
     }
 
+    @Test
+    void keepsNestedSelectInsideSingleStatementOnTheFastPath() {
+        String sql = "select * from orders where id in (select id from users where users.id = 1) and na";
+
+        SqlCompletionStatementWindow window = locate(sql);
+
+        assertCurrentWindow(window, sql, 0, sql.length());
+    }
+
+    @Test
+    void keepsUnionQueryTogetherWhenTopLevelSelectsRepeat() {
+        String sql = "select id from orders where na union select id from archived_orders where na";
+
+        SqlCompletionStatementWindow window = locate(sql);
+
+        assertCurrentWindow(window, sql, 0, sql.length());
+    }
+
+    @Test
+    void keepsInsertSelectTogetherWhenTopLevelStatementKeywordsRepeat() {
+        String sql = "insert into orders(id) select id from users where na";
+
+        SqlCompletionStatementWindow window = locate(sql);
+
+        assertCurrentWindow(window, sql, 0, sql.length());
+    }
+
+    @Test
+    void preservesCurrentWindowWhenLargeHistoryCursorIsBeforeSeparator() {
+        StringBuilder sqlBuilder = new StringBuilder();
+        for (int index = 0; index < 200; index++) {
+            sqlBuilder.append("select * from archive_").append(index).append(";\n");
+        }
+        int currentStart = sqlBuilder.length();
+        sqlBuilder.append("select * from orders where na; select * from next_table");
+        String sql = sqlBuilder.toString();
+        int cursor = currentStart + "select * from orders where na".length();
+
+        SqlCompletionStatementWindow window = locate(sql, cursor);
+
+        assertCurrentWindow(window, "select * from orders where na", currentStart, cursor);
+    }
+
+    @Test
+    void fallsBackToParserForUnclosedParentheses() {
+        String sql = "select coalesce(o.sta from app.orders o";
+
+        SqlCompletionStatementWindow window = locate(sql);
+
+        assertCurrentWindow(window, sql, 0, sql.length());
+    }
+
+    @Test
+    void fallsBackToParserForUnclosedStringLiteral() {
+        String sql = "select * from orders where name = 'unterminated; select * from users where na";
+
+        SqlCompletionStatementWindow window = locate(sql);
+
+        assertCurrentWindow(window, "select * from users where na", sql.lastIndexOf("select * from users"),
+                sql.length());
+    }
+
+    @Test
+    void fallsBackToParserForUnclosedBlockComment() {
+        String sql = "select * from orders /* unterminated; select * from users where na";
+
+        SqlCompletionStatementWindow window = locate(sql);
+
+        assertCurrentWindow(window, "select * from users where na", sql.lastIndexOf("select * from users"),
+                sql.length());
+    }
+
+    @Test
+    void keepsQuestionMarkParametersEligibleForTheFastPath() {
+        String sql = "select * from orders where id = ?; select * from users where na";
+
+        SqlCompletionStatementWindow window = locate(sql);
+
+        assertCurrentWindow(window, "select * from users where na", sql.lastIndexOf("select * from users"),
+                sql.length());
+    }
+
+    @Test
+    void doesNotUseFastPathForUnmatchedClosingParenthesis() {
+        String sql = "select * from orders where id = 1); select * from users where na";
+
+        SqlCompletionStatementWindow window = locate(sql);
+
+        assertCurrentWindow(window, "select * from users where na", sql.lastIndexOf("select * from users"),
+                sql.length());
+    }
+
     @Test
     void keepsLargeScriptCurrentWindowBoundedByStatementSeparator() {
         StringBuilder sqlBuilder = new StringBuilder();
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-oracle/src/main/java/ai/chat2db/plugin/oracle/OracleDBManager.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-oracle/src/main/java/ai/chat2db/plugin/oracle/OracleDBManager.java
index 2a96f44728..1e045c9719 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-oracle/src/main/java/ai/chat2db/plugin/oracle/OracleDBManager.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-oracle/src/main/java/ai/chat2db/plugin/oracle/OracleDBManager.java
@@ -77,7 +77,7 @@ public void exportTable(Connection connection, String databaseName, String schem
             boolean containData, TaskExecutionContext context) throws SQLException {
         String tableDDL = Chat2DBContext.getDbMetaData().tableDDL(connection,
                 new TableMetadataRequest(databaseName, schemaName, tableName));
-        String sqlBuilder = "DROP TABLE " + qualifiedName(schemaName, tableName, false) + ";\n" + tableDDL + "\n";
+        String sqlBuilder = "DROP TABLE " + qualifiedName(schemaName, tableName) + ";\n" + tableDDL + "\n";
         context.write(sqlBuilder);
         if (containData) {
             exportTableData(connection, databaseName, schemaName, tableName, context);
@@ -169,8 +169,8 @@ public void connectDatabase(Connection connection, String database) {
 
     @Override
     public void copyTable(Connection connection, String databaseName, String schemaName, String tableName, String newTableName, boolean copyData) throws SQLException {
-        String source = qualifiedName(schemaName, tableName, true);
-        String target = qualifiedName(schemaName, newTableName, true);
+        String source = qualifiedName(schemaName, tableName);
+        String target = qualifiedName(schemaName, newTableName);
         String sql;
         if (copyData) {
             sql = "CREATE TABLE " + target + " AS SELECT * FROM " + source;
@@ -182,12 +182,12 @@ public void copyTable(Connection connection, String databaseName, String schemaN
 
     @Override
     public String dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
-        return "DROP TABLE " + qualifiedName(schemaName, tableName, false);
+        return "DROP TABLE " + qualifiedName(schemaName, tableName);
     }
 
     @Override
     public String truncateTable(Connection connection, String databaseName, String schemaName, String tableName) {
-        return "TRUNCATE TABLE " + qualifiedName(schemaName, tableName, true);
+        return "TRUNCATE TABLE " + qualifiedName(schemaName, tableName);
     }
 
     @Override
@@ -197,23 +197,16 @@ public void exportTableData(Connection connection, String databaseName, String s
 
     @Override
     public void dropView(Connection connection, String databaseName, String schemaName, String viewName) {
-        String sql = "DROP VIEW " + qualifiedName(schemaName, viewName, false);
+        String sql = "DROP VIEW " + qualifiedName(schemaName, viewName);
         DefaultSQLExecutor.getInstance().execute(connection, sql, (resultSet) -> null);
     }
 
-    private static String qualifiedName(String schemaName, String objectName, boolean normalizeQuotedObject) {
-        String normalizedObject = normalizeQuotedObject ? normalizeQuotedIdentifier(objectName) : objectName;
-        String quotedObject = OracleIdentifierProcessor.INSTANCE.quoteIdentifierAlways(normalizedObject);
+    private static String qualifiedName(String schemaName, String objectName) {
+        String quotedObject = OracleIdentifierProcessor.INSTANCE.quoteIdentifierAlways(objectName);
         if (StringUtils.isBlank(schemaName)) {
             return quotedObject;
         }
         return OracleIdentifierProcessor.INSTANCE.quoteIdentifierAlways(schemaName) + "." + quotedObject;
     }
 
-    private static String normalizeQuotedIdentifier(String identifier) {
-        if (OracleIdentifierProcessor.INSTANCE.isQuoteIdentifier(identifier)) {
-            return OracleIdentifierProcessor.INSTANCE.removeIdentifierQuote(identifier);
-        }
-        return identifier;
-    }
 }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-oracle/src/test/java/ai/chat2db/plugin/oracle/OracleIdentifierProcessorTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-oracle/src/test/java/ai/chat2db/plugin/oracle/OracleIdentifierProcessorTest.java
index 6b50dcdcdd..1e4f2d2c1f 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-oracle/src/test/java/ai/chat2db/plugin/oracle/OracleIdentifierProcessorTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-oracle/src/test/java/ai/chat2db/plugin/oracle/OracleIdentifierProcessorTest.java
@@ -145,12 +145,12 @@ void dropTableQuotesAndEscapesTableName() {
     }
 
     @Test
-    void dbManagerQualifiesRawAndServicePrequotedNames() throws Exception {
+    void dbManagerQualifiesRawNames() throws Exception {
         OracleDBManager manager = new OracleDBManager();
         assertEquals("DROP TABLE \"SA\"\"LES\".\"ORDERS\"",
                 manager.dropTable(null, "ignored_database", "SA\"LES", "ORDERS"));
         assertEquals("TRUNCATE TABLE \"SA\"\"LES\".\"OR\"\"DERS\"",
-                manager.truncateTable(null, "ignored_database", "SA\"LES", "\"OR\"\"DERS\""));
+                manager.truncateTable(null, "ignored_database", "SA\"LES", "OR\"DERS"));
     }
 
     @Test
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-postgresql/src/main/java/ai/chat2db/plugin/postgresql/PostgreSQLDBManager.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-postgresql/src/main/java/ai/chat2db/plugin/postgresql/PostgreSQLDBManager.java
index 00c1fa1573..b983341d98 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-postgresql/src/main/java/ai/chat2db/plugin/postgresql/PostgreSQLDBManager.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-postgresql/src/main/java/ai/chat2db/plugin/postgresql/PostgreSQLDBManager.java
@@ -66,7 +66,7 @@ private void exportSequences(Connection connection, String schemaName, TaskExecu
                 if (StringUtils.isBlank(sequenceName)) {
                     continue;
                 }
-                String quotedSequenceName = qualifiedTableName(schemaName, sequenceName, false);
+                String quotedSequenceName = qualifiedTableName(schemaName, sequenceName);
                 sqlBuilder.append(SQL_DROP_SEQUENCE_EXISTS).append(quotedSequenceName).append(";\n");
                 sqlBuilder.append(SQL_CREATE_SEQUENCE).append(quotedSequenceName).append("\n")
                         .append(" START WITH ").append(startValue).append("\n")
@@ -89,7 +89,7 @@ private void exportTypes(Connection connection, String schemaName, TaskExecution
         DefaultSQLExecutor.getInstance().preExecute(connection, ENUM_TYPE_DDL_SQL, new String[]{schemaName}, resultSet -> {
             while (resultSet.next()) {
                 typeBuilder.append(SQL_DROP_TYPE_EXISTS)
-                        .append(qualifiedTableName(schemaName, resultSet.getString("type_name"), false))
+                        .append(qualifiedTableName(schemaName, resultSet.getString("type_name")))
                         .append(";\n");
                 typeBuilder.append(resultSet.getString("ddl")).append("\n");
                 context.write(typeBuilder.toString());
@@ -98,7 +98,7 @@ private void exportTypes(Connection connection, String schemaName, TaskExecution
         typeBuilder.setLength(0);
         DefaultSQLExecutor.getInstance().preExecute(connection, UDT_SQL, new String[]{schemaName}, resultSet -> {
             while (resultSet.next()) {
-                String typeName = qualifiedTableName(schemaName, resultSet.getString("type_name"), false);
+                String typeName = qualifiedTableName(schemaName, resultSet.getString("type_name"));
                 typeBuilder.append(SQL_DROP_TYPE_EXISTS).append(typeName).append(";\n");
                 typeBuilder.append(resultSet.getString("create_type_statement")).append("\n");
                 context.write(typeBuilder.toString());
@@ -123,7 +123,7 @@ public void exportTable(Connection connection, String databaseName, String schem
                 new TableMetadataRequest(databaseName, schemaName, tableName));
         StringBuilder sqlBuilder = new StringBuilder();
         sqlBuilder.append("\n").append(SQL_DROP_TABLE_EXISTS)
-                .append(qualifiedTableName(schemaName, tableName, false)).append(";").append("\n")
+                .append(qualifiedTableName(schemaName, tableName)).append(";").append("\n")
                 .append(tableDDL).append("\n");
         context.write(sqlBuilder.toString());
         if (containData) {
@@ -140,7 +140,7 @@ private void exportViews(Connection connection, String schemaName, TaskExecution
                 StringBuilder sqlBuilder = new StringBuilder();
                 String viewName = resultSet.getString("table_name");
                 String viewDefinition = resultSet.getString("view_definition");
-                String quotedObjectName = qualifiedTableName(schemaName, viewName, false);
+                String quotedObjectName = qualifiedTableName(schemaName, viewName);
                 sqlBuilder.append(SQL_DROP_VIEW_EXISTS).append(quotedObjectName).append(";\n");
                 sqlBuilder.append(SQL_CREATE_REPLACE_VIEW).append(quotedObjectName).append(" AS ").append(viewDefinition).append("\n");
                 context.write(sqlBuilder.toString());
@@ -221,12 +221,12 @@ public String replaceDatabaseInJdbcUrl(String url, String newDatabase) {
 
     @Override
     public String dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
-        return "DROP TABLE " + qualifiedTableName(schemaName, tableName, false);
+        return "DROP TABLE " + qualifiedTableName(schemaName, tableName);
     }
 
     @Override
     public String truncateTable(Connection connection, String databaseName, String schemaName, String tableName) {
-        return "TRUNCATE TABLE " + qualifiedTableName(schemaName, tableName, true);
+        return "TRUNCATE TABLE " + qualifiedTableName(schemaName, tableName);
     }
 
     @Override
@@ -251,8 +251,8 @@ public void copyTable(Connection connection, String databaseName, String schemaN
 
     static String buildCopyTableSql(String schemaName, String tableName, String newTableName,
                                     boolean copyData) {
-        String source = qualifiedTableName(schemaName, tableName, true);
-        String target = qualifiedTableName(schemaName, newTableName, true);
+        String source = qualifiedTableName(schemaName, tableName);
+        String target = qualifiedTableName(schemaName, newTableName);
         return "CREATE TABLE " + target + " AS TABLE " + source
                 + (copyData ? " WITH DATA" : " WITH NO DATA");
     }
@@ -265,14 +265,12 @@ public void exportTableData(Connection connection, String databaseName, String s
 
     @Override
     public void dropView(Connection connection, String databaseName, String schemaName, String viewName) {
-        String sql = "DROP VIEW " + qualifiedTableName(schemaName, viewName, false);
+        String sql = "DROP VIEW " + qualifiedTableName(schemaName, viewName);
         DefaultSQLExecutor.getInstance().execute(connection, sql, resultSet -> null);
     }
 
-    private static String qualifiedTableName(String schemaName, String tableName,
-                                             boolean normalizeQuotedTable) {
-        String normalizedTable = normalizeQuotedTable ? normalizeQuotedIdentifier(tableName) : tableName;
-        String quotedTable = PostgreSQLIdentifierProcessor.INSTANCE.quoteIdentifierAlways(normalizedTable);
+    private static String qualifiedTableName(String schemaName, String tableName) {
+        String quotedTable = PostgreSQLIdentifierProcessor.INSTANCE.quoteIdentifierAlways(tableName);
         if (StringUtils.isBlank(schemaName)) {
             return quotedTable;
         }
@@ -280,10 +278,4 @@ private static String qualifiedTableName(String schemaName, String tableName,
                 + "." + quotedTable;
     }
 
-    private static String normalizeQuotedIdentifier(String identifier) {
-        if (PostgreSQLIdentifierProcessor.INSTANCE.isQuoteIdentifier(identifier)) {
-            return PostgreSQLIdentifierProcessor.INSTANCE.removeIdentifierQuote(identifier);
-        }
-        return identifier;
-    }
 }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-postgresql/src/test/java/ai/chat2db/plugin/postgresql/PostgreSQLDBManagerTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-postgresql/src/test/java/ai/chat2db/plugin/postgresql/PostgreSQLDBManagerTest.java
index a3c4922ace..aacca0de19 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-postgresql/src/test/java/ai/chat2db/plugin/postgresql/PostgreSQLDBManagerTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-postgresql/src/test/java/ai/chat2db/plugin/postgresql/PostgreSQLDBManagerTest.java
@@ -32,18 +32,16 @@ void buildsDropSchemaSqlWithoutCascade() {
     @Test
     void buildsSchemaQualifiedTableStatementsWithoutDoubleQuotingServiceNames() throws Exception {
         PostgreSQLDBManager manager = new PostgreSQLDBManager();
-        String source = PostgreSQLIdentifierProcessor.INSTANCE.quoteIdentifierAlways("ord\"ers");
-        String target = PostgreSQLIdentifierProcessor.INSTANCE.quoteIdentifierAlways("ord\"ers_copy");
 
         assertEquals("DROP TABLE \"analytics\".\"ord\"\"ers\"",
                 manager.dropTable(null, "ignored_database", "analytics", "ord\"ers"));
         assertEquals("TRUNCATE TABLE \"analytics\".\"ord\"\"ers\"",
-                manager.truncateTable(null, "ignored_database", "analytics", source));
+                manager.truncateTable(null, "ignored_database", "analytics", "ord\"ers"));
         assertEquals("CREATE TABLE \"analytics\".\"ord\"\"ers_copy\" AS TABLE "
                         + "\"analytics\".\"ord\"\"ers\" WITH DATA",
-                PostgreSQLDBManager.buildCopyTableSql("analytics", source, target, true));
+                PostgreSQLDBManager.buildCopyTableSql("analytics", "ord\"ers", "ord\"ers_copy", true));
         assertEquals("CREATE TABLE \"ord\"\"ers_copy\" AS TABLE \"ord\"\"ers\" WITH NO DATA",
-                PostgreSQLDBManager.buildCopyTableSql(null, source, target, false));
+                PostgreSQLDBManager.buildCopyTableSql(null, "ord\"ers", "ord\"ers_copy", false));
     }
 
     private static class TestPostgreSQLDBManager extends PostgreSQLDBManager {
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/main/java/ai/chat2db/plugin/redis/RedisScriptExecutor.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/main/java/ai/chat2db/plugin/redis/RedisScriptExecutor.java
index 9f0214b3c7..a32dd0c9a4 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/main/java/ai/chat2db/plugin/redis/RedisScriptExecutor.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/main/java/ai/chat2db/plugin/redis/RedisScriptExecutor.java
@@ -336,11 +336,16 @@ public ExecuteResponse update(RedisKey oldKey, RedisKey newKey) {
                 scripts.addAll(script);
             }
         }
-        if (newKey != null && newKey.getTtl() != null && newKey.getTtl() > 0) {
-            StringBuilder stringBuilder = new StringBuilder();
-            stringBuilder.append(RedisConstants.COMMAND_EXPIRE_KEY_PREFIX).append(getRedisValue(newKey.getName()))
-                    .append(RedisConstants.COMMAND_ARGUMENT_SEPARATOR).append(newKey.getTtl());
-            scripts.add(stringBuilder.toString());
+        if (newKey != null && newKey.getTtl() != null) {
+            Long ttl = newKey.getTtl();
+            if (ttl > 0) {
+                StringBuilder stringBuilder = new StringBuilder();
+                stringBuilder.append(RedisConstants.COMMAND_EXPIRE_KEY_PREFIX).append(getRedisValue(newKey.getName()))
+                        .append(RedisConstants.COMMAND_ARGUMENT_SEPARATOR).append(ttl);
+                scripts.add(stringBuilder.toString());
+            } else if (ttl == -1L) {
+                scripts.add(RedisConstants.COMMAND_PERSIST_KEY_PREFIX + getRedisValue(newKey.getName()));
+            }
         }
         ExecuteResponse executeResult = new ExecuteResponse();
         for (String s : scripts) {
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/main/java/ai/chat2db/plugin/redis/constant/RedisConstants.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/main/java/ai/chat2db/plugin/redis/constant/RedisConstants.java
index 2bc30ed161..903537ea64 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/main/java/ai/chat2db/plugin/redis/constant/RedisConstants.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/main/java/ai/chat2db/plugin/redis/constant/RedisConstants.java
@@ -13,6 +13,7 @@ public final class RedisConstants {
     public static final String COMMAND_EXISTS_KEY = "EXISTS %s";
     public static final String COMMAND_EXPIRE_ARGUMENT_PREFIX = " EX ";
     public static final String COMMAND_EXPIRE_KEY_PREFIX = "EXPIRE ";
+    public static final String COMMAND_PERSIST_KEY_PREFIX = "PERSIST ";
     public static final String COMMAND_GET_KEY_PREFIX = "GET ";
     public static final String COMMAND_HASH_DELETE_PREFIX = "HDEL ";
     public static final String COMMAND_HASH_GET_ALL_PREFIX = "HGETALL ";
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/test/java/ai/chat2db/plugin/redis/RedisScriptExecutorUpdateTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/test/java/ai/chat2db/plugin/redis/RedisScriptExecutorUpdateTest.java
index 344538784e..04149d0c2f 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/test/java/ai/chat2db/plugin/redis/RedisScriptExecutorUpdateTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-redis/src/test/java/ai/chat2db/plugin/redis/RedisScriptExecutorUpdateTest.java
@@ -1,24 +1,33 @@
 package ai.chat2db.plugin.redis;
 
+import ai.chat2db.community.domain.api.config.DriverConfig;
 import ai.chat2db.community.domain.api.model.result.ExecuteResponse;
 import ai.chat2db.plugin.redis.model.RedisKey;
+import ai.chat2db.spi.model.datasource.ConnectInfo;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Proxy;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
+import java.util.ArrayList;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
- * Covers update() paths that must return before touching a connection.
- * These tests run without a Chat2DBContext, so reaching command execution
- * would fail, which is exactly the regression they guard against.
+ * Covers update() command generation and paths that must return before touching a connection.
  */
 class RedisScriptExecutorUpdateTest {
 
+    @AfterEach
+    void tearDown() {
+        Chat2DBContext.close();
+    }
+
     @Test
     void updateReturnsEmptyResponseWhenBothKeysAreNull() {
         assertNotNull(RedisScriptExecutor.getInstance().update(null, null));
@@ -32,6 +41,52 @@ void typeChangeAbortsInsteadOfDeletingWhenNewTypeHasNothingToWrite() {
         assertNotNull(RedisScriptExecutor.getInstance().update(oldKey, newKey));
     }
 
+    @Test
+    void updatePersistsKeyWhenTtlChangesFromExpiringToNoExpiration() {
+        List<String> commands = captureUpdateCommands();
+
+        RedisScriptExecutor.getInstance().update(stringKey("k", 60L), stringKey("k", -1L));
+
+        assertEquals(List.of("PERSIST 'k'"), commands);
+    }
+
+    @Test
+    void updatePersistsDesiredNoExpirationStateWithoutTrustingOldTtl() {
+        List<String> commands = captureUpdateCommands();
+
+        RedisScriptExecutor.getInstance().update(stringKey("k", -1L), stringKey("k", -1L));
+
+        assertEquals(List.of("PERSIST 'k'"), commands);
+    }
+
+    @Test
+    void updatePersistsRecreatedKeyWhenDesiredTtlHasNoExpiration() {
+        List<String> commands = captureUpdateCommands();
+        RedisKey oldKey = RedisKey.builder().name("k").type("list").ttl(60L).build();
+
+        RedisScriptExecutor.getInstance().update(oldKey, stringKey("k", -1L));
+
+        assertEquals("PERSIST 'k'", commands.get(commands.size() - 1));
+    }
+
+    @Test
+    void updatePersistsRenamedKeyUsingQuotedNewName() {
+        List<String> commands = captureUpdateCommands();
+
+        RedisScriptExecutor.getInstance().update(stringKey("old key", 60L), stringKey("new key's", -1L));
+
+        assertEquals(List.of("RENAME 'old key' 'new key\\'s'\n", "PERSIST 'new key\\'s'"), commands);
+    }
+
+    @Test
+    void updateKeepsExpireCommandForPositiveTtl() {
+        List<String> commands = captureUpdateCommands();
+
+        RedisScriptExecutor.getInstance().update(stringKey("k", 60L), stringKey("k", 120L));
+
+        assertEquals(List.of("EXPIRE 'k' 120"), commands);
+    }
+
     @Test
     void executeUpdatePublishesExecutionMetrics() {
         PreparedStatement statement = (PreparedStatement) Proxy.newProxyInstance(
@@ -51,4 +106,41 @@ void executeUpdatePublishesExecutionMetrics() {
                 result.getExecutionMetrics().getExecuteDurationMs());
         assertTrue(result.getExecutionMetrics().getExecuteDurationMs() >= 0L);
     }
+
+    private RedisKey stringKey(String name, Long ttl) {
+        return RedisKey.builder()
+                .name(name)
+                .type("string")
+                .value("value")
+                .ttl(ttl)
+                .build();
+    }
+
+    private List<String> captureUpdateCommands() {
+        List<String> commands = new ArrayList<>();
+        Connection connection = (Connection) Proxy.newProxyInstance(
+                Connection.class.getClassLoader(), new Class<?>[]{Connection.class},
+                (proxy, method, args) -> {
+                    if ("prepareStatement".equals(method.getName())) {
+                        commands.add((String) args[0]);
+                        return updateStatement();
+                    }
+                    if ("isClosed".equals(method.getName())) {
+                        return false;
+                    }
+                    return null;
+                });
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setDbType("REDIS");
+        connectInfo.setDriverConfig(new DriverConfig());
+        connectInfo.setConnection(connection);
+        Chat2DBContext.putContext(connectInfo);
+        return commands;
+    }
+
+    private PreparedStatement updateStatement() {
+        return (PreparedStatement) Proxy.newProxyInstance(
+                PreparedStatement.class.getClassLoader(), new Class<?>[]{PreparedStatement.class},
+                (proxy, method, args) -> "executeUpdate".equals(method.getName()) ? 1 : null);
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/SqlServerDBManager.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/SqlServerDBManager.java
index 07cf0a7d3d..136e2587a4 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/SqlServerDBManager.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/SqlServerDBManager.java
@@ -203,8 +203,6 @@ public void connectDatabase(Connection connection, String database) {
 
     @Override
     public void copyTable(Connection connection, String databaseName, String schemaName, String tableName, String newTableName, boolean copyData) throws SQLException {
-        tableName = unquoteIdentifier(tableName);
-        newTableName = unquoteIdentifier(newTableName);
         String ddl = Chat2DBContext.getDbMetaData().tableDDL(connection,
                 new TableMetadataRequest(databaseName, schemaName, tableName));
         List<String> batches = prepareCopyDdlBatches(ddl, databaseName, schemaName, tableName, newTableName);
@@ -582,18 +580,7 @@ private static String quoteIdentifier(String identifier) {
         if (StringUtils.isBlank(identifier)) {
             return identifier;
         }
-        return SqlServerIdentifierProcessor.INSTANCE.quoteIdentifierAlways(unquoteIdentifier(identifier));
-    }
-
-    static String unquoteIdentifier(String identifier) {
-        if (StringUtils.isBlank(identifier)) {
-            return identifier;
-        }
-        String value = identifier;
-        if (value.length() >= 2 && value.startsWith("[") && value.endsWith("]")) {
-            value = value.substring(1, value.length() - 1).replace("]]", "]");
-        }
-        return value;
+        return SqlServerIdentifierProcessor.INSTANCE.quoteIdentifierAlways(identifier);
     }
 
     private static final class DdlLexicalState {
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/SqlServerMetaData.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/SqlServerMetaData.java
index 5c59a14116..0d33d99dee 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/SqlServerMetaData.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/SqlServerMetaData.java
@@ -725,11 +725,11 @@ private TableIndexColumn getTableIndexColumn(ResultSet resultSet) throws SQLExce
         TableIndexColumn tableIndexColumn = new TableIndexColumn();
         tableIndexColumn.setColumnName(resultSet.getString("COLUMN_NAME"));
         tableIndexColumn.setOrdinalPosition(resultSet.getShort("COLUMN_POSITION"));
-        int collation = resultSet.getInt("DESCEND");
-        if (collation == 1) {
-            tableIndexColumn.setAscOrDesc("ASC");
-        } else {
+        int isDescending = resultSet.getInt("DESCEND");
+        if (isDescending == 1) {
             tableIndexColumn.setAscOrDesc("DESC");
+        } else {
+            tableIndexColumn.setAscOrDesc("ASC");
         }
         return tableIndexColumn;
     }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/builder/SqlServerSqlBuilder.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/builder/SqlServerSqlBuilder.java
index 5260d1ca30..d8e80b3a01 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/builder/SqlServerSqlBuilder.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/builder/SqlServerSqlBuilder.java
@@ -7,6 +7,7 @@
 import ai.chat2db.plugin.sqlserver.enums.type.SqlServerIndexTypeEnum;
 import ai.chat2db.plugin.sqlserver.SqlServerSqlGuards;
 import ai.chat2db.plugin.sqlserver.identifier.SqlServerIdentifierProcessor;
+import ai.chat2db.plugin.sqlserver.parser.base.TSqlLexer;
 import ai.chat2db.spi.DefaultSqlBuilder;
 import ai.chat2db.spi.model.request.PageLimitRequest;
 import ai.chat2db.spi.model.request.UpdateSqlRequest;
@@ -25,10 +26,11 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.Token;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 import java.util.stream.Collectors;
 
 import static ai.chat2db.plugin.sqlserver.constant.SqlServerSqlBuilderConstants.*;
@@ -285,7 +287,7 @@ public String buildPageLimit(PageLimitRequest request) {
             if (versions.length > 0 && Integer.parseInt(versions[0]) >= 11) {
                 StringBuilder sqlBuilder = new StringBuilder(sql.length() + 14);
                 sqlBuilder.append(sql);
-                if (!sql.toLowerCase(Locale.ROOT).contains(ORDER_BY_KEYWORD_LOWER)) {
+                if (!hasTopLevelOrderBy(sql)) {
                     sqlBuilder.append(SQL_ORDER_BY_OPEN_PAREN_SELECT_NULL_CLOSE_PAREN);
                 }
                 sqlBuilder.append(SQLConstants.LINE_SEPARATOR_OFFSET_SQL);
@@ -310,6 +312,37 @@ public String buildPageLimit(PageLimitRequest request) {
         return sqlBuilder.toString();
     }
 
+    private static boolean hasTopLevelOrderBy(String sql) {
+        TSqlLexer lexer = new TSqlLexer(CharStreams.fromString(sql));
+        int parenthesisDepth = 0;
+        boolean previousTokenWasOrder = false;
+        Token token;
+        while ((token = lexer.nextToken()).getType() != Token.EOF) {
+            if (token.getChannel() != Token.DEFAULT_CHANNEL) {
+                continue;
+            }
+            int tokenType = token.getType();
+            if (tokenType == TSqlLexer.LR_BRACKET) {
+                parenthesisDepth++;
+                previousTokenWasOrder = false;
+                continue;
+            }
+            if (tokenType == TSqlLexer.RR_BRACKET) {
+                parenthesisDepth = Math.max(0, parenthesisDepth - 1);
+                previousTokenWasOrder = false;
+                continue;
+            }
+            if (parenthesisDepth != 0) {
+                continue;
+            }
+            if (previousTokenWasOrder && tokenType == TSqlLexer.BY) {
+                return true;
+            }
+            previousTokenWasOrder = tokenType == TSqlLexer.ORDER;
+        }
+        return false;
+    }
+
 
     @Override
     public String buildCreateDatabase(Database database) {
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/constant/SqlServerSqlBuilderConstants.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/constant/SqlServerSqlBuilderConstants.java
index 1134d829c8..d8ea5b54fa 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/constant/SqlServerSqlBuilderConstants.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/main/java/ai/chat2db/plugin/sqlserver/constant/SqlServerSqlBuilderConstants.java
@@ -33,7 +33,6 @@ public final class SqlServerSqlBuilderConstants {
     public static final String VALUE_CLOSE_PAREN_GO = "\n)\ngo\n";
     public static final String VALUE_GO = "\ngo\n";
     public static final String VALUE_BACKSLASH_DOT = "\\.";
-    public static final String ORDER_BY_KEYWORD_LOWER = "order by";
     public static final String SQL_ORDER_BY_OPEN_PAREN_SELECT_NULL_CLOSE_PAREN = "\n ORDER BY (SELECT NULL)";
     public static final String SQL_COLLATE = " COLLATE ";
     public static final String SQL_EXEC_OPEN_BRACKET = "exec [";
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/SqlServerDBManagerTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/SqlServerDBManagerTest.java
index 21f4e963a1..69c28f0c56 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/SqlServerDBManagerTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/SqlServerDBManagerTest.java
@@ -203,12 +203,18 @@ void shouldExcludeGeneratedColumnsButKeepIdentityAndDefaultBackedColumns() {
     void shouldEscapeEveryQualifiedIdentifierPart() {
         assertEquals("[catalog]]archive].[sales].[orders]]2026]",
                 SqlServerDBManager.buildFullTableName("catalog]archive", "sales", "orders]2026"));
-        assertEquals("[catalog].[sales].[orders]",
+        assertEquals("[[catalog]]].[[sales]]].[[orders]]]",
                 SqlServerDBManager.buildFullTableName("[catalog]", "[sales]", "[orders]"));
     }
 
     @Test
-    void shouldNormalizeMetadataFormattedNamesAtCopyBoundary() throws Exception {
+    void truncatePreservesLiteralBracketsInTheRawName() {
+        assertEquals("TRUNCATE TABLE [catalog].[sales].[[orders]]]",
+                new SqlServerDBManager().truncateTable(null, "catalog", "sales", "[orders]"));
+    }
+
+    @Test
+    void shouldUseRawNamesAtCopyBoundary() throws Exception {
         AtomicReference<TableMetadataRequest> ddlRequest = new AtomicReference<>();
         AtomicReference<List<String>> queryParameters = new AtomicReference<>();
         List<String> preparedSql = new ArrayList<>();
@@ -239,7 +245,7 @@ public SqlServerMetaData getDbMetaData() {
         try {
             new SqlServerDBManager().copyTable(
                     recordingConnection(preparedSql, queryParameters),
-                    "catalog", "sales", "[orders]", "[orders_copy]", true);
+                    "catalog", "sales", "orders", "orders_copy", true);
 
             assertEquals("orders", ddlRequest.get().getTableName());
             assertEquals("CREATE TABLE [sales].[orders_copy]\n([id] int)", preparedSql.get(0));
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/SqlServerMetaDataTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/SqlServerMetaDataTest.java
index 9be4aebb97..6e11c3804f 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/SqlServerMetaDataTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/SqlServerMetaDataTest.java
@@ -1,8 +1,15 @@
 package ai.chat2db.plugin.sqlserver;
 
+import ai.chat2db.community.domain.api.model.metadata.TableIndex;
+import ai.chat2db.community.domain.api.model.metadata.TableIndexColumn;
+import ai.chat2db.plugin.sqlserver.enums.type.SqlServerIndexTypeEnum;
 import org.junit.jupiter.api.Test;
 
+import java.lang.reflect.Proxy;
 import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -50,4 +57,69 @@ void shouldQuoteEveryForeignKeyIdentifierPart() {
                         "FK orders]owner", List.of("order id", "line]id"),
                         "sales archive", "order]history", List.of("id"), 0, 2));
     }
+
+    @Test
+    void shouldPreserveIndexColumnSortDirectionFromSqlServerMetadata() {
+        List<TableIndex> indexes = new SqlServerMetaData().indexes(
+                indexMetadataConnection(), "catalog", "dbo", "orders");
+
+        assertEquals(1, indexes.size());
+        TableIndex index = indexes.get(0);
+        assertEquals(List.of("DESC", "ASC"), index.getColumnList().stream()
+                .map(TableIndexColumn::getAscOrDesc)
+                .toList());
+
+        String script = SqlServerIndexTypeEnum.NONCLUSTERED.buildIndexScript(index);
+        assertTrue(script.contains("([created_at] DESC,[id] ASC)"), script);
+    }
+
+    private static Connection indexMetadataConnection() {
+        ResultSet resultSet = indexMetadataResultSet();
+        PreparedStatement statement = (PreparedStatement) Proxy.newProxyInstance(
+                SqlServerMetaDataTest.class.getClassLoader(),
+                new Class<?>[]{PreparedStatement.class},
+                (proxy, method, args) -> switch (method.getName()) {
+                    case "execute" -> true;
+                    case "getResultSet" -> resultSet;
+                    default -> defaultValue(method.getReturnType());
+                });
+        return (Connection) Proxy.newProxyInstance(
+                SqlServerMetaDataTest.class.getClassLoader(),
+                new Class<?>[]{Connection.class},
+                (proxy, method, args) -> "prepareStatement".equals(method.getName())
+                        ? statement : defaultValue(method.getReturnType()));
+    }
+
+    private static ResultSet indexMetadataResultSet() {
+        int[] row = {-1};
+        return (ResultSet) Proxy.newProxyInstance(
+                SqlServerMetaDataTest.class.getClassLoader(),
+                new Class<?>[]{ResultSet.class},
+                (proxy, method, args) -> switch (method.getName()) {
+                    case "next" -> ++row[0] < 2;
+                    case "getString" -> switch ((String) args[0]) {
+                        case "INDEX_NAME" -> "IX_orders_sort";
+                        case "COLUMN_NAME" -> row[0] == 0 ? "created_at" : "id";
+                        case "INDEX_TYPE" -> "NONCLUSTERED";
+                        default -> null;
+                    };
+                    case "getInt" -> "DESCEND".equals(args[0]) && row[0] == 0 ? 1 : 0;
+                    case "getShort" -> (short) (row[0] + 1);
+                    case "getBoolean" -> false;
+                    default -> defaultValue(method.getReturnType());
+                });
+    }
+
+    private static Object defaultValue(Class<?> type) {
+        if (!type.isPrimitive() || type == void.class) {
+            return null;
+        }
+        if (type == boolean.class) {
+            return false;
+        }
+        if (type == char.class) {
+            return '\0';
+        }
+        return 0;
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/builder/SqlServerSqlBuilderTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/builder/SqlServerSqlBuilderTest.java
index ddfefc3890..a121ad5913 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/builder/SqlServerSqlBuilderTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-sqlserver/src/test/java/ai/chat2db/plugin/sqlserver/builder/SqlServerSqlBuilderTest.java
@@ -9,6 +9,7 @@
 import ai.chat2db.spi.IPlugin;
 import ai.chat2db.spi.constant.SQLConstants;
 import ai.chat2db.spi.model.datasource.ConnectInfo;
+import ai.chat2db.spi.model.request.PageLimitRequest;
 import ai.chat2db.spi.sql.Chat2DBContext;
 import org.junit.jupiter.api.Test;
 
@@ -50,6 +51,37 @@ void shouldIncludeSchemaWhenDatabaseNameIsBlank() {
         assertEquals("[analytics].[dbo].[orders]", builder.tableName("analytics", "dbo", "orders"));
     }
 
+    @Test
+    void shouldAddOuterOrderByWhenOnlyWindowFunctionIsOrdered() {
+        String sql = "SELECT ROW_NUMBER() OVER (ORDER BY id) AS row_no, id FROM users";
+
+        assertEquals(sql + "\n ORDER BY (SELECT NULL)\n OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY",
+                buildPageLimit(sql));
+    }
+
+    @Test
+    void shouldAddOuterOrderByWhenOnlyNestedQueryIsOrdered() {
+        String sql = "SELECT id FROM (SELECT TOP 10 id FROM users ORDER BY id) recent_users";
+
+        assertEquals(sql + "\n ORDER BY (SELECT NULL)\n OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY",
+                buildPageLimit(sql));
+    }
+
+    @Test
+    void shouldIgnoreOrderByInStringAndCommentWhenPaginating() {
+        String sql = "SELECT 'order by' AS label FROM users -- order by is not an outer clause";
+
+        assertEquals(sql + "\n ORDER BY (SELECT NULL)\n OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY",
+                buildPageLimit(sql));
+    }
+
+    @Test
+    void shouldKeepExistingOuterOrderByWhenPaginating() {
+        String sql = "SELECT id FROM users ORDER /* keep deterministic */\n BY id";
+
+        assertEquals(sql + "\n OFFSET 0 ROWS  FETCH NEXT 10 ROWS ONLY", buildPageLimit(sql));
+    }
+
     @Test
     void shouldQuoteAndEscapeQualifiedViewName() {
         SqlServerSqlBuilder builder = new SqlServerSqlBuilder();
@@ -124,6 +156,24 @@ private static String buildCopyWhere(String columnType, String value) {
         return buildCopyWhere(columnType, Collections.singletonList(value));
     }
 
+    private static String buildPageLimit(String sql) {
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setDbType("SQLSERVER");
+        connectInfo.setDbVersion("15.0");
+        connectInfo.setDriverConfig(new DriverConfig());
+        Chat2DBContext.putContext(connectInfo);
+        try {
+            return new SqlServerSqlBuilder().buildPageLimit(PageLimitRequest.builder()
+                    .sql(sql)
+                    .offset(0)
+                    .pageNo(1)
+                    .pageSize(10)
+                    .build());
+        } finally {
+            Chat2DBContext.removeContext();
+        }
+    }
+
     private static String buildCopyWhere(String columnType, List<String> values) {
         List<ResultOperation> operations = values.stream().map(value -> {
             ResultOperation operation = new ResultOperation();
diff --git a/chat2db-community-server/chat2db-community-plugins/chat2db-community-xugudb/src/test/java/ai/chat2db/plugin/xugudb/XugudbIdentifierProcessorTest.java b/chat2db-community-server/chat2db-community-plugins/chat2db-community-xugudb/src/test/java/ai/chat2db/plugin/xugudb/XugudbIdentifierProcessorTest.java
index 837a63a5d4..9ff0f421af 100644
--- a/chat2db-community-server/chat2db-community-plugins/chat2db-community-xugudb/src/test/java/ai/chat2db/plugin/xugudb/XugudbIdentifierProcessorTest.java
+++ b/chat2db-community-server/chat2db-community-plugins/chat2db-community-xugudb/src/test/java/ai/chat2db/plugin/xugudb/XugudbIdentifierProcessorTest.java
@@ -17,6 +17,8 @@
 import ai.chat2db.spi.model.request.SingleInsertSqlRequest;
 import ai.chat2db.spi.model.request.TruncateTableRequest;
 import ai.chat2db.spi.model.request.UpdateSqlRequest;
+import ai.chat2db.spi.model.datasource.ConnectInfo;
+import ai.chat2db.spi.sql.Chat2DBContext;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -328,15 +330,22 @@ void updateQuotesSetAndPrimaryKeyColumns() {
     }
 
     @Test
-    void metadataAndManagerRespectRawVersusPrequotedNames() throws Exception {
+    void metadataAndManagerQuoteRawNames() throws Exception {
         XUGUDBMetaData metaData = new XUGUDBMetaData();
         assertEquals("\"App\".\"MixedTable\"", metaData.getMetaDataName("ignored", "App", "MixedTable"));
 
         XUGUDBManager manager = new XUGUDBManager();
         assertEquals("DROP TABLE IF EXISTS \"ta\"\"ble\"",
                 manager.dropTable(null, null, null, "ta\"ble"));
-        assertEquals("TRUNCATE TABLE \"App\".\"MixedTable\"",
-                manager.truncateTable(null, null, null, "\"App\".\"MixedTable\""));
+        ConnectInfo context = new ConnectInfo();
+        context.setDbType("XUGUDB");
+        Chat2DBContext.putContext(context);
+        try {
+            assertEquals("TRUNCATE TABLE \"ta\"\"ble\"",
+                    manager.truncateTable(null, null, null, "ta\"ble"));
+        } finally {
+            Chat2DBContext.removeContext();
+        }
     }
 
     @Test
diff --git a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/DefaultDBManager.java b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/DefaultDBManager.java
index 87ff471980..ef1809ff95 100644
--- a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/DefaultDBManager.java
+++ b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/DefaultDBManager.java
@@ -300,11 +300,14 @@ public void exportTable(Connection connection, String databaseName, String schem
 
     @Override
     public String truncateTable(Connection connection, String databaseName, String schemaName, String tableName) throws SQLException {
-        return String.format(SQL_TRUNCATE_TABLE, tableName);
+        return String.format(SQL_TRUNCATE_TABLE, Chat2DBContext.getDbMetaData().getMetaDataName(tableName));
     }
 
     @Override
     public void copyTable(Connection connection, String databaseName, String schemaName, String tableName, String newTableName, boolean copyData) throws SQLException {
+        IDbMetaData metaData = Chat2DBContext.getDbMetaData();
+        tableName = metaData.getMetaDataName(tableName);
+        newTableName = metaData.getMetaDataName(newTableName);
         String sql;
         if (copyData) {
             sql = String.format(SQL_COPY_TABLE_DATA, newTableName, tableName);
diff --git a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/DefaultSQLExecutor.java b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/DefaultSQLExecutor.java
index 346659bd59..54ab64f821 100644
--- a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/DefaultSQLExecutor.java
+++ b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/DefaultSQLExecutor.java
@@ -1316,6 +1316,31 @@ private ExecuteResponse streamQueryExecuteResponse(Statement stmt, boolean limit
         return executeResult;
     }
 
+    /**
+     * Publishes an already-materialized query result on the streaming path.
+     * Sends an empty {@code dataList} with {@code resultStarted}, then the real
+     * rows via {@code rows}, matching {@link #streamQueryExecuteResponse}.
+     * The caller ({@link #executeStreaming}) remains responsible for a single
+     * {@code resultFinished}.
+     */
+    protected void publishMaterializedQueryResult(ExecuteResponse response,
+                                                  ISqlExecutionResultConsumer consumer,
+                                                  AtomicInteger streamResultSequence,
+                                                  int statementSequence,
+                                                  int pageNo,
+                                                  int pageSize) {
+        response.setStatementSequence(statementSequence);
+        setStreamResultId(response, streamResultSequence.incrementAndGet());
+        addRowNumber(response, pageNo, pageSize);
+        List<List<ResultCell>> numberedRows = response.getDataList() == null
+                ? new ArrayList<>()
+                : new ArrayList<>(response.getDataList());
+        response.setDataList(new ArrayList<>());
+        consumer.resultStarted(response);
+        consumer.rows(response, numberedRows);
+        response.setDataList(numberedRows);
+    }
+
     private void setStreamResultId(ExecuteResponse executeResult, int streamResultId) {
         Map<String, Object> extra = executeResult.getExtra();
         if (extra == null) {
diff --git a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IActiveTransactionManager.java b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IActiveTransactionManager.java
new file mode 100644
index 0000000000..af2b26e1cd
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IActiveTransactionManager.java
@@ -0,0 +1,14 @@
+package ai.chat2db.spi;
+
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction;
+
+import java.sql.Connection;
+import java.util.List;
+
+/**
+ * Provides dialect-specific active transaction inspection.
+ */
+public interface IActiveTransactionManager {
+
+    List<ActiveTransaction> activeTransactions(Connection connection);
+}
diff --git a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IDbManager.java b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IDbManager.java
index d447b48d28..7f5502f664 100644
--- a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IDbManager.java
+++ b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IDbManager.java
@@ -55,9 +55,13 @@ void exportDatabase(Connection connection, String databaseName, String schemaNam
     void exportTable(Connection connection, String databaseName, String schemaName, String tableName,
             boolean containData, TaskExecutionContext context) throws SQLException;
 
+    /** Builds truncate SQL from raw object names, quoting them inside the implementation. */
     String truncateTable(Connection connection, String databaseName, String schemaName, String tableName)
             throws SQLException;
 
+    /**
+     * Copies a table using raw object names; implementations quote identifiers when building SQL.
+     */
     void copyTable(Connection connection, String databaseName, String schemaName, String tableName, String newTableName,
             boolean copyData) throws SQLException;
 
diff --git a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IPlugin.java b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IPlugin.java
index 934e6cae65..9b7090fc68 100644
--- a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IPlugin.java
+++ b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/IPlugin.java
@@ -108,6 +108,15 @@ default IRoutineManager getRoutineManager() {
         return null;
     }
 
+    /**
+     * Returns the optional active transaction manager for this plugin.
+     *
+     * @return active transaction manager when supported; otherwise {@code null}.
+     */
+    default IActiveTransactionManager getActiveTransactionManager() {
+        return null;
+    }
+
     /**
      * Returns all database configurations supported by this plugin instance.
      *
diff --git a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/model/datasource/ConnectInfo.java b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/model/datasource/ConnectInfo.java
index 871ba3476d..e497855abe 100644
--- a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/model/datasource/ConnectInfo.java
+++ b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/model/datasource/ConnectInfo.java
@@ -420,31 +420,102 @@ public void setSchemaName(String schemaName) {
 
     public ConnectInfo copy() {
         ConnectInfo copy = createCopy();
-        copy.setDbVersion(this.getDbVersion());
-        copy.setDbType(this.getDbType());
-        copy.setHost(this.getHost());
-        copy.setPort(this.getPort());
+        copy.setLoginUser(this.getLoginUser());
+        copy.setAlias(this.getAlias());
+        copy.setDataSourceId(this.getDataSourceId());
         copy.setDatabaseName(this.getDatabaseName());
         copy.setSchemaName(this.getSchemaName());
+        copy.setConsoleId(this.getConsoleId());
+        copy.setUrl(this.getUrl());
         copy.setUser(this.getUser());
         copy.setPassword(this.getPassword());
-        copy.setUrl(this.getUrl());
-        copy.setAlias(this.getAlias());
-        copy.setDataSourceId(this.getDataSourceId());
-        copy.setConsoleId(this.getConsoleId());
         copy.setConsoleOwn(this.getConsoleOwn());
+        copy.setDbType(this.getDbType());
+        copy.setPort(this.getPort());
+        copy.setUrlWithOutDatabase(this.getUrlWithOutDatabase());
+        copy.setHost(this.getHost());
+        copy.setSsh(copySsh(this.getSsh()));
+        copy.setSsl(copySsl(this.getSsl()));
+        copy.setSid(this.getSid());
         copy.setDriver(this.getDriver());
-        copy.setSsh(this.getSsh());
-        copy.setSsl(this.getSsl());
         copy.setJdbc(this.getJdbc());
-        copy.setExtendInfo(this.getExtendInfo());
-        copy.setDriverConfig(this.getDriverConfig());
-        copy.setSid(this.getSid());
-        copy.setUrlWithOutDatabase(this.getUrlWithOutDatabase());
+        copy.setExtendInfo(copyKeyValues(this.getExtendInfo()));
+        copy.setServiceName(this.getServiceName());
+        copy.setKeyfile(this.getKeyfile());
+        copy.setEmail(this.getEmail());
+        copy.setProject(this.getProject());
+        copy.setDbVersion(this.getDbVersion());
+        copy.setDriverConfig(copyDriverConfig(this.getDriverConfig()));
         copy.setLastAccessTime(new Date());
         return copy;
     }
 
+    private static SSHInfo copySsh(SSHInfo source) {
+        if (source == null) {
+            return null;
+        }
+        SSHInfo copy = new SSHInfo();
+        copy.setUse(source.isUse());
+        copy.setHostName(source.getHostName());
+        copy.setPort(source.getPort());
+        copy.setUserName(source.getUserName());
+        copy.setLocalPort(source.getLocalPort());
+        copy.setAuthenticationType(source.getAuthenticationType());
+        copy.setPassword(source.getPassword());
+        copy.setKeyFile(source.getKeyFile());
+        copy.setPassphrase(source.getPassphrase());
+        copy.setRHost(source.getRHost());
+        copy.setRPort(source.getRPort());
+        return copy;
+    }
+
+    private static SSLInfo copySsl(SSLInfo source) {
+        return source == null ? null : new SSLInfo();
+    }
+
+    private static DriverConfig copyDriverConfig(DriverConfig source) {
+        if (source == null) {
+            return null;
+        }
+        DriverConfig copy = new DriverConfig();
+        copy.setUrl(source.getUrl());
+        copy.setJdbcDriver(source.getJdbcDriver());
+        copy.setJdbcDriverClass(source.getJdbcDriverClass());
+        copy.setDownloadJdbcDriverUrls(copyStrings(source.getDownloadJdbcDriverUrls()));
+        copy.setDbType(source.getDbType());
+        copy.setCustom(source.isCustom());
+        copy.setExtendInfo(copyKeyValues(source.getExtendInfo()));
+        copy.setDefaultDriver(source.isDefaultDriver());
+        return copy;
+    }
+
+    private static List<String> copyStrings(List<String> source) {
+        return source == null ? null : new ArrayList<>(source);
+    }
+
+    private static List<KeyValue> copyKeyValues(List<KeyValue> source) {
+        if (source == null) {
+            return null;
+        }
+        List<KeyValue> copy = new ArrayList<>(source.size());
+        for (KeyValue item : source) {
+            copy.add(copyKeyValue(item));
+        }
+        return copy;
+    }
+
+    private static KeyValue copyKeyValue(KeyValue source) {
+        if (source == null) {
+            return null;
+        }
+        KeyValue copy = new KeyValue();
+        copy.setKey(source.getKey());
+        copy.setValue(source.getValue());
+        copy.setRequired(source.isRequired());
+        copy.setChoices(copyStrings(source.getChoices()));
+        return copy;
+    }
+
     protected ConnectInfo createCopy() {
         return new ConnectInfo();
     }
diff --git a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/model/value/JDBCDataValue.java b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/model/value/JDBCDataValue.java
index a430ff97ed..cb30251a5c 100644
--- a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/model/value/JDBCDataValue.java
+++ b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/model/value/JDBCDataValue.java
@@ -34,6 +34,8 @@
 @AllArgsConstructor
 public class JDBCDataValue {
     private static final Logger log = LoggerFactory.getLogger(JDBCDataValue.class);
+    private static final int LARGE_VALUE_THRESHOLD_BYTES = 10 * 1024;
+    private static final int LARGE_VALUE_PREVIEW_CHARS = 200;
     private static final Pattern SUMMARY_SIZE_PATTERN = Pattern.compile("(\\d+(?:\\.\\d+)?)\\s*(B|KB|MB|GB)\\s*$",
             Pattern.CASE_INSENSITIVE);
     private ResultSet resultSet;
@@ -267,10 +269,11 @@ public ResultCell buildResultCell(String value) {
         int sqlType = getSqlType();
         long displayBytes = value == null ? 0L : value.getBytes(StandardCharsets.UTF_8).length;
         long displayChars = value == null ? 0L : value.length();
-        LargeValueInfo largeValueInfo = detectLargeValue(value, columnType, sqlType);
-        Object rawValue = getRawCellValue(largeValueInfo);
+        LargeValueInfo largeValueInfo = detectLargeValue(value, columnType, sqlType, displayBytes);
+        String displayValue = previewValue(value, largeValueInfo);
+        Object rawValue = getRawCellValue(value, largeValueInfo);
         return ResultCell.builder()
-                .value(value)
+                .value(displayValue)
                 .rawValue(rawValue)
                 .largeValue(largeValueInfo.largeValue)
                 .valueType(largeValueInfo.valueType.code())
@@ -278,8 +281,9 @@ public ResultCell buildResultCell(String value) {
                 .columnType(columnType)
                 .sizeBytes(largeValueInfo.sizeBytes)
                 .sizeChars(largeValueInfo.sizeChars)
-                .loadedBytes(largeValueInfo.largeValue ? displayBytes : null)
-                .loadedChars(largeValueInfo.largeValue ? displayChars : null)
+                .loadedBytes(largeValueInfo.largeValue && displayValue != null
+                        ? (long) displayValue.getBytes(StandardCharsets.UTF_8).length : null)
+                .loadedChars(largeValueInfo.largeValue && displayValue != null ? (long) displayValue.length() : null)
                 .truncated(largeValueInfo.largeValue)
                 .build();
     }
@@ -319,7 +323,7 @@ public String getBinaryDataString() {
         }
     }
 
-    private LargeValueInfo detectLargeValue(String value, String columnType, int sqlType) {
+    private LargeValueInfo detectLargeValue(String value, String columnType, int sqlType, long valueBytes) {
         LargeValueInfo info = new LargeValueInfo();
         info.valueType = LargeValueTypeEnum.resolve(columnType, sqlType);
         if (!limitSize || value == null) {
@@ -328,6 +332,7 @@ private LargeValueInfo detectLargeValue(String value, String columnType, int sql
         Long summaryBytes = parseSummaryBytes(value);
         if (summaryBytes != null) {
             info.largeValue = true;
+            info.summary = true;
             info.sizeBytes = summaryBytes;
             if (info.valueType == LargeValueTypeEnum.BINARY && isImageSummary(value)) {
                 info.valueType = LargeValueTypeEnum.IMAGE;
@@ -337,9 +342,10 @@ private LargeValueInfo detectLargeValue(String value, String columnType, int sql
             }
             return info;
         }
-        if (LargeValueTypeEnum.isPotentialLargeType(columnType, sqlType) && value.length() > LobUnitEnum.M.getSize()) {
+        if (LargeValueTypeEnum.isPotentialLargeType(columnType, sqlType)
+                && valueBytes > LARGE_VALUE_THRESHOLD_BYTES) {
             info.largeValue = true;
-            info.sizeBytes = (long) value.getBytes(StandardCharsets.UTF_8).length;
+            info.sizeBytes = valueBytes;
             info.sizeChars = (long) value.length();
         }
         return info;
@@ -349,10 +355,18 @@ private boolean isImageSummary(String value) {
         return value != null && value.toUpperCase(Locale.ROOT).contains(" IMAGE");
     }
 
-    private Object getRawCellValue(LargeValueInfo largeValueInfo) {
+    private String previewValue(String value, LargeValueInfo largeValueInfo) {
+        if (value == null || !largeValueInfo.largeValue || largeValueInfo.summary
+                || value.length() <= LARGE_VALUE_PREVIEW_CHARS) {
+            return value;
+        }
+        return value.substring(0, LARGE_VALUE_PREVIEW_CHARS);
+    }
+
+    private Object getRawCellValue(String value, LargeValueInfo largeValueInfo) {
         try {
             if (largeValueInfo.valueType == LargeValueTypeEnum.JSON) {
-                return getJsonString();
+                return value;
             }
             if (!largeValueInfo.largeValue) {
                 return getObject();
@@ -422,6 +436,7 @@ private String getJsonString() {
 
     private static class LargeValueInfo {
         private boolean largeValue;
+        private boolean summary;
         private LargeValueTypeEnum valueType = LargeValueTypeEnum.UNKNOWN;
         private Long sizeBytes;
         private Long sizeChars;
diff --git a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java
index 4f0e028538..75db407f87 100644
--- a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java
+++ b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/sql/Chat2DBContext.java
@@ -1,6 +1,7 @@
 package ai.chat2db.spi.sql;
 
 import ai.chat2db.spi.IAccountManager;
+import ai.chat2db.spi.IActiveTransactionManager;
 import ai.chat2db.spi.IDbManager;
 import ai.chat2db.spi.IDbMetaData;
 import ai.chat2db.spi.IPlugin;
@@ -124,6 +125,15 @@ public static IRoutineManager getRoutineManager() {
         return plugin == null ? null : plugin.getRoutineManager();
     }
 
+    public static IActiveTransactionManager getActiveTransactionManager() {
+        ConnectInfo connectInfo = getConnectInfo();
+        if (connectInfo == null || StringUtils.isBlank(connectInfo.getDbType())) {
+            return null;
+        }
+        IPlugin plugin = PLUGIN_MAP.get(connectInfo.getDbType());
+        return plugin == null ? null : plugin.getActiveTransactionManager();
+    }
+
     public static Connection getConnection() {
         Connection connection = ConnectionPool.getConnection(getConnectInfo());
         return StatementGuardConnection.wrap(connection, STATEMENT_GUARD_THREAD_LOCAL.get());
@@ -139,6 +149,13 @@ public static StatementGuardScope bindStatementGuard(Consumer<String> statementG
         return new StatementGuardScope(previous);
     }
 
+    public static void guardStatement(String sql) {
+        Consumer<String> statementGuard = STATEMENT_GUARD_THREAD_LOCAL.get();
+        if (statementGuard != null) {
+            statementGuard.accept(sql);
+        }
+    }
+
 
     public static String getDbVersion() {
         ConnectInfo connectInfo = getConnectInfo();
diff --git a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/sql/JdbcDriverManager.java b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/sql/JdbcDriverManager.java
index 901af4580f..483f4d919e 100644
--- a/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/sql/JdbcDriverManager.java
+++ b/chat2db-community-server/chat2db-community-spi/src/main/java/ai/chat2db/spi/sql/JdbcDriverManager.java
@@ -177,6 +177,10 @@ private static List<URL> getJarUrlsFromZip(String zipFilePath, boolean clean) th
         String file = getFilePath(zipFilePath, clean);
         File unzipFile = new File(file);
         File[] files = unzipFile.listFiles();
+        if (files == null) {
+            throw new IOException("Driver zip extraction directory not found: "
+                    + unzipFile.getAbsolutePath() + ". Please re-upload the driver.");
+        }
         for (File f : files) {
             if (f.getName().endsWith(".jar")) {
                 jarUrls.add(f.toURI().toURL());
diff --git a/chat2db-community-server/chat2db-community-spi/src/test/java/ai/chat2db/community/test/spi/model/JDBCDataValueLargeCellTest.java b/chat2db-community-server/chat2db-community-spi/src/test/java/ai/chat2db/community/test/spi/model/JDBCDataValueLargeCellTest.java
index 1bdd488a01..38e155a410 100644
--- a/chat2db-community-server/chat2db-community-spi/src/test/java/ai/chat2db/community/test/spi/model/JDBCDataValueLargeCellTest.java
+++ b/chat2db-community-server/chat2db-community-spi/src/test/java/ai/chat2db/community/test/spi/model/JDBCDataValueLargeCellTest.java
@@ -65,6 +65,24 @@ void leavesSmallStringsEditableInlineValues() {
         assertEquals("small value", cell.getValue());
     }
 
+    @Test
+    void truncatesJsonValuesLargerThanTenKbForLazyLoading() {
+        String json = "{\"payload\":\"" + "x".repeat(11 * 1024) + "\"}";
+        JDBCDataValue value = new JDBCDataValue(resultSet(), metaData("jsonb", Types.OTHER), 1, true);
+
+        ResultCell cell = value.buildResultCell(json);
+
+        assertTrue(cell.isLargeValue());
+        assertTrue(cell.isTruncated());
+        assertEquals("JSON", cell.getValueType());
+        assertEquals(200, cell.getValue().length());
+        assertEquals(json, cell.getRawValue());
+        assertEquals((long) json.getBytes(java.nio.charset.StandardCharsets.UTF_8).length, cell.getSizeBytes());
+        assertEquals((long) json.length(), cell.getSizeChars());
+        assertEquals(200L, cell.getLoadedBytes());
+        assertEquals(200L, cell.getLoadedChars());
+    }
+
     @Test
     void nullClobReturnsNullInsteadOfDereferencingClob() {
         ResultSet resultSet = resultSet("getClob", null, "getString", null);
diff --git a/chat2db-community-server/chat2db-community-spi/src/test/java/ai/chat2db/spi/model/datasource/ConnectInfoTest.java b/chat2db-community-server/chat2db-community-spi/src/test/java/ai/chat2db/spi/model/datasource/ConnectInfoTest.java
index 1c3052fae0..1b955c7dc8 100644
--- a/chat2db-community-server/chat2db-community-spi/src/test/java/ai/chat2db/spi/model/datasource/ConnectInfoTest.java
+++ b/chat2db-community-server/chat2db-community-spi/src/test/java/ai/chat2db/spi/model/datasource/ConnectInfoTest.java
@@ -1,13 +1,46 @@
 package ai.chat2db.spi.model.datasource;
 
+import ai.chat2db.community.domain.api.config.DriverConfig;
+import ai.chat2db.community.domain.api.model.datasource.KeyValue;
+import ai.chat2db.community.domain.api.model.datasource.SSHInfo;
+import ai.chat2db.community.domain.api.model.datasource.SSLInfo;
+import com.jcraft.jsch.JSch;
 import org.junit.jupiter.api.Test;
 
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ConnectInfoTest {
 
+    private static final Set<String> COPIED_FIELDS = Set.of(
+            "loginUser", "alias", "dataSourceId", "databaseName", "schemaName", "consoleId", "url", "user",
+            "password", "consoleOwn", "dbType", "port", "urlWithOutDatabase", "host", "ssh", "ssl", "sid",
+            "driver", "jdbc", "extendInfo", "serviceName", "keyfile", "email", "project", "dbVersion",
+            "driverConfig"
+    );
+
+    private static final Set<String> OMITTED_METADATA_FIELDS = Set.of("gmtCreate", "gmtModified");
+
+    private static final Set<String> RESET_RUNTIME_FIELDS = Set.of(
+            "connection", "lastAccessTime", "poolGeneration", "session", "inUse"
+    );
+
     @Test
     void equalInstancesShouldHaveEqualHashCodes() {
         LocalDateTime modifiedAt = LocalDateTime.of(2026, 7, 25, 12, 0);
@@ -25,4 +58,179 @@ void equalInstancesShouldHaveEqualHashCodes() {
         assertEquals(first, second);
         assertEquals(first.hashCode(), second.hashCode());
     }
+
+    @Test
+    void copyShouldPreserveConnectionFieldsAndResetRuntimeState() throws Exception {
+        ConnectInfo source = populatedConnectInfo();
+        Connection connection = (Connection) Proxy.newProxyInstance(
+                Connection.class.getClassLoader(), new Class<?>[]{Connection.class}, (proxy, method, args) -> null);
+        source.setConnection(connection);
+        source.setSession(new JSch().getSession("ssh-user", "localhost", 22));
+        source.setLastAccessTime(new Date(1L));
+        source.updatePoolGeneration(12L);
+        assertTrue(source.trySetInUse());
+
+        long beforeCopy = System.currentTimeMillis();
+        ConnectInfo copy = source.copy();
+        long afterCopy = System.currentTimeMillis();
+
+        assertAll(
+                () -> assertEquals(source.getLoginUser(), copy.getLoginUser()),
+                () -> assertEquals(source.getAlias(), copy.getAlias()),
+                () -> assertEquals(source.getDataSourceId(), copy.getDataSourceId()),
+                () -> assertNull(copy.getGmtCreate()),
+                () -> assertNull(copy.getGmtModified()),
+                () -> assertEquals(source.getDatabaseName(), copy.getDatabaseName()),
+                () -> assertEquals(source.getSchemaName(), copy.getSchemaName()),
+                () -> assertEquals(source.getConsoleId(), copy.getConsoleId()),
+                () -> assertEquals(source.getUrl(), copy.getUrl()),
+                () -> assertEquals(source.getUser(), copy.getUser()),
+                () -> assertEquals(source.getPassword(), copy.getPassword()),
+                () -> assertEquals(source.getConsoleOwn(), copy.getConsoleOwn()),
+                () -> assertEquals(source.getDbType(), copy.getDbType()),
+                () -> assertEquals(source.getPort(), copy.getPort()),
+                () -> assertEquals(source.getUrlWithOutDatabase(), copy.getUrlWithOutDatabase()),
+                () -> assertEquals(source.getHost(), copy.getHost()),
+                () -> assertEquals(source.getSsh(), copy.getSsh()),
+                () -> assertEquals(source.getSid(), copy.getSid()),
+                () -> assertEquals(source.getDriver(), copy.getDriver()),
+                () -> assertEquals(source.getJdbc(), copy.getJdbc()),
+                () -> assertEquals(source.getExtendInfo(), copy.getExtendInfo()),
+                () -> assertEquals(source.getServiceName(), copy.getServiceName()),
+                () -> assertEquals(source.getKeyfile(), copy.getKeyfile()),
+                () -> assertEquals(source.getEmail(), copy.getEmail()),
+                () -> assertEquals(source.getProject(), copy.getProject()),
+                () -> assertEquals(source.getDbVersion(), copy.getDbVersion()),
+                () -> assertEquals(source.getDriverConfig(), copy.getDriverConfig()),
+                () -> assertNull(copy.getConnection()),
+                () -> assertNull(copy.getSession()),
+                () -> assertNull(copy.poolGeneration()),
+                () -> assertFalse(copy.isInUse()),
+                () -> assertTrue(copy.getLastAccessTime().getTime() >= beforeCopy),
+                () -> assertTrue(copy.getLastAccessTime().getTime() <= afterCopy)
+        );
+    }
+
+    @Test
+    void copyShouldNotShareMutableConnectionConfiguration() {
+        ConnectInfo source = populatedConnectInfo();
+
+        ConnectInfo copy = source.copy();
+
+        assertAll(
+                () -> assertNotSame(source.getSsh(), copy.getSsh()),
+                () -> assertNotSame(source.getSsl(), copy.getSsl()),
+                () -> assertNotSame(source.getExtendInfo(), copy.getExtendInfo()),
+                () -> assertNotSame(source.getExtendInfo().get(0), copy.getExtendInfo().get(0)),
+                () -> assertNotSame(source.getExtendInfo().get(0).getChoices(), copy.getExtendInfo().get(0).getChoices()),
+                () -> assertNotSame(source.getDriverConfig(), copy.getDriverConfig()),
+                () -> assertNotSame(source.getDriverConfig().getDownloadJdbcDriverUrls(),
+                        copy.getDriverConfig().getDownloadJdbcDriverUrls()),
+                () -> assertNotSame(source.getDriverConfig().getExtendInfo(), copy.getDriverConfig().getExtendInfo()),
+                () -> assertNotSame(source.getDriverConfig().getExtendInfo().get(0),
+                        copy.getDriverConfig().getExtendInfo().get(0))
+        );
+
+        copy.getSsh().setHostName("changed-host");
+        copy.getExtendInfo().get(0).setValue("changed-value");
+        copy.getExtendInfo().get(0).getChoices().add("changed-choice");
+        copy.getDriverConfig().getDownloadJdbcDriverUrls().add("https://example.com/changed.jar");
+        copy.getDriverConfig().getExtendInfo().get(0).setValue("changed-driver-value");
+
+        assertAll(
+                () -> assertEquals("ssh.example.com", source.getSsh().getHostName()),
+                () -> assertEquals("extension-value", source.getExtendInfo().get(0).getValue()),
+                () -> assertEquals(List.of("one", "two"), source.getExtendInfo().get(0).getChoices()),
+                () -> assertEquals(List.of("https://example.com/driver.jar"),
+                        source.getDriverConfig().getDownloadJdbcDriverUrls()),
+                () -> assertEquals("driver-extension-value",
+                        source.getDriverConfig().getExtendInfo().get(0).getValue())
+        );
+    }
+
+    @Test
+    void everyInstanceFieldShouldHaveExplicitCopySemantics() {
+        Set<String> actualFields = Arrays.stream(ConnectInfo.class.getDeclaredFields())
+                .filter(field -> !Modifier.isStatic(field.getModifiers()))
+                .map(field -> field.getName())
+                .collect(Collectors.toSet());
+        Set<String> classifiedFields = new HashSet<>(COPIED_FIELDS);
+        classifiedFields.addAll(OMITTED_METADATA_FIELDS);
+        classifiedFields.addAll(RESET_RUNTIME_FIELDS);
+
+        assertEquals(classifiedFields, actualFields);
+    }
+
+    private ConnectInfo populatedConnectInfo() {
+        ConnectInfo connectInfo = new ConnectInfo();
+        connectInfo.setLoginUser("login-user");
+        connectInfo.setAlias("primary");
+        connectInfo.setDataSourceId(42L);
+        connectInfo.setGmtCreate(LocalDateTime.of(2026, 8, 28, 9, 0));
+        connectInfo.setGmtModified(LocalDateTime.of(2026, 8, 29, 10, 0));
+        connectInfo.setDatabaseName("inventory");
+        connectInfo.setSchemaName("public");
+        connectInfo.setConsoleId(7L);
+        connectInfo.setUrl("jdbc:test://db.example.com/inventory");
+        connectInfo.setUser("database-user");
+        connectInfo.setPassword("database-password");
+        connectInfo.setConsoleOwn(Boolean.TRUE);
+        connectInfo.setDbType("TEST");
+        connectInfo.setPort(15432);
+        connectInfo.setUrlWithOutDatabase("jdbc:test://db.example.com");
+        connectInfo.setHost("db.example.com");
+        connectInfo.setSsh(sshInfo());
+        connectInfo.setSsl(new SSLInfo());
+        connectInfo.setSid("database-sid");
+        connectInfo.setDriver("test-driver");
+        connectInfo.setJdbc("test-jdbc");
+        connectInfo.setExtendInfo(new ArrayList<>(List.of(
+                keyValue("extension", "extension-value", true, List.of("one", "two")))));
+        connectInfo.setServiceName("database-service");
+        connectInfo.setKeyfile("C:/keys/service-account.json");
+        connectInfo.setEmail("service-account@example.com");
+        connectInfo.setProject("cloud-project");
+        connectInfo.setDbVersion("1.0");
+        connectInfo.setDriverConfig(driverConfig());
+        return connectInfo;
+    }
+
+    private SSHInfo sshInfo() {
+        SSHInfo ssh = new SSHInfo();
+        ssh.setUse(true);
+        ssh.setHostName("ssh.example.com");
+        ssh.setPort("22");
+        ssh.setUserName("ssh-user");
+        ssh.setLocalPort("15432");
+        ssh.setAuthenticationType("PASSWORD");
+        ssh.setPassword("ssh-password");
+        ssh.setKeyFile("C:/keys/ssh.pem");
+        ssh.setPassphrase("ssh-passphrase");
+        ssh.setRHost("db.internal");
+        ssh.setRPort("5432");
+        return ssh;
+    }
+
+    private DriverConfig driverConfig() {
+        DriverConfig config = new DriverConfig();
+        config.setUrl("jdbc:test://{host}:{port}/{database}");
+        config.setJdbcDriver("test-driver.jar");
+        config.setJdbcDriverClass("example.Driver");
+        config.setDownloadJdbcDriverUrls(new ArrayList<>(List.of("https://example.com/driver.jar")));
+        config.setDbType("TEST");
+        config.setCustom(true);
+        config.setExtendInfo(new ArrayList<>(List.of(
+                keyValue("driver-extension", "driver-extension-value", false, List.of("alpha", "beta")))));
+        config.setDefaultDriver(true);
+        return config;
+    }
+
+    private KeyValue keyValue(String key, String value, boolean required, List<String> choices) {
+        KeyValue keyValue = new KeyValue();
+        keyValue.setKey(key);
+        keyValue.setValue(value);
+        keyValue.setRequired(required);
+        keyValue.setChoices(new ArrayList<>(choices));
+        return keyValue;
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-start/src/main/java/ai/chat2db/community/start/Application.java b/chat2db-community-server/chat2db-community-start/src/main/java/ai/chat2db/community/start/Application.java
index 5c03fce171..f5eb0114d7 100644
--- a/chat2db-community-server/chat2db-community-start/src/main/java/ai/chat2db/community/start/Application.java
+++ b/chat2db-community-server/chat2db-community-start/src/main/java/ai/chat2db/community/start/Application.java
@@ -3,6 +3,7 @@
 import ai.chat2db.community.jcef.context.JcefContext;
 import ai.chat2db.community.jcef.frame.MainJFrame;
 import ai.chat2db.community.jcef.utils.CallJsFunctionUtil;
+import ai.chat2db.community.jcef.utils.SingleInstanceUtil;
 import ai.chat2db.community.tools.console.ConsoleCodec;
 import ai.chat2db.community.tools.console.ConsoleOutboundRegistry;
 import ai.chat2db.community.tools.console.bridge.JcefServerBridgeRegistry;
@@ -40,6 +41,9 @@ public class Application {
 
     public static void main(String[] args) {
         initializeCommunityRuntimeMode();
+        if (!SingleInstanceUtil.registerDesktopInstance(args)) {
+            return;
+        }
         validateCommunityEncryptionKey();
         log.info("Starting Application, args: {}", Arrays.toString(args));
         log.info("Chat2DB runtime mode: {}, networkStatus: {}, basePath: {}",
diff --git a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages.properties b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages.properties
index 8cd19647c0..1d9230fded 100644
--- a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages.properties
+++ b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages.properties
@@ -1,5 +1,6 @@
 # common
 common.businessError=Please try resubmitting or refreshing the page later
+table.copy.failed=Failed to copy table: {0}
 common.systemError=An exception occurs, you can view the exception details in the log in the help menu.
 common.needLoggedIn=Login required
 common.redirect=Redirect
@@ -163,8 +164,20 @@ mysql.account.scopeRequired=Privilege scope is required
 mysql.account.scopeUnsupported=Unsupported privilege scope
 mysql.account.tableRequired=Table name is required
 mysql.account.userRequired=User is required
+mysql.activeTransaction.processPrivilegeRequired=PROCESS privilege is required to inspect active InnoDB transactions
+activeTransaction.inspection.unsupported=The current datasource does not support active transaction inspection
 api.privateKeyNotFound=Private key information does not exist
 api.decryptPasswordError=Password decryption failed
+import.preview.emptyFile=The file contains no data rows
+import.preview.parseFailed=Failed to parse the import file: {1}
+import.preview.fileUnreadable=Cannot read the import file: {1}
+import.preview.duplicateSourceColumns=The import file contains a duplicate source column: {0}
+import.preview.invalidCsvOptions=Unsupported CSV options
+import.preview.invalidEncoding=Unsupported CSV encoding: {0}
+import.preview.invalidEncodingLine=CSV is not valid {0} near line {1}
+import.preview.malformedCsv=CSV line {0} cannot be parsed. Check that the encoding, delimiter, text qualifier, and escape settings above match the file.
+import.preview.unclosedQuote=CSV has an unclosed quote starting at line {0}
+import.csv.invalidValue=CSV row {0}, column "{1}" cannot convert value "{2}". Check the date, time, and decimal format settings.
 datasource.identityColor.invalid=Identity color must use the #RRGGBB format
 task.delete.activeForbidden=Pending or running tasks cannot be deleted
 task.delete.artifactFailed=Failed to delete exported file: {0}
diff --git a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_en_US.properties b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_en_US.properties
index 91d9c86c18..e51640ae02 100644
--- a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_en_US.properties
+++ b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_en_US.properties
@@ -1,4 +1,5 @@
 common.businessError=Please try resubmitting or refreshing the page later
+table.copy.failed=Failed to copy table: {0}
 common.systemError=An exception occurs, you can view the exception details in the log in the help menu.
 common.needLoggedIn=Login required
 common.redirect=Redirect
@@ -180,8 +181,22 @@ mysql.account.scopeRequired=Privilege scope is required
 mysql.account.scopeUnsupported=Unsupported privilege scope
 mysql.account.tableRequired=Table name is required
 mysql.account.userRequired=User is required
+mysql.activeTransaction.processPrivilegeRequired=PROCESS privilege is required to inspect active InnoDB transactions
+activeTransaction.inspection.unsupported=The current datasource does not support active transaction inspection
 api.privateKeyNotFound=Private key information does not exist
 api.decryptPasswordError=Password decryption failed
+
+# Import preview
+import.preview.emptyFile=The file contains no data rows
+import.preview.parseFailed=Failed to parse the import file: {1}
+import.preview.fileUnreadable=Cannot read the import file: {1}
+import.preview.duplicateSourceColumns=The import file contains a duplicate source column: {0}
+import.preview.invalidCsvOptions=Unsupported CSV options
+import.preview.invalidEncoding=Unsupported CSV encoding: {0}
+import.preview.invalidEncodingLine=CSV is not valid {0} near line {1}
+import.preview.malformedCsv=CSV line {0} cannot be parsed. Check that the encoding, delimiter, text qualifier, and escape settings above match the file.
+import.preview.unclosedQuote=CSV has an unclosed quote starting at line {0}
+import.csv.invalidValue=CSV row {0}, column "{1}" cannot convert value "{2}". Check the date, time, and decimal format settings.
 datasource.identityColor.invalid=Identity color must use the #RRGGBB format
 task.delete.activeForbidden=Pending or running tasks cannot be deleted
 task.delete.artifactFailed=Failed to delete exported file: {0}
diff --git a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_es_ES.properties b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_es_ES.properties
index d5f5368031..b19e27c83c 100644
--- a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_es_ES.properties
+++ b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_es_ES.properties
@@ -1,4 +1,5 @@
 common.businessError=Vuelva a enviar la solicitud o actualice la página más tarde
+table.copy.failed=No se pudo copiar la tabla: {0}
 common.systemError=Se ha producido una excepción. Puede consultar los detalles en el registro del menú Ayuda.
 common.needLoggedIn=Debe iniciar sesión
 common.redirect=Redirigir
@@ -180,8 +181,22 @@ mysql.account.scopeRequired=El ámbito del privilegio es obligatorio
 mysql.account.scopeUnsupported=Ámbito del privilegio no compatible
 mysql.account.tableRequired=El nombre de la tabla es obligatorio
 mysql.account.userRequired=El usuario es obligatorio
+mysql.activeTransaction.processPrivilegeRequired=Se requiere el privilegio PROCESS para inspeccionar transacciones InnoDB activas
+activeTransaction.inspection.unsupported=La fuente de datos actual no admite la inspección de transacciones activas
 api.privateKeyNotFound=La información de la clave privada no existe
 api.decryptPasswordError=No se pudo descifrar la contraseña
+
+# Import preview
+import.preview.emptyFile=El archivo no contiene filas de datos
+import.preview.parseFailed=No se pudo analizar el archivo de importación: {1}
+import.preview.fileUnreadable=No se puede leer el archivo de importación: {1}
+import.preview.duplicateSourceColumns=El archivo de importación contiene una columna de origen duplicada: {0}
+import.preview.invalidCsvOptions=Opciones CSV no compatibles
+import.preview.invalidEncoding=Codificación CSV no compatible: {0}
+import.preview.invalidEncodingLine=El CSV no es {0} válido cerca de la línea {1}
+import.preview.malformedCsv=No se puede analizar la línea {0} del CSV. Compruebe que la codificación, el delimitador, el calificador de texto y la configuración de escape de arriba coincidan con el archivo.
+import.preview.unclosedQuote=El CSV tiene una comilla sin cerrar desde la línea {0}
+import.csv.invalidValue=No se puede convertir el valor "{2}" de la fila {0}, columna "{1}" del CSV. Revise la configuración de fecha, hora y formato decimal.
 datasource.identityColor.invalid=El color de identidad debe usar el formato #RRGGBB
 task.delete.activeForbidden=No se pueden eliminar tareas pendientes o en ejecución
 task.delete.artifactFailed=No se pudo eliminar el archivo exportado: {0}
diff --git a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_ja_JP.properties b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_ja_JP.properties
index 81c60f8289..69b462c0d7 100644
--- a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_ja_JP.properties
+++ b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_ja_JP.properties
@@ -1,4 +1,5 @@
 # Japanese translations for Chat2DB menus
+table.copy.failed=テーブルのコピーに失敗しました: {0}
 
 menu.edit=編集
 menu.edit.cut=切り取り
@@ -60,7 +61,19 @@ sqlExecution.streamingUnsupported=現在のデータソース実行器はスト
 networkProxy.unexpectedResponseCode=予期しないレスポンスコードです: {0}
 networkProxy.hostRequired=プロキシホストが必要です
 networkProxy.portRange=プロキシポートは 1 から 65535 の範囲で指定してください
+mysql.activeTransaction.processPrivilegeRequired=アクティブな InnoDB トランザクションの確認には PROCESS 権限が必要です
+activeTransaction.inspection.unsupported=現在のデータソースはアクティブトランザクションの確認に対応していません
 api.privateKeyNotFound=秘密鍵情報が存在しません
 api.decryptPasswordError=パスワードの復号に失敗しました
+import.preview.emptyFile=ファイルにデータ行がありません
+import.preview.parseFailed=インポートファイルを解析できませんでした: {1}
+import.preview.fileUnreadable=インポートファイルを読み取れません: {1}
+import.preview.duplicateSourceColumns=インポートファイルに重複したソース列があります: {0}
+import.preview.invalidCsvOptions=サポートされていない CSV オプションです
+import.preview.invalidEncoding=サポートされていない CSV エンコーディングです: {0}
+import.preview.invalidEncodingLine=CSV は {1} 行目付近で有効な {0} ではありません
+import.preview.malformedCsv=CSV の {0} 行目を解析できません。上の文字コード、区切り文字、テキスト修飾子、エスケープ設定がファイルと一致しているか確認してください。
+import.preview.unclosedQuote=CSV の {0} 行目から始まる引用符が閉じられていません
+import.csv.invalidValue=CSV の {0} 行目、列「{1}」の値「{2}」を変換できません。日付、時刻、小数形式の設定を確認してください。
 task.delete.activeForbidden=保留中または実行中のタスクは削除できません
 task.delete.artifactFailed=エクスポートファイルを削除できませんでした: {0}
diff --git a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_ko_KR.properties b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_ko_KR.properties
index 63283522dc..2199090842 100644
--- a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_ko_KR.properties
+++ b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_ko_KR.properties
@@ -1,4 +1,5 @@
 common.businessError=나중에 다시 제출하거나 페이지를 새로 고쳐 주세요
+table.copy.failed=테이블을 복사하지 못했습니다: {0}
 common.systemError=예외가 발생했습니다. 도움말 메뉴의 로그에서 예외 상세 정보를 확인할 수 있습니다.
 common.needLoggedIn=로그인이 필요합니다
 common.redirect=리디렉션
@@ -180,8 +181,22 @@ mysql.account.scopeRequired=권한 범위가 필요합니다
 mysql.account.scopeUnsupported=지원되지 않는 권한 범위입니다
 mysql.account.tableRequired=테이블 이름이 필요합니다
 mysql.account.userRequired=사용자가 필요합니다
+mysql.activeTransaction.processPrivilegeRequired=활성 InnoDB 트랜잭션을 확인하려면 PROCESS 권한이 필요합니다
+activeTransaction.inspection.unsupported=현재 데이터 소스는 활성 트랜잭션 검사를 지원하지 않습니다
 api.privateKeyNotFound=개인 키 정보가 존재하지 않습니다
 api.decryptPasswordError=비밀번호를 복호화하지 못했습니다
+
+# Import preview
+import.preview.emptyFile=파일에 데이터 행이 없습니다
+import.preview.parseFailed=가져오기 파일을 구문 분석하지 못했습니다: {1}
+import.preview.fileUnreadable=가져오기 파일을 읽을 수 없습니다: {1}
+import.preview.duplicateSourceColumns=가져오기 파일에 중복된 소스 열이 있습니다: {0}
+import.preview.invalidCsvOptions=지원되지 않는 CSV 옵션입니다
+import.preview.invalidEncoding=지원되지 않는 CSV 인코딩입니다: {0}
+import.preview.invalidEncodingLine=CSV가 {1}행 부근에서 유효한 {0} 형식이 아닙니다
+import.preview.malformedCsv=CSV {0}행을 해석할 수 없습니다. 위의 인코딩, 구분자, 텍스트 한정자 및 이스케이프 설정이 파일과 일치하는지 확인하세요.
+import.preview.unclosedQuote=CSV의 {0}행에서 시작한 따옴표가 닫히지 않았습니다
+import.csv.invalidValue=CSV {0}행, "{1}" 열의 값 "{2}"을 변환할 수 없습니다. 날짜, 시간 및 소수점 형식 설정을 확인하세요.
 datasource.identityColor.invalid=식별 색상은 #RRGGBB 형식을 사용해야 합니다
 task.delete.activeForbidden=대기 중이거나 실행 중인 작업은 삭제할 수 없습니다
 task.delete.artifactFailed=내보낸 파일을 삭제하지 못했습니다: {0}
diff --git a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_zh_CN.properties b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_zh_CN.properties
index 79a84ee782..66bdcbf914 100644
--- a/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_zh_CN.properties
+++ b/chat2db-community-server/chat2db-community-start/src/main/resources/i18n/messages_zh_CN.properties
@@ -1,4 +1,5 @@
 common.businessError=请尝试重新提交或者刷新页面
+table.copy.failed=复制表失败：{0}
 common.systemError=系统发生异常，可在帮助中点击日志查看异常详情。
 common.needLoggedIn=需要登陆页面
 common.redirect=重定向页面
@@ -175,8 +176,22 @@ mysql.account.scopeRequired=权限范围不能为空
 mysql.account.scopeUnsupported=不支持的权限范围
 mysql.account.tableRequired=表名称不能为空
 mysql.account.userRequired=用户不能为空
+mysql.activeTransaction.processPrivilegeRequired=查看活动 InnoDB 事务需要 PROCESS 权限
+activeTransaction.inspection.unsupported=当前数据源不支持活动事务检查
 api.privateKeyNotFound=私钥密钥信息不存在
 api.decryptPasswordError=解密密码错误
+
+# Import preview
+import.preview.emptyFile=文件中没有数据行
+import.preview.parseFailed=导入文件解析失败：{1}
+import.preview.fileUnreadable=无法读取导入文件：{1}
+import.preview.duplicateSourceColumns=导入文件包含重复的源字段：{0}
+import.preview.invalidCsvOptions=不支持的 CSV 选项
+import.preview.invalidEncoding=不支持的 CSV 编码：{0}
+import.preview.invalidEncodingLine=CSV 在第 {1} 行附近不是有效的 {0} 编码
+import.preview.malformedCsv=CSV 第 {0} 行无法解析，请检查上方的编码、分隔符、文本限定符和转义方式是否与文件一致。
+import.preview.unclosedQuote=CSV 存在从第 {0} 行开始未闭合的引号
+import.csv.invalidValue=CSV 第 {0} 行的列“{1}”无法转换值“{2}”，请检查日期、时间和小数格式设置。
 datasource.identityColor.invalid=身份颜色必须使用 #RRGGBB 格式
 task.delete.activeForbidden=等待中或进行中的任务不能删除
 task.delete.artifactFailed=删除导出文件失败：{0}
diff --git a/chat2db-community-server/chat2db-community-start/src/test/java/ai/chat2db/community/start/test/api/TableCopyFlowTest.java b/chat2db-community-server/chat2db-community-start/src/test/java/ai/chat2db/community/start/test/api/TableCopyFlowTest.java
new file mode 100644
index 0000000000..1c4d0d1a35
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-start/src/test/java/ai/chat2db/community/start/test/api/TableCopyFlowTest.java
@@ -0,0 +1,229 @@
+package ai.chat2db.community.start.test.api;
+
+import ai.chat2db.community.domain.api.model.request.db.DbTableCopyRequest;
+import ai.chat2db.community.domain.core.impl.db.DbTableServiceImpl;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.community.tools.console.ConsoleMessage;
+import ai.chat2db.community.tools.util.I18nUtils;
+import ai.chat2db.community.web.api.config.console.ConsoleHelper;
+import ai.chat2db.community.web.api.config.console.RequestMappingInfo;
+import ai.chat2db.community.web.api.util.ApplicationContextUtil;
+import ai.chat2db.community.web.api.util.RequestMappingUtils;
+import ai.chat2db.plugin.clickhouse.ClickHouseDBManager;
+import ai.chat2db.plugin.dm.DMDBManager;
+import ai.chat2db.plugin.mysql.MysqlDBManager;
+import ai.chat2db.plugin.mysql.MysqlMetaData;
+import ai.chat2db.plugin.oracle.OracleDBManager;
+import ai.chat2db.plugin.postgresql.PostgreSQLDBManager;
+import ai.chat2db.spi.DefaultDBManager;
+import ai.chat2db.spi.DefaultMetaService;
+import ai.chat2db.spi.IDbManager;
+import ai.chat2db.spi.IDbMetaData;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.MockedStatic;
+import org.springframework.context.support.ResourceBundleMessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.*;
+
+class TableCopyFlowTest {
+    private static final String LONG_TABLE = "inventory_material_record_source12345678901";
+    private final DbTableServiceImpl service = new DbTableServiceImpl(null);
+
+    @Test
+    void preparationOnlyReturnsANameAndNeverTouchesTheDatabase() {
+        try (MockedStatic<Chat2DBContext> context = mockStatic(Chat2DBContext.class)) {
+            String name = service.prepareCopyTable(LONG_TABLE);
+            assertEquals(32, name.length());
+            assertTrue(name.matches("inventory_materi_copy_[0-9]{10}"));
+            context.verifyNoInteractions();
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void mysqlCopiesDataAndStructureThroughTheService(boolean copyData) throws Exception {
+        try (Connection connection = DriverManager.getConnection("jdbc:h2:mem:copy_flow;MODE=MySQL")) {
+            connection.createStatement().execute("CREATE TABLE `" + LONG_TABLE + "` (id BIGINT PRIMARY KEY, rev_no VARCHAR(200))");
+            connection.createStatement().execute("INSERT INTO `" + LONG_TABLE + "` VALUES (1, 'A'), (2, NULL)");
+            try (MockedStatic<Chat2DBContext> context = context(connection, new MysqlDBManager(), new MysqlMetaData())) {
+                service.copyTable(request(LONG_TABLE, "material_copy", copyData));
+            }
+            try (ResultSet rows = connection.createStatement().executeQuery("SELECT COUNT(*) FROM `material_copy`")) {
+                assertTrue(rows.next());
+                assertEquals(copyData ? 2 : 0, rows.getInt(1));
+            }
+            if (copyData) {
+                try (ResultSet rows = connection.createStatement().executeQuery("SELECT rev_no FROM `material_copy` ORDER BY id")) {
+                    assertTrue(rows.next());
+                    assertEquals("A", rows.getString(1));
+                    assertTrue(rows.next());
+                    assertNull(rows.getString(1));
+                }
+            }
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"orders", "select", "order details", "ord`ers", "`orders`", "a`; DROP TABLE b; --"})
+    void mysqlQuotesRawNamesExactlyOnce(String name) throws Exception {
+        Connection connection = recordingConnection();
+        try (MockedStatic<Chat2DBContext> context = context(connection, new MysqlDBManager(), new MysqlMetaData())) {
+            service.copyTable(request(name, "new`table", true));
+        }
+        verify(connection).prepareStatement("CREATE TABLE `new``table` AS SELECT * FROM `"
+                + name.replace("`", "``") + "`");
+    }
+
+    @Test
+    void generatedNameKeepsTheCopySuffixForLongTableNames() throws Exception {
+        Connection connection = recordingConnection();
+        IDbManager manager = mock(IDbManager.class);
+        try (MockedStatic<Chat2DBContext> context = context(connection, manager, new MysqlMetaData())) {
+            service.copyTable(request(LONG_TABLE, null, true));
+        }
+        var target = org.mockito.ArgumentCaptor.forClass(String.class);
+        verify(manager).copyTable(eq(connection), eq("app"), isNull(), eq(LONG_TABLE), target.capture(), eq(true));
+        assertEquals(32, target.getValue().length());
+        assertTrue(target.getValue().matches("inventory_materi_copy_[0-9]{10}"), target.getValue());
+    }
+
+    @Test
+    void defaultManagerStillQuotesNamesForPluginsWithoutAnOverride() throws Exception {
+        Connection connection = recordingConnection();
+        IDbMetaData metadata = new DefaultMetaService() {
+            @Override
+            public String getMetaDataName(String... names) {
+                return Arrays.stream(names).map(name -> "\"" + name.replace("\"", "\"\"") + "\"")
+                        .collect(Collectors.joining("."));
+            }
+        };
+        try (MockedStatic<Chat2DBContext> context = context(connection, new DefaultDBManager(), metadata)) {
+            service.copyTable(request("order details", "ord\"ers", false));
+        }
+        verify(connection).prepareStatement("CREATE TABLE \"ord\"\"ers\" AS SELECT * FROM \"order details\" WHERE 1=0");
+    }
+
+    @Test
+    void otherDialectCopyManagersPreserveLiteralQuoteCharacters() throws Exception {
+        for (IDbManager manager : List.of(new PostgreSQLDBManager(), new OracleDBManager(), new DMDBManager())) {
+            Connection connection = recordingConnection();
+            try (MockedStatic<Chat2DBContext> context = context(connection, manager, new DefaultMetaService())) {
+                service.copyTable(request("\"orders\"", "\"copy\"", true));
+            }
+            String source = "\"\"\"orders\"\"\"";
+            String target = "\"\"\"copy\"\"\"";
+            String expected = manager instanceof PostgreSQLDBManager
+                    ? "CREATE TABLE " + target + " AS TABLE " + source + " WITH DATA"
+                    : "CREATE TABLE " + target + " AS SELECT * FROM " + source;
+            verify(connection).prepareStatement(expected);
+        }
+        Connection connection = recordingConnection();
+        try (MockedStatic<Chat2DBContext> context = context(connection, new ClickHouseDBManager(), new DefaultMetaService())) {
+            service.copyTable(request("`orders`", "`copy`", true));
+        }
+        verify(connection).prepareStatement("CREATE TABLE `app`.```copy``` AS `app`.```orders```");
+        verify(connection).prepareStatement("INSERT INTO `app`.```copy``` SELECT * FROM `app`.```orders```");
+    }
+
+    @Test
+    void copyFailurePreservesTheDatabaseMessageInEveryLocale() throws Exception {
+        Connection connection = recordingConnection();
+        SQLException original = new SQLException("Table 'app.orders' doesn't exist", "42S02", 1146);
+        when(connection.prepareStatement(anyString())).thenThrow(original);
+        BusinessException failure;
+        try (MockedStatic<Chat2DBContext> context = context(connection, new MysqlDBManager(), new MysqlMetaData())) {
+            failure = assertThrows(BusinessException.class, () -> service.copyTable(request("orders", "copy", true)));
+        }
+        assertEquals("table.copy.failed", failure.getCode());
+        assertEquals(original.getMessage(), failure.getArgs()[0]);
+        assertSame(original, failure.getCause().getCause());
+        ResourceBundleMessageSource messages = new ResourceBundleMessageSource();
+        messages.setBasename("i18n/messages");
+        messages.setDefaultEncoding("UTF-8");
+        for (Locale locale : List.of(Locale.ROOT, Locale.US, Locale.CHINA, Locale.JAPAN, Locale.KOREA, Locale.forLanguageTag("es-ES"))) {
+            String text = messages.getMessage(failure.getCode(), failure.getArgs(), locale);
+            assertTrue(text.contains(original.getMessage()), text);
+            assertFalse(text.contains("no message"), text);
+            assertFalse(text.contains("{0}"), text);
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"zh-CN", "en-US", "ja-JP"})
+    void desktopBridgeIncludesTheOriginalDatabaseError(String language) throws Exception {
+        Connection connection = recordingConnection();
+        String reason = "Table 'app.orders' doesn't exist";
+        when(connection.prepareStatement(anyString())).thenThrow(new SQLException(reason));
+        ResourceBundleMessageSource messages = new ResourceBundleMessageSource();
+        messages.setBasename("i18n/messages");
+        messages.setDefaultEncoding("UTF-8");
+        Locale previousLocale = LocaleContextHolder.getLocale();
+        try (MockedStatic<Chat2DBContext> context = context(connection, new MysqlDBManager(), new MysqlMetaData());
+             MockedStatic<RequestMappingUtils> routing = mockStatic(RequestMappingUtils.class);
+             MockedStatic<ApplicationContextUtil> beans = mockStatic(ApplicationContextUtil.class);
+             MockedStatic<I18nUtils> i18n = mockStatic(I18nUtils.class)) {
+            RequestMappingInfo mapping = RequestMappingInfo.builder().controller(CopyController.class)
+                    .method("copy").params(new Class<?>[0]).build();
+            routing.when(() -> RequestMappingUtils.getRequestMappingInfo("/api/rdb/table/copy", "post")).thenReturn(mapping);
+            beans.when(() -> ApplicationContextUtil.getBeanOfType(CopyController.class)).thenReturn(new CopyController());
+            i18n.when(() -> I18nUtils.getMessage(eq("table.copy.failed"), any(Object[].class)))
+                    .thenAnswer(call -> messages.getMessage(call.getArgument(0), call.getArgument(1), LocaleContextHolder.getLocale()));
+            ConsoleMessage message = new ConsoleMessage();
+            message.setRequestUrl("/api/rdb/table/copy");
+            message.setMethod("post");
+            message.setHeaders(Map.of("Accept-Language", language));
+            Map<String, Object> result = ConsoleHelper.doController(message).getMessage();
+            assertEquals("table.copy.failed", result.get("errorCode"));
+            assertEquals(messages.getMessage("table.copy.failed", new Object[]{reason}, Locale.forLanguageTag(language)),
+                    result.get("errorMessage"));
+        } finally {
+            LocaleContextHolder.setLocale(previousLocale);
+        }
+    }
+
+    public static class CopyController {
+        public void copy() {
+            new DbTableServiceImpl(null).copyTable(request("orders", "copy", true));
+        }
+    }
+
+    private static Connection recordingConnection() throws SQLException {
+        Connection connection = mock(Connection.class);
+        when(connection.prepareStatement(anyString())).thenReturn(mock(PreparedStatement.class));
+        return connection;
+    }
+
+    private static MockedStatic<Chat2DBContext> context(Connection connection, IDbManager manager, IDbMetaData metadata) {
+        MockedStatic<Chat2DBContext> context = mockStatic(Chat2DBContext.class);
+        context.when(Chat2DBContext::getConnection).thenReturn(connection);
+        context.when(Chat2DBContext::getDbManager).thenReturn(manager);
+        context.when(Chat2DBContext::getDbMetaData).thenReturn(metadata);
+        return context;
+    }
+
+    private static DbTableCopyRequest request(String source, String target, boolean copyData) {
+        DbTableCopyRequest request = new DbTableCopyRequest();
+        request.setDatabaseName("app");
+        request.setTableName(source);
+        request.setNewName(target);
+        request.setCopyData(copyData);
+        return request;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-start/src/test/java/ai/chat2db/community/start/test/api/TableIdentifierContractTest.java b/chat2db-community-server/chat2db-community-start/src/test/java/ai/chat2db/community/start/test/api/TableIdentifierContractTest.java
new file mode 100644
index 0000000000..6319694104
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-start/src/test/java/ai/chat2db/community/start/test/api/TableIdentifierContractTest.java
@@ -0,0 +1,182 @@
+package ai.chat2db.community.start.test.api;
+
+import ai.chat2db.community.domain.api.model.request.db.DbTableCopyRequest;
+import ai.chat2db.community.domain.api.model.request.db.DbTableQueryRequest;
+import ai.chat2db.community.domain.core.impl.db.DbTableServiceImpl;
+import ai.chat2db.spi.IDbManager;
+import ai.chat2db.spi.IDbMetaData;
+import ai.chat2db.spi.IPlugin;
+import ai.chat2db.spi.model.request.TableMetadataRequest;
+import ai.chat2db.spi.sql.Chat2DBContext;
+import com.alibaba.fastjson2.JSON;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.MockedStatic;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.*;
+
+class TableIdentifierContractTest {
+    private static final List<String[]> NAMES = List.of(
+            new String[]{"source data", "target data"},
+            new String[]{"select", "order"},
+            new String[]{"a`b\"c]d", "n`m\"l]k"},
+            new String[]{"`source`", "`target`"},
+            new String[]{"\"source\"", "\"target\""},
+            new String[]{"[source]", "[target]"},
+            new String[]{"a'; DROP TABLE x; --", "b'; DROP TABLE y; --"},
+            new String[]{"inventory_material_record_source12345678901", "custom_material_copy"});
+
+    static Stream<Arguments> databases() {
+        return Chat2DBContext.PLUGIN_MAP.entrySet().stream()
+                .sorted(Map.Entry.comparingByKey())
+                .flatMap(entry -> NAMES.stream().map(names -> Arguments.of(entry.getKey(), names[0], names[1])));
+    }
+
+    @ParameterizedTest(name = "{0}: copy {1}")
+    @MethodSource("databases")
+    void copyPassesRawNamesToEveryRegisteredPlugin(String dbType, String source, String target) throws Exception {
+        IPlugin plugin = Chat2DBContext.PLUGIN_MAP.get(dbType);
+        IDbManager manager = plugin.getDbManager();
+        IDbMetaData metadata = spy(plugin.getDbMetaData());
+        List<String> executed = new ArrayList<>();
+        Connection connection = recordingConnection(executed);
+        String owner = manager.getClass().getMethod("copyTable", Connection.class, String.class, String.class,
+                String.class, String.class, boolean.class).getDeclaringClass().getSimpleName();
+
+        try (MockedStatic<Chat2DBContext> context = context(plugin, metadata, connection)) {
+            String quotedSource = metadata.getSQLIdentifierProcessor().quoteIdentifierAlways(source);
+            String quotedTarget = metadata.getSQLIdentifierProcessor().quoteIdentifierAlways(target);
+            String defaultSource = metadata.getMetaDataName(source);
+            String defaultTarget = metadata.getMetaDataName(target);
+            if (owner.equals("SqlServerDBManager")) {
+                doReturn("CREATE TABLE " + quotedSource + " ([id] int)").when(metadata)
+                        .tableDDL(any(Connection.class), any(TableMetadataRequest.class));
+            }
+            for (boolean copyData : List.of(false, true)) {
+                executed.clear();
+                clearInvocations(metadata);
+                DbTableCopyRequest request = new DbTableCopyRequest();
+                request.setDatabaseName("app");
+                request.setSchemaName("scope");
+                request.setTableName(source);
+                request.setNewName(target);
+                request.setCopyData(copyData);
+                new DbTableServiceImpl(null).copyTable(request);
+
+                List<String> expected = switch (owner) {
+                    case "MysqlDBManager", "SUNDBDBManager" -> List.of(ctas(quotedTarget, quotedSource, copyData));
+                    case "DefaultDBManager" -> List.of(ctas(defaultTarget, defaultSource, copyData));
+                    case "PostgreSQLDBManager", "KingBaseDBManager" -> List.of("CREATE TABLE \"scope\"." + quotedTarget
+                            + " AS TABLE \"scope\"." + quotedSource + (copyData ? " WITH DATA" : " WITH NO DATA"));
+                    case "OracleDBManager", "DMDBManager", "OscarBaseDBManager" ->
+                            List.of(ctas("\"scope\"." + quotedTarget, "\"scope\"." + quotedSource, copyData));
+                    case "ClickHouseDBManager" -> statements(copyData,
+                            "CREATE TABLE `scope`." + quotedTarget + " AS `scope`." + quotedSource,
+                            "INSERT INTO `scope`." + quotedTarget + " SELECT * FROM `scope`." + quotedSource);
+                    case "DB2DBManager", "HiveDBManager" -> statements(copyData,
+                            "CREATE TABLE " + quotedTarget + " LIKE " + quotedSource
+                                    + (owner.equals("DB2DBManager") ? " INCLUDING INDEXES" : ""),
+                            "INSERT INTO " + quotedTarget + " SELECT * FROM " + quotedSource);
+                    case "SqlServerDBManager" -> statements(copyData,
+                            "CREATE TABLE [scope]." + quotedTarget + " ([id] int)",
+                            "INSERT INTO [app].[scope]." + quotedTarget + " ([id]) SELECT [id] FROM [app].[scope]." + quotedSource);
+                    case "MongodbDBManager" -> List.of("db.getCollection(" + JSON.toJSONString(target)
+                            + ").insertMany(db.getCollection(" + JSON.toJSONString(source) + ").find({}))");
+                    default -> throw new AssertionError("Add contract coverage for " + dbType + ": " + owner);
+                };
+                assertEquals(expected, executed, dbType + ", copyData=" + copyData);
+                if (owner.equals("DefaultDBManager")) {
+                    verify(metadata).getMetaDataName(source);
+                    verify(metadata).getMetaDataName(target);
+                } else {
+                    verify(metadata, never()).getMetaDataName(any(String[].class));
+                }
+            }
+        }
+    }
+
+    @ParameterizedTest(name = "{0}: truncate {1}")
+    @MethodSource("databases")
+    void truncatePassesRawNamesToEveryRegisteredPlugin(String dbType, String source, String unusedTarget) throws Exception {
+        IPlugin plugin = Chat2DBContext.PLUGIN_MAP.get(dbType);
+        IDbManager manager = plugin.getDbManager();
+        IDbMetaData metadata = spy(plugin.getDbMetaData());
+        List<String> executed = new ArrayList<>();
+        Connection connection = recordingConnection(executed);
+        String owner = manager.getClass().getMethod("truncateTable", Connection.class, String.class,
+                String.class, String.class).getDeclaringClass().getSimpleName();
+
+        try (MockedStatic<Chat2DBContext> context = context(plugin, metadata, connection)) {
+            String quotedSource = metadata.getSQLIdentifierProcessor().quoteIdentifierAlways(source);
+            String defaultSource = metadata.getMetaDataName(source);
+            clearInvocations(metadata);
+            DbTableQueryRequest request = new DbTableQueryRequest();
+            request.setDatabaseName("app");
+            request.setSchemaName("scope");
+            request.setTableName(source);
+            new DbTableServiceImpl(null).truncateTable(request);
+
+            String expected = switch (owner) {
+                case "DefaultDBManager" -> "TRUNCATE TABLE " + defaultSource;
+                case "MysqlDBManager", "DB2DBManager" -> "TRUNCATE TABLE " + quotedSource;
+                case "PostgreSQLDBManager", "OracleDBManager", "DMDBManager", "OscarBaseDBManager" ->
+                        "TRUNCATE TABLE \"scope\"." + quotedSource;
+                case "ClickHouseDBManager" -> "TRUNCATE TABLE `scope`." + quotedSource;
+                case "SqlServerDBManager" -> "TRUNCATE TABLE [app].[scope]." + quotedSource;
+                case "MongodbDBManager" -> "db.getCollection(" + JSON.toJSONString(source) + ").deleteMany({})";
+                default -> throw new AssertionError("Add contract coverage for " + dbType + ": " + owner);
+            };
+            assertEquals(List.of(expected), executed, dbType);
+            if (owner.equals("DefaultDBManager")) {
+                verify(metadata).getMetaDataName(source);
+            } else {
+                verify(metadata, never()).getMetaDataName(any(String[].class));
+            }
+        }
+    }
+
+    private static String ctas(String target, String source, boolean copyData) {
+        return "CREATE TABLE " + target + " AS SELECT * FROM " + source + (copyData ? "" : " WHERE 1=0");
+    }
+
+    private static List<String> statements(boolean copyData, String structure, String data) {
+        return copyData ? List.of(structure, data) : List.of(structure);
+    }
+
+    private static Connection recordingConnection(List<String> executed) throws Exception {
+        Connection connection = mock(Connection.class);
+        when(connection.prepareStatement(anyString())).thenAnswer(call -> {
+            String sql = call.getArgument(0);
+            PreparedStatement statement = mock(PreparedStatement.class);
+            when(statement.execute()).thenAnswer(ignored -> { executed.add(sql); return false; });
+            ResultSet columns = mock(ResultSet.class);
+            when(columns.next()).thenReturn(true, false);
+            when(columns.getString("COLUMN_NAME")).thenReturn("id");
+            when(columns.getString("DATA_TYPE")).thenReturn("int");
+            when(statement.executeQuery()).thenReturn(columns);
+            return statement;
+        });
+        return connection;
+    }
+
+    private static MockedStatic<Chat2DBContext> context(IPlugin plugin, IDbMetaData metadata, Connection connection) {
+        MockedStatic<Chat2DBContext> context = mockStatic(Chat2DBContext.class);
+        context.when(Chat2DBContext::getDBConfig).thenReturn(plugin.getDBConfig());
+        context.when(Chat2DBContext::getDbManager).thenReturn(plugin.getDbManager());
+        context.when(Chat2DBContext::getDbMetaData).thenReturn(metadata);
+        context.when(Chat2DBContext::getConnection).thenReturn(connection);
+        return context;
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-storage/src/main/java/ai/chat2db/community/storage/LocalWorkspaceStorage.java b/chat2db-community-server/chat2db-community-storage/src/main/java/ai/chat2db/community/storage/LocalWorkspaceStorage.java
index e84681c49d..4cc7fa2732 100644
--- a/chat2db-community-server/chat2db-community-storage/src/main/java/ai/chat2db/community/storage/LocalWorkspaceStorage.java
+++ b/chat2db-community-server/chat2db-community-storage/src/main/java/ai/chat2db/community/storage/LocalWorkspaceStorage.java
@@ -28,10 +28,12 @@
 import ai.chat2db.community.tools.wrapper.result.DataResult;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Component
 public class LocalWorkspaceStorage implements IWorkspaceStorage {
@@ -166,7 +168,9 @@ public Long createOperationLog(OperationLog request) {
 
     @Override
     public PageResponse<OperationLog> operationLogList(OpsOperationLogPageQueryRequest operationLogPageQueryRequest) {
-        List<OperationLog> logs = OperationLogStorage.INSTANCE.getDataList();
+        List<OperationLog> logs = OperationLogStorage.INSTANCE.getDataList().stream()
+                .filter(operationLog -> matchesOperationLog(operationLog, operationLogPageQueryRequest))
+                .toList();
         return page(logs, operationLogPageQueryRequest.getPageNo(), operationLogPageQueryRequest.getPageSize());
     }
 
@@ -219,6 +223,26 @@ private String encryptString(String password) {
         return AesGcmUtil.configured().encrypt(password);
     }
 
+    private boolean matchesOperationLog(OperationLog operationLog, OpsOperationLogPageQueryRequest request) {
+        if (operationLog == null) {
+            return false;
+        }
+        if (request.getDataSourceId() != null
+                && !Objects.equals(request.getDataSourceId(), operationLog.getDataSourceId())) {
+            return false;
+        }
+        if (StringUtils.isNotBlank(request.getDatabaseName())
+                && !Objects.equals(request.getDatabaseName(), operationLog.getDatabaseName())) {
+            return false;
+        }
+        if (StringUtils.isNotBlank(request.getSchemaName())
+                && !Objects.equals(request.getSchemaName(), operationLog.getSchemaName())) {
+            return false;
+        }
+        String searchKey = StringUtils.trimToNull(request.getSearchKey());
+        return searchKey == null || StringUtils.containsIgnoreCase(operationLog.getDdl(), searchKey);
+    }
+
     private int normalizePageNo(Integer pageNo) {
         return Math.max(1, pageNo == null ? 1 : pageNo);
     }
diff --git a/chat2db-community-server/chat2db-community-storage/src/test/java/ai/chat2db/community/storage/LocalWorkspaceStoragePaginationTest.java b/chat2db-community-server/chat2db-community-storage/src/test/java/ai/chat2db/community/storage/LocalWorkspaceStoragePaginationTest.java
index d229ec4c39..e649cf4090 100644
--- a/chat2db-community-server/chat2db-community-storage/src/test/java/ai/chat2db/community/storage/LocalWorkspaceStoragePaginationTest.java
+++ b/chat2db-community-server/chat2db-community-storage/src/test/java/ai/chat2db/community/storage/LocalWorkspaceStoragePaginationTest.java
@@ -97,6 +97,64 @@ void operationLogListReturnsOnlyTheRequestedSlice() {
         assertFalse(page3.getHasNextPage());
     }
 
+    @Test
+    void operationLogListFiltersFullSqlCaseInsensitivelyBeforePagination() {
+        String firstDdl = "a".repeat(220) + " FrOm OrDeRs";
+        String secondDdl = "b".repeat(220) + " FROM ORDERS";
+        Long firstMatchId = saveOperationLog(1L, "sales", "public", firstDdl);
+        Long secondMatchId = saveOperationLog(1L, "sales", "public", secondDdl);
+        saveOperationLog(1L, "sales", "public", "select * from customers");
+
+        OpsOperationLogPageQueryRequest request = new OpsOperationLogPageQueryRequest();
+        request.setPageNo(1);
+        request.setPageSize(1);
+        request.setSearchKey("from orders");
+
+        PageResponse<OperationLog> page1 = workspaceStorage.operationLogList(request);
+        assertEquals(1, page1.getData().size());
+        assertEquals(secondMatchId, page1.getData().get(0).getId());
+        assertEquals(secondDdl, page1.getData().get(0).getDdl());
+        assertEquals(2L, page1.getTotal());
+        assertTrue(page1.getHasNextPage());
+
+        request.setPageNo(2);
+        PageResponse<OperationLog> page2 = workspaceStorage.operationLogList(request);
+        assertEquals(1, page2.getData().size());
+        assertEquals(firstMatchId, page2.getData().get(0).getId());
+        assertEquals(firstDdl, page2.getData().get(0).getDdl());
+        assertEquals(2L, page2.getTotal());
+        assertFalse(page2.getHasNextPage());
+    }
+
+    @Test
+    void operationLogListAppliesAllScopeFiltersBeforePagination() {
+        Long firstMatchId = saveOperationLog(7L, "warehouse", "analytics", "select 1");
+        Long secondMatchId = saveOperationLog(7L, "warehouse", "analytics", "select 2");
+        saveOperationLog(8L, "warehouse", "analytics", "wrong datasource");
+        saveOperationLog(7L, "reporting", "analytics", "wrong database");
+        saveOperationLog(7L, "warehouse", "staging", "wrong schema");
+
+        OpsOperationLogPageQueryRequest request = new OpsOperationLogPageQueryRequest();
+        request.setPageNo(1);
+        request.setPageSize(1);
+        request.setDataSourceId(7L);
+        request.setDatabaseName("warehouse");
+        request.setSchemaName("analytics");
+
+        PageResponse<OperationLog> page1 = workspaceStorage.operationLogList(request);
+        assertEquals(1, page1.getData().size());
+        assertEquals(secondMatchId, page1.getData().get(0).getId());
+        assertEquals(2L, page1.getTotal());
+        assertTrue(page1.getHasNextPage());
+
+        request.setPageNo(2);
+        PageResponse<OperationLog> page2 = workspaceStorage.operationLogList(request);
+        assertEquals(1, page2.getData().size());
+        assertEquals(firstMatchId, page2.getData().get(0).getId());
+        assertEquals(2L, page2.getTotal());
+        assertFalse(page2.getHasNextPage());
+    }
+
     @Test
     void listDataSourcesReturnsOnlyTheRequestedSlice() {
         for (int i = 0; i < 3; i++) {
@@ -191,4 +249,13 @@ void fullUpdateStillPreservesStoredPasswordInsideDatasourceStorage() {
             System.clearProperty(AesGcmUtil.KEY_PROPERTY);
         }
     }
+
+    private static Long saveOperationLog(Long dataSourceId, String databaseName, String schemaName, String ddl) {
+        OperationLog log = new OperationLog();
+        log.setDataSourceId(dataSourceId);
+        log.setDatabaseName(databaseName);
+        log.setSchemaName(schemaName);
+        log.setDdl(ddl);
+        return OperationLogStorage.INSTANCE.save(log);
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/http/LocalCookie.java b/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/http/LocalCookie.java
index 40130eea2e..c1641f04ed 100644
--- a/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/http/LocalCookie.java
+++ b/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/http/LocalCookie.java
@@ -51,7 +51,7 @@ public class LocalCookie {
         } catch (Exception e) {
             log.error("LocalCookie init error", e);
         }
-        new Thread(() -> {
+        Thread cookieFlushThread = new Thread(() -> {
             while (true) {
                 try {
                     Thread.sleep(1000);
@@ -67,7 +67,9 @@ public class LocalCookie {
                     log.error("LocalCookie write file error", e);
                 }
             }
-        }).start();
+        }, "chat2db-community-cookie-flush");
+        cookieFlushThread.setDaemon(true);
+        cookieFlushThread.start();
     }
 
     private static void init() {
diff --git a/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/util/JdbcJarUtils.java b/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/util/JdbcJarUtils.java
index fa81a812b6..98a70df742 100644
--- a/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/util/JdbcJarUtils.java
+++ b/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/util/JdbcJarUtils.java
@@ -9,9 +9,15 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.AtomicMoveNotSupportedException;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.List;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
 import cn.hutool.core.io.FileUtil;
@@ -28,8 +34,25 @@
 @Slf4j
 public class JdbcJarUtils {
 
+    private static final String ASYNC_DOWNLOAD_THREAD_NAME_PREFIX = "chat2db-jdbc-download-";
+
+    private static final String PARTIAL_FILE_PREFIX = "jdbc-";
+
+    private static final String PARTIAL_FILE_SUFFIX = ".part";
+
+    private static final long STALE_PARTIAL_FILE_AGE_MILLIS = TimeUnit.DAYS.toMillis(1);
+
+    private static final AtomicInteger ASYNC_DOWNLOAD_THREAD_INDEX = new AtomicInteger();
+
+    static final ThreadFactory ASYNC_DOWNLOAD_THREAD_FACTORY = runnable -> {
+        Thread thread = new Thread(runnable,
+                ASYNC_DOWNLOAD_THREAD_NAME_PREFIX + ASYNC_DOWNLOAD_THREAD_INDEX.incrementAndGet());
+        thread.setDaemon(true);
+        return thread;
+    };
+
     private static final OkHttpClient async_client = new OkHttpClient.Builder()
-            .dispatcher(new Dispatcher(Executors.newFixedThreadPool(20)))
+            .dispatcher(new Dispatcher(Executors.newFixedThreadPool(20, ASYNC_DOWNLOAD_THREAD_FACTORY)))
             .build();
 
     private static final OkHttpClient client = new OkHttpClient();
@@ -39,6 +62,7 @@ public class JdbcJarUtils {
         if (!file.exists()) {
             file.mkdirs();
         }
+        cleanupStalePartialFiles(file);
     }
 
     public static void asyncDownload(List<String> urls) throws Exception {
@@ -57,7 +81,6 @@ public static void asyncDownload(String url) throws Exception {
 
     static void asyncDownload(String url, Consumer<IOException> completion) throws IOException {
         File file = outputFile(url);
-        deleteIfExists(file);
         String safeUrl = sanitizeUrl(url);
         Request request;
         try {
@@ -68,7 +91,6 @@ static void asyncDownload(String url, Consumer<IOException> completion) throws I
         async_client.newCall(request).enqueue(new Callback() {
             @Override
             public void onFailure(Call call, IOException e) {
-                deleteIfExists(file);
                 IOException failure = downloadFailure(safeUrl, e.getClass().getSimpleName());
                 log.warn("Async JDBC driver download failed for {} ({})", safeUrl,
                     e.getClass().getSimpleName());
@@ -79,7 +101,6 @@ public void onFailure(Call call, IOException e) {
             public void onResponse(Call call, Response response) {
                 try (Response closeableResponse = response) {
                     if (!closeableResponse.isSuccessful()) {
-                        deleteIfExists(file);
                         IOException failure = downloadFailure(safeUrl,
                             "HTTP " + closeableResponse.code());
                         log.warn("Async JDBC driver download failed for {} (HTTP {})", safeUrl,
@@ -90,7 +111,6 @@ public void onResponse(Call call, Response response) {
                     writeResponseBody(closeableResponse, file);
                     completion.accept(null);
                 } catch (IOException e) {
-                    deleteIfExists(file);
                     IOException failure = downloadFailure(safeUrl, e.getClass().getSimpleName());
                     log.warn("Async JDBC driver download failed for {} ({})", safeUrl,
                         e.getClass().getSimpleName());
@@ -106,7 +126,6 @@ public static void download(String url) throws IOException {
             pathfile.mkdirs();
         }
         File file = outputFile(url);
-        deleteIfExists(file);
         String safeUrl = sanitizeUrl(url);
         Request request;
         try {
@@ -125,14 +144,12 @@ public static void download(String url) throws IOException {
         }
         try (response) {
             if (!response.isSuccessful()) {
-                deleteIfExists(file);
                 log.warn("JDBC driver download failed for {} (HTTP {})", safeUrl, response.code());
                 throw downloadFailure(safeUrl, "HTTP " + response.code());
             }
             try {
                 writeResponseBody(response, file);
             } catch (IOException e) {
-                deleteIfExists(file);
                 throw downloadFailure(safeUrl, e.getClass().getSimpleName());
             }
         }
@@ -173,14 +190,46 @@ private static void writeResponseBody(Response response, File file) throws IOExc
         if (response.body() == null) {
             throw new IOException("Empty response body");
         }
-        try (InputStream is = response.body().byteStream();
-             FileOutputStream fos = new FileOutputStream(file)) {
-            byte[] buffer = new byte[2048];
-            int length;
-            while ((length = is.read(buffer)) != -1) {
-                fos.write(buffer, 0, length);
+        Path outputPath = file.toPath().toAbsolutePath();
+        Path temporaryFile = Files.createTempFile(outputPath.getParent(),
+            PARTIAL_FILE_PREFIX + file.getName() + "-", PARTIAL_FILE_SUFFIX);
+        try {
+            try (InputStream is = response.body().byteStream();
+                 FileOutputStream fos = new FileOutputStream(temporaryFile.toFile())) {
+                byte[] buffer = new byte[2048];
+                int length;
+                while ((length = is.read(buffer)) != -1) {
+                    fos.write(buffer, 0, length);
+                }
+                fos.flush();
+            }
+            moveIntoPlace(temporaryFile, outputPath);
+        } finally {
+            deleteIfExists(temporaryFile.toFile());
+        }
+    }
+
+    private static void moveIntoPlace(Path temporaryFile, Path outputPath) throws IOException {
+        try {
+            Files.move(temporaryFile, outputPath, StandardCopyOption.ATOMIC_MOVE,
+                StandardCopyOption.REPLACE_EXISTING);
+        } catch (AtomicMoveNotSupportedException ignored) {
+            Files.move(temporaryFile, outputPath, StandardCopyOption.REPLACE_EXISTING);
+        }
+    }
+
+    static void cleanupStalePartialFiles(File directory) {
+        File[] partialFiles = directory.listFiles((ignored, name) ->
+            name.startsWith(PARTIAL_FILE_PREFIX) && name.endsWith(PARTIAL_FILE_SUFFIX));
+        if (partialFiles == null) {
+            return;
+        }
+        long cutoff = System.currentTimeMillis() - STALE_PARTIAL_FILE_AGE_MILLIS;
+        for (File partialFile : partialFiles) {
+            long lastModified = partialFile.lastModified();
+            if (partialFile.isFile() && lastModified > 0 && lastModified < cutoff) {
+                deleteIfExists(partialFile);
             }
-            fos.flush();
         }
     }
 
diff --git a/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/util/JsonFileUtils.java b/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/util/JsonFileUtils.java
new file mode 100644
index 0000000000..190ac4a27f
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-tools/src/main/java/ai/chat2db/community/tools/util/JsonFileUtils.java
@@ -0,0 +1,46 @@
+package ai.chat2db.community.tools.util;
+
+import cn.hutool.core.io.FileUtil;
+import com.alibaba.fastjson2.JSON;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * UTF-8 JSON file operations. Callers serialize writes and read-modify-write operations for each file.
+ */
+public final class JsonFileUtils {
+
+    private JsonFileUtils() {
+    }
+
+    /** Returns an empty list for a missing file; malformed content is never treated as an empty list. */
+    public static <T> List<T> readArray(File file, Class<T> elementType) {
+        if (!file.exists()) {
+            return new ArrayList<>();
+        }
+        List<T> values = JSON.parseArray(FileUtil.readUtf8String(file), elementType);
+        if (values == null) {
+            throw new IllegalStateException("Expected a JSON array in " + file);
+        }
+        return values;
+    }
+
+    /** Replaces the target after writing a complete JSON document, using an atomic move when supported. */
+    public static void writeAtomically(File file, Object value) throws IOException {
+        FileUtil.mkParentDirs(file);
+        Path temporary = file.toPath().resolveSibling(file.getName() + ".part");
+        Files.writeString(temporary, JSON.toJSONString(value));
+        try {
+            Files.move(temporary, file.toPath(), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+        } catch (AtomicMoveNotSupportedException e) {
+            Files.move(temporary, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-tools/src/test/java/ai/chat2db/community/tools/util/JdbcJarUtilsTest.java b/chat2db-community-server/chat2db-community-tools/src/test/java/ai/chat2db/community/tools/util/JdbcJarUtilsTest.java
index 253e1eec46..e8cda0369f 100644
--- a/chat2db-community-server/chat2db-community-tools/src/test/java/ai/chat2db/community/tools/util/JdbcJarUtilsTest.java
+++ b/chat2db-community-server/chat2db-community-tools/src/test/java/ai/chat2db/community/tools/util/JdbcJarUtilsTest.java
@@ -2,7 +2,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -15,9 +18,12 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -34,16 +40,30 @@ void cleanUp() {
         filesToDelete.forEach(File::delete);
     }
 
+    @Test
+    void asyncDownloadWorkerThreadsAreNamedDaemons() {
+        Thread first = JdbcJarUtils.ASYNC_DOWNLOAD_THREAD_FACTORY.newThread(() -> { });
+        Thread second = JdbcJarUtils.ASYNC_DOWNLOAD_THREAD_FACTORY.newThread(() -> { });
+
+        assertTrue(first.isDaemon());
+        assertTrue(second.isDaemon());
+        assertTrue(first.getName().startsWith("chat2db-jdbc-download-"));
+        assertTrue(second.getName().startsWith("chat2db-jdbc-download-"));
+        assertNotEquals(first.getName(), second.getName());
+    }
+
     @Test
     void asyncConnectionFailureIsReportedWithoutLeavingAPartialFile() throws Exception {
         String fileName = uniqueFileName();
         File output = outputFile(fileName);
         CountDownLatch completion = new CountDownLatch(1);
         AtomicReference<IOException> failure = new AtomicReference<>();
+        AtomicReference<Thread> callbackThread = new AtomicReference<>();
 
         JdbcJarUtils.asyncDownload(
             "http://user:password@127.0.0.1:1/" + fileName + "?token=secret",
             error -> {
+                callbackThread.set(Thread.currentThread());
                 failure.set(error);
                 completion.countDown();
             });
@@ -53,6 +73,133 @@ void asyncConnectionFailureIsReportedWithoutLeavingAPartialFile() throws Excepti
         assertFalse(failure.get().getMessage().contains("user:password"));
         assertFalse(failure.get().getMessage().contains("token=secret"));
         assertFalse(output.exists());
+        assertNotNull(callbackThread.get());
+        assertTrue(callbackThread.get().isDaemon());
+        // OkHttp temporarily replaces the worker name while an AsyncCall is running. The
+        // factory test above owns the stable naming assertion; this callback only needs to
+        // prove that the actual network worker is a daemon.
+    }
+
+    @Test
+    void asyncDownloadPublishesOnlyCompleteFiles() throws Exception {
+        String fileName = uniqueFileName();
+        File output = outputFile(fileName);
+        byte[] content = "complete-jdbc-driver".getBytes(StandardCharsets.UTF_8);
+        CountDownLatch headersSent = new CountDownLatch(1);
+        CountDownLatch releaseBody = new CountDownLatch(1);
+        server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
+        server.createContext("/" + fileName, exchange -> {
+            exchange.sendResponseHeaders(200, content.length);
+            headersSent.countDown();
+            try (OutputStream responseBody = exchange.getResponseBody()) {
+                try {
+                    if (!releaseBody.await(10, TimeUnit.SECONDS)) {
+                        return;
+                    }
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
+                responseBody.write(content);
+            }
+        });
+        server.start();
+        CountDownLatch completion = new CountDownLatch(1);
+        AtomicReference<IOException> failure = new AtomicReference<>();
+
+        JdbcJarUtils.asyncDownload(
+            "http://127.0.0.1:" + server.getAddress().getPort() + "/" + fileName,
+            error -> {
+                failure.set(error);
+                completion.countDown();
+            });
+
+        File partialFile = null;
+        try {
+            assertTrue(headersSent.await(10, TimeUnit.SECONDS));
+            partialFile = awaitPartialFile(output);
+            assertNotNull(partialFile);
+            filesToDelete.add(partialFile);
+            assertFalse(output.exists());
+        } finally {
+            releaseBody.countDown();
+        }
+        assertTrue(completion.await(10, TimeUnit.SECONDS));
+        assertNull(failure.get());
+        assertArrayEquals(content, Files.readAllBytes(output.toPath()));
+        assertFalse(partialFile.exists());
+    }
+
+    @Test
+    void asyncFailureDoesNotDeletePreviouslyPublishedDriver() throws Exception {
+        String fileName = uniqueFileName();
+        File output = outputFile(fileName);
+        byte[] content = "complete-jdbc-driver".getBytes(StandardCharsets.UTF_8);
+        server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
+        server.createContext("/" + fileName, exchange -> {
+            if ("fail=true".equals(exchange.getRequestURI().getRawQuery())) {
+                exchange.sendResponseHeaders(503, -1);
+                exchange.close();
+                return;
+            }
+            exchange.sendResponseHeaders(200, content.length);
+            try (OutputStream responseBody = exchange.getResponseBody()) {
+                responseBody.write(content);
+            }
+        });
+        server.start();
+        String url = "http://127.0.0.1:" + server.getAddress().getPort() + "/" + fileName;
+
+        assertNull(awaitAsyncDownload(url));
+        assertArrayEquals(content, Files.readAllBytes(output.toPath()));
+
+        assertNotNull(awaitAsyncDownload(url + "?fail=true"));
+        assertArrayEquals(content, Files.readAllBytes(output.toPath()));
+    }
+
+    @Test
+    void interruptedResponseRemovesPartialFile() throws Exception {
+        String fileName = uniqueFileName();
+        File output = outputFile(fileName);
+        byte[] partialContent = "partial".getBytes(StandardCharsets.UTF_8);
+        server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
+        server.createContext("/" + fileName, exchange -> {
+            exchange.sendResponseHeaders(200, partialContent.length + 10);
+            try (OutputStream responseBody = exchange.getResponseBody()) {
+                responseBody.write(partialContent);
+                responseBody.flush();
+            }
+        });
+        server.start();
+
+        IOException failure = awaitAsyncDownload(
+            "http://127.0.0.1:" + server.getAddress().getPort() + "/" + fileName);
+
+        assertNotNull(failure);
+        assertFalse(output.exists());
+        assertNull(findPartialFile(output));
+    }
+
+    @Test
+    void stalePartialFilesAreCleanedWithoutRemovingFreshDownloads() throws Exception {
+        File directory = new File(JdbcDriverConstants.DRIVER_LIB_PATH);
+        File stale = new File(directory, "jdbc-stale-" + UUID.randomUUID() + ".part");
+        File fresh = new File(directory, "jdbc-fresh-" + UUID.randomUUID() + ".part");
+        File matchingDirectory = new File(directory, "jdbc-directory-" + UUID.randomUUID() + ".part");
+        filesToDelete.add(stale);
+        filesToDelete.add(fresh);
+        filesToDelete.add(matchingDirectory);
+        Files.writeString(stale.toPath(), "stale", StandardCharsets.UTF_8);
+        Files.writeString(fresh.toPath(), "fresh", StandardCharsets.UTF_8);
+        assertTrue(matchingDirectory.mkdir());
+        assertTrue(stale.setLastModified(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2)));
+        assertTrue(matchingDirectory.setLastModified(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2)));
+
+        JdbcJarUtils.cleanupStalePartialFiles(directory);
+
+        assertFalse(stale.exists());
+        assertTrue(fresh.exists());
+        assertTrue(matchingDirectory.exists());
     }
 
     @Test
@@ -123,4 +270,34 @@ private File outputFile(String fileName) {
         filesToDelete.add(output);
         return output;
     }
+
+    private File awaitPartialFile(File output) throws InterruptedException {
+        long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(10);
+        do {
+            File partialFile = findPartialFile(output);
+            if (partialFile != null) {
+                return partialFile;
+            }
+            Thread.sleep(10);
+        } while (System.nanoTime() < deadline);
+        return null;
+    }
+
+    private File findPartialFile(File output) {
+        String prefix = "jdbc-" + output.getName() + "-";
+        File[] partialFiles = output.getParentFile().listFiles(
+            (directory, name) -> name.startsWith(prefix) && name.endsWith(".part"));
+        return partialFiles == null || partialFiles.length == 0 ? null : partialFiles[0];
+    }
+
+    private IOException awaitAsyncDownload(String url) throws Exception {
+        CountDownLatch completion = new CountDownLatch(1);
+        AtomicReference<IOException> failure = new AtomicReference<>();
+        JdbcJarUtils.asyncDownload(url, error -> {
+            failure.set(error);
+            completion.countDown();
+        });
+        assertTrue(completion.await(10, TimeUnit.SECONDS));
+        return failure.get();
+    }
 }
diff --git a/chat2db-community-server/chat2db-community-tools/src/test/java/ai/chat2db/community/tools/util/JsonFileUtilsTest.java b/chat2db-community-server/chat2db-community-tools/src/test/java/ai/chat2db/community/tools/util/JsonFileUtilsTest.java
new file mode 100644
index 0000000000..168ab72849
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-tools/src/test/java/ai/chat2db/community/tools/util/JsonFileUtilsTest.java
@@ -0,0 +1,66 @@
+package ai.chat2db.community.tools.util;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class JsonFileUtilsTest {
+
+    @TempDir
+    Path directory;
+
+    @Test
+    void roundTripsTypedArraysAndClearsAnExistingFile() throws IOException {
+        Path path = directory.resolve("nested/records.json");
+        assertTrue(JsonFileUtils.readArray(path.toFile(), Entry.class).isEmpty());
+        assertFalse(Files.exists(path));
+        List<Entry> entries = List.of(new Entry("订单", 2));
+
+        JsonFileUtils.writeAtomically(path.toFile(), entries);
+
+        assertEquals(entries, JsonFileUtils.readArray(path.toFile(), Entry.class));
+        JsonFileUtils.writeAtomically(path.toFile(), List.of());
+        assertEquals("[]", Files.readString(path));
+        assertFalse(Files.exists(path.resolveSibling("records.json.part")));
+    }
+
+    @Test
+    void malformedOrNullDocumentsArePreservedAndRejected() throws IOException {
+        Path path = directory.resolve("records.json");
+        for (String content : List.of("broken JSON", "null")) {
+            Files.writeString(path, content);
+            assertThrows(RuntimeException.class, () -> JsonFileUtils.readArray(path.toFile(), Entry.class));
+            assertEquals(content, Files.readString(path));
+        }
+    }
+
+    @Test
+    void failedWritePreservesThePreviousDocumentAndCanBeRetried() throws IOException {
+        Path path = directory.resolve("records.json");
+        List<Entry> original = List.of(new Entry("original", 1));
+        JsonFileUtils.writeAtomically(path.toFile(), original);
+        Path blocked = Files.createDirectory(directory.resolve("records.json.part"));
+        Path child = Files.writeString(blocked.resolve("child"), "keep");
+
+        assertThrows(IOException.class, () -> JsonFileUtils.writeAtomically(path.toFile(), List.of()));
+
+        assertEquals(original, JsonFileUtils.readArray(path.toFile(), Entry.class));
+        assertEquals("keep", Files.readString(child));
+        Files.delete(child);
+        Files.delete(blocked);
+        JsonFileUtils.writeAtomically(path.toFile(), List.of());
+        assertTrue(JsonFileUtils.readArray(path.toFile(), Entry.class).isEmpty());
+    }
+
+    record Entry(String name, int attempts) {
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/adapter/ai/AiChatStreamAdapter.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/adapter/ai/AiChatStreamAdapter.java
index daceacf9ff..9cb77863ae 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/adapter/ai/AiChatStreamAdapter.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/adapter/ai/AiChatStreamAdapter.java
@@ -6,17 +6,14 @@
 import ai.chat2db.community.web.api.model.request.ai.ChatRequest;
 import ai.chat2db.community.domain.api.model.ai.AiChatMessage;
 import ai.chat2db.community.domain.api.model.ai.AiChatSession;
-import ai.chat2db.community.domain.api.model.ai.AiBusinessContextResult;
 import ai.chat2db.community.domain.api.model.ai.AiRuntimeModel;
 import ai.chat2db.community.domain.api.model.ai.ChatAttachment;
 import ai.chat2db.community.domain.api.model.request.ai.AiChatMessageAddRequest;
-import ai.chat2db.community.domain.api.model.request.ai.AiSelectedKnowledge;
 import ai.chat2db.community.domain.api.model.runtime.ConnectionProfile;
 import ai.chat2db.community.domain.api.model.request.runtime.DbConnectionContextRequest;
 import ai.chat2db.community.domain.api.service.db.IDbConnectionContextService;
 import ai.chat2db.community.domain.api.service.ai.IAiChatStreamService;
 import ai.chat2db.community.domain.api.service.ai.IAiAttachmentService;
-import ai.chat2db.community.domain.api.service.ai.IAiBusinessContextService;
 import ai.chat2db.community.domain.api.service.ai.IAiChatHistoryService;
 import ai.chat2db.community.domain.api.service.ai.IAiModelConfigService;
 import ai.chat2db.community.domain.api.service.sys.IIdentityService;
@@ -30,7 +27,6 @@
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
-import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.model.Generation;
@@ -228,8 +224,6 @@ public class AiChatStreamAdapter implements IAiChatStreamService<ChatRequest, Ss
 
     private final IAiChatHistoryService historyService;
 
-    private final IAiBusinessContextService businessContextService;
-
     private final IAiAttachmentService aiAttachmentService;
 
     private final ChatConverter chatConverter;
@@ -241,7 +235,6 @@ public AiChatStreamAdapter(IAiModelConfigService modelConfigService,
                            AiModelFactory modelFactory,
                            AiToolAdapter aiToolAdapter,
                            IAiChatHistoryService historyService,
-                           IAiBusinessContextService businessContextService,
                            IAiAttachmentService aiAttachmentService,
                            ChatConverter chatConverter,
                            IDbConnectionContextService connectionContextService,
@@ -252,7 +245,6 @@ public AiChatStreamAdapter(IAiModelConfigService modelConfigService,
                 .toolObjects(aiToolAdapter)
                 .build();
         this.historyService = historyService;
-        this.businessContextService = businessContextService;
         this.aiAttachmentService = aiAttachmentService;
         this.chatConverter = chatConverter;
         this.connectionContextService = connectionContextService;
@@ -268,10 +260,7 @@ public String chatSync(ChatRequest request) {
             List<ChatMessage> effectiveHistory = request.getHistory() != null
                     ? request.getHistory()
                     : new ArrayList<>();
-            AiBusinessContextResult businessContext = businessContextService.resolve(
-                    chatConverter.toBusinessContextParam(request));
-            List<Message> messages = buildMessages(request.getInput(), request.getAttachments(), effectiveHistory,
-                    businessContext.getStructuredContext());
+            List<Message> messages = buildMessages(request.getInput(), request.getAttachments(), effectiveHistory);
             Map<String, Object> toolContext = buildToolContext(request);
             putRequestContext(toolContext);
             boolean hasExecutableToolContext = !toolContext.isEmpty();
@@ -319,17 +308,13 @@ public SseEmitter stream(ChatRequest request) {
         StringBuilder persistedTraceBuilder = new StringBuilder();
         StringBuilder streamedReasoningState = new StringBuilder();
         Long userId = identityService.currentUserId();
-        AiBusinessContextResult businessContext = businessContextService.resolve(
-                chatConverter.toBusinessContextParam(request));
         String sessionId = shouldPersistHistory(request)
-                ? prepareSession(request, userId, businessContext.getSelectedKnowledge()) : null;
+                ? prepareSession(request, userId) : null;
         Context capturedContext = ContextUtils.queryContext();
         List<ChatMessage> effectiveHistory = resolveHistory(request, sessionId, userId);
-        String structuredBusinessContext = businessContext.getStructuredContext();
         String structuredAttachmentContext = aiAttachmentService.buildStructuredContext(request.getAttachments());
         logAttachmentDebug(request, effectiveHistory, structuredAttachmentContext);
-        List<Message> messages = buildMessages(request.getInput(), request.getAttachments(), effectiveHistory,
-                structuredBusinessContext);
+        List<Message> messages = buildMessages(request.getInput(), request.getAttachments(), effectiveHistory);
         Map<String, Object> toolContext = buildToolContext(request);
         putRequestContext(toolContext);
         boolean hasExecutableToolContext = !toolContext.isEmpty();
@@ -365,7 +350,7 @@ public SseEmitter stream(ChatRequest request) {
                         if (finalSessionId != null && (responseBuilder.length() > 0 || !traceEvents.isEmpty())) {
                             try {
                                 historyService.addMessage(addMessageRequest(finalSessionId, userId, "assistant",
-                                        responseBuilder.toString(), serializeTraceEvents(traceEvents), null, null));
+                                        responseBuilder.toString(), serializeTraceEvents(traceEvents), null));
                             } catch (Exception e) {
                                 log.error("save assistant message failed, sessionId={}", finalSessionId, e);
                             }
@@ -393,13 +378,12 @@ public SseEmitter stream(ChatRequest request) {
     }
 
 
-    private String prepareSession(ChatRequest request, Long userId,
-                                  List<AiSelectedKnowledge> selectedKnowledgeSnapshot) {
+    private String prepareSession(ChatRequest request, Long userId) {
         if (StringUtils.isNotBlank(request.getSessionId())) {
             String sessionId = request.getSessionId().trim();
             try {
                 historyService.addMessage(addMessageRequest(sessionId, userId, "user", request.getInput(), null,
-                        request.getAttachments(), selectedKnowledgeSnapshot));
+                        request.getAttachments()));
             } catch (Exception e) {
                 log.error("save user message failed, sessionId={}", sessionId, e);
             }
@@ -408,7 +392,7 @@ private String prepareSession(ChatRequest request, Long userId,
         try {
             AiChatSession session = historyService.createSession(userId, request.getInput());
             historyService.addMessage(addMessageRequest(session.getId(), userId, "user", request.getInput(), null,
-                    request.getAttachments(), selectedKnowledgeSnapshot));
+                    request.getAttachments()));
             return session.getId();
         } catch (Exception e) {
             log.error("create session failed", e);
@@ -417,8 +401,7 @@ private String prepareSession(ChatRequest request, Long userId,
     }
 
     private AiChatMessageAddRequest addMessageRequest(String sessionId, Long userId, String role, String content,
-                                                      String reasoningContent, List<ChatAttachment> attachments,
-                                                      List<AiSelectedKnowledge> selectedKnowledge) {
+                                                      String reasoningContent, List<ChatAttachment> attachments) {
         AiChatMessageAddRequest request = new AiChatMessageAddRequest();
         request.setSessionId(sessionId);
         request.setUserId(userId);
@@ -426,7 +409,6 @@ private AiChatMessageAddRequest addMessageRequest(String sessionId, Long userId,
         request.setContent(content);
         request.setReasoningContent(reasoningContent);
         request.setAttachments(attachments);
-        request.setSelectedKnowledge(selectedKnowledge);
         return request;
     }
 
@@ -456,12 +438,8 @@ private List<ChatMessage> resolveHistory(ChatRequest request, String sessionId,
 
     private List<Message> buildMessages(String input,
                                         List<ai.chat2db.community.domain.api.model.ai.ChatAttachment> currentAttachments,
-                                        List<ChatMessage> history,
-                                        String structuredBusinessContext) {
+                                        List<ChatMessage> history) {
         List<Message> messages = new ArrayList<>();
-        if (StringUtils.isNotBlank(structuredBusinessContext)) {
-            messages.add(new SystemMessage(structuredBusinessContext));
-        }
         if (Objects.nonNull(history)) {
             for (ChatMessage h : history) {
                 if (Objects.isNull(h) || StringUtils.isBlank(h.getContent()) || StringUtils.isBlank(h.getRole())) {
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/adapter/db/ImportFileUploadAdapter.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/adapter/db/ImportFileUploadAdapter.java
new file mode 100644
index 0000000000..f01e4d2fb7
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/adapter/db/ImportFileUploadAdapter.java
@@ -0,0 +1,44 @@
+package ai.chat2db.community.web.api.adapter.db;
+
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
+import ai.chat2db.community.domain.api.service.file.IUploadFileService;
+import ai.chat2db.community.web.api.config.console.DesktopBridgeRequestContext;
+import ai.chat2db.community.web.api.model.request.db.DesktopImportFileRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+
+@Component
+public class ImportFileUploadAdapter {
+
+    private final IUploadFileService<MultipartFile> uploadFileService;
+
+    private final IImportFileStagingService importFileStagingService;
+
+    public ImportFileUploadAdapter(IUploadFileService<MultipartFile> uploadFileService,
+            IImportFileStagingService importFileStagingService) {
+        this.uploadFileService = uploadFileService;
+        this.importFileStagingService = importFileStagingService;
+    }
+
+    public String stage(MultipartFile upload) {
+        File transferredFile = null;
+        try {
+            transferredFile = uploadFileService.transferToTempFile(upload);
+            return importFileStagingService.stage(transferredFile, upload.getOriginalFilename());
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Could not store import file", e);
+        } finally {
+            if (transferredFile != null && transferredFile.isFile()) {
+                transferredFile.delete();
+            }
+        }
+    }
+
+    public String stageDesktopFile(DesktopImportFileRequest request) {
+        DesktopBridgeRequestContext.requireActive();
+        return importFileStagingService.stage(new File(request.getSourceFile()), request.getOriginalFileName());
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/ConsoleHelper.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/ConsoleHelper.java
index 30ce8faea0..e8aa0baf26 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/ConsoleHelper.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/ConsoleHelper.java
@@ -314,10 +314,10 @@ public static ConsoleResult doController(ConsoleMessage message) {
                     ActionResult result1 = ActionResult.fail(errorCode, errorCode, null);
                     result.setMessage(ConsoleObjectConverter.object2map(result1));
                     return result;
-                } else if (throwable instanceof BusinessException) {
+                } else if (throwable instanceof BusinessException businessException) {
                     log.error("BusinessException error, param {}", JSON.toJSONString(message), e);
-                    ActionResult result1 = ActionResult.fail(((BusinessException) throwable).getCode()
-                            , I18nUtils.getMessage(((BusinessException) throwable).getCode()), null);
+                    ActionResult result1 = ActionResult.fail(businessException.getCode(),
+                            I18nUtils.getMessage(businessException.getCode(), businessException.getArgs()), null);
                     result.setMessage(ConsoleObjectConverter.object2map(result1));
                     return result;
                 } else if (throwable instanceof SystemException) {
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/DesktopBridgeRequestContext.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/DesktopBridgeRequestContext.java
new file mode 100644
index 0000000000..5292e4bb9f
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/DesktopBridgeRequestContext.java
@@ -0,0 +1,35 @@
+package ai.chat2db.community.web.api.config.console;
+
+import ai.chat2db.community.tools.exception.BusinessException;
+
+import java.util.function.Supplier;
+
+public final class DesktopBridgeRequestContext {
+
+    private static final ThreadLocal<Boolean> ACTIVE = new ThreadLocal<>();
+
+    private DesktopBridgeRequestContext() {
+    }
+
+    public static <T> T invoke(Supplier<T> operation) {
+        boolean nested = isActive();
+        ACTIVE.set(true);
+        try {
+            return operation.get();
+        } finally {
+            if (!nested) {
+                ACTIVE.remove();
+            }
+        }
+    }
+
+    public static void requireActive() {
+        if (!isActive()) {
+            throw new BusinessException("common.permissionDenied");
+        }
+    }
+
+    static boolean isActive() {
+        return Boolean.TRUE.equals(ACTIVE.get());
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/WebJcefServerBridge.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/WebJcefServerBridge.java
index 19892dac17..00674ca3e9 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/WebJcefServerBridge.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/config/console/WebJcefServerBridge.java
@@ -33,7 +33,7 @@ public boolean isReady() {
 
     @Override
     public ConsoleResult doController(ConsoleMessage message) {
-        return ConsoleHelper.doController(message);
+        return DesktopBridgeRequestContext.invoke(() -> ConsoleHelper.doController(message));
     }
 
     @Override
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/AiChatController.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/AiChatController.java
index 61cfda20b1..cdbb824c0f 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/AiChatController.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/AiChatController.java
@@ -16,6 +16,7 @@
 import ai.chat2db.community.domain.api.service.ai.IAiModelConfigService;
 import ai.chat2db.community.domain.api.service.sys.IIdentityService;
 import ai.chat2db.community.web.api.model.request.ai.AiChatSessionDeleteRequest;
+import ai.chat2db.community.web.api.model.request.ai.AiChatSessionRenameRequest;
 import ai.chat2db.community.web.api.model.request.ai.ChatRequest;
 import ai.chat2db.community.web.api.model.request.ai.ParseLocalAttachmentRequest;
 import ai.chat2db.community.web.api.model.request.ai.ModelConfigDeleteRequest;
@@ -209,6 +210,19 @@ public ListResult<AiChatMessageResponse> listMessages(@RequestParam("sessionId")
         return ListResult.of(chatConverter.message2response(messages));
     }
 
+    /**
+     * Renames a session owned by the current user.
+     *
+     * @param request session identifier and new title.
+     * @return operation result for the request.
+     */
+    @PostMapping("/chat/history/session/rename")
+    public ActionResult renameSession(@RequestBody @Valid AiChatSessionRenameRequest request) {
+        Long userId = identityService.currentUserId();
+        aiChatHistoryService.renameSession(request.getId(), userId, request.getTitle());
+        return ActionResult.isSuccess();
+    }
+
     /**
      * Deletes session.
      * <p>
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbActiveTransactionController.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbActiveTransactionController.java
new file mode 100644
index 0000000000..f2f3c6ac63
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbActiveTransactionController.java
@@ -0,0 +1,38 @@
+package ai.chat2db.community.web.api.controller;
+
+import ai.chat2db.community.domain.api.model.transaction.ActiveTransaction;
+import ai.chat2db.community.domain.api.service.db.IDbActiveTransactionService;
+import ai.chat2db.community.tools.wrapper.result.DataResult;
+import ai.chat2db.community.web.api.aspect.connection.ConnectionInfoAspect;
+import ai.chat2db.community.web.api.model.request.data.source.DataSourceBaseRequest;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Exposes active InnoDB transaction inspection (MYSQL-OPS-002).
+ */
+@ConnectionInfoAspect
+@RequestMapping("/api/rdb/active_transaction")
+@RestController
+public class DbActiveTransactionController {
+
+    @Autowired
+    private IDbActiveTransactionService activeTransactionService;
+
+    /**
+     * Lists active InnoDB transactions.
+     * <p>
+     * Endpoint: {@code GET /api/rdb/active_transaction/list}.
+     *
+     * @return active transactions.
+     */
+    @GetMapping("/list")
+    public DataResult<List<ActiveTransaction>> list(@Valid DataSourceBaseRequest request) {
+        return DataResult.of(activeTransactionService.activeTransactions());
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbDataSourceController.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbDataSourceController.java
index c0d248a3b0..a362e2aff4 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbDataSourceController.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbDataSourceController.java
@@ -195,14 +195,14 @@ public DataResult<DataSourceResponse> queryById(@RequestParam("id") Long id) {
     /**
      * Closes datasource connections by request parameters.
      * <p>
-     * Endpoint: {@code GET /api/connection/close}.
+     * Endpoint: {@code POST /api/connection/close}.
      *
-     * @param id identifier used to locate the target resource.
+     * @param request request containing the identifier of the connection to close.
      * @return operation result for the request.
      */
-    @GetMapping("/close")
-    public ActionResult closeConnection(@RequestParam("id") Long id) {
-        dataSourceService.removeConnection(id);
+    @PostMapping("/close")
+    public ActionResult closeConnection(@RequestBody @Valid DataSourceCloseRequest request) {
+        dataSourceService.removeConnection(request.getId());
         return ActionResult.isSuccess();
     }
 
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbImportPreviewController.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbImportPreviewController.java
new file mode 100644
index 0000000000..aa447a7f59
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbImportPreviewController.java
@@ -0,0 +1,75 @@
+package ai.chat2db.community.web.api.controller;
+
+import ai.chat2db.community.domain.api.model.db.ImportPreview;
+import ai.chat2db.community.domain.api.service.db.IDbImportPreviewService;
+import ai.chat2db.community.domain.api.service.db.IDbMappedImportService;
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
+import ai.chat2db.community.tools.wrapper.result.DataResult;
+import ai.chat2db.community.web.api.adapter.db.ImportFileUploadAdapter;
+import ai.chat2db.community.web.api.aspect.connection.ConnectionInfoAspect;
+import ai.chat2db.community.web.api.converter.db.DbImportWebConverter;
+import ai.chat2db.community.web.api.model.request.db.DesktopImportFileRequest;
+import ai.chat2db.community.web.api.model.request.db.ImportExecuteRequest;
+import ai.chat2db.community.web.api.model.request.db.ImportPreviewRequest;
+import ai.chat2db.community.web.api.model.response.task.TaskSubmitResponse;
+import jakarta.validation.Valid;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * Database-independent, bounded import preview and column mapping. Preview and execution
+ * share the same parser; nothing is written during preview.
+ */
+@ConnectionInfoAspect
+@RequestMapping("/api/rdb/import_preview")
+@RestController
+public class DbImportPreviewController {
+
+    private final IDbImportPreviewService importPreviewService;
+
+    private final IDbMappedImportService mappedImportService;
+
+    private final IImportFileStagingService importFileStagingService;
+
+    private final DbImportWebConverter importWebConverter;
+
+    private final ImportFileUploadAdapter importFileUploadAdapter;
+
+    public DbImportPreviewController(IDbImportPreviewService importPreviewService,
+            IDbMappedImportService mappedImportService,
+            IImportFileStagingService importFileStagingService, DbImportWebConverter importWebConverter,
+            ImportFileUploadAdapter importFileUploadAdapter) {
+        this.importPreviewService = importPreviewService;
+        this.mappedImportService = mappedImportService;
+        this.importFileStagingService = importFileStagingService;
+        this.importWebConverter = importWebConverter;
+        this.importFileUploadAdapter = importFileUploadAdapter;
+    }
+
+    @PostMapping("/upload")
+    public DataResult<String> upload(@RequestParam("file") MultipartFile file) {
+        return DataResult.of(importFileUploadAdapter.stage(file));
+    }
+
+    @PostMapping("/upload_local")
+    public DataResult<String> uploadDesktopFile(@Valid @RequestBody DesktopImportFileRequest request) {
+        return DataResult.of(importFileUploadAdapter.stageDesktopFile(request));
+    }
+
+    @PostMapping("/preview")
+    public DataResult<ImportPreview> preview(@Valid @RequestBody ImportPreviewRequest request) {
+        return DataResult.of(importPreviewService.preview(request.getDataSourceId(), request.getDatabaseName(),
+                request.getSchemaName(), request.getTableName(), importFileStagingService.resolve(request.getFileId()),
+                request.getCsvOptions()));
+    }
+
+    @PostMapping("/execute")
+    public DataResult<TaskSubmitResponse> execute(@Valid @RequestBody ImportExecuteRequest request) {
+        return DataResult.of(new TaskSubmitResponse(
+                mappedImportService.submit(importWebConverter.toMappedImportExecution(request))));
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbTableController.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbTableController.java
index b539efd807..3767843453 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbTableController.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/DbTableController.java
@@ -284,6 +284,12 @@ public ActionResult truncate(@RequestBody TableDetailQueryRequest request) {
         return ActionResult.isSuccess();
     }
 
+    /** Returns a suggested target name without creating a table or copying data. */
+    @GetMapping("/copy/prepare")
+    public DataResult<String> prepareCopy(@Valid TableDetailQueryRequest request) {
+        return DataResult.of(tableService.prepareCopyTable(request.getTableName()));
+    }
+
     /**
      * Copies tables.
      * <p>
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/TaskController.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/TaskController.java
index a2134fd2f3..a5da0a9c7d 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/TaskController.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/controller/TaskController.java
@@ -4,6 +4,7 @@
 import ai.chat2db.community.domain.api.model.task.Task;
 import ai.chat2db.community.domain.api.model.task.TaskEvent;
 import ai.chat2db.community.domain.api.model.task.TaskQuery;
+import ai.chat2db.community.domain.api.service.task.IImportTaskSubmissionService;
 import ai.chat2db.community.domain.api.service.task.TaskService;
 import ai.chat2db.community.tools.wrapper.result.ActionResult;
 import ai.chat2db.community.tools.wrapper.result.DataResult;
@@ -39,11 +40,15 @@ public class TaskController {
 
     private final TaskDownloadWebConverter taskDownloadWebConverter;
 
+    private final IImportTaskSubmissionService importTaskSubmissionService;
+
     public TaskController(TaskService taskService, TaskWebConverter taskWebConverter,
-            TaskDownloadWebConverter taskDownloadWebConverter) {
+            TaskDownloadWebConverter taskDownloadWebConverter,
+            IImportTaskSubmissionService importTaskSubmissionService) {
         this.taskService = taskService;
         this.taskWebConverter = taskWebConverter;
         this.taskDownloadWebConverter = taskDownloadWebConverter;
+        this.importTaskSubmissionService = importTaskSubmissionService;
     }
 
     @PostMapping("/export")
@@ -54,7 +59,8 @@ public DataResult<TaskSubmitResponse> submitExport(@Valid @RequestBody TaskExpor
 
     @PostMapping("/import")
     public DataResult<TaskSubmitResponse> submitImport(@Valid @RequestBody TaskImportRequest request) {
-        Long taskId = taskService.submitImport(taskWebConverter.importRequest2spec(request));
+        Long taskId = importTaskSubmissionService.submit(
+                taskWebConverter.importRequest2spec(request), request.getFileId());
         return DataResult.of(new TaskSubmitResponse(taskId));
     }
 
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/ai/ChatConverter.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/ai/ChatConverter.java
index f360903858..ce4b0b2f6a 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/ai/ChatConverter.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/ai/ChatConverter.java
@@ -1,9 +1,7 @@
 package ai.chat2db.community.web.api.converter.ai;
 
 import ai.chat2db.community.domain.api.model.request.ai.AiModelConfigSaveRequest;
-import ai.chat2db.community.domain.api.model.request.ai.AiBusinessContextBuildRequest;
 import ai.chat2db.community.domain.api.model.request.ai.AiChatRuntimeResolveRequest;
-import ai.chat2db.community.domain.api.model.request.ai.AiSelectedKnowledge;
 import ai.chat2db.community.domain.api.model.ai.AiChatMessage;
 import ai.chat2db.community.domain.api.model.ai.AiChatSession;
 import ai.chat2db.community.domain.api.model.ai.ChatAttachment;
@@ -47,25 +45,6 @@ public AiChatRuntimeResolveRequest toRuntimeResolveParam(ChatRequest request) {
         return param;
     }
 
-    public AiBusinessContextBuildRequest toBusinessContextParam(ChatRequest request) {
-        AiBusinessContextBuildRequest param = new AiBusinessContextBuildRequest();
-        if (request == null) {
-            return param;
-        }
-        param.setDataSourceId(request.getDataSourceId());
-        param.setDatabaseName(request.getDatabaseName());
-        param.setSchemaName(request.getSchemaName());
-        param.setSelectedKnowledge(request.getSelectedKnowledge() == null
-                ? List.of()
-                : request.getSelectedKnowledge().stream().map(source -> {
-                    AiSelectedKnowledge selected = new AiSelectedKnowledge();
-                    selected.setId(source.getId());
-                    selected.setType(source.getType());
-                    return selected;
-                }).toList());
-        return param;
-    }
-
     public AiModelConfigSaveRequest toModelConfigParam(ModelConfigSaveRequest request) {
         AiModelConfigSaveRequest param =
                 new AiModelConfigSaveRequest();
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/db/DbImportWebConverter.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/db/DbImportWebConverter.java
new file mode 100644
index 0000000000..225e65625a
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/db/DbImportWebConverter.java
@@ -0,0 +1,22 @@
+package ai.chat2db.community.web.api.converter.db;
+
+import ai.chat2db.community.domain.api.model.db.MappedImportExecution;
+import ai.chat2db.community.web.api.model.request.db.ImportExecuteRequest;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DbImportWebConverter {
+
+    public MappedImportExecution toMappedImportExecution(ImportExecuteRequest request) {
+        return MappedImportExecution.builder()
+                .dataSourceId(request.getDataSourceId())
+                .databaseName(request.getDatabaseName())
+                .schemaName(request.getSchemaName())
+                .tableName(request.getTableName())
+                .fileId(request.getFileId())
+                .csvOptions(request.getCsvOptions())
+                .mappings(request.getMappings())
+                .unmappedTarget(request.getUnmappedTarget())
+                .build();
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/task/TaskWebConverter.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/task/TaskWebConverter.java
index 5adecc94dd..4669cb3597 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/task/TaskWebConverter.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/converter/task/TaskWebConverter.java
@@ -2,6 +2,7 @@
 
 import ai.chat2db.community.domain.api.enums.ExportSizeEnum;
 import ai.chat2db.community.domain.api.enums.ExportScopeTypeEnum;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
 import ai.chat2db.community.domain.api.model.task.ExportTaskSpec;
 import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
 import ai.chat2db.community.domain.api.model.task.TaskFileFormat;
@@ -61,9 +62,17 @@ public ImportTaskSpec importRequest2spec(TaskImportRequest request) {
                 .displayFileName(StringUtils.defaultIfBlank(request.getDisplayFileName(), fileName(sourceFile)))
                 .format(format)
                 .dataTimeFormat(request.getDataTimeFormat())
+                .csvOptions(csvOptions(format, request.getCsvOptions()))
                 .build();
     }
 
+    private CsvOptions csvOptions(String format, CsvOptions csvOptions) {
+        if (!TaskFileFormat.CSV.name().equals(format)) {
+            return null;
+        }
+        return (csvOptions == null ? CsvOptions.defaults() : csvOptions).validate();
+    }
+
     private String resolveExportTaskType(TaskExportRequest request) {
         if (StringUtils.isNotBlank(request.getTaskType())) {
             TaskType taskType = TaskType.valueOf(normalize(request.getTaskType()));
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/AiChatSessionRenameRequest.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/AiChatSessionRenameRequest.java
new file mode 100644
index 0000000000..b6c79119d0
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/AiChatSessionRenameRequest.java
@@ -0,0 +1,16 @@
+package ai.chat2db.community.web.api.model.request.ai;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Data
+public class AiChatSessionRenameRequest {
+
+    @NotBlank
+    private String id;
+
+    @NotBlank
+    @Size(max = 50)
+    private String title;
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/ChatRequest.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/ChatRequest.java
index 5b557f7c2a..a3172bdc0e 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/ChatRequest.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/ChatRequest.java
@@ -27,9 +27,6 @@ public class ChatRequest {
     @Valid
     private List<ChatAttachment> attachments = new ArrayList<>();
 
-    @Valid
-    private List<SelectedKnowledgeRequest> selectedKnowledge = new ArrayList<>();
-
 
     private Long dataSourceId;
 
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/SelectedKnowledgeRequest.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/SelectedKnowledgeRequest.java
deleted file mode 100644
index 313bb8770b..0000000000
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/ai/SelectedKnowledgeRequest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ai.chat2db.community.web.api.model.request.ai;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Data
-public class SelectedKnowledgeRequest {
-
-    @NotNull
-    private Long id;
-
-    @NotBlank
-    private String type;
-}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/DesktopImportFileRequest.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/DesktopImportFileRequest.java
new file mode 100644
index 0000000000..781614b148
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/DesktopImportFileRequest.java
@@ -0,0 +1,14 @@
+package ai.chat2db.community.web.api.model.request.db;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class DesktopImportFileRequest {
+
+    @NotBlank
+    private String sourceFile;
+
+    @NotBlank
+    private String originalFileName;
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/ImportExecuteRequest.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/ImportExecuteRequest.java
new file mode 100644
index 0000000000..6790fb18f7
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/ImportExecuteRequest.java
@@ -0,0 +1,26 @@
+package ai.chat2db.community.web.api.model.request.db;
+
+import ai.chat2db.community.domain.api.model.task.ImportColumnMapping;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.domain.api.model.task.UnmappedTargetStrategy;
+import ai.chat2db.community.web.api.model.request.data.source.DataSourceBaseRequest;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ImportExecuteRequest extends DataSourceBaseRequest {
+
+    @NotBlank
+    private String tableName;
+
+    @NotBlank
+    private String fileId;
+
+    private CsvOptions csvOptions;
+
+    private List<ImportColumnMapping> mappings;
+
+    private UnmappedTargetStrategy unmappedTarget;
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/ImportPreviewRequest.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/ImportPreviewRequest.java
new file mode 100644
index 0000000000..34f29bdf85
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/ImportPreviewRequest.java
@@ -0,0 +1,18 @@
+package ai.chat2db.community.web.api.model.request.db;
+
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
+import ai.chat2db.community.web.api.model.request.data.source.DataSourceBaseRequest;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class ImportPreviewRequest extends DataSourceBaseRequest {
+
+    @NotBlank
+    private String tableName;
+
+    @NotBlank
+    private String fileId;
+
+    private CsvOptions csvOptions;
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/SelectResultUpdateRequest.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/SelectResultUpdateRequest.java
index 9f42e44ea4..062725c5ac 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/SelectResultUpdateRequest.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/db/SelectResultUpdateRequest.java
@@ -5,7 +5,6 @@
 import ai.chat2db.community.web.api.model.request.data.source.IDataSourceConsoleRequestInfo;
 import ai.chat2db.community.domain.api.model.result.Header;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;
@@ -25,7 +24,6 @@ public class SelectResultUpdateRequest extends DataSourceBaseRequest implements
     private String tableName;
 
 
-    @NotNull
     private Long consoleId;
 
 
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/task/TaskImportRequest.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/task/TaskImportRequest.java
index 79665cc7cf..6672f792f7 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/task/TaskImportRequest.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/request/task/TaskImportRequest.java
@@ -1,6 +1,7 @@
 package ai.chat2db.community.web.api.model.request.task;
 
 import ai.chat2db.community.web.api.model.request.data.source.DataSourceBaseRequest;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
 import lombok.Data;
 
 @Data
@@ -14,9 +15,13 @@ public class TaskImportRequest extends DataSourceBaseRequest {
 
     private String sourceFile;
 
+    private String fileId;
+
     private String displayFileName;
 
     private String format;
 
     private String dataTimeFormat;
+
+    private CsvOptions csvOptions;
 }
diff --git a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/response/ai/AiChatMessageResponse.java b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/response/ai/AiChatMessageResponse.java
index 877af9c489..bae5eaed0b 100644
--- a/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/response/ai/AiChatMessageResponse.java
+++ b/chat2db-community-server/chat2db-community-web/src/main/java/ai/chat2db/community/web/api/model/response/ai/AiChatMessageResponse.java
@@ -1,7 +1,6 @@
 package ai.chat2db.community.web.api.model.response.ai;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import ai.chat2db.community.domain.api.model.request.ai.AiSelectedKnowledge;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -23,8 +22,6 @@ public class AiChatMessageResponse {
 
     private List<ai.chat2db.community.domain.api.model.ai.ChatAttachment> attachments = new ArrayList<>();
 
-    private List<AiSelectedKnowledge> selectedKnowledge = new ArrayList<>();
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime gmtCreate;
 }
diff --git a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/adapter/ai/AiChatStreamAdapterScenarioTest.java b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/adapter/ai/AiChatStreamAdapterScenarioTest.java
index 770f26d55c..8a807f48f4 100644
--- a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/adapter/ai/AiChatStreamAdapterScenarioTest.java
+++ b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/adapter/ai/AiChatStreamAdapterScenarioTest.java
@@ -1,16 +1,8 @@
 package ai.chat2db.community.web.api.adapter.ai;
 
-import ai.chat2db.community.domain.api.model.ai.AiChatMessage;
-import ai.chat2db.community.domain.api.model.ai.AiChatSession;
-import ai.chat2db.community.domain.api.model.request.ai.AiChatMessageAddRequest;
-import ai.chat2db.community.domain.api.model.request.ai.AiSelectedKnowledge;
-import ai.chat2db.community.domain.api.service.ai.IAiChatHistoryService;
 import ai.chat2db.community.web.api.model.request.ai.ChatRequest;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.Method;
-import java.util.List;
-
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -45,43 +37,12 @@ void persistHistoryDefaultsToTrueAndCanBeDisabledForOneShotScenarios() {
 
     @Test
     void sensitiveLogTextIsReducedToLengthOnly() {
-        String secretPrompt = "enterprise knowledge and customer values";
+        String secretPrompt = "private context and customer values";
 
         assertEquals(secretPrompt.length(), AiChatStreamAdapter.textLength(secretPrompt));
         assertEquals(0, AiChatStreamAdapter.textLength(null));
     }
 
-    @Test
-    void persistsServerResolvedKnowledgeSnapshotWithUserMessage() throws Exception {
-        RecordingHistoryService historyService = new RecordingHistoryService();
-        AiChatStreamAdapter adapter = adapter(historyService);
-        ChatRequest request = existingSessionRequest();
-        AiSelectedKnowledge knowledge = new AiSelectedKnowledge();
-        knowledge.setId(186L);
-        knowledge.setType("KNOWLEDGE_TERM");
-        knowledge.setKey("三全水饺");
-        knowledge.setValue("速冻水饺商品集合");
-
-        invokePrepareSession(adapter, request, List.of(knowledge));
-
-        assertEquals(1, historyService.addedMessages.size());
-        AiSelectedKnowledge persisted = historyService.addedMessages.get(0).getSelectedKnowledge().get(0);
-        assertEquals(186L, persisted.getId());
-        assertEquals("KNOWLEDGE_TERM", persisted.getType());
-        assertEquals("三全水饺", persisted.getKey());
-        assertEquals("速冻水饺商品集合", persisted.getValue());
-    }
-
-    @Test
-    void doesNotInventKnowledgeWhenResolvedSnapshotIsEmpty() throws Exception {
-        RecordingHistoryService historyService = new RecordingHistoryService();
-
-        invokePrepareSession(adapter(historyService), existingSessionRequest(), List.of());
-
-        assertEquals(1, historyService.addedMessages.size());
-        assertTrue(historyService.addedMessages.get(0).getSelectedKnowledge().isEmpty());
-    }
-
     private void assertPromptContains(String questionType, String expected) {
         ChatRequest request = new ChatRequest();
         request.setQuestionType(questionType);
@@ -94,57 +55,4 @@ private void assertPromptIsEmpty(String questionType) {
         assertTrue(AiChatStreamAdapter.buildQuestionTypePrompt(request).isEmpty());
     }
 
-    private AiChatStreamAdapter adapter(IAiChatHistoryService historyService) {
-        return new AiChatStreamAdapter(null, null, new AiToolAdapter(null, null), historyService,
-                null, null, null, null, null);
-    }
-
-    private ChatRequest existingSessionRequest() {
-        ChatRequest request = new ChatRequest();
-        request.setSessionId("session-1");
-        request.setInput("查询销量");
-        return request;
-    }
-
-    private void invokePrepareSession(AiChatStreamAdapter adapter, ChatRequest request,
-                                      List<AiSelectedKnowledge> selectedKnowledge) throws Exception {
-        Method method = AiChatStreamAdapter.class.getDeclaredMethod(
-                "prepareSession", ChatRequest.class, Long.class, List.class);
-        method.setAccessible(true);
-        method.invoke(adapter, request, 35L, selectedKnowledge);
-    }
-
-    private static class RecordingHistoryService implements IAiChatHistoryService {
-        private final List<AiChatMessageAddRequest> addedMessages = new java.util.ArrayList<>();
-
-        @Override
-        public AiChatSession createSession(Long userId, String firstMessage) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public AiChatMessage addMessage(AiChatMessageAddRequest request) {
-            addedMessages.add(request);
-            return new AiChatMessage();
-        }
-
-        @Override
-        public List<AiChatSession> listSessions(Long userId) {
-            return List.of();
-        }
-
-        @Override
-        public List<AiChatMessage> getMessages(String sessionId, Long userId) {
-            return List.of();
-        }
-
-        @Override
-        public List<AiChatMessage> getHistoryForAI(String sessionId, Long userId) {
-            return List.of();
-        }
-
-        @Override
-        public void deleteSession(String sessionId, Long userId) {
-        }
-    }
 }
diff --git a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/adapter/db/ImportFileUploadAdapterTest.java b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/adapter/db/ImportFileUploadAdapterTest.java
new file mode 100644
index 0000000000..1abe5cc092
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/adapter/db/ImportFileUploadAdapterTest.java
@@ -0,0 +1,63 @@
+package ai.chat2db.community.web.api.adapter.db;
+
+import ai.chat2db.community.domain.api.service.file.IImportFileStagingService;
+import ai.chat2db.community.tools.exception.BusinessException;
+import ai.chat2db.community.web.api.config.console.DesktopBridgeRequestContext;
+import ai.chat2db.community.web.api.model.request.db.DesktopImportFileRequest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class ImportFileUploadAdapterTest {
+
+    @Test
+    void stagesDesktopFileOnlyInsideJcefBridge(@TempDir Path directory) throws Exception {
+        File selectedFile = Files.writeString(directory.resolve("users.csv"), "name\nAda\n").toFile();
+        RecordingStagingService stagingService = new RecordingStagingService();
+        ImportFileUploadAdapter adapter = new ImportFileUploadAdapter(null, stagingService);
+        DesktopImportFileRequest request = new DesktopImportFileRequest();
+        request.setSourceFile(selectedFile.getAbsolutePath());
+        request.setOriginalFileName("users.csv");
+
+        assertThrows(BusinessException.class, () -> adapter.stageDesktopFile(request));
+
+        String fileId = DesktopBridgeRequestContext.invoke(() -> adapter.stageDesktopFile(request));
+        assertEquals("file-id", fileId);
+        assertEquals(selectedFile, stagingService.sourceFile);
+        assertEquals("users.csv", stagingService.originalFileName);
+    }
+
+    private static final class RecordingStagingService implements IImportFileStagingService {
+
+        private File sourceFile;
+        private String originalFileName;
+
+        @Override
+        public String stage(File file, String fileName) {
+            sourceFile = file;
+            originalFileName = fileName;
+            return "file-id";
+        }
+
+        @Override
+        public File resolve(String fileId) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void claimForTask(String fileId) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void release(String fileId) {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/config/console/DesktopBridgeRequestContextTest.java b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/config/console/DesktopBridgeRequestContextTest.java
new file mode 100644
index 0000000000..cd1414fa44
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/config/console/DesktopBridgeRequestContextTest.java
@@ -0,0 +1,34 @@
+package ai.chat2db.community.web.api.config.console;
+
+import ai.chat2db.community.tools.exception.BusinessException;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class DesktopBridgeRequestContextTest {
+
+    @Test
+    void marksOnlyTheCurrentBridgeInvocationAsActive() {
+        assertFalse(DesktopBridgeRequestContext.isActive());
+
+        DesktopBridgeRequestContext.invoke(() -> {
+            assertTrue(DesktopBridgeRequestContext.isActive());
+            DesktopBridgeRequestContext.requireActive();
+            return null;
+        });
+
+        assertFalse(DesktopBridgeRequestContext.isActive());
+        assertThrows(BusinessException.class, DesktopBridgeRequestContext::requireActive);
+    }
+
+    @Test
+    void clearsContextWhenBridgeInvocationFails() {
+        assertThrows(IllegalStateException.class, () -> DesktopBridgeRequestContext.invoke(() -> {
+            throw new IllegalStateException("failed");
+        }));
+
+        assertFalse(DesktopBridgeRequestContext.isActive());
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/controller/DbActiveTransactionControllerTest.java b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/controller/DbActiveTransactionControllerTest.java
new file mode 100644
index 0000000000..3d2bbdceec
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/controller/DbActiveTransactionControllerTest.java
@@ -0,0 +1,18 @@
+package ai.chat2db.community.web.api.controller;
+
+import ai.chat2db.community.web.api.model.request.data.source.DataSourceBaseRequest;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Method;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class DbActiveTransactionControllerTest {
+
+    @Test
+    void listRequestExposesDatasourceContextToConnectionAspect() throws Exception {
+        Method method = DbActiveTransactionController.class.getMethod("list", DataSourceBaseRequest.class);
+
+        assertEquals(DataSourceBaseRequest.class, method.getParameterTypes()[0]);
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/controller/DbDataSourceControllerTest.java b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/controller/DbDataSourceControllerTest.java
new file mode 100644
index 0000000000..d848b2862e
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/controller/DbDataSourceControllerTest.java
@@ -0,0 +1,53 @@
+package ai.chat2db.community.web.api.controller;
+
+import ai.chat2db.community.domain.api.service.db.IDbDataSourceService;
+import ai.chat2db.community.web.api.model.request.data.source.DataSourceCloseRequest;
+import jakarta.validation.Valid;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class DbDataSourceControllerTest {
+
+    @Test
+    void closeConnectionUsesPostBodyAndDelegatesConnectionId() throws Exception {
+        AtomicReference<Long> closedConnectionId = new AtomicReference<>();
+        IDbDataSourceService dataSourceService = (IDbDataSourceService) Proxy.newProxyInstance(
+                getClass().getClassLoader(),
+                new Class<?>[] {IDbDataSourceService.class},
+                (proxy, method, args) -> {
+                    if ("removeConnection".equals(method.getName())) {
+                        closedConnectionId.set((Long) args[0]);
+                        return null;
+                    }
+                    throw new UnsupportedOperationException(method.getName());
+                });
+        DbDataSourceController controller = new DbDataSourceController(dataSourceService, null, null, null, null);
+        DataSourceCloseRequest request = new DataSourceCloseRequest();
+        request.setId(42L);
+
+        controller.closeConnection(request);
+
+        assertEquals(42L, closedConnectionId.get());
+
+        Method closeConnection = DbDataSourceController.class.getMethod(
+                "closeConnection", DataSourceCloseRequest.class);
+        PostMapping postMapping = closeConnection.getAnnotation(PostMapping.class);
+        assertNotNull(postMapping);
+        assertArrayEquals(new String[] {"/close"}, postMapping.value());
+        assertNull(closeConnection.getAnnotation(GetMapping.class));
+        assertTrue(closeConnection.getParameters()[0].isAnnotationPresent(RequestBody.class));
+        assertTrue(closeConnection.getParameters()[0].isAnnotationPresent(Valid.class));
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/converter/operation/log/OperationLogConverterTest.java b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/converter/operation/log/OperationLogConverterTest.java
new file mode 100644
index 0000000000..6d8c7315c2
--- /dev/null
+++ b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/converter/operation/log/OperationLogConverterTest.java
@@ -0,0 +1,32 @@
+package ai.chat2db.community.web.api.converter.operation.log;
+
+import ai.chat2db.community.domain.api.model.request.operation.OpsOperationLogPageQueryRequest;
+import ai.chat2db.community.web.api.model.request.operation.log.OperationLogQueryRequest;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class OperationLogConverterTest {
+
+    private final OperationLogConverter converter = new OperationLogConverterImpl();
+
+    @Test
+    void request2paramCarriesOperationTypeAndScopeFilters() {
+        OperationLogQueryRequest request = new OperationLogQueryRequest();
+        request.setPageNo(1);
+        request.setPageSize(20);
+        request.setSearchKey("from orders");
+        request.setDataSourceId(7L);
+        request.setDatabaseName("warehouse");
+        request.setSchemaName("analytics");
+        request.setOperationType("SQL_EXECUTE");
+
+        OpsOperationLogPageQueryRequest param = converter.request2param(request);
+
+        assertEquals("SQL_EXECUTE", param.getOperationType());
+        assertEquals("from orders", param.getSearchKey());
+        assertEquals(7L, param.getDataSourceId());
+        assertEquals("warehouse", param.getDatabaseName());
+        assertEquals("analytics", param.getSchemaName());
+    }
+}
diff --git a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/converter/task/TaskWebConverterTest.java b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/converter/task/TaskWebConverterTest.java
index 9a9a7b47f8..2de000e477 100644
--- a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/converter/task/TaskWebConverterTest.java
+++ b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/converter/task/TaskWebConverterTest.java
@@ -4,8 +4,10 @@
 import ai.chat2db.community.domain.api.enums.ExportScopeTypeEnum;
 import ai.chat2db.community.domain.api.model.task.ExportTaskSpec;
 import ai.chat2db.community.domain.api.model.task.ImportTaskSpec;
+import ai.chat2db.community.domain.api.model.task.CsvOptions;
 import ai.chat2db.community.domain.api.model.task.TaskFileFormat;
 import ai.chat2db.community.domain.api.model.task.TaskType;
+import ai.chat2db.community.tools.exception.BusinessException;
 import ai.chat2db.community.web.api.model.request.task.TaskExportRequest;
 import ai.chat2db.community.web.api.model.request.task.TaskImportRequest;
 import org.junit.jupiter.api.Test;
@@ -13,6 +15,7 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class TaskWebConverterTest {
 
@@ -103,8 +106,71 @@ void distinguishesDataAndSqlFileImports() {
         ImportTaskSpec dataSpec = converter.importRequest2spec(dataRequest);
         ImportTaskSpec sqlSpec = converter.importRequest2spec(sqlRequest);
 
-        assertEquals("Import table data - app.orders", dataSpec.getTaskName());
-        assertEquals("Import SQL file - app.orders", sqlSpec.getTaskName());
+        assertEquals("Import table data - app.public.orders", dataSpec.getTaskName());
+        assertEquals("public", dataSpec.getTarget().getSchemaName());
+        assertEquals("Import SQL file - app.public.orders", sqlSpec.getTaskName());
+    }
+
+    @Test
+    void preservesValidatedCsvOptionsForImportTasks() {
+        CsvOptions csvOptions = CsvOptions.builder()
+                .encoding("AUTO")
+                .delimiter("|")
+                .quote("\"")
+                .escape("\\")
+                .newline("CRLF")
+                .hasHeader(true)
+                .emptyAsNull(true)
+                .headerRow(3)
+                .dataStartRow(4)
+                .dataEndRow(20)
+                .dateOrder("DMY")
+                .dateTimeOrder("TIME_TIMEZONE_DATE")
+                .dateDelimiter("/")
+                .timeDelimiter(":")
+                .decimalSymbol(",")
+                .build();
+        TaskImportRequest importRequest = importRequest(TaskType.DATA_FILE_IMPORT.name());
+        importRequest.setCsvOptions(csvOptions);
+
+        ImportTaskSpec importSpec = converter.importRequest2spec(importRequest);
+
+        assertEquals("AUTO", importSpec.getCsvOptions().getEncoding());
+        assertEquals("\\", importSpec.getCsvOptions().getEscape());
+        assertEquals(3, importSpec.getCsvOptions().getHeaderRow());
+        assertEquals(20, importSpec.getCsvOptions().getDataEndRow());
+        assertEquals("DMY", importSpec.getCsvOptions().getDateOrder());
+        assertEquals("TIME_TIMEZONE_DATE", importSpec.getCsvOptions().getDateTimeOrder());
+        assertEquals(",", importSpec.getCsvOptions().getDecimalSymbol());
+    }
+
+    @Test
+    void rejectsUnsupportedCsvOptionsBeforeTaskSubmission() {
+        TaskImportRequest request = importRequest(TaskType.DATA_FILE_IMPORT.name());
+        request.setCsvOptions(CsvOptions.builder()
+                .encoding("UTF-8")
+                .delimiter(",")
+                .quote("\"")
+                .escape("\n")
+                .newline("LF")
+                .hasHeader(true)
+                .emptyAsNull(true)
+                .build());
+
+        assertEquals("import.preview.invalidCsvOptions",
+                assertThrows(BusinessException.class, () -> converter.importRequest2spec(request)).getCode());
+
+        request.setCsvOptions(CsvOptions.builder()
+                .encoding("NO_SUCH_CHARSET")
+                .delimiter(",")
+                .quote("\"")
+                .escape("\"")
+                .newline("LF")
+                .hasHeader(true)
+                .emptyAsNull(true)
+                .build());
+        assertEquals("import.preview.invalidEncoding",
+                assertThrows(BusinessException.class, () -> converter.importRequest2spec(request)).getCode());
     }
 
     private TaskExportRequest exportRequest(String taskType, String databaseName, String tableName) {
@@ -120,6 +186,7 @@ private TaskImportRequest importRequest(String taskType) {
         TaskImportRequest request = new TaskImportRequest();
         request.setTaskType(taskType);
         request.setDatabaseName("app");
+        request.setSchemaName("public");
         request.setTableName("orders");
         request.setSourceFile("/tmp/orders.csv");
         request.setFormat(TaskType.SQL_FILE_IMPORT.name().equals(taskType)
diff --git a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/model/request/db/DmlExecutionRequestValidationTest.java b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/model/request/db/DmlExecutionRequestValidationTest.java
index 3b8fdeaada..1e4a84860b 100644
--- a/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/model/request/db/DmlExecutionRequestValidationTest.java
+++ b/chat2db-community-server/chat2db-community-web/src/test/java/ai/chat2db/community/web/api/model/request/db/DmlExecutionRequestValidationTest.java
@@ -1,11 +1,13 @@
 package ai.chat2db.community.web.api.model.request.db;
 
+import ai.chat2db.community.domain.api.model.request.db.SelectResultOperation;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -68,6 +70,15 @@ void tableEditExecutionOnlyRequiresSqlAndDatasourceContext() {
         assertValid(request);
     }
 
+    @Test
+    void resultEditPreviewDoesNotRequireConsoleContext() {
+        SelectResultUpdateRequest request = new SelectResultUpdateRequest();
+        request.setDataSourceId(1L);
+        request.setOperations(List.of(new SelectResultOperation()));
+
+        assertValid(request);
+    }
+
     @Test
     void ddlExecutionDoesNotRequireATableTarget() {
         DdlExecuteRequest request = new DdlExecuteRequest();
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-001/README.md b/script/test-fixtures/mysql/MYSQL-IMPORT-001/README.md
new file mode 100644
index 0000000000..7d75b0a418
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-001/README.md
@@ -0,0 +1,34 @@
+# MYSQL-IMPORT-001: Import preview and column mapping
+
+## Fixture
+
+- `init.sql` creates `import001_contacts` (with defaults) and `import001_strict`
+  (NOT NULL `code` without a default) plus `import001_admin`.
+- `fixture_contacts.csv` — 3 rows matching the target columns by name.
+- `fixture_reordered.csv` — reordered columns (age,name,email).
+- `fixture_extra.csv` — an extra source column that must be skippable.
+- `fixture_missing_required.csv` — no field matching the required `code` column.
+- For XLS/XLSX, convert any fixture CSV with the same header/rows (a deterministic
+  large-file generator may produce a 1M-row CSV to verify the bounded preview).
+
+## Verification
+
+1. Connect as `import001_admin`; right-click `import001_contacts` -> Import Data,
+   choose `fixture_contacts.csv`.
+2. Verify the preview shows ten data rows at most and automatically maps name->name,
+   email->email, age->age (id unmapped, auto-increment). Target options show column comments.
+3. Execute — verify the summary reports 3 rows imported, 0 failed, and the rows are
+   readable from the table (note column uses its DEFAULT 'imported').
+4. Import `fixture_reordered.csv` — verify the auto mapping is still correct by name
+   (order does not matter), and rows import with age 28.
+5. Import `fixture_extra.csv` — verify extra_column is automatically set to "Skip field";
+   execute; verify the row imports and the extra column is ignored.
+6. Import `fixture_missing_required.csv` into `import001_strict` — verify the UI blocks
+   submission because `code` has no mapping. If the API is called directly, verify the task
+   fails and its transaction leaves no partial rows.
+7. Set unmapped strategy to DEFAULT on `import001_contacts` for a file missing `note` —
+   verify the note default is applied; with NULL strategy verify `note` becomes NULL.
+8. Feed a file with an invalid numeric `age` — verify the task fails, the batch error is
+   recorded, and the file-level transaction rolls back all rows.
+9. Feed a large CSV (generated) — verify only the bounded preview rows are shown and the
+   preview stays fast.
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-001/cleanup.sql b/script/test-fixtures/mysql/MYSQL-IMPORT-001/cleanup.sql
new file mode 100644
index 0000000000..861506569e
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-001/cleanup.sql
@@ -0,0 +1,3 @@
+-- MYSQL-IMPORT-001: Cleanup
+DROP DATABASE IF EXISTS `import001_test`;
+DROP USER IF EXISTS 'import001_admin'@'%';
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_contacts.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_contacts.csv
new file mode 100644
index 0000000000..b370ab7086
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_contacts.csv
@@ -0,0 +1,4 @@
+name,email,age
+Alice,alice@example.com,30
+Bob,bob@example.com,25
+Carol,,40
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_extra.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_extra.csv
new file mode 100644
index 0000000000..321c7afa43
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_extra.csv
@@ -0,0 +1,2 @@
+name,email,age,extra_column
+Eve,eve@example.com,35,ignored
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_missing_required.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_missing_required.csv
new file mode 100644
index 0000000000..5073d23d0e
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_missing_required.csv
@@ -0,0 +1,2 @@
+description
+Missing required code
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_reordered.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_reordered.csv
new file mode 100644
index 0000000000..63b866f198
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-001/fixture_reordered.csv
@@ -0,0 +1,2 @@
+age,name,email
+28,David,david@example.com
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-001/grants.sql b/script/test-fixtures/mysql/MYSQL-IMPORT-001/grants.sql
new file mode 100644
index 0000000000..ffe689216c
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-001/grants.sql
@@ -0,0 +1,4 @@
+-- MYSQL-IMPORT-001: Grants for test user
+-- INSERT on the target tables is required for import.
+GRANT INSERT ON `import001_test`.* TO 'import001_admin'@'%';
+FLUSH PRIVILEGES;
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-001/init.sql b/script/test-fixtures/mysql/MYSQL-IMPORT-001/init.sql
new file mode 100644
index 0000000000..57860b5717
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-001/init.sql
@@ -0,0 +1,23 @@
+-- MYSQL-IMPORT-001: Import preview and column mapping
+-- Test fixture: target tables (one with a NOT NULL no-default column) and an admin user.
+
+CREATE DATABASE IF NOT EXISTS `import001_test`;
+USE `import001_test`;
+
+CREATE TABLE IF NOT EXISTS `import001_contacts` (
+    `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
+    `name` VARCHAR(64) NOT NULL COMMENT 'Contact name',
+    `email` VARCHAR(128) DEFAULT NULL COMMENT 'Email address',
+    `age` INT DEFAULT NULL COMMENT 'Age',
+    `note` VARCHAR(255) DEFAULT 'imported' COMMENT 'Import note',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `import001_strict` (
+    `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
+    `code` VARCHAR(32) NOT NULL COMMENT 'Business code',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB;
+
+CREATE USER IF NOT EXISTS 'import001_admin'@'%' IDENTIFIED BY 'Import001_admin_2026';
+GRANT SELECT, INSERT, UPDATE, DELETE ON `import001_test`.* TO 'import001_admin'@'%';
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/README.md b/script/test-fixtures/mysql/MYSQL-IMPORT-002/README.md
new file mode 100644
index 0000000000..86135938c7
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/README.md
@@ -0,0 +1,34 @@
+# MYSQL-IMPORT-002: CSV encoding and format options
+
+## Fixture
+
+- `init.sql` creates `import002_items` plus `import002_admin`.
+- Byte-accurate CSV fixtures:
+  - `fixture_utf8.csv` — UTF-8 with a quoted value containing a comma
+  - `fixture_gb18030.csv` — GB18030-encoded Chinese text
+  - `fixture_latin1.csv` — ISO-8859-1 (José/café)
+  - `fixture_semicolon.csv` — semicolon delimiter with an embedded semicolon in quotes
+  - `fixture_tab.csv` — tab delimiter
+  - `fixture_no_header.csv` — no header row
+  - `fixture_crlf.csv` — CRLF line endings with an embedded newline in a quoted field
+  - `fixture_bad_quote.csv` — unclosed quote (must be rejected before any write)
+
+## Verification
+
+1. Connect as `import002_admin`; import `fixture_utf8.csv` — verify the preview shows the
+   Chinese value correctly and the quoted value `quoted "value"` stays in one field.
+2. Import `fixture_gb18030.csv` with encoding GB18030 — verify no character corruption and
+   the row imports as 张伟/中文备注.
+3. Import `fixture_latin1.csv` with encoding ISO-8859-1 — verify José/café import correctly.
+4. Import `fixture_semicolon.csv` with delimiter `;` — verify the field `hello; world`
+   remains a single value.
+5. Import `fixture_tab.csv` with delimiter Tab — verify columns split on tabs.
+6. Import `fixture_no_header.csv` with header row OFF — verify the first row is treated as
+   data (columns column_1..3) and imports.
+7. Import `fixture_crlf.csv` — verify the embedded newline stays inside the note field and
+   the row imports once.
+8. Import `fixture_bad_quote.csv` — verify it is rejected with the unclosed-quote error
+   and the source line, and no rows are written.
+9. With "Empty field = NULL" OFF, import a row with an empty note — verify the note is an
+   empty string; with it ON the note is SQL NULL.
+10. Feed a generated large CSV (1M rows) — verify the preview stays bounded and fast.
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/cleanup.sql b/script/test-fixtures/mysql/MYSQL-IMPORT-002/cleanup.sql
new file mode 100644
index 0000000000..44cc4e50f1
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/cleanup.sql
@@ -0,0 +1,3 @@
+-- MYSQL-IMPORT-002: Cleanup
+DROP DATABASE IF EXISTS `import002_test`;
+DROP USER IF EXISTS 'import002_admin'@'%';
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_bad_quote.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_bad_quote.csv
new file mode 100644
index 0000000000..30597d5760
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_bad_quote.csv
@@ -0,0 +1,2 @@
+name,note,price
+Bad,"unclosed,1.00
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_crlf.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_crlf.csv
new file mode 100644
index 0000000000..7359703796
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_crlf.csv
@@ -0,0 +1,3 @@
+name,note,price
+Multi,"line1
+line2",3.00
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_gb18030.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_gb18030.csv
new file mode 100644
index 0000000000..534f7963b2
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_gb18030.csv
@@ -0,0 +1,2 @@
+name,note,price
+��ΰ,���ı�ע,30.00
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_latin1.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_latin1.csv
new file mode 100644
index 0000000000..f18cdbbeeb
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_latin1.csv
@@ -0,0 +1,2 @@
+name,note,price
+Jos�,caf�,5.00
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_no_header.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_no_header.csv
new file mode 100644
index 0000000000..60c2c1f003
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_no_header.csv
@@ -0,0 +1 @@
+NoHeader,no header note,9.90
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_semicolon.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_semicolon.csv
new file mode 100644
index 0000000000..5a5a385cb3
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_semicolon.csv
@@ -0,0 +1,2 @@
+name;note;price
+Anna;"hello; world";7.50
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_tab.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_tab.csv
new file mode 100644
index 0000000000..c22bb7adf5
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_tab.csv
@@ -0,0 +1,2 @@
+name	note	price
+Tabby	ok	1.00
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_utf8.csv b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_utf8.csv
new file mode 100644
index 0000000000..a307b9b5dc
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/fixture_utf8.csv
@@ -0,0 +1,3 @@
+name,note,price
+雪,备注一,10.50
+Alice,"quoted ""value""",20.00
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/grants.sql b/script/test-fixtures/mysql/MYSQL-IMPORT-002/grants.sql
new file mode 100644
index 0000000000..87f60b8a90
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/grants.sql
@@ -0,0 +1,3 @@
+-- MYSQL-IMPORT-002: Grants for test user
+GRANT INSERT ON `import002_test`.* TO 'import002_admin'@'%';
+FLUSH PRIVILEGES;
diff --git a/script/test-fixtures/mysql/MYSQL-IMPORT-002/init.sql b/script/test-fixtures/mysql/MYSQL-IMPORT-002/init.sql
new file mode 100644
index 0000000000..171d77ac0a
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-IMPORT-002/init.sql
@@ -0,0 +1,16 @@
+-- MYSQL-IMPORT-002: CSV encoding and format options
+-- Test fixture: import target table and an admin user.
+
+CREATE DATABASE IF NOT EXISTS `import002_test`;
+USE `import002_test`;
+
+CREATE TABLE IF NOT EXISTS `import002_items` (
+    `id` BIGINT NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(64) NOT NULL,
+    `note` VARCHAR(255) DEFAULT NULL,
+    `price` DECIMAL(10,2) DEFAULT NULL,
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB;
+
+CREATE USER IF NOT EXISTS 'import002_admin'@'%' IDENTIFIED BY 'Import002_admin_2026';
+GRANT SELECT, INSERT, UPDATE, DELETE ON `import002_test`.* TO 'import002_admin'@'%';
diff --git a/script/test-fixtures/mysql/MYSQL-OBJ-003/README.md b/script/test-fixtures/mysql/MYSQL-OBJ-003/README.md
new file mode 100644
index 0000000000..9156743fef
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OBJ-003/README.md
@@ -0,0 +1,21 @@
+# MYSQL-OBJ-003: Visible and invisible column management
+
+## Fixture
+
+- `init.sql` creates `obj003_column_test` with id, name, secret, and created_at columns.
+- On MySQL 8.0.23+, `secret` is made INVISIBLE via `ALTER TABLE ... MODIFY COLUMN ... INVISIBLE`.
+- `grants.sql` grants SELECT, INSERT, UPDATE, ALTER to the test user.
+- `cleanup.sql` drops the test table.
+
+## Verification
+
+1. Connect with the test user.
+2. Open the table in the table editor.
+3. Verify the column list shows VISIBLE/INVISIBLE for each column.
+4. The `secret` column should show INVISIBLE.
+5. Toggle `secret` from INVISIBLE to VISIBLE and preview the SQL.
+6. Execute and refresh — the column should show VISIBLE.
+7. Create a new invisible column and verify the SQL includes INVISIBLE.
+8. Verify `SELECT *` omits invisible columns (explained in UI tooltip).
+9. Explicitly querying an invisible column by name still works.
+10. On MySQL 5.7 and 8.0.22 or earlier, the visibility control should not appear.
diff --git a/script/test-fixtures/mysql/MYSQL-OBJ-003/cleanup.sql b/script/test-fixtures/mysql/MYSQL-OBJ-003/cleanup.sql
new file mode 100644
index 0000000000..0871b697b1
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OBJ-003/cleanup.sql
@@ -0,0 +1,3 @@
+-- MYSQL-OBJ-003: Cleanup
+
+DROP TABLE IF EXISTS `obj003_column_test`;
diff --git a/script/test-fixtures/mysql/MYSQL-OBJ-003/grants.sql b/script/test-fixtures/mysql/MYSQL-OBJ-003/grants.sql
new file mode 100644
index 0000000000..a4f6ce8c91
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OBJ-003/grants.sql
@@ -0,0 +1,5 @@
+-- MYSQL-OBJ-003: Grants for test user
+-- Minimal privileges for column visibility testing
+
+GRANT SELECT, INSERT, UPDATE, ALTER ON *.* TO 'chat2db_test'@'%';
+FLUSH PRIVILEGES;
diff --git a/script/test-fixtures/mysql/MYSQL-OBJ-003/init.sql b/script/test-fixtures/mysql/MYSQL-OBJ-003/init.sql
new file mode 100644
index 0000000000..a80c629b41
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OBJ-003/init.sql
@@ -0,0 +1,13 @@
+-- MYSQL-OBJ-003: Visible and invisible column management
+-- Test fixture: table with visible and invisible columns
+
+CREATE TABLE IF NOT EXISTS `obj003_column_test` (
+    `id` BIGINT NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(128) NOT NULL,
+    `secret` VARCHAR(256) DEFAULT NULL,
+    `created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB;
+
+-- For MySQL 8.0.23+: make the secret column invisible
+ALTER TABLE `obj003_column_test` MODIFY COLUMN `secret` VARCHAR(256) DEFAULT NULL INVISIBLE;
diff --git a/script/test-fixtures/mysql/MYSQL-OBJ-006/README.md b/script/test-fixtures/mysql/MYSQL-OBJ-006/README.md
new file mode 100644
index 0000000000..b6b9e4f8b3
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OBJ-006/README.md
@@ -0,0 +1,19 @@
+# MYSQL-OBJ-006: Visible and invisible index management
+
+## Fixture
+
+- `init.sql` creates `obj006_index_test` with primary key, unique, ordinary, and composite indexes.
+- On MySQL 8.0+, `idx_name` is made INVISIBLE via `ALTER INDEX`.
+- `grants.sql` grants SELECT, INDEX, ALTER to the test user.
+- `cleanup.sql` drops the test table.
+
+## Verification
+
+1. Connect with the test user.
+2. Open the table in the table editor.
+3. Verify the index list shows VISIBLE/INVISIBLE for each index.
+4. Toggle `idx_name` from INVISIBLE to VISIBLE and preview the SQL.
+5. Execute and refresh — the index should show VISIBLE.
+6. Toggle `uk_code` to INVISIBLE and verify the SQL previews correctly.
+7. Verify the primary key row does not offer a visibility toggle.
+8. On MySQL 5.7, the visibility column should not appear.
diff --git a/script/test-fixtures/mysql/MYSQL-OBJ-006/cleanup.sql b/script/test-fixtures/mysql/MYSQL-OBJ-006/cleanup.sql
new file mode 100644
index 0000000000..2ddda10011
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OBJ-006/cleanup.sql
@@ -0,0 +1,3 @@
+-- MYSQL-OBJ-006: Cleanup
+
+DROP TABLE IF EXISTS `obj006_index_test`;
diff --git a/script/test-fixtures/mysql/MYSQL-OBJ-006/grants.sql b/script/test-fixtures/mysql/MYSQL-OBJ-006/grants.sql
new file mode 100644
index 0000000000..e3cfa652d8
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OBJ-006/grants.sql
@@ -0,0 +1,5 @@
+-- MYSQL-OBJ-006: Grants for test user
+-- Minimal privileges for index visibility testing
+
+GRANT SELECT, INDEX, ALTER ON *.* TO 'chat2db_test'@'%';
+FLUSH PRIVILEGES;
diff --git a/script/test-fixtures/mysql/MYSQL-OBJ-006/init.sql b/script/test-fixtures/mysql/MYSQL-OBJ-006/init.sql
new file mode 100644
index 0000000000..72a30ee4c5
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OBJ-006/init.sql
@@ -0,0 +1,16 @@
+-- MYSQL-OBJ-006: Visible and invisible index management
+-- Test fixture: table with ordinary, unique, composite, and primary indexes
+
+CREATE TABLE IF NOT EXISTS `obj006_index_test` (
+    `id` BIGINT NOT NULL AUTO_INCREMENT,
+    `code` VARCHAR(32) NOT NULL,
+    `name` VARCHAR(128) NOT NULL,
+    `value` INT DEFAULT 0,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_code` (`code`),
+    KEY `idx_name` (`name`),
+    KEY `idx_name_value` (`name`, `value`)
+) ENGINE=InnoDB;
+
+-- For MySQL 8.0+ : make idx_name invisible
+ALTER TABLE `obj006_index_test` ALTER INDEX `idx_name` INVISIBLE;
diff --git a/script/test-fixtures/mysql/MYSQL-OPS-002/README.md b/script/test-fixtures/mysql/MYSQL-OPS-002/README.md
new file mode 100644
index 0000000000..b68ce78804
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OPS-002/README.md
@@ -0,0 +1,37 @@
+# MYSQL-OPS-002: Active transaction inspection
+
+## Fixture
+
+- `init.sql` creates:
+  - `ops002_admin` — administrator with PROCESS plus read access to MySQL 8.0
+    lock-wait metadata (full transaction and blocking-chain visibility)
+  - `ops002_user` — limited account (no PROCESS; can inspect its own visible
+    InnoDB transactions, but cross-user transaction/process details can be hidden
+    or rejected by MySQL privilege checks)
+  - `ops002_test` database with `ops002_accounts` and sample data
+- `grants.sql` grants PROCESS to the admin account only
+- `cleanup.sql` drops test objects and users
+
+## Verification
+
+1. Connect as `ops002_admin`.
+2. Expand the datasource's Monitor node, then double-click Active Transactions.
+3. Open a second connection and run `START TRANSACTION; UPDATE ops002_accounts SET balance = balance - 100 WHERE id = 1;` — leave it open.
+4. Refresh the view — verify the transaction appears with state RUNNING, a growing age, isolation level REPEATABLE READ, thread ID, user, host, database, and the UPDATE SQL text.
+5. Open a third connection and run a second open transaction — verify both are listed, ordered by start time.
+6. On the third connection run `START TRANSACTION; UPDATE ops002_accounts SET balance = balance + 10 WHERE id = 1;` while the first transaction holds the row lock — verify the waiting transaction's state is LOCK WAIT.
+7. On MySQL 8.0, capture fixture evidence with:
+   ```sql
+   SELECT REQUESTING_ENGINE_TRANSACTION_ID, REQUESTING_ENGINE_LOCK_ID,
+          BLOCKING_ENGINE_TRANSACTION_ID, BLOCKING_ENGINE_LOCK_ID
+   FROM performance_schema.data_lock_waits;
+   ```
+8. On MySQL 5.7, capture fixture evidence with:
+   ```sql
+   SELECT requesting_trx_id, requested_lock_id, blocking_trx_id, blocking_lock_id
+   FROM information_schema.innodb_lock_waits;
+   ```
+9. Verify the Active Transactions view shows waited-lock and blocker fields for the waiting row, and that the owner and blocker connection ID links open datasource-bound consoles filtered by the exact `information_schema.PROCESSLIST.ID`.
+10. Commit or roll back the first transaction — refresh — verify committed or rolled-back transactions disappear instead of remaining as historical rows.
+11. Connect as `ops002_user`, open a transaction, and refresh the view — verify hidden SQL is rendered as an explicit unavailable state when MySQL returns NULL, lock-wait metadata degrades explicitly when the account or server cannot expose it, and a PROCESS denial from the transaction/process query is reported as a permission-required state rather than a generic runtime error.
+12. With no open transactions, refresh — verify the empty state is shown normally.
diff --git a/script/test-fixtures/mysql/MYSQL-OPS-002/cleanup.sql b/script/test-fixtures/mysql/MYSQL-OPS-002/cleanup.sql
new file mode 100644
index 0000000000..adce63a526
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OPS-002/cleanup.sql
@@ -0,0 +1,4 @@
+-- MYSQL-OPS-002: Cleanup
+DROP DATABASE IF EXISTS `ops002_test`;
+DROP USER IF EXISTS 'ops002_admin'@'%';
+DROP USER IF EXISTS 'ops002_user'@'%';
diff --git a/script/test-fixtures/mysql/MYSQL-OPS-002/grants.sql b/script/test-fixtures/mysql/MYSQL-OPS-002/grants.sql
new file mode 100644
index 0000000000..ce14777313
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OPS-002/grants.sql
@@ -0,0 +1,8 @@
+-- MYSQL-OPS-002: Grants for test user
+-- ops002_admin has PROCESS for full transaction visibility (all users + SQL text).
+GRANT PROCESS ON *.* TO 'ops002_admin'@'%';
+GRANT SELECT ON `performance_schema`.`data_lock_waits` TO 'ops002_admin'@'%';
+GRANT SELECT ON `performance_schema`.`data_locks` TO 'ops002_admin'@'%';
+-- ops002_user intentionally has NO PROCESS: cross-user transaction/process details can
+-- be hidden, returned with NULL SQL text, or rejected by MySQL privilege checks.
+FLUSH PRIVILEGES;
diff --git a/script/test-fixtures/mysql/MYSQL-OPS-002/init.sql b/script/test-fixtures/mysql/MYSQL-OPS-002/init.sql
new file mode 100644
index 0000000000..0d00a03d33
--- /dev/null
+++ b/script/test-fixtures/mysql/MYSQL-OPS-002/init.sql
@@ -0,0 +1,27 @@
+-- MYSQL-OPS-002: Active transaction inspection
+-- Test fixture: users, a test table, and a stored helper that opens transactions.
+-- The admin account can see all transactions (PROCESS). The limited account has no
+-- PROCESS grant: MySQL may hide cross-user transaction/process details, return NULL SQL
+-- text, or reject active-transaction inspection depending on the server/version path.
+
+CREATE DATABASE IF NOT EXISTS `ops002_test`;
+USE `ops002_test`;
+
+CREATE TABLE IF NOT EXISTS `ops002_accounts` (
+    `id` BIGINT NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(64) NOT NULL,
+    `balance` DECIMAL(12,2) NOT NULL DEFAULT 0,
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB;
+
+INSERT INTO `ops002_accounts` (`name`, `balance`) VALUES
+    ('alice', 1000.00),
+    ('bob', 500.00),
+    ('carol', 250.00);
+
+-- Two test users: full visibility vs limited visibility.
+CREATE USER IF NOT EXISTS 'ops002_admin'@'%' IDENTIFIED BY 'Ops002_admin_2026';
+CREATE USER IF NOT EXISTS 'ops002_user'@'%' IDENTIFIED BY 'Ops002_user_2026';
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON `ops002_test`.* TO 'ops002_admin'@'%';
+GRANT SELECT, INSERT, UPDATE, DELETE ON `ops002_test`.* TO 'ops002_user'@'%';