diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index a73453c..0410dec 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v6
         with:
-          go-version: '1.24'
+          go-version-file: 'go.mod'
 
       - name: Setup Node
         uses: actions/setup-node@v5
@@ -70,27 +70,130 @@ jobs:
       drivers: ${{ steps.detect.outputs.drivers }}
       has_changes: ${{ steps.detect.outputs.has_changes }}
       release_source: ${{ steps.detect.outputs.release_source }}
+      compare_base: ${{ steps.detect.outputs.compare_base }}
+      force_global_driver_builds: ${{ steps.detect.outputs.force_global_driver_builds }}
+      source_commit: ${{ steps.published_source.outputs.source_commit }}
+      has_manifest: ${{ steps.published_source.outputs.has_manifest }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
+      - name: Resolve published driver release source
+        id: published_source
+        env:
+          DRIVER_RELEASE_TOKEN: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          manifest_path="$RUNNER_TEMP/published-driver-manifest.json"
+          SOURCE_COMMIT="$(python3 tools/resolve-driver-release-source.py --repo Syngnat/GoNavi-DriverAgents --tag dev-latest --manifest-output "$manifest_path")"
+          echo "source_commit=${SOURCE_COMMIT}" >> "$GITHUB_OUTPUT"
+          if [[ -s "$manifest_path" ]]; then
+            echo "has_manifest=true" >> "$GITHUB_OUTPUT"
+            echo "🧭 Published dev driver release exposes revision manifest"
+          else
+            echo "has_manifest=false" >> "$GITHUB_OUTPUT"
+            echo "🧭 Published dev driver release has no revision manifest"
+          fi
+          if [[ -n "$SOURCE_COMMIT" && -s "$manifest_path" ]]; then
+            if bash ./tools/validate-driver-release-manifest.sh --commit "$SOURCE_COMMIT" --manifest "$manifest_path"; then
+              if python3 tools/validate-driver-release-assets.py --repo Syngnat/GoNavi-DriverAgents --tag dev-latest; then
+                echo "manifest_valid=true" >> "$GITHUB_OUTPUT"
+                echo "🧭 Published dev driver release manifest and actual assets are consistent with its source commit"
+              else
+                echo "manifest_valid=false" >> "$GITHUB_OUTPUT"
+                echo "⚠️ Published dev driver release assets do not match manifest; forcing full rebuild"
+              fi
+            else
+              echo "manifest_valid=false" >> "$GITHUB_OUTPUT"
+              echo "⚠️ Published dev driver release manifest is stale; forcing full rebuild"
+            fi
+          else
+            echo "manifest_valid=false" >> "$GITHUB_OUTPUT"
+          fi
+          if [[ -n "$SOURCE_COMMIT" ]]; then
+            echo "🧭 Last published dev driver release source commit: $SOURCE_COMMIT"
+          else
+            echo "🧭 Unable to resolve published dev driver release source commit; fallback to push diff base"
+          fi
+
       - name: Detect changed driver agents
         id: detect
         shell: bash
         run: |
           set -euo pipefail
-          BASE_REF="${{ github.event.before }}"
-          if [[ -z "$BASE_REF" || "$BASE_REF" =~ ^0+$ ]]; then
-            if BASE_REF="$(git rev-parse HEAD^ 2>/dev/null)"; then
-              :
+          merge_csv() {
+            local current="$1"
+            local incoming="$2"
+            local merged="$current"
+            local seen=",${current},"
+            local item
+            IFS=',' read -r -a items <<< "$incoming"
+            for item in "${items[@]}"; do
+              item="$(printf '%s' "$item" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')"
+              if [[ -z "$item" ]]; then
+                continue
+              fi
+              if [[ "$seen" == *",$item,"* ]]; then
+                continue
+              fi
+              if [[ -n "$merged" ]]; then
+                merged="${merged},${item}"
+              else
+                merged="$item"
+              fi
+              seen="${seen}${item},"
+            done
+            printf '%s\n' "$merged"
+          }
+
+          BASE_REF="${{ steps.published_source.outputs.source_commit }}"
+          HAS_MANIFEST="${{ steps.published_source.outputs.has_manifest }}"
+          MANIFEST_VALID="${{ steps.published_source.outputs.manifest_valid }}"
+          if [[ "$HAS_MANIFEST" != "true" ]]; then
+            echo "⚠️ Published driver release lacks revision manifest; forcing full rebuild to self-heal old assets"
+            BASE_REF="all"
+          elif [[ "$MANIFEST_VALID" != "true" ]]; then
+            echo "⚠️ Published driver release manifest is stale; forcing full rebuild to self-heal old assets"
+            BASE_REF="all"
+          fi
+          if [[ -n "$BASE_REF" ]]; then
+            if git rev-parse --verify "${BASE_REF}^{commit}" >/dev/null 2>&1 && git merge-base --is-ancestor "$BASE_REF" "$GITHUB_SHA"; then
+              echo "🧭 Using last published driver release source commit as detection base: $BASE_REF"
             else
-              BASE_REF="all"
+              echo "⚠️ Published driver release source commit is unavailable or not an ancestor of $GITHUB_SHA: $BASE_REF"
+              BASE_REF=""
             fi
           fi
+
+          if [[ -z "$BASE_REF" ]]; then
+            echo "⚠️ Falling back to full driver rebuild because published driver release source commit is unavailable"
+            BASE_REF="all"
+          fi
+          echo "🧭 Final driver detection base: $BASE_REF"
           DRIVERS="$(bash ./tools/detect-changed-driver-agents.sh --base "$BASE_REF" --head "$GITHUB_SHA")"
+          if [[ "$BASE_REF" != "all" ]]; then
+            REVISION_DRIVERS=""
+            for PLATFORM in darwin/amd64 darwin/arm64 windows/amd64 windows/arm64 linux/amd64; do
+              PLATFORM_DRIVERS="$(bash ./tools/diff-driver-agent-revisions.sh --base "$BASE_REF" --head "$GITHUB_SHA" --platform "$PLATFORM")" || {
+                echo "⚠️ 平台 revision 差异对比失败（${PLATFORM}），保守回退为全量驱动重建"
+                DRIVERS="$(bash ./tools/detect-changed-driver-agents.sh --base all --head "$GITHUB_SHA")"
+                REVISION_DRIVERS=""
+                break
+              }
+              REVISION_DRIVERS="$(merge_csv "$REVISION_DRIVERS" "$PLATFORM_DRIVERS")"
+            done
+            if [[ -n "$REVISION_DRIVERS" ]]; then
+              echo "🧭 Revision diff union drivers: $REVISION_DRIVERS"
+              DRIVERS="$(merge_csv "$DRIVERS" "$REVISION_DRIVERS")"
+            fi
+          fi
+          FORCE_GLOBAL_DRIVER_BUILDS="$(bash ./tools/should-force-global-driver-builds.sh --base "$BASE_REF" --head "$GITHUB_SHA")"
           echo "drivers=${DRIVERS}" >> "$GITHUB_OUTPUT"
+          echo "compare_base=${BASE_REF}" >> "$GITHUB_OUTPUT"
+          echo "force_global_driver_builds=${FORCE_GLOBAL_DRIVER_BUILDS}" >> "$GITHUB_OUTPUT"
           if [ -n "$DRIVERS" ]; then
             echo "has_changes=true" >> "$GITHUB_OUTPUT"
             echo "🧭 Changed driver agents: $DRIVERS"
@@ -98,6 +201,9 @@ jobs:
             echo "has_changes=false" >> "$GITHUB_OUTPUT"
             echo "🧭 No driver-agent changes detected"
           fi
+          if [[ "$FORCE_GLOBAL_DRIVER_BUILDS" == "true" ]]; then
+            echo "🧭 Driver build/release plumbing changed; preserve global driver rebuild set on every platform"
+          fi
           echo "release_source=dev-latest" >> "$GITHUB_OUTPUT"
 
   build:
@@ -172,20 +278,35 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v6
         with:
-          go-version: '1.24'
+          go-version-file: 'go.mod'
 
       - name: Download frontend dist
+        id: download_frontend_dist
+        continue-on-error: true
         uses: actions/download-artifact@v7
         with:
           name: frontend-dist
-          path: .
+          path: frontend-artifact
+
+      - name: Reset failed frontend dist download
+        if: steps.download_frontend_dist.outcome != 'success'
+        shell: bash
+        run: rm -rf frontend-artifact
+
+      - name: Retry frontend dist download
+        if: steps.download_frontend_dist.outcome != 'success'
+        uses: actions/download-artifact@v7
+        with:
+          name: frontend-dist
+          path: frontend-artifact
 
       - name: Extract frontend dist
         shell: bash
         run: |
           set -euo pipefail
           mkdir -p frontend/dist
-          tar -xf frontend-dist.tar -C frontend/dist
+          test -s frontend-artifact/frontend-dist.tar
+          tar -xf frontend-artifact/frontend-dist.tar -C frontend/dist
           test -s frontend/dist/index.html
 
       - name: Install UPX (Windows)
@@ -252,7 +373,7 @@ jobs:
 
       - name: Setup MSYS2 Toolchain For DuckDB (Windows AMD64)
         id: msys2_duckdb
-        if: ${{ matrix.build_optional_agents && matrix.platform == 'windows/amd64' && contains(format(',{0},', needs.driver_agents.outputs.drivers), ',duckdb,') }}
+        if: ${{ matrix.platform == 'windows/amd64' }}
         continue-on-error: true
         uses: msys2/setup-msys2@v2
         with:
@@ -260,9 +381,10 @@ jobs:
           update: true
           install: >-
             mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-binutils
 
       - name: Configure DuckDB CGO Toolchain (Windows AMD64)
-        if: ${{ matrix.build_optional_agents && matrix.platform == 'windows/amd64' && contains(format(',{0},', needs.driver_agents.outputs.drivers), ',duckdb,') }}
+        if: ${{ matrix.platform == 'windows/amd64' }}
         shell: pwsh
         run: |
           function Find-MingwBin([string[]]$candidates) {
@@ -320,7 +442,7 @@ jobs:
           Write-Host "✅ 已配置 DuckDB cgo 编译器: gcc=$gcc g++=$gxx"
 
       - name: Verify DuckDB CGO Toolchain (Windows AMD64)
-        if: ${{ matrix.build_optional_agents && matrix.platform == 'windows/amd64' && contains(format(',{0},', needs.driver_agents.outputs.drivers), ',duckdb,') }}
+        if: ${{ matrix.platform == 'windows/amd64' }}
         shell: pwsh
         run: |
           & "$env:CC" --version
@@ -338,32 +460,83 @@ jobs:
 
       - name: Build
         shell: bash
-        env:
-          CHANGED_DRIVER_AGENTS: ${{ needs.driver_agents.outputs.drivers }}
         run: |
           set -euo pipefail
           DEV_VERSION="${{ steps.version.outputs.version }}"
-          if [ -n "$CHANGED_DRIVER_AGENTS" ]; then
-            ./tools/generate-driver-agent-revisions.sh --platform "${{ matrix.platform }}" --drivers "$CHANGED_DRIVER_AGENTS"
-          else
-            echo "🧭 No driver-agent changes; keeping committed driver revisions"
-          fi
+          echo "🧭 为 ${{ matrix.platform }} 全量生成 driver-agent revision 指纹，避免跨平台沿用旧 revision"
+          ./tools/generate-driver-agent-revisions.sh --platform "${{ matrix.platform }}"
+          REVISION_HASH="$(python3 - <<'PY'
+          import hashlib
+          from pathlib import Path
+
+          print(hashlib.sha256(Path("internal/db/driver_agent_revisions_gen.go").read_bytes()).hexdigest())
+          PY
+          )"
+          export GOCACHE="${RUNNER_TEMP}/go-build-${{ matrix.os_name }}-${{ matrix.arch_name }}-${REVISION_HASH}"
+          mkdir -p "$GOCACHE"
+          echo "🧭 使用隔离 GOCACHE：$GOCACHE"
           if [ -n "${{ matrix.wails_tags }}" ]; then
             wails build -s -skipbindings -platform ${{ matrix.platform }} -clean -o ${{ matrix.build_name }} -tags "${{ matrix.wails_tags }}" -ldflags "-s -w -X GoNavi-Wails/internal/app.AppVersion=${DEV_VERSION}"
           else
             wails build -s -skipbindings -platform ${{ matrix.platform }} -clean -o ${{ matrix.build_name }} -ldflags "-s -w -X GoNavi-Wails/internal/app.AppVersion=${DEV_VERSION}"
           fi
 
-      - name: Build Optional Driver Agents
+      - name: Resolve Platform Driver Revision Diff
+        id: revision_diff
         if: ${{ matrix.build_optional_agents && needs.driver_agents.outputs.has_changes == 'true' }}
         shell: bash
+        run: |
+          set -euo pipefail
+          BASE_REF="${{ needs.driver_agents.outputs.compare_base }}"
+          FALLBACK_DRIVERS="${{ needs.driver_agents.outputs.drivers }}"
+          FORCE_GLOBAL_DRIVER_BUILDS="${{ needs.driver_agents.outputs.force_global_driver_builds }}"
+
+          if [[ -z "$BASE_REF" || "$BASE_REF" == "all" || "$FORCE_GLOBAL_DRIVER_BUILDS" == "true" ]]; then
+            if [[ "$FORCE_GLOBAL_DRIVER_BUILDS" == "true" && -n "$BASE_REF" && "$BASE_REF" != "all" ]]; then
+              echo "⚠️ 当前提交涉及 driver 构建/发布链路，保留全局驱动重建结果：${FALLBACK_DRIVERS}"
+            else
+              echo "⚠️ 当前 driver 检测基线不可做平台 diff，回退使用全局检测结果：${FALLBACK_DRIVERS}"
+            fi
+            echo "drivers=${FALLBACK_DRIVERS}" >> "$GITHUB_OUTPUT"
+          else
+            echo "🧭 对比当前平台 revision：base=${BASE_REF} head=${GITHUB_SHA} platform=${{ matrix.platform }}"
+            if DRIVERS="$(bash ./tools/diff-driver-agent-revisions.sh --base "$BASE_REF" --head "$GITHUB_SHA" --platform "${{ matrix.platform }}")"; then
+              echo "🧭 当前平台实际需要重建的 driver agents: ${DRIVERS:-<empty>}"
+              echo "drivers=${DRIVERS}" >> "$GITHUB_OUTPUT"
+            else
+              echo "⚠️ revision 差异对比失败，保守回退为全量重建"
+              ALL_DRIVERS="$(bash ./tools/detect-changed-driver-agents.sh --base all --head "$GITHUB_SHA")"
+              echo "drivers=${ALL_DRIVERS}" >> "$GITHUB_OUTPUT"
+            fi
+          fi
+
+          DRIVERS="$(sed -n 's/^drivers=//p' "$GITHUB_OUTPUT" | tail -n 1)"
+          if [[ -n "$DRIVERS" ]]; then
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Build Optional Driver Agents
+        if: ${{ matrix.build_optional_agents && steps.revision_diff.outputs.has_changes == 'true' }}
+        shell: bash
         env:
-          CHANGED_DRIVER_AGENTS: ${{ needs.driver_agents.outputs.drivers }}
+          CHANGED_DRIVER_AGENTS: ${{ steps.revision_diff.outputs.drivers }}
         run: |
           set -euo pipefail
           TARGET_PLATFORM="${{ matrix.platform }}"
           GOOS="${TARGET_PLATFORM%%/*}"
           GOARCH="${TARGET_PLATFORM##*/}"
+          REVISION_HASH="$(python3 - <<'PY'
+          import hashlib
+          from pathlib import Path
+
+          print(hashlib.sha256(Path("internal/db/driver_agent_revisions_gen.go").read_bytes()).hexdigest())
+          PY
+          )"
+          export GOCACHE="${RUNNER_TEMP}/go-build-${{ matrix.os_name }}-${{ matrix.arch_name }}-${REVISION_HASH}"
+          mkdir -p "$GOCACHE"
+          echo "🧭 可选驱动使用隔离 GOCACHE：$GOCACHE"
           IFS=',' read -r -a DRIVERS <<< "$CHANGED_DRIVER_AGENTS"
           OUTDIR="drivers/${{ matrix.os_name }}"
           mkdir -p "$OUTDIR"
@@ -372,17 +545,51 @@ jobs:
 
           prepare_duckdb_windows_library() {
             local lib_dir="$RUNNER_TEMP/duckdb-windows-${DUCKDB_WINDOWS_LIBRARY_VERSION}"
+            local extract_dir="$RUNNER_TEMP/duckdb-windows-extract-${DUCKDB_WINDOWS_LIBRARY_VERSION}"
             local zip_path="$RUNNER_TEMP/libduckdb-windows-amd64.zip"
-            if [ -f "$lib_dir/duckdb.dll" ] && [ -f "$lib_dir/duckdb.lib" ]; then
+            if [ -f "$lib_dir/duckdb.dll" ] && [ -f "$lib_dir/libduckdb.dll.a" ] && [ -f "$lib_dir/libduckdb.a" ]; then
               echo "$lib_dir"
               return 0
             fi
             mkdir -p "$lib_dir"
-            curl -fsSL "$DUCKDB_WINDOWS_LIBRARY_URL" -o "$zip_path"
-            unzip -qo "$zip_path" -d "$lib_dir"
-            cp "$lib_dir/duckdb.lib" "$lib_dir/libduckdb.dll.a"
-            cp "$lib_dir/duckdb.lib" "$lib_dir/libduckdb.a"
-            echo "$lib_dir"
+            rm -rf "$extract_dir"
+            rm -f "$zip_path"
+            local attempt dll_path
+            for attempt in 1 2 3; do
+              echo "📥 下载 DuckDB Windows 动态库 (${attempt}/3): ${DUCKDB_WINDOWS_LIBRARY_URL}" >&2
+              if curl --retry 3 --retry-delay 2 --retry-all-errors --connect-timeout 20 --max-time 300 -fsSL "$DUCKDB_WINDOWS_LIBRARY_URL" -o "$zip_path"; then
+                if unzip -tq "$zip_path" >/dev/null 2>&1; then
+                  rm -rf "$lib_dir"
+                  rm -rf "$extract_dir"
+                  mkdir -p "$lib_dir"
+                  mkdir -p "$extract_dir"
+                  unzip -qo "$zip_path" -d "$extract_dir"
+                  dll_path="$(find "$extract_dir" -type f -name duckdb.dll | head -n 1 || true)"
+                  if [ -n "$dll_path" ]; then
+                    cp "$dll_path" "$lib_dir/duckdb.dll"
+                    go run ./cmd/mingw-import-lib \
+                      --dll "$lib_dir/duckdb.dll" \
+                      --output-lib "$lib_dir/libduckdb.dll.a"
+                    cp "$lib_dir/libduckdb.dll.a" "$lib_dir/libduckdb.a"
+                    rm -rf "$extract_dir"
+                    echo "$lib_dir"
+                    return 0
+                  fi
+                  echo "⚠️ DuckDB Windows 动态库压缩包缺少 duckdb.dll，准备重试" >&2
+                else
+                  echo "⚠️ DuckDB Windows 动态库压缩包校验失败，准备重试" >&2
+                fi
+              else
+                echo "⚠️ DuckDB Windows 动态库下载失败，准备重试" >&2
+              fi
+              rm -f "$zip_path"
+              rm -rf "$lib_dir"
+              rm -rf "$extract_dir"
+              mkdir -p "$lib_dir"
+              sleep $((attempt * 2))
+            done
+            echo "❌ 无法准备 DuckDB Windows 动态库：${DUCKDB_WINDOWS_LIBRARY_URL}" >&2
+            return 1
           }
 
           for DRIVER in "${DRIVERS[@]}"; do
@@ -394,48 +601,98 @@ jobs:
               echo "⚠️ 跳过 DuckDB driver（当前平台 ${GOOS}/${GOARCH} 不受支持，仅支持 windows/amd64）"
               continue
             fi
-            TAG="gonavi_${BUILD_DRIVER}_driver"
-            BUILD_TAGS="$TAG"
-            OUTPUT="${DRIVER}-driver-agent-${GOOS}-${GOARCH}"
-            if [ "$GOOS" = "windows" ]; then
-              OUTPUT="${OUTPUT}.exe"
+            DRIVER_VARIANTS=("")
+            if [ "$DRIVER" = "mongodb" ]; then
+              DRIVER_VARIANTS=("v1" "v2" "")
             fi
-            OUTPUT_PATH="${OUTDIR}/${OUTPUT}"
-            DUCKDB_LIB_DIR=""
-            if [ "$DRIVER" = "duckdb" ] && [ "$GOOS" = "windows" ] && [ "$GOARCH" = "amd64" ]; then
-              DUCKDB_LIB_DIR="$(prepare_duckdb_windows_library)"
-              BUILD_TAGS="${BUILD_TAGS} duckdb_use_lib"
-            fi
-            echo "🔧 构建 ${OUTPUT_PATH} (tags=${BUILD_TAGS})"
-            if [ "$DRIVER" = "duckdb" ]; then
-              if [ -n "$DUCKDB_LIB_DIR" ]; then
-                CGO_ENABLED=1 GOOS="$GOOS" GOARCH="$GOARCH" CGO_LDFLAGS="-L${DUCKDB_LIB_DIR} -lduckdb" PATH="${DUCKDB_LIB_DIR}:$PATH" go build \
-                  -tags "${BUILD_TAGS}" \
-                  -trimpath \
-                  -ldflags "-s -w" \
-                  -o "${OUTPUT_PATH}" \
-                  ./cmd/optional-driver-agent
-                cp "$DUCKDB_LIB_DIR/duckdb.dll" "$OUTDIR/duckdb.dll"
-                bash ./tools/compress-driver-artifact.sh "$OUTDIR/duckdb.dll" "$TARGET_PLATFORM" "${{ matrix.os_name }}/duckdb.dll"
+            for DRIVER_VARIANT in "${DRIVER_VARIANTS[@]}"; do
+              TAG="gonavi_${BUILD_DRIVER}_driver"
+              BUILD_TAGS="$TAG"
+              OUTPUT_STEM="${DRIVER}-driver-agent"
+              if [ "$DRIVER" = "mongodb" ]; then
+                if [ "$DRIVER_VARIANT" = "v1" ]; then
+                  BUILD_TAGS="gonavi_mongodb_driver_v1"
+                  OUTPUT_STEM="mongodb-driver-agent-v1"
+                elif [ "$DRIVER_VARIANT" = "v2" ]; then
+                  BUILD_TAGS="gonavi_mongodb_driver"
+                  OUTPUT_STEM="mongodb-driver-agent-v2"
+                else
+                  BUILD_TAGS="gonavi_mongodb_driver"
+                fi
+              fi
+              OUTPUT="${OUTPUT_STEM}-${GOOS}-${GOARCH}"
+              if [ "$GOOS" = "windows" ]; then
+                OUTPUT="${OUTPUT}.exe"
+              fi
+              OUTPUT_PATH="${OUTDIR}/${OUTPUT}"
+              DUCKDB_LIB_DIR=""
+              if [ "$DRIVER" = "duckdb" ] && [ "$GOOS" = "windows" ] && [ "$GOARCH" = "amd64" ]; then
+                DUCKDB_LIB_DIR="$(prepare_duckdb_windows_library)"
+                BUILD_TAGS="${BUILD_TAGS} duckdb_use_lib"
+              fi
+              echo "🔧 构建 ${OUTPUT_PATH} (tags=${BUILD_TAGS})"
+              if [ "$DRIVER" = "duckdb" ]; then
+                if [ -n "$DUCKDB_LIB_DIR" ]; then
+                  DUCKDB_LIB_DIR_GCC="$(cygpath -m "$DUCKDB_LIB_DIR")"
+                  DUCKDB_LIB_DIR_PATH="$(cygpath -u "$DUCKDB_LIB_DIR")"
+                  # cgo 会把每个 CGO_LDFLAGS 片段转成 //go:cgo_ldflag，-L 参数不能再额外包引号。
+                  DUCKDB_WINDOWS_CGO_LDFLAGS="-L${DUCKDB_LIB_DIR_GCC} -lduckdb -lstdc++ -lm -lws2_32 -lwsock32 -lrstrtmgr"
+                  CGO_ENABLED=1 GOOS="$GOOS" GOARCH="$GOARCH" CGO_LDFLAGS="${DUCKDB_WINDOWS_CGO_LDFLAGS}" PATH="${DUCKDB_LIB_DIR_PATH}:$PATH" go build \
+                    -tags "${BUILD_TAGS}" \
+                    -trimpath \
+                    -ldflags "-s -w" \
+                    -o "${OUTPUT_PATH}" \
+                    ./cmd/optional-driver-agent
+                  cp "$DUCKDB_LIB_DIR/duckdb.dll" "$OUTDIR/duckdb.dll"
+                  bash ./tools/compress-driver-artifact.sh "$OUTDIR/duckdb.dll" "$TARGET_PLATFORM" "${{ matrix.os_name }}/duckdb.dll"
+                else
+                  CGO_ENABLED=1 GOOS="$GOOS" GOARCH="$GOARCH" go build \
+                    -tags "${BUILD_TAGS}" \
+                    -trimpath \
+                    -ldflags "-s -w" \
+                    -o "${OUTPUT_PATH}" \
+                    ./cmd/optional-driver-agent
+                fi
               else
-                CGO_ENABLED=1 GOOS="$GOOS" GOARCH="$GOARCH" go build \
+                CGO_ENABLED=0 GOOS="$GOOS" GOARCH="$GOARCH" go build \
                   -tags "${BUILD_TAGS}" \
                   -trimpath \
                   -ldflags "-s -w" \
                   -o "${OUTPUT_PATH}" \
                   ./cmd/optional-driver-agent
               fi
-            else
-              CGO_ENABLED=0 GOOS="$GOOS" GOARCH="$GOARCH" go build \
-                -tags "${BUILD_TAGS}" \
-                -trimpath \
-                -ldflags "-s -w" \
-                -o "${OUTPUT_PATH}" \
-                ./cmd/optional-driver-agent
-            fi
-            bash ./tools/compress-driver-artifact.sh "${OUTPUT_PATH}" "$TARGET_PLATFORM" "${{ matrix.os_name }}/${OUTPUT}"
+              bash ./tools/compress-driver-artifact.sh "${OUTPUT_PATH}" "$TARGET_PLATFORM" "${{ matrix.os_name }}/${OUTPUT}"
+              if [ "$DRIVER" = "duckdb" ] && [ -n "$DUCKDB_LIB_DIR" ]; then
+                DUCKDB_ZIP_PATH="${OUTDIR}/duckdb-driver.zip"
+                export DUCKDB_ZIP_PATH
+                export DUCKDB_AGENT_PATH="${OUTPUT_PATH}"
+                export DUCKDB_DLL_PATH="${OUTDIR}/duckdb.dll"
+              python3 - <<'PY'
+          import os
+          import zipfile
+
+          zip_path = os.environ["DUCKDB_ZIP_PATH"]
+          entries = [
+              ("Windows/duckdb-driver-agent-windows-amd64.exe", os.environ["DUCKDB_AGENT_PATH"]),
+              ("Windows/duckdb.dll", os.environ["DUCKDB_DLL_PATH"]),
+          ]
+
+          with zipfile.ZipFile(zip_path, "w", compression=zipfile.ZIP_DEFLATED) as zf:
+              for arcname, src in entries:
+                  if not os.path.isfile(src):
+                      raise FileNotFoundError(src)
+                  zf.write(src, arcname)
+          PY
+                echo "📦 已生成 DuckDB Windows 专属驱动包: ${DUCKDB_ZIP_PATH}"
+              fi
+            done
           done
 
+          bash ./tools/verify-driver-agent-revisions.sh \
+            --assets-dir drivers \
+            --platform "$TARGET_PLATFORM" \
+            --drivers "$CHANGED_DRIVER_AGENTS"
+
       # macOS Packaging
       - name: Package macOS DMG
         if: contains(matrix.platform, 'darwin')
@@ -690,53 +947,13 @@ jobs:
           fi
 
           echo "📦 打包驱动总包：GoNavi-DriverAgents.zip"
-          python3 - <<'PY'
-          import json
-          import os
-          import shutil
-          import zipfile
-          from pathlib import Path
+          python3 ../tools/package-driver-release-assets.py \
+            drivers \
+            ../driver-release-assets
 
-          out_name = "GoNavi-DriverAgents.zip"
-          index_name = "GoNavi-DriverAgents-Index.json"
-          base = Path("drivers")
-          driver_release_dir = Path("../driver-release-assets")
-          if driver_release_dir.exists():
-              shutil.rmtree(driver_release_dir)
-          driver_release_dir.mkdir(parents=True, exist_ok=True)
-          out_path = driver_release_dir / out_name
-          index_path = driver_release_dir / index_name
-          if out_path.exists():
-              out_path.unlink()
-          if index_path.exists():
-              index_path.unlink()
-
-          size_index = {}
-          standalone_assets = []
-          with zipfile.ZipFile(out_path, "w", compression=zipfile.ZIP_DEFLATED) as zf:
-              for p in sorted(base.rglob("*")):
-                  if not p.is_file():
-                      continue
-                  arcname = p.relative_to(base).as_posix()
-                  if p.name in size_index:
-                      raise RuntimeError(f"driver asset name conflict: {p.name}")
-                  zf.write(p, arcname)
-                  size_index[p.name] = p.stat().st_size
-                  standalone_path = driver_release_dir / p.name
-                  if standalone_path.exists():
-                      raise RuntimeError(f"release asset already exists: {standalone_path}")
-                  shutil.copy2(p, standalone_path)
-                  standalone_assets.append(standalone_path.name)
-
-          index_path.write_text(
-              json.dumps({"assets": size_index}, ensure_ascii=False, indent=2),
-              encoding="utf-8",
-          )
-
-          print(f"created {out_name} size={out_path.stat().st_size} bytes")
-          print(f"created {index_name} entries={len(size_index)}")
-          print(f"published standalone driver assets={len(standalone_assets)}")
-          PY
+          python3 ../tools/generate-driver-release-manifest.py \
+            --assets-dir drivers \
+            --output ../driver-release-assets/GoNavi-DriverAgents-Manifest.json
 
           rm -rf drivers
           echo "has_driver_assets=true" >> "$GITHUB_OUTPUT"
@@ -888,23 +1105,32 @@ jobs:
 
       - name: Create Dev Driver Agents Pre-release
         if: steps.driver_assets.outputs.has_driver_assets == 'true'
-        uses: softprops/action-gh-release@v3
-        with:
-          repository: Syngnat/GoNavi-DriverAgents
-          tag_name: dev-latest
-          name: "GoNavi Driver Agents (${{ steps.version.outputs.version }})"
-          files: driver-release-assets/*
-          fail_on_unmatched_files: true
-          prerelease: true
-          draft: false
-          make_latest: false
-          body: |
+        env:
+          GH_TOKEN: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          mapfile -t DRIVER_RELEASE_ASSETS < <(find driver-release-assets -maxdepth 1 -type f | sort)
+          if [ ${#DRIVER_RELEASE_ASSETS[@]} -eq 0 ]; then
+            echo "未找到 driver release assets"
+            exit 1
+          fi
+
+          NOTES_FILE="$RUNNER_TEMP/dev-driver-release-notes.md"
+          cat > "$NOTES_FILE" <<'EOF'
             GoNavi dev driver-agent assets.
 
             **版本**: `${{ steps.version.outputs.version }}`
             **来源仓库**: `${{ github.repository }}`
             **提交**: [`${{ github.sha }}`](${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }})
-          token: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+          EOF
+
+          gh release create dev-latest "${DRIVER_RELEASE_ASSETS[@]}" \
+            --repo Syngnat/GoNavi-DriverAgents \
+            --title "GoNavi Driver Agents (${{ steps.version.outputs.version }})" \
+            --notes-file "$NOTES_FILE" \
+            --prerelease \
+            --latest=false
 
       - name: Create Dev Pre-release
         uses: softprops/action-gh-release@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5ae6071..df05264 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v6
         with:
-          go-version: '1.24'
+          go-version-file: 'go.mod'
 
       - name: Setup Node
         uses: actions/setup-node@v5
@@ -66,17 +66,94 @@ jobs:
       drivers: ${{ steps.detect.outputs.drivers }}
       has_changes: ${{ steps.detect.outputs.has_changes }}
       release_source: ${{ steps.detect.outputs.release_source }}
+      compare_base: ${{ steps.detect.outputs.compare_base }}
+      force_global_driver_builds: ${{ steps.detect.outputs.force_global_driver_builds }}
+      published_source_commit: ${{ steps.published_source.outputs.source_commit }}
+      has_manifest: ${{ steps.published_source.outputs.has_manifest }}
+      manifest_valid: ${{ steps.published_source.outputs.manifest_valid }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
+      - name: Resolve published driver release source
+        id: published_source
+        env:
+          DRIVER_RELEASE_TOKEN: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          PREV_TAG="$(git describe --tags --match 'v*' --abbrev=0 "${GITHUB_SHA}^" 2>/dev/null || true)"
+          manifest_path="$RUNNER_TEMP/published-driver-manifest.json"
+          if [[ -z "$PREV_TAG" ]]; then
+            echo "source_commit=" >> "$GITHUB_OUTPUT"
+            echo "has_manifest=false" >> "$GITHUB_OUTPUT"
+            echo "manifest_valid=false" >> "$GITHUB_OUTPUT"
+            echo "🧭 No previous stable tag found; full rebuild will be used"
+            exit 0
+          fi
+          SOURCE_COMMIT="$(python3 tools/resolve-driver-release-source.py --repo Syngnat/GoNavi-DriverAgents --tag "$PREV_TAG" --manifest-output "$manifest_path")"
+          echo "source_commit=${SOURCE_COMMIT}" >> "$GITHUB_OUTPUT"
+          if [[ -s "$manifest_path" ]]; then
+            echo "has_manifest=true" >> "$GITHUB_OUTPUT"
+            echo "🧭 Published driver release exposes revision manifest"
+          else
+            echo "has_manifest=false" >> "$GITHUB_OUTPUT"
+            echo "🧭 Published driver release has no revision manifest"
+          fi
+          if [[ -n "$SOURCE_COMMIT" && -s "$manifest_path" ]]; then
+            if bash ./tools/validate-driver-release-manifest.sh --commit "$SOURCE_COMMIT" --manifest "$manifest_path"; then
+              if python3 tools/validate-driver-release-assets.py --repo Syngnat/GoNavi-DriverAgents --tag "$PREV_TAG"; then
+                echo "manifest_valid=true" >> "$GITHUB_OUTPUT"
+                echo "🧭 Published driver release manifest and actual assets are consistent with its source commit"
+              else
+                echo "manifest_valid=false" >> "$GITHUB_OUTPUT"
+                echo "⚠️ Published driver release assets do not match manifest; forcing full rebuild"
+              fi
+            else
+              echo "manifest_valid=false" >> "$GITHUB_OUTPUT"
+              echo "⚠️ Published driver release manifest is stale; forcing full rebuild"
+            fi
+          else
+            echo "manifest_valid=false" >> "$GITHUB_OUTPUT"
+          fi
+          if [[ -n "$SOURCE_COMMIT" ]]; then
+            echo "🧭 Last published release source commit (${PREV_TAG}): $SOURCE_COMMIT"
+          else
+            echo "🧭 Unable to resolve published release source commit for ${PREV_TAG}; fallback to previous tag diff"
+          fi
+
       - name: Detect changed driver agents
         id: detect
         shell: bash
         run: |
           set -euo pipefail
+          merge_csv() {
+            local current="$1"
+            local incoming="$2"
+            local merged="$current"
+            local seen=",${current},"
+            local item
+            IFS=',' read -r -a items <<< "$incoming"
+            for item in "${items[@]}"; do
+              item="$(printf '%s' "$item" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')"
+              if [[ -z "$item" ]]; then
+                continue
+              fi
+              if [[ "$seen" == *",$item,"* ]]; then
+                continue
+              fi
+              if [[ -n "$merged" ]]; then
+                merged="${merged},${item}"
+              else
+                merged="$item"
+              fi
+              seen="${seen}${item},"
+            done
+            printf '%s\n' "$merged"
+          }
+
           git fetch --force --tags
           PREV_TAG="$(git describe --tags --match 'v*' --abbrev=0 "${GITHUB_SHA}^" 2>/dev/null || true)"
           if [ -n "$PREV_TAG" ]; then
@@ -86,9 +163,39 @@ jobs:
             BASE_REF="all"
             RELEASE_SOURCE="all"
           fi
+          HAS_MANIFEST="${{ steps.published_source.outputs.has_manifest }}"
+          MANIFEST_VALID="${{ steps.published_source.outputs.manifest_valid }}"
+          if [[ "$RELEASE_SOURCE" != "all" && "$HAS_MANIFEST" != "true" ]]; then
+            echo "⚠️ Published driver release lacks revision manifest; forcing full rebuild to self-heal old assets"
+            BASE_REF="all"
+            RELEASE_SOURCE="all"
+          elif [[ "$RELEASE_SOURCE" != "all" && "$MANIFEST_VALID" != "true" ]]; then
+            echo "⚠️ Published driver release manifest is stale; forcing full rebuild to self-heal old assets"
+            BASE_REF="all"
+            RELEASE_SOURCE="all"
+          fi
           DRIVERS="$(bash ./tools/detect-changed-driver-agents.sh --base "$BASE_REF" --head "$GITHUB_SHA")"
+          if [[ "$BASE_REF" != "all" ]]; then
+            REVISION_DRIVERS=""
+            for PLATFORM in darwin/amd64 darwin/arm64 windows/amd64 windows/arm64 linux/amd64; do
+              PLATFORM_DRIVERS="$(bash ./tools/diff-driver-agent-revisions.sh --base "$BASE_REF" --head "$GITHUB_SHA" --platform "$PLATFORM")" || {
+                echo "⚠️ 平台 revision 差异对比失败（${PLATFORM}），保守回退为全量驱动重建"
+                DRIVERS="$(bash ./tools/detect-changed-driver-agents.sh --base all --head "$GITHUB_SHA")"
+                REVISION_DRIVERS=""
+                break
+              }
+              REVISION_DRIVERS="$(merge_csv "$REVISION_DRIVERS" "$PLATFORM_DRIVERS")"
+            done
+            if [[ -n "$REVISION_DRIVERS" ]]; then
+              echo "🧭 Revision diff union drivers: $REVISION_DRIVERS"
+              DRIVERS="$(merge_csv "$DRIVERS" "$REVISION_DRIVERS")"
+            fi
+          fi
+          FORCE_GLOBAL_DRIVER_BUILDS="$(bash ./tools/should-force-global-driver-builds.sh --base "$BASE_REF" --head "$GITHUB_SHA")"
           echo "drivers=${DRIVERS}" >> "$GITHUB_OUTPUT"
           echo "release_source=${RELEASE_SOURCE}" >> "$GITHUB_OUTPUT"
+          echo "compare_base=${BASE_REF}" >> "$GITHUB_OUTPUT"
+          echo "force_global_driver_builds=${FORCE_GLOBAL_DRIVER_BUILDS}" >> "$GITHUB_OUTPUT"
           if [ -n "$DRIVERS" ]; then
             echo "has_changes=true" >> "$GITHUB_OUTPUT"
             echo "🧭 Changed driver agents since ${BASE_REF}: $DRIVERS"
@@ -96,6 +203,9 @@ jobs:
             echo "has_changes=false" >> "$GITHUB_OUTPUT"
             echo "🧭 No driver-agent changes since ${BASE_REF}"
           fi
+          if [[ "$FORCE_GLOBAL_DRIVER_BUILDS" == "true" ]]; then
+            echo "🧭 Driver build/release plumbing changed; preserve global driver rebuild set on every platform"
+          fi
 
   # Phase 1: Build in parallel and output artifacts
   build:
@@ -167,24 +277,41 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
 
       - name: Setup Go
         uses: actions/setup-go@v6
         with:
-          go-version: '1.24'
+          go-version-file: 'go.mod'
 
       - name: Download frontend dist
+        id: download_frontend_dist
+        continue-on-error: true
         uses: actions/download-artifact@v7
         with:
           name: frontend-dist
-          path: .
+          path: frontend-artifact
+
+      - name: Reset failed frontend dist download
+        if: steps.download_frontend_dist.outcome != 'success'
+        shell: bash
+        run: rm -rf frontend-artifact
+
+      - name: Retry frontend dist download
+        if: steps.download_frontend_dist.outcome != 'success'
+        uses: actions/download-artifact@v7
+        with:
+          name: frontend-dist
+          path: frontend-artifact
 
       - name: Extract frontend dist
         shell: bash
         run: |
           set -euo pipefail
           mkdir -p frontend/dist
-          tar -xf frontend-dist.tar -C frontend/dist
+          test -s frontend-artifact/frontend-dist.tar
+          tar -xf frontend-artifact/frontend-dist.tar -C frontend/dist
           test -s frontend/dist/index.html
 
       - name: Install UPX (Windows)
@@ -255,7 +382,7 @@ jobs:
 
       - name: Setup MSYS2 Toolchain For DuckDB (Windows AMD64)
         id: msys2_duckdb
-        if: ${{ matrix.build_optional_agents && matrix.platform == 'windows/amd64' && contains(format(',{0},', needs.driver_agents.outputs.drivers), ',duckdb,') }}
+        if: ${{ matrix.platform == 'windows/amd64' }}
         continue-on-error: true
         uses: msys2/setup-msys2@v2
         with:
@@ -263,9 +390,10 @@ jobs:
           update: true
           install: >-
             mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-binutils
 
       - name: Configure DuckDB CGO Toolchain (Windows AMD64)
-        if: ${{ matrix.build_optional_agents && matrix.platform == 'windows/amd64' && contains(format(',{0},', needs.driver_agents.outputs.drivers), ',duckdb,') }}
+        if: ${{ matrix.platform == 'windows/amd64' }}
         shell: pwsh
         run: |
           function Find-MingwBin([string[]]$candidates) {
@@ -323,7 +451,7 @@ jobs:
           Write-Host "✅ 已配置 DuckDB cgo 编译器: gcc=$gcc g++=$gxx"
 
       - name: Verify DuckDB CGO Toolchain (Windows AMD64)
-        if: ${{ matrix.build_optional_agents && matrix.platform == 'windows/amd64' && contains(format(',{0},', needs.driver_agents.outputs.drivers), ',duckdb,') }}
+        if: ${{ matrix.platform == 'windows/amd64' }}
         shell: pwsh
         run: |
           & "$env:CC" --version
@@ -331,31 +459,82 @@ jobs:
 
       - name: Build
         shell: bash
-        env:
-          CHANGED_DRIVER_AGENTS: ${{ needs.driver_agents.outputs.drivers }}
         run: |
           set -euo pipefail
-          if [ -n "$CHANGED_DRIVER_AGENTS" ]; then
-            ./tools/generate-driver-agent-revisions.sh --platform "${{ matrix.platform }}" --drivers "$CHANGED_DRIVER_AGENTS"
-          else
-            echo "🧭 No driver-agent changes; keeping committed driver revisions"
-          fi
+          echo "🧭 为 ${{ matrix.platform }} 全量生成 driver-agent revision 指纹，避免跨平台沿用旧 revision"
+          ./tools/generate-driver-agent-revisions.sh --platform "${{ matrix.platform }}"
+          REVISION_HASH="$(python3 - <<'PY'
+          import hashlib
+          from pathlib import Path
+
+          print(hashlib.sha256(Path("internal/db/driver_agent_revisions_gen.go").read_bytes()).hexdigest())
+          PY
+          )"
+          export GOCACHE="${RUNNER_TEMP}/go-build-${{ matrix.os_name }}-${{ matrix.arch_name }}-${REVISION_HASH}"
+          mkdir -p "$GOCACHE"
+          echo "🧭 使用隔离 GOCACHE：$GOCACHE"
           if [ -n "${{ matrix.wails_tags }}" ]; then
             wails build -s -skipbindings -platform ${{ matrix.platform }} -clean -o ${{ matrix.build_name }} -tags "${{ matrix.wails_tags }}" -ldflags "-s -w -X GoNavi-Wails/internal/app.AppVersion=${{ github.ref_name }}"
           else
             wails build -s -skipbindings -platform ${{ matrix.platform }} -clean -o ${{ matrix.build_name }} -ldflags "-s -w -X GoNavi-Wails/internal/app.AppVersion=${{ github.ref_name }}"
           fi
 
-      - name: Build Optional Driver Agents
+      - name: Resolve Platform Driver Revision Diff
+        id: revision_diff
         if: ${{ matrix.build_optional_agents && needs.driver_agents.outputs.has_changes == 'true' }}
         shell: bash
+        run: |
+          set -euo pipefail
+          BASE_REF="${{ needs.driver_agents.outputs.compare_base }}"
+          FALLBACK_DRIVERS="${{ needs.driver_agents.outputs.drivers }}"
+          FORCE_GLOBAL_DRIVER_BUILDS="${{ needs.driver_agents.outputs.force_global_driver_builds }}"
+
+          if [[ -z "$BASE_REF" || "$BASE_REF" == "all" || "$FORCE_GLOBAL_DRIVER_BUILDS" == "true" ]]; then
+            if [[ "$FORCE_GLOBAL_DRIVER_BUILDS" == "true" && -n "$BASE_REF" && "$BASE_REF" != "all" ]]; then
+              echo "⚠️ 当前提交涉及 driver 构建/发布链路，保留全局驱动重建结果：${FALLBACK_DRIVERS}"
+            else
+              echo "⚠️ 未拿到可比对的历史 release 基线，回退使用全局检测结果：${FALLBACK_DRIVERS}"
+            fi
+            echo "drivers=${FALLBACK_DRIVERS}" >> "$GITHUB_OUTPUT"
+          else
+            echo "🧭 对比当前平台 revision：base=${BASE_REF} head=${GITHUB_SHA} platform=${{ matrix.platform }}"
+            if DRIVERS="$(bash ./tools/diff-driver-agent-revisions.sh --base "$BASE_REF" --head "$GITHUB_SHA" --platform "${{ matrix.platform }}")"; then
+              echo "🧭 当前平台实际需要重建的 driver agents: ${DRIVERS:-<empty>}"
+              echo "drivers=${DRIVERS}" >> "$GITHUB_OUTPUT"
+            else
+              echo "⚠️ revision 差异对比失败，保守回退为全量重建"
+              ALL_DRIVERS="$(bash ./tools/detect-changed-driver-agents.sh --base all --head "$GITHUB_SHA")"
+              echo "drivers=${ALL_DRIVERS}" >> "$GITHUB_OUTPUT"
+            fi
+          fi
+
+          DRIVERS="$(sed -n 's/^drivers=//p' "$GITHUB_OUTPUT" | tail -n 1)"
+          if [[ -n "$DRIVERS" ]]; then
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Build Optional Driver Agents
+        if: ${{ matrix.build_optional_agents && steps.revision_diff.outputs.has_changes == 'true' }}
+        shell: bash
         env:
-          CHANGED_DRIVER_AGENTS: ${{ needs.driver_agents.outputs.drivers }}
+          CHANGED_DRIVER_AGENTS: ${{ steps.revision_diff.outputs.drivers }}
         run: |
           set -euo pipefail
           TARGET_PLATFORM="${{ matrix.platform }}"
           GOOS="${TARGET_PLATFORM%%/*}"
           GOARCH="${TARGET_PLATFORM##*/}"
+          REVISION_HASH="$(python3 - <<'PY'
+          import hashlib
+          from pathlib import Path
+
+          print(hashlib.sha256(Path("internal/db/driver_agent_revisions_gen.go").read_bytes()).hexdigest())
+          PY
+          )"
+          export GOCACHE="${RUNNER_TEMP}/go-build-${{ matrix.os_name }}-${{ matrix.arch_name }}-${REVISION_HASH}"
+          mkdir -p "$GOCACHE"
+          echo "🧭 可选驱动使用隔离 GOCACHE：$GOCACHE"
           IFS=',' read -r -a DRIVERS <<< "$CHANGED_DRIVER_AGENTS"
           OUTDIR="drivers/${{ matrix.os_name }}"
           mkdir -p "$OUTDIR"
@@ -364,17 +543,51 @@ jobs:
 
           prepare_duckdb_windows_library() {
             local lib_dir="$RUNNER_TEMP/duckdb-windows-${DUCKDB_WINDOWS_LIBRARY_VERSION}"
+            local extract_dir="$RUNNER_TEMP/duckdb-windows-extract-${DUCKDB_WINDOWS_LIBRARY_VERSION}"
             local zip_path="$RUNNER_TEMP/libduckdb-windows-amd64.zip"
-            if [ -f "$lib_dir/duckdb.dll" ] && [ -f "$lib_dir/duckdb.lib" ]; then
+            if [ -f "$lib_dir/duckdb.dll" ] && [ -f "$lib_dir/libduckdb.dll.a" ] && [ -f "$lib_dir/libduckdb.a" ]; then
               echo "$lib_dir"
               return 0
             fi
             mkdir -p "$lib_dir"
-            curl -fsSL "$DUCKDB_WINDOWS_LIBRARY_URL" -o "$zip_path"
-            unzip -qo "$zip_path" -d "$lib_dir"
-            cp "$lib_dir/duckdb.lib" "$lib_dir/libduckdb.dll.a"
-            cp "$lib_dir/duckdb.lib" "$lib_dir/libduckdb.a"
-            echo "$lib_dir"
+            rm -rf "$extract_dir"
+            rm -f "$zip_path"
+            local attempt dll_path
+            for attempt in 1 2 3; do
+              echo "📥 下载 DuckDB Windows 动态库 (${attempt}/3): ${DUCKDB_WINDOWS_LIBRARY_URL}" >&2
+              if curl --retry 3 --retry-delay 2 --retry-all-errors --connect-timeout 20 --max-time 300 -fsSL "$DUCKDB_WINDOWS_LIBRARY_URL" -o "$zip_path"; then
+                if unzip -tq "$zip_path" >/dev/null 2>&1; then
+                  rm -rf "$lib_dir"
+                  rm -rf "$extract_dir"
+                  mkdir -p "$lib_dir"
+                  mkdir -p "$extract_dir"
+                  unzip -qo "$zip_path" -d "$extract_dir"
+                  dll_path="$(find "$extract_dir" -type f -name duckdb.dll | head -n 1 || true)"
+                  if [ -n "$dll_path" ]; then
+                    cp "$dll_path" "$lib_dir/duckdb.dll"
+                    go run ./cmd/mingw-import-lib \
+                      --dll "$lib_dir/duckdb.dll" \
+                      --output-lib "$lib_dir/libduckdb.dll.a"
+                    cp "$lib_dir/libduckdb.dll.a" "$lib_dir/libduckdb.a"
+                    rm -rf "$extract_dir"
+                    echo "$lib_dir"
+                    return 0
+                  fi
+                  echo "⚠️ DuckDB Windows 动态库压缩包缺少 duckdb.dll，准备重试" >&2
+                else
+                  echo "⚠️ DuckDB Windows 动态库压缩包校验失败，准备重试" >&2
+                fi
+              else
+                echo "⚠️ DuckDB Windows 动态库下载失败，准备重试" >&2
+              fi
+              rm -f "$zip_path"
+              rm -rf "$lib_dir"
+              rm -rf "$extract_dir"
+              mkdir -p "$lib_dir"
+              sleep $((attempt * 2))
+            done
+            echo "❌ 无法准备 DuckDB Windows 动态库：${DUCKDB_WINDOWS_LIBRARY_URL}" >&2
+            return 1
           }
 
           for DRIVER in "${DRIVERS[@]}"; do
@@ -386,48 +599,98 @@ jobs:
               echo "⚠️ 跳过 DuckDB driver（当前平台 ${GOOS}/${GOARCH} 不受支持，仅支持 windows/amd64）"
               continue
             fi
-            TAG="gonavi_${BUILD_DRIVER}_driver"
-            BUILD_TAGS="$TAG"
-            OUTPUT="${DRIVER}-driver-agent-${GOOS}-${GOARCH}"
-            if [ "$GOOS" = "windows" ]; then
-              OUTPUT="${OUTPUT}.exe"
+            DRIVER_VARIANTS=("")
+            if [ "$DRIVER" = "mongodb" ]; then
+              DRIVER_VARIANTS=("v1" "v2" "")
             fi
-            OUTPUT_PATH="${OUTDIR}/${OUTPUT}"
-            DUCKDB_LIB_DIR=""
-            if [ "$DRIVER" = "duckdb" ] && [ "$GOOS" = "windows" ] && [ "$GOARCH" = "amd64" ]; then
-              DUCKDB_LIB_DIR="$(prepare_duckdb_windows_library)"
-              BUILD_TAGS="${BUILD_TAGS} duckdb_use_lib"
-            fi
-            echo "🔧 构建 ${OUTPUT_PATH} (tags=${BUILD_TAGS})"
-            if [ "$DRIVER" = "duckdb" ]; then
-              if [ -n "$DUCKDB_LIB_DIR" ]; then
-                CGO_ENABLED=1 GOOS="$GOOS" GOARCH="$GOARCH" CGO_LDFLAGS="-L${DUCKDB_LIB_DIR} -lduckdb" PATH="${DUCKDB_LIB_DIR}:$PATH" go build \
-                  -tags "${BUILD_TAGS}" \
-                  -trimpath \
-                  -ldflags "-s -w" \
-                  -o "${OUTPUT_PATH}" \
-                  ./cmd/optional-driver-agent
-                cp "$DUCKDB_LIB_DIR/duckdb.dll" "$OUTDIR/duckdb.dll"
-                bash ./tools/compress-driver-artifact.sh "$OUTDIR/duckdb.dll" "$TARGET_PLATFORM" "${{ matrix.os_name }}/duckdb.dll"
+            for DRIVER_VARIANT in "${DRIVER_VARIANTS[@]}"; do
+              TAG="gonavi_${BUILD_DRIVER}_driver"
+              BUILD_TAGS="$TAG"
+              OUTPUT_STEM="${DRIVER}-driver-agent"
+              if [ "$DRIVER" = "mongodb" ]; then
+                if [ "$DRIVER_VARIANT" = "v1" ]; then
+                  BUILD_TAGS="gonavi_mongodb_driver_v1"
+                  OUTPUT_STEM="mongodb-driver-agent-v1"
+                elif [ "$DRIVER_VARIANT" = "v2" ]; then
+                  BUILD_TAGS="gonavi_mongodb_driver"
+                  OUTPUT_STEM="mongodb-driver-agent-v2"
+                else
+                  BUILD_TAGS="gonavi_mongodb_driver"
+                fi
+              fi
+              OUTPUT="${OUTPUT_STEM}-${GOOS}-${GOARCH}"
+              if [ "$GOOS" = "windows" ]; then
+                OUTPUT="${OUTPUT}.exe"
+              fi
+              OUTPUT_PATH="${OUTDIR}/${OUTPUT}"
+              DUCKDB_LIB_DIR=""
+              if [ "$DRIVER" = "duckdb" ] && [ "$GOOS" = "windows" ] && [ "$GOARCH" = "amd64" ]; then
+                DUCKDB_LIB_DIR="$(prepare_duckdb_windows_library)"
+                BUILD_TAGS="${BUILD_TAGS} duckdb_use_lib"
+              fi
+              echo "🔧 构建 ${OUTPUT_PATH} (tags=${BUILD_TAGS})"
+              if [ "$DRIVER" = "duckdb" ]; then
+                if [ -n "$DUCKDB_LIB_DIR" ]; then
+                  DUCKDB_LIB_DIR_GCC="$(cygpath -m "$DUCKDB_LIB_DIR")"
+                  DUCKDB_LIB_DIR_PATH="$(cygpath -u "$DUCKDB_LIB_DIR")"
+                  # cgo 会把每个 CGO_LDFLAGS 片段转成 //go:cgo_ldflag，-L 参数不能再额外包引号。
+                  DUCKDB_WINDOWS_CGO_LDFLAGS="-L${DUCKDB_LIB_DIR_GCC} -lduckdb -lstdc++ -lm -lws2_32 -lwsock32 -lrstrtmgr"
+                  CGO_ENABLED=1 GOOS="$GOOS" GOARCH="$GOARCH" CGO_LDFLAGS="${DUCKDB_WINDOWS_CGO_LDFLAGS}" PATH="${DUCKDB_LIB_DIR_PATH}:$PATH" go build \
+                    -tags "${BUILD_TAGS}" \
+                    -trimpath \
+                    -ldflags "-s -w" \
+                    -o "${OUTPUT_PATH}" \
+                    ./cmd/optional-driver-agent
+                  cp "$DUCKDB_LIB_DIR/duckdb.dll" "$OUTDIR/duckdb.dll"
+                  bash ./tools/compress-driver-artifact.sh "$OUTDIR/duckdb.dll" "$TARGET_PLATFORM" "${{ matrix.os_name }}/duckdb.dll"
+                else
+                  CGO_ENABLED=1 GOOS="$GOOS" GOARCH="$GOARCH" go build \
+                    -tags "${BUILD_TAGS}" \
+                    -trimpath \
+                    -ldflags "-s -w" \
+                    -o "${OUTPUT_PATH}" \
+                    ./cmd/optional-driver-agent
+                fi
               else
-                CGO_ENABLED=1 GOOS="$GOOS" GOARCH="$GOARCH" go build \
+                CGO_ENABLED=0 GOOS="$GOOS" GOARCH="$GOARCH" go build \
                   -tags "${BUILD_TAGS}" \
                   -trimpath \
                   -ldflags "-s -w" \
                   -o "${OUTPUT_PATH}" \
                   ./cmd/optional-driver-agent
               fi
-            else
-              CGO_ENABLED=0 GOOS="$GOOS" GOARCH="$GOARCH" go build \
-                -tags "${BUILD_TAGS}" \
-                -trimpath \
-                -ldflags "-s -w" \
-                -o "${OUTPUT_PATH}" \
-                ./cmd/optional-driver-agent
-            fi
-            bash ./tools/compress-driver-artifact.sh "${OUTPUT_PATH}" "$TARGET_PLATFORM" "${{ matrix.os_name }}/${OUTPUT}"
+              bash ./tools/compress-driver-artifact.sh "${OUTPUT_PATH}" "$TARGET_PLATFORM" "${{ matrix.os_name }}/${OUTPUT}"
+              if [ "$DRIVER" = "duckdb" ] && [ -n "$DUCKDB_LIB_DIR" ]; then
+                DUCKDB_ZIP_PATH="${OUTDIR}/duckdb-driver.zip"
+                export DUCKDB_ZIP_PATH
+                export DUCKDB_AGENT_PATH="${OUTPUT_PATH}"
+                export DUCKDB_DLL_PATH="${OUTDIR}/duckdb.dll"
+              python3 - <<'PY'
+          import os
+          import zipfile
+
+          zip_path = os.environ["DUCKDB_ZIP_PATH"]
+          entries = [
+              ("Windows/duckdb-driver-agent-windows-amd64.exe", os.environ["DUCKDB_AGENT_PATH"]),
+              ("Windows/duckdb.dll", os.environ["DUCKDB_DLL_PATH"]),
+          ]
+
+          with zipfile.ZipFile(zip_path, "w", compression=zipfile.ZIP_DEFLATED) as zf:
+              for arcname, src in entries:
+                  if not os.path.isfile(src):
+                      raise FileNotFoundError(src)
+                  zf.write(src, arcname)
+          PY
+                echo "📦 已生成 DuckDB Windows 专属驱动包: ${DUCKDB_ZIP_PATH}"
+              fi
+            done
           done
 
+          bash ./tools/verify-driver-agent-revisions.sh \
+            --assets-dir drivers \
+            --platform "$TARGET_PLATFORM" \
+            --drivers "$CHANGED_DRIVER_AGENTS"
+
       # macOS Packaging
       - name: Package macOS DMG
         if: contains(matrix.platform, 'darwin')
@@ -702,6 +965,7 @@ jobs:
               REQUIRED_FILES+=("drivers/Windows/${driver}-driver-agent-windows-arm64.exe")
             else
               REQUIRED_FILES+=("drivers/Windows/duckdb.dll")
+              REQUIRED_FILES+=("drivers/Windows/duckdb-driver.zip")
             fi
 
             for file in "${REQUIRED_FILES[@]}"; do
@@ -738,53 +1002,13 @@ jobs:
           fi
 
           echo "📦 打包驱动总包：GoNavi-DriverAgents.zip"
-          python3 - <<'PY'
-          import json
-          import os
-          import shutil
-          import zipfile
-          from pathlib import Path
+          python3 ../tools/package-driver-release-assets.py \
+            drivers \
+            ../driver-release-assets
 
-          out_name = "GoNavi-DriverAgents.zip"
-          index_name = "GoNavi-DriverAgents-Index.json"
-          base = Path("drivers")
-          driver_release_dir = Path("../driver-release-assets")
-          if driver_release_dir.exists():
-              shutil.rmtree(driver_release_dir)
-          driver_release_dir.mkdir(parents=True, exist_ok=True)
-          out_path = driver_release_dir / out_name
-          index_path = driver_release_dir / index_name
-          if out_path.exists():
-              out_path.unlink()
-          if index_path.exists():
-              index_path.unlink()
-
-          size_index = {}
-          standalone_assets = []
-          with zipfile.ZipFile(out_path, "w", compression=zipfile.ZIP_DEFLATED) as zf:
-              for p in sorted(base.rglob("*")):
-                  if not p.is_file():
-                      continue
-                  arcname = p.relative_to(base).as_posix()
-                  if p.name in size_index:
-                      raise RuntimeError(f"driver asset name conflict: {p.name}")
-                  zf.write(p, arcname)
-                  size_index[p.name] = p.stat().st_size
-                  standalone_path = driver_release_dir / p.name
-                  if standalone_path.exists():
-                      raise RuntimeError(f"release asset already exists: {standalone_path}")
-                  shutil.copy2(p, standalone_path)
-                  standalone_assets.append(standalone_path.name)
-
-          index_path.write_text(
-              json.dumps({"assets": size_index}, ensure_ascii=False, indent=2),
-              encoding="utf-8",
-          )
-
-          print(f"created {out_name} size={out_path.stat().st_size} bytes")
-          print(f"created {index_name} entries={len(size_index)}")
-          print(f"published standalone driver assets={len(standalone_assets)}")
-          PY
+          python3 ../tools/generate-driver-release-manifest.py \
+            --assets-dir drivers \
+            --output ../driver-release-assets/GoNavi-DriverAgents-Manifest.json
 
           # GoNavi 主仓库只保留主程序包；驱动资产发布到独立仓库。
           rm -rf drivers
@@ -825,18 +1049,28 @@ jobs:
           sha256sum "${FILES[@]}" > SHA256SUMS
 
       - name: Create Driver Agents Release
-        uses: softprops/action-gh-release@v3
         if: startsWith(github.ref, 'refs/tags/') && steps.driver_assets.outputs.has_driver_assets == 'true'
-        with:
-          repository: Syngnat/GoNavi-DriverAgents
-          tag_name: ${{ github.ref_name }}
-          name: "GoNavi Driver Agents ${{ github.ref_name }}"
-          files: driver-release-assets/*
-          fail_on_unmatched_files: true
-          make_latest: true
-          body: |
+        env:
+          GH_TOKEN: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          mapfile -t DRIVER_RELEASE_ASSETS < <(find driver-release-assets -maxdepth 1 -type f | sort)
+          if [ ${#DRIVER_RELEASE_ASSETS[@]} -eq 0 ]; then
+            echo "未找到 driver release assets"
+            exit 1
+          fi
+
+          NOTES_FILE="$RUNNER_TEMP/driver-release-notes.md"
+          cat > "$NOTES_FILE" <<'EOF'
             GoNavi driver-agent assets for `${{ github.ref_name }}`.
-          token: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+          EOF
+
+          gh release create "${{ github.ref_name }}" "${DRIVER_RELEASE_ASSETS[@]}" \
+            --repo Syngnat/GoNavi-DriverAgents \
+            --title "GoNavi Driver Agents ${{ github.ref_name }}" \
+            --notes-file "$NOTES_FILE" \
+            --latest
 
       - name: Checkout code for changelog
         uses: actions/checkout@v5
diff --git a/.gitignore b/.gitignore
index af09dda..2810a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ build/bin/
 
 # wails / node artifacts (按需)
 node_modules/
+frontend/wailsjs/tsconfig.json
 
 dist/
 .DS_Store
diff --git a/AI_EXTENSIONS_ROADMAP.md b/AI_EXTENSIONS_ROADMAP.md
new file mode 100644
index 0000000..dd196e6
--- /dev/null
+++ b/AI_EXTENSIONS_ROADMAP.md
@@ -0,0 +1,106 @@
+# AI 扩展能力路线
+
+当前 GoNavi 的 AI 链路是：
+
+1. 前端 `AIChatPanel` 组装 system messages。
+2. 前端声明本地固定工具 `LOCAL_TOOLS`。
+3. 后端 `aiservice.Service` 只负责 Provider 配置、安全级别与模型转发。
+
+这套结构已经足够承接“用户级提示词”，但要继续承接 MCP 和 Skills，需要先把“提示词 / 工具 / 技能”三层职责拆开。
+
+## 1. 用户级自定义提示词
+
+已落地的方向：
+
+- 配置存储在 `ai_config.json` 的 `userPromptSettings`。
+- 由 `AISettingsModal` 提供编辑入口。
+- 由 `AIChatPanel` 在运行时追加为 system message。
+
+建议长期保持 4 个层级：
+
+- `global`: 所有 AI 会话统一追加。
+- `database`: 数据库 / SQL 场景追加。
+- `jvm`: JVM 资源浏览与分析场景追加。
+- `jvmDiagnostic`: JVM 诊断命令规划场景追加。
+
+这样既能满足“个人习惯”定制，也不会把所有场景揉成一条超长总提示词。
+
+## 2. MCP 能力开放
+
+目标不是把 MCP 做成新的聊天面板，而是把它变成“外部工具源”。
+
+建议后续拆成三层：
+
+1. `tool registry`
+   - 统一收口内置工具、本地扩展工具、MCP 工具。
+   - 对模型只暴露统一的 `tools[]`。
+2. `mcp server config`
+   - 保存 server 名称、transport、启动命令或 URL、超时、启用状态。
+   - 由后端维护生命周期与连通性。
+3. `mcp runtime bridge`
+   - 负责 `list tools / call tool / errors / timeout / auth`。
+
+### MCP 是否需要单独 GitHub 仓库
+
+不需要把“GoNavi 对 MCP 的支持”单独拆仓库。
+
+更合理的边界是：
+
+- `GoNavi 主仓库`
+  - 维护 MCP client、配置、UI、工具注册和运行时桥接。
+- `单独仓库（可选）`
+  - 只在你要发布一个可复用的 MCP Server 时才有价值。
+  - 例如 `gonavi-mcp-sql-tools`、`gonavi-mcp-jvm-agent` 这类独立 server。
+
+结论：
+
+- “客户端支持 MCP” 不需要新仓库。
+- “某个独立 MCP Server” 是否拆仓库，取决于它要不要单独发布、复用或部署。
+
+## 3. Skills 设计
+
+Skills 不建议直接等同于“另一种提示词”。
+
+更合适的定义是：
+
+- `skill manifest`
+  - 名称、说明、适用场景、是否默认启用。
+- `skill prompt`
+  - 该技能追加的 system prompt / few-shot / 输出约束。
+- `skill tool requirements`
+  - 该技能依赖哪些内置工具或 MCP 工具。
+- `skill shortcuts`
+  - 可选地给欢迎卡片、斜杠命令或快速动作提供入口。
+
+一个 Skill 本质上应该是“提示词 + 工具依赖 + 使用入口”的组合，而不是单独一段文案。
+
+### Skills 是否需要单独 GitHub 仓库
+
+第一阶段不需要。
+
+建议顺序：
+
+1. 先在 GoNavi 主仓库内把 Skills manifest/runtime 跑通。
+2. 等格式稳定后，再考虑增加“本地目录导入”或“Git 仓库导入”。
+
+只有当你明确要做下面两件事时，独立仓库才值得：
+
+- 把 Skills 当作社区共享资产分发。
+- 让不同团队独立维护自己的 skill pack。
+
+## 建议的下一步实现顺序
+
+1. 抽出统一 `ToolRegistry`，让 `LOCAL_TOOLS` 不再硬编码在聊天面板内部。
+2. 在 AI 设置中新增 `MCP Servers` 配置页。
+3. 后端先支持最小 transport：
+   - `stdio`
+   - `http/sse`（如果后续确认需要）
+4. 在 AI 设置中新增 `Skills` 配置页。
+5. 让 Skill 以 manifest 形式声明：
+   - `id`
+   - `name`
+   - `description`
+   - `systemPrompt`
+   - `requiredTools`
+   - `scopes`
+6. 再决定是否增加“从 Git 仓库同步 MCP/Skills 包”的分发能力。
diff --git a/README.md b/README.md
index 6029bcb..cd75c60 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ GoNavi is designed for developers and DBAs who need a unified desktop experience
 | Document | MongoDB | Optional driver agent | Document query, collection browsing, connection management |
 | Time-series | TDengine | Optional driver agent | Time-series schema browsing and querying |
 | Columnar Analytics | ClickHouse | Optional driver agent | Analytical query, object browsing, SQL execution |
+| Search | Elasticsearch | Optional driver agent | Index browsing, mapping inspection, JSON DSL / query_string search |
 | Extensibility | Custom Driver/DSN | Custom | Extend to more data sources via Driver + DSN |
 
 <h2 align="center">📸 Screenshots</h2>
@@ -212,6 +213,16 @@ sudo apt-get install -y libgtk-3-0 libwebkit2gtk-4.0-37 libjavascriptcoregtk-4.0
 
 If you use Linux artifacts with the `-WebKit41` suffix, prefer Debian 13 / Ubuntu 24.04+.
 
+### Linux: Chinese text appears as square boxes
+
+Minimal Ubuntu 24.04 LTS desktop/server environments may not include Chinese CJK fonts. Install Noto / WenQuanYi fonts and restart GoNavi:
+
+```bash
+sudo apt-get update
+sudo apt-get install -y fonts-noto-cjk fonts-wqy-microhei
+fc-cache -fv
+```
+
 ---
 
 ## Contributing
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 688f86e..e8f9627 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -50,6 +50,7 @@ GoNavi 面向开发者与 DBA，核心目标是让数据库操作在桌面端做
 | 文档型 | MongoDB | 可选驱动代理 | 文档查询、集合浏览、连接管理 |
 | 时序 | TDengine | 可选驱动代理 | 时序库表浏览、查询分析 |
 | 列式分析 | ClickHouse | 可选驱动代理 | 分析查询、对象浏览、SQL 执行 |
+| 搜索 | Elasticsearch | 可选驱动代理 | 索引浏览、Mapping 检查、JSON DSL / query_string 查询 |
 | 扩展接入 | Custom Driver/DSN | 自定义 | 通过 Driver + DSN 接入更多数据源 |
 
 <h2 align="center">📸 项目截图</h2>
@@ -195,6 +196,16 @@ sudo apt-get update
 sudo apt-get install -y libgtk-3-0 libwebkit2gtk-4.0-37 libjavascriptcoregtk-4.0-18
 ```
 
+### Linux 中文显示为方框
+
+Ubuntu 24.04 LTS 的最小化桌面或服务器环境可能没有安装中文 CJK 字体，GoNavi 打开后中文会显示为方框。安装 Noto / 文泉驿字体后重启 GoNavi：
+
+```bash
+sudo apt-get update
+sudo apt-get install -y fonts-noto-cjk fonts-wqy-microhei
+fc-cache -fv
+```
+
 ---
 
 ## 贡献指南
diff --git a/build-driver-agents.sh b/build-driver-agents.sh
index 854348d..7574585 100755
--- a/build-driver-agents.sh
+++ b/build-driver-agents.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR"
 
-DEFAULT_DRIVERS=(mariadb oceanbase doris starrocks sphinx sqlserver sqlite duckdb dameng kingbase highgo vastbase opengauss iris mongodb tdengine clickhouse)
+DEFAULT_DRIVERS=(mariadb oceanbase doris starrocks sphinx sqlserver sqlite duckdb dameng kingbase highgo vastbase opengauss gaussdb iris mongodb tdengine iotdb clickhouse elasticsearch)
 DEFAULT_PLATFORMS=(darwin/amd64 darwin/arm64 windows/amd64 windows/arm64 linux/amd64 linux/arm64)
 DUCKDB_WINDOWS_LIBRARY_VERSION="v1.4.4"
 DUCKDB_WINDOWS_LIBRARY_URL="https://github.com/duckdb/duckdb/releases/download/${DUCKDB_WINDOWS_LIBRARY_VERSION}/libduckdb-windows-amd64.zip"
@@ -42,7 +42,9 @@ normalize_driver() {
   case "$name" in
     doris|diros) echo "doris" ;;
     open_gauss|open-gauss) echo "opengauss" ;;
-    mariadb|oceanbase|starrocks|sphinx|sqlserver|sqlite|duckdb|dameng|kingbase|highgo|vastbase|opengauss|iris|mongodb|tdengine|clickhouse)
+    gaussdb|gauss_db|gauss-db) echo "gaussdb" ;;
+    elasticsearch|elastic) echo "elasticsearch" ;;
+    mariadb|oceanbase|starrocks|sphinx|sqlserver|sqlite|duckdb|dameng|kingbase|highgo|vastbase|opengauss|gaussdb|iris|mongodb|tdengine|iotdb|clickhouse)
       echo "$name"
       ;;
     *)
@@ -144,6 +146,40 @@ PY
   fi
 }
 
+zip_duckdb_windows_package() {
+  local bundle_stage_dir="$1"
+  local zip_path="$2"
+
+  rm -f "$zip_path"
+  if command -v python3 >/dev/null 2>&1; then
+    BUNDLE_STAGE_DIR="$bundle_stage_dir" BUNDLE_ZIP_PATH="$zip_path" python3 - <<'PY'
+import os
+import zipfile
+
+stage_dir = os.environ["BUNDLE_STAGE_DIR"]
+zip_path = os.environ["BUNDLE_ZIP_PATH"]
+entries = [
+    ("Windows/duckdb-driver-agent-windows-amd64.exe", os.path.join(stage_dir, "Windows", "duckdb-driver-agent-windows-amd64.exe")),
+    ("Windows/duckdb.dll", os.path.join(stage_dir, "Windows", "duckdb.dll")),
+]
+
+with zipfile.ZipFile(zip_path, "w", compression=zipfile.ZIP_DEFLATED) as zf:
+    for arcname, src in entries:
+        if not os.path.isfile(src):
+            raise FileNotFoundError(src)
+        zf.write(src, arcname)
+PY
+  elif command -v zip >/dev/null 2>&1; then
+    (
+      cd "$bundle_stage_dir"
+      zip -qry "$zip_path" "Windows/duckdb-driver-agent-windows-amd64.exe" "Windows/duckdb.dll"
+    )
+  else
+    echo "❌ 未找到 python3 或 zip，无法生成 DuckDB Windows 专属驱动包。"
+    exit 1
+  fi
+}
+
 prepare_duckdb_windows_library() {
   local cache_root="$1"
   local lib_dir="$cache_root/duckdb-windows-${DUCKDB_WINDOWS_LIBRARY_VERSION}"
@@ -201,6 +237,7 @@ driver_csv=""
 target_platform=""
 out_root="dist/driver-agents"
 bundle_name="GoNavi-DriverAgents.zip"
+duckdb_windows_zip_name="duckdb-driver.zip"
 strict_mode="false"
 upx_mode="${GONAVI_DRIVER_AGENT_UPX:-auto}"
 
@@ -402,6 +439,14 @@ fi
 
 zip_bundle "$bundle_zip_path" "$bundle_stage_dir"
 
+duckdb_asset_path="$out_root_abs/windows-amd64/duckdb-driver-agent-windows-amd64.exe"
+duckdb_dll_path="$out_root_abs/windows-amd64/$DUCKDB_WINDOWS_SUPPORT_DLL"
+if [[ -f "$duckdb_asset_path" && -f "$duckdb_dll_path" ]]; then
+  duckdb_zip_path="$out_root_abs/windows-amd64/$duckdb_windows_zip_name"
+  zip_duckdb_windows_package "$bundle_stage_dir" "$duckdb_zip_path"
+  built_assets+=("Windows/$duckdb_windows_zip_name")
+fi
+
 echo ""
 echo "✅ 构建完成"
 echo "   单文件输出根目录：$out_root_abs"
diff --git a/cmd/gonavi-mcp-server/README.md b/cmd/gonavi-mcp-server/README.md
new file mode 100644
index 0000000..48ba95a
--- /dev/null
+++ b/cmd/gonavi-mcp-server/README.md
@@ -0,0 +1,193 @@
+# GoNavi MCP Server
+
+`gonavi-mcp-server` 会把 GoNavi 已保存连接背后的数据库能力通过 MCP 暴露给外部客户端。本机客户端默认使用 `stdio`；云端 Agent 可使用显式开启的 Streamable HTTP 模式。
+
+## 当前提供的 tools
+
+- `get_connections`
+  - 返回 GoNavi 已保存连接的 `id/name/type/target/defaultDatabase` 等摘要信息
+- `get_databases`
+  - 入参：`connectionId`
+- `get_tables`
+  - 入参：`connectionId`、可选 `dbName`
+- `get_columns`
+  - 入参：`connectionId`、可选 `dbName`、`tableName`
+- `get_table_ddl`
+  - 入参：`connectionId`、可选 `dbName`、`tableName`
+- `execute_sql`
+  - 入参：`connectionId`、可选 `dbName`、`sql`
+  - 默认只允许只读 SQL
+  - 如果 SQL 包含 DDL/DML，必须显式传 `allowMutating=true`
+  - `maxRowsPerResult` 用来限制单个结果集返回的行数，默认 `200`
+
+远程 Agent 只需要库表结构时，启动 HTTP 模式请加 `--schema-only`。该模式不注册 `execute_sql`，只保留连接摘要、库表、字段、索引、外键、触发器和 DDL 工具。
+
+## 运行方式
+
+开发态直接运行：
+
+```powershell
+go run ./cmd/gonavi-mcp-server
+```
+
+显式运行本机 `stdio`：
+
+```powershell
+go run ./cmd/gonavi-mcp-server stdio
+```
+
+也可以先编译：
+
+```powershell
+go build -o .\bin\gonavi-mcp-server.exe .\cmd\gonavi-mcp-server
+```
+
+远程 Agent 使用 Streamable HTTP 时必须设置 bearer token：
+
+```powershell
+$env:GONAVI_MCP_HTTP_TOKEN = "<随机token>"
+go run ./cmd/gonavi-mcp-server http --addr 127.0.0.1:8765 --path /mcp --schema-only
+```
+
+安装包主程序也支持同样模式：
+
+```powershell
+& "C:\Program Files\GoNavi\GoNavi.exe" mcp-server http --addr 127.0.0.1:8765 --path /mcp --token "<随机token>" --schema-only
+```
+
+默认建议只监听 `127.0.0.1`，再通过 SSH 隧道、反向代理或内网网关暴露给云端 Agent。不要在没有 TLS、防火墙和鉴权的情况下直接监听公网地址。
+
+无图形界面或需要把配置交给云端 Agent 时，可直接生成 OpenClaw / Hermans 等远程 MCP 配置：
+
+```powershell
+& "C:\Program Files\GoNavi\GoNavi.exe" mcp-server remote-config --client openclaw --url "https://<你的域名或隧道地址>/mcp" --token "<随机token>" --schema-only
+```
+
+独立 server 开发态也支持同样能力：
+
+```powershell
+go run ./cmd/gonavi-mcp-server remote-config --client hermans --url "https://<你的域名或隧道地址>/mcp" --token "<随机token>" --schema-only
+```
+
+## Claude Code / Codex / OpenClaw / Hermans
+
+正式安装包场景，推荐直接在 GoNavi 里使用“AI 设置 -> MCP 服务 -> 安装到 Claude Code / 安装到 Codex”。
+
+它会自动把当前安装的 `GoNavi.exe` 写入 Claude Code 的用户级 `~/.claude.json`，命令形态类似：
+
+```json
+{
+  "mcpServers": {
+    "gonavi": {
+      "type": "stdio",
+      "command": "C:\\Program Files\\GoNavi\\GoNavi.exe",
+      "args": ["mcp-server"],
+      "env": {}
+    }
+  }
+}
+```
+
+这样用户不需要自己找本机 `gonavi-mcp-server.exe` 路径，安装包本体就能直接作为 MCP 入口。
+
+Codex 当前使用 `~/.codex/config.toml`，GoNavi 会写入类似下面这段：
+
+```toml
+[mcp_servers.gonavi]
+command = 'C:\Program Files\GoNavi\GoNavi.exe'
+args = ['mcp-server']
+startup_timeout_sec = 60
+```
+
+仓库开发态如果要在本机 `Claude Code CLI` 里稳定使用这个 MCP，仍然推荐走仓库内包装脚本：
+
+```powershell
+.\tools\claude-gonavi-mcp.ps1 -p "必须调用 gonavi MCP 的 get_connections 工具"
+```
+
+或者：
+
+```cmd
+tools\claude-gonavi-mcp.cmd -p "必须调用 gonavi MCP 的 get_connections 工具"
+```
+
+这个脚本会先构建 `bin\gonavi-mcp-server.exe`，再通过 `--mcp-config` 和 `--strict-mcp-config` 把 GoNavi MCP 单独注入当前 Claude 会话，避免默认混合 MCP 加载时序导致的首轮工具未挂载问题。
+
+OpenClaw、Hermans 这类部署在云端或远端 Linux 的 Agent，不能直接使用 Windows 本机的 `stdio` 命令。GoNavi 的连接信息和数据库密码仍应留在 Windows 本机，由 GoNavi MCP 读取保存连接和系统凭据；远端 Agent 只拿到 MCP tools 和 `connectionId`。
+
+推荐接入形态：
+
+1. Windows 本机运行 GoNavi，并保持能访问已保存的数据库连接。
+2. 在 Windows 本机启动 `GoNavi.exe mcp-server http --addr 127.0.0.1:8765 --path /mcp --token <随机token> --schema-only`。
+3. 通过 SSH 隧道、反向代理或内网网关把 `http://127.0.0.1:8765/mcp` 暴露为云端 Agent 可访问的 HTTPS 地址。
+4. 在 OpenClaw / Hermans 中添加远程 MCP Server，transport 选择 Streamable HTTP，URL 指向 `/mcp` 地址，并设置请求头 `Authorization: Bearer <随机token>`。
+5. 先调用 `get_connections` 获取 `connectionId`，再调用 `get_databases`、`get_tables`、`get_columns`、`get_table_ddl` 等工具读取结构。
+
+如果目标 Agent 支持 `mcpServers` JSON，可按下面的通用片段配置：
+
+```json
+{
+  "mcpServers": {
+    "gonavi": {
+      "type": "streamable-http",
+      "url": "https://<你的域名或隧道地址>/mcp",
+      "headers": {
+        "Authorization": "Bearer <随机token>"
+      }
+    }
+  }
+}
+```
+
+不要把数据库 `host/user/password` 写入云端 Agent 的配置文件。默认 `--schema-only` 不暴露 `execute_sql`；如果你明确需要远程执行 SQL，可以去掉该参数，此时 `execute_sql` 仍受 GoNavi AI 安全设置控制，写操作必须显式传 `allowMutating=true`。
+
+## MCP 客户端配置示例
+
+开发态：
+
+```json
+{
+  "mcpServers": {
+    "gonavi": {
+      "command": "go",
+      "args": ["run", "./cmd/gonavi-mcp-server"]
+    }
+  }
+}
+```
+
+Windows 独立 server 编译产物（开发态）：
+
+```json
+{
+  "mcpServers": {
+    "gonavi": {
+      "command": "D:\\Work\\CodeRepos\\GoNavi\\bin\\gonavi-mcp-server.exe",
+      "args": []
+    }
+  }
+}
+```
+
+Windows 已安装 GoNavi（推荐给最终用户）：
+
+```json
+{
+  "mcpServers": {
+    "gonavi": {
+      "type": "stdio",
+      "command": "C:\\Program Files\\GoNavi\\GoNavi.exe",
+      "args": ["mcp-server"],
+      "env": {}
+    }
+  }
+}
+```
+
+## 使用说明
+
+- 先调用 `get_connections`，拿到 `connectionId`
+- 之后所有数据库工具都只传 `connectionId`，由 GoNavi 服务端内部解析保存连接和密钥
+- 如果 `dbName` 为空，会优先使用该保存连接里的默认数据库
+- Server 会读取 GoNavi 当前活动数据目录里的连接配置，并通过系统 keyring/凭据管理器解析密文
+- 如果本机凭据存储不可用，依赖密钥的连接会返回对应错误
diff --git a/cmd/gonavi-mcp-server/main.go b/cmd/gonavi-mcp-server/main.go
new file mode 100644
index 0000000..95e7bfd
--- /dev/null
+++ b/cmd/gonavi-mcp-server/main.go
@@ -0,0 +1,42 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"os"
+	"strings"
+
+	"GoNavi-Wails/internal/mcpserver"
+)
+
+func main() {
+	ctx := context.Background()
+	err := run(ctx, os.Args[1:])
+	if err != nil {
+		log.Printf("GoNavi MCP Server 退出: %v", err)
+	}
+}
+
+func run(ctx context.Context, args []string) error {
+	if len(args) == 0 {
+		return mcpserver.RunAppStdioServer(ctx)
+	}
+
+	mode := strings.ToLower(strings.TrimSpace(args[0]))
+	switch mode {
+	case "stdio", "--stdio":
+		return mcpserver.RunAppStdioServer(ctx)
+	case "http", "--http", "streamable-http", "--streamable-http":
+		options, err := mcpserver.ParseHTTPServerOptions(args[1:])
+		if err != nil {
+			return err
+		}
+		log.Printf("GoNavi MCP Streamable HTTP Server 启动：addr=%s path=%s schemaOnly=%v", options.Addr, options.Path, options.SchemaOnly)
+		return mcpserver.RunAppStreamableHTTPServer(ctx, options)
+	case "remote-config", "--remote-config":
+		return mcpserver.WriteRemoteMCPClientConfig(os.Stdout, args[1:])
+	default:
+		return fmt.Errorf("未知 MCP server 模式: %s（支持 stdio/http/remote-config）", args[0])
+	}
+}
diff --git a/cmd/mingw-import-lib/main.go b/cmd/mingw-import-lib/main.go
new file mode 100644
index 0000000..e0a6bd8
--- /dev/null
+++ b/cmd/mingw-import-lib/main.go
@@ -0,0 +1,27 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	"GoNavi-Wails/internal/buildutil"
+)
+
+func main() {
+	var (
+		dllPath     string
+		dlltoolPath string
+		outputLib   string
+	)
+
+	flag.StringVar(&dllPath, "dll", "", "Path to the source DLL")
+	flag.StringVar(&dlltoolPath, "dlltool", "", "Optional path to dlltool executable")
+	flag.StringVar(&outputLib, "output-lib", "", "Output import library path")
+	flag.Parse()
+
+	if err := buildutil.GenerateWindowsImportLibraryFromDLL(dllPath, dlltoolPath, outputLib); err != nil {
+		fmt.Fprintf(os.Stderr, "generate mingw import library failed: %v\n", err)
+		os.Exit(1)
+	}
+}
diff --git a/cmd/optional-driver-agent/main.go b/cmd/optional-driver-agent/main.go
index bf24273..4915947 100644
--- a/cmd/optional-driver-agent/main.go
+++ b/cmd/optional-driver-agent/main.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"reflect"
+	"strconv"
 	"strings"
 	"time"
 
@@ -17,6 +18,7 @@ import (
 type agentRequest struct {
 	ID        int64                        `json:"id"`
 	Method    string                       `json:"method"`
+	SessionID string                       `json:"sessionId,omitempty"`
 	Config    *connection.ConnectionConfig `json:"config,omitempty"`
 	Query     string                       `json:"query,omitempty"`
 	TimeoutMs int64                        `json:"timeoutMs,omitempty"`
@@ -39,6 +41,8 @@ const (
 	agentMethodClose         = "close"
 	agentMethodMetadata      = "metadata"
 	agentMethodPing          = "ping"
+	agentMethodOpenSession   = "openSession"
+	agentMethodCloseSession  = "closeSession"
 	agentMethodQuery         = "query"
 	agentMethodExec          = "exec"
 	agentMethodGetDatabases  = "getDatabases"
@@ -59,6 +63,12 @@ var (
 	agentDatabaseFactory func() db.Database
 )
 
+type agentRuntime struct {
+	inst          db.Database
+	sessions      map[string]db.StatementExecer
+	nextSessionID int64
+}
+
 func main() {
 	if agentDatabaseFactory == nil || strings.TrimSpace(agentDriverType) == "" {
 		fmt.Fprintf(os.Stderr, "未配置驱动代理 provider，请使用 gonavi_<driver>_driver 标签构建\n")
@@ -70,7 +80,9 @@ func main() {
 	writer := bufio.NewWriter(os.Stdout)
 	defer writer.Flush()
 
-	var inst db.Database
+	runtimeState := &agentRuntime{
+		sessions: make(map[string]db.StatementExecer),
+	}
 	for scanner.Scan() {
 		line := strings.TrimSpace(scanner.Text())
 		if line == "" {
@@ -87,23 +99,21 @@ func main() {
 			continue
 		}
 
-		resp := handleRequest(&inst, req)
+		resp := handleRequest(runtimeState, req)
 		if err := writeResponse(writer, resp); err != nil {
 			fmt.Fprintf(os.Stderr, "写入响应失败：%v\n", err)
 			break
 		}
 	}
 
-	if inst != nil {
-		_ = inst.Close()
-	}
+	runtimeState.close()
 
 	if err := scanner.Err(); err != nil {
 		fmt.Fprintf(os.Stderr, "读取请求失败：%v\n", err)
 	}
 }
 
-func handleRequest(inst *db.Database, req agentRequest) agentResponse {
+func handleRequest(runtimeState *agentRuntime, req agentRequest) agentResponse {
 	resp := agentResponse{ID: req.ID, Success: true}
 	method := strings.TrimSpace(req.Method)
 
@@ -112,9 +122,7 @@ func handleRequest(inst *db.Database, req agentRequest) agentResponse {
 		if req.Config == nil {
 			return fail(resp, "连接配置为空")
 		}
-		if *inst != nil {
-			_ = (*inst).Close()
-		}
+		runtimeState.close()
 		next := agentDatabaseFactory()
 		if next == nil {
 			return fail(resp, "驱动代理初始化失败")
@@ -122,14 +130,13 @@ func handleRequest(inst *db.Database, req agentRequest) agentResponse {
 		if err := next.Connect(*req.Config); err != nil {
 			return fail(resp, err.Error())
 		}
-		*inst = next
+		runtimeState.inst = next
 		return resp
 	case agentMethodClose:
-		if *inst != nil {
-			if err := (*inst).Close(); err != nil {
+		if runtimeState.inst != nil {
+			if err := runtimeState.close(); err != nil {
 				return fail(resp, err.Error())
 			}
-			*inst = nil
 		}
 		return resp
 	case agentMethodMetadata:
@@ -139,74 +146,124 @@ func handleRequest(inst *db.Database, req agentRequest) agentResponse {
 			"protocolSchema": "json-lines-v1",
 		}
 		return resp
+	case agentMethodOpenSession:
+		if runtimeState.inst == nil {
+			return fail(resp, "connection not open")
+		}
+		provider, ok := runtimeState.inst.(db.SessionExecerProvider)
+		if !ok {
+			return fail(resp, fmt.Sprintf("当前数据源（%s）不支持 SQL 编辑器托管事务", strings.TrimSpace(agentDriverType)))
+		}
+		openCtx := context.Background()
+		var cancel context.CancelFunc
+		if req.TimeoutMs > 0 {
+			openCtx, cancel = context.WithTimeout(context.Background(), time.Duration(req.TimeoutMs)*time.Millisecond)
+			defer cancel()
+		}
+		session, err := provider.OpenSessionExecer(openCtx)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		sessionID := runtimeState.nextID()
+		runtimeState.sessions[sessionID] = session
+		resp.Data = sessionID
+		return resp
+	case agentMethodCloseSession:
+		if err := runtimeState.closeSession(req.SessionID); err != nil {
+			return fail(resp, err.Error())
+		}
+		return resp
 	}
 
-	if *inst == nil {
+	if runtimeState.inst == nil {
 		return fail(resp, "connection not open")
 	}
 
+	if session, ok, err := runtimeState.session(req.SessionID); err != nil {
+		return fail(resp, err.Error())
+	} else if ok {
+		switch method {
+		case agentMethodQuery:
+			data, fields, err := queryStatementWithOptionalTimeout(session, req.Query, req.TimeoutMs)
+			if err != nil {
+				return fail(resp, err.Error())
+			}
+			resp.Data = data
+			resp.Fields = fields
+		case agentMethodExec:
+			affected, err := execStatementWithOptionalTimeout(session, req.Query, req.TimeoutMs)
+			if err != nil {
+				return fail(resp, err.Error())
+			}
+			resp.RowsAffected = affected
+		default:
+			return fail(resp, "当前事务会话不支持该方法")
+		}
+		return resp
+	}
+
 	switch method {
 	case agentMethodPing:
-		if err := (*inst).Ping(); err != nil {
+		if err := runtimeState.inst.Ping(); err != nil {
 			return fail(resp, err.Error())
 		}
 	case agentMethodQuery:
-		data, fields, err := queryWithOptionalTimeout(*inst, req.Query, req.TimeoutMs)
+		data, fields, err := queryWithOptionalTimeout(runtimeState.inst, req.Query, req.TimeoutMs)
 		if err != nil {
 			return fail(resp, err.Error())
 		}
 		resp.Data = data
 		resp.Fields = fields
 	case agentMethodExec:
-		affected, err := execWithOptionalTimeout(*inst, req.Query, req.TimeoutMs)
+		affected, err := execWithOptionalTimeout(runtimeState.inst, req.Query, req.TimeoutMs)
 		if err != nil {
 			return fail(resp, err.Error())
 		}
 		resp.RowsAffected = affected
 	case agentMethodGetDatabases:
-		data, err := (*inst).GetDatabases()
+		data, err := runtimeState.inst.GetDatabases()
 		if err != nil {
 			return fail(resp, err.Error())
 		}
 		resp.Data = data
 	case agentMethodGetTables:
-		data, err := (*inst).GetTables(req.DBName)
+		data, err := runtimeState.inst.GetTables(req.DBName)
 		if err != nil {
 			return fail(resp, err.Error())
 		}
 		resp.Data = data
 	case agentMethodGetCreateStmt:
-		data, err := (*inst).GetCreateStatement(req.DBName, req.TableName)
+		data, err := runtimeState.inst.GetCreateStatement(req.DBName, req.TableName)
 		if err != nil {
 			return fail(resp, err.Error())
 		}
 		resp.Data = data
 	case agentMethodGetColumns:
-		data, err := (*inst).GetColumns(req.DBName, req.TableName)
+		data, err := runtimeState.inst.GetColumns(req.DBName, req.TableName)
 		if err != nil {
 			return fail(resp, err.Error())
 		}
 		resp.Data = data
 	case agentMethodGetAllColumns:
-		data, err := (*inst).GetAllColumns(req.DBName)
+		data, err := runtimeState.inst.GetAllColumns(req.DBName)
 		if err != nil {
 			return fail(resp, err.Error())
 		}
 		resp.Data = data
 	case agentMethodGetIndexes:
-		data, err := (*inst).GetIndexes(req.DBName, req.TableName)
+		data, err := runtimeState.inst.GetIndexes(req.DBName, req.TableName)
 		if err != nil {
 			return fail(resp, err.Error())
 		}
 		resp.Data = data
 	case agentMethodGetForeignKey:
-		data, err := (*inst).GetForeignKeys(req.DBName, req.TableName)
+		data, err := runtimeState.inst.GetForeignKeys(req.DBName, req.TableName)
 		if err != nil {
 			return fail(resp, err.Error())
 		}
 		resp.Data = data
 	case agentMethodGetTriggers:
-		data, err := (*inst).GetTriggers(req.DBName, req.TableName)
+		data, err := runtimeState.inst.GetTriggers(req.DBName, req.TableName)
 		if err != nil {
 			return fail(resp, err.Error())
 		}
@@ -215,7 +272,7 @@ func handleRequest(inst *db.Database, req agentRequest) agentResponse {
 		if req.Changes == nil {
 			return fail(resp, "变更集为空")
 		}
-		applier, ok := (*inst).(interface {
+		applier, ok := runtimeState.inst.(interface {
 			ApplyChanges(tableName string, changes connection.ChangeSet) error
 		})
 		if !ok {
@@ -231,6 +288,67 @@ func handleRequest(inst *db.Database, req agentRequest) agentResponse {
 	return resp
 }
 
+func (r *agentRuntime) nextID() string {
+	r.ensureSessionMap()
+	r.nextSessionID++
+	return "session-" + strconv.FormatInt(r.nextSessionID, 10)
+}
+
+func (r *agentRuntime) session(sessionID string) (db.StatementExecer, bool, error) {
+	r.ensureSessionMap()
+	sessionID = strings.TrimSpace(sessionID)
+	if sessionID == "" {
+		return nil, false, nil
+	}
+	session, ok := r.sessions[sessionID]
+	if !ok || session == nil {
+		return nil, false, fmt.Errorf("事务会话不存在或已结束")
+	}
+	return session, true, nil
+}
+
+func (r *agentRuntime) closeSession(sessionID string) error {
+	r.ensureSessionMap()
+	sessionID = strings.TrimSpace(sessionID)
+	if sessionID == "" {
+		return fmt.Errorf("事务会话 ID 不能为空")
+	}
+	session, ok := r.sessions[sessionID]
+	if ok {
+		delete(r.sessions, sessionID)
+	}
+	if !ok || session == nil {
+		return fmt.Errorf("事务会话不存在或已结束")
+	}
+	return session.Close()
+}
+
+func (r *agentRuntime) close() error {
+	var closeErr error
+	r.ensureSessionMap()
+	for sessionID, session := range r.sessions {
+		delete(r.sessions, sessionID)
+		if session != nil {
+			if err := session.Close(); err != nil && closeErr == nil {
+				closeErr = err
+			}
+		}
+	}
+	if r.inst != nil {
+		if err := r.inst.Close(); err != nil && closeErr == nil {
+			closeErr = err
+		}
+		r.inst = nil
+	}
+	return closeErr
+}
+
+func (r *agentRuntime) ensureSessionMap() {
+	if r.sessions == nil {
+		r.sessions = make(map[string]db.StatementExecer)
+	}
+}
+
 func writeResponse(writer *bufio.Writer, resp agentResponse) error {
 	// 对响应数据做统一 JSON 安全归一化：
 	// 将 map[any]any（如 duckdb.Map）递归转换为 map[string]any，避免序列化失败导致代理进程退出。
@@ -301,7 +419,23 @@ func normalizeAgentResponseData(v interface{}) interface{} {
 	}
 }
 
-func queryWithOptionalTimeout(inst db.Database, query string, timeoutMs int64) ([]map[string]interface{}, []string, error) {
+type agentQueryRunner interface {
+	Query(string) ([]map[string]interface{}, []string, error)
+}
+
+type agentQueryContextRunner interface {
+	QueryContext(context.Context, string) ([]map[string]interface{}, []string, error)
+}
+
+type agentExecRunner interface {
+	Exec(string) (int64, error)
+}
+
+type agentExecContextRunner interface {
+	ExecContext(context.Context, string) (int64, error)
+}
+
+func queryWithOptionalTimeout(inst agentQueryRunner, query string, timeoutMs int64) ([]map[string]interface{}, []string, error) {
 	effectiveTimeoutMs := timeoutMs
 	if effectiveTimeoutMs <= 0 && strings.EqualFold(strings.TrimSpace(agentDriverType), "clickhouse") {
 		effectiveTimeoutMs = int64(legacyClickHouseDefaultTimeout / time.Millisecond)
@@ -309,9 +443,7 @@ func queryWithOptionalTimeout(inst db.Database, query string, timeoutMs int64) (
 	if effectiveTimeoutMs <= 0 {
 		return inst.Query(query)
 	}
-	if q, ok := inst.(interface {
-		QueryContext(context.Context, string) ([]map[string]interface{}, []string, error)
-	}); ok {
+	if q, ok := inst.(agentQueryContextRunner); ok {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Duration(effectiveTimeoutMs)*time.Millisecond)
 		defer cancel()
 		return q.QueryContext(ctx, query)
@@ -319,7 +451,15 @@ func queryWithOptionalTimeout(inst db.Database, query string, timeoutMs int64) (
 	return inst.Query(query)
 }
 
-func execWithOptionalTimeout(inst db.Database, query string, timeoutMs int64) (int64, error) {
+func queryStatementWithOptionalTimeout(inst db.StatementExecer, query string, timeoutMs int64) ([]map[string]interface{}, []string, error) {
+	queryRunner, ok := inst.(agentQueryRunner)
+	if !ok {
+		return nil, nil, fmt.Errorf("当前事务会话不支持查询语句")
+	}
+	return queryWithOptionalTimeout(queryRunner, query, timeoutMs)
+}
+
+func execWithOptionalTimeout(inst agentExecRunner, query string, timeoutMs int64) (int64, error) {
 	effectiveTimeoutMs := timeoutMs
 	if effectiveTimeoutMs <= 0 && strings.EqualFold(strings.TrimSpace(agentDriverType), "clickhouse") {
 		effectiveTimeoutMs = int64(legacyClickHouseDefaultTimeout / time.Millisecond)
@@ -327,12 +467,14 @@ func execWithOptionalTimeout(inst db.Database, query string, timeoutMs int64) (i
 	if effectiveTimeoutMs <= 0 {
 		return inst.Exec(query)
 	}
-	if e, ok := inst.(interface {
-		ExecContext(context.Context, string) (int64, error)
-	}); ok {
+	if e, ok := inst.(agentExecContextRunner); ok {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Duration(effectiveTimeoutMs)*time.Millisecond)
 		defer cancel()
 		return e.ExecContext(ctx, query)
 	}
 	return inst.Exec(query)
 }
+
+func execStatementWithOptionalTimeout(inst db.StatementExecer, query string, timeoutMs int64) (int64, error) {
+	return execWithOptionalTimeout(inst, query, timeoutMs)
+}
diff --git a/cmd/optional-driver-agent/main_test.go b/cmd/optional-driver-agent/main_test.go
index 7e082e1..da976a0 100644
--- a/cmd/optional-driver-agent/main_test.go
+++ b/cmd/optional-driver-agent/main_test.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"strings"
 	"testing"
 	"time"
 
@@ -77,8 +78,8 @@ func TestHandleRequestMetadataReportsAgentRevision(t *testing.T) {
 	agentDriverType = "clickhouse"
 	agentDatabaseFactory = func() db.Database { return nil }
 
-	var inst db.Database
-	resp := handleRequest(&inst, agentRequest{ID: 7, Method: agentMethodMetadata})
+	runtimeState := &agentRuntime{sessions: make(map[string]db.StatementExecer)}
+	resp := handleRequest(runtimeState, agentRequest{ID: 7, Method: agentMethodMetadata})
 	if !resp.Success {
 		t.Fatalf("metadata request failed: %s", resp.Error)
 	}
@@ -150,6 +151,45 @@ func (f *fakeAgentTimeoutDB) GetTriggers(dbName, tableName string) ([]connection
 	return nil, nil
 }
 
+type fakeAgentSessionDB struct {
+	fakeAgentTimeoutDB
+	session *fakeAgentStatementSession
+}
+
+func (f *fakeAgentSessionDB) OpenSessionExecer(ctx context.Context) (db.StatementExecer, error) {
+	f.session = &fakeAgentStatementSession{}
+	return f.session, nil
+}
+
+type fakeAgentStatementSession struct {
+	queryCalls int
+	execCalls  int
+	closed     bool
+}
+
+func (f *fakeAgentStatementSession) Query(query string) ([]map[string]interface{}, []string, error) {
+	return f.QueryContext(context.Background(), query)
+}
+
+func (f *fakeAgentStatementSession) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	f.queryCalls++
+	return []map[string]interface{}{{"session_ok": 1}}, []string{"session_ok"}, nil
+}
+
+func (f *fakeAgentStatementSession) Exec(query string) (int64, error) {
+	return f.ExecContext(context.Background(), query)
+}
+
+func (f *fakeAgentStatementSession) ExecContext(ctx context.Context, query string) (int64, error) {
+	f.execCalls++
+	return 9, nil
+}
+
+func (f *fakeAgentStatementSession) Close() error {
+	f.closed = true
+	return nil
+}
+
 func TestQueryWithOptionalTimeout_UsesQueryContext(t *testing.T) {
 	fake := &fakeAgentTimeoutDB{}
 	data, fields, err := queryWithOptionalTimeout(fake, "SELECT 1", int64((2 * time.Second).Milliseconds()))
@@ -198,3 +238,71 @@ func TestQueryWithOptionalTimeout_ClickHouseLegacyModeUsesQueryContext(t *testin
 		t.Fatalf("clickhouse legacy query 调用路径异常，QueryContext=%v Query=%v", fake.queryContextCalled, fake.queryCalled)
 	}
 }
+
+func TestHandleRequest_UsesPinnedSessionForSessionScopedQueryAndExec(t *testing.T) {
+	old := agentDriverType
+	defer func() { agentDriverType = old }()
+	agentDriverType = "sqlserver"
+
+	fake := &fakeAgentSessionDB{}
+	runtimeState := &agentRuntime{
+		inst:     fake,
+		sessions: make(map[string]db.StatementExecer),
+	}
+
+	openResp := handleRequest(runtimeState, agentRequest{ID: 1, Method: agentMethodOpenSession})
+	if !openResp.Success {
+		t.Fatalf("openSession failed: %s", openResp.Error)
+	}
+	sessionID, ok := openResp.Data.(string)
+	if !ok || strings.TrimSpace(sessionID) == "" {
+		t.Fatalf("unexpected session id payload: %#v", openResp.Data)
+	}
+	if fake.session == nil {
+		t.Fatal("expected OpenSessionExecer to create a pinned session")
+	}
+
+	queryResp := handleRequest(runtimeState, agentRequest{
+		ID:        2,
+		Method:    agentMethodQuery,
+		SessionID: sessionID,
+		Query:     "SELECT 1",
+	})
+	if !queryResp.Success {
+		t.Fatalf("session query failed: %s", queryResp.Error)
+	}
+	if fake.queryCalled || fake.queryContextCalled {
+		t.Fatalf("expected session query to bypass database-level query path, got Query=%v QueryContext=%v", fake.queryCalled, fake.queryContextCalled)
+	}
+	if fake.session.queryCalls != 1 {
+		t.Fatalf("expected pinned session queryCalls=1, got %d", fake.session.queryCalls)
+	}
+
+	execResp := handleRequest(runtimeState, agentRequest{
+		ID:        3,
+		Method:    agentMethodExec,
+		SessionID: sessionID,
+		Query:     "UPDATE t SET v = 1",
+	})
+	if !execResp.Success {
+		t.Fatalf("session exec failed: %s", execResp.Error)
+	}
+	if fake.execCalled || fake.execContextCalled {
+		t.Fatalf("expected session exec to bypass database-level exec path, got Exec=%v ExecContext=%v", fake.execCalled, fake.execContextCalled)
+	}
+	if fake.session.execCalls != 1 {
+		t.Fatalf("expected pinned session execCalls=1, got %d", fake.session.execCalls)
+	}
+
+	closeResp := handleRequest(runtimeState, agentRequest{
+		ID:        4,
+		Method:    agentMethodCloseSession,
+		SessionID: sessionID,
+	})
+	if !closeResp.Success {
+		t.Fatalf("closeSession failed: %s", closeResp.Error)
+	}
+	if !fake.session.closed {
+		t.Fatal("expected pinned session to close")
+	}
+}
diff --git a/cmd/optional-driver-agent/provider_elasticsearch.go b/cmd/optional-driver-agent/provider_elasticsearch.go
new file mode 100644
index 0000000..cd65b9f
--- /dev/null
+++ b/cmd/optional-driver-agent/provider_elasticsearch.go
@@ -0,0 +1,12 @@
+//go:build gonavi_elasticsearch_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "elasticsearch"
+	agentDatabaseFactory = func() db.Database {
+		return &db.ElasticsearchDB{}
+	}
+}
diff --git a/cmd/optional-driver-agent/provider_gaussdb.go b/cmd/optional-driver-agent/provider_gaussdb.go
new file mode 100644
index 0000000..6ad5750
--- /dev/null
+++ b/cmd/optional-driver-agent/provider_gaussdb.go
@@ -0,0 +1,12 @@
+//go:build gonavi_gaussdb_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "gaussdb"
+	agentDatabaseFactory = func() db.Database {
+		return &db.GaussDB{}
+	}
+}
diff --git a/cmd/optional-driver-agent/provider_iotdb.go b/cmd/optional-driver-agent/provider_iotdb.go
new file mode 100644
index 0000000..0beb13e
--- /dev/null
+++ b/cmd/optional-driver-agent/provider_iotdb.go
@@ -0,0 +1,12 @@
+//go:build gonavi_iotdb_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "iotdb"
+	agentDatabaseFactory = func() db.Database {
+		return &db.IoTDBDB{}
+	}
+}
diff --git a/docs/driver-manifest.json b/docs/driver-manifest.json
index 7dd4802..81d826f 100644
--- a/docs/driver-manifest.json
+++ b/docs/driver-manifest.json
@@ -96,6 +96,12 @@
       "version": "1.11.1",
       "checksumPolicy": "off",
       "downloadUrl": "builtin://activate/postgres"
+    },
+    "elasticsearch": {
+      "engine": "go",
+      "version": "8.19.0",
+      "checksumPolicy": "off",
+      "downloadUrl": "builtin://activate/elasticsearch"
     }
   }
 }
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 2b0ef39..cf89390 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -17,6 +17,7 @@
         "@types/react-syntax-highlighter": "^15.5.13",
         "antd": "^5.12.0",
         "clsx": "^2.1.0",
+        "fflate": "^0.8.3",
         "mermaid": "^11.13.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -3347,6 +3348,12 @@
         }
       }
     },
+    "node_modules/fflate": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.3.tgz",
+      "integrity": "sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==",
+      "license": "MIT"
+    },
     "node_modules/format": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 45be874..197e39c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -20,6 +20,7 @@
     "@types/react-syntax-highlighter": "^15.5.13",
     "antd": "^5.12.0",
     "clsx": "^2.1.0",
+    "fflate": "^0.8.3",
     "mermaid": "^11.13.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/frontend/package.json.md5 b/frontend/package.json.md5
index 0a899cc..55123bf 100755
--- a/frontend/package.json.md5
+++ b/frontend/package.json.md5
@@ -1 +1 @@
-9cd8f4622f2dcccbe605710ea36885d4
\ No newline at end of file
+eccaaf323f1be46f3102979e48be98e2
diff --git a/frontend/public/db-icons/chroma.svg b/frontend/public/db-icons/chroma.svg
new file mode 100644
index 0000000..0d190a4
--- /dev/null
+++ b/frontend/public/db-icons/chroma.svg
@@ -0,0 +1 @@
+<svg width="163" height="40" fill="none" xmlns="http://www.w3.org/2000/svg"><mask id="prefix__a" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="2" width="53" height="36"><path d="M52.503 2.501H.003v35h52.5v-35z" fill="#fff"/></mask><g mask="url(#prefix__a)"><path d="M17.503 2.501c-9.665 0-17.5 7.835-17.5 17.5s7.835 17.5 17.5 17.5 17.5-7.835 17.5-17.5-7.835-17.5-17.5-17.5z" fill="#327EFF"/><path d="M35.003 2.501c-9.665 0-17.5 7.835-17.5 17.5s7.835 17.5 17.5 17.5 17.5-7.834 17.5-17.5c0-9.665-7.835-17.5-17.5-17.5z" fill="#FFDE2D"/><path d="M17.503 20.002c0-9.665 7.835-17.5 17.5-17.5v17.5h-17.5z" fill="#FF6446"/><path d="M35.003 20.001c0 9.665-7.835 17.5-17.5 17.5v-17.5h17.5z" fill="#FF6446"/></g><path d="M68.543 30.45c-6.03 0-10.32-4.65-10.32-11.1 0-6.36 3.96-11.22 10.29-11.22 5.28 0 8.4 3.15 8.85 7.23h-4.32c-.39-2.16-2.01-3.57-4.53-3.57-3.96 0-5.85 3.3-5.85 7.56 0 4.38 2.28 7.53 5.88 7.53 2.55 0 4.35-1.53 4.62-3.78h4.26a7.596 7.596 0 01-2.37 5.07c-1.47 1.38-3.54 2.28-6.51 2.28zM83.41 8.55v8.07h.09c1.11-1.62 2.37-2.43 4.47-2.43 3.18 0 5.31 2.4 5.31 5.76V30H89.2v-9.45c0-1.65-.96-2.82-2.67-2.82-1.8 0-3.12 1.44-3.12 3.54V30h-4.08V8.55h4.08zm16.315 6.06v2.46h.09c.93-1.74 1.98-2.64 3.78-2.64.45 0 .72.03.96.12v3.57h-.09c-2.67-.27-4.59 1.14-4.59 4.38V30h-4.08V14.61h3.93zm13.438 15.84c-4.77 0-8.04-3.54-8.04-8.13 0-4.59 3.27-8.13 8.04-8.13s8.04 3.54 8.04 8.13c0 4.59-3.27 8.13-8.04 8.13zm0-3.12c2.49 0 3.9-2.01 3.9-5.01s-1.41-5.04-3.9-5.04c-2.52 0-3.9 2.04-3.9 5.04s1.38 5.01 3.9 5.01zM123.1 30V14.61h3.93v2.07h.09c.84-1.41 2.34-2.49 4.47-2.49 1.95 0 3.51 1.08 4.26 2.7h.06c1.05-1.68 2.67-2.7 4.62-2.7 3.24 0 5.07 2.1 5.07 5.46V30h-4.08v-9.66c0-1.74-.87-2.64-2.37-2.64-1.71 0-2.76 1.32-2.76 3.36V30h-4.08v-9.66c0-1.74-.87-2.64-2.37-2.64-1.65 0-2.76 1.32-2.76 3.36V30h-4.08zm34.71 0c-.24-.3-.39-1.02-.48-1.71h-.06c-.78 1.17-1.89 2.07-4.53 2.07-3.15 0-5.37-1.65-5.37-4.71 0-3.39 2.76-4.47 6.18-4.95 2.55-.36 3.72-.57 3.72-1.74 0-1.11-.87-1.83-2.58-1.83-1.92 0-2.85.69-2.97 2.16h-3.63c.12-2.7 2.13-5.07 6.629-5.07 4.621 0 6.481 2.07 6.481 5.67v7.83c0 1.17.18 1.86.54 2.13V30h-3.93zm-4.08-2.49c2.34 0 3.63-1.44 3.63-2.94v-2.31c-.72.42-1.83.66-2.851.9-2.129.48-3.179.96-3.179 2.4s.96 1.95 2.4 1.95z" fill="#000"/></svg>
diff --git a/frontend/public/db-icons/dameng.png b/frontend/public/db-icons/dameng.png
new file mode 100644
index 0000000..ba44acb
Binary files /dev/null and b/frontend/public/db-icons/dameng.png differ
diff --git a/frontend/public/db-icons/elasticsearch.svg b/frontend/public/db-icons/elasticsearch.svg
new file mode 100644
index 0000000..bbac79d
--- /dev/null
+++ b/frontend/public/db-icons/elasticsearch.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-15 0 286 286" width="800px" height="800px" preserveAspectRatio="xMidYMid">
+  <g>
+    <path d="M14.3443,80.1733 L203.5503,80.1733 C224.4013,80.1733 243.0203,70.6123 255.5133,55.6863 C229.4533,21.8353 188.5523,0.0003 142.5303,0.0003 C86.1783,0.0003 37.4763,32.7113 14.3443,80.1733" fill="#F0BF1A"/>
+    <path d="M187.5152,102.4438 L5.7552,102.4438 C2.0332,115.1648 0.0002,128.6068 0.0002,142.5298 C0.0002,156.4538 2.0332,169.8968 5.7552,182.6168 L187.5152,182.6168 C209.3402,182.6168 227.6022,164.8008 227.6022,142.5298 C227.6022,120.2598 209.7862,102.4438 187.5152,102.4438" fill="#07A5DE"/>
+    <path d="M255.9996,228.7548 C243.5856,214.1638 225.1166,204.8868 204.4406,204.8868 L14.3446,204.8868 C37.4766,252.3498 86.1786,285.0598 142.5296,285.0598 C188.8356,285.0598 229.9656,262.9628 255.9996,228.7548" fill="#3EBEB0"/>
+    <path d="M5.7555,102.4438 C2.0325,115.1648 0.0005,128.6068 0.0005,142.5298 C0.0005,156.4538 2.0325,169.8968 5.7555,182.6168 L124.7135,182.6168 C127.8315,170.5908 129.6125,157.2288 129.6125,142.5298 C129.6125,127.8318 127.8315,114.4698 124.7135,102.4438 L5.7555,102.4438 Z" fill="#231F20"/>
+    <path d="M70.8199,19.1528 C46.7669,33.4058 26.7239,54.7848 14.2529,80.1738 L119.3689,80.1738 C108.6789,55.6758 91.7539,35.1878 70.8199,19.1528" fill="#D7A229"/>
+    <path d="M75.274,268.1347 C95.762,251.6547 112.242,229.8297 122.487,204.8867 L14.253,204.8867 C27.615,231.6117 48.995,253.8817 75.274,268.1347" fill="#019B8F"/>
+  </g>
+</svg>
diff --git a/frontend/public/db-icons/gaussdb.ico b/frontend/public/db-icons/gaussdb.ico
new file mode 100644
index 0000000..bd9490b
Binary files /dev/null and b/frontend/public/db-icons/gaussdb.ico differ
diff --git a/frontend/public/db-icons/goldendb.ico b/frontend/public/db-icons/goldendb.ico
new file mode 100644
index 0000000..74d3adb
Binary files /dev/null and b/frontend/public/db-icons/goldendb.ico differ
diff --git a/frontend/public/db-icons/highgo.ico b/frontend/public/db-icons/highgo.ico
new file mode 100644
index 0000000..5a56dc0
Binary files /dev/null and b/frontend/public/db-icons/highgo.ico differ
diff --git a/frontend/public/db-icons/iotdb.svg b/frontend/public/db-icons/iotdb.svg
new file mode 100644
index 0000000..d742630
--- /dev/null
+++ b/frontend/public/db-icons/iotdb.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="Õ_xBA__x2264__x201E__1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 107.7 107.7"
+	 style="enable-background:new 0 0 107.7 107.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#9E2878;}
+</style>
+<g>
+	<g id="g1133" transform="translate(-244.51235,-228.78793)">
+		<path id="path1119" class="st0" d="M340.8,253.8c2.6-1,5.5,0.4,6.2,3c0.7,2.6-1.1,5.7-3.7,6.4c-3.2,0.6-6.2-1.4-9.3,0.2
+			c-3.1,1.7-4,5.2-4.7,8.3c-1.4,5-8.5,7.3-12.1,4.2c-3.3-2.4-3.4-7.8-0.2-11c2.2-2.5,5.9-3.3,8.8-2c2.7,1.2,6,1.7,8.6-0.4
+			C337.5,260.1,336.7,255.1,340.8,253.8L340.8,253.8z"/>
+		<path id="path1121" class="st0" d="M280.5,244.7c4.2-2.2,9.5,1.5,8.2,6.1c-1.4,5.4-0.7,11.5,2.9,15.5c3.4,4,9.8,4.8,14.6,1.9
+			c3.7-2.1,6-5.8,7.4-9.6c1-3.1,0.6-6.2,1.1-9.3c1-3.8,5.8-6,9.1-4.2c3.2,1.4,4,5.9,1.7,8.8c-1.4,2.2-4.2,2.7-6.3,3.8
+			c-3.6,1.9-6.5,4.9-8.4,8.6c-1.2,2.1-1.1,4.5-1.7,6.7c-0.9,1.9-3,2.7-4.8,2.9c-4.8,0.6-9.5,3-13,6.7c-1.7,1.7-3.1,4.2-5.6,4.2
+			c-2.7-0.2-4.7-2.6-7.4-2.7c-4.9-0.7-10.2,0.7-14.4,4c-3.7,3.1-9.4,0.8-9.6-3.7c-0.9-5.1,6.2-9.5,10.1-6.2c4.3,4,10.8,5.6,16.9,3.7
+			c5.6-1.9,9.7-8.3,8.6-14c-0.9-4.9-4.2-9.3-8.6-11.4c-1.7-0.8-3.6-1.6-4.2-3.5C275.6,250.2,277.3,246.2,280.5,244.7L280.5,244.7z"
+			/>
+		<path id="path1123" class="st0" d="M277.8,235.9c2.2-0.8,4.2,1.3,3.3,3.4c-0.6,2.1-3.7,2.7-4.8,1.1
+			C275,238.9,276,236.4,277.8,235.9z"/>
+		<path id="path1125" class="st0" d="M246.9,278.8c2.2-0.8,4.2,1.2,3.3,3.4c-0.6,2.1-3.7,2.7-4.8,1C244,281.9,245,279.3,246.9,278.8
+			L246.9,278.8z"/>
+		<path id="path1127" class="st0" d="M328.2,236.2c2.2-0.7,4.2,1.3,3.3,3.5c-0.6,2-3.7,2.7-4.8,1
+			C325.4,239.2,326.3,236.8,328.2,236.2z"/>
+		<path id="path1129" class="st0" d="M253.6,257.7c0.4-3.7,5.5-5.9,8.1-3.6c1.9,1.1,1.6,3.6,2.2,5.4c0.4,2.4,2.7,4.3,5.2,4.3
+			c3.2,0.3,6.4-2.3,9.5-1.2c4.8,1.2,6.5,7.5,3.2,11.5c-2.9,4.1-9.3,4.5-12,0.7c-2.4-2.8-0.5-7.1-2.7-10.1c-1.7-2.9-5.4-2.7-8.3-1.9
+			C255.8,263.8,253,260.7,253.6,257.7L253.6,257.7z"/>
+		<path id="path1131" class="st0" d="M300.8,230c3.3-1.9,7.5,0.9,6.7,4.6c0,2.3-2.2,3.6-3.5,5.2c-1.9,1.9-2.3,4.9-1.2,7
+			c1.3,2.9,4.9,4,5.5,7.2c1.2,4.8-3.3,10.1-8.2,9.8c-4.8,0.1-8.3-5-6.3-9.5c1.2-3.8,5.8-4.9,7.2-8.5c1.7-3.2-0.4-6.1-2.4-8.1
+			C296.7,235.6,297.9,231.4,300.8,230z"/>
+	</g>
+	<g id="g1149" transform="translate(-244.51235,-228.78793)">
+		<path id="path1135" class="st0" d="M256,311.5c-2.6,1-5.5-0.4-6.2-3c-0.7-2.6,1.1-5.7,3.7-6.4c3.2-0.6,6.2,1.4,9.3-0.2
+			c3.1-1.6,4-5.1,4.7-8.2c1.4-5,8.5-7.3,12.1-4.2c3.3,2.4,3.4,7.8,0.2,10.9c-2.2,2.5-5.9,3.3-8.8,2c-2.7-1.2-6-1.7-8.6,0.4
+			C259.1,305,259.9,310.2,256,311.5L256,311.5z"/>
+		<path id="path1137" class="st0" d="M316.1,320.5c-4.2,2.2-9.5-1.5-8.2-6c1.4-5.4,0.7-11.6-2.9-15.6c-3.4-4-9.8-4.7-14.6-1.9
+			c-3.7,2-6,5.7-7.4,9.5c-1,3.1-0.6,6.2-1.1,9.3c-1,3.8-5.8,6-9.1,4.3c-3.2-1.4-4-5.9-1.7-8.9c1.4-2.2,4.2-2.7,6.3-3.8
+			c3.6-1.9,6.5-4.9,8.4-8.6c1.2-2,1.1-4.5,1.7-6.6c0.9-1.9,3-2.7,4.8-2.9c4.8-0.6,9.5-3,13-6.7c1.7-1.6,3.1-4.2,5.6-4.1
+			c2.7,0.1,4.7,2.5,7.4,2.7c4.9,0.6,10.2-0.8,14.4-4c3.7-3.2,9.4-0.9,9.6,3.6c0.9,5.1-6.2,9.5-10.1,6.2c-4.3-4-10.8-5.6-16.9-3.7
+			c-5.6,1.9-9.7,8.3-8.6,14c0.9,4.8,4.2,9.3,8.6,11.3c1.7,0.8,3.6,1.6,4.2,3.5C321.2,314.9,319.4,319.1,316.1,320.5L316.1,320.5z"/>
+		<path id="path1139" class="st0" d="M318.9,329.4c-2.2,0.8-4.2-1.3-3.3-3.4c0.6-2.1,3.7-2.7,4.8-1.1
+			C321.7,326.3,320.7,328.8,318.9,329.4z"/>
+		<path id="path1141" class="st0" d="M349.9,286.5c-2.2,0.7-4.2-1.3-3.3-3.5c0.6-2.1,3.7-2.7,4.8-1
+			C352.8,283.5,351.8,285.9,349.9,286.5z"/>
+		<path id="path1143" class="st0" d="M268.5,329c-2.2,0.7-4.2-1.3-3.3-3.5c0.6-2,3.7-2.7,4.8-1C271.3,325.9,270.3,328.5,268.5,329z"
+			/>
+		<path id="path1145" class="st0" d="M343.1,307.4c-0.4,3.7-5.5,5.9-8.1,3.6c-1.9-1.1-1.6-3.6-2.2-5.4c-0.4-2.4-2.7-4.3-5.2-4.3
+			c-3.2-0.3-6.4,2.3-9.5,1.2c-4.8-1.2-6.5-7.5-3.2-11.5c2.9-4.1,9.3-4.5,12-0.7c2.4,2.8,0.5,7,2.7,10c1.7,2.9,5.4,2.7,8.3,1.9
+			C341,301.4,343.8,304.4,343.1,307.4L343.1,307.4z"/>
+		<path id="path1147" class="st0" d="M295.8,335.2c-3.3,2-7.5-0.9-6.7-4.6c0-2.3,2.2-3.6,3.5-5.2c1.9-1.9,2.3-4.9,1.2-7
+			c-1.3-2.9-4.9-4-5.5-7.2c-1.2-4.8,3.3-10.1,8.2-9.8c4.8-0.1,8.3,5,6.3,9.6c-1.2,3.7-5.8,4.8-7.2,8.4c-1.7,3.2,0.4,6.1,2.4,8.2
+			C300,329.6,298.8,333.8,295.8,335.2L295.8,335.2z"/>
+	</g>
+</g>
+</svg>
diff --git a/frontend/public/db-icons/iris.png b/frontend/public/db-icons/iris.png
new file mode 100644
index 0000000..048b311
Binary files /dev/null and b/frontend/public/db-icons/iris.png differ
diff --git a/frontend/public/db-icons/jvm.ico b/frontend/public/db-icons/jvm.ico
new file mode 100644
index 0000000..c6b6979
Binary files /dev/null and b/frontend/public/db-icons/jvm.ico differ
diff --git a/frontend/public/db-icons/kafka.png b/frontend/public/db-icons/kafka.png
new file mode 100644
index 0000000..a4b5359
Binary files /dev/null and b/frontend/public/db-icons/kafka.png differ
diff --git a/frontend/public/db-icons/kingbase.ico b/frontend/public/db-icons/kingbase.ico
new file mode 100644
index 0000000..b1f280c
Binary files /dev/null and b/frontend/public/db-icons/kingbase.ico differ
diff --git a/frontend/public/db-icons/mqtt.svg b/frontend/public/db-icons/mqtt.svg
new file mode 100644
index 0000000..20fe3d6
--- /dev/null
+++ b/frontend/public/db-icons/mqtt.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 1100 300" overflow="visible" xml:space="preserve">
+<g id="black_bg" display="none">
+	<rect x="-2384.9" y="-306.8" display="inline" width="4531.8" height="1152"/>
+</g>
+<g id="logos">
+	<g>
+		<path fill="#FFFFFF" d="M388,150.1c1.7,3.7,3.3,7.5,4.8,11.4c1.5-4,3.1-7.8,4.9-11.6c1.7-3.7,3.5-7.4,5.3-10.9l50.5-99.5
+			c0.9-1.7,1.8-3,2.8-4c0.9-0.9,2-1.6,3.2-2.1c1.2-0.5,2.5-0.7,4-0.7c1.5,0,3.2,0,5.2,0h34.8v196.6h-40.2V116.3
+			c0-5.5,0.3-11.4,0.8-17.8l-52.1,101.1c-1.6,3.2-3.8,5.5-6.5,7.2c-2.7,1.6-5.9,2.4-9.4,2.4h-6.2c-3.5,0-6.6-0.8-9.4-2.4
+			c-2.7-1.6-4.9-4-6.5-7.2L321.4,98.3c0.4,3.2,0.6,6.3,0.8,9.4c0.2,3.1,0.3,6,0.3,8.6v113.1h-40.2V32.8h34.8c2,0,3.7,0,5.2,0
+			c1.5,0,2.8,0.2,4,0.7c1.2,0.5,2.2,1.1,3.2,2.1c0.9,0.9,1.9,2.3,2.8,4l50.6,99.9C384.6,142.9,386.3,146.4,388,150.1z"/>
+		<path fill="#FFFFFF" d="M719.1,131c0,8.5-0.9,16.6-2.6,24.4c-1.8,7.8-4.3,15.1-7.6,21.9c-3.3,6.8-7.3,13.2-12.2,19
+			c-4.8,5.9-10.3,11-16.4,15.5l49.8,54.4h-37.5c-5.4,0-10.3-0.7-14.7-2c-4.4-1.3-8.3-3.9-11.7-7.9L641.7,229c-4,0.8-8,1.4-12.1,1.9
+			c-4.1,0.4-8.3,0.7-12.6,0.7c-15.3,0-29.2-2.6-41.8-7.7c-12.6-5.1-23.4-12.2-32.3-21.3c-9-9-15.9-19.7-20.8-31.9
+			c-4.9-12.2-7.4-25.5-7.4-39.7c0-14.2,2.5-27.4,7.4-39.7c4.9-12.2,11.8-22.9,20.8-31.9c9-9,19.7-16.1,32.3-21.2
+			c12.6-5.1,26.5-7.7,41.8-7.7c15.3,0,29.2,2.6,41.8,7.8c12.6,5.2,23.3,12.3,32.2,21.3c8.9,9,15.8,19.6,20.7,31.9
+			C716.6,103.7,719.1,116.8,719.1,131z M672.4,131c0-9.7-1.3-18.5-3.8-26.3c-2.5-7.8-6.1-14.4-10.9-19.8
+			c-4.7-5.4-10.5-9.5-17.3-12.4c-6.8-2.9-14.6-4.3-23.4-4.3c-8.8,0-16.7,1.4-23.6,4.3c-6.9,2.9-12.7,7-17.4,12.4
+			c-4.7,5.4-8.3,12-10.9,19.8c-2.5,7.8-3.8,16.5-3.8,26.3c0,9.8,1.3,18.6,3.8,26.4c2.5,7.8,6.1,14.4,10.9,19.8
+			c4.7,5.4,10.5,9.5,17.4,12.4c6.9,2.8,14.7,4.3,23.6,4.3c8.7,0,16.5-1.4,23.4-4.3c6.8-2.8,12.6-7,17.3-12.4
+			c4.7-5.4,8.3-12,10.9-19.8C671.1,149.6,672.4,140.8,672.4,131z"/>
+		<path fill="#FFFFFF" d="M865.6,32.7v36.2h-53.3v160.5h-45.6V68.9h-53.3V32.7H865.6z"/>
+		<path fill="#FFFFFF" d="M1040.1,32.7v36.2h-55.3v160.5h-45.6V68.9h-53.3V32.7H1040.1z"/>
+	</g>
+	<path fill="#FFFFFF" d="M34.9,144c-0.2,0-0.4,0-0.6,0v77.6c0,5.6,4.6,10.2,10.2,10.2h79.9C123.7,183.3,83.8,144,34.9,144z"/>
+	<path fill="#FFFFFF" d="M34.9,80c-0.2,0-0.4,0-0.6,0v33c65.9,0.3,119.5,53.3,120.2,118.8h34.2C188.1,148,119.3,80,34.9,80z"/>
+	<path fill="#FFFFFF" d="M237.2,221.7v-70.1C214,94.8,167.3,50,109.1,29H44.5c-5.6,0-10.2,4.6-10.2,10.2V49
+		c101.4,0.3,183.9,82,184.5,182.8h8.2C232.6,231.8,237.2,227.3,237.2,221.7z"/>
+	<path fill="#FFFFFF" d="M210.5,57.3c9.4,9.4,19,21.3,26.7,31.8v-50c0-5.6-4.5-10.1-10.1-10.1h-51.5
+		C187.5,37.3,199.9,46.8,210.5,57.3z"/>
+</g>
+</svg>
diff --git a/frontend/public/db-icons/oceanbase.png b/frontend/public/db-icons/oceanbase.png
new file mode 100644
index 0000000..9d43ce8
Binary files /dev/null and b/frontend/public/db-icons/oceanbase.png differ
diff --git a/frontend/public/db-icons/opengauss.ico b/frontend/public/db-icons/opengauss.ico
new file mode 100644
index 0000000..aec5a87
Binary files /dev/null and b/frontend/public/db-icons/opengauss.ico differ
diff --git a/frontend/public/db-icons/oracle.ico b/frontend/public/db-icons/oracle.ico
new file mode 100644
index 0000000..c59864b
Binary files /dev/null and b/frontend/public/db-icons/oracle.ico differ
diff --git a/frontend/public/db-icons/qdrant.svg b/frontend/public/db-icons/qdrant.svg
new file mode 100644
index 0000000..c10ad96
--- /dev/null
+++ b/frontend/public/db-icons/qdrant.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Capa_2" data-name="Capa 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 346.42 400">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #9e0d38;
+      }
+
+      .cls-2 {
+        fill: #dc244c;
+      }
+
+      .cls-3 {
+        fill: #ff516b;
+      }
+    </style>
+  </defs>
+  <g id="Vectors">
+    <g>
+      <g>
+        <polygon class="cls-2" points="173.21 0 0 100 0 300 173.21 400 238.16 362.5 238.16 287.5 173.21 325 64.96 262.5 64.96 137.5 173.21 75 281.46 137.5 281.46 387.5 346.42 350 346.42 100 173.21 0"/>
+        <polygon class="cls-2" points="108.26 162.5 108.26 237.5 173.21 275 238.16 237.5 238.16 162.5 173.21 125 108.26 162.5"/>
+      </g>
+      <g>
+        <polygon class="cls-1" points="238.16 287.5 238.16 362.5 173.21 400 173.21 325 238.16 287.5"/>
+        <polygon class="cls-1" points="346.42 100 346.42 350 281.46 387.5 281.46 137.5 346.42 100"/>
+        <polygon class="cls-3" points="346.42 100 281.46 137.5 173.21 75 64.96 137.5 0 100 173.21 0 346.42 100"/>
+        <polygon class="cls-2" points="173.21 325 173.21 400 0 300 0 100 64.96 137.5 64.96 262.5 173.21 325"/>
+        <polygon class="cls-3" points="238.16 162.5 173.21 200 108.26 162.5 173.21 125 238.16 162.5"/>
+        <polygon class="cls-2" points="173.21 200 173.21 275 108.26 237.5 108.26 162.5 173.21 200"/>
+        <polygon class="cls-1" points="238.16 162.5 238.16 237.5 173.21 275 173.21 200 238.16 162.5"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/frontend/public/db-icons/rabbitmq.svg b/frontend/public/db-icons/rabbitmq.svg
new file mode 100644
index 0000000..db28ea5
--- /dev/null
+++ b/frontend/public/db-icons/rabbitmq.svg
@@ -0,0 +1,7 @@
+<svg role="img" viewBox="0 0 132.29167 132.29166" xmlns="http://www.w3.org/2000/svg">
+  <title>RabbitMQ</title>
+  <path
+    d="M 127.32189 54.270409 H 84.999977 a 5.2690424 5.2690424 0 0 1 -5.302308 -5.302309 V 6.6461888 A 5.2690424 5.2690424 0 0 0 74.39536 1.3438804 H 58.555783 A 5.2690424 5.2690424 0 0 0 53.253474 6.6461888 V 48.9681 a 5.2690424 5.2690424 0 0 1 -5.302309 5.302309 H 32.111589 A 5.2690424 5.2690424 0 0 1 26.80928 48.9681 V 6.6461888 A 5.2690424 5.2690424 0 0 0 21.506972 1.3106149 H 5.6341299 A 5.2690424 5.2690424 0 0 0 0.3650864 6.6461888 V 128.31903 a 5.2690424 5.2690424 0 0 0 5.3023089 5.30231 H 127.32189 a 5.2690424 5.2690424 0 0 0 5.30231 -5.30231 V 59.572717 a 5.2690424 5.2690424 0 0 0 -5.30231 -5.302308 z m -21.17517 44.908545 a 7.9542581 7.9542581 0 0 1 -7.95425 7.987516 H 87.573659 a 7.9542581 7.9542581 0 0 1 -7.954257 -7.987516 V 88.593818 a 7.9542581 7.9542581 0 0 1 7.954257 -7.987517 h 10.618811 a 7.9542581 7.9542581 0 0 1 7.95425 7.987517 z"
+    fill="#FF6600"
+  />
+</svg>
diff --git a/frontend/public/db-icons/rocketmq.png b/frontend/public/db-icons/rocketmq.png
new file mode 100644
index 0000000..7a70ce7
Binary files /dev/null and b/frontend/public/db-icons/rocketmq.png differ
diff --git a/frontend/public/db-icons/starrocks.png b/frontend/public/db-icons/starrocks.png
new file mode 100644
index 0000000..a41cbb7
Binary files /dev/null and b/frontend/public/db-icons/starrocks.png differ
diff --git a/frontend/public/db-icons/tdengine.ico b/frontend/public/db-icons/tdengine.ico
new file mode 100644
index 0000000..1918d15
Binary files /dev/null and b/frontend/public/db-icons/tdengine.ico differ
diff --git a/frontend/public/db-icons/vastbase.svg b/frontend/public/db-icons/vastbase.svg
new file mode 100644
index 0000000..370d089
--- /dev/null
+++ b/frontend/public/db-icons/vastbase.svg
@@ -0,0 +1,72 @@
+<svg width="159" height="48" viewBox="0 0 159 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_798)">
+<path d="M93.932 39.4721C93.6905 39.3017 93.4059 39.1653 93.0955 39.0461C92.7764 38.9268 92.4573 38.8246 92.1382 38.7223C91.8277 38.6371 90.0598 38.2623 89.7062 38.1004C88.7404 37.6403 89.1888 37.1717 89.3527 37.061C89.4993 36.9673 89.6545 36.9332 89.8615 36.8906C90.0598 36.848 90.422 36.8054 91.0602 36.8054C91.4052 36.8054 91.8019 36.848 92.0865 36.8991C92.371 36.9502 92.6298 37.0184 92.8454 37.078C93.0092 37.1206 93.0868 37.1547 93.3456 37.1717C93.587 37.1973 93.7509 37.078 93.8716 36.9843C93.9751 36.9076 94.0441 36.7372 94.0441 36.6605C94.0441 36.5583 94.0441 36.2601 94.0441 36.2175C94.0441 35.996 93.8199 35.8171 93.5353 35.7319C93.5094 35.7234 93.4749 35.7149 93.4404 35.6978C93.2421 35.6382 93.0265 35.5871 92.7764 35.5445C92.5263 35.5019 92.2503 35.4593 91.9657 35.4337C91.6725 35.4082 91.3879 35.3911 91.0947 35.3911C90.5428 35.3911 90.0081 35.4337 89.5079 35.5274C89.0077 35.6126 88.5765 35.7489 88.2143 35.9364C87.8435 36.1153 87.5502 36.3453 87.3346 36.6265C87.1191 36.8991 87.0156 37.2228 87.0156 37.5807C87.0156 37.8959 87.0932 38.1685 87.2398 38.3986C87.3864 38.6286 87.5934 38.8246 87.8262 38.9864C88.0677 39.1568 88.3437 39.2931 88.6455 39.4124C89.3354 39.685 91.2758 40.0173 92.052 40.2729C92.8281 40.5285 92.7591 41.3634 92.2589 41.5935C91.7501 41.8235 91.1033 41.832 90.3703 41.832C89.9132 41.832 89.3958 41.7809 89.0508 41.7127C88.7059 41.6446 88.4989 41.5594 88.2574 41.4827C88.0073 41.406 87.7227 41.2186 87.4468 41.2186C87.1104 41.2186 86.8086 41.3634 86.8086 41.6616C86.8086 41.7894 86.8086 41.7979 86.8086 41.832C86.8086 41.8661 86.8086 41.9172 86.8086 41.9683V42.275C86.8086 42.488 86.9379 42.6073 87.0587 42.6755C87.1708 42.7436 87.2484 42.7777 87.4295 42.8459C87.6106 42.9055 87.8435 42.9736 88.1194 43.0333C88.3954 43.0929 88.7145 43.1526 89.0767 43.1952C89.4389 43.2378 89.7149 43.2633 90.1288 43.2633C90.7497 43.2633 91.4569 43.2122 92.0002 43.11C92.5435 43.0077 93.0178 42.8629 93.4318 42.6499C93.8371 42.4539 94.1648 42.1984 94.3977 41.9002C94.6391 41.602 94.7599 41.2527 94.7599 40.8522C94.7599 40.5455 94.6823 40.2814 94.527 40.0599C94.3718 39.8384 94.1735 39.6424 93.932 39.4721Z" fill="#A0A0A0"/>
+<path d="M119.071 36.0554C118.235 35.3994 117.528 35.3057 115.777 35.3057H113.078C113.078 35.3057 113.034 35.3057 113 35.3227H112.965C112.534 35.3227 112.181 35.672 112.181 36.098V42.4707C112.181 42.8967 112.534 43.246 112.965 43.246H113.103C113.103 43.246 113.147 43.246 113.164 43.246H115.587C117.321 43.246 118.088 43.1779 118.968 42.5304C120.003 41.7636 120.218 41.0479 120.218 39.1651C120.218 37.4697 120.054 36.8392 119.063 36.0639L119.071 36.0554ZM118.028 41.2524L117.881 41.3717C117.579 41.6699 116.475 41.7977 115.579 41.7977H114.294C114.104 41.7892 113.905 41.6784 113.905 41.4824V37.2056C113.905 37.0096 114.121 36.7285 114.311 36.7285L115.544 36.7114C116.57 36.7114 117.433 36.737 118.054 37.3419C118.416 37.6997 118.485 38.2024 118.485 39.2247C118.485 40.3664 118.459 40.8264 118.019 41.2609L118.028 41.2524Z" fill="#A0A0A0"/>
+<path d="M107.101 35.3911H99.9258C99.7016 35.3911 99.5205 35.57 99.5205 35.7915V36.6605C99.5205 36.8906 99.7102 37.0695 99.9345 37.0695H102.582V42.4284C102.582 42.8544 102.642 43.2037 103.074 43.2037H103.832C104.264 43.2037 104.281 42.8544 104.281 42.4284V37.0695H107.101C107.299 37.0695 107.455 36.9076 107.455 36.7117V35.7489C107.455 35.553 107.291 35.3911 107.092 35.3911H107.101Z" fill="#A0A0A0"/>
+<path d="M145.236 35.3911H138.061C137.836 35.3911 137.655 35.57 137.655 35.7915V36.6605C137.655 36.8906 137.845 37.0695 138.069 37.0695H140.717V42.4284C140.717 42.8544 140.777 43.2037 141.208 43.2037H141.967C142.398 43.2037 142.416 42.8544 142.416 42.4284V37.0695H145.236C145.434 37.0695 145.598 36.9076 145.598 36.7117V35.7489C145.598 35.553 145.434 35.3911 145.236 35.3911Z" fill="#A0A0A0"/>
+<path d="M69.535 35.3994H68.9572C68.5174 35.3738 68.4139 35.4164 68.2846 35.655L68.1811 35.8424L68.1121 35.9702L67.9482 36.2684C67.9482 36.2684 67.9482 36.2684 67.9482 36.2769L65.3697 40.9542L62.5755 35.9276C62.5755 35.9276 62.5755 35.9191 62.5669 35.9105L62.4203 35.6464C62.2909 35.4164 62.1012 35.3908 61.7821 35.3823H61.1439C60.661 35.3908 60.6179 35.7742 60.7472 36.0128L61.256 36.9499C61.256 36.9499 61.2733 36.984 61.2819 37.0011L64.4555 42.6922C64.6366 42.9989 64.9643 43.2119 65.3352 43.2119C65.706 43.2119 66.0337 42.9989 66.2148 42.6922L69.4143 37.0181L69.949 35.9872C70.0783 35.7572 70.0611 35.3823 69.535 35.3994Z" fill="#A0A0A0"/>
+<path d="M82.0395 41.585L78.8831 35.9279C78.702 35.6127 78.3829 35.4082 78.0121 35.4082C77.6413 35.4082 77.3222 35.6127 77.1411 35.9279L73.9933 41.6191C73.9933 41.6191 73.9761 41.6531 73.9675 41.6702L73.4587 42.6073C73.3293 42.8374 73.4587 43.1015 73.6829 43.2378H74.4677C74.873 43.2378 74.9851 43.2037 75.1145 42.9737L75.2611 42.7096C75.2611 42.7096 75.2611 42.7011 75.2697 42.6925L75.8389 41.6531H78.6934C78.8486 41.6531 79.116 41.4316 78.9349 41.0738L78.5295 40.3496C78.4951 40.2815 78.4261 40.2389 78.3484 40.2389H76.6064L78.0207 37.6659L80.5734 42.3432C80.5734 42.3432 80.5734 42.3432 80.5734 42.3518L80.7373 42.65L80.8063 42.7777L80.9098 42.9652C81.0391 43.1952 81.272 43.2293 81.6169 43.2293L82.3758 43.2463C82.5483 43.2378 82.807 42.9141 82.6259 42.6159L82.0136 41.585H82.0395Z" fill="#A0A0A0"/>
+<path d="M132.895 41.585L129.739 35.9279C129.558 35.6127 129.238 35.4082 128.868 35.4082C128.497 35.4082 128.178 35.6127 127.997 35.9279L124.849 41.6191C124.849 41.6191 124.832 41.6531 124.823 41.6702L124.314 42.6073C124.185 42.8374 124.314 43.1015 124.538 43.2378H125.323C125.728 43.2378 125.841 43.2037 125.97 42.9737L126.117 42.7096C126.117 42.7096 126.117 42.7011 126.125 42.6925L126.694 41.6531H129.549C129.704 41.6531 129.971 41.4316 129.79 41.0738L129.385 40.3496C129.351 40.2815 129.282 40.2389 129.204 40.2389H127.462L128.876 37.6659L131.429 42.3432C131.429 42.3432 131.429 42.3432 131.429 42.3518L131.593 42.6585L131.662 42.7863L131.765 42.9737C131.895 43.2037 132.127 43.2378 132.481 43.2378L133.24 43.2548C133.412 43.2463 133.671 42.9226 133.49 42.6244L132.878 41.585H132.895Z" fill="#A0A0A0"/>
+<path d="M158.94 42.6156L158.328 41.5762L155.171 35.9191C154.99 35.6039 154.671 35.3994 154.3 35.3994C153.929 35.3994 153.61 35.6039 153.429 35.9191L150.281 41.6103C150.281 41.6103 150.264 41.6444 150.256 41.6614L149.747 42.5986C149.617 42.8286 149.747 43.0927 149.971 43.229H150.756C151.161 43.229 151.273 43.1949 151.403 42.9649L151.549 42.7008C151.549 42.7008 151.549 42.6923 151.558 42.6838L152.127 41.6444H154.981C155.137 41.6444 155.404 41.4228 155.223 41.065L154.818 40.3408C154.783 40.2727 154.714 40.2301 154.637 40.2301H152.894L154.309 37.6571L156.862 42.3345C156.862 42.3345 156.862 42.3345 156.862 42.343L157.025 42.6497L157.094 42.7775L157.198 42.9649C157.327 43.1949 157.56 43.229 157.905 43.229L158.664 43.2461C158.836 43.2375 159.095 42.9138 158.914 42.6156H158.94Z" fill="#A0A0A0"/>
+<path d="M141.476 29.751V22.2366C141.89 22.0833 142.304 21.9214 142.718 21.751C143.192 21.5551 143.244 21.4869 143.235 21.112C143.235 20.8053 143.244 20.0556 143.244 19.5615C143.244 19.1951 143.02 19.0758 142.692 19.161C142.295 19.2633 141.881 19.3655 141.467 19.4677V14.9523H142.977C143.14 14.9523 143.27 14.8245 143.27 14.6626V12.7372C143.27 12.5753 143.14 12.4475 142.977 12.4475H141.467V10.1813C141.467 10.0194 141.338 9.8916 141.174 9.8916H138.828C138.665 9.8916 138.535 10.0194 138.535 9.90864V12.4475H137.095C136.931 12.4475 136.802 12.5753 136.802 12.7372V14.6626C136.802 14.8245 136.931 14.9523 137.095 14.9523H138.535V20.0812C138.061 20.1578 137.595 20.2175 137.129 20.2516C137.026 20.2601 136.922 20.2686 136.871 20.3538C136.793 20.4816 136.81 20.6861 136.81 20.6861V22.6712C136.81 22.6712 136.767 23.1653 136.897 23.2931C136.966 23.3612 137.164 23.4038 137.336 23.3698C137.742 23.2931 138.138 23.1994 138.535 23.1057V28.4901C138.509 28.6009 138.458 28.6861 138.328 28.7968C138.251 28.8565 138.138 28.8991 137.992 28.9161L137.224 28.9417C137.06 28.9417 136.931 29.0695 136.931 29.2313V31.1568C136.931 31.3186 137.06 31.4464 137.224 31.4464H139.863L139.898 31.4294C140.769 31.3357 141.441 30.4837 141.467 29.8107V29.7936C141.467 29.7936 141.467 29.7766 141.467 29.7681C141.467 29.7595 141.467 29.7425 141.467 29.734L141.476 29.751Z" fill="#19140F"/>
+<path d="M158.361 19.1268H153.98V17.3121H157.792C158.033 17.3121 158.223 17.1162 158.223 16.8861V10.2663C158.223 10.0278 158.025 9.84033 157.792 9.84033L146.426 9.92553C146.426 9.92553 146.365 9.90849 146.331 9.90849H143.985C143.821 9.90849 143.692 10.0363 143.692 10.1982V23.0714C143.562 25.3632 143.131 26.8797 142.234 28.8904V31.4548H142.303C142.898 31.4037 146.279 27.6209 146.615 22.0576L146.633 21.6486H151.057V23.4719H147.141C146.969 23.4719 146.822 23.6167 146.822 23.7871V31.2077C146.822 31.3781 146.969 31.523 147.141 31.523H157.913C158.085 31.523 158.232 31.3781 158.232 31.2077V23.7871C158.232 23.6167 158.085 23.4719 157.913 23.4719H153.997V21.6486H158.378C158.542 21.6486 158.672 21.5208 158.672 21.359V19.4335C158.672 19.2716 158.542 19.1438 158.378 19.1438L158.361 19.1268ZM155.222 26.2408V28.7626C155.222 28.8819 155.127 28.9756 155.006 28.9756H149.979C149.858 28.9756 149.763 28.8819 149.763 28.7626V26.2408C149.763 26.1215 149.858 26.0278 149.979 26.0278H155.006C155.127 26.0278 155.222 26.1215 155.222 26.2408ZM147.124 12.4303H154.696C154.972 12.4303 155.205 12.6604 155.205 12.933V14.4154C155.205 14.688 154.972 14.9181 154.696 14.9181H147.124C146.883 14.9181 146.684 14.7477 146.633 14.5262V12.8307C146.676 12.6007 146.883 12.4303 147.124 12.4303ZM146.641 19.1268V17.3121H151.048V19.1268H146.641Z" fill="#19140F"/>
+<path d="M114.397 10.4023H112.051C111.889 10.4023 111.758 10.532 111.758 10.692V13.0094C111.758 13.1694 111.889 13.299 112.051 13.299H114.397C114.559 13.299 114.69 13.1694 114.69 13.0094V10.692C114.69 10.532 114.559 10.4023 114.397 10.4023Z" fill="#19140F"/>
+<path d="M122.58 10.4023H120.235C120.073 10.4023 119.941 10.532 119.941 10.692V13.0094C119.941 13.1694 120.073 13.299 120.235 13.299H122.58C122.742 13.299 122.874 13.1694 122.874 13.0094V10.692C122.874 10.532 122.742 10.4023 122.58 10.4023Z" fill="#19140F"/>
+<path d="M122.132 29.1031C122.046 29.1031 121.951 29.1031 121.865 29.1031C121.123 29.1031 120.382 28.9839 119.692 28.7794C121.003 27.6633 121.908 26.232 122.072 24.5536H123.176C123.34 24.5536 123.469 24.4258 123.469 24.264V22.3385C123.469 22.1766 123.34 22.0488 123.176 22.0488H115.182V21.3502C115.182 21.1883 115.052 21.0605 114.888 21.0605H112.543C112.379 21.0605 112.249 21.1883 112.249 21.3502V22.0488H111.646C111.482 22.0488 111.353 22.1766 111.353 22.3385V24.264C111.353 24.4258 111.482 24.5536 111.646 24.5536H112.482C112.698 26.249 113.431 27.6378 114.509 28.7112C113.707 28.9583 112.87 29.1031 112.068 29.1031C111.991 29.1031 111.913 29.1031 111.835 29.1031C111.585 29.1031 111.378 29.2991 111.378 29.5462V30.969C111.378 31.2075 111.577 31.412 111.818 31.412C111.896 31.412 111.982 31.412 112.06 31.412C113.716 31.412 115.44 31.0542 116.984 30.4067C118.441 31.0712 120.132 31.412 121.857 31.412C121.934 31.412 122.02 31.412 122.098 31.412C122.348 31.412 122.546 31.2075 122.546 30.9604V29.4865C122.546 29.265 122.357 29.0861 122.132 29.0946V29.1031ZM115.354 24.5621H119.2C119.14 25.5845 118.321 26.6324 117.122 27.4588C116.113 26.6495 115.44 25.6186 115.354 24.5621Z" fill="#19140F"/>
+<path d="M132.714 29.0521C131.636 28.9755 130.644 28.5239 129.782 27.8338C131.187 26.164 132.041 24.017 132.093 21.6144C132.11 21.4526 132.11 21.3333 132.11 21.2907V14.9435H132.86C133.024 14.9435 133.154 14.8072 133.154 14.6538V12.7284C133.154 12.5665 133.024 12.4387 132.86 12.4387H128.1C128.16 12.2257 128.221 11.9957 128.281 11.7657C128.402 11.263 128.462 10.8455 128.454 10.2918C128.454 10.0617 128.264 9.88281 128.031 9.88281H125.332C124.987 9.88281 124.719 10.1725 124.745 10.5048C124.754 10.6496 124.762 10.8029 124.762 10.9563C124.762 12.4302 124.193 13.7763 123.262 14.7902V14.1597C123.262 13.9978 123.133 13.87 122.969 13.87H118.777V10.198C118.777 10.0362 118.648 9.90837 118.484 9.90837H116.139C115.975 9.90837 115.845 10.0362 115.845 10.198V13.87H111.628C111.464 13.87 111.335 13.9978 111.335 14.1597V16.4771C111.335 16.6389 111.464 16.7667 111.628 16.7667H113.293C113.293 16.7667 113.293 16.7923 113.293 16.8093C113.293 17.6187 112.378 18.1725 111.723 18.5559C111.585 18.6325 111.464 18.6922 111.378 18.8029C111.361 18.8285 111.344 18.8881 111.335 18.9648V20.3791C111.344 20.4472 111.369 20.5069 111.395 20.541C111.464 20.6262 111.585 20.6602 111.697 20.6688C111.818 20.6858 111.87 20.6858 111.99 20.6858C113.715 20.6858 115.595 19.3312 115.845 17.6613V20.4728C115.845 20.6347 115.975 20.7625 116.139 20.7625H118.484C118.648 20.7625 118.777 20.6347 118.777 20.4728V17.6443C119.019 19.3141 120.908 20.6858 122.632 20.6858C122.753 20.6858 122.813 20.6858 122.926 20.6688C123.046 20.6517 123.158 20.6262 123.227 20.541C123.253 20.5069 123.279 20.4558 123.288 20.3961V18.9478C123.279 18.8796 123.271 18.8285 123.245 18.8029C123.158 18.6922 123.029 18.6325 122.9 18.5559C122.244 18.1725 121.33 17.6187 121.33 16.8093C121.33 16.7923 121.33 16.7838 121.33 16.7667H122.831V16.903C122.831 16.903 122.788 17.1331 122.969 17.3205C123.15 17.5079 123.374 17.4227 123.633 17.3546C123.745 17.3205 123.857 17.2864 123.96 17.2524V21.7678C123.96 21.8189 123.96 21.8615 123.96 21.8956C123.96 21.9808 123.96 22.066 123.96 22.1512V22.2449C123.96 22.2449 123.96 22.2449 123.96 22.2534C124.038 24.3407 124.788 26.2321 126.004 27.7401C125.185 28.3535 124.236 28.7965 123.227 28.984C123.003 29.0266 122.839 29.2311 122.839 29.4611V30.9265C122.839 31.1821 123.064 31.3695 123.314 31.3354C125.03 31.0969 126.599 30.4749 127.91 29.5463C129.281 30.526 130.92 31.1735 132.705 31.378C132.947 31.4036 133.154 31.2247 133.154 30.9861C133.154 30.6624 133.154 29.8786 133.154 29.5889C133.154 29.0351 132.757 29.0777 132.679 29.0777L132.714 29.0521ZM127.039 14.9435H128.824C128.824 14.9435 129.178 14.9776 129.178 15.3695V22.066C129.074 23.3525 128.626 24.5878 127.936 25.6613C127.289 24.5282 126.918 23.2417 126.918 21.9978C126.918 21.9297 126.918 21.87 126.901 21.8274V17.0308C126.901 16.869 126.772 16.7412 126.608 16.7412H125.142C125.944 16.2896 126.556 15.6847 127.031 14.952L127.039 14.9435Z" fill="#19140F"/>
+<path d="M107.308 29.8531H98.5372V29.0097H105.937C106.161 29.0097 106.351 28.8223 106.351 28.6007V27.7828C106.351 27.5613 106.161 27.3739 105.937 27.3739H98.5372V26.5134H105.117C105.264 26.5134 105.376 26.3941 105.376 26.2493V20.1748C105.376 20.0299 105.255 19.9106 105.117 19.9106H88.4472C88.3006 19.9106 88.1885 20.0299 88.1885 20.1748V26.2493C88.1885 26.3941 88.3092 26.5134 88.4472 26.5134H95.0273V27.3739H87.6279C87.4037 27.3739 87.214 27.5613 87.214 27.7828V28.6007C87.214 28.8223 87.4037 29.0097 87.6279 29.0097H95.0273V29.8531H86.2567C86.0325 29.8531 85.8428 30.0406 85.8428 30.2621V31.08C85.8428 31.3015 86.0325 31.4889 86.2567 31.4889H107.299C107.523 31.4889 107.713 31.3015 107.713 31.08V30.2621C107.713 30.0406 107.523 29.8531 107.299 29.8531H107.308ZM102.125 24.5368C102.125 24.7158 101.978 24.8606 101.797 24.8606H98.5372V24.0001H101.797C101.978 24.0001 102.125 24.1449 102.125 24.3238V24.5368ZM101.797 21.5464C101.978 21.5464 102.125 21.6913 102.125 21.8702V22.0832C102.125 22.2621 101.978 22.4069 101.797 22.4069H98.5372V21.5464H101.797ZM91.5001 21.8702C91.5001 21.6913 91.6467 21.5464 91.8278 21.5464H95.0445V22.4069H91.8278C91.6467 22.4069 91.5001 22.2621 91.5001 22.0832V21.8702ZM91.8278 24.8606C91.6467 24.8606 91.5001 24.7158 91.5001 24.5368V24.3238C91.5001 24.1449 91.6467 24.0001 91.8278 24.0001H95.0445V24.8606H91.8278Z" fill="#19140F"/>
+<path d="M107.317 17.3975H86.2655C86.0369 17.3975 85.8516 17.5806 85.8516 17.8064V18.6158C85.8516 18.8416 86.0369 19.0247 86.2655 19.0247H107.317C107.545 19.0247 107.731 18.8416 107.731 18.6158V17.8064C107.731 17.5806 107.545 17.3975 107.317 17.3975Z" fill="#19140F"/>
+<path d="M88.2919 16.4944H105.298C105.445 16.4944 105.557 16.3751 105.557 16.2303V10.1557C105.557 10.0109 105.436 9.8916 105.298 9.8916H88.2919C88.1453 9.8916 88.0332 10.0109 88.0332 10.1557V16.2303C88.0332 16.3751 88.1539 16.4944 88.2919 16.4944ZM91.3189 11.8341C91.3189 11.6552 91.4655 11.5103 91.6466 11.5103H101.944C102.125 11.5103 102.271 11.6552 102.271 11.8341V12.0471C102.271 12.226 102.125 12.3708 101.944 12.3708H91.6466C91.4655 12.3708 91.3189 12.226 91.3189 12.0471V11.8341ZM91.3189 14.3304C91.3189 14.1515 91.4655 14.0066 91.6466 14.0066H101.944C102.125 14.0066 102.271 14.1515 102.271 14.3304V14.5434C102.271 14.7223 102.125 14.8671 101.944 14.8671H91.6466C91.4655 14.8671 91.3189 14.7223 91.3189 14.5434V14.3304Z" fill="#19140F"/>
+<path d="M63.7749 16.043H61.1274C60.9721 16.043 60.8428 16.1708 60.8428 16.3241V20.2176C60.8428 20.371 60.9721 20.4988 61.1274 20.4988H63.7059C63.8612 20.4988 64.0509 20.3284 64.0509 20.175V16.3241C64.0509 16.1708 63.9388 16.043 63.7835 16.043H63.7749Z" fill="#19140F"/>
+<path d="M63.749 21.606H61.1274C60.9721 21.606 60.8428 21.7338 60.8428 21.8871V31.1651C60.8428 31.3184 60.9721 31.4462 61.1274 31.4462H63.7404C63.8957 31.4462 64.0164 31.3184 64.0164 31.1651V21.8871C64.0164 21.7338 63.9043 21.606 63.749 21.606Z" fill="#19140F"/>
+<path d="M81.5318 20.4731H80.0916V15.4635C80.0916 15.1568 79.8415 14.9097 79.5311 14.9097H68.3975C68.7425 14.6797 69.2082 14.2963 69.6911 13.7936H81.0489C81.2041 13.7936 81.3248 13.6743 81.3248 13.5125V11.5615C81.3248 11.4081 81.1955 11.2888 81.0489 11.2888H70.8726C70.8898 11.1696 70.933 10.1728 70.933 10.1728C70.933 10.0194 70.8036 9.8916 70.6484 9.8916H68.1474C67.9922 9.8916 67.8628 10.0194 67.8628 10.1728V10.8714C67.8628 12.03 66.5692 13.1546 65.4568 13.3591C65.4568 13.3591 65.0342 13.3762 65.0342 13.7169V15.1057C65.0342 15.259 65.1635 15.3868 65.3101 15.3868L66.5951 15.1823V20.4646H65.7413C65.5861 20.4646 65.4568 20.5838 65.4568 20.7457V22.6882C65.4568 22.8415 65.5861 22.9693 65.7413 22.9693H66.5951V27.9448C66.5951 28.2856 66.828 28.3879 67.1384 28.3879H77.1163V28.7627C77.1163 28.9757 77.1163 29.2228 76.78 29.2228H74.2101C74.0548 29.2228 73.822 29.325 73.8737 29.5636C73.9255 29.8021 74.6758 31.0119 74.6758 31.0119C74.762 31.1653 74.8482 31.4209 75.1328 31.4209H79.6087C80.0399 31.4209 80.0485 31.2079 80.0485 30.9779L80.0744 28.3879L80.954 28.4049C81.1092 28.4049 81.2903 28.2686 81.2903 28.1152V26.1983C81.2817 26.045 81.1179 25.8831 80.9626 25.8831H80.0744V22.9608H81.5059C81.6612 22.9608 81.7905 22.833 81.7905 22.6797V20.7372C81.7905 20.5838 81.6784 20.456 81.5232 20.456L81.5318 20.4731ZM77.1508 25.619C77.1508 25.7723 77.0215 25.9001 76.8663 25.9001H75.0294V24.1365C75.0294 23.8554 74.9172 23.7446 74.6326 23.7446H72.4163C72.2611 23.7446 72.08 23.8639 72.08 24.0684V25.9001H69.9067C69.8205 25.9001 69.5531 25.8234 69.5531 25.6275V23.3101C69.5531 23.1568 69.6739 23.0205 69.8377 23.0205H76.8663C77.0215 23.0205 77.1508 23.2249 77.1508 23.3783V25.619ZM77.1336 20.4731H75.038V18.6925C75.038 18.4965 74.9172 18.3261 74.762 18.3261H72.3645C72.2093 18.3261 72.08 18.4965 72.08 18.6499V20.4731H69.5359V17.7979C69.5359 17.5082 69.7774 17.3719 69.9326 17.3719L76.8318 17.3975C76.987 17.3975 77.1508 17.5338 77.1508 17.7382L77.1336 20.4731Z" fill="#19140F"/>
+<path d="M61.1184 14.9353H63.7401C63.8953 14.9353 64.0161 14.816 64.0161 14.6541V10.7606C64.0161 10.6073 63.8695 10.4795 63.7142 10.4795H61.1098C60.9546 10.4795 60.8252 10.6073 60.8252 10.7606V14.6541C60.8252 14.8075 60.9546 14.9353 61.1098 14.9353H61.1184Z" fill="#19140F"/>
+<path d="M34.323 44.7455L34.2626 44.6518C34.2109 44.5411 34.1591 44.4388 34.1074 44.3451L26.915 32.1364C26.5097 31.4718 25.768 31.0288 24.9315 31.0288C24.095 31.0288 23.3447 31.4804 22.9394 32.1534L15.7211 44.2599C15.7211 44.2599 15.7039 44.2855 15.6952 44.3025L15.6435 44.3877C15.6004 44.4644 15.5573 44.5496 15.5141 44.6263L15.4365 44.7455C14.9105 45.606 15.1864 46.7391 16.0574 47.2588L16.8508 47.7359C17.7219 48.2556 18.8689 47.983 19.3949 47.1225L19.8779 46.3387C19.9124 46.2876 19.9382 46.2365 19.9641 46.1768L24.897 37.9383L29.7782 46.1002C29.8127 46.1768 29.8472 46.262 29.8989 46.3387L30.2007 46.8329C30.2439 46.9095 30.2956 46.9862 30.3387 47.0544L30.3818 47.1225C30.9079 47.983 32.0549 48.2556 32.9259 47.7359L33.7193 47.2588C34.5903 46.7391 34.8663 45.606 34.3402 44.7455H34.323Z" fill="url(#paint0_radial_1_798)"/>
+<path d="M47.7674 26.2578H47.6553C47.5346 26.2492 47.4138 26.2407 47.3017 26.2407L33.0032 26.2918C32.2184 26.3089 31.4595 26.7178 31.0369 27.442C30.6144 28.1662 30.6402 29.0267 31.0197 29.7082L38.031 41.9425C38.031 41.9596 38.0482 41.9681 38.0568 41.9851L38.1086 42.0788C38.1517 42.1555 38.2034 42.2322 38.2552 42.3089L38.3242 42.4367C38.8157 43.3227 39.9455 43.6465 40.8424 43.1609L41.653 42.7178C42.5499 42.2322 42.8776 41.1161 42.3861 40.2301L41.9376 39.4292C41.9117 39.3781 41.8773 39.327 41.8428 39.2759L37.091 30.9436L46.6808 30.8499C46.767 30.8584 46.8533 30.8669 46.9481 30.8669L47.526 30.8499C47.6122 30.8499 47.7071 30.8499 47.7933 30.8499H47.8709C48.8885 30.8243 49.7078 29.9809 49.6819 28.9755L49.6647 28.0639C49.6388 27.0586 48.785 26.2492 47.7674 26.2748V26.2578Z" fill="url(#paint1_radial_1_798)"/>
+<path d="M38.2819 5.51233L38.2302 5.61457C38.1612 5.70829 38.0922 5.81052 38.0405 5.90424L30.9343 18.1641C30.5549 18.8457 30.5376 19.6976 30.9602 20.4218C31.3828 21.146 32.1503 21.5549 32.9437 21.572L47.1732 21.6912C47.1905 21.6912 47.2077 21.6912 47.2164 21.6912H47.3198C47.4061 21.6912 47.5009 21.6912 47.5958 21.6827H47.7424C48.76 21.7083 49.6138 20.9074 49.6397 19.8936L49.6569 18.982C49.6828 17.9767 48.8635 17.1332 47.8459 17.1076L46.9231 17.0906C46.8628 17.0906 46.8024 17.0906 46.742 17.0906L37.0573 16.9884L41.766 8.73278C41.8178 8.66462 41.8695 8.58795 41.9126 8.51127L42.1886 8.00861C42.2317 7.93193 42.2748 7.85525 42.3179 7.77858L42.3524 7.71042C42.844 6.82437 42.5077 5.70829 41.6194 5.22266L40.8088 4.77964C39.9119 4.29402 38.7821 4.62629 38.2906 5.50381L38.2819 5.51233Z" fill="url(#paint2_radial_1_798)"/>
+<path d="M15.359 3.25477L15.4194 3.34848C15.4711 3.45924 15.5229 3.56147 15.5746 3.65519L22.767 15.8639C23.1723 16.5285 23.914 16.9715 24.7505 16.9715C25.5871 16.9715 26.3373 16.5199 26.7427 15.8469L33.9609 3.74039C33.9609 3.74039 33.9782 3.71483 33.9868 3.69779L34.0385 3.61259C34.0817 3.53591 34.1248 3.45072 34.1679 3.37404L34.2455 3.25477C34.7716 2.39428 34.4956 1.26115 33.6246 0.741453L32.8312 0.26435C31.9602 -0.255352 30.8132 0.0172783 30.2871 0.877768L29.8042 1.66158C29.7697 1.7127 29.7438 1.76382 29.7179 1.82346L24.785 10.062L19.9039 1.90013C19.8694 1.82346 19.8349 1.73826 19.7831 1.66158L19.4813 1.16744C19.4382 1.09076 19.3864 1.01408 19.3433 0.945926L19.3002 0.877768C18.7741 0.0172783 17.6271 -0.255352 16.7561 0.26435L15.9627 0.741453C15.0917 1.26115 14.8157 2.39428 15.3418 3.25477H15.359Z" fill="url(#paint3_radial_1_798)"/>
+<path d="M1.91414 21.7426H2.02625C2.14699 21.7511 2.26772 21.7596 2.37983 21.7596L16.6784 21.7085C17.4631 21.6914 18.2221 21.2825 18.6446 20.5583C19.0672 19.8342 19.0413 18.9737 18.6619 18.2921L11.6506 6.05779C11.6506 6.04075 11.6333 6.03223 11.6247 6.0152L11.573 5.92148C11.5299 5.8448 11.4781 5.76812 11.4264 5.69145L11.3574 5.56365C10.8658 4.6776 9.73607 4.35385 8.83918 4.83948L8.02853 5.2825C7.13164 5.76812 6.80393 6.8842 7.29549 7.77025L7.74394 8.57111C7.76981 8.62222 7.80431 8.67334 7.8388 8.72446L12.5906 17.0567L3.00076 17.1504C2.91452 17.1419 2.82828 17.1334 2.73342 17.1334L2.15561 17.1504C2.06937 17.1504 1.97451 17.1504 1.88827 17.1504H1.81065C0.793024 17.1845 -0.0262521 18.028 -0.000380225 19.0418L0.0168677 19.9534C0.0427396 20.9588 0.896512 21.7681 1.91414 21.7426Z" fill="url(#paint4_radial_1_798)"/>
+<path d="M11.4002 42.488L11.4519 42.3858C11.5209 42.292 11.5899 42.1898 11.6417 42.0961L18.7478 29.8362C19.1273 29.1547 19.1445 28.3027 18.7219 27.5785C18.2994 26.8543 17.5318 26.4454 16.7384 26.4284L2.5175 26.3091C2.50025 26.3091 2.483 26.3091 2.47438 26.3091H2.37089C2.28465 26.3091 2.18979 26.3091 2.09493 26.3176H1.94832C0.930692 26.292 0.0769193 27.0929 0.0510474 28.1067L0.0337995 29.0183C0.00792757 30.0237 0.827204 30.8671 1.84483 30.8927L2.7676 30.9097C2.82796 30.9097 2.88833 30.9097 2.9487 30.9097L12.6334 31.012L7.92473 39.2675C7.87298 39.3357 7.82124 39.4124 7.77812 39.4891L7.50215 39.9917C7.45903 40.0684 7.41591 40.1451 7.37279 40.2218L7.3383 40.2899C6.84673 41.176 7.18306 42.292 8.07133 42.7777L8.88199 43.2207C9.77888 43.7063 10.9086 43.374 11.4002 42.4965V42.488Z" fill="url(#paint5_radial_1_798)"/>
+</g>
+<defs>
+<radialGradient id="paint0_radial_1_798" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(24.727 23.6565) scale(24.7299 24.4309)">
+<stop stop-color="#FFC80F"/>
+<stop offset="0.33" stop-color="#FFA512"/>
+<stop offset="0.77" stop-color="#FF7D17"/>
+<stop offset="1" stop-color="#FF6E19"/>
+</radialGradient>
+<radialGradient id="paint1_radial_1_798" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(24.7267 23.6564) scale(24.7299 24.4309)">
+<stop stop-color="#FFC80F"/>
+<stop offset="0.33" stop-color="#FFA512"/>
+<stop offset="0.77" stop-color="#FF7D17"/>
+<stop offset="1" stop-color="#FF6E19"/>
+</radialGradient>
+<radialGradient id="paint2_radial_1_798" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(24.7276 23.6565) scale(24.7299 24.4309)">
+<stop stop-color="#FFC80F"/>
+<stop offset="0.33" stop-color="#FFA512"/>
+<stop offset="0.77" stop-color="#FF7D17"/>
+<stop offset="1" stop-color="#FF6E19"/>
+</radialGradient>
+<radialGradient id="paint3_radial_1_798" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(24.7272 23.6566) scale(24.7299 24.4309)">
+<stop stop-color="#FFC80F"/>
+<stop offset="0.33" stop-color="#FFA512"/>
+<stop offset="0.77" stop-color="#FF7D17"/>
+<stop offset="1" stop-color="#FF6E19"/>
+</radialGradient>
+<radialGradient id="paint4_radial_1_798" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(24.727 23.6567) scale(24.7299 24.4309)">
+<stop stop-color="#FFC80F"/>
+<stop offset="0.33" stop-color="#FFA512"/>
+<stop offset="0.77" stop-color="#FF7D17"/>
+<stop offset="1" stop-color="#FF6E19"/>
+</radialGradient>
+<radialGradient id="paint5_radial_1_798" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(24.7267 23.6566) scale(24.7299 24.4309)">
+<stop stop-color="#FFC80F"/>
+<stop offset="0.33" stop-color="#FFA512"/>
+<stop offset="0.77" stop-color="#FF7D17"/>
+<stop offset="1" stop-color="#FF6E19"/>
+</radialGradient>
+<clipPath id="clip0_1_798">
+<rect width="159" height="48" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/frontend/src/App.ai-panel-error-boundary.test.ts b/frontend/src/App.ai-panel-error-boundary.test.ts
index 42f4b28..ada430e 100644
--- a/frontend/src/App.ai-panel-error-boundary.test.ts
+++ b/frontend/src/App.ai-panel-error-boundary.test.ts
@@ -6,11 +6,16 @@ const appSource = readFileSync(
   fileURLToPath(new globalThis.URL('./App.tsx', import.meta.url)),
   'utf8',
 );
+const aiPanelBoundarySource = readFileSync(
+  fileURLToPath(new globalThis.URL('./components/ai/AIPanelErrorBoundary.tsx', import.meta.url)),
+  'utf8',
+);
 
 describe('AI panel lazy-load guard', () => {
   it('keeps AI panel failures scoped to the panel area with retry support', () => {
     expect(appSource).toContain("import AIChatPanel from './components/AIChatPanel';");
-    expect(appSource).toContain('class AIPanelErrorBoundary extends React.Component');
+    expect(appSource).toContain("import AIPanelErrorBoundary from './components/ai/AIPanelErrorBoundary';");
+    expect(aiPanelBoundarySource).toContain('class AIPanelErrorBoundary extends React.Component');
     expect(appSource).toContain('<AIPanelErrorBoundary');
     expect(appSource).toContain('key={aiPanelRenderNonce}');
     expect(appSource).toContain('AI 面板加载失败');
diff --git a/frontend/src/App.css b/frontend/src/App.css
index a3d2f0a..6d59d91 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -1,6 +1,6 @@
 :root {
-  --gn-font-sans: "Inter", "PingFang SC", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", sans-serif;
-  --gn-font-mono: "JetBrains Mono", ui-monospace, "SF Mono", Menlo, Consolas, monospace;
+  --gn-font-sans: "Inter", "PingFang SC", "Noto Sans CJK SC", "Noto Sans SC", "Source Han Sans SC", "WenQuanYi Micro Hei", "Microsoft YaHei", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Ubuntu", sans-serif;
+  --gn-font-mono: "JetBrains Mono", "Noto Sans Mono CJK SC", "Noto Sans Mono", ui-monospace, "SF Mono", Menlo, Consolas, "DejaVu Sans Mono", monospace;
 }
 
 html, body, #root {
@@ -649,9 +649,11 @@ body[data-theme='light'] .redis-viewer-workbench .ant-radio-button-wrapper-check
     }
 }
 .gonavi-query-editor-link-hint {
+  color: #1677ff !important;
   cursor: pointer;
   text-decoration: underline;
-  text-decoration-style: dashed;
+  text-decoration-style: solid;
+  text-decoration-color: currentColor;
   text-decoration-thickness: 1px;
   text-underline-offset: 3px;
 }
@@ -672,6 +674,10 @@ body[data-theme='dark'] .gonavi-query-editor-object-token {
   color: #7dd3fc;
 }
 
+body[data-theme='dark'] .gonavi-query-editor-link-hint {
+  color: #69b1ff !important;
+}
+
 body[data-theme='dark'] .gonavi-query-editor-column-token {
   color: #5eead4;
 }
@@ -679,3 +685,9 @@ body[data-theme='dark'] .gonavi-query-editor-column-token {
 body[data-theme='dark'] .gonavi-query-editor-db-token {
   color: #c4b5fd;
 }
+
+/* Legacy sidebar resize bounds — mirror v2 .gn-v2-app-sider so Ant Design inline width locks do not collapse drag range. */
+body[data-ui-version="legacy"] .ant-layout-sider {
+  min-width: 232px !important;
+  max-width: 420px !important;
+}
diff --git a/frontend/src/App.tool-center.test.ts b/frontend/src/App.tool-center.test.ts
index 85628d0..98dcd79 100644
--- a/frontend/src/App.tool-center.test.ts
+++ b/frontend/src/App.tool-center.test.ts
@@ -6,6 +6,14 @@ const appSource = readFileSync(
   fileURLToPath(new globalThis.URL('./App.tsx', import.meta.url)),
   'utf8',
 );
+const appCss = readFileSync(
+  fileURLToPath(new globalThis.URL('./App.css', import.meta.url)),
+  'utf8',
+);
+const linuxCJKFontBannerSource = readFileSync(
+  fileURLToPath(new globalThis.URL('./components/LinuxCJKFontBanner.tsx', import.meta.url)),
+  'utf8',
+);
 
 const getGlobalShortcutCaseBlock = (action: string) => {
   const caseToken = `case '${action}':`;
@@ -120,6 +128,10 @@ describe('tool center menu entries', () => {
     expect(appSource).toContain('ghostRef.current.style.left = `${startGuideLeft + (newWidth - startWidth)}px`;');
   });
 
+  it('keeps legacy sidebar resize bounds aligned with the v2 sider CSS limits', () => {
+    expect(appCss).toMatch(/body\[data-ui-version="legacy"\]\s+\.ant-layout-sider\s*\{[^}]*min-width:\s*232px\s*!important;[^}]*max-width:\s*420px\s*!important;/s);
+  });
+
   it('keeps connection modal warm-mounted while leaving the other heavyweight modals conditional', () => {
     expect(appSource).toContain('const [isConnectionModalMounted, setIsConnectionModalMounted] = useState(false);');
     expect(appSource).toContain('{isConnectionModalMounted && (');
@@ -181,7 +193,7 @@ describe('tool center menu entries', () => {
       ['toggleLogPanel', 'handleToggleLogPanel();'],
       ['toggleTheme', 'setTheme('],
       ['openShortcutManager', 'setIsShortcutModalOpen(true);'],
-      ['toggleMacFullscreen', 'handleTitleBarWindowToggle();'],
+      ['toggleMacFullscreen', 'handleTitleBarWindowToggle({ allowMacNativeFullscreen: true });'],
       ['resetWindowZoom', 'handleManualResetWindowZoom();'],
     ]);
 
@@ -195,11 +207,48 @@ describe('tool center menu entries', () => {
     expect(appSource).toContain('switchActiveTabByOffset, themeMode');
   });
 
+  it('automatically resets WebView2 zoom when a Windows taskbar restore returns focus', () => {
+    expect(appSource).toContain('shouldResetWebViewZoomForScaleFix(reason, hasViewportScaleDrift)');
+    expect(appSource).toContain('const shouldResetWebViewZoom = shouldResetWebViewZoomForScaleFix(reason, hasViewportScaleDrift);');
+    expect(appSource).toContain('if (shouldResetWebViewZoom && !isMaximised)');
+    expect(appSource).toContain('const res = await (window as any).go?.app?.App?.ResetWebViewZoom?.();');
+    expect(appSource).toContain('if (!shouldApplyWindowsScaleFix(reason, hasViewportScaleDrift))');
+    expect(appSource).toContain('const nudgedWidth = getWindowsScaleFixNudgedWidth(width);');
+    expect(appSource).toContain('WindowSetSize(nudgedWidth, height);');
+    expect(appSource).toContain('该异常不一定表现为 viewport ratio drift');
+  });
+
+  it('captures window state on startup and lifecycle events instead of waiting only for the polling interval', () => {
+    expect(appSource).toContain('const scheduleWindowStateSave = (delayMs = 120) => {');
+    expect(appSource).toContain('if (hydrated) {');
+    expect(appSource).toContain('scheduleWindowStateSave(320);');
+    expect(appSource).toContain('const unsubscribeHydration = useStore.persist.onFinishHydration(() => {');
+    expect(appSource).toContain("window.addEventListener('resize', handleWindowRuntimeChange);");
+    expect(appSource).toContain("window.addEventListener('focus', handleWindowRuntimeChange);");
+    expect(appSource).toContain("window.addEventListener('pageshow', handleWindowRuntimeChange);");
+    expect(appSource).toContain("window.addEventListener('pagehide', handleWindowLifecycleFlush, { capture: true });");
+    expect(appSource).toContain("window.addEventListener('beforeunload', handleWindowLifecycleFlush, { capture: true });");
+  });
+
+  it('keeps titlebar double-click on maximise while shortcuts may enter macOS fullscreen', () => {
+    expect(appSource).toContain('const handleTitleBarWindowToggle = async (options?: { allowMacNativeFullscreen?: boolean }) => {');
+    expect(appSource).toContain('const allowMacNativeFullscreen = options?.allowMacNativeFullscreen === true;');
+    expect(appSource).toContain('if (allowMacNativeFullscreen && useNativeMacWindowControls && isMacRuntime) {');
+    expect(appSource).toContain('void handleTitleBarWindowToggle({ allowMacNativeFullscreen: false });');
+    expect(getGlobalShortcutCaseBlock('toggleMacFullscreen')).toContain('handleTitleBarWindowToggle({ allowMacNativeFullscreen: true });');
+  });
+
   it('captures global shortcuts before Monaco/editor defaults consume them', () => {
     expect(appSource).toContain("window.addEventListener('keydown', handleGlobalShortcut, true);");
     expect(appSource).toContain("window.removeEventListener('keydown', handleGlobalShortcut, true);");
   });
 
+  it('skips the native mac titlebar bridge when the current runtime does not expose it', () => {
+    expect(appSource).toContain("const backendApp = (window as any).go?.app?.App;");
+    expect(appSource).toContain("if (typeof backendApp?.SetMacNativeWindowControls !== 'function') {");
+    expect(appSource).toContain('void safeWindowRuntimeCall(() => SetMacNativeWindowControls(useNativeMacWindowControls), undefined);');
+  });
+
   it('listens for command search query-tab events and routes them through handleNewQuery', () => {
     expect(appSource).toContain("window.addEventListener('gonavi:create-query-tab', handleCreateQueryTabEvent as EventListener);");
     expect(appSource).toContain("window.removeEventListener('gonavi:create-query-tab', handleCreateQueryTabEvent as EventListener);");
@@ -228,6 +277,11 @@ describe('global appearance tokens', () => {
     expect(appSource).toContain('buildFontFamilyOptions(runtimePlatform, \'mono\', installedFontFamilies)');
     expect(appSource).toContain('ListInstalledFontFamilies()');
     expect(appSource).toContain('const [installedFontFamilies, setInstalledFontFamilies] = useState<InstalledFontFamily[]>(EMPTY_INSTALLED_FONT_FAMILIES);');
+    expect(appSource).toContain("import LinuxCJKFontBanner from './components/LinuxCJKFontBanner';");
+    expect(appSource).toContain('<LinuxCJKFontBanner');
+    expect(linuxCJKFontBannerSource).toContain('data-gonavi-linux-cjk-font-banner="true"');
+    expect(linuxCJKFontBannerSource).toContain('Linux CJK fonts missing / Ubuntu 中文字体缺失');
+    expect(appSource).toContain('setIsLinuxCJKFontBannerDismissed(true)');
     expect(appSource).toContain('matchFontFamilyOption');
     expect(appSource).toContain('showSearch');
     expect(appSource).toContain('const dataTableFontSizeFollowsGlobal = appearance.dataTableFontSizeFollowGlobal !== false;');
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index ee3f040..3daad4f 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -8,10 +8,13 @@ import ConnectionModal from './components/ConnectionModal';
 import SnippetSettingsModal from './components/SnippetSettingsModal';
 import ConnectionPackagePasswordModal from './components/ConnectionPackagePasswordModal';
 import DataSyncModal from './components/DataSyncModal';
+import { type DataSyncEntryMode } from './components/dataSyncEntryMode';
 import DriverManagerModal from './components/DriverManagerModal';
+import LinuxCJKFontBanner from './components/LinuxCJKFontBanner';
 import LogPanel from './components/LogPanel';
 import AISettingsModal from './components/AISettingsModal';
 import AIChatPanel from './components/AIChatPanel';
+import AIPanelErrorBoundary from './components/ai/AIPanelErrorBoundary';
 import SecurityUpdateBanner from './components/SecurityUpdateBanner';
 import SecurityUpdateIntroModal from './components/SecurityUpdateIntroModal';
 import SecurityUpdateProgressModal from './components/SecurityUpdateProgressModal';
@@ -20,13 +23,24 @@ import LanguageSettingsPanel from './components/LanguageSettingsPanel';
 import { DEFAULT_APPEARANCE, useStore } from './store';
 import { SavedConnection, SecurityUpdateIssue, SecurityUpdateStatus } from './types';
 import { blurToFilter, isMacLikePlatform, normalizeBlurForPlatform, normalizeOpacityForPlatform, isWindowsPlatform, resolveAppearanceValues } from './utils/appearance';
-import { buildFontFamilyOptions, DEFAULT_MONO_FONT_FAMILY, DEFAULT_UI_FONT_FAMILY, matchFontFamilyOption, resolveMonoFontFamily, resolveUIFontFamily, sanitizeFontFamilyInput, type FontFamilyOption, type InstalledFontFamily } from './utils/fontFamilies';
+import { buildFontFamilyOptions, DEFAULT_MONO_FONT_FAMILY, DEFAULT_UI_FONT_FAMILY, getLinuxCJKFontInstallHint, matchFontFamilyOption, resolveMonoFontFamily, resolveUIFontFamily, sanitizeFontFamilyInput, type FontFamilyOption, type InstalledFontFamily } from './utils/fontFamilies';
 import {
   DENSITY_OPTIONS,
   sanitizeDataTableDensity,
   sanitizeDataTableFontSize,
   sanitizeSidebarTreeFontSize,
 } from './utils/dataGridDisplay';
+import {
+  TAB_DISPLAY_SECONDARY_DEFAULT_KEYS,
+  TAB_DISPLAY_ELEMENT_META,
+  applyTabDisplaySettingsPatch,
+  resolveTabDisplayElementOrder,
+  sanitizeTabDisplaySettings,
+  switchTabDisplayLayout,
+  type TabDisplayElementKey,
+  type TabDisplayLayout,
+  type TabDisplaySettings,
+} from './utils/tabDisplay';
 import { getMacNativeTitlebarPaddingLeft, getMacNativeTitlebarPaddingRight, shouldHandleMacNativeFullscreenShortcut, shouldSuppressMacNativeEscapeExit } from './utils/macWindow';
 import { shouldEnableMacWindowDiagnostics } from './utils/macWindowDiagnostics';
 import { resolveAboutDisplayVersion } from './utils/appVersionDisplay';
@@ -45,6 +59,7 @@ import {
   mergeSecurityUpdateStatusWithLegacySource,
   startSecurityUpdateFromBootstrap,
 } from './utils/secureConfigBootstrap';
+import { bootstrapSavedQueries } from './utils/savedQueryPersistence';
 import {
   LEGACY_PERSIST_KEY,
   hasLegacyMigratableSensitiveItems,
@@ -192,48 +207,12 @@ const createClosedConnectionPackageDialogState = (): ConnectionPackageDialogStat
   confirmLoading: false,
 });
 
-interface AIPanelErrorBoundaryProps {
-  children: React.ReactNode;
-  fallback: (error: Error | null) => React.ReactNode;
-  onError?: (error: Error, errorInfo: React.ErrorInfo) => void;
-}
-
-interface AIPanelErrorBoundaryState {
-  hasError: boolean;
-  error: Error | null;
-}
-
-class AIPanelErrorBoundary extends React.Component<
-  AIPanelErrorBoundaryProps,
-  AIPanelErrorBoundaryState
-> {
-  constructor(props: AIPanelErrorBoundaryProps) {
-    super(props);
-    this.state = { hasError: false, error: null };
-  }
-
-  static getDerivedStateFromError(error: Error): AIPanelErrorBoundaryState {
-    return { hasError: true, error };
-  }
-
-  componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
-    this.props.onError?.(error, errorInfo);
-  }
-
-  render() {
-    if (this.state.hasError) {
-      return this.props.fallback(this.state.error);
-    }
-
-    return this.props.children;
-  }
-}
-
 function App() {
   const { language, t } = useI18n();
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isConnectionModalMounted, setIsConnectionModalMounted] = useState(false);
   const [isSyncModalOpen, setIsSyncModalOpen] = useState(false);
+  const [syncModalEntryMode, setSyncModalEntryMode] = useState<DataSyncEntryMode>('sync');
   const [isDriverModalOpen, setIsDriverModalOpen] = useState(false);
   const [editingConnection, setEditingConnection] = useState<SavedConnection | null>(null);
   const connectionModalWarmupDoneRef = useRef(false);
@@ -252,6 +231,7 @@ function App() {
   const setGlobalProxy = useStore(state => state.setGlobalProxy);
   const replaceConnections = useStore(state => state.replaceConnections);
   const replaceGlobalProxy = useStore(state => state.replaceGlobalProxy);
+  const replaceSavedQueries = useStore(state => state.replaceSavedQueries);
   const shortcutOptions = useStore(state => state.shortcutOptions);
   const updateShortcut = useStore(state => state.updateShortcut);
   const resetShortcutOptions = useStore(state => state.resetShortcutOptions);
@@ -276,6 +256,90 @@ function App() {
   const effectiveSidebarTreeFontSize = sidebarTreeFontSizeFollowsGlobal
       ? effectiveFontSize
       : (sanitizeSidebarTreeFontSize(appearance.sidebarTreeFontSize) ?? effectiveFontSize);
+  const tabDisplaySettings = useMemo(
+      () => sanitizeTabDisplaySettings(appearance.tabDisplay),
+      [appearance.tabDisplay],
+  );
+  const tabDisplayElementOrder = useMemo(
+      () => resolveTabDisplayElementOrder(tabDisplaySettings),
+      [tabDisplaySettings],
+  );
+  const visibleTabDisplayElementKeys = useMemo(
+      () => new Set<TabDisplayElementKey>([
+          ...tabDisplaySettings.primaryElements,
+          ...tabDisplaySettings.secondaryElements,
+      ]),
+      [tabDisplaySettings],
+  );
+  const setTabDisplaySettings = useCallback((settings: Partial<TabDisplaySettings>) => {
+      setAppearance({
+          tabDisplay: applyTabDisplaySettingsPatch(tabDisplaySettings, settings),
+      });
+  }, [setAppearance, tabDisplaySettings]);
+  const setTabDisplayLayout = useCallback((layout: TabDisplayLayout) => {
+      if (layout === tabDisplaySettings.layout) return;
+      setAppearance({
+          tabDisplay: switchTabDisplayLayout(tabDisplaySettings, layout),
+      });
+  }, [setAppearance, tabDisplaySettings]);
+  const updateTabDisplayElementVisibility = useCallback((key: TabDisplayElementKey, checked: boolean) => {
+      setFocusedTabDisplayElementKey(key);
+      const removeKey = (keys: TabDisplayElementKey[]) => keys.filter((item) => item !== key);
+      if (!checked) {
+          setTabDisplaySettings({
+              layout: tabDisplaySettings.layout,
+              primaryElements: removeKey(tabDisplaySettings.primaryElements),
+              secondaryElements: removeKey(tabDisplaySettings.secondaryElements),
+          });
+          return;
+      }
+
+      const primaryElements = removeKey(tabDisplaySettings.primaryElements);
+      const secondaryElements = removeKey(tabDisplaySettings.secondaryElements);
+      if (tabDisplaySettings.layout === 'double' && TAB_DISPLAY_SECONDARY_DEFAULT_KEYS.includes(key)) {
+          secondaryElements.push(key);
+      } else {
+          primaryElements.push(key);
+      }
+      setTabDisplaySettings({
+          layout: tabDisplaySettings.layout,
+          primaryElements,
+          secondaryElements,
+      });
+  }, [setTabDisplaySettings, tabDisplaySettings]);
+  const moveTabDisplayElement = useCallback((key: TabDisplayElementKey, offset: -1 | 1) => {
+      setFocusedTabDisplayElementKey(key);
+      const moveWithin = (keys: TabDisplayElementKey[]) => {
+          const index = keys.indexOf(key);
+          if (index < 0) return keys;
+          const nextIndex = index + offset;
+          if (nextIndex < 0 || nextIndex >= keys.length) return keys;
+          const next = [...keys];
+          [next[index], next[nextIndex]] = [next[nextIndex], next[index]];
+          return next;
+      };
+
+      setTabDisplaySettings({
+          layout: tabDisplaySettings.layout,
+          primaryElements: moveWithin(tabDisplaySettings.primaryElements),
+          secondaryElements: moveWithin(tabDisplaySettings.secondaryElements),
+      });
+  }, [setTabDisplaySettings, tabDisplaySettings]);
+  const setTabDisplayElementRow = useCallback((key: TabDisplayElementKey, row: 'primary' | 'secondary') => {
+      setFocusedTabDisplayElementKey(key);
+      const primaryElements = tabDisplaySettings.primaryElements.filter((item) => item !== key);
+      const secondaryElements = tabDisplaySettings.secondaryElements.filter((item) => item !== key);
+      if (row === 'primary') {
+          primaryElements.push(key);
+      } else {
+          secondaryElements.push(key);
+      }
+      setTabDisplaySettings({
+          layout: tabDisplaySettings.layout,
+          primaryElements,
+          secondaryElements,
+      });
+  }, [setTabDisplaySettings, tabDisplaySettings]);
   const resolvedUiFontFamily = resolveUIFontFamily(appearance.customUIFontFamily);
   const resolvedMonoFontFamily = resolveMonoFontFamily(appearance.customMonoFontFamily);
   const appComponentSize: 'small' | 'middle' | 'large' = effectiveUiScale <= 0.92 ? 'small' : (effectiveUiScale >= 1.12 ? 'large' : 'middle');
@@ -301,6 +365,7 @@ function App() {
       () => buildFontFamilyOptions(runtimePlatform, 'mono', installedFontFamilies),
       [installedFontFamilies, runtimePlatform],
   );
+  const linuxCJKFontInstallHint = getLinuxCJKFontInstallHint(runtimePlatform, installedFontFamilies);
   const [isStoreHydrated, setIsStoreHydrated] = useState(() => useStore.persist.hasHydrated());
   const [hasLoadedSecureConfig, setHasLoadedSecureConfig] = useState(false);
   const [viewportWidth, setViewportWidth] = useState(() => (typeof window === 'undefined' ? 1280 : window.innerWidth || 1280));
@@ -315,6 +380,7 @@ function App() {
   const [isSecurityUpdateProgressOpen, setIsSecurityUpdateProgressOpen] = useState(false);
   const [securityUpdateProgressStage, setSecurityUpdateProgressStage] = useState(() => t('app.security_update.stage.checking_saved_config'));
   const [securityUpdateRepairSource, setSecurityUpdateRepairSource] = useState<SecurityUpdateRepairSource | null>(null);
+  const [focusedTabDisplayElementKey, setFocusedTabDisplayElementKey] = useState<TabDisplayElementKey | null>(null);
   const [focusedAIProviderId, setFocusedAIProviderId] = useState<string | undefined>(undefined);
   const [connectionPackageDialog, setConnectionPackageDialog] = useState<ConnectionPackageDialogState>(() => createClosedConnectionPackageDialogState());
   const [pendingConnectionImportPayload, setPendingConnectionImportPayload] = useState<string | null>(null);
@@ -421,6 +487,33 @@ function App() {
       };
   }, [isStoreHydrated]);
 
+  useEffect(() => {
+      if (!isStoreHydrated) {
+          return;
+      }
+
+      let cancelled = false;
+      const loadSavedQueries = async () => {
+          try {
+              await bootstrapSavedQueries({
+                  backend: (window as any).go?.app?.App,
+                  replaceSavedQueries: (queries) => {
+                      if (!cancelled) {
+                          replaceSavedQueries(queries);
+                      }
+                  },
+              });
+          } catch (err) {
+              console.warn('Failed to bootstrap saved queries', err);
+          }
+      };
+
+      void loadSavedQueries();
+      return () => {
+          cancelled = true;
+      };
+  }, [isStoreHydrated, replaceSavedQueries]);
+
   const normalizeSecurityUpdateStatus = useCallback((status?: Partial<SecurityUpdateStatus> | null): SecurityUpdateStatus => {
       const fallback = createEmptySecurityUpdateStatus();
       return {
@@ -698,9 +791,15 @@ function App() {
   // 定时保存窗口状态、尺寸与位置
   useEffect(() => {
       const SAVE_INTERVAL_MS = 2000;
+      let cancelled = false;
+      let hydrated = useStore.persist.hasHydrated();
+      let eventSaveTimer: number | null = null;
       let lastSaved = '';
 
       const saveWindowState = async () => {
+          if (cancelled || !hydrated) {
+              return;
+          }
           try {
               const [isFs, isMax] = await Promise.all([
                   safeWindowRuntimeCall(() => WindowIsFullscreen(), false),
@@ -744,8 +843,67 @@ function App() {
             }
       };
 
-      const timer = window.setInterval(saveWindowState, SAVE_INTERVAL_MS);
-      return () => window.clearInterval(timer);
+      const scheduleWindowStateSave = (delayMs = 120) => {
+          if (cancelled || !hydrated) {
+              return;
+          }
+          if (eventSaveTimer !== null) {
+              window.clearTimeout(eventSaveTimer);
+          }
+          eventSaveTimer = window.setTimeout(() => {
+              eventSaveTimer = null;
+              void saveWindowState();
+          }, delayMs);
+      };
+
+      const handleWindowRuntimeChange = () => {
+          scheduleWindowStateSave();
+      };
+
+      const handleVisibilityChange = () => {
+          if (document.visibilityState === 'visible') {
+              scheduleWindowStateSave(120);
+          }
+      };
+
+      const handleWindowLifecycleFlush = () => {
+          void saveWindowState();
+      };
+
+      if (hydrated) {
+          scheduleWindowStateSave(320);
+      }
+      const unsubscribeHydration = useStore.persist.onFinishHydration(() => {
+          if (cancelled || hydrated) {
+              return;
+          }
+          hydrated = true;
+          scheduleWindowStateSave(320);
+      });
+
+      const timer = window.setInterval(() => {
+          void saveWindowState();
+      }, SAVE_INTERVAL_MS);
+      window.addEventListener('resize', handleWindowRuntimeChange);
+      window.addEventListener('focus', handleWindowRuntimeChange);
+      window.addEventListener('pageshow', handleWindowRuntimeChange);
+      window.addEventListener('pagehide', handleWindowLifecycleFlush, { capture: true });
+      window.addEventListener('beforeunload', handleWindowLifecycleFlush, { capture: true });
+      document.addEventListener('visibilitychange', handleVisibilityChange);
+      return () => {
+          cancelled = true;
+          if (eventSaveTimer !== null) {
+              window.clearTimeout(eventSaveTimer);
+          }
+          window.clearInterval(timer);
+          window.removeEventListener('resize', handleWindowRuntimeChange);
+          window.removeEventListener('focus', handleWindowRuntimeChange);
+          window.removeEventListener('pageshow', handleWindowRuntimeChange);
+          window.removeEventListener('pagehide', handleWindowLifecycleFlush, { capture: true });
+          window.removeEventListener('beforeunload', handleWindowLifecycleFlush, { capture: true });
+          document.removeEventListener('visibilitychange', handleVisibilityChange);
+          unsubscribeHydration();
+      };
   }, []);
 
   useEffect(() => {
@@ -791,15 +949,28 @@ function App() {
                   devicePixelRatio: Number(window.devicePixelRatio) || 1,
                   visualViewportScale: window.visualViewport?.scale,
               });
+              const shouldResetWebViewZoom = shouldResetWebViewZoomForScaleFix(reason, hasViewportScaleDrift);
+
+              if (shouldResetWebViewZoom && !isMaximised) {
+                  try {
+                      const res = await (window as any).go?.app?.App?.ResetWebViewZoom?.();
+                      if (!res?.success) {
+                          console.warn('ResetWebViewZoom unavailable in fixWindowScaleIfNeeded:', res?.message);
+                      }
+                  } catch (e) {
+                      console.warn('ResetWebViewZoom call failed in fixWindowScaleIfNeeded', e);
+                  }
+              }
 
               if (isMaximised) {
                   if (!shouldToggleMaximisedWindowForScaleFix(reason, hasViewportScaleDrift)) {
-                      // restore + drift（任务栏点击恢复后字体异常变大）的零感知修复路径：
+                      // restore（任务栏点击恢复后字体异常变大/变糊）的零感知修复路径：
                       // 调 backend App.ResetWebViewZoom 触发 WebView2 ICoreWebView2Controller::put_ZoomFactor(1.0)，
-                      // 让 WebView2 重算 D2D/DirectWrite 字体度量。完全不动窗口、零动画。
+                      // 让 WebView2 重算 D2D/DirectWrite 字体度量。该异常不一定表现为 viewport ratio drift，
+                      // 所以 restore 场景不能依赖 hasViewportScaleDrift。完全不动窗口、零动画。
                       // backend 失败（wails 升级破坏反射 / 非 Windows）时回退到 dispatch resize 兜底；
                       // 用户仍可按 Ctrl+Shift+0 手动 toggle 修复。
-                      if (shouldResetWebViewZoomForScaleFix(reason, hasViewportScaleDrift)) {
+                      if (shouldResetWebViewZoom) {
                           try {
                               const res = await (window as any).go?.app?.App?.ResetWebViewZoom?.();
                               if (!res?.success) {
@@ -1480,12 +1651,11 @@ function App() {
       if (!isStoreHydrated || !isMacRuntime) {
           return;
       }
-
-      try {
-          void SetMacNativeWindowControls(useNativeMacWindowControls).catch(() => undefined);
-      } catch (e) {
-          console.warn('Wails API: SetMacNativeWindowControls unavailable', e);
+      const backendApp = (window as any).go?.app?.App;
+      if (typeof backendApp?.SetMacNativeWindowControls !== 'function') {
+          return;
       }
+      void safeWindowRuntimeCall(() => SetMacNativeWindowControls(useNativeMacWindowControls), undefined);
   }, [isMacRuntime, isStoreHydrated, useNativeMacWindowControls]);
 
   useEffect(() => {
@@ -2002,7 +2172,7 @@ function App() {
       try {
           setPendingConnectionImportPayload(null);
           const importedViews = await importConnectionsPayload(raw, '');
-          if (importKind === 'mysql-workbench-xml' && importedViews.some(v => !v.hasPrimaryPassword)) {
+          if ((importKind === 'mysql-workbench-xml' || importKind === 'navicat-ncx') && importedViews.some(v => !v.hasPrimaryPassword)) {
               void message.warning(t('app.connection_package.message.imported_with_missing_passwords', { count: importedViews.length }));
           } else {
               void message.success(t('app.connection_package.message.imported_connections', { count: importedViews.length }));
@@ -2139,12 +2309,17 @@ function App() {
   const [isLanguageModalOpen, setIsLanguageModalOpen] = useState(false);
   const [isThemeModalOpen, setIsThemeModalOpen] = useState(false);
   const [themeModalSection, setThemeModalSection] = useState<'theme' | 'appearance'>('theme');
+  const [isLinuxCJKFontBannerDismissed, setIsLinuxCJKFontBannerDismissed] = useState(false);
   const [isAppearanceModalOpen, setIsAppearanceModalOpen] = useState(false);
   const [isShortcutModalOpen, setIsShortcutModalOpen] = useState(false);
   const [isSnippetModalOpen, setIsSnippetModalOpen] = useState(false);
   const [capturingShortcutAction, setCapturingShortcutAction] = useState<ShortcutAction | null>(null);
+  const tabDisplaySettingsPanelRef = useRef<HTMLDivElement | null>(null);
+  const [tabDisplaySettingsFocusRequest, setTabDisplaySettingsFocusRequest] = useState(0);
   useEffect(() => {
-      if (!isThemeModalOpen || themeModalSection !== 'appearance') {
+      const shouldLoadInstalledFonts =
+          runtimePlatform === 'linux' || (isThemeModalOpen && themeModalSection === 'appearance');
+      if (!shouldLoadInstalledFonts) {
           return;
       }
       if (hasLoadedInstalledFontsRef.current || isFontFamiliesLoading) {
@@ -2192,7 +2367,17 @@ function App() {
       return () => {
           cancelled = true;
       };
-  }, [isThemeModalOpen, t, themeModalSection]);
+  }, [isThemeModalOpen, runtimePlatform, t, themeModalSection]);
+
+  useEffect(() => {
+      if (!isThemeModalOpen || themeModalSection !== 'appearance' || tabDisplaySettingsFocusRequest === 0) {
+          return;
+      }
+      const timer = window.setTimeout(() => {
+          tabDisplaySettingsPanelRef.current?.scrollIntoView({ block: 'start', behavior: 'smooth' });
+      }, 80);
+      return () => window.clearTimeout(timer);
+  }, [isThemeModalOpen, themeModalSection, tabDisplaySettingsFocusRequest]);
 
   const shortcutConflictMap = useMemo(() => {
       const map: Partial<Record<ShortcutAction, ConflictInfo[]>> = {};
@@ -2612,7 +2797,8 @@ function App() {
       }
   }, [securityUpdateRepairSource]);
 
-  const handleTitleBarWindowToggle = async () => {
+  const handleTitleBarWindowToggle = async (options?: { allowMacNativeFullscreen?: boolean }) => {
+      const allowMacNativeFullscreen = options?.allowMacNativeFullscreen === true;
       const syncWindowStateFromRuntime = async () => {
           try {
               const [isFullscreen, isMaximised] = await Promise.all([
@@ -2633,7 +2819,7 @@ function App() {
               void emitWindowDiagnostic('action:titlebar-toggle:after-unfullscreen');
               return;
           }
-          if (useNativeMacWindowControls && isMacRuntime) {
+          if (allowMacNativeFullscreen && useNativeMacWindowControls && isMacRuntime) {
               await WindowFullscreen();
               await syncWindowStateFromRuntime();
               void emitWindowDiagnostic('action:titlebar-toggle:after-fullscreen');
@@ -2658,7 +2844,7 @@ function App() {
       if (target?.closest('[data-no-titlebar-toggle="true"]')) {
           return;
       }
-      void handleTitleBarWindowToggle();
+      void handleTitleBarWindowToggle({ allowMacNativeFullscreen: false });
   };
 
   // handleManualResetWindowZoom 由 resetWindowZoom 快捷键（默认 Ctrl+Shift+0）触发，
@@ -2931,6 +3117,19 @@ function App() {
       };
   }, []);
 
+  useEffect(() => {
+      const handleOpenTabDisplaySettingsEvent = () => {
+          setIsSettingsModalOpen(false);
+          setThemeModalSection('appearance');
+          setIsThemeModalOpen(true);
+          setTabDisplaySettingsFocusRequest((current) => current + 1);
+      };
+      window.addEventListener('gonavi:open-tab-display-settings', handleOpenTabDisplaySettingsEvent as EventListener);
+      return () => {
+          window.removeEventListener('gonavi:open-tab-display-settings', handleOpenTabDisplaySettingsEvent as EventListener);
+      };
+  }, []);
+
   useEffect(() => {
       const handleCreateQueryTabEvent = () => {
           handleNewQuery();
@@ -3023,7 +3222,7 @@ function App() {
                   break;
               case 'toggleMacFullscreen':
                   if (isMacRuntime && useNativeMacWindowControls) {
-                      void handleTitleBarWindowToggle();
+                      void handleTitleBarWindowToggle({ allowMacNativeFullscreen: true });
                   }
                   break;
               case 'resetWindowZoom':
@@ -3196,6 +3395,13 @@ function App() {
           </span>
       </div>
   ), [darkMode]);
+  const showLinuxCJKFontBanner = Boolean(
+      linuxCJKFontInstallHint &&
+      hasLoadedInstalledFontsRef.current &&
+      !isFontFamiliesLoading &&
+      !fontFamiliesLoadError &&
+      !isLinuxCJKFontBannerDismissed,
+  );
 
   return (
     <ConfigProvider
@@ -3269,6 +3475,18 @@ function App() {
               )}
           </div>
 
+          {showLinuxCJKFontBanner && (
+              <LinuxCJKFontBanner
+                darkMode={darkMode}
+                installHint={linuxCJKFontInstallHint || ''}
+                onOpenFontSettings={() => {
+                        setThemeModalSection('appearance');
+                        setIsThemeModalOpen(true);
+                }}
+                onDismiss={() => setIsLinuxCJKFontBannerDismissed(true)}
+              />
+          )}
+
           <Layout style={{ flex: 1, minHeight: 0, minWidth: 0 }}>
           <Sider 
             ref={siderRef}
@@ -3607,6 +3825,28 @@ function App() {
                     void handleExportConnections();
                   },
                 },
+                {
+                  key: 'schema-compare',
+                  icon: <AppstoreOutlined />,
+                  title: '表结构比对',
+                  description: '对比源表与目标表结构差异，只预览不执行。',
+                  onClick: () => {
+                    setIsToolsModalOpen(false);
+                    setSyncModalEntryMode('schemaCompare');
+                    setIsSyncModalOpen(true);
+                  },
+                },
+                {
+                  key: 'data-compare',
+                  icon: <SwitcherOutlined />,
+                  title: '数据比对',
+                  description: '按主键分析新增、更新、删除和相同行。',
+                  onClick: () => {
+                    setIsToolsModalOpen(false);
+                    setSyncModalEntryMode('dataCompare');
+                    setIsSyncModalOpen(true);
+                  },
+                },
                 {
                   key: 'sync',
                   icon: <UploadOutlined rotate={90} />,
@@ -3614,6 +3854,7 @@ function App() {
                   description: t('app.tools.entry.sync.description'),
                   onClick: () => {
                     setIsToolsModalOpen(false);
+                    setSyncModalEntryMode('sync');
                     setIsSyncModalOpen(true);
                   },
                 },
@@ -3846,6 +4087,7 @@ function App() {
           <DataSyncModal
             open={isSyncModalOpen}
             onClose={() => setIsSyncModalOpen(false)}
+            entryMode={syncModalEntryMode}
           />
           )}
           {isDriverModalOpen && (
@@ -4165,6 +4407,23 @@ function App() {
                                           {t('app.theme.ui_version.beta_warning')}
                                       </div>
                                   )}
+                                  {appearance.uiVersion === 'v2' && (
+                                      <div style={{ marginTop: 14 }}>
+                                          <div style={{ marginBottom: 8, fontWeight: 500 }}>新版左侧搜索模式</div>
+                                          <Segmented
+                                              block
+                                              options={[
+                                                  { label: '新版命令搜索', value: 'command' },
+                                                  { label: '旧版侧栏筛选', value: 'filter' },
+                                              ]}
+                                              value={appearance.v2SidebarSearchMode ?? 'command'}
+                                              onChange={(value) => setAppearance({ v2SidebarSearchMode: value as 'command' | 'filter' })}
+                                          />
+                                          <div style={{ ...utilityMutedTextStyle, marginTop: 8 }}>
+                                              新版命令搜索适合跳转连接、表和动作，可在面板中开启同步开关持续过滤左侧树；旧版侧栏筛选会直接显示输入框并持久保留筛选内容。
+                                          </div>
+                                      </div>
+                                  )}
                               </div>
                               <div style={utilityPanelStyle}>
                                   <div style={{ marginBottom: 10, fontWeight: 600 }}>{t('app.theme.mode_title')}</div>
@@ -4274,6 +4533,24 @@ function App() {
                                                       ? t('app.theme.font_family.loaded_ui_hint', { count: installedFontFamilies.length })
                                                       : t('app.theme.font_family.loading_ui_hint'))}
                                           </div>
+                                          {linuxCJKFontInstallHint && hasLoadedInstalledFontsRef.current && !isFontFamiliesLoading && !fontFamiliesLoadError && (
+                                              <div
+                                                  style={{
+                                                      marginTop: 8,
+                                                      padding: '9px 10px',
+                                                      borderRadius: 8,
+                                                      border: darkMode ? '1px solid rgba(250,204,21,0.28)' : '1px solid rgba(217,119,6,0.22)',
+                                                      background: darkMode ? 'rgba(250,204,21,0.08)' : 'rgba(251,191,36,0.12)',
+                                                      color: darkMode ? 'rgba(254,249,195,0.92)' : '#92400e',
+                                                      fontSize: 12,
+                                                      lineHeight: 1.7,
+                                                  }}
+                                              >
+                                                  Ubuntu/Linux 未检测到中文 CJK 字体，界面可能显示方框。请安装：
+                                                  <span style={{ fontFamily: 'var(--gn-font-mono)', marginLeft: 6 }}>{linuxCJKFontInstallHint}</span>
+                                                  ，然后重启 GoNavi。
+                                              </div>
+                                          )}
                                       </div>
                                       <div>
                                           <div style={{ marginBottom: 8, fontWeight: 500 }}>{t('app.theme.font_family.mono_title')}</div>
@@ -4308,6 +4585,181 @@ function App() {
                                       </div>
                                   </div>
                               </div>
+                              <div ref={tabDisplaySettingsPanelRef} style={utilityPanelStyle}>
+                                  <div style={{ display: 'flex', alignItems: 'flex-start', justifyContent: 'space-between', gap: 12, marginBottom: 12 }}>
+                                      <div style={{ minWidth: 0 }}>
+                                          <div style={{ fontWeight: 500 }}>Tab 标签展示</div>
+                                          <div style={{ ...utilityMutedTextStyle, marginTop: 4 }}>
+                                              自定义连接名、对象类型、对象名、数据库、Schema 和 Host/IP 的展示顺序；双行模式可把上下文放到副行。
+                                          </div>
+                                      </div>
+                                      <Segmented
+                                          size="small"
+                                          options={[
+                                              { label: '单行', value: 'single' },
+                                              { label: '双行', value: 'double' },
+                                          ]}
+                                          value={tabDisplaySettings.layout}
+                                          onChange={(value) => setTabDisplayLayout(value as TabDisplayLayout)}
+                                      />
+                                  </div>
+                                  <div style={{ display: 'grid', gap: 8 }}>
+                                      {tabDisplayElementOrder.map((key) => {
+                                          const meta = TAB_DISPLAY_ELEMENT_META[key];
+                                          const checked = visibleTabDisplayElementKeys.has(key);
+                                          const row = tabDisplaySettings.secondaryElements.includes(key) ? 'secondary' : 'primary';
+                                          const currentRowElements = row === 'secondary'
+                                              ? tabDisplaySettings.secondaryElements
+                                              : tabDisplaySettings.primaryElements;
+                                          const indexInRow = currentRowElements.indexOf(key);
+                                          const canMoveUp = checked && indexInRow > 0;
+                                          const canMoveDown = checked && indexInRow >= 0 && indexInRow < currentRowElements.length - 1;
+                                          const isFocused = focusedTabDisplayElementKey === key;
+                                          return (
+                                              <div
+                                                  key={key}
+                                                  role="button"
+                                                  tabIndex={0}
+                                                  onClick={() => setFocusedTabDisplayElementKey(key)}
+                                                  onKeyDown={(event) => {
+                                                      if (event.key === 'Enter' || event.key === ' ') {
+                                                          event.preventDefault();
+                                                          setFocusedTabDisplayElementKey(key);
+                                                      }
+                                                  }}
+                                                  style={{
+                                                      display: 'grid',
+                                                      gridTemplateColumns: 'minmax(0, 1fr) auto',
+                                                      gap: 10,
+                                                      alignItems: 'center',
+                                                      padding: '9px 10px',
+                                                      borderRadius: 10,
+                                                      border: `1px solid ${isFocused
+                                                          ? (darkMode ? 'rgba(255,214,102,0.54)' : 'rgba(24,144,255,0.54)')
+                                                          : (darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(16,24,40,0.08)')}`,
+                                                      boxShadow: isFocused
+                                                          ? (darkMode ? '0 0 0 2px rgba(255,214,102,0.14)' : '0 0 0 2px rgba(24,144,255,0.12)')
+                                                          : 'none',
+                                                      background: isFocused
+                                                          ? (darkMode ? 'linear-gradient(90deg, rgba(255,214,102,0.12) 0%, rgba(255,255,255,0.045) 100%)' : 'linear-gradient(90deg, rgba(24,144,255,0.10) 0%, rgba(255,255,255,0.78) 100%)')
+                                                          : checked
+                                                          ? (darkMode ? 'rgba(255,255,255,0.045)' : 'rgba(255,255,255,0.62)')
+                                                          : (darkMode ? 'rgba(255,255,255,0.02)' : 'rgba(16,24,40,0.025)'),
+                                                      cursor: 'pointer',
+                                                      transition: 'border-color 140ms ease, box-shadow 140ms ease, background 140ms ease',
+                                                  }}
+                                              >
+                                                  <div style={{ display: 'flex', alignItems: 'center', gap: 10, minWidth: 0 }}>
+                                                      <span style={{
+                                                          width: 22,
+                                                          height: 22,
+                                                          borderRadius: 999,
+                                                          display: 'inline-flex',
+                                                          alignItems: 'center',
+                                                          justifyContent: 'center',
+                                                          flexShrink: 0,
+                                                          fontFamily: resolvedMonoFontFamily,
+                                                          fontSize: 11,
+                                                          fontWeight: 800,
+                                                          background: isFocused
+                                                              ? (darkMode ? 'rgba(255,214,102,0.22)' : 'rgba(24,144,255,0.14)')
+                                                              : (darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(16,24,40,0.05)'),
+                                                          color: isFocused
+                                                              ? (darkMode ? '#ffd666' : '#1677ff')
+                                                              : (darkMode ? 'rgba(255,255,255,0.56)' : 'rgba(16,24,40,0.5)'),
+                                                      }}>
+                                                          {checked && indexInRow >= 0 ? indexInRow + 1 : '-'}
+                                                      </span>
+                                                      <Switch
+                                                          size="small"
+                                                          checked={checked}
+                                                          onClick={(_, event) => event.stopPropagation()}
+                                                          onChange={(nextChecked) => updateTabDisplayElementVisibility(key, nextChecked)}
+                                                      />
+                                                      <div style={{ minWidth: 0 }}>
+                                                          <div style={{ display: 'flex', alignItems: 'center', gap: 8, minWidth: 0 }}>
+                                                              <span style={{ fontWeight: 600 }}>{meta.label}</span>
+                                                              {isFocused ? (
+                                                                  <span style={{
+                                                                      fontSize: 10,
+                                                                      lineHeight: '16px',
+                                                                      padding: '0 6px',
+                                                                      borderRadius: 999,
+                                                                      background: darkMode ? 'rgba(255,214,102,0.16)' : 'rgba(24,144,255,0.10)',
+                                                                      color: darkMode ? '#ffd666' : '#1677ff',
+                                                                  }}>
+                                                                      当前
+                                                                  </span>
+                                                              ) : null}
+                                                              {checked && tabDisplaySettings.layout === 'double' ? (
+                                                                  <span style={{
+                                                                      fontSize: 10,
+                                                                      lineHeight: '16px',
+                                                                      padding: '0 6px',
+                                                                      borderRadius: 999,
+                                                                      background: row === 'secondary'
+                                                                          ? (darkMode ? 'rgba(56,189,248,0.14)' : 'rgba(2,132,199,0.08)')
+                                                                          : (darkMode ? 'rgba(34,197,94,0.14)' : 'rgba(22,163,74,0.08)'),
+                                                                      color: row === 'secondary'
+                                                                          ? (darkMode ? '#7dd3fc' : '#0369a1')
+                                                                          : (darkMode ? '#86efac' : '#15803d'),
+                                                                  }}>
+                                                                      {row === 'secondary' ? '副行' : '主行'}
+                                                                  </span>
+                                                              ) : null}
+                                                          </div>
+                                                          <div style={{ ...utilityMutedTextStyle, marginTop: 2 }}>{meta.description}</div>
+                                                      </div>
+                                                  </div>
+                                                  <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
+                                                      {tabDisplaySettings.layout === 'double' && checked ? (
+                                                          <Segmented
+                                                              size="small"
+                                                              options={[
+                                                                  { label: '主行', value: 'primary' },
+                                                                  { label: '副行', value: 'secondary' },
+                                                              ]}
+                                                              value={row}
+                                                              onChange={(value) => setTabDisplayElementRow(key, value as 'primary' | 'secondary')}
+                                                              onClick={(event) => event.stopPropagation()}
+                                                          />
+                                                      ) : null}
+                                                      <Button
+                                                          size="small"
+                                                          disabled={!canMoveUp}
+                                                          onClick={(event) => {
+                                                              event.stopPropagation();
+                                                              moveTabDisplayElement(key, -1);
+                                                          }}
+                                                      >
+                                                          上移
+                                                      </Button>
+                                                      <Button
+                                                          size="small"
+                                                          disabled={!canMoveDown}
+                                                          onClick={(event) => {
+                                                              event.stopPropagation();
+                                                              moveTabDisplayElement(key, 1);
+                                                          }}
+                                                      >
+                                                          下移
+                                                      </Button>
+                                                  </div>
+                                              </div>
+                                          );
+                                      })}
+                                  </div>
+                                  <div style={{ ...utilityMutedTextStyle, marginTop: 10 }}>
+                                      当前预览：{tabDisplaySettings.layout === 'double' ? '主行 ' : ''}
+                                      {tabDisplaySettings.primaryElements.map((key) => TAB_DISPLAY_ELEMENT_META[key].label).join(' / ') || '默认标签'}
+                                      {tabDisplaySettings.layout === 'double' && tabDisplaySettings.secondaryElements.length > 0
+                                          ? `，副行 ${tabDisplaySettings.secondaryElements.map((key) => TAB_DISPLAY_ELEMENT_META[key].label).join(' / ')}`
+                                          : ''}
+                                      {focusedTabDisplayElementKey
+                                          ? `；当前选中 ${TAB_DISPLAY_ELEMENT_META[focusedTabDisplayElementKey].label}`
+                                          : ''}
+                                  </div>
+                              </div>
                               <div style={utilityPanelStyle}>
                                   <div style={{ marginBottom: 10, fontWeight: 500 }}>{t('app.theme.appearance.transparency_blur_title')}</div>
                                   <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12, marginBottom: 12 }}>
diff --git a/frontend/src/App.ui-version.test.ts b/frontend/src/App.ui-version.test.ts
index e7e8c0f..26fedf2 100644
--- a/frontend/src/App.ui-version.test.ts
+++ b/frontend/src/App.ui-version.test.ts
@@ -30,6 +30,9 @@ describe('UI version switch placement', () => {
     expect(appSource).toContain("onClick={() => setAppearance({ uiVersion: item.key as 'legacy' | 'v2' })}");
     expect(appSource).toContain('新版 UI 仍在 Beta');
     expect(appSource).toContain('Windows、macOS 与 Linux 均可切换');
+    expect(appSource).toContain('新版左侧搜索模式');
+    expect(appSource).toContain("value={appearance.v2SidebarSearchMode ?? 'command'}");
+    expect(appSource).toContain("setAppearance({ v2SidebarSearchMode: value as 'command' | 'filter' })");
   });
 
   it('uses the card-style v2 switch from the redesign instead of the segmented pill', () => {
@@ -42,6 +45,7 @@ describe('UI version switch placement', () => {
     expect(uiVersionBlock).toContain("label: '旧版 UI'");
     expect(uiVersionBlock).toContain("label: '新版 UI'");
     expect(uiVersionBlock).toContain('CheckOutlined');
-    expect(uiVersionBlock).not.toContain('<Segmented');
+    expect(uiVersionBlock).toContain('新版左侧搜索模式');
+    expect(uiVersionBlock).toContain('<Segmented');
   });
 });
diff --git a/frontend/src/components/AIChatPanel.css b/frontend/src/components/AIChatPanel.css
index f8487da..65d47ae 100644
--- a/frontend/src/components/AIChatPanel.css
+++ b/frontend/src/components/AIChatPanel.css
@@ -305,16 +305,17 @@
     gap: 8px;
     border-radius: 6px;
     border: 1px solid transparent;
-    border-bottom-color: rgba(128, 128, 128, 0.4);
+    border-color: rgba(128, 128, 128, 0.22) !important;
     padding: 6px 10px;
     transition: all 0.2s ease;
-    background: transparent !important;
+    background: rgba(128, 128, 128, 0.03) !important;
     box-shadow: none !important;
 }
 
 .ai-chat-input-wrapper:focus-within {
-    border-color: var(--ant-primary-color, #1677ff) !important;
-    background: rgba(128, 128, 128, 0.05) !important;
+    border-color: rgba(128, 128, 128, 0.28) !important;
+    background: rgba(128, 128, 128, 0.035) !important;
+    box-shadow: none !important;
 }
 
 .ai-chat-input-wrapper textarea {
@@ -336,6 +337,32 @@
     opacity: 0.4;
 }
 
+body[data-ui-version="v2"] .gn-v2-ai-panel .ai-chat-input-wrapper,
+body[data-ui-version="v2"] .gn-v2-ai-panel .ai-chat-input-wrapper:focus-within {
+    border: 0 !important;
+    background: transparent !important;
+    box-shadow: none !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-ai-panel .gn-v2-ai-input-surface,
+body[data-ui-version="v2"] .gn-v2-ai-panel .gn-v2-ai-input-surface:focus-within {
+    border: 0.5px solid var(--gn-br-2) !important;
+    border-radius: 10px !important;
+    background: var(--gn-bg-input) !important;
+    box-shadow: none !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-ai-panel .gn-v2-ai-input-box textarea,
+body[data-ui-version="v2"] .gn-v2-ai-panel .gn-v2-ai-input-box textarea.ant-input:focus,
+body[data-ui-version="v2"] .gn-v2-ai-panel .gn-v2-ai-input-box textarea.ant-input:focus-visible {
+    border: 0 !important;
+    border-radius: 0 !important;
+    outline: none !important;
+    background: transparent !important;
+    box-shadow: none !important;
+    padding: 0 !important;
+}
+
 .ai-chat-send-btn {
     width: 26px;
     height: 26px;
@@ -493,17 +520,26 @@
     left: 50% !important;
     transform: translateX(-50%) !important;
     right: auto !important;
-    width: min(100%, 720px);
-    max-width: calc(100% - 32px);
     z-index: 100;
 }
 
+.ai-chat-panel .ant-message {
+    width: min(100%, 720px);
+    max-width: calc(100% - 32px);
+}
+
+.ai-settings-body .ant-message {
+    width: fit-content;
+    max-width: min(520px, calc(100% - 32px));
+}
+
 .ai-settings-body .ant-message .ant-message-notice {
-    width: 100%;
+    width: auto;
 }
 
 .ai-settings-body .ant-message .ant-message-notice-content {
-    width: 100%;
+    width: fit-content;
+    max-width: 100%;
     white-space: normal;
     word-break: break-word;
     overflow-wrap: anywhere;
diff --git a/frontend/src/components/AIChatPanel.message-boundary.test.tsx b/frontend/src/components/AIChatPanel.message-boundary.test.tsx
index 1d6eacc..9412480 100644
--- a/frontend/src/components/AIChatPanel.message-boundary.test.tsx
+++ b/frontend/src/components/AIChatPanel.message-boundary.test.tsx
@@ -1,1030 +1,66 @@
 import { describe, expect, it } from 'vitest';
 import { readFileSync } from 'node:fs';
 
-import { catalogs } from '../i18n/catalog';
-import { SUPPORTED_LANGUAGES } from '../i18n/resolveLanguage';
-
 const source = readFileSync(new URL('./AIChatPanel.tsx', import.meta.url), 'utf8');
+const testSource = readFileSync(new URL('./AIChatPanel.message-boundary.test.tsx', import.meta.url), 'utf8');
+const boundarySource = readFileSync(new URL('./ai/AIMessageRenderBoundary.tsx', import.meta.url), 'utf8');
+const conversationViewSource = readFileSync(new URL('./ai/AIChatPanelConversationView.tsx', import.meta.url), 'utf8');
 
-const renderErrorKeys = [
-  'ai_chat.panel.render_error.title',
-  'ai_chat.panel.render_error.description',
-  'ai_chat.panel.render_error.unknown',
-  'ai_chat.panel.render_error.retry',
-  'ai_chat.panel.render_error.delete',
-] as const;
+describe('AIChatPanel merge resolution', () => {
+  it('clears conflict markers from the merged files', () => {
+    expect(source).not.toMatch(/^<{7}|^={7}|^>{7}/m);
+    expect(testSource).not.toMatch(/^<{7}|^={7}|^>{7}/m);
+  });
 
-const panelFallbackKeys = [
-  'ai_chat.panel.history.empty',
-  'ai_chat.panel.session.default_title',
-] as const;
+  it('keeps dev split architecture while retaining render-boundary isolation', () => {
+    expect(source).toContain("import AIChatPanelConversationView from './ai/AIChatPanelConversationView';");
+    expect(source).toContain("import { useAIChatRuntimeResources } from './ai/useAIChatRuntimeResources';");
+    expect(source).toContain("import { useAIChatStreamSubscription } from './ai/useAIChatStreamSubscription';");
+    expect(source).toContain("import { useAIChatLocalTools } from './ai/useAIChatLocalTools';");
 
-const composerNoticeKeys = [
-  'ai_chat.composer_notice.missing_provider.title',
-  'ai_chat.composer_notice.missing_provider.description',
-  'ai_chat.composer_notice.missing_model.title',
-  'ai_chat.composer_notice.missing_model.description',
-  'ai_chat.composer_notice.model_fetch_failed.title',
-  'ai_chat.composer_notice.model_fetch_failed.default_description',
-  'ai_chat.composer_notice.model_fetch_failed.detail_description',
-] as const;
-
-const sendLifecycleKeys = [
-  'ai_chat.panel.status.model_connecting',
-  'ai_chat.panel.status.waking_engine',
-  'ai_chat.panel.status.waiting_response',
-  'ai_chat.panel.message.service_not_ready',
-  'ai_chat.panel.message.send_failed',
-] as const;
-
-const toolTransitionAndErrorKeys = [
-  'ai_chat.panel.message.error',
-  'ai_chat.panel.message.empty_response',
-  'ai_chat.panel.message.request_interrupted',
-  'ai_chat.panel.status.summarizing_probe',
-  'ai_chat.panel.status.returning_runtime_data',
-  'ai_chat.panel.status.deep_reasoning',
-  'ai_chat.panel.status.waiting_instruction',
-  'ai_chat.panel.status.analyzing_chain',
-] as const;
-
-const modelControlKeys = [
-  'ai_chat.panel.model_control.force_tool_call',
-  'ai_chat.panel.model_control.continue_after_summary',
-] as const;
-
-const memoryAndSanitizedErrorKeys = [
-  'ai_chat.panel.status.memory_compressing',
-  'ai_chat.panel.status.memory_compress_failed',
-  'ai_chat.panel.status.memory_summary',
-  'ai_chat.panel.status.memory_probe_summary',
-  'ai_chat.panel.error.unknown',
-  'ai_chat.panel.error.http_server',
-  'ai_chat.panel.error.html_response',
-  'ai_chat.panel.error.truncated_suffix',
-] as const;
-
-const memorySummaryPromptKey = 'ai_chat.panel.prompt.memory_summary' as const;
-
-const jvmDiagnosticPromptKey = 'ai_chat.panel.prompt.jvm_diagnostic' as const;
-
-const jvmRuntimePromptKey = 'ai_chat.panel.prompt.jvm_runtime' as const;
-
-const sqlPromptKeys = [
-  'ai_chat.panel.prompt.sql.context_tables',
-  'ai_chat.panel.prompt.sql.current_database',
-  'ai_chat.panel.prompt.sql.no_context',
-  'ai_chat.panel.prompt.sql.no_connections',
-] as const;
-
-const jvmDiagnosticPolicyKeys = [
-  'ai_chat.panel.jvm_diagnostic.policy.read_only',
-  'ai_chat.panel.jvm_diagnostic.policy.plan_first',
-  'ai_chat.panel.jvm_diagnostic.permission.allowed',
-  'ai_chat.panel.jvm_diagnostic.permission.forbidden',
-] as const;
-
-const jvmRuntimePolicyKeys = [
-  'ai_chat.panel.jvm_runtime.policy.read_only',
-  'ai_chat.panel.jvm_runtime.policy.preview_required',
-  'ai_chat.panel.jvm_runtime.resource_path.current',
-  'ai_chat.panel.jvm_runtime.resource_path.missing',
-] as const;
-
-const executeLocalToolWrapperKeys = [
-  'ai_chat.panel.tool_result.columns_exact_fields',
-  'ai_chat.panel.tool_error.connection_not_found',
-  'ai_chat.panel.tool_error.unknown_function',
-  'ai_chat.panel.tool_error.fetch_databases_failed',
-  'ai_chat.panel.tool_error.fetch_tables_failed',
-  'ai_chat.panel.tool_error.fetch_columns_failed',
-  'ai_chat.panel.tool_error.fetch_table_ddl_failed',
-  'ai_chat.panel.tool_error.sql_blocked',
-  'ai_chat.panel.tool_error.sql_execute_failed',
-  'ai_chat.panel.tool_error.sql_execute_exception',
-  'ai_chat.panel.probe.max_rounds',
-  'ai_chat.panel.probe.consecutive_failed',
-] as const;
-
-const localToolSchemaKeys = [
-  'ai_chat.panel.local_tool.get_connections.description',
-  'ai_chat.panel.local_tool.get_databases.description',
-  'ai_chat.panel.local_tool.get_tables.description',
-  'ai_chat.panel.local_tool.get_columns.description',
-  'ai_chat.panel.local_tool.get_table_ddl.description',
-  'ai_chat.panel.local_tool.execute_sql.description',
-  'ai_chat.panel.local_tool.param.connection_id',
-  'ai_chat.panel.local_tool.param.connection_id_from_get_connections',
-  'ai_chat.panel.local_tool.param.db_name',
-  'ai_chat.panel.local_tool.param.table_name',
-  'ai_chat.panel.local_tool.param.sql',
-] as const;
-
-const localToolFunctionNames = [
-  'get_connections',
-  'get_databases',
-  'get_tables',
-  'get_columns',
-  'get_table_ddl',
-  'execute_sql',
-] as const;
-
-const localToolSchemaRawSnippets = [
-  "type: 'function'",
-  "type: 'object'",
-  "type: 'string'",
-  "connectionId: { type: 'string'",
-  "dbName: { type: 'string'",
-  "tableName: { type: 'string'",
-  "sql: { type: 'string'",
-  "required: ['connectionId']",
-  "required: ['connectionId', 'dbName']",
-  "required: ['connectionId', 'dbName', 'tableName']",
-  "required: ['connectionId', 'dbName', 'sql']",
-] as const;
-
-const fixedChineseLocalToolSchemaSnippets = [
-  '当需要查询、操作数据库但用户没有选择任何连接上下文时',
-  '获取指定连接（connectionId）下的所有数据库',
-  '当已经确定了目标连接和数据库名后',
-  '获取指定表的字段列表',
-  '获取指定表的完整建表语句',
-  '在指定连接和数据库上执行 SQL 查询并返回结果',
-  '连接ID',
-  '数据库名',
-  '表名',
-  '要执行的 SQL 语句',
-] as const;
-
-const aiInsightKeys = [
-  'ai_chat.panel.insight.context.linked_title',
-  'ai_chat.panel.insight.context.empty_title',
-  'ai_chat.panel.insight.context.linked_body',
-  'ai_chat.panel.insight.context.empty_body',
-  'ai_chat.panel.insight.context.table_separator',
-  'ai_chat.panel.insight.context.more_tables_suffix',
-  'ai_chat.panel.insight.query.slowest_title',
-  'ai_chat.panel.insight.query.empty_title',
-  'ai_chat.panel.insight.query.empty_body',
-  'ai_chat.panel.insight.status.failed_title',
-  'ai_chat.panel.insight.status.ok_title',
-  'ai_chat.panel.insight.status.recent_body',
-  'ai_chat.panel.insight.status.empty_body',
-  'ai_chat.panel.insight.write.detected_title',
-  'ai_chat.panel.insight.write.readonly_title',
-  'ai_chat.panel.insight.write.detected_body',
-  'ai_chat.panel.insight.write.readonly_body',
-] as const;
-
-const getPlaceholders = (value: string): string[] =>
-  Array.from(value.matchAll(/\{\{([A-Za-z0-9_]+)\}\}/g), (match) => match[1]).sort();
-
-const countOccurrences = (value: string, needle: string): number => value.split(needle).length - 1;
-
-const getStreamSubscriptionEffect = (): string => {
-  const marker = 'EventsOn(eventName, handler);';
-  const markerIndex = source.indexOf(marker);
-  expect(markerIndex).toBeGreaterThan(-1);
-
-  const effectStart = source.lastIndexOf('useEffect(() => {', markerIndex);
-  const depsEnd = source.indexOf(']);', markerIndex);
-  expect(effectStart).toBeGreaterThan(-1);
-  expect(depsEnd).toBeGreaterThan(-1);
-
-  return source.slice(effectStart, depsEnd + 3);
-};
-
-const getStreamSubscriptionDeps = (): string[] => {
-  const effect = getStreamSubscriptionEffect();
-  const match = effect.match(/\}, \[([\s\S]*?)\]\);$/);
-  expect(match).not.toBeNull();
-
-  return (match?.[1] || '')
-    .split(',')
-    .map((part) => part.trim())
-    .filter(Boolean);
-};
-
-const getExecuteLocalToolsCallback = (): string => {
-  const marker = 'const executeLocalTools = useCallback(async';
-  const callbackStart = source.indexOf(marker);
-  expect(callbackStart).toBeGreaterThan(-1);
-
-  const rest = source.slice(callbackStart);
-  const callbackEnd = rest.match(/^    \}, \[([^\]]*)\]\);/m);
-  expect(callbackEnd).not.toBeNull();
-  expect(callbackEnd?.index).toBeDefined();
-
-  return rest.slice(0, (callbackEnd?.index || 0) + (callbackEnd?.[0].length || 0));
-};
-
-const getExecuteLocalToolsDeps = (): string[] => {
-  const callback = getExecuteLocalToolsCallback();
-  const match = callback.match(/\}, \[([^\]]*)\]\);$/);
-  expect(match).not.toBeNull();
-
-  return (match?.[1] || '')
-    .split(',')
-    .map((part) => part.trim())
-    .filter(Boolean);
-};
-
-const getLocalToolsBuilder = (): string => {
-  const marker = 'const buildLocalTools = (translateLocalToolSchema: AIChatTranslator) => [';
-  const builderStart = source.indexOf(marker);
-  expect(builderStart).toBeGreaterThan(-1);
-
-  const builderEnd = source.indexOf('export const AIChatPanel', builderStart);
-  expect(builderEnd).toBeGreaterThan(builderStart);
-
-  return source.slice(builderStart, builderEnd);
-};
-
-const getFetchDynamicModelsCallback = (): string => {
-  const marker = 'const fetchDynamicModels = useCallback(async () => {';
-  const callbackStart = source.indexOf(marker);
-  expect(callbackStart).toBeGreaterThan(-1);
-
-  const rest = source.slice(callbackStart);
-  const callbackEnd = rest.match(/^    \}, \[([^\]]*)\]\);/m);
-  expect(callbackEnd).not.toBeNull();
-  expect(callbackEnd?.index).toBeDefined();
-
-  return rest.slice(0, (callbackEnd?.index || 0) + (callbackEnd?.[0].length || 0));
-};
-
-const getFetchDynamicModelsDeps = (): string[] => {
-  const callback = getFetchDynamicModelsCallback();
-  const match = callback.match(/\}, \[([^\]]*)\]\);$/);
-  expect(match).not.toBeNull();
-
-  return (match?.[1] || '')
-    .split(',')
-    .map((part) => part.trim())
-    .filter(Boolean);
-};
-
-const getAiInsightsMemo = (): string => {
-  const marker = 'const aiInsights = useMemo(() => {';
-  const memoStart = source.indexOf(marker);
-  expect(memoStart).toBeGreaterThan(-1);
-
-  const rest = source.slice(memoStart);
-  const memoEnd = rest.match(/^    \}, \[([^\]]*)\]\);/m);
-  expect(memoEnd).not.toBeNull();
-  expect(memoEnd?.index).toBeDefined();
-
-  return rest.slice(0, (memoEnd?.index || 0) + (memoEnd?.[0].length || 0));
-};
-
-const getAiInsightsDeps = (): string[] => {
-  const memo = getAiInsightsMemo();
-  const match = memo.match(/\}, \[([^\]]*)\]\);$/);
-  expect(match).not.toBeNull();
-
-  return (match?.[1] || '')
-    .split(',')
-    .map((part) => part.trim())
-    .filter(Boolean);
-};
-
-const getBuildSystemContextMessagesCallback = (): string => {
-  const marker = 'const buildSystemContextMessages = useCallback(async';
-  const callbackStart = source.indexOf(marker);
-  expect(callbackStart).toBeGreaterThan(-1);
-
-  const rest = source.slice(callbackStart);
-  const callbackEnd = rest.match(/^    \}, \[\]\);/m);
-  expect(callbackEnd).not.toBeNull();
-  expect(callbackEnd?.index).toBeDefined();
-
-  return rest.slice(0, (callbackEnd?.index || 0) + (callbackEnd?.[0].length || 0));
-};
-
-const getBuildSystemContextMessagesDeps = (): string[] => {
-  const callback = getBuildSystemContextMessagesCallback();
-  const match = callback.match(/\}, \[([^\]]*)\]\);$/);
-  expect(match).not.toBeNull();
-
-  return (match?.[1] || '')
-    .split(',')
-    .map((part) => part.trim())
-    .filter(Boolean);
-};
-
-describe('AIChatPanel message render isolation', () => {
-  it('keeps per-message render failures scoped to the broken bubble', () => {
-    expect(source).toContain('class AIMessageRenderBoundary extends React.Component');
-    expect(source).toContain('[AI Message Render Error]');
+    expect(boundarySource).toContain('class AIMessageRenderBoundary extends React.Component');
+    expect(conversationViewSource).toContain("import AIMessageRenderBoundary from './AIMessageRenderBoundary';");
+    expect(conversationViewSource).toContain('<AIMessageRenderBoundary');
+    expect(source).toContain('onMessageRenderError={handleMessageRenderError}');
     expect(source).toContain('__gonaviLastAIMessageRenderError');
-    expect(source).toContain('<AIMessageRenderBoundary');
-    expect(source).toContain('onDeleteMessage={handleDeleteMessage}');
+    expect(source).toContain('[AI Message Render Error]');
   });
 
-  it('uses i18n keys for fixed render-boundary chrome while preserving raw error detail', () => {
-    for (const key of renderErrorKeys) {
-      expect(source).toContain(key);
-    }
-
-    expect(source).toContain('translateRenderError={t}');
-    expect(source).toContain("this.state.error?.message || translateRenderError('ai_chat.panel.render_error.unknown')");
-
-    expect(source).not.toContain('这条 AI 消息渲染失败，已自动隔离');
-    expect(source).not.toContain('其余对话仍可继续使用。你可以先删除这条异常消息，再继续操作。');
-    expect(source).not.toContain('未知渲染错误');
-    expect(source).not.toContain('重试渲染');
-    expect(source).not.toContain('删除这条消息');
-  });
-
-  it('keeps render-boundary catalog keys present and placeholder-free in every language', () => {
-    for (const language of SUPPORTED_LANGUAGES) {
-      for (const key of renderErrorKeys) {
-        expect(catalogs[language]).toHaveProperty(key);
-        expect(catalogs[language][key]).toBeTruthy();
-        expect(getPlaceholders(catalogs[language][key])).toEqual([]);
-      }
-    }
-  });
-
-  it('uses i18n fallback text for V2 history and default session titles', () => {
-    expect(source).toContain("t('ai_chat.panel.history.empty')");
-    expect(source).toContain("session.title || t('ai_chat.panel.session.default_title')");
-    expect(source).toContain("?.title || t('ai_chat.panel.session.default_title')");
-    expect(countOccurrences(source, "t('ai_chat.panel.history.empty')")).toBe(1);
-    expect(countOccurrences(source, "t('ai_chat.panel.session.default_title')")).toBe(2);
-
-    expect(source).not.toContain('暂无历史会话');
-    expect(source).not.toContain("session.title || '新对话'");
-    expect(source).not.toContain("?.title || '新对话'");
-  });
-
-  it('keeps panel fallback catalog keys present and placeholder-free in every language', () => {
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      for (const key of panelFallbackKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual([]);
-      }
-    }
-  });
-
-  it('keeps raw session titles untranslated while localizing only empty-title fallback', () => {
-    expect(source).toContain("session.title || t('ai_chat.panel.session.default_title')");
-    expect(source).not.toContain('t(session.title');
-    expect(source).not.toContain('t(currentSession');
-  });
-
-  it('uses i18n keys for send lifecycle chrome while preserving raw send details', () => {
-    for (const key of sendLifecycleKeys) {
-      expect(source).toContain(key);
-    }
-
-    expect(source).toContain("t('ai_chat.panel.message.send_failed', { detail: cleanE })");
-    expect(source).toContain("t('ai_chat.panel.message.send_failed', { detail: cleanE2 })");
-    expect(source).not.toContain('t(cleanE');
-    expect(source).not.toContain('t(cleanE2');
-    expect(source).not.toContain('t(rawE');
-    expect(source).not.toContain('t(rawE2');
-
-    expect(source).not.toContain('等待模型响应');
-    expect(source).not.toContain('❌ 发送失败:');
-  });
-
-  it('keeps send-failed wrapper catalog placeholder limited to detail in every language', () => {
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      expect(catalog).toHaveProperty('ai_chat.panel.message.send_failed');
-      expect(catalog['ai_chat.panel.message.send_failed']).toBeTruthy();
-      expect(getPlaceholders(catalog['ai_chat.panel.message.send_failed'])).toEqual(['detail']);
-    }
-  });
-
-  it('uses i18n keys for tool transition and generic error chrome while preserving raw details', () => {
-    for (const key of toolTransitionAndErrorKeys) {
-      expect(source).toContain(key);
-    }
-
-    expect(source).toContain("t('ai_chat.panel.message.error', { detail: cleanErr })");
-    expect(source).not.toContain('t(cleanErr');
-    expect(source).not.toContain('t(rawErr');
-
-    expect(source).not.toContain('❌ 错误: ${cleanErr}');
-    expect(source).not.toContain('❌ 模型未能成功响应任何内容，可能遭遇频控、上下文超载或理解拒绝。');
-    expect(source).not.toContain('❌ 请求中断：未收到任何具体回复。');
-    expect(source).not.toContain('汇总探针执行结果中');
-    expect(source).not.toContain('向模型回传运行时数据');
-    expect(source).not.toContain('模型大脑深度推理中');
-    expect(source).not.toContain('等待下发操作指令');
-    expect(source).not.toContain('正在深度思考链路与逻辑');
-  });
-
-  it('keeps generic error wrapper catalog placeholder limited to detail in every language', () => {
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      expect(catalog).toHaveProperty('ai_chat.panel.message.error');
-      expect(catalog['ai_chat.panel.message.error']).toBeTruthy();
-      expect(getPlaceholders(catalog['ai_chat.panel.message.error'])).toEqual(['detail']);
-    }
-  });
-
-  it('uses i18n keys for model-control prompt wrappers', () => {
-    const streamSubscriptionEffect = getStreamSubscriptionEffect();
-    const executeLocalToolsCallback = getExecuteLocalToolsCallback();
-
-    expect(streamSubscriptionEffect).toContain("content: tRef.current('ai_chat.panel.model_control.force_tool_call')");
-    expect(executeLocalToolsCallback).toContain(
-      "content: translateToolChrome('ai_chat.panel.model_control.continue_after_summary')",
-    );
-  });
-
-  it('does not keep fixed Chinese model-control prompt wrappers in code', () => {
-    expect(source).not.toContain('请直接使用 function call 调用工具执行操作，不要只用文字描述计划。');
-    expect(source).not.toContain('请根据上述最新状态与探索结果，继续完成你先前未竟的分析或执行下一步。');
-  });
-
-  it('keeps model-control catalog keys present and placeholder-free in every language', () => {
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      for (const key of modelControlKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual([]);
-      }
-    }
-  });
-
-  it('uses i18n keys for executeLocalTools fixed wrappers while preserving raw tool details', () => {
-    for (const key of executeLocalToolWrapperKeys) {
-      expect(source).toContain(key);
-    }
-
-    expect(source).toContain("translateToolChrome('ai_chat.panel.probe.max_rounds', { count: MAX_TOOL_CALL_ROUNDS })");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.probe.consecutive_failed')");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.tool_error.connection_not_found')");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.tool_error.unknown_function', { functionName: tc.function.name })");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.tool_error.fetch_databases_failed', { detail: String(e?.message || e) })");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.tool_error.fetch_tables_failed', { detail: String(e?.message || e) })");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.tool_error.fetch_columns_failed', { detail: String(e?.message || e) })");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.tool_result.columns_exact_fields', { tableName: safeTable, fieldNames, detailJson: JSON.stringify(cols) })");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.tool_error.fetch_table_ddl_failed', { detail: String(e?.message || e) })");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.tool_error.sql_blocked', { operationType: check.operationType })");
-    expect(source).toContain("qRes?.message || translateToolChrome('ai_chat.panel.tool_error.sql_execute_failed')");
-    expect(source).toContain("translateToolChrome('ai_chat.panel.tool_error.sql_execute_exception', { detail: String(e?.message || e) })");
-
-    expect(source).not.toContain('t(qRes?.message');
-    expect(source).not.toContain('t(safeSql');
-    expect(source).not.toContain('t(safeDbName');
-    expect(source).not.toContain('t(safeTable');
-    expect(source).not.toContain('t(toolResult.content');
-    expect(source).not.toContain('t(fieldNames');
-    expect(source).not.toContain('t(JSON.stringify(cols)');
-
-    expect(source).not.toContain('以下为 ${safeTable} 表的真实字段列表');
-    expect(source).not.toContain('可用字段：${fieldNames}');
-    expect(source).not.toContain('详细信息：${JSON.stringify(cols)}');
-    expect(source).not.toContain('`⚠️ 工具调用已达 ${MAX_TOOL_CALL_ROUNDS} 轮上限，自动终止循环。如需继续探索，请发送新的消息。`');
-    expect(source).not.toContain('`获取数据库列表失败: ${e?.message || e}`');
-    expect(source).not.toContain('`获取表列表失败: ${e?.message || e}`');
-    expect(source).not.toContain('`获取字段列表失败: ${e?.message || e}`');
-    expect(source).not.toContain('`获取建表语句失败: ${e?.message || e}`');
-    expect(source).not.toContain('`安全策略拦截：当前安全级别不允许执行 ${check.operationType} 类型的 SQL。请将 SQL 展示给用户，让用户手动执行。`');
-    expect(source).not.toContain("'SQL 执行失败'");
-    expect(source).not.toContain('`SQL 执行异常: ${e?.message || e}`');
-    expect(source).not.toContain("'⚠️ 探针连续 3 轮执行失败，自动终止。请检查连接状态后重试。'");
-    expect(source).not.toContain("'Connection not found'");
-    expect(source).not.toContain('`Unknown function: ${tc.function.name}`');
-  });
-
-  it('keeps executeLocalTools wrapper catalog placeholders exact in every language', () => {
-    const placeholderExpectations: Record<(typeof executeLocalToolWrapperKeys)[number], string[]> = {
-      'ai_chat.panel.tool_result.columns_exact_fields': ['detailJson', 'fieldNames', 'tableName'],
-      'ai_chat.panel.tool_error.connection_not_found': [],
-      'ai_chat.panel.tool_error.unknown_function': ['functionName'],
-      'ai_chat.panel.tool_error.fetch_databases_failed': ['detail'],
-      'ai_chat.panel.tool_error.fetch_tables_failed': ['detail'],
-      'ai_chat.panel.tool_error.fetch_columns_failed': ['detail'],
-      'ai_chat.panel.tool_error.fetch_table_ddl_failed': ['detail'],
-      'ai_chat.panel.tool_error.sql_blocked': ['operationType'],
-      'ai_chat.panel.tool_error.sql_execute_failed': [],
-      'ai_chat.panel.tool_error.sql_execute_exception': ['detail'],
-      'ai_chat.panel.probe.max_rounds': ['count'],
-      'ai_chat.panel.probe.consecutive_failed': [],
-    };
-
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      for (const key of executeLocalToolWrapperKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual(placeholderExpectations[key]);
-      }
-    }
-  });
-
-  it('uses the current translator inside executeLocalTools without depending on stale t closures', () => {
-    const callback = getExecuteLocalToolsCallback();
-    const deps = getExecuteLocalToolsDeps();
-
-    expect(callback).toContain('const translateToolChrome: AIChatTranslator = (key, params) => tRef.current(key, params);');
-    expect(callback).not.toContain('const translateToolChrome = tRef.current;');
-    expect(deps).not.toContain('t');
-    expect(callback).not.toMatch(/\bt\(/);
-
-    for (const key of executeLocalToolWrapperKeys) {
-      expect(callback).toContain(`translateToolChrome('${key}'`);
-    }
-  });
-
-  it('builds LOCAL_TOOLS schema descriptions from the current translator while preserving raw schema identifiers', () => {
-    const builder = getLocalToolsBuilder();
-
-    expect(source).toContain('const getLocalTools = useCallback(() => buildLocalTools(tRef.current), []);');
-    expect(source).toContain('AIChatStream(sid, allMsg, getLocalTools())');
-    expect(source).toContain('AIChatStream(sid, allMessages, getLocalTools())');
-    expect(source).toContain('AIChatSend(allMessages, getLocalTools())');
-    expect(source).toContain('const chainTools = totalToolRoundRef.current >= SOFT_LIMIT_ROUNDS ? [] : getLocalTools();');
-    expect(source).not.toContain('LOCAL_TOOLS');
-
-    for (const key of localToolSchemaKeys) {
-      expect(builder).toContain(`translateLocalToolSchema('${key}')`);
-    }
-
-    for (const functionName of localToolFunctionNames) {
-      expect(builder).toContain(`name: '${functionName}'`);
-    }
-
-    for (const rawSnippet of localToolSchemaRawSnippets) {
-      expect(builder).toContain(rawSnippet);
-    }
-
-    for (const fixedChineseSnippet of fixedChineseLocalToolSchemaSnippets) {
-      expect(builder).not.toContain(fixedChineseSnippet);
-    }
-  });
-
-  it('keeps local tool schema catalog entries placeholder-free in every language', () => {
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      for (const key of localToolSchemaKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual([]);
-      }
-    }
-  });
-
-  it('uses i18n composer notices while preserving raw model-fetch failure detail', () => {
-    const callback = getFetchDynamicModelsCallback();
-    const deps = getFetchDynamicModelsDeps();
-
-    expect(source).toContain('AIComposerNoticeDescriptor');
-    expect(source).toContain(
-      'const [composerNoticeState, setComposerNoticeState] = useState<AIComposerNoticeDescriptor | null>(null);',
-    );
-    expect(source).toContain(
-      'const composerNotice = useMemo(() => buildAIComposerNotice(t, composerNoticeState), [composerNoticeState, t]);',
-    );
+  it('restores panel-level i18n orchestration for composer notices and send lifecycle text', () => {
+    expect(source).toContain("import { useI18n } from '../i18n/provider';");
+    expect(source).toContain("import type { AIComposerNoticeDescriptor } from '../utils/aiComposerNotice';");
+    expect(source).toContain("import { buildAIComposerNotice } from '../utils/aiComposerNotice';");
+    expect(source).toContain("const { t } = useI18n();");
+    expect(source).toContain("const [composerNoticeState, setComposerNoticeState] = useState<AIComposerNoticeDescriptor | null>(null);");
+    expect(source).toContain("buildAIComposerNotice(t, composerNoticeState) ?? runtimeComposerNotice");
     expect(source).toContain("setComposerNoticeState({ kind: 'missing_provider' });");
+    expect(source).toContain("setComposerNoticeState({ kind: 'provider_incomplete', issues: readiness.issues });");
     expect(source).toContain("setComposerNoticeState({ kind: 'missing_model' });");
-    expect(callback).toContain("setComposerNoticeState({ kind: 'model_fetch_failed', detail: result.error });");
-    expect(callback).toContain("const detail = e?.message || String(e || '');");
-    expect(callback).toContain("setComposerNoticeState({ kind: 'model_fetch_failed', detail });");
-    expect(deps).not.toContain('t');
-
-    expect(source).not.toContain('setComposerNotice(buildMissingProviderNotice(t));');
-    expect(source).not.toContain('setComposerNotice(buildMissingModelNotice(t));');
-    expect(callback).not.toContain('buildModelFetchFailedNotice(t');
-    expect(callback).not.toMatch(/\bt\(/);
-    expect(source).not.toContain('setComposerNotice(buildMissingProviderNotice());');
-    expect(source).not.toContain('setComposerNotice(buildMissingModelNotice());');
-    expect(source).not.toContain("buildModelFetchFailedNotice('获取模型列表失败：'");
-  });
-
-  it('keeps composer notice catalog placeholders exact in every language', () => {
-    const placeholderExpectations: Record<(typeof composerNoticeKeys)[number], string[]> = {
-      'ai_chat.composer_notice.missing_provider.title': [],
-      'ai_chat.composer_notice.missing_provider.description': [],
-      'ai_chat.composer_notice.missing_model.title': [],
-      'ai_chat.composer_notice.missing_model.description': [],
-      'ai_chat.composer_notice.model_fetch_failed.title': [],
-      'ai_chat.composer_notice.model_fetch_failed.default_description': [],
-      'ai_chat.composer_notice.model_fetch_failed.detail_description': ['detail'],
-    };
-
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      for (const key of composerNoticeKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual(placeholderExpectations[key]);
-      }
-    }
-  });
-
-  it('uses i18n keys for AI insight chrome while preserving raw insight data', () => {
-    const memo = getAiInsightsMemo();
-    const deps = getAiInsightsDeps();
-
-    for (const key of aiInsightKeys) {
-      expect(memo).toContain(key);
-    }
-
-    expect(memo).toContain('slowest.sql.slice(0, 140)');
-    expect(memo).toContain('errors[0]?.message ||');
-    expect(deps).toContain('t');
-
-    expect(source).not.toContain('已关联 ${contextCount} 张表');
-    expect(source).not.toContain('尚未关联表结构');
-    expect(source).not.toContain('当前对话会带上 ');
-    expect(source).not.toContain(' 的结构上下文。');
-    expect(source).not.toContain('在表页打开 AI 后会自动关联当前表，也可以在输入框上方手动添加上下文。');
-    expect(source).not.toContain('最近最慢查询 ${Math.round(slowest.duration).toLocaleString()}ms');
-    expect(source).not.toContain('暂无查询耗时样本');
-    expect(source).not.toContain('执行查询后这里会显示可用于优化分析的 SQL 线索。');
-    expect(source).not.toContain('${errors.length} 条最近查询失败');
-    expect(source).not.toContain('最近查询状态正常');
-    expect(source).not.toContain('已记录 ${recentLogs.length} 条最近 SQL，可直接让 AI 解释或优化。');
-    expect(source).not.toContain('暂无 SQL 日志。');
-    expect(source).not.toContain('检测到 ${writeCount} 条写操作');
-    expect(source).not.toContain('当前以只读分析为主');
-    expect(source).not.toContain('涉及写入的 SQL 建议先生成预览与回滚语句，再执行提交。');
-    expect(source).not.toContain('AI 默认优先解释、生成 SELECT、分析 Schema 与优化索引。');
-  });
-
-  it('keeps AI insight catalog placeholders exact in every language', () => {
-    const placeholderExpectations: Record<(typeof aiInsightKeys)[number], string[]> = {
-      'ai_chat.panel.insight.context.linked_title': ['count'],
-      'ai_chat.panel.insight.context.empty_title': [],
-      'ai_chat.panel.insight.context.linked_body': ['tables'],
-      'ai_chat.panel.insight.context.empty_body': [],
-      'ai_chat.panel.insight.context.table_separator': [],
-      'ai_chat.panel.insight.context.more_tables_suffix': [],
-      'ai_chat.panel.insight.query.slowest_title': ['duration'],
-      'ai_chat.panel.insight.query.empty_title': [],
-      'ai_chat.panel.insight.query.empty_body': [],
-      'ai_chat.panel.insight.status.failed_title': ['count'],
-      'ai_chat.panel.insight.status.ok_title': [],
-      'ai_chat.panel.insight.status.recent_body': ['count'],
-      'ai_chat.panel.insight.status.empty_body': [],
-      'ai_chat.panel.insight.write.detected_title': ['count'],
-      'ai_chat.panel.insight.write.readonly_title': [],
-      'ai_chat.panel.insight.write.detected_body': [],
-      'ai_chat.panel.insight.write.readonly_body': [],
-    };
-
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      for (const key of aiInsightKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual(placeholderExpectations[key]);
-      }
-    }
-  });
-
-  it('keeps stream subscription stable when the UI translator changes', () => {
-    const effect = getStreamSubscriptionEffect();
-    const effectWithoutTranslatorRefCalls = effect.replace(/tRef\.current\(/g, '');
-    const deps = getStreamSubscriptionDeps();
-
-    expect(deps).toContain('addAIChatMessage');
-    expect(deps).toContain('updateAIChatMessage');
-    expect(deps).toContain('sid');
-    expect(deps).not.toContain('t');
 
     for (const key of [
-      'ai_chat.panel.message.error',
-      'ai_chat.panel.message.empty_response',
-      'ai_chat.panel.message.request_interrupted',
+      'ai_chat.panel.status.model_connecting',
+      'ai_chat.panel.status.waking_engine',
+      'ai_chat.panel.status.waiting_response',
+      'ai_chat.panel.status.memory_summary',
+      'ai_chat.panel.message.service_not_ready',
     ]) {
-      expect(effect).toContain(`tRef.current('${key}'`);
-      expect(effectWithoutTranslatorRefCalls).not.toContain(`t('${key}'`);
-    }
-  });
-
-  it('uses i18n keys for memory compression chrome while preserving generated summaries as raw detail', () => {
-    for (const key of memoryAndSanitizedErrorKeys) {
-      expect(source).toContain(key);
+      expect(source).toContain(`t('${key}'`);
     }
 
-    expect(source).toContain("content: t('ai_chat.panel.status.memory_compressing')");
-    expect(source).toContain("content: t('ai_chat.panel.status.memory_compress_failed')");
-    expect(source).toContain("content: t('ai_chat.panel.status.memory_summary', { summary })");
-    expect(source).toContain("content: translateToolChrome('ai_chat.panel.status.memory_probe_summary', { summary })");
-    expect(source).not.toContain('t(summary');
-
-    expect(source).not.toContain('对话已超载，正在启动记忆压缩');
-    expect(source).not.toContain('记忆压缩失败，将尝试原样接续');
-    expect(source).not.toContain('【自动记忆重塑】已将超长历史压缩为摘要');
-    expect(source).not.toContain('【自动记忆重塑】已将超长历史探针数据和对话压缩为摘要');
+    expect(source).not.toContain('buildMissingProviderNotice');
+    expect(source).not.toContain('buildIncompleteProviderNotice');
+    expect(source).not.toContain('buildMissingModelNotice');
   });
 
-  it('uses the memory-summary prompt catalog key instead of a fixed source prompt', () => {
-    expect(source).toContain(`t('${memorySummaryPromptKey}')`);
-
-    expect(source).not.toContain('这是一段超长对话的历史记录。为了释放上下文空间同时保留你的记忆核心');
-    expect(source).not.toContain('技术事实、已探索出的数据结构状态、用户的中心诉求、当前进展');
-    expect(source).not.toContain('剔除无效执行过程、客套话、JSON返回值本身。');
-    expect(source).not.toContain('请控制在 1000-2000 字左右，输出纯干货 Markdown。');
-  });
-
-  it('keeps the memory-summary prompt catalog entry placeholder-free in every language', () => {
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      expect(catalog).toHaveProperty(memorySummaryPromptKey);
-      expect(catalog[memorySummaryPromptKey]).toBeTruthy();
-      expect(getPlaceholders(catalog[memorySummaryPromptKey])).toEqual([]);
-    }
-  });
-
-  it('uses the JVM diagnostic prompt catalog key while preserving raw diagnostic context values', () => {
-    const callback = getBuildSystemContextMessagesCallback();
-    const callbackWithoutTranslatorRefCalls = callback.replace(/tRef\.current\(/g, '');
-    const deps = getBuildSystemContextMessagesDeps();
-
-    expect(source).toContain(`const jvmDiagnosticPromptKey = '${jvmDiagnosticPromptKey}' as const;`);
-    expect(callback).toContain('content: tRef.current(jvmDiagnosticPromptKey, {');
-    expect(callback).toContain('connectionName: activeConnection.name');
-    expect(callback).toContain("host: activeConnection.config.host || '-'");
-    expect(callback).toContain('transport: diagnosticTransport');
-    expect(callback).toContain('environment');
-    expect(callback).toContain(
-      "readOnlyPolicy: tRef.current(readOnly ? 'ai_chat.panel.jvm_diagnostic.policy.read_only' : 'ai_chat.panel.jvm_diagnostic.policy.plan_first')",
-    );
-    expect(callback).toContain(
-      "observePolicy: tRef.current(diagnostic?.allowObserveCommands !== false ? 'ai_chat.panel.jvm_diagnostic.permission.allowed' : 'ai_chat.panel.jvm_diagnostic.permission.forbidden')",
-    );
-    expect(callback).toContain(
-      "tracePolicy: tRef.current(diagnostic?.allowTraceCommands === true ? 'ai_chat.panel.jvm_diagnostic.permission.allowed' : 'ai_chat.panel.jvm_diagnostic.permission.forbidden')",
-    );
-    expect(callback).toContain(
-      "mutatingPolicy: tRef.current(diagnostic?.allowMutatingCommands === true ? 'ai_chat.panel.jvm_diagnostic.permission.allowed' : 'ai_chat.panel.jvm_diagnostic.permission.forbidden')",
-    );
-    expect(deps).not.toContain('t');
-    expect(callbackWithoutTranslatorRefCalls).not.toMatch(/content:\s*t\(jvmDiagnosticPromptKey,\s*\{/);
-    expect(callbackWithoutTranslatorRefCalls).not.toMatch(/\bt\(/);
-
-    expect(source).not.toContain('你是 GoNavi 的 JVM 诊断助手');
-    expect(source).not.toContain('当前页签是 Arthas 兼容诊断工作台');
-    expect(source).not.toContain('回答规则：\n1. 可以先给一小段分析');
-    expect(source).not.toContain('命令权限：observe=');
-    expect(source).not.toContain('JSON 字段严格限定为 intent、transport、command、riskLevel、reason、expectedSignals');
-    expect(source).not.toContain('t(activeConnection.name');
-    expect(source).not.toContain('t(activeConnection.config.host');
-    expect(source).not.toContain('t(diagnosticTransport');
-    expect(source).not.toContain('t(environment');
-  });
-
-  it('keeps the JVM diagnostic prompt placeholders exact and preserves raw plan identifiers in every language', () => {
-    const expectedPromptPlaceholders = [
-      'connectionName',
-      'environment',
-      'host',
-      'mutatingPolicy',
-      'observePolicy',
-      'readOnlyPolicy',
-      'tracePolicy',
-      'transport',
-    ];
-    const rawPromptIdentifiers = [
-      'GoNavi',
-      'JVM',
-      'Arthas',
-      'JSON',
-      'intent',
-      'transport',
-      'command',
-      'riskLevel',
-      'reason',
-      'expectedSignals',
-      'low',
-      'medium',
-      'high',
-      'observe',
-      'trace',
-      'mutating',
-    ];
-
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      expect(catalog).toHaveProperty(jvmDiagnosticPromptKey);
-      expect(catalog[jvmDiagnosticPromptKey]).toBeTruthy();
-      expect(getPlaceholders(catalog[jvmDiagnosticPromptKey])).toEqual(expectedPromptPlaceholders);
-
-      for (const rawIdentifier of rawPromptIdentifiers) {
-        expect(catalog[jvmDiagnosticPromptKey]).toContain(rawIdentifier);
-      }
-
-      for (const key of jvmDiagnosticPolicyKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual([]);
-      }
-    }
-  });
-
-  it('uses the JVM runtime prompt catalog key while preserving raw runtime context values', () => {
-    const callback = getBuildSystemContextMessagesCallback();
-    const callbackWithoutTranslatorRefCalls = callback.replace(/tRef\.current\(/g, '');
-    const deps = getBuildSystemContextMessagesDeps();
-
-    expect(source).toContain(`const jvmRuntimePromptKey = '${jvmRuntimePromptKey}' as const;`);
-    expect(callback).toContain('content: tRef.current(jvmRuntimePromptKey, {');
-    expect(callback).toContain('connectionName: activeConnection.name');
-    expect(callback).toContain("host: activeConnection.config.host || '-'");
-    expect(callback).toContain('providerMode');
-    expect(callback).toContain('environment');
-    expect(callback).toContain(
-      "connectionPolicy: tRef.current(readOnly ? 'ai_chat.panel.jvm_runtime.policy.read_only' : 'ai_chat.panel.jvm_runtime.policy.preview_required')",
-    );
-    expect(callback).toContain(
-      "resourcePathStatus: tRef.current(resourcePath ? 'ai_chat.panel.jvm_runtime.resource_path.current' : 'ai_chat.panel.jvm_runtime.resource_path.missing', { resourcePath })",
-    );
-    expect(deps).not.toContain('t');
-    expect(callbackWithoutTranslatorRefCalls).not.toMatch(/content:\s*t\(jvmRuntimePromptKey,\s*\{/);
-    expect(callbackWithoutTranslatorRefCalls).not.toMatch(/\bt\(/);
-
-    expect(source).not.toContain('你是 GoNavi 的 JVM 运行时分析助手');
-    expect(source).not.toContain('当前上下文不是 SQL，而是 JVM 资源工作台');
-    expect(source).not.toContain('JSON 字段严格限定为 targetType、selector、action、payload、reason');
-    expect(source).not.toContain('selector.resourcePath 优先使用当前资源路径');
-    expect(source).not.toContain('不要输出脚本、命令或“已经执行成功”之类的表述');
-    expect(callbackWithoutTranslatorRefCalls).not.toContain('t(activeConnection.name');
-    expect(callbackWithoutTranslatorRefCalls).not.toContain('t(activeConnection.config.host');
-    expect(callbackWithoutTranslatorRefCalls).not.toContain('t(providerMode');
-    expect(callbackWithoutTranslatorRefCalls).not.toContain('t(environment');
-    expect(callbackWithoutTranslatorRefCalls).not.toContain('t(resourcePath');
-  });
-
-  it('keeps the JVM runtime prompt placeholders exact and preserves raw plan identifiers in every language', () => {
-    const expectedPromptPlaceholders = [
-      'connectionName',
-      'connectionPolicy',
-      'environment',
-      'host',
-      'providerMode',
-      'resourcePathStatus',
-    ];
-    const policyPlaceholderExpectations: Record<(typeof jvmRuntimePolicyKeys)[number], string[]> = {
-      'ai_chat.panel.jvm_runtime.policy.read_only': [],
-      'ai_chat.panel.jvm_runtime.policy.preview_required': [],
-      'ai_chat.panel.jvm_runtime.resource_path.current': ['resourcePath'],
-      'ai_chat.panel.jvm_runtime.resource_path.missing': [],
-    };
-    const rawPromptIdentifiers = [
-      'GoNavi',
-      'JVM',
-      'SQL',
-      'JSON',
-      'targetType',
-      'selector',
-      'action',
-      'payload',
-      'reason',
-      'supportedActions',
-      'selector.resourcePath',
-      'resourcePath',
-      'format',
-      'json',
-      'text',
-    ];
-
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      expect(catalog).toHaveProperty(jvmRuntimePromptKey);
-      expect(catalog[jvmRuntimePromptKey]).toBeTruthy();
-      expect(getPlaceholders(catalog[jvmRuntimePromptKey])).toEqual(expectedPromptPlaceholders);
-
-      for (const rawIdentifier of rawPromptIdentifiers) {
-        expect(catalog[jvmRuntimePromptKey]).toContain(rawIdentifier);
-      }
-
-      for (const key of jvmRuntimePolicyKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual(policyPlaceholderExpectations[key]);
-      }
-    }
-  });
-
-  it('uses SQL system prompt catalog keys while preserving raw SQL context parameters', () => {
-    const callback = getBuildSystemContextMessagesCallback();
-    const callbackWithoutTranslatorRefCalls = callback.replace(/tRef\.current\(/g, '');
-    const deps = getBuildSystemContextMessagesDeps();
-
-    for (const key of sqlPromptKeys) {
-      expect(callback).toContain(key);
-    }
-
-    expect(callback).toContain('const sqlPromptKey = activeContextItems.length > 0');
-    expect(callback).toContain("targetConnId && targetDbName");
-    expect(callback).toContain("conns.length > 0");
-    expect(callback).toContain('content: tRef.current(sqlPromptKey, sqlPromptParams),');
-    expect(callback).toContain('dbDisplayType,');
-    expect(callback).toContain('ddlChunks,');
-    expect(callback).toContain('targetDbName,');
-    expect(callback).toContain('connList,');
-    expect(deps).not.toContain('t');
-    expect(callbackWithoutTranslatorRefCalls).not.toMatch(/\bt\(/);
-
-    expect(callbackWithoutTranslatorRefCalls).not.toContain('t(dbDisplayType');
-    expect(callbackWithoutTranslatorRefCalls).not.toContain('t(ddlChunks');
-    expect(callbackWithoutTranslatorRefCalls).not.toContain('t(targetDbName');
-    expect(callbackWithoutTranslatorRefCalls).not.toContain('t(connList');
-
-    expect(source).not.toContain('你是一个专业的数据库助手。当前连接的数据库类型是');
-    expect(source).not.toContain('用户目前在界面上没有选中任何具体的数据库或数据表');
-    expect(source).not.toContain('当前存在的连接：');
-  });
-
-  it('keeps SQL system prompt placeholders exact and raw workflow identifiers intact in every language', () => {
-    const placeholderExpectations: Record<(typeof sqlPromptKeys)[number], string[]> = {
-      'ai_chat.panel.prompt.sql.context_tables': ['dbDisplayType', 'ddlChunks'],
-      'ai_chat.panel.prompt.sql.current_database': ['dbDisplayType', 'targetDbName'],
-      'ai_chat.panel.prompt.sql.no_context': ['connList'],
-      'ai_chat.panel.prompt.sql.no_connections': [],
-    };
-    const rawPromptIdentifiers = [
-      'SQL',
-      'DDL',
-      'get_connections',
-      'get_databases',
-      'get_tables',
-      'get_columns',
-      'host',
-      'localhost',
-      '127.0.0.1',
-      'name',
-      'dev',
-      'local',
-      'connectionId',
-      'dbName',
-      'database.table',
-      '@context',
-    ];
-
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      for (const key of sqlPromptKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual(placeholderExpectations[key]);
-      }
-
-      const combinedPrompt = sqlPromptKeys.map((key) => catalog[key]).join('\n');
-      for (const rawIdentifier of rawPromptIdentifiers) {
-        expect(combinedPrompt).toContain(rawIdentifier);
-      }
-    }
-  });
-
-  it('passes the active translator into sanitized error fallbacks without translating raw details', () => {
-    expect(source).toContain('const sanitizeErrorMsg = (raw: string, t: AIChatTranslator): string =>');
-    expect(source).toContain('sanitizeErrorMsg(data.error, tRef.current)');
-    expect(source).toContain('sanitizeErrorMsg(errRaw, t)');
-    expect(source).toContain('sanitizeErrorMsg(errR, translateToolChrome)');
-    expect(source).toContain('sanitizeErrorMsg(errR2, t)');
-    expect(source).toContain('sanitizeErrorMsg(rawE, t)');
-    expect(source).toContain('sanitizeErrorMsg(rawE2, t)');
-
-    expect(source).toContain("return t('ai_chat.panel.error.unknown')");
-    expect(source).toContain("return t('ai_chat.panel.error.http_server', { code })");
-    expect(source).toContain("return t('ai_chat.panel.error.html_response')");
-    expect(source).toContain("+ t('ai_chat.panel.error.truncated_suffix')");
-    expect(source).not.toContain('t(title');
-    expect(source).not.toContain('t(raw');
-  });
-
-  it('uses the generic i18n error wrapper for non-stream AIChatSend fallbacks', () => {
-    expect(source).toContain("content: result?.success ? result.content : t('ai_chat.panel.message.error', { detail: errClean })");
-    expect(source).toContain("content: result?.success ? result.content : translateToolChrome('ai_chat.panel.message.error', { detail: errC })");
-    expect(source).toContain("content: result?.success ? result.content : t('ai_chat.panel.message.error', { detail: errC2 })");
-
-    expect(source).not.toContain('`❌ ${errClean}`');
-    expect(source).not.toContain('`❌ ${errC}`');
-    expect(source).not.toContain('`❌ ${errC2}`');
-  });
-
-  it('keeps memory and sanitized-error catalog placeholders consistent in every language', () => {
-    const placeholderExpectations: Record<(typeof memoryAndSanitizedErrorKeys)[number], string[]> = {
-      'ai_chat.panel.status.memory_compressing': [],
-      'ai_chat.panel.status.memory_compress_failed': [],
-      'ai_chat.panel.status.memory_summary': ['summary'],
-      'ai_chat.panel.status.memory_probe_summary': ['summary'],
-      'ai_chat.panel.error.unknown': [],
-      'ai_chat.panel.error.http_server': ['code'],
-      'ai_chat.panel.error.html_response': [],
-      'ai_chat.panel.error.truncated_suffix': [],
-    };
-
-    for (const language of SUPPORTED_LANGUAGES) {
-      const catalog = catalogs[language] as Record<string, string>;
-      for (const key of memoryAndSanitizedErrorKeys) {
-        expect(catalog).toHaveProperty(key);
-        expect(catalog[key]).toBeTruthy();
-        expect(getPlaceholders(catalog[key])).toEqual(placeholderExpectations[key]);
-      }
-    }
+  it('keeps translated session and insight chrome in the panel layer instead of falling back to hardcoded copy', () => {
+    expect(source).toContain("() => orderedAISessions.find((session) => session.id === sid)?.title || t('ai_chat.panel.session.default_title')");
+    expect(source).toContain("title: session.title || t('ai_chat.panel.session.default_title')");
+    expect(source).toContain("t('ai_chat.panel.insight.context.linked_title', { count: contextCount })");
+    expect(source).toContain("t('ai_chat.panel.insight.context.linked_body', { tables: tablePreview })");
+    expect(source).toContain("t('ai_chat.panel.insight.query.slowest_title', { duration: Math.round(slowest.duration).toLocaleString() })");
+    expect(source).toContain("t('ai_chat.panel.insight.status.recent_body', { count: recentLogs.length })");
+    expect(source).toContain("t('ai_chat.panel.insight.write.detected_title', { count: writeCount })");
+    expect(source).not.toContain('buildAIChatInsights({');
+    expect(source).not.toContain("|| '新对话'");
   });
 });
diff --git a/frontend/src/components/AIChatPanel.tsx b/frontend/src/components/AIChatPanel.tsx
index f0172f1..86fed1d 100644
--- a/frontend/src/components/AIChatPanel.tsx
+++ b/frontend/src/components/AIChatPanel.tsx
@@ -1,32 +1,46 @@
 import React, { useState, useRef, useEffect, useCallback, useMemo } from 'react';
 import { createPortal } from 'react-dom';
-import { useStore, loadAISessionsFromBackend, loadAISessionFromBackend } from '../store';
-import { EventsOn, EventsOff } from '../../wailsjs/runtime';
-import { DBGetDatabases, DBGetTables } from '../../wailsjs/go/app/App';
+import { useStore } from '../store';
 import type { OverlayWorkbenchTheme } from '../utils/overlayWorkbenchTheme';
 import type {
+    AIChatAttachment,
     AIChatMessage,
-    AIToolCall,
     JVMAIPlanContext,
     JVMDiagnosticPlanContext,
 } from '../types';
-import { DatabaseOutlined, DownOutlined, HistoryOutlined, TableOutlined, WarningOutlined } from '@ant-design/icons';
 import './AIChatPanel.css';
 
 import { AIChatHeader } from './ai/AIChatHeader';
-import { AIChatWelcome } from './ai/AIChatWelcome';
-import { AIMessageBubble } from './ai/AIMessageBubble';
 import { AIChatInput } from './ai/AIChatInput';
 import { AIHistoryDrawer } from './ai/AIHistoryDrawer';
-import type { AIComposerNoticeDescriptor } from '../utils/aiComposerNotice';
+import AIChatPanelConversationView from './ai/AIChatPanelConversationView';
+import { useAIChatStreamSubscription } from './ai/useAIChatStreamSubscription';
 import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
+import type { AIComposerNoticeDescriptor } from '../utils/aiComposerNotice';
 import { buildAIComposerNotice } from '../utils/aiComposerNotice';
-import { buildAIReadonlyPreviewSQL } from '../utils/aiSqlLimit';
-import { resolveAITableSchemaToolResult } from '../utils/aiTableSchemaTool';
 import { consumeAIChatSendShortcutOnKeyDown } from '../utils/aiChatSendShortcut';
 import { toAIRequestMessage } from '../utils/aiMessagePayload';
+import { compressContextIfNeeded, getDynamicMaxContextChars } from '../utils/aiChatRuntime';
 import { getShortcutPlatform, resolveShortcutBinding } from '../utils/shortcuts';
 import { isMacLikePlatform } from '../utils/appearance';
+import { buildAvailableAIChatTools } from '../utils/aiToolRegistry';
+import {
+    buildAIChatInlineHistorySessions,
+    calculateAIContextUsageChars,
+    collectAIChatContextTableNames,
+    inferAIChatConnectionContext,
+    resolveAIChatPanelMode,
+} from './ai/aiChatPanelDerivedState';
+import { dispatchAIChatPayload } from './ai/aiChatPayloadDispatch';
+import { buildAIChatReadinessSnapshot } from './ai/aiChatReadiness';
+import { buildAISystemContextMessages } from './ai/aiSystemContextMessages';
+import { useAIChatRuntimeResources } from './ai/useAIChatRuntimeResources';
+import { useAIChatAutoContext } from './ai/useAIChatAutoContext';
+import { useAIChatPanelResize } from './ai/useAIChatPanelResize';
+import { useAIChatPlanContexts } from './ai/useAIChatPlanContexts';
+import { useAIChatSessionState } from './ai/useAIChatSessionState';
+import { useAIChatSessionTitleGenerator } from './ai/useAIChatSessionTitleGenerator';
+import { useAIChatLocalTools } from './ai/useAIChatLocalTools';
 import { useI18n } from '../i18n/provider';
 
 interface AIChatPanelProps {
@@ -41,323 +55,41 @@ interface AIChatPanelProps {
 
 const genId = () => `msg-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
 
-type AIChatTranslator = (key: string, params?: Record<string, string | number | boolean | null | undefined>) => string;
-
-const jvmDiagnosticPromptKey = 'ai_chat.panel.prompt.jvm_diagnostic' as const;
-const jvmRuntimePromptKey = 'ai_chat.panel.prompt.jvm_runtime' as const;
-
-interface AIMessageRenderBoundaryProps {
-    children: React.ReactNode;
-    msg: AIChatMessage;
-    darkMode: boolean;
-    overlayTheme: OverlayWorkbenchTheme;
-    onDeleteMessage: (id: string) => void;
-    onError?: (error: Error, errorInfo: React.ErrorInfo, msg: AIChatMessage) => void;
-    translateRenderError: (key: string) => string;
-}
-
-interface AIMessageRenderBoundaryState {
-    hasError: boolean;
-    error: Error | null;
-}
-
-class AIMessageRenderBoundary extends React.Component<
-    AIMessageRenderBoundaryProps,
-    AIMessageRenderBoundaryState
-> {
-    constructor(props: AIMessageRenderBoundaryProps) {
-        super(props);
-        this.state = { hasError: false, error: null };
-    }
-
-    static getDerivedStateFromError(error: Error): AIMessageRenderBoundaryState {
-        return { hasError: true, error };
-    }
-
-    componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
-        this.props.onError?.(error, errorInfo, this.props.msg);
-    }
-
-    private handleRetryRender = () => {
-        this.setState({ hasError: false, error: null });
-    };
-
-    render() {
-        if (this.state.hasError) {
-            const { msg, darkMode, overlayTheme, onDeleteMessage, translateRenderError } = this.props;
-            return (
-                <div className="ai-ide-message" style={{ borderBottom: 'none', padding: '8px 16px' }}>
-                    <div style={{
-                        background: darkMode ? 'rgba(239,68,68,0.08)' : 'rgba(239,68,68,0.05)',
-                        border: `1px solid ${darkMode ? 'rgba(248,113,113,0.32)' : 'rgba(239,68,68,0.18)'}`,
-                        borderRadius: 12,
-                        padding: '14px 16px',
-                    }}>
-                        <div style={{ fontSize: 13, fontWeight: 600, color: overlayTheme.titleText }}>
-                            {translateRenderError('ai_chat.panel.render_error.title')}
-                        </div>
-                        <div style={{ marginTop: 6, fontSize: 12, lineHeight: 1.6, color: overlayTheme.mutedText }}>
-                            {translateRenderError('ai_chat.panel.render_error.description')}
-                        </div>
-                        <div style={{
-                            marginTop: 10,
-                            padding: '8px 10px',
-                            borderRadius: 8,
-                            background: darkMode ? 'rgba(0,0,0,0.18)' : 'rgba(0,0,0,0.03)',
-                            fontSize: 12,
-                            color: overlayTheme.titleText,
-                            wordBreak: 'break-word',
-                            whiteSpace: 'pre-wrap',
-                        }}>
-                            {this.state.error?.message || translateRenderError('ai_chat.panel.render_error.unknown')}
-                        </div>
-                        <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>
-                            <button
-                                type="button"
-                                onClick={this.handleRetryRender}
-                                style={{
-                                    border: overlayTheme.sectionBorder,
-                                    background: 'transparent',
-                                    color: overlayTheme.titleText,
-                                    borderRadius: 8,
-                                    padding: '6px 12px',
-                                    cursor: 'pointer',
-                                }}
-                            >
-                                {translateRenderError('ai_chat.panel.render_error.retry')}
-                            </button>
-                            <button
-                                type="button"
-                                onClick={() => onDeleteMessage(msg.id)}
-                                style={{
-                                    border: '1px solid rgba(239,68,68,0.28)',
-                                    background: darkMode ? 'rgba(239,68,68,0.08)' : 'rgba(239,68,68,0.05)',
-                                    color: '#ef4444',
-                                    borderRadius: 8,
-                                    padding: '6px 12px',
-                                    cursor: 'pointer',
-                                }}
-                            >
-                                {translateRenderError('ai_chat.panel.render_error.delete')}
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            );
-        }
-
-        return this.props.children;
-    }
-}
-
-export const getDynamicMaxContextChars = (modelName?: string) => {
-    if (!modelName) return 258000; // 默认 258k (2026主流基线)
-    const lower = modelName.toLowerCase();
-    
-    // 「星际杯」- 百万到千万级 Tokens (保守取 2~5M 字符)
-    if (lower.includes('gemini-1.5-pro') || lower.includes('gemini-2') || lower.includes('gemini-3')) {
-        return 5000000;
-    }
-    // 「超大杯」- 1M Tokens (针对 2026 旗舰：约 1,000,000 字符)
-    if (lower.includes('glm-5') || lower.includes('claude-4') || lower.includes('claude-3.7') || lower.includes('gpt-5') || lower.includes('qwen3') || lower.includes('deepseek-v4')) {
-        return 1000000;
-    }
-    if (lower.includes('claude-3-opus') || lower.includes('claude-3.5') || lower.includes('glm-4-long') || lower.includes('qwen-long')) {
-        return 1000000;
-    }
-    // 「大杯」- 200K ~ 258K Tokens (针对现代主流：约 258,000 字符)
-    if (lower.includes('claude') || lower.includes('deepseek') || lower.includes('gpt-4.5') || lower.includes('qwen2.5')) {
-        return 258000;
-    }
-    // 「中杯/小杯」- 128K Tokens (老基线：约 128,000 字符)
-    if (lower.includes('gpt-4') || lower.includes('gpt-4o') || lower.includes('glm') || lower.includes('z-ai')) {
-        return 128000;
-    }
-    if (lower.includes('qwen')) {
-        return 128000;
-    }
-    // Default fallback
-    return 258000; 
-};
-
-// 当超出指定字符上限时触发上下文自建压缩
-const compressContextIfNeeded = async (sid: string, messagesPayload: any[], maxLimit: number, t: AIChatTranslator) => {
-    try {
-        const chars = messagesPayload.reduce((sum, m) => sum + (m.content?.length || 0) + (m.reasoning_content?.length || 0) + JSON.stringify(m.tool_calls || []).length, 0);
-        if (chars < maxLimit) return null;
-
-        const Service = (window as any).go?.aiservice?.Service;
-        if (!Service?.AIChatSend) return null;
-
-        const connectingMsgId = genId();
-        useStore.getState().addAIChatMessage(sid, {
-            id: connectingMsgId, role: 'assistant', phase: 'connecting', content: t('ai_chat.panel.status.memory_compressing'), timestamp: Date.now(), loading: true
-        });
-
-        const summaryPrompt = t('ai_chat.panel.prompt.memory_summary');
-
-        const sysMsg = { role: 'system', content: summaryPrompt };
-        const result = await Service.AIChatSend([sysMsg, ...messagesPayload]);
-
-        if (result?.success && result.content) {
-            useStore.getState().deleteAIChatMessage(sid, connectingMsgId);
-            return result.content;
-        } else {
-            useStore.getState().updateAIChatMessage(sid, connectingMsgId, { loading: false, phase: 'idle', content: t('ai_chat.panel.status.memory_compress_failed') });
-        }
-    } catch (e) {
-        console.error("Compression exception:", e);
-    }
-    return null;
-};
-
-// 清洗错误信息：去除 HTML 标签、提取关键错误描述、截断过长文本
-const sanitizeErrorMsg = (raw: string, t: AIChatTranslator): string => {
-    if (!raw || typeof raw !== 'string') return t('ai_chat.panel.error.unknown');
-    // 检测 HTML 内容
-    if (raw.includes('<html') || raw.includes('<!DOCTYPE') || raw.includes('<head')) {
-        // 尝试提取 <title> 内容
-        const titleMatch = raw.match(/<title[^>]*>([^<]+)<\/title>/i);
-        // 尝试提取 HTTP 状态码
-        const codeMatch = raw.match(/\b(4\d{2}|5\d{2})\b/);
-        const title = titleMatch?.[1]?.trim();
-        const code = codeMatch?.[1];
-        if (title) return code ? `HTTP ${code}: ${title}` : title;
-        if (code) return t('ai_chat.panel.error.http_server', { code });
-        return t('ai_chat.panel.error.html_response');
-    }
-    // 截断过长的纯文本错误
-    if (raw.length > 300) return raw.substring(0, 280) + t('ai_chat.panel.error.truncated_suffix');
-    return raw;
-};
-
-const buildLocalTools = (translateLocalToolSchema: AIChatTranslator) => [
-    {
-        type: 'function',
-        function: {
-            name: 'get_connections',
-            description: translateLocalToolSchema('ai_chat.panel.local_tool.get_connections.description'),
-            parameters: { type: 'object', properties: {} }
-        }
-    },
-    {
-        type: 'function',
-        function: {
-            name: 'get_databases',
-            description: translateLocalToolSchema('ai_chat.panel.local_tool.get_databases.description'),
-            parameters: {
-                type: 'object',
-                properties: {
-                    connectionId: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.connection_id_from_get_connections') }
-                },
-                required: ['connectionId']
-            }
-        }
-    },
-    {
-        type: 'function',
-        function: {
-            name: 'get_tables',
-            description: translateLocalToolSchema('ai_chat.panel.local_tool.get_tables.description'),
-            parameters: {
-                type: 'object',
-                properties: {
-                    connectionId: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.connection_id') },
-                    dbName: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.db_name') },
-                },
-                required: ['connectionId', 'dbName']
-            }
-        }
-    },
-    {
-        type: 'function',
-        function: {
-            name: 'get_columns',
-            description: translateLocalToolSchema('ai_chat.panel.local_tool.get_columns.description'),
-            parameters: {
-                type: 'object',
-                properties: {
-                    connectionId: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.connection_id') },
-                    dbName: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.db_name') },
-                    tableName: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.table_name') },
-                },
-                required: ['connectionId', 'dbName', 'tableName']
-            }
-        }
-    },
-    {
-        type: 'function',
-        function: {
-            name: 'get_table_ddl',
-            description: translateLocalToolSchema('ai_chat.panel.local_tool.get_table_ddl.description'),
-            parameters: {
-                type: 'object',
-                properties: {
-                    connectionId: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.connection_id') },
-                    dbName: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.db_name') },
-                    tableName: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.table_name') },
-                },
-                required: ['connectionId', 'dbName', 'tableName']
-            }
-        }
-    },
-    {
-        type: 'function',
-        function: {
-            name: 'execute_sql',
-            description: translateLocalToolSchema('ai_chat.panel.local_tool.execute_sql.description'),
-            parameters: {
-                type: 'object',
-                properties: {
-                    connectionId: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.connection_id') },
-                    dbName: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.db_name') },
-                    sql: { type: 'string', description: translateLocalToolSchema('ai_chat.panel.local_tool.param.sql') },
-                },
-                required: ['connectionId', 'dbName', 'sql']
-            }
-        }
-    }
-];
-
-export const AIChatPanel: React.FC<AIChatPanelProps> = ({ 
-    width = 380, darkMode, bgColor, onClose, onOpenSettings, onWidthChange, overlayTheme 
+export const AIChatPanel: React.FC<AIChatPanelProps> = ({
+    width = 380, darkMode, bgColor, onClose, onOpenSettings, onWidthChange, overlayTheme
 }) => {
     const { t } = useI18n();
-    const tRef = useRef(t);
-    tRef.current = t;
-    const getLocalTools = useCallback(() => buildLocalTools(tRef.current), []);
     const [input, setInput] = useState('');
-    const [draftImages, setDraftImages] = useState<string[]>([]);
+    const [draftAttachments, setDraftAttachments] = useState<AIChatAttachment[]>([]);
     const [sending, setSending] = useState(false);
-    const [activeProvider, setActiveProvider] = useState<any>(null);
-    const [dynamicModels, setDynamicModels] = useState<string[]>([]);
     const [showScrollBottom, setShowScrollBottom] = useState(false);
-    const [loadingModels, setLoadingModels] = useState(false);
-    const [composerNoticeState, setComposerNoticeState] = useState<AIComposerNoticeDescriptor | null>(null);
-    const [panelWidth, setPanelWidth] = useState(width);
-    const [isResizing, setIsResizing] = useState(false);
     const [historyOpen, setHistoryOpen] = useState(false);
     const [activePanelMode, setActivePanelMode] = useState<'chat' | 'insights' | 'history'>('chat');
-    const composerNotice = useMemo(() => buildAIComposerNotice(t, composerNoticeState), [composerNoticeState, t]);
-    
+    const [composerNoticeState, setComposerNoticeState] = useState<AIComposerNoticeDescriptor | null>(null);
+    const {
+        activeProvider,
+        composerNotice: runtimeComposerNotice,
+        dynamicModels,
+        fetchDynamicModels,
+        handleComposerAction,
+        handleModelChange,
+        handleOpenSettingsFromPanel,
+        loadingModels,
+        mcpTools,
+        skills,
+        userPromptSettings,
+    } = useAIChatRuntimeResources({ onOpenSettings });
+
     const messagesEndRef = useRef<HTMLDivElement>(null);
     const textareaRef = useRef<HTMLTextAreaElement>(null);
-    const resizeStartX = useRef(0);
-    const resizeStartWidth = useRef(0);
-    const toolCallRoundRef = useRef(0); // 连续失败轮次计数
-    const totalToolRoundRef = useRef(0); // 全局工具调用总轮次计数（防止无限循环）
-    const nudgeCountRef = useRef(0);    // 催促模型使用 function call 的次数
-    const panelRef = useRef<HTMLDivElement>(null); // 面板 DOM ref，用于拖拽时直接操作宽度
-    const dragWidthRef = useRef(0); // 拖拽过程中的实时宽度（不触发 React 重渲染）
-    const pendingJVMPlanContextRef = useRef<JVMAIPlanContext | undefined>(undefined);
-    const pendingJVMDiagnosticPlanContextRef = useRef<JVMDiagnosticPlanContext | undefined>(undefined);
+    const nudgeCountRef = useRef(0);
+    const {
+        getCurrentJVMPlanContext,
+        getCurrentJVMDiagnosticPlanContext,
+        pendingJVMPlanContextRef,
+        pendingJVMDiagnosticPlanContextRef,
+    } = useAIChatPlanContexts();
 
-    useEffect(() => {
-        setPanelWidth(width);
-        dragWidthRef.current = width;
-    }, [width]);
-
-    const aiChatHistory = useStore(state => state.aiChatHistory);
     const aiActiveSessionId = useStore(state => state.aiActiveSessionId);
     const appearance = useStore(state => state.appearance);
     const createNewAISession = useStore(state => state.createNewAISession);
@@ -366,240 +98,79 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
     const deleteAIChatMessage = useStore(state => state.deleteAIChatMessage);
     const truncateAIChatMessages = useStore(state => state.truncateAIChatMessages);
     const updateAISessionTitle = useStore(state => state.updateAISessionTitle);
-    
+
     const activeContext = useStore(state => state.activeContext);
     const aiContexts = useStore(state => state.aiContexts);
     const connections = useStore(state => state.connections);
     const tabs = useStore(state => state.tabs);
     const activeTabId = useStore(state => state.activeTabId);
     const sqlLogs = useStore(state => state.sqlLogs);
-    const aiChatSessions = useStore(state => state.aiChatSessions);
     const setAIActiveSessionId = useStore(state => state.setAIActiveSessionId);
     const aiPanelVisible = useStore(state => state.aiPanelVisible);
     const isV2Ui = appearance.uiVersion === 'v2';
     const activeShortcutPlatform = getShortcutPlatform(isMacLikePlatform());
+    const {
+        ghostRef,
+        handleResizeStart,
+        isResizing,
+        panelRect,
+        panelRef,
+        panelWidth,
+    } = useAIChatPanelResize({
+        width,
+        isV2Ui,
+        onWidthChange,
+    });
+    const availableTools = useMemo(
+        () => buildAvailableAIChatTools(mcpTools),
+        [mcpTools],
+    );
     const aiChatSendShortcutBinding = useStore(state => resolveShortcutBinding(
         state.shortcutOptions,
         'sendAIChatMessage',
         activeShortcutPlatform,
     ));
+    const { sid, messages, orderedAISessions } = useAIChatSessionState({
+        aiActiveSessionId,
+        aiPanelVisible,
+        createNewAISession,
+    });
 
-    const getCurrentJVMPlanContext = useCallback((): JVMAIPlanContext | undefined => {
-        const state = useStore.getState();
-        const activeTab = state.tabs.find(t => t.id === state.activeTabId);
-        if (!activeTab || activeTab.type !== 'jvm-resource') {
-            return undefined;
-        }
-
-        const activeConnection = state.connections.find(c => c.id === activeTab.connectionId);
-        if (activeConnection?.config?.type !== 'jvm') {
-            return undefined;
-        }
-
-        const resourcePath = String(activeTab.resourcePath || '').trim();
-        if (!resourcePath) {
-            return undefined;
-        }
-
-        return {
-            tabId: activeTab.id,
-            connectionId: activeTab.connectionId,
-            providerMode: (activeTab.providerMode || activeConnection.config.jvm?.preferredMode || 'jmx') as JVMAIPlanContext['providerMode'],
-            resourcePath,
-        };
-    }, []);
-
-    const getCurrentJVMDiagnosticPlanContext = useCallback((): JVMDiagnosticPlanContext | undefined => {
-        const state = useStore.getState();
-        const activeTab = state.tabs.find(t => t.id === state.activeTabId);
-        if (!activeTab || activeTab.type !== 'jvm-diagnostic') {
-            return undefined;
-        }
-
-        const activeConnection = state.connections.find(c => c.id === activeTab.connectionId);
-        if (activeConnection?.config?.type !== 'jvm') {
-            return undefined;
-        }
-
-        return {
-            tabId: activeTab.id,
-            connectionId: activeTab.connectionId,
-            transport: activeConnection.config.jvm?.diagnostic?.transport || 'agent-bridge',
-        };
-    }, []);
-
-    // Auto-Context Injection Hook
-    useEffect(() => {
-        if (!aiPanelVisible) return;
-        const activeTab = tabs.find(t => t.id === activeTabId);
-        if (activeTab && (activeTab.type === 'table' || activeTab.type === 'design')) {
-            const { connectionId, dbName, tableName } = activeTab;
-            if (connectionId && dbName && tableName) {
-                const connKey = `${connectionId}:${dbName}`;
-                const currentContexts = useStore.getState().aiContexts[connKey] || [];
-                if (!currentContexts.find(c => c.dbName === dbName && c.tableName === tableName)) {
-                    const conn = useStore.getState().connections.find(c => c.id === connectionId);
-                    if (conn) {
-                        import('../../wailsjs/go/app/App').then(({ DBShowCreateTable }) => {
-                            DBShowCreateTable(buildRpcConnectionConfig(conn.config) as any, dbName, tableName).then(res => {
-                                if (res.success && res.data) {
-                                    let createSql = '';
-                                    if (typeof res.data === 'string') createSql = res.data;
-                                    else if (Array.isArray(res.data) && res.data.length > 0) {
-                                        const row = res.data[0];
-                                        createSql = (Object.values(row).find(v => typeof v === 'string' && (v.toUpperCase().includes('CREATE TABLE') || v.toUpperCase().includes('CREATE'))) || Object.values(row)[1] || Object.values(row)[0]) as string;
-                                    }
-                                    if (createSql) {
-                                        useStore.getState().addAIContext(connKey, { dbName: dbName, tableName, ddl: createSql });
-                                    }
-                                }
-                            });
-                        }).catch(err => console.error("Failed to auto-fetch table context", err));
-                    }
-                }
-            }
-        }
-    }, [aiPanelVisible, activeTabId, tabs]);
+    useAIChatAutoContext({
+        aiPanelVisible,
+        activeTabId,
+        tabs,
+    });
 
     useEffect(() => {
-        if (!aiActiveSessionId) {
-            createNewAISession();
+        if (runtimeComposerNotice) {
+            setComposerNoticeState(null);
         }
-    }, [aiActiveSessionId, createNewAISession]);
-
-    const sid = aiActiveSessionId || 'session-fallback';
-
-    // 面板首次可见时从后端加载会话列表
-    const sessionsLoadedRef = useRef(false);
-    useEffect(() => {
-        if (!aiPanelVisible || sessionsLoadedRef.current) return;
-        sessionsLoadedRef.current = true;
-        loadAISessionsFromBackend();
-    }, [aiPanelVisible]);
-
-    // 切换会话时按需从后端加载消息
-    useEffect(() => {
-        if (sid && sid !== 'session-fallback') {
-            loadAISessionFromBackend(sid);
-        }
-    }, [sid]);
-    const messages = aiChatHistory[sid] || [];
+    }, [runtimeComposerNotice]);
 
     const getConnectionName = useCallback(() => {
         let connectionId = activeContext?.connectionId;
         if (!connectionId) {
-            const activeTab = tabs.find(t => t.id === activeTabId);
+            const activeTab = tabs.find(tab => tab.id === activeTabId);
             connectionId = activeTab?.connectionId;
         }
         if (!connectionId) return '';
-        const conn = connections.find(c => c.id === connectionId);
-        return conn ? conn.name : '';
+        const connection = connections.find(item => item.id === connectionId);
+        return connection ? connection.name : '';
     }, [activeContext, activeTabId, connections, tabs]);
 
     const activeConnName = getConnectionName();
+    const composerNotice = useMemo(
+        () => buildAIComposerNotice(t, composerNoticeState) ?? runtimeComposerNotice,
+        [composerNoticeState, runtimeComposerNotice, t],
+    );
 
     const textColor = overlayTheme.titleText;
     const mutedColor = overlayTheme.mutedText;
     const borderColor = overlayTheme.divider;
-    const assistantBubbleBg = darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)';
     const quickActionBg = darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(255,255,255,0.8)';
     const quickActionBorder = overlayTheme.sectionBorder;
 
-    const loadActiveProvider = useCallback(async () => {
-        try {
-            const Service = (window as any).go?.aiservice?.Service;
-            if (!Service) return;
-            const [provRes, activeRes] = await Promise.all([
-                Service.AIGetProviders?.(),
-                Service.AIGetActiveProvider?.(),
-            ]);
-            if (Array.isArray(provRes) && activeRes) {
-                const current = provRes.find((p: any) => p.id === activeRes);
-                setActiveProvider(current || null);
-            }
-        } catch (e) { console.warn('Failed to load active provider', e); }
-    }, []);
-
-    useEffect(() => { loadActiveProvider(); }, [loadActiveProvider]);
-
-    // 监听供应商配置变更（来自设置面板的删除/新增/切换操作），重新加载 active provider 并清空已缓存的模型
-    useEffect(() => {
-        const handler = () => {
-            setDynamicModels([]);
-            setComposerNoticeState(null);
-            activeProviderIdRef.current = null;
-            loadActiveProvider();
-        };
-        window.addEventListener('gonavi:ai:provider-changed', handler);
-        return () => window.removeEventListener('gonavi:ai:provider-changed', handler);
-    }, [loadActiveProvider]);
-
-    const handleModelChange = async (val: string) => {
-        if (!activeProvider) return;
-        try {
-            const Service = (window as any).go?.aiservice?.Service;
-            const payload = {
-                ...activeProvider,
-                model: val,
-                apiKey: activeProvider.apiKey || '',
-                hasSecret: activeProvider.hasSecret ?? Boolean(activeProvider.secretRef),
-            };
-            await Service?.AISaveProvider?.(payload);
-            setActiveProvider(payload);
-            setComposerNoticeState(null);
-        } catch (e) { console.warn('Failed to update provider model', e); }
-    };
-
-    const activeProviderIdRef = useRef<string | null>(null);
-
-    useEffect(() => {
-        if (activeProvider?.id && activeProvider.id !== activeProviderIdRef.current) {
-            setDynamicModels([]);
-            setComposerNoticeState(null);
-            activeProviderIdRef.current = activeProvider.id;
-        }
-        // 供应商被删除后 activeProvider 变为 null，此时也必须清空残留模型
-        if (!activeProvider) {
-            setDynamicModels([]);
-            setComposerNoticeState(null);
-            activeProviderIdRef.current = null;
-        }
-    }, [activeProvider?.id, activeProvider]);
-
-    useEffect(() => {
-        if (activeProvider?.model && String(activeProvider.model).trim()) {
-            setComposerNoticeState(null);
-        }
-    }, [activeProvider?.model]);
-
-
-    // dynamicModels 仅在内存中使用，不再写回供应商配置，避免污染静态 models 列表
-
-    const fetchDynamicModels = useCallback(async () => {
-        try {
-            setLoadingModels(true);
-            setComposerNoticeState(null);
-            const Service = (window as any).go?.aiservice?.Service;
-            if (!Service) return;
-            const result = await Service.AIListModels?.();
-            if (result?.success && Array.isArray(result.models) && result.models.length > 0) {
-                const sortedModels = [...result.models].sort((a, b) => a.localeCompare(b));
-                setDynamicModels(sortedModels);
-                setComposerNoticeState(null);
-            } else if (result && !result.success) {
-                setDynamicModels([]);
-                setComposerNoticeState({ kind: 'model_fetch_failed', detail: result.error });
-            }
-        } catch (e: any) {
-            console.warn('Failed to fetch models', e);
-            setDynamicModels([]);
-            const detail = e?.message || String(e || '');
-            setComposerNoticeState({ kind: 'model_fetch_failed', detail });
-        } finally {
-            setLoadingModels(false);
-        }
-    }, []);
-
     useEffect(() => {
         if (messages.length === 0) return;
         messagesEndRef.current?.scrollIntoView({ behavior: sending ? 'auto' : 'smooth', block: 'end' });
@@ -613,15 +184,12 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
     }, []);
 
     useEffect(() => {
-        const handler = (e: Event) => {
-            const detail = (e as CustomEvent).detail;
+        const handler = (event: Event) => {
+            const detail = (event as CustomEvent).detail;
             if (detail?.prompt) {
                 setInput(detail.prompt);
                 setTimeout(() => {
-                    const el = textareaRef.current as any;
-                    if (el) {
-                        el.focus();
-                    }
+                    textareaRef.current?.focus();
                 }, 50);
             }
         };
@@ -629,258 +197,10 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
         return () => window.removeEventListener('gonavi:ai:inject-prompt', handler);
     }, []);
 
-    useEffect(() => {
-        const eventName = `ai:stream:${sid}`;
-        let assistantMsgId = '';
-        let isFirstCompletion = false;
+    const generateTitleForSession = useAIChatSessionTitleGenerator({ updateAISessionTitle });
 
-        // 新增：利用 requestAnimationFrame 缓冲高频事件，避免 React 重绘阻塞导致感官吞吐变慢
-        const streamBuffer = { thinking: '', reasoningContent: '', content: '' };
-        let flushPending = false;
-
-        const flushStreamBuffer = () => {
-            if (!assistantMsgId) return;
-            const current = useStore.getState().aiChatHistory[sid];
-            const existing = current?.find(m => m.id === assistantMsgId);
-            if (!existing) return;
-
-            const updates: any = {};
-            if (streamBuffer.thinking) {
-                updates.thinking = (existing.thinking || '') + streamBuffer.thinking;
-                updates.phase = 'thinking';
-                streamBuffer.thinking = '';
-            }
-            if (streamBuffer.reasoningContent) {
-                updates.reasoning_content = (existing.reasoning_content || '') + streamBuffer.reasoningContent;
-                streamBuffer.reasoningContent = '';
-            }
-            if (streamBuffer.content) {
-                updates.content = (existing.content || '') + streamBuffer.content;
-                updates.phase = 'generating';
-                streamBuffer.content = '';
-            }
-            
-            if (Object.keys(updates).length > 0) {
-                updateAIChatMessage(sid, assistantMsgId, updates);
-            }
-            flushPending = false;
-        };
-
-        const handler = (data: { content?: string; thinking?: string; reasoning_content?: string; tool_calls?: AIToolCall[]; done?: boolean; error?: string }) => {
-            // Find connecting message if there's no active assistant string
-            if (!assistantMsgId) {
-                const history = useStore.getState().aiChatHistory[sid] || [];
-                const lastMsg = history[history.length - 1];
-                if (lastMsg && lastMsg.role === 'assistant' && lastMsg.loading && lastMsg.phase === 'connecting') {
-                    assistantMsgId = lastMsg.id;
-                    // 【关键】接管 connecting 消息时，立即清空其过渡文案，防止泄漏到 AI 回复正文
-                    updateAIChatMessage(sid, assistantMsgId, { content: '' });
-                }
-            }
-
-            if (data.error) {
-                const cleanErr = sanitizeErrorMsg(data.error, tRef.current);
-                const rawErr = cleanErr !== data.error ? data.error : undefined;
-                if (assistantMsgId) {
-                    updateAIChatMessage(sid, assistantMsgId, { content: tRef.current('ai_chat.panel.message.error', { detail: cleanErr }), phase: 'idle', loading: false, rawError: rawErr });
-                } else {
-                    addAIChatMessage(sid, {
-                        id: genId(),
-                        role: 'assistant',
-                        phase: 'idle',
-                        content: tRef.current('ai_chat.panel.message.error', { detail: cleanErr }),
-                        rawError: rawErr,
-                        timestamp: Date.now(),
-                        jvmPlanContext: pendingJVMPlanContextRef.current,
-                        jvmDiagnosticPlanContext: pendingJVMDiagnosticPlanContextRef.current,
-                    });
-                }
-                assistantMsgId = '';
-                setSending(false);
-                return;
-            }
-
-            if (data.tool_calls && data.tool_calls.length > 0) {
-                if (assistantMsgId) {
-                    updateAIChatMessage(sid, assistantMsgId, { tool_calls: data.tool_calls, phase: 'tool_calling' });
-                } else {
-                    assistantMsgId = genId();
-                    addAIChatMessage(sid, {
-                        id: assistantMsgId,
-                        role: 'assistant',
-                        phase: 'tool_calling',
-                        content: '',
-                        tool_calls: data.tool_calls,
-                        timestamp: Date.now(),
-                        loading: true,
-                        jvmPlanContext: pendingJVMPlanContextRef.current,
-                        jvmDiagnosticPlanContext: pendingJVMDiagnosticPlanContextRef.current,
-                    });
-                }
-            }
-
-            // 处理 thinking（模型思考过程）
-            const displayThinking = data.thinking || data.reasoning_content || '';
-            if (displayThinking || data.reasoning_content) {
-                if (!assistantMsgId) {
-                    assistantMsgId = genId();
-                    addAIChatMessage(sid, {
-                        id: assistantMsgId,
-                        role: 'assistant',
-                        phase: 'thinking',
-                        content: '',
-                        thinking: displayThinking || undefined,
-                        reasoning_content: data.reasoning_content || undefined,
-                        timestamp: Date.now(),
-                        loading: true,
-                        jvmPlanContext: pendingJVMPlanContextRef.current,
-                        jvmDiagnosticPlanContext: pendingJVMDiagnosticPlanContextRef.current,
-                    });
-                    if (sending) setSending(false);
-                } else {
-                    streamBuffer.thinking += displayThinking;
-                    if (data.reasoning_content) {
-                        streamBuffer.reasoningContent += data.reasoning_content;
-                    }
-                    if (sending) setSending(false);
-                }
-            }
-
-            if (data.content) {
-                if (!assistantMsgId) {
-                    assistantMsgId = genId();
-                    addAIChatMessage(sid, {
-                        id: assistantMsgId,
-                        role: 'assistant',
-                        phase: 'generating',
-                        content: data.content,
-                        timestamp: Date.now(),
-                        loading: true,
-                        jvmPlanContext: pendingJVMPlanContextRef.current,
-                        jvmDiagnosticPlanContext: pendingJVMDiagnosticPlanContextRef.current,
-                    });
-                    setSending(false);
-                    const currentHistory = useStore.getState().aiChatHistory[sid] || [];
-                    if (currentHistory.length <= 1) isFirstCompletion = true;
-                } else {
-                    streamBuffer.content += data.content;
-                    if (sending) setSending(false);
-                }
-            }
-
-            if (streamBuffer.thinking || streamBuffer.reasoningContent || streamBuffer.content) {
-                if (!flushPending) {
-                    flushPending = true;
-                    requestAnimationFrame(flushStreamBuffer);
-                }
-            }
-
-            if (data.done) {
-                // 如果有残留未 flush 的 buffer，立刻推入状态树
-                if (streamBuffer.thinking || streamBuffer.reasoningContent || streamBuffer.content) {
-                    flushStreamBuffer();
-                }
-                const doneAssistantId = assistantMsgId;
-                const doneIsFirst = isFirstCompletion;
-                assistantMsgId = '';
-                setTimeout(() => {
-                    // 🔧 清除所有残留的 connecting 过渡气泡的 loading 状态
-                    const currentMsgs = useStore.getState().aiChatHistory[sid] || [];
-                    for (const msg of currentMsgs) {
-                        if (msg.id !== doneAssistantId && msg.loading && msg.phase === 'connecting') {
-                            updateAIChatMessage(sid, msg.id, { loading: false, phase: 'idle' });
-                        }
-                    }
-
-                    if (doneAssistantId) {
-                        const current = useStore.getState().aiChatHistory[sid];
-                        const existing = current?.find(m => m.id === doneAssistantId);
-                        if (existing && existing.tool_calls && existing.tool_calls.length > 0) {
-                            // 【关键】保持 loading:true 和 phase:'tool_calling'，让 UI 能实时展示工具执行进度
-                            nudgeCountRef.current = 0;
-                            setTimeout(() => executeLocalTools(existing.tool_calls!, doneAssistantId), 50);
-                            return;
-                        }
-
-                        // 自动催促：模型描述了要调用工具但没有 function call
-                        if (existing && nudgeCountRef.current < 2 &&
-                            /(?:让我|我先|我来|现在|接下来|下面).*(?:查询|查找|获取|查看|检查|调用)|(?:获取|查询|查找|查看).*(?:信息|字段|列表|数据)[：:]?\s*$/.test(existing.content || '')) {
-                            nudgeCountRef.current += 1;
-                            // 🔧 关闭当前消息的 loading 状态，消除闪烁光标
-                            updateAIChatMessage(sid, doneAssistantId, { loading: false, phase: 'idle' });
-                            // 注入 system 催促并重发
-                            (async () => {
-                                try {
-                                    const currentHistory = useStore.getState().aiChatHistory[sid] || [];
-                                    const messagesPayload = currentHistory.map(toAIRequestMessage);
-                                    const sysMessages = await buildSystemContextMessages(
-                                        existing.jvmPlanContext,
-                                        existing.jvmDiagnosticPlanContext,
-                                    );
-                                    // 追加催促消息
-                                    messagesPayload.push({ role: 'user', content: tRef.current('ai_chat.panel.model_control.force_tool_call') });
-                                    const allMsg = [...sysMessages, ...messagesPayload];
-                                    const Service = (window as any).go?.aiservice?.Service;
-                                    if (Service?.AIChatStream) await Service.AIChatStream(sid, allMsg, getLocalTools());
-                                } catch (e) {
-                                    console.error('Nudge failed', e);
-                                    setSending(false);
-                                }
-                            })();
-                            return;
-                        }
-
-                        if (doneIsFirst) generateTitleForSession(sid);
-                        
-                        // 正常完成：关闭 loading，消除闪烁光标
-                        const hasContent = !!existing?.content?.trim();
-                        const hasThinking = !!existing?.thinking?.trim();
-                        const hasTools = !!(existing?.tool_calls?.length);
-                        
-                        if (!hasContent && !hasThinking && !hasTools) {
-                            updateAIChatMessage(sid, doneAssistantId, { content: tRef.current('ai_chat.panel.message.empty_response'), loading: false, phase: 'idle' });
-                        } else {
-                            updateAIChatMessage(sid, doneAssistantId, { loading: false, phase: 'idle' });
-                        }
-                    } else {
-                        addAIChatMessage(sid, { id: genId(), role: 'assistant', content: tRef.current('ai_chat.panel.message.request_interrupted'), timestamp: Date.now(), loading: false });
-                    }
-                    setSending(false);
-                }, 50);
-            }
-        };
-
-        EventsOn(eventName, handler);
-        return () => { EventsOff(eventName); };
-    }, [addAIChatMessage, updateAIChatMessage, sid, getLocalTools]);
-
-    const generateTitleForSession = async (currentSid: string) => {
-        try {
-            const Service = (window as any).go?.aiservice?.Service;
-            const historyLocal = useStore.getState().aiChatHistory[currentSid] || [];
-            if (!Service?.AIChatSend || historyLocal.length < 2) return;
-            
-            const firstUserMsg = historyLocal.find(m => m.role === 'user');
-            if (firstUserMsg) {
-                // 取用前 50 个字符截断，防止太长的查询消耗过多 Token
-                const snippet = firstUserMsg.content.slice(0, 50);
-                const titleReq = [
-                    { role: 'system', content: 'You are a summarizer. Provide a short 3-6 word title for this prompt. Do not use quotes, punctuation, or explain. Just the title in the same language as the prompt.' },
-                    { role: 'user', content: snippet }
-                ];
-                const res = await Service.AIChatSend(titleReq);
-                if (res?.success && res.content) {
-                    const cleanTitle = res.content.trim().replace(/^["']|["']$/g, '');
-                    updateAISessionTitle(currentSid, cleanTitle);
-                }
-            }
-        } catch (e) {
-            console.warn('Failed to auto-generate title', e);
-        }
-    };
-
-    const handleScrollMessages = useCallback((e: React.UIEvent<HTMLDivElement>) => {
-        const { scrollTop, scrollHeight, clientHeight } = e.currentTarget;
+    const handleScrollMessages = useCallback((event: React.UIEvent<HTMLDivElement>) => {
+        const { scrollTop, scrollHeight, clientHeight } = event.currentTarget;
         const isNearBottom = scrollHeight - scrollTop - clientHeight < 150;
         setShowScrollBottom(!isNearBottom);
     }, []);
@@ -893,14 +213,54 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
         truncateAIChatMessages(sid, msg.id);
         deleteAIChatMessage(sid, msg.id);
         setInput(msg.content);
+        setDraftAttachments(msg.attachments || []);
         setTimeout(() => textareaRef.current?.focus(), 50);
     }, [sid, truncateAIChatMessages, deleteAIChatMessage]);
 
+    const buildSystemContextMessages = useCallback((
+        overrideJVMPlanContext?: JVMAIPlanContext,
+        overrideJVMDiagnosticPlanContext?: JVMDiagnosticPlanContext,
+    ) => {
+        const { activeContext, aiContexts, connections, tabs, activeTabId } = useStore.getState();
+        return buildAISystemContextMessages({
+            activeContext,
+            aiContexts,
+            connections,
+            tabs,
+            activeTabId,
+            availableToolNames: availableTools.map((tool) => tool.function.name),
+            skills,
+            userPromptSettings,
+            overrideJVMPlanContext,
+            overrideJVMDiagnosticPlanContext,
+        });
+    }, [availableTools, skills, userPromptSettings]);
+
+    const {
+        executeLocalTools,
+        resetToolCallState,
+        toolContextMapRef,
+    } = useAIChatLocalTools({
+        sid,
+        activeProviderModel: activeProvider?.model,
+        availableTools,
+        buildSystemContextMessages,
+        dynamicModels,
+        mcpTools,
+        nextMessageId: genId,
+        pendingJVMPlanContextRef,
+        pendingJVMDiagnosticPlanContextRef,
+        setSending,
+        skills,
+        updateAIChatMessage,
+        userPromptSettings,
+    });
+
     const handleRetryMessage = useCallback(async (msg: AIChatMessage) => {
         const historyLocal = useStore.getState().aiChatHistory[sid] || [];
-        const aiIndex = historyLocal.findIndex(m => m.id === msg.id);
+        const aiIndex = historyLocal.findIndex(message => message.id === msg.id);
         if (aiIndex <= 0) return;
-        
+
         let lastUserMsgIndex = -1;
         for (let i = aiIndex - 1; i >= 0; i--) {
             if (historyLocal[i].role === 'user') {
@@ -908,14 +268,12 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
                 break;
             }
         }
-        
+
         if (lastUserMsgIndex >= 0) {
             const userMsg = historyLocal[lastUserMsgIndex];
-            truncateAIChatMessages(sid, userMsg.id); 
+            truncateAIChatMessages(sid, userMsg.id);
 
-            // 重置计数器（与 handleSend 保持一致）
-            toolCallRoundRef.current = 0;
-            totalToolRoundRef.current = 0;
+            resetToolCallState();
             nudgeCountRef.current = 0;
             const retryJVMPlanContext = msg.jvmPlanContext || getCurrentJVMPlanContext();
             const retryJVMDiagnosticPlanContext =
@@ -925,10 +283,13 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
 
             setSending(true);
 
-            // 插入 connecting 过渡消息（波纹动画），与 handleSend 保持一致
             const connectingMsg: AIChatMessage = {
-                id: genId(), role: 'assistant', phase: 'connecting', content: '',
-                timestamp: Date.now(), loading: true,
+                id: genId(),
+                role: 'assistant',
+                phase: 'connecting',
+                content: '',
+                timestamp: Date.now(),
+                loading: true,
                 jvmPlanContext: retryJVMPlanContext,
                 jvmDiagnosticPlanContext: retryJVMDiagnosticPlanContext,
             };
@@ -936,535 +297,119 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
 
             const truncatedHistory = historyLocal.slice(0, lastUserMsgIndex + 1);
             const messagesPayload = truncatedHistory.map(toAIRequestMessage);
-            
+
             try {
                 const sysMessages = await buildSystemContextMessages(
                     retryJVMPlanContext,
                     retryJVMDiagnosticPlanContext,
                 );
                 const allMessages = [...sysMessages, ...messagesPayload];
-                
-                const Service = (window as any).go?.aiservice?.Service;
-                if (Service?.AIChatStream) {
-                    await Service.AIChatStream(sid, allMessages, getLocalTools());
-                } else if (Service?.AIChatSend) {
-                     const result = await Service.AIChatSend(allMessages, getLocalTools());
-                     const errRaw = result?.error || t('ai_chat.panel.error.unknown');
-                     const errClean = sanitizeErrorMsg(errRaw, t);
-                     addAIChatMessage(sid, {
-                         id: genId(), role: 'assistant', 
-                         content: result?.success ? result.content : t('ai_chat.panel.message.error', { detail: errClean }),
-                         thinking: result?.success ? result.reasoning_content : undefined,
-                         reasoning_content: result?.success ? result.reasoning_content : undefined,
-                         rawError: (!result?.success && errClean !== errRaw) ? errRaw : undefined,
-                         timestamp: Date.now(),
-                         jvmPlanContext: retryJVMPlanContext,
-                         jvmDiagnosticPlanContext: retryJVMDiagnosticPlanContext,
-                     });
-                     setSending(false);
-                } else {
-                    setSending(false);
-                }
-            } catch(e: any) {
-                const rawE = e?.message || String(e);
-                const cleanE = sanitizeErrorMsg(rawE, t);
-                addAIChatMessage(sid, {
-                    id: genId(),
-                    role: 'assistant',
-                    content: t('ai_chat.panel.message.send_failed', { detail: cleanE }),
-                    rawError: cleanE !== rawE ? rawE : undefined,
-                    timestamp: Date.now(),
+                await dispatchAIChatPayload({
+                    sid,
+                    messages: allMessages,
+                    tools: availableTools,
+                    addAIChatMessage,
+                    updateAIChatMessage,
+                    setSending,
+                    nextMessageId: genId,
+                    pendingAssistantMessageId: connectingMsg.id,
                     jvmPlanContext: retryJVMPlanContext,
                     jvmDiagnosticPlanContext: retryJVMDiagnosticPlanContext,
                 });
+            } catch {
                 setSending(false);
             }
         }
     }, [
         sid,
+        availableTools,
+        buildSystemContextMessages,
         truncateAIChatMessages,
         addAIChatMessage,
         getCurrentJVMPlanContext,
         getCurrentJVMDiagnosticPlanContext,
-        getLocalTools,
-        t,
+        resetToolCallState,
+        updateAIChatMessage,
     ]);
 
-    const buildSystemContextMessages = useCallback(async (
-        overrideJVMPlanContext?: JVMAIPlanContext,
-        overrideJVMDiagnosticPlanContext?: JVMDiagnosticPlanContext,
-    ) => {
-        // 🔧 性能优化：从 store 实时读取，避免闭包捕获导致的依赖链式重建
-        const { activeContext: ctx, aiContexts: ctxMap, connections: conns, tabs: allTabs, activeTabId: tabId } = useStore.getState();
-
-        const connectionKey = ctx?.connectionId ? `${ctx.connectionId}:${ctx.dbName || ''}` : 'default';
-        const activeContextItems = ctxMap[connectionKey] || [];
-        const systemMessages: { role: string; content: string; images?: string[] }[] = [];
-        const matchesDiagnosticContext = (tab: typeof allTabs[number]) => {
-            if (!overrideJVMDiagnosticPlanContext || tab.type !== 'jvm-diagnostic') {
-                return false;
-            }
-            const tabConnection = conns.find(c => c.id === tab.connectionId);
-            const tabTransport = tabConnection?.config?.jvm?.diagnostic?.transport || 'agent-bridge';
-            return (
-                tab.connectionId === overrideJVMDiagnosticPlanContext.connectionId &&
-                tabTransport === overrideJVMDiagnosticPlanContext.transport
-            );
-        };
-        const activeTab = overrideJVMDiagnosticPlanContext
-            ? (
-                allTabs.find(t => t.id === overrideJVMDiagnosticPlanContext.tabId && matchesDiagnosticContext(t)) ||
-                allTabs.find(t => matchesDiagnosticContext(t))
-            )
-            : overrideJVMPlanContext
-                ? (
-                    allTabs.find(t => t.id === overrideJVMPlanContext.tabId) ||
-                    allTabs.find(
-                        t =>
-                            t.type === 'jvm-resource' &&
-                            t.connectionId === overrideJVMPlanContext.connectionId &&
-                            t.providerMode === overrideJVMPlanContext.providerMode &&
-                            String(t.resourcePath || '').trim() === overrideJVMPlanContext.resourcePath,
-                    )
-                )
-                : allTabs.find(t => t.id === tabId);
-        const activeConnection = activeTab?.connectionId
-            ? conns.find(c => c.id === activeTab.connectionId)
-            : undefined;
-
-        if (
-            activeTab &&
-            activeTab.type === 'jvm-diagnostic' &&
-            activeConnection?.config?.type === 'jvm'
-        ) {
-            const diagnostic = activeConnection.config.jvm?.diagnostic;
-            const diagnosticTransport = overrideJVMDiagnosticPlanContext?.transport || diagnostic?.transport || 'agent-bridge';
-            const readOnly = activeConnection.config.jvm?.readOnly !== false;
-            const environment = activeConnection.config.jvm?.environment || 'unknown';
-            systemMessages.push({
-                role: 'system',
-                content: tRef.current(jvmDiagnosticPromptKey, {
-                    connectionName: activeConnection.name,
-                    host: activeConnection.config.host || '-',
-                    transport: diagnosticTransport,
-                    environment,
-                    readOnlyPolicy: tRef.current(readOnly ? 'ai_chat.panel.jvm_diagnostic.policy.read_only' : 'ai_chat.panel.jvm_diagnostic.policy.plan_first'),
-                    observePolicy: tRef.current(diagnostic?.allowObserveCommands !== false ? 'ai_chat.panel.jvm_diagnostic.permission.allowed' : 'ai_chat.panel.jvm_diagnostic.permission.forbidden'),
-                    tracePolicy: tRef.current(diagnostic?.allowTraceCommands === true ? 'ai_chat.panel.jvm_diagnostic.permission.allowed' : 'ai_chat.panel.jvm_diagnostic.permission.forbidden'),
-                    mutatingPolicy: tRef.current(diagnostic?.allowMutatingCommands === true ? 'ai_chat.panel.jvm_diagnostic.permission.allowed' : 'ai_chat.panel.jvm_diagnostic.permission.forbidden'),
-                }),
-            });
-            return systemMessages;
-        }
-
-        if (
-            activeTab &&
-            (activeTab.type === 'jvm-resource' || activeTab.type === 'jvm-overview' || activeTab.type === 'jvm-audit') &&
-            activeConnection?.config?.type === 'jvm'
-        ) {
-            const providerMode = activeTab.providerMode || activeConnection.config.jvm?.preferredMode || 'jmx';
-            const resourcePath = activeTab.resourcePath || '';
-            const readOnly = activeConnection.config.jvm?.readOnly !== false;
-            const environment = activeConnection.config.jvm?.environment || 'unknown';
-            systemMessages.push({
-                role: 'system',
-                content: tRef.current(jvmRuntimePromptKey, {
-                    connectionName: activeConnection.name,
-                    host: activeConnection.config.host || '-',
-                    providerMode,
-                    environment,
-                    connectionPolicy: tRef.current(readOnly ? 'ai_chat.panel.jvm_runtime.policy.read_only' : 'ai_chat.panel.jvm_runtime.policy.preview_required'),
-                    resourcePathStatus: tRef.current(resourcePath ? 'ai_chat.panel.jvm_runtime.resource_path.current' : 'ai_chat.panel.jvm_runtime.resource_path.missing', { resourcePath }),
-                }),
-            });
-            return systemMessages;
-        }
-        
-        let targetConnId = ctx?.connectionId;
-        let targetDbName = ctx?.dbName;
-        if (!targetConnId || !targetDbName) {
-            if (activeTab && activeTab.connectionId && activeTab.dbName) {
-                targetConnId = activeTab.connectionId;
-                targetDbName = activeTab.dbName;
-            }
-        }
-
-        const conn = conns.find(c => c.id === targetConnId);
-        const dbType = conn?.config?.type || 'unknown';
-        const dbDisplayType = dbType === 'diros' ? 'Doris' : dbType.charAt(0).toUpperCase() + dbType.slice(1);
-        const ddlChunks = activeContextItems.map(c => `-- Table: ${c.dbName}.${c.tableName}\n${c.ddl}`).join('\n\n');
-        const connList = conns.map(c => `{id: "${c.id}", name: "${c.name}", type: "${c.config?.type || 'unknown'}"}`).join(', ');
-        const sqlPromptKey = activeContextItems.length > 0
-            ? 'ai_chat.panel.prompt.sql.context_tables'
-            : targetConnId && targetDbName
-                ? 'ai_chat.panel.prompt.sql.current_database'
-                : conns.length > 0
-                    ? 'ai_chat.panel.prompt.sql.no_context'
-                    : 'ai_chat.panel.prompt.sql.no_connections';
-        const sqlPromptParams = activeContextItems.length > 0
-            ? {
-                dbDisplayType,
-                ddlChunks,
-            }
-            : targetConnId && targetDbName
-                ? {
-                    dbDisplayType,
-                    targetDbName,
-                }
-                : conns.length > 0
-                    ? {
-                        connList,
-                    }
-                    : {};
-        systemMessages.push({
-            role: 'system',
-            content: tRef.current(sqlPromptKey, sqlPromptParams),
-        });
-        return systemMessages;
-    }, []); // 零依赖：函数内部通过 useStore.getState() 实时读取
-
-    // 记录所有成功的 get_tables 调用结果，用于表级精确匹配
-    const toolContextMapRef = useRef<Map<string, { connectionId: string; dbName: string; tables: string[] }>>(new Map());
-
-    const executeLocalTools = useCallback(async (toolCalls: AIToolCall[], currentAsstMsgId: string) => {
-        const translateToolChrome: AIChatTranslator = (key, params) => tRef.current(key, params);
-        const currentAsstMsg = (useStore.getState().aiChatHistory[sid] || []).find(m => m.id === currentAsstMsgId);
-        const inheritedJVMPlanContext = currentAsstMsg?.jvmPlanContext || pendingJVMPlanContextRef.current;
-        const inheritedJVMDiagnosticPlanContext =
-            currentAsstMsg?.jvmDiagnosticPlanContext || pendingJVMDiagnosticPlanContextRef.current;
-        pendingJVMPlanContextRef.current = inheritedJVMPlanContext;
-        pendingJVMDiagnosticPlanContextRef.current = inheritedJVMDiagnosticPlanContext;
-
-        // 【全局轮次熔断】防止模型（如 DeepSeek）在已生成答案后仍无限循环调用工具
-        const MAX_TOOL_CALL_ROUNDS = 15;
-        totalToolRoundRef.current += 1;
-        if (totalToolRoundRef.current > MAX_TOOL_CALL_ROUNDS) {
-            updateAIChatMessage(sid, currentAsstMsgId, { loading: false, phase: 'idle' });
-            useStore.getState().addAIChatMessage(sid, {
-                id: genId(), role: 'assistant',
-                content: translateToolChrome('ai_chat.panel.probe.max_rounds', { count: MAX_TOOL_CALL_ROUNDS }),
-                timestamp: Date.now(),
-                jvmPlanContext: inheritedJVMPlanContext,
-                jvmDiagnosticPlanContext: inheritedJVMDiagnosticPlanContext,
-            });
-            setSending(false);
-            return;
-        }
-
-        const results: AIChatMessage[] = [];
-        // 【串行逐条执行 + 实时写入 store】
-        for (const tc of toolCalls) {
-            let resStr = '';
-            let success = false;
-            try {
-                const args = JSON.parse(tc.function.arguments || '{}');
-                switch (tc.function.name) {
-                    case 'get_connections':
-                        const conns = useStore.getState().connections.map(c => ({
-                            id: c.id,
-                            name: c.name,
-                            type: c.config?.type,
-                            host: (c.config as any)?.host || (c.config as any)?.addr || ''
-                        }));
-                        resStr = JSON.stringify(conns);
-                        success = true;
-                        break;
-                    case 'get_databases': {
-                        const conn = useStore.getState().connections.find(c => c.id === args.connectionId);
-                        if (conn) {
-                            try {
-                                const dbRes = await DBGetDatabases(buildRpcConnectionConfig(conn.config) as any);
-                                if (dbRes?.success && Array.isArray(dbRes.data)) {
-                                    let dNames = dbRes.data.map((r: any) => r.Database || r.database || Object.values(r)[0]);
-                                    if (dNames.length > 50) dNames = [...dNames.slice(0, 50), '...(截断)'];
-                                    resStr = JSON.stringify(dNames);
-                                    success = true;
-                                } else {
-                                    resStr = dbRes?.message || 'Failed to fetch DBs';
-                                }
-                            } catch (e: any) {
-                                resStr = translateToolChrome('ai_chat.panel.tool_error.fetch_databases_failed', { detail: String(e?.message || e) });
-                            }
-                        } else { resStr = translateToolChrome('ai_chat.panel.tool_error.connection_not_found'); }
-                        break;
-                    }
-                    case 'get_tables': {
-                        const conn = useStore.getState().connections.find(c => c.id === args.connectionId);
-                        if (conn) {
-                            try {
-                                const rawDbName = args.dbName || args.database;
-                                const safeDbName = rawDbName ? String(rawDbName).trim() : '';
-                                const tbRes = await DBGetTables(buildRpcConnectionConfig(conn.config) as any, safeDbName);
-                                if (tbRes?.success && Array.isArray(tbRes.data)) {
-                                    let tNames = tbRes.data.map((r: any) => r.Table || r.table || Object.values(r)[0] as string);
-                                    if (tNames.length > 150) tNames = [...tNames.slice(0, 150), '...(截断)'];
-                                    resStr = JSON.stringify(tNames);
-                                    success = true;
-                                    // 🔑 记录已验证的上下文参数和表列表（用于后续表级精确匹配）
-                                    toolContextMapRef.current.set(`${args.connectionId}:${safeDbName}`, {
-                                        connectionId: args.connectionId,
-                                        dbName: safeDbName,
-                                        tables: tNames.filter((t: string) => t !== '...(截断)')
-                                    });
-                                } else { resStr = tbRes?.message || 'Failed to fetch Tables'; }
-                            } catch (e: any) {
-                                resStr = translateToolChrome('ai_chat.panel.tool_error.fetch_tables_failed', { detail: String(e?.message || e) });
-                            }
-                        } else { resStr = translateToolChrome('ai_chat.panel.tool_error.connection_not_found'); }
-                        break;
-                    }
-                    case 'get_columns': {
-                        const conn = useStore.getState().connections.find(c => c.id === args.connectionId);
-                        if (conn) {
-                            try {
-                                const safeDbName = args.dbName ? String(args.dbName).trim() : '';
-                                const safeTable = args.tableName ? String(args.tableName).trim() : '';
-                                const { DBGetColumns } = await import('../../wailsjs/go/app/App');
-                                const colRes = await DBGetColumns(buildRpcConnectionConfig(conn.config) as any, safeDbName, safeTable);
-                                if (colRes?.success && Array.isArray(colRes.data)) {
-                                    // 只保留关键字段信息，减少 token 占用
-                                    const cols = colRes.data.map((c: any) => {
-                                        const keys = Object.keys(c);
-                                        return {
-                                            field: c.Field || c.field || c.COLUMN_NAME || c.column_name || c.Name || c.name || (keys.length > 0 ? c[keys[0]] : ''),
-                                            type: c.Type || c.type || c.DATA_TYPE || c.data_type || (keys.length > 1 ? c[keys[1]] : ''),
-                                            nullable: c.Null || c.null || c.IS_NULLABLE || c.is_nullable || c.Nullable || c.nullable || '',
-                                            default: c.Default || c.default || c.COLUMN_DEFAULT || c.column_default || c.DefaultValue || '',
-                                            comment: c.Comment || c.comment || c.COLUMN_COMMENT || c.column_comment || c.Description || '',
-                                        };
-                                    });
-                                    // ⚠️ 在工具返回结果中直接注入强制警告，确保模型使用精确字段名
-                                    const fieldNames = cols.map((c: any) => c.field).join(', ');
-                                    resStr = translateToolChrome('ai_chat.panel.tool_result.columns_exact_fields', { tableName: safeTable, fieldNames, detailJson: JSON.stringify(cols) });
-                                    success = true;
-                                } else { resStr = colRes?.message || 'Failed to fetch columns'; }
-                            } catch (e: any) {
-                                resStr = translateToolChrome('ai_chat.panel.tool_error.fetch_columns_failed', { detail: String(e?.message || e) });
-                            }
-                        } else { resStr = translateToolChrome('ai_chat.panel.tool_error.connection_not_found'); }
-                        break;
-                    }
-                    case 'get_table_ddl': {
-                        const conn = useStore.getState().connections.find(c => c.id === args.connectionId);
-                        if (conn) {
-                            try {
-                                const safeDbName = args.dbName ? String(args.dbName).trim() : '';
-                                const safeTable = args.tableName ? String(args.tableName).trim() : '';
-                                const { DBShowCreateTable, DBGetColumns } = await import('../../wailsjs/go/app/App');
-                                const rpcConfig = buildRpcConnectionConfig(conn.config) as any;
-                                const toolResult = await resolveAITableSchemaToolResult({
-                                    tableName: safeTable,
-                                    fetchDDL: () => DBShowCreateTable(rpcConfig, safeDbName, safeTable),
-                                    fetchColumns: () => DBGetColumns(rpcConfig, safeDbName, safeTable),
-                                });
-                                resStr = toolResult.content;
-                                success = toolResult.success;
-                            } catch (e: any) {
-                                resStr = translateToolChrome('ai_chat.panel.tool_error.fetch_table_ddl_failed', { detail: String(e?.message || e) });
-                            }
-                        } else { resStr = translateToolChrome('ai_chat.panel.tool_error.connection_not_found'); }
-                        break;
-                    }
-                    case 'execute_sql': {
-                        const conn = useStore.getState().connections.find(c => c.id === args.connectionId);
-                        if (conn) {
-                            try {
-                                const safeDbName = args.dbName ? String(args.dbName).trim() : '';
-                                const safeSql = args.sql ? String(args.sql).trim() : '';
-                                // 安全级别检查
-                                const Service = (window as any).go?.aiservice?.Service;
-                                if (Service?.AICheckSQL) {
-                                    const check = await Service.AICheckSQL(safeSql);
-                                    if (!check.allowed) {
-                                        resStr = translateToolChrome('ai_chat.panel.tool_error.sql_blocked', { operationType: check.operationType });
-                                        break;
-                                    }
-                                }
-                                const { DBQuery } = await import('../../wailsjs/go/app/App');
-                                const finalSql = buildAIReadonlyPreviewSQL(conn.config?.type || '', safeSql, 50, conn.config?.driver || '');
-                                const qRes = await DBQuery(buildRpcConnectionConfig(conn.config) as any, safeDbName, finalSql);
-                                if (qRes?.success) {
-                                    const rows = Array.isArray(qRes.data) ? qRes.data : [];
-                                    const limitedRows = rows.slice(0, 50);
-                                    resStr = JSON.stringify({ rowCount: rows.length, data: limitedRows });
-                                    success = true;
-                                } else { resStr = qRes?.message || translateToolChrome('ai_chat.panel.tool_error.sql_execute_failed'); }
-                            } catch (e: any) {
-                                resStr = translateToolChrome('ai_chat.panel.tool_error.sql_execute_exception', { detail: String(e?.message || e) });
-                            }
-                        } else { resStr = translateToolChrome('ai_chat.panel.tool_error.connection_not_found'); }
-                        break;
-                    }
-                    default:
-                        resStr = translateToolChrome('ai_chat.panel.tool_error.unknown_function', { functionName: tc.function.name });
-                }
-            } catch (e: any) {
-                resStr = e.message;
-            }
-
-            const toolResultMsg: AIChatMessage = {
-                id: genId(),
-                role: 'tool',
-                content: resStr,
-                timestamp: Date.now(),
-                tool_call_id: tc.id,
-                tool_name: tc.function.name,
-                success
-            };
-            results.push(toolResultMsg);
-
-            // 【实时写入】每执行完一条立即写入 store，让 UI 能实时看到进度打勾
-            useStore.getState().addAIChatMessage(sid, toolResultMsg);
-
-            // 延迟 150ms，给 UI 渲染时间，创造“逐个完成”的视觉节奏
-            await new Promise(resolve => setTimeout(resolve, 150));
-        }
-
-        // 智能熔断：只计连续失败轮次，成功则重置
-        const anySuccess = results.some(r => r.success === true);
-        if (anySuccess) {
-            toolCallRoundRef.current = 0;
-        } else {
-            toolCallRoundRef.current += 1;
-            if (toolCallRoundRef.current >= 3) {
-                useStore.getState().addAIChatMessage(sid, {
-                    id: genId(), role: 'assistant',
-                    content: translateToolChrome('ai_chat.panel.probe.consecutive_failed'),
-                    timestamp: Date.now(),
-                    jvmPlanContext: inheritedJVMPlanContext,
-                    jvmDiagnosticPlanContext: inheritedJVMDiagnosticPlanContext,
-                });
-                setSending(false);
-                return;
-            }
-        }
-        try {
-            // 【过渡状态】工具执行完毕，将上一条消息的 loading 关闭（消除闪烁光标）
-            updateAIChatMessage(sid, currentAsstMsgId, { loading: false, phase: 'idle' });
-
-            // 插入过渡气泡
-            const chainConnectingMsg: AIChatMessage = {
-                id: genId(), role: 'assistant', phase: 'connecting', 
-                content: translateToolChrome('ai_chat.panel.status.summarizing_probe'),
-                timestamp: Date.now(), loading: true,
-                jvmPlanContext: inheritedJVMPlanContext,
-                jvmDiagnosticPlanContext: inheritedJVMDiagnosticPlanContext,
-            };
-            useStore.getState().addAIChatMessage(sid, chainConnectingMsg);
-            
-            // 模拟人类视角的平滑多段过渡
-            const safeUpdateTransition = (text: string) => {
-                const currentMsg = useStore.getState().aiChatHistory[sid]?.find(m => m.id === chainConnectingMsg.id);
-                // 只有当消息仍然处于连接过渡态时才允许修改文本；如果模型已经开始吐出思考、正文、工具或结束，直接退出
-                if (currentMsg && currentMsg.phase === 'connecting' && currentMsg.loading) {
-                    updateAIChatMessage(sid, chainConnectingMsg.id, { content: text });
-                }
-            };
-
-            setTimeout(() => safeUpdateTransition(translateToolChrome('ai_chat.panel.status.returning_runtime_data')), 200);
-            setTimeout(() => safeUpdateTransition(translateToolChrome('ai_chat.panel.status.deep_reasoning')), 500);
-            setTimeout(() => safeUpdateTransition(translateToolChrome('ai_chat.panel.status.waiting_instruction')), 1200);
-            setTimeout(() => safeUpdateTransition(translateToolChrome('ai_chat.panel.status.analyzing_chain')), 3000);
-
-            setSending(true);
-            const currentHistory = useStore.getState().aiChatHistory[sid] || [];
-            // 过滤掉 connecting 占位消息，不发给模型
-            const messagesPayload = currentHistory.filter(m => m.phase !== 'connecting').map(toAIRequestMessage);
-            const sysMessages = await buildSystemContextMessages(
-                inheritedJVMPlanContext,
-                inheritedJVMDiagnosticPlanContext,
-            );
-
-            let finalMessagesPayload = messagesPayload;
-            // 在这里加入长度检查和自动摘要（带上动态限额）
-            const dynamicMaxLimit = getDynamicMaxContextChars(activeProvider?.model);
-            const summary = await compressContextIfNeeded(sid, messagesPayload, dynamicMaxLimit, translateToolChrome);
-            if (summary) {
-                 const compressedMsg: AIChatMessage = {
-                     id: genId(), role: 'assistant', content: translateToolChrome('ai_chat.panel.status.memory_probe_summary', { summary }), timestamp: Date.now() - 1000
-                 };
-                 const continueMsg: AIChatMessage = {
-                     id: genId(), role: 'user', content: translateToolChrome('ai_chat.panel.model_control.continue_after_summary'), timestamp: Date.now() - 500
-                 };
-                 useStore.getState().replaceAIChatHistory(sid, [compressedMsg, continueMsg, chainConnectingMsg]);
-                 finalMessagesPayload = [
-                     { role: 'assistant', content: compressedMsg.content },
-                     { role: 'user', content: continueMsg.content }
-                 ];
-            }
-
-            const allMessages = [...sysMessages, ...finalMessagesPayload];
-
-            // 【软收敛】超过 10 轮工具调用后，不再传递 tools 参数，从物理层面强制模型只能用文本回答
-            const SOFT_LIMIT_ROUNDS = 10;
-            const chainTools = totalToolRoundRef.current >= SOFT_LIMIT_ROUNDS ? [] : getLocalTools();
-
-            const Service = (window as any).go?.aiservice?.Service;
-            if (Service?.AIChatStream) {
-                await Service.AIChatStream(sid, allMessages, chainTools);
-            } else if (Service?.AIChatSend) {
-                const result = await Service.AIChatSend(allMessages, chainTools);
-                const errR = result?.error || translateToolChrome('ai_chat.panel.error.unknown');
-                const errC = sanitizeErrorMsg(errR, translateToolChrome);
-                useStore.getState().addAIChatMessage(sid, {
-                    id: genId(), role: 'assistant',
-                    content: result?.success ? result.content : translateToolChrome('ai_chat.panel.message.error', { detail: errC }),
-                    thinking: result?.success ? result.reasoning_content : undefined,
-                    reasoning_content: result?.success ? result.reasoning_content : undefined,
-                    rawError: (!result?.success && errC !== errR) ? errR : undefined,
-                    timestamp: Date.now(),
-                    jvmPlanContext: inheritedJVMPlanContext,
-                    jvmDiagnosticPlanContext: inheritedJVMDiagnosticPlanContext,
-                });
-                setSending(false);
-            }
-        } catch (e) {
-            console.error('Failed to chain tool call', e);
-            setSending(false);
-        }
-    }, [sid, buildSystemContextMessages, getLocalTools]);
+    useAIChatStreamSubscription({
+        sid,
+        sending,
+        setSending,
+        availableTools,
+        addAIChatMessage,
+        updateAIChatMessage,
+        buildSystemContextMessages,
+        executeLocalTools,
+        generateTitleForSession,
+        nextMessageId: genId,
+        nudgeCountRef,
+        pendingJVMPlanContextRef,
+        pendingJVMDiagnosticPlanContextRef,
+    });
 
     const handleSend = useCallback(async () => {
         const text = input.trim();
-        if ((!text && draftImages.length === 0) || sending) return;
+        if ((!text && draftAttachments.length === 0) || sending) return;
 
-        // 前置校验：必须配置供应商且选择模型后才能发送
-        if (!activeProvider) {
+        const connectionKey = activeContext?.connectionId ? `${activeContext.connectionId}:${activeContext.dbName || ''}` : 'default';
+        const readiness = buildAIChatReadinessSnapshot({
+            activeProvider,
+            dynamicModels,
+            loadingModels,
+            activeContext,
+            activeContextItems: aiContexts[connectionKey] || [],
+        });
+
+        if (readiness.status === 'missing_provider') {
             setComposerNoticeState({ kind: 'missing_provider' });
             return;
         }
-        if (!activeProvider.model || !activeProvider.model.trim()) {
+        if (readiness.status === 'provider_incomplete') {
+            setComposerNoticeState({ kind: 'provider_incomplete', issues: readiness.issues });
+            return;
+        }
+        if (readiness.status === 'missing_model' || readiness.status === 'loading_models') {
             setComposerNoticeState({ kind: 'missing_model' });
             return;
         }
         setComposerNoticeState(null);
 
-        toolCallRoundRef.current = 0; // 重置工具调用轮次计数
-        totalToolRoundRef.current = 0; // 重置总轮次计数
-        nudgeCountRef.current = 0;     // 重置催促计数
+        resetToolCallState();
+        nudgeCountRef.current = 0;
         const currentJVMPlanContext = getCurrentJVMPlanContext();
         const currentJVMDiagnosticPlanContext = getCurrentJVMDiagnosticPlanContext();
         pendingJVMPlanContextRef.current = currentJVMPlanContext;
         pendingJVMDiagnosticPlanContextRef.current = currentJVMDiagnosticPlanContext;
 
-        const currentImages = [...draftImages];
+        const currentAttachments = [...draftAttachments];
+        const currentImages = currentAttachments
+            .filter((attachment) => attachment.kind === 'image' && attachment.dataUrl)
+            .map((attachment) => attachment.dataUrl as string);
+        const currentFileAttachments = currentAttachments.filter((attachment) => attachment.kind !== 'image');
         setInput('');
-        setDraftImages([]);
+        setDraftAttachments([]);
         setSending(true);
 
-        if (textareaRef.current) {
-            textareaRef.current.focus();               
-        }
+        textareaRef.current?.focus();
 
         const userMsg: AIChatMessage = {
-            id: genId(), role: 'user', content: text, timestamp: Date.now(),
+            id: genId(),
+            role: 'user',
+            content: text,
+            timestamp: Date.now(),
             images: currentImages.length > 0 ? currentImages : undefined,
+            attachments: currentFileAttachments.length > 0 ? currentFileAttachments : undefined,
         };
         addAIChatMessage(sid, userMsg);
-        
+
         const connectingMsg: AIChatMessage = {
-            id: genId(), role: 'assistant', phase: 'connecting', content: '', 
-            timestamp: Date.now(), loading: true,
+            id: genId(),
+            role: 'assistant',
+            phase: 'connecting',
+            content: '',
+            timestamp: Date.now(),
+            loading: true,
             jvmPlanContext: currentJVMPlanContext,
             jvmDiagnosticPlanContext: currentJVMDiagnosticPlanContext,
         };
@@ -1475,101 +420,72 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
             currentJVMDiagnosticPlanContext,
         );
 
-        // 【过渡状态 2】上下文已组装完成，即将接入模型
         updateAIChatMessage(sid, connectingMsg.id, { content: t('ai_chat.panel.status.model_connecting') });
 
         const chatMessages = [...messages, userMsg].map(toAIRequestMessage);
 
         let finalMessagesPayload = chatMessages;
         const dynamicMaxLimit = getDynamicMaxContextChars(activeProvider?.model);
-        const summary = await compressContextIfNeeded(sid, chatMessages, dynamicMaxLimit, t);
+        const summary = await compressContextIfNeeded(sid, chatMessages, dynamicMaxLimit);
         if (summary) {
-            // 清理原有历史，保留系统生成的总结记录和当前的 userMsg 以及 connectingMsg
             const compressedMsg: AIChatMessage = {
-                id: genId(), role: 'assistant', content: t('ai_chat.panel.status.memory_summary', { summary }), timestamp: Date.now() - 1000
+                id: genId(),
+                role: 'assistant',
+                content: t('ai_chat.panel.status.memory_summary', { summary }),
+                timestamp: Date.now() - 1000,
             };
             useStore.getState().replaceAIChatHistory(sid, [compressedMsg, userMsg, connectingMsg]);
             finalMessagesPayload = [
                 { role: 'assistant', content: compressedMsg.content },
-                { role: 'user', content: userMsg.content, images: userMsg.images }
+                toAIRequestMessage(userMsg),
             ];
         }
 
         const allMessages = [...systemMessages, ...finalMessagesPayload];
 
-        // 【过渡状态 3】大脑唤醒
         updateAIChatMessage(sid, connectingMsg.id, { content: t('ai_chat.panel.status.waking_engine') });
-
-        // 【过渡状态 4】最后一步，等待第一字节返回
         updateAIChatMessage(sid, connectingMsg.id, { content: t('ai_chat.panel.status.waiting_response') });
 
-        try {
-            const Service = (window as any).go?.aiservice?.Service;
-            if (Service?.AIChatStream) {
-                await Service.AIChatStream(sid, allMessages, getLocalTools());
-            } else if (Service?.AIChatSend) {
-                const result = await Service.AIChatSend(allMessages, getLocalTools());
-                const errR2 = result?.error || t('ai_chat.panel.error.unknown');
-                const errC2 = sanitizeErrorMsg(errR2, t);
-                const assistantMsg: AIChatMessage = {
-                    id: genId(), role: 'assistant',
-                    content: result?.success ? result.content : t('ai_chat.panel.message.error', { detail: errC2 }),
-                    thinking: result?.success ? result.reasoning_content : undefined,
-                    reasoning_content: result?.success ? result.reasoning_content : undefined,
-                    rawError: (!result?.success && errC2 !== errR2) ? errR2 : undefined,
-                    timestamp: Date.now(),
-                    jvmPlanContext: currentJVMPlanContext,
-                    jvmDiagnosticPlanContext: currentJVMDiagnosticPlanContext,
-                };
-                addAIChatMessage(sid, assistantMsg);
-                setSending(false);
-                
-                // auto-generate title fallback for non-stream
-                if (messages.length === 0) {
-                    generateTitleForSession(sid);
-                }
-            } else {
-                addAIChatMessage(sid, {
-                    id: genId(),
-                    role: 'assistant',
-                    content: t('ai_chat.panel.message.service_not_ready'),
-                    timestamp: Date.now(),
-                    jvmPlanContext: currentJVMPlanContext,
-                    jvmDiagnosticPlanContext: currentJVMDiagnosticPlanContext,
-                });
-                setSending(false);
-            }
-        } catch (e: any) {
-            const rawE2 = e?.message || String(e);
-            const cleanE2 = sanitizeErrorMsg(rawE2, t);
-            addAIChatMessage(sid, {
-                id: genId(),
-                role: 'assistant',
-                content: t('ai_chat.panel.message.send_failed', { detail: cleanE2 }),
-                rawError: cleanE2 !== rawE2 ? rawE2 : undefined,
-                timestamp: Date.now(),
-                jvmPlanContext: currentJVMPlanContext,
-                jvmDiagnosticPlanContext: currentJVMDiagnosticPlanContext,
-            });
-            setSending(false);
-        }
+        await dispatchAIChatPayload({
+            sid,
+            messages: allMessages,
+            tools: availableTools,
+            addAIChatMessage,
+            updateAIChatMessage,
+            setSending,
+            nextMessageId: genId,
+            pendingAssistantMessageId: connectingMsg.id,
+            jvmPlanContext: currentJVMPlanContext,
+            jvmDiagnosticPlanContext: currentJVMDiagnosticPlanContext,
+            unavailableContent: t('ai_chat.panel.message.service_not_ready'),
+            onNonStreamSuccess: messages.length === 0
+                ? () => generateTitleForSession(sid)
+                : undefined,
+        });
     }, [
         input,
-        draftImages,
+        draftAttachments,
         sending,
         messages,
         addAIChatMessage,
         sid,
+        activeContext,
         activeProvider,
+        aiContexts,
+        availableTools,
         buildSystemContextMessages,
+        dynamicModels,
+        generateTitleForSession,
         getCurrentJVMPlanContext,
         getCurrentJVMDiagnosticPlanContext,
-        getLocalTools,
+        loadingModels,
+        resetToolCallState,
         t,
+        updateAIChatMessage,
     ]);
 
-    const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
-        consumeAIChatSendShortcutOnKeyDown(aiChatSendShortcutBinding, e, handleSend);
+    const handleKeyDown = useCallback((event: React.KeyboardEvent) => {
+        consumeAIChatSendShortcutOnKeyDown(aiChatSendShortcutBinding, event, handleSend);
     }, [aiChatSendShortcutBinding, handleSend]);
 
     const handleStop = useCallback(async () => {
@@ -1578,201 +494,140 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
             if (Service?.AIChatCancel) {
                 await Service.AIChatCancel(sid);
             }
-        } catch (e) {
-            console.warn('Failed to stop chat stream', e);
+        } catch (error) {
+            console.warn('Failed to stop chat stream', error);
         }
         setSending(false);
     }, [sid]);
 
-    const ghostRef = useRef<HTMLDivElement>(null);
-    const panelRect = useRef<{top: number, bottom: number, left: number} | null>(null);
+    const { inferredConnectionId, inferredDbName } = useMemo(
+        () => inferAIChatConnectionContext({
+            activeConnectionId: activeContext?.connectionId,
+            activeDbName: activeContext?.dbName,
+            messages,
+            toolContextEntries: toolContextMapRef.current.values(),
+        }),
+        [activeContext?.connectionId, activeContext?.dbName, messages],
+    );
 
-    const handleResizeStart = useCallback((e: React.MouseEvent) => {
-        e.preventDefault();
-        setIsResizing(true);
-        resizeStartX.current = e.clientX;
-        resizeStartWidth.current = panelWidth;
-        dragWidthRef.current = panelWidth;
-        if (panelRef.current) {
-            const rect = panelRef.current.getBoundingClientRect();
-            panelRect.current = {
-                top: rect.top,
-                bottom: window.innerHeight - rect.bottom,
-                left: rect.left
-            };
-        }
-    }, [panelWidth]);
-
-    useEffect(() => {
-        if (!isResizing) return;
-        let animationFrameId: number;
-        const handleMouseMove = (e: MouseEvent) => {
-            if (animationFrameId) {
-                cancelAnimationFrame(animationFrameId);
-            }
-            animationFrameId = requestAnimationFrame(() => {
-                const delta = resizeStartX.current - e.clientX;
-                const minWidth = isV2Ui ? 300 : 280;
-                const maxWidth = isV2Ui ? 520 : 700;
-                const newWidth = Math.min(Math.max(resizeStartWidth.current + delta, minWidth), maxWidth);
-                dragWidthRef.current = newWidth;
-                
-                // 仅更新 ghost 虚线位置，通过绝对定位规避重排
-                if (ghostRef.current && panelRect.current) {
-                    const actualDelta = newWidth - resizeStartWidth.current;
-                    ghostRef.current.style.left = `${panelRect.current.left - actualDelta}px`;
-                }
-            });
-        };
-        const handleMouseUp = () => {
-            if (animationFrameId) {
-                cancelAnimationFrame(animationFrameId);
-            }
-            setIsResizing(false);
-            // 拖拽结束时才提交最终宽度到 React state 和外层回调
-            setPanelWidth(dragWidthRef.current);
-            onWidthChange?.(dragWidthRef.current);
-        };
-        
-        document.addEventListener('mousemove', handleMouseMove);
-        document.addEventListener('mouseup', handleMouseUp);
-        
-        // 拖拽期间关闭指针事件以避免下方 Monaco Editor 捕获 hover 或重绘，极大提升性能
-        document.body.style.cursor = 'col-resize';
-        document.body.style.userSelect = 'none';
-        document.body.style.pointerEvents = 'none'; // 关键性能优化
-        
-        return () => {
-            if (animationFrameId) cancelAnimationFrame(animationFrameId);
-            document.removeEventListener('mousemove', handleMouseMove);
-            document.removeEventListener('mouseup', handleMouseUp);
-            document.body.style.cursor = '';
-            document.body.style.userSelect = '';
-            document.body.style.pointerEvents = '';
-        };
-    }, [isResizing, isV2Ui, onWidthChange]);
-
-    // 回推幽灵上下文：基于 get_tables 记录进行表级精确匹配（useMemo 缓存，避免每帧重算）
-    const { inferredConnectionId, inferredDbName } = useMemo(() => {
-        let connId = activeContext?.connectionId;
-        let dbName = activeContext?.dbName;
-
-        if (!connId || !dbName) {
-            const allMsgText = messages.map(m => m.content || '').join(' ');
-            let bestMatch: { connectionId: string; dbName: string } | null = null;
-            let bestScore = 0;
-            for (const entry of toolContextMapRef.current.values()) {
-                let score = 0;
-                for (const table of entry.tables) {
-                    if (allMsgText.includes(table)) score++;
-                }
-                if (score > bestScore) {
-                    bestScore = score;
-                    bestMatch = { connectionId: entry.connectionId, dbName: entry.dbName };
-                }
-            }
-            if (bestMatch) {
-                if (!connId) connId = bestMatch.connectionId;
-                if (!dbName) dbName = bestMatch.dbName;
-            }
-        }
-        return { inferredConnectionId: connId, inferredDbName: dbName };
-    }, [activeContext?.connectionId, activeContext?.dbName, messages.length]);
-
-    // useMemo 缓存：避免内联闭包击穿子组件 memo
     const handleDeleteMessage = useCallback((id: string) => deleteAIChatMessage(sid, id), [sid, deleteAIChatMessage]);
     const handleMessageRenderError = useCallback((error: Error, errorInfo: React.ErrorInfo, msg: AIChatMessage) => {
         console.error('[AI Message Render Error]', msg.id, error, errorInfo);
+        const renderErrorPayload = {
+            messageId: msg.id,
+            role: msg.role,
+            contentPreview: String(msg.content || '').slice(0, 240),
+            message: error.message,
+            stack: error.stack,
+            componentStack: errorInfo.componentStack,
+            recordedAt: Date.now(),
+        };
         if (typeof window !== 'undefined') {
-            (window as any).__gonaviLastAIMessageRenderError = {
-                messageId: msg.id,
-                role: msg.role,
-                contentPreview: String(msg.content || '').slice(0, 240),
-                message: error.message,
-                stack: error.stack,
-                componentStack: errorInfo.componentStack,
-            };
+            (window as any).__gonaviLastAIMessageRenderError = renderErrorPayload;
         }
+        (globalThis as any).__gonaviLastAIMessageRenderError = renderErrorPayload;
     }, []);
+    const currentSessionTitle = useMemo(
+        () => orderedAISessions.find((session) => session.id === sid)?.title || t('ai_chat.panel.session.default_title'),
+        [orderedAISessions, sid, t],
+    );
     const activeConnectionConfig = useMemo(() => {
         if (!inferredConnectionId) return undefined;
-        const connection = connections.find(c => c.id === inferredConnectionId);
+        const connection = connections.find(item => item.id === inferredConnectionId);
         return connection ? buildRpcConnectionConfig(connection.config) : undefined;
     }, [inferredConnectionId, connections]);
-    const contextUsageChars = useMemo(() =>
-        messages.reduce((sum, m) => sum + (m.content?.length || 0) + (m.reasoning_content?.length || 0) + JSON.stringify(m.tool_calls || []).length, 0),
-    [messages]);
-    const contextTableNames = useMemo(() => {
-        const ck = activeContext?.connectionId ? `${activeContext.connectionId}:${activeContext.dbName || ''}` : 'default';
-        return (aiContexts[ck] || []).map(c => `${c.dbName}.${c.tableName}`);
-    }, [activeContext?.connectionId, activeContext?.dbName, aiContexts]);
+    const contextUsageChars = useMemo(
+        () => calculateAIContextUsageChars(messages),
+        [messages],
+    );
+    const contextTableNames = useMemo(
+        () => collectAIChatContextTableNames({
+            aiContexts,
+            activeConnectionId: activeContext?.connectionId,
+            activeDbName: activeContext?.dbName,
+        }),
+        [activeContext?.connectionId, activeContext?.dbName, aiContexts],
+    );
     const aiInsights = useMemo(() => {
         const recentLogs = sqlLogs.slice(0, 24);
         const slowest = recentLogs
             .filter((log) => log.status === 'success')
-            .sort((a, b) => b.duration - a.duration)[0];
+            .sort((left, right) => right.duration - left.duration)[0];
         const errors = recentLogs.filter((log) => log.status === 'error');
         const writeCount = recentLogs.filter((log) => /\b(INSERT|UPDATE|DELETE|ALTER|DROP|CREATE)\b/i.test(log.sql)).length;
         const contextCount = contextTableNames.length;
         const tableSeparator = t('ai_chat.panel.insight.context.table_separator');
         const tablePreview = `${contextTableNames.slice(0, 3).join(tableSeparator)}${contextCount > 3 ? t('ai_chat.panel.insight.context.more_tables_suffix') : ''}`;
+
         return [
             {
-                tone: 'info',
-                title: contextCount > 0 ? t('ai_chat.panel.insight.context.linked_title', { count: contextCount }) : t('ai_chat.panel.insight.context.empty_title'),
+                tone: 'info' as const,
+                title: contextCount > 0
+                    ? t('ai_chat.panel.insight.context.linked_title', { count: contextCount })
+                    : t('ai_chat.panel.insight.context.empty_title'),
                 body: contextCount > 0
                     ? t('ai_chat.panel.insight.context.linked_body', { tables: tablePreview })
                     : t('ai_chat.panel.insight.context.empty_body'),
             },
             {
-                tone: slowest && slowest.duration > 1000 ? 'warn' : 'accent',
-                title: slowest ? t('ai_chat.panel.insight.query.slowest_title', { duration: Math.round(slowest.duration).toLocaleString() }) : t('ai_chat.panel.insight.query.empty_title'),
+                tone: slowest && slowest.duration > 1000 ? 'warn' as const : 'accent' as const,
+                title: slowest
+                    ? t('ai_chat.panel.insight.query.slowest_title', { duration: Math.round(slowest.duration).toLocaleString() })
+                    : t('ai_chat.panel.insight.query.empty_title'),
                 body: slowest ? slowest.sql.slice(0, 140) : t('ai_chat.panel.insight.query.empty_body'),
             },
             {
-                tone: errors.length > 0 ? 'warn' : 'info',
-                title: errors.length > 0 ? t('ai_chat.panel.insight.status.failed_title', { count: errors.length }) : t('ai_chat.panel.insight.status.ok_title'),
-                body: errors[0]?.message || (recentLogs.length > 0 ? t('ai_chat.panel.insight.status.recent_body', { count: recentLogs.length }) : t('ai_chat.panel.insight.status.empty_body')),
+                tone: errors.length > 0 ? 'warn' as const : 'info' as const,
+                title: errors.length > 0
+                    ? t('ai_chat.panel.insight.status.failed_title', { count: errors.length })
+                    : t('ai_chat.panel.insight.status.ok_title'),
+                body: errors[0]?.message || (
+                    recentLogs.length > 0
+                        ? t('ai_chat.panel.insight.status.recent_body', { count: recentLogs.length })
+                        : t('ai_chat.panel.insight.status.empty_body')
+                ),
             },
             {
-                tone: writeCount > 0 ? 'warn' : 'accent',
-                title: writeCount > 0 ? t('ai_chat.panel.insight.write.detected_title', { count: writeCount }) : t('ai_chat.panel.insight.write.readonly_title'),
-                body: writeCount > 0 ? t('ai_chat.panel.insight.write.detected_body') : t('ai_chat.panel.insight.write.readonly_body'),
+                tone: writeCount > 0 ? 'warn' as const : 'accent' as const,
+                title: writeCount > 0
+                    ? t('ai_chat.panel.insight.write.detected_title', { count: writeCount })
+                    : t('ai_chat.panel.insight.write.readonly_title'),
+                body: writeCount > 0
+                    ? t('ai_chat.panel.insight.write.detected_body')
+                    : t('ai_chat.panel.insight.write.readonly_body'),
             },
         ];
     }, [contextTableNames, sqlLogs, t]);
+    const panelHistorySessions = useMemo(
+        () => buildAIChatInlineHistorySessions(
+            orderedAISessions.map((session) => ({
+                ...session,
+                title: session.title || t('ai_chat.panel.session.default_title'),
+            })),
+        ),
+        [orderedAISessions, t],
+    );
+    const effectivePanelMode = useMemo(
+        () => resolveAIChatPanelMode(isV2Ui, activePanelMode),
+        [activePanelMode, isV2Ui],
+    );
 
-    const renderPanelHistoryList = () => {
-        const sessions = aiChatSessions.slice(0, 8);
-        if (sessions.length === 0) {
-            return <div className="gn-v2-ai-empty-note">{t('ai_chat.panel.history.empty')}</div>;
-        }
-        return sessions.map((session) => (
-            <button
-                key={session.id}
-                type="button"
-                className={`gn-v2-ai-history-card${session.id === sid ? ' is-active' : ''}`}
-                onClick={() => {
-                    setAIActiveSessionId(session.id);
-                    setActivePanelMode('chat');
-                }}
-            >
-                <span>
-                    <HistoryOutlined />
-                    <strong>{session.title || t('ai_chat.panel.session.default_title')}</strong>
-                </span>
-                <small>{new Date(session.updatedAt).toLocaleString(undefined, { month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit' })}</small>
-            </button>
-        ));
-    };
-    const effectivePanelMode = isV2Ui ? activePanelMode : 'chat';
+    const handleComposerActionWithNoticeReset = useCallback((actionKey: 'open-settings' | 'reload-models') => {
+        setComposerNoticeState(null);
+        handleComposerAction(actionKey);
+    }, [handleComposerAction]);
+
+    const handleModelChangeWithNoticeReset = useCallback((model: string) => {
+        setComposerNoticeState(null);
+        void handleModelChange(model);
+    }, [handleModelChange]);
 
     return (
         <div ref={panelRef} className={`ai-chat-panel${isV2Ui ? ' gn-v2-ai-panel' : ''}`} style={{ width: panelWidth, background: bgColor || 'transparent', color: textColor, borderLeft: overlayTheme.shellBorder, position: 'relative' }}>
             <div className={`ai-resize-handle${isResizing ? ' active' : ''}`} onMouseDown={handleResizeStart} />
-            
+
             {isResizing && panelRect.current && createPortal(
-                <div 
+                <div
                     ref={ghostRef}
                     style={{
                         position: 'fixed',
@@ -1805,10 +660,9 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
                     createNewAISession();
                     setActivePanelMode('chat');
                 }}
-                onSettingsClick={() => { onOpenSettings?.(); setTimeout(loadActiveProvider, 500); }}
+                onSettingsClick={handleOpenSettingsFromPanel}
                 onClose={onClose}
-                messages={messages}
-                sessionTitle={useStore.getState().aiChatSessions.find(s => s.id === sid)?.title || t('ai_chat.panel.session.default_title')}
+                sessionTitle={currentSessionTitle}
                 activeMode={effectivePanelMode}
                 onModeChange={(mode) => {
                     if (!isV2Ui) return;
@@ -1819,106 +673,50 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
                 }}
             />
 
-            <div className="ai-chat-messages" onScroll={handleScrollMessages}>
-                {effectivePanelMode === 'chat' && (
-                    messages.length === 0 ? (
-                        <AIChatWelcome
-                            overlayTheme={overlayTheme}
-                            quickActionBg={quickActionBg}
-                            quickActionBorder={quickActionBorder}
-                            textColor={textColor}
-                            mutedColor={mutedColor}
-                            onQuickAction={(prompt: string, autoSend?: boolean) => {
-                                setInput(prompt);
-                                if (autoSend) {
-                                    // Use setTimeout to let setInput render, then trigger send
-                                    setTimeout(() => {
-                                        const el = textareaRef.current;
-                                        if (el) el.focus();
-                                        // Dispatch a synthetic enter to trigger handleSend
-                                        // Simpler: just call handleSend directly with the prompt
-                                    }, 50);
-                                }
-                            }}
-                            contextTableNames={contextTableNames}
-                            isV2Ui={isV2Ui}
-                        />
-                    ) : (
-                        messages.map(msg => (
-                            <AIMessageRenderBoundary
-                                key={msg.id}
-                                msg={msg}
-                                darkMode={darkMode}
-                                overlayTheme={overlayTheme}
-                                onDeleteMessage={handleDeleteMessage}
-                                onError={handleMessageRenderError}
-                                translateRenderError={t}
-                            >
-                                <AIMessageBubble
-                                    msg={msg}
-                                    darkMode={darkMode}
-                                    overlayTheme={overlayTheme}
-                                    textColor={textColor}
-                                    onEdit={handleEditMessage}
-                                    onRetry={handleRetryMessage}
-                                    onDelete={handleDeleteMessage}
-                                    activeConnectionId={inferredConnectionId}
-                                    activeConnectionConfig={activeConnectionConfig}
-                                    activeDbName={inferredDbName}
-                                    allMessages={messages}
-                                />
-                            </AIMessageRenderBoundary>
-                        ))
-                    )
-                )}
-
-                {effectivePanelMode === 'insights' && (
-                    <div className="gn-v2-ai-insights-list">
-                        {aiInsights.map((item) => (
-                            <div className={`gn-v2-ai-insight-card tone-${item.tone}`} key={item.title}>
-                                <span className="gn-v2-ai-insight-icon">
-                                    {item.tone === 'warn' ? <WarningOutlined /> : item.tone === 'accent' ? <DatabaseOutlined /> : <TableOutlined />}
-                                </span>
-                                <div>
-                                    <strong>{item.title}</strong>
-                                    <p>{item.body}</p>
-                                </div>
-                            </div>
-                        ))}
-                    </div>
-                )}
-
-                {effectivePanelMode === 'history' && (
-                    <div className="gn-v2-ai-history-list">
-                        {renderPanelHistoryList()}
-                    </div>
-                )}
-                
-
-                <div ref={messagesEndRef} />
-            </div>
-
-            {showScrollBottom && (
-                <div 
-                    onClick={scrollToMessagesBottom}
-                    style={{
-                        position: 'absolute', bottom: 120, right: 20, width: 32, height: 32, borderRadius: '50%',
-                        background: darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.05)', backdropFilter: 'blur(8px)',
-                        display: 'flex', alignItems: 'center', justifyContent: 'center', cursor: 'pointer',
-                        color: textColor, boxShadow: '0 4px 12px rgba(0,0,0,0.1)', zIndex: 10, transition: 'all 0.2s ease',
-                    }}
-                    onMouseEnter={(e) => { e.currentTarget.style.transform = 'scale(1.1)'; e.currentTarget.style.background = darkMode ? 'rgba(255, 255, 255, 0.15)' : 'rgba(0, 0, 0, 0.1)'; }}
-                    onMouseLeave={(e) => { e.currentTarget.style.transform = 'scale(1)'; e.currentTarget.style.background = darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.05)'; }}
-                >
-                    <DownOutlined style={{ fontSize: 14 }} />
-                </div>
-            )}
+            <AIChatPanelConversationView
+                mode={effectivePanelMode}
+                messages={messages}
+                darkMode={darkMode}
+                overlayTheme={overlayTheme}
+                textColor={textColor}
+                mutedColor={mutedColor}
+                quickActionBg={quickActionBg}
+                quickActionBorder={quickActionBorder}
+                showScrollBottom={showScrollBottom}
+                contextTableNames={contextTableNames}
+                isV2Ui={isV2Ui}
+                insights={aiInsights}
+                sessions={panelHistorySessions}
+                activeSessionId={sid}
+                activeConnectionId={inferredConnectionId}
+                activeConnectionConfig={activeConnectionConfig}
+                activeDbName={inferredDbName}
+                messagesEndRef={messagesEndRef}
+                onScrollMessages={handleScrollMessages}
+                onQuickAction={(prompt: string, autoSend?: boolean) => {
+                    setInput(prompt);
+                    if (autoSend) {
+                        window.setTimeout(() => {
+                            textareaRef.current?.focus();
+                        }, 50);
+                    }
+                }}
+                onSelectSession={(sessionId) => {
+                    setAIActiveSessionId(sessionId);
+                    setActivePanelMode('chat');
+                }}
+                onEditMessage={handleEditMessage}
+                onRetryMessage={handleRetryMessage}
+                onDeleteMessage={handleDeleteMessage}
+                onMessageRenderError={handleMessageRenderError}
+                onScrollBottom={scrollToMessagesBottom}
+            />
 
             <AIChatInput
                 input={input}
                 setInput={setInput}
-                draftImages={draftImages}
-                setDraftImages={setDraftImages}
+                draftAttachments={draftAttachments}
+                setDraftAttachments={setDraftAttachments}
                 sending={sending}
                 onSend={handleSend}
                 onStop={handleStop}
@@ -1931,7 +729,8 @@ export const AIChatPanel: React.FC<AIChatPanelProps> = ({
                 sendShortcutBinding={aiChatSendShortcutBinding}
                 shortcutPlatform={activeShortcutPlatform}
                 composerNotice={composerNotice}
-                onModelChange={handleModelChange}
+                onComposerAction={handleComposerActionWithNoticeReset}
+                onModelChange={handleModelChangeWithNoticeReset}
                 onFetchModels={fetchDynamicModels}
                 textareaRef={textareaRef}
                 darkMode={darkMode}
diff --git a/frontend/src/components/AISettingsModal.edit-password.test.tsx b/frontend/src/components/AISettingsModal.edit-password.test.tsx
index 8bf7074..f5694ee 100644
--- a/frontend/src/components/AISettingsModal.edit-password.test.tsx
+++ b/frontend/src/components/AISettingsModal.edit-password.test.tsx
@@ -3,6 +3,7 @@ import { readFileSync } from 'node:fs';
 
 const source = readFileSync(new URL('./AISettingsModal.tsx', import.meta.url), 'utf8');
 const aiChatPanelCss = readFileSync(new URL('./AIChatPanel.css', import.meta.url), 'utf8');
+const providersSectionSource = readFileSync(new URL('./ai/AISettingsProvidersSection.tsx', import.meta.url), 'utf8');
 
 describe('AISettingsModal edit password behavior', () => {
   it('loads editable provider details before opening the edit modal', () => {
@@ -10,9 +11,63 @@ describe('AISettingsModal edit password behavior', () => {
     expect(source).toContain('await Service.AIGetEditableProvider(p.id)');
   });
 
+  it('loads and saves user-level custom prompts through the AI service', () => {
+    expect(source).toContain("callOrFallback(() => Service.AIGetUserPromptSettings?.(), EMPTY_AI_USER_PROMPT_SETTINGS)");
+    expect(source).toContain('await Service?.AISaveUserPromptSettings?.(payload);');
+    expect(source).toContain("window.dispatchEvent(new CustomEvent('gonavi:ai:config-changed'))");
+    expect(source).toContain("import AISettingsPromptsSection from './ai/AISettingsPromptsSection';");
+    expect(source).toContain('<AISettingsPromptsSection');
+  });
+
+  it('loads MCP servers and skills through the AI service', () => {
+    expect(source).toContain('Service.AIGetMCPClientInstallStatuses?.()');
+    expect(source).toContain('Service.AIGetMCPServers?.()');
+    expect(source).toContain('Service.AIListMCPTools?.()');
+    expect(source).toContain('Service.AIGetSkills?.()');
+    expect(source).toContain("import AISettingsSkillsSection from './ai/AISettingsSkillsSection';");
+    expect(source).toContain('<AISettingsSkillsSection');
+  });
+
+  it('delegates bulky MCP and built-in tool sections to dedicated ai components', () => {
+    expect(source).toContain("import AIBuiltinToolsCatalog from './ai/AIBuiltinToolsCatalog';");
+    expect(source).toContain("import AISettingsProvidersSection from './ai/AISettingsProvidersSection';");
+    expect(source).toContain("import AISettingsSidebar, { type AISettingsSectionKey } from './ai/AISettingsSidebar';");
+    expect(source).toContain("import AISettingsSafetySection from './ai/AISettingsSafetySection';");
+    expect(source).toContain("import AISettingsContextSection from './ai/AISettingsContextSection';");
+    expect(source).toContain('<AISettingsProvidersSection');
+    expect(source).toContain("import AISettingsMCPSection from './ai/AISettingsMCPSection';");
+    expect(source).toContain('<AISettingsSidebar');
+    expect(source).toContain('<AISettingsSafetySection');
+    expect(source).toContain('<AISettingsContextSection');
+    expect(source).toContain('<AISettingsMCPSection');
+    expect(source).toContain('<AIBuiltinToolsCatalog');
+  });
+
+  it('wires the external MCP client install panel actions back to the modal handlers', () => {
+    expect(source).toContain('mcpClientStatuses={mcpClientStatuses}');
+    expect(source).toContain('selectedMCPClient={selectedMCPClient}');
+    expect(source).toContain("import { useAIMCPClientInstaller } from './ai/useAIMCPClientInstaller';");
+    expect(source).toContain('} = useAIMCPClientInstaller({');
+    expect(source).toContain('handleSelectMCPClient,');
+    expect(source).toContain('loadMCPClientStatuses,');
+    expect(source).toContain('selectedMCPClientStatus,');
+    expect(source).toContain('onSelectClient={handleSelectMCPClient}');
+    expect(source).toContain('onRefreshStatus={() => void loadMCPClientStatuses()}');
+    expect(source).toContain('onCopyConfigPath={() => void handleCopySelectedMCPConfigPath()}');
+    expect(source).toContain('onCopyLaunchCommand={() => void handleCopySelectedMCPLaunchCommand()}');
+    expect(source).toContain('onInstallSelectedClient={handleInstallSelectedMCPClient}');
+  });
+
+  it('waits briefly for the AI service bridge before warning and removes noisy provider debug logs', () => {
+    expect(source).toContain('const resolveAIService = useCallback(async () => {');
+    expect(source).toContain('const service = await waitForAIService();');
+    expect(source).not.toContain("console.log('[AI] AIGetProviders result:'");
+    expect(source).not.toContain("console.log('[AI] AIGetActiveProvider result:'");
+  });
+
   it('keeps the prefilled api key masked by default', () => {
     expect(source).toContain('const [primaryPasswordVisible, setPrimaryPasswordVisible] = useState(false);');
-    expect(source).toContain('visible: primaryPasswordVisible,');
+    expect(providersSectionSource).toContain('visible: primaryPasswordVisible,');
   });
 
   it('does not render the clear helper block anymore', () => {
@@ -28,9 +83,10 @@ describe('AISettingsModal edit password behavior', () => {
 
   it('keeps long ai settings toast errors wrapped within the modal body', () => {
     expect(aiChatPanelCss).toContain('.ai-settings-body .ant-message {');
-    expect(aiChatPanelCss).toContain('width: min(100%, 720px);');
-    expect(aiChatPanelCss).toContain('max-width: calc(100% - 32px);');
+    expect(aiChatPanelCss).toContain('width: fit-content;');
+    expect(aiChatPanelCss).toContain('max-width: min(520px, calc(100% - 32px));');
     expect(aiChatPanelCss).toContain('.ai-settings-body .ant-message .ant-message-notice-content {');
+    expect(aiChatPanelCss).toContain('max-width: 100%;');
     expect(aiChatPanelCss).toContain('white-space: normal;');
     expect(aiChatPanelCss).toContain('overflow-wrap: anywhere;');
   });
diff --git a/frontend/src/components/AISettingsModal.tsx b/frontend/src/components/AISettingsModal.tsx
index a1412c9..01c0077 100644
--- a/frontend/src/components/AISettingsModal.tsx
+++ b/frontend/src/components/AISettingsModal.tsx
@@ -1,27 +1,38 @@
-import React, { useState, useEffect, useCallback, useRef } from 'react';
-import { Modal, Button, Input, Select, Form, message as antdMessage, Tooltip, Tabs, Space, Popconfirm, Slider } from 'antd';
-import { PlusOutlined, DeleteOutlined, EditOutlined, CheckOutlined, ApiOutlined, SafetyCertificateOutlined, RobotOutlined, ThunderboltOutlined, CloudOutlined, ExperimentOutlined, KeyOutlined, LinkOutlined, AppstoreOutlined, ToolOutlined } from '@ant-design/icons';
-import type { AIProviderConfig, AIProviderType, AISafetyLevel, AIContextLevel } from '../types';
+import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
+import { Modal, Form, message as antdMessage } from 'antd';
+import { RobotOutlined } from '@ant-design/icons';
+import type { AIProviderConfig, AIProviderType, AISafetyLevel, AIContextLevel, AIUserPromptSettings, AIMCPServerConfig, AIMCPToolDescriptor, AIMCPClientInstallStatus, AIMCPHTTPServerStatus, AISkillConfig } from '../types';
 import {
-    QWEN_BAILIAN_ANTHROPIC_BASE_URL,
-    QWEN_CODING_PLAN_ANTHROPIC_BASE_URL,
-    QWEN_CODING_PLAN_MODELS,
-    resolveProviderPresetKey,
     resolvePresetBaseURL,
     resolvePresetModelSelection,
     resolvePresetTransport,
 } from '../utils/aiProviderPresets';
-import {
-    PROVIDER_PRESET_CARD_BASE_STYLE,
-    PROVIDER_PRESET_CARD_CONTENT_STYLE,
-    PROVIDER_PRESET_CARD_DESCRIPTION_STYLE,
-    PROVIDER_PRESET_GRID_STYLE,
-    PROVIDER_PRESET_CARD_TITLE_STYLE,
-} from '../utils/aiSettingsPresetLayout';
 import { resolveProviderSecretDraft } from '../utils/providerSecretDraft';
 import { buildAddProviderEditorSession, buildClosedProviderEditorSession, buildEditProviderEditorSession, type ProviderEditorSession } from '../utils/aiProviderEditorState';
 import type { OverlayWorkbenchTheme } from '../utils/overlayWorkbenchTheme';
 import { useI18n } from '../i18n/provider';
+import { BUILTIN_AI_TOOL_INFO } from '../utils/aiToolRegistry';
+import { EMPTY_MCP_CLIENT_STATUSES } from '../utils/mcpClientInstallStatus';
+import AIBuiltinToolsCatalog from './ai/AIBuiltinToolsCatalog';
+import AISettingsMCPSection from './ai/AISettingsMCPSection';
+import type { AIMCPHTTPServerDraft } from './ai/AIMCPHTTPServerPanel';
+import AISettingsSidebar, { type AISettingsSectionKey } from './ai/AISettingsSidebar';
+import AISettingsSafetySection from './ai/AISettingsSafetySection';
+import AISettingsContextSection from './ai/AISettingsContextSection';
+import AISettingsProvidersSection from './ai/AISettingsProvidersSection';
+import AISettingsPromptsSection from './ai/AISettingsPromptsSection';
+import AISettingsSkillsSection from './ai/AISettingsSkillsSection';
+import { useAIMCPClientInstaller } from './ai/useAIMCPClientInstaller';
+import {
+    EMPTY_AI_USER_PROMPT_SETTINGS,
+    EMPTY_MCP_SERVER,
+    EMPTY_SKILL,
+    PROVIDER_PRESETS,
+    findPreset,
+    matchProviderPreset,
+    type ProviderPreset,
+    waitForAIService,
+} from './ai/aiSettingsModalConfig';
 interface AISettingsModalProps {
     open: boolean;
     onClose: () => void;
@@ -30,56 +41,41 @@ interface AISettingsModalProps {
     focusProviderId?: string;
 }
 
-// 预设配置：每个预设映射到后端 type（openai/anthropic/gemini/custom）并附带默认 URL 和 Model
-interface ProviderPreset {
-    key: string;
-    labelKey: string;
-    fallbackLabel: string;
-    icon: React.ReactNode;
-    descKey: string;
-    fallbackDesc: string;
-    color: string;
-    backendType: AIProviderType;
-    fixedApiFormat?: string;
-    defaultBaseUrl: string;
-    defaultModel: string;
-    models: string[];
-}
-
-const PROVIDER_PRESETS: ProviderPreset[] = [
-    { key: 'openai', labelKey: 'ai_settings.provider_preset.openai.label', fallbackLabel: 'OpenAI', icon: <ApiOutlined />, descKey: 'ai_settings.provider_preset.openai.desc', fallbackDesc: 'GPT-5.4 / 5.3 series', color: '#10b981', backendType: 'openai', defaultBaseUrl: 'https://api.openai.com/v1', defaultModel: 'gpt-4o', models: [] },
-    { key: 'deepseek', labelKey: 'ai_settings.provider_preset.deepseek.label', fallbackLabel: 'DeepSeek', icon: <ThunderboltOutlined />, descKey: 'ai_settings.provider_preset.deepseek.desc', fallbackDesc: 'DeepSeek-V4 / R1', color: '#3b82f6', backendType: 'openai', defaultBaseUrl: 'https://api.deepseek.com/v1', defaultModel: 'deepseek-chat', models: [] },
-    { key: 'qwen-bailian', labelKey: 'ai_settings.provider_preset.qwen_bailian.label', fallbackLabel: 'Qwen (Bailian General)', icon: <CloudOutlined />, descKey: 'ai_settings.provider_preset.qwen_bailian.desc', fallbackDesc: 'Bailian Anthropic-compatible endpoint / remote model list', color: '#6366f1', backendType: 'anthropic', defaultBaseUrl: QWEN_BAILIAN_ANTHROPIC_BASE_URL, defaultModel: '', models: [] },
-    { key: 'qwen-coding-plan', labelKey: 'ai_settings.provider_preset.qwen_coding_plan.label', fallbackLabel: 'Qwen (Coding Plan)', icon: <CloudOutlined />, descKey: 'ai_settings.provider_preset.qwen_coding_plan.desc', fallbackDesc: 'Claude Code CLI proxy chain / official supported model list', color: '#4f46e5', backendType: 'custom', fixedApiFormat: 'claude-cli', defaultBaseUrl: QWEN_CODING_PLAN_ANTHROPIC_BASE_URL, defaultModel: '', models: QWEN_CODING_PLAN_MODELS },
-    { key: 'zhipu', labelKey: 'ai_settings.provider_preset.zhipu.label', fallbackLabel: 'Zhipu GLM', icon: <ExperimentOutlined />, descKey: 'ai_settings.provider_preset.zhipu.desc', fallbackDesc: 'GLM-5 / GLM-5-Turbo', color: '#0ea5e9', backendType: 'openai', defaultBaseUrl: 'https://open.bigmodel.cn/api/paas/v4', defaultModel: 'glm-4', models: [] },
-    { key: 'moonshot', labelKey: 'ai_settings.provider_preset.moonshot.label', fallbackLabel: 'Kimi', icon: <ExperimentOutlined />, descKey: 'ai_settings.provider_preset.moonshot.desc', fallbackDesc: 'Kimi K2.5 (Anthropic-compatible)', color: '#0d9488', backendType: 'anthropic', defaultBaseUrl: 'https://api.moonshot.cn/anthropic', defaultModel: 'moonshot-v1-8k', models: [] },
-    { key: 'anthropic', labelKey: 'ai_settings.provider_preset.anthropic.label', fallbackLabel: 'Claude', icon: <ExperimentOutlined />, descKey: 'ai_settings.provider_preset.anthropic.desc', fallbackDesc: 'Claude Opus/Sonnet', color: '#d97706', backendType: 'anthropic', defaultBaseUrl: 'https://api.anthropic.com', defaultModel: 'claude-3-5-sonnet-20241022', models: [] },
-    { key: 'gemini', labelKey: 'ai_settings.provider_preset.gemini.label', fallbackLabel: 'Gemini', icon: <CloudOutlined />, descKey: 'ai_settings.provider_preset.gemini.desc', fallbackDesc: 'Gemini 3.1 / 2.5 series', color: '#059669', backendType: 'gemini', defaultBaseUrl: 'https://generativelanguage.googleapis.com', defaultModel: 'gemini-2.5-flash', models: [] },
-    { key: 'volcengine-ark', labelKey: 'ai_settings.provider_preset.volcengine_ark.label', fallbackLabel: 'Volcengine Ark', icon: <CloudOutlined />, descKey: 'ai_settings.provider_preset.volcengine_ark.desc', fallbackDesc: 'Ark general inference / Doubao models', color: '#0ea5e9', backendType: 'openai', defaultBaseUrl: 'https://ark.cn-beijing.volces.com/api/v3', defaultModel: '', models: [] },
-    { key: 'volcengine-coding', labelKey: 'ai_settings.provider_preset.volcengine_coding.label', fallbackLabel: 'Volcengine Coding Plan', icon: <CloudOutlined />, descKey: 'ai_settings.provider_preset.volcengine_coding.desc', fallbackDesc: 'Ark Code / Coding Plan', color: '#0284c7', backendType: 'openai', defaultBaseUrl: 'https://ark.cn-beijing.volces.com/api/coding/v3', defaultModel: '', models: [] },
-    { key: 'minimax', labelKey: 'ai_settings.provider_preset.minimax.label', fallbackLabel: 'MiniMax', icon: <ExperimentOutlined />, descKey: 'ai_settings.provider_preset.minimax.desc', fallbackDesc: 'M2.7 / M2.5 series (Anthropic-compatible)', color: '#e11d48', backendType: 'anthropic', defaultBaseUrl: 'https://api.minimaxi.com/anthropic', defaultModel: 'MiniMax-M2.7', models: ['MiniMax-M2.7', 'MiniMax-M2.7-highspeed', 'MiniMax-M2.5', 'MiniMax-M2.5-highspeed', 'MiniMax-M2.1', 'MiniMax-M2.1-highspeed', 'MiniMax-M2'] },
-    { key: 'ollama', labelKey: 'ai_settings.provider_preset.ollama.label', fallbackLabel: 'Ollama', icon: <AppstoreOutlined />, descKey: 'ai_settings.provider_preset.ollama.desc', fallbackDesc: 'Locally deployed open-source models', color: '#78716c', backendType: 'openai', defaultBaseUrl: 'http://localhost:11434/v1', defaultModel: 'llama3', models: [] },
-    { key: 'custom', labelKey: 'ai_settings.provider_preset.custom.label', fallbackLabel: 'Custom', icon: <AppstoreOutlined />, descKey: 'ai_settings.provider_preset.custom.desc', fallbackDesc: 'Custom API endpoint', color: '#64748b', backendType: 'custom', defaultBaseUrl: '', defaultModel: '', models: [] },
-];
-
-const findPreset = (key: string): ProviderPreset => PROVIDER_PRESETS.find(p => p.key === key) || PROVIDER_PRESETS[PROVIDER_PRESETS.length - 1];
-
-const matchProviderPreset = (provider: Pick<AIProviderConfig, 'type' | 'baseUrl' | 'apiFormat'>): ProviderPreset => {
-    const presetKey = resolveProviderPresetKey(provider, PROVIDER_PRESETS, 'custom');
-    return findPreset(presetKey);
+const DEFAULT_MCP_HTTP_SERVER_STATUS: AIMCPHTTPServerStatus = {
+    running: false,
+    addr: '127.0.0.1:8765',
+    path: '/mcp',
+    url: 'http://127.0.0.1:8765/mcp',
+    schemaOnly: true,
+    message: 'GoNavi MCP HTTP 服务未启动',
 };
 
-const SAFETY_OPTIONS: { labelKey: string; value: AISafetyLevel; descKey: string; color: string; icon: string }[] = [
-    { labelKey: 'ai_settings.safety.readonly.label', value: 'readonly', descKey: 'ai_settings.safety.readonly.desc', color: '#22c55e', icon: '🔒' },
-    { labelKey: 'ai_settings.safety.readwrite.label', value: 'readwrite', descKey: 'ai_settings.safety.readwrite.desc', color: '#f59e0b', icon: '⚠️' },
-    { labelKey: 'ai_settings.safety.full.label', value: 'full', descKey: 'ai_settings.safety.full.desc', color: '#ef4444', icon: '🔓' },
-];
+const DEFAULT_MCP_HTTP_SERVER_DRAFT: AIMCPHTTPServerDraft = {
+    addr: DEFAULT_MCP_HTTP_SERVER_STATUS.addr,
+    path: DEFAULT_MCP_HTTP_SERVER_STATUS.path,
+    authorizationHeader: '',
+};
 
-const CONTEXT_OPTIONS: { labelKey: string; value: AIContextLevel; descKey: string; icon: string }[] = [
-    { labelKey: 'ai_settings.context.schema_only.label', value: 'schema_only', descKey: 'ai_settings.context.schema_only.desc', icon: '📋' },
-    { labelKey: 'ai_settings.context.with_samples.label', value: 'with_samples', descKey: 'ai_settings.context.with_samples.desc', icon: '📊' },
-    { labelKey: 'ai_settings.context.with_results.label', value: 'with_results', descKey: 'ai_settings.context.with_results.desc', icon: '📑' },
-];
+const buildMCPHTTPServerDraftFromStatus = (
+    status: AIMCPHTTPServerStatus,
+    fallback: AIMCPHTTPServerDraft = DEFAULT_MCP_HTTP_SERVER_DRAFT,
+): AIMCPHTTPServerDraft => ({
+    addr: String(status.addr || fallback.addr || DEFAULT_MCP_HTTP_SERVER_STATUS.addr).trim(),
+    path: String(status.path || fallback.path || DEFAULT_MCP_HTTP_SERVER_STATUS.path).trim(),
+    authorizationHeader: String(
+        status.authorizationHeader ||
+        (status.token ? `Bearer ${status.token}` : '') ||
+        fallback.authorizationHeader ||
+        '',
+    ).trim(),
+});
+
+const normalizeMCPHTTPAuthorizationToken = (value: string): string => {
+    const trimmed = String(value || '').trim();
+    if (!trimmed) return '';
+    const withoutHeaderName = trimmed.replace(/^Authorization\s*:\s*/i, '').trim();
+    return withoutHeaderName.replace(/^Bearer\s+/i, '').trim();
+};
 
 const AISettingsModal: React.FC<AISettingsModalProps> = ({ open, onClose, darkMode, overlayTheme, focusProviderId }) => {
     const { t } = useI18n();
@@ -87,15 +83,23 @@ const AISettingsModal: React.FC<AISettingsModalProps> = ({ open, onClose, darkMo
     const [activeProviderId, setActiveProviderId] = useState<string>('');
     const [safetyLevel, setSafetyLevel] = useState<AISafetyLevel>('readonly');
     const [contextLevel, setContextLevel] = useState<AIContextLevel>('schema_only');
+    const [mcpServers, setMCPServers] = useState<AIMCPServerConfig[]>([]);
+    const [mcpTools, setMCPTools] = useState<AIMCPToolDescriptor[]>([]);
+    const [mcpHTTPServerStatus, setMCPHTTPServerStatus] = useState<AIMCPHTTPServerStatus>(DEFAULT_MCP_HTTP_SERVER_STATUS);
+    const [mcpHTTPServerDraft, setMCPHTTPServerDraft] = useState<AIMCPHTTPServerDraft>(DEFAULT_MCP_HTTP_SERVER_DRAFT);
+    const [mcpHTTPServerLoading, setMCPHTTPServerLoading] = useState(false);
+    const [skills, setSkills] = useState<AISkillConfig[]>([]);
     const [editingProvider, setEditingProvider] = useState<AIProviderConfig | null>(null);
     const [isEditing, setIsEditing] = useState(false);
     const [loading, setLoading] = useState(false);
     const [testStatus, setTestStatus] = useState<'idle' | 'success' | 'error'>('idle');
     const [builtinPrompts, setBuiltinPrompts] = useState<Record<string, string>>({});
-    const [activeSection, setActiveSection] = useState<'providers' | 'safety' | 'context' | 'prompts' | 'tools'>('providers');
+    const [userPromptSettings, setUserPromptSettings] = useState<AIUserPromptSettings>(EMPTY_AI_USER_PROMPT_SETTINGS);
+    const [activeSection, setActiveSection] = useState<AISettingsSectionKey>('providers');
     const [primaryPasswordVisible, setPrimaryPasswordVisible] = useState(false);
     const [form] = Form.useForm();
     const modalBodyRef = useRef<HTMLDivElement>(null);
+    const missingAIServiceWarnedRef = useRef(false);
 
     // Modal 内部 toast 通知
     const [messageApi, messageContextHolder] = antdMessage.useMessage({ getContainer: () => modalBodyRef.current || document.body });
@@ -104,39 +108,133 @@ const AISettingsModal: React.FC<AISettingsModalProps> = ({ open, onClose, darkMo
     const cardBg = darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)';
     const cardBorder = darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)';
     const cardHoverBg = darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.03)';
-    const sectionLabelColor = darkMode ? 'rgba(255,255,255,0.5)' : 'rgba(0,0,0,0.4)';
     const inputBg = darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)';
-
     // Hook 必须在组件顶层调用，不能在条件分支内
     const watchedType = Form.useWatch('type', form);
     const watchedPresetKey = Form.useWatch('presetKey', form);
     const watchedApiFormat = Form.useWatch('apiFormat', form) || 'openai';
+    const skillRequiredToolOptions = useMemo(() => ([
+        ...BUILTIN_AI_TOOL_INFO.map((tool) => ({
+            label: `${tool.name} · 内置工具`,
+            value: tool.name,
+        })),
+        ...mcpTools.map((tool) => ({
+            label: `${tool.alias} · ${tool.serverName}`,
+            value: tool.alias,
+        })),
+    ]), [mcpTools]);
+
+    const resolveAIService = useCallback(async () => {
+        const service = await waitForAIService();
+        if (service) {
+            missingAIServiceWarnedRef.current = false;
+            return service;
+        }
+        if (!missingAIServiceWarnedRef.current) {
+            console.warn('[AI] Service not found on window.go');
+            missingAIServiceWarnedRef.current = true;
+        }
+        return null;
+    }, []);
+
+    const copyTextToClipboard = useCallback(async (text: string, successMessage: string) => {
+        if (typeof navigator?.clipboard?.writeText !== 'function') {
+            throw new Error('当前环境不支持复制到剪贴板');
+        }
+        await navigator.clipboard.writeText(text);
+        void messageApi.success(successMessage);
+    }, [messageApi]);
+
+    const {
+        handleCopySelectedMCPConfigPath,
+        handleCopySelectedMCPLaunchCommand,
+        handleInstallSelectedMCPClient,
+        handleSelectMCPClient,
+        loadMCPClientStatuses,
+        mcpClientStatusLoading,
+        mcpClientStatuses,
+        resetMCPClientSelectionTouched,
+        selectedMCPClient,
+        selectedMCPClientCommandText,
+        selectedMCPClientStatus,
+        syncMCPClientStatuses,
+    } = useAIMCPClientInstaller({
+        resolveAIService,
+        messageApi,
+        copyTextToClipboard,
+        onBeforeInstall: () => setLoading(true),
+        onAfterInstall: () => setLoading(false),
+        onConfigChanged: () => window.dispatchEvent(new CustomEvent('gonavi:ai:config-changed')),
+    });
 
     const loadConfig = useCallback(async () => {
         try {
-            const Service = (window as any).go?.aiservice?.Service;
-            if (!Service) { console.warn('[AI] Service not found on window.go'); return; }
-            const [provRes, safeRes, ctxRes, promptsRes] = await Promise.all([
-                Service.AIGetProviders?.() || [],
-                Service.AIGetSafetyLevel?.() || 'readonly',
-                Service.AIGetContextLevel?.() || 'schema_only',
-                Service.AIGetBuiltinPrompts?.() || {},
+            const Service = await resolveAIService();
+            if (!Service) {
+                return;
+            }
+            const callOrFallback = async <T,>(loader: (() => Promise<T>) | undefined, fallback: T): Promise<T> => {
+                if (typeof loader !== 'function') {
+                    return fallback;
+                }
+                try {
+                    return await loader();
+                } catch (error) {
+                    console.warn('[AI] settings load fallback', error);
+                    return fallback;
+                }
+            };
+            const [provRes, safeRes, ctxRes, promptsRes, userPromptsRes, mcpServersRes, mcpToolsRes, mcpHTTPServerStatusRes, skillsRes, mcpClientStatusesRes] = await Promise.all([
+                callOrFallback(() => Service.AIGetProviders?.(), []),
+                callOrFallback<AISafetyLevel>(() => Service.AIGetSafetyLevel?.(), 'readonly'),
+                callOrFallback<AIContextLevel>(() => Service.AIGetContextLevel?.(), 'schema_only'),
+                callOrFallback(() => Service.AIGetBuiltinPrompts?.(), {}),
+                callOrFallback(() => Service.AIGetUserPromptSettings?.(), EMPTY_AI_USER_PROMPT_SETTINGS),
+                callOrFallback(() => Service.AIGetMCPServers?.(), []),
+                callOrFallback(() => Service.AIListMCPTools?.(), []),
+                callOrFallback<AIMCPHTTPServerStatus>(() => Service.AIGetMCPHTTPServerStatus?.(), DEFAULT_MCP_HTTP_SERVER_STATUS),
+                callOrFallback(() => Service.AIGetSkills?.(), []),
+                callOrFallback<AIMCPClientInstallStatus[]>(() => Service.AIGetMCPClientInstallStatuses?.(), EMPTY_MCP_CLIENT_STATUSES),
             ]);
-            console.log('[AI] AIGetProviders result:', JSON.stringify(provRes), 'isArray:', Array.isArray(provRes));
             if (Array.isArray(provRes)) {
                 setProviders(provRes);
                 const activeRes = await Service.AIGetActiveProvider?.();
-                console.log('[AI] AIGetActiveProvider result:', activeRes);
                 if (activeRes) setActiveProviderId(activeRes);
             }
             if (safeRes) setSafetyLevel(safeRes);
             if (ctxRes) setContextLevel(ctxRes);
             if (promptsRes) setBuiltinPrompts(promptsRes);
+            if (userPromptsRes) {
+                setUserPromptSettings({
+                    ...EMPTY_AI_USER_PROMPT_SETTINGS,
+                    ...userPromptsRes,
+                });
+            }
+            if (Array.isArray(mcpServersRes)) setMCPServers(mcpServersRes);
+            if (Array.isArray(mcpToolsRes)) setMCPTools(mcpToolsRes);
+            if (mcpHTTPServerStatusRes) {
+                const nextStatus = {
+                    ...DEFAULT_MCP_HTTP_SERVER_STATUS,
+                    ...mcpHTTPServerStatusRes,
+                };
+                setMCPHTTPServerStatus(nextStatus);
+                setMCPHTTPServerDraft((prev) => buildMCPHTTPServerDraftFromStatus(nextStatus, prev));
+            }
+            if (Array.isArray(skillsRes)) setSkills(skillsRes);
+            if (Array.isArray(mcpClientStatusesRes)) {
+                syncMCPClientStatuses(mcpClientStatusesRes);
+            }
         } catch (e) { console.warn('Failed to load AI config', e); }
-    }, []);
+    }, [resolveAIService, syncMCPClientStatuses]);
 
     useEffect(() => { if (open) void loadConfig(); }, [open, loadConfig]);
 
+    useEffect(() => {
+        if (open) {
+            resetMCPClientSelectionTouched();
+        }
+    }, [open, resetMCPClientSelectionTouched]);
+
     useEffect(() => {
         if (!open || !focusProviderId) {
             return;
@@ -252,7 +350,7 @@ const AISettingsModal: React.FC<AISettingsModalProps> = ({ open, onClose, darkMo
                 customModels: values.models,
             });
             // 内置供应商自动使用 preset label 作为名称
-            const finalName = isCustomLike ? (values.name || preset.fallbackLabel) : preset.fallbackLabel;
+            const finalName = isCustomLike ? (values.name || preset.label) : preset.label;
             
             const finalBaseUrl = resolvePresetBaseURL({
                 presetKey: values.presetKey,
@@ -314,6 +412,196 @@ const AISettingsModal: React.FC<AISettingsModalProps> = ({ open, onClose, darkMo
         } catch (e) { /* ignore */ }
     };
 
+    const handleSaveUserPromptSettings = async () => {
+        try {
+            setLoading(true);
+            const Service = (window as any).go?.aiservice?.Service;
+            const payload = {
+                global: String(userPromptSettings.global || ''),
+                database: String(userPromptSettings.database || ''),
+                jvm: String(userPromptSettings.jvm || ''),
+                jvmDiagnostic: String(userPromptSettings.jvmDiagnostic || ''),
+            };
+            await Service?.AISaveUserPromptSettings?.(payload);
+            setUserPromptSettings(payload);
+            void messageApi.success('自定义提示词已保存');
+            window.dispatchEvent(new CustomEvent('gonavi:ai:config-changed'));
+        } catch (e: any) {
+            void messageApi.error(e?.message || '保存自定义提示词失败');
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const updateMCPServerDraft = (id: string, patch: Partial<AIMCPServerConfig>) => {
+        setMCPServers((prev) => prev.map((item) => item.id === id ? { ...item, ...patch } : item));
+    };
+
+    const handleAddMCPServer = (seed?: Partial<AIMCPServerConfig>) => {
+        setMCPServers((prev) => [...prev, EMPTY_MCP_SERVER(seed)]);
+    };
+
+    const handleSaveMCPServer = async (server: AIMCPServerConfig) => {
+        try {
+            setLoading(true);
+            const Service = (window as any).go?.aiservice?.Service;
+            await Service?.AISaveMCPServer?.(server);
+            await loadConfig();
+            void messageApi.success('MCP 服务已保存');
+            window.dispatchEvent(new CustomEvent('gonavi:ai:config-changed'));
+        } catch (e: any) {
+            void messageApi.error(e?.message || '保存 MCP 服务失败');
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleDeleteMCPServer = async (id: string) => {
+        try {
+            setLoading(true);
+            const Service = (window as any).go?.aiservice?.Service;
+            if (typeof Service?.AIDeleteMCPServer === 'function' && !String(id).startsWith('mcp-draft-')) {
+                await Service.AIDeleteMCPServer(id);
+                await loadConfig();
+                window.dispatchEvent(new CustomEvent('gonavi:ai:config-changed'));
+            } else {
+                setMCPServers((prev) => prev.filter((item) => item.id !== id));
+            }
+            void messageApi.success('MCP 服务已删除');
+        } catch (e: any) {
+            void messageApi.error(e?.message || '删除 MCP 服务失败');
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleTestMCPServer = async (server: AIMCPServerConfig) => {
+        try {
+            setLoading(true);
+            const Service = (window as any).go?.aiservice?.Service;
+            const res = await Service?.AITestMCPServer?.(server);
+            if (res?.success) {
+                void messageApi.success(res?.message || 'MCP 服务连接成功');
+                if (typeof Service?.AIListMCPTools === 'function') {
+                    const nextTools = await Service.AIListMCPTools();
+                    if (Array.isArray(nextTools)) setMCPTools(nextTools);
+                } else if (Array.isArray(res?.tools)) {
+                    setMCPTools(res.tools);
+                }
+            } else {
+                void messageApi.error(res?.message || 'MCP 服务测试失败');
+            }
+        } catch (e: any) {
+            void messageApi.error(e?.message || '测试 MCP 服务失败');
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleToggleMCPHTTPServer = async (checked: boolean) => {
+        try {
+            setMCPHTTPServerLoading(true);
+            const Service = await resolveAIService();
+            if (!Service) {
+                throw new Error('当前运行时暂不支持 MCP HTTP 服务控制');
+            }
+            if (checked && typeof Service.AIStartMCPHTTPServer !== 'function') {
+                throw new Error('当前版本暂不支持启动 MCP HTTP 服务');
+            }
+            if (!checked && typeof Service.AIStopMCPHTTPServer !== 'function') {
+                throw new Error('当前版本暂不支持停止 MCP HTTP 服务');
+            }
+            const nextStatus = checked
+                ? await Service.AIStartMCPHTTPServer({
+                    addr: mcpHTTPServerDraft.addr || DEFAULT_MCP_HTTP_SERVER_STATUS.addr,
+                    path: mcpHTTPServerDraft.path || DEFAULT_MCP_HTTP_SERVER_STATUS.path,
+                    token: normalizeMCPHTTPAuthorizationToken(mcpHTTPServerDraft.authorizationHeader),
+                    schemaOnly: true,
+                })
+                : await Service.AIStopMCPHTTPServer();
+            if (nextStatus) {
+                const normalizedStatus = {
+                    ...DEFAULT_MCP_HTTP_SERVER_STATUS,
+                    ...nextStatus,
+                };
+                setMCPHTTPServerStatus(normalizedStatus);
+                setMCPHTTPServerDraft((prev) => buildMCPHTTPServerDraftFromStatus(normalizedStatus, prev));
+            }
+            void messageApi.success(checked ? 'GoNavi MCP HTTP 服务已启动' : 'GoNavi MCP HTTP 服务已停止');
+        } catch (e: any) {
+            void messageApi.error(e?.message || '切换 GoNavi MCP HTTP 服务失败');
+        } finally {
+            setMCPHTTPServerLoading(false);
+        }
+    };
+
+    const handleUpdateMCPHTTPServerDraft = (patch: Partial<AIMCPHTTPServerDraft>) => {
+        setMCPHTTPServerDraft((prev) => ({
+            ...prev,
+            ...patch,
+        }));
+    };
+
+    const handleCopyMCPHTTPServerURL = async () => {
+        const url = String(mcpHTTPServerStatus.url || '').trim();
+        if (!url) {
+            void messageApi.error('当前没有可复制的 MCP HTTP URL');
+            return;
+        }
+        await copyTextToClipboard(url, 'MCP HTTP URL 已复制');
+    };
+
+    const handleCopyMCPHTTPServerAuthorization = async () => {
+        const authorizationHeader = String(mcpHTTPServerStatus.authorizationHeader || '').trim();
+        if (!authorizationHeader) {
+            void messageApi.error('请先启动 MCP HTTP 服务生成 Authorization Header');
+            return;
+        }
+        await copyTextToClipboard(`Authorization: ${authorizationHeader}`, 'Authorization Header 已复制');
+    };
+
+    const updateSkillDraft = (id: string, patch: Partial<AISkillConfig>) => {
+        setSkills((prev) => prev.map((item) => item.id === id ? { ...item, ...patch } : item));
+    };
+
+    const handleAddSkill = () => {
+        setSkills((prev) => [...prev, EMPTY_SKILL()]);
+    };
+
+    const handleSaveSkill = async (skill: AISkillConfig) => {
+        try {
+            setLoading(true);
+            const Service = (window as any).go?.aiservice?.Service;
+            await Service?.AISaveSkill?.(skill);
+            await loadConfig();
+            void messageApi.success('Skill 已保存');
+            window.dispatchEvent(new CustomEvent('gonavi:ai:config-changed'));
+        } catch (e: any) {
+            void messageApi.error(e?.message || '保存 Skill 失败');
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleDeleteSkill = async (id: string) => {
+        try {
+            setLoading(true);
+            const Service = (window as any).go?.aiservice?.Service;
+            if (typeof Service?.AIDeleteSkill === 'function' && !String(id).startsWith('skill-draft-')) {
+                await Service.AIDeleteSkill(id);
+                await loadConfig();
+                window.dispatchEvent(new CustomEvent('gonavi:ai:config-changed'));
+            } else {
+                setSkills((prev) => prev.filter((item) => item.id !== id));
+            }
+            void messageApi.success('Skill 已删除');
+        } catch (e: any) {
+            void messageApi.error(e?.message || '删除 Skill 失败');
+        } finally {
+            setLoading(false);
+        }
+    };
+
     const handleTestProvider = async () => {
         try {
             const values = await form.validateFields();
@@ -379,367 +667,6 @@ const AISettingsModal: React.FC<AISettingsModalProps> = ({ open, onClose, darkMo
         });
     };
 
-    // ---- 字段装饰器样式 ----
-    const fieldGroupStyle: React.CSSProperties = {
-        padding: '14px 16px', borderRadius: 12, border: `1px solid ${cardBorder}`,
-        background: cardBg, marginBottom: 12,
-    };
-    const fieldLabelStyle: React.CSSProperties = {
-        fontSize: 13, fontWeight: 700, textTransform: 'uppercase' as const, letterSpacing: '0.08em',
-        color: sectionLabelColor, marginBottom: 10, display: 'flex', alignItems: 'center', gap: 6,
-    };
-    const presetLabel = (preset: ProviderPreset): string => t(preset.labelKey) || preset.fallbackLabel;
-    const presetDesc = (preset: ProviderPreset): string => t(preset.descKey) || preset.fallbackDesc;
-
-    // ===== Provider 列表 =====
-    const renderProviderList = () => (
-        <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
-            {providers.length === 0 && (
-                <div style={{
-                    textAlign: 'center', padding: '36px 20px', color: overlayTheme.mutedText, fontSize: 14,
-                    border: `1px dashed ${cardBorder}`, borderRadius: 14, background: cardBg,
-                }}>
-                    <RobotOutlined style={{ fontSize: 32, marginBottom: 12, opacity: 0.3, display: 'block' }} />
-                    {t('ai_settings.provider.empty.title')}<br />
-                    <span style={{ fontSize: 13, opacity: 0.6 }}>{t('ai_settings.provider.empty.description')}</span>
-                </div>
-            )}
-            {providers.map(p => {
-                const matchedPreset = matchProviderPreset(p);
-                const isActive = p.id === activeProviderId;
-                return (
-                    <div key={p.id} onClick={() => handleSetActive(p.id)} style={{
-                        padding: '14px 16px', borderRadius: 14, cursor: 'pointer', transition: 'all 0.2s ease',
-                        border: `1.5px solid ${isActive ? overlayTheme.selectedText : cardBorder}`,
-                        background: isActive ? overlayTheme.selectedBg : cardBg,
-                        display: 'flex', alignItems: 'center', gap: 14,
-                    }}>
-                        <div style={{
-                            width: 36, height: 36, borderRadius: 10, display: 'grid', placeItems: 'center',
-                            background: isActive ? overlayTheme.iconBg : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)'),
-                            color: isActive ? overlayTheme.iconColor : overlayTheme.mutedText, 
-                            fontSize: 18, flexShrink: 0, transition: 'all 0.2s ease',
-                        }}>
-                            {matchedPreset.icon || <ApiOutlined />}
-                        </div>
-                        <div style={{ flex: 1, minWidth: 0 }}>
-                            <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, display: 'flex', alignItems: 'center', gap: 8 }}>
-                                {p.name || p.type}
-                                {isActive && <CheckOutlined style={{ color: overlayTheme.iconColor, fontSize: 13 }} />}
-                            </div>
-                            <div style={{ fontSize: 12, color: overlayTheme.mutedText, marginTop: 4, display: 'flex', alignItems: 'center', gap: 6 }}>
-                                <span>{presetLabel(matchedPreset)}</span>
-                                <span style={{ opacity: 0.4 }}>·</span>
-                                <span style={{ fontFamily: 'var(--gn-font-mono)', fontSize: 12 }}>{p.model || t('ai_settings.provider.no_model')}</span>
-                            </div>
-                        </div>
-                        <Space size={2}>
-                            <Tooltip title={t('ai_settings.provider.action.edit')}>
-                                <Button type="text" size="small" icon={<EditOutlined />}
-                                    onClick={e => { e.stopPropagation(); handleEditProvider(p); }}
-                                    style={{ color: overlayTheme.mutedText }} />
-                            </Tooltip>
-                            <Popconfirm title={t('ai_settings.provider.confirm_delete')} onConfirm={() => handleDeleteProvider(p.id)}
-                                okButtonProps={{ danger: true }} okText={t('common.delete')} cancelText={t('common.cancel')}>
-                                <Button type="text" size="small" icon={<DeleteOutlined />} danger
-                                    onClick={e => e.stopPropagation()} />
-                            </Popconfirm>
-                        </Space>
-                    </div>
-                );
-            })}
-            <Button type="dashed" icon={<PlusOutlined />} onClick={handleAddProvider}
-                style={{ borderRadius: 12, height: 42, borderColor: darkMode ? 'rgba(255,255,255,0.12)' : undefined }}>
-                {t('ai_settings.provider.action.add')}
-            </Button>
-        </div>
-    );
-
-    // ===== Provider 编辑表单 =====
-    const renderProviderForm = () => {
-        const presetKeyFromForm = watchedPresetKey || (editingProvider as any)?.presetKey || 'openai';
-        return (
-            <div>
-                {/* 顶部返回 */}
-                <div style={{ marginBottom: 16, display: 'flex', alignItems: 'center', gap: 10 }}>
-                    <Button size="small" onClick={resetProviderEditorSession}
-                        style={{ borderRadius: 8 }}>← {t('ai_settings.action.back')}</Button>
-                    <span style={{ fontWeight: 700, fontSize: 16, color: overlayTheme.titleText }}>
-                        {editingProvider?.id ? t('ai_settings.provider.editor.edit_title') : t('ai_settings.provider.editor.add_title')}
-                    </span>
-                </div>
-
-                <Form form={form} layout="vertical" size="small">
-                    {/* Provider 类型选择 - 卡片式 */}
-                    <div style={fieldGroupStyle}>
-                        <div style={fieldLabelStyle}>
-                            <AppstoreOutlined style={{ fontSize: 14 }} /> {t('ai_settings.form.section.service_type')}
-                        </div>
-                        <Form.Item name="presetKey" noStyle>
-                            <div style={PROVIDER_PRESET_GRID_STYLE}>
-                                {PROVIDER_PRESETS.map(pt => (
-                                    <div key={pt.key} onClick={() => { form.setFieldValue('presetKey', pt.key); handlePresetChange(pt.key); }}
-                                        style={{
-                                            ...PROVIDER_PRESET_CARD_BASE_STYLE,
-                                            border: `1.5px solid ${presetKeyFromForm === pt.key ? overlayTheme.selectedText : 'transparent'}`,
-                                            background: presetKeyFromForm === pt.key ? overlayTheme.selectedBg : (darkMode ? 'rgba(255,255,255,0.02)' : 'rgba(255,255,255,0.72)'),
-                                            boxShadow: presetKeyFromForm === pt.key ? 'none' : (darkMode ? 'inset 0 0 0 1px rgba(255,255,255,0.028)' : 'inset 0 0 0 1px rgba(16,24,40,0.03)'),
-                                        }}>
-                                        <div style={{
-                                            color: presetKeyFromForm === pt.key ? overlayTheme.iconColor : overlayTheme.mutedText,
-                                            fontSize: 18, marginTop: 2, transition: 'all 0.2s ease', flexShrink: 0,
-                                        }}>
-                                            {pt.icon}
-                                        </div>
-                                        <div style={PROVIDER_PRESET_CARD_CONTENT_STYLE}>
-                                            <div style={{ ...PROVIDER_PRESET_CARD_TITLE_STYLE, fontSize: 13, fontWeight: 700, color: overlayTheme.titleText, lineHeight: 1.3 }}>{presetLabel(pt)}</div>
-                                            <div style={{ ...PROVIDER_PRESET_CARD_DESCRIPTION_STYLE, fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.4 }}>{presetDesc(pt)}</div>
-                                        </div>
-                                    </div>
-                                ))}
-                            </div>
-                        </Form.Item>
-                        <Form.Item name="type" hidden><Input /></Form.Item>
-                    </div>
-
-                    {/* 基本信息 - 仅自定义/Ollama 显示 */}
-                    {(presetKeyFromForm === 'custom' || presetKeyFromForm === 'ollama') && (
-                        <div style={{ ...fieldGroupStyle, marginTop: 16 }}>
-                            <div style={fieldLabelStyle}>
-                                <RobotOutlined style={{ fontSize: 14 }} /> {t('ai_settings.form.section.basic')}
-                            </div>
-                            
-                            <Form.Item label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>{t('ai_settings.form.provider_name')}</span>} name="name" rules={[{ required: true, message: t('ai_settings.form.provider_name_required') }]} style={{ marginBottom: 16 }}>
-                                <Input placeholder={t('ai_settings.form.provider_name_placeholder')}
-                                    size="middle"
-                                    style={{ borderRadius: 8, background: inputBg, border: `1px solid ${cardBorder}` }} />
-                            </Form.Item>
-                            
-                            {presetKeyFromForm === 'custom' && (
-                                <Form.Item label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>{t('ai_settings.form.api_format')}</span>} name="apiFormat" style={{ marginBottom: 16 }}>
-                                    <div style={{ 
-                                        display: 'inline-flex', padding: 4, background: darkMode ? 'rgba(0,0,0,0.2)' : 'rgba(0,0,0,0.04)', 
-                                        borderRadius: 8, gap: 4 
-                                    }}>
-                                        {[{ value: 'openai', label: 'OpenAI' }, { value: 'anthropic', label: 'Anthropic' }, { value: 'gemini', label: 'Gemini' }, { value: 'claude-cli', label: 'Claude CLI' }].map(fmt => (
-                                            <div
-                                                key={fmt.value}
-                                                onClick={() => form.setFieldsValue({ apiFormat: fmt.value })}
-                                                style={{
-                                                    padding: '6px 16px', borderRadius: 6, fontSize: 13, fontWeight: watchedApiFormat === fmt.value ? 600 : 500, cursor: 'pointer',
-                                                    background: watchedApiFormat === fmt.value ? (darkMode ? '#374151' : '#ffffff') : 'transparent',
-                                                    color: watchedApiFormat === fmt.value ? overlayTheme.titleText : overlayTheme.mutedText,
-                                                    boxShadow: watchedApiFormat === fmt.value ? '0 1px 3px rgba(0,0,0,0.1)' : 'none',
-                                                    transition: 'all 0.2s ease',
-                                                }}
-                                            >
-                                                {fmt.label}
-                                            </div>
-                                        ))}
-                                    </div>
-                                </Form.Item>
-                            )}
-                            
-                            <Form.Item label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>{t('ai_settings.form.model_list')}</span>} name="models" style={{ marginBottom: 0 }}>
-                                <Select mode="tags" size="middle" placeholder={t('ai_settings.form.model_list_placeholder')} style={{ width: '100%' }} />
-                            </Form.Item>
-                        </div>
-                    )}
-                    <Form.Item name="model" hidden><Input /></Form.Item>
-                    <Form.Item name="name" hidden><Input /></Form.Item>
-
-                    {/* 认证信息 */}
-                    <div style={{ ...fieldGroupStyle, marginTop: 16 }}>
-                        <div style={fieldLabelStyle}>
-                            <KeyOutlined style={{ fontSize: 14 }} /> {t('ai_settings.form.section.auth_connection')}
-                        </div>
-                        <Form.Item label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>{t('ai_settings.form.api_key')}</span>} name="apiKey" rules={[{ validator: (_, value) => { const apiKey = String(value || '').trim(); if (apiKey || editingProvider?.id) { return Promise.resolve(); } return Promise.reject(new Error(t('ai_settings.form.api_key_required'))); } }]} style={{ marginBottom: 16 }}>
-                            <Input.Password placeholder={editingProvider?.id ? t('ai_settings.form.api_key_keep_placeholder') : t('ai_settings.form.api_key_placeholder')}
-                                size="middle"
-                                visibilityToggle={{
-                                    visible: primaryPasswordVisible,
-                                    onVisibleChange: setPrimaryPasswordVisible,
-                                }}
-                                style={{ borderRadius: 8, background: inputBg, border: `1px solid ${cardBorder}` }} />
-                        </Form.Item>
-
-                        {(presetKeyFromForm === 'custom' || presetKeyFromForm === 'ollama') && (
-                            <Form.Item label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>{t('ai_settings.form.api_endpoint')}</span>} name="baseUrl" rules={[{ required: true, message: t('ai_settings.form.api_endpoint_required') }]} style={{ marginBottom: 0 }}>
-                                <Input placeholder={findPreset(presetKeyFromForm).defaultBaseUrl || 'https://...'}
-                                    size="middle"
-                                    suffix={<LinkOutlined style={{ color: overlayTheme.mutedText }} />}
-                                    style={{ borderRadius: 8, background: inputBg, border: `1px solid ${cardBorder}` }} />
-                            </Form.Item>
-                        )}
-                    </div>
-
-
-
-                    {/* 操作按钮 */}
-                    <div style={{
-                        display: 'flex', gap: 8, justifyContent: 'flex-end', marginTop: 12, paddingTop: 16,
-                        borderTop: `1px solid ${cardBorder}`, paddingBottom: 24,
-                    }}>
-                        <Button onClick={handleTestProvider} loading={loading} style={{ borderRadius: 10 }}
-                            icon={testStatus === 'success' ? <CheckOutlined style={{ color: '#22c55e' }} /> : undefined}>
-                            {testStatus === 'success' ? t('ai_settings.action.connection_ok') : testStatus === 'error' ? t('ai_settings.action.retest') : t('ai_settings.action.test')}
-                        </Button>
-                        <Button type="primary" onClick={handleSaveProvider} loading={loading}
-                            style={{ borderRadius: 10, fontWeight: 600 }}>
-                            {t('ai_settings.action.save')}
-                        </Button>
-                    </div>
-                </Form>
-            </div>
-        );
-    };
-
-    // ===== 安全控制 =====
-    const renderSafetySettings = () => (
-        <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
-            <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginBottom: 8 }}>
-                {t('ai_settings.safety.description')}
-            </div>
-            {SAFETY_OPTIONS.map(opt => {
-                const active = safetyLevel === opt.value;
-                return (
-                    <div key={opt.value} onClick={() => handleSafetyChange(opt.value)} style={{
-                        padding: '14px 16px', borderRadius: 14, cursor: 'pointer', transition: 'all 0.2s ease',
-                        border: `1.5px solid ${active ? (opt.color === '#ef4444' ? opt.color : overlayTheme.selectedText) : cardBorder}`,
-                        background: active ? (opt.color === '#ef4444' ? `${opt.color}15` : overlayTheme.selectedBg) : cardBg,
-                        display: 'flex', alignItems: 'flex-start', gap: 14,
-                    }}>
-                        <div style={{
-                            width: 36, height: 36, borderRadius: 10, display: 'grid', placeItems: 'center', fontSize: 18, flexShrink: 0,
-                            background: active ? (opt.color === '#ef4444' ? `${opt.color}25` : overlayTheme.iconBg) : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.03)'),
-                            color: active ? (opt.color === '#ef4444' ? opt.color : overlayTheme.iconColor) : overlayTheme.mutedText,
-                            transition: 'all 0.2s ease',
-                        }}>
-                            {opt.icon}
-                        </div>
-                        <div style={{ flex: 1 }}>
-                            <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, display: 'flex', alignItems: 'center', gap: 8 }}>
-                                {t(opt.labelKey)}
-                                {active && <CheckOutlined style={{ color: opt.color === '#ef4444' ? opt.color : overlayTheme.iconColor, fontSize: 14 }} />}
-                            </div>
-                            <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginTop: 4, lineHeight: '1.5' }}>{t(opt.descKey)}</div>
-                        </div>
-                    </div>
-                );
-            })}
-        </div>
-    );
-
-    // ===== 上下文级别 =====
-    const renderContextSettings = () => (
-        <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
-            <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginBottom: 8 }}>
-                {t('ai_settings.context.description')}
-            </div>
-            {CONTEXT_OPTIONS.map(opt => {
-                const active = contextLevel === opt.value;
-                return (
-                    <div key={opt.value} onClick={() => handleContextChange(opt.value)} style={{
-                        padding: '14px 16px', borderRadius: 14, cursor: 'pointer', transition: 'all 0.2s ease',
-                        border: `1.5px solid ${active ? overlayTheme.selectedText : cardBorder}`,
-                        background: active ? overlayTheme.selectedBg : cardBg,
-                        display: 'flex', alignItems: 'flex-start', gap: 14,
-                    }}>
-                        <div style={{
-                            width: 36, height: 36, borderRadius: 10, display: 'grid', placeItems: 'center', fontSize: 18, flexShrink: 0,
-                            background: active ? overlayTheme.iconBg : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.03)'),
-                            color: active ? overlayTheme.iconColor : overlayTheme.mutedText,
-                            transition: 'all 0.2s ease',
-                        }}>
-                            {opt.icon}
-                        </div>
-                        <div style={{ flex: 1 }}>
-                            <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, display: 'flex', alignItems: 'center', gap: 8 }}>
-                                {t(opt.labelKey)}
-                                {active && <CheckOutlined style={{ color: overlayTheme.iconColor, fontSize: 14 }} />}
-                            </div>
-                            <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginTop: 4, lineHeight: '1.5' }}>{t(opt.descKey)}</div>
-                        </div>
-                    </div>
-                );
-            })}
-        </div>
-    );
-
-    const renderBuiltinPrompts = () => (
-        <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
-            <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginBottom: 4 }}>
-                {t('ai_settings.prompts.description')}
-            </div>
-            {Object.entries(builtinPrompts).map(([title, promptText]) => (
-                <div key={title} style={{
-                    padding: '12px', borderRadius: 12, border: `1px solid ${cardBorder}`, background: cardBg,
-                }}>
-                    <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, marginBottom: 8, display: 'flex', alignItems: 'center', gap: 6 }}>
-                        <RobotOutlined style={{ color: overlayTheme.iconColor }} /> {title}
-                    </div>
-                    <div style={{
-                        background: darkMode ? 'rgba(0,0,0,0.2)' : 'rgba(255,255,255,0.8)',
-                        padding: '10px 12px', borderRadius: 8, fontSize: 13, color: overlayTheme.mutedText,
-                        whiteSpace: 'pre-wrap', fontFamily: 'var(--gn-font-mono)', lineHeight: 1.5,
-                        userSelect: 'text', border: darkMode ? '1px solid rgba(255,255,255,0.03)' : '1px solid rgba(0,0,0,0.02)'
-                    }}>
-                        {promptText}
-                    </div>
-                </div>
-            ))}
-        </div>
-    );
-
-    const BUILTIN_TOOLS_INFO = [
-        { name: 'get_connections', icon: '🔗', descKey: 'ai_settings.tools.get_connections.desc', detailKey: 'ai_settings.tools.get_connections.detail', params: t('ai_settings.tools.params.none') },
-        { name: 'get_databases', icon: '🗄️', descKey: 'ai_settings.tools.get_databases.desc', detailKey: 'ai_settings.tools.get_databases.detail', params: 'connectionId' },
-        { name: 'get_tables', icon: '📋', descKey: 'ai_settings.tools.get_tables.desc', detailKey: 'ai_settings.tools.get_tables.detail', params: 'connectionId, dbName' },
-        { name: 'get_columns', icon: '🔍', descKey: 'ai_settings.tools.get_columns.desc', detailKey: 'ai_settings.tools.get_columns.detail', params: 'connectionId, dbName, tableName' },
-        { name: 'get_table_ddl', icon: '📝', descKey: 'ai_settings.tools.get_table_ddl.desc', detailKey: 'ai_settings.tools.get_table_ddl.detail', params: 'connectionId, dbName, tableName' },
-        { name: 'execute_sql', icon: '▶️', descKey: 'ai_settings.tools.execute_sql.desc', detailKey: 'ai_settings.tools.execute_sql.detail', params: 'connectionId, dbName, sql' },
-    ];
-
-    const renderBuiltinTools = () => (
-        <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
-            <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginBottom: 4 }}>
-                {t('ai_settings.tools.description')}
-            </div>
-            <div style={{ fontSize: 12, color: overlayTheme.mutedText, opacity: 0.7, padding: '8px 12px', borderRadius: 8, background: cardBg, border: `1px solid ${cardBorder}` }}>
-                {t('ai_settings.tools.workflow')}
-            </div>
-            {BUILTIN_TOOLS_INFO.map(tool => (
-                <div key={tool.name} style={{
-                    padding: '14px 16px', borderRadius: 14, border: `1px solid ${cardBorder}`, background: cardBg,
-                    transition: 'all 0.2s ease',
-                }}>
-                    <div style={{ display: 'flex', alignItems: 'center', gap: 10, marginBottom: 8 }}>
-                        <span style={{ fontSize: 20 }}>{tool.icon}</span>
-                        <div>
-                            <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, fontFamily: 'var(--gn-font-mono)' }}>
-                                {tool.name}
-                            </div>
-                            <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginTop: 2 }}>{t(tool.descKey)}</div>
-                        </div>
-                    </div>
-                    <div style={{
-                        fontSize: 13, color: overlayTheme.mutedText, lineHeight: 1.6, padding: '8px 12px',
-                        background: darkMode ? 'rgba(0,0,0,0.15)' : 'rgba(0,0,0,0.02)', borderRadius: 8,
-                    }}>
-                        {t(tool.detailKey)}
-                    </div>
-                    <div style={{ marginTop: 8, fontSize: 12, color: overlayTheme.mutedText, opacity: 0.7, display: 'flex', alignItems: 'center', gap: 6 }}>
-                        <ToolOutlined style={{ fontSize: 12 }} />
-                        <span>{t('ai_settings.tools.params_label')}</span>
-                        <code style={{ fontFamily: 'var(--gn-font-mono)', fontSize: 12, padding: '1px 6px', borderRadius: 4, background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)' }}>
-                            {tool.params}
-                        </code>
-                    </div>
-                </div>
-            ))}
-        </div>
-    );
-
     const modalShellStyle = {
         background: overlayTheme.shellBg, border: overlayTheme.shellBorder,
         boxShadow: overlayTheme.shellShadow, backdropFilter: overlayTheme.shellBackdropFilter,
@@ -775,54 +702,138 @@ const AISettingsModal: React.FC<AISettingsModalProps> = ({ open, onClose, darkMo
         >
               <div ref={modalBodyRef} className="ai-settings-body" style={{ display: 'grid', gridTemplateColumns: '180px minmax(0, 1fr)', gap: 16, padding: '12px 0', height: '100%', minHeight: 0, overflow: 'hidden', alignItems: 'stretch', position: 'relative' }}>
                   {messageContextHolder}
-                  <div style={{ padding: '0 12px', height: 'fit-content' }}>
-                      <div style={{ marginBottom: 12, fontWeight: 600, color: overlayTheme.titleText }}>{t('ai_settings.nav.title')}</div>
-                      <div style={{ display: 'grid', gap: 10 }}>
-                          {[
-                              { key: 'providers', title: t('ai_settings.nav.providers.title'), description: t('ai_settings.nav.providers.description'), icon: <ApiOutlined /> },
-                              { key: 'safety', title: t('ai_settings.nav.safety.title'), description: t('ai_settings.nav.safety.description'), icon: <SafetyCertificateOutlined /> },
-                              { key: 'context', title: t('ai_settings.nav.context.title'), description: t('ai_settings.nav.context.description'), icon: <RobotOutlined /> },
-                              { key: 'tools', title: t('ai_settings.nav.tools.title'), description: t('ai_settings.nav.tools.description'), icon: <ToolOutlined /> },
-                              { key: 'prompts', title: t('ai_settings.nav.prompts.title'), description: t('ai_settings.nav.prompts.description'), icon: <ExperimentOutlined /> },
-                          ].map((item) => {
-                              const active = activeSection === item.key;
-                              return (
-                                  <button
-                                      key={item.key}
-                                      type="button"
-                                      onClick={() => setActiveSection(item.key as typeof activeSection)}
-                                      style={{
-                                          textAlign: 'left',
-                                          padding: '12px 14px',
-                                          borderRadius: 12,
-                                          border: `1px solid ${active
-                                              ? (darkMode ? 'rgba(255,214,102,0.3)' : 'rgba(24,144,255,0.24)')
-                                              : (darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(16,24,40,0.08)')}`,
-                                          background: active
-                                              ? (darkMode ? 'linear-gradient(180deg, rgba(255,214,102,0.12) 0%, rgba(255,214,102,0.06) 100%)' : 'linear-gradient(180deg, rgba(24,144,255,0.10) 0%, rgba(24,144,255,0.05) 100%)')
-                                              : (darkMode ? 'rgba(255,255,255,0.02)' : 'rgba(255,255,255,0.72)'),
-                                          color: active ? (darkMode ? '#f5f7ff' : '#162033') : (darkMode ? 'rgba(255,255,255,0.82)' : '#3f4b5e'),
-                                          cursor: 'pointer',
-                                      }}
-                                  >
-                                      <div style={{ display: 'flex', alignItems: 'center', gap: 10 }}>
-                                          <span style={{ fontSize: 16 }}>{item.icon}</span>
-                                          <span style={{ fontSize: 14, fontWeight: 700 }}>{item.title}</span>
-                                      </div>
-                                      <div style={{ marginTop: 6, fontSize: 12, lineHeight: 1.6, color: active ? (darkMode ? 'rgba(255,255,255,0.68)' : 'rgba(22,32,51,0.68)') : 'rgba(128,128,128,0.7)' }}>
-                                          {item.description}
-                                      </div>
-                                  </button>
-                              );
-                          })}
-                      </div>
-                  </div>
+                  <AISettingsSidebar
+                      activeSection={activeSection}
+                      darkMode={darkMode}
+                      overlayTheme={overlayTheme}
+                      onSelectSection={setActiveSection}
+                  />
                   <div style={{ minWidth: 0, minHeight: 0, height: '100%', overflowY: 'auto', overflowX: 'hidden', paddingRight: 8, paddingBottom: 28 }}>
-                      {activeSection === 'providers' && (isEditing ? renderProviderForm() : renderProviderList())}
-                      {activeSection === 'safety' && renderSafetySettings()}
-                      {activeSection === 'context' && renderContextSettings()}
-                      {activeSection === 'tools' && renderBuiltinTools()}
-                      {activeSection === 'prompts' && renderBuiltinPrompts()}
+                      {activeSection === 'providers' && (
+                          <AISettingsProvidersSection
+                              providers={providers}
+                              activeProviderId={activeProviderId}
+                              editingProvider={editingProvider}
+                              isEditing={isEditing}
+                              form={form}
+                              providerPresets={PROVIDER_PRESETS}
+                              watchedPresetKey={watchedPresetKey}
+                              watchedApiFormat={watchedApiFormat}
+                              loading={loading}
+                              testStatus={testStatus}
+                              primaryPasswordVisible={primaryPasswordVisible}
+                              darkMode={darkMode}
+                              overlayTheme={overlayTheme}
+                              cardBg={cardBg}
+                              cardBorder={cardBorder}
+                              inputBg={inputBg}
+                              onPrimaryPasswordVisibleChange={setPrimaryPasswordVisible}
+                              resolveProviderPreset={matchProviderPreset}
+                              resolvePresetByKey={findPreset}
+                              onAddProvider={handleAddProvider}
+                              onEditProvider={handleEditProvider}
+                              onDeleteProvider={handleDeleteProvider}
+                              onSetActiveProvider={handleSetActive}
+                              onCancelEdit={resetProviderEditorSession}
+                              onPresetChange={handlePresetChange}
+                              onTestProvider={handleTestProvider}
+                              onSaveProvider={handleSaveProvider}
+                          />
+                      )}
+                      {activeSection === 'safety' && (
+                          <AISettingsSafetySection
+                              safetyLevel={safetyLevel}
+                              darkMode={darkMode}
+                              overlayTheme={overlayTheme}
+                              cardBg={cardBg}
+                              cardBorder={cardBorder}
+                              onChange={handleSafetyChange}
+                          />
+                      )}
+                      {activeSection === 'context' && (
+                          <AISettingsContextSection
+                              contextLevel={contextLevel}
+                              darkMode={darkMode}
+                              overlayTheme={overlayTheme}
+                              cardBg={cardBg}
+                              cardBorder={cardBorder}
+                              onChange={handleContextChange}
+                          />
+                      )}
+                      {activeSection === 'mcp' && (
+                          <AISettingsMCPSection
+                              mcpClientStatuses={mcpClientStatuses}
+                              selectedMCPClient={selectedMCPClient}
+                              selectedMCPClientStatus={selectedMCPClientStatus}
+                              selectedMCPClientCommandText={selectedMCPClientCommandText}
+                              mcpHTTPServerStatus={mcpHTTPServerStatus}
+                              mcpHTTPServerDraft={mcpHTTPServerDraft}
+                              mcpServers={mcpServers}
+                              mcpTools={mcpTools}
+                              darkMode={darkMode}
+                              overlayTheme={overlayTheme}
+                              cardBg={cardBg}
+                              cardBorder={cardBorder}
+                              inputBg={inputBg}
+                              loading={loading}
+                              mcpClientStatusLoading={mcpClientStatusLoading}
+                              mcpHTTPServerLoading={mcpHTTPServerLoading}
+                              onUpdateHTTPServerDraft={handleUpdateMCPHTTPServerDraft}
+                              onToggleHTTPServer={handleToggleMCPHTTPServer}
+                              onCopyHTTPServerURL={() => void handleCopyMCPHTTPServerURL()}
+                              onCopyHTTPServerAuthorization={() => void handleCopyMCPHTTPServerAuthorization()}
+                              onSelectClient={handleSelectMCPClient}
+                              onRefreshStatus={() => void loadMCPClientStatuses()}
+                              onCopyConfigPath={() => void handleCopySelectedMCPConfigPath()}
+                              onCopyLaunchCommand={() => void handleCopySelectedMCPLaunchCommand()}
+                              onInstallSelectedClient={handleInstallSelectedMCPClient}
+                              onAddServer={handleAddMCPServer}
+                              onUpdateServerDraft={updateMCPServerDraft}
+                              onTestServer={handleTestMCPServer}
+                              onSaveServer={handleSaveMCPServer}
+                              onDeleteServer={handleDeleteMCPServer}
+                          />
+                      )}
+                      {activeSection === 'skills' && (
+                          <AISettingsSkillsSection
+                              skills={skills}
+                              skillRequiredToolOptions={skillRequiredToolOptions}
+                              overlayTheme={overlayTheme}
+                              cardBg={cardBg}
+                              cardBorder={cardBorder}
+                              inputBg={inputBg}
+                              loading={loading}
+                              onAddSkill={handleAddSkill}
+                              onUpdateSkillDraft={updateSkillDraft}
+                              onSaveSkill={handleSaveSkill}
+                              onDeleteSkill={handleDeleteSkill}
+                          />
+                      )}
+                      {activeSection === 'tools' && (
+                          <AIBuiltinToolsCatalog
+                              darkMode={darkMode}
+                              overlayTheme={overlayTheme}
+                              cardBg={cardBg}
+                              cardBorder={cardBorder}
+                          />
+                      )}
+                      {activeSection === 'prompts' && (
+                          <AISettingsPromptsSection
+                              builtinPrompts={builtinPrompts}
+                              userPromptSettings={userPromptSettings}
+                              overlayTheme={overlayTheme}
+                              cardBg={cardBg}
+                              cardBorder={cardBorder}
+                              inputBg={inputBg}
+                              darkMode={darkMode}
+                              loading={loading}
+                              onChangeUserPrompt={(key, value) => setUserPromptSettings((prev) => ({
+                                  ...prev,
+                                  [key]: value,
+                              }))}
+                              onSave={handleSaveUserPromptSettings}
+                          />
+                      )}
                   </div>
               </div>
         </Modal>
@@ -830,6 +841,3 @@ const AISettingsModal: React.FC<AISettingsModalProps> = ({ open, onClose, darkMo
 };
 
 export default AISettingsModal;
-
-
-
diff --git a/frontend/src/components/ConnectionModal.edit-password.test.tsx b/frontend/src/components/ConnectionModal.edit-password.test.tsx
index 615d678..02418f4 100644
--- a/frontend/src/components/ConnectionModal.edit-password.test.tsx
+++ b/frontend/src/components/ConnectionModal.edit-password.test.tsx
@@ -1,7 +1,12 @@
 import { describe, expect, it } from 'vitest';
 import { readFileSync } from 'node:fs';
 
-const source = readFileSync(new URL('./ConnectionModal.tsx', import.meta.url), 'utf8');
+const connectionModalSource = readFileSync(new URL('./ConnectionModal.tsx', import.meta.url), 'utf8');
+const redisSectionsSource = readFileSync(new URL('./ConnectionModalRedisSections.tsx', import.meta.url), 'utf8');
+const mongoSectionsSource = readFileSync(new URL('./ConnectionModalMongoSections.tsx', import.meta.url), 'utf8');
+const connectionTypeCatalogSource = readFileSync(new URL('../utils/connectionTypeCatalog.ts', import.meta.url), 'utf8');
+const connectionTypeCapabilitiesSource = readFileSync(new URL('../utils/connectionTypeCapabilities.ts', import.meta.url), 'utf8');
+const source = `${connectionModalSource}\n${redisSectionsSource}\n${mongoSectionsSource}\n${connectionTypeCatalogSource}\n${connectionTypeCapabilitiesSource}`;
 
 describe('ConnectionModal edit password behavior', () => {
   it('keeps the prefilled primary password masked by default', () => {
@@ -36,3 +41,189 @@ describe('ConnectionModal edit password behavior', () => {
     );
   });
 });
+
+describe('ConnectionModal data source registry', () => {
+  it('exposes Elasticsearch in the create-connection picker with HTTP defaults', () => {
+    expect(source).toContain("case 'elasticsearch':");
+    expect(source).toContain('return 9200;');
+    expect(source).toContain('elasticsearch: ["http", "https"]');
+    expect(source).toContain("key: 'elasticsearch'");
+    expect(source).toContain("name: 'Elasticsearch'");
+    expect(source).toContain('icon: getDbIcon(item.key, undefined, 36)');
+    expect(source).toContain('type === "elasticsearch"');
+    expect(source).toContain("return '支持索引浏览、Mapping 检查、JSON DSL 和 query_string 查询';");
+    expect(source).toContain('const PRIMARY_USERNAME_OPTIONAL_TYPES = new Set([');
+    expect(source).toContain('"mqtt",');
+    expect(source).toContain(
+      'type === "clickhouse" ? "default" : (type === "redis" || type === "elasticsearch" || type === "chroma" || type === "qdrant" || type === "rocketmq" || type === "mqtt" || type === "kafka" || type === "rabbitmq") ? "" : "root";',
+    );
+    expect(source).toContain('PRIMARY_USERNAME_OPTIONAL_TYPES.has(dbType)');
+    expect(source).toContain('label="显示数据库 (留空显示全部)"');
+  });
+
+  it('keeps MQTT username optional during test-connection validation', () => {
+    expect(source).toContain('"mqtt",');
+    expect(source).toContain('PRIMARY_USERNAME_OPTIONAL_TYPES.has(dbType)');
+    expect(source).toContain(': [createUriAwareRequiredRule("请输入用户名")]');
+    expect(source).toContain('? "未开启认证可留空"');
+  });
+
+  it('exposes Chroma in the create-connection picker with vector defaults', () => {
+    expect(source).toContain("case 'chroma':");
+    expect(source).toContain('return 8000;');
+    expect(source).toContain('chroma: ["http", "https", "chroma"]');
+    expect(source).toContain("key: 'chroma'");
+    expect(source).toContain("name: 'Chroma'");
+    expect(source).toContain('type === "chroma"');
+    expect(source).toContain("return 'Collection 浏览、向量检索和元数据过滤';");
+    expect(source).toContain('return "http://127.0.0.1:8000/default_database?tenant=default_tenant";');
+    expect(source).toContain('return "tenant=default_tenant&apiKey=...";');
+  });
+
+  it('exposes Qdrant in the create-connection picker with vector defaults', () => {
+    expect(source).toContain("case 'qdrant':");
+    expect(source).toContain('return 6333;');
+    expect(source).toContain('qdrant: ["http", "https", "qdrant"]');
+    expect(source).toContain("key: 'qdrant'");
+    expect(source).toContain("name: 'Qdrant'");
+    expect(source).toContain('type === "qdrant"');
+    expect(source).toContain("return 'Collection 浏览、向量搜索和 Payload 过滤';");
+    expect(source).toContain('return "http://127.0.0.1:6333";');
+    expect(source).toContain('return "apiKey=...";');
+  });
+
+  it('exposes Apache IoTDB in the create-connection picker with timeseries defaults', () => {
+    expect(source).toContain("case 'iotdb':");
+    expect(source).toContain('return 6667;');
+    expect(source).toContain('iotdb: ["iotdb"]');
+    expect(source).toContain("key: 'iotdb'");
+    expect(source).toContain("name: 'Apache IoTDB'");
+    expect(source).toContain('dbType === "iotdb"');
+    expect(source).toContain("return 'Storage Group / Device / Timeseries';");
+    expect(source).toContain('return "iotdb://root:root@127.0.0.1:6667/root.sg";');
+    expect(source).toContain('return "fetchSize=1024&timeZone=Asia%2FShanghai";');
+  });
+
+  it('exposes RocketMQ in the create-connection picker with nameserver and topic defaults', () => {
+    expect(source).toContain("case 'rocketmq':");
+    expect(source).toContain('return 9876;');
+    expect(source).toContain('rocketmq: ["rocketmq", "rmq"]');
+    expect(source).toContain("key: 'rocketmq'");
+    expect(source).toContain("name: 'RocketMQ'");
+    expect(source).toContain('dbType === "rocketmq"');
+    expect(source).toContain("return 'NameServer / Topic / Consumer Group';");
+    expect(source).toContain('return "rocketmq://accessKey:secretKey@127.0.0.1:9876,127.0.0.2:9876/orders.events?topology=cluster&groupId=gonavi&namespace=prod&tag=TagA&pullBatchSize=32&startOffset=latest";');
+    expect(source).toContain('return "groupId=gonavi&namespace=prod&tag=TagA&pullBatchSize=32&startOffset=latest";');
+    expect(source).toContain('label="默认 Topic（可选）"');
+    expect(source).toContain('label={dbType === "rocketmq" ? "Access Key" : "用户名"}');
+    expect(source).toContain('label={dbType === "rocketmq" ? "Secret Key" : "密码"}');
+    expect(source).toContain('emptyPlaceholder: dbType === "rocketmq" ? "未开启认证可留空" : "密码"');
+    expect(source).toContain('retainedLabel: dbType === "rocketmq" ? "已保存 Secret Key" : "已保存密码"');
+  });
+
+  it('exposes MQTT in the create-connection picker with broker and topic-filter defaults', () => {
+    expect(source).toContain("case 'mqtt':");
+    expect(source).toContain('return 1883;');
+    expect(source).toContain('mqtt: ["mqtt", "mqtts", "tcp", "ssl", "tls"]');
+    expect(source).toContain("key: 'mqtt'");
+    expect(source).toContain("name: 'MQTT'");
+    expect(source).toContain('dbType === "mqtt"');
+    expect(source).toContain("return 'Broker / Topic Filter / QoS';");
+    expect(source).toContain('return "mqtt://user:pass@127.0.0.1:1883/devices%2F%2B%2Ftelemetry?topology=cluster&clientId=gonavi-desktop&qos=1";');
+    expect(source).toContain('return "topics=devices%2F%2B%2Ftelemetry,%24SYS%2F%23&clientId=gonavi-desktop&qos=1&cleanSession=true&fetchWaitMs=4000";');
+    expect(source).toContain('label="默认 Topic / Filter（可选）"');
+  });
+
+  it('exposes Kafka in the create-connection picker with broker and topic defaults', () => {
+    expect(source).toContain("case 'kafka':");
+    expect(source).toContain('return 9092;');
+    expect(source).toContain("key: 'kafka'");
+    expect(source).toContain("name: 'Kafka'");
+    expect(source).toContain('dbType === "kafka"');
+    expect(source).toContain("return 'Broker / Topic / Consumer Group';");
+    expect(source).toContain('return "kafka://user:pass@127.0.0.1:9092,127.0.0.2:9092/orders.events?topology=cluster&groupId=analytics&mechanism=scram-sha-256";');
+    expect(source).toContain('return "groupId=gonavi&mechanism=scram-sha-256&clientId=gonavi-desktop&startOffset=latest";');
+    expect(source).toContain('label="默认 Topic（可选）"');
+  });
+
+  it('exposes RabbitMQ in the create-connection picker with management-api and vhost defaults', () => {
+    expect(source).toContain("case 'rabbitmq':");
+    expect(source).toContain('return 15672;');
+    expect(source).toContain('rabbitmq: ["rabbitmq", "http", "https"]');
+    expect(source).toContain("key: 'rabbitmq'");
+    expect(source).toContain("name: 'RabbitMQ'");
+    expect(source).toContain('dbType === "rabbitmq"');
+    expect(source).toContain("return 'Management API / Virtual Host / Queue';");
+    expect(source).toContain('return "rabbitmq://guest:guest@127.0.0.1:15672/%2F?defaultQueue=orders.queue&exchange=events.topic&timeout=30";');
+    expect(source).toContain('return "defaultQueue=orders.queue&exchange=events.topic&managementPathPrefix=/rabbitmq";');
+    expect(source).toContain('label="默认 Virtual Host（可选）"');
+  });
+
+  it('exposes GaussDB in the create-connection picker with PostgreSQL-family defaults', () => {
+    expect(source).toContain("case 'gaussdb':");
+    expect(source).toContain('return 5432;');
+    expect(source).toContain('gaussdb: ["gaussdb", "postgresql", "postgres"]');
+    expect(source).toContain("key: 'gaussdb'");
+    expect(source).toContain("name: 'GaussDB'");
+    expect(source).toContain('type === "gaussdb"');
+    expect(source).toContain('return "gaussdb://user:pass@127.0.0.1:5432/db_name";');
+    expect(source).toContain('return "application_name=GoNavi&statement_timeout=30000";');
+    expect(source).toContain('? "gaussdb"');
+    expect(source).toContain('dbType === "gaussdb"');
+  });
+
+  it('exposes GoldenDB in the create-connection picker with MySQL-compatible defaults', () => {
+    expect(source).toContain("case 'goldendb':");
+    expect(source).toContain('return 1523;');
+    expect(source).toContain("key: 'goldendb'");
+    expect(source).toContain("name: 'GoldenDB'");
+    expect(source).toContain('type === "goldendb"');
+    expect(source).toContain("return 'MySQL 兼容 / 分布式事务';");
+    expect(source).toContain('dbType === "goldendb" ? "goldendb" : "mysql"');
+    expect(source).toContain('type === "goldendb" ? "goldendb" : "mysql"');
+    expect(source).toContain('? "goldendb"');
+  });
+
+  it('keeps OceanBase Oracle service name optional for OBClient/MySQL-wire connections', () => {
+    expect(source).toContain('OceanBase Oracle 服务名 (Service Name，可选)');
+    expect(source).toContain('isOceanBaseOracle\n                          ? []');
+    expect(source).toContain('连接 OBClient/OBServer MySQL-wire 入口时可留空');
+    expect(source).toContain('只有连接 OBProxy Oracle listener/TNS 入口时才需要填写 SERVICE_NAME');
+    expect(source).toContain('createUriAwareRequiredRule("请输入 Oracle 服务名（例如 ORCLPDB1）")');
+    expect(source).not.toContain('请输入 OceanBase Oracle 服务名');
+    expect(source).not.toContain('Oracle 租户必须填写监听器注册的 SERVICE_NAME');
+  });
+});
+
+describe('ConnectionModal Redis Sentinel configuration', () => {
+  it('exposes Sentinel topology fields and safe defaults', () => {
+    expect(source).toContain('label: "哨兵模式"');
+    expect(source).toContain('name="redisSentinelMaster"');
+    expect(source).toContain('Sentinel master 名称');
+    expect(source).toContain('name="redisSentinelPassword"');
+    expect(source).toContain('hasRedisSentinelPassword');
+    expect(source).toContain('clearKey: "redisSentinelPassword"');
+    expect(source).toContain('form.setFieldValue("port", 26379)');
+    expect(source).toContain('form.setFieldValue("port", 6379)');
+  });
+
+  it('keeps the saved host as the primary Redis node when editing multi-node configs', () => {
+    expect(source).toContain('const savedPrimaryAddress = isFileDbConfigType');
+    expect(source).toContain('savedPrimaryAddress,');
+    expect(source).toContain('...(Array.isArray(config.hosts) ? config.hosts : [])');
+    expect(source).toContain('const redisHosts =');
+    expect(source).toContain('configType === "redis" ? normalizedHosts.slice(1) : [];');
+  });
+});
+
+describe('ConnectionModal MongoDB configuration', () => {
+  it('keeps replica, SRV, and read preference fields in the split Mongo sections', () => {
+    expect(source).toContain('ConnectionModalMongoSections');
+    expect(source).toContain('name="mongoSrv"');
+    expect(source).toContain('SRV 与 SSH 隧道同时启用');
+    expect(source).toContain('name="mongoReplicaPassword"');
+    expect(source).toContain('clearKey: "mongoReplicaPassword"');
+    expect(source).toContain('自动发现成员');
+    expect(source).toContain('fieldName: "mongoReadPreference"');
+  });
+});
diff --git a/frontend/src/components/ConnectionModal.tsx b/frontend/src/components/ConnectionModal.tsx
index de91219..6cc9dca 100644
--- a/frontend/src/components/ConnectionModal.tsx
+++ b/frontend/src/components/ConnectionModal.tsx
@@ -65,6 +65,32 @@ import { mergeParsedUriValuesForForm } from "../utils/connectionUriMerge";
 import { buildRpcConnectionConfig } from "../utils/connectionRpcConfig";
 import { getCustomConnectionDriverHelp } from "../utils/driverImportGuidance";
 import { isBackendCancelledResult } from "../utils/connectionExport";
+import {
+  buildRedisUriFromValues,
+  parseRedisUriToFormValues,
+  resolveRedisConfigDraft,
+} from "../utils/redisConnectionUri";
+import {
+  CONNECTION_TYPE_GROUPS,
+  getAllConnectionTypeCatalogItems,
+  getConnectionTypeDefaultPort as getDefaultPortByType,
+  getConnectionTypeHint,
+} from "../utils/connectionTypeCatalog";
+import {
+  isFileDatabaseType,
+  isMySQLCompatibleType,
+  isPostgresCompatibleSSLType,
+  singleHostUriSchemesByType,
+  supportsConnectionParamsForType,
+  supportsSSLCAPathForType,
+  supportsSSLClientCertificateForType,
+  supportsSSLForType,
+} from "../utils/connectionTypeCapabilities";
+import {
+  normalizeDriverType,
+  resolveConnectionDriverType,
+  type DriverStatusSnapshot,
+} from "../utils/connectionDriverType";
 import {
   describeUnsupportedOceanBaseProtocol,
   normalizeOceanBaseProtocol,
@@ -92,6 +118,7 @@ import {
   MongoDiscoverMembers,
   TestConnection,
   RedisConnect,
+  RedisGetDatabases,
   SelectDatabaseFile,
   SelectCertificateFile,
   SelectSSHKeyFile,
@@ -112,8 +139,19 @@ const MAX_URI_LENGTH = 4096;
 const MAX_CONNECTION_PARAMS_LENGTH = 4096;
 const MAX_URI_HOSTS = 32;
 const MAX_TIMEOUT_SECONDS = 3600;
+const PRIMARY_USERNAME_OPTIONAL_TYPES = new Set([
+  "mongodb",
+  "elasticsearch",
+  "chroma",
+  "qdrant",
+  "rocketmq",
+  "mqtt",
+  "kafka",
+  "rabbitmq",
+]);
 const CONNECTION_MODAL_WIDTH = 960;
 const CONNECTION_MODAL_BODY_HEIGHT = 620;
+const REDIS_DEFAULT_DATABASE_COUNT = 16;
 const STEP1_SIDEBAR_DIVIDER_DARK = "rgba(255, 255, 255, 0.16)";
 const STEP1_SIDEBAR_DIVIDER_LIGHT = "rgba(0, 0, 0, 0.08)";
 const CLICKHOUSE_PROTOCOL_OPTIONS: Array<{
@@ -132,6 +170,62 @@ const OCEANBASE_PROTOCOL_OPTIONS: Array<{
   { value: "mysql", label: "MySQL" },
   { value: "oracle", label: "Oracle" },
 ];
+
+const normalizeRedisDatabaseIndex = (value: unknown): number | null => {
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed) || parsed < 0) return null;
+  return Math.trunc(parsed);
+};
+
+const buildRedisDatabaseList = (...values: unknown[]): number[] => {
+  const indexes = new Set<number>();
+  for (let i = 0; i < REDIS_DEFAULT_DATABASE_COUNT; i += 1) {
+    indexes.add(i);
+  }
+  const collect = (value: unknown) => {
+    if (Array.isArray(value)) {
+      value.forEach(collect);
+      return;
+    }
+    const index = normalizeRedisDatabaseIndex(value);
+    if (index !== null) {
+      indexes.add(index);
+    }
+  };
+  values.forEach(collect);
+  return Array.from(indexes).sort((a, b) => a - b);
+};
+
+const extractRedisDatabaseList = (value: unknown): number[] => {
+  if (!Array.isArray(value)) return [];
+  const indexes = new Set<number>();
+  value.forEach((row: any) => {
+    const index = normalizeRedisDatabaseIndex(row?.index ?? row?.Index);
+    if (index !== null) {
+      indexes.add(index);
+    }
+  });
+  const result = Array.from(indexes).sort((a, b) => a - b);
+  return result.length > 0 ? result : buildRedisDatabaseList();
+};
+
+const normalizeRedisDatabaseSelection = (
+  value: unknown,
+  supportedDbs: number[],
+): number[] | undefined => {
+  if (!Array.isArray(value)) return undefined;
+  const supported = new Set(supportedDbs);
+  const selected = Array.from(
+    new Set(
+      value
+        .map(normalizeRedisDatabaseIndex)
+        .filter((index): index is number => index !== null)
+        .filter((index) => supported.size === 0 || supported.has(index)),
+    ),
+  ).sort((a, b) => a - b);
+  return selected.length > 0 ? selected : undefined;
+};
+
 const normalizeClickHouseProtocolValue = (
   value: unknown,
 ): ClickHouseProtocolChoice => {
@@ -178,6 +272,7 @@ type ConnectionSecretKey =
   | "httpTunnelPassword"
   | "mysqlReplicaPassword"
   | "mongoReplicaPassword"
+  | "redisSentinelPassword"
   | "opaqueURI"
   | "opaqueDSN";
 
@@ -214,6 +309,7 @@ const createEmptyConnectionSecretClearState =
     httpTunnelPassword: false,
     mysqlReplicaPassword: false,
     mongoReplicaPassword: false,
+    redisSentinelPassword: false,
     opaqueURI: false,
     opaqueDSN: false,
   });
@@ -240,6 +336,8 @@ const resolveInitialSecretFieldValue = (
       return String(config.mysqlReplicaPassword || "");
     case "mongoReplicaPassword":
       return String(config.mongoReplicaPassword || "");
+    case "redisSentinelPassword":
+      return String(config.redisSentinelPassword || "");
     case "uri":
       return String(config.uri || "");
     case "dsn":
@@ -249,231 +347,6 @@ const resolveInitialSecretFieldValue = (
   }
 };
 
-const getDefaultPortByType = (type: string) => {
-  switch (type) {
-    case "jvm":
-      return 9010;
-    case "mysql":
-      return 3306;
-    case "oceanbase":
-      return 2881;
-    case "doris":
-    case "diros":
-    case "starrocks":
-      return 9030;
-    case "sphinx":
-      return 9306;
-    case "clickhouse":
-      return 9000;
-    case "postgres":
-    case "opengauss":
-      return 5432;
-    case "redis":
-      return 6379;
-    case "tdengine":
-      return 6041;
-    case "oracle":
-      return 1521;
-    case "dameng":
-      return 5236;
-    case "kingbase":
-      return 54321;
-    case "sqlserver":
-      return 1433;
-    case "iris":
-      return 1972;
-    case "mongodb":
-      return 27017;
-    case "highgo":
-      return 5866;
-    case "mariadb":
-      return 3306;
-    case "vastbase":
-      return 5432;
-    case "sqlite":
-      return 0;
-    case "duckdb":
-      return 0;
-    default:
-      return 3306;
-  }
-};
-
-const singleHostUriSchemesByType: Record<string, string[]> = {
-  postgres: ["postgresql", "postgres"],
-  opengauss: ["opengauss", "jdbc:opengauss", "postgresql", "postgres"],
-  clickhouse: ["clickhouse"],
-  oracle: ["oracle"],
-  sqlserver: ["sqlserver"],
-  iris: ["iris", "intersystems"],
-  redis: ["redis"],
-  tdengine: ["tdengine"],
-  dameng: ["dameng", "dm"],
-  kingbase: ["kingbase"],
-  highgo: ["highgo"],
-  vastbase: ["vastbase"],
-};
-
-const sslSupportedTypes = new Set([
-  "mysql",
-  "mariadb",
-  "oceanbase",
-  "doris",
-  "diros",
-  "starrocks",
-  "sphinx",
-  "dameng",
-  "clickhouse",
-  "postgres",
-  "sqlserver",
-  "oracle",
-  "kingbase",
-  "highgo",
-  "vastbase",
-  "opengauss",
-  "mongodb",
-  "redis",
-  "tdengine",
-]);
-
-const supportsSSLForType = (type: string) =>
-  sslSupportedTypes.has(
-    String(type || "")
-      .trim()
-      .toLowerCase(),
-  );
-
-const sslCAPathSupportedTypes = new Set([
-  "mysql",
-  "mariadb",
-  "oceanbase",
-  "diros",
-  "starrocks",
-  "sphinx",
-  "clickhouse",
-  "postgres",
-  "sqlserver",
-  "kingbase",
-  "highgo",
-  "vastbase",
-  "opengauss",
-  "mongodb",
-  "redis",
-]);
-
-const sslClientCertificateSupportedTypes = new Set([
-  "mysql",
-  "mariadb",
-  "oceanbase",
-  "diros",
-  "starrocks",
-  "sphinx",
-  "dameng",
-  "clickhouse",
-  "postgres",
-  "kingbase",
-  "highgo",
-  "vastbase",
-  "opengauss",
-  "mongodb",
-  "redis",
-]);
-
-const supportsSSLCAPathForType = (type: string) =>
-  sslCAPathSupportedTypes.has(
-    String(type || "")
-      .trim()
-      .toLowerCase(),
-  );
-
-const supportsSSLClientCertificateForType = (type: string) =>
-  sslClientCertificateSupportedTypes.has(
-    String(type || "")
-      .trim()
-      .toLowerCase(),
-  );
-
-const isPostgresCompatibleSSLType = (type: string) =>
-  [
-    "postgres",
-    "kingbase",
-    "highgo",
-    "vastbase",
-    "opengauss",
-  ].includes(
-    String(type || "")
-      .trim()
-      .toLowerCase(),
-  );
-
-const isFileDatabaseType = (type: string) =>
-  type === "sqlite" || type === "duckdb";
-
-const isMySQLCompatibleType = (type: string) =>
-  type === "mysql" ||
-  type === "mariadb" ||
-  type === "oceanbase" ||
-  type === "doris" ||
-  type === "diros" ||
-  type === "starrocks" ||
-  type === "sphinx";
-
-const supportsConnectionParamsForType = (type: string) =>
-  isMySQLCompatibleType(type) ||
-  type === "postgres" ||
-  type === "kingbase" ||
-  type === "highgo" ||
-  type === "vastbase" ||
-  type === "opengauss" ||
-  type === "oracle" ||
-  type === "sqlserver" ||
-  type === "iris" ||
-  type === "clickhouse" ||
-  type === "mongodb" ||
-  type === "dameng" ||
-  type === "tdengine";
-
-type DriverStatusSnapshot = {
-  type: string;
-  name: string;
-  connectable: boolean;
-  expectedRevision?: string;
-  needsUpdate?: boolean;
-  updateReason?: string;
-  affectedConnections?: number;
-  message?: string;
-};
-
-const normalizeDriverType = (value: string): string => {
-  const normalized = String(value || "")
-    .trim()
-    .toLowerCase();
-  if (normalized === "postgresql") return "postgres";
-  if (normalized === "doris") return "diros";
-  if (
-    normalized === "intersystems" ||
-    normalized === "intersystemsiris" ||
-    normalized === "inter-systems-iris" ||
-    normalized === "inter-systems"
-  )
-    return "iris";
-  if (
-    normalized === "open_gauss" ||
-    normalized === "open-gauss" ||
-    normalized === "opengauss"
-  )
-    return "opengauss";
-  return normalized;
-};
-
-const resolveConnectionDriverType = (type: string, driver?: string): string => {
-  const normalizedType = normalizeDriverType(type);
-  if (normalizedType !== "custom") {
-    return normalizedType;
-  }
-  return normalizeDriverType(driver || "");
-};
-
 const ConnectionModal: React.FC<{
   open: boolean;
   onClose: () => void;
@@ -505,7 +378,7 @@ const ConnectionModal: React.FC<{
   const [testResult, setTestResult] = useState<TestResultState | null>(null);
   const [testErrorLogOpen, setTestErrorLogOpen] = useState(false);
   const [dbList, setDbList] = useState<string[]>([]);
-  const [redisDbList, setRedisDbList] = useState<number[]>([]); // Redis databases 0-15
+  const [redisDbList, setRedisDbList] = useState<number[]>([]);
   const [mongoMembers, setMongoMembers] = useState<MongoMemberInfo[]>([]);
   const [discoveringMembers, setDiscoveringMembers] = useState(false);
   const [uriFeedback, setUriFeedback] = useState<UriFeedbackState | null>(null);
@@ -541,6 +414,9 @@ const ConnectionModal: React.FC<{
   );
   const disableLocalBackdropFilter = isMacLikePlatform();
   const mysqlTopology = Form.useWatch("mysqlTopology", form) || "single";
+  const rocketmqTopology = Form.useWatch("rocketmqTopology", form) || "single";
+  const mqttTopology = Form.useWatch("mqttTopology", form) || "single";
+  const kafkaTopology = Form.useWatch("kafkaTopology", form) || "single";
   const mongoTopology = Form.useWatch("mongoTopology", form) || "single";
   const mongoSrv = Form.useWatch("mongoSrv", form) || false;
   const redisTopology = Form.useWatch("redisTopology", form) || "single";
@@ -574,6 +450,10 @@ const ConnectionModal: React.FC<{
   );
   const isOceanBaseOracle = dbType === "oceanbase" && oceanBaseProtocol === "oracle";
   const isMySQLLike = isMySQLCompatibleType(dbType) && !isOceanBaseOracle;
+  const isRocketMQ = dbType === "rocketmq";
+  const isMQTT = dbType === "mqtt";
+  const isKafka = dbType === "kafka";
+  const isRabbitMQ = dbType === "rabbitmq";
   const supportsConnectionParams = supportsConnectionParamsForType(dbType);
   const isSSLType = supportsSSLForType(dbType);
   const supportsSSLCAPath = supportsSSLCAPathForType(dbType);
@@ -944,19 +824,30 @@ const ConnectionModal: React.FC<{
       setMongoMembers([]);
     }
     if (fieldName === "redisTopology") {
-      const supportedDbs = Array.from({ length: 16 }, (_, i) => i);
+      const nextRedisTopology = String(value || "single").toLowerCase();
+      const currentRedisPort = Number(form.getFieldValue("port") || 0);
+      if (
+        nextRedisTopology === "sentinel" &&
+        (!currentRedisPort || currentRedisPort === 6379)
+      ) {
+        form.setFieldValue("port", 26379);
+      } else if (
+        nextRedisTopology !== "sentinel" &&
+        currentRedisPort === 26379
+      ) {
+        form.setFieldValue("port", 6379);
+      }
+      const supportedDbs = buildRedisDatabaseList(
+        form.getFieldValue("redisDB"),
+        form.getFieldValue("includeRedisDatabases"),
+      );
       setRedisDbList(supportedDbs);
-      const selectedDbsRaw = form.getFieldValue("includeRedisDatabases");
-      const selectedDbs = Array.isArray(selectedDbsRaw)
-        ? selectedDbsRaw.map((entry: any) => Number(entry))
-        : [];
-      const validDbs = selectedDbs
-        .filter((entry: number) => Number.isFinite(entry))
-        .map((entry: number) => Math.trunc(entry))
-        .filter((entry: number) => supportedDbs.includes(entry));
       form.setFieldValue(
         "includeRedisDatabases",
-        validDbs.length > 0 ? validDbs : undefined,
+        normalizeRedisDatabaseSelection(
+          form.getFieldValue("includeRedisDatabases"),
+          supportedDbs,
+        ),
       );
     }
     if (fieldName === "proxyType") {
@@ -1625,6 +1516,9 @@ const ConnectionModal: React.FC<{
       const mysqlDefaultPort = getDefaultPortByType(type);
       const parsed =
         parseMultiHostUri(trimmedUri, "mysql") ||
+        parseMultiHostUri(trimmedUri, "goldendb") ||
+        parseMultiHostUri(trimmedUri, "greatdb") ||
+        parseMultiHostUri(trimmedUri, "gdb") ||
         parseMultiHostUri(trimmedUri, "jdbc:mysql") ||
         parseMultiHostUri(trimmedUri, "oceanbase") ||
         parseMultiHostUri(trimmedUri, "jdbc:oceanbase") ||
@@ -1714,61 +1608,7 @@ const ConnectionModal: React.FC<{
     }
 
     if (type === "redis") {
-      const parsed =
-        parseMultiHostUri(trimmedUri, "redis") ||
-        parseMultiHostUri(trimmedUri, "rediss");
-      if (!parsed) {
-        return null;
-      }
-      if (!parsed.hosts.length || parsed.hosts.length > MAX_URI_HOSTS) {
-        return null;
-      }
-      if (parsed.hosts.some((entry) => !isValidUriHostEntry(entry))) {
-        return null;
-      }
-      const hostList = normalizeAddressList(parsed.hosts, 6379);
-      if (!hostList.length) {
-        return null;
-      }
-      const primary = parseHostPort(hostList[0] || "localhost:6379", 6379);
-      const topologyParam = String(
-        parsed.params.get("topology") || "",
-      ).toLowerCase();
-      const dbText = String(parsed.database || "")
-        .trim()
-        .replace(/^\//, "");
-      const dbIndex = Number(dbText);
-      const isRediss = trimmedUri.toLowerCase().startsWith("rediss://");
-      const skipVerifyText = String(parsed.params.get("skip_verify") || "")
-        .trim()
-        .toLowerCase();
-      const skipVerify =
-        skipVerifyText === "1" ||
-        skipVerifyText === "true" ||
-        skipVerifyText === "yes" ||
-        skipVerifyText === "on";
-      return {
-        host: primary?.host || "localhost",
-        port: primary?.port || 6379,
-        user: parsed.username || "",
-        password: parsed.password || "",
-        useSSL: isRediss,
-        sslMode: isRediss
-          ? skipVerify
-            ? "skip-verify"
-            : "required"
-          : "disable",
-        ...extractSSLPathValuesFromParams(parsed.params, type),
-        redisTopology:
-          hostList.length > 1 || topologyParam === "cluster"
-            ? "cluster"
-            : "single",
-        redisHosts: hostList.slice(1),
-        redisDB:
-          Number.isFinite(dbIndex) && dbIndex >= 0 && dbIndex <= 15
-            ? Math.trunc(dbIndex)
-            : 0,
-      };
+      return parseRedisUriToFormValues(trimmedUri);
     }
 
     if (type === "mongodb") {
@@ -1852,6 +1692,208 @@ const ConnectionModal: React.FC<{
       };
     }
 
+    if (type === "kafka") {
+      const defaultPort = getDefaultPortByType(type);
+      const parsed =
+        parseMultiHostUri(trimmedUri, "kafka") ||
+        parseMultiHostUri(trimmedUri, "apache-kafka") ||
+        parseMultiHostUri(trimmedUri, "apache_kafka");
+      if (!parsed) {
+        return null;
+      }
+      if (!parsed.hosts.length || parsed.hosts.length > MAX_URI_HOSTS) {
+        return null;
+      }
+      if (parsed.hosts.some((entry) => !isValidUriHostEntry(entry))) {
+        return null;
+      }
+      const hostList = normalizeAddressList(parsed.hosts, defaultPort);
+      if (!hostList.length) {
+        return null;
+      }
+      const primary = parseHostPort(
+        hostList[0] || `localhost:${defaultPort}`,
+        defaultPort,
+      );
+      const tlsEnabled = normalizeUriBool(
+        parsed.params.get("tls") ||
+          parsed.params.get("ssl") ||
+          parsed.params.get("useSSL") ||
+          parsed.params.get("use_ssl"),
+      );
+      const skipVerify = normalizeUriBool(
+        parsed.params.get("skip_verify") || parsed.params.get("skipVerify"),
+      );
+      const topology = String(parsed.params.get("topology") || "")
+        .trim()
+        .toLowerCase();
+      const timeoutValue = Number(parsed.params.get("timeout"));
+      return {
+        host: primary?.host || "localhost",
+        port: primary?.port || defaultPort,
+        user: parsed.username,
+        password: parsed.password,
+        database: parsed.database || "",
+        useSSL: tlsEnabled,
+        sslMode: tlsEnabled ? (skipVerify ? "skip-verify" : "required") : "disable",
+        ...extractSSLPathValuesFromParams(parsed.params, type),
+        kafkaTopology:
+          topology === "cluster" || hostList.length > 1 ? "cluster" : "single",
+        kafkaHosts: hostList.slice(1),
+        connectionParams: serializeConnectionParams(parsed.params),
+        timeout:
+          Number.isFinite(timeoutValue) && timeoutValue > 0
+            ? Math.min(MAX_TIMEOUT_SECONDS, Math.trunc(timeoutValue))
+            : undefined,
+      };
+    }
+
+    if (type === "mqtt") {
+      const defaultPort = getDefaultPortByType(type);
+      const parsed =
+        parseMultiHostUri(trimmedUri, "mqtt") ||
+        parseMultiHostUri(trimmedUri, "mqtts") ||
+        parseMultiHostUri(trimmedUri, "tcp") ||
+        parseMultiHostUri(trimmedUri, "ssl") ||
+        parseMultiHostUri(trimmedUri, "tls");
+      if (!parsed) {
+        return null;
+      }
+      if (!parsed.hosts.length || parsed.hosts.length > MAX_URI_HOSTS) {
+        return null;
+      }
+      if (parsed.hosts.some((entry) => !isValidUriHostEntry(entry))) {
+        return null;
+      }
+      const hostList = normalizeAddressList(parsed.hosts, defaultPort);
+      if (!hostList.length) {
+        return null;
+      }
+      const primary = parseHostPort(
+        hostList[0] || `localhost:${defaultPort}`,
+        defaultPort,
+      );
+      const lowerUri = trimmedUri.toLowerCase();
+      const tlsEnabled =
+        lowerUri.startsWith("mqtts://") ||
+        lowerUri.startsWith("ssl://") ||
+        lowerUri.startsWith("tls://") ||
+        normalizeUriBool(
+          parsed.params.get("tls") ||
+            parsed.params.get("ssl") ||
+            parsed.params.get("useSSL") ||
+            parsed.params.get("use_ssl"),
+        );
+      const skipVerify = normalizeUriBool(
+        parsed.params.get("skip_verify") || parsed.params.get("skipVerify"),
+      );
+      const topology = String(parsed.params.get("topology") || "")
+        .trim()
+        .toLowerCase();
+      const timeoutValue = Number(parsed.params.get("timeout"));
+      return {
+        host: primary?.host || "localhost",
+        port: primary?.port || defaultPort,
+        user: parsed.username,
+        password: parsed.password,
+        database: parsed.database || "",
+        useSSL: tlsEnabled,
+        sslMode: tlsEnabled ? (skipVerify ? "skip-verify" : "required") : "disable",
+        ...extractSSLPathValuesFromParams(parsed.params, type),
+        mqttTopology:
+          topology === "cluster" || hostList.length > 1 ? "cluster" : "single",
+        mqttHosts: hostList.slice(1),
+        connectionParams: serializeConnectionParams(parsed.params),
+        timeout:
+          Number.isFinite(timeoutValue) && timeoutValue > 0
+            ? Math.min(MAX_TIMEOUT_SECONDS, Math.trunc(timeoutValue))
+            : undefined,
+      };
+    }
+
+    if (type === "rocketmq") {
+      const defaultPort = getDefaultPortByType(type);
+      const parsed =
+        parseMultiHostUri(trimmedUri, "rocketmq") ||
+        parseMultiHostUri(trimmedUri, "rmq");
+      if (!parsed) {
+        return null;
+      }
+      if (!parsed.hosts.length || parsed.hosts.length > MAX_URI_HOSTS) {
+        return null;
+      }
+      if (parsed.hosts.some((entry) => !isValidUriHostEntry(entry))) {
+        return null;
+      }
+      const hostList = normalizeAddressList(parsed.hosts, defaultPort);
+      if (!hostList.length) {
+        return null;
+      }
+      const primary = parseHostPort(
+        hostList[0] || `localhost:${defaultPort}`,
+        defaultPort,
+      );
+      const topology = String(parsed.params.get("topology") || "")
+        .trim()
+        .toLowerCase();
+      const timeoutValue = Number(parsed.params.get("timeout"));
+      return {
+        host: primary?.host || "localhost",
+        port: primary?.port || defaultPort,
+        user: parsed.username,
+        password: parsed.password,
+        database: parsed.database || "",
+        rocketmqTopology:
+          topology === "cluster" || hostList.length > 1 ? "cluster" : "single",
+        rocketmqHosts: hostList.slice(1),
+        connectionParams: serializeConnectionParams(parsed.params),
+        timeout:
+          Number.isFinite(timeoutValue) && timeoutValue > 0
+            ? Math.min(MAX_TIMEOUT_SECONDS, Math.trunc(timeoutValue))
+            : undefined,
+      };
+    }
+
+    if (type === "rabbitmq") {
+      const defaultPort = getDefaultPortByType(type);
+      const parsed = parseSingleHostUri(
+        trimmedUri,
+        ["rabbitmq", "http", "https"],
+        defaultPort,
+      );
+      if (!parsed) {
+        return null;
+      }
+      const lowerUri = trimmedUri.toLowerCase();
+      const tlsEnabled =
+        lowerUri.startsWith("https://") ||
+        normalizeUriBool(
+          parsed.params.get("tls") ||
+            parsed.params.get("ssl") ||
+            parsed.params.get("useSSL") ||
+            parsed.params.get("use_ssl"),
+        );
+      const skipVerify = normalizeUriBool(
+        parsed.params.get("skip_verify") || parsed.params.get("skipVerify"),
+      );
+      const timeoutValue = Number(parsed.params.get("timeout"));
+      return {
+        host: parsed.host,
+        port: parsed.port,
+        user: parsed.username,
+        password: parsed.password,
+        database: parsed.database || "",
+        useSSL: tlsEnabled,
+        sslMode: tlsEnabled ? (skipVerify ? "skip-verify" : "required") : "disable",
+        ...extractSSLPathValuesFromParams(parsed.params, type),
+        connectionParams: serializeConnectionParams(parsed.params),
+        timeout:
+          Number.isFinite(timeoutValue) && timeoutValue > 0
+            ? Math.min(MAX_TIMEOUT_SECONDS, Math.trunc(timeoutValue))
+            : undefined,
+      };
+    }
+
     if (type === "clickhouse") {
       const httpValues = parseClickHouseHTTPUriToValues(trimmedUri);
       if (httpValues) {
@@ -1899,7 +1941,8 @@ const ConnectionModal: React.FC<{
           type === "kingbase" ||
           type === "highgo" ||
           type === "vastbase" ||
-          type === "opengauss"
+          type === "opengauss" ||
+          type === "gaussdb"
         ) {
           const sslMode = String(parsed.params.get("sslmode") || "")
             .trim()
@@ -2012,6 +2055,22 @@ const ConnectionModal: React.FC<{
             parsedValues.useSSL = false;
             parsedValues.sslMode = "disable";
           }
+        } else if (type === "chroma" || type === "qdrant") {
+          const tls = String(
+            parsed.params.get("tls") ||
+              parsed.params.get("ssl") ||
+              parsed.params.get("useSSL") ||
+              parsed.params.get("use_ssl") ||
+              "",
+          )
+            .trim()
+            .toLowerCase();
+          const skipVerify = normalizeBool(
+            parsed.params.get("skip_verify") || parsed.params.get("skipVerify"),
+          );
+          const enabled = tls ? normalizeBool(tls) : trimmedUri.toLowerCase().startsWith("https://");
+          parsedValues.useSSL = enabled;
+          parsedValues.sslMode = enabled ? (skipVerify ? "skip-verify" : "required") : "disable";
         }
       }
       return parsedValues;
@@ -2057,9 +2116,9 @@ const ConnectionModal: React.FC<{
     if (isMySQLCompatibleType(dbType)) {
       const defaultPort = getDefaultPortByType(dbType);
       const scheme =
-        dbType === "diros" ? "doris" : dbType === "starrocks" ? "starrocks" : dbType === "oceanbase" ? "oceanbase" : "mysql";
+        dbType === "diros" ? "doris" : dbType === "starrocks" ? "starrocks" : dbType === "oceanbase" ? "oceanbase" : dbType === "goldendb" ? "goldendb" : "mysql";
       if (dbType === "oceanbase") {
-        return `${scheme}://sys%40oracle001:pass@127.0.0.1:${defaultPort}/SERVICE_NAME?protocol=oracle`;
+        return `${scheme}://sys%40oracle001:pass@127.0.0.1:${defaultPort}?protocol=oracle`;
       }
       return `${scheme}://user:pass@127.0.0.1:${defaultPort},127.0.0.2:${defaultPort}/db_name?topology=replica`;
     }
@@ -2074,8 +2133,29 @@ const ConnectionModal: React.FC<{
     if (dbType === "clickhouse") {
       return "clickhouse://default:pass@127.0.0.1:9000/default";
     }
+    if (dbType === "chroma") {
+      return "http://127.0.0.1:8000/default_database?tenant=default_tenant";
+    }
+    if (dbType === "qdrant") {
+      return "http://127.0.0.1:6333";
+    }
+    if (dbType === "iotdb") {
+      return "iotdb://root:root@127.0.0.1:6667/root.sg";
+    }
+    if (dbType === "rocketmq") {
+      return "rocketmq://accessKey:secretKey@127.0.0.1:9876,127.0.0.2:9876/orders.events?topology=cluster&groupId=gonavi&namespace=prod&tag=TagA&pullBatchSize=32&startOffset=latest";
+    }
+    if (dbType === "mqtt") {
+      return "mqtt://user:pass@127.0.0.1:1883/devices%2F%2B%2Ftelemetry?topology=cluster&clientId=gonavi-desktop&qos=1";
+    }
+    if (dbType === "kafka") {
+      return "kafka://user:pass@127.0.0.1:9092,127.0.0.2:9092/orders.events?topology=cluster&groupId=analytics&mechanism=scram-sha-256";
+    }
+    if (dbType === "rabbitmq") {
+      return "rabbitmq://guest:guest@127.0.0.1:15672/%2F?defaultQueue=orders.queue&exchange=events.topic&timeout=30";
+    }
     if (dbType === "redis") {
-      return "redis://:pass@127.0.0.1:6379,127.0.0.2:6379/0?topology=cluster";
+      return "redis://:pass@127.0.0.1:6379,127.0.0.2:6379/0?topology=cluster 或 redis://:pass@10.0.0.1:26379,10.0.0.2:26379/0?topology=sentinel&master=mymaster";
     }
     if (dbType === "oracle") {
       return "oracle://user:pass@127.0.0.1:1521/ORCLPDB1";
@@ -2086,6 +2166,9 @@ const ConnectionModal: React.FC<{
     if (dbType === "opengauss") {
       return "opengauss://user:pass@127.0.0.1:5432/db_name";
     }
+    if (dbType === "gaussdb") {
+      return "gaussdb://user:pass@127.0.0.1:5432/db_name";
+    }
     return t("connection.modal.example", {
       value: "postgres://user:pass@127.0.0.1:5432/db_name",
     });
@@ -2106,6 +2189,7 @@ const ConnectionModal: React.FC<{
       case "highgo":
       case "vastbase":
       case "opengauss":
+      case "gaussdb":
         return "application_name=GoNavi&statement_timeout=30000";
       case "oracle":
         return "PREFETCH_ROWS=5000&TRACE FILE=/tmp/go-ora.trc";
@@ -2117,10 +2201,24 @@ const ConnectionModal: React.FC<{
         return "max_execution_time=60&compress=lz4";
       case "mongodb":
         return "retryWrites=true&readPreference=secondaryPreferred";
+      case "chroma":
+        return "tenant=default_tenant&apiKey=...";
+      case "qdrant":
+        return "apiKey=...";
       case "dameng":
         return "schema=SYSDBA";
       case "tdengine":
         return "timezone=Asia%2FShanghai";
+      case "iotdb":
+        return "fetchSize=1024&timeZone=Asia%2FShanghai";
+      case "rocketmq":
+        return "groupId=gonavi&namespace=prod&tag=TagA&pullBatchSize=32&startOffset=latest";
+      case "mqtt":
+        return "topics=devices%2F%2B%2Ftelemetry,%24SYS%2F%23&clientId=gonavi-desktop&qos=1&cleanSession=true&fetchWaitMs=4000";
+      case "kafka":
+        return "groupId=gonavi&mechanism=scram-sha-256&clientId=gonavi-desktop&startOffset=latest";
+      case "rabbitmq":
+        return "defaultQueue=orders.queue&exchange=events.topic&managementPathPrefix=/rabbitmq";
       default:
         return "key=value&another=value";
     }
@@ -2179,48 +2277,114 @@ const ConnectionModal: React.FC<{
       const dbPath = database ? `/${encodeURIComponent(database)}` : "/";
       const query = params.toString();
       const scheme =
-        type === "diros" ? "doris" : type === "starrocks" ? "starrocks" : type === "oceanbase" ? "oceanbase" : "mysql";
+        type === "diros" ? "doris" : type === "starrocks" ? "starrocks" : type === "oceanbase" ? "oceanbase" : type === "goldendb" ? "goldendb" : "mysql";
       return `${scheme}://${encodedAuth}${hosts.join(",")}${dbPath}${query ? `?${query}` : ""}`;
     }
 
-    if (type === "redis") {
-      const primary = toAddress(host, port, 6379);
-      const clusterHosts =
-        values.redisTopology === "cluster"
-          ? normalizeAddressList(values.redisHosts, 6379)
+    if (type === "kafka") {
+      const primary = toAddress(host, port, defaultPort);
+      const brokers =
+        values.kafkaTopology === "cluster"
+          ? normalizeAddressList(values.kafkaHosts, defaultPort)
           : [];
-      const hosts = normalizeAddressList([primary, ...clusterHosts], 6379);
+      const allBrokers = normalizeAddressList([primary, ...brokers], defaultPort);
       const params = new URLSearchParams();
-      if (hosts.length > 1 || values.redisTopology === "cluster") {
+      if (allBrokers.length > 1 || values.kafkaTopology === "cluster") {
         params.set("topology", "cluster");
       }
-      const redisUser = String(values.user || "").trim();
-      const redisPassword = String(values.password || "");
-      let redisAuth = "";
-      if (redisUser || redisPassword) {
-        const encodedPassword = redisPassword
-          ? encodeURIComponent(redisPassword)
-          : "";
-        redisAuth = redisUser
-          ? `${encodeURIComponent(redisUser)}${redisPassword ? `:${encodedPassword}` : ""}@`
-          : `:${encodedPassword}@`;
-      }
-      const redisDB = Number.isFinite(Number(values.redisDB))
-        ? Math.max(0, Math.min(15, Math.trunc(Number(values.redisDB))))
-        : 0;
-      const dbPath = `/${redisDB}`;
       if (values.useSSL) {
         const mode = String(values.sslMode || "preferred")
           .trim()
           .toLowerCase();
+        params.set("tls", "true");
         if (mode === "skip-verify" || mode === "preferred") {
           params.set("skip_verify", "true");
         }
+        appendSSLPathParamsForUri(params, type, values);
       }
-      appendSSLPathParamsForUri(params, type, values);
+      if (Number.isFinite(timeout) && timeout > 0) {
+        params.set("timeout", String(timeout));
+      }
+      mergeConnectionParams(params, values.connectionParams);
+      const topicPath = database ? `/${encodeURIComponent(database)}` : "";
       const query = params.toString();
-      const scheme = values.useSSL ? "rediss" : "redis";
-      return `${scheme}://${redisAuth}${hosts.join(",")}${dbPath}${query ? `?${query}` : ""}`;
+      return `kafka://${encodedAuth}${allBrokers.join(",")}${topicPath}${query ? `?${query}` : ""}`;
+    }
+
+    if (type === "mqtt") {
+      const primary = toAddress(host, port, defaultPort);
+      const brokers =
+        values.mqttTopology === "cluster"
+          ? normalizeAddressList(values.mqttHosts, defaultPort)
+          : [];
+      const allBrokers = normalizeAddressList([primary, ...brokers], defaultPort);
+      const params = new URLSearchParams();
+      if (allBrokers.length > 1 || values.mqttTopology === "cluster") {
+        params.set("topology", "cluster");
+      }
+      if (values.useSSL) {
+        const mode = String(values.sslMode || "preferred")
+          .trim()
+          .toLowerCase();
+        params.set("tls", "true");
+        if (mode === "skip-verify" || mode === "preferred") {
+          params.set("skip_verify", "true");
+        }
+        appendSSLPathParamsForUri(params, type, values);
+      }
+      if (Number.isFinite(timeout) && timeout > 0) {
+        params.set("timeout", String(timeout));
+      }
+      mergeConnectionParams(params, values.connectionParams);
+      const topicPath = database ? `/${encodeURIComponent(database)}` : "";
+      const query = params.toString();
+      return `mqtt://${encodedAuth}${allBrokers.join(",")}${topicPath}${query ? `?${query}` : ""}`;
+    }
+
+    if (type === "rocketmq") {
+      const primary = toAddress(host, port, defaultPort);
+      const nameservers =
+        values.rocketmqTopology === "cluster"
+          ? normalizeAddressList(values.rocketmqHosts, defaultPort)
+          : [];
+      const allNameServers = normalizeAddressList([primary, ...nameservers], defaultPort);
+      const params = new URLSearchParams();
+      if (allNameServers.length > 1 || values.rocketmqTopology === "cluster") {
+        params.set("topology", "cluster");
+      }
+      if (Number.isFinite(timeout) && timeout > 0) {
+        params.set("timeout", String(timeout));
+      }
+      mergeConnectionParams(params, values.connectionParams);
+      const topicPath = database ? `/${encodeURIComponent(database)}` : "";
+      const query = params.toString();
+      return `rocketmq://${encodedAuth}${allNameServers.join(",")}${topicPath}${query ? `?${query}` : ""}`;
+    }
+
+    if (type === "rabbitmq") {
+      const address = toAddress(host, port, defaultPort);
+      const params = new URLSearchParams();
+      if (values.useSSL) {
+        const mode = String(values.sslMode || "preferred")
+          .trim()
+          .toLowerCase();
+        params.set("tls", "true");
+        if (mode === "skip-verify" || mode === "preferred") {
+          params.set("skip_verify", "true");
+        }
+        appendSSLPathParamsForUri(params, type, values);
+      }
+      if (Number.isFinite(timeout) && timeout > 0) {
+        params.set("timeout", String(timeout));
+      }
+      mergeConnectionParams(params, values.connectionParams);
+      const vhostPath = database ? `/${encodeURIComponent(database)}` : "";
+      const query = params.toString();
+      return `rabbitmq://${encodedAuth}${address}${vhostPath}${query ? `?${query}` : ""}`;
+    }
+
+    if (type === "redis") {
+      return buildRedisUriFromValues(values);
     }
 
     if (isFileDatabaseType(type)) {
@@ -2292,8 +2456,14 @@ const ConnectionModal: React.FC<{
         ? normalizeClickHouseProtocolValue(values.clickHouseProtocol)
         : "auto";
     const scheme =
-      type === "postgres"
+      type === "gaussdb"
+        ? "gaussdb"
+        : type === "postgres"
         ? "postgresql"
+        : type === "chroma" || type === "qdrant"
+          ? values.useSSL
+            ? "https"
+            : "http"
         : type === "clickhouse" && clickHouseProtocol === "http"
           ? values.useSSL
             ? "https"
@@ -2344,6 +2514,11 @@ const ConnectionModal: React.FC<{
         if (mode === "skip-verify" || mode === "preferred") {
           params.set("skip_verify", "true");
         }
+      } else if (type === "chroma" || type === "qdrant") {
+        if (mode === "skip-verify" || mode === "preferred") {
+          params.set("skip_verify", "true");
+        }
+        appendSSLPathParamsForUri(params, type, values);
       }
     } else if (supportsSSLForType(type)) {
       if (isPostgresCompatibleSSLType(type)) {
@@ -2585,18 +2760,27 @@ const ConnectionModal: React.FC<{
         const defaultPort = getDefaultPortByType(configType);
         const isFileDbConfigType = isFileDatabaseType(configType);
         const jvmDefaultValues = buildDefaultJVMConnectionValues();
+        const savedPrimaryAddress = isFileDbConfigType
+          ? ""
+          : toAddress(
+              config.host || "localhost",
+              Number(config.port || defaultPort),
+              defaultPort,
+            );
         const normalizedHosts = isFileDbConfigType
           ? []
-          : normalizeAddressList(config.hosts, defaultPort);
+          : normalizeAddressList(
+              [
+                savedPrimaryAddress,
+                ...(Array.isArray(config.hosts) ? config.hosts : []),
+              ],
+              defaultPort,
+            );
         const primaryAddress = isFileDbConfigType
           ? null
           : parseHostPort(
               normalizedHosts[0] ||
-                toAddress(
-                  config.host || "localhost",
-                  Number(config.port || defaultPort),
-                  defaultPort,
-                ),
+                savedPrimaryAddress,
               defaultPort,
             );
         const primaryHost = isFileDbConfigType
@@ -2607,6 +2791,7 @@ const ConnectionModal: React.FC<{
           : primaryAddress?.port || Number(config.port || defaultPort);
         const mysqlReplicaHosts =
           configType === "mysql" ||
+          configType === "goldendb" ||
           configType === "mariadb" ||
           configType === "oceanbase" ||
           configType === "diros" ||
@@ -2614,6 +2799,12 @@ const ConnectionModal: React.FC<{
           configType === "sphinx"
             ? normalizedHosts.slice(1)
             : [];
+        const rocketmqHosts =
+          configType === "rocketmq" ? normalizedHosts.slice(1) : [];
+        const mqttHosts =
+          configType === "mqtt" ? normalizedHosts.slice(1) : [];
+        const kafkaHosts =
+          configType === "kafka" ? normalizedHosts.slice(1) : [];
         const mongoHosts =
           configType === "mongodb" ? normalizedHosts.slice(1) : [];
         const redisHosts =
@@ -2621,13 +2812,24 @@ const ConnectionModal: React.FC<{
         const mysqlIsReplica =
           String(config.topology || "").toLowerCase() === "replica" ||
           mysqlReplicaHosts.length > 0;
+        const rocketmqIsCluster =
+          String(config.topology || "").toLowerCase() === "cluster" ||
+          rocketmqHosts.length > 0;
+        const mqttIsCluster =
+          String(config.topology || "").toLowerCase() === "cluster" ||
+          mqttHosts.length > 0;
+        const kafkaIsCluster =
+          String(config.topology || "").toLowerCase() === "cluster" ||
+          kafkaHosts.length > 0;
         const mongoIsReplica =
           String(config.topology || "").toLowerCase() === "replica" ||
           mongoHosts.length > 0 ||
           !!config.replicaSet;
+        const redisTopologyValue = String(config.topology || "").toLowerCase();
+        const redisIsSentinel = redisTopologyValue === "sentinel";
         const redisIsCluster =
-          String(config.topology || "").toLowerCase() === "cluster" ||
-          redisHosts.length > 0;
+          !redisIsSentinel &&
+          (redisTopologyValue === "cluster" || redisHosts.length > 0);
         const {
           allowedModes: resolvedJvmAllowedModes,
           preferredMode: resolvedJvmPreferredMode,
@@ -2691,12 +2893,25 @@ const ConnectionModal: React.FC<{
           timeout: resolvedJvmTimeout,
           mysqlTopology: mysqlIsReplica ? "replica" : "single",
           mysqlReplicaHosts: mysqlReplicaHosts,
+          rocketmqTopology: rocketmqIsCluster ? "cluster" : "single",
+          rocketmqHosts: rocketmqHosts,
+          mqttTopology: mqttIsCluster ? "cluster" : "single",
+          mqttHosts: mqttHosts,
+          kafkaTopology: kafkaIsCluster ? "cluster" : "single",
+          kafkaHosts: kafkaHosts,
           mysqlReplicaUser: config.mysqlReplicaUser || "",
           mysqlReplicaPassword: config.mysqlReplicaPassword || "",
           mongoTopology: mongoIsReplica ? "replica" : "single",
           mongoHosts: mongoHosts,
-          redisTopology: redisIsCluster ? "cluster" : "single",
+          redisTopology: redisIsSentinel
+            ? "sentinel"
+            : redisIsCluster
+              ? "cluster"
+              : "single",
           redisHosts: redisHosts,
+          redisSentinelMaster: config.redisSentinelMaster || "",
+          redisSentinelUser: config.redisSentinelUser || "",
+          redisSentinelPassword: config.redisSentinelPassword || "",
           mongoSrv: !!config.mongoSrv,
           mongoReplicaSet: config.replicaSet || "",
           mongoAuthSource: config.authSource || "",
@@ -2816,7 +3031,12 @@ const ConnectionModal: React.FC<{
         }
         // 如果是 Redis 编辑模式，设置已保存的 Redis 数据库列表
         if (configType === "redis") {
-          setRedisDbList(Array.from({ length: 16 }, (_, i) => i));
+          setRedisDbList(
+            buildRedisDatabaseList(
+              config.redisDB,
+              initialValues.includeRedisDatabases,
+            ),
+          );
         }
       } else {
         // Create mode: Start at step 1
@@ -2893,6 +3113,16 @@ const ConnectionModal: React.FC<{
       clearSecret: clearSecrets.mongoReplicaPassword,
       forceClear: !mongoReplicaEnabled,
     });
+    const redisSentinelEnabled =
+      config.type === "redis" &&
+      config.topology === "sentinel" &&
+      values.savePassword !== false;
+    const redisSentinelDraft = resolveConnectionSecretDraft({
+      hasSecret: initialValues?.hasRedisSentinelPassword,
+      valueInput: config.redisSentinelPassword,
+      clearSecret: clearSecrets.redisSentinelPassword,
+      forceClear: !redisSentinelEnabled,
+    });
     const opaqueUriDraft = resolveConnectionSecretDraft({
       hasSecret: initialValues?.hasOpaqueURI,
       valueInput: config.uri,
@@ -2961,6 +3191,7 @@ const ConnectionModal: React.FC<{
         dsn: opaqueDsnDraft.value,
         mysqlReplicaPassword: mysqlReplicaDraft.value,
         mongoReplicaPassword: mongoReplicaDraft.value,
+        redisSentinelPassword: redisSentinelDraft.value,
       },
       includeDatabases: values.includeDatabases,
       includeRedisDatabases: isRedisType
@@ -2974,6 +3205,7 @@ const ConnectionModal: React.FC<{
       clearHttpTunnelPassword: httpTunnelDraft.clearStoredSecret,
       clearMySQLReplicaPassword: mysqlReplicaDraft.clearStoredSecret,
       clearMongoReplicaPassword: mongoReplicaDraft.clearStoredSecret,
+      clearRedisSentinelPassword: redisSentinelDraft.clearStoredSecret,
       clearOpaqueURI: opaqueUriDraft.clearStoredSecret,
       clearOpaqueDSN: opaqueDsnDraft.clearStoredSecret,
     };
@@ -3123,6 +3355,14 @@ const ConnectionModal: React.FC<{
     ) {
       return t("connection.modal.secret.blocking.mongoReplica");
     }
+    if (
+      clearSecrets.redisSentinelPassword &&
+      values.type === "redis" &&
+      values.redisTopology === "sentinel" &&
+      String(values.redisSentinelPassword ?? "") === ""
+    ) {
+      return "测试连接前请填写新的 Sentinel 密码，或取消清除已保存 Sentinel 密码";
+    }
     if (
       values.type === "mongodb" &&
       values.savePassword === false &&
@@ -3214,7 +3454,32 @@ const ConnectionModal: React.FC<{
         void message.destroy("connection-test-failure");
         setTestResult({ type: "success", message: res.message });
         if (isRedisType) {
-          setRedisDbList(Array.from({ length: 16 }, (_, i) => i));
+          const dbRes = await withClientTimeout(
+            RedisGetDatabases(config as any),
+            rpcTimeoutMs,
+            `连接成功但拉取 Redis 数据库列表超时（>${timeoutSeconds} 秒）`,
+          );
+          if (dbRes.success) {
+            const supportedDbs = extractRedisDatabaseList(dbRes.data);
+            setRedisDbList(supportedDbs);
+            form.setFieldValue(
+              "includeRedisDatabases",
+              normalizeRedisDatabaseSelection(
+                form.getFieldValue("includeRedisDatabases"),
+                supportedDbs,
+              ),
+            );
+          } else {
+            setRedisDbList(
+              buildRedisDatabaseList(
+                config.redisDB,
+                form.getFieldValue("includeRedisDatabases"),
+              ),
+            );
+            message.warning(
+              `连接成功，但获取 Redis 数据库列表失败：${normalizeConnectionSecretErrorMessage(dbRes.message, "未知错误")}`,
+            );
+          }
         } else if (!isJVMType) {
           // Other databases: fetch database list
           const dbRes = await withClientTimeout(
@@ -3582,7 +3847,7 @@ const ConnectionModal: React.FC<{
     }
 
     let hosts: string[] = [];
-    let topology: "single" | "replica" | "cluster" | undefined;
+    let topology: "single" | "replica" | "cluster" | "sentinel" | undefined;
     let replicaSet = "";
     let authSource = "";
     let readPreference = "";
@@ -3592,6 +3857,9 @@ const ConnectionModal: React.FC<{
     let mongoAuthMechanism = "";
     let mongoReplicaUser = "";
     let mongoReplicaPassword = "";
+    let redisSentinelMaster = "";
+    let redisSentinelUser = "";
+    let redisSentinelPassword = "";
     const savePassword =
       type === "mongodb" ? mergedValues.savePassword !== false : true;
 
@@ -3614,6 +3882,57 @@ const ConnectionModal: React.FC<{
       }
     }
 
+    if (type === "kafka") {
+      const brokers =
+        mergedValues.kafkaTopology === "cluster"
+          ? normalizeAddressList(mergedValues.kafkaHosts, defaultPort)
+          : [];
+      const allHosts = normalizeAddressList(
+        [`${primaryHost}:${primaryPort}`, ...brokers],
+        defaultPort,
+      );
+      if (mergedValues.kafkaTopology === "cluster" || allHosts.length > 1) {
+        hosts = allHosts;
+        topology = "cluster";
+      } else {
+        topology = "single";
+      }
+    }
+
+    if (type === "mqtt") {
+      const brokers =
+        mergedValues.mqttTopology === "cluster"
+          ? normalizeAddressList(mergedValues.mqttHosts, defaultPort)
+          : [];
+      const allHosts = normalizeAddressList(
+        [`${primaryHost}:${primaryPort}`, ...brokers],
+        defaultPort,
+      );
+      if (mergedValues.mqttTopology === "cluster" || allHosts.length > 1) {
+        hosts = allHosts;
+        topology = "cluster";
+      } else {
+        topology = "single";
+      }
+    }
+
+    if (type === "rocketmq") {
+      const nameservers =
+        mergedValues.rocketmqTopology === "cluster"
+          ? normalizeAddressList(mergedValues.rocketmqHosts, defaultPort)
+          : [];
+      const allHosts = normalizeAddressList(
+        [`${primaryHost}:${primaryPort}`, ...nameservers],
+        defaultPort,
+      );
+      if (mergedValues.rocketmqTopology === "cluster" || allHosts.length > 1) {
+        hosts = allHosts;
+        topology = "cluster";
+      } else {
+        topology = "single";
+      }
+    }
+
     if (type === "mongodb") {
       mongoSrvEnabled = !!mergedValues.mongoSrv;
       const extraHosts =
@@ -3653,23 +3972,19 @@ const ConnectionModal: React.FC<{
     }
 
     if (type === "redis") {
-      const clusterNodes =
-        mergedValues.redisTopology === "cluster"
-          ? normalizeAddressList(mergedValues.redisHosts, defaultPort)
-          : [];
-      const allHosts = normalizeAddressList(
-        [`${primaryHost}:${primaryPort}`, ...clusterNodes],
+      const redisDraft = resolveRedisConfigDraft(
+        mergedValues,
+        primaryHost,
+        primaryPort,
         defaultPort,
       );
-      if (mergedValues.redisTopology === "cluster" || allHosts.length > 1) {
-        hosts = allHosts;
-        topology = "cluster";
-      } else {
-        topology = "single";
-      }
-      mergedValues.redisDB = Number.isFinite(Number(mergedValues.redisDB))
-        ? Math.max(0, Math.min(15, Math.trunc(Number(mergedValues.redisDB))))
-        : 0;
+      primaryPort = redisDraft.primaryPort;
+      hosts = redisDraft.hosts;
+      topology = redisDraft.topology;
+      redisSentinelMaster = redisDraft.redisSentinelMaster;
+      redisSentinelUser = redisDraft.redisSentinelUser;
+      redisSentinelPassword = redisDraft.redisSentinelPassword;
+      mergedValues.redisDB = redisDraft.redisDB;
     }
 
     const sshConfig = mergedValues.useSSH
@@ -3769,8 +4084,11 @@ const ConnectionModal: React.FC<{
       connectionParams: normalizedConnectionParams,
       timeout: Number(mergedValues.timeout || 30),
       redisDB: Number.isFinite(Number(mergedValues.redisDB))
-        ? Math.max(0, Math.min(15, Math.trunc(Number(mergedValues.redisDB))))
+        ? Math.max(0, Math.trunc(Number(mergedValues.redisDB)))
         : 0,
+      redisSentinelMaster: redisSentinelMaster,
+      redisSentinelUser: redisSentinelUser,
+      redisSentinelPassword: keepPassword ? redisSentinelPassword : "",
       uri: String(mergedValues.uri || "").trim(),
       clickHouseProtocol:
         type === "clickhouse"
@@ -3853,6 +4171,9 @@ const ConnectionModal: React.FC<{
         includeDatabases: undefined,
         includeRedisDatabases: undefined,
         mysqlTopology: "single",
+        rocketmqTopology: "single",
+        mqttTopology: "single",
+        kafkaTopology: "single",
         redisTopology: "single",
         mongoTopology: "single",
         mongoSrv: false,
@@ -3862,7 +4183,13 @@ const ConnectionModal: React.FC<{
         mongoAuthMechanism: "",
         savePassword: true,
         mysqlReplicaHosts: [],
+        rocketmqHosts: [],
+        mqttHosts: [],
+        kafkaHosts: [],
         redisHosts: [],
+        redisSentinelMaster: "",
+        redisSentinelUser: "",
+        redisSentinelPassword: "",
         mongoHosts: [],
         mysqlReplicaUser: "",
         mysqlReplicaPassword: "",
@@ -3912,6 +4239,9 @@ const ConnectionModal: React.FC<{
         httpTunnelUser: "",
         httpTunnelPassword: "",
         mysqlTopology: "single",
+        rocketmqTopology: "single",
+        mqttTopology: "single",
+        kafkaTopology: "single",
         redisTopology: "single",
         mongoTopology: "single",
         mongoSrv: false,
@@ -3921,7 +4251,13 @@ const ConnectionModal: React.FC<{
         mongoAuthMechanism: "",
         savePassword: true,
         mysqlReplicaHosts: [],
+        rocketmqHosts: [],
+        mqttHosts: [],
+        kafkaHosts: [],
         redisHosts: [],
+        redisSentinelMaster: "",
+        redisSentinelUser: "",
+        redisSentinelPassword: "",
         mongoHosts: [],
         mysqlReplicaUser: "",
         mysqlReplicaPassword: "",
@@ -3932,7 +4268,7 @@ const ConnectionModal: React.FC<{
       });
     } else if (type !== "custom") {
       const defaultUser =
-        type === "clickhouse" ? "default" : type === "redis" ? "" : "root";
+        type === "clickhouse" ? "default" : (type === "redis" || type === "elasticsearch" || type === "chroma" || type === "qdrant" || type === "rocketmq" || type === "mqtt" || type === "kafka" || type === "rabbitmq") ? "" : "root";
       const sslCapableType = supportsSSLForType(type);
       setUseSSL(false);
       setUseHttpTunnel(false);
@@ -3951,6 +4287,9 @@ const ConnectionModal: React.FC<{
         httpTunnelUser: "",
         httpTunnelPassword: "",
         mysqlTopology: "single",
+        rocketmqTopology: "single",
+        mqttTopology: "single",
+        kafkaTopology: "single",
         redisTopology: "single",
         mongoTopology: "single",
         mongoSrv: false,
@@ -3960,7 +4299,13 @@ const ConnectionModal: React.FC<{
         mongoAuthMechanism: "",
         savePassword: true,
         mysqlReplicaHosts: [],
+        rocketmqHosts: [],
+        mqttHosts: [],
+        kafkaHosts: [],
         redisHosts: [],
+        redisSentinelMaster: "",
+        redisSentinelUser: "",
+        redisSentinelPassword: "",
         mongoHosts: [],
         mysqlReplicaUser: "",
         mysqlReplicaPassword: "",
@@ -4014,170 +4359,19 @@ const ConnectionModal: React.FC<{
   const driverStatusChecking =
     hasCurrentDriverType && !driverStatusLoaded && step === 2;
 
-  const dbTypeGroups = [
-    {
-      label: t("connection.modal.step1.group.relational"),
-      items: [
-        {
-          key: "mysql",
-          name: "MySQL",
-          icon: getDbIcon("mysql", undefined, 36),
-        },
-        {
-          key: "mariadb",
-          name: "MariaDB",
-          icon: getDbIcon("mariadb", undefined, 36),
-        },
-        {
-          key: "diros",
-          name: "Doris",
-          icon: getDbIcon("diros", undefined, 36),
-        },
-        {
-          key: "starrocks",
-          name: "StarRocks",
-          icon: getDbIcon("starrocks", undefined, 36),
-        },
-        {
-          key: "sphinx",
-          name: "Sphinx",
-          icon: getDbIcon("sphinx", undefined, 36),
-        },
-        {
-          key: "clickhouse",
-          name: "ClickHouse",
-          icon: getDbIcon("clickhouse", undefined, 36),
-        },
-        {
-          key: "postgres",
-          name: "PostgreSQL",
-          icon: getDbIcon("postgres", undefined, 36),
-        },
-        {
-          key: "sqlserver",
-          name: "SQL Server",
-          icon: getDbIcon("sqlserver", undefined, 36),
-        },
-        {
-          key: "iris",
-          name: "InterSystems IRIS",
-          icon: getDbIcon("iris", undefined, 36),
-        },
-        {
-          key: "sqlite",
-          name: "SQLite",
-          icon: getDbIcon("sqlite", undefined, 36),
-        },
-        {
-          key: "duckdb",
-          name: "DuckDB",
-          icon: getDbIcon("duckdb", undefined, 36),
-        },
-        {
-          key: "oracle",
-          name: "Oracle",
-          icon: getDbIcon("oracle", undefined, 36),
-        },
-      ],
-    },
-    {
-      label: t("connection.modal.step1.group.domestic"),
-      items: [
-        {
-          key: "oceanbase",
-          name: "OceanBase",
-          icon: getDbIcon("oceanbase", undefined, 36),
-        },
-        {
-          key: "dameng",
-          name: "Dameng (达梦)",
-          icon: getDbIcon("dameng", undefined, 36),
-        },
-        {
-          key: "kingbase",
-          name: "Kingbase (人大金仓)",
-          icon: getDbIcon("kingbase", undefined, 36),
-        },
-        {
-          key: "highgo",
-          name: "HighGo (瀚高)",
-          icon: getDbIcon("highgo", undefined, 36),
-        },
-        {
-          key: "vastbase",
-          name: "Vastbase (海量)",
-          icon: getDbIcon("vastbase", undefined, 36),
-        },
-        {
-          key: "opengauss",
-          name: "OpenGauss",
-          icon: getDbIcon("opengauss", undefined, 36),
-        },
-      ],
-    },
-    {
-      label: t("connection.modal.step1.group.nosql"),
-      items: [
-        {
-          key: "mongodb",
-          name: "MongoDB",
-          icon: getDbIcon("mongodb", undefined, 36),
-        },
-        {
-          key: "redis",
-          name: "Redis",
-          icon: getDbIcon("redis", undefined, 36),
-        },
-      ],
-    },
-    {
-      label: t("connection.modal.step1.group.timeseries"),
-      items: [
-        {
-          key: "tdengine",
-          name: "TDengine",
-          icon: getDbIcon("tdengine", undefined, 36),
-        },
-      ],
-    },
-    {
-      label: t("connection.modal.step1.group.other"),
-      items: [
-        {
-          key: "jvm",
-          name: "JVM Runtime",
-          step1Name: t("connection_modal.config_section.jvmRuntime.title"),
-          icon: getDbIcon("jvm", undefined, 36),
-        },
-        {
-          key: "custom",
-          name: t("connection_modal.db_type.custom"),
-          icon: getDbIcon("custom", undefined, 36),
-        },
-      ],
-    },
-  ];
+  const dbTypeGroups = useMemo(
+    () =>
+      CONNECTION_TYPE_GROUPS.map((group) => ({
+        ...group,
+        items: group.items.map((item) => ({
+          ...item,
+          icon: getDbIcon(item.key, undefined, 36),
+        })),
+      })),
+    [],
+  );
 
-  const dbTypes = dbTypeGroups.flatMap((g) => g.items);
-  const getDbTypeHint = (type: string) => {
-    switch (type) {
-      case "jvm":
-        return t("connection.modal.step1.hint.jvm");
-      case "custom":
-        return t("connection.modal.step1.hint.custom");
-      case "redis":
-        return t("connection.modal.step1.hint.redis");
-      case "mongodb":
-        return t("connection.modal.step1.hint.mongodb");
-      case "oceanbase":
-        return t("connection.modal.step1.hint.oceanBase");
-      case "sqlite":
-      case "duckdb":
-        return t("connection.modal.step1.hint.file");
-      default:
-        return t("connection.modal.step1.hint.standard");
-    }
-  };
+  const dbTypes = getAllConnectionTypeCatalogItems();
 
   const renderStep1 = () => (
     <div
@@ -4333,10 +4527,10 @@ const ConnectionModal: React.FC<{
                         display: "block",
                       }}
                     >
-                      {item.step1Name || item.name}
+                      {item.name}
                     </Text>
                     <Text type="secondary" style={{ fontSize: 12 }}>
-                      {getDbTypeHint(item.key)}
+                      {getConnectionTypeHint(item.key)}
                     </Text>
                   </div>
                 </Card>
@@ -5347,7 +5541,8 @@ const ConnectionModal: React.FC<{
                 dbType === "kingbase" ||
                 dbType === "highgo" ||
                 dbType === "vastbase" ||
-                dbType === "opengauss") &&
+                dbType === "opengauss" ||
+                dbType === "gaussdb") &&
                 renderConfigSectionCard({
                   sectionKey: "service",
                   icon: <DatabaseOutlined />,
@@ -5368,6 +5563,70 @@ const ConnectionModal: React.FC<{
                   ),
                 })}
 
+              {dbType === "kafka" &&
+                renderConfigSectionCard({
+                  sectionKey: "service",
+                  icon: <DatabaseOutlined />,
+                  children: (
+                    <Form.Item
+                      name="database"
+                      label="默认 Topic（可选）"
+                      help="留空时必须在 SQL 中显式指定 Topic；填写后可直接执行 SHOW、CONSUME 或 SELECT 预览。"
+                      style={{ marginBottom: 0 }}
+                    >
+                      <Input {...noAutoCapInputProps} placeholder="例如：orders.events" />
+                    </Form.Item>
+                  ),
+                })}
+
+              {dbType === "rocketmq" &&
+                renderConfigSectionCard({
+                  sectionKey: "service",
+                  icon: <DatabaseOutlined />,
+                  children: (
+                    <Form.Item
+                      name="database"
+                      label="默认 Topic（可选）"
+                      help="留空时必须在 SQL 中显式指定 Topic；连接参数可继续补充 groupId、namespace、tag、pullBatchSize 与 startOffset。"
+                      style={{ marginBottom: 0 }}
+                    >
+                      <Input {...noAutoCapInputProps} placeholder="例如：orders.events" />
+                    </Form.Item>
+                  ),
+                })}
+
+              {dbType === "mqtt" &&
+                renderConfigSectionCard({
+                  sectionKey: "service",
+                  icon: <DatabaseOutlined />,
+                  children: (
+                    <Form.Item
+                      name="database"
+                      label="默认 Topic / Filter（可选）"
+                      help="留空时必须在 SQL 中显式指定 Topic；填写后可直接执行 SHOW、CONSUME 或 SELECT 预览。支持使用 /、+、#。"
+                      style={{ marginBottom: 0 }}
+                    >
+                      <Input {...noAutoCapInputProps} placeholder="例如：devices/+/telemetry" />
+                    </Form.Item>
+                  ),
+                })}
+
+              {dbType === "rabbitmq" &&
+                renderConfigSectionCard({
+                  sectionKey: "service",
+                  icon: <DatabaseOutlined />,
+                  children: (
+                    <Form.Item
+                      name="database"
+                      label="默认 Virtual Host（可选）"
+                      help="留空默认使用 /；填写后查询编辑器会以当前 vhost 作为 Queue 浏览与测试发送上下文。"
+                      style={{ marginBottom: 0 }}
+                    >
+                      <Input {...noAutoCapInputProps} placeholder="例如：/ 或 orders-vhost" />
+                    </Form.Item>
+                  ),
+                })}
+
               {(dbType === "oracle" || isOceanBaseOracle) &&
                 renderConfigSectionCard({
                   sectionKey: "service",
@@ -5382,15 +5641,15 @@ const ConnectionModal: React.FC<{
                             )
                           : t("connection.modal.field.serviceName.label")
                       }
-                      rules={[
-                        createUriAwareRequiredRule(
-                          isOceanBaseOracle
-                            ? t(
-                                "connection.modal.field.oceanBaseServiceName.required",
-                              )
-                            : t("connection.modal.field.serviceName.required"),
-                        ),
-                      ]}
+                      rules={
+                        isOceanBaseOracle
+                          ? []
+                          : [
+                              createUriAwareRequiredRule(
+                                t("connection.modal.field.serviceName.required"),
+                              ),
+                            ]
+                      }
                       help={
                         isOceanBaseOracle
                           ? t(
@@ -5438,6 +5697,132 @@ const ConnectionModal: React.FC<{
                   }),
                 })}
 
+              {isKafka &&
+                renderConfigSectionCard({
+                  sectionKey: "connectionMode",
+                  icon: <ClusterOutlined />,
+                  children: renderChoiceCards({
+                    fieldName: "kafkaTopology",
+                    value: String(kafkaTopology),
+                    options: [
+                      {
+                        value: "single",
+                        label: "单 Broker",
+                        description: "只配置一个 bootstrap broker，适合本地或简单环境。",
+                      },
+                      {
+                        value: "cluster",
+                        label: "集群模式",
+                        description: "配置多个 bootstrap broker，提高发现与故障切换成功率。",
+                      },
+                    ],
+                  }),
+                })}
+
+              {isRocketMQ &&
+                renderConfigSectionCard({
+                  sectionKey: "connectionMode",
+                  icon: <ClusterOutlined />,
+                  children: renderChoiceCards({
+                    fieldName: "rocketmqTopology",
+                    value: String(rocketmqTopology),
+                    options: [
+                      {
+                        value: "single",
+                        label: "单 NameServer",
+                        description: "只配置一个 NameServer，适合本地或简单环境。",
+                      },
+                      {
+                        value: "cluster",
+                        label: "集群模式",
+                        description: "配置多个 NameServer，提高路由发现与故障切换成功率。",
+                      },
+                    ],
+                  }),
+                })}
+
+              {isMQTT &&
+                renderConfigSectionCard({
+                  sectionKey: "connectionMode",
+                  icon: <ClusterOutlined />,
+                  children: renderChoiceCards({
+                    fieldName: "mqttTopology",
+                    value: String(mqttTopology),
+                    options: [
+                      {
+                        value: "single",
+                        label: "单 Broker",
+                        description: "只配置一个 broker，适合本地或简单环境。",
+                      },
+                      {
+                        value: "cluster",
+                        label: "集群模式",
+                        description: "配置多个 broker，提高连接发现与故障切换成功率。",
+                      },
+                    ],
+                  }),
+                })}
+
+              {isKafka &&
+                kafkaTopology === "cluster" &&
+                renderConfigSectionCard({
+                  sectionKey: "replica",
+                  icon: <ClusterOutlined />,
+                  children: (
+                    <Form.Item
+                      name="kafkaHosts"
+                      label="额外 Broker 地址"
+                      help="可输入多个 broker 地址，格式：host:port（回车确认）"
+                    >
+                      <Select
+                        mode="tags"
+                        placeholder="例如：10.10.0.12:9092、10.10.0.13:9092"
+                        tokenSeparators={[",", ";", " "]}
+                      />
+                    </Form.Item>
+                  ),
+                })}
+
+              {isRocketMQ &&
+                rocketmqTopology === "cluster" &&
+                renderConfigSectionCard({
+                  sectionKey: "replica",
+                  icon: <ClusterOutlined />,
+                  children: (
+                    <Form.Item
+                      name="rocketmqHosts"
+                      label="额外 NameServer 地址"
+                      help="可输入多个 NameServer 地址，格式：host:port（回车确认）"
+                    >
+                      <Select
+                        mode="tags"
+                        placeholder="例如：10.10.0.12:9876、10.10.0.13:9876"
+                        tokenSeparators={[",", ";", " "]}
+                      />
+                    </Form.Item>
+                  ),
+                })}
+
+              {isMQTT &&
+                mqttTopology === "cluster" &&
+                renderConfigSectionCard({
+                  sectionKey: "replica",
+                  icon: <ClusterOutlined />,
+                  children: (
+                    <Form.Item
+                      name="mqttHosts"
+                      label="额外 Broker 地址"
+                      help="可输入多个 broker 地址，格式：host:port（回车确认）"
+                    >
+                      <Select
+                        mode="tags"
+                        placeholder="例如：10.10.0.12:1883、10.10.0.13:1883"
+                        tokenSeparators={[",", ";", " "]}
+                      />
+                    </Form.Item>
+                  ),
+                })}
+
               {isMySQLLike &&
                 mysqlTopology === "replica" &&
                 renderConfigSectionCard({
@@ -6021,7 +6406,7 @@ const ConnectionModal: React.FC<{
                           name="user"
                           label={t("connection.modal.field.username.label")}
                           rules={
-                            dbType === "mongodb"
+                            PRIMARY_USERNAME_OPTIONAL_TYPES.has(dbType)
                               ? []
                               : [
                                   createUriAwareRequiredRule(
@@ -6033,7 +6418,14 @@ const ConnectionModal: React.FC<{
                           }
                           style={{ marginBottom: 0 }}
                         >
-                          <Input {...noAutoCapInputProps} />
+                          <Input
+                            {...noAutoCapInputProps}
+                            placeholder={
+                              PRIMARY_USERNAME_OPTIONAL_TYPES.has(dbType)
+                                ? "未开启认证可留空"
+                                : undefined
+                            }
+                          />
                         </Form.Item>
                         <Form.Item
                           name="password"
@@ -6131,6 +6523,7 @@ const ConnectionModal: React.FC<{
 
               {!isFileDb &&
                 !isRedis &&
+                !isKafka &&
                 renderConfigSectionCard({
                   sectionKey: "databaseScope",
                   icon: <DatabaseOutlined />,
@@ -7149,6 +7542,9 @@ const ConnectionModal: React.FC<{
           connectionParams: "",
           oceanBaseProtocol: "mysql",
           mysqlTopology: "single",
+          rocketmqTopology: "single",
+          mqttTopology: "single",
+          kafkaTopology: "single",
           redisTopology: "single",
           mongoTopology: "single",
           mongoSrv: false,
@@ -7156,7 +7552,13 @@ const ConnectionModal: React.FC<{
           mongoAuthMechanism: "",
           savePassword: true,
           mysqlReplicaHosts: [],
+          rocketmqHosts: [],
+          mqttHosts: [],
+          kafkaHosts: [],
           redisHosts: [],
+          redisSentinelMaster: "",
+          redisSentinelUser: "",
+          redisSentinelPassword: "",
           mongoHosts: [],
           mysqlReplicaUser: "",
           mysqlReplicaPassword: "",
@@ -7276,19 +7678,32 @@ const ConnectionModal: React.FC<{
             );
           }
           if (changed.redisTopology !== undefined) {
-            const supportedDbs = Array.from({ length: 16 }, (_, i) => i);
+            const nextRedisTopology = String(
+              changed.redisTopology || "single",
+            ).toLowerCase();
+            const currentRedisPort = Number(form.getFieldValue("port") || 0);
+            if (
+              nextRedisTopology === "sentinel" &&
+              (!currentRedisPort || currentRedisPort === 6379)
+            ) {
+              form.setFieldValue("port", 26379);
+            } else if (
+              nextRedisTopology !== "sentinel" &&
+              currentRedisPort === 26379
+            ) {
+              form.setFieldValue("port", 6379);
+            }
+            const supportedDbs = buildRedisDatabaseList(
+              form.getFieldValue("redisDB"),
+              form.getFieldValue("includeRedisDatabases"),
+            );
             setRedisDbList(supportedDbs);
-            const selectedDbsRaw = form.getFieldValue("includeRedisDatabases");
-            const selectedDbs = Array.isArray(selectedDbsRaw)
-              ? selectedDbsRaw.map((entry: any) => Number(entry))
-              : [];
-            const validDbs = selectedDbs
-              .filter((entry: number) => Number.isFinite(entry))
-              .map((entry: number) => Math.trunc(entry))
-              .filter((entry: number) => supportedDbs.includes(entry));
             form.setFieldValue(
               "includeRedisDatabases",
-              validDbs.length > 0 ? validDbs : undefined,
+              normalizeRedisDatabaseSelection(
+                form.getFieldValue("includeRedisDatabases"),
+                supportedDbs,
+              ),
             );
           }
           if (
diff --git a/frontend/src/components/ConnectionModalMongoSections.tsx b/frontend/src/components/ConnectionModalMongoSections.tsx
new file mode 100644
index 0000000..98df36a
--- /dev/null
+++ b/frontend/src/components/ConnectionModalMongoSections.tsx
@@ -0,0 +1,364 @@
+import React from "react";
+import {
+  Alert,
+  Button,
+  Checkbox,
+  Form,
+  Input,
+  Select,
+  Space,
+  Table,
+  Tag,
+  Typography,
+} from "antd";
+import {
+  ApiOutlined,
+  ClusterOutlined,
+  ThunderboltOutlined,
+} from "@ant-design/icons";
+
+import type { MongoMemberInfo, SavedConnection } from "../types";
+import {
+  getStoredSecretPlaceholder,
+  type ConnectionConfigSectionKey,
+} from "../utils/connectionModalPresentation";
+import { noAutoCapInputProps } from "../utils/inputAutoCap";
+
+const { Text } = Typography;
+
+type ChoiceCardOption = {
+  value: string;
+  label: string;
+  description?: string;
+};
+
+type RenderChoiceCards = (params: {
+  fieldName: string;
+  value: string;
+  options: ChoiceCardOption[];
+  minWidth?: number;
+  onSelect?: (value: string) => void;
+}) => React.ReactNode;
+
+type RenderConfigSectionCard = (params: {
+  sectionKey: ConnectionConfigSectionKey;
+  icon: React.ReactNode;
+  children: React.ReactNode;
+  badge?: React.ReactNode;
+}) => React.ReactNode;
+
+type RenderStoredSecretControls = (params: {
+  fieldName: string;
+  clearKey: "mongoReplicaPassword";
+  hasStoredSecret?: boolean;
+  clearLabel: string;
+  description: string;
+}) => React.ReactNode;
+
+interface ConnectionModalMongoSectionsProps {
+  mongoTopology: string;
+  mongoSrv: boolean;
+  useSSH: boolean;
+  darkMode: boolean;
+  modalMutedTextStyle: React.CSSProperties;
+  mongoReadPreference: string;
+  mongoMembers: MongoMemberInfo[];
+  discoveringMembers: boolean;
+  initialValues?: SavedConnection | null;
+  renderChoiceCards: RenderChoiceCards;
+  renderConfigSectionCard: RenderConfigSectionCard;
+  renderStoredSecretControls: RenderStoredSecretControls;
+  setChoiceFieldValue: (fieldName: string, value: string | boolean) => void;
+  handleDiscoverMongoMembers: () => void;
+}
+
+const ConnectionModalMongoSections: React.FC<ConnectionModalMongoSectionsProps> = ({
+  mongoTopology,
+  mongoSrv,
+  useSSH,
+  darkMode,
+  modalMutedTextStyle,
+  mongoReadPreference,
+  mongoMembers,
+  discoveringMembers,
+  initialValues,
+  renderChoiceCards,
+  renderConfigSectionCard,
+  renderStoredSecretControls,
+  setChoiceFieldValue,
+  handleDiscoverMongoMembers,
+}) => (
+  <>
+    {renderConfigSectionCard({
+      sectionKey: "connectionMode",
+      icon: <ClusterOutlined />,
+      children: renderChoiceCards({
+        fieldName: "mongoTopology",
+        value: String(mongoTopology),
+        options: [
+          {
+            value: "single",
+            label: "单机模式",
+            description: "只连接一个 MongoDB 节点。",
+          },
+          {
+            value: "replica",
+            label: "副本集 / 多节点",
+            description: "配置副本集名称和多个候选节点。",
+          },
+        ],
+      }),
+    })}
+
+    {renderConfigSectionCard({
+      sectionKey: "mongoDiscovery",
+      icon: <ApiOutlined />,
+      children: (
+        <>
+          <Form.Item name="mongoSrv" hidden valuePropName="checked">
+            <Checkbox />
+          </Form.Item>
+          <div
+            style={{
+              display: "grid",
+              gridTemplateColumns: "repeat(auto-fit, minmax(180px, 1fr))",
+              gap: 10,
+            }}
+          >
+            {[
+              {
+                value: false,
+                label: "标准地址",
+                description: "使用 host:port 直连或副本集节点列表。",
+              },
+              {
+                value: true,
+                label: "SRV 地址",
+                description: "使用 mongodb+srv，由 DNS 发现目标节点。",
+              },
+            ].map((option) => {
+              const active = mongoSrv === option.value;
+              return (
+                <button
+                  key={String(option.value)}
+                  type="button"
+                  aria-pressed={active}
+                  onClick={() => setChoiceFieldValue("mongoSrv", option.value)}
+                  style={{
+                    textAlign: "left",
+                    padding: "12px 14px",
+                    borderRadius: 14,
+                    border: active
+                      ? darkMode
+                        ? "1px solid rgba(255,214,102,0.42)"
+                        : "1px solid rgba(22,119,255,0.36)"
+                      : darkMode
+                        ? "1px solid rgba(255,255,255,0.08)"
+                        : "1px solid rgba(16,24,40,0.08)",
+                    background: active
+                      ? darkMode
+                        ? "rgba(255,214,102,0.10)"
+                        : "rgba(22,119,255,0.07)"
+                      : darkMode
+                        ? "rgba(255,255,255,0.03)"
+                        : "rgba(16,24,40,0.03)",
+                    color: darkMode ? "#f5f7ff" : "#162033",
+                    cursor: "pointer",
+                  }}
+                >
+                  <Space size={8} wrap>
+                    <Text strong>{option.label}</Text>
+                    {active ? <Tag color="blue">当前</Tag> : null}
+                  </Space>
+                  <div style={{ ...modalMutedTextStyle, marginTop: 6 }}>
+                    {option.description}
+                  </div>
+                </button>
+              );
+            })}
+          </div>
+          {mongoSrv && useSSH && (
+            <Alert
+              type="warning"
+              showIcon
+              style={{ marginTop: 12 }}
+              message="SRV 与 SSH 隧道同时启用时，可能依赖本地 DNS 解析能力"
+            />
+          )}
+        </>
+      ),
+    })}
+
+    {mongoTopology === "replica" &&
+      renderConfigSectionCard({
+        sectionKey: "replica",
+        icon: <ClusterOutlined />,
+        children: (
+          <>
+            <Form.Item
+              name="mongoHosts"
+              label={mongoSrv ? "附加 SRV 主机（可选）" : "附加节点地址"}
+              help={
+                mongoSrv
+                  ? "可输入多个候选主机名，格式：host；若留空则仅使用上方主机。"
+                  : "可输入多个节点地址，格式：host:port（回车确认）"
+              }
+            >
+              <Select
+                mode="tags"
+                placeholder={
+                  mongoSrv
+                    ? "例如：cluster-a.example.com、cluster-b.example.com"
+                    : "例如：10.10.0.12:27017、10.10.0.13:27017"
+                }
+                tokenSeparators={[",", ";", " "]}
+              />
+            </Form.Item>
+            <div
+              style={{
+                display: "grid",
+                gridTemplateColumns: "repeat(2, minmax(0, 1fr))",
+                gap: 16,
+              }}
+            >
+              <Form.Item
+                name="mongoReplicaSet"
+                label="副本集名称（可选）"
+                style={{ marginBottom: 0 }}
+              >
+                <Input {...noAutoCapInputProps} placeholder="例如：rs0" />
+              </Form.Item>
+              <Form.Item
+                name="mongoReplicaUser"
+                label="副本集用户名（可选）"
+                style={{ marginBottom: 0 }}
+              >
+                <Input {...noAutoCapInputProps} placeholder="留空沿用主用户名" />
+              </Form.Item>
+            </div>
+            <Form.Item
+              name="mongoReplicaPassword"
+              label="副本集密码（可选）"
+              style={{ marginTop: 16, marginBottom: 0 }}
+            >
+              <Input.Password
+                {...noAutoCapInputProps}
+                placeholder={getStoredSecretPlaceholder({
+                  hasStoredSecret: initialValues?.hasMongoReplicaPassword,
+                  emptyPlaceholder: "留空沿用主密码",
+                  retainedLabel: "已保存副本集密码",
+                })}
+              />
+            </Form.Item>
+            {renderStoredSecretControls({
+              fieldName: "mongoReplicaPassword",
+              clearKey: "mongoReplicaPassword",
+              hasStoredSecret: initialValues?.hasMongoReplicaPassword,
+              clearLabel: "清除已保存副本集密码",
+              description:
+                "当前已保存副本集密码。留空表示继续沿用，输入新值表示替换。",
+            })}
+            <Space size={8} style={{ marginTop: 12, marginBottom: 12 }}>
+              <Button
+                onClick={handleDiscoverMongoMembers}
+                loading={discoveringMembers}
+              >
+                自动发现成员
+              </Button>
+            </Space>
+            {mongoMembers.length > 0 && (
+              <Table
+                size="small"
+                rowKey={(record) => record.host}
+                pagination={false}
+                dataSource={mongoMembers}
+                style={{ marginBottom: 12 }}
+                columns={[
+                  { title: "Host", dataIndex: "host", width: "48%" },
+                  {
+                    title: "角色",
+                    dataIndex: "role",
+                    width: "32%",
+                    render: (value: string, record: MongoMemberInfo) => (
+                      <Tag color={record.isSelf ? "blue" : "default"}>
+                        {value || "UNKNOWN"}
+                      </Tag>
+                    ),
+                  },
+                  {
+                    title: "健康",
+                    dataIndex: "healthy",
+                    width: "20%",
+                    render: (value: boolean) => (
+                      <Tag color={value ? "success" : "error"}>
+                        {value ? "正常" : "异常"}
+                      </Tag>
+                    ),
+                  },
+                ]}
+              />
+            )}
+          </>
+        ),
+      })}
+
+    {renderConfigSectionCard({
+      sectionKey: "mongoPolicy",
+      icon: <ThunderboltOutlined />,
+      children: (
+        <div
+          style={{
+            display: "grid",
+            gridTemplateColumns: "repeat(2, minmax(0, 1fr))",
+            gap: 16,
+          }}
+        >
+          <Form.Item
+            name="mongoAuthSource"
+            label="认证库 (authSource)"
+            style={{ marginBottom: 0 }}
+          >
+            <Input {...noAutoCapInputProps} placeholder="默认使用 database 或 admin" />
+          </Form.Item>
+          <div style={{ display: "grid", gap: 8 }}>
+            <Text strong>读偏好 (readPreference)</Text>
+            {renderChoiceCards({
+              fieldName: "mongoReadPreference",
+              value: String(mongoReadPreference),
+              minWidth: 130,
+              options: [
+                {
+                  value: "primary",
+                  label: "primary",
+                  description: "只读主节点。",
+                },
+                {
+                  value: "primaryPreferred",
+                  label: "primaryPreferred",
+                  description: "主节点优先。",
+                },
+                {
+                  value: "secondary",
+                  label: "secondary",
+                  description: "只读从节点。",
+                },
+                {
+                  value: "secondaryPreferred",
+                  label: "secondaryPreferred",
+                  description: "从节点优先。",
+                },
+                {
+                  value: "nearest",
+                  label: "nearest",
+                  description: "选择最近节点。",
+                },
+              ],
+            })}
+          </div>
+        </div>
+      ),
+    })}
+  </>
+);
+
+export default ConnectionModalMongoSections;
diff --git a/frontend/src/components/ConnectionModalRedisSections.tsx b/frontend/src/components/ConnectionModalRedisSections.tsx
new file mode 100644
index 0000000..33a794e
--- /dev/null
+++ b/frontend/src/components/ConnectionModalRedisSections.tsx
@@ -0,0 +1,242 @@
+import React from "react";
+import { Form, Input, Select } from "antd";
+import {
+  ClusterOutlined,
+  DatabaseOutlined,
+  SafetyCertificateOutlined,
+} from "@ant-design/icons";
+
+import type { SavedConnection } from "../types";
+import {
+  getStoredSecretPlaceholder,
+  type ConnectionConfigSectionKey,
+} from "../utils/connectionModalPresentation";
+import { noAutoCapInputProps } from "../utils/inputAutoCap";
+
+type ChoiceCardOption = {
+  value: string;
+  label: string;
+  description?: string;
+};
+
+type RenderChoiceCards = (params: {
+  fieldName: string;
+  value: string;
+  options: ChoiceCardOption[];
+  minWidth?: number;
+  onSelect?: (value: string) => void;
+}) => React.ReactNode;
+
+type RenderConfigSectionCard = (params: {
+  sectionKey: ConnectionConfigSectionKey;
+  icon: React.ReactNode;
+  children: React.ReactNode;
+  badge?: React.ReactNode;
+}) => React.ReactNode;
+
+type RenderStoredSecretControls = (params: {
+  fieldName: string;
+  clearKey: "redisSentinelPassword";
+  hasStoredSecret?: boolean;
+  clearLabel: string;
+  description: string;
+}) => React.ReactNode;
+
+interface ConnectionModalRedisSectionsProps {
+  redisTopology: string;
+  redisDbList: number[];
+  initialValues?: SavedConnection | null;
+  primaryPasswordVisible: boolean;
+  setPrimaryPasswordVisible: (visible: boolean) => void;
+  renderChoiceCards: RenderChoiceCards;
+  renderConfigSectionCard: RenderConfigSectionCard;
+  renderStoredSecretControls: RenderStoredSecretControls;
+  createUriAwareRequiredRule: (
+    messageText: string,
+    validateValue?: (value: unknown) => boolean,
+  ) => any;
+}
+
+const ConnectionModalRedisSections: React.FC<ConnectionModalRedisSectionsProps> = ({
+  redisTopology,
+  redisDbList,
+  initialValues,
+  primaryPasswordVisible,
+  setPrimaryPasswordVisible,
+  renderChoiceCards,
+  renderConfigSectionCard,
+  renderStoredSecretControls,
+  createUriAwareRequiredRule,
+}) => (
+  <>
+    {renderConfigSectionCard({
+      sectionKey: "connectionMode",
+      icon: <ClusterOutlined />,
+      children: (
+        <>
+          {renderChoiceCards({
+            fieldName: "redisTopology",
+            value: String(redisTopology),
+            options: [
+              {
+                value: "single",
+                label: "单机模式",
+                description: "只连接一个 Redis 节点。",
+              },
+              {
+                value: "cluster",
+                label: "集群模式",
+                description: "Redis Cluster，配置多个种子节点。",
+              },
+              {
+                value: "sentinel",
+                label: "哨兵模式",
+                description: "通过 Sentinel 发现主节点，适合主从高可用。",
+              },
+            ],
+          })}
+          {(redisTopology === "cluster" || redisTopology === "sentinel") && (
+            <>
+              <Form.Item
+                name="redisHosts"
+                label={
+                  redisTopology === "sentinel"
+                    ? "Sentinel 附加节点地址"
+                    : "集群附加节点地址"
+                }
+                help={
+                  redisTopology === "sentinel"
+                    ? "上方主机地址作为第一个 Sentinel；这里填写其他 Sentinel 节点，格式：host:port"
+                    : "主节点使用上方主机地址；这里填写其他种子节点，格式：host:port"
+                }
+                style={{ marginTop: 16, marginBottom: 0 }}
+              >
+                <Select
+                  mode="tags"
+                  placeholder={
+                    redisTopology === "sentinel"
+                      ? "例如：10.10.0.12:26379、10.10.0.13:26379"
+                      : "例如：10.10.0.12:6379、10.10.0.13:6379"
+                  }
+                  tokenSeparators={[",", ";", " "]}
+                />
+              </Form.Item>
+              {redisTopology === "sentinel" && (
+                <Form.Item
+                  name="redisSentinelMaster"
+                  label="Sentinel master 名称"
+                  help="填写 Sentinel 配置中的 monitor 名称，例如 mymaster。"
+                  rules={[
+                    createUriAwareRequiredRule(
+                      "请输入 Sentinel master 名称",
+                    ),
+                  ]}
+                  style={{ marginTop: 16, marginBottom: 0 }}
+                >
+                  <Input
+                    {...noAutoCapInputProps}
+                    placeholder="例如：mymaster"
+                  />
+                </Form.Item>
+              )}
+            </>
+          )}
+        </>
+      ),
+    })}
+
+    {renderConfigSectionCard({
+      sectionKey: "credentials",
+      icon: <SafetyCertificateOutlined />,
+      children: (
+        <>
+          <Form.Item name="password" label="密码 (可选)">
+            <Input.Password
+              {...noAutoCapInputProps}
+              visibilityToggle={{
+                visible: primaryPasswordVisible,
+                onVisibleChange: setPrimaryPasswordVisible,
+              }}
+              placeholder={getStoredSecretPlaceholder({
+                hasStoredSecret: initialValues?.hasPrimaryPassword,
+                emptyPlaceholder: "Redis 密码（如果设置了 requirepass）",
+                retainedLabel: "已保存 Redis 密码",
+              })}
+            />
+          </Form.Item>
+          {redisTopology === "sentinel" && (
+            <>
+              <div
+                style={{
+                  display: "grid",
+                  gridTemplateColumns: "repeat(2, minmax(0, 1fr))",
+                  gap: 16,
+                }}
+              >
+                <Form.Item
+                  name="redisSentinelUser"
+                  label="Sentinel 用户名（可选）"
+                  style={{ marginBottom: 0 }}
+                >
+                  <Input
+                    {...noAutoCapInputProps}
+                    placeholder="留空表示 Sentinel 不使用 ACL 用户名"
+                  />
+                </Form.Item>
+                <Form.Item
+                  name="redisSentinelPassword"
+                  label="Sentinel 密码（可选）"
+                  style={{ marginBottom: 0 }}
+                >
+                  <Input.Password
+                    {...noAutoCapInputProps}
+                    placeholder={getStoredSecretPlaceholder({
+                      hasStoredSecret: initialValues?.hasRedisSentinelPassword,
+                      emptyPlaceholder: "Sentinel 自身认证密码，留空则不发送",
+                      retainedLabel: "已保存 Sentinel 密码",
+                    })}
+                  />
+                </Form.Item>
+              </div>
+              {renderStoredSecretControls({
+                fieldName: "redisSentinelPassword",
+                clearKey: "redisSentinelPassword",
+                hasStoredSecret: initialValues?.hasRedisSentinelPassword,
+                clearLabel: "清除已保存 Sentinel 密码",
+                description:
+                  "当前已保存 Sentinel 密码。留空表示继续沿用，输入新值表示替换。",
+              })}
+            </>
+          )}
+        </>
+      ),
+    })}
+
+    {renderConfigSectionCard({
+      sectionKey: "databaseScope",
+      icon: <DatabaseOutlined />,
+      children: (
+        <Form.Item
+          name="includeRedisDatabases"
+          label="显示数据库 (留空显示全部)"
+          help="连接测试成功后可选择"
+          style={{ marginBottom: 0 }}
+        >
+          <Select
+            mode="multiple"
+            placeholder="选择显示的数据库"
+            allowClear
+          >
+            {redisDbList.map((db) => (
+              <Select.Option key={db} value={db}>
+                db{db}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+      ),
+    })}
+  </>
+);
+
+export default ConnectionModalRedisSections;
diff --git a/frontend/src/components/DataGrid.ddl.test.tsx b/frontend/src/components/DataGrid.ddl.test.tsx
index 5b80dca..fb0d4b8 100644
--- a/frontend/src/components/DataGrid.ddl.test.tsx
+++ b/frontend/src/components/DataGrid.ddl.test.tsx
@@ -11,7 +11,7 @@ import DataGrid, {
 } from './DataGrid';
 import { V2CellContextMenuView, V2ColumnHeaderContextMenuView, V2TableGroupContextMenuView } from './V2TableContextMenu';
 import { setCurrentLanguage, t } from '../i18n';
-import { ORACLE_ROWID_LOCATOR_COLUMN } from '../utils/rowLocator';
+import { DUCKDB_ROWID_LOCATOR_COLUMN, ORACLE_ROWID_LOCATOR_COLUMN } from '../utils/rowLocator';
 
 const storeState = vi.hoisted(() => ({
   connections: [
@@ -43,6 +43,11 @@ const storeState = vi.hoisted(() => ({
     showColumnType: false,
   },
   setQueryOptions: vi.fn(),
+  dataEditTransactionOptions: {
+    commitMode: 'manual' as 'manual' | 'auto',
+    autoCommitDelayMs: 5000,
+  },
+  setDataEditTransactionOptions: vi.fn(),
   addTab: vi.fn(),
   setActiveContext: vi.fn(),
   tableColumnOrders: {},
@@ -68,6 +73,8 @@ const backendApp = vi.hoisted(() => ({
   DBGetColumns: vi.fn(),
   DBGetIndexes: vi.fn(),
   DBGetForeignKeys: vi.fn(),
+  DBGetTriggers: vi.fn(),
+  DBQuery: vi.fn(),
   DBShowCreateTable: vi.fn(),
 }));
 
@@ -115,6 +122,16 @@ vi.mock('./ImportPreviewModal', () => ({
   default: () => null,
 }));
 
+vi.mock('./TableDesigner', () => ({
+  default: ({ tab, embedded }: { tab: { tableName?: string; initialTab?: string }; embedded?: boolean }) => (
+    <div data-table-designer={embedded ? 'embedded' : 'standalone'}>
+      <span>SCHEMA DESIGNER</span>
+      <span>{tab.tableName || 'unknown-table'}</span>
+      <span>{tab.initialTab || 'columns'}</span>
+    </div>
+  ),
+}));
+
 vi.mock('@ant-design/icons', () => {
   const Icon = () => <span />;
 
@@ -156,6 +173,7 @@ vi.mock('@ant-design/icons', () => {
 vi.mock('@dnd-kit/core', () => ({
   DndContext: ({ children }: any) => <>{children}</>,
   PointerSensor: vi.fn(),
+  KeyboardSensor: vi.fn(),
   MouseSensor: vi.fn(),
   TouchSensor: vi.fn(),
   useSensor: vi.fn(() => ({})),
@@ -174,6 +192,7 @@ vi.mock('@dnd-kit/sortable', () => ({
     isDragging: false,
   })),
   horizontalListSortingStrategy: vi.fn(),
+  sortableKeyboardCoordinates: vi.fn(),
   arrayMove: (items: any[], from: number, to: number) => {
     const next = [...items];
     const [item] = next.splice(from, 1);
@@ -224,9 +243,54 @@ vi.mock('antd', () => {
       </section>
     ) : null
   );
-  Modal.useModal = () => [{ info: vi.fn(() => ({ destroy: vi.fn() })) }, null];
+  Modal.useModal = () => {
+    const [infoConfig, setInfoConfig] = React.useState<any>(null);
+    return [{
+      info: vi.fn((config: any) => {
+        setInfoConfig(config);
+        return {
+          destroy: vi.fn(() => {
+            setInfoConfig(null);
+          }),
+        };
+      }),
+    }, infoConfig ? <section data-modal-use-holder="true">{infoConfig.content}</section> : null];
+  };
 
   const passthrough = ({ children }: any) => <>{children}</>;
+  const Dropdown = ({ children, menu, disabled }: any) => (
+    <>
+      {children}
+      {!disabled && menu?.items?.map((item: any) => (
+        item?.type === 'divider'
+          ? null
+          : <button key={item.key} type="button" disabled={item.disabled} onClick={item.onClick}>{item.label}</button>
+      ))}
+    </>
+  );
+  const Space = ({ children }: any) => <div>{children}</div>;
+  const Tabs = ({ items = [], activeKey, onChange }: any) => {
+    const resolvedActiveKey = activeKey ?? items[0]?.key;
+    const activeItem = items.find((item: any) => item.key === resolvedActiveKey) || items[0];
+    return (
+      <div data-tabs-active-key={resolvedActiveKey}>
+        <div>
+          {items.map((item: any) => (
+            <button key={item.key} type="button" data-tab-key={item.key} onClick={() => onChange?.(item.key)}>
+              {item.label}
+            </button>
+          ))}
+        </div>
+        <div>{activeItem?.children ?? null}</div>
+      </div>
+    );
+  };
+  const Empty: any = ({ description }: any) => <div>{description || 'empty'}</div>;
+  Empty.PRESENTED_IMAGE_SIMPLE = 'presented-image-simple';
+  const Tag = ({ children }: any) => <span>{children}</span>;
+  const Radio: any = ({ children }: any) => <span>{children}</span>;
+  Radio.Group = ({ children }: any) => <div>{children}</div>;
+  Radio.Button = ({ children }: any) => <button type="button">{children}</button>;
   const Segmented = ({ value, options, onChange }: any) => (
     <div data-segmented-value={value}>
       {(options || []).map((option: any) => (
@@ -256,10 +320,10 @@ vi.mock('antd', () => {
     message: messageApi,
     Input,
     Button,
-    Dropdown: passthrough,
+    Dropdown,
     Form,
     Pagination: () => null,
-    Select: () => null,
+    Select: ({ children }: any) => <div>{children}</div>,
     Modal,
     Checkbox: ({ checked, onChange }: any) => <input type="checkbox" checked={checked} onChange={onChange} />,
     Segmented,
@@ -268,6 +332,11 @@ vi.mock('antd', () => {
     DatePicker: () => null,
     TimePicker: () => null,
     AutoComplete: ({ children }: any) => <>{children}</>,
+    Tabs,
+    Empty,
+    Space,
+    Tag,
+    Radio,
   };
 });
 
@@ -355,6 +424,37 @@ describe('DataGrid commit change set', () => {
     });
   });
 
+  it('uses hidden DuckDB rowid only as locator and excludes it from update values', () => {
+    const result = buildDataGridCommitChangeSet({
+      addedRows: [],
+      modifiedRows: {
+        'row-1': { [GONAVI_ROW_KEY]: 'row-1', NAME: 'new-name', [DUCKDB_ROWID_LOCATOR_COLUMN]: 18 },
+      },
+      deletedRowKeys: new Set(),
+      data: [{ [GONAVI_ROW_KEY]: 'row-1', NAME: 'old-name', [DUCKDB_ROWID_LOCATOR_COLUMN]: 17 }],
+      editLocator: {
+        strategy: 'duckdb-rowid',
+        columns: ['rowid'],
+        valueColumns: [DUCKDB_ROWID_LOCATOR_COLUMN],
+        hiddenColumns: [DUCKDB_ROWID_LOCATOR_COLUMN],
+        readOnly: false,
+      },
+      visibleColumnNames: ['NAME'],
+      rowKeyToString,
+      normalizeCommitCellValue: normalizeValue,
+      shouldCommitColumn: commitColumnGuard,
+    });
+
+    expect(result).toEqual({
+      ok: true,
+      changes: {
+        inserts: [],
+        updates: [{ keys: { rowid: 17 }, values: { NAME: 'new-name' } }],
+        deletes: [],
+      },
+    });
+  });
+
   it('commits only writable result columns and maps aliases back to table columns', () => {
     const result = buildDataGridCommitChangeSet({
       addedRows: [],
@@ -547,9 +647,22 @@ describe('DataGrid DDL interactions', () => {
     backendApp.DBGetColumns.mockResolvedValue({ success: true, data: [] });
     backendApp.DBGetIndexes.mockResolvedValue({ success: true, data: [] });
     backendApp.DBGetForeignKeys.mockResolvedValue({ success: true, data: [] });
+    backendApp.DBGetTriggers.mockResolvedValue({ success: true, data: [] });
+    backendApp.DBQuery.mockResolvedValue({ success: true, data: [] });
     backendApp.DBShowCreateTable.mockResolvedValue({ success: true, data: 'CREATE TABLE users' });
     setCurrentLanguage('zh-CN');
     storeState.appearance.uiVersion = 'legacy';
+    storeState.dataEditTransactionOptions = {
+      commitMode: 'manual',
+      autoCommitDelayMs: 5000,
+    };
+    storeState.setDataEditTransactionOptions.mockReset();
+    storeState.setDataEditTransactionOptions.mockImplementation((options: Partial<typeof storeState.dataEditTransactionOptions>) => {
+      storeState.dataEditTransactionOptions = {
+        ...storeState.dataEditTransactionOptions,
+        ...options,
+      };
+    });
     storeState.addTab.mockReset();
     storeState.setActiveContext.mockReset();
     testRenderState.latestColumns = [];
@@ -588,6 +701,7 @@ describe('DataGrid DDL interactions', () => {
   });
 
   afterEach(() => {
+    vi.useRealTimers();
     backendApp.ImportData.mockReset();
     backendApp.ExportTable.mockReset();
     backendApp.ExportData.mockReset();
@@ -596,6 +710,8 @@ describe('DataGrid DDL interactions', () => {
     backendApp.DBGetColumns.mockReset();
     backendApp.DBGetIndexes.mockReset();
     backendApp.DBGetForeignKeys.mockReset();
+    backendApp.DBGetTriggers.mockReset();
+    backendApp.DBQuery.mockReset();
     backendApp.DBShowCreateTable.mockReset();
     vi.unstubAllGlobals();
   });
@@ -693,6 +809,7 @@ describe('DataGrid DDL interactions', () => {
         connectionId: 'conn-1',
         dbName: 'main',
         tableName: 'customers',
+        objectType: 'table',
       });
     },
   );
@@ -1039,6 +1156,49 @@ describe('DataGrid DDL interactions', () => {
     });
   });
 
+  it('exports query-result rows from in-memory data without rerunning ExportQuery', async () => {
+    backendApp.ExportData.mockResolvedValue({ success: true });
+    backendApp.ExportQuery.mockResolvedValue({ success: true });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(
+        <DataGrid
+          data={[
+            { __gonavi_row_key__: 'row-1', owner: 'sa' },
+            { __gonavi_row_key__: 'row-2', owner: 'dbo' },
+          ]}
+          columnNames={['owner']}
+          loading={false}
+          exportScope="queryResult"
+          resultSql="EXEC sp_helpdb"
+          dbName="master"
+          connectionId="conn-1"
+        />,
+      );
+    });
+    await waitForEffects();
+
+    await act(async () => {
+      await findButton(renderer!, 'HTML').props.onClick();
+    });
+
+    const exportAllButton = findButton(renderer!, t('data_grid.export.all_rows', { count: 2 }));
+    await act(async () => {
+      await exportAllButton.props.onClick();
+    });
+    await waitForEffects();
+
+    expect(backendApp.ExportData).toHaveBeenCalledTimes(1);
+    expect(backendApp.ExportData).toHaveBeenCalledWith(
+      [{ owner: 'sa' }, { owner: 'dbo' }],
+      ['owner'],
+      'export',
+      'html',
+    );
+    expect(backendApp.ExportQuery).not.toHaveBeenCalled();
+  });
+
   it('copies loaded column data from the v2 column header context menu', async () => {
     storeState.appearance.uiVersion = 'v2';
 
@@ -1229,8 +1389,114 @@ describe('DataGrid DDL interactions', () => {
     renderer!.unmount();
   });
 
-  it('switches the v2 footer field tab into the main fields view', async () => {
+  it('auto commits pending table edits after the configured delay', async () => {
+    vi.useFakeTimers();
     storeState.appearance.uiVersion = 'v2';
+    storeState.dataEditTransactionOptions = {
+      commitMode: 'auto',
+      autoCommitDelayMs: 3000,
+    };
+    backendApp.ApplyChanges.mockResolvedValue({ success: true, message: 'ok' });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(
+        <DataGrid
+          data={[
+            { __gonavi_row_key__: 'row-1', id: 1, name: 'alpha' },
+          ]}
+          columnNames={['id', 'name']}
+          loading={false}
+          tableName="users"
+          dbName="main"
+          connectionId="conn-1"
+          pkColumns={['id']}
+        />,
+      );
+    });
+    await waitForEffects();
+
+    const nameColumn = testRenderState.latestColumns.find((column) => column.key === 'name');
+    const contextTarget = {
+      closest: (selector: string) => selector === '[data-row-key][data-col-name]'
+        ? {
+            getAttribute: (name: string) => {
+              if (name === 'data-row-key') return 'row-1';
+              if (name === 'data-col-name') return 'name';
+              return null;
+            },
+          }
+        : null,
+    } as unknown as HTMLElement;
+
+    const openMenu = async () => {
+      const cellProps = nameColumn.onCell({ __gonavi_row_key__: 'row-1', id: 1, name: 'alpha' });
+      await act(async () => {
+        cellProps.onContextMenu({
+          preventDefault: vi.fn(),
+          stopPropagation: vi.fn(),
+          clientX: 160,
+          clientY: 120,
+          currentTarget: contextTarget,
+          target: contextTarget,
+        });
+      });
+    };
+
+    await openMenu();
+    await act(async () => {
+      findButton(renderer!, '复制本行为新增行').props.onClick({
+        preventDefault: vi.fn(),
+        stopPropagation: vi.fn(),
+      });
+    });
+    await openMenu();
+    await act(async () => {
+      findButton(renderer!, t('data_grid.context_menu.paste_row_as_new_count', { count: 1 })).props.onClick({
+        preventDefault: vi.fn(),
+        stopPropagation: vi.fn(),
+      });
+    });
+
+    expect(backendApp.ApplyChanges).not.toHaveBeenCalled();
+
+    await act(async () => {
+      vi.advanceTimersByTime(2999);
+      await Promise.resolve();
+    });
+    expect(backendApp.ApplyChanges).not.toHaveBeenCalled();
+
+    await act(async () => {
+      vi.advanceTimersByTime(1);
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.ApplyChanges).toHaveBeenCalledTimes(1);
+    expect(backendApp.ApplyChanges.mock.calls[0][3]).toMatchObject({
+      inserts: [
+        expect.objectContaining({
+          id: 1,
+          name: 'alpha',
+        }),
+      ],
+      updates: [],
+      deletes: [],
+      locatorStrategy: 'primary-key',
+    });
+    expect(messageApi.success).toHaveBeenCalledWith('自动提交成功');
+    renderer!.unmount();
+  });
+
+  it('switches the v2 footer object tab into the embedded designer view', async () => {
+    storeState.appearance.uiVersion = 'v2';
+    backendApp.DBGetColumns.mockResolvedValueOnce({
+      success: true,
+      data: [
+        { name: 'id', type: 'bigint', key: 'PRI', nullable: 'NO', default: '', comment: '' },
+        { name: 'name', type: 'varchar(255)', key: '', nullable: 'YES', default: '', comment: '' },
+      ],
+    });
 
     let renderer: ReactTestRenderer;
     await act(async () => {
@@ -1248,12 +1514,12 @@ describe('DataGrid DDL interactions', () => {
     await waitForEffects();
 
     await act(async () => {
-      findButton(renderer!, '字段信息').props.onClick();
+      findButton(renderer!, '对象设计').props.onClick();
     });
 
     const content = textContent(renderer!.root);
-    expect(content).toContain(t('data_grid.metadata_view.fields_badge'));
-    expect(content).toContain(t('data_grid.metadata_view.field_count', { count: 2 }));
+    expect(content).toContain('SCHEMA DESIGNER');
+    expect(content).toContain('字段');
     expect(content).toContain('id');
     expect(content).toContain('name');
   });
@@ -1277,9 +1543,9 @@ describe('DataGrid DDL interactions', () => {
     await waitForEffects();
 
     await act(async () => {
-      findButton(renderer!, '字段信息').props.onClick();
+      findButton(renderer!, '对象设计').props.onClick();
     });
-    expect(textContent(renderer!.root)).toContain(t('data_grid.metadata_view.fields_badge'));
+    expect(textContent(renderer!.root)).toContain('SCHEMA DESIGNER');
 
     storeState.appearance.uiVersion = 'legacy';
     await act(async () => {
@@ -1297,13 +1563,54 @@ describe('DataGrid DDL interactions', () => {
     await waitForEffects();
 
     const content = textContent(renderer!.root);
-    expect(content).not.toContain(t('data_grid.metadata_view.field_count', { count: 2 }));
+    expect(content).not.toContain('SCHEMA DESIGNER');
     expect(content).not.toContain('gn-v2-data-grid-fields-view');
     expect(content).toContain('数据预览');
     expect(content).toContain('结果视图');
     expect(content).toContain('字段信息');
   });
 
+  it('keeps the v2 fields tab as read-only field info for views', async () => {
+    storeState.appearance.uiVersion = 'v2';
+    backendApp.DBGetColumns.mockResolvedValueOnce({
+      success: true,
+      data: [
+        { name: 'id', type: 'bigint', key: '', nullable: 'NO', default: '', comment: '' },
+        { name: 'name', type: 'varchar(255)', key: '', nullable: 'YES', default: '', comment: '' },
+      ],
+    });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(
+        <DataGrid
+          data={[{ __gonavi_row_key__: 'row-1', id: 1, name: 'alpha' }]}
+          columnNames={['id', 'name']}
+          loading={false}
+          tableName="user_view"
+          dbName="main"
+          connectionId="conn-1"
+          objectType="view"
+        />,
+      );
+    });
+    await waitForEffects();
+
+    expect(textContent(renderer!.root)).toContain('字段信息');
+    expect(textContent(renderer!.root)).not.toContain('对象设计');
+
+    await act(async () => {
+      findButton(renderer!, '字段信息').props.onClick();
+    });
+
+    const content = textContent(renderer!.root);
+    expect(content).toContain(t('data_grid.metadata_view.fields_badge'));
+    expect(content).toContain(t('data_grid.metadata_view.field_count', { count: 2 }));
+    expect(content).toContain('id');
+    expect(content).toContain('name');
+    expect(content).not.toContain('SCHEMA DESIGNER');
+  });
+
   it('renders the v2 footer DDL view with the Monaco SQL editor', async () => {
     storeState.appearance.uiVersion = 'v2';
     backendApp.DBShowCreateTable.mockResolvedValueOnce({
@@ -1335,10 +1642,48 @@ describe('DataGrid DDL interactions', () => {
     expect(editors).toHaveLength(1);
     expect(editors[0].props['data-language']).toBe('sql');
     expect(editors[0].props['data-read-only']).toBe('true');
-    expect(textContent(editors[0])).toContain('CREATE TABLE users');
+    expect(textContent(editors[0])).toContain('CREATE TABLE');
+    expect(textContent(editors[0])).toContain('users');
     expect(renderer!.root.findAll((node) => node.type === 'pre' && textContent(node).includes('CREATE TABLE users'))).toHaveLength(0);
   });
 
+  it('formats DuckDB DDL into readable multiline SQL in the v2 view', async () => {
+    storeState.appearance.uiVersion = 'v2';
+    storeState.connections[0].config.type = 'duckdb';
+    backendApp.DBShowCreateTable.mockResolvedValueOnce({
+      success: true,
+      data: 'CREATE TABLE customers(customer_id BIGINT, customer_code VARCHAR, city VARCHAR, tier VARCHAR, signup_date DATE, lifetime_value DECIMAL(12,2), PRIMARY KEY(customer_id));',
+    });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(
+        <DataGrid
+          data={[{ __gonavi_row_key__: 'row-1', customer_id: 1 }]}
+          columnNames={['customer_id']}
+          loading={false}
+          tableName="example.main.customers"
+          dbName="main"
+          connectionId="conn-1"
+        />,
+      );
+    });
+    await waitForEffects();
+
+    await act(async () => {
+      findButton(renderer!, '查看 DDL').props.onClick();
+    });
+    await waitForEffects();
+
+    const editors = renderer!.root.findAll((node) => node.props['data-monaco-editor'] === 'true');
+    expect(editors).toHaveLength(1);
+    const ddlText = textContent(editors[0]);
+    expect(ddlText).toContain('CREATE TABLE customers (');
+    expect(ddlText).toContain('customer_id BIGINT,');
+    expect(ddlText).toContain('PRIMARY KEY (customer_id)');
+    expect(ddlText).toContain('\n');
+  });
+
   it('opens the v2 DDL view as a right sidebar while keeping the table visible', async () => {
     storeState.appearance.uiVersion = 'v2';
     backendApp.DBShowCreateTable.mockResolvedValueOnce({
diff --git a/frontend/src/components/DataGrid.layout.test.tsx b/frontend/src/components/DataGrid.layout.test.tsx
index a9aa455..1a2c6a1 100644
--- a/frontend/src/components/DataGrid.layout.test.tsx
+++ b/frontend/src/components/DataGrid.layout.test.tsx
@@ -20,6 +20,7 @@ import { DataGridV2DdlSideWorkspace, DataGridV2DdlView } from './DataGridV2DdlWo
 import { DataGridV2ErView, DataGridV2FieldsView } from './DataGridV2MetadataViews';
 import { I18nProvider } from '../i18n/provider';
 import { getCurrentLanguage, setCurrentLanguage, type LanguagePreference } from '../i18n';
+import { V2CellContextMenuView } from './V2TableContextMenu';
 import { cloneShortcutOptions, DEFAULT_SHORTCUT_OPTIONS } from '../utils/shortcuts';
 
 const mockStoreState = vi.hoisted(() => ({
@@ -45,6 +46,11 @@ vi.mock('../store', () => ({
       showColumnType: false,
     },
     setQueryOptions: vi.fn(),
+    dataEditTransactionOptions: {
+      commitMode: 'manual',
+      autoCommitDelayMs: 5000,
+    },
+    setDataEditTransactionOptions: vi.fn(),
     addTab: vi.fn(),
     setActiveContext: vi.fn(),
     tableColumnOrders: {},
@@ -112,6 +118,8 @@ describe('DataGrid layout', () => {
         columnNames={['id', 'name']}
         loading={false}
         tableName="users"
+        dbName="main"
+        connectionId="conn-1"
         readOnly
         pagination={{
           current: 1,
@@ -128,6 +136,7 @@ describe('DataGrid layout', () => {
     expect(markup).toContain('data-grid-column-quick-find-action="true"');
     expect(markup).toContain('字段显示');
     expect(markup).toContain('跳列');
+    expect(markup).toContain('对象设计');
     expect(markup).toContain('data-grid-page-find="true"');
     expect(markup).toContain('data-grid-page-find-prev="true"');
     expect(markup).toContain('data-grid-page-find-next="true"');
@@ -778,6 +787,34 @@ describe('DataGrid layout', () => {
     expect(source).not.toMatch(/<DataGridErrorBoundary\s+key={language}/);
   });
 
+  it('keeps the v2 footer fields action labeled as field info for views', () => {
+    const markup = renderToStaticMarkup(
+      <DataGrid
+        data={[
+          {
+            __gonavi_row_key__: 'row-1',
+            id: 1,
+            name: 'alpha',
+          },
+        ]}
+        columnNames={['id', 'name']}
+        loading={false}
+        tableName="user_view"
+        objectType="view"
+        readOnly
+        pagination={{
+          current: 1,
+          pageSize: 100,
+          total: 1,
+        }}
+        onPageChange={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('字段信息');
+    expect(markup).not.toContain('对象设计');
+  });
+
   it('falls back to the current i18n language when rendered outside I18nProvider', () => {
     const previousUiVersion = mockStoreState.uiVersion;
     const previousLanguage = getCurrentLanguage();
@@ -1677,6 +1714,7 @@ describe('DataGrid layout', () => {
       <DataGridSecondaryActions
         isV2Ui
         canViewDdl
+        canOpenObjectDesigner={false}
         viewMode="table"
         ddlLoading={false}
         showColumnComment={false}
@@ -1837,9 +1875,30 @@ describe('DataGrid layout', () => {
     expect(markup).toContain('gn-v2-data-grid-table-wrap');
     expect(markup).toContain('· main');
     expect(markup).toContain('提交事务');
+    expect(markup).toContain('手动提交');
     expect(markup).toContain('AI 洞察');
   });
 
+  it('clears modified cell markers when refreshing the grid', () => {
+    const source = readFileSync(new URL('./DataGrid.tsx', import.meta.url), 'utf8');
+
+    expect(source).toMatch(/const handleRefreshGrid = useCallback\(\(\) => \{[\s\S]*setModifiedColumns\(\{\}\);[\s\S]*if \(onReload\) onReload\(\);[\s\S]*\}, \[clearAutoCommitTimer, onReload\]\);/);
+  });
+
+  it('renders a cell-level undo action in the v2 context menu for modified cells', () => {
+    const markup = renderToStaticMarkup(
+      <V2CellContextMenuView
+        fieldName="status"
+        tableName="orders"
+        rowLabel="row 1"
+        canModifyData
+        canUndoCellChange
+      />,
+    );
+
+    expect(markup).toContain('撤销此单元格修改');
+  });
+
   it('preserves fractional seconds when rendering datetime values', () => {
     expect(formatCellDisplayText('2026-05-10T09:12:33.456+08:00')).toBe('2026-05-10 09:12:33.456');
   });
@@ -1918,6 +1977,7 @@ describe('DataGrid layout', () => {
 
     expect(tableMarkup).toContain('data-grid-ddl-action="true"');
     expect(tableMarkup).toContain('查看 DDL');
+    expect(tableMarkup).toContain('对象设计');
     expect(tableMarkup).not.toContain('data-grid-locate-sidebar-action="true"');
 
     const schemaTableMarkup = renderDataGridWithI18n(
@@ -1939,6 +1999,7 @@ describe('DataGrid layout', () => {
 
     expect(schemaTableMarkup).toContain('data-grid-ddl-action="true"');
     expect(schemaTableMarkup).toContain('查看 DDL');
+    expect(schemaTableMarkup).toContain('对象设计');
     expect(schemaTableMarkup).toContain('data-grid-page-find="true"');
 
     const queryMarkup = renderDataGridWithI18n(
@@ -1960,6 +2021,8 @@ describe('DataGrid layout', () => {
     );
 
     expect(queryMarkup).not.toContain('data-grid-ddl-action="true"');
+    expect(queryMarkup).toContain('字段信息');
+    expect(queryMarkup).not.toContain('对象设计');
   });
 
   it('keeps row copy and paste as context menu actions instead of toolbar buttons', () => {
@@ -2123,6 +2186,15 @@ describe('DataGrid layout', () => {
     expect(source).toContain('.${gridId} .data-grid-inline-editor-input');
   });
 
+  it('disables browser autocapitalization for inline cell editors', () => {
+    const source = readFileSync(new URL('./DataGrid.tsx', import.meta.url), 'utf8');
+
+    const editorInputCount = source.match(/\{\.\.\.noAutoCapInputProps\}[\s\S]{0,180}className="data-grid-inline-editor-input"/g)?.length || 0;
+
+    expect(source).toContain("import { applyNoAutoCapAttributesWithin, noAutoCapInputProps } from '../utils/inputAutoCap';");
+    expect(editorInputCount).toBe(2);
+  });
+
   it('renders a quick WHERE condition editor when table filters are visible', () => {
     const markup = renderDataGridWithI18n(
       <DataGrid
@@ -2211,10 +2283,16 @@ describe('DataGrid layout', () => {
     expect(source).toContain('type VirtualTableScrollReference = TableReference & {');
     expect(source).toContain('const tableRef = useRef<VirtualTableScrollReference | null>(null);');
     expect(source).toContain('resolveDataGridHorizontalWheelDelta({');
+    expect(source).toContain('const virtualHorizontalAlignmentRafRef = useRef<number | null>(null);');
     expect(source).toContain('const scheduleVirtualHorizontalWheel = useCallback');
     expect(source).toContain('pendingTableHorizontalDeltaRef.current += delta;');
     expect(source).toContain('tableHorizontalWheelRafRef.current = requestAnimationFrame');
+    expect(source).toContain('const scheduleVirtualHorizontalAlignment = useCallback((preferredLeft?: number) => {');
+    expect(source).toContain('virtualHorizontalElementsRef.current = { tableContainer: null, holderEl: null, innerEl: null, headerEl: null };');
+    expect(source).toContain('applyVirtualHorizontalOffset(tableContainer, nextLeft, { forceInternalScroll: true });');
+    expect(source).toContain('}, [horizontalScrollVisible, scheduleVirtualHorizontalAlignment, tableRenderData, tableScrollX, virtualEditingCell]);');
     expect(source).toContain('tableInstance.scrollTo({ left: clampedOffset, top: holderEl.scrollTop });');
+    expect(source).toContain('applyVirtualHorizontalOffset(tableContainer, latestExternalScroll.scrollLeft, { forceInternalScroll: true });');
     expect(source).toContain('if (externalSyncRafRef.current !== null)');
     expect(source).toContain('externalSyncRafRef.current = requestAnimationFrame');
     expect(source).toContain('const scheduleSyncExternalScrollFromTargets = useCallback');
@@ -2237,6 +2315,12 @@ describe('DataGrid layout', () => {
     expect(source).toContain("const useVirtualCellContentContain = false;");
     expect(source).toContain("const useVirtualEditableVisibilityHints = !isMacLike && !isV2Ui;");
     expect(source).toContain("contain: ${useVirtualRowCellContain ? 'layout paint style' : 'none'};");
+    expect(source).toContain('.${gridId} .data-grid-toolbar-scroll::-webkit-scrollbar-thumb:hover');
+    expect(source).toContain('.${gridId} .ant-table-body::-webkit-scrollbar-thumb:hover');
+    expect(source).toContain('.${gridId} .rc-virtual-list-holder::-webkit-scrollbar-thumb:hover');
+    expect(source).toContain('.${gridId} .data-grid-external-horizontal-scroll::-webkit-scrollbar-thumb:hover');
+    expect(source).toContain('background-clip: border-box;');
+    expect(source).toContain('horizontalScrollbarThumbHoverBg');
     expect(source).toContain('const handleSharedCellContextMenu = useCallback');
     expect(source).toContain('const shouldUsePlainVirtualContent = isV2Ui && !modifiedStyle;');
     expect(source).toContain('if (shouldUsePlainVirtualContent) {');
@@ -2259,7 +2343,13 @@ describe('DataGrid layout', () => {
     expect(css).toContain('width: 66px !important;');
     expect(css).toContain('grid-template-columns: 160px 26px 26px !important;');
     expect(css).toContain('container-name: gn-v2-data-grid-statusbar;');
-    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-data-grid-status-right::-webkit-scrollbar');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-data-grid-statusbar::-webkit-scrollbar');
+    expect(css).toContain('scrollbar-width: thin;');
+    expect(css).toContain('min-width: max-content;');
+    expect(css).toContain('flex: 0 0 auto;');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-data-grid-status-center {');
+    expect(css).not.toContain('.gn-v2-data-grid-status-center > span:last-child {\n    display: none;');
+    expect(css).not.toContain('.gn-v2-data-grid-status-center > span:nth-child(2) {\n    display: none;');
     expect(css).toContain('body[data-ui-version="v2"] .gn-v2-data-grid-pagination-wrap::-webkit-scrollbar');
     expect(css).toContain('@container gn-v2-data-grid-statusbar (max-width: 960px)');
     expect(css).toContain('@container gn-v2-data-grid-statusbar (max-width: 760px)');
diff --git a/frontend/src/components/DataGrid.tsx b/frontend/src/components/DataGrid.tsx
index ae7c717..bc5545f 100644
--- a/frontend/src/components/DataGrid.tsx
+++ b/frontend/src/components/DataGrid.tsx
@@ -133,6 +133,7 @@ import DataGridPreviewPanel from './DataGridPreviewPanel';
 import { DataGridJsonView, DataGridTextView } from './DataGridRecordViews';
 import { DataGridV2DdlSideWorkspace, DataGridV2DdlView } from './DataGridV2DdlWorkspace';
 import { DataGridV2ErView, DataGridV2FieldsView } from './DataGridV2MetadataViews';
+import TableDesigner from './TableDesigner';
 import { useDataGridFilters } from './useDataGridFilters';
 import { useDataGridDdlView } from './useDataGridDdlView';
 import { useDataGridModalEditors } from './useDataGridModalEditors';
@@ -197,6 +198,12 @@ const CELL_KEY_SEP = '\u0001';
 const CELL_SELECTION_DRAG_THRESHOLD_PX = 4;
 const DATE_TIME_CACHE_LIMIT = 2000;
 const TABLE_CELL_PREVIEW_MAX_CHARS = 240;
+const DATA_EDIT_AUTO_COMMIT_DELAY_OPTIONS = [
+    { value: 3000, label: '3 秒' },
+    { value: 5000, label: '5 秒' },
+    { value: 10000, label: '10 秒' },
+    { value: 30000, label: '30 秒' },
+];
 const DATA_GRID_DISPLAY_RENDER_VERSION = Symbol('DATA_GRID_DISPLAY_RENDER_VERSION');
 const DATA_GRID_VIRTUAL_EDIT_RENDER_VERSION = Symbol('DATA_GRID_VIRTUAL_EDIT_RENDER_VERSION');
 const DEFAULT_GRID_MONO_FONT_FAMILY = '"JetBrains Mono", ui-monospace, "SF Mono", Menlo, Consolas, monospace';
@@ -783,6 +790,7 @@ interface EditableCellProps {
   handleSave: (record: Item) => void;
   focusCell?: (record: Item, dataIndex: string, title: React.ReactNode) => void;
   columnType?: string;
+  dbType?: string;
   inputCellPadding?: React.CSSProperties;
   as?: any;
   modifiedColumns?: Record<string, Set<string>>;
@@ -832,6 +840,7 @@ const areEditableCellPropsEqual = (prevProps: EditableCellProps, nextProps: Edit
   if (prevProps.dataIndex !== nextProps.dataIndex) return false;
   if (prevProps.title !== nextProps.title) return false;
   if (prevProps.columnType !== nextProps.columnType) return false;
+  if (prevProps.dbType !== nextProps.dbType) return false;
   if (prevProps.darkMode !== nextProps.darkMode) return false;
   if (prevProps.as !== nextProps.as) return false;
   if (prevProps.handleSave !== nextProps.handleSave) return false;
@@ -869,6 +878,7 @@ const EditableCell: React.FC<EditableCellProps> = React.memo(({
   handleSave,
   focusCell,
   columnType,
+  dbType,
   inputCellPadding,
   as: Component = 'td',
   modifiedColumns,
@@ -958,7 +968,7 @@ const EditableCell: React.FC<EditableCellProps> = React.memo(({
 
   let childNode = children;
 
-  const pickerType = getTemporalPickerType(columnType);
+  const pickerType = getTemporalPickerType(columnType, dbType);
   const isDateTimeField = !!pickerType && !(/^0{4}-0{2}-0{2}/.test(String(record?.[dataIndex] || '')));
 
   const isRowDeleted = deletedRowKeys && rowKeyStr && record?.[GONAVI_ROW_KEY] !== undefined
@@ -1033,6 +1043,7 @@ const EditableCell: React.FC<EditableCellProps> = React.memo(({
           )
         ) : (
           <Input
+            {...noAutoCapInputProps}
             ref={inputRef}
             className="data-grid-inline-editor-input"
             style={{ width: '100%', ...inputCellPadding }}
@@ -1205,8 +1216,10 @@ interface DataGridProps {
     columnNames: string[];
     loading: boolean;
     tableName?: string;
+    objectType?: 'table' | 'view' | 'materialized-view';
     exportScope?: 'table' | 'queryResult';
     resultSql?: string;
+    resultExportAllSql?: string;
     dbName?: string;
     connectionId?: string;
     pkColumns?: string[];
@@ -1238,6 +1251,7 @@ interface DataGridProps {
     onApplyQuickWhereCondition?: (condition: string) => void;
     scrollSnapshot?: { top: number; left: number };
     onScrollSnapshotChange?: (snapshot: { top: number; left: number }) => void;
+    toolbarExtraActions?: React.ReactNode;
 }
 
 type GridFilterCondition = FilterCondition & {
@@ -1498,10 +1512,11 @@ const VIRTUAL_EDITING_CELL_STYLE: React.CSSProperties = {
 };
 
 const DataGrid: React.FC<DataGridProps> = ({
-    data, columnNames, loading, tableName, exportScope = 'table', dbName, connectionId, pkColumns = [], editLocator, readOnly = false,
+    data, columnNames, loading, tableName, objectType = 'table', exportScope = 'table', dbName, connectionId, pkColumns = [], editLocator, readOnly = false,
+    resultExportAllSql,
     onReload, onSort, onPageChange, pagination, onRequestTotalCount, onCancelTotalCount, sortInfoExternal, showFilter, onToggleFilter, exportSqlWithFilter, onApplyFilter, appliedFilterConditions, quickWhereCondition,
     onApplyQuickWhereCondition,
-    scrollSnapshot, onScrollSnapshotChange
+    scrollSnapshot, onScrollSnapshotChange, toolbarExtraActions
 }) => {
   const connections = useStore(state => state.connections);
   const addTab = useStore(state => state.addTab);
@@ -1512,6 +1527,8 @@ const DataGrid: React.FC<DataGridProps> = ({
   const uiScale = useStore(state => state.uiScale);
   const queryOptions = useStore(state => state.queryOptions);
   const setQueryOptions = useStore(state => state.setQueryOptions);
+  const dataEditTransactionOptions = useStore(state => state.dataEditTransactionOptions);
+  const setDataEditTransactionOptions = useStore(state => state.setDataEditTransactionOptions);
   const tableColumnOrders = useStore(state => state.tableColumnOrders);
   const enableColumnOrderMemory = useStore(state => state.enableColumnOrderMemory);
   const setTableColumnOrder = useStore(state => state.setTableColumnOrder);
@@ -1748,6 +1765,7 @@ const DataGrid: React.FC<DataGridProps> = ({
   const canImport = exportScope === 'table' && !!tableName;
   const canExport = !!connectionId && (isQueryResultExport || !!tableName);
   const canViewDdl = exportScope === 'table' && !!connectionId && !!tableName;
+  const canOpenObjectDesigner = exportScope === 'table' && objectType === 'table' && !!connectionId && !!tableName;
   const filteredExportSql = useMemo(() => String(exportSqlWithFilter || '').trim(), [exportSqlWithFilter]);
   const hasFilteredExportSql = exportScope === 'table' && filteredExportSql.length > 0;
 
@@ -1778,10 +1796,12 @@ const DataGrid: React.FC<DataGridProps> = ({
           columnMetaTooltipColor: darkMode ? 'rgba(255, 236, 179, 0.98)' : '#262626',
           panelFrameColor: darkMode ? 'rgba(0, 0, 0, 0.42)' : 'rgba(0, 0, 0, 0.18)',
           floatingScrollbarThumbBg: darkMode ? 'rgba(255,255,255,0.68)' : 'rgba(0,0,0,0.44)',
+          floatingScrollbarThumbHoverBg: darkMode ? 'rgba(255,255,255,0.78)' : 'rgba(0,0,0,0.54)',
           floatingScrollbarThumbBorderColor: darkMode ? 'rgba(255,255,255,0.26)' : 'rgba(255,255,255,0.52)',
           floatingScrollbarThumbShadow: (isMacLike || isV2Ui) ? 'none' : (darkMode ? '0 4px 14px rgba(0,0,0,0.42)' : '0 4px 10px rgba(0,0,0,0.20)'),
           verticalScrollbarTrackBg: darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.08)',
           horizontalScrollbarThumbBg: darkMode ? 'rgba(255,255,255,0.20)' : 'rgba(0,0,0,0.14)',
+          horizontalScrollbarThumbHoverBg: darkMode ? 'rgba(255,255,255,0.30)' : 'rgba(0,0,0,0.24)',
           toolbarDividerColor: darkMode ? 'rgba(255, 255, 255, 0.12)' : 'rgba(0, 0, 0, 0.10)',
           paginationShellBg: darkMode
               ? `linear-gradient(135deg, rgba(17,22,34,${_glassMode ? Math.max(0.22, opacity * 0.38) : 0.82}) 0%, rgba(10,14,24,${_glassMode ? Math.max(0.28, opacity * 0.46) : 0.9}) 100%)`
@@ -1820,8 +1840,8 @@ const DataGrid: React.FC<DataGridProps> = ({
       selectionAccentHex, selectionAccentRgb,
       columnMetaHintColor, columnMetaTooltipColor,
       panelFrameColor,
-      floatingScrollbarThumbBg, floatingScrollbarThumbBorderColor, floatingScrollbarThumbShadow,
-      verticalScrollbarTrackBg, horizontalScrollbarThumbBg,
+      floatingScrollbarThumbBg, floatingScrollbarThumbHoverBg, floatingScrollbarThumbBorderColor, floatingScrollbarThumbShadow,
+      verticalScrollbarTrackBg, horizontalScrollbarThumbBg, horizontalScrollbarThumbHoverBg,
       toolbarDividerColor,
       paginationShellBg, paginationShellBorderColor, paginationShellShadow,
       paginationChipBg, paginationChipBorderColor, paginationHoverBg,
@@ -1950,6 +1970,7 @@ const DataGrid: React.FC<DataGridProps> = ({
   const externalSyncRafRef = useRef<number | null>(null);
   const tableTargetSyncRafRef = useRef<number | null>(null);
   const tableHorizontalWheelRafRef = useRef<number | null>(null);
+  const virtualHorizontalAlignmentRafRef = useRef<number | null>(null);
   const pendingTableHorizontalDeltaRef = useRef(0);
   const pendingTableTargetSyncSourceRef = useRef<HTMLElement | null>(null);
   const scrollSnapshotRafRef = useRef<number | null>(null);
@@ -2348,7 +2369,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           if (value === undefined) return undefined;
           const normalizedName = String(columnName || '').trim();
           const meta = columnMetaMap[normalizedName] || columnMetaMapByLowerName[normalizedName.toLowerCase()];
-          const temporal = isTemporalColumnType(meta?.type);
+          const temporal = isTemporalColumnType(meta?.type, dbType);
 
           if (!temporal) {
               return value;
@@ -2369,7 +2390,7 @@ const DataGrid: React.FC<DataGridProps> = ({
 
           return value;
       },
-      [columnMetaMap, columnMetaMapByLowerName]
+      [columnMetaMap, columnMetaMapByLowerName, dbType]
   );
 
   const openForeignKeyTarget = useCallback((target: ForeignKeyTarget) => {
@@ -2385,6 +2406,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           connectionId,
           dbName: targetDbName,
           tableName: refTableName,
+          objectType: 'table',
       });
   }, [addTab, connectionId, dbName, setActiveContext]);
 
@@ -2457,8 +2479,15 @@ const DataGrid: React.FC<DataGridProps> = ({
                 }
                 .${gridId} .data-grid-toolbar-scroll::-webkit-scrollbar-thumb {
                     background: ${darkMode ? 'rgba(255,255,255,0.28)' : 'rgba(0,0,0,0.22)'};
+                    border: 0;
+                    background-clip: border-box;
                     border-radius: 999px;
                 }
+                .${gridId} .data-grid-toolbar-scroll::-webkit-scrollbar-thumb:hover {
+                    background: ${darkMode ? 'rgba(255,255,255,0.38)' : 'rgba(0,0,0,0.32)'};
+                    border: 0;
+                    background-clip: border-box;
+                }
                 .${gridId} .data-grid-toolbar-scroll::-webkit-scrollbar-track {
                     background: transparent;
                 }
@@ -2694,9 +2723,16 @@ const DataGrid: React.FC<DataGridProps> = ({
                 .${gridId} .ant-table-body::-webkit-scrollbar-thumb {
                     background: ${floatingScrollbarThumbBg};
                     border: 1px solid ${floatingScrollbarThumbBorderColor};
+                    background-clip: border-box;
                     border-radius: 999px;
                     box-shadow: ${floatingScrollbarThumbShadow};
                 }
+                .${gridId} .ant-table-body::-webkit-scrollbar-thumb:hover {
+                    background: ${floatingScrollbarThumbHoverBg};
+                    border: 1px solid ${floatingScrollbarThumbBorderColor};
+                    background-clip: border-box;
+                    box-shadow: ${floatingScrollbarThumbShadow};
+                }
                 .${gridId} .rc-virtual-list-holder {
                     scrollbar-width: thin;
                     scrollbar-color: ${floatingScrollbarThumbBg} transparent;
@@ -2713,9 +2749,16 @@ const DataGrid: React.FC<DataGridProps> = ({
                 .${gridId} .rc-virtual-list-holder::-webkit-scrollbar-thumb {
                     background: ${floatingScrollbarThumbBg};
                     border: 1px solid ${floatingScrollbarThumbBorderColor};
+                    background-clip: border-box;
                     border-radius: 999px;
                     box-shadow: ${floatingScrollbarThumbShadow};
                 }
+                .${gridId} .rc-virtual-list-holder::-webkit-scrollbar-thumb:hover {
+                    background: ${floatingScrollbarThumbHoverBg};
+                    border: 1px solid ${floatingScrollbarThumbBorderColor};
+                    background-clip: border-box;
+                    box-shadow: ${floatingScrollbarThumbShadow};
+                }
                 .${gridId} .data-grid-external-horizontal-scroll {
                     position: absolute;
                     left: ${floatingScrollbarInset}px;
@@ -2739,9 +2782,16 @@ const DataGrid: React.FC<DataGridProps> = ({
                 .${gridId} .data-grid-external-horizontal-scroll::-webkit-scrollbar-thumb {
                     background: ${horizontalScrollbarThumbBg};
                     border: 1px solid ${horizontalScrollbarThumbBorderColor};
+                    background-clip: border-box;
                     border-radius: 999px;
                     box-shadow: ${horizontalScrollbarThumbShadow};
                 }
+                .${gridId} .data-grid-external-horizontal-scroll::-webkit-scrollbar-thumb:hover {
+                    background: ${horizontalScrollbarThumbHoverBg};
+                    border: 1px solid ${horizontalScrollbarThumbBorderColor};
+                    background-clip: border-box;
+                    box-shadow: ${horizontalScrollbarThumbShadow};
+                }
                 .${gridId} .data-grid-external-horizontal-scroll-inner {
                     height: 1px;
                 }
@@ -3240,6 +3290,7 @@ const DataGrid: React.FC<DataGridProps> = ({
       canViewDdl,
       currentConnConfig,
       dbName,
+      dbType,
       tableName,
       isV2Ui,
       cellEditMode,
@@ -3255,6 +3306,22 @@ const DataGrid: React.FC<DataGridProps> = ({
       },
   });
 
+  useEffect(() => {
+      const handleExternalViewModeChange = (event: Event) => {
+          const detail = (event as CustomEvent<any>)?.detail || {};
+          if (String(detail.connectionId || '') !== String(connectionId || '')) return;
+          if (String(detail.dbName || '') !== String(dbName || '')) return;
+          if (String(detail.tableName || '') !== String(tableName || '')) return;
+          const nextMode = String(detail.viewMode || '').trim();
+          if (!nextMode) return;
+          if (!['table', 'json', 'text', 'fields', 'ddl', 'er'].includes(nextMode)) return;
+          handleViewModeChange(nextMode as GridViewMode);
+      };
+
+      window.addEventListener('gonavi:data-grid:set-view-mode', handleExternalViewModeChange as EventListener);
+      return () => window.removeEventListener('gonavi:data-grid:set-view-mode', handleExternalViewModeChange as EventListener);
+  }, [canOpenObjectDesigner, connectionId, dbName, handleViewModeChange, tableName]);
+
   useEffect(() => {
       if (!isTableSurfaceActive || !isV2Ui || !cellContextMenu.visible) return;
       const portal = cellContextMenuPortalRef.current;
@@ -3970,6 +4037,26 @@ const DataGrid: React.FC<DataGridProps> = ({
 
   const pendingChangeCount = addedRows.length + Object.keys(modifiedRows).length + deletedRowKeys.size;
   const hasChanges = pendingChangeCount > 0;
+  const dataEditCommitMode = dataEditTransactionOptions?.commitMode === 'auto' ? 'auto' : 'manual';
+  const dataEditAutoCommitDelayMs = DATA_EDIT_AUTO_COMMIT_DELAY_OPTIONS.some((item) => item.value === dataEditTransactionOptions?.autoCommitDelayMs)
+      ? Number(dataEditTransactionOptions?.autoCommitDelayMs)
+      : 5000;
+  const [autoCommitRemainingSeconds, setAutoCommitRemainingSeconds] = useState<number | null>(null);
+  const autoCommitTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const autoCommitCountdownRef = useRef<ReturnType<typeof setInterval> | null>(null);
+  const autoCommitChangeTokenRef = useRef(0);
+  const autoCommitFailedTokenRef = useRef(-1);
+  const clearAutoCommitTimer = useCallback(() => {
+      if (autoCommitTimerRef.current) {
+          clearTimeout(autoCommitTimerRef.current);
+          autoCommitTimerRef.current = null;
+      }
+      if (autoCommitCountdownRef.current) {
+          clearInterval(autoCommitCountdownRef.current);
+          autoCommitCountdownRef.current = null;
+      }
+      setAutoCommitRemainingSeconds(null);
+  }, []);
 
   const allSelectedAreDeleted = useMemo(() => {
       if (selectedRowKeys.length === 0) return false;
@@ -3987,6 +4074,11 @@ const DataGrid: React.FC<DataGridProps> = ({
   }, [addedRows, rowKeyStr]);
 
   const modifiedRowKeySet = useMemo(() => new Set(Object.keys(modifiedRows)), [modifiedRows]);
+  useEffect(() => {
+      autoCommitChangeTokenRef.current += 1;
+      autoCommitFailedTokenRef.current = -1;
+  }, [addedRows, modifiedRows, deletedRowKeys]);
+
   const rowClassName = useCallback((record: Item) => {
       const k = record?.[GONAVI_ROW_KEY];
       if (k === undefined || k === null) return '';
@@ -4309,6 +4401,45 @@ const DataGrid: React.FC<DataGridProps> = ({
     setCellContextMenu(prev => ({ ...prev, visible: false }));
   }, [cellContextMenu, handleCellSave, effectiveEditLocator, translateDataGrid]);
 
+  const canUndoContextMenuCellChange = useMemo(() => {
+    const record = cellContextMenu.record;
+    const dataIndex = String(cellContextMenu.dataIndex || '').trim();
+    const rowKey = record?.[GONAVI_ROW_KEY];
+    if (!record || !dataIndex || rowKey === undefined || rowKey === null) return false;
+    const keyStr = rowKeyStr(rowKey);
+    if (addedRowKeySet.has(keyStr)) return false;
+    return !!modifiedColumns[keyStr]?.has(dataIndex);
+  }, [addedRowKeySet, cellContextMenu.dataIndex, cellContextMenu.record, modifiedColumns, rowKeyStr]);
+
+  const handleUndoContextMenuCellChange = useCallback(() => {
+    const record = cellContextMenu.record;
+    const dataIndex = String(cellContextMenu.dataIndex || '').trim();
+    const rowKey = record?.[GONAVI_ROW_KEY];
+    if (!record || !dataIndex || rowKey === undefined || rowKey === null) return;
+
+    const keyStr = rowKeyStr(rowKey);
+    if (addedRowKeySet.has(keyStr)) {
+      void message.info('新增行请使用删除选中或整表回滚撤销');
+      setCellContextMenu(prev => ({ ...prev, visible: false }));
+      return;
+    }
+    if (!modifiedColumns[keyStr]?.has(dataIndex)) {
+      setCellContextMenu(prev => ({ ...prev, visible: false }));
+      return;
+    }
+
+    const originalRow = data.find((row) => rowKeyStr(row?.[GONAVI_ROW_KEY]) === keyStr);
+    if (!originalRow) {
+      void message.error('未找到该单元格的原始数据，无法撤销');
+      setCellContextMenu(prev => ({ ...prev, visible: false }));
+      return;
+    }
+
+    handleCellSave({ ...record, [dataIndex]: originalRow[dataIndex] });
+    setCellContextMenu(prev => ({ ...prev, visible: false }));
+    void message.success('已撤销单元格修改');
+  }, [addedRowKeySet, cellContextMenu.dataIndex, cellContextMenu.record, data, handleCellSave, modifiedColumns, rowKeyStr]);
+
   const handleCellEditorSave = useCallback(() => {
       if (!cellEditorMeta) return;
       if (!isWritableResultColumn(cellEditorMeta.dataIndex, effectiveEditLocator)) {
@@ -4350,7 +4481,7 @@ const DataGrid: React.FC<DataGridProps> = ({
       }
 
       const columnType = (columnMetaMap[dataIndex] || columnMetaMapByLowerName[dataIndex.toLowerCase()])?.type;
-      const pickerType = getTemporalPickerType(columnType);
+      const pickerType = getTemporalPickerType(columnType, dbType);
       const isDateTimeField = !!pickerType && !(/^0{4}-0{2}-0{2}/.test(String(raw || '')));
       const fieldName = getCellFieldName(record, dataIndex);
       if (isDateTimeField) {
@@ -4365,7 +4496,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           title,
           columnType,
       });
-  }, [canModifyData, columnMetaMap, columnMetaMapByLowerName, form, openCellEditor, rowKeyStr]);
+  }, [canModifyData, columnMetaMap, columnMetaMapByLowerName, dbType, form, openCellEditor, rowKeyStr]);
 
   const handleVirtualCellActivate = useCallback((record: Item, dataIndex: string, title: React.ReactNode) => {
       if (!canModifyData) return;
@@ -4495,7 +4626,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           return;
       }
 
-      const pickerType = getTemporalPickerType(editingCell.columnType);
+      const pickerType = getTemporalPickerType(editingCell.columnType, dbType);
       const isDateTimeField = !!pickerType && !(/^0{4}-0{2}-0{2}/.test(String(record?.[editingCell.dataIndex] || '')));
       const fieldName = getCellFieldName(record, editingCell.dataIndex);
       try {
@@ -4514,7 +4645,7 @@ const DataGrid: React.FC<DataGridProps> = ({
               closeVirtualInlineEditor();
           }
       }
-  }, [closeVirtualInlineEditor, form, handleCellSave, virtualEditingCell]);
+  }, [closeVirtualInlineEditor, dbType, form, handleCellSave, virtualEditingCell]);
 
   const pageFindMatches = useMemo(() => collectDataGridFindMatches(
       mergedDisplayData,
@@ -4636,7 +4767,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           displayMap[col] = toFormText(displayVal);
           // 日期时间类型: 将字符串值转为 dayjs 对象供 DatePicker 使用
           const colMeta = columnMetaMap[col] || columnMetaMapByLowerName[col.toLowerCase()];
-          const rowPickerType = getTemporalPickerType(colMeta?.type);
+          const rowPickerType = getTemporalPickerType(colMeta?.type, dbType);
           if (rowPickerType && displayVal !== null && displayVal !== undefined) {
               const dVal = parseToDayjs(displayVal, rowPickerType);
               formMap[col] = dVal;
@@ -4653,7 +4784,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           nullCols,
           formValues: formMap,
       });
-  }, [canModifyData, mergedDisplayData, data, addedRows, visibleColumnNames, rowKeyStr, columnMetaMap, columnMetaMapByLowerName, openRowEditor, translateDataGrid]);
+  }, [canModifyData, mergedDisplayData, data, addedRows, visibleColumnNames, rowKeyStr, columnMetaMap, columnMetaMapByLowerName, dbType, openRowEditor, translateDataGrid]);
 
   const openCurrentViewRowEditor = useCallback(() => {
       if (!canModifyData) return;
@@ -4820,7 +4951,7 @@ const DataGrid: React.FC<DataGridProps> = ({
               if (!isWritableResultColumn(col, effectiveEditLocator)) return;
               if (val && dayjs.isDayjs(val)) {
                   const colMeta = columnMetaMap[col] || columnMetaMapByLowerName[col.toLowerCase()];
-                  const rowPickerType = getTemporalPickerType(colMeta?.type);
+                  const rowPickerType = getTemporalPickerType(colMeta?.type, dbType);
                   convertedValues[col] = formatFromDayjs(val as dayjs.Dayjs, rowPickerType);
               } else {
                   convertedValues[col] = val;
@@ -4839,7 +4970,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           // 日期时间类型: 将 dayjs 对象转回格式化字符串
           if (nextVal && dayjs.isDayjs(nextVal)) {
               const colMeta = columnMetaMap[col] || columnMetaMapByLowerName[col.toLowerCase()];
-              const rowPickerType = getTemporalPickerType(colMeta?.type);
+              const rowPickerType = getTemporalPickerType(colMeta?.type, dbType);
               nextVal = formatFromDayjs(nextVal as dayjs.Dayjs, rowPickerType);
           }
           const baseVal = baseRawMap[col];
@@ -4854,7 +4985,7 @@ const DataGrid: React.FC<DataGridProps> = ({
       });
 
       closeRowEditor();
-  }, [rowEditorRowKey, rowEditorForm, addedRows, visibleColumnNames, rowKeyStr, closeRowEditor, effectiveEditLocator, columnMetaMap, columnMetaMapByLowerName]);
+  }, [rowEditorRowKey, rowEditorForm, addedRows, visibleColumnNames, rowKeyStr, closeRowEditor, effectiveEditLocator, columnMetaMap, columnMetaMapByLowerName, dbType]);
 
 
   const enableVirtual = isTableSurfaceActive;
@@ -4971,6 +5102,7 @@ const DataGrid: React.FC<DataGridProps> = ({
                   cellProps.handleSave = handleCellSave;
                   cellProps.focusCell = openCellEditor;
                   cellProps.columnType = displayColumnTypeMap[dataIndex];
+                  cellProps.dbType = dbType;
                   cellProps.inputCellPadding = inputCellPadding;
                   cellProps.modifiedColumns = modifiedColumns;
                   cellProps.rowKeyStr = rowKeyStr;
@@ -5001,7 +5133,7 @@ const DataGrid: React.FC<DataGridProps> = ({
                   : undefined;
               const shouldUsePlainVirtualContent = isV2Ui && !modifiedStyle;
               if (enableVirtual && enableInlineEditableCell) {
-                  const pickerType = getTemporalPickerType(columnType);
+                  const pickerType = getTemporalPickerType(columnType, dbType);
                   const isDateTimeField = !!pickerType && !(/^0{4}-0{2}-0{2}/.test(String(record?.[dataIndex] || '')));
                   const virtualCellStyle = modifiedStyle ? { ...virtualCellWrapperStyle, ...modifiedStyle } : virtualCellWrapperStyle;
                   const virtualEditable = !!col.editable && !rowDeletedForRender;
@@ -5074,6 +5206,7 @@ const DataGrid: React.FC<DataGridProps> = ({
                                       )
                                   ) : (
                                       <Input
+                                          {...noAutoCapInputProps}
                                           ref={virtualInlineInputRef}
                                           className="data-grid-inline-editor-input"
                                           style={{ width: '100%', ...inputCellPadding }}
@@ -5114,7 +5247,7 @@ const DataGrid: React.FC<DataGridProps> = ({
               return originalRenderContent;
           }
       };
-  }), [columns, useInlineEditableBodyCell, enableInlineEditableCell, enableVirtual, handleCellSave, openCellEditor, handleVirtualCellActivate, handleSharedCellContextMenu, displayColumnTypeMap, inputCellPadding, virtualCellWrapperStyle, modifiedColumns, rowKeyStr, deletedRowKeys, darkMode, virtualEditingCell, form, saveVirtualInlineEditor, lockVirtualInlineTableScroll, closeVirtualInlineEditor, updateFocusedCell]);
+  }), [columns, useInlineEditableBodyCell, enableInlineEditableCell, enableVirtual, handleCellSave, openCellEditor, handleVirtualCellActivate, handleSharedCellContextMenu, displayColumnTypeMap, dbType, inputCellPadding, virtualCellWrapperStyle, modifiedColumns, rowKeyStr, deletedRowKeys, darkMode, virtualEditingCell, form, saveVirtualInlineEditor, lockVirtualInlineTableScroll, closeVirtualInlineEditor, updateFocusedCell]);
 
   const handleAddRow = () => {
       const newKey = `new-${Date.now()}`;
@@ -5272,7 +5405,8 @@ const DataGrid: React.FC<DataGridProps> = ({
       visibleColumnNames, rowKeyStr, normalizeCommitCellValue, shouldCommitColumn,
       connectionId, tableName, connections, rowLocatorMessages, translateDataGrid]);
 
-  const handleCommit = async () => {
+  const handleCommit = useCallback(async (source: 'manual' | 'auto' = 'manual') => {
+      clearAutoCommitTimer();
       if (!connectionId || !tableName) return;
       const conn = connections.find(c => c.id === connectionId);
       if (!conn) return;
@@ -5321,6 +5455,7 @@ const DataGrid: React.FC<DataGridProps> = ({
       if (deletes.length > 0) logSql += `DELETE ${deletes.length} rows;\n`;
       
       if (res.success) {
+          autoCommitFailedTokenRef.current = -1;
           addSqlLog({
               id: Date.now().toString(),
               timestamp: Date.now(),
@@ -5330,7 +5465,7 @@ const DataGrid: React.FC<DataGridProps> = ({
               message: res.message,
               dbName
           });
-          void message.success(translateDataGrid('data_grid.message.transaction_committed'));
+          void message.success(source === 'auto' ? '自动提交成功' : translateDataGrid('data_grid.message.transaction_committed'));
           setAddedRows([]);
           setModifiedRows({});
           setDeletedRowKeys(new Set());
@@ -5346,9 +5481,73 @@ const DataGrid: React.FC<DataGridProps> = ({
               message: res.message,
               dbName
           });
-          void message.error(translateDataGrid('data_grid.message.commit_failed', { detail: res.message }));
+          if (source === 'auto') {
+              autoCommitFailedTokenRef.current = autoCommitChangeTokenRef.current;
+          }
+          void message.error(source === 'auto'
+              ? `自动提交失败: ${res.message}`
+              : translateDataGrid('data_grid.message.commit_failed', { detail: res.message }));
       }
-  };
+  }, [
+      clearAutoCommitTimer,
+      connectionId,
+      tableName,
+      connections,
+      addedRows,
+      modifiedRows,
+      deletedRowKeys,
+      data,
+      effectiveEditLocator,
+      visibleColumnNames,
+      rowKeyStr,
+      normalizeCommitCellValue,
+      shouldCommitColumn,
+      dbName,
+      addSqlLog,
+      onReload,
+      translateDataGrid,
+  ]);
+
+  useEffect(() => {
+      if (!canModifyData || dataEditCommitMode !== 'auto' || !hasChanges) {
+          clearAutoCommitTimer();
+          return;
+      }
+      if (autoCommitFailedTokenRef.current === autoCommitChangeTokenRef.current) {
+          clearAutoCommitTimer();
+          return;
+      }
+
+      const delayMs = dataEditAutoCommitDelayMs;
+      const dueAt = Date.now() + delayMs;
+      const updateRemaining = () => {
+          setAutoCommitRemainingSeconds(Math.max(1, Math.ceil((dueAt - Date.now()) / 1000)));
+      };
+      clearAutoCommitTimer();
+      updateRemaining();
+      autoCommitCountdownRef.current = setInterval(updateRemaining, 250);
+      autoCommitTimerRef.current = setTimeout(() => {
+          autoCommitTimerRef.current = null;
+          if (autoCommitCountdownRef.current) {
+              clearInterval(autoCommitCountdownRef.current);
+              autoCommitCountdownRef.current = null;
+          }
+          setAutoCommitRemainingSeconds(null);
+          void handleCommit('auto');
+      }, delayMs);
+
+      return clearAutoCommitTimer;
+  }, [
+      canModifyData,
+      dataEditCommitMode,
+      dataEditAutoCommitDelayMs,
+      hasChanges,
+      pendingChangeCount,
+      handleCommit,
+      clearAutoCommitTimer,
+  ]);
+
+  useEffect(() => clearAutoCommitTimer, [clearAutoCommitTimer]);
 
   const copyToClipboard = useCallback((text: string) => {
       navigator.clipboard.writeText(text).catch(console.error);
@@ -5853,12 +6052,15 @@ const DataGrid: React.FC<DataGridProps> = ({
   }, [tableName, filterConditions, quickWhereCondition, sortInfo, pkColumns, displayOutputColumnNames]);
 
   const queryResultCurrentPageRows = useMemo(() => {
+      if (isQueryResultExport) {
+          return mergedDisplayData;
+      }
       if (!pagination) {
           return mergedDisplayData;
       }
       const offset = Math.max(0, (pagination.current - 1) * pagination.pageSize);
       return mergedDisplayData.slice(offset, offset + pagination.pageSize);
-  }, [mergedDisplayData, pagination]);
+  }, [isQueryResultExport, mergedDisplayData, pagination]);
 
   const exportQueryResultRows = useCallback(async (format: string, scope: QueryResultExportScope) => {
       if (scope === 'selected') {
@@ -5878,8 +6080,13 @@ const DataGrid: React.FC<DataGridProps> = ({
           await exportData(queryResultCurrentPageRows, format);
           return;
       }
+      const exportAllSql = String(resultExportAllSql || '').trim();
+      if (exportAllSql && connectionId) {
+          await exportByQuery(exportAllSql, format, tableName || 'query_result');
+          return;
+      }
       await exportData(mergedDisplayData, format);
-  }, [exportData, mergedDisplayData, queryResultCurrentPageRows, rowKeyStr, selectedRowKeys, translateDataGrid]);
+  }, [connectionId, exportByQuery, exportData, mergedDisplayData, queryResultCurrentPageRows, resultExportAllSql, rowKeyStr, selectedRowKeys, tableName, translateDataGrid]);
 
   const openQueryResultExportScopeModal = useCallback((format: string) => {
       let instance: { destroy: () => void } | null = null;
@@ -5905,7 +6112,7 @@ const DataGrid: React.FC<DataGridProps> = ({
                           {translateDataGrid('data_grid.export.current_page_rows', { count: queryResultCurrentPageRows.length })}
                       </Button>
                       <Button type="primary" onClick={() => { void runExport('all'); }}>
-                          {translateDataGrid('data_grid.export.all_rows', { count: mergedDisplayData.length })}
+                          {resultExportAllSql ? '全部导出（重新查询）' : translateDataGrid('data_grid.export.all_rows', { count: mergedDisplayData.length })}
                       </Button>
                   </div>
               </div>
@@ -5914,7 +6121,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           okButtonProps: { style: { display: 'none' } },
           maskClosable: true,
       });
-  }, [exportQueryResultRows, mergedDisplayData.length, modal, queryResultCurrentPageRows.length, selectedRowKeys.length, translateDataGrid]);
+  }, [exportQueryResultRows, mergedDisplayData.length, modal, queryResultCurrentPageRows.length, resultExportAllSql, selectedRowKeys.length, translateDataGrid]);
 
   // Context Menu Export
   const handleExportSelected = useCallback(async (format: string, record: any) => {
@@ -5989,6 +6196,9 @@ const DataGrid: React.FC<DataGridProps> = ({
               handleCopyColumnData(cellContextMenu.dataIndex);
               closeMenu();
               return;
+          case 'undo-cell-change':
+              handleUndoContextMenuCellChange();
+              return;
           case 'set-null':
               handleCellSetNull();
               return;
@@ -6058,6 +6268,7 @@ const DataGrid: React.FC<DataGridProps> = ({
       getTargets,
       handleBatchFillToSelected,
       handleCellSetNull,
+      handleUndoContextMenuCellChange,
       handleCopyContextMenuFieldName,
       handleCopyCsv,
       handleCopyDelete,
@@ -6379,7 +6590,7 @@ const DataGrid: React.FC<DataGridProps> = ({
       return { holderEl, clampedOffset, currentOffset };
   }, [resolveVirtualHorizontalElements, tableScrollX]);
 
-  const applyVirtualHorizontalOffset = useCallback((tableContainer: HTMLElement, nextOffset: number) => {
+  const applyVirtualHorizontalOffset = useCallback((tableContainer: HTMLElement, nextOffset: number, options?: { forceInternalScroll?: boolean }) => {
       const synced = syncVirtualHorizontalVisualOffset(tableContainer, nextOffset);
       if (!synced) {
           return false;
@@ -6387,7 +6598,7 @@ const DataGrid: React.FC<DataGridProps> = ({
 
       const { holderEl, clampedOffset, currentOffset } = synced;
       const deltaX = clampedOffset - currentOffset;
-      if (Math.abs(deltaX) < 0.5) return true;
+      if (Math.abs(deltaX) < 0.5 && !options?.forceInternalScroll) return true;
 
       const tableInstance = tableRef.current;
       if (tableInstance && typeof tableInstance.scrollTo === 'function') {
@@ -6406,6 +6617,34 @@ const DataGrid: React.FC<DataGridProps> = ({
       return true;
   }, [syncVirtualHorizontalVisualOffset]);
 
+  const scheduleVirtualHorizontalAlignment = useCallback((preferredLeft?: number) => {
+      if (!enableVirtual || !isTableSurfaceActive) return;
+      if (virtualHorizontalAlignmentRafRef.current !== null) {
+          cancelAnimationFrame(virtualHorizontalAlignmentRafRef.current);
+      }
+      virtualHorizontalAlignmentRafRef.current = requestAnimationFrame(() => {
+          virtualHorizontalAlignmentRafRef.current = null;
+          const tableContainer = tableContainerRef.current;
+          if (!(tableContainer instanceof HTMLElement)) return;
+
+          virtualHorizontalElementsRef.current = { tableContainer: null, holderEl: null, innerEl: null, headerEl: null };
+          const externalScroll = externalHorizontalScrollRef.current;
+          const nextLeft = Math.max(0, preferredLeft ?? externalScroll?.scrollLeft ?? lastTableScrollLeftRef.current);
+          const applied = applyVirtualHorizontalOffset(tableContainer, nextLeft, { forceInternalScroll: true });
+          const resolvedLeft = applied ? readVirtualHorizontalOffset(tableContainer) : nextLeft;
+          lastTableScrollLeftRef.current = resolvedLeft;
+          if (externalScroll && Math.abs(externalScroll.scrollLeft - resolvedLeft) > 1) {
+              externalScroll.scrollLeft = resolvedLeft;
+          }
+          lastExternalScrollLeftRef.current = externalScroll?.scrollLeft ?? resolvedLeft;
+          requestAnimationFrame(() => {
+              const latestContainer = tableContainerRef.current;
+              if (!(latestContainer instanceof HTMLElement)) return;
+              syncVirtualHorizontalVisualOffset(latestContainer, resolvedLeft);
+          });
+      });
+  }, [applyVirtualHorizontalOffset, enableVirtual, isTableSurfaceActive, readVirtualHorizontalOffset, syncVirtualHorizontalVisualOffset]);
+
   const flushVirtualHorizontalWheel = useCallback((tableContainer: HTMLElement) => {
       tableHorizontalWheelRafRef.current = null;
       const delta = pendingTableHorizontalDeltaRef.current;
@@ -6654,7 +6893,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           // 虚拟表格路径：通过合成 WheelEvent 驱动 rc-virtual-list 内部状态，
           // rc-table 自动同步 header scrollLeft。
           if (enableVirtual && tableContainer instanceof HTMLElement) {
-              const applied = applyVirtualHorizontalOffset(tableContainer, latestExternalScroll.scrollLeft);
+              const applied = applyVirtualHorizontalOffset(tableContainer, latestExternalScroll.scrollLeft, { forceInternalScroll: true });
               if (applied) {
                   // WheelEvent 经 rc-virtual-list 处理后状态异步更新，延迟同步 ref
                   requestAnimationFrame(() => {
@@ -6943,6 +7182,17 @@ const DataGrid: React.FC<DataGridProps> = ({
       return () => cancelAnimationFrame(rafId);
   }, [isTableSurfaceActive, totalWidth, mergedDisplayData.length, pagination?.total, pagination?.pageSize, recalculateTableMetrics]);
 
+  useEffect(() => {
+      if (!horizontalScrollVisible) return;
+      scheduleVirtualHorizontalAlignment();
+      return () => {
+          if (virtualHorizontalAlignmentRafRef.current !== null) {
+              cancelAnimationFrame(virtualHorizontalAlignmentRafRef.current);
+              virtualHorizontalAlignmentRafRef.current = null;
+          }
+      };
+  }, [horizontalScrollVisible, scheduleVirtualHorizontalAlignment, tableRenderData, tableScrollX, virtualEditingCell]);
+
   // 虚拟表列对齐：antd 虚拟表 body 使用 <div>+<td>（非 <table>），
   // 不会自动拉伸列宽到视口。而 header <table> 会被 antd 的 CSS 或 JS
   // 设置为 width:100% 自动拉伸。强制 header table 宽度等于 scroll.x，
@@ -7334,7 +7584,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           const isJson = looksLikeJsonText(sample);
           const useTextArea = isJson || sample.includes('\n') || sample.length >= 160;
           const colMeta = columnMetaMap[col] || columnMetaMapByLowerName[col.toLowerCase()];
-          const pickerType = getTemporalPickerType(colMeta?.type);
+          const pickerType = getTemporalPickerType(colMeta?.type, dbType);
           const isTemporalValue = !!pickerType && !(/^0{4}-0{2}-0{2}/.test(String(sample || '')));
           const isWritable = isWritableResultColumn(col, effectiveEditLocator);
           return {
@@ -7348,15 +7598,27 @@ const DataGrid: React.FC<DataGridProps> = ({
               isWritable,
           };
       })
-  ), [displayColumnNames, columnMetaMap, columnMetaMapByLowerName, effectiveEditLocator, rowEditorOpen, rowEditorRowKey]);
+  ), [displayColumnNames, columnMetaMap, columnMetaMapByLowerName, dbType, effectiveEditLocator, rowEditorOpen, rowEditorRowKey]);
 
   const handleRefreshGrid = useCallback(() => {
+      clearAutoCommitTimer();
+      autoCommitFailedTokenRef.current = -1;
       setAddedRows([]);
       setModifiedRows({});
       setDeletedRowKeys(new Set());
+      setModifiedColumns({});
       setSelectedRowKeys([]);
       if (onReload) onReload();
-  }, [onReload]);
+  }, [clearAutoCommitTimer, onReload]);
+
+  const handleResetPendingChanges = useCallback(() => {
+      clearAutoCommitTimer();
+      autoCommitFailedTokenRef.current = -1;
+      setAddedRows([]);
+      setModifiedRows({});
+      setDeletedRowKeys(new Set());
+      setModifiedColumns({});
+  }, [clearAutoCommitTimer]);
 
   const handleToggleFilterWithDefault = useCallback(() => {
       if (!onToggleFilter) return;
@@ -7432,6 +7694,10 @@ const DataGrid: React.FC<DataGridProps> = ({
             copiedCellPatchColumnCount={copiedCellPatch ? Object.keys(copiedCellPatch.values).length : 0}
             hasChanges={hasChanges}
             pendingChangeCount={pendingChangeCount}
+            dataEditCommitMode={dataEditCommitMode}
+            dataEditAutoCommitDelayMs={dataEditAutoCommitDelayMs}
+            dataEditAutoCommitDelayOptions={DATA_EDIT_AUTO_COMMIT_DELAY_OPTIONS}
+            autoCommitRemainingSeconds={autoCommitRemainingSeconds}
             canImport={canImport}
             canExport={canExport}
             isQueryResultExport={isQueryResultExport}
@@ -7440,6 +7706,7 @@ const DataGrid: React.FC<DataGridProps> = ({
             aiShortcutLabel={aiShortcutLabel}
             legacyAiButtonStyle={legacyAiButtonStyle}
             paginationTotalCountLoading={pagination?.totalCountLoading}
+            toolbarExtraActions={toolbarExtraActions}
             filterConditions={filterConditions}
             sortInfo={sortInfo}
             displayColumnNames={displayColumnNames}
@@ -7457,12 +7724,9 @@ const DataGrid: React.FC<DataGridProps> = ({
             exportMenu={exportMenu}
             queryResultCopyMenu={queryResultCopyMenu}
             dbType={dbType}
-            onResetPendingChanges={() => {
-                setAddedRows([]);
-                setModifiedRows({});
-                setDeletedRowKeys(new Set());
-                setModifiedColumns({});
-            }}
+            onResetPendingChanges={handleResetPendingChanges}
+            onDataEditCommitModeChange={(mode) => setDataEditTransactionOptions({ commitMode: mode })}
+            onDataEditAutoCommitDelayChange={(delayMs) => setDataEditTransactionOptions({ autoCommitDelayMs: delayMs })}
             onRefresh={handleRefreshGrid}
             onToggleFilterClick={handleToggleFilterWithDefault}
             onAddRow={handleAddRow}
@@ -7572,15 +7836,32 @@ const DataGrid: React.FC<DataGridProps> = ({
         {viewMode === 'table' ? (
             renderDataTableView()
         ) : isV2Ui && viewMode === 'fields' ? (
-            <DataGridV2FieldsView
-                tableName={tableName}
-                displayOutputColumnNames={displayOutputColumnNames}
-                pkColumns={pkColumns}
-                locatorColumns={effectiveEditLocator?.columns}
-                columnMetaMap={columnMetaMap}
-                columnMetaMapByLowerName={columnMetaMapByLowerName}
-                translate={translateDataGrid}
-            />
+            canOpenObjectDesigner ? (
+                <TableDesigner
+                    embedded
+                    tab={{
+                        id: `embedded-design-${connectionId || ''}-${dbName || ''}-${tableName || ''}`,
+                        title: `设计表 (${tableName || ''})`,
+                        type: 'design',
+                        connectionId: String(connectionId || ''),
+                        dbName,
+                        tableName,
+                        initialTab: 'columns',
+                        readOnly,
+                        objectType: 'table',
+                    }}
+                />
+            ) : (
+                <DataGridV2FieldsView
+                    tableName={tableName}
+                    displayOutputColumnNames={displayOutputColumnNames}
+                    pkColumns={pkColumns}
+                    locatorColumns={effectiveEditLocator?.columns}
+                    columnMetaMap={columnMetaMap}
+                    columnMetaMapByLowerName={columnMetaMapByLowerName}
+                    translate={translateDataGrid}
+                />
+            )
         ) : isV2Ui && viewMode === 'ddl' && ddlViewLayout === 'side' ? (
             <DataGridV2DdlSideWorkspace
                 tableContent={renderDataTableView()}
@@ -7707,6 +7988,7 @@ const DataGrid: React.FC<DataGridProps> = ({
                         rowLabel={cellContextMenu.record?.[GONAVI_ROW_KEY] === undefined ? undefined : `row ${String(cellContextMenu.record?.[GONAVI_ROW_KEY])}`}
                         selectedRowCount={selectedRowKeys.length}
                         canModifyData={canModifyData}
+                        canUndoCellChange={canUndoContextMenuCellChange}
                         copiedRowCount={copiedRowsForPaste.length}
                         canPasteCopiedColumns={!!copiedCellPatch}
                         supportsCopyInsert={supportsCopyInsert}
@@ -7726,6 +8008,7 @@ const DataGrid: React.FC<DataGridProps> = ({
             copiedRowsForPasteLength={copiedRowsForPaste.length}
             selectedRowKeysLength={selectedRowKeys.length}
             copiedCellPatchAvailable={!!copiedCellPatch}
+            canUndoCellChange={canUndoContextMenuCellChange}
             supportsCopyInsert={supportsCopyInsert}
             translate={translateDataGrid}
             onClose={() => setCellContextMenu(prev => ({ ...prev, visible: false }))}
@@ -7743,6 +8026,7 @@ const DataGrid: React.FC<DataGridProps> = ({
                 copyRowsForPaste([rowKey]);
             }}
             onPasteCopiedRowsAsNew={handlePasteCopiedRowsAsNew}
+            onUndoCellChange={handleUndoContextMenuCellChange}
             onSetNull={handleCellSetNull}
             onEditRow={handleOpenContextMenuRowEditor}
             onFillToSelected={() => {
@@ -7797,6 +8081,7 @@ const DataGrid: React.FC<DataGridProps> = ({
 	       <DataGridSecondaryActions
                 isV2Ui={isV2Ui}
                 canViewDdl={canViewDdl}
+                canOpenObjectDesigner={canOpenObjectDesigner}
                 viewMode={viewMode}
                 ddlLoading={ddlLoading}
                 showColumnComment={showColumnComment}
diff --git a/frontend/src/components/DataGridColumnTitle.test.tsx b/frontend/src/components/DataGridColumnTitle.test.tsx
index 58feb3e..3d8193f 100644
--- a/frontend/src/components/DataGridColumnTitle.test.tsx
+++ b/frontend/src/components/DataGridColumnTitle.test.tsx
@@ -5,9 +5,10 @@ import { describe, expect, it, vi } from 'vitest';
 import DataGridColumnTitle from './DataGridColumnTitle';
 
 vi.mock('antd', () => ({
-  Tooltip: ({ children, title }: { children: React.ReactNode; title?: React.ReactNode }) => (
+  Tooltip: ({ children, title, rootClassName }: { children: React.ReactNode; title?: React.ReactNode; rootClassName?: string }) => (
     <>
       <div data-testid="tooltip-title">{title}</div>
+      <div data-tooltip-root-class={rootClassName}>{title}</div>
       {children}
     </>
   ),
@@ -55,6 +56,43 @@ describe('DataGridColumnTitle', () => {
     expect(markup).toContain('align-items:flex-start');
   });
 
+  it('keeps column metadata tooltip readable in light theme', () => {
+    const markup = renderToStaticMarkup(
+      <DataGridColumnTitle
+        columnName="auth_type"
+        columnMeta={{ type: 'tinyint(4)', comment: '认证类型：1企业，2个人' }}
+        showColumnType
+        showColumnComment
+        metaFontSize={11}
+        columnMetaHintColor="#595959"
+        columnMetaTooltipColor="#262626"
+        darkMode={false}
+      />,
+    );
+
+    expect(markup).toContain('data-tooltip-root-class="gn-data-grid-column-meta-tooltip"');
+    expect(markup).toContain('class="gn-data-grid-column-meta-tooltip-content"');
+    expect(markup).toContain('color:var(--gn-fg-1, #fff)');
+    expect(markup).not.toContain('color:#fff');
+  });
+
+  it('keeps the configured warm metadata tooltip color in dark theme', () => {
+    const markup = renderToStaticMarkup(
+      <DataGridColumnTitle
+        columnName="auth_type"
+        columnMeta={{ type: 'tinyint(4)', comment: '认证类型：1企业，2个人' }}
+        showColumnType
+        showColumnComment
+        metaFontSize={11}
+        columnMetaHintColor="rgba(255, 236, 179, 0.98)"
+        columnMetaTooltipColor="rgba(255, 236, 179, 0.98)"
+        darkMode
+      />,
+    );
+
+    expect(markup).toContain('color:rgba(255, 236, 179, 0.98)');
+  });
+
   it('renders foreign-key jump affordance when reference target exists', () => {
     const markup = renderToStaticMarkup(
       <DataGridColumnTitle
diff --git a/frontend/src/components/DataGridColumnTitle.tsx b/frontend/src/components/DataGridColumnTitle.tsx
index 3ce61a9..63bb612 100644
--- a/frontend/src/components/DataGridColumnTitle.tsx
+++ b/frontend/src/components/DataGridColumnTitle.tsx
@@ -155,22 +155,26 @@ const DataGridColumnTitle: React.FC<DataGridColumnTitleProps> = ({
     return titleNode;
   }
 
+  const tooltipTextColor = darkMode ? columnMetaTooltipColor : 'var(--gn-fg-1, #fff)';
+
   return (
     <Tooltip
       title={(
         <pre
+          className="gn-data-grid-column-meta-tooltip-content"
           style={{
             maxHeight: 260,
             overflow: 'auto',
             margin: 0,
             fontSize: 12,
             whiteSpace: 'pre-wrap',
-            color: darkMode ? columnMetaTooltipColor : '#fff',
+            color: tooltipTextColor,
           }}
         >
           {hoverLines.join('\n')}
         </pre>
       )}
+      rootClassName="gn-data-grid-column-meta-tooltip"
       styles={{ root: { maxWidth: 640 } }}
       {...(!darkMode ? { color: 'rgba(0, 0, 0, 0.82)' } : {})}
     >
diff --git a/frontend/src/components/DataGridLegacyCellContextMenu.tsx b/frontend/src/components/DataGridLegacyCellContextMenu.tsx
index d748b59..a5a47f1 100644
--- a/frontend/src/components/DataGridLegacyCellContextMenu.tsx
+++ b/frontend/src/components/DataGridLegacyCellContextMenu.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { createPortal } from 'react-dom';
-import { CopyOutlined, EditOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons';
+import { CopyOutlined, EditOutlined, UndoOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons';
 import { t } from '../i18n';
 
 interface CellContextMenuState {
@@ -20,6 +20,7 @@ interface DataGridLegacyCellContextMenuProps {
   copiedRowsForPasteLength: number;
   selectedRowKeysLength: number;
   copiedCellPatchAvailable: boolean;
+  canUndoCellChange: boolean;
   supportsCopyInsert: boolean;
   translate?: (key: string, params?: Record<string, unknown>) => string;
   onClose: () => void;
@@ -27,6 +28,7 @@ interface DataGridLegacyCellContextMenuProps {
   onCopyRowData: () => void;
   onCopyRowForPaste: () => void;
   onPasteCopiedRowsAsNew: () => void;
+  onUndoCellChange: () => void;
   onSetNull: () => void;
   onEditRow: () => void;
   onFillToSelected: () => void;
@@ -68,6 +70,7 @@ const DataGridLegacyCellContextMenu: React.FC<DataGridLegacyCellContextMenuProps
   copiedRowsForPasteLength,
   selectedRowKeysLength,
   copiedCellPatchAvailable,
+  canUndoCellChange,
   supportsCopyInsert,
   translate = fallbackTranslate,
   onClose,
@@ -75,6 +78,7 @@ const DataGridLegacyCellContextMenu: React.FC<DataGridLegacyCellContextMenuProps
   onCopyRowData,
   onCopyRowForPaste,
   onPasteCopiedRowsAsNew,
+  onUndoCellChange,
   onSetNull,
   onEditRow,
   onFillToSelected,
@@ -138,6 +142,22 @@ const DataGridLegacyCellContextMenu: React.FC<DataGridLegacyCellContextMenuProps
       <div style={separatorStyle(darkMode)} />
       {canModifyData && (
         <>
+          <div
+            style={{
+              ...baseItemStyle,
+              cursor: canUndoCellChange ? 'pointer' : 'not-allowed',
+              opacity: canUndoCellChange ? 1 : 0.5,
+            }}
+            {...makeHoverHandlers(canUndoCellChange)}
+            onClick={() => {
+              if (canUndoCellChange) {
+                onUndoCellChange();
+              }
+            }}
+          >
+            <UndoOutlined style={{ marginRight: 8 }} />
+            撤销此单元格修改
+          </div>
           <div style={baseItemStyle} {...makeHoverHandlers()} onClick={onSetNull}>
             {translate('data_grid.batch_fill.set_null')}
           </div>
diff --git a/frontend/src/components/DataGridSecondaryActions.tsx b/frontend/src/components/DataGridSecondaryActions.tsx
index 44080b6..4e90cb5 100644
--- a/frontend/src/components/DataGridSecondaryActions.tsx
+++ b/frontend/src/components/DataGridSecondaryActions.tsx
@@ -17,6 +17,7 @@ export type DataGridSecondaryActionsTranslate = (key: string, params?: I18nParam
 export interface DataGridSecondaryActionsProps {
   isV2Ui: boolean;
   canViewDdl: boolean;
+  canOpenObjectDesigner: boolean;
   viewMode: GridViewMode;
   ddlLoading: boolean;
   showColumnComment: boolean;
@@ -39,6 +40,7 @@ export interface DataGridSecondaryActionsProps {
 const DataGridSecondaryActions: React.FC<DataGridSecondaryActionsProps> = ({
   isV2Ui,
   canViewDdl,
+  canOpenObjectDesigner,
   viewMode,
   ddlLoading,
   showColumnComment,
@@ -58,9 +60,13 @@ const DataGridSecondaryActions: React.FC<DataGridSecondaryActionsProps> = ({
   translate = defaultTranslate,
 }) => {
   if (isV2Ui) {
+    const fieldsActionLabel = canOpenObjectDesigner
+      ? '对象设计'
+      : translate('data_grid.column_settings.field_info');
+    const fieldsActionIcon = canOpenObjectDesigner ? <EditOutlined /> : <FileTextOutlined />;
     const viewTabItems: Array<{ key: GridViewMode; label: string; icon: React.ReactNode; disabled?: boolean }> = [
       { key: 'table', label: translate('data_grid.secondary.data_preview'), icon: <TableOutlined /> },
-      { key: 'fields', label: translate('data_grid.column_settings.field_info'), icon: <FileTextOutlined /> },
+      { key: 'fields', label: fieldsActionLabel, icon: fieldsActionIcon },
       { key: 'ddl', label: translate('data_grid.secondary.view_ddl'), icon: <ConsoleSqlOutlined />, disabled: !canViewDdl },
       { key: 'er', label: translate('data_grid.secondary.er_diagram'), icon: <LinkOutlined /> },
     ];
diff --git a/frontend/src/components/DataGridToolbarFrame.tsx b/frontend/src/components/DataGridToolbarFrame.tsx
index cfc8441..31fc08b 100644
--- a/frontend/src/components/DataGridToolbarFrame.tsx
+++ b/frontend/src/components/DataGridToolbarFrame.tsx
@@ -66,6 +66,10 @@ export interface DataGridToolbarFrameProps {
   copiedCellPatchColumnCount: number;
   hasChanges: boolean;
   pendingChangeCount: number;
+  dataEditCommitMode: 'manual' | 'auto';
+  dataEditAutoCommitDelayMs: number;
+  dataEditAutoCommitDelayOptions: Array<{ value: number; label: string }>;
+  autoCommitRemainingSeconds: number | null;
   canImport: boolean;
   canExport: boolean;
   isQueryResultExport: boolean;
@@ -74,6 +78,7 @@ export interface DataGridToolbarFrameProps {
   aiShortcutLabel: string;
   legacyAiButtonStyle?: React.CSSProperties;
   paginationTotalCountLoading?: boolean;
+  toolbarExtraActions?: React.ReactNode;
   filterConditions: GridFilterCondition[];
   sortInfo: GridSortInfo[];
   displayColumnNames: string[];
@@ -92,6 +97,8 @@ export interface DataGridToolbarFrameProps {
   queryResultCopyMenu: MenuProps['items'];
   dbType: string;
   onResetPendingChanges: () => void;
+  onDataEditCommitModeChange: (mode: 'manual' | 'auto') => void;
+  onDataEditAutoCommitDelayChange: (delayMs: number) => void;
   onRefresh: () => void;
   onToggleFilterClick: () => void;
   onAddRow: () => void;
@@ -160,6 +167,10 @@ const DataGridToolbarFrame: React.FC<DataGridToolbarFrameProps> = ({
   copiedCellPatchColumnCount,
   hasChanges,
   pendingChangeCount,
+  dataEditCommitMode,
+  dataEditAutoCommitDelayMs,
+  dataEditAutoCommitDelayOptions,
+  autoCommitRemainingSeconds,
   canImport,
   canExport,
   isQueryResultExport,
@@ -168,6 +179,7 @@ const DataGridToolbarFrame: React.FC<DataGridToolbarFrameProps> = ({
   aiShortcutLabel,
   legacyAiButtonStyle,
   paginationTotalCountLoading,
+  toolbarExtraActions,
   filterConditions,
   sortInfo,
   displayColumnNames,
@@ -186,6 +198,8 @@ const DataGridToolbarFrame: React.FC<DataGridToolbarFrameProps> = ({
   queryResultCopyMenu,
   dbType,
   onResetPendingChanges,
+  onDataEditCommitModeChange,
+  onDataEditAutoCommitDelayChange,
   onRefresh,
   onToggleFilterClick,
   onAddRow,
@@ -365,6 +379,32 @@ const DataGridToolbarFrame: React.FC<DataGridToolbarFrameProps> = ({
               </Dropdown>
             )}
             {hasChanges && <Button icon={<UndoOutlined />} onClick={onResetPendingChanges}>{translate('data_grid.toolbar.rollback')}</Button>}
+            <Tooltip title="控制表数据编辑后的提交方式。手动提交更安全；自动提交会在最后一次修改后按所选时间提交。">
+              <Select
+                size="small"
+                value={dataEditCommitMode}
+                onChange={onDataEditCommitModeChange}
+                style={{ width: 118, flex: '0 0 auto' }}
+                options={[
+                  { value: 'manual', label: '手动提交' },
+                  { value: 'auto', label: '自动提交' },
+                ]}
+              />
+            </Tooltip>
+            {dataEditCommitMode === 'auto' && (
+              <Select
+                size="small"
+                value={dataEditAutoCommitDelayMs}
+                onChange={onDataEditAutoCommitDelayChange}
+                style={{ width: 82, flex: '0 0 auto' }}
+                options={dataEditAutoCommitDelayOptions}
+              />
+            )}
+            {dataEditCommitMode === 'auto' && hasChanges && autoCommitRemainingSeconds !== null && (
+              <span style={{ fontSize: 12, color: '#888', whiteSpace: 'nowrap' }}>
+                {autoCommitRemainingSeconds}s 后提交
+              </span>
+            )}
           </>
         )}
 
@@ -417,6 +457,13 @@ const DataGridToolbarFrame: React.FC<DataGridToolbarFrameProps> = ({
           </Tooltip>
         </>
 
+        {toolbarExtraActions && (
+          <>
+            {renderToolbarDivider()}
+            {toolbarExtraActions}
+          </>
+        )}
+
         {prefersManualTotalCount && (
           <>
             {renderToolbarDivider()}
diff --git a/frontend/src/components/DataSyncModal.entry-mode.test.ts b/frontend/src/components/DataSyncModal.entry-mode.test.ts
new file mode 100644
index 0000000..d26c84a
--- /dev/null
+++ b/frontend/src/components/DataSyncModal.entry-mode.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from 'vitest';
+
+import { resolveDataSyncEntryModePresentation } from './dataSyncEntryMode';
+
+describe('resolveDataSyncEntryModePresentation', () => {
+  it('marks schema compare as a read-only independent entry', () => {
+    const presentation = resolveDataSyncEntryModePresentation('schemaCompare');
+
+    expect(presentation.title).toBe('表结构比对');
+    expect(presentation.analyzeButtonText).toBe('开始比对');
+    expect(presentation.badgeText).toBe('结构比对');
+    expect(presentation.readOnly).toBe(true);
+  });
+
+  it('marks data compare as a read-only independent entry', () => {
+    const presentation = resolveDataSyncEntryModePresentation('dataCompare');
+
+    expect(presentation.title).toBe('数据比对');
+    expect(presentation.tableSelectLabel).toContain('比对数据');
+    expect(presentation.badgeText).toBe('数据比对');
+    expect(presentation.readOnly).toBe(true);
+  });
+
+  it('keeps the original sync entry writable', () => {
+    const presentation = resolveDataSyncEntryModePresentation('sync');
+
+    expect(presentation.title).toBe('数据同步工作台');
+    expect(presentation.analyzeButtonText).toBe('对比差异');
+    expect(presentation.badgeText).toBe('同步模式');
+    expect(presentation.readOnly).toBe(false);
+  });
+});
diff --git a/frontend/src/components/DataSyncModal.tsx b/frontend/src/components/DataSyncModal.tsx
index 1950ace..a1429b4 100644
--- a/frontend/src/components/DataSyncModal.tsx
+++ b/frontend/src/components/DataSyncModal.tsx
@@ -7,10 +7,12 @@ import { SavedConnection } from '../types';
 import { EventsOn } from '../../wailsjs/runtime/runtime';
 import { isMacLikePlatform, normalizeOpacityForPlatform, resolveAppearanceValues, resolveTextInputSafeBackdropFilter } from '../utils/appearance';
 import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
+import { quoteIdentPart, quoteQualifiedIdent } from '../utils/sql';
 import { formatLocalDateTimeLiteral, normalizeTemporalLiteralText } from './dataGridCopyInsert';
 import { buildDataSyncRequest, type SourceDatasetMode, validateDataSyncSelection } from './dataSyncRequest';
 import { t } from '../i18n';
 import { useOptionalI18n } from '../i18n/provider';
+import { resolveDataSyncEntryModePresentation, type DataSyncEntryMode } from './dataSyncEntryMode';
 const { Title, Text } = Typography;
 const { Step } = Steps;
 const { Option } = Select;
@@ -48,26 +50,11 @@ type TableOps = {
 type WorkflowType = 'sync' | 'migration';
 
 const quoteSqlIdent = (dbType: string, ident: string): string => {
-  const raw = String(ident || '').trim();
-  if (!raw) return raw;
-  const t = String(dbType || '').toLowerCase();
-  if (t === 'mysql' || t === 'mariadb' || t === 'oceanbase' || t === 'diros' || t === 'starrocks' || t === 'sphinx' || t === 'clickhouse' || t === 'tdengine') {
-    return `\`${raw.replace(/`/g, '``')}\``;
-  }
-  if (t === 'sqlserver') {
-    return `[${raw.replace(/]/g, ']]')}]`;
-  }
-  return `"${raw.replace(/"/g, '""')}"`;
+  return quoteIdentPart(dbType, String(ident || '').trim());
 };
 
 const quoteSqlTable = (dbType: string, tableName: string): string => {
-  const raw = String(tableName || '').trim();
-  if (!raw) return raw;
-  if (!raw.includes('.')) return quoteSqlIdent(dbType, raw);
-  return raw
-    .split('.')
-    .map((part) => quoteSqlIdent(dbType, part))
-    .join('.');
+  return quoteQualifiedIdent(dbType, String(tableName || '').trim());
 };
 
 const toSqlLiteral = (value: any, dbType: string): string => {
@@ -114,6 +101,17 @@ const resolveRedisDbIndex = (raw?: string): number => {
   return Number.isInteger(value) && value >= 0 && value <= 15 ? value : 0;
 };
 
+const isServiceNameBackedSyncConnection = (conn?: SavedConnection): boolean => {
+  const type = String(conn?.config?.type || '').trim().toLowerCase();
+  if (type === 'oracle') return true;
+  if (type !== 'oceanbase') return false;
+  const explicitProtocol = String((conn?.config as any)?.oceanBaseProtocol || '').trim().toLowerCase();
+  if (explicitProtocol === 'oracle') return true;
+  const params = new URLSearchParams(String(conn?.config?.connectionParams || ''));
+  const protocol = String(params.get('protocol') || params.get('tenantMode') || '').trim().toLowerCase();
+  return protocol === 'oracle';
+};
+
 const buildSqlPreview = (
   previewData: any,
   tableName: string,
@@ -193,7 +191,11 @@ const buildSqlPreview = (
   };
 };
 
-const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open, onClose }) => {
+const DataSyncModal: React.FC<{ open: boolean; onClose: () => void; entryMode?: DataSyncEntryMode }> = ({ open, onClose, entryMode = 'sync' }) => {
+  const entryPresentation = resolveDataSyncEntryModePresentation(entryMode);
+  const isSchemaCompareEntry = entryMode === 'schemaCompare';
+  const isDataCompareEntry = entryMode === 'dataCompare';
+  const isCompareEntry = entryPresentation.readOnly;
   const connections = useStore((state) => state.connections);
   const themeMode = useStore((state) => state.theme);
   const appearance = useStore((state) => state.appearance);
@@ -225,7 +227,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
 
   // Options
   const [workflowType, setWorkflowType] = useState<WorkflowType>('sync');
-  const [syncContent, setSyncContent] = useState<'data' | 'schema' | 'both'>('data');
+  const [syncContent, setSyncContent] = useState<'data' | 'schema' | 'both'>(isSchemaCompareEntry ? 'schema' : 'data');
   const [syncMode, setSyncMode] = useState<string>('insert_update');
   const [autoAddColumns, setAutoAddColumns] = useState<boolean>(true);
   const [targetTableStrategy, setTargetTableStrategy] = useState<'existing_only' | 'auto_create_if_missing' | 'smart'>('existing_only');
@@ -258,7 +260,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
 
   const normalizeConnConfig = (conn: SavedConnection, database?: string) => (
       buildRpcConnectionConfig(conn.config, {
-          database: typeof database === 'string' ? database : (conn.config.database || ''),
+          database: typeof database === 'string' && !isServiceNameBackedSyncConnection(conn) ? database : (conn.config.database || ''),
       })
   );
 
@@ -284,8 +286,8 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       });
 
       return () => {
-          offLog();
-          offProgress();
+          if (typeof offLog === 'function') offLog();
+          if (typeof offProgress === 'function') offProgress();
       };
   }, [open]);
 
@@ -307,7 +309,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
         setSourceDatasetMode('table');
         setSourceQuery('');
         setWorkflowType('sync');
-        setSyncContent('data');
+        setSyncContent(isSchemaCompareEntry ? 'schema' : 'data');
         setSyncMode('insert_update');
         setAutoAddColumns(true);
         setTargetTableStrategy('existing_only');
@@ -327,9 +329,48 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
         jobIdRef.current = '';
         autoScrollRef.current = true;
     }
-  }, [open]);
+  }, [open, isSchemaCompareEntry]);
 
   useEffect(() => {
+      if (isSchemaCompareEntry) {
+          if (workflowType !== 'sync') {
+              setWorkflowType('sync');
+          }
+          if (sourceDatasetMode !== 'table') {
+              setSourceDatasetMode('table');
+          }
+          if (syncContent !== 'schema') {
+              setSyncContent('schema');
+          }
+          if (syncMode !== 'insert_update') {
+              setSyncMode('insert_update');
+          }
+          if (targetTableStrategy !== 'existing_only') {
+              setTargetTableStrategy('existing_only');
+          }
+          if (createIndexes) {
+              setCreateIndexes(false);
+          }
+          return;
+      }
+      if (isDataCompareEntry) {
+          if (workflowType !== 'sync') {
+              setWorkflowType('sync');
+          }
+          if (syncContent !== 'data') {
+              setSyncContent('data');
+          }
+          if (syncMode !== 'insert_update') {
+              setSyncMode('insert_update');
+          }
+          if (targetTableStrategy !== 'existing_only') {
+              setTargetTableStrategy('existing_only');
+          }
+          if (createIndexes) {
+              setCreateIndexes(false);
+          }
+          return;
+      }
       if (workflowType === 'migration') {
           if (syncMode === 'insert_update') {
               setSyncMode('insert_only');
@@ -351,7 +392,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
               setCreateIndexes(false);
           }
       }
-  }, [workflowType]);
+  }, [isSchemaCompareEntry, isDataCompareEntry, workflowType, sourceDatasetMode, syncContent, syncMode, targetTableStrategy, createIndexes]);
 
   useEffect(() => {
       if (sourceDatasetMode !== 'query') return;
@@ -379,42 +420,42 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       setSourceConnId(connId);
       setSourceDb('');
       const conn = connections.find(c => c.id === connId);
-	  if (conn) {
-	      setLoading(true);
-	      try {
-	        const res = await DBGetDatabases(normalizeConnConfig(conn) as any);
-	        if (res.success) {
-	            const dbRows = Array.isArray(res.data) ? res.data : [];
-	            setSourceDbs(dbRows
-	                .map((r: any) => r?.Database || r?.database || r?.username)
-	                .filter((name: any) => typeof name === 'string' && name.trim() !== ''));
-	        }
-	      } catch(e: any) {
+      if (conn) {
+          setLoading(true);
+          try {
+            const res = await DBGetDatabases(normalizeConnConfig(conn) as any);
+            if (res.success) {
+                const dbRows = Array.isArray(res.data) ? res.data : [];
+                setSourceDbs(dbRows
+                    .map((r: any) => r?.Database || r?.database || r?.username)
+                    .filter((name: any) => typeof name === 'string' && name.trim() !== ''));
+            }
+          } catch(e: any) {
           message.error(tr('data_sync.message.fetch_source_databases_failed_detail', { detail: e?.message || String(e) }));
         }
-	      setLoading(false);
-	  }
+          setLoading(false);
+      }
   };
 
   const handleTargetConnChange = async (connId: string) => {
       setTargetConnId(connId);
       setTargetDb('');
       const conn = connections.find(c => c.id === connId);
-	  if (conn) {
-	      setLoading(true);
-	      try {
-	        const res = await DBGetDatabases(normalizeConnConfig(conn) as any);
-	        if (res.success) {
-	            const dbRows = Array.isArray(res.data) ? res.data : [];
-	            setTargetDbs(dbRows
-	                .map((r: any) => r?.Database || r?.database || r?.username)
-	                .filter((name: any) => typeof name === 'string' && name.trim() !== ''));
-	        }
-	      } catch(e: any) {
+      if (conn) {
+          setLoading(true);
+          try {
+            const res = await DBGetDatabases(normalizeConnConfig(conn) as any);
+            if (res.success) {
+                const dbRows = Array.isArray(res.data) ? res.data : [];
+                setTargetDbs(dbRows
+                    .map((r: any) => r?.Database || r?.database || r?.username)
+                    .filter((name: any) => typeof name === 'string' && name.trim() !== ''));
+            }
+          } catch(e: any) {
           message.error(tr('data_sync.message.fetch_target_databases_failed_detail', { detail: e?.message || String(e) }));
         }
-	      setLoading(false);
-	  }
+          setLoading(false);
+      }
   };
 
   const nextToTables = async () => {
@@ -428,15 +469,15 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
           const dbName = isSourceQueryMode ? targetDb : sourceDb;
           const conn = connections.find(c => c.id === connId);
           if (conn) {
-	          const config = normalizeConnConfig(conn, dbName);
-	          const res = await DBGetTables(config as any, dbName);
-	          if (res.success) {
-	              // DBGetTables returns [{Table: "name"}, ...]
-	              const tableRows = Array.isArray(res.data) ? res.data : [];
-	              const tables = tableRows
-	                  .map((row: any) => row?.Table || row?.table || row?.TABLE_NAME || Object.values(row || {})[0])
-	                  .filter((name: any) => typeof name === 'string' && name.trim() !== '');
-	              setAllTables(tables as string[]);
+              const config = normalizeConnConfig(conn, dbName);
+              const res = await DBGetTables(config as any, dbName);
+              if (res.success) {
+                  // DBGetTables returns [{Table: "name"}, ...]
+                  const tableRows = Array.isArray(res.data) ? res.data : [];
+                  const tables = tableRows
+                      .map((row: any) => row?.Table || row?.table || row?.TABLE_NAME || Object.values(row || {})[0])
+                      .filter((name: any) => typeof name === 'string' && name.trim() !== '');
+                  setAllTables(tables as string[]);
                   setSelectedTables(prev => {
                       const existing = prev.filter((name) => tables.includes(name));
                       if (isSourceQueryMode) {
@@ -444,7 +485,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                       }
                       return existing;
                   });
-	              setCurrentStep(1);
+                  setCurrentStep(1);
               } else {
                   message.error(res.message ? tr('data_sync.message.fetch_tables_failed_detail', { detail: res.message }) : tr('data_sync.message.fetch_tables_failed'));
               }
@@ -484,6 +525,8 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       const config = buildDataSyncRequest({
           sourceConfig: normalizeConnConfig(sConn, sourceDb),
           targetConfig: normalizeConnConfig(tConn, targetDb),
+          sourceDatabase: sourceDb,
+          targetDatabase: targetDb,
           selectedTables,
           sourceDatasetMode,
           sourceQuery,
@@ -539,6 +582,8 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       const config = buildDataSyncRequest({
           sourceConfig: normalizeConnConfig(sConn, sourceDb),
           targetConfig: normalizeConnConfig(tConn, targetDb),
+          sourceDatabase: sourceDb,
+          targetDatabase: targetDb,
           selectedTables,
           sourceDatasetMode,
           sourceQuery,
@@ -611,6 +656,8 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       const config = buildDataSyncRequest({
           sourceConfig: normalizeConnConfig(sConn, sourceDb),
           targetConfig: normalizeConnConfig(tConn, targetDb),
+          sourceDatabase: sourceDb,
+          targetDatabase: targetDb,
           selectedTables,
           sourceDatasetMode,
           sourceQuery,
@@ -689,7 +736,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
   }, [diffTables]);
 
   const isSourceQueryMode = sourceDatasetMode === 'query';
-  const isMigrationWorkflow = workflowType === 'migration';
+  const isMigrationWorkflow = !isCompareEntry && workflowType === 'migration';
   const sourceConn = useMemo(() => connections.find(c => c.id === sourceConnId), [connections, sourceConnId]);
   const targetConn = useMemo(() => connections.find(c => c.id === targetConnId), [connections, targetConnId]);
   const sourceType = String(sourceConn?.config?.type || '').toLowerCase();
@@ -806,8 +853,12 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
     <>
     <Modal
         title={renderModalTitle(
-            isMigrationWorkflow ? tr('data_sync.title.migration_workbench') : tr('data_sync.title.sync_workbench'),
-            isMigrationWorkflow ? tr('data_sync.title.migration_description') : tr('data_sync.title.sync_description'),
+            isMigrationWorkflow
+                ? tr('data_sync.title.migration_workbench')
+                : (isCompareEntry ? entryPresentation.title : tr('data_sync.title.sync_workbench')),
+            isMigrationWorkflow
+                ? tr('data_sync.title.migration_description')
+                : (isCompareEntry ? entryPresentation.description : tr('data_sync.title.sync_description')),
         )}
         open={open}
         onCancel={() => {
@@ -841,15 +892,23 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       <div style={heroPanelStyle}>
           <div style={{ display: 'flex', justifyContent: 'space-between', gap: 12, alignItems: 'flex-start', flexWrap: 'wrap' }}>
               <div style={{ minWidth: 0 }}>
-                  <div style={{ fontSize: 18, fontWeight: 700, color: darkMode ? '#f8fafc' : '#0f172a' }}>{isMigrationWorkflow ? tr('data_sync.title.migration') : tr('data_sync.title.sync')}</div>
+                  <div style={{ fontSize: 18, fontWeight: 700, color: darkMode ? '#f8fafc' : '#0f172a' }}>
+                      {isMigrationWorkflow
+                          ? tr('data_sync.title.migration')
+                          : (isCompareEntry ? entryPresentation.heroTitle : tr('data_sync.title.sync'))}
+                  </div>
                   <div style={{ marginTop: 6, fontSize: 13, lineHeight: 1.7, color: darkMode ? 'rgba(255,255,255,0.62)' : 'rgba(15,23,42,0.62)' }}>
                       {isMigrationWorkflow
                           ? tr('data_sync.title.migration_description')
-                          : tr('data_sync.title.sync_description')}
+                          : (isCompareEntry ? entryPresentation.heroDescription : tr('data_sync.title.sync_description'))}
                   </div>
               </div>
               <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8 }}>
-                  <span style={badgeStyle}>{isMigrationWorkflow ? <RocketOutlined /> : <SwapOutlined />} {isMigrationWorkflow ? tr('data_sync.badge.migration_mode') : tr('data_sync.badge.sync_mode')}</span>
+                  <span style={badgeStyle}>
+                      {isMigrationWorkflow ? <RocketOutlined /> : <SwapOutlined />} {isMigrationWorkflow
+                          ? tr('data_sync.badge.migration_mode')
+                          : (isCompareEntry ? entryPresentation.badgeText : tr('data_sync.badge.sync_mode'))}
+                  </span>
                   <span style={badgeStyle}><DatabaseOutlined /> {sourceConnId ? tr('data_sync.badge.source_selected') : tr('data_sync.badge.source_pending')}</span>
                   <span style={badgeStyle}><TableOutlined /> {tr('data_sync.badge.table_count', { count: selectedTables.length || 0 })}</span>
               </div>
@@ -858,7 +917,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       <Steps current={currentStep} style={{ marginBottom: 24 }}>
         <Step title={tr('data_sync.step.configure')} />
         <Step title={tr('data_sync.step.select_tables')} />
-        <Step title={tr('data_sync.step.result')} />
+        <Step title={isCompareEntry ? entryPresentation.resultTitle : tr('data_sync.step.result')} />
       </Steps>
       </div>
 
@@ -911,36 +970,48 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
               </div>
 
               <Card
-                  title={isMigrationWorkflow ? tr('data_sync.title.migration_options') : tr('data_sync.title.sync_options')}
+                  title={isMigrationWorkflow
+                      ? tr('data_sync.title.migration_options')
+                      : (isCompareEntry ? entryPresentation.optionTitle : tr('data_sync.title.sync_options'))}
                   style={{ ...shellCardStyle, marginTop: 18 }}
                   styles={{ header: { borderBottom: darkMode ? '1px solid rgba(255,255,255,0.08)' : '1px solid rgba(15,23,42,0.06)', fontWeight: 700 }, body: { padding: 18 } }}
               >
                   <div style={{ ...quietPanelStyle, marginBottom: 14 }}>
                       <Text style={{ color: darkMode ? 'rgba(255,255,255,0.72)' : 'rgba(15,23,42,0.68)', lineHeight: 1.7 }}>
-                          {tr('data_sync.help.workflow_type')}
+                          {isCompareEntry
+                              ? '当前入口只做差异分析和预览，不会执行同步、建表、补字段或删除数据。'
+                              : tr('data_sync.help.workflow_type')}
                       </Text>
                   </div>
                   <Form layout="vertical">
-                      <Form.Item label={tr('data_sync.field.workflow_type')}>
-                          <Select value={workflowType} onChange={setWorkflowType}>
-                              <Option value="sync">{tr('data_sync.option.workflow.sync')}</Option>
-                              <Option value="migration" disabled={isSourceQueryMode}>{tr('data_sync.option.workflow.migration')}</Option>
-                          </Select>
-                      </Form.Item>
-                      <Form.Item label={tr('data_sync.field.source_dataset_mode')}>
-                          <Select value={sourceDatasetMode} onChange={setSourceDatasetMode}>
-                              <Option value="table">{tr('data_sync.option.source_dataset.table')}</Option>
-                              <Option value="query">{tr('data_sync.option.source_dataset.query')}</Option>
-                          </Select>
-                      </Form.Item>
-                      <Alert
-                          type={isMigrationWorkflow ? 'info' : 'success'}
-                          showIcon
-                          style={{ marginBottom: 12 }}
-                          message={isMigrationWorkflow
-                              ? tr('data_sync.alert.migration_mode')
-                              : tr('data_sync.alert.sync_mode')}
-                      />
+                      {!isCompareEntry && (
+                          <Form.Item label={tr('data_sync.field.workflow_type')}>
+                              <Select value={workflowType} onChange={setWorkflowType}>
+                                  <Option value="sync">{tr('data_sync.option.workflow.sync')}</Option>
+                                  <Option value="migration" disabled={isSourceQueryMode}>{tr('data_sync.option.workflow.migration')}</Option>
+                              </Select>
+                          </Form.Item>
+                      )}
+                      {!isSchemaCompareEntry && (
+                          <Form.Item label={tr('data_sync.field.source_dataset_mode')}>
+                              <Select value={sourceDatasetMode} onChange={setSourceDatasetMode}>
+                                  <Option value="table">{isCompareEntry ? '按表比对' : tr('data_sync.option.source_dataset.table')}</Option>
+                                  <Option value="query">{isCompareEntry ? '按 SQL 结果集比对' : tr('data_sync.option.source_dataset.query')}</Option>
+                              </Select>
+                          </Form.Item>
+                      )}
+                        <Alert
+                            type={isMigrationWorkflow || isCompareEntry ? 'info' : 'success'}
+                            showIcon
+                            style={{ marginBottom: 12 }}
+                            message={isMigrationWorkflow
+                                ? tr('data_sync.alert.migration_mode')
+                                : isSchemaCompareEntry
+                                    ? '当前为“表结构比对”入口：固定只分析结构差异和生成可审阅 SQL，不执行变更。'
+                                    : isDataCompareEntry
+                                        ? '当前为“数据比对”入口：固定按主键分析行级差异，不执行写入。'
+                                        : tr('data_sync.alert.sync_mode')}
+                        />
                       {isSourceQueryMode && (
                           <Alert
                               type="info"
@@ -949,27 +1020,33 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                               message={tr('data_sync.alert.query_mode')}
                           />
                       )}
-                      <Form.Item label={isMigrationWorkflow ? tr('data_sync.field.migration_content') : tr('data_sync.field.sync_content')}>
-                          <Select value={syncContent} onChange={setSyncContent}>
-                              <Option value="data">{tr('data_sync.option.content.data')}</Option>
-                              <Option value="schema" disabled={isSourceQueryMode}>{tr('data_sync.option.content.schema')}</Option>
-                              <Option value="both" disabled={isSourceQueryMode}>{tr('data_sync.option.content.both')}</Option>
-                          </Select>
-                      </Form.Item>
-                      <Form.Item label={isMigrationWorkflow ? tr('data_sync.field.migration_mode') : tr('data_sync.field.sync_mode')}>
-                          <Select value={syncMode} onChange={setSyncMode} disabled={syncContent === 'schema'}>
-                              <Option value="insert_update">{tr('data_sync.option.sync_mode.insert_update')}</Option>
-                              <Option value="insert_only">{tr('data_sync.option.sync_mode.insert_only')}</Option>
-                              <Option value="full_overwrite">{tr('data_sync.option.sync_mode.full_overwrite')}</Option>
-                          </Select>
-                      </Form.Item>
-                      <Form.Item label={isMigrationWorkflow ? tr('data_sync.field.target_table_strategy') : tr('data_sync.field.target_table_requirement')}>
-                          <Select value={targetTableStrategy} onChange={setTargetTableStrategy} disabled={!isMigrationWorkflow || isSourceQueryMode}>
-                              <Option value="existing_only">{tr('data_sync.option.target_strategy.existing_only')}</Option>
-                              <Option value="auto_create_if_missing">{tr('data_sync.option.target_strategy.auto_create_if_missing')}</Option>
-                              <Option value="smart">{tr('data_sync.option.target_strategy.smart')}</Option>
-                          </Select>
-                      </Form.Item>
+                      {!isCompareEntry && (
+                          <Form.Item label={isMigrationWorkflow ? tr('data_sync.field.migration_content') : tr('data_sync.field.sync_content')}>
+                              <Select value={syncContent} onChange={setSyncContent}>
+                                  <Option value="data">{tr('data_sync.option.content.data')}</Option>
+                                  <Option value="schema" disabled={isSourceQueryMode}>{tr('data_sync.option.content.schema')}</Option>
+                                  <Option value="both" disabled={isSourceQueryMode}>{tr('data_sync.option.content.both')}</Option>
+                              </Select>
+                          </Form.Item>
+                      )}
+                      {!isCompareEntry && (
+                          <Form.Item label={isMigrationWorkflow ? tr('data_sync.field.migration_mode') : tr('data_sync.field.sync_mode')}>
+                              <Select value={syncMode} onChange={setSyncMode} disabled={syncContent === 'schema'}>
+                                  <Option value="insert_update">{tr('data_sync.option.sync_mode.insert_update')}</Option>
+                                  <Option value="insert_only">{tr('data_sync.option.sync_mode.insert_only')}</Option>
+                                  <Option value="full_overwrite">{tr('data_sync.option.sync_mode.full_overwrite')}</Option>
+                              </Select>
+                          </Form.Item>
+                      )}
+                      {!isCompareEntry && (
+                          <Form.Item label={isMigrationWorkflow ? tr('data_sync.field.target_table_strategy') : tr('data_sync.field.target_table_requirement')}>
+                              <Select value={targetTableStrategy} onChange={setTargetTableStrategy} disabled={!isMigrationWorkflow || isSourceQueryMode}>
+                                  <Option value="existing_only">{tr('data_sync.option.target_strategy.existing_only')}</Option>
+                                  <Option value="auto_create_if_missing">{tr('data_sync.option.target_strategy.auto_create_if_missing')}</Option>
+                                  <Option value="smart">{tr('data_sync.option.target_strategy.smart')}</Option>
+                              </Select>
+                          </Form.Item>
+                      )}
                       {isRedisMongoKeyspaceMigration && (
                           <Form.Item
                               label={tr('data_sync.field.mongo_collection_name')}
@@ -986,16 +1063,22 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                               />
                           </Form.Item>
                       )}
-                      <Form.Item>
-                          <Checkbox checked={autoAddColumns} onChange={(e) => setAutoAddColumns(e.target.checked)} disabled={isSourceQueryMode}>
-                              {tr('data_sync.option.auto_add_columns')}
-                          </Checkbox>
-                      </Form.Item>
-                      <Form.Item>
-                          <Checkbox checked={createIndexes} onChange={(e) => setCreateIndexes(e.target.checked)} disabled={!isMigrationWorkflow || targetTableStrategy === 'existing_only' || isSourceQueryMode}>
-                              {tr('data_sync.option.create_indexes')}
-                          </Checkbox>
-                      </Form.Item>
+                      {(!isCompareEntry || isSchemaCompareEntry) && (
+                          <Form.Item>
+                              <Checkbox checked={autoAddColumns} onChange={(e) => setAutoAddColumns(e.target.checked)} disabled={isSourceQueryMode}>
+                                  {isSchemaCompareEntry
+                                      ? '生成目标表缺失字段的兼容变更 SQL（仅预览，不执行）'
+                                      : tr('data_sync.option.auto_add_columns')}
+                              </Checkbox>
+                          </Form.Item>
+                      )}
+                      {!isCompareEntry && (
+                          <Form.Item>
+                              <Checkbox checked={createIndexes} onChange={(e) => setCreateIndexes(e.target.checked)} disabled={!isMigrationWorkflow || targetTableStrategy === 'existing_only' || isSourceQueryMode}>
+                                  {tr('data_sync.option.create_indexes')}
+                              </Checkbox>
+                          </Form.Item>
+                      )}
                       {isMigrationWorkflow && targetTableStrategy !== 'existing_only' && (
                           <Alert
                               type="info"
@@ -1004,7 +1087,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                               style={{ marginBottom: 12 }}
                           />
                       )}
-                      {!isMigrationWorkflow && (
+                      {!isCompareEntry && !isMigrationWorkflow && (
                           <Alert
                               type="info"
                               showIcon
@@ -1031,7 +1114,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                   {!isSourceQueryMode && (
                       <>
                           <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 10 }}>
-                              <Text type="secondary">{tr('data_sync.help.select_tables')}</Text>
+                              <Text type="secondary">{isCompareEntry ? entryPresentation.tableSelectLabel : tr('data_sync.help.select_tables')}</Text>
                               <Checkbox checked={showSameTables} onChange={(e) => setShowSameTables(e.target.checked)}>
                                   {tr('data_sync.option.show_same_tables')}
                               </Checkbox>
@@ -1215,55 +1298,62 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       {currentStep === 2 && (
           <div style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>
               <div style={quietPanelStyle}>
-              <Alert
-                  message={syncing ? tr('data_sync.result.running') : (syncResult?.success ? tr('data_sync.result.completed') : tr('data_sync.result.failed'))}
-                  description={
-                      syncing
-                          ? tr('data_sync.result.running_description', {
-                              stage: syncProgress.stage || tr('data_sync.progress.stage.executing'),
-                              table: syncProgress.table ? tr('data_sync.result.table_suffix', { table: syncProgress.table }) : '',
-                            })
-                          : (syncResult?.message || tr('data_sync.result.success_summary', {
-                              tables: syncResult?.tablesSynced || 0,
-                              inserted: syncResult?.rowsInserted || 0,
-                              updated: syncResult?.rowsUpdated || 0,
-                            }))
-                  }
-                  type={syncing ? "info" : (syncResult?.success ? "success" : "error")}
-                  showIcon
-              />
-
-              <div style={{ marginTop: 14 }}>
-                  <Progress
-                      percent={syncProgress.percent}
-                      status={syncing ? "active" : (syncResult?.success ? "success" : "exception")}
-                      format={() => `${syncProgress.current}/${syncProgress.total}`}
+                  <Alert
+                      message={syncing
+                          ? (isCompareEntry ? '正在比对' : tr('data_sync.result.running'))
+                          : (syncResult?.success
+                              ? (isCompareEntry ? '比对完成' : tr('data_sync.result.completed'))
+                              : (isCompareEntry ? '比对失败' : tr('data_sync.result.failed')))}
+                      description={
+                          syncing
+                              ? (isCompareEntry
+                                  ? `当前阶段：${syncProgress.stage || '执行中'}${syncProgress.table ? `，表：${syncProgress.table}` : ''}`
+                                  : tr('data_sync.result.running_description', {
+                                      stage: syncProgress.stage || tr('data_sync.progress.stage.executing'),
+                                      table: syncProgress.table ? tr('data_sync.result.table_suffix', { table: syncProgress.table }) : '',
+                                    }))
+                              : (syncResult?.message || (isCompareEntry
+                                  ? `成功比对 ${diffTables.length || syncResult?.tablesSynced || 0} 张表。`
+                                  : tr('data_sync.result.success_summary', {
+                                      tables: syncResult?.tablesSynced || 0,
+                                      inserted: syncResult?.rowsInserted || 0,
+                                      updated: syncResult?.rowsUpdated || 0,
+                                    })))
+                      }
+                      type={syncing ? "info" : (syncResult?.success ? "success" : "error")}
+                      showIcon
                   />
-              </div>
 
+                  <div style={{ marginTop: 14 }}>
+                      <Progress
+                          percent={syncProgress.percent}
+                          status={syncing ? "active" : (syncResult?.success ? "success" : "exception")}
+                          format={() => `${syncProgress.current}/${syncProgress.total}`}
+                      />
+                  </div>
               </div>
               <div style={quietPanelStyle}>
-              <Divider orientation="left" style={{ marginTop: 0 }}>{tr('data_sync.title.execution_log')}</Divider>
-              <div
-                  ref={logBoxRef}
-                  onScroll={() => {
-                      const el = logBoxRef.current;
-                      if (!el) return;
-                      const nearBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 40;
-                      autoScrollRef.current = nearBottom;
-                  }}
-                  style={{
-                      background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(248,250,252,0.92)',
-                      border: darkMode ? '1px solid rgba(255,255,255,0.08)' : '1px solid rgba(15,23,42,0.06)',
-                      borderRadius: 14,
-                      padding: 12,
-                      height: 300,
-                      overflowY: 'auto',
-                      fontFamily: 'var(--gn-font-mono)'
-                  }}
-              >
-                  {syncLogs.map((item, i: number) => <div key={i}>{renderSyncLogItem(item)}</div>)}
-              </div>
+                  <Divider orientation="left" style={{ marginTop: 0 }}>{isCompareEntry ? '分析日志' : tr('data_sync.title.execution_log')}</Divider>
+                  <div
+                      ref={logBoxRef}
+                      onScroll={() => {
+                          const el = logBoxRef.current;
+                          if (!el) return;
+                          const nearBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 40;
+                          autoScrollRef.current = nearBottom;
+                      }}
+                      style={{
+                          background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(248,250,252,0.92)',
+                          border: darkMode ? '1px solid rgba(255,255,255,0.08)' : '1px solid rgba(15,23,42,0.06)',
+                          borderRadius: 14,
+                          padding: 12,
+                          height: 300,
+                          overflowY: 'auto',
+                          fontFamily: 'var(--gn-font-mono)'
+                      }}
+                  >
+                      {syncLogs.map((item, i: number) => <div key={i}>{renderSyncLogItem(item)}</div>)}
+                  </div>
               </div>
           </div>
       )}
@@ -1274,26 +1364,38 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
           {currentStep === 0 && (
               <Button type="primary" onClick={nextToTables} loading={loading}>{tr('data_sync.action.next')}</Button>
           )}
-	          {currentStep === 1 && (
-	              <>
-	                <Button onClick={() => setCurrentStep(0)} style={{ marginRight: 8 }}>{tr('data_sync.action.previous')}</Button>
-	                <Button onClick={analyzeDiff} loading={loading} disabled={syncContent === 'schema' || selectedTables.length === 0 || analyzing || (isSourceQueryMode && !sourceQuery.trim())} style={{ marginRight: 8 }}>
-	                    {tr('data_sync.action.analyze_diff')}
-	                </Button>
-	                <Button
-	                    type="primary"
-	                    onClick={runSync}
-                    loading={loading}
-                    disabled={selectedTables.length === 0 || (isSourceQueryMode && !sourceQuery.trim()) || (syncContent !== 'schema' && diffTables.length === 0)}
-                >
-                    {tr('data_sync.action.start_sync')}
-                </Button>
+          {currentStep === 1 && (
+              <>
+                  <Button onClick={() => setCurrentStep(0)} style={{ marginRight: 8 }}>{tr('data_sync.action.previous')}</Button>
+                  <Button
+                      onClick={analyzeDiff}
+                      loading={loading}
+                      disabled={(isCompareEntry ? false : syncContent === 'schema') || selectedTables.length === 0 || analyzing || (isSourceQueryMode && !sourceQuery.trim())}
+                      style={{ marginRight: 8 }}
+                  >
+                      {isCompareEntry ? entryPresentation.analyzeButtonText : tr('data_sync.action.analyze_diff')}
+                  </Button>
+                  {isCompareEntry && (
+                      <Button onClick={onClose}>
+                          {entryPresentation.closeButtonText}
+                      </Button>
+                  )}
+                  {!isCompareEntry && (
+                      <Button
+                          type="primary"
+                          onClick={runSync}
+                          loading={loading}
+                          disabled={selectedTables.length === 0 || (isSourceQueryMode && !sourceQuery.trim()) || (syncContent !== 'schema' && diffTables.length === 0)}
+                      >
+                          {tr('data_sync.action.start_sync')}
+                      </Button>
+                  )}
               </>
           )}
           {currentStep === 2 && (
               <>
-                  <Button disabled={syncing} onClick={() => setCurrentStep(1)} style={{ marginRight: 8 }}>{tr('data_sync.action.continue_sync')}</Button>
-                  <Button type="primary" disabled={syncing} onClick={onClose}>{tr('data_sync.action.close')}</Button>
+                  <Button disabled={syncing} onClick={() => setCurrentStep(1)} style={{ marginRight: 8 }}>{isCompareEntry ? '返回比对' : tr('data_sync.action.continue_sync')}</Button>
+                  <Button type="primary" disabled={syncing} onClick={onClose}>{isCompareEntry ? entryPresentation.closeButtonText : tr('data_sync.action.close')}</Button>
               </>
           )}
       </div>
@@ -1369,7 +1471,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                             label: tr('data_sync.preview.tab.insert', { count: previewData.totalInserts || 0 }),
                             children: (
                                 <div>
-                                    <Text type="secondary">{tr('data_sync.preview.selection_hint.insert')}</Text>
+                                    <Text type="secondary">{isCompareEntry ? '行选择只影响 SQL 预览范围，不会执行写入。' : tr('data_sync.preview.selection_hint.insert')}</Text>
                                     <Table
                                         size="small"
                                         style={{ marginTop: 8 }}
@@ -1394,7 +1496,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                             label: tr('data_sync.preview.tab.update', { count: previewData.totalUpdates || 0 }),
                             children: (
                                 <div>
-                                    <Text type="secondary">{tr('data_sync.preview.selection_hint.update')}</Text>
+                                    <Text type="secondary">{isCompareEntry ? '行选择只影响 SQL 预览范围，不会执行写入。' : tr('data_sync.preview.selection_hint.update')}</Text>
                                     <Table
                                         size="small"
                                         style={{ marginTop: 8 }}
@@ -1445,7 +1547,7 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                             children: (
                                 <div>
                                     <Alert type="warning" showIcon message={tr('data_sync.preview.delete_warning')} />
-                                    <Text type="secondary">{tr('data_sync.preview.selection_hint.delete')}</Text>
+                                    <Text type="secondary">{isCompareEntry ? '行选择只影响 SQL 预览范围，不会执行写入。' : tr('data_sync.preview.selection_hint.delete')}</Text>
                                     <Table
                                         size="small"
                                         style={{ marginTop: 8 }}
@@ -1475,8 +1577,8 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                                         showIcon
                                         message={
                                             previewHasDataDiff
-                                                ? tr('data_sync.preview.sql.data_help')
-                                                : tr('data_sync.preview.sql.schema_help')
+                                                ? (isCompareEntry ? 'SQL 预览会按当前勾选的插入/更新/删除与行选择范围生成，仅用于审核差异。' : tr('data_sync.preview.sql.data_help'))
+                                                : (isCompareEntry ? 'SQL 预览展示结构差异建议语句，仅用于审核差异。' : tr('data_sync.preview.sql.schema_help'))
                                         }
                                     />
                                     <div style={{ marginTop: 8, marginBottom: 8, display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
diff --git a/frontend/src/components/DataViewer.primary-key.test.tsx b/frontend/src/components/DataViewer.primary-key.test.tsx
index 69240a5..1e2febe 100644
--- a/frontend/src/components/DataViewer.primary-key.test.tsx
+++ b/frontend/src/components/DataViewer.primary-key.test.tsx
@@ -4,7 +4,7 @@ import { act, create, type ReactTestRenderer } from 'react-test-renderer';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import type { TabData } from '../types';
-import { ORACLE_ROWID_LOCATOR_COLUMN } from '../utils/rowLocator';
+import { DUCKDB_ROWID_LOCATOR_COLUMN, ORACLE_ROWID_LOCATOR_COLUMN } from '../utils/rowLocator';
 import DataViewer from './DataViewer';
 
 const storeState = vi.hoisted(() => ({
@@ -184,6 +184,26 @@ describe('DataViewer safe editing locator', () => {
     renderer.unmount();
   });
 
+  it('enables table preview editing when primary key metadata uses boolean aliases', async () => {
+    backendApp.DBGetColumns.mockResolvedValue({
+      success: true,
+      data: [{ column_name: 'ID', isPrimary: true }, { column_name: 'NAME' }],
+    });
+
+    const renderer = await renderAndReload();
+
+    expect(dataGridState.latestProps?.pkColumns).toEqual(['ID']);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'primary-key',
+      columns: ['ID'],
+      valueColumns: ['ID'],
+      readOnly: false,
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(false);
+    expect(messageApi.warning).not.toHaveBeenCalled();
+    renderer.unmount();
+  });
+
   it('uses a unique index when the table has no primary key', async () => {
     backendApp.DBGetColumns.mockResolvedValue({
       success: true,
@@ -208,6 +228,65 @@ describe('DataViewer safe editing locator', () => {
     renderer.unmount();
   });
 
+  it('keeps DuckDB table preview writable when unique index metadata arrives as a safe locator', async () => {
+    storeState.connections[0].config.type = 'duckdb';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBGetColumns.mockResolvedValue({
+      success: true,
+      data: [{ name: 'slug', key: '' }, { name: 'name', key: '' }],
+    });
+    backendApp.DBGetIndexes.mockResolvedValue({
+      success: true,
+      data: [{ name: 'events_slug_key', columnName: 'slug', nonUnique: 0, seqInIndex: 1, indexType: 'UNIQUE' }],
+    });
+
+    const renderer = await renderAndReload(createTab({ id: 'tab-duckdb-unique', dbName: 'main', tableName: 'main.events', title: 'events' }));
+
+    expect(dataGridState.latestProps?.pkColumns).toEqual([]);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'unique-key',
+      columns: ['slug'],
+      valueColumns: ['slug'],
+      readOnly: false,
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(false);
+    expect(messageApi.warning).not.toHaveBeenCalled();
+    renderer.unmount();
+  });
+
+  it('uses hidden DuckDB rowid when no primary or unique key is available', async () => {
+    storeState.connections[0].config.type = 'duckdb';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBGetColumns.mockResolvedValue({
+      success: true,
+      data: [{ name: 'name', key: '' }],
+    });
+    backendApp.DBGetIndexes.mockResolvedValue({
+      success: true,
+      data: [],
+    });
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      fields: ['name', DUCKDB_ROWID_LOCATOR_COLUMN],
+      data: [{ name: 'launch', [DUCKDB_ROWID_LOCATOR_COLUMN]: 17 }],
+    });
+
+    const renderer = await renderAndReload(createTab({ id: 'tab-duckdb-rowid', dbName: 'main', tableName: 'main.events', title: 'events' }));
+
+    expect(dataGridState.latestProps?.pkColumns).toEqual([]);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'duckdb-rowid',
+      columns: ['rowid'],
+      valueColumns: [DUCKDB_ROWID_LOCATOR_COLUMN],
+      hiddenColumns: [DUCKDB_ROWID_LOCATOR_COLUMN],
+      readOnly: false,
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(false);
+    expect(messageApi.warning).not.toHaveBeenCalled();
+    expect(backendApp.DBQuery.mock.calls.some((call: any[]) => String(call[2]).includes(`rowid AS "${DUCKDB_ROWID_LOCATOR_COLUMN}"`))).toBe(true);
+    renderer.unmount();
+  });
+
   it('enables MongoDB table preview editing through the _id locator', async () => {
     storeState.connections[0].config.type = 'mongodb';
     storeState.connections[0].config.database = 'app';
@@ -319,6 +398,28 @@ describe('DataViewer safe editing locator', () => {
     renderer.unmount();
   });
 
+  it('keeps DuckDB table preview writable when primary key metadata arrives for a qualified table name', async () => {
+    storeState.connections[0].config.type = 'duckdb';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBGetColumns.mockResolvedValue({
+      success: true,
+      data: [{ name: 'id', key: 'PRI' }, { name: 'name', key: '' }],
+    });
+
+    const renderer = await renderAndReload(createTab({ id: 'tab-duckdb-pri', dbName: 'main', tableName: 'main.events', title: 'events' }));
+
+    expect(dataGridState.latestProps?.pkColumns).toEqual(['id']);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'primary-key',
+      columns: ['id'],
+      valueColumns: ['id'],
+      readOnly: false,
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(false);
+    expect(messageApi.warning).not.toHaveBeenCalled();
+    renderer.unmount();
+  });
+
   it('invalidates a stale known total when table data grows after a manual refresh', async () => {
     storeState.connections[0].config.type = 'mysql';
     storeState.connections[0].config.database = 'main';
diff --git a/frontend/src/components/DataViewer.tsx b/frontend/src/components/DataViewer.tsx
index 381cb49..cc2a516 100644
--- a/frontend/src/components/DataViewer.tsx
+++ b/frontend/src/components/DataViewer.tsx
@@ -17,6 +17,7 @@ import {
   validateQuickWhereCondition,
 } from '../utils/dataGridWhereFilter';
 import {
+  DUCKDB_ROWID_LOCATOR_COLUMN,
   ORACLE_ROWID_LOCATOR_COLUMN,
   resolveEditRowLocator,
   type EditRowLocator,
@@ -27,6 +28,7 @@ import {
   getColumnDefinitionName,
   getColumnDefinitionType,
 } from '../utils/columnDefinition';
+import { splitQualifiedNameLast, splitQualifiedNameSegments } from '../utils/qualifiedName';
 
 type ViewerPaginationState = {
   current: number;
@@ -206,42 +208,35 @@ const buildDataViewerBaseSelectSQL = (
   locator?: EditRowLocator,
 ): string => {
   const quotedTableName = quoteQualifiedIdent(dbType, tableName);
-  if (locator?.strategy !== 'oracle-rowid') {
+  if (locator?.strategy !== 'oracle-rowid' && locator?.strategy !== 'duckdb-rowid') {
     return `SELECT * FROM ${quotedTableName} ${whereSQL}`;
   }
 
   const alias = 'gonavi_row_source';
-  const rowIDAlias = quoteIdentPart(dbType, ORACLE_ROWID_LOCATOR_COLUMN);
-  return `SELECT ${alias}.*, ${alias}.ROWID AS ${rowIDAlias} FROM ${quotedTableName} ${alias} ${whereSQL}`;
-};
-
-const normalizeDuckDBIdentifier = (raw: string): string => {
-  const text = String(raw || '').trim();
-  if (text.length >= 2) {
-    const first = text[0];
-    const last = text[text.length - 1];
-    if ((first === '"' && last === '"') || (first === '`' && last === '`')) {
-      return text.slice(1, -1).trim();
-    }
+  if (locator?.strategy === 'duckdb-rowid') {
+    const duckdbRowIDAlias = quoteIdentPart(dbType, DUCKDB_ROWID_LOCATOR_COLUMN);
+    return `SELECT ${alias}.*, ${alias}.rowid AS ${duckdbRowIDAlias} FROM ${quotedTableName} ${alias} ${whereSQL}`;
   }
-  return text;
+
+  const oracleRowIDAlias = quoteIdentPart(dbType, ORACLE_ROWID_LOCATOR_COLUMN);
+  return `SELECT ${alias}.*, ${alias}.ROWID AS ${oracleRowIDAlias} FROM ${quotedTableName} ${alias} ${whereSQL}`;
 };
 
 const resolveDuckDBSchemaAndTable = (dbName: string, tableName: string) => {
   const rawTable = String(tableName || '').trim();
   if (!rawTable) return { schemaName: 'main', pureTableName: '' };
 
-  const parts = rawTable.split('.');
-  if (parts.length >= 2) {
-    const pureTableName = normalizeDuckDBIdentifier(parts[parts.length - 1]);
-    const schemaName = normalizeDuckDBIdentifier(parts[parts.length - 2]);
-    if (schemaName && pureTableName) {
-      return { schemaName, pureTableName };
-    }
+  const segments = splitQualifiedNameSegments(rawTable);
+  if (segments.length >= 2) {
+    return {
+      schemaName: segments[segments.length - 2],
+      pureTableName: segments[segments.length - 1],
+    };
   }
 
-  const fallbackSchema = normalizeDuckDBIdentifier(String(dbName || '').trim()) || 'main';
-  return { schemaName: fallbackSchema, pureTableName: normalizeDuckDBIdentifier(rawTable) };
+  const fallbackParsed = splitQualifiedNameLast(String(dbName || '').trim());
+  const fallbackSchema = fallbackParsed.objectName || String(dbName || '').trim() || 'main';
+  return { schemaName: fallbackSchema, pureTableName: segments[0] || rawTable };
 };
 
 const escapeSQLLiteral = (value: string): string => String(value || '').replace(/'/g, "''");
@@ -566,7 +561,7 @@ const DataViewer: React.FC<{ tab: TabData; isActive?: boolean }> = React.memo(({
 
     const dbType = resolveDataSourceType(config);
     const dbTypeLower = String(dbType || '').trim().toLowerCase();
-    const isMySQLFamily = dbTypeLower === 'mysql' || dbTypeLower === 'mariadb' || dbTypeLower === 'oceanbase' || dbTypeLower === 'diros';
+    const isMySQLFamily = dbTypeLower === 'mysql' || dbTypeLower === 'goldendb' || dbTypeLower === 'mariadb' || dbTypeLower === 'oceanbase' || dbTypeLower === 'diros';
     const normalizedQuickWhereCondition = normalizeQuickWhereCondition(quickWhereCondition);
     const quickWhereValidation = validateQuickWhereCondition(normalizedQuickWhereCondition);
     if (!quickWhereValidation.ok) {
@@ -634,13 +629,16 @@ const DataViewer: React.FC<{ tab: TabData; isActive?: boolean }> = React.memo(({
                     const resultColumns = getTableColumnNames(columnDefs);
                     const locatorColumns = isOracleLikeDialect(dbType)
                         ? [...resultColumns, ORACLE_ROWID_LOCATOR_COLUMN]
-                        : resultColumns;
+                        : (String(dbType || '').trim().toLowerCase() === 'duckdb'
+                            ? [...resultColumns, DUCKDB_ROWID_LOCATOR_COLUMN]
+                            : resultColumns);
                     let nextLocator = localizeDataViewerReadOnlyLocator(resolveEditRowLocator({
                         dbType,
                         resultColumns: locatorColumns,
                         primaryKeys,
                         indexes,
                         allowOracleRowID: true,
+                        allowDuckDBRowID: String(dbType || '').trim().toLowerCase() === 'duckdb',
                     }), tr);
 
                     if (nextLocator.readOnly && primaryKeys.length === 0 && !resIndexes?.success && !isOracleLikeDialect(dbType)) {
@@ -1154,6 +1152,7 @@ const DataViewer: React.FC<{ tab: TabData; isActive?: boolean }> = React.memo(({
           columnNames={columnNames}
           loading={loading}
           tableName={tab.tableName}
+          objectType={tab.objectType || 'table'}
           exportScope="table"
           dbName={tab.dbName}
           connectionId={tab.connectionId}
diff --git a/frontend/src/components/DatabaseIcons.test.tsx b/frontend/src/components/DatabaseIcons.test.tsx
index 4d5fa5e..ed9afbd 100644
--- a/frontend/src/components/DatabaseIcons.test.tsx
+++ b/frontend/src/components/DatabaseIcons.test.tsx
@@ -4,11 +4,40 @@ import { renderToStaticMarkup } from 'react-dom/server';
 
 import { DB_ICON_TYPES, getDbIcon, getDbIconLabel } from './DatabaseIcons';
 
+const BRAND_ICON_CASES: Array<[string, string, string]> = [
+  ['elasticsearch', 'Elasticsearch', 'elasticsearch.svg'],
+  ['oceanbase', 'OceanBase', 'oceanbase.png'],
+  ['oracle', 'Oracle', 'oracle.ico'],
+  ['starrocks', 'StarRocks', 'starrocks.png'],
+  ['kingbase', '金仓', 'kingbase.ico'],
+  ['dameng', '达梦', 'dameng.png'],
+  ['vastbase', 'VastBase', 'vastbase.svg'],
+  ['opengauss', 'OpenGauss', 'opengauss.ico'],
+  ['gaussdb', 'GaussDB', 'gaussdb.ico'],
+  ['goldendb', 'GoldenDB', 'goldendb.ico'],
+  ['highgo', '瀚高', 'highgo.ico'],
+  ['iris', 'InterSystems IRIS', 'iris.png'],
+  ['tdengine', 'TDengine', 'tdengine.ico'],
+  ['iotdb', 'Apache IoTDB', 'iotdb.svg'],
+  ['rocketmq', 'RocketMQ', 'rocketmq.png'],
+  ['mqtt', 'MQTT', 'mqtt.svg'],
+  ['kafka', 'Kafka', 'kafka.png'],
+  ['rabbitmq', 'RabbitMQ', 'rabbitmq.svg'],
+  ['chroma', 'Chroma', 'chroma.svg'],
+  ['qdrant', 'Qdrant', 'qdrant.svg'],
+  ['jvm', 'JVM', 'jvm.ico'],
+];
+
 describe('DatabaseIcons', () => {
-  it('includes InterSystems IRIS in the selectable database icons', () => {
-    expect(DB_ICON_TYPES).toContain('iris');
-    expect(getDbIconLabel('iris')).toBe('InterSystems IRIS');
-  });
+  for (const [type, label, asset] of BRAND_ICON_CASES) {
+    it(`includes ${label} in the selectable database icons`, () => {
+      expect(DB_ICON_TYPES).toContain(type);
+      expect(getDbIconLabel(type)).toBe(label);
+      const markup = renderToStaticMarkup(<>{getDbIcon(type, undefined, 22)}</>);
+      expect(markup).toContain(asset);
+      expect(markup).toContain(`alt="${type}"`);
+    });
+  }
 
   it('wraps database icons in a consistent frame for sidebar sizing', () => {
     const mysqlMarkup = renderToStaticMarkup(<>{getDbIcon('mysql', undefined, 22)}</>);
diff --git a/frontend/src/components/DatabaseIcons.tsx b/frontend/src/components/DatabaseIcons.tsx
index a54a0f5..126a820 100644
--- a/frontend/src/components/DatabaseIcons.tsx
+++ b/frontend/src/components/DatabaseIcons.tsx
@@ -35,6 +35,7 @@ const DB_DEFAULT_COLORS: Record<string, string> = {
     postgres:   '#336791',
     redis:      '#DC382D',
     mongodb:    '#47A248',
+    elasticsearch: '#FEC514',
     jvm:        '#1677FF',
     kingbase:   '#1890FF',
     dameng:     '#E6002D',
@@ -45,9 +46,18 @@ const DB_DEFAULT_COLORS: Record<string, string> = {
     duckdb:     '#FFC107',
     vastbase:   '#0066CC',
     opengauss:  '#2446A8',
+    gaussdb:    '#0B7FAB',
+    goldendb:   '#D97706',
     highgo:     '#00A86B',
     iris:       '#1F6FEB',
     tdengine:   '#2962FF',
+    iotdb:      '#0F766E',
+    rocketmq:   '#EA580C',
+    mqtt:       '#0EA5A4',
+    kafka:      '#F97316',
+    rabbitmq:   '#FF6B35',
+    chroma:     '#7C3AED',
+    qdrant:     '#DC244C',
     diros:      '#0050B3',
     starrocks:  '#00A6A6',
     sphinx:     '#2F5D62',
@@ -57,29 +67,90 @@ const DB_DEFAULT_COLORS: Record<string, string> = {
 export const getDbDefaultColor = (type: string): string =>
     DB_DEFAULT_COLORS[type?.toLowerCase()] || DB_DEFAULT_COLORS.custom;
 
-// ─── 有品牌 SVG 文件的数据库类型（文件在 /db-icons/ 下） ────
+type BrandAssetConfig = {
+    background?: string;
+    borderColor?: string;
+    iconScale?: number;
+    src: string;
+};
 
-const BRAND_SVG_TYPES = new Set([
-    'mysql', 'mariadb', 'postgres', 'redis', 'mongodb', 'clickhouse', 'sqlite',
-    'diros', 'sphinx', 'duckdb', 'sqlserver',
-]);
+// ─── 官方品牌资源（文件在 /db-icons/ 下） ────────────────────
 
-/** 品牌 SVG 图标：用 <img> 加载 /db-icons/*.svg */
-const BrandSvgIcon: React.FC<{ type: string; size: number; color?: string }> = ({ type, size, color }) => {
-    const bgColor = color || getDbDefaultColor(type);
+const BRAND_ASSET_CONFIGS: Record<string, BrandAssetConfig> = {
+    mysql: { src: '/db-icons/mysql.svg' },
+    mariadb: { src: '/db-icons/mariadb.svg' },
+    oceanbase: { src: '/db-icons/oceanbase.png', iconScale: 0.72 },
+    postgres: { src: '/db-icons/postgres.svg' },
+    redis: { src: '/db-icons/redis.svg' },
+    mongodb: { src: '/db-icons/mongodb.svg' },
+    elasticsearch: { src: '/db-icons/elasticsearch.svg' },
+    jvm: { src: '/db-icons/jvm.ico', iconScale: 0.72 },
+    kingbase: { src: '/db-icons/kingbase.ico', iconScale: 0.72 },
+    dameng: { src: '/db-icons/dameng.png', iconScale: 0.72 },
+    oracle: { src: '/db-icons/oracle.ico', iconScale: 0.72 },
+    sqlserver: { src: '/db-icons/sqlserver.svg' },
+    clickhouse: { src: '/db-icons/clickhouse.svg' },
+    sqlite: { src: '/db-icons/sqlite.svg' },
+    duckdb: { src: '/db-icons/duckdb.svg' },
+    vastbase: { src: '/db-icons/vastbase.svg', iconScale: 0.84 },
+    opengauss: { src: '/db-icons/opengauss.ico', iconScale: 0.72 },
+    gaussdb: { src: '/db-icons/gaussdb.ico', iconScale: 0.72 },
+    goldendb: { src: '/db-icons/goldendb.ico', iconScale: 0.72 },
+    highgo: { src: '/db-icons/highgo.ico', iconScale: 0.72 },
+    iris: { src: '/db-icons/iris.png', iconScale: 0.72 },
+    tdengine: { src: '/db-icons/tdengine.ico', iconScale: 0.72 },
+    iotdb: {
+        src: '/db-icons/iotdb.svg',
+        background: '#0F766E',
+        borderColor: '#0F766E',
+        iconScale: 0.82,
+    },
+    rocketmq: {
+        src: '/db-icons/rocketmq.png',
+        background: '#0F172A',
+        borderColor: '#EA580C',
+        iconScale: 0.84,
+    },
+    mqtt: {
+        src: '/db-icons/mqtt.svg',
+        background: '#0F172A',
+        borderColor: '#0EA5A4',
+        iconScale: 0.84,
+    },
+    kafka: { src: '/db-icons/kafka.png', iconScale: 0.8 },
+    rabbitmq: { src: '/db-icons/rabbitmq.svg', iconScale: 0.74 },
+    chroma: { src: '/db-icons/chroma.svg', iconScale: 0.9 },
+    qdrant: { src: '/db-icons/qdrant.svg', iconScale: 0.74 },
+    diros: { src: '/db-icons/diros.svg' },
+    starrocks: {
+        src: '/db-icons/starrocks.png',
+        background: '#0B1021',
+        borderColor: '#00A6A6',
+        iconScale: 0.84,
+    },
+    sphinx: { src: '/db-icons/sphinx.svg' },
+};
+
+const BRAND_ASSET_TYPES = new Set(Object.keys(BRAND_ASSET_CONFIGS));
+
+/** 品牌图标：用 <img> 加载官方 svg/png/ico 资源 */
+const BrandAssetIcon: React.FC<{ type: string; size: number; color?: string }> = ({ type, size, color }) => {
+    const config = BRAND_ASSET_CONFIGS[type.toLowerCase()];
+    const bgColor = color || config?.borderColor || getDbDefaultColor(type);
+    const iconScale = config?.iconScale ?? 0.64;
     return (
         <IconFrame size={size}>
             <span style={{
                 display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
                 width: size, height: size, borderRadius: size * 0.22,
-                background: '#fff', border: `1.5px solid ${bgColor}`,
+                background: config?.background || '#fff', border: `1.5px solid ${bgColor}`,
                 flexShrink: 0, overflow: 'hidden', boxSizing: 'border-box',
             }}>
                 <img
-                    src={`/db-icons/${type}.svg`}
+                    src={config?.src || `/db-icons/${type}.svg`}
                     alt={type}
-                    width={Math.round(size * 0.64)}
-                    height={Math.round(size * 0.64)}
+                    width={Math.round(size * iconScale)}
+                    height={Math.round(size * iconScale)}
                     style={{ display: 'block', objectFit: 'contain' }}
                 />
             </span>
@@ -87,98 +158,105 @@ const BrandSvgIcon: React.FC<{ type: string; size: number; color?: string }> = (
     );
 };
 
-// ─── 彩色标签图标（fallback） ──────────────────────────────
-
-/** 通用彩色标签：填充背景 + 白色粗体缩写 */
-const ColorBadge: React.FC<{ size: number; color: string; label: string }> = ({ size, color, label }) => {
-    const textSize = label.length <= 2 ? size * 0.48 : size * 0.38;
-    return (
-        <IconFrame size={size}>
-            <svg width={size} height={size} viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                <rect x="0" y="0" width="24" height="24" rx="5" fill={color}/>
-                <text
-                    x="12" y="12" dominantBaseline="central" textAnchor="middle"
-                    fontSize={textSize} fontWeight="800"
-                    style={{ fontFamily: 'var(--gn-font-sans, "Inter", "PingFang SC", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", sans-serif)' }}
-                    fill="#fff" letterSpacing={label.length > 2 ? -0.5 : 0}
-                >
-                    {label}
-                </text>
-            </svg>
-        </IconFrame>
-    );
-};
-
 // ─── 各数据库图标 ───────────────────────────────────────────
 
-// 有品牌 SVG 的数据库
+// 有品牌官方资源的数据库
 const MySQLIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="mysql" size={size} color={color} />
+    <BrandAssetIcon type="mysql" size={size} color={color} />
 );
 const MariaDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="mariadb" size={size} color={color} />
+    <BrandAssetIcon type="mariadb" size={size} color={color} />
 );
 const OceanBaseIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.oceanbase} label="OB" />
+    <BrandAssetIcon type="oceanbase" size={size} color={color} />
 );
 const PostgresIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="postgres" size={size} color={color} />
+    <BrandAssetIcon type="postgres" size={size} color={color} />
 );
 const RedisIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="redis" size={size} color={color} />
+    <BrandAssetIcon type="redis" size={size} color={color} />
 );
 const MongoDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="mongodb" size={size} color={color} />
+    <BrandAssetIcon type="mongodb" size={size} color={color} />
 );
 const ClickHouseIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="clickhouse" size={size} color={color} />
+    <BrandAssetIcon type="clickhouse" size={size} color={color} />
 );
 const SQLiteIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="sqlite" size={size} color={color} />
+    <BrandAssetIcon type="sqlite" size={size} color={color} />
 );
 
-// 无品牌 SVG → 彩色文字标签
 const OracleIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.oracle} label="Or" />
+    <BrandAssetIcon type="oracle" size={size} color={color} />
 );
 const SQLServerIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="sqlserver" size={size} color={color} />
+    <BrandAssetIcon type="sqlserver" size={size} color={color} />
 );
 const DorisIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="diros" size={size} color={color} />
+    <BrandAssetIcon type="diros" size={size} color={color} />
 );
 const StarRocksIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.starrocks} label="SR" />
+    <BrandAssetIcon type="starrocks" size={size} color={color} />
 );
 const SphinxIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="sphinx" size={size} color={color} />
+    <BrandAssetIcon type="sphinx" size={size} color={color} />
 );
 const DuckDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <BrandSvgIcon type="duckdb" size={size} color={color} />
+    <BrandAssetIcon type="duckdb" size={size} color={color} />
 );
 const KingBaseIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.kingbase} label="KB" />
+    <BrandAssetIcon type="kingbase" size={size} color={color} />
 );
 const DamengIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.dameng} label="DM" />
+    <BrandAssetIcon type="dameng" size={size} color={color} />
 );
 const VastBaseIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.vastbase} label="VB" />
+    <BrandAssetIcon type="vastbase" size={size} color={color} />
 );
 const OpenGaussIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.opengauss} label="OG" />
+    <BrandAssetIcon type="opengauss" size={size} color={color} />
+);
+const GaussDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="gaussdb" size={size} color={color} />
+);
+const GoldenDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="goldendb" size={size} color={color} />
 );
 const HighGoIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.highgo} label="HG" />
+    <BrandAssetIcon type="highgo" size={size} color={color} />
 );
 const IrisIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.iris} label="IR" />
+    <BrandAssetIcon type="iris" size={size} color={color} />
 );
 const TDengineIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.tdengine} label="TD" />
+    <BrandAssetIcon type="tdengine" size={size} color={color} />
+);
+const IoTDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="iotdb" size={size} color={color} />
+);
+const RocketMQIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="rocketmq" size={size} color={color} />
+);
+const MQTTIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="mqtt" size={size} color={color} />
+);
+const KafkaIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="kafka" size={size} color={color} />
+);
+const RabbitMQIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="rabbitmq" size={size} color={color} />
+);
+const ChromaIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="chroma" size={size} color={color} />
+);
+const QdrantIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="qdrant" size={size} color={color} />
 );
 const JVMIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.jvm} label="JVM" />
+    <BrandAssetIcon type="jvm" size={size} color={color} />
+);
+const ElasticsearchIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandAssetIcon type="elasticsearch" size={size} color={color} />
 );
 
 /** Custom — 齿轮图标 */
@@ -197,13 +275,6 @@ const CustomIcon: React.FC<DbIconProps> = ({ size = 16, color }) => {
 
 // ─── 图标注册表 ─────────────────────────────────────────────
 
-const DorisIconFallback: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.diros} label="Do" />
-);
-const SphinxIconFallback: React.FC<DbIconProps> = ({ size = 16, color }) => (
-    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.sphinx} label="Sp" />
-);
-
 const DB_ICON_MAP: Record<string, React.FC<DbIconProps>> = {
     mysql: MySQLIcon,
     mariadb: MariaDBIcon,
@@ -224,9 +295,19 @@ const DB_ICON_MAP: Record<string, React.FC<DbIconProps>> = {
     duckdb: DuckDBIcon,
     vastbase: VastBaseIcon,
     opengauss: OpenGaussIcon,
+    gaussdb: GaussDBIcon,
+    goldendb: GoldenDBIcon,
     highgo: HighGoIcon,
     iris: IrisIcon,
     tdengine: TDengineIcon,
+    iotdb: IoTDBIcon,
+    rocketmq: RocketMQIcon,
+    mqtt: MQTTIcon,
+    kafka: KafkaIcon,
+    rabbitmq: RabbitMQIcon,
+    chroma: ChromaIcon,
+    qdrant: QdrantIcon,
+    elasticsearch: ElasticsearchIcon,
     custom: CustomIcon,
 };
 
@@ -234,11 +315,11 @@ const DB_ICON_MAP: Record<string, React.FC<DbIconProps>> = {
 export const DB_ICON_TYPES: string[] = [
     'mysql', 'mariadb', 'oceanbase', 'postgres', 'redis', 'mongodb', 'jvm',
     'oracle', 'sqlserver', 'sqlite', 'duckdb', 'clickhouse', 'starrocks',
-    'kingbase', 'dameng', 'vastbase', 'opengauss', 'highgo', 'iris', 'tdengine', 'custom',
+    'kingbase', 'dameng', 'vastbase', 'opengauss', 'gaussdb', 'goldendb', 'highgo', 'iris', 'tdengine', 'iotdb', 'rocketmq', 'mqtt', 'kafka', 'rabbitmq', 'chroma', 'qdrant', 'elasticsearch', 'custom',
 ];
 
-/** 该类型是否有品牌 SVG 文件 */
-export const hasBrandSvg = (type: string): boolean => BRAND_SVG_TYPES.has(type?.toLowerCase());
+/** 该类型是否有品牌图标资源 */
+export const hasBrandSvg = (type: string): boolean => BRAND_ASSET_TYPES.has(type?.toLowerCase());
 
 /** 获取数据库图标 React 节点 */
 export const getDbIcon = (type: string, color?: string, size?: number): React.ReactNode => {
@@ -256,7 +337,10 @@ export const getDbIconLabel = (type: string): string => {
         sqlserver: 'SQL Server', clickhouse: 'ClickHouse', sqlite: 'SQLite',
         starrocks: 'StarRocks',
         duckdb: 'DuckDB', kingbase: '金仓', dameng: '达梦',
-        vastbase: 'VastBase', opengauss: 'OpenGauss', highgo: '瀚高', iris: 'InterSystems IRIS', tdengine: 'TDengine',
+        vastbase: 'VastBase', opengauss: 'OpenGauss', gaussdb: 'GaussDB', goldendb: 'GoldenDB', highgo: '瀚高', iris: 'InterSystems IRIS', tdengine: 'TDengine', iotdb: 'Apache IoTDB', rocketmq: 'RocketMQ', mqtt: 'MQTT', kafka: 'Kafka', rabbitmq: 'RabbitMQ',
+        chroma: 'Chroma',
+        qdrant: 'Qdrant',
+        elasticsearch: 'Elasticsearch',
         custom: '自定义',
     };
     return labels[type?.toLowerCase()] || type;
diff --git a/frontend/src/components/DefinitionViewer.object-edit.test.tsx b/frontend/src/components/DefinitionViewer.object-edit.test.tsx
new file mode 100644
index 0000000..ac1b7b9
--- /dev/null
+++ b/frontend/src/components/DefinitionViewer.object-edit.test.tsx
@@ -0,0 +1,378 @@
+import React from 'react';
+import { act, create } from 'react-test-renderer';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import type { TabData } from '../types';
+import DefinitionViewer from './DefinitionViewer';
+
+const storeState = vi.hoisted(() => ({
+  connections: [
+    {
+      id: 'conn-1',
+      name: 'local',
+      config: {
+        type: 'postgres',
+        host: '127.0.0.1',
+        port: 5432,
+        user: 'postgres',
+        password: '',
+        database: 'main',
+      },
+    },
+  ],
+  theme: 'light',
+  addTab: vi.fn(),
+  setActiveContext: vi.fn(),
+}));
+
+const backendApp = vi.hoisted(() => ({
+  DBQuery: vi.fn(),
+}));
+
+vi.mock('../store', () => ({
+  useStore: (selector: (state: typeof storeState) => any) => selector(storeState),
+}));
+
+vi.mock('../../wailsjs/go/app/App', () => backendApp);
+
+vi.mock('@ant-design/icons', () => ({
+  EditOutlined: () => <span data-icon="edit" />,
+}));
+
+vi.mock('./MonacoEditor', () => ({
+  default: ({ value, options }: any) => (
+    <pre data-editor="true" data-readonly={String(options?.readOnly)}>
+      {value}
+    </pre>
+  ),
+}));
+
+vi.mock('antd', () => ({
+  Spin: ({ tip }: any) => <div>{tip}</div>,
+  Alert: ({ message, description }: any) => <div>{message}{description}</div>,
+  Button: ({ children, onClick, icon }: any) => (
+    <button type="button" onClick={onClick}>
+      {icon}
+      {children}
+    </button>
+  ),
+}));
+
+const flushPromises = async (count = 6) => {
+  for (let i = 0; i < count; i += 1) {
+    await Promise.resolve();
+  }
+};
+
+const findButtonText = (node: any): string => (
+  (node.children || [])
+    .map((item: any) => (typeof item === 'string' ? item : findButtonText(item)))
+    .join('')
+);
+
+const createTab = (overrides: Partial<TabData> = {}): TabData => ({
+  id: 'view-def-conn-1-main-reporting.active_users',
+  title: '视图: reporting.active_users',
+  type: 'view-def',
+  connectionId: 'conn-1',
+  dbName: 'main',
+  viewName: 'reporting.active_users',
+  viewKind: 'view',
+  schemaName: 'reporting',
+  ...overrides,
+});
+
+describe('DefinitionViewer object edit entry', () => {
+  beforeEach(() => {
+    storeState.addTab.mockReset();
+    storeState.setActiveContext.mockReset();
+    storeState.theme = 'light';
+    storeState.connections[0].config.type = 'postgres';
+    backendApp.DBQuery.mockReset();
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [{ view_definition: 'SELECT id, name FROM users' }],
+    });
+  });
+
+  it('opens an editable query tab for view definitions', async () => {
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<DefinitionViewer tab={createTab()} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      button.props.onClick();
+    });
+
+    expect(storeState.setActiveContext).toHaveBeenCalledWith({ connectionId: 'conn-1', dbName: 'main' });
+    expect(storeState.addTab).toHaveBeenCalledWith(expect.objectContaining({
+      title: '修改视图: reporting.active_users',
+      type: 'query',
+      connectionId: 'conn-1',
+      dbName: 'main',
+      queryMode: 'object-edit',
+      query: expect.stringContaining('CREATE OR REPLACE VIEW reporting.active_users AS'),
+    }));
+    expect(storeState.addTab.mock.calls[0][0].query).toContain('SELECT id, name FROM users;');
+  });
+
+  it('adds CREATE OR REPLACE without duplicating view fragments returned without ddl prefix', async () => {
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [{ view_definition: 'VIEW reporting.active_users AS\nSELECT id, name FROM users' }],
+    });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<DefinitionViewer tab={createTab()} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      button.props.onClick();
+    });
+
+    const query = storeState.addTab.mock.calls[0][0].query;
+    expect(query).toContain('CREATE OR REPLACE VIEW reporting.active_users AS');
+    expect(query).toContain('SELECT id, name FROM users;');
+    expect(query).not.toContain('AS\nVIEW reporting.active_users AS');
+  });
+
+  it('opens an editable query tab for routine definitions', async () => {
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [{ routine_definition: 'CREATE OR REPLACE FUNCTION reporting.refresh_stats() RETURNS void AS $$ BEGIN END; $$ LANGUAGE plpgsql;' }],
+    });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<DefinitionViewer tab={createTab({
+        id: 'routine-def-conn-1-main-reporting.refresh_stats',
+        title: '函数: reporting.refresh_stats',
+        type: 'routine-def',
+        routineName: 'reporting.refresh_stats',
+        routineType: 'FUNCTION',
+        viewName: undefined,
+        viewKind: undefined,
+      })} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      button.props.onClick();
+    });
+
+    expect(storeState.addTab).toHaveBeenCalledWith(expect.objectContaining({
+      title: '修改函数/存储过程: reporting.refresh_stats',
+      type: 'query',
+      queryMode: 'object-edit',
+      query: expect.stringContaining('CREATE OR REPLACE FUNCTION reporting.refresh_stats()'),
+    }));
+  });
+
+  it('uses SQL Server catalog metadata when loading routine definitions', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [{ routine_definition: 'CREATE PROCEDURE [reporting].[refresh_stats]\nAS\nSELECT 1;' }],
+    });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<DefinitionViewer tab={createTab({
+        id: 'routine-def-conn-1-main-reporting.refresh_stats',
+        title: '存储过程: reporting.refresh_stats',
+        type: 'routine-def',
+        routineName: 'reporting.refresh_stats',
+        routineType: 'PROCEDURE',
+        viewName: undefined,
+        viewKind: undefined,
+      })} />);
+      await flushPromises();
+    });
+
+    const sql = String(backendApp.DBQuery.mock.calls[0][2] || '');
+    expect(sql).toContain('FROM [main].sys.all_sql_modules AS m');
+    expect(sql).toContain("WHERE o.name = N'refresh_stats'");
+    expect(sql).toContain("AND s.name = N'reporting'");
+    expect(sql).not.toContain('OBJECT_DEFINITION');
+    expect(String(renderer.root.findAll((node: any) => node.props['data-editor'] === 'true')[0].children.join(''))).toContain('CREATE PROCEDURE [reporting].[refresh_stats]');
+  });
+
+  it('joins SQL Server sp_helptext rows when catalog metadata is empty', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    backendApp.DBQuery
+      .mockResolvedValueOnce({ success: true, data: [] })
+      .mockResolvedValueOnce({
+        success: true,
+        data: [
+          { Text: 'CREATE PROCEDURE [reporting].[refresh_stats]\n' },
+          { Text: 'AS\n' },
+          { Text: 'BEGIN\n  SELECT 1;\nEND' },
+        ],
+      });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<DefinitionViewer tab={createTab({
+        id: 'routine-def-conn-1-main-reporting.refresh_stats',
+        title: '存储过程: reporting.refresh_stats',
+        type: 'routine-def',
+        routineName: 'reporting.refresh_stats',
+        routineType: 'PROCEDURE',
+        viewName: undefined,
+        viewKind: undefined,
+      })} />);
+      await flushPromises();
+    });
+
+    expect(backendApp.DBQuery.mock.calls[1][2]).toBe("EXEC [main].sys.sp_helptext @objname = N'[reporting].[refresh_stats]'");
+    const editorText = String(renderer.root.findAll((node: any) => node.props['data-editor'] === 'true')[0].children.join(''));
+    expect(editorText).toContain('CREATE PROCEDURE [reporting].[refresh_stats]');
+    expect(editorText).toContain('BEGIN\n  SELECT 1;\nEND');
+  });
+
+  it('adds CREATE OR REPLACE for routine source snippets returned without ddl prefix', async () => {
+    storeState.connections[0].config.type = 'oracle';
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [
+        { TEXT: 'PROCEDURE proc_tally2accept(p_id IN NUMBER) IS\n' },
+        { TEXT: '  v_count PLS_INTEGER;\n' },
+        { TEXT: 'BEGIN\n' },
+        { TEXT: '  SELECT COUNT(*) INTO v_count FROM dual;\n' },
+        { TEXT: 'END;\n' },
+      ],
+    });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<DefinitionViewer tab={createTab({
+        id: 'routine-def-conn-1-main-proc_tally2accept',
+        title: '存储过程: proc_tally2accept',
+        type: 'routine-def',
+        routineName: 'proc_tally2accept',
+        routineType: 'PROCEDURE',
+        viewName: undefined,
+        viewKind: undefined,
+      })} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      button.props.onClick();
+    });
+
+    const query = storeState.addTab.mock.calls[0][0].query;
+    expect(query).toContain('CREATE OR REPLACE PROCEDURE proc_tally2accept(p_id IN NUMBER)');
+    expect(query).toContain('v_count PLS_INTEGER;');
+    expect(query).toContain('SELECT COUNT(*) INTO v_count FROM dual;');
+  });
+
+  it('reloads the latest object definition before opening object edit', async () => {
+    backendApp.DBQuery
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{ view_definition: 'SELECT id FROM users' }],
+      })
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{ view_definition: 'SELECT id, name, updated_at FROM users' }],
+      });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<DefinitionViewer tab={createTab()} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      await button.props.onClick();
+      await flushPromises();
+    });
+
+    expect(backendApp.DBQuery).toHaveBeenCalledTimes(2);
+    const query = storeState.addTab.mock.calls[0][0].query;
+    expect(query).toContain('SELECT id, name, updated_at FROM users;');
+    expect(query).not.toContain('SELECT id FROM users;');
+
+    const editor = renderer.root.findAll((node: any) => node.props['data-editor'] === 'true')[0];
+    expect(String(editor.children.join(''))).toContain('SELECT id, name, updated_at FROM users');
+  });
+
+  it('keeps the current definition visible when refresh for object edit fails', async () => {
+    backendApp.DBQuery
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{ view_definition: 'SELECT id, name FROM users' }],
+      })
+      .mockResolvedValueOnce({
+        success: false,
+        message: 'network down',
+        data: [],
+      });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<DefinitionViewer tab={createTab()} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      await button.props.onClick();
+      await flushPromises();
+    });
+
+    expect(storeState.addTab).not.toHaveBeenCalled();
+    expect(String(renderer.root.findAll((node: any) => node.props['data-editor'] === 'true')[0].children.join(''))).toContain('SELECT id, name FROM users');
+    expect(findButtonText(renderer.root)).toContain('刷新最新定义失败');
+    expect(findButtonText(renderer.root)).toContain('network down');
+  });
+
+  it('does not keep the previous object definition when switching objects and the new load fails', async () => {
+    backendApp.DBQuery
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{ view_definition: 'SELECT id, name FROM users' }],
+      })
+      .mockResolvedValueOnce({
+        success: false,
+        message: 'load failed',
+        data: [],
+      });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<DefinitionViewer tab={createTab()} />);
+      await flushPromises();
+    });
+
+    await act(async () => {
+      renderer.update(<DefinitionViewer tab={createTab({
+        id: 'view-def-conn-1-main-reporting.archived_users',
+        title: '视图: reporting.archived_users',
+        viewName: 'reporting.archived_users',
+      })} />);
+      await flushPromises();
+    });
+
+    expect(findButtonText(renderer.root)).toContain('加载失败');
+    expect(findButtonText(renderer.root)).toContain('load failed');
+    expect(renderer.root.findAll((node: any) => node.props['data-editor'] === 'true')).toHaveLength(0);
+    expect(findButtonText(renderer.root)).not.toContain('SELECT id, name FROM users');
+  });
+});
diff --git a/frontend/src/components/DefinitionViewer.tsx b/frontend/src/components/DefinitionViewer.tsx
index 1fff34b..60aae46 100644
--- a/frontend/src/components/DefinitionViewer.tsx
+++ b/frontend/src/components/DefinitionViewer.tsx
@@ -1,12 +1,15 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import Editor from './MonacoEditor';
-import { Spin, Alert } from 'antd';
+import { Button, Spin, Alert } from 'antd';
+import { EditOutlined } from '@ant-design/icons';
 import { TabData } from '../types';
 import { useStore } from '../store';
 import { DBQuery } from '../../wailsjs/go/app/App';
 import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
 import { normalizeOceanBaseProtocol } from '../utils/oceanBaseProtocol';
 import { useI18n } from '../i18n/provider';
+import { splitQualifiedNameLast } from '../utils/qualifiedName';
+import { buildSqlServerObjectDefinitionQueries } from '../utils/sqlServerObjectDefinition';
 
 interface DefinitionViewerProps {
     tab: TabData;
@@ -29,15 +32,65 @@ const normalizeMySQLViewDDL = (rawDefinition: unknown): string => {
     return `${normalized};`;
 };
 
+const ensureSqlStatementTerminator = (sql: string): string => {
+    const normalized = String(sql || '').trim();
+    if (!normalized) return '';
+    return /;\s*$/.test(normalized) ? normalized : `${normalized};`;
+};
+
+const buildEditableDefinitionSql = (tab: TabData, definition: string, objectLabel: string, objectName: string): string => {
+    const normalizedDefinition = String(definition || '').trim();
+    const header = `-- 修改${objectLabel}: ${objectName}\n-- 请确认语法兼容当前数据库后执行\n`;
+    if (!normalizedDefinition) {
+        return `${header}-- 当前对象定义为空，请补全 ${objectName} 的 DDL 后执行\n`;
+    }
+
+    if (/^\s*--\s*(未找到|暂不支持|当前)/.test(normalizedDefinition)) {
+        return `${header}${ensureSqlStatementTerminator(normalizedDefinition)}`;
+    }
+
+    if (tab.type === 'view-def' && !/^\s*create\b/i.test(normalizedDefinition)) {
+        if (/^\s*view\b/i.test(normalizedDefinition)) {
+            return `${header}${ensureSqlStatementTerminator(normalizedDefinition.replace(/^\s*view\b/i, 'CREATE OR REPLACE VIEW'))}`;
+        }
+        return `${header}CREATE OR REPLACE VIEW ${objectName} AS\n${ensureSqlStatementTerminator(normalizedDefinition)}`;
+    }
+
+    if (
+        tab.type === 'routine-def'
+        && !/^\s*create\b/i.test(normalizedDefinition)
+        && /^\s*(function|procedure)\b/i.test(normalizedDefinition)
+    ) {
+        return `${header}${ensureSqlStatementTerminator(`CREATE OR REPLACE ${normalizedDefinition}`)}`;
+    }
+
+    return `${header}${ensureSqlStatementTerminator(normalizedDefinition)}`;
+};
+
 const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
     const [definition, setDefinition] = useState<string>('');
+    const [openingObjectEdit, setOpeningObjectEdit] = useState(false);
+    const isMountedRef = useRef(true);
+    const loadedDefinitionKeyRef = useRef('');
 
     const connections = useStore(state => state.connections);
     const theme = useStore(state => state.theme);
+    const addTab = useStore(state => state.addTab);
+    const setActiveContext = useStore(state => state.setActiveContext);
     const darkMode = theme === 'dark';
     const { t } = useI18n();
+    const objectIdentityKey = [
+        tab.connectionId,
+        tab.dbName,
+        tab.type,
+        tab.viewName,
+        tab.viewKind,
+        tab.eventName,
+        tab.routineName,
+        tab.routineType,
+    ].map((item) => String(item || '')).join('||');
 
     const escapeSQLLiteral = (raw: string): string => String(raw || '').replace(/'/g, "''");
 
@@ -46,12 +99,14 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
         if (type === 'custom') {
             const driver = String(conn?.config?.driver || '').trim().toLowerCase();
             if (driver === 'diros' || driver === 'doris') return 'mysql';
+            if (driver === 'goldendb' || driver === 'greatdb' || driver === 'gdb') return 'mysql';
             if (driver === 'oceanbase') return normalizeOceanBaseProtocol(conn?.config?.oceanBaseProtocol) === 'oracle' ? 'oracle' : 'mysql';
             if (driver === 'opengauss' || driver === 'open_gauss' || driver === 'open-gauss') return 'opengauss';
+            if (driver === 'gaussdb' || driver === 'gauss_db' || driver === 'gauss-db') return 'gaussdb';
             return driver;
         }
         if (type === 'oceanbase' && normalizeOceanBaseProtocol(conn?.config?.oceanBaseProtocol) === 'oracle') return 'oracle';
-        if (type === 'mariadb' || type === 'oceanbase' || type === 'diros' || type === 'sphinx') return 'mysql';
+        if (type === 'goldendb' || type === 'mariadb' || type === 'oceanbase' || type === 'diros' || type === 'sphinx') return 'mysql';
         if (type === 'dameng') return 'dm';
         return type;
     };
@@ -65,12 +120,8 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
     };
 
     const parseSchemaAndName = (fullName: string): { schema: string; name: string } => {
-        const raw = String(fullName || '').trim();
-        const idx = raw.lastIndexOf('.');
-        if (idx > 0 && idx < raw.length - 1) {
-            return { schema: raw.substring(0, idx), name: raw.substring(idx + 1) };
-        }
-        return { schema: '', name: raw };
+        const parsed = splitQualifiedNameLast(fullName);
+        return { schema: parsed.parentPath, name: parsed.objectName };
     };
 
     const getCaseInsensitiveRawValue = (row: Record<string, any>, candidateKeys: string[]): any => {
@@ -150,12 +201,13 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
             case 'kingbase':
             case 'highgo':
             case 'vastbase':
-            case 'opengauss': {
+            case 'opengauss':
+            case 'gaussdb': {
                 const schemaRef = schema || 'public';
                 return [`SELECT pg_get_viewdef('${escapeSQLLiteral(schemaRef)}.${safeName}'::regclass, true) AS view_definition`];
             }
             case 'sqlserver':
-                return [`SELECT OBJECT_DEFINITION(OBJECT_ID('${escapeSQLLiteral(viewName)}')) AS view_definition`];
+                return buildSqlServerObjectDefinitionQueries('view', viewName, dbName, 'view_definition');
             case 'oracle':
             case 'dm':
                 if (schema) {
@@ -198,12 +250,13 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
             case 'kingbase':
             case 'highgo':
             case 'vastbase':
-            case 'opengauss': {
+            case 'opengauss':
+            case 'gaussdb': {
                 const schemaRef = schema || 'public';
                 return [`SELECT pg_get_functiondef(p.oid) AS routine_definition FROM pg_proc p JOIN pg_namespace n ON p.pronamespace = n.oid WHERE n.nspname = '${escapeSQLLiteral(schemaRef)}' AND p.proname = '${safeName}' LIMIT 1`];
             }
             case 'sqlserver':
-                return [`SELECT OBJECT_DEFINITION(OBJECT_ID('${escapeSQLLiteral(routineName)}')) AS routine_definition`];
+                return buildSqlServerObjectDefinitionQueries('routine', routineName, dbName, 'routine_definition');
             case 'oracle':
             case 'dm': {
                 const owner = schema ? escapeSQLLiteral(schema).toUpperCase() : (safeDbName ? safeDbName.toUpperCase() : '');
@@ -331,6 +384,19 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
             case 'oracle':
             case 'dm':
                 return row.view_definition || row.VIEW_DEFINITION || row.text || row.TEXT || Object.values(row)[0] || '';
+            case 'sqlserver': {
+                const directDefinition = getCaseInsensitiveRawValue(row, ['view_definition', 'definition']);
+                if (directDefinition !== undefined && directDefinition !== null && String(directDefinition).trim() !== '') {
+                    return String(directDefinition);
+                }
+                const helpTextDefinition = data
+                    .map((item) => getCaseInsensitiveRawValue(item, ['Text', 'text']))
+                    .filter((value) => value !== undefined && value !== null)
+                    .map((value) => String(value))
+                    .join('');
+                if (helpTextDefinition.trim()) return helpTextDefinition;
+                return String(Object.values(row)[0] || '');
+            }
             default:
                 return row.view_definition || row.VIEW_DEFINITION || row.sql || row.SQL || Object.values(row)[0] || '';
         }
@@ -382,6 +448,19 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
                 }
                 return JSON.stringify(row, null, 2);
             }
+            case 'sqlserver': {
+                const directDefinition = getCaseInsensitiveRawValue(data[0], ['routine_definition', 'definition']);
+                if (directDefinition !== undefined && directDefinition !== null && String(directDefinition).trim() !== '') {
+                    return String(directDefinition);
+                }
+                const helpTextDefinition = data
+                    .map((row) => getCaseInsensitiveRawValue(row, ['Text', 'text']))
+                    .filter((value) => value !== undefined && value !== null)
+                    .map((value) => String(value))
+                    .join('');
+                if (helpTextDefinition.trim()) return helpTextDefinition;
+                return String(Object.values(data[0])[0] || '');
+            }
             default: {
                 const row = data[0];
                 return row.routine_definition || row.ROUTINE_DEFINITION || Object.values(row)[0] || '';
@@ -413,112 +492,155 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
         }
     };
 
+    const loadDefinition = async (): Promise<{ success: boolean; definition?: string; error?: string }> => {
+        const conn = connections.find(c => c.id === tab.connectionId);
+        if (!conn) {
+            return { success: false, error: t('definition_viewer.error.connection_not_found') };
+        }
+
+        const dbName = tab.dbName || '';
+        const dialect = getMetadataDialect(conn);
+        const sphinxLike = isSphinxConnection(conn) && dialect === 'mysql';
+
+        let queries: string[];
+        let extractFn: (dialect: string, data: any[]) => string;
+        let resolvedObjectLabel: string;
+
+        if (tab.type === 'view-def') {
+            const viewName = tab.viewName || '';
+            if (!viewName) {
+                return { success: false, error: t('definition_viewer.error.view_name_empty') };
+            }
+            queries = buildShowViewQueries(dialect, viewName, dbName, tab.viewKind);
+            extractFn = extractViewDefinition;
+            resolvedObjectLabel = tab.viewKind === 'materialized'
+                ? t('definition_viewer.object.materialized_view')
+                : t('definition_viewer.object.view');
+        } else if (tab.type === 'event-def') {
+            const eventName = tab.eventName || '';
+            if (!eventName) {
+                return { success: false, error: t('definition_viewer.error.event_name_empty') };
+            }
+            queries = buildShowEventQueries(dialect, eventName, dbName);
+            extractFn = extractEventDefinition;
+            resolvedObjectLabel = t('definition_viewer.object.event');
+        } else {
+            const routineName = tab.routineName || '';
+            const routineType = tab.routineType || 'FUNCTION';
+            if (!routineName) {
+                return { success: false, error: t('definition_viewer.error.routine_name_empty') };
+            }
+            queries = buildShowRoutineQueries(dialect, routineName, routineType, dbName);
+            extractFn = extractRoutineDefinition;
+            resolvedObjectLabel = t('definition_viewer.object.routine');
+        }
+
+        if (!queries.length || String(queries[0] || '').startsWith('--')) {
+            return {
+                success: true,
+                definition: String(
+                    queries[0] || `-- ${t('definition_viewer.editor.unsupported_object_definition')}`,
+                ),
+            };
+        }
+
+        try {
+            const config = {
+                ...conn.config,
+                port: Number(conn.config.port),
+                password: conn.config.password || '',
+                database: conn.config.database || '',
+                useSSH: conn.config.useSSH || false,
+                ssh: conn.config.ssh || { host: '', port: 22, user: '', password: '', keyPath: '' }
+            };
+
+            const result = await runQueryCandidates(config, dbName, queries);
+
+            if (result.success && Array.isArray(result.data) && result.data.length > 0) {
+                return { success: true, definition: extractFn(dialect, result.data) };
+            }
+
+            if (result.success) {
+                if (sphinxLike) {
+                    const version = await getVersionHint(config, dbName);
+                    const versionText = version
+                        ? t('definition_viewer.editor.sphinx.version_suffix', { version })
+                        : '';
+                    return {
+                        success: true,
+                        definition: `-- ${t('definition_viewer.editor.sphinx.empty_result', {
+                            version: versionText,
+                            object: resolvedObjectLabel,
+                        })}\n-- ${t('definition_viewer.editor.sphinx.compat_queries_hint')}`,
+                    };
+                }
+                return {
+                    success: true,
+                    definition: `-- ${t('definition_viewer.editor.object_definition_not_found', {
+                        object: resolvedObjectLabel,
+                    })}`,
+                };
+            }
+
+            if (sphinxLike) {
+                const version = await getVersionHint(config, dbName);
+                const versionText = version
+                    ? t('definition_viewer.editor.sphinx.version_suffix', { version })
+                    : '';
+                const failedMessage = result.message
+                    ? `${t('definition_viewer.editor.sphinx.failed_message_label')}: ${result.message}`
+                    : t('definition_viewer.editor.sphinx.failed_message_unknown');
+                return {
+                    success: true,
+                    definition: `-- ${t('definition_viewer.editor.sphinx.unsupported_query', {
+                        version: versionText,
+                        object: resolvedObjectLabel,
+                    })}\n-- ${failedMessage}`,
+                };
+            }
+
+            return {
+                success: false,
+                error: result.message || t('definition_viewer.error.query_failed'),
+            };
+        } catch (e: any) {
+            return {
+                success: false,
+                error: t('definition_viewer.error.query_failed_detail', {
+                    detail: e?.message || String(e),
+                }),
+            };
+        }
+    };
+
     useEffect(() => {
-        const loadDefinition = async () => {
+        let cancelled = false;
+        const syncDefinition = async () => {
             setLoading(true);
             setError(null);
-
-            const conn = connections.find(c => c.id === tab.connectionId);
-            if (!conn) {
-                setError(t('definition_viewer.error.connection_not_found'));
-                setLoading(false);
+            const result = await loadDefinition();
+            if (cancelled) {
                 return;
             }
-
-            const dbName = tab.dbName || '';
-            const dialect = getMetadataDialect(conn);
-            const sphinxLike = isSphinxConnection(conn) && dialect === 'mysql';
-
-            let queries: string[];
-            let extractFn: (dialect: string, data: any[]) => string;
-            let objectLabel: string;
-
-            if (tab.type === 'view-def') {
-                const viewName = tab.viewName || '';
-                if (!viewName) {
-                    setError(t('definition_viewer.error.view_name_empty'));
-                    setLoading(false);
-                    return;
-                }
-                queries = buildShowViewQueries(dialect, viewName, dbName, tab.viewKind);
-                extractFn = extractViewDefinition;
-                objectLabel = tab.viewKind === 'materialized'
-                    ? t('definition_viewer.object.materialized_view')
-                    : t('definition_viewer.object.view');
-            } else if (tab.type === 'event-def') {
-                const eventName = tab.eventName || '';
-                if (!eventName) {
-                    setError(t('definition_viewer.error.event_name_empty'));
-                    setLoading(false);
-                    return;
-                }
-                queries = buildShowEventQueries(dialect, eventName, dbName);
-                extractFn = extractEventDefinition;
-                objectLabel = t('definition_viewer.object.event');
+            if (result.success) {
+                loadedDefinitionKeyRef.current = objectIdentityKey;
+                setDefinition(String(result.definition || ''));
             } else {
-                const routineName = tab.routineName || '';
-                const routineType = tab.routineType || 'FUNCTION';
-                if (!routineName) {
-                    setError(t('definition_viewer.error.routine_name_empty'));
-                    setLoading(false);
-                    return;
-                }
-                queries = buildShowRoutineQueries(dialect, routineName, routineType, dbName);
-                extractFn = extractRoutineDefinition;
-                objectLabel = t('definition_viewer.object.routine');
-            }
-
-            if (!queries.length || String(queries[0] || '').startsWith('--')) {
-                setDefinition(String(queries[0] || `-- ${t('definition_viewer.editor.unsupported_object_definition')}`));
-                setLoading(false);
-                return;
-            }
-
-            try {
-                const config = {
-                    ...conn.config,
-                    port: Number(conn.config.port),
-                    password: conn.config.password || '',
-                    database: conn.config.database || '',
-                    useSSH: conn.config.useSSH || false,
-                    ssh: conn.config.ssh || { host: '', port: 22, user: '', password: '', keyPath: '' }
-                };
-
-                const result = await runQueryCandidates(config, dbName, queries);
-
-                if (result.success && Array.isArray(result.data) && result.data.length > 0) {
-                    const def = extractFn(dialect, result.data);
-                    setDefinition(def);
-                    return;
-                }
-
-                if (result.success) {
-                    if (sphinxLike) {
-                        const version = await getVersionHint(config, dbName);
-                        const versionText = version ? t('definition_viewer.editor.sphinx.version_suffix', { version }) : '';
-                        setDefinition(`-- ${t('definition_viewer.editor.sphinx.empty_result', { version: versionText, object: objectLabel })}\n-- ${t('definition_viewer.editor.sphinx.compat_queries_hint')}`);
-                        return;
-                    }
-                    setDefinition(`-- ${t('definition_viewer.editor.object_definition_not_found', { object: objectLabel })}`);
-                } else if (sphinxLike) {
-                    const version = await getVersionHint(config, dbName);
-                    const versionText = version ? t('definition_viewer.editor.sphinx.version_suffix', { version }) : '';
-                    const failedMessage = result.message
-                        ? `${t('definition_viewer.editor.sphinx.failed_message_label')}: ${result.message}`
-                        : t('definition_viewer.editor.sphinx.failed_message_unknown');
-                    setDefinition(`-- ${t('definition_viewer.editor.sphinx.unsupported_query', { version: versionText, object: objectLabel })}\n-- ${failedMessage}`);
-                } else {
-                    setError(result.message || t('definition_viewer.error.query_failed'));
-                }
-            } catch (e: any) {
-                setError(t('definition_viewer.error.query_failed_detail', { detail: e?.message || String(e) }));
-            } finally {
-                setLoading(false);
+                setError(result.error || t('definition_viewer.error.query_failed'));
             }
+            setLoading(false);
         };
 
-        loadDefinition();
-    }, [tab.connectionId, tab.dbName, tab.viewName, tab.viewKind, tab.eventName, tab.routineName, tab.routineType, tab.type, connections, t]);
+        syncDefinition();
+
+        return () => {
+            cancelled = true;
+        };
+    }, [tab.connectionId, tab.dbName, tab.viewName, tab.viewKind, tab.eventName, tab.routineName, tab.routineType, tab.type, connections, objectIdentityKey, t]);
+
+    useEffect(() => () => {
+        isMountedRef.current = false;
+    }, []);
 
     const objectLabel = tab.type === 'view-def'
         ? (tab.viewKind === 'materialized' ? t('definition_viewer.object.materialized_view') : t('definition_viewer.object.view'))
@@ -529,6 +651,44 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
     const loadingTip = tab.type === 'view-def'
         ? t('definition_viewer.loading.view_definition')
         : (tab.type === 'event-def' ? t('definition_viewer.loading.event_definition') : t('definition_viewer.loading.routine_definition'));
+    const normalizedObjectName = String(objectName || '').trim();
+    const displayedDefinition = loadedDefinitionKeyRef.current === objectIdentityKey ? definition : '';
+    const hasDefinition = String(displayedDefinition || '').trim() !== '';
+
+    const openObjectEditQuery = async () => {
+        if (!normalizedObjectName || openingObjectEdit) return;
+        const dbName = String(tab.dbName || '').trim();
+        setOpeningObjectEdit(true);
+        setError(null);
+        try {
+            const result = await loadDefinition();
+            if (!isMountedRef.current) {
+                return;
+            }
+            if (!result.success) {
+                setError(result.error || t('definition_viewer.error.query_failed'));
+                return;
+            }
+            const latestDefinition = String(result.definition || '');
+            loadedDefinitionKeyRef.current = objectIdentityKey;
+            setDefinition(latestDefinition);
+            const query = buildEditableDefinitionSql(tab, latestDefinition, objectLabel, normalizedObjectName);
+            setActiveContext({ connectionId: tab.connectionId, dbName });
+            addTab({
+                id: `query-edit-object-${tab.connectionId}-${dbName}-${Date.now()}`,
+                title: `修改${objectLabel}: ${normalizedObjectName}`,
+                type: 'query',
+                connectionId: tab.connectionId,
+                dbName,
+                query,
+                queryMode: 'object-edit',
+            });
+        } finally {
+            if (isMountedRef.current) {
+                setOpeningObjectEdit(false);
+            }
+        }
+    };
 
     if (loading) {
         return (
@@ -538,7 +698,7 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
         );
     }
 
-    if (error) {
+    if (error && !hasDefinition) {
         return (
             <div style={{ padding: 16 }}>
                 <Alert type="error" message={t('definition_viewer.error.load_failed')} description={error} showIcon />
@@ -548,17 +708,27 @@ const DefinitionViewer: React.FC<DefinitionViewerProps> = ({ tab }) => {
 
     return (
         <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
-            <div style={{ padding: '8px 16px', borderBottom: darkMode ? '1px solid #303030' : '1px solid #f0f0f0' }}>
-                <strong>{objectLabel}: </strong>{objectName}
-                {tab.dbName && <span style={{ marginLeft: 16, color: '#888' }}>{t('definition_viewer.field.database')}: {tab.dbName}</span>}
-                {tab.routineType && <span style={{ marginLeft: 16, color: '#888' }}>{t('definition_viewer.field.type')}: {tab.routineType}</span>}
+            <div style={{ padding: '8px 16px', borderBottom: darkMode ? '1px solid #303030' : '1px solid #f0f0f0', display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12 }}>
+                <div style={{ minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+                    <strong>{objectLabel}: </strong>{objectName}
+                    {tab.dbName && <span style={{ marginLeft: 16, color: '#888' }}>{t('definition_viewer.field.database')}: {tab.dbName}</span>}
+                    {tab.routineType && <span style={{ marginLeft: 16, color: '#888' }}>{t('definition_viewer.field.type')}: {tab.routineType}</span>}
+                </div>
+                <Button size="small" icon={<EditOutlined />} onClick={openObjectEditQuery} disabled={!normalizedObjectName} loading={openingObjectEdit}>
+                    对象修改
+                </Button>
             </div>
+            {error && hasDefinition && (
+                <div style={{ padding: '8px 16px 0' }}>
+                    <Alert type="warning" message="刷新最新定义失败" description={error} showIcon />
+                </div>
+            )}
             <div style={{ flex: 1, minHeight: 0 }}>
                 <Editor
                     height="100%"
                     language="sql"
                     theme={darkMode ? 'transparent-dark' : 'transparent-light'}
-                    value={definition}
+                    value={displayedDefinition}
                     options={{
                         readOnly: true,
                         minimap: { enabled: false },
diff --git a/frontend/src/components/DriverManagerModal.test.tsx b/frontend/src/components/DriverManagerModal.test.tsx
new file mode 100644
index 0000000..affbb65
--- /dev/null
+++ b/frontend/src/components/DriverManagerModal.test.tsx
@@ -0,0 +1,407 @@
+import React from 'react';
+import { readFileSync } from 'node:fs';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import DriverManagerModal from './DriverManagerModal';
+
+const connectionModalSource = readFileSync(new URL('./ConnectionModal.tsx', import.meta.url), 'utf8');
+const driverManagerModalSource = readFileSync(new URL('./DriverManagerModal.tsx', import.meta.url), 'utf8');
+const sidebarSource = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
+
+const storeState = vi.hoisted(() => ({
+  theme: 'light',
+  appearance: {
+    enabled: true,
+    opacity: 1,
+    blur: 0,
+    uiVersion: 'legacy',
+  },
+}));
+
+const backendApp = vi.hoisted(() => ({
+  CheckDriverNetworkStatus: vi.fn(),
+  DownloadDriverPackage: vi.fn(),
+  GetDriverVersionList: vi.fn(),
+  GetDriverVersionPackageSize: vi.fn(),
+  GetDriverStatusList: vi.fn(),
+  InstallLocalDriverPackage: vi.fn(),
+  OpenDriverDownloadDirectory: vi.fn(),
+  RemoveDriverPackage: vi.fn(),
+  SelectDriverPackageDirectory: vi.fn(),
+  SelectDriverPackageFile: vi.fn(),
+}));
+
+const runtimeApi = vi.hoisted(() => ({
+  EventsOn: vi.fn(() => vi.fn()),
+}));
+
+const messageApi = vi.hoisted(() => ({
+  error: vi.fn(),
+  success: vi.fn(),
+  warning: vi.fn(),
+  info: vi.fn(),
+}));
+
+vi.mock('../store', () => ({
+  useStore: (selector: (state: typeof storeState) => any) => selector(storeState),
+}));
+
+vi.mock('../../wailsjs/go/app/App', () => backendApp);
+vi.mock('../../wailsjs/runtime/runtime', () => runtimeApi);
+
+vi.mock('@ant-design/icons', () => {
+  const Icon = () => <span />;
+  return {
+    DeleteOutlined: Icon,
+    DownloadOutlined: Icon,
+    FileSearchOutlined: Icon,
+    FolderOpenOutlined: Icon,
+    InfoCircleFilled: Icon,
+    ReloadOutlined: Icon,
+  };
+});
+
+describe('driver-agent update prompt placement', () => {
+  it('keeps revision mismatch prompts inside driver manager only', () => {
+    expect(driverManagerModalSource).toContain('需要重装');
+    expect(driverManagerModalSource).toContain('row.needsUpdate');
+
+    expect(connectionModalSource).not.toContain('当前数据源驱动代理建议重装');
+    expect(connectionModalSource).not.toContain('去驱动管理重装');
+
+    expect(sidebarSource).not.toContain('warnIfConnectionDriverAgentNeedsUpdate');
+    expect(sidebarSource).not.toContain('driver-agent-update-');
+    expect(sidebarSource).not.toContain('驱动代理需要重装：');
+  });
+});
+
+vi.mock('antd', () => {
+  const Button: any = ({ children, disabled, loading, onClick, ...rest }: any) => (
+    <button type="button" disabled={disabled || loading} onClick={onClick} {...rest}>
+      {children}
+    </button>
+  );
+
+  const Input: any = ({ value, onChange, placeholder }: any) => (
+    <input value={value} onChange={onChange} placeholder={placeholder} />
+  );
+  Input.Search = ({ value, onChange, placeholder }: any) => (
+    <input value={value} onChange={onChange} placeholder={placeholder} />
+  );
+
+  const Select = ({ value, options, disabled, loading, placeholder, onOpenChange, onChange }: any) => (
+    <select
+      value={value}
+      disabled={disabled}
+      data-select-loading={String(loading)}
+      data-select-placeholder={placeholder}
+      onFocus={() => onOpenChange?.(true)}
+      onChange={(event) => onChange?.(event.target.value)}
+    >
+      <option value="">{placeholder || ''}</option>
+      {(options || []).flatMap((item: any) => {
+        if (Array.isArray(item?.options)) {
+          return item.options.map((grouped: any) => (
+            <option key={grouped.value} value={grouped.value}>
+              {String(grouped.label || grouped.value)}
+            </option>
+          ));
+        }
+        return (
+          <option key={item.value} value={item.value}>
+            {String(item.label || item.value)}
+          </option>
+        );
+      })}
+    </select>
+  );
+  const Progress = () => <div data-progress="true" />;
+  const Tag = ({ children }: any) => <span>{children}</span>;
+  const Switch = ({ checked, onChange, disabled }: any) => (
+    <button type="button" disabled={disabled} data-switch-checked={String(checked)} onClick={() => onChange?.(!checked)}>
+      switch
+    </button>
+  );
+  const Space = ({ children }: any) => <div>{children}</div>;
+  const Text = ({ children }: any) => <span>{children}</span>;
+  const Paragraph = ({ children }: any) => <div>{children}</div>;
+  const Typography = { Paragraph, Text };
+  const Alert = ({ children, message, description }: any) => <div>{children}{message}{description}</div>;
+  const Empty: any = ({ description }: any) => <div>{description}</div>;
+  Empty.PRESENTED_IMAGE_SIMPLE = null;
+  const Collapse = ({ items }: any) => (
+    <div>{items?.map((item: any) => <div key={item.key}>{item.label}{item.children}</div>)}</div>
+  );
+  const Modal: any = ({ children, open, footer, title }: any) => (open ? (
+    <section data-modal-title={title}>
+      {children}
+      <div>{footer}</div>
+    </section>
+  ) : null);
+  Modal.confirm = vi.fn();
+
+  return {
+    Alert,
+    Button,
+    Collapse,
+    Empty,
+    Input,
+    Modal,
+    Progress,
+    Select,
+    Space,
+    Switch,
+    Tag,
+    Typography,
+    message: messageApi,
+  };
+});
+
+const flushPromises = async () => {
+  await act(async () => {
+    await Promise.resolve();
+    await Promise.resolve();
+  });
+};
+
+const textContent = (node: any): string =>
+  (node.children || [])
+    .map((item: any) => (typeof item === 'string' ? item : textContent(item)))
+    .join('');
+
+const findButton = (renderer: ReactTestRenderer, text: string) =>
+  renderer.root.findAll((node) => node.type === 'button' && textContent(node).includes(text))[0];
+
+describe('DriverManagerModal toolbar actions', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    backendApp.GetDriverStatusList.mockResolvedValue({
+      success: true,
+      data: {
+        downloadDir: 'D:/drivers',
+        drivers: [
+          {
+            type: 'duckdb',
+            name: 'DuckDB',
+            builtIn: false,
+            pinnedVersion: '2.5.6',
+            runtimeAvailable: false,
+            packageInstalled: false,
+            connectable: false,
+            defaultDownloadUrl: 'builtin://activate/duckdb',
+            message: '未启用',
+          },
+        ],
+      },
+    });
+    backendApp.CheckDriverNetworkStatus.mockResolvedValue({
+      success: true,
+      data: {
+        reachable: true,
+        summary: 'ok',
+        recommendedProxy: false,
+        proxyConfigured: false,
+        checks: [],
+      },
+    });
+    backendApp.GetDriverVersionList.mockResolvedValue({
+      success: true,
+      data: {
+        versions: [{ version: '2.5.6', downloadUrl: 'builtin://activate/duckdb', recommended: true }],
+      },
+    });
+    backendApp.DownloadDriverPackage.mockImplementation(() => new Promise(() => {}));
+    backendApp.OpenDriverDownloadDirectory.mockResolvedValue({ success: true });
+    backendApp.SelectDriverPackageDirectory.mockResolvedValue({ success: true, data: { path: 'D:/drivers/import' } });
+  });
+
+  it('keeps directory tools enabled while a single driver install is running', async () => {
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<DriverManagerModal open onClose={vi.fn()} />);
+    });
+    await flushPromises();
+
+    const installButton = findButton(renderer!, '安装启用');
+    const openDirButtonBefore = findButton(renderer!, '打开驱动目录');
+    const importDirButtonBefore = findButton(renderer!, '导入驱动目录');
+    const installAllButtonBefore = findButton(renderer!, '安装所有驱动');
+
+    expect(openDirButtonBefore.props.disabled).toBeFalsy();
+    expect(importDirButtonBefore.props.disabled).toBeFalsy();
+    expect(installAllButtonBefore.props.disabled).toBeFalsy();
+
+    await act(async () => {
+      installButton.props.onClick();
+      await Promise.resolve();
+    });
+
+    const openDirButtonAfter = findButton(renderer!, '打开驱动目录');
+    const importDirButtonAfter = findButton(renderer!, '导入驱动目录');
+    const installAllButtonAfter = findButton(renderer!, '安装所有驱动');
+
+    expect(openDirButtonAfter.props.disabled).toBeFalsy();
+    expect(importDirButtonAfter.props.disabled).toBeFalsy();
+    expect(installAllButtonAfter.props.disabled).toBe(true);
+  });
+
+  it('releases install action when the driver install watchdog expires', async () => {
+    vi.useFakeTimers();
+    try {
+      let renderer: ReactTestRenderer;
+      await act(async () => {
+        renderer = create(<DriverManagerModal open onClose={vi.fn()} />);
+      });
+      await flushPromises();
+
+      const installButton = findButton(renderer!, '安装启用');
+      await act(async () => {
+        installButton.props.onClick();
+        await Promise.resolve();
+      });
+
+      expect(findButton(renderer!, '安装启用').props.disabled).toBe(true);
+
+      await act(async () => {
+        vi.advanceTimersByTime(12 * 60 * 1000);
+        await Promise.resolve();
+      });
+
+      expect(findButton(renderer!, '安装启用').props.disabled).toBeFalsy();
+      expect(messageApi.error).toHaveBeenCalledWith(expect.stringContaining('超过 12 分钟仍未完成'));
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it('reinstalls stale MongoDB v2 drivers with the v1 compatibility default', async () => {
+    vi.useFakeTimers({ shouldAdvanceTime: true });
+    try {
+      vi.setSystemTime(new Date(Date.now() + 2 * 60 * 1000));
+      backendApp.GetDriverStatusList.mockResolvedValue({
+        success: true,
+        data: {
+          downloadDir: 'D:/drivers',
+          drivers: [
+            {
+              type: 'mongodb',
+              name: 'MongoDB',
+              builtIn: false,
+              pinnedVersion: '1.17.9',
+              installedVersion: '2.5.0',
+              runtimeAvailable: true,
+              packageInstalled: true,
+              connectable: true,
+              needsUpdate: true,
+              defaultDownloadUrl: 'builtin://activate/mongodb',
+              message: '建议重装',
+            },
+          ],
+        },
+      });
+      backendApp.GetDriverVersionList.mockResolvedValue({
+        success: true,
+        data: {
+          versions: [
+            { version: '2.5.0', downloadUrl: 'builtin://activate/mongodb?version=2.5.0' },
+            { version: '1.17.9', downloadUrl: 'builtin://activate/mongodb', recommended: true },
+          ],
+        },
+      });
+      backendApp.DownloadDriverPackage.mockResolvedValue({ success: true });
+
+      let renderer: ReactTestRenderer;
+      await act(async () => {
+        renderer = create(<DriverManagerModal open onClose={vi.fn()} />);
+      });
+      await flushPromises();
+
+      const reinstallButton = findButton(renderer!, '重装驱动');
+      await act(async () => {
+        await reinstallButton.props.onClick();
+      });
+
+      expect(backendApp.DownloadDriverPackage).toHaveBeenCalledWith(
+        'mongodb',
+        '1.17.9',
+        'builtin://activate/mongodb',
+        'D:/drivers',
+      );
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it('allows switching installed TDengine drivers to a historical compatible version', async () => {
+    backendApp.GetDriverStatusList.mockResolvedValue({
+      success: true,
+      data: {
+        downloadDir: 'D:/drivers',
+        drivers: [
+          {
+            type: 'tdengine',
+            name: 'TDengine',
+            builtIn: false,
+            pinnedVersion: '3.7.8',
+            installedVersion: '3.7.8',
+            runtimeAvailable: true,
+            packageInstalled: true,
+            connectable: true,
+            defaultDownloadUrl: 'builtin://activate/tdengine',
+            message: '已启用',
+          },
+        ],
+      },
+    });
+    backendApp.GetDriverVersionList.mockResolvedValue({
+      success: true,
+      data: {
+        versions: [
+          { version: '3.7.8', downloadUrl: 'builtin://activate/tdengine', recommended: true },
+          { version: '3.3.1', downloadUrl: 'builtin://activate/tdengine?channel=history&version=3.3.1' },
+        ],
+      },
+    });
+    backendApp.DownloadDriverPackage.mockResolvedValue({ success: true });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<DriverManagerModal open onClose={vi.fn()} />);
+    });
+    await flushPromises();
+
+    const refreshButton = findButton(renderer!, '刷新');
+    await act(async () => {
+      await refreshButton.props.onClick();
+    });
+    await flushPromises();
+
+    const versionSelect = renderer!.root.findByType('select');
+    await act(async () => {
+      versionSelect.props.onFocus();
+    });
+    await flushPromises();
+    expect(backendApp.GetDriverVersionList).toHaveBeenCalledWith('tdengine', '');
+
+    const reloadedVersionSelect = renderer!.root.findByType('select');
+    await act(async () => {
+      reloadedVersionSelect.props.onChange({ target: { value: '3.3.1@@builtin://activate/tdengine?channel=history&version=3.3.1' } });
+    });
+    await flushPromises();
+
+    const switchButtons = renderer!.root.findAll((node) => node.type === 'button' && textContent(node).includes('切换版本'));
+    expect(switchButtons).toHaveLength(1);
+    const switchButton = switchButtons[0];
+    await act(async () => {
+      await switchButton.props.onClick();
+    });
+
+    expect(backendApp.DownloadDriverPackage).toHaveBeenCalledWith(
+      'tdengine',
+      '3.3.1',
+      'builtin://activate/tdengine?channel=history&version=3.3.1',
+      'D:/drivers',
+    );
+  });
+});
diff --git a/frontend/src/components/DriverManagerModal.tsx b/frontend/src/components/DriverManagerModal.tsx
index df32375..670b253 100644
--- a/frontend/src/components/DriverManagerModal.tsx
+++ b/frontend/src/components/DriverManagerModal.tsx
@@ -8,6 +8,7 @@ import { useStore } from '../store';
 import { t } from '../i18n';
 import { normalizeOpacityForPlatform, resolveAppearanceValues } from '../utils/appearance';
 import { isBackendCancelledResult } from '../utils/connectionExport';
+import { normalizeDriverProgressUpdate, type DriverProgressState } from '../utils/driverProgress';
 import { buildDriverManagerWorkbenchTheme } from '../utils/driverManagerWorkbenchTheme';
 import {
   getDriverLocalImportButtonLabel,
@@ -60,12 +61,6 @@ type DriverProgressEvent = {
   percent?: number;
 };
 
-type ProgressState = {
-  status: 'start' | 'downloading' | 'done' | 'error';
-  message: string;
-  percent: number;
-};
-
 type DriverLocalSourceCode = 'file' | 'directory';
 type DriverActionKind = '' | 'install' | 'remove' | 'local';
 type DriverBatchActionKind = '' | 'install-all' | 'reinstall-updates' | 'remove-all';
@@ -135,6 +130,7 @@ const buildVersionOptionKey = (option: DriverVersionOption) => `${option.version
 const buildVersionSizeLoadingKey = (driverType: string, optionKey: string) => `${driverType}@@${optionKey}`;
 const DRIVER_STATUS_CACHE_TTL_MS = 60 * 1000;
 const DRIVER_NETWORK_CACHE_TTL_MS = 5 * 60 * 1000;
+const DRIVER_INSTALL_WATCHDOG_MS = 12 * 60 * 1000;
 const normalizeDriverSearchText = (value: string) => String(value || '').trim().toLowerCase();
 const isSlimBuildInstallUnavailable = (row: DriverStatusRow) => row.reasonCode === 'slim_build_missing_driver' && !row.packageInstalled;
 const resolveDriverBatchActionLabel = (actionKind: DriverBatchActionKind) => {
@@ -482,7 +478,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
   const [actionState, setActionState] = useState<{ driverType: string; kind: DriverActionKind }>({ driverType: '', kind: '' });
   const [batchAction, setBatchAction] = useState<DriverBatchActionKind>('');
   const [batchProgress, setBatchProgress] = useState<DriverBatchProgressState | null>(null);
-  const [progressMap, setProgressMap] = useState<Record<string, ProgressState>>({});
+  const [progressMap, setProgressMap] = useState<Record<string, DriverProgressState>>({});
   const [operationLogMap, setOperationLogMap] = useState<Record<string, DriverLogEntry[]>>({});
   const [logDriverType, setLogDriverType] = useState('');
   const [logModalOpen, setLogModalOpen] = useState(false);
@@ -493,7 +489,9 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
   const [versionLoadingMap, setVersionLoadingMap] = useState<Record<string, boolean>>({});
   const [versionSizeLoadingMap, setVersionSizeLoadingMap] = useState<Record<string, boolean>>({});
   const downloadDirRef = useRef(downloadDir);
-  const batchBusy = batchDirectoryImporting || batchAction !== '' || actionState.kind !== '';
+  const progressMapRef = useRef<Record<string, DriverProgressState>>({});
+  const batchBusy = batchDirectoryImporting || batchAction !== '';
+  const installMutatingBusy = batchBusy || actionState.kind !== '';
 
   useEffect(() => {
     downloadDirRef.current = downloadDir;
@@ -515,6 +513,31 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
     )
   ), []);
 
+  const updateDriverProgress = useCallback((driverType: string, incoming: DriverProgressState) => {
+    const normalized = String(driverType || '').trim().toLowerCase();
+    if (!normalized) {
+      return undefined;
+    }
+    const nextProgress = normalizeDriverProgressUpdate(progressMapRef.current[normalized], incoming);
+    progressMapRef.current = {
+      ...progressMapRef.current,
+      [normalized]: nextProgress,
+    };
+    setProgressMap(progressMapRef.current);
+    return nextProgress;
+  }, []);
+
+  const clearDriverProgress = useCallback((driverType: string) => {
+    const normalized = String(driverType || '').trim().toLowerCase();
+    if (!normalized) {
+      return;
+    }
+    const next = { ...progressMapRef.current };
+    delete next[normalized];
+    progressMapRef.current = next;
+    setProgressMap(next);
+  }, []);
+
   const modalBodyStyle = useMemo<React.CSSProperties>(() => ({
     maxHeight: 'calc(100vh - 220px)',
     overflowY: 'auto',
@@ -779,6 +802,8 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
           return prev;
         }
         const preferred =
+          (row.needsUpdate ? options.find((option) => option.version === row.pinnedVersion) : undefined) ||
+          (row.needsUpdate ? options.find((option) => option.recommended) : undefined) ||
           options.find((option) => option.version === row.installedVersion) ||
           options.find((option) => option.version === row.pinnedVersion) ||
           options.find((option) => option.recommended) ||
@@ -912,18 +937,19 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
         }
         const messageText = String(event.message || '').trim();
         const percent = Math.max(0, Math.min(100, Number(event.percent || 0)));
-        setProgressMap((prev) => ({
-          ...prev,
-          [driverType]: {
-            status,
-            message: messageText,
-            percent,
-          },
-        }));
-        const progressText = `${Math.round(percent)}%`;
-        const statusText = String(status || '').toUpperCase();
-        const lineText = `[${statusText}] ${messageText || '-'} (${progressText})`;
-        const lineSignature = `${statusText}|${messageText || '-'}`;
+        const nextProgress = updateDriverProgress(driverType, {
+          status,
+          message: messageText,
+          percent,
+        });
+        if (!nextProgress) {
+          return;
+        }
+        const progressText = `${Math.round(nextProgress.percent)}%`;
+        const statusText = String(nextProgress.status || '').toUpperCase();
+        const logMessageText = nextProgress.message || '-';
+        const lineText = `[${statusText}] ${logMessageText} (${progressText})`;
+        const lineSignature = `${statusText}|${logMessageText}`;
         appendOperationLog(driverType, lineText, lineSignature, 'update-last');
       });
     } catch (error) {
@@ -934,7 +960,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
         off();
       }
     };
-  }, [appendOperationLog]);
+  }, [appendOperationLog, updateDriverProgress]);
 
   const resolveLocalImportVersion = useCallback((row: DriverStatusRow) => {
     const options = versionMap[row.type] || [];
@@ -946,20 +972,41 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
     return selectedOption?.version || row.pinnedVersion || '';
   }, [selectedVersionMap, versionMap]);
 
+  const resolveSelectedVersionOption = useCallback((row: DriverStatusRow) => {
+    const options = versionMap[row.type] || [];
+    const selectedKey = selectedVersionMap[row.type];
+    return (
+      options.find((item) => buildVersionOptionKey(item) === selectedKey) ||
+      options.find((item) => item.recommended) ||
+      options[0]
+    );
+  }, [selectedVersionMap, versionMap]);
+
+  const resolveInstalledDriverVersion = useCallback((row: DriverStatusRow) => (
+    String(row.installedVersion || '').trim() || String(row.pinnedVersion || '').trim()
+  ), []);
+
+  const isDriverVersionSwitchPending = useCallback((row: DriverStatusRow) => {
+    if (row.builtIn || (!row.packageInstalled && !row.connectable)) {
+      return false;
+    }
+    const selectedVersion = String(resolveSelectedVersionOption(row)?.version || '').trim();
+    const installedVersion = resolveInstalledDriverVersion(row);
+    return !!selectedVersion && !!installedVersion && selectedVersion !== installedVersion;
+  }, [resolveInstalledDriverVersion, resolveSelectedVersionOption]);
+
   const installDriver = useCallback(async (
     row: DriverStatusRow,
     actionOptions?: { silentToast?: boolean; skipRefresh?: boolean },
   ) => {
     setActionState({ driverType: row.type, kind: 'install' });
-    setProgressMap((prev) => ({
-      ...prev,
-      [row.type]: {
-        status: 'start',
-        message: t('driver.modal.progress.install.start'),
-        percent: 0,
-      },
-    }));
+    updateDriverProgress(row.type, {
+      status: 'start',
+      message: t('driver.modal.progress.install.start'),
+      percent: 0,
+    });
     appendOperationLog(row.type, t('driver.modal.operationLog.autoInstall.start'));
+    let watchdogId: ReturnType<typeof setTimeout> | undefined;
     try {
       let versionOptions = versionMap[row.type] || [];
       if (versionOptions.length === 0) {
@@ -968,12 +1015,25 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
       const selectedKey = selectedVersionMap[row.type];
       const selectedOption =
         versionOptions.find((item) => buildVersionOptionKey(item) === selectedKey) ||
+        (row.needsUpdate ? versionOptions.find((item) => item.version === row.pinnedVersion) : undefined) ||
+        (row.needsUpdate ? versionOptions.find((item) => item.recommended) : undefined) ||
         versionOptions.find((item) => item.recommended) ||
         versionOptions[0];
       const selectedVersion = selectedOption?.version || row.pinnedVersion || '';
       const selectedDownloadURL = selectedOption?.downloadUrl || row.defaultDownloadUrl || '';
 
-      const result = await DownloadDriverPackage(row.type, selectedVersion, selectedDownloadURL, downloadDir);
+      const installWatchdog = new Promise<never>((_, reject) => {
+        watchdogId = setTimeout(() => {
+          reject(new Error(`安装 ${row.name} 超过 ${Math.round(DRIVER_INSTALL_WATCHDOG_MS / 60000)} 分钟仍未完成。后台任务可能仍在下载或构建，请稍后刷新状态；如多次出现，请检查代理或改用本地驱动包导入。`));
+        }, DRIVER_INSTALL_WATCHDOG_MS);
+      });
+      const result = await Promise.race([
+        DownloadDriverPackage(row.type, selectedVersion, selectedDownloadURL, downloadDir),
+        installWatchdog,
+      ]);
+      if (watchdogId) {
+        clearTimeout(watchdogId);
+      }
       if (!result?.success) {
         const errText = resolveDriverErrorMessage(
           result?.message,
@@ -1001,10 +1061,25 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
         await refreshStatus(false);
       }
       return true;
+    } catch (error) {
+      const errText = error instanceof Error ? error.message : String(error || `安装 ${row.name} 失败`);
+      appendOperationLog(row.type, `[ERROR] ${errText}`);
+      updateDriverProgress(row.type, {
+        status: 'error',
+        message: errText,
+        percent: 0,
+      });
+      if (!actionOptions?.silentToast) {
+        message.error(errText);
+      }
+      return false;
     } finally {
+      if (watchdogId) {
+        clearTimeout(watchdogId);
+      }
       setActionState({ driverType: '', kind: '' });
     }
-  }, [appendOperationLog, downloadDir, loadVersionOptions, refreshStatus, resolveDriverErrorMessage, selectedVersionMap, versionMap]);
+  }, [appendOperationLog, downloadDir, loadVersionOptions, refreshStatus, resolveDriverErrorMessage, selectedVersionMap, updateDriverProgress, versionMap]);
 
   const installDriverFromLocalPath = useCallback(async (
     row: DriverStatusRow,
@@ -1022,14 +1097,11 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
     }
 
     setActionState({ driverType: row.type, kind: 'local' });
-    setProgressMap((prev) => ({
-      ...prev,
-      [row.type]: {
-        status: 'start',
-        message: t('driver.modal.progress.localImport.start'),
-        percent: 0,
-      },
-    }));
+    updateDriverProgress(row.type, {
+      status: 'start',
+      message: t('driver.modal.progress.localImport.start'),
+      percent: 0,
+    });
     const selectedVersion = resolveLocalImportVersion(row);
     const versionTip = formatDriverVersionTip(selectedVersion);
     const logVersionTip = formatDriverLogVersionTip(selectedVersion);
@@ -1068,7 +1140,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
     } finally {
       setActionState({ driverType: '', kind: '' });
     }
-  }, [appendOperationLog, downloadDir, refreshStatus, resolveDriverErrorMessage, resolveLocalImportVersion]);
+  }, [appendOperationLog, downloadDir, refreshStatus, resolveDriverErrorMessage, resolveLocalImportVersion, updateDriverProgress]);
 
   const installDriverFromLocalFile = useCallback(async (row: DriverStatusRow) => {
     const fileRes = await SelectDriverPackageFile(downloadDir);
@@ -1223,11 +1295,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
       if (!options?.silentToast) {
         message.success(t('driver.modal.success.removeDriver', { name: row.name }));
       }
-      setProgressMap((prev) => {
-        const next = { ...prev };
-        delete next[row.type];
-        return next;
-      });
+      clearDriverProgress(row.type);
       if (!options?.skipRefresh) {
         await refreshStatus(false);
       }
@@ -1235,7 +1303,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
     } finally {
       setActionState({ driverType: '', kind: '' });
     }
-  }, [appendOperationLog, downloadDir, refreshStatus, resolveDriverErrorMessage]);
+  }, [appendOperationLog, clearDriverProgress, downloadDir, refreshStatus, resolveDriverErrorMessage]);
 
   const resolvePackageSizeText = (row: DriverStatusRow): string => {
     if (row.builtIn) {
@@ -1299,22 +1367,12 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
       return <Text type="secondary">{t('driver.modal.card.noInstallNeeded')}</Text>;
     }
 
-    const versionLocked = row.packageInstalled || row.connectable;
-    if (versionLocked) {
-      const installedVersion = String(row.installedVersion || '').trim();
-      const revisionHint = row.needsUpdate ? t('driver.modal.card.versionLock.reinstallSuffix') : '';
-      return (
-        <Text type="secondary" className="driver-manager-version-lock">
-          {installedVersion
-            ? t('driver.modal.card.versionLock.installedVersion', { version: installedVersion, suffix: revisionHint })
-            : t('driver.modal.card.versionLock.installed', { suffix: revisionHint })}
-        </Text>
-      );
-    }
-
     const options = versionMap[row.type] || [];
     const selectedKey = selectedVersionMap[row.type];
     const selectOptions = buildVersionSelectOptions(options);
+    const installedVersion = resolveInstalledDriverVersion(row);
+    const versionSwitchPending = isDriverVersionSwitchPending(row);
+    const selectedOption = resolveSelectedVersionOption(row);
     const mongoHint = row.type === 'mongodb'
       ? t('driver.modal.card.mongodbVersionHint')
       : '';
@@ -1342,6 +1400,13 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
             void loadVersionPackageSize(row, value);
           }}
         />
+        {(row.packageInstalled || row.connectable) ? (
+          <Text type="secondary" className="driver-manager-small-text">
+            {versionSwitchPending
+              ? `当前已安装 ${installedVersion || '当前版本'}，已选择 ${selectedOption?.version || '目标版本'}，点击“切换版本”生效`
+              : `${installedVersion ? `${installedVersion}（已安装` : '已安装'}${row.needsUpdate ? '，需重装' : ''}${installedVersion ? '）' : ''}`}
+          </Text>
+        ) : null}
         {mongoHint ? <Text type="secondary" className="driver-manager-small-text">{mongoHint}</Text> : null}
       </div>
     );
@@ -1357,6 +1422,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
     const loadingLocal = actionState.driverType === row.type && actionState.kind === 'local';
     const logs = operationLogMap[row.type] || [];
     const hasLogs = logs.length > 0;
+    const versionSwitchPending = isDriverVersionSwitchPending(row);
 
     if (isSlimBuildUnavailable && !row.packageInstalled) {
       return <Text type="secondary">{t('driver.modal.card.fullOnly')}</Text>;
@@ -1366,6 +1432,10 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
       <Button type="primary" icon={<DownloadOutlined />} disabled={batchBusy} loading={loadingInstallOrRemove} onClick={() => installDriver(row)}>
         {t('driver.modal.card.action.reinstall')}
       </Button>
+    ) : versionSwitchPending ? (
+      <Button type="primary" icon={<DownloadOutlined />} disabled={batchBusy} loading={loadingInstallOrRemove} onClick={() => installDriver(row)}>
+        切换版本
+      </Button>
     ) : row.connectable ? (
       <Button danger icon={<DeleteOutlined />} disabled={batchBusy} loading={loadingInstallOrRemove} onClick={() => removeDriver(row)}>
         {t('driver.modal.card.action.remove')}
@@ -1769,7 +1839,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
             {t('driver.modal.footer.networkCheck')}
           </Button>
           <Button key="close" type="primary" onClick={onClose}>
-            {batchBusy ? t('driver.modal.footer.background') : t('driver.modal.footer.close')}
+            {installMutatingBusy ? t('driver.modal.footer.background') : t('driver.modal.footer.close')}
           </Button>
         </Space>
       )}
@@ -1922,12 +1992,12 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
             <Switch
               checked={forceOverwriteInstalled}
               onChange={(checked) => setForceOverwriteInstalled(checked)}
-              disabled={batchBusy}
+              disabled={batchDirectoryImporting}
             />
             <Button
               type="primary"
               icon={<DownloadOutlined />}
-              disabled={batchBusy || installableRows.length === 0}
+              disabled={installMutatingBusy || installableRows.length === 0}
               loading={batchAction === 'install-all'}
               onClick={() => void installAllDrivers()}
             >
@@ -1936,7 +2006,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
             <Button
               type="primary"
               icon={<DownloadOutlined />}
-              disabled={batchBusy || reinstallableRows.length === 0}
+              disabled={installMutatingBusy || reinstallableRows.length === 0}
               loading={batchAction === 'reinstall-updates'}
               onClick={() => void reinstallNeededDrivers()}
             >
@@ -1945,7 +2015,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
             <Button
               danger
               icon={<DeleteOutlined />}
-              disabled={batchBusy || removableRows.length === 0}
+              disabled={installMutatingBusy || removableRows.length === 0}
               loading={batchAction === 'remove-all'}
               onClick={() => void removeAllDrivers()}
             >
@@ -1953,7 +2023,6 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
             </Button>
             <Button
               icon={<FolderOpenOutlined />}
-              disabled={batchBusy}
               onClick={() => void openDriverDirectory()}
             >
               {t('driver.modal.toolbar.openDirectory')}
@@ -1961,7 +2030,7 @@ const DriverManagerModal: React.FC<{ open: boolean; onClose: () => void; onOpenG
             <Button
               icon={<FolderOpenOutlined />}
               loading={batchDirectoryImporting}
-              disabled={batchBusy && !batchDirectoryImporting}
+              disabled={batchDirectoryImporting}
               onClick={() => void installDriversFromDirectory()}
             >
               {t('driver.modal.toolbar.importDirectory')}
diff --git a/frontend/src/components/FindInDatabaseModal.tsx b/frontend/src/components/FindInDatabaseModal.tsx
index 21c76cb..d3e19e2 100644
--- a/frontend/src/components/FindInDatabaseModal.tsx
+++ b/frontend/src/components/FindInDatabaseModal.tsx
@@ -334,7 +334,7 @@ const FindInDatabaseModal: React.FC<FindInDatabaseModalProps> = ({ open, onClose
                 header: { background: 'transparent', borderBottom: 'none', paddingBottom: 8 },
                 body: { paddingTop: 8 },
             }}
-            destroyOnClose
+            destroyOnHidden
         >
             <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
                 <div style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
diff --git a/frontend/src/components/JVMResourceBrowser.interaction.test.tsx b/frontend/src/components/JVMResourceBrowser.interaction.test.tsx
index e51cf14..db095ca 100644
--- a/frontend/src/components/JVMResourceBrowser.interaction.test.tsx
+++ b/frontend/src/components/JVMResourceBrowser.interaction.test.tsx
@@ -35,6 +35,13 @@ const storeState = vi.hoisted(() => ({
   aiPanelVisible: false,
   setAIPanelVisible: vi.fn(),
   theme: "light",
+  fontSize: 14,
+  appearance: {
+    uiVersion: "legacy",
+    dataTableFontSize: 14,
+    dataTableFontSizeFollowGlobal: true,
+    customMonoFontFamily: "",
+  },
 }));
 
 const backendApp = vi.hoisted(() => ({
diff --git a/frontend/src/components/LinuxCJKFontBanner.tsx b/frontend/src/components/LinuxCJKFontBanner.tsx
new file mode 100644
index 0000000..cc8f750
--- /dev/null
+++ b/frontend/src/components/LinuxCJKFontBanner.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { Button } from 'antd';
+import { InfoCircleOutlined } from '@ant-design/icons';
+
+interface LinuxCJKFontBannerProps {
+  darkMode: boolean;
+  installHint: string;
+  onOpenFontSettings: () => void;
+  onDismiss: () => void;
+}
+
+const LinuxCJKFontBanner: React.FC<LinuxCJKFontBannerProps> = ({
+  darkMode,
+  installHint,
+  onOpenFontSettings,
+  onDismiss,
+}) => (
+  <div
+    data-gonavi-linux-cjk-font-banner="true"
+    style={{
+      flexShrink: 0,
+      display: 'flex',
+      alignItems: 'center',
+      gap: 12,
+      padding: '8px 14px',
+      borderBottom: darkMode ? '1px solid rgba(250,204,21,0.20)' : '1px solid rgba(217,119,6,0.18)',
+      background: darkMode ? 'rgba(250,204,21,0.10)' : 'rgba(255,247,237,0.92)',
+      color: darkMode ? 'rgba(254,249,195,0.96)' : '#7c2d12',
+      fontSize: 12,
+      lineHeight: 1.55,
+    }}
+  >
+    <InfoCircleOutlined style={{ flexShrink: 0, color: darkMode ? '#facc15' : '#d97706' }} />
+    <div style={{ minWidth: 0, flex: 1 }}>
+      <div style={{ fontWeight: 700 }}>
+        Linux CJK fonts missing / Ubuntu 中文字体缺失
+      </div>
+      <div>
+        Chinese text may render as □□□. Install fonts, then restart GoNavi:
+        <code style={{ marginLeft: 6, fontFamily: 'var(--gn-font-mono)', wordBreak: 'break-all' }}>
+          {installHint}
+        </code>
+      </div>
+    </div>
+    <Button
+      size="small"
+      onClick={onOpenFontSettings}
+    >
+      Font Settings
+    </Button>
+    <Button
+      size="small"
+      type="text"
+      onClick={onDismiss}
+      style={{ color: 'inherit' }}
+    >
+      Close
+    </Button>
+  </div>
+);
+
+export default LinuxCJKFontBanner;
diff --git a/frontend/src/components/MessagePublishModal.tsx b/frontend/src/components/MessagePublishModal.tsx
new file mode 100644
index 0000000..85571f2
--- /dev/null
+++ b/frontend/src/components/MessagePublishModal.tsx
@@ -0,0 +1,288 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import { Alert, Checkbox, Form, Input, Modal, Select, Space, Typography, message } from 'antd';
+
+import { DBQuery } from '../../wailsjs/go/app/App';
+import type { SavedConnection } from '../types';
+import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
+import {
+  buildMessagePublishCommand,
+  createDefaultMessagePublishDraft,
+  getMessagePublishPresentation,
+  type MessagePublishDraft,
+} from '../utils/messagePublish';
+
+const { Text } = Typography;
+const { TextArea } = Input;
+
+const ROCKETMQ_DELAY_LEVEL_OPTIONS = [
+  { label: '不延时', value: 0 },
+  { label: '1 · 1s', value: 1 },
+  { label: '2 · 5s', value: 2 },
+  { label: '3 · 10s', value: 3 },
+  { label: '4 · 30s', value: 4 },
+  { label: '5 · 1m', value: 5 },
+  { label: '6 · 2m', value: 6 },
+  { label: '7 · 3m', value: 7 },
+  { label: '8 · 4m', value: 8 },
+  { label: '9 · 5m', value: 9 },
+  { label: '10 · 6m', value: 10 },
+  { label: '11 · 7m', value: 11 },
+  { label: '12 · 8m', value: 12 },
+  { label: '13 · 9m', value: 13 },
+  { label: '14 · 10m', value: 14 },
+  { label: '15 · 20m', value: 15 },
+  { label: '16 · 30m', value: 16 },
+  { label: '17 · 1h', value: 17 },
+  { label: '18 · 2h', value: 18 },
+];
+
+export type MessagePublishModalProps = {
+  open: boolean;
+  connection: SavedConnection | null;
+  executionDbName?: string;
+  defaultDestination?: string;
+  onCancel: () => void;
+  onSuccess?: (result: { destination: string; affectedRows: number; commandText: string }) => void;
+};
+
+const MessagePublishModal: React.FC<MessagePublishModalProps> = ({
+  open,
+  connection,
+  executionDbName = '',
+  defaultDestination = '',
+  onCancel,
+  onSuccess,
+}) => {
+  const [form] = Form.useForm<MessagePublishDraft>();
+  const [submitting, setSubmitting] = useState(false);
+  const presentation = useMemo(
+    () => getMessagePublishPresentation(connection?.config),
+    [connection],
+  );
+
+  useEffect(() => {
+    if (!open || !connection) return;
+    form.setFieldsValue(
+      createDefaultMessagePublishDraft(
+        connection.config,
+        defaultDestination,
+      ),
+    );
+  }, [connection, defaultDestination, form, open]);
+
+  useEffect(() => {
+    if (open) return;
+    form.resetFields();
+    setSubmitting(false);
+  }, [form, open]);
+
+  const handleSubmit = async () => {
+    if (!connection) return;
+
+    let values: MessagePublishDraft;
+    try {
+      values = await form.validateFields();
+    } catch {
+      return;
+    }
+
+    let command;
+    try {
+      command = buildMessagePublishCommand(connection.config, values);
+    } catch (error: any) {
+      void message.error(error?.message || '构造发送命令失败');
+      return;
+    }
+
+    setSubmitting(true);
+    try {
+      const res = await DBQuery(
+        buildRpcConnectionConfig(connection.config) as any,
+        executionDbName,
+        command.commandText,
+      );
+      if (!res?.success) {
+        void message.error(`发送失败: ${res?.message || '未知错误'}`);
+        return;
+      }
+
+      const affectedRows = Number((res.data as any)?.affectedRows);
+      onSuccess?.({
+        destination: command.destinationLabel,
+        affectedRows: Number.isFinite(affectedRows) ? affectedRows : 0,
+        commandText: command.commandText,
+      });
+    } catch (error: any) {
+      void message.error(`发送失败: ${error?.message || String(error)}`);
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  return (
+    <Modal
+      title={`测试发送消息${connection?.name ? ` · ${connection.name}` : ''}`}
+      open={open}
+      onCancel={onCancel}
+      onOk={() => { void handleSubmit(); }}
+      okText="发送"
+      confirmLoading={submitting}
+      width={720}
+      destroyOnHidden
+      maskClosable={!submitting}
+    >
+      <Space direction="vertical" size={12} style={{ width: '100%' }}>
+        <Alert
+          type="info"
+          showIcon
+          message={presentation.alertMessage}
+        />
+
+        <Form<MessagePublishDraft>
+          form={form}
+          layout="vertical"
+          initialValues={createDefaultMessagePublishDraft(connection?.config, defaultDestination)}
+        >
+          <Form.Item
+            label={presentation.destinationLabel}
+            name="destination"
+            rules={[{ required: true, message: presentation.destinationRequiredMessage }]}
+          >
+            <Input placeholder={presentation.destinationPlaceholder} />
+          </Form.Item>
+
+          {presentation.showExchange && (
+            <Form.Item
+              label="Exchange（可选）"
+              name="exchange"
+              extra="留空使用默认交换机；若填写自定义交换机，请确认目标 Queue 已建立 binding。"
+            >
+              <Input placeholder="例如：events.topic" />
+            </Form.Item>
+          )}
+
+          {presentation.showRoutingKey && (
+            <Form.Item
+              label="Routing Key（可选）"
+              name="routingKey"
+              extra="留空时默认使用当前 Queue 名。"
+            >
+              <Input placeholder="例如：orders.queue" />
+            </Form.Item>
+          )}
+
+          {presentation.showQos && (
+            <Form.Item
+              label="QoS"
+              name="qos"
+              extra="0 为至多一次，1 为至少一次，2 为仅一次。"
+            >
+              <Select
+                options={[
+                  { label: '0 · At most once', value: 0 },
+                  { label: '1 · At least once', value: 1 },
+                  { label: '2 · Exactly once', value: 2 },
+                ]}
+              />
+            </Form.Item>
+          )}
+
+          {presentation.showRetain && (
+            <Form.Item name="retain" valuePropName="checked" style={{ marginBottom: 16 }}>
+              <Checkbox>Retain 消息</Checkbox>
+            </Form.Item>
+          )}
+
+          {presentation.showTag && (
+            <Form.Item
+              label="Tag（可选）"
+              name="tag"
+              extra="留空表示不过滤或不写入 Tag。"
+            >
+              <Input placeholder={presentation.tagPlaceholder} />
+            </Form.Item>
+          )}
+
+          {presentation.showDelayLevel && (
+            <Form.Item
+              label="Delay Level（可选）"
+              name="delayLevel"
+              extra="RocketMQ 使用固定延时级别，0 表示立即发送。"
+            >
+              <Select options={ROCKETMQ_DELAY_LEVEL_OPTIONS} />
+            </Form.Item>
+          )}
+
+          {presentation.showKey && (
+            <Form.Item label={presentation.keyLabel}>
+              {presentation.showKeyMode ? (
+                <Space.Compact style={{ width: '100%' }}>
+                  <Form.Item name="keyMode" noStyle>
+                    <Select
+                      style={{ width: 120 }}
+                      options={[
+                        { label: '文本', value: 'text' },
+                        { label: 'JSON', value: 'json' },
+                      ]}
+                    />
+                  </Form.Item>
+                  <Form.Item name="key" noStyle>
+                    <Input placeholder={presentation.keyPlaceholder} />
+                  </Form.Item>
+                </Space.Compact>
+              ) : (
+                <Form.Item name="key" noStyle>
+                  <Input placeholder={presentation.keyPlaceholder} />
+                </Form.Item>
+              )}
+            </Form.Item>
+          )}
+
+          <Form.Item label="消息体类型" name="bodyMode">
+            <Select
+              options={[
+                { label: 'JSON', value: 'json' },
+                { label: '文本', value: 'text' },
+              ]}
+            />
+          </Form.Item>
+
+          <Form.Item
+            label="消息体"
+            name="body"
+            rules={[{ required: true, message: '请输入消息体' }]}
+            extra="JSON 模式下需输入合法 JSON；文本模式按原样发送。"
+          >
+            <TextArea rows={8} placeholder="请输入消息体" />
+          </Form.Item>
+
+          {presentation.showHeaders && (
+            <Form.Item
+              label="Headers（可选）"
+              name="headers"
+              extra={'需为 JSON 对象，例如 {"x-source":"gonavi"}。'}
+            >
+              <TextArea rows={5} placeholder='{"x-source":"gonavi"}' />
+            </Form.Item>
+          )}
+
+          {presentation.showProperties && (
+            <Form.Item
+              label="Properties（可选）"
+              name="properties"
+              extra='需为 JSON 对象，例如 {"content_type":"application/json"}。'
+            >
+              <TextArea rows={5} placeholder='{"content_type":"application/json"}' />
+            </Form.Item>
+          )}
+        </Form>
+
+        <Text type="secondary">
+          {presentation.successHint} 发送成功后会返回 <Text code>affectedRows</Text>，用于确认本次测试消息是否已提交。
+        </Text>
+      </Space>
+    </Modal>
+  );
+};
+
+export default MessagePublishModal;
diff --git a/frontend/src/components/QueryEditor.external-sql-save.test.tsx b/frontend/src/components/QueryEditor.external-sql-save.test.tsx
index 4ff4a3a..12375f4 100644
--- a/frontend/src/components/QueryEditor.external-sql-save.test.tsx
+++ b/frontend/src/components/QueryEditor.external-sql-save.test.tsx
@@ -1,11 +1,17 @@
 import React from 'react';
+import { readFileSync } from 'node:fs';
 import { act, create, type ReactTestRenderer } from 'react-test-renderer';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { setCurrentLanguage } from '../i18n';
 import type { SavedQuery, TabData } from '../types';
 import { ORACLE_ROWID_LOCATOR_COLUMN } from '../utils/rowLocator';
-import QueryEditor, { resolveQueryEditorNavigationDecorations, resolveQueryEditorNavigationTarget } from './QueryEditor';
+import { clearQueryTabDraft, clearSQLFileTabDraft, getQueryTabDraft, getSQLFileTabDraft } from '../utils/sqlFileTabDrafts';
+import QueryEditor, {
+  collectQueryEditorObjectDecorationCandidates,
+  resolveQueryEditorNavigationDecorations,
+  resolveQueryEditorNavigationTarget,
+} from './QueryEditor';
 
 const storeState = vi.hoisted(() => ({
   connections: [
@@ -33,8 +39,20 @@ const storeState = vi.hoisted(() => ({
   appearance: { uiVersion: 'legacy' as 'legacy' | 'v2' },
   sqlFormatOptions: { keywordCase: 'upper' as const },
   setSqlFormatOptions: vi.fn(),
-  queryOptions: { maxRows: 5000 },
+  queryOptions: {
+    maxRows: 5000,
+    showColumnComment: true,
+    showColumnType: true,
+    showQueryResultsPanel: false,
+  },
   setQueryOptions: vi.fn(),
+  sqlEditorTransactionOptions: {
+    commitMode: 'manual' as 'manual' | 'auto',
+    autoCommitDelayMs: 0,
+  },
+  setSqlEditorTransactionOptions: vi.fn(),
+  sqlEditorPendingTransactions: {} as Record<string, unknown>,
+  setSqlEditorPendingTransaction: vi.fn(),
   shortcutOptions: {
     runQuery: {
       mac: { enabled: false, combo: '' },
@@ -48,10 +66,15 @@ const storeState = vi.hoisted(() => ({
       mac: { enabled: true, combo: 'Meta+S' },
       windows: { enabled: true, combo: 'Ctrl+S' },
     },
+    toggleQueryResultsPanel: {
+      mac: { enabled: true, combo: 'Meta+Shift+M' },
+      windows: { enabled: true, combo: 'Ctrl+Shift+M' },
+    },
   },
   activeTabId: 'tab-1',
   aiPanelVisible: false,
   setAIPanelVisible: vi.fn(),
+  sqlSnippets: [] as any[],
 }));
 
 const storeSubscribers = vi.hoisted(() => new Set<() => void>());
@@ -64,6 +87,9 @@ const backendApp = vi.hoisted(() => ({
   DBQuery: vi.fn(),
   DBQueryWithCancel: vi.fn(),
   DBQueryMulti: vi.fn(),
+  DBQueryMultiTransactional: vi.fn(),
+  DBCommitTransaction: vi.fn(),
+  DBRollbackTransaction: vi.fn(),
   DBGetTables: vi.fn(),
   DBGetAllColumns: vi.fn(),
   DBGetDatabases: vi.fn(),
@@ -86,6 +112,10 @@ const dataGridState = vi.hoisted(() => ({
   latestProps: null as any,
 }));
 
+const tabsState = vi.hoisted(() => ({
+  activeKey: undefined as string | undefined,
+}));
+
 const autoFetchState = vi.hoisted(() => ({
   visible: false,
 }));
@@ -94,19 +124,21 @@ const editorState = vi.hoisted(() => {
   const state = {
     value: '',
     editor: null as any,
-    domNode: { style: { cursor: '' } },
+    domNode: { style: { cursor: '' }, addEventListener: vi.fn(), removeEventListener: vi.fn() },
     position: { lineNumber: 1, column: 1 },
     selection: null as any,
     providers: [] as any[],
     hoverProviders: [] as any[],
     contentChangeListeners: [] as Array<() => void>,
     cursorPositionListeners: [] as Array<(event: any) => void>,
+    modelContentListeners: [] as Array<(event: any) => void>,
     mouseMoveListeners: [] as Array<(event: any) => void>,
     mouseDownListeners: [] as Array<(event: any) => void>,
     mouseLeaveListeners: [] as Array<() => void>,
     hasTextFocus: true,
     decorationIds: [] as string[],
     contentHoverCalls: [] as any[],
+    latestOnChange: null as null | ((value?: string) => void),
   };
   const offsetAt = (position: { lineNumber: number; column: number }) => {
     const text = state.value;
@@ -134,7 +166,8 @@ const editorState = vi.hoisted(() => {
     return state.value.slice(Math.min(start, end), Math.max(start, end));
   };
   const model = {
-    getValue: () => state.value,
+    getValue: vi.fn(() => state.value),
+    getValueLength: vi.fn(() => state.value.length),
     setValue: (value: string) => {
       state.value = value;
     },
@@ -142,7 +175,16 @@ const editorState = vi.hoisted(() => {
     getLineContent: (lineNumber: number) => state.value.replace(/\r\n/g, '\n').split('\n')[lineNumber - 1] || '',
     getLineCount: () => state.value.replace(/\r\n/g, '\n').split('\n').length,
     getLineMaxColumn: (lineNumber: number) => (state.value.replace(/\r\n/g, '\n').split('\n')[lineNumber - 1] || '').length + 1,
-    getWordUntilPosition: () => ({ startColumn: 1, endColumn: 1, word: '' }),
+    getWordUntilPosition: (position: { lineNumber: number; column: number }) => {
+      const lineContent = model.getLineContent(position.lineNumber);
+      const beforeCursor = lineContent.slice(0, Math.max(0, position.column - 1));
+      const word = beforeCursor.match(/[A-Za-z0-9_$]*$/)?.[0] || '';
+      return {
+        startColumn: position.column - word.length,
+        endColumn: position.column,
+        word,
+      };
+    },
     getOffsetAt: offsetAt,
     getPositionAt: positionAt,
   };
@@ -179,8 +221,9 @@ const editorState = vi.hoisted(() => {
       });
     }),
     addAction: vi.fn(),
-    onDidChangeModelContent: vi.fn((listener: () => void) => {
+    onDidChangeModelContent: vi.fn((listener: (event?: any) => void) => {
       state.contentChangeListeners.push(listener);
+      state.modelContentListeners.push(listener);
       return { dispose: vi.fn() };
     }),
     onDidChangeCursorPosition: vi.fn((listener: (event: any) => void) => {
@@ -209,6 +252,7 @@ const editorState = vi.hoisted(() => {
     hasTextFocus: vi.fn(() => state.hasTextFocus),
     revealLineInCenterIfOutsideViewport: vi.fn(),
     revealRangeInCenterIfOutsideViewport: vi.fn(),
+    layout: vi.fn(),
     focus: vi.fn(),
     trigger: vi.fn(),
   };
@@ -239,13 +283,14 @@ vi.mock('../utils/autoFetchVisibility', () => ({
 }));
 
 vi.mock('@monaco-editor/react', () => ({
-  default: ({ defaultValue, onMount }: any) => {
+  default: ({ defaultValue, onChange, onMount }: any) => {
     React.useEffect(() => {
       editorState.value = String(defaultValue || '');
+      editorState.latestOnChange = onChange;
       onMount?.(editorState.editor, {
         editor: { setTheme: vi.fn() },
         KeyMod: { CtrlCmd: 2048, WinCtrl: 256 },
-        KeyCode: { KeyQ: 81, KeyS: 83 },
+        KeyCode: { KeyM: 77, KeyQ: 81, KeyS: 83 },
         languages: {
           CompletionItemKind: { Keyword: 1, Function: 2, Field: 3 },
           CompletionItemInsertTextRule: { InsertAsSnippet: 1 },
@@ -293,7 +338,11 @@ vi.mock('@monaco-editor/react', () => ({
 vi.mock('./DataGrid', () => ({
   default: (props: any) => {
     dataGridState.latestProps = props;
-    return <div data-grid="true" />;
+    return (
+      <div data-grid="true">
+        {props.toolbarExtraActions ?? null}
+      </div>
+    );
   },
   GONAVI_ROW_KEY: '__gonavi_row_key__',
 }));
@@ -309,6 +358,8 @@ vi.mock('@ant-design/icons', () => {
     StopOutlined: Icon,
     RobotOutlined: Icon,
     DatabaseOutlined: Icon,
+    EyeOutlined: Icon,
+    EyeInvisibleOutlined: Icon,
   };
 });
 
@@ -319,6 +370,8 @@ vi.mock('antd', () => {
     </button>
   );
   Button.Group = ({ children }: any) => <div>{children}</div>;
+  const Space: any = ({ children }: any) => <div>{children}</div>;
+  Space.Compact = ({ children, className }: any) => <div className={className}>{children}</div>;
 
   const Form: any = ({ children }: any) => <form>{children}</form>;
   Form.Item = ({ children }: any) => <>{children}</>;
@@ -326,6 +379,7 @@ vi.mock('antd', () => {
 
   return {
     Button,
+    Space,
     message: messageApi,
     Modal: ({ children, open, onOk, okText = '确认' }: any) => (open ? (
       <section>
@@ -347,11 +401,27 @@ vi.mock('antd', () => {
     ),
     Tooltip: ({ children }: any) => <>{children}</>,
     Select: () => null,
-    Tabs: ({ activeKey, items }: any) => {
-      const activeItem = items?.find((item: any) => item.key === activeKey) || items?.[0];
+    Tabs: ({ activeKey, items, onChange, tabBarExtraContent }: any) => {
+      const resolvedActiveKey = tabsState.activeKey ?? activeKey ?? items?.[0]?.key;
+      const activeItem = items?.find((item: any) => item.key === resolvedActiveKey) || items?.[0];
       return (
         <div>
-          <div>{items?.map((item: any) => <span key={item.key}>{item.label}</span>)}</div>
+          <div>
+            {items?.map((item: any) => (
+              <button
+                key={item.key}
+                type="button"
+                data-tab-key={item.key}
+                onClick={() => {
+                  tabsState.activeKey = item.key;
+                  onChange?.(item.key);
+                }}
+              >
+                {item.label}
+              </button>
+            ))}
+            {tabBarExtraContent?.right ?? null}
+          </div>
           <div>{activeItem?.children}</div>
         </div>
       );
@@ -367,6 +437,9 @@ const textContent = (node: any): string =>
 const findButton = (renderer: ReactTestRenderer, text: string) =>
   renderer.root.findAll((node) => node.type === 'button' && textContent(node).includes(text))[0];
 
+const findButtons = (renderer: ReactTestRenderer, text: string) =>
+  renderer.root.findAll((node) => node.type === 'button' && textContent(node).includes(text));
+
 const findExactButton = (renderer: ReactTestRenderer, text: string) =>
   renderer.root.findAll((node) => node.type === 'button' && textContent(node) === text)[0];
 
@@ -434,10 +507,25 @@ const createDefaultConnections = () => ([
 
 describe('QueryEditor external SQL save', () => {
   beforeEach(() => {
+    const completionState = (globalThis as any).__gonaviSqlCompletionState;
+    if (completionState) {
+      completionState.registered = false;
+      completionState.disposables = [];
+    }
     vi.stubGlobal('window', {
       addEventListener: vi.fn(),
       removeEventListener: vi.fn(),
       dispatchEvent: vi.fn(),
+      requestAnimationFrame: vi.fn((callback: FrameRequestCallback) => {
+        callback(0);
+        return 1;
+      }),
+      cancelAnimationFrame: vi.fn(),
+      innerHeight: 900,
+    });
+    vi.stubGlobal('document', {
+      addEventListener: vi.fn(),
+      removeEventListener: vi.fn(),
     });
     setCurrentLanguage('zh-CN');
     storeState.languagePreference = 'zh-CN';
@@ -450,17 +538,69 @@ describe('QueryEditor external SQL save', () => {
     storeState.addTab.mockReset();
     storeState.setActiveContext.mockReset();
     storeState.saveQuery.mockReset();
+    storeState.saveQuery.mockImplementation(async (query: SavedQuery) => query);
     storeState.savedQueries = [];
     storeState.activeTabId = 'tab-1';
     storeState.aiPanelVisible = false;
     storeState.setAIPanelVisible.mockReset();
+    storeState.queryOptions = {
+      maxRows: 5000,
+      showColumnComment: true,
+      showColumnType: true,
+      showQueryResultsPanel: false,
+    };
+    storeState.sqlEditorTransactionOptions = {
+      commitMode: 'manual',
+      autoCommitDelayMs: 0,
+    };
+    storeState.shortcutOptions = {
+      runQuery: {
+        mac: { enabled: false, combo: '' },
+        windows: { enabled: false, combo: '' },
+      },
+      selectCurrentStatement: {
+        mac: { enabled: false, combo: '' },
+        windows: { enabled: false, combo: '' },
+      },
+      saveQuery: {
+        mac: { enabled: true, combo: 'Meta+S' },
+        windows: { enabled: true, combo: 'Ctrl+S' },
+      },
+      toggleQueryResultsPanel: {
+        mac: { enabled: true, combo: 'Meta+Shift+M' },
+        windows: { enabled: true, combo: 'Ctrl+Shift+M' },
+      },
+    };
+    storeState.setQueryOptions.mockReset();
+    storeState.setQueryOptions.mockImplementation((options: Record<string, unknown>) => {
+      storeState.queryOptions = { ...storeState.queryOptions, ...options };
+    });
+    storeState.setSqlEditorTransactionOptions.mockReset();
+    storeState.setSqlEditorTransactionOptions.mockImplementation((options: Record<string, unknown>) => {
+      storeState.sqlEditorTransactionOptions = { ...storeState.sqlEditorTransactionOptions, ...options };
+    });
+    storeState.sqlEditorPendingTransactions = {};
+    storeState.setSqlEditorPendingTransaction.mockReset();
+    storeState.setSqlEditorPendingTransaction.mockImplementation((tabId: string, transaction: unknown) => {
+      if (!transaction) {
+        delete storeState.sqlEditorPendingTransactions[tabId];
+        return;
+      }
+      storeState.sqlEditorPendingTransactions[tabId] = transaction;
+    });
+    Object.values(backendApp).forEach((fn) => fn.mockReset());
     messageApi.success.mockReset();
     messageApi.error.mockReset();
+    messageApi.info.mockReset();
     messageApi.warning.mockReset();
     backendApp.DBQuery.mockResolvedValue({ success: true, data: [] });
     backendApp.WriteSQLFile.mockResolvedValue({ success: true });
     backendApp.ExportSQLFile.mockResolvedValue({ success: true });
+    backendApp.DBQueryWithCancel.mockResolvedValue({ success: true, data: [] });
     backendApp.DBQueryMulti.mockResolvedValue({ success: true, data: [] });
+    backendApp.DBQueryMultiTransactional.mockResolvedValue({ success: true, data: [] });
+    backendApp.DBCommitTransaction.mockResolvedValue({ success: true, message: '事务已提交' });
+    backendApp.DBRollbackTransaction.mockResolvedValue({ success: true, message: '事务已回滚' });
     backendApp.DBGetColumns.mockResolvedValue({ success: true, data: [] });
     backendApp.DBGetIndexes.mockResolvedValue({ success: true, data: [] });
     backendApp.DBGetAllColumns.mockResolvedValue({ success: true, data: [] });
@@ -473,6 +613,7 @@ describe('QueryEditor external SQL save', () => {
     storeState.appearance.uiVersion = 'legacy';
     autoFetchState.visible = false;
     dataGridState.latestProps = null;
+    tabsState.activeKey = undefined;
     editorState.value = '';
     editorState.position = { lineNumber: 1, column: 1 };
     editorState.selection = null;
@@ -480,13 +621,17 @@ describe('QueryEditor external SQL save', () => {
     editorState.hoverProviders = [];
     editorState.contentChangeListeners = [];
     editorState.cursorPositionListeners = [];
+    editorState.modelContentListeners = [];
     editorState.mouseMoveListeners = [];
     editorState.mouseDownListeners = [];
     editorState.mouseLeaveListeners = [];
     editorState.hasTextFocus = true;
     editorState.decorationIds = [];
     editorState.contentHoverCalls = [];
+    editorState.latestOnChange = null;
     editorState.editor.getValue.mockClear();
+    editorState.editor.getModel().getValue.mockClear();
+    editorState.editor.getModel().getValueLength.mockClear();
     editorState.editor.setValue.mockClear();
     editorState.editor.executeEdits.mockClear();
     editorState.editor.deltaDecorations.mockClear();
@@ -495,6 +640,11 @@ describe('QueryEditor external SQL save', () => {
     editorState.editor.addAction.mockClear();
     storeState.updateQueryTabDraft.mockReset();
     storeSubscribers.clear();
+    editorState.editor.layout.mockClear();
+    clearQueryTabDraft('tab-1');
+    clearQueryTabDraft('tab-2');
+    clearSQLFileTabDraft('tab-1');
+    clearSQLFileTabDraft('tab-2');
   });
 
   afterEach(() => {
@@ -510,6 +660,636 @@ describe('QueryEditor external SQL save', () => {
     expect(editorState.value).toBe('SELECT * FROM ');
   });
 
+  it('keeps the query results panel hidden by default on first entry', async () => {
+    storeState.appearance.uiVersion = 'v2';
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab()} />);
+    });
+
+    expect(textContent(renderer.toJSON())).not.toContain('等待执行 SQL');
+  });
+
+  it('shows the empty query results panel after toggling the results button', async () => {
+    storeState.appearance.uiVersion = 'v2';
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab()} />);
+    });
+
+    await act(async () => {
+      findButton(renderer, '结果').props.onClick();
+    });
+
+    expect(textContent(renderer.toJSON())).toContain('等待执行 SQL');
+    expect(storeState.updateQueryTabDraft).toHaveBeenCalledWith('tab-1', {
+      resultPanelVisible: true,
+    });
+  });
+
+  it('hides the expanded empty query results panel from the inline hide action', async () => {
+    storeState.appearance.uiVersion = 'v2';
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab()} />);
+    });
+
+    await act(async () => {
+      findButton(renderer, '结果').props.onClick();
+    });
+    expect(textContent(renderer.toJSON())).toContain('等待执行 SQL');
+
+    await act(async () => {
+      findButton(renderer, '隐藏').props.onClick();
+    });
+
+    expect(textContent(renderer.toJSON())).not.toContain('等待执行 SQL');
+    expect(storeState.updateQueryTabDraft).toHaveBeenLastCalledWith('tab-1', {
+      resultPanelVisible: false,
+    });
+  });
+
+  it('auto expands the query results panel after a successful execution returns rows', async () => {
+    storeState.appearance.uiVersion = 'v2';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{ columns: ['value'], rows: [{ value: 1 }] }],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: 'SELECT 1 AS value' })} />);
+    });
+
+    expect(textContent(renderer.toJSON())).not.toContain('结果 1');
+
+    await act(async () => {
+      await findButton(renderer, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer.toJSON())).toContain('结果 1');
+    expect(storeState.updateQueryTabDraft).toHaveBeenCalledWith('tab-1', {
+      resultPanelVisible: true,
+    });
+  });
+
+  it('keeps the inline hide action available after query results render rows', async () => {
+    storeState.appearance.uiVersion = 'v2';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{ columns: ['value'], rows: [{ value: 1 }] }],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: 'SELECT 1 AS value' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer.toJSON())).toContain('结果 1');
+
+    await act(async () => {
+      findButton(renderer, '隐藏').props.onClick();
+    });
+
+    expect(textContent(renderer.toJSON())).not.toContain('结果 1');
+    expect(storeState.updateQueryTabDraft).toHaveBeenLastCalledWith('tab-1', {
+      resultPanelVisible: false,
+    });
+  });
+
+  it('toggles the query results panel with Ctrl/Cmd+Shift+M', async () => {
+    storeState.appearance.uiVersion = 'v2';
+
+    const windowListeners: Record<string, ((event?: any) => void)[]> = {};
+    vi.stubGlobal('window', {
+      addEventListener: vi.fn((type: string, listener: (event?: any) => void) => {
+        windowListeners[type] ||= [];
+        windowListeners[type].push(listener);
+      }),
+      removeEventListener: vi.fn(),
+      dispatchEvent: vi.fn(),
+      requestAnimationFrame: vi.fn((callback: FrameRequestCallback) => {
+        callback(0);
+        return 1;
+      }),
+      cancelAnimationFrame: vi.fn(),
+      innerHeight: 900,
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab()} />);
+    });
+
+    const toggleAction = editorState.editor.addAction.mock.calls
+      .map((call: any[]) => call[0])
+      .find((action: any) => action?.id === 'gonavi.toggleQueryResultsPanel');
+    expect(toggleAction).toMatchObject({
+      label: 'GoNavi: 切换结果区',
+    });
+    expect(toggleAction?.keybindings?.[0]).toBeGreaterThan(0);
+
+    const isMacRuntime = /(Mac|iPhone|iPad|iPod)/i.test(`${navigator.platform || ''} ${navigator.userAgent || ''}`);
+    const createToggleEvent = () => ({
+      ctrlKey: !isMacRuntime,
+      metaKey: isMacRuntime,
+      altKey: false,
+      shiftKey: true,
+      key: 'm',
+      target: null,
+      preventDefault: vi.fn(),
+      stopPropagation: vi.fn(),
+    });
+
+    const firstEvent = createToggleEvent();
+    await act(async () => {
+      windowListeners.keydown?.forEach((listener) => listener(firstEvent));
+    });
+
+    expect(firstEvent.preventDefault).toHaveBeenCalled();
+    expect(firstEvent.stopPropagation).toHaveBeenCalled();
+    expect(textContent(renderer.toJSON())).toContain('等待执行 SQL');
+
+    const secondEvent = createToggleEvent();
+    await act(async () => {
+      windowListeners.keydown?.forEach((listener) => listener(secondEvent));
+    });
+
+    expect(secondEvent.preventDefault).toHaveBeenCalled();
+    expect(secondEvent.stopPropagation).toHaveBeenCalled();
+    expect(textContent(renderer.toJSON())).not.toContain('等待执行 SQL');
+  });
+
+  it('shows the query results panel with the shortcut after manually hiding it', async () => {
+    storeState.appearance.uiVersion = 'v2';
+
+    const windowListeners: Record<string, ((event?: any) => void)[]> = {};
+    vi.stubGlobal('window', {
+      addEventListener: vi.fn((type: string, listener: (event?: any) => void) => {
+        windowListeners[type] ||= [];
+        windowListeners[type].push(listener);
+      }),
+      removeEventListener: vi.fn(),
+      dispatchEvent: vi.fn(),
+      requestAnimationFrame: vi.fn((callback: FrameRequestCallback) => {
+        callback(0);
+        return 1;
+      }),
+      cancelAnimationFrame: vi.fn(),
+      innerHeight: 900,
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab()} />);
+    });
+
+    await act(async () => {
+      findButton(renderer, '结果').props.onClick();
+    });
+    await act(async () => {
+      findButton(renderer, '隐藏').props.onClick();
+    });
+    expect(textContent(renderer.toJSON())).not.toContain('等待执行 SQL');
+
+    const FakeNode = class {};
+    const bodyNode = new FakeNode();
+    const documentElement = new FakeNode();
+    vi.stubGlobal('Node', FakeNode);
+    vi.stubGlobal('document', {
+      body: bodyNode,
+      documentElement,
+    });
+    editorState.hasTextFocus = false;
+    const isMacRuntime = /(Mac|iPhone|iPad|iPod)/i.test(`${navigator.platform || ''} ${navigator.userAgent || ''}`);
+    const toggleEvent = {
+      ctrlKey: !isMacRuntime,
+      metaKey: isMacRuntime,
+      altKey: false,
+      shiftKey: true,
+      key: 'm',
+      target: bodyNode,
+      preventDefault: vi.fn(),
+      stopPropagation: vi.fn(),
+    };
+    await act(async () => {
+      windowListeners.keydown?.forEach((listener) => listener(toggleEvent));
+    });
+
+    expect(toggleEvent.preventDefault).toHaveBeenCalled();
+    expect(textContent(renderer.toJSON())).toContain('等待执行 SQL');
+    expect(storeState.updateQueryTabDraft).toHaveBeenLastCalledWith('tab-1', {
+      resultPanelVisible: true,
+    });
+
+    renderer.unmount();
+  });
+
+  it('keeps query result panel visibility isolated per tab', async () => {
+    storeState.appearance.uiVersion = 'v2';
+    storeState.queryOptions.showQueryResultsPanel = false;
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ id: 'tab-1', resultPanelVisible: false })} />);
+    });
+    expect(textContent(renderer.toJSON())).not.toContain('等待执行 SQL');
+
+    await act(async () => {
+      renderer.update(<QueryEditor tab={createTab({ id: 'tab-2', resultPanelVisible: true })} />);
+    });
+
+    expect(textContent(renderer.toJSON())).toContain('等待执行 SQL');
+
+    renderer.unmount();
+  });
+
+  it('registers all SQL completion providers in the disposable singleton state', async () => {
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: '' })} />);
+    });
+
+    const completionState = (globalThis as any).__gonaviSqlCompletionState;
+
+    expect(editorState.hoverProviders).toHaveLength(1);
+    expect(editorState.providers).toHaveLength(3);
+    expect(completionState.disposables).toHaveLength(4);
+
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('keeps plain typing out of SQL completion trigger characters', async () => {
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: '' })} />);
+    });
+
+    const sqlProvider = editorState.providers.find((provider) => Array.isArray(provider.triggerCharacters) && provider.triggerCharacters.includes('.'));
+
+    expect(sqlProvider).toBeTruthy();
+    expect(sqlProvider.triggerCharacters).toEqual(['.']);
+    expect(sqlProvider.triggerCharacters).not.toContain('s');
+
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('drops cancelled SQL completion requests while the user keeps typing', async () => {
+    let renderer!: ReactTestRenderer;
+    backendApp.DBGetTables.mockResolvedValueOnce({
+      success: true,
+      data: [{ Table: 'session_log' }],
+    });
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: '', dbName: 'main' })} />);
+    });
+
+    const sqlProvider = editorState.providers.find((provider) => Array.isArray(provider.triggerCharacters) && provider.triggerCharacters.includes('.'));
+    expect(sqlProvider).toBeTruthy();
+
+    editorState.value = 'SELECT * FROM ss';
+    editorState.position = { lineNumber: 1, column: editorState.value.length + 1 };
+    editorState.latestOnChange?.(editorState.value);
+
+    const result = await sqlProvider.provideCompletionItems(
+      editorState.editor.getModel(),
+      editorState.position,
+      undefined,
+      { isCancellationRequested: true },
+    );
+
+    expect(result.suggestions).toEqual([]);
+    expect(backendApp.DBGetTables).not.toHaveBeenCalled();
+
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('keeps table name completion available after typing in a fresh query tab', async () => {
+    let renderer!: ReactTestRenderer;
+    autoFetchState.visible = true;
+    storeState.connections[0].config.database = '';
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'information_schema' }, { Database: 'main' }] });
+    backendApp.DBGetTables.mockResolvedValueOnce({ success: true, data: [{ Tables_in_main: 'organization' }] });
+    backendApp.DBGetAllColumns.mockResolvedValueOnce({ success: true, data: [] });
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: '' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const sqlProvider = editorState.providers.find((provider) => Array.isArray(provider.triggerCharacters) && provider.triggerCharacters.includes('.'));
+    expect(sqlProvider).toBeTruthy();
+    expect(storeState.updateQueryTabDraft).toHaveBeenLastCalledWith('tab-1', expect.objectContaining({
+      dbName: 'main',
+    }));
+
+    editorState.value = 'SELECT * FROM org';
+    editorState.latestOnChange?.(editorState.value);
+    const result = await sqlProvider.provideCompletionItems(editorState.editor.getModel(), { lineNumber: 1, column: editorState.value.length + 1 });
+
+    expect(result.suggestions.map((item: any) => item.label)).toContain('organization');
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('fuzzy matches table names in FROM completion before column candidates', async () => {
+    let renderer!: ReactTestRenderer;
+    autoFetchState.visible = true;
+    storeState.connections[0].config.database = '';
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'information_schema' }, { Database: 'main' }] });
+    backendApp.DBGetTables.mockResolvedValueOnce({ success: true, data: [{ Tables_in_main: 'fs_org_auth_application' }] });
+    backendApp.DBGetAllColumns.mockResolvedValueOnce({
+      success: true,
+      data: [{ tableName: 'fs_org_auth_application', name: 'orgi', type: 'varchar(32)' }],
+    });
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: '' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const sqlProvider = editorState.providers.find((provider) => Array.isArray(provider.triggerCharacters) && provider.triggerCharacters.includes('.'));
+    expect(sqlProvider).toBeTruthy();
+
+    editorState.value = 'SELECT * FROM org';
+    editorState.latestOnChange?.(editorState.value);
+    const result = await sqlProvider.provideCompletionItems(editorState.editor.getModel(), { lineNumber: 1, column: editorState.value.length + 1 });
+    const labels = result.suggestions.map((item: any) => item.label);
+
+    expect(labels).toContain('fs_org_auth_application');
+    expect(labels).not.toContain('orgi');
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('lazy loads current database tables for FROM completion when metadata is not preloaded', async () => {
+    let renderer!: ReactTestRenderer;
+    autoFetchState.visible = false;
+    backendApp.DBGetTables.mockResolvedValueOnce({
+      success: true,
+      data: [{ Table: 'fs_org_auth_application' }],
+    });
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: '', dbName: 'front_end_sys' })} />);
+    });
+
+    const sqlProvider = editorState.providers.find((provider) => Array.isArray(provider.triggerCharacters) && provider.triggerCharacters.includes('.'));
+    expect(sqlProvider).toBeTruthy();
+
+    editorState.value = 'SELECT * FROM or';
+    editorState.latestOnChange?.(editorState.value);
+    const result = await sqlProvider.provideCompletionItems(editorState.editor.getModel(), { lineNumber: 1, column: editorState.value.length + 1 });
+    const labels = result.suggestions.map((item: any) => item.label);
+
+    expect(backendApp.DBGetTables).toHaveBeenCalledWith(expect.any(Object), 'front_end_sys');
+    expect(labels).toContain('fs_org_auth_application');
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('quotes uppercase postgres table names in FROM completion insert text', async () => {
+    let renderer!: ReactTestRenderer;
+    autoFetchState.visible = true;
+    storeState.connections[0].config.type = 'postgres';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'main' }] });
+    backendApp.DBGetTables.mockResolvedValueOnce({ success: true, data: [{ Table: 'public.MyTable' }] });
+    backendApp.DBGetAllColumns.mockResolvedValueOnce({ success: true, data: [] });
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: '', dbName: 'main' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const sqlProvider = editorState.providers.find((provider) => Array.isArray(provider.triggerCharacters) && provider.triggerCharacters.includes('.'));
+    expect(sqlProvider).toBeTruthy();
+
+    editorState.value = 'SELECT * FROM My';
+    editorState.latestOnChange?.(editorState.value);
+    const result = await sqlProvider.provideCompletionItems(editorState.editor.getModel(), { lineNumber: 1, column: editorState.value.length + 1 });
+    const match = result.suggestions.find((item: any) => item.label === 'MyTable');
+
+    expect(match?.insertText).toBe('"MyTable"');
+
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('quotes uppercase postgres table names after schema qualifiers in completion insert text', async () => {
+    let renderer!: ReactTestRenderer;
+    autoFetchState.visible = true;
+    storeState.connections[0].config.type = 'postgres';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'main' }] });
+    backendApp.DBGetTables.mockResolvedValueOnce({ success: true, data: [{ Table: 'public.MyTable' }] });
+    backendApp.DBGetAllColumns.mockResolvedValueOnce({ success: true, data: [] });
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: '', dbName: 'main' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const sqlProvider = editorState.providers.find((provider) => Array.isArray(provider.triggerCharacters) && provider.triggerCharacters.includes('.'));
+    expect(sqlProvider).toBeTruthy();
+
+    editorState.value = 'SELECT * FROM public.';
+    editorState.latestOnChange?.(editorState.value);
+    const result = await sqlProvider.provideCompletionItems(editorState.editor.getModel(), { lineNumber: 1, column: editorState.value.length + 1 });
+    const match = result.suggestions.find((item: any) => item.label === 'MyTable');
+
+    expect(match?.insertText).toBe('"MyTable"');
+
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('quotes uppercase postgres column names in completion insert text', async () => {
+    let renderer!: ReactTestRenderer;
+    autoFetchState.visible = true;
+    storeState.connections[0].config.type = 'postgres';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'main' }] });
+    backendApp.DBGetTables.mockResolvedValueOnce({ success: true, data: [{ Table: 'public.MyTable' }] });
+    backendApp.DBGetAllColumns.mockResolvedValueOnce({
+      success: true,
+      data: [{ tableName: 'public.MyTable', name: 'DisplayName', type: 'text' }],
+    });
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: '', dbName: 'main' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const sqlProvider = editorState.providers.find((provider) => Array.isArray(provider.triggerCharacters) && provider.triggerCharacters.includes('.'));
+    expect(sqlProvider).toBeTruthy();
+
+    editorState.value = 'SELECT Dis FROM public."MyTable"';
+    editorState.latestOnChange?.(editorState.value);
+    const result = await sqlProvider.provideCompletionItems(editorState.editor.getModel(), { lineNumber: 1, column: 'SELECT Dis'.length + 1 });
+    const match = result.suggestions.find((item: any) => item.label === 'DisplayName');
+
+    expect(match?.insertText).toBe('"DisplayName"');
+
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('preloads metadata only for the current database when many databases are visible', async () => {
+    let renderer!: ReactTestRenderer;
+    autoFetchState.visible = true;
+    storeState.connections[0].config.type = 'mysql';
+    storeState.connections[0].config.database = '';
+    const databaseRows = [
+      { Database: 'main' },
+      ...Array.from({ length: 40 }, (_, index) => ({ Database: `tenant_${String(index + 1).padStart(3, '0')}` })),
+    ];
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: databaseRows });
+    backendApp.DBGetTables.mockImplementation(async (_config: any, dbName: string) => ({
+      success: true,
+      data: dbName === 'main' ? [{ Tables_in_main: 'users' }] : [{ [`Tables_in_${dbName}`]: 'unexpected_table' }],
+    }));
+    backendApp.DBGetAllColumns.mockImplementation(async (_config: any, dbName: string) => ({
+      success: true,
+      data: dbName === 'main' ? [{ tableName: 'users', name: 'id', type: 'bigint' }] : [],
+    }));
+    backendApp.DBQuery.mockResolvedValue({ success: true, data: [] });
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: 'SELECT * FROM users', dbName: 'main' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBGetDatabases).toHaveBeenCalledTimes(1);
+    expect(backendApp.DBGetTables.mock.calls.map((call: any[]) => call[1])).toEqual(['main']);
+    expect(backendApp.DBGetAllColumns.mock.calls.map((call: any[]) => call[1])).toEqual(['main']);
+    const metadataQueryDbs = new Set(backendApp.DBQuery.mock.calls.map((call: any[]) => call[1]));
+    expect([...metadataQueryDbs]).toEqual(['main']);
+
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
+  it('suggests columns in WHERE for cross-database MySQL tables with quoted hyphenated database names', async () => {
+    let renderer!: ReactTestRenderer;
+    autoFetchState.visible = true;
+    storeState.connections[0].config.type = 'mysql';
+    storeState.connections[0].config.database = '';
+    backendApp.DBGetDatabases.mockResolvedValueOnce({
+      success: true,
+      data: [{ Database: 'sanpin' }, { Database: 'ccbim-document-07' }],
+    });
+    backendApp.DBGetTables.mockImplementation(async (_config: any, dbName: string) => {
+      if (dbName === 'sanpin') {
+        return { success: true, data: [{ Table: 'orders' }] };
+      }
+      if (dbName === 'ccbim-document-07') {
+        return { success: true, data: [{ Table: 'doc' }] };
+      }
+      return { success: true, data: [] };
+    });
+    backendApp.DBGetAllColumns.mockImplementation(async (_config: any, dbName: string) => {
+      if (dbName === 'sanpin') {
+        return {
+          success: true,
+          data: [{ tableName: 'orders', name: 'id', type: 'bigint' }],
+        };
+      }
+      if (dbName === 'ccbim-document-07') {
+        return {
+          success: true,
+          data: [
+            { tableName: 'doc', name: 'node_id', type: 'varchar(64)' },
+            { tableName: 'doc', name: 'node_name', type: 'varchar(255)' },
+          ],
+        };
+      }
+      return { success: true, data: [] };
+    });
+
+    editorState.value = 'SELECT *\nFROM `ccbim-document-07`.doc\nWHERE no';
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: editorState.value, dbName: 'sanpin' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const sqlProvider = editorState.providers.find((provider) => Array.isArray(provider.triggerCharacters) && provider.triggerCharacters.includes('.'));
+    expect(sqlProvider).toBeTruthy();
+
+    editorState.latestOnChange?.(editorState.value);
+    const result = await sqlProvider.provideCompletionItems(
+      editorState.editor.getModel(),
+      { lineNumber: 3, column: 'WHERE no'.length + 1 },
+    );
+    const labels = result.suggestions.map((item: any) => item.label);
+
+    expect(labels).toContain('node_id');
+    expect(labels).toContain('node_name');
+
+    await act(async () => {
+      renderer.unmount();
+    });
+  });
+
   it('resolves database and table targets for ctrl/cmd navigation', () => {
     const tables = [
       { dbName: 'main', tableName: 'users' },
@@ -579,6 +1359,30 @@ describe('QueryEditor external SQL save', () => {
     });
   });
 
+  it('prefers the unique schema-qualified view target when metadata also contains a bare view name', () => {
+    const views = [
+      { dbName: 'SYSDBA', viewName: 'V_ACCOUNT', schemaName: undefined },
+      { dbName: 'SYSDBA', viewName: 'SYSDBA.V_ACCOUNT', schemaName: 'SYSDBA' },
+    ];
+
+    expect(resolveQueryEditorNavigationTarget(
+      'select * from V_ACCOUNT',
+      'select * from V_ACCOUNT'.length + 1,
+      'SYSDBA',
+      ['SYSDBA'],
+      [],
+      views,
+      [],
+      [],
+      [],
+    )).toEqual({
+      type: 'view',
+      dbName: 'SYSDBA',
+      viewName: 'SYSDBA.V_ACCOUNT',
+      schemaName: 'SYSDBA',
+    });
+  });
+
   it('opens a table tab on ctrl left click inside the editor', async () => {
     editorState.value = 'select * from analytics.events where id = 1';
     autoFetchState.visible = true;
@@ -621,6 +1425,7 @@ describe('QueryEditor external SQL save', () => {
       connectionId: 'conn-1',
       dbName: 'analytics',
       tableName: 'events',
+      objectType: 'table',
     });
     expect((window as any).dispatchEvent).toHaveBeenCalledWith(expect.objectContaining({
       type: 'gonavi:locate-sidebar-object',
@@ -629,6 +1434,101 @@ describe('QueryEditor external SQL save', () => {
     expect(stopPropagation).toHaveBeenCalled();
   });
 
+  it('opens a table tab on macOS cmd click when Monaco omits leftButton', async () => {
+    editorState.value = 'select * from fs_mkefu_regist_record;';
+    autoFetchState.visible = true;
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'mkefu_location_dev_local' }] });
+    backendApp.DBGetTables.mockResolvedValueOnce({ success: true, data: [{ Tables_in_mkefu_location_dev_local: 'fs_mkefu_regist_record' }] });
+    backendApp.DBGetAllColumns.mockResolvedValueOnce({ success: true, data: [] });
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ query: editorState.value, dbName: 'mkefu_location_dev_local' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const preventDefault = vi.fn();
+    const stopPropagation = vi.fn();
+    await act(async () => {
+      editorState.mouseDownListeners[0]?.({
+        target: { position: { lineNumber: 1, column: 'select * from fs_mkefu_regist_record'.length } },
+        event: {
+          browserEvent: { button: 0, buttons: 1 },
+          ctrlKey: false,
+          metaKey: true,
+          preventDefault,
+          stopPropagation,
+        },
+      });
+    });
+
+    expect(storeState.setActiveContext).toHaveBeenCalledWith({ connectionId: 'conn-1', dbName: 'mkefu_location_dev_local' });
+    expect(storeState.addTab).toHaveBeenCalledWith(expect.objectContaining({
+      type: 'table',
+      connectionId: 'conn-1',
+      dbName: 'mkefu_location_dev_local',
+      tableName: 'fs_mkefu_regist_record',
+      objectType: 'table',
+    }));
+    expect(preventDefault).toHaveBeenCalled();
+    expect(stopPropagation).toHaveBeenCalled();
+  });
+
+  it('does not read the full editor model when ctrl/cmd clicking objects in large SQL', async () => {
+    editorState.value = [
+      ...Array.from({ length: 4000 }, (_, index) => `-- filler ${index + 1}`),
+      'select * from analytics.events where id = 1',
+    ].join('\n');
+    autoFetchState.visible = true;
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'main' }, { Database: 'analytics' }] });
+    backendApp.DBGetTables
+      .mockResolvedValueOnce({ success: true, data: [{ Tables_in_main: 'users' }] })
+      .mockResolvedValueOnce({ success: true, data: [{ Tables_in_analytics: 'events' }] });
+    backendApp.DBGetAllColumns
+      .mockResolvedValueOnce({ success: true, data: [] })
+      .mockResolvedValueOnce({ success: true, data: [] });
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ query: editorState.value, dbName: 'main' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    editorState.editor.getModel().getValue.mockClear();
+    editorState.editor.getModel().getValueLength.mockClear();
+    const lineNumber = editorState.value.split('\n').length;
+    const preventDefault = vi.fn();
+    const stopPropagation = vi.fn();
+
+    await act(async () => {
+      editorState.mouseDownListeners[0]?.({
+        target: { position: { lineNumber, column: 27 } },
+        event: {
+          browserEvent: { button: 0, buttons: 1 },
+          ctrlKey: true,
+          metaKey: false,
+          preventDefault,
+          stopPropagation,
+        },
+      });
+    });
+
+    expect(editorState.editor.getModel().getValueLength).not.toHaveBeenCalled();
+    expect(editorState.editor.getModel().getValue).not.toHaveBeenCalled();
+    expect(storeState.addTab).toHaveBeenCalledWith(expect.objectContaining({
+      type: 'table',
+      connectionId: 'conn-1',
+      dbName: 'analytics',
+      tableName: 'events',
+    }));
+    expect(preventDefault).toHaveBeenCalled();
+    expect(stopPropagation).toHaveBeenCalled();
+  });
+
   it('shows link-style hover feedback when ctrl/cmd is pressed over a navigable identifier', async () => {
     editorState.value = 'select * from analytics.events where id = 1';
     autoFetchState.visible = true;
@@ -662,8 +1562,15 @@ describe('QueryEditor external SQL save', () => {
     expect(editorState.domNode.style.cursor).toBe('pointer');
     const lastDecorationCall = editorState.editor.deltaDecorations.mock.calls.at(-1);
     expect(lastDecorationCall?.[1]?.[0]?.options?.inlineClassName).toBe('gonavi-query-editor-link-hint');
-    expect(lastDecorationCall?.[1]?.[0]?.options?.hoverMessage?.value).toContain('Ctrl + 点击打开该表');
-    expect(lastDecorationCall?.[1]?.[0]?.options?.hoverMessage?.value).toContain('**表** `events`');
+    expect(lastDecorationCall?.[1]?.[0]?.options?.hoverMessage).toBeUndefined();
+
+    const hover = editorState.hoverProviders[0]?.provideHover(
+      editorState.editor.getModel(),
+      { lineNumber: 1, column: 27 },
+    );
+    const hoverText = String(hover?.contents?.[0]?.value || '');
+    expect(hoverText.match(/\*\*表\*\*/g)).toHaveLength(1);
+    expect(hoverText).toContain('**表** `events`');
 
     await act(async () => {
       editorState.mouseLeaveListeners[0]?.();
@@ -744,6 +1651,147 @@ describe('QueryEditor external SQL save', () => {
         }),
       ]),
     );
+    expect(storeState.updateQueryTabDraft).toHaveBeenCalledWith('tab-1', {
+      formatRestoreSnapshot: {
+        query: 'select * from users where id=1',
+        createdAt: expect.any(Number),
+      },
+    });
+  });
+
+  it('restores the last pre-beautify SQL snapshot after reopening a query tab', async () => {
+    let renderer!: ReactTestRenderer;
+    const originalSql = 'select * from users where id=1';
+
+    await act(async () => {
+      renderer = create(
+        <QueryEditor
+          tab={createTab({
+            query: 'SELECT\n  *\nFROM\n  users\nWHERE\n  id = 1',
+            formatRestoreSnapshot: {
+              query: originalSql,
+              createdAt: 123,
+            },
+          })}
+        />,
+      );
+    });
+
+    const restoreButton = findButton(renderer, '还原上次美化');
+    await act(async () => {
+      await restoreButton.props.onClick();
+    });
+
+    expect(editorState.value).toBe(originalSql);
+    expect(storeState.updateQueryTabDraft).toHaveBeenCalledWith('tab-1', {
+      query: originalSql,
+      formatRestoreSnapshot: undefined,
+    });
+    expect(messageApi.success).toHaveBeenCalledWith('已还原到美化前 SQL');
+  });
+
+  it('formats postgres window-function SQL with cast syntax through Monaco edits', async () => {
+    let renderer!: ReactTestRenderer;
+    storeState.connections[0].config.type = 'postgres';
+    storeState.connections[0].config.database = 'main';
+    const pgSql = [
+      'SELECT',
+      `FLOOR(DATE_PART('epoch', "CREATE_TIME" - LAG("END_TIME") OVER (ORDER BY "CREATE_TIME" asc, "ID" desc))*1000)::int as time_diff_seconds,`,
+      '*',
+      `FROM "FAM_RU_BLOCK" WHERE "RU_JOB_ID" = ''`,
+    ].join('\n');
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: pgSql, dbName: 'main' })} />);
+    });
+
+    const formatButton = findButton(renderer, '美化');
+    await act(async () => {
+      await formatButton.props.onClick();
+    });
+
+    expect(messageApi.error).not.toHaveBeenCalled();
+    expect(editorState.editor.executeEdits).toHaveBeenCalledWith(
+      'gonavi-format-sql',
+      expect.arrayContaining([
+        expect.objectContaining({
+          text: expect.stringContaining(')::int AS time_diff_seconds'),
+        }),
+      ]),
+    );
+  });
+
+  it('formats postgres cast syntax after switching to another query tab connection', async () => {
+    let renderer!: ReactTestRenderer;
+    storeState.connections = [
+      {
+        id: 'conn-1',
+        name: 'mysql-local',
+        config: {
+          type: 'mysql',
+          host: '127.0.0.1',
+          port: 3306,
+          user: 'root',
+          password: '',
+          database: 'main',
+        },
+      },
+      {
+        id: 'conn-2',
+        name: 'pg-local',
+        config: {
+          type: 'postgres',
+          host: '127.0.0.1',
+          port: 5432,
+          user: 'postgres',
+          password: '',
+          database: 'main',
+        },
+      },
+    ];
+    const pgSql = [
+      'SELECT',
+      '    *,',
+      '    is_del = 0',
+      'FROM',
+      '    wm_stock',
+      'WHERE',
+      '    1 = 1',
+      '    AND is_del = 0',
+      "    and create_date > '2025-06-25'::date;",
+    ].join('\n');
+
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ id: 'tab-1', connectionId: 'conn-1', query: 'select 1;' })} />);
+    });
+
+    await act(async () => {
+      renderer.update(
+        <QueryEditor
+          tab={createTab({
+            id: 'tab-2',
+            connectionId: 'conn-2',
+            dbName: 'main',
+            query: pgSql,
+          })}
+        />,
+      );
+    });
+
+    const formatButton = findButton(renderer, '美化');
+    await act(async () => {
+      await formatButton.props.onClick();
+    });
+
+    expect(messageApi.error).not.toHaveBeenCalled();
+    expect(editorState.editor.executeEdits).toHaveBeenCalledWith(
+      'gonavi-format-sql',
+      expect.arrayContaining([
+        expect.objectContaining({
+          text: expect.stringContaining("'2025-06-25'::date;"),
+        }),
+      ]),
+    );
   });
 
   it('localizes format settings menu labels in English', async () => {
@@ -801,6 +1849,31 @@ describe('QueryEditor external SQL save', () => {
     }));
   });
 
+  it('renders SQL metadata hover as a fixed overflow widget below first-line tokens', async () => {
+    editorState.value = 'select users.id from users';
+    autoFetchState.visible = true;
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'main' }] });
+    backendApp.DBGetTables.mockResolvedValueOnce({ success: true, data: [{ Tables_in_main: 'users' }] });
+    backendApp.DBGetAllColumns.mockResolvedValueOnce({
+      success: true,
+      data: [{ tableName: 'users', name: 'id', type: 'bigint', comment: '主键ID' }],
+    });
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ query: editorState.value, dbName: 'main' })} />);
+    });
+
+    const initialOptions = editorState.editor.updateOptions.mock.calls[0]?.[0];
+    expect(initialOptions).toMatchObject({
+      fixedOverflowWidgets: true,
+      hover: {
+        enabled: true,
+        delay: 1000,
+        above: false,
+      },
+    });
+  });
+
   it('prefers the hovered identifier position for ctrl+q object info', async () => {
     editorState.value = 'select * from user_actions';
     autoFetchState.visible = true;
@@ -2049,6 +3122,39 @@ describe('QueryEditor external SQL save', () => {
     });
   });
 
+  it('registers SQL metadata hover provider only once across query editor instances', async () => {
+    editorState.value = 'select * from H2.S_BUSI';
+    autoFetchState.visible = true;
+    backendApp.DBGetDatabases.mockResolvedValue({ success: true, data: [{ Database: 'H2' }] });
+    backendApp.DBGetTables.mockResolvedValue({ success: true, data: [{ Tables_in_H2: 'H2.S_BUSI' }] });
+    backendApp.DBGetAllColumns.mockResolvedValue({ success: true, data: [] });
+
+    let firstRenderer: ReactTestRenderer;
+    let secondRenderer: ReactTestRenderer;
+    await act(async () => {
+      firstRenderer = create(<QueryEditor tab={createTab({ id: 'tab-1', query: editorState.value, dbName: 'H2' })} isActive={false} />);
+    });
+    await act(async () => {
+      secondRenderer = create(<QueryEditor tab={createTab({ id: 'tab-2', query: editorState.value, dbName: 'H2' })} isActive />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(editorState.hoverProviders).toHaveLength(1);
+    const hover = editorState.hoverProviders[0].provideHover(
+      editorState.editor.getModel(),
+      { lineNumber: 1, column: 18 },
+    );
+    const hoverText = String(hover?.contents?.[0]?.value || '');
+    expect(hoverText.match(/\*\*表\*\*/g)).toHaveLength(1);
+    expect(hoverText).toContain('`H2.S_BUSI`');
+
+    firstRenderer!.unmount();
+    secondRenderer!.unmount();
+  });
+
   it('keeps hover underline active when ctrl/cmd is pressed repeatedly without moving the mouse', async () => {
     const windowListeners: Record<string, ((event?: any) => void)[]> = {};
     vi.stubGlobal('window', {
@@ -2115,6 +3221,13 @@ describe('QueryEditor external SQL save', () => {
     expect(lastDecorationCall?.[1]?.[0]?.options?.inlineClassName).toBe('gonavi-query-editor-link-hint');
   });
 
+  it('keeps query editor hyperlink decorations blue with a solid underline', () => {
+    const css = readFileSync(new URL('../App.css', import.meta.url), 'utf8');
+
+    expect(css).toMatch(/\.gonavi-query-editor-link-hint\s*\{[^}]*color:\s*#1677ff\s*!important;[^}]*text-decoration:\s*underline;[^}]*text-decoration-style:\s*solid;[^}]*text-decoration-color:\s*currentColor;/s);
+    expect(css).toMatch(/body\[data-theme='dark'\]\s+\.gonavi-query-editor-link-hint\s*\{[^}]*color:\s*#69b1ff\s*!important;/s);
+  });
+
   it('opens a view tab on ctrl left click inside the editor', async () => {
     editorState.value = 'select * from reporting.active_users';
     autoFetchState.visible = true;
@@ -2159,7 +3272,17 @@ describe('QueryEditor external SQL save', () => {
       dbName: 'main',
       viewName: 'active_users',
       viewKind: 'view',
+      schemaName: 'reporting',
+      sidebarLocateKey: 'conn-1-main-view-active_users',
     });
+    expect((window as any).dispatchEvent).toHaveBeenCalledWith(expect.objectContaining({
+      type: 'gonavi:locate-sidebar-object',
+      detail: expect.objectContaining({
+        tabId: 'conn-1-main-view-active_users',
+        schemaName: 'reporting',
+        objectGroup: 'views',
+      }),
+    }));
   });
 
   it('opens trigger and routine tabs on ctrl left click inside the editor', async () => {
@@ -2220,6 +3343,9 @@ describe('QueryEditor external SQL save', () => {
       connectionId: 'conn-1',
       dbName: 'main',
       triggerName: 'audit.users_bi',
+      triggerTableName: 'audit.users',
+      schemaName: 'audit',
+      sidebarLocateKey: 'conn-1-main-trigger-audit.users_bi-audit.users',
     });
     expect(storeState.addTab).toHaveBeenCalledWith({
       id: 'routine-def-conn-1-main-reporting.refresh_stats',
@@ -2229,7 +3355,27 @@ describe('QueryEditor external SQL save', () => {
       dbName: 'main',
       routineName: 'reporting.refresh_stats',
       routineType: 'PROCEDURE',
+      schemaName: 'reporting',
+      sidebarLocateKey: 'conn-1-main-routine-reporting.refresh_stats',
     });
+    expect((window as any).dispatchEvent).toHaveBeenCalledWith(expect.objectContaining({
+      type: 'gonavi:locate-sidebar-object',
+      detail: expect.objectContaining({
+        tabId: 'conn-1-main-trigger-audit.users_bi-audit.users',
+        triggerName: 'audit.users_bi',
+        schemaName: 'audit',
+        objectGroup: 'triggers',
+      }),
+    }));
+    expect((window as any).dispatchEvent).toHaveBeenCalledWith(expect.objectContaining({
+      type: 'gonavi:locate-sidebar-object',
+      detail: expect.objectContaining({
+        tabId: 'conn-1-main-routine-reporting.refresh_stats',
+        routineName: 'reporting.refresh_stats',
+        schemaName: 'reporting',
+        objectGroup: 'routines',
+      }),
+    }));
   });
 
   describe('object navigation tab title localization', () => {
@@ -2428,6 +3574,30 @@ describe('QueryEditor external SQL save', () => {
     }));
   });
 
+  it('skips heavy autocomplete metadata fetch for object edit query tabs', async () => {
+    autoFetchState.visible = true;
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'main' }, { Database: 'analytics' }] });
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({
+        query: 'CREATE OR REPLACE VIEW reporting.active_users AS SELECT * FROM users;',
+        dbName: 'main',
+        queryMode: 'object-edit',
+      })} />);
+    });
+    await act(async () => {
+      for (let i = 0; i < 6; i += 1) {
+        await Promise.resolve();
+      }
+    });
+
+    expect(backendApp.DBGetDatabases).toHaveBeenCalledTimes(1);
+    expect(backendApp.DBGetTables).not.toHaveBeenCalled();
+    expect(backendApp.DBGetAllColumns).not.toHaveBeenCalled();
+    expect(backendApp.DBQuery).not.toHaveBeenCalled();
+    expect(editorState.editor.deltaDecorations).toHaveBeenCalledWith([], []);
+  });
+
   it('keeps the editor empty when a tab draft is externally synced to an empty query', async () => {
     let renderer!: ReactTestRenderer;
 
@@ -2467,6 +3637,154 @@ describe('QueryEditor external SQL save', () => {
     expect(messageApi.success).toHaveBeenCalledWith('SQL 文件已保存！');
   });
 
+  it('keeps external SQL file typing out of persisted tab drafts to avoid input freezes', async () => {
+    const filePath = '/Users/me/Documents/gonavi-queries/report.sql';
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ filePath })} />);
+    });
+
+    storeState.updateQueryTabDraft.mockClear();
+    editorState.editor.deltaDecorations.mockClear();
+    editorState.editor.getModel().getValue.mockClear();
+    editorState.editor.getModel().getValueLength.mockClear();
+
+    await act(async () => {
+      editorState.value = 'select 1;\n1';
+      editorState.latestOnChange?.(editorState.value);
+      editorState.modelContentListeners.forEach((listener) => listener({
+        changes: [{ text: '1' }],
+      }));
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(storeState.updateQueryTabDraft).not.toHaveBeenCalledWith('tab-1', expect.objectContaining({
+      query: 'select 1;\n1',
+    }));
+    expect(getSQLFileTabDraft('tab-1')).toBe('select 1;\n1');
+    expect(editorState.editor.deltaDecorations).not.toHaveBeenCalled();
+    expect(editorState.editor.getModel().getValue).not.toHaveBeenCalled();
+    expect(editorState.editor.getModel().getValueLength).not.toHaveBeenCalled();
+  });
+
+  it('keeps large regular query typing out of persisted tab drafts to avoid input freezes', async () => {
+    const largeSql = `select * from users;\n${'x'.repeat(60_000)}`;
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ query: 'select 1;' })} />);
+    });
+
+    storeState.updateQueryTabDraft.mockClear();
+    editorState.editor.deltaDecorations.mockClear();
+    editorState.editor.getModel().getValue.mockClear();
+    editorState.editor.getModel().getValueLength.mockClear();
+
+    await act(async () => {
+      editorState.value = largeSql;
+      editorState.latestOnChange?.(largeSql);
+      editorState.modelContentListeners.forEach((listener) => listener({
+        changes: [{ text: largeSql }],
+      }));
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(storeState.updateQueryTabDraft).not.toHaveBeenCalledWith('tab-1', expect.objectContaining({
+      query: largeSql,
+    }));
+    expect(getQueryTabDraft('tab-1')).toBe(largeSql);
+    expect(editorState.editor.deltaDecorations).not.toHaveBeenCalled();
+    expect(editorState.editor.getModel().getValueLength).not.toHaveBeenCalled();
+    expect(editorState.editor.getModel().getValue).not.toHaveBeenCalled();
+  });
+
+  it('keeps short regular query typing on the Monaco fast path without rerender side effects', async () => {
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ query: 'select 1;' })} />);
+    });
+
+    storeState.updateQueryTabDraft.mockClear();
+    editorState.editor.deltaDecorations.mockClear();
+    editorState.editor.getModel().getValue.mockClear();
+    editorState.editor.getModel().getValueLength.mockClear();
+
+    await act(async () => {
+      editorState.value = 'SELECT * FROM fs_org_auth_application;\n\nSELECT * FROM fs_bcp_auth_info; ';
+      editorState.latestOnChange?.(editorState.value);
+      editorState.modelContentListeners.forEach((listener) => listener({
+        changes: [{ text: ' ' }],
+      }));
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(getQueryTabDraft('tab-1')).toBe('SELECT * FROM fs_org_auth_application;\n\nSELECT * FROM fs_bcp_auth_info; ');
+    expect(storeState.updateQueryTabDraft).not.toHaveBeenCalledWith('tab-1', expect.objectContaining({
+      query: expect.any(String),
+    }));
+    expect(editorState.editor.deltaDecorations).not.toHaveBeenCalled();
+    expect(editorState.editor.getModel().getValue).not.toHaveBeenCalled();
+    expect(editorState.editor.getModel().getValueLength).not.toHaveBeenCalled();
+  });
+
+  it('skips SQL literals when collecting object decoration candidates for insert scripts', () => {
+    const insertValues = Array.from({ length: 120 }, (_, index) => {
+      const suffix = String(index + 1).padStart(3, '0');
+      return `('legacy-seed-L${suffix}', '旧版企业-L${suffix}', '深圳市南山区 ${suffix} 号', 'legacy${suffix}@demo.test')`;
+    }).join(',\n');
+    const sql = [
+      '-- 字符串里的 fs_org_auth_file 不应参与对象装饰扫描',
+      'INSERT INTO mkefu_location_dev_local.uk_corp (id, corp_name, address, email) VALUES',
+      `${insertValues};`,
+      'SELECT uk_corp.id FROM uk_corp;',
+    ].join('\n');
+
+    const candidates = collectQueryEditorObjectDecorationCandidates(sql, 1000);
+    const candidateTexts = candidates.map((candidate) => candidate.lineContent.slice(candidate.positionColumn - 1, candidate.positionColumn + 30));
+
+    expect(candidateTexts.some((text) => text.includes('legacy-seed'))).toBe(false);
+    expect(candidateTexts.some((text) => text.includes('旧版企业'))).toBe(false);
+    expect(candidateTexts.some((text) => text.includes('demo.test'))).toBe(false);
+    expect(candidateTexts.some((text) => text.includes('mkefu_location_dev_local'))).toBe(true);
+    expect(candidateTexts.some((text) => text.includes('uk_corp'))).toBe(true);
+  });
+
+  it('does not provide metadata hover inside SQL string literals', async () => {
+    editorState.value = "insert into users(name) values ('users.id should stay plain');";
+    autoFetchState.visible = true;
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'main' }] });
+    backendApp.DBGetTables.mockResolvedValueOnce({ success: true, data: [{ Tables_in_main: 'users' }] });
+    backendApp.DBGetAllColumns.mockResolvedValueOnce({
+      success: true,
+      data: [{ tableName: 'users', name: 'id', type: 'bigint', comment: '主键ID' }],
+    });
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ query: editorState.value, dbName: 'main' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const hoverProvider = editorState.hoverProviders[0];
+    expect(hoverProvider).toBeTruthy();
+    const literalColumn = editorState.value.indexOf('users.id should') + 3;
+    const hover = hoverProvider.provideHover(
+      editorState.editor.getModel(),
+      { lineNumber: 1, column: literalColumn },
+    );
+
+    expect(hover).toBeNull();
+  });
+
   it('registers Ctrl/Cmd+S to quick-save the active query', async () => {
     const windowListeners: Record<string, ((event?: any) => void)[]> = {};
     vi.stubGlobal('window', {
@@ -2496,13 +3814,14 @@ describe('QueryEditor external SQL save', () => {
     const saveAction = findEditorAction('gonavi.saveQuery');
     expect(saveAction).toMatchObject({
       label: 'GoNavi: 保存查询',
-      keybindings: [2048 | 83],
     });
+    expect(saveAction?.keybindings?.[0]).toBeGreaterThan(0);
 
     editorState.value = 'select 5;';
+    const isMacRuntime = /(Mac|iPhone|iPad|iPod)/i.test(`${navigator.platform || ''} ${navigator.userAgent || ''}`);
     const event = {
-      ctrlKey: true,
-      metaKey: false,
+      ctrlKey: !isMacRuntime,
+      metaKey: isMacRuntime,
       altKey: false,
       shiftKey: false,
       key: 's',
@@ -2805,6 +4124,414 @@ describe('QueryEditor external SQL save', () => {
     });
   });
 
+  it('shows Chinese semantic meaning for SQL execution errors', async () => {
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: false,
+      message: 'pq: syntax error at or near "from"',
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: 'SELECT * from' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const pageText = textContent(renderer!.root);
+    expect(pageText).toContain('执行失败');
+    expect(pageText).toContain('中文语义：SQL 语法错误');
+    expect(pageText).toContain('处理建议：');
+    expect(pageText).toContain('原始错误：pq: syntax error at or near "from"');
+  });
+
+  it('runs SQL editor DML through a pending managed transaction and commits manually', async () => {
+    backendApp.DBQueryMultiTransactional.mockResolvedValueOnce({
+      success: true,
+      transactionId: 'tx-1',
+      transactionPending: true,
+      data: [
+        { columns: ['affectedRows'], rows: [{ affectedRows: 2 }], statementIndex: 1 },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: "UPDATE users SET name = 'new' WHERE id = 1" })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBQueryMultiTransactional).toHaveBeenCalledWith(
+      expect.anything(),
+      'main',
+      expect.stringContaining('UPDATE users SET name'),
+      'query-1',
+    );
+    expect(backendApp.DBQueryMulti).not.toHaveBeenCalled();
+    expect(textContent(renderer!.root)).not.toContain('未提交');
+    expect(textContent(renderer!.root)).toContain('提交');
+    expect(textContent(renderer!.root)).toContain('影响行数：2');
+
+    await act(async () => {
+      await findButton(renderer!, '提交').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBCommitTransaction).toHaveBeenCalledWith('tx-1');
+    expect(textContent(renderer!.root)).not.toContain('未提交');
+  });
+
+  it('runs SQL editor WITH DML through a pending managed transaction', async () => {
+    const sql = 'WITH target AS (SELECT id FROM users WHERE active = 1) UPDATE users SET synced = 1 WHERE id IN (SELECT id FROM target)';
+    backendApp.DBQueryMultiTransactional.mockResolvedValueOnce({
+      success: true,
+      transactionId: 'tx-with-dml',
+      transactionPending: true,
+      data: [
+        { columns: ['affectedRows'], rows: [{ affectedRows: 2 }], statementIndex: 1 },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: sql })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBQueryMultiTransactional).toHaveBeenCalledWith(
+      expect.anything(),
+      'main',
+      expect.stringContaining('WITH target AS'),
+      'query-1',
+    );
+    expect(backendApp.DBQueryMulti).not.toHaveBeenCalled();
+    expect(textContent(renderer!.root)).not.toContain('未提交');
+    expect(textContent(renderer!.root)).toContain('提交');
+
+    await act(async () => {
+      await findButton(renderer!, '提交').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBCommitTransaction).toHaveBeenCalledWith('tx-with-dml');
+  });
+
+  it('shows the pending statement count for multi-SQL manual transactions', async () => {
+    const sql = "UPDATE users SET active = 0 WHERE id = 1; DELETE FROM users WHERE id = 2;";
+    backendApp.DBQueryMultiTransactional.mockResolvedValueOnce({
+      success: true,
+      transactionId: 'tx-multi-dml',
+      transactionPending: true,
+      data: [
+        { columns: ['affectedRows'], rows: [{ affectedRows: 1 }], statementIndex: 1 },
+        { columns: ['affectedRows'], rows: [{ affectedRows: 1 }], statementIndex: 2 },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: sql })} />);
+    });
+    editorState.selection = {
+      startLineNumber: 1,
+      startColumn: 1,
+      endLineNumber: 1,
+      endColumn: sql.length + 1,
+    };
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBQueryMultiTransactional).toHaveBeenCalledWith(
+      expect.anything(),
+      'main',
+      expect.stringContaining('DELETE FROM users'),
+      'query-1',
+    );
+    expect(textContent(renderer!.root)).not.toContain('未提交');
+    expect(textContent(renderer!.root)).toContain('提交 (2)');
+    expect(storeState.sqlEditorPendingTransactions['tab-1']).toMatchObject({
+      id: 'tx-multi-dml',
+      statementCount: 2,
+    });
+  });
+
+  it('keeps SQL editor WITH SELECT on the regular query path', async () => {
+    const sql = 'WITH target AS (SELECT id FROM users WHERE active = 1) SELECT * FROM target';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [
+        { columns: ['id'], rows: [{ id: 1 }], statementIndex: 1 },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: sql })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBQueryMulti).toHaveBeenCalledWith(
+      expect.anything(),
+      'main',
+      expect.stringContaining('WITH target AS'),
+      'query-1',
+    );
+    expect(backendApp.DBQueryMultiTransactional).not.toHaveBeenCalled();
+  });
+
+  it('keeps manual SQL transaction actions inline in the top toolbar without duplicating them in result tabs', async () => {
+    backendApp.DBQueryMultiTransactional.mockResolvedValueOnce({
+      success: true,
+      transactionId: 'tx-toolbar-inline',
+      transactionPending: true,
+      data: [
+        { columns: ['affectedRows'], rows: [{ affectedRows: 1 }], statementIndex: 1 },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: "UPDATE users SET active = 0 WHERE id = 1" })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const pageText = textContent(renderer!.root);
+    expect(pageText).not.toContain('未提交');
+    expect(findButtons(renderer!, '提交')).toHaveLength(1);
+    expect(findButtons(renderer!, '回滚')).toHaveLength(1);
+  });
+
+  it('adds pagination to limited query results and reloads the selected page only', async () => {
+    const firstPageRows = Array.from({ length: 500 }, (_item, index) => ({ id: index + 1 }));
+    const secondPageRows = Array.from({ length: 500 }, (_item, index) => ({ id: index + 501 }));
+    backendApp.DBQueryMulti
+      .mockResolvedValueOnce({
+        success: true,
+        data: [
+          { columns: ['id'], rows: firstPageRows, statementIndex: 1 },
+        ],
+      })
+      .mockResolvedValueOnce({
+        success: true,
+        data: [
+          { columns: ['id'], rows: secondPageRows, statementIndex: 1 },
+        ],
+      });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: 'SELECT id FROM users LIMIT 0,500' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(dataGridState.latestProps?.pagination).toMatchObject({
+      current: 1,
+      pageSize: 500,
+      total: 1000,
+      totalKnown: false,
+    });
+    expect(dataGridState.latestProps?.resultExportAllSql).toBe('SELECT id FROM users');
+
+    await act(async () => {
+      await dataGridState.latestProps?.onPageChange?.(2, 500);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBQueryMulti).toHaveBeenCalledTimes(2);
+    const pageSql = String(backendApp.DBQueryMulti.mock.calls[1][2]);
+    expect(pageSql).toContain('SELECT * FROM (SELECT id FROM users) AS __gonavi_query_page__');
+    expect(pageSql).toContain('LIMIT 501 OFFSET 500');
+    expect(dataGridState.latestProps?.pagination).toMatchObject({
+      current: 2,
+      pageSize: 500,
+      total: 1000,
+      totalKnown: true,
+    });
+    expect(dataGridState.latestProps?.data?.[0]).toMatchObject({ id: 501 });
+  });
+
+  it('runs SQL editor data-changing CTEs through a pending managed transaction', async () => {
+    const sql = 'WITH moved AS (DELETE FROM audit_logs WHERE created_at < NOW() RETURNING id) SELECT * FROM moved';
+    backendApp.DBQueryMultiTransactional.mockResolvedValueOnce({
+      success: true,
+      transactionId: 'tx-write-cte',
+      transactionPending: true,
+      data: [
+        { columns: ['affectedRows'], rows: [{ affectedRows: 3 }], statementIndex: 1 },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ query: sql })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBQueryMultiTransactional).toHaveBeenCalledWith(
+      expect.anything(),
+      'main',
+      expect.stringContaining('DELETE FROM audit_logs'),
+      'query-1',
+    );
+    expect(backendApp.DBQueryMulti).not.toHaveBeenCalled();
+    expect(textContent(renderer!.root)).not.toContain('未提交');
+  });
+
+  it('auto commits SQL editor DML transactions after the configured delay', async () => {
+    vi.useFakeTimers();
+    storeState.sqlEditorTransactionOptions = {
+      commitMode: 'auto',
+      autoCommitDelayMs: 3000,
+    };
+    backendApp.DBQueryMultiTransactional.mockResolvedValueOnce({
+      success: true,
+      transactionId: 'tx-auto',
+      transactionPending: true,
+      data: [
+        { columns: ['affectedRows'], rows: [{ affectedRows: 1 }], statementIndex: 1 },
+      ],
+    });
+
+    try {
+      let renderer!: ReactTestRenderer;
+      await act(async () => {
+        renderer = create(<QueryEditor tab={createTab({ query: "DELETE FROM users WHERE id = 1" })} />);
+      });
+
+      await act(async () => {
+        await findButton(renderer!, '运行').props.onClick();
+      });
+      await act(async () => {
+        await Promise.resolve();
+        await Promise.resolve();
+      });
+
+      expect(textContent(renderer!.root)).toContain('3s 后自动提交');
+      expect(backendApp.DBCommitTransaction).not.toHaveBeenCalled();
+
+      await act(async () => {
+        vi.advanceTimersByTime(3000);
+        await Promise.resolve();
+        await Promise.resolve();
+      });
+
+      expect(backendApp.DBCommitTransaction).toHaveBeenCalledWith('tx-auto');
+      expect(backendApp.DBQueryMulti).not.toHaveBeenCalled();
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it('supports DBeaver-style immediate auto-commit for SQL editor DML transactions', async () => {
+    vi.useFakeTimers();
+    storeState.sqlEditorTransactionOptions = {
+      commitMode: 'auto',
+      autoCommitDelayMs: 0,
+    };
+    backendApp.DBQueryMultiTransactional.mockResolvedValueOnce({
+      success: true,
+      transactionId: 'tx-auto-now',
+      transactionPending: true,
+      data: [
+        { columns: ['affectedRows'], rows: [{ affectedRows: 1 }], statementIndex: 1 },
+      ],
+    });
+
+    try {
+      let renderer!: ReactTestRenderer;
+      await act(async () => {
+        renderer = create(<QueryEditor tab={createTab({ query: "UPDATE users SET active = 0 WHERE id = 1" })} />);
+      });
+
+      await act(async () => {
+        await findButton(renderer!, '运行').props.onClick();
+      });
+      await act(async () => {
+        await Promise.resolve();
+        await Promise.resolve();
+      });
+
+      expect(backendApp.DBQueryMultiTransactional).toHaveBeenCalled();
+      expect(backendApp.DBQueryMulti).not.toHaveBeenCalled();
+      expect(textContent(renderer!.root)).toContain('自动提交中');
+      expect(textContent(renderer!.root)).toContain('提交 (1)');
+      expect(backendApp.DBCommitTransaction).not.toHaveBeenCalled();
+
+      await act(async () => {
+        vi.runOnlyPendingTimers();
+        await Promise.resolve();
+        await Promise.resolve();
+      });
+
+      expect(backendApp.DBCommitTransaction).toHaveBeenCalledWith('tx-auto-now');
+      expect(textContent(renderer!.root)).not.toContain('自动提交中');
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
   it('automatically appends hidden primary key locator columns for editable query results', async () => {
     storeState.connections[0].config.type = 'oracle';
     storeState.connections[0].config.database = 'ORCLPDB1';
@@ -2927,6 +4654,46 @@ describe('QueryEditor external SQL save', () => {
     expect(messageApi.warning).not.toHaveBeenCalled();
   });
 
+  it('uses snake_case unique index metadata for query result row locators', async () => {
+    storeState.connections[0].config.type = 'kingbase';
+    storeState.connections[0].config.database = 'KINGBASE';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{ columns: ['NAME', '__gonavi_locator_1_EMAIL'], rows: [{ NAME: 'old-name', __gonavi_locator_1_EMAIL: 'a@example.com' }] }],
+    });
+    backendApp.DBGetColumns.mockResolvedValueOnce({
+      success: true,
+      data: [{ column_name: 'EMAIL' }, { column_name: 'NAME' }],
+    });
+    backendApp.DBGetIndexes.mockResolvedValueOnce({
+      success: true,
+      data: [{ index_name: 'users_email_key', column_name: 'EMAIL', is_unique: 't', seq_in_index: '1', index_type: 'btree' }],
+    });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'KINGBASE', query: 'SELECT NAME FROM users' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'unique-key',
+      columns: ['EMAIL'],
+      valueColumns: ['__gonavi_locator_1_EMAIL'],
+      hiddenColumns: ['__gonavi_locator_1_EMAIL'],
+      readOnly: false,
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(false);
+    expect(messageApi.warning).not.toHaveBeenCalled();
+  });
+
   it('uses hidden Oracle ROWID for query results without primary or unique keys', async () => {
     storeState.connections[0].config.type = 'oracle';
     storeState.connections[0].config.database = 'ORCLPDB1';
@@ -3007,6 +4774,382 @@ describe('QueryEditor external SQL save', () => {
     renderer?.unmount();
   });
 
+  it('keeps Oracle anonymous PL/SQL blocks intact when running from the editor', async () => {
+    storeState.connections[0].config.type = 'oracle';
+    storeState.connections[0].config.database = 'ORCLPDB1';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{ columns: ['affectedRows'], rows: [{ affectedRows: 1 }] }],
+    });
+    const plsql = [
+      'BEGIN',
+      "    INSERT INTO tmp_disable_trigger (table_name) VALUES ('t_memcard_reg');",
+      "    UPDATE t_memcard_reg SET CARDLEVEL = 1 WHERE MEMCARDNO = '8032277312';",
+      "    DELETE FROM tmp_disable_trigger WHERE table_name = 't_memcard_reg';",
+      'END;',
+    ].join('\n');
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'ORCLPDB1', query: plsql })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBQueryMulti).toHaveBeenCalledWith(expect.anything(), 'ORCLPDB1', plsql, 'query-1');
+    expect(storeState.addSqlLog).toHaveBeenCalledWith(expect.objectContaining({
+      sql: plsql,
+      status: 'success',
+    }));
+    renderer?.unmount();
+  });
+
+  it('renders result grid for sqlserver exec statements that return rows', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    storeState.connections[0].config.database = 'master';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{ columns: ['SPID', 'STATUS'], rows: [{ SPID: 52, STATUS: 'RUNNABLE' }] }],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'master', query: 'EXEC sp_who2' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer!.toJSON())).toContain('结果 1');
+    expect(textContent(renderer!.toJSON())).not.toContain('影响行数：');
+    expect(dataGridState.latestProps?.columnNames).toEqual(['SPID', 'STATUS']);
+    expect(Array.isArray(dataGridState.latestProps?.data)).toBe(true);
+    expect(dataGridState.latestProps?.data?.[0]).toMatchObject({ SPID: 52, STATUS: 'RUNNABLE' });
+  });
+
+  it('renders standalone message result for sqlserver statistics statements', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    storeState.connections[0].config.database = 'master';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{
+        columns: [],
+        rows: [],
+        messages: ["Table 'users'. Scan count 1, logical reads 3."],
+      }],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'master', query: 'SET STATISTICS IO ON;' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer!.toJSON())).toContain('消息 1');
+    expect(textContent(renderer!.toJSON())).toContain("Table 'users'. Scan count 1, logical reads 3.");
+    expect(dataGridState.latestProps?.columnNames).not.toEqual([]);
+  });
+
+  it('keeps multiple result sets from a single sqlserver statement', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    storeState.connections[0].config.database = 'master';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [
+        { statementIndex: 1, columns: ['name'], rows: [{ name: 'master' }] },
+        { statementIndex: 1, columns: ['owner'], rows: [{ owner: 'sa' }] },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'master', query: 'EXEC sp_helpdb' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer!.toJSON())).toContain('结果 1');
+    expect(textContent(renderer!.toJSON())).toContain('结果 2');
+    expect(dataGridState.latestProps?.columnNames).toEqual(['name']);
+  });
+
+  it('prefers the first displayable sqlserver procedure result when empty result sets are returned', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    storeState.connections[0].config.database = 'hydee';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [
+        { statementIndex: 1, columns: [], rows: [] },
+        {
+          statementIndex: 1,
+          columns: ['insert_sql'],
+          rows: [
+            { insert_sql: "insert into c_user(userid) values('168')" },
+            { insert_sql: "insert into c_user(userid) values('169')" },
+          ],
+        },
+        { statementIndex: 1, columns: [], rows: [] },
+        { statementIndex: 1, columns: [], rows: [] },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'hydee', query: "p_get_select 'c_user','userid = ''168''',1" })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer!.toJSON())).toContain('结果 4');
+    expect(dataGridState.latestProps?.columnNames).toEqual(['insert_sql']);
+    expect(dataGridState.latestProps?.data?.[0]).toMatchObject({
+      insert_sql: "insert into c_user(userid) values('168')",
+    });
+  });
+
+  it('prefers concrete sqlserver procedure rows over affected-row status results', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    storeState.connections[0].config.database = 'hydee';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [
+        { statementIndex: 1, columns: ['affectedRows'], rows: [{ affectedRows: 0 }] },
+        { statementIndex: 1, columns: [], rows: [] },
+        {
+          statementIndex: 1,
+          columns: ['insert_sql'],
+          rows: [
+            { insert_sql: "insert into c_user(userid) values('168')" },
+          ],
+        },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'hydee', query: "p_get_select 'c_user','userid = ''168''',1" })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(dataGridState.latestProps?.columnNames).toEqual(['insert_sql']);
+    expect(dataGridState.latestProps?.data?.[0]).toMatchObject({
+      insert_sql: "insert into c_user(userid) values('168')",
+    });
+    expect(textContent(renderer!.toJSON())).not.toContain('影响行数：0');
+  });
+
+  it('prefers sqlserver print output messages over affected-row status results', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    storeState.connections[0].config.database = 'hydee';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [
+        { statementIndex: 1, columns: ['affectedRows'], rows: [{ affectedRows: 0 }] },
+        {
+          statementIndex: 1,
+          columns: [],
+          rows: [],
+          messages: [
+            "insert into c_dyscript(projectid,name) values (1,'demo')",
+            "insert into c_dyscript(projectid,name) values (2,'next')",
+          ],
+        },
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'hydee', query: "p_get_select c_dyscript,'projectid = 1',1" })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer!.toJSON())).toContain('消息 2');
+    expect(textContent(renderer!.toJSON())).toContain("insert into c_dyscript(projectid,name) values (1,'demo')");
+    expect(textContent(renderer!.toJSON())).not.toContain('影响行数：0');
+    expect(dataGridState.latestProps).toBeNull();
+  });
+
+  it('renders top-level sqlserver print messages when result sets contain only status rows', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    storeState.connections[0].config.database = 'hydee';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [
+        { statementIndex: 1, columns: ['affectedRows'], rows: [{ affectedRows: 0 }] },
+      ],
+      messages: [
+        "insert into c_dyscript(projectid,name) values (1,'demo')",
+      ],
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'hydee', query: "p_get_select c_dyscript,'projectid = 1',1" })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer!.toJSON())).toContain('消息 2');
+    expect(textContent(renderer!.toJSON())).toContain("insert into c_dyscript(projectid,name) values (1,'demo')");
+    expect(textContent(renderer!.toJSON())).not.toContain('影响行数：0');
+    expect(dataGridState.latestProps).toBeNull();
+  });
+
+  it('keeps both tabs when rerunning the same single sqlserver statement with multiple result sets', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    storeState.connections[0].config.database = 'master';
+    backendApp.DBQueryMulti
+      .mockResolvedValueOnce({
+        success: true,
+        data: [
+          { statementIndex: 1, columns: ['name'], rows: [{ name: 'master' }] },
+          { statementIndex: 1, columns: ['owner'], rows: [{ owner: 'sa' }] },
+        ],
+      })
+      .mockResolvedValueOnce({
+        success: true,
+        data: [
+          { statementIndex: 1, columns: ['name'], rows: [{ name: 'tempdb' }] },
+          { statementIndex: 1, columns: ['owner'], rows: [{ owner: 'dbo' }] },
+        ],
+      });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'master', query: 'EXEC sp_helpdb' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const tabLabels = renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-label');
+    });
+    expect(tabLabels).toHaveLength(2);
+    expect(dataGridState.latestProps?.columnNames).toEqual(['name']);
+    expect(dataGridState.latestProps?.data?.[0]).toMatchObject({ name: 'tempdb' });
+  });
+
+  it('reloads the active secondary result set for a single sqlserver statement', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    storeState.connections[0].config.database = 'master';
+    backendApp.DBQueryMulti
+      .mockResolvedValueOnce({
+        success: true,
+        data: [
+          { statementIndex: 1, columns: ['name'], rows: [{ name: 'master' }] },
+          { statementIndex: 1, columns: ['owner'], rows: [{ owner: 'sa' }] },
+        ],
+      })
+      .mockResolvedValueOnce({
+        success: true,
+        data: [
+          { statementIndex: 1, columns: ['name'], rows: [{ name: 'master' }] },
+          { statementIndex: 1, columns: ['owner'], rows: [{ owner: 'dbo' }] },
+        ],
+      });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'master', query: 'EXEC sp_helpdb' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const resultTabButtons = renderer!.root.findAll((node) => node.type === 'button' && node.props['data-tab-key']);
+    expect(resultTabButtons).toHaveLength(2);
+
+    await act(async () => {
+      resultTabButtons[1].props.onClick();
+    });
+
+    expect(dataGridState.latestProps?.columnNames).toEqual(['owner']);
+    expect(dataGridState.latestProps?.data?.[0]).toMatchObject({ owner: 'sa' });
+
+    await act(async () => {
+      await dataGridState.latestProps?.onReload?.();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBQueryMulti).toHaveBeenCalledTimes(2);
+    expect(dataGridState.latestProps?.columnNames).toEqual(['owner']);
+    expect(dataGridState.latestProps?.data?.[0]).toMatchObject({ owner: 'dbo' });
+    expect(dataGridState.latestProps?.data).not.toEqual(expect.arrayContaining([expect.objectContaining({ name: 'master' })]));
+  });
+
   it('localizes the non-Oracle no-safe-locator read-only warning in English while preserving the raw table name', async () => {
     storeState.languagePreference = 'en-US';
     setCurrentLanguage('en-US');
@@ -3132,6 +5275,46 @@ describe('QueryEditor external SQL save', () => {
     );
   });
 
+  it('keeps MySQL information_schema routine results read-only without a locator warning', async () => {
+    const sql = [
+      'SELECT ROUTINE_SCHEMA, ROUTINE_NAME, DEFINER, SECURITY_TYPE',
+      'FROM information_schema.ROUTINES',
+      "WHERE ROUTINE_SCHEMA = 'mkefu_location_dev_local'",
+      "  AND ROUTINE_NAME = 'init_orgi'",
+    ].join('\n');
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{
+        columns: ['ROUTINE_SCHEMA', 'ROUTINE_NAME', 'DEFINER', 'SECURITY_TYPE'],
+        rows: [{
+          ROUTINE_SCHEMA: 'mkefu_location_dev_local',
+          ROUTINE_NAME: 'init_orgi',
+          DEFINER: 'root@%',
+          SECURITY_TYPE: 'DEFINER',
+        }],
+      }],
+    });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'mkefu_location_dev_local', query: sql })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(dataGridState.latestProps?.tableName).toBe('ROUTINES');
+    expect(dataGridState.latestProps?.readOnly).toBe(true);
+    expect(backendApp.DBGetColumns).not.toHaveBeenCalled();
+    expect(backendApp.DBGetIndexes).not.toHaveBeenCalled();
+    expect(messageApi.warning).not.toHaveBeenCalled();
+  });
+
   it('runs the SQL statement at the cursor instead of the whole editor when nothing is selected', async () => {
     backendApp.DBQueryMulti.mockResolvedValueOnce({
       success: true,
@@ -3364,6 +5547,10 @@ describe('QueryEditor external SQL save', () => {
   it('shows "No executable SQL." in English when the cursor is on a blank line', async () => {
     storeState.languagePreference = 'en-US';
     setCurrentLanguage('en-US');
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{ columns: ['a'], rows: [{ a: 1 }] }],
+    });
 
     let renderer: ReactTestRenderer;
     await act(async () => {
@@ -3373,6 +5560,30 @@ describe('QueryEditor external SQL save', () => {
       })} />);
     });
 
+    editorState.position = { lineNumber: 1, column: 'select 1 as a;'.length + 1 };
+    editorState.selection = {
+      startLineNumber: 1,
+      startColumn: 'select 1 as a;'.length + 1,
+      endLineNumber: 1,
+      endColumn: 'select 1 as a;'.length + 1,
+      positionLineNumber: 1,
+      positionColumn: 'select 1 as a;'.length + 1,
+    };
+
+    await act(async () => {
+      const runButton = findButton(renderer!, '运行');
+      runButton.props.onMouseDown?.({ preventDefault: vi.fn() });
+      await runButton.props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer!.toJSON())).toContain('结果 1');
+    backendApp.DBQueryMulti.mockClear();
+    messageApi.info.mockClear();
+
     editorState.position = { lineNumber: 3, column: 1 };
     editorState.selection = {
       startLineNumber: 3,
@@ -3387,7 +5598,7 @@ describe('QueryEditor external SQL save', () => {
     });
 
     await act(async () => {
-      const runButton = findButton(renderer!, 'Run');
+      const runButton = findButton(renderer!, '运行');
       runButton.props.onMouseDown?.({ preventDefault: vi.fn() });
       await runButton.props.onClick();
     });
@@ -3399,6 +5610,7 @@ describe('QueryEditor external SQL save', () => {
     expect(backendApp.DBQueryMulti).not.toHaveBeenCalled();
     expect(messageApi.info).toHaveBeenCalledWith('No executable SQL.');
     expect(messageApi.info).not.toHaveBeenCalledWith('没有可执行的 SQL。');
+    expect(dataGridState.latestProps?.data).toEqual(expect.arrayContaining([expect.objectContaining({ a: 1 })]));
   });
 
   it('shows "Select a database first." in English before running without a database', async () => {
@@ -3875,8 +6087,149 @@ describe('QueryEditor external SQL save', () => {
     expect(String(backendApp.DBQueryMulti.mock.calls[1][2])).toContain('select 2 as b');
     expect(String(backendApp.DBQueryMulti.mock.calls[1][2])).not.toContain('select 1 as a');
     expect(textContent(renderer!.toJSON())).toContain('结果 1');
-    expect(textContent(renderer!.toJSON())).toContain('(1)');
     expect(textContent(renderer!.toJSON())).toContain('结果 2');
+    expect(renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-count') && textContent(node) === '1';
+    })).toHaveLength(2);
+  });
+
+  it('replaces existing result tabs when rerunning the same formatted SQL', async () => {
+    backendApp.DBQueryMulti
+      .mockResolvedValueOnce({
+        success: true,
+        data: [
+          { columns: ['id'], rows: [{ id: 1 }, { id: 2 }, { id: 3 }] },
+          { columns: ['id'], rows: Array.from({ length: 10 }, (_, index) => ({ id: index + 1 })) },
+        ],
+      })
+      .mockResolvedValueOnce({
+        success: true,
+        data: [
+          { columns: ['id'], rows: [{ id: 11 }, { id: 12 }, { id: 13 }] },
+          { columns: ['id'], rows: Array.from({ length: 10 }, (_, index) => ({ id: index + 11 })) },
+        ],
+      });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({
+        dbName: 'main',
+        query: 'SELECT * FROM fs_org_auth_application;\nSELECT * FROM fs_bcp_auth_info;',
+      })} />);
+    });
+
+    editorState.position = { lineNumber: 1, column: 'SELECT * FROM fs_org_auth_application;'.length + 1 };
+    editorState.selection = null;
+
+    await act(async () => {
+      const runButton = findButton(renderer!, '运行');
+      runButton.props.onMouseDown?.({ preventDefault: vi.fn() });
+      await runButton.props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(textContent(renderer!.toJSON())).toContain('结果 1');
+    expect(textContent(renderer!.toJSON())).toContain('结果 2');
+
+    editorState.value = [
+      'SELECT',
+      '    *',
+      'FROM',
+      '    fs_org_auth_application;',
+      '',
+      'SELECT',
+      '    *',
+      'FROM',
+      '    fs_bcp_auth_info;',
+    ].join('\n');
+    editorState.position = { lineNumber: 4, column: '    fs_org_auth_application;'.length + 1 };
+    editorState.selection = null;
+
+    await act(async () => {
+      const runButton = findButton(renderer!, '运行');
+      runButton.props.onMouseDown?.({ preventDefault: vi.fn() });
+      await runButton.props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBQueryMulti).toHaveBeenCalledTimes(2);
+    expect(textContent(renderer!.toJSON())).toContain('结果 1');
+    expect(textContent(renderer!.toJSON())).toContain('结果 2');
+    expect(textContent(renderer!.toJSON())).not.toContain('结果 3');
+    expect(textContent(renderer!.toJSON())).not.toContain('结果 4');
+    expect(renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-label');
+    })).toHaveLength(2);
+  });
+
+  it('provides context menu actions for query result tabs', async () => {
+    backendApp.DBQueryMulti.mockResolvedValue({
+      success: true,
+      data: [
+        { columns: ['a'], rows: [{ a: 1 }] },
+        { columns: ['b'], rows: [{ b: 2 }] },
+        { columns: ['c'], rows: [{ c: 3 }] },
+      ],
+    });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({
+        dbName: 'main',
+        query: 'select 1 as a;\nselect 2 as b;\nselect 3 as c;',
+      })} />);
+    });
+
+    await act(async () => {
+      const runButton = findButton(renderer!, '运行');
+      runButton.props.onMouseDown?.({ preventDefault: vi.fn() });
+      await runButton.props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-label');
+    })).toHaveLength(3);
+
+    await act(async () => {
+      renderer!.root.findAll((node) => node.type === 'button' && textContent(node) === '关闭右侧')[1].props.onClick();
+    });
+    expect(renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-label');
+    })).toHaveLength(2);
+    expect(textContent(renderer!.toJSON())).not.toContain('结果 3');
+
+    await act(async () => {
+      renderer!.root.findAll((node) => node.type === 'button' && textContent(node) === '关闭左侧')[1].props.onClick();
+    });
+    expect(renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-label');
+    })).toHaveLength(1);
+    expect(dataGridState.latestProps?.data).toEqual(expect.arrayContaining([expect.objectContaining({ b: 2 })]));
+    expect(dataGridState.latestProps?.data).not.toEqual(expect.arrayContaining([expect.objectContaining({ a: 1 })]));
+    expect(dataGridState.latestProps?.data).not.toEqual(expect.arrayContaining([expect.objectContaining({ c: 3 })]));
+
+    await act(async () => {
+      renderer!.root.findAll((node) => node.type === 'button' && textContent(node) === '关闭所有')[0].props.onClick();
+    });
+    expect(renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-label');
+    })).toHaveLength(0);
   });
 
   it('replaces the current result when rerunning the same cursor SQL', async () => {
@@ -4003,6 +6356,431 @@ describe('QueryEditor external SQL save', () => {
     expect(String(backendApp.DBQueryMulti.mock.calls[1][2])).not.toContain('select 3 as c');
     expect(textContent(renderer!.toJSON())).toContain('结果 1');
     expect(textContent(renderer!.toJSON())).toContain('结果 2');
+    expect(dataGridState.latestProps?.data).toEqual(expect.arrayContaining([expect.objectContaining({ b: 2 })]));
+    expect(dataGridState.latestProps?.data).not.toEqual(expect.arrayContaining([expect.objectContaining({ a: 1 })]));
+  });
+
+  it('renders compact result tab labels with row counts outside the title text', async () => {
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [
+        { columns: ['a'], rows: [{ a: 1 }, { a: 2 }] },
+        { columns: ['b'], rows: [{ b: 3 }] },
+      ],
+    });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({
+        dbName: 'main',
+        query: 'select 1 as a;\nselect 2 as b;',
+      })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const tabLabels = renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-label');
+    });
+    const counts = renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-count');
+    });
+    const titles = renderer!.root.findAll((node) => {
+      const className = String(node.props?.className || '');
+      return className.includes('query-result-tab-text');
+    });
+
+    expect(tabLabels).toHaveLength(2);
+    expect(titles.map((node) => textContent(node))).toEqual(['结果 1', '结果 2']);
+    expect(counts.map((node) => textContent(node))).toEqual(['2', '1']);
+    expect(textContent(renderer!.toJSON())).not.toContain('结果 1 (2)');
+  });
+
+  it('keeps query result tabs compact, centered, and readable in v2 UI', () => {
+    const source = readFileSync(new URL('./QueryEditorResultsPanel.tsx', import.meta.url), 'utf8');
+    const css = readFileSync(new URL('../v2-theme.css', import.meta.url), 'utf8');
+
+    expect(source).toContain('.query-result-tabs .ant-tabs-tab {');
+    expect(source).toContain('width: auto !important;');
+    expect(source).toContain('max-width: 148px !important;');
+    expect(source).toContain('height: 30px !important;');
+    expect(source).toContain('align-items: center !important;');
+    expect(source).toContain('font-size: 14px !important;');
+    expect(source).toContain('.query-result-tab-text {');
+    expect(source).toContain('user-select: none;');
+    expect(source).toContain('font-weight: 700;');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav .ant-tabs-tab {');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav .ant-tabs-tab-btn {');
+    expect(css).toContain('user-select: none;');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-results .query-result-tab-text {');
+  });
+
+  it('keeps the v2 query editor toolbar grouped and compact', () => {
+    const source = readFileSync(new URL('./QueryEditor.tsx', import.meta.url), 'utf8');
+    const toolbarSource = readFileSync(new URL('./QueryEditorToolbar.tsx', import.meta.url), 'utf8');
+    const resultsPanelSource = readFileSync(new URL('./QueryEditorResultsPanel.tsx', import.meta.url), 'utf8');
+    const transactionSettingsSource = readFileSync(new URL('./QueryEditorTransactionSettings.tsx', import.meta.url), 'utf8');
+    const transactionToolbarSource = readFileSync(new URL('./QueryEditorTransactionToolbar.tsx', import.meta.url), 'utf8');
+    const css = readFileSync(new URL('../v2-theme.css', import.meta.url), 'utf8');
+
+    expect(source).toContain('QueryEditorToolbar');
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-selects');
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-actions');
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-connection-select');
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-database-select');
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-max-rows-select');
+    expect(toolbarSource).toContain('QueryEditorTransactionSettings');
+    expect(transactionSettingsSource).toContain('gn-v2-query-toolbar-transaction-mode-select');
+    expect(transactionSettingsSource).toContain('gn-v2-query-toolbar-transaction-delay-select');
+    expect(transactionSettingsSource).toContain('参考 DBeaver');
+    expect(transactionSettingsSource).toContain("label: '手动'");
+    expect(transactionSettingsSource).toContain("label: '自动'");
+    expect(transactionSettingsSource).not.toContain("label: '手动提交'");
+    expect(transactionSettingsSource).not.toContain("label: '自动提交'");
+    expect(transactionSettingsSource).toContain("label: '立即'");
+    expect(transactionSettingsSource).toContain("label: '3s'");
+    expect(source).toContain('QueryEditorTransactionToolbar');
+    expect(transactionToolbarSource).toContain("className={isV2Ui ? 'gn-v2-query-transaction-toolbar' : undefined}");
+    expect(transactionToolbarSource).toContain(": null;");
+    expect(transactionToolbarSource).toContain('gn-v2-query-transaction-commit-button');
+    expect(transactionToolbarSource).toContain('gn-v2-toolbar-kbd');
+    expect(transactionToolbarSource).toContain("'自动提交中'");
+    expect(transactionToolbarSource).toContain('onFinish');
+    expect(toolbarSource).toContain('{isV2Ui && pendingTransactionToolbar}');
+    expect(toolbarSource).not.toContain('gn-v2-query-toolbar-transaction-row');
+    expect(resultsPanelSource).not.toContain('transactionToolbar?: React.ReactNode;');
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-action-group');
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-action-pair');
+    expect(toolbarSource).toContain('const aiMenuItems');
+    expect(toolbarSource).toContain('key: "toggle-result-panel"');
+    expect(toolbarSource).toContain('{!isV2Ui && (');
+    expect(toolbarSource).toContain('trigger={["click"]}');
+    expect(toolbarSource.indexOf('onClick={onQuickSave}')).toBeLessThan(toolbarSource.indexOf('menu={{ items: aiMenuItems }}'));
+    expect(toolbarSource.indexOf('menu={{ items: aiMenuItems }}')).toBeLessThan(toolbarSource.indexOf('menu={{ items: moreMenuItems }}'));
+    expect(toolbarSource.indexOf('menu={{ items: moreMenuItems }}')).toBeLessThan(toolbarSource.indexOf('icon={<FormatPainterOutlined />}'));
+    expect(transactionSettingsSource).toContain('style={isV2Ui ? undefined : { width: 78 }}');
+    expect(transactionSettingsSource).toContain('style={isV2Ui ? undefined : { width: 68 }}');
+    expect(toolbarSource).toContain('style={isV2Ui ? undefined : { width: 200 }}');
+    expect(toolbarSource).toContain('style={isV2Ui ? undefined : { width: 170 }}');
+
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-toolbar-selects');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-toolbar-actions');
+    expect(css).toContain('width: 74px !important;');
+    expect(css).toContain('width: 62px !important;');
+    expect(css).toContain('flex: 0 0 auto !important;');
+    expect(css).toContain('justify-content: flex-start;');
+    expect(css).toContain('height: 32px !important;');
+    expect(css).toContain('line-height: 30px !important;');
+    expect(css).toContain('display: inline-flex !important;');
+    expect(css).toContain('gap: 6px;');
+    expect(css).toContain('overflow-x: auto;');
+    expect(css).toContain('overflow-y: hidden;');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-toolbar-action-pair');
+    expect(css).toContain('gap: 8px;');
+    expect(css).toContain('margin-left: 0 !important;');
+    expect(css).toContain('max-width: 760px;');
+    expect(css).toContain('width: 140px !important;');
+    expect(css).toContain('width: 166px !important;');
+    expect(css).toContain('width: 132px !important;');
+    expect(css).toContain('width: 34px !important;');
+    expect(css).toContain('@media (max-width: 900px)');
+    expect(css).not.toContain('body[data-ui-version="v2"] .gn-v2-query-toolbar-transaction-row {');
+
+    const queryToolbarMainCss = css.slice(css.indexOf('body[data-ui-version="v2"] .gn-v2-query-toolbar-main {'), css.indexOf('body[data-ui-version="v2"] .gn-v2-query-toolbar-selects {'));
+    expect(queryToolbarMainCss).toContain('flex-wrap: nowrap;');
+    expect(queryToolbarMainCss).toContain('width: max-content;');
+    expect(queryToolbarMainCss).not.toContain('flex-wrap: wrap;');
+    expect(queryToolbarMainCss).not.toContain('margin-left: auto;');
+    expect(queryToolbarMainCss).not.toContain('justify-content: flex-end;');
+  });
+
+  it('keeps custom SQL snippet syntax help editable and uses it in completion details', () => {
+    const modalSource = readFileSync(new URL('./SnippetSettingsModal.tsx', import.meta.url), 'utf8');
+    const source = readFileSync(new URL('./QueryEditor.tsx', import.meta.url), 'utf8');
+
+    expect(modalSource).toContain('片段语法说明（可编辑）');
+    expect(modalSource).toContain('data-sql-snippet-syntax-help-editor="true"');
+    expect(modalSource).toContain("defaultActiveKey={['snippet-help']}");
+    expect(modalSource).toContain('footer={null}');
+    expect(modalSource).toContain('data-sql-snippet-action-row="true"');
+    expect(modalSource).toContain('body: { paddingTop: 8, paddingBottom: 24 }');
+    expect(modalSource).toContain("size=\"large\"");
+    expect(modalSource).toContain('minWidth: 96');
+    expect(modalSource).toContain('syntaxHelp');
+    expect(modalSource).toContain('占位符语法参考');
+    expect(source).toContain('s.syntaxHelp || s.description || s.body');
+  });
+
+  it('coalesces editor result splitter dragging through requestAnimationFrame', async () => {
+    const moveListeners: Array<(event: MouseEvent) => void> = [];
+    const upListeners: Array<() => void> = [];
+    const frameCallbacks: FrameRequestCallback[] = [];
+    vi.mocked(document.addEventListener).mockImplementation((type: string, listener: any) => {
+      if (type === 'mousemove') moveListeners.push(listener);
+      if (type === 'mouseup') upListeners.push(listener);
+    });
+    vi.mocked(window.requestAnimationFrame).mockImplementation((callback: FrameRequestCallback) => {
+      frameCallbacks.push(callback);
+      return frameCallbacks.length;
+    });
+
+    let renderer!: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ resultPanelVisible: true })} />);
+    });
+
+    const resizer = renderer.root.find((node) => node.props?.title === '拖动调整高度');
+    await act(async () => {
+      resizer.props.onMouseDown({ clientY: 300, preventDefault: vi.fn() });
+      moveListeners.forEach((listener) => listener({ clientY: 340 } as MouseEvent));
+      moveListeners.forEach((listener) => listener({ clientY: 380 } as MouseEvent));
+    });
+
+    expect(window.requestAnimationFrame).toHaveBeenCalledTimes(1);
+    expect(editorState.editor.layout).not.toHaveBeenCalled();
+
+    await act(async () => {
+      frameCallbacks.splice(0).forEach((callback) => callback(16));
+    });
+    expect(editorState.editor.layout).toHaveBeenCalledTimes(1);
+
+    await act(async () => {
+      upListeners.forEach((listener) => listener());
+    });
+    expect(editorState.editor.layout).toHaveBeenCalledTimes(2);
+    expect(document.removeEventListener).toHaveBeenCalledWith('mousemove', expect.any(Function));
+    expect(document.removeEventListener).toHaveBeenCalledWith('mouseup', expect.any(Function));
+  });
+
+  it('inserts sidebar object text when dropped into the SQL editor', async () => {
+    const domListeners: Record<string, ((event?: any) => void)[]> = {};
+    editorState.domNode = {
+      style: { cursor: '' },
+      addEventListener: vi.fn((type: string, listener: (event?: any) => void) => {
+        domListeners[type] ||= [];
+        domListeners[type].push(listener);
+      }),
+      removeEventListener: vi.fn(),
+    } as any;
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ query: 'select * from ' })} />);
+    });
+
+    editorState.position = { lineNumber: 1, column: 'select * from '.length + 1 };
+
+    await act(async () => {
+      domListeners.drop?.forEach((listener) => listener({
+        clientX: 10,
+        clientY: 10,
+        preventDefault: vi.fn(),
+        stopPropagation: vi.fn(),
+        dataTransfer: {
+          types: ['application/x-gonavi-sql-object', 'text/plain'],
+          getData: (type: string) => {
+            if (type === 'application/x-gonavi-sql-object') {
+              return JSON.stringify({ text: 'reporting.active_users' });
+            }
+            if (type === 'text/plain') {
+              return 'reporting.active_users';
+            }
+            return '';
+          },
+        },
+      }));
+    });
+
+    expect(editorState.editor.executeEdits).toHaveBeenCalledWith(
+      'gonavi-sidebar-drop',
+      [expect.objectContaining({ text: 'reporting.active_users' })],
+    );
+    expect(editorState.value).toContain('reporting.active_users');
+  });
+
+  it('prevents Monaco native drag marker and keeps metadata hover after sidebar object drops', async () => {
+    const domListeners: Record<string, ((event?: any) => void)[]> = {};
+    editorState.domNode = {
+      style: { cursor: '' },
+      addEventListener: vi.fn((type: string, listener: (event?: any) => void) => {
+        domListeners[type] ||= [];
+        domListeners[type].push(listener);
+      }),
+      removeEventListener: vi.fn(),
+    } as any;
+    editorState.editor.getTargetAtClientPoint = vi.fn(() => ({
+      position: { lineNumber: 1, column: 'SELECT * FROM '.length + 1 },
+    }));
+    editorState.value = 'SELECT * FROM ';
+    autoFetchState.visible = true;
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'front_end_sys' }] });
+    backendApp.DBGetTables.mockResolvedValueOnce({ success: true, data: [{ Tables_in_front_end_sys: 'fs_mkefu_regist_record' }] });
+    backendApp.DBGetAllColumns.mockResolvedValueOnce({ success: true, data: [] });
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ query: editorState.value, dbName: 'front_end_sys' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const dragOverEvent = {
+      preventDefault: vi.fn(),
+      stopPropagation: vi.fn(),
+      dataTransfer: {
+        types: ['application/x-gonavi-sql-object', 'text/plain'],
+        dropEffect: 'none',
+        getData: vi.fn(() => ''),
+      },
+    };
+    await act(async () => {
+      domListeners.dragover?.forEach((listener) => listener(dragOverEvent));
+    });
+
+    expect(dragOverEvent.preventDefault).toHaveBeenCalled();
+    expect(dragOverEvent.stopPropagation).toHaveBeenCalled();
+    expect(dragOverEvent.dataTransfer.dropEffect).toBe('copy');
+    expect(dragOverEvent.dataTransfer.getData).not.toHaveBeenCalled();
+
+    await act(async () => {
+      domListeners.drop?.forEach((listener) => listener({
+        clientX: 10,
+        clientY: 10,
+        preventDefault: vi.fn(),
+        stopPropagation: vi.fn(),
+        dataTransfer: {
+          types: ['application/x-gonavi-sql-object', 'text/plain'],
+          getData: (type: string) => {
+            if (type === 'application/x-gonavi-sql-object') {
+              return JSON.stringify({ text: 'fs_mkefu_regist_record' });
+            }
+            if (type === 'text/plain') {
+              return 'fs_mkefu_regist_record';
+            }
+            return '';
+          },
+        },
+      }));
+    });
+
+    const hover = editorState.hoverProviders[0]?.provideHover(
+      editorState.editor.getModel(),
+      { lineNumber: 1, column: 'SELECT * FROM fs_mkefu_regist_record'.length },
+    );
+    expect(editorState.value).toContain('fs_mkefu_regist_record');
+    expect(hover?.contents?.[0]?.value).toContain('**表** `fs_mkefu_regist_record`');
+
+    await act(async () => {
+      editorState.mouseDownListeners[0]?.({
+        target: { position: { lineNumber: 1, column: 'SELECT * FROM fs_mkefu_regist_record'.length } },
+        event: {
+          leftButton: true,
+          ctrlKey: true,
+          metaKey: false,
+          preventDefault: vi.fn(),
+          stopPropagation: vi.fn(),
+        },
+      });
+    });
+
+    expect(storeState.setActiveContext).toHaveBeenCalledWith({ connectionId: 'conn-1', dbName: 'front_end_sys' });
+    expect(storeState.addTab).toHaveBeenCalledWith(expect.objectContaining({
+      type: 'table',
+      connectionId: 'conn-1',
+      dbName: 'front_end_sys',
+      tableName: 'fs_mkefu_regist_record',
+      objectType: 'table',
+    }));
+  });
+
+  it('keeps sidebar object navigation tied to the dragged database after drop', async () => {
+    const domListeners: Record<string, ((event?: any) => void)[]> = {};
+    editorState.domNode = {
+      style: { cursor: '' },
+      addEventListener: vi.fn((type: string, listener: (event?: any) => void) => {
+        domListeners[type] ||= [];
+        domListeners[type].push(listener);
+      }),
+      removeEventListener: vi.fn(),
+    } as any;
+    editorState.editor.getTargetAtClientPoint = vi.fn(() => ({
+      position: { lineNumber: 1, column: 'SELECT * FROM '.length + 1 },
+    }));
+    editorState.value = 'SELECT * FROM ';
+    autoFetchState.visible = true;
+    backendApp.DBGetDatabases.mockResolvedValueOnce({ success: true, data: [{ Database: 'main' }, { Database: 'front_end_sys' }] });
+    backendApp.DBGetTables
+      .mockResolvedValueOnce({ success: true, data: [{ Tables_in_main: 'users' }] })
+      .mockResolvedValueOnce({ success: true, data: [{ Tables_in_front_end_sys: 'fs_mkefu_regist_record' }] });
+    backendApp.DBGetAllColumns
+      .mockResolvedValueOnce({ success: true, data: [] })
+      .mockResolvedValueOnce({ success: true, data: [] });
+
+    await act(async () => {
+      create(<QueryEditor tab={createTab({ query: editorState.value, dbName: 'main' })} />);
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    await act(async () => {
+      domListeners.drop?.forEach((listener) => listener({
+        clientX: 10,
+        clientY: 10,
+        preventDefault: vi.fn(),
+        stopPropagation: vi.fn(),
+        dataTransfer: {
+          types: ['application/x-gonavi-sql-object', 'text/plain'],
+          getData: (type: string) => {
+            if (type === 'application/x-gonavi-sql-object') {
+              return JSON.stringify({
+                text: 'fs_mkefu_regist_record',
+                nodeType: 'table',
+                connectionId: 'conn-1',
+                dbName: 'front_end_sys',
+              });
+            }
+            if (type === 'text/plain') {
+              return 'fs_mkefu_regist_record';
+            }
+            return '';
+          },
+        },
+      }));
+    });
+
+    expect(editorState.value).toContain('front_end_sys.fs_mkefu_regist_record');
+
+    await act(async () => {
+      editorState.mouseDownListeners[0]?.({
+        target: { position: { lineNumber: 1, column: 'SELECT * FROM front_end_sys.fs_mkefu_regist_record'.length } },
+        event: {
+          leftButton: true,
+          ctrlKey: true,
+          metaKey: false,
+          preventDefault: vi.fn(),
+          stopPropagation: vi.fn(),
+        },
+      });
+    });
+
+    expect(storeState.setActiveContext).toHaveBeenCalledWith({ connectionId: 'conn-1', dbName: 'front_end_sys' });
+    expect(storeState.addTab).toHaveBeenCalledWith(expect.objectContaining({
+      type: 'table',
+      connectionId: 'conn-1',
+      dbName: 'front_end_sys',
+      tableName: 'fs_mkefu_regist_record',
+      objectType: 'table',
+    }));
   });
 
   it('runs selected SQL before cursor SQL', async () => {
@@ -4085,6 +6863,95 @@ describe('QueryEditor external SQL save', () => {
     expect(messageApi.warning).not.toHaveBeenCalled();
   });
 
+  it('keeps DuckDB qualified table query results writable when primary key metadata arrives', async () => {
+    storeState.connections[0].config.type = 'duckdb';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{ columns: ['NAME', '__gonavi_locator_1_id'], rows: [{ NAME: 'launch', __gonavi_locator_1_id: 7 }] }],
+    });
+    backendApp.DBGetColumns.mockResolvedValueOnce({
+      success: true,
+      data: [{ name: 'id', key: 'PRI' }, { name: 'name', key: '' }],
+    });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'main', query: 'SELECT NAME FROM main.events' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(backendApp.DBGetColumns).toHaveBeenCalledWith(expect.anything(), 'main', 'main.events');
+    expect(dataGridState.latestProps?.tableName).toBe('main.events');
+    expect(dataGridState.latestProps?.pkColumns).toEqual(['id']);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'primary-key',
+      columns: ['id'],
+      valueColumns: ['__gonavi_locator_1_id'],
+      hiddenColumns: ['__gonavi_locator_1_id'],
+      writableColumns: {
+        NAME: 'name',
+      },
+      readOnly: false,
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(false);
+    expect(String(backendApp.DBQueryMulti.mock.calls[0][2])).toContain('"id" AS "__gonavi_locator_1_id"');
+    expect(messageApi.warning).not.toHaveBeenCalled();
+  });
+
+  it('uses hidden DuckDB rowid when query results have no primary or unique key', async () => {
+    storeState.connections[0].config.type = 'duckdb';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBQueryMulti.mockResolvedValueOnce({
+      success: true,
+      data: [{ columns: ['NAME', '__gonavi_duckdb_rowid__'], rows: [{ NAME: 'launch', __gonavi_duckdb_rowid__: 17 }] }],
+    });
+    backendApp.DBGetColumns.mockResolvedValueOnce({
+      success: true,
+      data: [{ name: 'name', key: '' }],
+    });
+    backendApp.DBGetIndexes.mockResolvedValueOnce({
+      success: true,
+      data: [],
+    });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<QueryEditor tab={createTab({ dbName: 'main', query: 'SELECT NAME FROM main.events' })} />);
+    });
+
+    await act(async () => {
+      await findButton(renderer!, '运行').props.onClick();
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(dataGridState.latestProps?.tableName).toBe('main.events');
+    expect(dataGridState.latestProps?.pkColumns).toEqual([]);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'duckdb-rowid',
+      columns: ['rowid'],
+      valueColumns: ['__gonavi_duckdb_rowid__'],
+      hiddenColumns: ['__gonavi_duckdb_rowid__'],
+      writableColumns: {
+        NAME: 'name',
+      },
+      readOnly: false,
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(false);
+    expect(String(backendApp.DBQueryMulti.mock.calls[0][2])).toContain('rowid AS "__gonavi_duckdb_rowid__"');
+    expect(messageApi.warning).not.toHaveBeenCalled();
+  });
+
   it.each([
     'mysql',
     'mariadb',
@@ -4096,6 +6963,7 @@ describe('QueryEditor external SQL save', () => {
     'highgo',
     'vastbase',
     'opengauss',
+    'gaussdb',
     'sqlserver',
     'sqlite',
     'duckdb',
diff --git a/frontend/src/components/QueryEditor.tsx b/frontend/src/components/QueryEditor.tsx
index 34d56ad..e0f9f5f 100644
--- a/frontend/src/components/QueryEditor.tsx
+++ b/frontend/src/components/QueryEditor.tsx
@@ -1,41 +1,53 @@
-import React, { useState, useEffect, useRef, useMemo, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useMemo, useCallback } from 'react';
 import Editor, { type OnMount } from './MonacoEditor';
-import { Button, message, Modal, Input, Form, Dropdown, MenuProps, Tooltip, Select, Tabs } from 'antd';
-import { PlayCircleOutlined, SaveOutlined, FormatPainterOutlined, SettingOutlined, CloseOutlined, StopOutlined, RobotOutlined } from '@ant-design/icons';
-import { format } from 'sql-formatter';
+import { message, Modal, Input, Form, MenuProps } from 'antd';
+import { format, type SqlLanguage } from 'sql-formatter';
 import { v4 as uuidv4 } from 'uuid';
 import { TabData, ColumnDefinition, IndexDefinition } from '../types';
 import { useStore } from '../store';
-import { DBQuery, DBQueryWithCancel, DBQueryMulti, DBGetTables, DBGetAllColumns, DBGetDatabases, DBGetColumns, DBGetIndexes, CancelQuery, GenerateQueryID, WriteSQLFile, ExportSQLFile } from '../../wailsjs/go/app/App';
-import DataGrid, { GONAVI_ROW_KEY } from './DataGrid';
+import { DBQuery, DBQueryWithCancel, DBQueryMulti, DBQueryMultiTransactional, DBGetTables, DBGetAllColumns, DBGetDatabases, DBGetColumns, DBGetIndexes, CancelQuery, GenerateQueryID, WriteSQLFile, ExportSQLFile } from '../../wailsjs/go/app/App';
+import { GONAVI_ROW_KEY } from './DataGrid';
 import { getDataSourceCapabilities } from '../utils/dataSourceCapabilities';
 import { applyMongoQueryAutoLimit, convertMongoShellToJsonCommand } from "../utils/mongodb";
 import { getShortcutDisplayLabel, getShortcutPlatform, getShortcutPrimaryModifierDisplayLabel, isEditableElement, isShortcutMatch, comboToMonacoKeyBinding, resolveShortcutBinding } from "../utils/shortcuts";
 import { useAutoFetchVisibility } from '../utils/autoFetchVisibility';
 import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
+import { isPostgresSchemaDialect } from '../utils/connectionDriverType';
 import { isOracleLikeDialect, resolveSqlDialect, resolveSqlFunctions, resolveSqlKeywords } from '../utils/sqlDialect';
 import { applyQueryAutoLimit } from '../utils/queryAutoLimit';
+import {
+    buildQueryResultPageSql,
+    createInitialQueryResultPagination,
+    resolveQueryResultPaginationTotal,
+} from '../utils/queryResultPagination';
 import { extractQueryResultTableRef, type QueryResultTableRef } from '../utils/queryResultTable';
-import { quoteIdentPart } from '../utils/sql';
-import { resolveCurrentSqlStatementRange, resolveExecutableSql } from '../utils/sqlStatementSelection';
+import { quoteIdentPart, quoteQualifiedIdent } from '../utils/sql';
+import { formatSqlExecutionError } from '../utils/sqlErrorSemantics';
+import { shouldUseSqlEditorManagedTransaction } from '../utils/sqlEditorTransaction';
+import { findSqlStatementRanges, resolveCurrentSqlStatementRange, resolveExecutableSql } from '../utils/sqlStatementSelection';
 import { isMacLikePlatform } from '../utils/appearance';
 import { splitSidebarQualifiedName } from '../utils/sidebarLocate';
-import { normalizeSidebarViewName } from '../utils/sidebarMetadata';
+import { buildMySQLCompatibleViewMetadataSqls, isSidebarViewTableType, normalizeSidebarViewName } from '../utils/sidebarMetadata';
+import { SIDEBAR_SQL_EDITOR_DRAG_MIME, decodeSidebarSqlEditorDragPayload, hasSidebarSqlEditorDragPayload } from '../utils/sidebarSqlDrag';
 import { resolveUniqueKeyGroupsFromIndexes } from './dataGridCopyInsert';
-import { ORACLE_ROWID_LOCATOR_COLUMN, type EditRowLocator } from '../utils/rowLocator';
 import { SUPPORTED_LANGUAGES, t as translate } from '../i18n';
 import {
+    DUCKDB_ROWID_LOCATOR_COLUMN,
+    ORACLE_ROWID_LOCATOR_COLUMN,
+    type EditRowLocator,
+} from '../utils/rowLocator';
+import { getQueryTabDraft, hasQueryTabDraft, setQueryTabDraft, setSQLFileTabDraft } from '../utils/sqlFileTabDrafts';
+import {
+    getColumnDefinitionComment,
     getColumnDefinitionKey,
     getColumnDefinitionName,
+    getColumnDefinitionType,
 } from '../utils/columnDefinition';
-
-const SQL_KEYWORDS = [
-    'SELECT', 'FROM', 'WHERE', 'LIMIT', 'INSERT', 'UPDATE', 'DELETE', 'JOIN', 'LEFT', 'RIGHT',
-    'INNER', 'OUTER', 'ON', 'GROUP BY', 'ORDER BY', 'AS', 'AND', 'OR', 'NOT', 'NULL', 'IS',
-    'IN', 'VALUES', 'SET', 'CREATE', 'TABLE', 'DROP', 'ALTER', 'ADD', 'MODIFY', 'CHANGE',
-    'COLUMN', 'KEY', 'PRIMARY', 'FOREIGN', 'REFERENCES', 'CONSTRAINT', 'DEFAULT', 'AUTO_INCREMENT',
-    'COMMENT', 'SHOW', 'DESCRIBE', 'EXPLAIN',
-];
+import QueryEditorResultsPanel, { type QueryEditorResultSet } from './QueryEditorResultsPanel';
+import { SQL_EDITOR_AUTO_COMMIT_DELAY_OPTIONS } from './QueryEditorTransactionSettings';
+import QueryEditorTransactionToolbar from './QueryEditorTransactionToolbar';
+import QueryEditorToolbar from './QueryEditorToolbar';
+import { useSqlEditorTransactionController } from './useSqlEditorTransactionController';
 
 const UNTITLED_QUERY_DATABASE_PLACEHOLDER = '__GONAVI_QUERY_DATABASE__';
 
@@ -79,10 +91,14 @@ const buildQueryEditorAiContextPrompt = (connection: any, database: string): str
     });
 };
 
-// HMR 重载时释放旧注册避免补全项重复
+// HMR 重载时释放旧注册避免补全和 hover 内容重复
 const _g = globalThis as any;
+const SQL_COMPLETION_PROVIDER_VERSION = '20260612-cursor-stable-completion-v1';
 if (!_g.__gonaviSqlCompletionState) {
-    _g.__gonaviSqlCompletionState = { registered: false, disposables: [] as any[] };
+    _g.__gonaviSqlCompletionState = { registered: false, version: '', disposables: [] as any[] };
+}
+if (!Array.isArray(_g.__gonaviSqlCompletionState.disposables)) {
+    _g.__gonaviSqlCompletionState.disposables = [];
 }
 let sqlCompletionRegistered = _g.__gonaviSqlCompletionState.registered;
 let sqlCompletionDisposables = _g.__gonaviSqlCompletionState.disposables;
@@ -100,7 +116,32 @@ type CompletionRoutineMeta = {dbName: string, routineName: string, routineType:
 let sharedTablesData: CompletionTableMeta[] = [];
 let sharedAllColumnsData: CompletionColumnMeta[] = [];
 let sharedVisibleDbs: string[] = [];
+let sharedViewsData: CompletionViewMeta[] = [];
+let sharedMaterializedViewsData: CompletionViewMeta[] = [];
+let sharedTriggersData: CompletionTriggerMeta[] = [];
+let sharedRoutinesData: CompletionRoutineMeta[] = [];
 let sharedColumnsCacheData: Record<string, any[]> = {};
+const sharedLazyTablesCache: Record<string, CompletionTableMeta[] | undefined> = {};
+const sharedLazyTablesInFlight: Record<string, Promise<CompletionTableMeta[]> | undefined> = {};
+const createEmptySqlCompletionResult = () => ({ suggestions: [] as any[] });
+const isSqlCompletionRequestCancelled = (token?: { isCancellationRequested?: boolean } | null) =>
+    Boolean(token?.isCancellationRequested);
+const clearRecord = (record: Record<string, unknown>) => {
+    Object.keys(record).forEach((key) => {
+        delete record[key];
+    });
+};
+const resetSharedQueryEditorMetadata = () => {
+    sharedTablesData = [];
+    sharedAllColumnsData = [];
+    sharedViewsData = [];
+    sharedMaterializedViewsData = [];
+    sharedTriggersData = [];
+    sharedRoutinesData = [];
+    sharedColumnsCacheData = {};
+    clearRecord(sharedLazyTablesCache);
+    clearRecord(sharedLazyTablesInFlight);
+};
 
 const QUERY_LOCATOR_ALIAS_PREFIX = '__gonavi_locator_';
 
@@ -127,6 +168,65 @@ type QueryStatementPlan = {
     warning?: string;
 };
 
+const stripSidebarDropIdentifierQuotes = (part: string): string => {
+    const text = String(part || '').trim();
+    if (!text) return '';
+    if ((text.startsWith('`') && text.endsWith('`')) || (text.startsWith('"') && text.endsWith('"')) || (text.startsWith('[') && text.endsWith(']'))) {
+        return text.slice(1, -1).trim();
+    }
+    return text;
+};
+
+const shouldPrefixSidebarDropDatabase = (
+    payloadConnectionId: string,
+    payloadDbName: string,
+    payloadText: string,
+    currentConnectionId: string,
+    currentDb: string,
+): boolean => {
+    const sourceDbName = String(payloadDbName || '').trim();
+    if (!sourceDbName) return false;
+    const normalizedSourceDbName = sourceDbName.toLowerCase();
+    if (String(currentDb || '').trim().toLowerCase() === normalizedSourceDbName) return false;
+
+    const sourceConnectionId = String(payloadConnectionId || '').trim();
+    const targetConnectionId = String(currentConnectionId || '').trim();
+    if (sourceConnectionId && targetConnectionId && sourceConnectionId !== targetConnectionId) return false;
+
+    const parts = String(payloadText || '')
+        .split('.')
+        .map(stripSidebarDropIdentifierQuotes)
+        .filter(Boolean);
+    return parts[0]?.toLowerCase() !== normalizedSourceDbName;
+};
+
+const isQueryEditorPrimaryMouseButton = (event: any): boolean => {
+    if (event?.leftButton === true) return true;
+    if (event?.leftButton === false) return false;
+
+    const browserEvent = event?.browserEvent || event?.nativeEvent || event;
+    if (browserEvent?.button === 0) return true;
+    if (event?.button === 0) return true;
+    if (browserEvent?.buttons === 1) return true;
+    if (event?.buttons === 1) return true;
+    return false;
+};
+
+const readSidebarSqlDropText = (
+    event: DragEvent,
+    currentConnectionId = '',
+    currentDb = '',
+): string => {
+    const payload = decodeSidebarSqlEditorDragPayload(String(event.dataTransfer?.getData(SIDEBAR_SQL_EDITOR_DRAG_MIME) || ''));
+    if (payload?.text) {
+        if (shouldPrefixSidebarDropDatabase(payload.connectionId || '', payload.dbName || '', payload.text, currentConnectionId, currentDb)) {
+            return `${String(payload.dbName || '').trim()}.${payload.text}`;
+        }
+        return payload.text;
+    }
+    return String(event.dataTransfer?.getData('text/plain') || '').trim();
+};
+
 const stripQueryIdentifierQuotes = (part: string): string => {
     const text = String(part || '').trim();
     if (!text) return '';
@@ -139,6 +239,33 @@ const stripQueryIdentifierQuotes = (part: string): string => {
     return text;
 };
 
+const MYSQL_SYSTEM_METADATA_SCHEMAS = new Set(['information_schema', 'performance_schema', 'mysql', 'sys']);
+const POSTGRES_SYSTEM_METADATA_SCHEMAS = new Set(['information_schema', 'pg_catalog']);
+const SQLITE_SYSTEM_METADATA_TABLES = new Set(['sqlite_master', 'sqlite_schema', 'sqlite_temp_master', 'sqlite_temp_schema']);
+
+const isSystemMetadataQueryResult = (tableRef: QueryResultTableRef, dbType: string): boolean => {
+    const normalizedDbType = String(dbType || '').trim().toLowerCase();
+    const metadataDbName = stripQueryIdentifierQuotes(tableRef.metadataDbName).toLowerCase();
+    const metadataTableName = stripQueryIdentifierQuotes(tableRef.metadataTableName).toLowerCase();
+
+    if (['mysql', 'goldendb', 'mariadb', 'oceanbase', 'diros', 'starrocks', 'sphinx', 'tidb'].includes(normalizedDbType)) {
+        return MYSQL_SYSTEM_METADATA_SCHEMAS.has(metadataDbName);
+    }
+    if (['postgres', 'kingbase', 'highgo', 'vastbase', 'opengauss', 'gaussdb'].includes(normalizedDbType)) {
+        return POSTGRES_SYSTEM_METADATA_SCHEMAS.has(metadataDbName);
+    }
+    if (normalizedDbType === 'sqlite' || normalizedDbType === 'duckdb') {
+        return SQLITE_SYSTEM_METADATA_TABLES.has(metadataTableName) || metadataDbName === 'information_schema';
+    }
+    if (normalizedDbType === 'sqlserver') {
+        return metadataDbName === 'information_schema' || metadataDbName === 'sys';
+    }
+    if (normalizedDbType === 'clickhouse') {
+        return metadataDbName === 'system' || metadataDbName === 'information_schema';
+    }
+    return false;
+};
+
 const splitTopLevelComma = (text: string): string[] => {
     const parts: string[] = [];
     let current = '';
@@ -288,7 +415,7 @@ const rewriteOracleSelectAllWithExpressions = (sql: string, expressions: string[
     if (!selectAllFound) return undefined;
 
     const fromTrimmed = fromTail.trimStart();
-    const tableMatch = fromTrimmed.match(/^((?:[`"\[]?\w+[`"\]]?)(?:\s*\.\s*(?:[`"\[]?\w+[`"\]]?)){0,2})([\s\S]*)$/);
+    const tableMatch = fromTrimmed.match(QUERY_EDITOR_SQL_LEADING_IDENTIFIER_PATH_REGEX);
     if (!tableMatch) return undefined;
 
     const tableText = tableMatch[1];
@@ -373,6 +500,10 @@ const buildQueryRowIDExpression = (dbType: string, sourceAlias?: string): string
     `${sourceAlias ? `${sourceAlias}.` : ''}ROWID AS ${quoteIdentPart(dbType, ORACLE_ROWID_LOCATOR_COLUMN)}`
 );
 
+const buildDuckDBRowIDExpression = (dbType: string, sourceAlias?: string): string => (
+    `${sourceAlias ? `${sourceAlias}.` : ''}rowid AS ${quoteIdentPart(dbType, DUCKDB_ROWID_LOCATOR_COLUMN)}`
+);
+
 const escapeMetadataSqlLiteral = (raw: string): string => String(raw || '').replace(/'/g, "''");
 
 const quoteSqlServerDbIdentifier = (raw: string): string => `[${String(raw || '').replace(/]/g, ']]')}]`;
@@ -398,6 +529,38 @@ const normalizeMetadataDialect = (conn: any): string => {
     return String(dialect || '').toLowerCase();
 };
 
+const resolveQueryEditorFormatterLanguage = (conn: any): SqlLanguage => {
+    const dialect = normalizeMetadataDialect(conn);
+    switch (dialect) {
+        case 'postgres':
+        case 'kingbase':
+        case 'highgo':
+        case 'vastbase':
+        case 'opengauss':
+        case 'gaussdb':
+            return 'postgresql';
+        case 'duckdb':
+            return 'duckdb';
+        case 'sqlite':
+            return 'sqlite';
+        case 'sqlserver':
+            return 'transactsql';
+        case 'oracle':
+        case 'dameng':
+            return 'plsql';
+        case 'clickhouse':
+            return 'clickhouse';
+        case 'mysql':
+        case 'goldendb':
+        case 'sphinx':
+            return 'mysql';
+        case 'mariadb':
+            return 'mariadb';
+        default:
+            return 'sql';
+    }
+};
+
 const buildCompletionTableCommentSQL = (dialect: string, dbName: string): string => {
     const db = String(dbName || '').trim();
     const escapedDb = escapeMetadataSqlLiteral(db);
@@ -410,6 +573,7 @@ const buildCompletionTableCommentSQL = (dialect: string, dbName: string): string
         case 'vastbase':
         case 'highgo':
         case 'opengauss':
+        case 'gaussdb':
             return `SELECT n.nspname || '.' || c.relname AS table_name, obj_description(c.oid, 'pg_class') AS table_comment FROM pg_class c JOIN pg_namespace n ON n.oid = c.relnamespace WHERE c.relkind IN ('r', 'p') AND n.nspname NOT IN ('pg_catalog', 'information_schema') AND n.nspname NOT LIKE 'pg|_%' ESCAPE '|' ORDER BY n.nspname, c.relname`;
         case 'sqlserver': {
             const safeDb = quoteSqlServerDbIdentifier(db);
@@ -502,6 +666,9 @@ const getTabQueryValue = (tab: TabData): string => (
 );
 
 const getInitialEditorQuery = (tab: TabData): string => {
+    if (hasQueryTabDraft(tab.id)) {
+        return getQueryTabDraft(tab.id);
+    }
     const tabQuery = getTabQueryValue(tab);
     if (tabQuery || tab.filePath || tab.savedQueryId || tab.readOnly) {
         return tabQuery;
@@ -518,16 +685,19 @@ const resolveNextResultSetIndex = (sets: Array<{ key?: string }>): number => {
     return maxIndex + 1;
 };
 
-const areSqlStatementListsEqual = (left: string[], right: string[]): boolean => (
-    left.length === right.length && left.every((statement, index) => statement === right[index])
-);
-
 const normalizeExecutedSqlKey = (sql: string): string => String(sql || '')
     .replace(/\r\n/g, '\n')
     .replace(/；/g, ';')
     .trim()
     .replace(/;+\s*$/g, '')
-    .trim();
+    .trim()
+    .replace(/\s+/g, ' ')
+    .toLowerCase();
+
+const areSqlStatementListsEqual = (left: string[], right: string[]): boolean => (
+    left.length === right.length
+    && left.every((statement, index) => normalizeExecutedSqlKey(statement) === normalizeExecutedSqlKey(right[index]))
+);
 
 const normalizeEditorPosition = (position: any): { lineNumber: number; column: number } | null => {
     if (!position) return null;
@@ -563,6 +733,17 @@ const getFirstRowValue = (row: Record<string, any>): string => {
     return '';
 };
 
+const getMySQLShowTablesName = (row: Record<string, any>): string => {
+    for (const key of Object.keys(row || {})) {
+        if (!key.toLowerCase().startsWith('tables_in_')) continue;
+        const value = row[key];
+        if (value === undefined || value === null) continue;
+        const normalized = String(value).trim();
+        if (normalized !== '') return normalized;
+    }
+    return '';
+};
+
 const normalizeMetadataQuerySpecs = (specs: MetadataQuerySpec[]): MetadataQuerySpec[] => {
     const seen = new Set<string>();
     const normalized: MetadataQuerySpec[] = [];
@@ -590,22 +771,16 @@ const buildCompletionViewsMetadataQuerySpecs = (dialect: string, dbName: string)
     switch (dialect) {
         case 'mysql':
         case 'starrocks': {
-            const dbIdent = String(dbName || '').replace(/`/g, '``').trim();
-            return normalizeMetadataQuerySpecs([
-                {
-                    sql: safeDbName
-                        ? `SELECT TABLE_NAME AS view_name, TABLE_SCHEMA AS schema_name FROM information_schema.views WHERE table_schema = '${safeDbName}' ORDER BY TABLE_NAME`
-                        : '',
-                },
-                { sql: dbIdent ? `SHOW FULL TABLES FROM \`${dbIdent}\`` : '' },
-                { sql: 'SHOW FULL TABLES' },
-            ]);
+            return normalizeMetadataQuerySpecs(
+                buildMySQLCompatibleViewMetadataSqls(dbName).map((sql) => ({ sql })),
+            );
         }
         case 'postgres':
         case 'kingbase':
         case 'highgo':
         case 'vastbase':
         case 'opengauss':
+        case 'gaussdb':
             return [{ sql: `SELECT schemaname AS schema_name, viewname AS view_name FROM pg_catalog.pg_views WHERE schemaname != 'information_schema' AND schemaname NOT LIKE 'pg|_%' ESCAPE '|' ORDER BY schemaname, viewname` }];
         case 'sqlserver': {
             const safeDb = quoteSqlServerDbIdentifier(dbName || 'master');
@@ -669,6 +844,7 @@ const buildCompletionTriggersMetadataQuerySpecs = (dialect: string, dbName: stri
         case 'highgo':
         case 'vastbase':
         case 'opengauss':
+        case 'gaussdb':
             return [{ sql: `SELECT DISTINCT event_object_schema AS schema_name, event_object_table AS table_name, trigger_name FROM information_schema.triggers WHERE trigger_schema NOT IN ('pg_catalog', 'information_schema') AND trigger_schema NOT LIKE 'pg|_%' ESCAPE '|' ORDER BY event_object_schema, event_object_table, trigger_name` }];
         case 'sqlserver': {
             const safeDb = quoteSqlServerDbIdentifier(dbName || 'master');
@@ -711,6 +887,7 @@ const buildCompletionFunctionsMetadataQuerySpecs = (dialect: string, dbName: str
         case 'highgo':
         case 'vastbase':
         case 'opengauss':
+        case 'gaussdb':
             return normalizeMetadataQuerySpecs([
                 {
                     sql: `SELECT n.nspname AS schema_name, p.proname AS routine_name, CASE WHEN p.prokind = 'p' THEN 'PROCEDURE' ELSE 'FUNCTION' END AS routine_type FROM pg_proc p JOIN pg_namespace n ON p.pronamespace = n.oid WHERE n.nspname NOT IN ('pg_catalog', 'information_schema') AND n.nspname NOT LIKE 'pg|_%' ESCAPE '|' ORDER BY n.nspname, routine_type, p.proname`,
@@ -791,7 +968,208 @@ type QueryEditorHoverTarget =
     | { kind: 'column'; dbName: string; tableName: string; columnName: string; type?: string; comment?: string; schemaName?: string; range: { startColumn: number; endColumn: number } };
 
 const QUERY_EDITOR_IDENTIFIER_CHAR_REGEX = /[A-Za-z0-9_$`"\[\].]/;
+const QUERY_EDITOR_SQL_UNQUOTED_IDENTIFIER_PATTERN = '[A-Za-z_][A-Za-z0-9_$]*';
+const QUERY_EDITOR_SQL_QUOTED_IDENTIFIER_PATTERN = '(?:`[^`]+`|"[^"]+"|\\[[^\\]]+\\])';
+const QUERY_EDITOR_SQL_IDENTIFIER_PATTERN = `(?:${QUERY_EDITOR_SQL_QUOTED_IDENTIFIER_PATTERN}|${QUERY_EDITOR_SQL_UNQUOTED_IDENTIFIER_PATTERN})`;
+const QUERY_EDITOR_SQL_IDENTIFIER_PATH_PATTERN = `${QUERY_EDITOR_SQL_IDENTIFIER_PATTERN}(?:\\s*\\.\\s*${QUERY_EDITOR_SQL_IDENTIFIER_PATTERN}){0,2}`;
+const QUERY_EDITOR_SQL_THREE_PART_COMPLETION_REGEX = new RegExp(
+    `(${QUERY_EDITOR_SQL_IDENTIFIER_PATTERN})\\s*\\.\\s*(${QUERY_EDITOR_SQL_IDENTIFIER_PATTERN})\\s*\\.\\s*([A-Za-z0-9_$]*)$`,
+);
+const QUERY_EDITOR_SQL_QUALIFIER_COMPLETION_REGEX = new RegExp(
+    `(${QUERY_EDITOR_SQL_IDENTIFIER_PATTERN})\\s*\\.\\s*([A-Za-z0-9_$]*)$`,
+);
+const QUERY_EDITOR_SQL_TABLE_REFERENCE_REGEX = new RegExp(
+    `\\b(?:FROM|JOIN|UPDATE|INTO|DELETE\\s+FROM)\\s+(${QUERY_EDITOR_SQL_IDENTIFIER_PATH_PATTERN})`,
+    'gi',
+);
+const QUERY_EDITOR_SQL_ALIAS_REFERENCE_REGEX = new RegExp(
+    `\\b(?:FROM|JOIN|UPDATE|INTO|DELETE\\s+FROM)\\s+(${QUERY_EDITOR_SQL_IDENTIFIER_PATH_PATTERN})(?:\\s+(?:AS\\s+)?(${QUERY_EDITOR_SQL_IDENTIFIER_PATTERN}))?`,
+    'gi',
+);
+const QUERY_EDITOR_SQL_LEADING_IDENTIFIER_PATH_REGEX = new RegExp(`^(${QUERY_EDITOR_SQL_IDENTIFIER_PATH_PATTERN})([\\s\\S]*)$`);
 const QUERY_EDITOR_HOVER_DELAY_MS = 1000;
+const QUERY_EDITOR_OBJECT_DECORATION_MAX_TEXT_LENGTH = 200_000;
+const QUERY_EDITOR_OBJECT_DECORATION_MAX_IDENTIFIERS = 800;
+const QUERY_EDITOR_OBJECT_DECORATION_MAX_LINES = 1_000;
+const QUERY_EDITOR_LIVE_DECORATION_MAX_TEXT_LENGTH = 50_000;
+const QUERY_EDITOR_PERSISTED_DRAFT_MAX_TEXT_LENGTH = 50_000;
+
+const getQueryEditorModelValueLength = (model: any): number | null => {
+    if (!model || typeof model.getValueLength !== 'function') {
+        return null;
+    }
+    try {
+        const length = Number(model.getValueLength());
+        return Number.isFinite(length) ? length : null;
+    } catch {
+        return null;
+    }
+};
+
+const getQueryEditorModelTextIfWithinLimit = (model: any, maxTextLength: number): string | null => {
+    const modelLength = getQueryEditorModelValueLength(model);
+    if (modelLength !== null && modelLength > maxTextLength) {
+        return null;
+    }
+    const text = String(model?.getValue?.() || '');
+    return text.length <= maxTextLength ? text : null;
+};
+
+const getQueryEditorObjectResolveText = (
+    model: any,
+    lineContent: string,
+    maxTextLength = QUERY_EDITOR_OBJECT_DECORATION_MAX_TEXT_LENGTH,
+): string => getQueryEditorModelTextIfWithinLimit(model, maxTextLength) ?? lineContent;
+
+const getQueryEditorDecorationModelTextIfLightweight = (
+    model: any,
+    maxTextLength: number,
+): string | null => {
+    if (!model || typeof model.getLineCount !== 'function' || typeof model.getLineContent !== 'function') {
+        return getQueryEditorModelTextIfWithinLimit(model, maxTextLength);
+    }
+
+    const lineCount = Number(model.getLineCount());
+    if (!Number.isFinite(lineCount) || lineCount <= 0 || lineCount > QUERY_EDITOR_OBJECT_DECORATION_MAX_LINES) {
+        return null;
+    }
+
+    const lines: string[] = [];
+    let textLength = 0;
+    for (let lineNumber = 1; lineNumber <= lineCount; lineNumber += 1) {
+        const lineContent = String(model.getLineContent(lineNumber) || '');
+        textLength += lineContent.length + (lineNumber < lineCount ? 1 : 0);
+        if (textLength > maxTextLength) {
+            return null;
+        }
+        lines.push(lineContent);
+    }
+
+    return lines.join('\n');
+};
+
+const maskQueryEditorSqlLiteralsAndComments = (source: string): string => {
+    const text = String(source || '').replace(/\r\n/g, '\n');
+    if (!text) return '';
+
+    const chars = text.split('');
+    let inSingle = false;
+    let inLineComment = false;
+    let inBlockComment = false;
+    let escaped = false;
+
+    const maskAt = (index: number) => {
+        if (chars[index] !== '\n') {
+            chars[index] = ' ';
+        }
+    };
+
+    for (let i = 0; i < text.length; i += 1) {
+        const ch = text[i];
+        const next = i + 1 < text.length ? text[i + 1] : '';
+        const prev = i > 0 ? text[i - 1] : '';
+
+        if (inLineComment) {
+            if (ch === '\n') {
+                inLineComment = false;
+            } else {
+                maskAt(i);
+            }
+            continue;
+        }
+
+        if (inBlockComment) {
+            maskAt(i);
+            if (ch === '*' && next === '/') {
+                maskAt(i + 1);
+                i += 1;
+                inBlockComment = false;
+            }
+            continue;
+        }
+
+        if (inSingle) {
+            maskAt(i);
+            if (escaped) {
+                escaped = false;
+                continue;
+            }
+            if (ch === '\\') {
+                escaped = true;
+                continue;
+            }
+            if (ch === '\'' && next === '\'') {
+                maskAt(i + 1);
+                i += 1;
+                continue;
+            }
+            if (ch === '\'') {
+                inSingle = false;
+            }
+            continue;
+        }
+
+        if (ch === '/' && next === '*') {
+            maskAt(i);
+            maskAt(i + 1);
+            i += 1;
+            inBlockComment = true;
+            continue;
+        }
+
+        if (ch === '#') {
+            maskAt(i);
+            inLineComment = true;
+            continue;
+        }
+
+        if (ch === '-' && next === '-' && (i === 0 || /\s/.test(prev))) {
+            maskAt(i);
+            maskAt(i + 1);
+            i += 1;
+            inLineComment = true;
+            continue;
+        }
+
+        if (ch === '\'') {
+            maskAt(i);
+            inSingle = true;
+        }
+    }
+
+    return chars.join('');
+};
+
+export const collectQueryEditorObjectDecorationCandidates = (
+    source: string,
+    maxIdentifiers = QUERY_EDITOR_OBJECT_DECORATION_MAX_IDENTIFIERS,
+): Array<{ lineNumber: number; lineContent: string; positionColumn: number }> => {
+    const text = String(source || '').replace(/\r\n/g, '\n');
+    if (!text) return [];
+
+    const maskedText = maskQueryEditorSqlLiteralsAndComments(text);
+    const lines = text.split('\n');
+    const maskedLines = maskedText.split('\n');
+    const candidates: Array<{ lineNumber: number; lineContent: string; positionColumn: number }> = [];
+    const identifierRegex = /[`"\[]?[A-Za-z_][A-Za-z0-9_$]*(?:[`"\]]?\s*\.\s*[`"\[]?[A-Za-z_][A-Za-z0-9_$]*){0,2}[`"\]]?/g;
+
+    for (const [lineIndex, maskedLine] of maskedLines.entries()) {
+        let match: RegExpExecArray | null;
+        identifierRegex.lastIndex = 0;
+        while ((match = identifierRegex.exec(maskedLine)) !== null) {
+            candidates.push({
+                lineNumber: lineIndex + 1,
+                lineContent: lines[lineIndex] || '',
+                positionColumn: match.index + 2,
+            });
+            if (candidates.length >= maxIdentifiers) {
+                return candidates;
+            }
+        }
+    }
+
+    return candidates;
+};
 
 const findIdentifierWindowAtOffset = (
     lineContent: string,
@@ -799,14 +1177,15 @@ const findIdentifierWindowAtOffset = (
 ): { start: number; end: number } | null => {
     const text = String(lineContent || '');
     if (!text) return null;
+    const searchableText = maskQueryEditorSqlLiteralsAndComments(text);
     const maxIndex = text.length - 1;
     if (maxIndex < 0) return null;
     let offset = Math.max(0, Math.min(maxIndex, Number.isFinite(rawOffset) ? rawOffset : 0));
 
-    if (!QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(text[offset] || '')) {
-        if (offset > 0 && QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(text[offset - 1] || '')) {
+    if (!QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(searchableText[offset] || '')) {
+        if (offset > 0 && QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(searchableText[offset - 1] || '')) {
             offset -= 1;
-        } else if (offset < maxIndex && QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(text[offset + 1] || '')) {
+        } else if (offset < maxIndex && QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(searchableText[offset + 1] || '')) {
             offset += 1;
         } else {
             return null;
@@ -814,12 +1193,12 @@ const findIdentifierWindowAtOffset = (
     }
 
     let start = offset;
-    while (start > 0 && QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(text[start - 1] || '')) {
+    while (start > 0 && QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(searchableText[start - 1] || '')) {
         start -= 1;
     }
 
     let end = offset + 1;
-    while (end < text.length && QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(text[end] || '')) {
+    while (end < text.length && QUERY_EDITOR_IDENTIFIER_CHAR_REGEX.test(searchableText[end] || '')) {
         end += 1;
     }
 
@@ -874,7 +1253,8 @@ const buildQueryEditorAliasMap = (
         'left', 'right', 'inner', 'outer', 'full', 'cross', 'join',
         'union', 'except', 'intersect', 'as', 'set', 'values', 'returning',
     ]);
-    const aliasRegex = /\b(?:FROM|JOIN|UPDATE|INTO|DELETE\s+FROM)\s+([`"]?\w+[`"]?(?:\s*\.\s*[`"]?\w+[`"]?)?)(?:\s+(?:AS\s+)?([`"]?\w+[`"]?))?/gi;
+    const aliasRegex = QUERY_EDITOR_SQL_ALIAS_REFERENCE_REGEX;
+    aliasRegex.lastIndex = 0;
     let match: RegExpExecArray | null;
     while ((match = aliasRegex.exec(fullText)) !== null) {
         const tableIdent = normalizeCompletionQualifiedName(match[1] || '');
@@ -901,6 +1281,53 @@ const buildQueryEditorAliasMap = (
     return aliasMap;
 };
 
+const collectQueryEditorReferencedDatabaseNames = (
+    fullText: string,
+    currentDb: string,
+    visibleDbs: string[],
+): string[] => {
+    const result: string[] = [];
+    const seen = new Set<string>();
+    const addDb = (dbName: string) => {
+        const normalized = String(dbName || '').trim();
+        if (!normalized) return;
+        const key = normalized.toLowerCase();
+        if (seen.has(key)) return;
+        seen.add(key);
+        result.push(normalized);
+    };
+
+    addDb(currentDb);
+
+    const visibleDbByLower = new Map(
+        visibleDbs
+            .map((db) => String(db || '').trim())
+            .filter(Boolean)
+            .map((db) => [db.toLowerCase(), db] as const),
+    );
+    const commonSchemaNames = new Set(['public', 'dbo', 'sys', 'information_schema', 'pg_catalog', 'mysql', 'performance_schema']);
+    const tableRegex = QUERY_EDITOR_SQL_TABLE_REFERENCE_REGEX;
+    tableRegex.lastIndex = 0;
+    let match: RegExpExecArray | null;
+    while ((match = tableRegex.exec(String(fullText || ''))) !== null) {
+        const tableIdent = normalizeCompletionQualifiedName(match[1] || '');
+        if (!tableIdent) continue;
+        const parts = tableIdent.split('.');
+        if (parts.length < 2) continue;
+        const candidate = visibleDbByLower.get(String(parts[0] || '').toLowerCase());
+        if (candidate) {
+            addDb(candidate);
+        } else if (visibleDbByLower.size === 0) {
+            const inferredDb = String(parts[0] || '').trim();
+            const inferredKey = inferredDb.toLowerCase();
+            if (inferredDb && inferredKey !== String(currentDb || '').trim().toLowerCase() && !commonSchemaNames.has(inferredKey)) {
+                addDb(inferredDb);
+            }
+        }
+    }
+    return result;
+};
+
 export const resolveQueryEditorNavigationTarget = (
     lineContent: string,
     column: number,
@@ -1033,6 +1460,16 @@ export const resolveQueryEditorNavigationTarget = (
             && meta.normalizedRawObjectName === exactQualifiedName
         );
         if (exact) {
+            if (!normalizedSchemaName && !exact.normalizedSchemaName) {
+                const schemaQualifiedMatches = metas.filter((meta) =>
+                    meta.normalizedDbName === normalizedDbName
+                    && meta.normalizedObjectName === normalizedObjectName
+                    && Boolean(meta.normalizedSchemaName)
+                );
+                if (schemaQualifiedMatches.length === 1) {
+                    return schemaQualifiedMatches[0];
+                }
+            }
             return exact;
         }
 
@@ -1354,16 +1791,6 @@ export const resolveQueryEditorNavigationDecorations = (
     }];
 };
 
-const buildQueryEditorNavigationHoverMarkdown = (
-    hoverTarget: QueryEditorHoverTarget | null,
-    actionHint: string,
-): string => {
-    const hoverContent = hoverTarget ? buildQueryEditorHoverMarkdown(hoverTarget) : '';
-    return hoverContent
-        ? `${hoverContent}\n\n---\n\n${actionHint}`
-        : actionHint;
-};
-
 const dispatchQueryEditorSidebarLocate = (detail: Record<string, unknown>) => {
     if (typeof window === 'undefined') {
         return;
@@ -1383,6 +1810,16 @@ const resolveEventTargetNode = (target: EventTarget | null): Node | null => (
     typeof Node !== 'undefined' && target instanceof Node ? target : null
 );
 
+const isDocumentLevelShortcutTarget = (targetNode: Node | null): boolean => {
+    if (!targetNode) {
+        return true;
+    }
+    if (typeof document === 'undefined') {
+        return false;
+    }
+    return targetNode === document.body || targetNode === document.documentElement;
+};
+
 const clearQueryEditorLinkDecorations = (
     editor: any,
     decorationIdsRef: React.MutableRefObject<string[]>,
@@ -1428,6 +1865,10 @@ const resolveQueryLocatorPlan = async ({
     const tableRef = extractQueryResultTableRef(statement, dbType, currentDb);
     if (!tableRef) return plan;
     plan.tableRef = tableRef;
+    if (isSystemMetadataQueryResult(tableRef, dbType)) {
+        plan.editLocator = buildQueryReadOnlyLocator('系统元数据查询结果保持只读。');
+        return plan;
+    }
 
     const selectInfo = parseSimpleSelectInfo(statement);
     if (!selectInfo) {
@@ -1472,6 +1913,7 @@ const resolveQueryLocatorPlan = async ({
         const appendExpressions: string[] = [];
         const hiddenColumns: string[] = [];
         let needsOracleRowIDExpression = false;
+        let needsDuckDBRowIDExpression = false;
 
         const buildColumnLocator = (strategy: 'primary-key' | 'unique-key', locatorColumns: string[]): EditRowLocator => {
             const valueColumns = locatorColumns.map((column, index) => {
@@ -1510,6 +1952,16 @@ const resolveQueryLocatorPlan = async ({
                     writableColumns,
                     readOnly: false,
                 };
+            } else if (String(dbType || '').trim().toLowerCase() === 'duckdb') {
+                needsDuckDBRowIDExpression = true;
+                plan.editLocator = {
+                    strategy: 'duckdb-rowid',
+                    columns: ['rowid'],
+                    valueColumns: [DUCKDB_ROWID_LOCATOR_COLUMN],
+                    hiddenColumns: [DUCKDB_ROWID_LOCATOR_COLUMN],
+                    writableColumns,
+                    readOnly: false,
+                };
             } else {
                 if (!resIndexes?.success) {
                     const reason = translate('query_editor.message.read_only_index_metadata_unavailable');
@@ -1529,6 +1981,7 @@ const resolveQueryLocatorPlan = async ({
 
         const executableAppendExpressions = [
             ...(needsOracleRowIDExpression ? [buildQueryRowIDExpression(dbType)] : []),
+            ...(needsDuckDBRowIDExpression ? [buildDuckDBRowIDExpression(dbType)] : []),
             ...appendExpressions,
         ];
 
@@ -1559,20 +2012,10 @@ const resolveQueryLocatorPlan = async ({
 
 const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isActive = true }) => {
   const [query, setQuery] = useState(getInitialEditorQuery(tab));
+  const isExternalSQLFileTab = Boolean(String(tab.filePath || '').trim());
+  const isObjectEditQueryTab = tab.type === 'query' && tab.queryMode === 'object-edit';
   
-  type ResultSet = {
-      key: string;
-      sql: string;
-      exportSql?: string;
-      rows: any[];
-      columns: string[];
-      tableName?: string;
-      pkColumns: string[];
-      editLocator?: EditRowLocator;
-      readOnly: boolean;
-      truncated?: boolean;
-      pkLoading?: boolean;
-  };
+  type ResultSet = QueryEditorResultSet;
 
   // Result Sets
   const [resultSets, setResultSets] = useState<ResultSet[]>([]);
@@ -1593,12 +2036,14 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
   // Resizing state
   const [editorHeight, setEditorHeight] = useState(300);
+  const editorShellRef = useRef<HTMLDivElement | null>(null);
   const editorRef = useRef<any>(null);
   const monacoRef = useRef<any>(null);
   const runQueryActionRef = useRef<any>(null);
   const selectCurrentStatementActionRef = useRef<any>(null);
   const saveQueryActionRef = useRef<any>(null);
   const aiContextMenuActionDisposablesRef = useRef<any[]>([]);
+  const toggleQueryResultsPanelActionRef = useRef<any>(null);
   const lastExternalQueryRef = useRef<string>(getTabQueryValue(tab));
   const lastEditorCursorPositionRef = useRef<any>(null);
   const lastHoverTargetPositionRef = useRef<{ lineNumber: number; column: number } | null>(null);
@@ -1607,8 +2052,9 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
   const ctrlMetaPressedRef = useRef(false);
   const objectDecorationIdsRef = useRef<string[]>([]);
   const objectHoverActionRef = useRef<any>(null);
-  const hoverProviderDisposableRef = useRef<any>(null);
-  const dragRef = useRef<{ startY: number, startHeight: number } | null>(null);
+  const dragRef = useRef<{ startY: number, startHeight: number, currentHeight: number } | null>(null);
+  const pendingEditorHeightRef = useRef(editorHeight);
+  const resizeFrameRef = useRef<number | null>(null);
   const queryEditorRootRef = useRef<HTMLDivElement | null>(null);
   const editorPaneRef = useRef<HTMLDivElement | null>(null);
   const tablesRef = useRef<CompletionTableMeta[]>([]); // Store tables for autocomplete (cross-db)
@@ -1618,6 +2064,8 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
   const triggersRef = useRef<CompletionTriggerMeta[]>([]);
   const routinesRef = useRef<CompletionRoutineMeta[]>([]);
   const visibleDbsRef = useRef<string[]>([]); // Store visible databases for cross-db intellisense
+  const metadataFetchKeyRef = useRef<string>('');
+  const metadataContextKeyRef = useRef<string>('');
 
   const connections = useStore(state => state.connections);
   const queryCapableConnections = useMemo(
@@ -1644,6 +2092,11 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
   const setSqlFormatOptions = useStore(state => state.setSqlFormatOptions);
   const queryOptions = useStore(state => state.queryOptions);
   const setQueryOptions = useStore(state => state.setQueryOptions);
+  const sqlEditorTransactionOptions = useStore(state => state.sqlEditorTransactionOptions);
+  const setSqlEditorTransactionOptions = useStore(state => state.setSqlEditorTransactionOptions);
+  const [isResultPanelVisible, setIsResultPanelVisible] = useState(
+      () => tab.resultPanelVisible === true
+  );
   const shortcutOptions = useStore(state => state.shortcutOptions);
   const activeShortcutPlatform = getShortcutPlatform(isMacLikePlatform());
   const runQueryShortcutBinding = useMemo(
@@ -1658,12 +2111,63 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       () => resolveShortcutBinding(shortcutOptions, 'saveQuery', activeShortcutPlatform),
       [activeShortcutPlatform, shortcutOptions],
   );
+  const toggleQueryResultsPanelShortcutBinding = useMemo(
+      () => resolveShortcutBinding(shortcutOptions, 'toggleQueryResultsPanel', activeShortcutPlatform),
+      [activeShortcutPlatform, shortcutOptions],
+  );
   const primaryShortcutModifierLabel = useMemo(
       () => getShortcutPrimaryModifierDisplayLabel(activeShortcutPlatform),
       [activeShortcutPlatform],
   );
+  useEffect(() => {
+      setIsResultPanelVisible(tab.resultPanelVisible === true);
+  }, [tab.id, tab.resultPanelVisible]);
+  const updateResultPanelVisibility = useCallback((visible: boolean) => {
+      setIsResultPanelVisible(visible);
+      updateQueryTabDraft(tab.id, { resultPanelVisible: visible });
+  }, [tab.id, updateQueryTabDraft]);
+  const toggleResultPanelVisibility = useCallback(() => {
+      setIsResultPanelVisible((previousVisible) => {
+          const nextVisible = !previousVisible;
+          updateQueryTabDraft(tab.id, { resultPanelVisible: nextVisible });
+          return nextVisible;
+      });
+  }, [tab.id, updateQueryTabDraft]);
+  const sqlEditorCommitMode = sqlEditorTransactionOptions?.commitMode === 'auto' ? 'auto' : 'manual';
+  const sqlEditorAutoCommitDelayMs = SQL_EDITOR_AUTO_COMMIT_DELAY_OPTIONS.some((item) => item.value === sqlEditorTransactionOptions?.autoCommitDelayMs)
+      ? Number(sqlEditorTransactionOptions?.autoCommitDelayMs)
+      : 0;
+  const {
+      activatePendingSqlTransaction,
+      autoCommitRemainingSeconds: sqlEditorAutoCommitRemainingSeconds,
+      finishPendingSqlTransaction,
+      pendingSqlTransaction,
+      pendingSqlTransactionRef,
+  } = useSqlEditorTransactionController({ tabId: tab.id });
   const autoFetchVisible = useAutoFetchVisibility();
 
+  useEffect(() => {
+      const nextContextKey = [
+          String(currentConnectionId || '').trim(),
+          String(currentDb || '').trim().toLowerCase(),
+      ].join('\u0000');
+      if (metadataContextKeyRef.current === nextContextKey) {
+          return;
+      }
+      metadataContextKeyRef.current = nextContextKey;
+      metadataFetchKeyRef.current = '';
+      tablesRef.current = [];
+      allColumnsRef.current = [];
+      viewsRef.current = [];
+      materializedViewsRef.current = [];
+      triggersRef.current = [];
+      routinesRef.current = [];
+      columnsCacheRef.current = {};
+      if (isActive) {
+          resetSharedQueryEditorMetadata();
+      }
+  }, [currentConnectionId, currentDb, isActive]);
+
   const currentSavedQuery = useMemo(() => {
       const savedId = String(tab.savedQueryId || '').trim();
       if (savedId) {
@@ -1676,6 +2180,27 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       return savedQueries.find((item) => item.id === tabId) || null;
   }, [savedQueries, tab.id, tab.savedQueryId]);
 
+  const syncQueryDraft = useCallback((nextQuery: string) => {
+      const next = String(nextQuery ?? '');
+      if (isExternalSQLFileTab) {
+          setSQLFileTabDraft(tab.id, next);
+          return;
+      }
+      setQueryTabDraft(tab.id, next);
+  }, [isExternalSQLFileTab, tab.id]);
+
+  const applyQueryState = useCallback((nextQuery: string) => {
+      const next = String(nextQuery ?? '');
+      syncQueryDraft(next);
+      if (!isExternalSQLFileTab || next.length <= QUERY_EDITOR_PERSISTED_DRAFT_MAX_TEXT_LENGTH) {
+          setQuery(next);
+      }
+  }, [isExternalSQLFileTab, syncQueryDraft]);
+
+  useEffect(() => {
+      setQueryTabDraft(tab.id, query);
+  }, [query, tab.id]);
+
   useEffect(() => {
       currentConnectionIdRef.current = currentConnectionId;
   }, [currentConnectionId]);
@@ -1695,12 +2220,44 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
   }, [currentDb]);
 
   useEffect(() => {
+      const nextConnectionId = String(tab.connectionId || '').trim();
+      const nextDb = String(tab.dbName || '').trim();
+      if (nextConnectionId !== currentConnectionIdRef.current) {
+          currentConnectionIdRef.current = nextConnectionId;
+          setCurrentConnectionId(nextConnectionId);
+      }
+      if (nextDb !== currentDbRef.current) {
+          currentDbRef.current = nextDb;
+          setCurrentDb(nextDb);
+      }
+  }, [tab.id, tab.connectionId, tab.dbName]);
+
+  useEffect(() => {
+      if (isExternalSQLFileTab) return;
+      const currentDraft = getQueryTabDraft(tab.id, query);
+      const shouldPersistQuery = currentDraft.length <= QUERY_EDITOR_PERSISTED_DRAFT_MAX_TEXT_LENGTH;
       updateQueryTabDraft(tab.id, {
-          query,
+          ...(shouldPersistQuery ? { query: currentDraft } : {}),
           connectionId: currentConnectionId,
           dbName: currentDb,
       });
-  }, [currentConnectionId, currentDb, query, tab.id, updateQueryTabDraft]);
+  }, [currentConnectionId, currentDb, isExternalSQLFileTab, query, tab.id, updateQueryTabDraft]);
+
+  useEffect(() => {
+      if (!isExternalSQLFileTab) return;
+      updateQueryTabDraft(tab.id, {
+          connectionId: currentConnectionId,
+          dbName: currentDb,
+      });
+  }, [currentConnectionId, currentDb, isExternalSQLFileTab, tab.id, updateQueryTabDraft]);
+
+  useEffect(() => {
+      if (!isExternalSQLFileTab) return;
+      setSQLFileTabDraft(tab.id, getCurrentQuery());
+      return () => {
+          setSQLFileTabDraft(tab.id, getCurrentQuery());
+      };
+  }, [isExternalSQLFileTab, tab.id]);
 
   // 当此 Tab 成为活跃 Tab 时，将本实例的状态同步到模块级共享变量
   // 确保 completion provider 始终使用当前活跃 Tab 的上下文
@@ -1712,6 +2269,10 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       sharedTablesData = tablesRef.current;
       sharedAllColumnsData = allColumnsRef.current;
       sharedVisibleDbs = visibleDbsRef.current;
+      sharedViewsData = viewsRef.current;
+      sharedMaterializedViewsData = materializedViewsRef.current;
+      sharedTriggersData = triggersRef.current;
+      sharedRoutinesData = routinesRef.current;
       sharedColumnsCacheData = columnsCacheRef.current;
   }, [isActive, currentDb, currentConnectionId, connections]);
 
@@ -1719,7 +2280,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       connectionsRef.current = connections;
   }, [connections]);
 
-  const refreshObjectDecorations = useCallback(() => {
+  const refreshObjectDecorations = useCallback((maxTextLength = QUERY_EDITOR_OBJECT_DECORATION_MAX_TEXT_LENGTH) => {
       const editor = editorRef.current;
       const monaco = monacoRef.current;
       const model = editor?.getModel?.();
@@ -1727,54 +2288,58 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           return;
       }
 
-      const text = String(model.getValue?.() || '');
+      if (isObjectEditQueryTab) {
+          objectDecorationIdsRef.current = editor.deltaDecorations(objectDecorationIdsRef.current, []);
+          return;
+      }
+
+      const text = getQueryEditorDecorationModelTextIfLightweight(model, maxTextLength);
+      if (text === null) {
+          objectDecorationIdsRef.current = editor.deltaDecorations(objectDecorationIdsRef.current, []);
+          return;
+      }
+
       const decorations: any[] = [];
       const seen = new Set<string>();
-      const identifierRegex = /[`"\[]?[A-Za-z_][A-Za-z0-9_$]*(?:[`"\]]?\s*\.\s*[`"\[]?[A-Za-z_][A-Za-z0-9_$]*){0,2}[`"\]]?/g;
-      const lines = text.replace(/\r\n/g, '\n').split('\n');
+      const candidates = collectQueryEditorObjectDecorationCandidates(text);
 
-      lines.forEach((lineContent, lineIndex) => {
-          let match: RegExpExecArray | null;
-          identifierRegex.lastIndex = 0;
-          while ((match = identifierRegex.exec(lineContent)) !== null) {
-              const positionColumn = match.index + 2;
-              const hoverTarget = resolveQueryEditorHoverTarget(
-                  text,
-                  lineContent,
-                  positionColumn,
-                  currentDbRef.current,
-                  visibleDbsRef.current,
-                  tablesRef.current,
-                  allColumnsRef.current,
-                  viewsRef.current,
-                  materializedViewsRef.current,
-                  triggersRef.current,
-                  routinesRef.current,
-              );
-              if (!hoverTarget) continue;
+      for (const candidate of candidates) {
+          const hoverTarget = resolveQueryEditorHoverTarget(
+              text,
+              candidate.lineContent,
+              candidate.positionColumn,
+              currentDbRef.current,
+              visibleDbsRef.current,
+              tablesRef.current,
+              allColumnsRef.current,
+              viewsRef.current,
+              materializedViewsRef.current,
+              triggersRef.current,
+              routinesRef.current,
+          );
+          if (!hoverTarget) continue;
 
-              const inlineClassName = hoverTarget.kind === 'column'
-                  ? 'gonavi-query-editor-column-token'
-                  : hoverTarget.kind === 'database'
-                      ? 'gonavi-query-editor-db-token'
-                      : 'gonavi-query-editor-object-token';
-              const key = `${lineIndex + 1}:${hoverTarget.range.startColumn}:${hoverTarget.range.endColumn}:${inlineClassName}`;
-              if (seen.has(key)) continue;
-              seen.add(key);
-              decorations.push({
-                  range: new monaco.Range(
-                      lineIndex + 1,
-                      hoverTarget.range.startColumn,
-                      lineIndex + 1,
-                      hoverTarget.range.endColumn,
-                  ),
-                  options: { inlineClassName },
-              });
-          }
-      });
+          const inlineClassName = hoverTarget.kind === 'column'
+              ? 'gonavi-query-editor-column-token'
+              : hoverTarget.kind === 'database'
+                  ? 'gonavi-query-editor-db-token'
+                  : 'gonavi-query-editor-object-token';
+          const key = `${candidate.lineNumber}:${hoverTarget.range.startColumn}:${hoverTarget.range.endColumn}:${inlineClassName}`;
+          if (seen.has(key)) continue;
+          seen.add(key);
+          decorations.push({
+              range: new monaco.Range(
+                  candidate.lineNumber,
+                  hoverTarget.range.startColumn,
+                  candidate.lineNumber,
+                  hoverTarget.range.endColumn,
+              ),
+              options: { inlineClassName },
+          });
+      }
 
       objectDecorationIdsRef.current = editor.deltaDecorations(objectDecorationIdsRef.current, decorations);
-  }, []);
+  }, [isObjectEditQueryTab]);
 
   const showObjectInfoAtPosition = useCallback((position?: { lineNumber: number; column: number } | null) => {
       const editor = editorRef.current;
@@ -1785,8 +2350,9 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           return false;
       }
       const lineContent = String(model.getLineContent?.(normalizedPosition.lineNumber) || '');
+      const resolveText = getQueryEditorObjectResolveText(model, lineContent);
       const hoverTarget = resolveQueryEditorHoverTarget(
-          String(model.getValue?.() || ''),
+          resolveText,
           lineContent,
           normalizedPosition.column,
           currentDbRef.current,
@@ -1829,39 +2395,8 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
   }, []);
 
   useEffect(() => {
-      const editor = editorRef.current;
-      const monaco = monacoRef.current;
-      if (!editor || !monaco) return;
-
-      objectHoverActionRef.current?.dispose?.();
-      const showObjectInfoKeybinding = monaco.KeyMod?.CtrlCmd && monaco.KeyCode?.KeyQ
-          ? [monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyQ]
-          : undefined;
-      objectHoverActionRef.current = editor.addAction({
-          id: 'gonavi.queryEditor.showObjectInfo',
-          label: buildQueryEditorMonacoActionLabel('query_editor.action.show_object_info'),
-          keybindings: showObjectInfoKeybinding,
-          run: () => {
-              const preferredPosition = lastHoverTargetPositionRef.current || editor.getPosition?.();
-              const shown = showObjectInfoAtPosition(preferredPosition);
-              if (!shown) {
-                  void message.info({
-                      key: 'gonavi-query-editor-object-info-miss',
-                      content: translate('query_editor.message.object_info_target_not_found'),
-                  });
-              }
-          },
-      });
-
-      return () => {
-          objectHoverActionRef.current?.dispose?.();
-          objectHoverActionRef.current = null;
-      };
-  }, [languagePreference, showObjectInfoAtPosition]);
-
-  useEffect(() => {
-      refreshObjectDecorations();
-  }, [query, currentDb, refreshObjectDecorations]);
+      refreshObjectDecorations(QUERY_EDITOR_LIVE_DECORATION_MAX_TEXT_LENGTH);
+  }, [currentDb, refreshObjectDecorations]);
 
   const getCurrentQuery = () => {
       const val = editorRef.current?.getValue?.();
@@ -1869,6 +2404,75 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       return query || '';
   };
 
+  const insertTextIntoEditorAtPosition = useCallback((text: string, position?: { lineNumber: number; column: number } | null) => {
+      const editor = editorRef.current;
+      const monaco = monacoRef.current;
+      const targetPosition = normalizeEditorPosition(position || editor?.getPosition?.() || lastEditorCursorPositionRef.current);
+      if (!editor || !monaco?.Range || !targetPosition || !text) {
+          return false;
+      }
+      editor.focus?.();
+      editor.setPosition?.(targetPosition);
+      editor.executeEdits?.('gonavi-sidebar-drop', [{
+          range: new monaco.Range(
+              targetPosition.lineNumber,
+              targetPosition.column,
+              targetPosition.lineNumber,
+              targetPosition.column,
+          ),
+          text,
+          forceMoveMarkers: true,
+      }]);
+      editor.pushUndoStop?.();
+      return true;
+  }, []);
+
+  const mergeSidebarDropObjectMetadata = useCallback((payload: ReturnType<typeof decodeSidebarSqlEditorDragPayload>) => {
+      if (!payload?.text || !payload.dbName) {
+          return;
+      }
+      const nodeType = String(payload.nodeType || '').trim().toLowerCase();
+      if (nodeType && nodeType !== 'table') {
+          return;
+      }
+      const dbName = String(payload.dbName || '').trim();
+      const tableName = normalizeCompletionQualifiedName(payload.text);
+      if (!dbName || !tableName) {
+          return;
+      }
+      const visibleKey = dbName.toLowerCase();
+      if (!visibleDbsRef.current.some((db) => String(db || '').toLowerCase() === visibleKey)) {
+          visibleDbsRef.current = [...visibleDbsRef.current, dbName];
+      }
+      const tableKey = `${visibleKey}\u0000${tableName.toLowerCase()}`;
+      if (!tablesRef.current.some((table) => `${String(table.dbName || '').toLowerCase()}\u0000${String(table.tableName || '').toLowerCase()}` === tableKey)) {
+          tablesRef.current = [...tablesRef.current, { dbName, tableName }];
+      }
+      if (isActive) {
+          sharedVisibleDbs = visibleDbsRef.current;
+          sharedTablesData = tablesRef.current;
+      }
+  }, [isActive]);
+
+  const handleSidebarObjectDrop = useCallback((event: DragEvent) => {
+      if (!hasSidebarSqlEditorDragPayload(event.dataTransfer)) {
+          return;
+      }
+      event.preventDefault();
+      event.stopPropagation();
+      const payload = decodeSidebarSqlEditorDragPayload(String(event.dataTransfer?.getData(SIDEBAR_SQL_EDITOR_DRAG_MIME) || ''));
+      const dragText = readSidebarSqlDropText(event, currentConnectionIdRef.current, currentDbRef.current);
+      if (!dragText) {
+          return;
+      }
+      const editor = editorRef.current;
+      const dropTarget = editor?.getTargetAtClientPoint?.(event.clientX, event.clientY);
+      if (insertTextIntoEditorAtPosition(dragText, normalizeEditorPosition(dropTarget?.position))) {
+          mergeSidebarDropObjectMetadata(payload);
+          refreshObjectDecorations(QUERY_EDITOR_LIVE_DECORATION_MAX_TEXT_LENGTH);
+      }
+  }, [insertTextIntoEditorAtPosition, mergeSidebarDropObjectMetadata, refreshObjectDecorations]);
+
   const handleSelectCurrentStatement = () => {
       const editor = editorRef.current;
       const monaco = monacoRef.current;
@@ -2004,7 +2608,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
   const syncQueryToEditor = (sql: string) => {
       const next = sql || '';
-      setQuery(next);
+      applyQueryState(next);
       const editor = editorRef.current;
       if (editor && editor.getValue?.() !== next) {
           editor.setValue(next);
@@ -2058,8 +2662,13 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
               setDbList(dbs);
               if (!currentDbRef.current) {
-                  if (conn.config.database && dbs.includes(conn.config.database)) setCurrentDb(conn.config.database);
-                  else if (dbs.length > 0 && dbs[0] !== 'information_schema') setCurrentDb(dbs[0]);
+                  const configuredDb = String(conn.config.database || '').trim();
+                  const fallbackDb = dbs.find((db: string) => String(db || '').toLowerCase() !== 'information_schema') || dbs[0] || '';
+                  const nextDb = configuredDb && dbs.includes(configuredDb) ? configuredDb : fallbackDb;
+                  if (nextDb) {
+                      currentDbRef.current = nextDb;
+                      setCurrentDb(nextDb);
+                  }
               }
           } else {
               visibleDbsRef.current = [];
@@ -2074,16 +2683,16 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
   // Fetch Metadata for Autocomplete (Cross-database)
   useEffect(() => {
-      if (!autoFetchVisible) {
+      if (!autoFetchVisible || isObjectEditQueryTab) {
           return;
       }
 
+      let cancelled = false;
       const fetchMetadata = async () => {
           const conn = connections.find(c => c.id === currentConnectionId);
           if (!conn) return;
 
           const visibleDbs = visibleDbsRef.current;
-          if (!visibleDbs || visibleDbs.length === 0) return;
 
           const config = {
             ...conn.config,
@@ -2094,7 +2703,20 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
             ssh: conn.config.ssh || { host: "", port: 22, user: "", password: "", keyPath: "" }
           };
 
-          // 加载所有可见数据库的表
+          const metadataDbName = String(currentDbRef.current || currentDb || '').trim();
+          if (!metadataDbName) return;
+          const metadataDbNames = collectQueryEditorReferencedDatabaseNames(
+              getCurrentQuery(),
+              metadataDbName,
+              visibleDbs,
+          );
+          const metadataFetchKey = [
+              currentConnectionId,
+              ...metadataDbNames.map((dbName) => String(dbName || '').toLowerCase()),
+          ].join('\u0000');
+          if (metadataFetchKeyRef.current === metadataFetchKey) return;
+          metadataFetchKeyRef.current = metadataFetchKey;
+
           const allTables: CompletionTableMeta[] = [];
           const allColumns: CompletionColumnMeta[] = [];
           const allViews: CompletionViewMeta[] = [];
@@ -2102,13 +2724,35 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           const allTriggers: CompletionTriggerMeta[] = [];
           const allRoutines: CompletionRoutineMeta[] = [];
           const metadataDialect = normalizeMetadataDialect(conn);
+          const syncMetadataSnapshot = () => {
+              if (cancelled) {
+                  return false;
+              }
+              tablesRef.current = [...allTables];
+              allColumnsRef.current = [...allColumns];
+              viewsRef.current = [...allViews];
+              materializedViewsRef.current = [...allMaterializedViews];
+              triggersRef.current = [...allTriggers];
+              routinesRef.current = [...allRoutines];
+              if (isActive) {
+                  sharedTablesData = tablesRef.current;
+                  sharedAllColumnsData = allColumnsRef.current;
+                  sharedViewsData = viewsRef.current;
+                  sharedMaterializedViewsData = materializedViewsRef.current;
+                  sharedTriggersData = triggersRef.current;
+                  sharedRoutinesData = routinesRef.current;
+              }
+              return true;
+          };
 
-          for (const dbName of visibleDbs) {
+          for (const dbName of metadataDbNames) {
+              if (cancelled) return;
               const tableComments = new Map<string, string>();
               const tableCommentSQL = buildCompletionTableCommentSQL(metadataDialect, dbName);
               if (tableCommentSQL) {
                   try {
                       const resTableComments = await DBQuery(buildRpcConnectionConfig(config) as any, dbName, tableCommentSQL);
+                      if (cancelled) return;
                       if (resTableComments.success && Array.isArray(resTableComments.data)) {
                           resTableComments.data.forEach((row: any) => {
                               const tableName = normalizeCommentText(getCaseInsensitiveValue(row, ['table_name', 'TABLE_NAME', 'name', 'Name']));
@@ -2123,6 +2767,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
               // 获取表
               const resTables = await DBGetTables(buildRpcConnectionConfig(config) as any, dbName);
+              if (cancelled) return;
               if (resTables.success && Array.isArray(resTables.data)) {
                   const tableNames = resTables.data.map((row: any) => Object.values(row)[0] as string);
                   tableNames.forEach((tableName: string) => {
@@ -2136,9 +2781,11 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       });
                   });
               }
+              if (!syncMetadataSnapshot()) return;
 
               // 获取列 (所有数据库类型都支持 DBGetAllColumns)
               const resCols = await DBGetAllColumns(buildRpcConnectionConfig(config) as any, dbName);
+              if (cancelled) return;
               if (resCols.success && Array.isArray(resCols.data)) {
                   resCols.data.forEach((col: any) => {
                       allColumns.push({
@@ -2150,19 +2797,23 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       });
                   });
               }
+              if (!syncMetadataSnapshot()) return;
 
               const viewResults = await queryCompletionMetadataRowsBySpecs(
                   config,
                   dbName,
                   buildCompletionViewsMetadataQuerySpecs(metadataDialect, dbName),
               );
+              if (cancelled) return;
               const seenViews = new Set<string>();
               viewResults.forEach((queryResult) => {
                   queryResult.rows.forEach((row) => {
-                      const tableType = String(getCaseInsensitiveValue(row, ['table_type', 'table type', 'type']) || '').trim().toUpperCase();
-                      if (tableType && tableType !== 'VIEW') return;
+                      const tableType = getCaseInsensitiveValue(row, ['table_type', 'table type', 'type']);
+                      if (!isSidebarViewTableType(tableType)) return;
                       const schemaName = String(getCaseInsensitiveValue(row, ['schema_name', 'schemaname', 'owner', 'table_schema', 'db']) || '').trim();
-                      const rawViewName = String(getCaseInsensitiveValue(row, ['view_name', 'viewname', 'table_name', 'name']) || '').trim() || getFirstRowValue(row);
+                      const rawViewName = String(getCaseInsensitiveValue(row, ['view_name', 'viewname', 'table_name', 'name']) || '').trim()
+                          || getMySQLShowTablesName(row)
+                          || getFirstRowValue(row);
                       const normalizedViewName = normalizeSidebarViewName(metadataDialect, dbName, schemaName, rawViewName);
                       if (!normalizedViewName) return;
                       const uniqueKey = `${dbName.toLowerCase()}@@${normalizedViewName.toLowerCase()}`;
@@ -2176,12 +2827,14 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       });
                   });
               });
+              if (!syncMetadataSnapshot()) return;
 
               const materializedViewResults = await queryCompletionMetadataRowsBySpecs(
                   config,
                   dbName,
                   buildCompletionMaterializedViewsMetadataQuerySpecs(metadataDialect, dbName),
               );
+              if (cancelled) return;
               const seenMaterializedViews = new Set<string>();
               materializedViewResults.forEach((queryResult) => {
                   queryResult.rows.forEach((row) => {
@@ -2200,12 +2853,14 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       });
                   });
               });
+              if (!syncMetadataSnapshot()) return;
 
               const triggerResults = await queryCompletionMetadataRowsBySpecs(
                   config,
                   dbName,
                   buildCompletionTriggersMetadataQuerySpecs(metadataDialect, dbName),
               );
+              if (cancelled) return;
               const seenTriggers = new Set<string>();
               triggerResults.forEach((queryResult) => {
                   queryResult.rows.forEach((row) => {
@@ -2231,12 +2886,14 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       });
                   });
               });
+              if (!syncMetadataSnapshot()) return;
 
               const routineResults = await queryCompletionMetadataRowsBySpecs(
                   config,
                   dbName,
                   buildCompletionFunctionsMetadataQuerySpecs(metadataDialect, dbName),
               );
+              if (cancelled) return;
               const seenRoutines = new Set<string>();
               routineResults.forEach((queryResult) => {
                   queryResult.rows.forEach((row) => {
@@ -2258,23 +2915,17 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       });
                   });
               });
+              if (!syncMetadataSnapshot()) return;
           }
 
-          tablesRef.current = allTables;
-          allColumnsRef.current = allColumns;
-          viewsRef.current = allViews;
-          materializedViewsRef.current = allMaterializedViews;
-          triggersRef.current = allTriggers;
-          routinesRef.current = allRoutines;
-          // 如果当前 Tab 是活跃 Tab，同步更新共享变量
-          if (isActive) {
-              sharedTablesData = allTables;
-              sharedAllColumnsData = allColumns;
-          }
+          if (!syncMetadataSnapshot()) return;
           refreshObjectDecorations();
       };
       void fetchMetadata();
-  }, [autoFetchVisible, currentConnectionId, connections, dbList, isActive, refreshObjectDecorations]); // dbList 变化时触发重新加载
+      return () => {
+          cancelled = true;
+      };
+  }, [autoFetchVisible, currentConnectionId, currentDb, connections, isActive, isObjectEditQueryTab, refreshObjectDecorations]);
 
   // Query ID management helpers
   const setQueryId = (id: string) => {
@@ -2287,26 +2938,82 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       setCurrentQueryId('');
   };
 
-  // Handle Resizing
-  const handleMouseDown = (e: React.MouseEvent) => {
-      e.preventDefault();
-      dragRef.current = { startY: e.clientY, startHeight: editorHeight };
-      document.addEventListener('mousemove', handleMouseMove);
-      document.addEventListener('mouseup', handleMouseUp);
-  };
+  const clampEditorHeight = useCallback((height: number) => {
+      const viewportHeight = Number.isFinite(window.innerHeight) ? window.innerHeight : 800;
+      const maxHeight = Math.max(100, viewportHeight - 200);
+      return Math.max(100, Math.min(maxHeight, height));
+  }, []);
 
-  const handleMouseMove = (e: MouseEvent) => {
+  const applyEditorHeightToDom = useCallback(() => {
+      const nextHeight = pendingEditorHeightRef.current;
+      if (editorShellRef.current) {
+          editorShellRef.current.style.height = `${nextHeight}px`;
+      }
+      editorRef.current?.layout?.();
+  }, []);
+
+  const cancelEditorResizeFrame = useCallback(() => {
+      if (resizeFrameRef.current === null) return;
+      if (typeof window.cancelAnimationFrame === 'function') {
+          window.cancelAnimationFrame(resizeFrameRef.current);
+      } else {
+          window.clearTimeout(resizeFrameRef.current);
+      }
+      resizeFrameRef.current = null;
+  }, []);
+
+  const scheduleEditorHeightDomUpdate = useCallback((height: number) => {
+      pendingEditorHeightRef.current = height;
+      if (resizeFrameRef.current !== null) return;
+
+      const requestFrame = typeof window.requestAnimationFrame === 'function'
+          ? window.requestAnimationFrame.bind(window)
+          : (callback: FrameRequestCallback) => window.setTimeout(() => callback(Date.now()), 16);
+
+      resizeFrameRef.current = requestFrame(() => {
+          resizeFrameRef.current = null;
+          applyEditorHeightToDom();
+      });
+  }, [applyEditorHeightToDom]);
+
+  // Handle Resizing
+  const handleMouseMove = useCallback((e: MouseEvent) => {
       if (!dragRef.current) return;
       const delta = e.clientY - dragRef.current.startY;
-      const newHeight = Math.max(100, Math.min(window.innerHeight - 200, dragRef.current.startHeight + delta));
-      setEditorHeight(newHeight);
-  };
+      const newHeight = clampEditorHeight(dragRef.current.startHeight + delta);
+      dragRef.current.currentHeight = newHeight;
+      scheduleEditorHeightDomUpdate(newHeight);
+  }, [clampEditorHeight, scheduleEditorHeightDomUpdate]);
 
-  const handleMouseUp = () => {
+  const handleMouseUp = useCallback(() => {
+      const finalHeight = dragRef.current?.currentHeight;
       dragRef.current = null;
+      cancelEditorResizeFrame();
+      if (typeof finalHeight === 'number') {
+          pendingEditorHeightRef.current = finalHeight;
+          applyEditorHeightToDom();
+          setEditorHeight(finalHeight);
+      }
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
-  };
+  }, [applyEditorHeightToDom, cancelEditorResizeFrame, handleMouseMove]);
+
+  const handleMouseDown = useCallback((e: React.MouseEvent) => {
+      e.preventDefault();
+      dragRef.current = { startY: e.clientY, startHeight: editorHeight, currentHeight: editorHeight };
+      pendingEditorHeightRef.current = editorHeight;
+      document.addEventListener('mousemove', handleMouseMove);
+      document.addEventListener('mouseup', handleMouseUp);
+  }, [editorHeight, handleMouseMove, handleMouseUp]);
+
+  useEffect(() => {
+      return () => {
+          dragRef.current = null;
+          cancelEditorResizeFrame();
+          document.removeEventListener('mousemove', handleMouseMove);
+          document.removeEventListener('mouseup', handleMouseUp);
+      };
+  }, [cancelEditorResizeFrame, handleMouseMove, handleMouseUp]);
 
   // Setup Autocomplete and Editor
   const handleEditorDidMount: OnMount = (editor, monaco) => {
@@ -2315,9 +3022,11 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       lastEditorCursorPositionRef.current = normalizeEditorPosition(editor.getPosition?.());
 
       editor.updateOptions?.({
+          fixedOverflowWidgets: true,
           hover: {
               enabled: true,
               delay: QUERY_EDITOR_HOVER_DELAY_MS,
+              above: false,
           },
       });
 
@@ -2354,20 +3063,6 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
               setQueryEditorMouseCursor(editor, '');
               return;
           }
-          const hoverTarget = resolveQueryEditorHoverTarget(
-              String(model?.getValue?.() || ''),
-              lineContent,
-              targetPosition.column,
-              currentDbRef.current,
-              visibleDbsRef.current,
-              tablesRef.current,
-              allColumnsRef.current,
-              viewsRef.current,
-              materializedViewsRef.current,
-              triggersRef.current,
-              routinesRef.current,
-          );
-
           linkDecorationIdsRef.current = editor.deltaDecorations(
               linkDecorationIdsRef.current,
               decorations.map((item) => ({
@@ -2379,9 +3074,6 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   ),
                   options: {
                       inlineClassName: 'gonavi-query-editor-link-hint',
-                      hoverMessage: {
-                          value: buildQueryEditorNavigationHoverMarkdown(hoverTarget, item.hoverMessage),
-                      },
                   },
               })),
           );
@@ -2416,46 +3108,23 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           editor.updateOptions?.({ mouseStyle: 'text' });
           setQueryEditorMouseCursor(editor, '');
       };
+      const editorDomNode = editor.getDomNode?.();
+      const handleEditorDragOver = (rawEvent: Event) => {
+          const event = rawEvent as DragEvent;
+          if (!hasSidebarSqlEditorDragPayload(event.dataTransfer)) return;
+          event.preventDefault();
+          event.stopPropagation();
+          if (event.dataTransfer) {
+              event.dataTransfer.dropEffect = 'copy';
+          }
+      };
+      const handleEditorDrop = (rawEvent: Event) => {
+          handleSidebarObjectDrop(rawEvent as DragEvent);
+      };
 
       // 应用透明主题（主题由 MonacoEditor 包装组件按需注册）
       monaco.editor.setTheme(darkMode ? 'transparent-dark' : 'transparent-light');
 
-      hoverProviderDisposableRef.current?.dispose?.();
-      hoverProviderDisposableRef.current = monaco.languages.registerHoverProvider('sql', {
-          provideHover: (model: any, position: any) => {
-              const normalizedPosition = normalizeEditorPosition(position);
-              if (!normalizedPosition) {
-                  return null;
-              }
-              const lineContent = String(model?.getLineContent?.(normalizedPosition.lineNumber) || '');
-              const hoverTarget = resolveQueryEditorHoverTarget(
-                  String(model?.getValue?.() || ''),
-                  lineContent,
-                  normalizedPosition.column,
-                  currentDbRef.current,
-                  visibleDbsRef.current,
-                  tablesRef.current,
-                  allColumnsRef.current,
-                  viewsRef.current,
-                  materializedViewsRef.current,
-                  triggersRef.current,
-                  routinesRef.current,
-              );
-              if (!hoverTarget) {
-                  return null;
-              }
-              return {
-                  range: new monaco.Range(
-                      normalizedPosition.lineNumber,
-                      hoverTarget.range.startColumn,
-                      normalizedPosition.lineNumber,
-                      hoverTarget.range.endColumn,
-                  ),
-                  contents: [{ value: buildQueryEditorHoverMarkdown(hoverTarget) }],
-              };
-          },
-      });
-
       objectHoverActionRef.current?.dispose?.();
       const showObjectInfoKeybinding = monaco.KeyMod?.CtrlCmd && monaco.KeyCode?.KeyQ
           ? [monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyQ]
@@ -2483,8 +3152,11 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           }
       });
 
-      editor.onDidChangeModelContent?.(() => {
-          refreshObjectDecorations();
+      editor.onDidChangeModelContent?.((event: any) => {
+          const hasSlashCommandMarker = Array.isArray(event?.changes)
+              && event.changes.some((change: any) => /__AI_\w+__/.test(String(change?.text || '')));
+          if (!hasSlashCommandMarker) return;
+          refreshObjectDecorations(QUERY_EDITOR_LIVE_DECORATION_MAX_TEXT_LENGTH);
       });
 
       editor.onMouseMove?.((event: any) => {
@@ -2501,15 +3173,16 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       window.addEventListener('keydown', syncModifierState);
       window.addEventListener('keyup', syncModifierState);
       window.addEventListener('blur', handleWindowBlur);
+      editorDomNode?.addEventListener('dragover', handleEditorDragOver, true);
+      editorDomNode?.addEventListener('drop', handleEditorDrop, true);
 
       editor.onMouseDown?.((event: any) => {
           const browserEvent = event?.event;
-          syncModifierState(browserEvent || null);
           const targetPosition = normalizeEditorPosition(event?.target?.position);
           if (!browserEvent || !targetPosition) {
               return;
           }
-          if (browserEvent.leftButton !== true) {
+          if (!isQueryEditorPrimaryMouseButton(browserEvent)) {
               return;
           }
           if (!browserEvent.ctrlKey && !browserEvent.metaKey) {
@@ -2570,6 +3243,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   connectionId,
                   dbName: targetDbName,
                   tableName: targetTableName,
+                  objectType: 'table',
               });
               dispatchQueryEditorSidebarLocate({
                   connectionId,
@@ -2587,6 +3261,10 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
               const viewTitle = navigationTarget.type === 'materialized-view'
                   ? translate('sidebar.tab.materialized_view_definition', { name: targetViewName })
                   : translate('sidebar.tab.view_definition', { name: targetViewName });
+              const targetSchemaName = String(navigationTarget.schemaName || '').trim();
+              const sidebarLocateKey = navigationTarget.type === 'materialized-view'
+                  ? `${connectionId}-${targetDbName}-materialized-view-${targetViewName}`
+                  : `${connectionId}-${targetDbName}-view-${targetViewName}`;
               addTab({
                   id: `view-def-${connectionId}-${targetDbName}-${targetViewName}`,
                   title: viewTitle,
@@ -2595,13 +3273,16 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   dbName: targetDbName,
                   viewName: targetViewName,
                   viewKind: navigationTarget.type === 'materialized-view' ? 'materialized' : 'view',
+                  schemaName: targetSchemaName || undefined,
+                  sidebarLocateKey,
               });
               dispatchQueryEditorSidebarLocate({
+                  tabId: sidebarLocateKey,
                   connectionId,
                   dbName: targetDbName,
                   viewName: targetViewName,
                   tableName: targetViewName,
-                  schemaName: navigationTarget.schemaName,
+                  schemaName: targetSchemaName,
                   objectGroup: navigationTarget.type === 'materialized-view' ? 'materializedViews' : 'views',
               });
               return;
@@ -2610,6 +3291,9 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           if (navigationTarget.type === 'trigger') {
               const targetTriggerName = String(navigationTarget.triggerName || '').trim();
               if (!targetTriggerName) return;
+              const targetTriggerTableName = String(navigationTarget.tableName || '').trim();
+              const targetSchemaName = String(navigationTarget.schemaName || '').trim();
+              const sidebarLocateKey = `${connectionId}-${targetDbName}-trigger-${targetTriggerName}-${targetTriggerTableName}`;
               addTab({
                   id: `trigger-${connectionId}-${targetDbName}-${targetTriggerName}`,
                   title: translate('sidebar.tab.trigger', { name: targetTriggerName }),
@@ -2617,13 +3301,17 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   connectionId,
                   dbName: targetDbName,
                   triggerName: targetTriggerName,
+                  triggerTableName: targetTriggerTableName || undefined,
+                  schemaName: targetSchemaName || undefined,
+                  sidebarLocateKey,
               });
               dispatchQueryEditorSidebarLocate({
+                  tabId: sidebarLocateKey,
                   connectionId,
                   dbName: targetDbName,
                   triggerName: targetTriggerName,
                   tableName: targetTriggerName,
-                  schemaName: navigationTarget.schemaName,
+                  schemaName: targetSchemaName,
                   objectGroup: 'triggers',
               });
               return;
@@ -2634,6 +3322,8 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           const routineTypeLabel = navigationTarget.routineType === 'PROCEDURE'
               ? translate('sidebar.object.procedure')
               : translate('sidebar.object.function');
+          const targetSchemaName = String(navigationTarget.schemaName || '').trim();
+          const sidebarLocateKey = `${connectionId}-${targetDbName}-routine-${targetRoutineName}`;
           addTab({
               id: `routine-def-${connectionId}-${targetDbName}-${targetRoutineName}`,
               title: translate('sidebar.tab.routine_definition', {
@@ -2645,13 +3335,16 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
               dbName: targetDbName,
               routineName: targetRoutineName,
               routineType: navigationTarget.routineType,
+              schemaName: targetSchemaName || undefined,
+              sidebarLocateKey,
           });
           dispatchQueryEditorSidebarLocate({
+              tabId: sidebarLocateKey,
               connectionId,
               dbName: targetDbName,
               routineName: targetRoutineName,
               tableName: targetRoutineName,
-              schemaName: navigationTarget.schemaName,
+              schemaName: targetSchemaName,
               objectGroup: 'routines',
           });
       });
@@ -2663,11 +3356,11 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           objectHoverActionRef.current?.dispose?.();
           objectHoverActionRef.current = null;
           disposeQueryEditorAiContextMenuActions();
-          hoverProviderDisposableRef.current?.dispose?.();
-          hoverProviderDisposableRef.current = null;
           window.removeEventListener('keydown', syncModifierState);
           window.removeEventListener('keyup', syncModifierState);
           window.removeEventListener('blur', handleWindowBlur);
+          editorDomNode?.removeEventListener('dragover', handleEditorDragOver, true);
+          editorDomNode?.removeEventListener('drop', handleEditorDrop, true);
       });
 
       refreshObjectDecorations();
@@ -2727,16 +3420,75 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
       // 注册 / 斜杠命令 AI 快捷补全
       refreshQueryEditorSlashCommandDefs();
+      const toggleResultsBinding = toggleQueryResultsPanelShortcutBinding;
+      if (toggleResultsBinding?.enabled && toggleResultsBinding.combo) {
+          const keyBinding = comboToMonacoKeyBinding(
+              toggleResultsBinding.combo, monaco.KeyMod, monaco.KeyCode
+          );
+          if (keyBinding) {
+              toggleQueryResultsPanelActionRef.current = editor.addAction({
+                  id: 'gonavi.toggleQueryResultsPanel',
+                  label: buildQueryEditorMonacoActionLabel('app.shortcuts.action.toggleQueryResultsPanel.label'),
+                  keybindings: [keyBinding.keyMod | keyBinding.keyCode],
+                  run: toggleResultPanelVisibility,
+              });
+          }
+      }
+
+      // HMR 重载或测试重置时，以全局状态为准，避免本地闭包状态和 provider 列表不同步。
+      sqlCompletionRegistered = Boolean(_g.__gonaviSqlCompletionState.registered);
+      sqlCompletionDisposables = _g.__gonaviSqlCompletionState.disposables;
+      const shouldRegisterSqlCompletion = !sqlCompletionRegistered
+          || _g.__gonaviSqlCompletionState.version !== SQL_COMPLETION_PROVIDER_VERSION;
 
       // HMR 重载时释放旧注册避免补全项重复
-      if (!sqlCompletionRegistered) {
+      if (shouldRegisterSqlCompletion) {
       sqlCompletionRegistered = true;
       _g.__gonaviSqlCompletionState.registered = true;
+      _g.__gonaviSqlCompletionState.version = SQL_COMPLETION_PROVIDER_VERSION;
       sqlCompletionDisposables.forEach((d: any) => d?.dispose?.());
       sqlCompletionDisposables.length = 0;
+      sqlCompletionDisposables.push(monaco.languages.registerHoverProvider('sql', {
+          provideHover: (model: any, position: any) => {
+              const normalizedPosition = normalizeEditorPosition(position);
+              if (!normalizedPosition) {
+                  return null;
+              }
+              const lineContent = String(model?.getLineContent?.(normalizedPosition.lineNumber) || '');
+              const resolveText = getQueryEditorObjectResolveText(model, lineContent);
+              const hoverTarget = resolveQueryEditorHoverTarget(
+                  resolveText,
+                  lineContent,
+                  normalizedPosition.column,
+                  sharedCurrentDb,
+                  sharedVisibleDbs,
+                  sharedTablesData,
+                  sharedAllColumnsData,
+                  sharedViewsData,
+                  sharedMaterializedViewsData,
+                  sharedTriggersData,
+                  sharedRoutinesData,
+              );
+              if (!hoverTarget) {
+                  return null;
+              }
+              return {
+                  range: new monaco.Range(
+                      normalizedPosition.lineNumber,
+                      hoverTarget.range.startColumn,
+                      normalizedPosition.lineNumber,
+                      hoverTarget.range.endColumn,
+                  ),
+                  contents: [{ value: buildQueryEditorHoverMarkdown(hoverTarget) }],
+              };
+          },
+      }));
       sqlCompletionDisposables.push(monaco.languages.registerCompletionItemProvider('sql', {
           triggerCharacters: ['.'],
-          provideCompletionItems: async (model: any, position: any) => {
+          provideCompletionItems: async (model: any, position: any, _context?: any, token?: { isCancellationRequested?: boolean }) => {
+              if (isSqlCompletionRequestCancelled(token)) {
+                  return createEmptySqlCompletionResult();
+              }
               const word = model.getWordUntilPosition(position);
               const range = {
                   startLineNumber: position.lineNumber,
@@ -2750,12 +3502,22 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   String(activeConnection?.config?.driver || ''),
                   { oceanBaseProtocol: activeConnection?.config?.oceanBaseProtocol },
               );
+              const shouldQuoteCompletionIdentifiers = isPostgresSchemaDialect(activeDialect);
+              const quoteCompletionPart = (ident: string) => {
+                  const raw = String(ident || '').trim();
+                  if (!raw) return raw;
+                  return shouldQuoteCompletionIdentifiers ? quoteIdentPart(activeDialect, raw) : raw;
+              };
+              const quoteCompletionPath = (ident: string) => {
+                  const raw = String(ident || '').trim();
+                  if (!raw) return raw;
+                  return shouldQuoteCompletionIdentifiers ? quoteQualifiedIdent(activeDialect, raw) : raw;
+              };
               const dialectKeywords = resolveSqlKeywords(activeDialect);
               const dialectFunctions = resolveSqlFunctions(activeDialect);
 
               const stripQuotes = stripCompletionIdentifierQuotes;
               const normalizeQualifiedName = normalizeCompletionQualifiedName;
-              const getLastPart = getCompletionQualifiedNameLastPart;
               const splitSchemaAndTable = splitCompletionSchemaAndTable;
 
               const buildConnConfig = () => {
@@ -2772,24 +3534,124 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   };
               };
 
-              const getColumnsByDB = async (tableIdent: string) => {
+              const getLazyTablesByDB = async (dbName: string) => {
                   const connId = sharedCurrentConnectionId;
-                  const dbName = sharedCurrentDb;
-                  if (!connId || !dbName) return [] as ColumnDefinition[];
-                  const key = `${connId}|${dbName}|${tableIdent}`;
-                  const cached = sharedColumnsCacheData[key];
-                  if (cached) return cached;
+                  if (!connId || !dbName) return [] as CompletionTableMeta[];
+                  const key = `${connId}|${dbName}`;
+                  if (sharedLazyTablesCache[key]) {
+                      return sharedLazyTablesCache[key];
+                  }
+                  if (sharedLazyTablesInFlight[key]) {
+                      return sharedLazyTablesInFlight[key];
+                  }
 
                   const config = buildConnConfig();
-                  if (!config) return [] as ColumnDefinition[];
+                  if (!config) return [] as CompletionTableMeta[];
 
-                  const res = await DBGetColumns(buildRpcConnectionConfig(config) as any, dbName, tableIdent);
+                  sharedLazyTablesInFlight[key] = DBGetTables(buildRpcConnectionConfig(config) as any, dbName)
+                      .then((res) => {
+                          const tables = res?.success && Array.isArray(res.data)
+                              ? res.data
+                                  .map((row: any) => String(Object.values(row || {})[0] || '').trim())
+                                  .filter(Boolean)
+                                  .map((tableName: string) => ({ dbName, tableName }))
+                              : [];
+                          sharedLazyTablesCache[key] = tables;
+                          if (tables.length > 0) {
+                              const existingKeys = new Set(sharedTablesData.map((table) => `${table.dbName.toLowerCase()}.${table.tableName.toLowerCase()}`));
+                              const missingTables = tables.filter((table) => !existingKeys.has(`${table.dbName.toLowerCase()}.${table.tableName.toLowerCase()}`));
+                              if (missingTables.length > 0) {
+                                  sharedTablesData = [...sharedTablesData, ...missingTables];
+                              }
+                          }
+                          return tables;
+                      })
+                      .catch(() => [])
+                      .finally(() => {
+                          delete sharedLazyTablesInFlight[key];
+                      });
+                  return sharedLazyTablesInFlight[key];
+              };
+
+              const toCompletionColumns = (
+                  columns: ColumnDefinition[],
+                  dbName: string,
+                  tableName: string,
+              ): CompletionColumnMeta[] => columns
+                  .map((column) => ({
+                      dbName,
+                      tableName,
+                      name: getColumnDefinitionName(column),
+                      type: getColumnDefinitionType(column),
+                      comment: getColumnDefinitionComment(column),
+                  }))
+                  .filter((column) => !!column.name);
+
+              const findPreloadedColumns = (dbName: string, tableName: string) => {
+                  const targetDbLower = String(dbName || '').toLowerCase();
+                  const targetTableLower = String(tableName || '').toLowerCase();
+                  return sharedAllColumnsData.filter((column) => {
+                      if (String(column.dbName || '').toLowerCase() !== targetDbLower) return false;
+                      const columnTableLower = String(column.tableName || '').toLowerCase();
+                      if (columnTableLower === targetTableLower) return true;
+                      const parsed = splitSchemaAndTable(column.tableName || '');
+                      return String(parsed.table || '').toLowerCase() === targetTableLower;
+                  });
+              };
+
+              const mergeSharedCompletionColumns = (columns: CompletionColumnMeta[]) => {
+                  if (columns.length === 0) return;
+                  const existingKeys = new Set(sharedAllColumnsData.map((column) => [
+                      String(column.dbName || '').toLowerCase(),
+                      String(column.tableName || '').toLowerCase(),
+                      String(column.name || '').toLowerCase(),
+                  ].join('\u0000')));
+                  const missing = columns.filter((column) => {
+                      const key = [
+                          String(column.dbName || '').toLowerCase(),
+                          String(column.tableName || '').toLowerCase(),
+                          String(column.name || '').toLowerCase(),
+                      ].join('\u0000');
+                      if (existingKeys.has(key)) return false;
+                      existingKeys.add(key);
+                      return true;
+                  });
+                  if (missing.length > 0) {
+                      sharedAllColumnsData = [...sharedAllColumnsData, ...missing];
+                  }
+              };
+
+              const getCompletionColumnsByTable = async (dbName: string, tableIdent: string) => {
+                  const connId = sharedCurrentConnectionId;
+                  const targetDb = String(dbName || '').trim();
+                  const targetTable = String(tableIdent || '').trim();
+                  if (!connId || !targetDb || !targetTable) return [] as CompletionColumnMeta[];
+
+                  const preloaded = findPreloadedColumns(targetDb, targetTable);
+                  if (preloaded.length > 0) {
+                      return preloaded;
+                  }
+
+                  const key = `${connId}|${targetDb}|${targetTable}`;
+                  const cached = sharedColumnsCacheData[key] as ColumnDefinition[] | undefined;
+                  if (cached) {
+                      const cachedColumns = toCompletionColumns(cached, targetDb, targetTable);
+                      mergeSharedCompletionColumns(cachedColumns);
+                      return cachedColumns;
+                  }
+
+                  const config = buildConnConfig();
+                  if (!config) return [] as CompletionColumnMeta[];
+
+                  const res = await DBGetColumns(buildRpcConnectionConfig(config) as any, targetDb, targetTable);
                   if (res?.success && Array.isArray(res.data)) {
                       const cols = res.data as ColumnDefinition[];
                       sharedColumnsCacheData[key] = cols;
-                      return cols;
+                      const completionColumns = toCompletionColumns(cols, targetDb, targetTable);
+                      mergeSharedCompletionColumns(completionColumns);
+                      return completionColumns;
                   }
-                  return [] as ColumnDefinition[];
+                  return [] as CompletionColumnMeta[];
               };
 
               const fullText = model.getValue();
@@ -2798,17 +3660,16 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
               const linePrefix = model.getLineContent(position.lineNumber).slice(0, position.column - 1);
 
               // 0) 三段式 db.table.column 格式：当输入 db.table. 时提示列
-              const threePartMatch = linePrefix.match(/([`"]?\w+[`"]?)\.([`"]?\w+[`"]?)\.(\w*)$/);
+              const threePartMatch = linePrefix.match(QUERY_EDITOR_SQL_THREE_PART_COMPLETION_REGEX);
               if (threePartMatch) {
                   const dbPart = stripQuotes(threePartMatch[1]);
                   const tablePart = stripQuotes(threePartMatch[2]);
                   const colPrefix = (threePartMatch[3] || '').toLowerCase();
 
-                  // 在 allColumnsRef 中查找匹配的列
-                  const cols = sharedAllColumnsData.filter(c =>
-                      (c.dbName || '').toLowerCase() === dbPart.toLowerCase() &&
-                      (c.tableName || '').toLowerCase() === tablePart.toLowerCase()
-                  );
+                  const cols = await getCompletionColumnsByTable(dbPart, tablePart);
+                  if (isSqlCompletionRequestCancelled(token)) {
+                      return createEmptySqlCompletionResult();
+                  }
 
                   const filtered = colPrefix
                       ? cols.filter(c => (c.name || '').toLowerCase().startsWith(colPrefix))
@@ -2817,7 +3678,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   const suggestions = filtered.map(c => ({
                       label: c.name,
                       kind: monaco.languages.CompletionItemKind.Field,
-                      insertText: c.name,
+                      insertText: quoteCompletionPart(c.name),
                       detail: appendCommentToDetail(`${c.type} (${c.dbName}.${c.tableName})`, c.comment),
                       documentation: buildCompletionDocumentation(c.comment),
                       range,
@@ -2827,7 +3688,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
               }
 
               // 1) 两段式 qualifier.xxx 格式
-              const qualifierMatch = linePrefix.match(/([`"]?[A-Za-z_]\w*[`"]?)\.(\w*)$/);
+              const qualifierMatch = linePrefix.match(QUERY_EDITOR_SQL_QUALIFIER_COMPLETION_REGEX);
               if (qualifierMatch) {
                   const qualifier = stripQuotes(qualifierMatch[1]);
                   const prefix = (qualifierMatch[2] || '').toLowerCase();
@@ -2837,9 +3698,15 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   const visibleDbs = sharedVisibleDbs;
                   if (visibleDbs.some(db => db.toLowerCase() === qualifierLower)) {
                       // qualifier 是数据库名，提示该库的表
-                      const tables = sharedTablesData.filter(t =>
+                      let tables = sharedTablesData.filter(t =>
                           (t.dbName || '').toLowerCase() === qualifierLower
                       );
+                      if (tables.length === 0) {
+                          tables = await getLazyTablesByDB(qualifier);
+                          if (isSqlCompletionRequestCancelled(token)) {
+                              return createEmptySqlCompletionResult();
+                          }
+                      }
                       const filtered = prefix
                           ? tables.filter(t => (t.tableName || '').toLowerCase().startsWith(prefix))
                           : tables;
@@ -2847,7 +3714,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       const suggestions = filtered.map(t => ({
                           label: t.tableName,
                           kind: monaco.languages.CompletionItemKind.Class,
-                          insertText: t.tableName,
+                          insertText: quoteCompletionPath(t.tableName),
                           detail: appendCommentToDetail(`${translate('query_editor.object_info.table')} (${t.dbName})`, t.comment),
                           documentation: buildCompletionDocumentation(t.comment),
                           range,
@@ -2877,7 +3744,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       const suggestions = filtered.map(t => ({
                           label: t.table,
                           kind: monaco.languages.CompletionItemKind.Class,
-                          insertText: t.table,
+                          insertText: quoteCompletionPart(t.table),
                           detail: appendCommentToDetail(`${translate('query_editor.object_info.table')} (${t.dbName}${t.schema ? '.' + t.schema : ''})`, t.comment),
                           documentation: buildCompletionDocumentation(t.comment),
                           range,
@@ -2887,59 +3754,13 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   }
 
                   // 否则检查是否是表别名或表名，提示列
-                  const reserved = new Set([
-                      'where', 'on', 'group', 'order', 'limit', 'having',
-                      'left', 'right', 'inner', 'outer', 'full', 'cross', 'join',
-                      'union', 'except', 'intersect', 'as', 'set', 'values', 'returning',
-                  ]);
-
-                  const aliasMap: Record<string, {dbName: string, tableName: string}> = {};
-                  // Capture table and optional alias, support db.table format
-                  const aliasRegex = /\b(?:FROM|JOIN|UPDATE|INTO|DELETE\s+FROM)\s+([`"]?\w+[`"]?(?:\s*\.\s*[`"]?\w+[`"]?)?)(?:\s+(?:AS\s+)?([`"]?\w+[`"]?))?/gi;
-                  let m;
-                  while ((m = aliasRegex.exec(fullText)) !== null) {
-                      const tableIdent = normalizeQualifiedName(m[1] || '');
-                      if (!tableIdent) continue;
-
-                      // 解析 db.table 或 table 格式
-                      const parts = tableIdent.split('.');
-                      let dbName = sharedCurrentDb || '';
-                      let tableName = tableIdent;
-                      if (parts.length === 2) {
-                          dbName = parts[0];
-                          tableName = parts[1];
-                      }
-
-                      const shortTable = getLastPart(tableIdent);
-                      // 用表名作为 qualifier
-                      if (shortTable) aliasMap[shortTable.toLowerCase()] = { dbName, tableName };
-
-                      const a = stripQuotes(m[2] || '').trim();
-                      if (!a) continue;
-                      const al = a.toLowerCase();
-                      if (reserved.has(al)) continue;
-                      aliasMap[al] = { dbName, tableName };
-                  }
+                  const aliasMap = buildQueryEditorAliasMap(fullText, sharedCurrentDb || '');
 
                   const tableInfo = aliasMap[qualifier.toLowerCase()];
                   if (tableInfo) {
-                      // Prefer preloaded MySQL all-columns cache
-                      let cols: { name: string, type?: string, tableName?: string, dbName?: string, comment?: string }[];
-                      if (sharedAllColumnsData.length > 0) {
-                          const tiTableLower = (tableInfo.tableName || '').toLowerCase();
-                          cols = sharedAllColumnsData
-                              .filter(c => {
-                                  if ((c.dbName || '').toLowerCase() !== (tableInfo.dbName || '').toLowerCase()) return false;
-                                  const cTableLower = (c.tableName || '').toLowerCase();
-                                  if (cTableLower === tiTableLower) return true;
-                                  // schema.table 格式匹配纯表名
-                                  const parsed = splitSchemaAndTable(c.tableName || '');
-                                  return (parsed.table || '').toLowerCase() === tiTableLower;
-                              })
-                              .map(c => ({ name: c.name, type: c.type, tableName: c.tableName, dbName: c.dbName, comment: c.comment }));
-                      } else {
-                          const dbCols = await getColumnsByDB(tableInfo.tableName);
-                          cols = dbCols.map(c => ({ name: c.name, type: c.type, tableName: tableInfo.tableName, comment: c.comment }));
+                      const cols = await getCompletionColumnsByTable(tableInfo.dbName, tableInfo.tableName);
+                      if (isSqlCompletionRequestCancelled(token)) {
+                          return createEmptySqlCompletionResult();
                       }
 
                       const filtered = prefix
@@ -2949,7 +3770,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       const suggestions = filtered.map(c => ({
                           label: c.name,
                           kind: monaco.languages.CompletionItemKind.Field,
-                          insertText: c.name,
+                          insertText: quoteCompletionPart(c.name),
                           detail: appendCommentToDetail(
                               c.type ? `${c.type} (${c.dbName ? c.dbName + '.' : ''}${c.tableName})` : (c.tableName ? `(${c.tableName})` : ''),
                               c.comment,
@@ -2963,7 +3784,8 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
               }
 
               // 2) global/table/column completion
-              const tableRegex = /\b(?:FROM|JOIN|UPDATE|INTO|DELETE\s+FROM)\s+([`"]?\w+[`"]?(?:\s*\.\s*[`"]?\w+[`"]?)?)/gi;
+              const tableRegex = QUERY_EDITOR_SQL_TABLE_REFERENCE_REGEX;
+              tableRegex.lastIndex = 0;
               const foundTables = new Set<string>();
               let match;
               while ((match = tableRegex.exec(fullText)) !== null) {
@@ -2976,6 +3798,16 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
               const currentDatabase = sharedCurrentDb || '';
               const wordPrefix = (word.word || '').toLowerCase();
               const startsWithPrefix = (candidate: string) => !wordPrefix || candidate.toLowerCase().startsWith(wordPrefix);
+              const includesWordPrefix = (candidate: string) => !wordPrefix || String(candidate || '').toLowerCase().includes(wordPrefix);
+              const getPrefixMatchRank = (...candidates: string[]) => {
+                  if (!wordPrefix) return '0';
+                  const normalized = candidates
+                      .map((candidate) => String(candidate || '').toLowerCase())
+                      .filter(Boolean);
+                  if (normalized.some((candidate) => candidate.startsWith(wordPrefix))) return '0';
+                  if (normalized.some((candidate) => candidate.includes(wordPrefix))) return '1';
+                  return '9';
+              };
               const expectsTableName = /\b(?:FROM|JOIN|UPDATE|INTO|DELETE\s+FROM|TABLE|DESCRIBE|DESC|EXPLAIN)\s+[`"]?[\w.]*$/i.test(linePrefix.trim());
               const shouldBoostKeywords = !expectsTableName
                   && wordPrefix.length > 0
@@ -2985,10 +3817,51 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   : expectsTableName
                       ? { keyword: '20', func: '25', columnCurrent: '10', columnOther: '11', tableCurrent: '00', tableOther: '01', db: '30' }
                       : { keyword: '30', func: '25', columnCurrent: '00', columnOther: '01', tableCurrent: '10', tableOther: '11', db: '20' };
+              let completionTables = sharedTablesData;
+              if (
+                  expectsTableName
+                  && currentDatabase
+                  && !sharedTablesData.some((t) => (t.dbName || '').toLowerCase() === currentDatabase.toLowerCase())
+              ) {
+                  const lazyTables = await getLazyTablesByDB(currentDatabase);
+                  if (isSqlCompletionRequestCancelled(token)) {
+                      return createEmptySqlCompletionResult();
+                  }
+                  if (lazyTables.length > 0) {
+                      const seenTableKeys = new Set<string>();
+                      completionTables = [...sharedTablesData, ...lazyTables].filter((table) => {
+                          const key = `${String(table.dbName || '').toLowerCase()}.${String(table.tableName || '').toLowerCase()}`;
+                          if (seenTableKeys.has(key)) return false;
+                          seenTableKeys.add(key);
+                          return true;
+                      });
+                  }
+              }
+
+              const referencedColumns: CompletionColumnMeta[] = [];
+              if (!expectsTableName) {
+                  const aliasMapForReferencedTables = buildQueryEditorAliasMap(fullText, currentDatabase);
+                  const seenReferencedTables = new Set<string>();
+                  for (const tableInfo of Object.values(aliasMapForReferencedTables)) {
+                      const key = `${String(tableInfo.dbName || '').toLowerCase()}.${String(tableInfo.tableName || '').toLowerCase()}`;
+                      if (!tableInfo.dbName || !tableInfo.tableName || seenReferencedTables.has(key)) continue;
+                      seenReferencedTables.add(key);
+                      const preloaded = findPreloadedColumns(tableInfo.dbName, tableInfo.tableName);
+                      if (preloaded.length > 0) continue;
+                      const cols = await getCompletionColumnsByTable(tableInfo.dbName, tableInfo.tableName);
+                      if (isSqlCompletionRequestCancelled(token)) {
+                          return createEmptySqlCompletionResult();
+                      }
+                      referencedColumns.push(...cols);
+                  }
+              }
+              const completionColumns = referencedColumns.length > 0
+                  ? [...sharedAllColumnsData, ...referencedColumns]
+                  : sharedAllColumnsData;
 
               // 相关列提示：匹配 SQL 中引用的表（FROM/JOIN 等）
               // 权重最高，输入 WHERE 条件时优先显示
-              const relevantColumns = sharedAllColumnsData
+              const relevantColumns = (expectsTableName ? [] : completionColumns)
                   .filter(c => {
                       const fullIdent = `${c.dbName}.${c.tableName}`.toLowerCase();
                       const shortIdent = (c.tableName || '').toLowerCase();
@@ -3003,7 +3876,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       return {
                           label: c.name,
                           kind: monaco.languages.CompletionItemKind.Field,
-                          insertText: c.name,
+                          insertText: quoteCompletionPart(c.name),
                           detail: appendCommentToDetail(`${c.type} (${c.dbName}.${c.tableName})`, c.comment),
                           documentation: buildCompletionDocumentation(c.comment),
                           range,
@@ -3013,7 +3886,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
               // 表提示：当前库智能处理 schema.table 格式
               // 1. 构建纯表名到 schema 列表的映射，检测同名表
-              const currentDbTables = sharedTablesData.filter(t =>
+              const currentDbTables = completionTables.filter(t =>
                   (t.dbName || '').toLowerCase() === currentDatabase.toLowerCase()
               );
               const tableNameToSchemas = new Map<string, string[]>();
@@ -3025,40 +3898,42 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   tableNameToSchemas.set(pureTable, schemas);
               }
 
-              const tableSuggestions = sharedTablesData
+              const tableSuggestions = completionTables
                 .filter(t => {
                     const isCurrentDb = (t.dbName || '').toLowerCase() === currentDatabase.toLowerCase();
-                    if (!isCurrentDb) {
-                        // 跨库：用 db.table 格式匹配
-                        return startsWithPrefix(`${t.dbName}.${t.tableName}`);
-                    }
-                    // 当前库：同时用完整名和纯表名匹配
                     const parsed = splitSchemaAndTable(t.tableName || '');
                     const pureTable = parsed.table || t.tableName || '';
-                    return startsWithPrefix(t.tableName || '') || startsWithPrefix(pureTable);
+                    if (!isCurrentDb) {
+                        // 跨库：用 db.table 格式匹配
+                        return includesWordPrefix(`${t.dbName}.${t.tableName}`)
+                            || includesWordPrefix(t.tableName || '')
+                            || includesWordPrefix(pureTable);
+                    }
+                    // 当前库：同时用完整名和纯表名匹配
+                    return includesWordPrefix(t.tableName || '') || includesWordPrefix(pureTable);
                 })
                 .map(t => {
                   const isCurrentDb = (t.dbName || '').toLowerCase() === currentDatabase.toLowerCase();
+                  const parsed = splitSchemaAndTable(t.tableName || '');
+                  const pureTable = parsed.table || t.tableName || '';
                   if (!isCurrentDb) {
                       const label = `${t.dbName}.${t.tableName}`;
                       return {
                           label,
                           kind: monaco.languages.CompletionItemKind.Class,
-                          insertText: label,
+                          insertText: quoteCompletionPath(label),
                           detail: appendCommentToDetail(`${translate('query_editor.object_info.table')} (${t.dbName})`, t.comment),
                           documentation: buildCompletionDocumentation(t.comment),
                           range,
-                          sortText: sortGroups.tableOther + t.tableName,
+                          sortText: sortGroups.tableOther + getPrefixMatchRank(`${t.dbName}.${t.tableName}`, t.tableName || '', pureTable) + t.tableName,
                       };
                   }
                   // 当前库：检查是否有跨 schema 同名表
-                  const parsed = splitSchemaAndTable(t.tableName || '');
-                  const pureTable = parsed.table || t.tableName || '';
                   const schemas = tableNameToSchemas.get(pureTable.toLowerCase()) || [];
                   const hasDuplicate = schemas.length > 1;
                   // 同名表存在于多个 schema → 显示 schema.table；否则只显示纯表名
                   const label = hasDuplicate ? t.tableName : pureTable;
-                  const insertText = hasDuplicate ? t.tableName : pureTable;
+                  const insertText = quoteCompletionPath(hasDuplicate ? t.tableName : pureTable);
                   const schemaInfo = parsed.schema ? ` (${parsed.schema})` : '';
                   return {
                       label,
@@ -3067,7 +3942,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       detail: appendCommentToDetail(`${translate('query_editor.object_info.table')}${schemaInfo}`, t.comment),
                       documentation: buildCompletionDocumentation(t.comment),
                       range,
-                      sortText: sortGroups.tableCurrent + pureTable,
+                      sortText: sortGroups.tableCurrent + getPrefixMatchRank(t.tableName || '', pureTable) + pureTable,
                   };
               });
 
@@ -3148,11 +4023,11 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
 
       // SQL snippet completion provider
-      monaco.languages.registerCompletionItemProvider('sql', {
+      sqlCompletionDisposables.push(monaco.languages.registerCompletionItemProvider('sql', {
           provideCompletionItems: (model: any, position: any) => {
               const word = model.getWordUntilPosition(position);
               const prefix = word.word.toLowerCase();
-              if (!prefix) return { suggestions: [] };
+              if (!prefix) return createEmptySqlCompletionResult();
 
               const range = {
                   startLineNumber: position.lineNumber,
@@ -3161,7 +4036,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   endColumn: word.endColumn,
               };
 
-              const allSnippets = useStore.getState().sqlSnippets;
+              const allSnippets = useStore.getState().sqlSnippets || [];
               const matched = allSnippets.filter(s =>
                   s.prefix.toLowerCase().startsWith(prefix) ||
                   s.name.toLowerCase().includes(prefix)
@@ -3174,20 +4049,23 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                       insertText: s.body,
                       insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
                       detail: s.name,
-                      documentation: s.description || s.body,
+                      documentation: s.syntaxHelp || s.description || s.body,
                       range,
                       sortText: '04' + s.prefix,
                   })),
               };
           },
-      });
+      }));
 
       } // end sqlCompletionRegistered guard
 
       // 每个编辑器实例都注册内容变化监听（检测斜杠命令标记）
       let _handlingSlash = false;
-      editor.onDidChangeModelContent(() => {
+      editor.onDidChangeModelContent((event: any) => {
           if (_handlingSlash) return;
+          const hasSlashCommandMarker = Array.isArray(event?.changes)
+              && event.changes.some((change: any) => /__AI_\w+__/.test(String(change?.text || '')));
+          if (!hasSlashCommandMarker) return;
           const model = editor.getModel();
           if (!model) return;
           const content = model.getValue();
@@ -3229,12 +4107,29 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
   const handleFormat = () => {
       try {
-          const formatted = format(getCurrentQuery(), { language: 'mysql', keywordCase: sqlFormatOptions.keywordCase });
+          const activeConnectionId = String(currentConnectionIdRef.current || '').trim();
+          const tabConnectionId = String(tab.connectionId || '').trim();
+          const conn = connectionsRef.current.find(c => c.id === activeConnectionId)
+              || (tabConnectionId && tabConnectionId !== activeConnectionId
+                  ? connectionsRef.current.find(c => c.id === tabConnectionId)
+                  : undefined);
+          const formatterLanguage = resolveQueryEditorFormatterLanguage(conn);
+          const sourceSql = getCurrentQuery();
+          const formatted = format(sourceSql, { language: formatterLanguage, keywordCase: sqlFormatOptions.keywordCase });
+          if (sourceSql === formatted) {
+              return;
+          }
+          updateQueryTabDraft(tab.id, {
+              formatRestoreSnapshot: {
+                  query: sourceSql,
+                  createdAt: Date.now(),
+              },
+          });
           const editor = editorRef.current;
           const monaco = monacoRef.current;
           const model = editor?.getModel?.();
           if (editor && monaco && model) {
-              const currentValue = String(model.getValue?.() || '');
+              const currentValue = String(model.getValue?.() || sourceSql);
               if (currentValue === formatted) {
                   return;
               }
@@ -3248,7 +4143,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
               }]);
               editor.pushUndoStop?.();
               const nextValue = editor.getValue?.();
-              setQuery(typeof nextValue === 'string' ? nextValue : formatted);
+              applyQueryState(typeof nextValue === 'string' ? nextValue : formatted);
               refreshObjectDecorations();
               return;
       }
@@ -3258,6 +4153,21 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       }
   };
 
+  const handleRestoreLastFormat = () => {
+      const previousQuery = tab.formatRestoreSnapshot?.query;
+      if (!previousQuery) {
+          void message.info('没有可还原的美化前 SQL');
+          return;
+      }
+      syncQueryToEditor(previousQuery);
+      updateQueryTabDraft(tab.id, {
+          query: previousQuery,
+          formatRestoreSnapshot: undefined,
+      });
+      refreshObjectDecorations();
+      void message.success('已还原到美化前 SQL');
+  };
+
   const handleAIAction = (action: 'generate' | 'explain' | 'optimize' | 'schema') => {
       const editor = editorRef.current;
       const selection = editor?.getModel()?.getValueInRange(editor.getSelection()) || '';
@@ -3294,6 +4204,13 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           onClick: () => setSqlFormatOptions({ keywordCase: 'lower' }) 
       },
       { type: 'divider' },
+      {
+          key: 'restore-last-format',
+          label: '还原上次美化',
+          disabled: !tab.formatRestoreSnapshot?.query,
+          onClick: handleRestoreLastFormat,
+      },
+      { type: 'divider' },
       {
           key: 'snippet-settings',
           label: translate('query_editor.format.snippet_settings'),
@@ -3307,128 +4224,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
   ];
 
   const splitSQLStatements = (sql: string): string[] => {
-    const text = (sql || '').replace(/\r\n/g, '\n');
-    const statements: string[] = [];
-
-    let cur = '';
-    let inSingle = false;
-    let inDouble = false;
-    let inBacktick = false;
-    let escaped = false;
-    let inLineComment = false;
-    let inBlockComment = false;
-    let dollarTag: string | null = null; // postgres/kingbase: $$...$$ or $tag$...$tag$
-
-    const push = () => {
-        const s = cur.trim();
-        if (s) statements.push(s);
-        cur = '';
-    };
-
-    const isWS = (ch: string) => ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r';
-
-    for (let i = 0; i < text.length; i++) {
-        const ch = text[i];
-        const next = i + 1 < text.length ? text[i + 1] : '';
-        const prev = i > 0 ? text[i - 1] : '';
-        const next2 = i + 2 < text.length ? text[i + 2] : '';
-
-        if (!inSingle && !inDouble && !inBacktick) {
-            if (inLineComment) {
-                cur += ch;
-                if (ch === '\n') inLineComment = false;
-                continue;
-            }
-
-            if (inBlockComment) {
-                cur += ch;
-                if (ch === '*' && next === '/') {
-                    cur += next;
-                    i++;
-                    inBlockComment = false;
-                }
-                continue;
-            }
-
-            // Start comments
-            if (ch === '/' && next === '*') {
-                cur += ch + next;
-                i++;
-                inBlockComment = true;
-                continue;
-            }
-            if (ch === '#') {
-                cur += ch;
-                inLineComment = true;
-                continue;
-            }
-            if (ch === '-' && next === '-' && (i === 0 || isWS(prev)) && (next2 === '' || isWS(next2))) {
-                cur += ch + next;
-                i++;
-                inLineComment = true;
-                continue;
-            }
-
-            // Dollar-quoted strings (PG/Kingbase)
-            if (dollarTag) {
-                if (text.startsWith(dollarTag, i)) {
-                    cur += dollarTag;
-                    i += dollarTag.length - 1;
-                    dollarTag = null;
-                } else {
-                    cur += ch;
-                }
-                continue;
-            }
-            if (ch === '$') {
-                const m = text.slice(i).match(/^\$[A-Za-z0-9_]*\$/);
-                if (m && m[0]) {
-                    dollarTag = m[0];
-                    cur += dollarTag;
-                    i += dollarTag.length - 1;
-                    continue;
-                }
-            }
-        }
-
-        if (escaped) {
-            cur += ch;
-            escaped = false;
-            continue;
-        }
-
-        if ((inSingle || inDouble) && ch === '\\') {
-            cur += ch;
-            escaped = true;
-            continue;
-        }
-
-        if (!inDouble && !inBacktick && ch === '\'') {
-            inSingle = !inSingle;
-            cur += ch;
-            continue;
-        }
-        if (!inSingle && !inBacktick && ch === '"') {
-            inDouble = !inDouble;
-            cur += ch;
-            continue;
-        }
-        if (!inSingle && !inDouble && ch === '`') {
-            inBacktick = !inBacktick;
-            cur += ch;
-            continue;
-        }
-
-        if (!inSingle && !inDouble && !inBacktick && !dollarTag && (ch === ';' || ch === '；')) {
-            push();
-            continue;
-        }
-
-        cur += ch;
-    }
-
-    push();
-    return statements;
+    return findSqlStatementRanges(sql).map((range) => range.text);
   };
 
   const getSelectedSQL = (): string => {
@@ -3444,6 +4240,13 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       return selected;
   };
 
+  const buildResultSetMergeKey = (result: ResultSet): string => {
+      const sqlKey = normalizeExecutedSqlKey(result.exportSql || result.sql);
+      const sourceStatementIndex = Number(result.sourceStatementIndex || 1);
+      const statementResultIndex = Number(result.statementResultIndex || 1);
+      return `${sqlKey}::${sourceStatementIndex}::${statementResultIndex}`;
+  };
+
   const mergeResultSets = (previous: ResultSet[], next: ResultSet[], replaceAll: boolean): ResultSet[] => {
       if (replaceAll || previous.length === 0) {
           return next.map((result, index) => ({ ...result, key: `result-${index + 1}` }));
@@ -3451,8 +4254,8 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
       const merged = [...previous];
       next.forEach((result) => {
-          const incomingKey = normalizeExecutedSqlKey(result.exportSql || result.sql);
-          const existingIndex = merged.findIndex((item) => normalizeExecutedSqlKey(item.exportSql || item.sql) === incomingKey);
+          const incomingKey = buildResultSetMergeKey(result);
+          const existingIndex = merged.findIndex((item) => buildResultSetMergeKey(item) === incomingKey);
           if (existingIndex >= 0) {
               merged[existingIndex] = { ...result, key: merged[existingIndex].key };
               return;
@@ -3462,6 +4265,65 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       return merged;
   };
 
+  const isDisplayableResultSet = (result?: ResultSet | null): boolean => {
+      if (!result) {
+          return false;
+      }
+      if (Array.isArray(result.messages) && result.messages.length > 0) {
+          return true;
+      }
+      if (Array.isArray(result.columns) && result.columns.length > 0) {
+          return true;
+      }
+      if (Array.isArray(result.rows) && result.rows.length > 0) {
+          return true;
+      }
+      return false;
+  };
+
+  const isAffectedRowsResultSet = (result?: ResultSet | null): boolean =>
+      Boolean(
+          result &&
+          Array.isArray(result.columns) &&
+          result.columns.length === 1 &&
+          result.columns[0] === 'affectedRows',
+      );
+
+  const isMessageLikeResultSet = (result?: ResultSet | null): boolean =>
+      Boolean(
+          result &&
+          Array.isArray(result.messages) &&
+          result.messages.length > 0 &&
+          result.resultType !== 'grid',
+      );
+
+  const isConcreteGridResultSet = (result?: ResultSet | null): boolean =>
+      Boolean(
+          result &&
+          result.resultType !== 'message' &&
+          !isAffectedRowsResultSet(result) &&
+          (
+              (Array.isArray(result.columns) && result.columns.length > 0) ||
+              (Array.isArray(result.rows) && result.rows.length > 0)
+          ),
+      );
+
+  const resolveActiveResultKeyAfterMerge = (merged: ResultSet[], executed: ResultSet[]): string => {
+      const firstExecutedResult = executed.find((result) => isConcreteGridResultSet(result))
+          || executed.find((result) => isMessageLikeResultSet(result))
+          || executed.find((result) => isDisplayableResultSet(result) && !isAffectedRowsResultSet(result))
+          || executed.find((result) => isDisplayableResultSet(result))
+          || executed[0];
+      if (!firstExecutedResult) {
+          return '';
+      }
+      const executedSqlKey = buildResultSetMergeKey(firstExecutedResult);
+      return merged.find((item) => buildResultSetMergeKey(item) === executedSqlKey)?.key
+          || firstExecutedResult.key
+          || merged[0]?.key
+          || '';
+  };
+
   const resolveExecutableSQLAtEditorPosition = (model: any, sqlText: string, position: any): string => {
       const normalizedPosition = normalizeEditorPosition(position);
       if (!normalizedPosition) return '';
@@ -3532,6 +4394,8 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       if (!sql?.trim() || !currentDb) return;
       const conn = connections.find(c => c.id === currentConnectionId);
       if (!conn) return;
+      const currentResult = resultSets.find((item) => item.key === resultKey);
+      const statementResultIndex = Math.max(1, Number(currentResult?.statementResultIndex || 1));
 
       const config = {
           ...conn.config,
@@ -3554,15 +4418,14 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           const res = await DBQueryMulti(buildRpcConnectionConfig(config) as any, currentDb, sql, queryId);
           if (!res?.success) {
               message.error(translate('query_editor.message.refresh_failed', {
-                  error: res?.message || translate('common.unknown'),
+                  error: formatSqlExecutionError(res?.message || translate('common.unknown')),
               }));
               return;
           }
 
-          // 取第一个结果集（单条 SQL 只有一个结果集）
           const resultSetDataArray = Array.isArray(res.data) ? (res.data as any[]) : [];
-          if (resultSetDataArray.length === 0) return;
-          const rsData = resultSetDataArray[0];
+          const rsData = resultSetDataArray[Math.max(0, statementResultIndex - 1)];
+          if (!rsData) return;
           const isAffectedResult = Array.isArray(rsData.rows) && rsData.rows.length === 1
               && rsData.columns && rsData.columns.length === 1
               && rsData.columns[0] === 'affectedRows';
@@ -3585,18 +4448,128 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           // 只更新匹配的结果集的 rows 和 columns，保留 tableName/pkColumns/readOnly 等元数据
           setResultSets(prev => prev.map(rs =>
               rs.key === resultKey
-                  ? { ...rs, rows, columns: cols, truncated }
+                  ? {
+                      ...rs,
+                      rows,
+                      columns: cols,
+                      messages: Array.isArray(rsData.messages) ? rsData.messages : [],
+                      resultType: ((!Array.isArray(rsData.rows) || rsData.rows.length === 0) && (!Array.isArray(rsData.columns) || rsData.columns.length === 0) && Array.isArray(rsData.messages) && rsData.messages.length > 0)
+                          ? 'message'
+                          : 'grid',
+                      truncated,
+                  }
                   : rs
           ));
       } catch (err: any) {
           message.error(translate('query_editor.message.refresh_failed', {
-              error: err?.message || translate('common.unknown'),
+              error: formatSqlExecutionError(err?.message || err || translate('common.unknown')),
           }));
       } finally {
           setLoading(false);
       }
   };
 
+  const handleResultPageChange = async (resultKey: string, page: number, pageSize: number) => {
+      const target = resultSets.find((item) => item.key === resultKey);
+      if (!target?.page?.baseSql || !currentDb) return;
+      const conn = connections.find(c => c.id === currentConnectionId);
+      if (!conn) return;
+      const safePage = Math.max(1, Math.floor(Number(page) || 1));
+      const safePageSize = Math.max(1, Math.floor(Number(pageSize) || target.page.pageSize || 1));
+      const config = {
+          ...conn.config,
+          port: Number(conn.config.port),
+          password: conn.config.password || "",
+          database: conn.config.database || "",
+          useSSH: conn.config.useSSH || false,
+          ssh: conn.config.ssh || { host: "", port: 22, user: "", password: "", keyPath: "" }
+      };
+      const dbType = String(config.type || 'mysql');
+      const driver = String((config as any).driver || '');
+      const normalizedDbType = String(resolveSqlDialect(dbType, driver, {
+          oceanBaseProtocol: String((config as any).oceanBaseProtocol || ''),
+      })).toLowerCase();
+      const pageSql = buildQueryResultPageSql({
+          baseSql: target.page.baseSql,
+          dbType: normalizedDbType,
+          driver,
+          page: safePage,
+          pageSize: safePageSize,
+          lookahead: true,
+      });
+
+      try {
+          setLoading(true);
+          setResultSets(prev => prev.map(rs =>
+              rs.key === resultKey && rs.page
+                  ? { ...rs, page: { ...rs.page, loading: true } }
+                  : rs
+          ));
+          let queryId: string;
+          try {
+              queryId = await GenerateQueryID();
+          } catch {
+              queryId = 'query-page-' + Date.now();
+          }
+          const res = await DBQueryMulti(buildRpcConnectionConfig(config) as any, currentDb, pageSql, queryId);
+          if (!res?.success) {
+              message.error('翻页失败: ' + formatSqlExecutionError(res?.message || '未知错误'));
+              return;
+          }
+
+          const resultSetDataArray = Array.isArray(res.data) ? (res.data as any[]) : [];
+          const rsData = resultSetDataArray[0];
+          if (!rsData) {
+              message.warning('翻页未返回结果集');
+              return;
+          }
+          const rawRows = Array.isArray(rsData.rows) ? rsData.rows : [];
+          const hasNext = rawRows.length > safePageSize;
+          const rows = rawRows.slice(0, safePageSize);
+          const rowKeyOffset = (safePage - 1) * safePageSize;
+          rows.forEach((row: any, i: number) => {
+              if (row && typeof row === 'object') row[GONAVI_ROW_KEY] = rowKeyOffset + i;
+          });
+          const cols = (rsData.columns && rsData.columns.length > 0)
+              ? rsData.columns
+              : (rows.length > 0 ? Object.keys(rows[0]) : target.columns);
+          const totalState = resolveQueryResultPaginationTotal({
+              current: safePage,
+              pageSize: safePageSize,
+              rowCount: rows.length,
+              hasNext,
+          });
+          setResultSets(prev => prev.map(rs =>
+              rs.key === resultKey && rs.page
+                  ? {
+                      ...rs,
+                      rows,
+                      columns: cols,
+                      messages: Array.isArray(rsData.messages) ? rsData.messages : [],
+                      resultType: 'grid',
+                      truncated: false,
+                      page: {
+                          ...rs.page,
+                          current: safePage,
+                          pageSize: safePageSize,
+                          ...totalState,
+                          loading: false,
+                      },
+                  }
+                  : rs
+          ));
+      } catch (err: any) {
+          message.error('翻页失败: ' + formatSqlExecutionError(err?.message || err || '未知错误'));
+      } finally {
+          setLoading(false);
+          setResultSets(prev => prev.map(rs =>
+              rs.key === resultKey && rs.page?.loading
+                  ? { ...rs, page: { ...rs.page, loading: false } }
+                  : rs
+          ));
+      }
+  };
+
   const handleRun = async () => {
     const currentQuery = getCurrentQuery();
     if (!currentQuery.trim()) return;
@@ -3696,7 +4669,8 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                         const prefix = statements.length > 1
                             ? translate('query_editor.message.statement_failed_prefix', { index: idx + 1 })
                             : '';
-                        setExecutionError(prefix + shellConvert.error);
+                        updateResultPanelVisibility(true);
+                        setExecutionError(formatSqlExecutionError(shellConvert.error, { prefix }));
                         setResultSets([]);
                         setActiveResultKey('');
                         return;
@@ -3737,7 +4711,8 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                     const prefix = statements.length > 1
                         ? translate('query_editor.message.statement_failed_prefix', { index: idx + 1 })
                         : '';
-                    setExecutionError(prefix + res.message);
+                    updateResultPanelVisibility(true);
+                    setExecutionError(formatSqlExecutionError(res.message, { prefix }));
                     setResultSets([]);
                     setActiveResultKey('');
                     return;
@@ -3760,12 +4735,29 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                         key: `result-${idx + 1}`,
                         sql: rawStatement,
                         exportSql: rawStatement,
+                        sourceStatementIndex: idx + 1,
+                        statementResultIndex: 1,
                         rows,
                         columns: cols,
+                        messages: Array.isArray(res.messages) ? res.messages : [],
                         pkColumns: [],
                         readOnly: true,
                         truncated
                     });
+                } else if (Array.isArray(res.messages) && res.messages.length > 0) {
+                    nextResultSets.push({
+                        key: `result-${idx + 1}`,
+                        sql: rawStatement,
+                        exportSql: rawStatement,
+                        sourceStatementIndex: idx + 1,
+                        statementResultIndex: 1,
+                        rows: [],
+                        columns: [],
+                        messages: res.messages,
+                        resultType: 'message',
+                        pkColumns: [],
+                        readOnly: true,
+                    });
                 } else {
                     const affected = Number((res.data as any)?.affectedRows);
                     if (Number.isFinite(affected)) {
@@ -3775,17 +4767,26 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                             key: `result-${idx + 1}`,
                             sql: rawStatement,
                             exportSql: rawStatement,
+                            sourceStatementIndex: idx + 1,
+                            statementResultIndex: 1,
                             rows: [row],
                             columns: ['affectedRows'],
+                            messages: Array.isArray(res.messages) ? res.messages : [],
                             pkColumns: [],
                             readOnly: true
                         });
                     }
                 }
             }
+            if (nextResultSets.length > 0) {
+                updateResultPanelVisibility(true);
+            }
             const shouldReplaceAllResults = didExecuteWholeEditor;
-            setResultSets(prev => mergeResultSets(prev, nextResultSets, shouldReplaceAllResults));
-            setActiveResultKey(nextResultSets[0]?.key || '');
+            setResultSets(prev => {
+                const merged = mergeResultSets(prev, nextResultSets, shouldReplaceAllResults);
+                setActiveResultKey(resolveActiveResultKeyAfterMerge(merged, nextResultSets));
+                return merged;
+            });
             if (didExecuteAppendedSql || didExecuteWholeEditor) {
                 lastExecutedEditorQueryRef.current = currentQuery;
             }
@@ -3815,6 +4816,14 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                 setActiveResultKey('');
                 return;
             }
+            const useManagedTransaction = shouldUseSqlEditorManagedTransaction(sourceStatements);
+            if (useManagedTransaction && pendingSqlTransactionRef.current) {
+                message.warning('当前 SQL 编辑器已有未提交事务，请先提交或回滚后再执行新的增删改语句。');
+                return;
+            }
+            const managedTransactionStatementCount = sourceStatements
+                .filter((statement) => shouldUseSqlEditorManagedTransaction([statement]))
+                .length || sourceStatements.length;
 
             const forceReadOnlyResult = connCaps.forceReadOnlyQueryResult;
             const statementPlans: QueryStatementPlan[] = [];
@@ -3849,7 +4858,8 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
             }
             setQueryId(queryId);
 
-            const res = await DBQueryMulti(buildRpcConnectionConfig(config) as any, currentDb, fullSQL, queryId);
+            const queryExecutor = useManagedTransaction ? DBQueryMultiTransactional : DBQueryMulti;
+            const res = await queryExecutor(buildRpcConnectionConfig(config) as any, currentDb, fullSQL, queryId);
             const duration = Date.now() - startTime;
 
             addSqlLog({
@@ -3884,23 +4894,42 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                     return;
                 }
 
-                setExecutionError(res.message);
+                updateResultPanelVisibility(true);
+                setExecutionError(formatSqlExecutionError(res.message));
                 setResultSets([]);
                 setActiveResultKey('');
                 return;
             }
 
+            if (useManagedTransaction && res.transactionPending && res.transactionId) {
+                activatePendingSqlTransaction({
+                    id: String(res.transactionId),
+                    commitMode: sqlEditorCommitMode,
+                    autoCommitDelayMs: sqlEditorAutoCommitDelayMs,
+                    createdAt: Date.now(),
+                    statementCount: managedTransactionStatementCount,
+                });
+            }
+
             // res.data 是 ResultSetData[] 数组
             const resultSetDataArray = Array.isArray(res.data) ? (res.data as any[]) : [];
+            const topLevelMessages = Array.isArray(res.messages)
+                ? (res.messages as any[]).map((item) => String(item ?? '').trim()).filter(Boolean)
+                : [];
             const nextResultSets: ResultSet[] = [];
             const maxRows = Number(queryOptions?.maxRows) || 0;
             let anyTruncated = false;
+            const statementResultCounts = new Map<number, number>();
 
             for (let idx = 0; idx < resultSetDataArray.length; idx++) {
                 const rsData = resultSetDataArray[idx];
-                const plan = executablePlans[idx];
+                const sourceStatementIndex = Number(rsData?.statementIndex || idx + 1);
+                const statementResultIndex = (statementResultCounts.get(sourceStatementIndex) || 0) + 1;
+                statementResultCounts.set(sourceStatementIndex, statementResultIndex);
+                const plan = executablePlans[Math.max(0, sourceStatementIndex - 1)];
                 const originalSql = plan?.originalSql || '';
                 const executedSql = plan?.executedSql || originalSql;
+                const resultMessages = Array.isArray(rsData?.messages) ? rsData.messages : [];
 
                 // 检查是否为 affectedRows 类结果集
                 const isAffectedResult = Array.isArray(rsData.rows) && rsData.rows.length === 1
@@ -3915,11 +4944,28 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                         key: `result-${idx + 1}`,
                         sql: executedSql,
                         exportSql: originalSql,
+                        sourceStatementIndex,
+                        statementResultIndex,
                         rows: [row],
                         columns: ['affectedRows'],
+                        messages: resultMessages,
                         pkColumns: [],
                         readOnly: true
                     });
+                } else if ((!Array.isArray(rsData.rows) || rsData.rows.length === 0) && (!Array.isArray(rsData.columns) || rsData.columns.length === 0) && resultMessages.length > 0) {
+                    nextResultSets.push({
+                        key: `result-${idx + 1}`,
+                        sql: executedSql,
+                        exportSql: originalSql,
+                        sourceStatementIndex,
+                        statementResultIndex,
+                        rows: [],
+                        columns: [],
+                        messages: resultMessages,
+                        resultType: 'message',
+                        pkColumns: [],
+                        readOnly: true,
+                    });
                 } else {
                     let rows = Array.isArray(rsData.rows) ? rsData.rows : [];
                     let truncated = false;
@@ -3939,24 +4985,58 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
                     const tableRef = plan?.tableRef;
                     const editLocator = plan?.editLocator;
+                    const page = createInitialQueryResultPagination({
+                        executedSql,
+                        exportSql: originalSql,
+                        dbType: normalizedDbType,
+                        driver,
+                        returnedRowCount: rows.length,
+                        fallbackPageSize: maxRows,
+                    });
                     nextResultSets.push({
                         key: `result-${idx + 1}`,
                         sql: executedSql,
                         exportSql: originalSql,
+                        sourceStatementIndex,
+                        statementResultIndex,
                         rows,
                         columns: cols,
+                        messages: resultMessages,
                         tableName: tableRef?.tableName,
                         pkColumns: plan?.pkColumns || [],
                         editLocator,
                         readOnly: forceReadOnlyResult || !editLocator || editLocator.readOnly,
-                        truncated
+                        truncated,
+                        page,
                     });
                 }
             }
 
+            if (topLevelMessages.length > 0 && !nextResultSets.some((result) => Array.isArray(result.messages) && result.messages.length > 0)) {
+                nextResultSets.push({
+                    key: `result-${nextResultSets.length + 1}`,
+                    sql: fullSQL,
+                    exportSql: sourceStatements.join(';\n'),
+                    sourceStatementIndex: 1,
+                    statementResultIndex: (statementResultCounts.get(1) || 0) + 1,
+                    rows: [],
+                    columns: [],
+                    messages: topLevelMessages,
+                    resultType: 'message',
+                    pkColumns: [],
+                    readOnly: true,
+                });
+            }
+
+            if (nextResultSets.length > 0) {
+                updateResultPanelVisibility(true);
+            }
             const shouldReplaceAllResults = didExecuteWholeEditor;
-            setResultSets(prev => mergeResultSets(prev, nextResultSets, shouldReplaceAllResults));
-            setActiveResultKey(nextResultSets[0]?.key || '');
+            setResultSets(prev => {
+                const merged = mergeResultSets(prev, nextResultSets, shouldReplaceAllResults);
+                setActiveResultKey(resolveActiveResultKeyAfterMerge(merged, nextResultSets));
+                return merged;
+            });
             if (didExecuteAppendedSql || didExecuteWholeEditor) {
                 lastExecutedEditorQueryRef.current = currentQuery;
             }
@@ -3979,16 +5059,19 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
 
         }
     } catch (e: any) {
-        message.error(translate('query_editor.message.execution_failed_with_error', { error: e.message }));
+        const formattedError = formatSqlExecutionError(e?.message || e);
+        message.error(translate('query_editor.message.execution_failed_with_error', { error: formattedError }));
         addSqlLog({
             id: `log-${Date.now()}-error`,
             timestamp: Date.now(),
-            sql: executableSQL || getExecutableSQL() || query,
+            sql: executableSQL || getExecutableSQL() || getCurrentQuery(),
             status: 'error',
             duration: Date.now() - runStartTime,
             message: e.message,
             dbName: currentDb
         });
+        updateResultPanelVisibility(true);
+        setExecutionError(formattedError);
         setResultSets([]);
         setActiveResultKey('');
     } finally {
@@ -4201,6 +5284,37 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       refreshQueryEditorSlashCommandDefs();
   }, [languagePreference, refreshQueryEditorSlashCommandDefs]);
 
+  useEffect(() => {
+      if (toggleQueryResultsPanelActionRef.current) {
+          toggleQueryResultsPanelActionRef.current.dispose();
+          toggleQueryResultsPanelActionRef.current = null;
+      }
+
+      const editor = editorRef.current;
+      const monaco = monacoRef.current;
+      if (!editor || !monaco) return;
+
+      const binding = toggleQueryResultsPanelShortcutBinding;
+      if (!binding?.enabled || !binding.combo) return;
+
+      const keyBinding = comboToMonacoKeyBinding(binding.combo, monaco.KeyMod, monaco.KeyCode);
+      if (keyBinding) {
+          toggleQueryResultsPanelActionRef.current = editor.addAction({
+              id: 'gonavi.toggleQueryResultsPanel',
+              label: buildQueryEditorMonacoActionLabel('app.shortcuts.action.toggleQueryResultsPanel.label'),
+              keybindings: [keyBinding.keyMod | keyBinding.keyCode],
+              run: toggleResultPanelVisibility,
+          });
+      }
+
+      return () => {
+          if (toggleQueryResultsPanelActionRef.current) {
+              toggleQueryResultsPanelActionRef.current.dispose();
+              toggleQueryResultsPanelActionRef.current = null;
+          }
+      };
+  }, [languagePreference, toggleQueryResultsPanelShortcutBinding, toggleResultPanelVisibility]);
+
   useEffect(() => {
       const handleRunActiveQuery = () => {
           if (!isActive) {
@@ -4269,7 +5383,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   }]);
                   const nextValue = editor.getValue?.();
                   if (typeof nextValue === 'string') {
-                      setQuery(nextValue);
+                      applyQueryState(nextValue);
                   }
                   
                   // 定位并滚动到可见区域
@@ -4294,7 +5408,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
               }
               }
           } else {
-              setQuery((prev: string) => prev ? prev + '\n' + sqlText : sqlText);
+              applyQueryState(getCurrentQuery() ? `${getCurrentQuery()}\n${sqlText}` : sqlText);
               message.success(translate('query_editor.message.append_success'));
           }
       };
@@ -4310,7 +5424,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       return rawTitle;
   };
 
-  const persistQuery = (payload: { id: string; name: string; createdAt?: number }) => {
+  const persistQuery = async (payload: { id: string; name: string; createdAt?: number }) => {
       const sql = getCurrentQuery();
       const saved = {
           id: payload.id,
@@ -4320,16 +5434,16 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           dbName: currentDb || tab.dbName || '',
           createdAt: payload.createdAt ?? Date.now(),
       };
-      saveQuery(saved);
+      const persisted = await saveQuery(saved);
       addTab({
           ...tab,
-          title: payload.name,
+          title: persisted.name,
           query: sql,
           connectionId: currentConnectionId,
           dbName: currentDb || tab.dbName || '',
-          savedQueryId: payload.id,
+          savedQueryId: persisted.id,
       });
-      return saved;
+      return persisted;
   };
 
   const openSaveQueryModal = (mode: 'save' | 'rename') => {
@@ -4358,6 +5472,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
                   filePath,
                   savedQueryId: undefined,
               });
+              setSQLFileTabDraft(tab.id, sql);
               message.success(translate('query_editor.message.sql_file_saved'));
           } catch (error) {
               message.error(translate('query_editor.message.save_sql_file_failed', {
@@ -4375,7 +5490,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           return;
       }
       const saveName = existed?.name || resolveDefaultQueryName();
-      persistQuery({ id: saveId, name: saveName, createdAt: existed?.createdAt });
+      await persistQuery({ id: saveId, name: saveName, createdAt: existed?.createdAt });
       message.success(translate('query_editor.message.saved'));
   };
 
@@ -4461,6 +5576,39 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       };
   }, [isActive, saveQueryShortcutBinding, handleQuickSave]);
 
+  useEffect(() => {
+      const binding = toggleQueryResultsPanelShortcutBinding;
+      if (!binding?.enabled || !binding.combo) {
+          return;
+      }
+
+      const handleToggleResultsShortcut = (event: KeyboardEvent) => {
+          if (!isActive) {
+              return;
+          }
+          if (!isShortcutMatch(event, binding.combo)) {
+              return;
+          }
+
+          const editor = editorRef.current;
+          const targetNode = resolveEventTargetNode(event.target);
+          const editorHasFocus = !!editor?.hasTextFocus?.();
+          const inQueryEditor = !!(targetNode && queryEditorRootRef.current?.contains(targetNode));
+          if (!editorHasFocus && !inQueryEditor && !isDocumentLevelShortcutTarget(targetNode)) {
+              return;
+          }
+
+          event.preventDefault();
+          event.stopPropagation();
+          toggleResultPanelVisibility();
+      };
+
+      window.addEventListener('keydown', handleToggleResultsShortcut, true);
+      return () => {
+          window.removeEventListener('keydown', handleToggleResultsShortcut, true);
+      };
+  }, [isActive, toggleQueryResultsPanelShortcutBinding, toggleResultPanelVisibility]);
+
   useEffect(() => {
       const handleSaveActiveQuery = () => {
           if (!isActive) {
@@ -4481,7 +5629,7 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           const existed = currentSavedQuery || null;
           const fallbackSavedId = String(tab.savedQueryId || '').trim();
           const nextSavedId = existed?.id || fallbackSavedId || `saved-${Date.now()}`;
-          persistQuery({
+          await persistQuery({
               id: nextSavedId,
               name: String(values.name || '').trim() || translate('query_editor.save_modal.unnamed'),
               createdAt: existed?.createdAt,
@@ -4491,6 +5639,9 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
           ));
           setIsSaveModalOpen(false);
       } catch (e) {
+          if (e instanceof Error) {
+              message.error('保存查询失败: ' + e.message);
+          }
       }
   };
 
@@ -4509,335 +5660,180 @@ const QueryEditor: React.FC<{ tab: TabData; isActive?: boolean }> = ({ tab, isAc
       });
   };
 
+  const replaceResultSetsAfterMenuClose = (next: ResultSet[], preferredKey?: string) => {
+      setResultSets(next);
+      setActiveResultKey(prevActive => {
+          if (preferredKey && next.some(result => result.key === preferredKey)) return preferredKey;
+          if (prevActive && next.some(result => result.key === prevActive)) return prevActive;
+          return next[0]?.key || '';
+      });
+  };
+
+  const closeOtherResultTabs = (key: string) => {
+      const target = resultSets.find(result => result.key === key);
+      replaceResultSetsAfterMenuClose(target ? [target] : resultSets, key);
+  };
+
+  const closeResultTabsToLeft = (key: string) => {
+      const index = resultSets.findIndex(result => result.key === key);
+      if (index <= 0) return;
+      replaceResultSetsAfterMenuClose(resultSets.slice(index), key);
+  };
+
+  const closeResultTabsToRight = (key: string) => {
+      const index = resultSets.findIndex(result => result.key === key);
+      if (index < 0 || index >= resultSets.length - 1) return;
+      replaceResultSetsAfterMenuClose(resultSets.slice(0, index + 1), key);
+  };
+
+  const closeAllResultTabs = () => {
+      setResultSets([]);
+      setActiveResultKey('');
+  };
+
+  const toggleQueryResultsPanelShortcutLabel =
+      toggleQueryResultsPanelShortcutBinding.enabled && toggleQueryResultsPanelShortcutBinding.combo
+          ? getShortcutDisplayLabel(toggleQueryResultsPanelShortcutBinding.combo, activeShortcutPlatform)
+          : '';
+
+  const handleDiagnoseExecutionError = () => {
+      const errSql = getCurrentQuery();
+      const prompt = `我在执行以下 SQL 时遇到了错误：\n\`\`\`sql\n${errSql}\n\`\`\`\n\n数据库报错信息如下：\n\`\`\`text\n${executionError}\n\`\`\`\n\n请帮我分析错误原因，并给出修改建议。`;
+      const store = useStore.getState();
+      const wasClosed = !store.aiPanelVisible;
+      if (wasClosed) store.setAIPanelVisible(true);
+      setTimeout(() => {
+          window.dispatchEvent(new CustomEvent('gonavi:ai:inject-prompt', { detail: { prompt } }));
+      }, wasClosed ? 350 : 0);
+  };
+
+  const sqlEditorTransactionToolbar = (
+      <QueryEditorTransactionToolbar
+          isV2Ui={isV2Ui}
+          darkMode={darkMode}
+          transaction={pendingSqlTransaction}
+          autoCommitRemainingSeconds={sqlEditorAutoCommitRemainingSeconds}
+          onFinish={(action) => void finishPendingSqlTransaction(action, 'manual')}
+      />
+  );
+
   return (
     <div ref={queryEditorRootRef} className={isV2Ui ? 'gn-v2-query-editor' : undefined} style={{ flex: '1 1 auto', minHeight: 0, display: 'flex', flexDirection: 'column', height: '100%', overflow: 'hidden' }}>
-      <style>{`
-        .query-result-tabs {
-          flex: 1 1 auto;
-          min-height: 0;
-          display: flex;
-          flex-direction: column;
-          overflow: hidden;
-        }
-        .query-result-tabs .ant-tabs-nav {
-          flex: 0 0 auto;
-          margin: 0;
-        }
-        .query-result-tabs .ant-tabs-nav-list {
-          align-items: stretch;
-        }
-        .query-result-tabs .ant-tabs-tab {
-          min-height: 34px;
-          padding: 4px 10px !important;
-        }
-        .query-result-tabs .ant-tabs-tab-btn {
-          max-width: 100%;
-        }
-        .query-result-tabs .ant-tabs-content-holder {
-          flex: 1 1 auto;
-          overflow: hidden;
-          min-height: 0;
-          display: flex;
-          flex-direction: column;
-        }
-        .query-result-tabs .ant-tabs-content {
-          flex: 1 1 auto;
-          min-height: 0;
-          display: flex;
-          flex-direction: column;
-        }
-        .query-result-tabs .ant-tabs-tabpane {
-          flex: 1 1 auto;
-          min-height: 0;
-          display: flex;
-          flex-direction: column;
-          overflow: hidden;
-        }
-        .query-result-tabs .ant-tabs-tabpane > div {
-          flex: 1 1 auto;
-          min-height: 0;
-        }
-        .query-result-tabs .ant-tabs-tabpane-hidden {
-          display: none !important;
-        }
-        .query-result-tabs .ant-tabs-ink-bar {
-          transition: none !important;
-        }
-        .query-result-tab-label {
-          display: inline-flex;
-          align-items: center;
-          gap: 6px;
-          min-width: 0;
-          max-width: 100%;
-          line-height: 1.1;
-        }
-        .query-result-tab-text {
-          min-width: 0;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-        .query-result-tab-close {
-          display: inline-flex;
-          align-items: center;
-          justify-content: center;
-          width: 16px;
-          height: 16px;
-          border-radius: 999px;
-          color: #999;
-          cursor: pointer;
-          flex: 0 0 auto;
-        }
-        .query-result-tab-close:hover {
-          background: rgba(0, 0, 0, 0.06);
-          color: #666;
-        }
-      `}</style>
-      <div ref={editorPaneRef} className={isV2Ui ? 'gn-v2-query-editor-pane' : undefined}>
-      <div className={isV2Ui ? 'gn-v2-query-toolbar' : undefined} style={{ padding: '4px 8px 8px', display: 'flex', gap: '8px', flexShrink: 0, alignItems: 'center' }}>
-        <Select 
-            style={{ width: 150 }} 
-            placeholder={translate('query_editor.placeholder.connection')}
-            value={currentConnectionId}
-            onChange={(val) => {
-                setCurrentConnectionId(val);
-                setCurrentDb('');
-            }}
-            options={queryCapableConnections.map(c => ({ label: c.name, value: c.id }))}
-            showSearch
-        />
-        <Select 
-            style={{ width: 200 }} 
-            placeholder={translate('query_editor.placeholder.database')}
-            value={currentDb}
-            onChange={setCurrentDb}
-            options={dbList.map(db => ({ label: db, value: db }))}
-            showSearch
-        />
-        <Tooltip title={translate('query_editor.max_rows.tooltip')}>
-            <Select
-                style={{ width: 170 }}
-                value={queryOptions?.maxRows ?? 5000}
-                onChange={(val) => setQueryOptions({ maxRows: Number(val) })}
-                options={[
-                    { label: translate('query_editor.max_rows.option_500'), value: 500 },
-                    { label: translate('query_editor.max_rows.option_1000'), value: 1000 },
-                    { label: translate('query_editor.max_rows.option_5000'), value: 5000 },
-                    { label: translate('query_editor.max_rows.option_20000'), value: 20000 },
-                    { label: translate('query_editor.max_rows.option_unlimited'), value: 0 },
-                ]}
-            />
-        </Tooltip>
-        <Button.Group>
-          <Tooltip
-              title={
-	                  runQueryShortcutBinding.enabled && runQueryShortcutBinding.combo
-	                      ? translate('query_editor.action.run_with_shortcut', {
-                              shortcut: getShortcutDisplayLabel(runQueryShortcutBinding.combo, activeShortcutPlatform),
-                          })
-	                      : translate('query_editor.action.run')
-              }
-          >
-              <Button type="primary" icon={<PlayCircleOutlined />} onMouseDown={captureEditorCursorPosition} onClick={handleRun} loading={loading}>
-                {translate('query_editor.action.run')}
-              </Button>
-          </Tooltip>
-          {loading && (
-            <Tooltip title={translate('query_editor.action.stop')}>
-              <Button type="primary" danger icon={<StopOutlined />} onClick={handleCancel}>
-                {translate('query_editor.action.stop')}
-              </Button>
-            </Tooltip>
-          )}
-        </Button.Group>
-        <Button.Group>
-            <Tooltip
-                title={
-                    saveQueryShortcutBinding.enabled && saveQueryShortcutBinding.combo
-                        ? translate('query_editor.action.save_with_shortcut', {
-                            shortcut: getShortcutDisplayLabel(saveQueryShortcutBinding.combo, activeShortcutPlatform),
-                        })
-                        : translate('query_editor.action.save')
-                }
-            >
-              <Button icon={<SaveOutlined />} onClick={handleQuickSave}>
-                {translate('query_editor.action.save')}
-              </Button>
-            </Tooltip>
-            <Dropdown menu={{ items: saveMoreMenuItems }} placement="bottomRight">
-                <Button>{translate('query_editor.action.more')}</Button>
-            </Dropdown>
-        </Button.Group>
-        
-        <Button.Group>
-            <Tooltip title={translate('query_editor.action.format_sql')}>
-                <Button icon={<FormatPainterOutlined />} onClick={handleFormat}>{translate('query_editor.action.format')}</Button>
-            </Tooltip>
-            <Dropdown menu={{ items: formatSettingsMenu }} placement="bottomRight">
-                <Button icon={<SettingOutlined />} />
-            </Dropdown>
-        </Button.Group>
-
-        <Dropdown menu={{ items: [
-            { key: 'ai-generate', label: translate('query_editor.action.ai_generate_sql_menu'), icon: <RobotOutlined />, onClick: () => handleAIAction('generate') },
-            { key: 'ai-explain', label: translate('query_editor.action.ai_explain_sql_menu'), icon: <RobotOutlined />, onClick: () => handleAIAction('explain') },
-            { key: 'ai-optimize', label: translate('query_editor.action.ai_optimize_sql_menu'), icon: <RobotOutlined />, onClick: () => handleAIAction('optimize') },
-            { type: 'divider' as const },
-            { key: 'ai-schema', label: translate('query_editor.action.ai_schema_analysis'), icon: <RobotOutlined />, onClick: () => handleAIAction('schema') },
-        ] }} placement="bottomRight">
-            <Button icon={<RobotOutlined />} style={{ color: '#818cf8' }}>AI</Button>
-        </Dropdown>
-      </div>
+      <div
+        ref={editorPaneRef}
+        className={isV2Ui ? 'gn-v2-query-editor-pane' : undefined}
+        style={{ display: 'flex', flexDirection: 'column', minHeight: 0, flex: isResultPanelVisible ? '0 0 auto' : '1 1 auto' }}
+      >
+      <QueryEditorToolbar
+        isV2Ui={isV2Ui}
+        currentConnectionId={currentConnectionId}
+        currentDb={currentDb}
+        queryCapableConnections={queryCapableConnections}
+        dbList={dbList}
+        maxRows={queryOptions?.maxRows ?? 5000}
+        sqlEditorCommitMode={sqlEditorCommitMode}
+        sqlEditorAutoCommitDelayMs={sqlEditorAutoCommitDelayMs}
+        pendingTransactionToolbar={pendingSqlTransaction ? sqlEditorTransactionToolbar : null}
+        runQueryShortcutBinding={runQueryShortcutBinding}
+        saveQueryShortcutBinding={saveQueryShortcutBinding}
+        toggleQueryResultsPanelShortcutBinding={toggleQueryResultsPanelShortcutBinding}
+        activeShortcutPlatform={activeShortcutPlatform}
+        isResultPanelVisible={isResultPanelVisible}
+        loading={loading}
+        saveMoreMenuItems={saveMoreMenuItems}
+        formatSettingsMenu={formatSettingsMenu}
+        onConnectionChange={(val) => {
+            setCurrentConnectionId(val);
+            setCurrentDb('');
+        }}
+        onDatabaseChange={setCurrentDb}
+        onMaxRowsChange={(maxRows) => setQueryOptions({ maxRows })}
+        onCommitModeChange={(mode) => setSqlEditorTransactionOptions(
+            mode === 'auto'
+                ? { commitMode: mode, autoCommitDelayMs: 0 }
+                : { commitMode: mode },
+        )}
+        onAutoCommitDelayMsChange={(delayMs) => setSqlEditorTransactionOptions({ autoCommitDelayMs: delayMs })}
+        onCaptureEditorCursorPosition={captureEditorCursorPosition}
+        onRun={handleRun}
+        onCancel={handleCancel}
+        onQuickSave={handleQuickSave}
+        onFormat={handleFormat}
+        onToggleResultPanelVisibility={toggleResultPanelVisibility}
+        onAIAction={handleAIAction}
+      />
       
-      <div className={isV2Ui ? 'gn-v2-query-monaco-shell' : undefined} style={{ height: editorHeight, minHeight: '100px' }}>
+      <div
+        ref={editorShellRef}
+        className={isV2Ui ? 'gn-v2-query-monaco-shell' : undefined}
+        style={isResultPanelVisible ? { height: editorHeight, minHeight: '100px' } : { flex: '1 1 auto', minHeight: 0 }}
+      >
         <Editor 
           height="100%" 
           gonaviTypography="code"
           defaultLanguage="sql" 
           theme={darkMode ? "transparent-dark" : "transparent-light"}
           defaultValue={query}
-          onChange={(val) => setQuery(val || '')}
+          onChange={(val) => {
+              const nextValue = val || '';
+              syncQueryDraft(nextValue);
+          }}
           onMount={handleEditorDidMount}
           options={{ 
             minimap: { enabled: false }, 
             automaticLayout: true,
+            fixedOverflowWidgets: true,
+            hover: {
+              enabled: true,
+              delay: QUERY_EDITOR_HOVER_DELAY_MS,
+              above: false,
+            },
             scrollBeyondLastLine: false,
+            quickSuggestions: { other: true, comments: false, strings: false },
+            suggestOnTriggerCharacters: true,
           }}
         />
       </div>
 
-      <div 
-        className={isV2Ui ? 'gn-v2-query-resizer' : undefined}
-        onMouseDown={handleMouseDown}
-        style={{ 
-            height: '5px', 
-            cursor: 'row-resize', 
-            background: darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.04)',
-            flexShrink: 0,
-            zIndex: 10 
-        }} 
-        title={translate('query_editor.action.resize_editor')}
-      />
+      {isResultPanelVisible && (
+        <div
+          className={isV2Ui ? 'gn-v2-query-resizer' : undefined}
+          onMouseDown={handleMouseDown}
+          style={{
+              height: '5px',
+              cursor: 'row-resize',
+              background: darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.04)',
+              flexShrink: 0,
+              zIndex: 10
+          }}
+          title={translate('query_editor.action.resize_editor')}
+        />
+      )}
       </div>
 
-      <div className={isV2Ui ? 'gn-v2-query-results' : undefined} style={{ flex: 1, minHeight: 0, overflow: 'hidden', padding: 0, display: 'flex', flexDirection: 'column' }}>
-        {resultSets.length > 0 ? (
-          <Tabs
-              className="query-result-tabs"
-              activeKey={activeResultKey || resultSets[0]?.key}
-              onChange={setActiveResultKey}
-              animated={false}
-              style={{ flex: 1, minHeight: 0 }}
-              items={resultSets.map((rs, idx) => ({
-                  key: rs.key,
-                  label: (
-                      <div className="query-result-tab-label">
-                          <Tooltip title={rs.sql}>
-                          <span className="query-result-tab-text">{(() => {
-                              const isAffected = rs.columns.length === 1 && rs.columns[0] === 'affectedRows';
-                              if (isAffected) return translate('query_editor.result.tab_title_success', { index: idx + 1 });
-                              return translate('query_editor.result.tab_title', {
-                                  index: idx + 1,
-                                  count: Array.isArray(rs.rows) ? rs.rows.length : 0,
-                              });
-                          })()}</span>
-                          </Tooltip>
-                          <Tooltip title={translate('query_editor.result.close')}>
-                              <span
-                                  className="query-result-tab-close"
-                                  onClick={(e) => {
-                                      e.preventDefault();
-                                      e.stopPropagation();
-                                      handleCloseResult(rs.key);
-                                  }}
-                              >
-                                  <CloseOutlined style={{ fontSize: 12 }} />
-                              </span>
-                          </Tooltip>
-                      </div>
-                  ),
-                  children: (() => {
-                      // affectedRows 类型结果集（UPDATE/INSERT/DELETE）：简洁提示
-                      const isAffectedResult = rs.columns.length === 1 && rs.columns[0] === 'affectedRows';
-                      if (isAffectedResult) {
-                          const affected = Number(rs.rows[0]?.affectedRows ?? 0);
-                          return (
-                              <div className={isV2Ui ? 'gn-v2-query-success' : undefined} style={{
-                                  flex: 1, minHeight: 0, display: 'flex', alignItems: 'center', justifyContent: 'center',
-                                  flexDirection: 'column', gap: 8, color: '#666', userSelect: 'text',
-                              }}>
-                                  <span style={{ fontSize: 36, color: '#52c41a' }}>✓</span>
-                                  <span style={{ fontSize: 14, fontWeight: 500 }}>{translate('query_editor.result.execution_success')}</span>
-                                  <span style={{ fontSize: 13, color: '#999' }}>
-                                      {translate('query_editor.result.affected_rows', { count: affected })}
-                                  </span>
-                              </div>
-                          );
-                      }
-                      return (
-                          <div style={{ flex: 1, minHeight: 0, overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
-                              <DataGrid
-                                  data={rs.rows}
-                                  columnNames={rs.columns}
-                                  loading={loading}
-                                  tableName={rs.tableName}
-                                  exportScope="queryResult"
-                                  resultSql={rs.exportSql || rs.sql}
-                                  dbName={currentDb}
-                                  connectionId={currentConnectionId}
-                                  pkColumns={rs.pkColumns}
-                                  editLocator={rs.editLocator}
-                                  onReload={() => handleReloadResult(rs.key, rs.sql)}
-                                  readOnly={rs.readOnly}
-                              />
-                          </div>
-                      );
-                  })()
-              }))}
-          />
-        ) : executionError ? (
-          <div className={isV2Ui ? 'gn-v2-query-error' : undefined} style={{ flex: 1, minHeight: 0, padding: 24, display: 'flex', flexDirection: 'column', gap: 16, background: darkMode ? '#1e1e1e' : '#fafafa', overflow: 'auto' }}>
-              <div style={{ color: '#ff4d4f', fontWeight: 'bold', fontSize: 16, display: 'flex', alignItems: 'center', gap: 8 }}>
-                  <CloseOutlined />
-                  <span>{translate('query_editor.result.execution_failed')}</span>
-              </div>
-              <div className="custom-scrollbar" style={{ padding: 16, background: darkMode ? '#2d1a1a' : '#fff2f0', border: `1px solid ${darkMode ? '#5c2020' : '#ffccc7'}`, borderRadius: 6, color: darkMode ? '#ffa39e' : '#cf1322', fontFamily: 'var(--gn-font-mono)', fontSize: 'var(--gn-font-size-mono, 13px)', whiteSpace: 'pre-wrap', wordBreak: 'break-all', maxHeight: '40vh', overflow: 'auto' }}>
-                  {executionError}
-              </div>
-              <div style={{ marginTop: 8 }}>
-                  <Button
-                      type="primary"
-                      icon={<RobotOutlined />}
-                      style={{ background: '#818cf8', borderColor: '#818cf8', boxShadow: '0 2px 0 rgba(129, 140, 248, 0.2)' }}
-                      onClick={() => {
-                          const errSql = getCurrentQuery();
-                          const prompt = translate('query_editor.ai_prompt.diagnose', {
-                              sql: errSql,
-                              error: executionError,
-                          });
-                          const store = useStore.getState();
-                          const wasClosed = !store.aiPanelVisible;
-                          if (wasClosed) store.setAIPanelVisible(true);
-                          setTimeout(() => {
-                              window.dispatchEvent(new CustomEvent('gonavi:ai:inject-prompt', { detail: { prompt } }));
-                          }, wasClosed ? 350 : 0);
-                      }}
-                  >
-                      {translate('query_editor.result.ai_diagnose')}
-                  </Button>
-              </div>
-          </div>
-        ) : (
-          <div className={isV2Ui ? 'gn-v2-query-empty' : undefined} style={{ flex: 1, minHeight: 0 }}>
-            {isV2Ui && (
-              <div>
-                <strong>{translate('query_editor.empty_state.title')}</strong>
-                <span>{translate('query_editor.empty_state.description')}</span>
-              </div>
-            )}
-          </div>
-        )}
-      </div>
+      {isResultPanelVisible && (
+        <QueryEditorResultsPanel
+          resultSets={resultSets}
+          activeResultKey={activeResultKey}
+          loading={loading}
+          executionError={executionError}
+          darkMode={darkMode}
+          isV2Ui={isV2Ui}
+          currentDb={currentDb}
+          currentConnectionId={currentConnectionId}
+          toggleShortcutLabel={toggleQueryResultsPanelShortcutLabel}
+          onActiveResultKeyChange={setActiveResultKey}
+          onHide={() => updateResultPanelVisibility(false)}
+          onCloseResult={handleCloseResult}
+          onCloseOtherResultTabs={closeOtherResultTabs}
+          onCloseResultTabsToLeft={closeResultTabsToLeft}
+          onCloseResultTabsToRight={closeResultTabsToRight}
+          onCloseAllResultTabs={closeAllResultTabs}
+          onReloadResult={handleReloadResult}
+          onResultPageChange={handleResultPageChange}
+          onDiagnoseExecutionError={handleDiagnoseExecutionError}
+        />
+      )}
 
       <Modal 
         title={translate(saveModalMode === 'rename' ? 'query_editor.save_modal.rename_title' : 'query_editor.save_modal.title')}
diff --git a/frontend/src/components/QueryEditorResultsPanel.tsx b/frontend/src/components/QueryEditorResultsPanel.tsx
new file mode 100644
index 0000000..914c5de
--- /dev/null
+++ b/frontend/src/components/QueryEditorResultsPanel.tsx
@@ -0,0 +1,535 @@
+import React from 'react';
+import { Button, Dropdown, Tabs, Tooltip, type MenuProps } from 'antd';
+import { CloseOutlined, EyeInvisibleOutlined, RobotOutlined } from '@ant-design/icons';
+
+import type { EditRowLocator } from '../utils/rowLocator';
+import type { QueryResultPaginationState } from '../utils/queryResultPagination';
+import DataGrid from './DataGrid';
+
+export type QueryEditorResultSet = {
+    key: string;
+    sql: string;
+    exportSql?: string;
+    sourceStatementIndex?: number;
+    statementResultIndex?: number;
+    rows: any[];
+    columns: string[];
+    messages?: string[];
+    resultType?: 'grid' | 'message';
+    tableName?: string;
+    pkColumns: string[];
+    editLocator?: EditRowLocator;
+    readOnly: boolean;
+    truncated?: boolean;
+    pkLoading?: boolean;
+    page?: QueryResultPaginationState & { loading?: boolean };
+};
+
+interface QueryEditorResultsPanelProps {
+    resultSets: QueryEditorResultSet[];
+    activeResultKey: string;
+    loading: boolean;
+    executionError: string;
+    darkMode: boolean;
+    isV2Ui: boolean;
+    currentDb: string;
+    currentConnectionId: string;
+    toggleShortcutLabel: string;
+    onActiveResultKeyChange: (key: string) => void;
+    onHide: () => void;
+    onCloseResult: (key: string) => void;
+    onCloseOtherResultTabs: (key: string) => void;
+    onCloseResultTabsToLeft: (key: string) => void;
+    onCloseResultTabsToRight: (key: string) => void;
+    onCloseAllResultTabs: () => void;
+    onReloadResult: (key: string, sql: string) => void;
+    onResultPageChange: (key: string, page: number, pageSize: number) => void;
+    onDiagnoseExecutionError: () => void;
+}
+
+const isAffectedRowsResult = (result: QueryEditorResultSet): boolean =>
+    result.columns.length === 1 && result.columns[0] === 'affectedRows';
+
+const QueryEditorResultsPanel: React.FC<QueryEditorResultsPanelProps> = ({
+    resultSets,
+    activeResultKey,
+    loading,
+    executionError,
+    darkMode,
+    isV2Ui,
+    currentDb,
+    currentConnectionId,
+    toggleShortcutLabel,
+    onActiveResultKeyChange,
+    onHide,
+    onCloseResult,
+    onCloseOtherResultTabs,
+    onCloseResultTabsToLeft,
+    onCloseResultTabsToRight,
+    onCloseAllResultTabs,
+    onReloadResult,
+    onResultPageChange,
+    onDiagnoseExecutionError,
+}) => {
+    const resolvedActiveResultKey = activeResultKey || resultSets[0]?.key || '';
+    const activeResultSet = resultSets.find((rs) => rs.key === resolvedActiveResultKey) || null;
+    const activeResultUsesDataGrid = Boolean(
+        activeResultSet &&
+        activeResultSet.resultType !== 'message' &&
+        !isAffectedRowsResult(activeResultSet),
+    );
+    const hideTooltipTitle = toggleShortcutLabel
+        ? `隐藏结果区（${toggleShortcutLabel}）`
+        : '隐藏结果区';
+
+    const buildResultTabMenuItems = (key: string, index: number): MenuProps['items'] => [
+        {
+            key: 'close-other',
+            label: '关闭其他页',
+            disabled: resultSets.length <= 1,
+            onClick: () => onCloseOtherResultTabs(key),
+        },
+        {
+            key: 'close-left',
+            label: '关闭左侧',
+            disabled: index <= 0,
+            onClick: () => onCloseResultTabsToLeft(key),
+        },
+        {
+            key: 'close-right',
+            label: '关闭右侧',
+            disabled: index >= resultSets.length - 1,
+            onClick: () => onCloseResultTabsToRight(key),
+        },
+        { type: 'divider' },
+        {
+            key: 'close-all',
+            label: '关闭所有',
+            disabled: resultSets.length === 0,
+            onClick: onCloseAllResultTabs,
+        },
+    ];
+
+    const hideButton = (
+        <Tooltip title={hideTooltipTitle}>
+            <Button
+                className="query-result-panel-hide"
+                type="text"
+                size="small"
+                icon={<EyeInvisibleOutlined />}
+                onClick={onHide}
+            >
+                隐藏
+            </Button>
+        </Tooltip>
+    );
+
+    const tabsHideButton = (
+        <Tooltip title={hideTooltipTitle}>
+            <Button
+                aria-label="隐藏结果区"
+                className="query-result-panel-hide query-result-panel-hide-compact"
+                type="text"
+                size="small"
+                icon={<EyeInvisibleOutlined />}
+                onClick={onHide}
+            />
+        </Tooltip>
+    );
+    const tabsExtraContent = !activeResultUsesDataGrid
+        ? {
+            right: (
+                <div style={{ display: 'inline-flex', alignItems: 'center', gap: 8 }}>
+                    {tabsHideButton}
+                </div>
+            ),
+        }
+        : undefined;
+
+    const toolbarHideButton = (
+        <Tooltip title={hideTooltipTitle}>
+            <Button
+                className={isV2Ui ? 'gn-v2-query-result-toolbar-hide' : undefined}
+                icon={<EyeInvisibleOutlined />}
+                onClick={onHide}
+            >
+                <span>隐藏</span>
+                {isV2Ui && toggleShortcutLabel && (
+                    <span className="gn-v2-toolbar-kbd">{toggleShortcutLabel}</span>
+                )}
+            </Button>
+        </Tooltip>
+    );
+
+    return (
+        <>
+            <style>{`
+              .query-result-tabs {
+                flex: 1 1 auto;
+                min-height: 0;
+                display: flex;
+                flex-direction: column;
+                overflow: hidden;
+              }
+              .query-result-tabs .ant-tabs-nav {
+                flex: 0 0 auto;
+                margin: 0;
+                min-height: 38px;
+                padding-right: 8px;
+              }
+              .query-result-tabs .ant-tabs-nav-wrap {
+                flex: 0 1 auto;
+                min-width: 0;
+              }
+              .query-result-tabs .ant-tabs-extra-content {
+                display: inline-flex;
+                align-items: center;
+                padding-left: 8px;
+              }
+              .query-result-tabs .ant-tabs-nav-list {
+                align-items: center;
+                width: auto;
+              }
+              .query-result-tabs .ant-tabs-tab {
+                width: auto !important;
+                min-width: 0 !important;
+                max-width: 148px !important;
+                height: 30px !important;
+                min-height: 30px;
+                margin: 4px 6px 4px 0 !important;
+                padding: 0 9px !important;
+                border-radius: 999px !important;
+                border: 0.5px solid transparent !important;
+                border-right: 0.5px solid transparent !important;
+                align-items: center !important;
+                justify-content: center !important;
+              }
+              .query-result-tabs .ant-tabs-tab-btn {
+                width: auto !important;
+                height: 100%;
+                max-width: 100%;
+                display: inline-flex !important;
+                align-items: center !important;
+                justify-content: center !important;
+                font-size: 14px !important;
+                line-height: 1 !important;
+              }
+              .query-result-tabs .ant-tabs-tab.ant-tabs-tab-active::after {
+                display: none;
+              }
+              .query-result-tabs .ant-tabs-content-holder {
+                flex: 1 1 auto;
+                overflow: hidden;
+                min-height: 0;
+                display: flex;
+                flex-direction: column;
+              }
+              .query-result-tabs .ant-tabs-content {
+                flex: 1 1 auto;
+                min-height: 0;
+                display: flex;
+                flex-direction: column;
+              }
+              .query-result-tabs .ant-tabs-tabpane {
+                flex: 1 1 auto;
+                min-height: 0;
+                display: flex;
+                flex-direction: column;
+                overflow: hidden;
+              }
+              .query-result-tabs .ant-tabs-tabpane > div {
+                flex: 1 1 auto;
+                min-height: 0;
+              }
+              .query-result-tabs .ant-tabs-tabpane-hidden {
+                display: none !important;
+              }
+              .query-result-tabs .ant-tabs-ink-bar {
+                transition: none !important;
+              }
+              .query-result-tab-label {
+                display: inline-flex;
+                align-items: center;
+                gap: 5px;
+                min-width: 0;
+                max-width: 126px;
+                height: 100%;
+                line-height: 1;
+                user-select: none;
+                -webkit-user-select: none;
+              }
+              .query-result-tab-text {
+                min-width: 0;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                font-size: 14px;
+                font-weight: 700;
+              }
+              .query-result-tab-count {
+                flex: 0 0 auto;
+                min-width: 17px;
+                height: 17px;
+                padding: 0 5px;
+                border-radius: 999px;
+                display: inline-flex;
+                align-items: center;
+                justify-content: center;
+                background: rgba(148, 163, 184, 0.16);
+                color: inherit;
+                font-size: 11px;
+                font-weight: 700;
+                line-height: 17px;
+              }
+              .query-result-tab-close {
+                display: inline-flex;
+                align-items: center;
+                justify-content: center;
+                width: 16px;
+                height: 16px;
+                border-radius: 999px;
+                color: #999;
+                cursor: pointer;
+                flex: 0 0 auto;
+              }
+              .query-result-tab-close:hover {
+                background: rgba(0, 0, 0, 0.06);
+                color: #666;
+              }
+              .query-result-panel-header {
+                flex: 0 0 auto;
+                min-height: 38px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                gap: 12px;
+                padding: 0 12px;
+                border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+                background: rgba(255, 255, 255, 0.9);
+              }
+              .query-result-panel-header-title {
+                font-size: 13px;
+                font-weight: 600;
+                color: #666;
+              }
+              .query-result-panel-hide {
+                display: inline-flex;
+                align-items: center;
+                gap: 4px;
+              }
+              .query-result-panel-hide-compact {
+                min-width: 28px;
+                padding: 0 6px;
+                justify-content: center;
+              }
+            `}</style>
+            <div
+                className={isV2Ui ? 'gn-v2-query-results' : undefined}
+                style={{ position: 'relative', flex: 1, minHeight: 0, overflow: 'hidden', padding: 0, display: 'flex', flexDirection: 'column' }}
+            >
+                {resultSets.length > 0 ? (
+                    <Tabs
+                        className="query-result-tabs"
+                        activeKey={resolvedActiveResultKey}
+                        onChange={onActiveResultKeyChange}
+                        animated={false}
+                        style={{ flex: 1, minHeight: 0 }}
+                        tabBarExtraContent={tabsExtraContent}
+                        items={resultSets.map((rs, idx) => ({
+                            key: rs.key,
+                            label: (
+                                <Dropdown
+                                    menu={{ items: buildResultTabMenuItems(rs.key, idx) }}
+                                    trigger={['contextMenu']}
+                                    rootClassName={isV2Ui ? 'gn-v2-tab-context-menu-popup' : undefined}
+                                >
+                                    <div
+                                        className="query-result-tab-label"
+                                        onContextMenu={(event) => {
+                                            event.preventDefault();
+                                        }}
+                                    >
+                                        <Tooltip title={rs.sql}>
+                                            <span className="query-result-tab-text">{rs.resultType === 'message' ? `消息 ${idx + 1}` : `结果 ${idx + 1}`}</span>
+                                        </Tooltip>
+                                        {(() => {
+                                            if (rs.resultType === 'message') {
+                                                return <span className="query-result-tab-count">i</span>;
+                                            }
+                                            if (isAffectedRowsResult(rs)) {
+                                                return <span className="query-result-tab-count">✓</span>;
+                                            }
+                                            if (!Array.isArray(rs.rows)) {
+                                                return null;
+                                            }
+                                            return <span className="query-result-tab-count">{rs.rows.length}</span>;
+                                        })()}
+                                        <Tooltip title="关闭结果">
+                                            <span
+                                                className="query-result-tab-close"
+                                                onClick={(e) => {
+                                                    e.preventDefault();
+                                                    e.stopPropagation();
+                                                    onCloseResult(rs.key);
+                                                }}
+                                            >
+                                                <CloseOutlined style={{ fontSize: 12 }} />
+                                            </span>
+                                        </Tooltip>
+                                    </div>
+                                </Dropdown>
+                            ),
+                            children: (() => {
+                                if (rs.resultType === 'message') {
+                                    return (
+                                        <div className={isV2Ui ? 'gn-v2-query-success' : undefined} style={{
+                                            flex: 1, minHeight: 0, display: 'flex', justifyContent: 'center',
+                                            flexDirection: 'column', gap: 12, padding: 24, color: '#666', userSelect: 'text',
+                                            overflow: 'auto',
+                                        }}>
+                                            <span style={{ fontSize: 14, fontWeight: 600 }}>执行消息</span>
+                                            <div style={{
+                                                padding: 16,
+                                                borderRadius: 8,
+                                                border: darkMode ? '1px solid rgba(255,255,255,0.12)' : '1px solid rgba(0,0,0,0.08)',
+                                                background: darkMode ? 'rgba(255,255,255,0.03)' : '#fff',
+                                                whiteSpace: 'pre-wrap',
+                                                wordBreak: 'break-word',
+                                                fontFamily: 'var(--gn-font-mono)',
+                                                fontSize: 'var(--gn-font-size-mono, 13px)',
+                                            }}>
+                                                {(rs.messages || []).join('\n')}
+                                            </div>
+                                        </div>
+                                    );
+                                }
+                                if (isAffectedRowsResult(rs)) {
+                                    const affected = Number(rs.rows[0]?.affectedRows ?? 0);
+                                    return (
+                                        <div className={isV2Ui ? 'gn-v2-query-success' : undefined} style={{
+                                            flex: 1, minHeight: 0, display: 'flex', alignItems: 'center', justifyContent: 'center',
+                                            flexDirection: 'column', gap: 8, color: '#666', userSelect: 'text',
+                                        }}>
+                                            <span style={{ fontSize: 36, color: '#52c41a' }}>✓</span>
+                                            <span style={{ fontSize: 14, fontWeight: 500 }}>执行成功</span>
+                                            <span style={{ fontSize: 13, color: '#999' }}>影响行数：{affected}</span>
+                                            {Array.isArray(rs.messages) && rs.messages.length > 0 && (
+                                                <div style={{
+                                                    marginTop: 8,
+                                                    maxWidth: 720,
+                                                    padding: 12,
+                                                    borderRadius: 8,
+                                                    border: darkMode ? '1px solid rgba(255,255,255,0.12)' : '1px solid rgba(0,0,0,0.08)',
+                                                    background: darkMode ? 'rgba(255,255,255,0.03)' : '#fff',
+                                                    whiteSpace: 'pre-wrap',
+                                                    wordBreak: 'break-word',
+                                                    fontFamily: 'var(--gn-font-mono)',
+                                                    fontSize: 'var(--gn-font-size-mono, 12px)',
+                                                }}>
+                                                    {rs.messages.join('\n')}
+                                                </div>
+                                            )}
+                                        </div>
+                                    );
+                                }
+                                return (
+                                    <div style={{ flex: 1, minHeight: 0, overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
+                                        {Array.isArray(rs.messages) && rs.messages.length > 0 && (
+                                            <div style={{
+                                                flex: '0 0 auto',
+                                                margin: '8px 8px 0',
+                                                padding: '10px 12px',
+                                                borderRadius: 8,
+                                                border: darkMode ? '1px solid rgba(255,255,255,0.12)' : '1px solid rgba(0,0,0,0.08)',
+                                                background: darkMode ? 'rgba(255,255,255,0.03)' : '#fff',
+                                                whiteSpace: 'pre-wrap',
+                                                wordBreak: 'break-word',
+                                                fontFamily: 'var(--gn-font-mono)',
+                                                fontSize: 'var(--gn-font-size-mono, 12px)',
+                                                color: darkMode ? '#d4d4d4' : '#666',
+                                            }}>
+                                                {rs.messages.join('\n')}
+                                            </div>
+                                        )}
+                                        <DataGrid
+                                            data={rs.rows}
+                                            columnNames={rs.columns}
+                                            loading={loading || rs.page?.loading === true}
+                                            tableName={rs.tableName}
+                                            exportScope="queryResult"
+                                            resultSql={rs.exportSql || rs.sql}
+                                            resultExportAllSql={rs.page?.exportAllSql}
+                                            dbName={currentDb}
+                                            connectionId={currentConnectionId}
+                                            pkColumns={rs.pkColumns}
+                                            editLocator={rs.editLocator}
+                                            onReload={() => {
+                                                if (rs.page) {
+                                                    onResultPageChange(rs.key, rs.page.current, rs.page.pageSize);
+                                                    return;
+                                                }
+                                                onReloadResult(rs.key, rs.sql);
+                                            }}
+                                            pagination={rs.page ? {
+                                                current: rs.page.current,
+                                                pageSize: rs.page.pageSize,
+                                                total: rs.page.total,
+                                                totalKnown: rs.page.totalKnown,
+                                            } : undefined}
+                                            onPageChange={rs.page ? ((page, size) => onResultPageChange(rs.key, page, size)) : undefined}
+                                            readOnly={rs.readOnly}
+                                            toolbarExtraActions={resolvedActiveResultKey === rs.key ? toolbarHideButton : null}
+                                        />
+                                    </div>
+                                );
+                            })(),
+                        }))}
+                    />
+                ) : executionError ? (
+                    <>
+                        <div className={isV2Ui ? 'query-result-panel-header gn-v2-query-result-panel-header' : 'query-result-panel-header'}>
+                            <span className="query-result-panel-header-title">结果区</span>
+                            {hideButton}
+                        </div>
+                        <div className={isV2Ui ? 'gn-v2-query-error' : undefined} style={{ flex: 1, minHeight: 0, padding: 24, display: 'flex', flexDirection: 'column', gap: 16, background: darkMode ? '#1e1e1e' : '#fafafa', overflow: 'auto' }}>
+                            <div style={{ color: '#ff4d4f', fontWeight: 'bold', fontSize: 16, display: 'flex', alignItems: 'center', gap: 8 }}>
+                                <CloseOutlined />
+                                <span>执行失败</span>
+                            </div>
+                            <div className="custom-scrollbar" style={{ padding: 16, background: darkMode ? '#2d1a1a' : '#fff2f0', border: `1px solid ${darkMode ? '#5c2020' : '#ffccc7'}`, borderRadius: 6, color: darkMode ? '#ffa39e' : '#cf1322', fontFamily: 'var(--gn-font-mono)', fontSize: 'var(--gn-font-size-mono, 13px)', whiteSpace: 'pre-wrap', wordBreak: 'break-all', maxHeight: '40vh', overflow: 'auto' }}>
+                                {executionError}
+                            </div>
+                            <div style={{ marginTop: 8 }}>
+                                <Button
+                                    type="primary"
+                                    icon={<RobotOutlined />}
+                                    style={{ background: '#818cf8', borderColor: '#818cf8', boxShadow: '0 2px 0 rgba(129, 140, 248, 0.2)' }}
+                                    onClick={onDiagnoseExecutionError}
+                                >
+                                    一键 AI 诊断
+                                </Button>
+                            </div>
+                        </div>
+                    </>
+                ) : (
+                    <>
+                        <div className={isV2Ui ? 'query-result-panel-header gn-v2-query-result-panel-header' : 'query-result-panel-header'}>
+                            <span className="query-result-panel-header-title">结果区</span>
+                            {hideButton}
+                        </div>
+                        <div className={isV2Ui ? 'gn-v2-query-empty' : undefined} style={{ flex: 1, minHeight: 0 }}>
+                            {isV2Ui && (
+                                <div>
+                                    <strong>等待执行 SQL</strong>
+                                    <span>运行查询后，结果会在下方以新版数据网格展示。</span>
+                                </div>
+                            )}
+                        </div>
+                    </>
+                )}
+            </div>
+        </>
+    );
+};
+
+export default QueryEditorResultsPanel;
diff --git a/frontend/src/components/QueryEditorToolbar.layout.test.tsx b/frontend/src/components/QueryEditorToolbar.layout.test.tsx
new file mode 100644
index 0000000..858d26c
--- /dev/null
+++ b/frontend/src/components/QueryEditorToolbar.layout.test.tsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import { readFileSync } from 'node:fs';
+import { describe, expect, it } from 'vitest';
+
+describe('QueryEditorToolbar layout', () => {
+  it('keeps the v2 toolbar on a single scrollable row in small windows', () => {
+    const toolbarSource = readFileSync(new URL('./QueryEditorToolbar.tsx', import.meta.url), 'utf8');
+    const css = readFileSync(new URL('../v2-theme.css', import.meta.url), 'utf8');
+    const toolbarCss = css.slice(
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-toolbar {'),
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-toolbar-main {'),
+    );
+    const toolbarMainCss = css.slice(
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-toolbar-main {'),
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-toolbar-selects {'),
+    );
+
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-main');
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-actions');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-toolbar-main');
+    expect(toolbarCss).toContain('overflow-x: auto;');
+    expect(toolbarCss).toContain('overflow-y: hidden;');
+    expect(toolbarCss).toContain('flex-wrap: nowrap;');
+    expect(toolbarMainCss).toContain('flex-wrap: nowrap;');
+    expect(toolbarMainCss).toContain('min-width: 100%;');
+    expect(toolbarMainCss).toContain('width: max-content;');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-toolbar-actions {');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-toolbar-action-pair {');
+  });
+
+  it('keeps run and stop buttons separated in the v2 toolbar action group', () => {
+    const toolbarSource = readFileSync(new URL('./QueryEditorToolbar.tsx', import.meta.url), 'utf8');
+    const css = readFileSync(new URL('../v2-theme.css', import.meta.url), 'utf8');
+
+    expect(toolbarSource).toContain('gn-v2-query-toolbar-action-group');
+    expect(toolbarSource).not.toContain('Space.Compact');
+    expect(css).toContain('body[data-ui-version="v2"] .gn-v2-query-toolbar-action-group {');
+    expect(css).not.toContain('.gn-v2-query-toolbar-action-group.ant-btn-group');
+    expect(css).toContain('gap: 6px;');
+  });
+
+  it('keeps commit button hover styling in source and v2 css', () => {
+    const css = readFileSync(new URL('../v2-theme.css', import.meta.url), 'utf8');
+    const commitBaseCss = css.slice(
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button {'),
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:hover,'),
+    );
+    const commitHoverCss = css.slice(
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:hover,'),
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button .gn-v2-toolbar-kbd {'),
+    );
+    const commitKbdHoverCss = css.slice(
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:hover .gn-v2-toolbar-kbd,'),
+      css.indexOf('body[data-ui-version="v2"] .gn-v2-query-toolbar-icon-action.ant-btn,'),
+    );
+
+    expect(css).toContain('.gn-v2-query-transaction-commit-button:hover');
+    expect(css).toContain('.gn-v2-query-transaction-commit-button:focus-visible');
+    expect(commitBaseCss).toContain('background: var(--gn-accent-soft) !important;');
+    expect(commitHoverCss).not.toContain('background: var(--gn-accent-soft) !important;');
+    expect(commitHoverCss).toContain('box-shadow:');
+    expect(commitKbdHoverCss).toContain('background:');
+  });
+});
diff --git a/frontend/src/components/QueryEditorToolbar.tsx b/frontend/src/components/QueryEditorToolbar.tsx
new file mode 100644
index 0000000..add392f
--- /dev/null
+++ b/frontend/src/components/QueryEditorToolbar.tsx
@@ -0,0 +1,368 @@
+import React from "react";
+import { Button, Dropdown, Select, Tooltip, type MenuProps } from "antd";
+import {
+  EyeInvisibleOutlined,
+  EyeOutlined,
+  FormatPainterOutlined,
+  PlayCircleOutlined,
+  RobotOutlined,
+  SaveOutlined,
+  SettingOutlined,
+  StopOutlined,
+} from "@ant-design/icons";
+
+import type { SavedConnection } from "../types";
+import {
+  getShortcutDisplayLabel,
+  type ShortcutPlatform,
+  type ShortcutPlatformBinding,
+} from "../utils/shortcuts";
+import QueryEditorTransactionSettings, {
+  type SqlEditorCommitMode,
+} from "./QueryEditorTransactionSettings";
+
+type QueryEditorToolbarProps = {
+  isV2Ui: boolean;
+  currentConnectionId: string;
+  currentDb: string;
+  queryCapableConnections: SavedConnection[];
+  dbList: string[];
+  maxRows: number;
+  sqlEditorCommitMode: SqlEditorCommitMode;
+  sqlEditorAutoCommitDelayMs: number;
+  pendingTransactionToolbar: React.ReactNode;
+  runQueryShortcutBinding: ShortcutPlatformBinding;
+  saveQueryShortcutBinding: ShortcutPlatformBinding;
+  toggleQueryResultsPanelShortcutBinding: ShortcutPlatformBinding;
+  activeShortcutPlatform: ShortcutPlatform;
+  isResultPanelVisible: boolean;
+  loading: boolean;
+  saveMoreMenuItems: MenuProps["items"];
+  formatSettingsMenu: MenuProps["items"];
+  onConnectionChange: (connectionId: string) => void;
+  onDatabaseChange: (dbName: string) => void;
+  onMaxRowsChange: (maxRows: number) => void;
+  onCommitModeChange: (mode: SqlEditorCommitMode) => void;
+  onAutoCommitDelayMsChange: (delayMs: number) => void;
+  onCaptureEditorCursorPosition: () => void;
+  onRun: () => void;
+  onCancel: () => void;
+  onQuickSave: () => void;
+  onFormat: () => void;
+  onToggleResultPanelVisibility: () => void;
+  onAIAction: (action: "generate" | "explain" | "optimize" | "schema") => void;
+};
+
+const QueryEditorToolbar: React.FC<QueryEditorToolbarProps> = ({
+  isV2Ui,
+  currentConnectionId,
+  currentDb,
+  queryCapableConnections,
+  dbList,
+  maxRows,
+  sqlEditorCommitMode,
+  sqlEditorAutoCommitDelayMs,
+  pendingTransactionToolbar,
+  runQueryShortcutBinding,
+  saveQueryShortcutBinding,
+  toggleQueryResultsPanelShortcutBinding,
+  activeShortcutPlatform,
+  isResultPanelVisible,
+  loading,
+  saveMoreMenuItems,
+  formatSettingsMenu,
+  onConnectionChange,
+  onDatabaseChange,
+  onMaxRowsChange,
+  onCommitModeChange,
+  onAutoCommitDelayMsChange,
+  onCaptureEditorCursorPosition,
+  onRun,
+  onCancel,
+  onQuickSave,
+  onFormat,
+  onToggleResultPanelVisibility,
+  onAIAction,
+}) => {
+  const baseMoreMenuItems = saveMoreMenuItems ?? [];
+  const toggleResultPanelTitle =
+    toggleQueryResultsPanelShortcutBinding.enabled &&
+    toggleQueryResultsPanelShortcutBinding.combo
+      ? `${isResultPanelVisible ? "隐藏结果区" : "显示结果区"}（${getShortcutDisplayLabel(toggleQueryResultsPanelShortcutBinding.combo, activeShortcutPlatform)}）`
+      : isResultPanelVisible
+        ? "隐藏结果区"
+        : "显示结果区";
+  const aiMenuItems: MenuProps["items"] = [
+    {
+      key: "ai-generate",
+      label: "生成 SQL",
+      icon: <RobotOutlined />,
+      onClick: () => onAIAction("generate"),
+    },
+    {
+      key: "ai-explain",
+      label: "解释 SQL",
+      icon: <RobotOutlined />,
+      onClick: () => onAIAction("explain"),
+    },
+    {
+      key: "ai-optimize",
+      label: "优化 SQL",
+      icon: <RobotOutlined />,
+      onClick: () => onAIAction("optimize"),
+    },
+    { type: "divider" as const },
+    {
+      key: "ai-schema",
+      label: "Schema 分析",
+      icon: <RobotOutlined />,
+      onClick: () => onAIAction("schema"),
+    },
+  ];
+  const moreMenuItems: MenuProps["items"] = isV2Ui
+    ? [
+        ...baseMoreMenuItems,
+        ...(baseMoreMenuItems.length > 0 ? [{ type: "divider" as const }] : []),
+        {
+          key: "toggle-result-panel",
+          label: toggleResultPanelTitle,
+          icon: isResultPanelVisible ? (
+            <EyeInvisibleOutlined />
+          ) : (
+            <EyeOutlined />
+          ),
+          onClick: onToggleResultPanelVisibility,
+        },
+      ]
+    : baseMoreMenuItems;
+  const selects = (
+    <div
+      className={isV2Ui ? "gn-v2-query-toolbar-selects" : undefined}
+      style={{
+        display: "flex",
+        gap: "8px",
+        flexShrink: 0,
+        alignItems: "center",
+      }}
+    >
+      <Select
+        className={
+          isV2Ui
+            ? "gn-v2-query-toolbar-select gn-v2-query-toolbar-connection-select"
+            : undefined
+        }
+        style={isV2Ui ? undefined : { width: 150 }}
+        placeholder="选择连接"
+        value={currentConnectionId}
+        onChange={onConnectionChange}
+        options={queryCapableConnections.map((c) => ({
+          label: c.name,
+          value: c.id,
+        }))}
+        showSearch
+      />
+      <Select
+        className={
+          isV2Ui
+            ? "gn-v2-query-toolbar-select gn-v2-query-toolbar-database-select"
+            : undefined
+        }
+        style={isV2Ui ? undefined : { width: 200 }}
+        placeholder="选择数据库"
+        value={currentDb}
+        onChange={onDatabaseChange}
+        options={dbList.map((db) => ({ label: db, value: db }))}
+        showSearch
+      />
+      <Tooltip title="最大返回行数（会对 SELECT 自动加 LIMIT，防止大结果集卡死）">
+        <Select
+          className={
+            isV2Ui
+              ? "gn-v2-query-toolbar-select gn-v2-query-toolbar-max-rows-select"
+              : undefined
+          }
+          style={isV2Ui ? undefined : { width: 170 }}
+          value={maxRows}
+          onChange={(val) => onMaxRowsChange(Number(val))}
+          options={[
+            { label: "最大行数：500", value: 500 },
+            { label: "最大行数：1000", value: 1000 },
+            { label: "最大行数：5000", value: 5000 },
+            { label: "最大行数：20000", value: 20000 },
+            { label: "最大行数：不限", value: 0 },
+          ]}
+        />
+      </Tooltip>
+      <QueryEditorTransactionSettings
+        isV2Ui={isV2Ui}
+        commitMode={sqlEditorCommitMode}
+        autoCommitDelayMs={sqlEditorAutoCommitDelayMs}
+        onCommitModeChange={onCommitModeChange}
+        onAutoCommitDelayMsChange={onAutoCommitDelayMsChange}
+      />
+      {!isV2Ui && pendingTransactionToolbar}
+    </div>
+  );
+
+  const actions = (
+    <div
+      className={isV2Ui ? "gn-v2-query-toolbar-actions" : undefined}
+      style={{
+        display: "flex",
+        gap: "8px",
+        flexShrink: 0,
+        alignItems: "center",
+      }}
+    >
+      <div
+        className={isV2Ui ? "gn-v2-query-toolbar-action-group" : undefined}
+        style={{ display: "flex", gap: "8px", alignItems: "center" }}
+      >
+        <Tooltip
+          title={
+            runQueryShortcutBinding.enabled && runQueryShortcutBinding.combo
+              ? `运行（${getShortcutDisplayLabel(runQueryShortcutBinding.combo, activeShortcutPlatform)}）`
+              : "运行"
+          }
+        >
+          <Button
+            className={isV2Ui ? "gn-v2-query-toolbar-run-action" : undefined}
+            type="primary"
+            icon={<PlayCircleOutlined />}
+            onMouseDown={onCaptureEditorCursorPosition}
+            onClick={onRun}
+            loading={loading}
+          >
+            运行
+          </Button>
+        </Tooltip>
+        {loading && (
+          <Button
+            type="primary"
+            danger
+            icon={<StopOutlined />}
+            onClick={onCancel}
+          >
+            停止
+          </Button>
+        )}
+      </div>
+      {isV2Ui && pendingTransactionToolbar}
+      <div
+        className={isV2Ui ? "gn-v2-query-toolbar-action-pair" : undefined}
+        style={{ display: "flex", gap: "8px", alignItems: "center" }}
+      >
+        <Tooltip
+          title={
+            saveQueryShortcutBinding.enabled && saveQueryShortcutBinding.combo
+              ? `保存（${getShortcutDisplayLabel(saveQueryShortcutBinding.combo, activeShortcutPlatform)}）`
+              : "保存"
+          }
+        >
+          <Button icon={<SaveOutlined />} onClick={onQuickSave}>
+            保存
+          </Button>
+        </Tooltip>
+        <Dropdown
+          menu={{ items: aiMenuItems }}
+          placement="bottomRight"
+          trigger={["click"]}
+        >
+          <Button
+            className={isV2Ui ? "gn-v2-query-toolbar-ai-action" : undefined}
+            icon={<RobotOutlined />}
+            style={{ color: "#818cf8" }}
+          >
+            AI
+          </Button>
+        </Dropdown>
+        <Dropdown
+          menu={{ items: moreMenuItems }}
+          placement="bottomRight"
+          trigger={["click"]}
+        >
+          <Button>更多</Button>
+        </Dropdown>
+      </div>
+
+      <div
+        className={isV2Ui ? "gn-v2-query-toolbar-action-pair" : undefined}
+        style={{ display: "flex", gap: "8px", alignItems: "center" }}
+      >
+        <Tooltip title="美化 SQL">
+          <Button icon={<FormatPainterOutlined />} onClick={onFormat}>
+            美化
+          </Button>
+        </Tooltip>
+        <Dropdown
+          menu={{ items: formatSettingsMenu }}
+          placement="bottomRight"
+          trigger={["click"]}
+        >
+          <Button
+            className={isV2Ui ? "gn-v2-query-toolbar-icon-action" : undefined}
+            icon={<SettingOutlined />}
+          />
+        </Dropdown>
+      </div>
+
+      {!isV2Ui && (
+        <Tooltip title={toggleResultPanelTitle}>
+          <Button
+            icon={
+              isResultPanelVisible ? <EyeInvisibleOutlined /> : <EyeOutlined />
+            }
+            onClick={onToggleResultPanelVisibility}
+          >
+            结果
+          </Button>
+        </Tooltip>
+      )}
+    </div>
+  );
+
+  if (!isV2Ui) {
+    return (
+      <div
+        className={undefined}
+        style={{
+          padding: "4px 8px 8px",
+          display: "flex",
+          gap: "8px",
+          flexShrink: 0,
+          alignItems: "center",
+        }}
+      >
+        {selects}
+        {actions}
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className="gn-v2-query-toolbar"
+      style={{
+        padding: "4px 8px 8px",
+        display: "flex",
+        gap: "8px",
+        flexShrink: 0,
+      }}
+    >
+      <div
+        className="gn-v2-query-toolbar-main"
+        style={{
+          display: "flex",
+          gap: "8px",
+          flexShrink: 0,
+          alignItems: "center",
+        }}
+      >
+        {selects}
+        {actions}
+      </div>
+    </div>
+  );
+};
+
+export default QueryEditorToolbar;
diff --git a/frontend/src/components/QueryEditorTransactionSettings.tsx b/frontend/src/components/QueryEditorTransactionSettings.tsx
new file mode 100644
index 0000000..d9b59c8
--- /dev/null
+++ b/frontend/src/components/QueryEditorTransactionSettings.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { Select, Tooltip } from 'antd';
+
+export type SqlEditorCommitMode = 'manual' | 'auto';
+
+export const SQL_EDITOR_AUTO_COMMIT_DELAY_OPTIONS = [
+  { value: 0, label: '立即' },
+  { value: 3000, label: '3s' },
+  { value: 5000, label: '5s' },
+  { value: 10000, label: '10s' },
+  { value: 30000, label: '30s' },
+];
+
+type QueryEditorTransactionSettingsProps = {
+  isV2Ui: boolean;
+  commitMode: SqlEditorCommitMode;
+  autoCommitDelayMs: number;
+  onCommitModeChange: (mode: SqlEditorCommitMode) => void;
+  onAutoCommitDelayMsChange: (delayMs: number) => void;
+};
+
+const QueryEditorTransactionSettings: React.FC<QueryEditorTransactionSettingsProps> = ({
+  isV2Ui,
+  commitMode,
+  autoCommitDelayMs,
+  onCommitModeChange,
+  onAutoCommitDelayMsChange,
+}) => (
+  <>
+    <Tooltip title="参考 DBeaver：SQL 编辑器执行 INSERT/UPDATE/DELETE/MERGE/REPLACE 等 DML 时先进入 GoNavi 托管事务；手动提交需要手动提交/回滚，自动提交会在执行成功后自动 COMMIT。">
+      <Select
+        className={isV2Ui ? 'gn-v2-query-toolbar-select gn-v2-query-toolbar-transaction-mode-select' : undefined}
+        style={isV2Ui ? undefined : { width: 78 }}
+        value={commitMode}
+        onChange={(mode) => onCommitModeChange(mode === 'auto' ? 'auto' : 'manual')}
+        options={[
+          { label: '手动', value: 'manual' },
+          { label: '自动', value: 'auto' },
+        ]}
+      />
+    </Tooltip>
+    {commitMode === 'auto' && (
+      <Select
+        className={isV2Ui ? 'gn-v2-query-toolbar-select gn-v2-query-toolbar-transaction-delay-select' : undefined}
+        style={isV2Ui ? undefined : { width: 68 }}
+        value={autoCommitDelayMs}
+        onChange={(delayMs) => onAutoCommitDelayMsChange(Number(delayMs))}
+        options={SQL_EDITOR_AUTO_COMMIT_DELAY_OPTIONS}
+      />
+    )}
+  </>
+);
+
+export default QueryEditorTransactionSettings;
diff --git a/frontend/src/components/QueryEditorTransactionToolbar.tsx b/frontend/src/components/QueryEditorTransactionToolbar.tsx
new file mode 100644
index 0000000..ceeab10
--- /dev/null
+++ b/frontend/src/components/QueryEditorTransactionToolbar.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import { Button } from 'antd';
+
+export type PendingSqlEditorTransaction = {
+  id: string;
+  commitMode: 'manual' | 'auto';
+  autoCommitDelayMs: number;
+  createdAt: number;
+  autoCommitDueAt?: number | null;
+  statementCount?: number;
+};
+
+type QueryEditorTransactionToolbarProps = {
+  isV2Ui: boolean;
+  darkMode: boolean;
+  transaction: PendingSqlEditorTransaction | null;
+  autoCommitRemainingSeconds: number | null;
+  onFinish: (action: 'commit' | 'rollback') => void;
+};
+
+const QueryEditorTransactionToolbar: React.FC<QueryEditorTransactionToolbarProps> = ({
+  isV2Ui,
+  darkMode,
+  transaction,
+  autoCommitRemainingSeconds,
+  onFinish,
+}) => {
+  if (!transaction) {
+    return null;
+  }
+
+  const statementCount = Math.max(0, Math.floor(Number(transaction.statementCount) || 0));
+  const pendingCount = statementCount > 0 ? statementCount : 1;
+  const statusText = transaction.commitMode === 'auto'
+    ? autoCommitRemainingSeconds !== null && autoCommitRemainingSeconds > 0
+      ? `${autoCommitRemainingSeconds}s 后自动提交`
+      : '自动提交中'
+    : null;
+  const commitLabel = isV2Ui
+    ? (
+      <>
+        <span>提交</span>
+        <span className="gn-v2-toolbar-kbd">{pendingCount}</span>
+      </>
+    )
+    : `提交 (${pendingCount})`;
+
+  return (
+    <div
+      className={isV2Ui ? 'gn-v2-query-transaction-toolbar' : undefined}
+      style={{
+        display: 'inline-flex',
+        alignItems: 'center',
+        gap: 8,
+        padding: '0 4px',
+        whiteSpace: 'nowrap',
+      }}
+    >
+      {statusText ? (
+        <span style={{ fontSize: 12, color: darkMode ? '#d4d4d4' : '#666' }}>
+          {statusText}
+        </span>
+      ) : null}
+      <Button
+        className={isV2Ui ? 'gn-v2-query-transaction-commit-button' : undefined}
+        size="small"
+        type="primary"
+        onClick={() => onFinish('commit')}
+      >
+        {commitLabel}
+      </Button>
+      <Button
+        size="small"
+        danger
+        onClick={() => onFinish('rollback')}
+      >
+        回滚
+      </Button>
+    </div>
+  );
+};
+
+export default QueryEditorTransactionToolbar;
diff --git a/frontend/src/components/RedisViewer.interaction.test.tsx b/frontend/src/components/RedisViewer.interaction.test.tsx
index bf9f5bd..341510a 100644
--- a/frontend/src/components/RedisViewer.interaction.test.tsx
+++ b/frontend/src/components/RedisViewer.interaction.test.tsx
@@ -129,10 +129,31 @@ const flushEffects = async () => {
   });
 };
 
+const collectRenderedText = (node: any): string => {
+  if (node == null || typeof node === 'boolean') return '';
+  if (typeof node === 'string' || typeof node === 'number') return String(node);
+  if (Array.isArray(node)) return node.map(collectRenderedText).join('');
+  if (Array.isArray(node.children)) return node.children.map(collectRenderedText).join('');
+  return '';
+};
+
 describe('RedisViewer tree interactions', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     antdState.treeProps = null;
+    storeState.connections = [
+      {
+        id: 'redis-1',
+        name: 'redis',
+        config: {
+          type: 'redis',
+          host: '127.0.0.1',
+          port: 6379,
+          password: '',
+          database: '',
+        },
+      },
+    ];
     redisBackend.RedisScanKeys.mockResolvedValue({
       success: true,
       data: {
@@ -190,4 +211,35 @@ describe('RedisViewer tree interactions', () => {
 
     renderer!.unmount();
   });
+
+  it('shows Redis Cluster topology context in the key explorer header', async () => {
+    storeState.connections = [
+      {
+        id: 'redis-1',
+        name: 'redis-cluster',
+        config: {
+          type: 'redis',
+          host: '10.0.0.1',
+          port: 6379,
+          hosts: ['10.0.0.2:6379', '10.0.0.3:6379'],
+          topology: 'cluster',
+          password: '',
+          database: '',
+        } as any,
+      },
+    ];
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<RedisViewer connectionId="redis-1" redisDB={2} />);
+    });
+    await flushEffects();
+
+    const renderedText = collectRenderedText(renderer!.toJSON());
+    expect(renderedText).toContain('db2');
+    expect(renderedText).toContain('Cluster');
+    expect(renderedText).toContain('3 节点');
+
+    renderer!.unmount();
+  });
 });
diff --git a/frontend/src/components/RedisViewer.tsx b/frontend/src/components/RedisViewer.tsx
index 17cb37e..6f823f8 100644
--- a/frontend/src/components/RedisViewer.tsx
+++ b/frontend/src/components/RedisViewer.tsx
@@ -147,6 +147,35 @@ const isRedisKeyGoneErrorMessage = (messageText: string): boolean => {
     return messageText.includes(REDIS_KEY_GONE_MESSAGE);
 };
 
+const normalizeToolbarText = (value: unknown): string => String(value || '').trim();
+
+const resolveRedisTopology = (connection?: { config?: { topology?: string; hosts?: string[] } }): 'single' | 'replica' | 'cluster' | 'sentinel' => {
+    const topology = normalizeToolbarText(connection?.config?.topology).toLowerCase();
+    if (topology === 'replica') return 'replica';
+    if (topology === 'sentinel') return 'sentinel';
+    if (topology === 'cluster') return 'cluster';
+    const extraHosts = Array.isArray(connection?.config?.hosts) ? connection.config.hosts.filter(Boolean) : [];
+    return extraHosts.length > 0 ? 'cluster' : 'single';
+};
+
+const buildRedisSeedAddresses = (connection?: { config?: { host?: string; port?: number | string; hosts?: string[] } }): string[] => {
+    if (!connection) return [];
+    const port = Number.isFinite(Number(connection.config?.port)) ? Number(connection.config?.port) : 6379;
+    const primaryHost = normalizeToolbarText(connection.config?.host);
+    const primary = primaryHost ? `${primaryHost}:${port}` : '';
+    const extraHosts = Array.isArray(connection.config?.hosts)
+        ? connection.config.hosts.map((host) => normalizeToolbarText(host)).filter(Boolean)
+        : [];
+    return [primary, ...extraHosts].filter(Boolean);
+};
+
+const getRedisTopologyTagLabel = (topology: 'single' | 'replica' | 'cluster' | 'sentinel'): string => {
+    if (topology === 'replica') return 'Replica';
+    if (topology === 'cluster') return 'Cluster';
+    if (topology === 'sentinel') return 'Sentinel';
+    return 'Single';
+};
+
 const RedisViewer: React.FC<RedisViewerProps> = ({ connectionId, redisDB }) => {
     const connections = useStore(state => state.connections);
     const theme = useStore(state => state.theme);
@@ -174,6 +203,9 @@ const RedisViewer: React.FC<RedisViewerProps> = ({ connectionId, redisDB }) => {
     const valueToolbarBg = workbenchTheme.panelBgStrong;
     const valueToolbarBorder = workbenchTheme.panelBorder;
     const valueToolbarText = workbenchTheme.textMuted;
+    const redisTopology = useMemo(() => resolveRedisTopology(connection), [connection]);
+    const redisSeedAddresses = useMemo(() => buildRedisSeedAddresses(connection), [connection]);
+    const redisSentinelMaster = normalizeToolbarText(connection?.config?.redisSentinelMaster);
 
     const [keys, setKeys] = useState<RedisKeyInfo[]>([]);
     const [loading, setLoading] = useState(false);
@@ -1856,7 +1888,16 @@ const RedisViewer: React.FC<RedisViewerProps> = ({ connectionId, redisDB }) => {
                     <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', gap: 12, marginBottom: 12 }}>
                         <div>
                             <div style={{ fontSize: 12, textTransform: 'uppercase', letterSpacing: '.08em', color: workbenchTheme.textMuted, fontWeight: 600 }}>{tr('redis_viewer.title.key_explorer')}</div>
-                            <div style={{ fontSize: 24, fontWeight: 700, color: workbenchTheme.textPrimary, marginTop: 4 }}>db{redisDB}</div>
+                            <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap', marginTop: 4 }}>
+                                <div style={{ fontSize: 24, fontWeight: 700, color: workbenchTheme.textPrimary }}>db{redisDB}</div>
+                                <Tag style={mutedPillTagStyle}>{getRedisTopologyTagLabel(redisTopology)}</Tag>
+                                {redisTopology !== 'single' && (
+                                    <Tag style={mutedPillTagStyle}>{Math.max(redisSeedAddresses.length, 1)} nodes</Tag>
+                                )}
+                                {redisSentinelMaster && (
+                                    <Tag style={mutedPillTagStyle}>master: {redisSentinelMaster}</Tag>
+                                )}
+                            </div>
                         </div>
                         <Tag style={mutedPillTagStyle}>{tr('redis_viewer.label.keys_count', { count: keys.length })}</Tag>
                     </div>
diff --git a/frontend/src/components/RedisViewerKeyToolbar.tsx b/frontend/src/components/RedisViewerKeyToolbar.tsx
new file mode 100644
index 0000000..26e82b8
--- /dev/null
+++ b/frontend/src/components/RedisViewerKeyToolbar.tsx
@@ -0,0 +1,152 @@
+import React from 'react';
+import { Button, Input, Popconfirm, Radio, Space, Tag } from 'antd';
+import type { RadioChangeEvent } from 'antd';
+import { DeleteOutlined, PlusOutlined, ReloadOutlined, SearchOutlined } from '@ant-design/icons';
+
+import type { SavedConnection } from '../types';
+import { noAutoCapInputProps } from '../utils/inputAutoCap';
+import type { RedisSearchMode } from '../utils/redisSearchPattern';
+
+const { Search } = Input;
+
+const normalizeText = (value: unknown): string => String(value || '').trim();
+
+const normalizeRedisTopology = (connection?: SavedConnection): 'single' | 'cluster' | 'sentinel' => {
+  const topology = normalizeText(connection?.config?.topology).toLowerCase();
+  if (topology === 'sentinel') return 'sentinel';
+  if (topology === 'cluster') return 'cluster';
+  const extraHosts = Array.isArray(connection?.config?.hosts) ? connection.config.hosts.filter(Boolean) : [];
+  return extraHosts.length > 0 ? 'cluster' : 'single';
+};
+
+const buildRedisSeedAddresses = (connection?: SavedConnection): string[] => {
+  if (!connection) return [];
+  const config = connection.config || {};
+  const port = Number.isFinite(Number(config.port)) ? Number(config.port) : 6379;
+  const primary = normalizeText(config.host) ? `${normalizeText(config.host)}:${port}` : '';
+  const extraHosts = Array.isArray(config.hosts)
+    ? config.hosts.map((host) => normalizeText(host)).filter(Boolean)
+    : [];
+  return [primary, ...extraHosts].filter(Boolean);
+};
+
+const getRedisTopologyLabel = (topology: 'single' | 'cluster' | 'sentinel'): string => {
+  if (topology === 'cluster') return 'Cluster';
+  if (topology === 'sentinel') return 'Sentinel';
+  return '单机';
+};
+
+type RedisViewerKeyToolbarProps = {
+  isV2Ui: boolean;
+  redisDB: number;
+  connection?: SavedConnection;
+  keyCount: number;
+  selectedKeyCount: number;
+  searchMode: RedisSearchMode;
+  searchInput: string;
+  mutedPillTagStyle: React.CSSProperties;
+  actionButtonStyle: React.CSSProperties;
+  primaryActionButtonStyle: React.CSSProperties;
+  dangerActionButtonStyle: React.CSSProperties;
+  textMutedColor: string;
+  textPrimaryColor: string;
+  onSearchModeChange: (event: RadioChangeEvent) => void;
+  onSearchInputChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  onSearch: (value: string) => void;
+  onRefresh: () => void;
+  onCreateKey: () => void;
+  onSelectAllLoadedKeys: () => void;
+  onClearAllSelectedKeys: () => void;
+  onDeleteSelectedKeys: () => void;
+};
+
+const RedisViewerKeyToolbar: React.FC<RedisViewerKeyToolbarProps> = ({
+  isV2Ui,
+  redisDB,
+  connection,
+  keyCount,
+  selectedKeyCount,
+  searchMode,
+  searchInput,
+  mutedPillTagStyle,
+  actionButtonStyle,
+  primaryActionButtonStyle,
+  dangerActionButtonStyle,
+  textMutedColor,
+  textPrimaryColor,
+  onSearchModeChange,
+  onSearchInputChange,
+  onSearch,
+  onRefresh,
+  onCreateKey,
+  onSelectAllLoadedKeys,
+  onClearAllSelectedKeys,
+  onDeleteSelectedKeys,
+}) => {
+  const topology = normalizeRedisTopology(connection);
+  const seedAddresses = buildRedisSeedAddresses(connection);
+  const sentinelMaster = topology === 'sentinel'
+    ? normalizeText(connection?.config?.redisSentinelMaster)
+    : '';
+
+  return (
+    <div>
+      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', gap: 12, marginBottom: 12 }}>
+        <div>
+          <div style={{ fontSize: 12, textTransform: 'uppercase', letterSpacing: '.08em', color: textMutedColor, fontWeight: 600 }}>Key Explorer</div>
+          <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap', marginTop: 4 }}>
+            <div style={{ fontSize: 24, fontWeight: 700, color: textPrimaryColor }}>db{redisDB}</div>
+            <Tag style={mutedPillTagStyle}>{getRedisTopologyLabel(topology)}</Tag>
+            {topology !== 'single' && (
+              <Tag style={mutedPillTagStyle}>{seedAddresses.length || 1} 节点</Tag>
+            )}
+            {sentinelMaster && (
+              <Tag style={mutedPillTagStyle}>master: {sentinelMaster}</Tag>
+            )}
+          </div>
+        </div>
+        <Tag style={mutedPillTagStyle}>{keyCount} Keys</Tag>
+      </div>
+      <Space.Compact style={{ width: '100%' }}>
+        <Radio.Group
+          value={searchMode}
+          onChange={onSearchModeChange}
+          buttonStyle="solid"
+          style={{ flexShrink: 0 }}
+        >
+          <Radio.Button value="fuzzy">模糊</Radio.Button>
+          <Radio.Button value="exact">精确</Radio.Button>
+        </Radio.Group>
+        <Search
+          {...noAutoCapInputProps}
+          style={{ flex: 1 }}
+          placeholder={searchMode === 'exact' ? '输入完整 Key / 命名空间精确搜索' : '搜索 Key（模糊匹配）'}
+          value={searchInput}
+          onChange={onSearchInputChange}
+          onSearch={onSearch}
+          allowClear
+          enterButton={<SearchOutlined />}
+        />
+      </Space.Compact>
+      <div className={isV2Ui ? 'gn-v2-redis-toolbar' : undefined} style={{ marginTop: 12, display: 'flex', justifyContent: 'space-between', gap: 12, flexWrap: 'wrap' }}>
+        <Space wrap size={8}>
+          <Button size="small" style={actionButtonStyle} icon={<ReloadOutlined />} onClick={onRefresh}>刷新</Button>
+          <Button size="small" style={actionButtonStyle} icon={<PlusOutlined />} onClick={onCreateKey}>新建</Button>
+          <Button size="small" style={primaryActionButtonStyle} onClick={onSelectAllLoadedKeys} disabled={keyCount === 0}>全选全部</Button>
+          <Button size="small" style={actionButtonStyle} onClick={onClearAllSelectedKeys} disabled={selectedKeyCount === 0}>取消全选</Button>
+        </Space>
+        <Popconfirm
+          title={`确定删除选中的 ${selectedKeyCount} 个 Key？`}
+          onConfirm={onDeleteSelectedKeys}
+          disabled={selectedKeyCount === 0}
+        >
+          <Button size="small" style={dangerActionButtonStyle} icon={<DeleteOutlined />} disabled={selectedKeyCount === 0}>
+            删除选中({selectedKeyCount})
+          </Button>
+        </Popconfirm>
+      </div>
+    </div>
+  );
+};
+
+export default RedisViewerKeyToolbar;
diff --git a/frontend/src/components/Sidebar.locate-toolbar.test.tsx b/frontend/src/components/Sidebar.locate-toolbar.test.tsx
index 6270a37..8a07b2a 100644
--- a/frontend/src/components/Sidebar.locate-toolbar.test.tsx
+++ b/frontend/src/components/Sidebar.locate-toolbar.test.tsx
@@ -4,15 +4,20 @@ import { renderToStaticMarkup } from 'react-dom/server';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import Sidebar, {
+  buildAllSavedQueriesTreeNode,
   buildSidebarTableChildrenForUi,
   buildV2SidebarTableSectionedChildren,
   buildSQLFileExecutionFooter,
   buildV2RailConnectionGroups,
+  estimateV2TreeHorizontalScrollWidth,
+  filterV2CommandSearchTreeItems,
   filterV2ExplorerTreeByKind,
   getV2RailConnectionGroupBadgeText,
   hasSidebarLazyChildren,
   normalizeSidebarTreeRelativeDropPosition,
   parseV2CommandSearchQuery,
+  resolveV2CommandSearchPersistentFilter,
+  type V2CommandSearchItem,
   resolveSidebarDropNodeFromDomEvent,
   resolveSidebarTagDropInsertBefore,
   resolveSidebarDropTargetMetricsFromDomEvent,
@@ -27,6 +32,8 @@ import Sidebar, {
   shouldSkipSidebarLoadOnExpandWhileDragging,
   shouldSkipSidebarSelectWhileDragging,
   shouldLoadSidebarNodeOnExpand,
+  shouldCloseV2CommandSearchOnGlobalKey,
+  shouldRunV2CommandSearchEnter,
   sortSidebarTableEntries,
 } from './Sidebar';
 import {
@@ -43,6 +50,7 @@ import {
   V2ConnectionGroupContextMenuView,
   V2ConnectionContextMenuView,
   V2DatabaseContextMenuView,
+  V2SchemaContextMenuView,
   V2TableContextMenuView,
   V2TableGroupContextMenuView,
   formatV2TableContextMenuRows,
@@ -164,6 +172,7 @@ vi.mock('../../wailsjs/go/app/App', () => ({
   DBGetTables: mocks.noop,
   DBQuery: mocks.noop,
   DBShowCreateTable: mocks.noop,
+  DBReleaseConnection: mocks.noop,
   ExportTable: mocks.noop,
   OpenSQLFile: mocks.noop,
   ExecuteSQLFile: mocks.noop,
@@ -180,6 +189,12 @@ vi.mock('../../wailsjs/go/app/App', () => ({
   SelectSQLDirectory: mocks.noop,
   ListSQLDirectory: mocks.noop,
   ReadSQLFile: mocks.noop,
+  CreateSQLFile: mocks.noop,
+  CreateSQLDirectory: mocks.noop,
+  DeleteSQLFile: mocks.noop,
+  DeleteSQLDirectory: mocks.noop,
+  RenameSQLFile: mocks.noop,
+  RenameSQLDirectory: mocks.noop,
   JVMProbeCapabilities: mocks.noop,
   GetDriverStatusList: mocks.noop,
 }));
@@ -225,6 +240,10 @@ describe('Sidebar locate toolbar', () => {
       title: 'users',
       dataRef: { tableName: 'public.users' },
     })).toBe('public.users');
+    expect(resolveSidebarTableNameForCopy({
+      title: 'v_users',
+      dataRef: { viewName: 'reporting.v_users' },
+    })).toBe('reporting.v_users');
     expect(resolveSidebarTableNameForCopy({
       title: 'users',
       dataRef: {},
@@ -272,6 +291,125 @@ describe('Sidebar locate toolbar', () => {
     });
   });
 
+  it('only runs v2 command search enter for a real selected result outside IME composition', () => {
+    expect(shouldRunV2CommandSearchEnter({
+      key: 'Enter',
+      activeItemCount: 1,
+    })).toBe(true);
+    expect(shouldRunV2CommandSearchEnter({
+      key: 'Enter',
+      isComposing: true,
+      activeItemCount: 1,
+    })).toBe(false);
+    expect(shouldRunV2CommandSearchEnter({
+      key: 'Enter',
+      keyCode: 229,
+      activeItemCount: 1,
+    })).toBe(false);
+    expect(shouldRunV2CommandSearchEnter({
+      key: 'Enter',
+      activeItemCount: 0,
+    })).toBe(false);
+    expect(shouldRunV2CommandSearchEnter({
+      key: 'Escape',
+      activeItemCount: 1,
+    })).toBe(false);
+  });
+
+  it('keeps v2 command search persisted filter after closing the palette', () => {
+    expect(resolveV2CommandSearchPersistentFilter({
+      commandSearchValue: '  org  ',
+      persistedFilter: '',
+      enabled: true,
+      isOpen: true,
+    })).toBe('org');
+
+    expect(resolveV2CommandSearchPersistentFilter({
+      commandSearchValue: '',
+      persistedFilter: 'org',
+      enabled: true,
+      isOpen: false,
+    })).toBe('org');
+
+    expect(resolveV2CommandSearchPersistentFilter({
+      commandSearchValue: 'org',
+      persistedFilter: 'org',
+      enabled: false,
+      isOpen: true,
+    })).toBe('');
+  });
+
+  it('closes v2 command search on global escape only while the palette is open', () => {
+    expect(shouldCloseV2CommandSearchOnGlobalKey({
+      key: 'Escape',
+      isOpen: true,
+    })).toBe(true);
+
+    expect(shouldCloseV2CommandSearchOnGlobalKey({
+      key: 'Esc',
+      isOpen: true,
+    })).toBe(true);
+
+    expect(shouldCloseV2CommandSearchOnGlobalKey({
+      key: 'Escape',
+      isOpen: false,
+    })).toBe(false);
+
+    expect(shouldCloseV2CommandSearchOnGlobalKey({
+      key: 'Enter',
+      isOpen: true,
+    })).toBe(false);
+  });
+
+  it('keeps all loaded v2 command table matches once a keyword is entered', () => {
+    const items: V2CommandSearchItem[] = Array.from({ length: 40 }, (_, index) => ({
+      key: `node-table-${index}`,
+      kind: 'node' as const,
+      title: `fs_order_${index}`,
+      meta: '开发240 · front_end_sys',
+      icon: null,
+      node: {
+        type: 'table',
+        key: `table-${index}`,
+        title: `fs_order_${index}`,
+        dataRef: {
+          tableName: `fs_order_${index}`,
+          dbName: 'front_end_sys',
+        },
+      },
+    }));
+
+    expect(filterV2CommandSearchTreeItems(
+      items,
+      parseV2CommandSearchQuery('fs_order'),
+    )).toHaveLength(40);
+    expect(filterV2CommandSearchTreeItems(
+      items,
+      parseV2CommandSearchQuery(''),
+    )).toHaveLength(24);
+    expect(filterV2CommandSearchTreeItems(
+      [
+        ...items,
+        {
+          key: 'node-db',
+          kind: 'node' as const,
+          title: 'front_end_sys',
+          meta: '开发240',
+          icon: null,
+          node: {
+            type: 'database',
+            key: 'db-front-end-sys',
+            title: 'front_end_sys',
+            dataRef: {
+              dbName: 'front_end_sys',
+            },
+          },
+        },
+      ],
+      parseV2CommandSearchQuery('@fs_order'),
+    )).toHaveLength(40);
+  });
+
   it('keeps the v2 active host on the selected database connection', () => {
     const connectionIds = ['local', 'dev240', 'dev241'];
     const databaseNode = {
@@ -367,16 +505,136 @@ describe('Sidebar locate toolbar', () => {
     expect(source).toContain('}> = React.memo(({');
   });
 
+  it('builds a standalone saved-query tree without loading database nodes', () => {
+    const tree = buildAllSavedQueriesTreeNode(
+      [
+        {
+          id: 'saved-1',
+          name: 'Orders',
+          sql: 'select * from orders',
+          connectionId: 'conn-1',
+          dbName: 'app',
+          createdAt: 100,
+        },
+        {
+          id: 'saved-orphan',
+          name: 'Legacy Report',
+          sql: 'select 1',
+          connectionId: 'legacy-1',
+          originalConnectionId: 'legacy-1',
+          dbName: 'legacy_db',
+          createdAt: 200,
+          bindingStatus: 'orphan',
+        },
+      ],
+      [{
+        id: 'conn-1',
+        name: 'Primary',
+        config: {
+          type: 'mysql',
+          host: 'db.local',
+          port: 3306,
+        },
+      }] as any,
+    );
+
+    expect(tree?.key).toBe('all-saved-queries');
+    expect(tree?.title).toBe('全部已存查询');
+    expect(tree?.children?.[0]).toMatchObject({
+      key: 'all-saved-queries-connection-conn-1',
+      title: 'Primary',
+      type: 'saved-query-group',
+    });
+    expect(tree?.children?.[0].children?.[0]).toMatchObject({
+      key: 'all-saved-queries-connection-conn-1-db-app',
+      title: 'app',
+    });
+    expect(tree?.children?.[0].children?.[0].children?.[0]).toMatchObject({
+      key: 'all-saved-query-saved-1',
+      title: 'Orders',
+      type: 'saved-query',
+    });
+    const unmatchedGroup = tree?.children?.find((child) => child.key === 'all-saved-queries-unmatched');
+    expect(unmatchedGroup?.title).toBe('未匹配');
+    expect(unmatchedGroup?.children?.[0]).toMatchObject({
+      key: 'all-saved-queries-unmatched-legacy-1',
+      title: 'legacy-1',
+    });
+    expect(unmatchedGroup?.children?.[0].children?.[0].children?.[0]).toMatchObject({
+      key: 'all-saved-query-saved-orphan',
+      title: 'Legacy Report',
+    });
+  });
+
+  it('releases backend database connections when disconnecting a sidebar connection', () => {
+    const source = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
+    const disconnectSource = source.slice(
+      source.indexOf('const releaseConnectionResources = async'),
+      source.indexOf('const deleteConnectionNode ='),
+    );
+
+    expect(source).toContain('DBReleaseConnection');
+    expect(disconnectSource).toContain('await releaseConnectionResources(conn);');
+    expect(source.match(/onClick: \(\) => void disconnectConnectionNode\(node\)/g)).toHaveLength(2);
+  });
+
   it('renders the current table locate action in the sidebar toolbar', () => {
     const markup = renderToStaticMarkup(<Sidebar />);
     const externalSqlActionIndex = markup.indexOf('data-sidebar-open-external-sql-file-action="true"');
     const locateActionIndex = markup.indexOf('data-sidebar-locate-current-tab-action="true"');
 
     expect(markup).toContain('data-sidebar-locate-current-tab-action="true"');
-    expect(markup).toContain('aria-label="定位当前打开表"');
+    expect(markup).toContain('aria-label="定位当前标签页"');
     expect(locateActionIndex).toBeGreaterThan(externalSqlActionIndex);
   });
 
+  it('passes the exact tree key when locating a command-search object node', () => {
+    const source = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
+    const commandSearchRunSource = source.slice(
+      source.indexOf("if (node.type === 'table' || node.type === 'view' || node.type === 'materialized-view')"),
+      source.indexOf("if (node.type === 'db-trigger' || node.type === 'db-event' || node.type === 'routine')"),
+    );
+
+    expect(commandSearchRunSource).toContain("tabId: String(node.key || '')");
+  });
+
+  it('wires external SQL directory file actions to dedicated Wails APIs', () => {
+    const source = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
+    const loadTablesSource = source.slice(
+      source.indexOf('const loadTables = async'),
+      source.indexOf('const locateObjectInSidebarRef'),
+    );
+
+    expect(source).toContain('CreateSQLFile(directoryPath, name)');
+    expect(source).toContain('RenameSQLFile(filePath, name)');
+    expect(source).toContain('DeleteSQLFile(filePath)');
+    expect(source).toContain('CreateSQLDirectory(directoryPath, name)');
+    expect(source).toContain('RenameSQLDirectory(directoryPath, name)');
+    expect(source).toContain('DeleteSQLDirectory(directoryPath)');
+    expect(source).toContain('refreshGlobalExternalSQLRootNode(false)');
+    expect(source).toContain("request.objectGroup === 'externalSqlFiles'");
+    expect(source).toContain('SQL 文件未在外部 SQL 目录中找到');
+    expect(source).toContain('filePath: data.filePath || undefined');
+    expect(source).toContain("key: 'add-external-sql-directory'");
+    expect(source).toContain("key: 'new-external-sql-file'");
+    expect(source).toContain("key: 'rename-external-sql-file'");
+    expect(source).toContain("key: 'delete-external-sql-file'");
+    expect(source).toContain("key: 'new-external-sql-directory'");
+    expect(source).toContain("key: 'rename-external-sql-directory'");
+    expect(source).toContain("key: 'delete-external-sql-directory'");
+    expect(source).toContain('新建 SQL 文件');
+    expect(source).toContain('重命名 SQL 文件');
+    expect(source).toContain('确认删除 SQL 文件');
+    expect(source).toContain('新建目录');
+    expect(source).toContain('重命名目录');
+    expect(source).toContain('确认删除目录');
+    expect(source).toContain('仅支持删除空目录');
+    expect(source).toContain('文件名不能包含路径分隔符');
+    expect(source).toContain('目录名不能包含路径分隔符');
+    expect(loadTablesSource).not.toContain('externalSQLRootNode');
+    expect(loadTablesSource).not.toContain('dbExternalSQLDirectories');
+  });
+
   it('keeps the legacy sidebar toolbar on a stable five-column grid layout', () => {
     const source = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
     const markup = renderToStaticMarkup(<Sidebar />);
@@ -400,7 +658,10 @@ describe('Sidebar locate toolbar', () => {
     expect(markup).toContain('gn-v2-object-explorer');
     expect(markup).toContain('gn-v2-active-connection-header');
     expect(markup).toContain('gn-v2-explorer-search');
+    expect(markup).toContain('data-v2-sidebar-search-mode="command"');
     expect(markup).toContain('gn-v2-explorer-command-trigger');
+    expect(markup).toContain('gn-v2-explorer-filter-action');
+    expect(markup).toContain('重置侧栏筛选');
     expect(markup).toContain('搜索表、连接、动作... 或问 AI');
     expect(markup).toContain('gn-v2-search-shortcut');
     expect(markup).toContain('<kbd>⌘</kbd>');
@@ -414,6 +675,13 @@ describe('Sidebar locate toolbar', () => {
     expect(markup).toContain('函数');
     expect(markup).toContain('aria-pressed="true"');
     expect(source).toContain("const [v2ExplorerFilter, setV2ExplorerFilter] = useState<V2ExplorerFilter>('all');");
+    expect(source).toContain("const v2SidebarSearchMode = appearance.v2SidebarSearchMode ?? 'command';");
+    expect(source).toContain('const v2CommandSearchPersistentFilterEnabled = appearance.v2CommandSearchPersistentFilterEnabled === true;');
+    expect(source).toContain('handleV2CommandSearchValueChange(event.target.value)');
+    expect(source).toContain('toggleV2CommandSearchPersistentFilter');
+    expect(source).toContain('gn-v2-command-filter-switch');
+    expect(source).toContain("window.addEventListener('keydown', handleV2CommandSearchGlobalKeyDown, true)");
+    expect(source).toContain("window.removeEventListener('keydown', handleV2CommandSearchGlobalKeyDown, true)");
     expect(source).toContain('onClick={() => setV2ExplorerFilter(item.key)}');
     expect(source).toContain('treeData={isV2Ui ? v2VisibleTreeData : displayTreeData}');
     expect(markup).toContain('gn-v2-sidebar-log-footer');
@@ -457,6 +725,18 @@ describe('Sidebar locate toolbar', () => {
     expect(contextMenuFunction).not.toContain('setActiveContext');
   });
 
+  it('can render the v2 sidebar with legacy persistent filter input', () => {
+    mocks.state.appearance.v2SidebarSearchMode = 'filter';
+    mocks.state.appearance.v2SidebarPersistedFilter = 'fs_org';
+
+    const markup = renderToStaticMarkup(<Sidebar uiVersion="v2" />);
+
+    expect(markup).toContain('data-v2-sidebar-search-mode="filter"');
+    expect(markup).toContain('筛选左侧表、连接、对象...');
+    expect(markup).toContain('value="fs_org"');
+    expect(markup).toContain('重置侧栏筛选');
+  });
+
   it('renders the v2 search shortcut from the user shortcut settings', () => {
     mocks.state.shortcutOptions = cloneShortcutOptions(DEFAULT_SHORTCUT_OPTIONS);
     mocks.state.shortcutOptions.focusSidebarSearch.mac = { combo: 'Meta+F', enabled: true };
@@ -619,14 +899,39 @@ describe('Sidebar locate toolbar', () => {
     expect(css).not.toContain('.gn-v2-active-connection-trigger:hover');
   });
 
-  it('keeps v2 tree status dots circular while truncating only the label text', () => {
+  it('keeps v2 tree status dots circular while using virtual horizontal scroll for long labels', () => {
     const css = readFileSync(new URL('../v2-theme.css', import.meta.url), 'utf8');
     const source = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
+    const utilsSource = readFileSync(new URL('./sidebarV2Utils.ts', import.meta.url), 'utf8');
 
     expect(source).toContain('gn-v2-tree-status is-${status}');
     expect(source).toContain('data-sidebar-tree-folder-icon="true"');
+    expect(source).toContain("overflow: 'hidden'");
+    expect(source).not.toContain("overflowX: isV2Ui ? 'auto' : 'hidden'");
+    expect(source).toContain('scrollWidth={isV2Ui ? v2TreeHorizontalScrollWidth : undefined}');
+    expect(utilsSource).toContain('export const V2_TREE_HORIZONTAL_SCROLL_BOTTOM_RESERVE = 32;');
+    expect(source).toContain('const effectiveTreeHeight = isV2Ui && v2TreeHorizontalScrollWidth');
+    expect(source).toContain('treeHeight - V2_TREE_HORIZONTAL_SCROLL_BOTTOM_RESERVE');
+    expect(source).toContain('height={effectiveTreeHeight}');
+    expect(source).toContain('treeData={isV2Ui ? v2VisibleTreeData : displayTreeData}');
+    expect(source).not.toContain('__v2-tree-horizontal-scroll-spacer__');
+    expect(source).not.toContain('v2TreeDataWithScrollSpacer');
+    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \{[^}]*--gn-v2-tree-horizontal-scroll-reserve: 32px;[^}]*overflow: hidden !important;/s);
+    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.sidebar-tree-scroll-content \{[^}]*display: flex;[^}]*height: 100%;[^}]*padding: 4px 0 0;/s);
+    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree \{[^}]*flex: 1 1 auto;[^}]*width: 100%;[^}]*min-width: 0;[^}]*height: 100%;/s);
+    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-list \{[^}]*height: calc\(100% - var\(--gn-v2-tree-horizontal-scroll-reserve\)\);[^}]*min-height: 0;[^}]*box-sizing: border-box;/s);
+    expect(css).not.toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-list \{[^}]*height: 100%;/s);
+    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-list-holder-inner \{[^}]*width: 100%;[^}]*min-width: 100%;/s);
+    expect(css).not.toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-list-holder-inner \{[^}]*width: max-content;/s);
+    expect(css).not.toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-list \{[^}]*position: static !important;/s);
+    expect(css).not.toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-list-holder \{[^}]*calc\(100% - var\(--gn-v2-tree-horizontal-scroll-reserve\)\)/s);
+    expect(css).not.toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-list-holder \{[^}]*overflow-x: auto !important;/s);
+    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-list-scrollbar-horizontal \{[^}]*height: 12px !important;[^}]*bottom: calc\(\(var\(--gn-v2-tree-horizontal-scroll-reserve\) - 12px\) \* -1\) !important;/s);
+    expect(css).not.toContain('.gn-v2-tree-horizontal-scroll-spacer');
+    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-list-scrollbar-horizontal \.ant-tree-list-scrollbar-thumb \{[^}]*height: 8px !important;/s);
+    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-node-content-wrapper \{[^}]*display: flex !important;/s);
     expect(css).toMatch(/\.gn-v2-tree-title\.is-connection \{[^}]*align-items:\s*center;/s);
-    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-title \{[^}]*overflow: visible;/s);
+    expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-title \{[^}]*flex: 1 1 auto;[^}]*overflow: visible;/s);
     expect(css).toMatch(/\.gn-v2-explorer-tree-shell \.ant-tree-title > \.gn-v2-tree-title \{[^}]*overflow: visible;/s);
     expect(css).toMatch(/\.gn-v2-tree-status \{[^}]*width: 14px;[^}]*height: 14px;[^}]*flex: 0 0 14px;[^}]*overflow: visible;/s);
     expect(css).toMatch(/\.gn-v2-tree-status::before \{[^}]*width: 7px;[^}]*height: 7px;[^}]*border-radius: 50%;/s);
@@ -636,6 +941,32 @@ describe('Sidebar locate toolbar', () => {
     expect(css).not.toContain('.gn-v2-tree-connection-meta');
   });
 
+  it('estimates a v2 tree scroll width only when content is wider than the viewport', () => {
+    const narrowWidth = estimateV2TreeHorizontalScrollWidth([
+      {
+        title: 'front_end_sys',
+        key: 'db-front-end',
+        type: 'database',
+        children: [{
+          title: 'com_vod_error_file_tmp_with_a_very_long_table_name',
+          key: 'table-long',
+          type: 'table',
+        }],
+      },
+    ] as any, 260);
+    const wideWidth = estimateV2TreeHorizontalScrollWidth([
+      {
+        title: 'users',
+        key: 'table-users',
+        type: 'table',
+      },
+    ] as any, 900);
+
+    expect(narrowWidth).toBeGreaterThan(260);
+    expect(narrowWidth).toBeLessThanOrEqual(960);
+    expect(wideWidth).toBeUndefined();
+  });
+
   it('does not repeat the active connection as an object-tree root in v2', () => {
     mocks.state.connections = [{
       id: 'conn-local',
@@ -741,6 +1072,7 @@ describe('Sidebar locate toolbar', () => {
 
   it('reorders dragged connections instead of only moving them between groups', () => {
     const source = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
+    const utilsSource = readFileSync(new URL('./sidebarV2Utils.ts', import.meta.url), 'utf8');
 
     expect(source).toContain('const reorderConnections = useStore(state => state.reorderConnections);');
     expect(source).toContain('reorderConnections(');
@@ -748,7 +1080,7 @@ describe('Sidebar locate toolbar', () => {
     expect(source).toContain('const domDropNode = resolveSidebarDropNodeFromDomEvent(info?.event);');
     expect(source).toContain('const dropTargetMetrics = resolveSidebarDropTargetMetricsFromDomEvent(info?.event);');
     expect(source).toContain("findTreeNodeByKeyRef.current(treeDataRef.current, domDropNode.key)");
-    expect(source).toContain("const treeNode = baseElement.closest('.ant-tree-treenode') as HTMLElement | null;");
+    expect(utilsSource).toContain("const treeNode = baseElement.closest('.ant-tree-treenode') as HTMLElement | null;");
     expect(source).toContain('insertBefore,');
   });
 
@@ -970,6 +1302,43 @@ describe('Sidebar locate toolbar', () => {
     expect(filterV2ExplorerTreeByKind(tree, 'events')[0].children?.map((node) => node.key)).toEqual(['conn-main-events']);
   });
 
+  it('hides external SQL roots from v2 object kind filters', () => {
+    const tree = [
+      {
+        title: 'front_end_sys',
+        key: 'conn-main',
+        type: 'database' as const,
+        children: [
+          {
+            title: '表',
+            key: 'conn-main-tables',
+            type: 'object-group' as const,
+            dataRef: { groupKey: 'tables' },
+            children: [{ title: 'users', key: 'users', type: 'table' as const }],
+          },
+        ],
+      },
+      {
+        title: '外部 SQL 目录',
+        key: 'external-sql-root',
+        type: 'external-sql-root' as const,
+        children: [
+          {
+            title: 'scripts',
+            key: 'external-sql-folder:scripts',
+            type: 'external-sql-folder' as const,
+          },
+        ],
+      },
+    ];
+
+    expect(filterV2ExplorerTreeByKind(tree, 'all').map((node) => node.key)).toEqual([
+      'conn-main',
+      'external-sql-root',
+    ]);
+    expect(filterV2ExplorerTreeByKind(tree, 'tables').map((node) => node.key)).toEqual(['conn-main']);
+  });
+
   it('adds rename to the saved query context menu', () => {
     const source = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
     const renameHandlerStart = source.indexOf('const handleRenameSavedQuery = async () =>');
@@ -1686,7 +2055,7 @@ describe('Sidebar locate toolbar', () => {
     expect(source).toContain("t('sidebar.validation.schema_name_required')");
 
     expect(runSqlSource).toContain("message.error(t('sidebar.message.connection_config_not_found'))");
-    expect(runSqlSource).toContain("title: t('sidebar.sql_file_exec.title')");
+    expect(runSqlSource).toContain("data.fileName || t('sidebar.sql_file_exec.title')");
     expect(runSqlSource).toContain("message.error(t('sidebar.message.read_file_failed'");
 
     expect(databaseShellSource).toContain("message.error(t('sidebar.message.database_name_required'))");
@@ -1707,6 +2076,24 @@ describe('Sidebar locate toolbar', () => {
     expect(starRocksSource).toContain("title: t('sidebar.v2_database_menu.new_external_catalog')");
   });
 
+  it('renders the v2 schema context menu with rename and schema-level export actions', () => {
+    const markup = renderToStaticMarkup(
+      <V2SchemaContextMenuView
+        dbName="app_db"
+        schemaName="sales"
+      />,
+    );
+
+    expect(markup).toContain('data-v2-schema-context-menu="true"');
+    expect(markup).toContain('sales');
+    expect(markup).toContain('SCHEMA');
+    expect(markup).toContain('编辑模式');
+    expect(markup).toContain('刷新对象树');
+    expect(markup).toContain('导出当前模式表结构 · SQL');
+    expect(markup).toContain('备份当前模式全部表 · 结构 + 数据');
+    expect(markup).toContain('删除模式 · DROP CASCADE');
+  });
+
   it('renders the v2 connection context menu for host rail actions', () => {
     setCurrentLanguage('en-US');
 
@@ -2243,4 +2630,15 @@ describe('Sidebar locate toolbar', () => {
     expect(source).toContain('void loadTables(dbNode);');
     expect(source).toContain("window.removeEventListener('gonavi:sidebar-table-pin-changed'");
   });
+
+  it('waits long enough for slow object-tree loads before reporting locate misses', () => {
+    const source = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
+
+    expect(source).toContain('const SIDEBAR_LOCATE_LOAD_WAIT_INTERVAL_MS = 50;');
+    expect(source).toContain('const SIDEBAR_LOCATE_LOAD_WAIT_ATTEMPTS = 160;');
+    expect(source).toContain('attempt < SIDEBAR_LOCATE_LOAD_WAIT_ATTEMPTS');
+    expect(source).toContain('window.setTimeout(resolve, SIDEBAR_LOCATE_LOAD_WAIT_INTERVAL_MS)');
+    expect(source).toContain('return !loadingNodesRef.current.has(loadKey);');
+    expect(source).toContain('对象仍在加载中');
+  });
 });
diff --git a/frontend/src/components/Sidebar.message-publish.test.tsx b/frontend/src/components/Sidebar.message-publish.test.tsx
new file mode 100644
index 0000000..25595ff
--- /dev/null
+++ b/frontend/src/components/Sidebar.message-publish.test.tsx
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest';
+import { readFileSync } from 'node:fs';
+
+const sidebarSource = readFileSync(new URL('./Sidebar.tsx', import.meta.url), 'utf8');
+const contextMenuSource = readFileSync(new URL('./V2TableContextMenu.tsx', import.meta.url), 'utf8');
+const modalSource = readFileSync(new URL('./MessagePublishModal.tsx', import.meta.url), 'utf8');
+
+describe('Sidebar Kafka publish entry', () => {
+  it('adds a Kafka topic publish action in both legacy and v2 table menus', () => {
+    expect(sidebarSource).toContain("key: 'publish-message'");
+    expect(sidebarSource).toContain("label: '测试发送消息'");
+    expect(sidebarSource).toContain('openMessagePublishModal(node)');
+    expect(contextMenuSource).toContain("| 'publish-message'");
+    expect(contextMenuSource).toContain("title: '测试发送消息'");
+  });
+
+  it('renders the dedicated message publish modal and executes DBQuery through the encoder', () => {
+    expect(sidebarSource).toContain('<MessagePublishModal');
+    expect(modalSource).toContain('buildMessagePublishCommand');
+    expect(modalSource).toContain('DBQuery(');
+    expect(modalSource).toContain('消息体');
+  });
+});
diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index 443aab1..c2f0d84 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useMemo, useRef, useCallback, useDeferredValue } from 'react';
 import { createPortal } from 'react-dom';
-import { Tree, message, Dropdown, MenuProps, Input, Button, Modal, Form, Badge, Checkbox, Space, Select, Popover, Tooltip, Progress } from 'antd';
+import { Tree, message, Dropdown, MenuProps, Input, Button, Modal, Form, Badge, Checkbox, Space, Select, Popover, Tooltip, Progress, Switch } from 'antd';
 	import {
 	  DatabaseOutlined,
 	  TableOutlined,
@@ -25,6 +25,7 @@ import { Tree, message, Dropdown, MenuProps, Input, Button, Modal, Form, Badge,
   FileAddOutlined,
   PlusOutlined,
   ReloadOutlined,
+  SendOutlined,
   DeleteOutlined,
   DisconnectOutlined,
   CloudOutlined,
@@ -53,18 +54,26 @@ import {
     useStore,
 } from '../store';
 import { buildOverlayWorkbenchTheme } from '../utils/overlayWorkbenchTheme';
-		import { SavedConnection, SavedQuery, ConnectionTag, ExternalSQLTreeEntry, JVMCapability, JVMResourceSummary } from '../types';
+		import { ConnectionTag, SavedConnection, SavedQuery, ExternalSQLDirectory, ExternalSQLTreeEntry, JVMCapability, JVMResourceSummary } from '../types';
 import { getDbIcon } from './DatabaseIcons';
-		import { DBGetDatabases, DBGetTables, DBQuery, DBShowCreateTable, ExportTable, OpenSQLFile, ExecuteSQLFile, CancelSQLFileExecution, CreateDatabase, CreateSchema, RenameDatabase, DropDatabase, RenameTable, DropTable, DropView, DropFunction, RenameView, SelectSQLDirectory, ListSQLDirectory, ReadSQLFile, JVMProbeCapabilities, GetDriverStatusList } from '../../wailsjs/go/app/App';
+		import { DBGetDatabases, DBGetTables, DBQuery, DBShowCreateTable, DBReleaseConnection, ExportTable, OpenSQLFile, ExecuteSQLFile, CancelSQLFileExecution, CreateDatabase, CreateSchema, RenameDatabase, DropDatabase, RenameTable, DropTable, DropView, DropFunction, RenameView, SelectSQLDirectory, ListSQLDirectory, ReadSQLFile, CreateSQLFile, CreateSQLDirectory, DeleteSQLFile, DeleteSQLDirectory, RenameSQLFile, RenameSQLDirectory, JVMProbeCapabilities, GetDriverStatusList } from '../../wailsjs/go/app/App';
 import { getTableDataDangerActionMeta, supportsTableTruncateAction, type TableDataDangerActionKind } from './tableDataDangerActions';
   import { EventsOn } from '../../wailsjs/runtime/runtime';
   import { isMacLikePlatform, normalizeOpacityForPlatform, resolveAppearanceValues } from '../utils/appearance';
 import { useAutoFetchVisibility } from '../utils/autoFetchVisibility';
 import FindInDatabaseModal from './FindInDatabaseModal';
 import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
-import { getDataSourceCapabilities } from '../utils/dataSourceCapabilities';
+import { getDataSourceCapabilities, resolveDataSourceType } from '../utils/dataSourceCapabilities';
 import { noAutoCapInputProps } from '../utils/inputAutoCap';
-import { normalizeSidebarViewName, resolveSidebarRuntimeDatabase } from '../utils/sidebarMetadata';
+import {
+  buildMySQLCompatibleViewMetadataSqls,
+  isSidebarViewTableType,
+  normalizeSidebarViewMetadataEntry,
+  resolveSidebarMetadataDialect,
+  resolveSidebarRuntimeDatabase,
+  type SidebarViewMetadataEntry,
+} from '../utils/sidebarMetadata';
+import { splitQualifiedNameLast } from '../utils/qualifiedName';
 import { buildStarRocksMaterializedViewPreviewSql } from './tableDesignerSchemaSql';
 import { normalizeOceanBaseProtocol } from '../utils/oceanBaseProtocol';
 import { resolveConnectionHostSummary, resolveConnectionHostTokens } from '../utils/tabDisplay';
@@ -83,20 +92,53 @@ import { buildTableSelectQuery } from '../utils/objectQueryTemplates';
 import { getShortcutPlatform, resolveShortcutDisplay } from '../utils/shortcuts';
 import { buildExternalSQLDirectoryId, buildExternalSQLRootNode, buildExternalSQLTabId, type ExternalSQLTreeNode } from '../utils/externalSqlTree';
 import { getCurrentLanguage, t } from '../i18n';
+import { SIDEBAR_SQL_EDITOR_DRAG_MIME, encodeSidebarSqlEditorDragPayload } from '../utils/sidebarSqlDrag';
+import { buildSqlServerObjectDefinitionQueries } from '../utils/sqlServerObjectDefinition';
 import JVMModeBadge from './jvm/JVMModeBadge';
+import MessagePublishModal from './MessagePublishModal';
+import {
+  SIDEBAR_CONTEXT_MENU_FALLBACK_HEIGHT,
+  SIDEBAR_CONTEXT_MENU_FALLBACK_WIDTH,
+  isExternalSQLDirectoryModalMode,
+  normalizeMySQLViewDDLForEditing,
+  resolveSidebarContextMenuPosition,
+  resolveSidebarObjectDragText,
+  type ExternalSQLFileModalMode,
+  type SearchScope,
+} from './sidebarCoreUtils';
+export { resolveSidebarContextMenuPosition } from './sidebarCoreUtils';
+export type { ExternalSQLFileModalMode, SearchScope } from './sidebarCoreUtils';
 import {
     V2DatabaseContextMenuView,
     V2ConnectionGroupContextMenuView,
     V2ConnectionContextMenuView,
+    V2SchemaContextMenuView,
     V2TableContextMenuView,
     V2TableGroupContextMenuView,
     type V2DatabaseContextMenuActionKey,
     type V2ConnectionGroupContextMenuActionKey,
     type V2ConnectionContextMenuActionKey,
+    type V2SchemaContextMenuActionKey,
     type V2TableContextMenuActionKey,
     type V2TableContextMenuStats,
     type V2TableGroupContextMenuActionKey,
 } from './V2TableContextMenu';
+import {
+  V2_TREE_HORIZONTAL_SCROLL_BOTTOM_RESERVE,
+  estimateV2TreeHorizontalScrollWidth,
+  filterV2CommandSearchTreeItems,
+  resolveV2CommandSearchPersistentFilter,
+  shouldCloseV2CommandSearchOnGlobalKey,
+  shouldRunV2CommandSearchEnter,
+} from './sidebarV2Utils';
+
+export {
+  estimateV2TreeHorizontalScrollWidth,
+  filterV2CommandSearchTreeItems,
+  resolveV2CommandSearchPersistentFilter,
+  shouldCloseV2CommandSearchOnGlobalKey,
+  shouldRunV2CommandSearchEnter,
+};
 
 const { Search } = Input;
 type SidebarContextMenuState = {
@@ -105,43 +147,16 @@ type SidebarContextMenuState = {
   sourceX?: number;
   sourceY?: number;
   items: MenuProps['items'];
-  kind?: 'v2-table' | 'v2-database' | 'v2-table-group' | 'v2-connection' | 'v2-connection-group';
+  kind?: 'v2-table' | 'v2-database' | 'v2-schema' | 'v2-table-group' | 'v2-connection' | 'v2-connection-group';
   node?: any;
   rootClassName?: string;
   overlayStyle?: React.CSSProperties;
   maxHeight?: number;
 };
 
-const SIDEBAR_CONTEXT_MENU_SAFE_GAP = 8;
-const SIDEBAR_CONTEXT_MENU_FALLBACK_WIDTH = 264;
-const SIDEBAR_CONTEXT_MENU_FALLBACK_HEIGHT = 420;
+const SIDEBAR_LOCATE_LOAD_WAIT_INTERVAL_MS = 50;
+const SIDEBAR_LOCATE_LOAD_WAIT_ATTEMPTS = 160;
 
-export const resolveSidebarContextMenuPosition = (
-  x: number,
-  y: number,
-  options?: {
-    width?: number;
-    height?: number;
-    viewportWidth?: number;
-    viewportHeight?: number;
-    safeGap?: number;
-  },
-): { x: number; y: number; maxHeight: number } => {
-  const safeGap = options?.safeGap ?? SIDEBAR_CONTEXT_MENU_SAFE_GAP;
-  const viewportWidth = options?.viewportWidth ?? (typeof window === 'undefined' ? 1024 : window.innerWidth);
-  const viewportHeight = options?.viewportHeight ?? (typeof window === 'undefined' ? 768 : window.innerHeight);
-  const width = Math.max(0, options?.width ?? SIDEBAR_CONTEXT_MENU_FALLBACK_WIDTH);
-  const height = Math.max(0, options?.height ?? SIDEBAR_CONTEXT_MENU_FALLBACK_HEIGHT);
-  const maxX = Math.max(safeGap, viewportWidth - width - safeGap);
-  const maxY = Math.max(safeGap, viewportHeight - height - safeGap);
-  const nextX = Math.max(safeGap, Math.min(x, maxX));
-  const nextY = Math.max(safeGap, Math.min(y, maxY));
-  return {
-    x: nextX,
-    y: nextY,
-    maxHeight: Math.max(120, viewportHeight - nextY - safeGap),
-  };
-};
 interface TreeNode {
   title: string;
   key: string;
@@ -150,7 +165,7 @@ interface TreeNode {
   children?: TreeNode[];
   icon?: React.ReactNode;
   dataRef?: any;
-  type?: 'connection' | 'database' | 'table' | 'view' | 'materialized-view' | 'db-trigger' | 'db-event' | 'routine' | 'object-group' | 'v2-table-section' | 'queries-folder' | 'saved-query' | 'external-sql-root' | 'external-sql-directory' | 'external-sql-folder' | 'external-sql-file' | 'folder-columns' | 'folder-indexes' | 'folder-fks' | 'folder-triggers' | 'redis-db' | 'tag' | 'jvm-mode' | 'jvm-resource' | 'jvm-diagnostic' | 'jvm-monitoring';
+  type?: 'connection' | 'database' | 'table' | 'view' | 'materialized-view' | 'db-trigger' | 'db-event' | 'routine' | 'object-group' | 'v2-table-section' | 'queries-folder' | 'saved-query' | 'all-saved-queries' | 'saved-query-group' | 'unmatched-saved-queries' | 'external-sql-root' | 'external-sql-directory' | 'external-sql-folder' | 'external-sql-file' | 'folder-columns' | 'folder-indexes' | 'folder-fks' | 'folder-triggers' | 'redis-db' | 'tag' | 'jvm-mode' | 'jvm-resource' | 'jvm-diagnostic' | 'jvm-monitoring';
 }
 
 export const resolveV2ObjectGroupTitle = (node: Pick<TreeNode, 'type' | 'dataRef'> | null | undefined): string | null => {
@@ -275,13 +290,14 @@ export const shouldLoadSidebarNodeOnExpand = (
   if (!node || node.isLeaf === true || hasSidebarLazyChildren(node.children)) return false;
   return node.type === 'connection'
       || node.type === 'database'
+      || node.type === 'external-sql-root'
       || node.type === 'table'
       || node.type === 'jvm-mode'
       || node.type === 'jvm-resource';
 };
 
 export const resolveSidebarTableNameForCopy = (node: Pick<TreeNode, 'title' | 'dataRef'> | null | undefined): string => {
-  return String(node?.dataRef?.tableName || node?.title || '').trim();
+  return String(node?.dataRef?.tableName || node?.dataRef?.viewName || node?.dataRef?.eventName || node?.title || '').trim();
 };
 
 type SidebarTableSortPreference = 'name' | 'frequency';
@@ -395,8 +411,7 @@ type BatchTableExportMode = 'schema' | 'backup' | 'dataOnly';
 type BatchObjectType = 'table' | 'view';
 type BatchObjectFilterType = 'all' | BatchObjectType;
 type BatchSelectionScope = 'filtered' | 'all';
-type SearchScope = 'smart' | 'object' | 'database' | 'host' | 'tag';
-type V2ExplorerFilter = 'all' | 'tables' | 'views' | 'routines' | 'events';
+export type V2ExplorerFilter = 'all' | 'tables' | 'views' | 'routines' | 'events';
 
 export const V2_RAIL_UNGROUPED_CONNECTION_GROUP_ID = '__gonavi-v2-ungrouped-connections__';
 
@@ -544,6 +559,9 @@ export const filterV2ExplorerTreeByKind = (
   };
 
   const visit = (node: TreeNode): TreeNode | null => {
+    if (node.type === 'external-sql-root') {
+      return null;
+    }
     const groupKey = String(node?.dataRef?.groupKey || '');
     if (node.type === 'object-group') {
       if (allowedGroupKeys.has(groupKey)) {
@@ -568,6 +586,12 @@ export const filterV2ExplorerTreeByKind = (
   return nodes.map(visit).filter(Boolean) as TreeNode[];
 };
 
+type SidebarMessagePublishTarget = {
+  connection: SavedConnection;
+  executionDbName: string;
+  destination: string;
+};
+
 interface BatchObjectItem {
   title: string;
   key: string;
@@ -576,7 +600,7 @@ interface BatchObjectItem {
   dataRef: any;
 }
 
-type V2CommandSearchItem =
+export type V2CommandSearchItem =
   | {
       key: string;
       kind: 'node';
@@ -948,8 +972,6 @@ const SEARCH_SCOPE_LABEL_KEY_MAP: Record<SearchScope, string> = SEARCH_SCOPE_OPT
   acc[option.value] = option.labelKey;
   return acc;
 }, {} as Record<SearchScope, string>);
-
-
 const SEARCH_SCOPE_ICON_MAP: Record<SearchScope, React.ReactNode> = {
   smart: <ThunderboltOutlined />,
   object: <TableOutlined />,
@@ -958,21 +980,113 @@ const SEARCH_SCOPE_ICON_MAP: Record<SearchScope, React.ReactNode> = {
   tag: <TagOutlined />,
 };
 
-const normalizeMySQLViewDDLForEditing = (viewName: string, rawDefinition: unknown): string => {
-  const text = String(rawDefinition || '').trim();
-  if (!text) return '';
+const isSavedQueryUnmatchedForConnectionIds = (query: SavedQuery, connectionIds: Set<string>): boolean => (
+  query.bindingStatus === 'orphan' || !connectionIds.has(query.connectionId)
+);
 
-  const normalized = text.replace(/\r\n/g, '\n').trim().replace(/;+\s*$/, '');
-  const createViewPrefixPattern = /^\s*create\s+(?:algorithm\s*=\s*\w+\s+)?(?:definer\s*=\s*(?:`[^`]+`|\S+)\s*@\s*(?:`[^`]+`|\S+)\s+)?(?:sql\s+security\s+(?:definer|invoker)\s+)?view\s+/i;
-  if (createViewPrefixPattern.test(normalized)) {
-    return `${normalized.replace(createViewPrefixPattern, 'CREATE OR REPLACE VIEW ')};`;
+export const buildAllSavedQueriesTreeNode = (
+  savedQueries: SavedQuery[],
+  connections: SavedConnection[],
+): TreeNode | null => {
+  if (savedQueries.length === 0) {
+      return null;
   }
 
-  if (/^\s*(select|with)\b/i.test(normalized)) {
-    return `CREATE OR REPLACE VIEW ${viewName} AS\n${normalized};`;
+  const connectionIds = new Set(connections.map((conn) => conn.id));
+  const unmatchedSavedQueries = savedQueries.filter((query) => isSavedQueryUnmatchedForConnectionIds(query, connectionIds));
+  const unmatchedIds = new Set(unmatchedSavedQueries.map((query) => query.id));
+  const createQueryNode = (query: SavedQuery): TreeNode => ({
+      title: query.name || '未命名查询',
+      key: `all-saved-query-${query.id}`,
+      icon: <FileTextOutlined />,
+      type: 'saved-query',
+      dataRef: query,
+      isLeaf: true,
+  });
+  const buildDatabaseGroups = (queries: SavedQuery[], keyPrefix: string): TreeNode[] => {
+      const groupedByDatabase = new Map<string, SavedQuery[]>();
+      queries.forEach((query) => {
+          const dbName = String(query.dbName || '').trim() || '默认数据库';
+          groupedByDatabase.set(dbName, [...(groupedByDatabase.get(dbName) || []), query]);
+      });
+      return Array.from(groupedByDatabase.entries()).map(([dbName, items]) => ({
+          title: dbName,
+          key: `${keyPrefix}-db-${encodeURIComponent(dbName)}`,
+          icon: <DatabaseOutlined />,
+          type: 'saved-query-group',
+          selectable: false,
+          isLeaf: false,
+          children: items.map(createQueryNode),
+      }));
+  };
+
+  const groupedByConnection = new Map<string, SavedQuery[]>();
+  savedQueries.forEach((query) => {
+      if (unmatchedIds.has(query.id)) {
+          return;
+      }
+      groupedByConnection.set(query.connectionId, [
+          ...(groupedByConnection.get(query.connectionId) || []),
+          query,
+      ]);
+  });
+
+  const children: TreeNode[] = [];
+  connections.forEach((conn) => {
+      const connectionQueries = groupedByConnection.get(conn.id);
+      if (!connectionQueries || connectionQueries.length === 0) {
+          return;
+      }
+      const iconType = resolveConnectionIconType(conn);
+      const iconColor = resolveConnectionAccentColor(conn);
+      children.push({
+          title: conn.name || conn.id,
+          key: `all-saved-queries-connection-${conn.id}`,
+          icon: getDbIcon(iconType, iconColor, 22),
+          type: 'saved-query-group',
+          selectable: false,
+          isLeaf: false,
+          children: buildDatabaseGroups(connectionQueries, `all-saved-queries-connection-${conn.id}`),
+      });
+  });
+
+  if (unmatchedSavedQueries.length > 0) {
+      const groupedByOriginalConnection = new Map<string, SavedQuery[]>();
+      unmatchedSavedQueries.forEach((query) => {
+          const originalConnectionId = String(query.originalConnectionId || query.connectionId || '未知连接').trim() || '未知连接';
+          groupedByOriginalConnection.set(originalConnectionId, [
+              ...(groupedByOriginalConnection.get(originalConnectionId) || []),
+              query,
+          ]);
+      });
+      children.push({
+          title: '未匹配',
+          key: 'all-saved-queries-unmatched',
+          icon: <WarningOutlined />,
+          type: 'saved-query-group',
+          selectable: false,
+          isLeaf: false,
+          children: Array.from(groupedByOriginalConnection.entries()).map(([connectionLabel, items]) => ({
+              title: connectionLabel,
+              key: `all-saved-queries-unmatched-${encodeURIComponent(connectionLabel)}`,
+              icon: <FolderOpenOutlined />,
+              type: 'saved-query-group',
+              selectable: false,
+              isLeaf: false,
+              children: buildDatabaseGroups(items, `all-saved-queries-unmatched-${encodeURIComponent(connectionLabel)}`),
+          })),
+      });
   }
 
-  return `${normalized};`;
+  return {
+      title: '全部已存查询',
+      key: 'all-saved-queries',
+      icon: <FolderOpenOutlined />,
+      type: 'all-saved-queries',
+      isLeaf: false,
+      selectable: false,
+      children,
+  };
 };
 
 const Sidebar: React.FC<{
@@ -1034,6 +1148,7 @@ const Sidebar: React.FC<{
   const sqlLogs = useStore(state => state.sqlLogs) || [];
   const shortcutOptions = useStore(state => state.shortcutOptions);
   const languagePreference = useStore(state => state.languagePreference);
+  const setAppearance = useStore(state => state.setAppearance);
   const setAIPanelVisible = useStore(state => state.setAIPanelVisible);
   const addAIContext = useStore(state => state.addAIContext);
   void languagePreference;
@@ -1047,6 +1162,7 @@ const Sidebar: React.FC<{
   const focusSidebarSearchShortcutTokens = focusSidebarSearchShortcut === '-'
       ? []
       : focusSidebarSearchShortcut.match(/Ctrl|Alt|Shift|Esc|Space|[⌘⌃⌥⇧↵↑↓←→]|[^+]/g) ?? [];
+  const isV2Ui = (uiVersion ?? appearance.uiVersion) === 'v2';
   const [treeData, setTreeData] = useState<TreeNode[]>([]);
   const activeTab = useMemo(() => tabs.find(tab => tab.id === activeTabId) || null, [tabs, activeTabId]);
   const activeTabLocateRequest = useMemo(() => normalizeSidebarLocateObjectRequestFromTab(activeTab), [activeTab]);
@@ -1102,7 +1218,11 @@ const Sidebar: React.FC<{
           </div>
       </div>
   );
-  const [searchValue, setSearchValue] = useState('');
+  const v2SidebarSearchMode = appearance.v2SidebarSearchMode ?? 'command';
+  const v2UseLegacySidebarFilter = isV2Ui && v2SidebarSearchMode === 'filter';
+  const v2CommandSearchPersistentFilterEnabled = appearance.v2CommandSearchPersistentFilterEnabled === true;
+  const v2PersistedSidebarFilter = appearance.v2SidebarPersistedFilter ?? '';
+  const [searchValue, setSearchValue] = useState(v2PersistedSidebarFilter);
   const deferredSearchValue = useDeferredValue(searchValue);
   const [searchScopes, setSearchScopes] = useState<SearchScope[]>(['smart']);
   const [v2ExplorerFilter, setV2ExplorerFilter] = useState<V2ExplorerFilter>('all');
@@ -1111,6 +1231,7 @@ const Sidebar: React.FC<{
   const commandSearchInputRef = useRef<any>(null);
   const [isV2CommandSearchOpen, setIsV2CommandSearchOpen] = useState(false);
   const [v2CommandSearchValue, setV2CommandSearchValue] = useState('');
+  const deferredV2CommandSearchValue = useDeferredValue(v2CommandSearchValue);
   const [v2CommandActiveIndex, setV2CommandActiveIndex] = useState(0);
   const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
   const [autoExpandParent, setAutoExpandParent] = useState(true);
@@ -1129,13 +1250,24 @@ const Sidebar: React.FC<{
       selectedNodes: [],
       activeContext: null,
   });
-  const driverStatusCacheRef = useRef<{ fetchedAt: number; items: Record<string, DriverStatusSnapshot> } | null>(null);
-  const driverUpdateWarningKeysRef = useRef<Set<string>>(new Set());
   const connectionReloadSignaturesRef = useRef<Record<string, string>>({});
+  const driverStatusCacheRef = useRef<{
+      fetchedAt: number;
+      items: Record<string, DriverStatusSnapshot>;
+  } | null>(null);
+  const driverUpdateWarningKeysRef = useRef<Set<string>>(new Set());
   const [contextMenu, setContextMenu] = useState<SidebarContextMenuState | null>(null);
   const contextMenuPortalRef = useRef<HTMLDivElement | null>(null);
   const [v2TableContextMenuStats, setV2TableContextMenuStats] = useState<Record<string, V2TableContextMenuStats>>({});
   const connectionIds = useMemo(() => connections.map((conn) => conn.id), [connections]);
+  const connectionIdSet = useMemo(() => new Set(connectionIds), [connectionIds]);
+  const unmatchedSavedQueries = useMemo(
+      () => savedQueries.filter((query) => isSavedQueryUnmatchedForConnectionIds(query, connectionIdSet)),
+      [connectionIdSet, savedQueries],
+  );
+  const allSavedQueriesNode = useMemo<TreeNode | null>(() => {
+      return buildAllSavedQueriesTreeNode(savedQueries, connections);
+  }, [connections, savedQueries]);
   const v2RailConnectionGroups = useMemo(
       () => buildV2RailConnectionGroups(connections, connectionTags, sidebarRootOrder),
       [connections, connectionTags, sidebarRootOrder],
@@ -1169,17 +1301,88 @@ const Sidebar: React.FC<{
       setV2CommandActiveIndex(0);
   }, []);
 
+  const commitV2CommandSearchPersistentFilter = useCallback((value = v2CommandSearchValue) => {
+      if (!v2CommandSearchPersistentFilterEnabled) {
+          return;
+      }
+      const nextFilter = value.trim();
+      setSearchValue(nextFilter);
+      if (nextFilter !== v2PersistedSidebarFilter) {
+          setAppearance({ v2SidebarPersistedFilter: nextFilter });
+      }
+  }, [setAppearance, v2CommandSearchPersistentFilterEnabled, v2CommandSearchValue, v2PersistedSidebarFilter]);
+
   const closeV2CommandSearch = useCallback(() => {
+      commitV2CommandSearchPersistentFilter();
       setIsV2CommandSearchOpen(false);
       setV2CommandSearchValue('');
       setV2CommandActiveIndex(0);
+  }, [commitV2CommandSearchPersistentFilter]);
+
+  useEffect(() => {
+      setSearchValue(v2PersistedSidebarFilter);
+  }, [v2PersistedSidebarFilter]);
+
+  useEffect(() => {
+      if (!v2UseLegacySidebarFilter) {
+          return;
+      }
+      const nextFilter = searchValue.trim();
+      if (nextFilter !== v2PersistedSidebarFilter) {
+          setAppearance({ v2SidebarPersistedFilter: nextFilter });
+      }
+  }, [searchValue, setAppearance, v2PersistedSidebarFilter, v2UseLegacySidebarFilter]);
+
+  const handleV2CommandSearchValueChange = useCallback((value: string) => {
+      setV2CommandSearchValue(value);
   }, []);
+
+  useEffect(() => {
+      if (!v2CommandSearchPersistentFilterEnabled) {
+          return;
+      }
+      if (!isV2CommandSearchOpen) {
+          return;
+      }
+      const nextFilter = resolveV2CommandSearchPersistentFilter({
+          commandSearchValue: deferredV2CommandSearchValue,
+          persistedFilter: v2PersistedSidebarFilter,
+          enabled: v2CommandSearchPersistentFilterEnabled,
+          isOpen: isV2CommandSearchOpen,
+      });
+      setSearchValue(nextFilter);
+      const timer = window.setTimeout(() => {
+          setAppearance({ v2SidebarPersistedFilter: nextFilter });
+      }, 160);
+      return () => window.clearTimeout(timer);
+  }, [deferredV2CommandSearchValue, isV2CommandSearchOpen, setAppearance, v2CommandSearchPersistentFilterEnabled, v2PersistedSidebarFilter]);
+
+  const toggleV2CommandSearchPersistentFilter = useCallback((enabled: boolean) => {
+      const nextFilter = enabled ? v2CommandSearchValue.trim() : '';
+      setSearchValue(nextFilter);
+      setAppearance({
+          v2CommandSearchPersistentFilterEnabled: enabled,
+          v2SidebarPersistedFilter: nextFilter,
+      });
+      message.success(enabled ? '已开启左侧筛选同步' : '已关闭左侧筛选同步');
+  }, [setAppearance, v2CommandSearchValue]);
+
+  const resetV2SidebarFilter = useCallback(() => {
+      setSearchValue('');
+      setAppearance({
+          v2CommandSearchPersistentFilterEnabled: false,
+          v2SidebarPersistedFilter: '',
+      });
+      message.success('已重置侧栏筛选');
+  }, [setAppearance]);
   
   // Virtual Scroll State
   const [treeHeight, setTreeHeight] = useState(500);
+  const [treeViewportWidth, setTreeViewportWidth] = useState(0);
   const treeContainerRef = useRef<HTMLDivElement>(null);
   const treeRef = useRef<any>(null);
   const treeDataRef = useRef<TreeNode[]>([]);
+  const externalSQLDirectoryTreesRef = useRef<Record<string, ExternalSQLTreeEntry[]>>({});
   const findTreeNodeByKeyRef = useRef<(nodes: TreeNode[], targetKey: React.Key) => TreeNode | null>(() => null);
   const expandConnectionFromRailRef = useRef<(connectionId: string) => void>(() => {});
   useEffect(() => {
@@ -1191,6 +1394,7 @@ const Sidebar: React.FC<{
       const resizeObserver = new ResizeObserver(entries => {
           for (let entry of entries) {
               setTreeHeight(entry.contentRect.height);
+              setTreeViewportWidth(entry.contentRect.width);
           }
       });
       resizeObserver.observe(treeContainerRef.current);
@@ -1199,7 +1403,7 @@ const Sidebar: React.FC<{
 
   useEffect(() => {
       const handleFocusSidebarSearch = () => {
-          if ((uiVersion ?? appearance.uiVersion) === 'v2') {
+          if (isV2Ui && !v2UseLegacySidebarFilter) {
               openV2CommandSearch();
               return;
           }
@@ -1214,7 +1418,7 @@ const Sidebar: React.FC<{
       return () => {
           window.removeEventListener('gonavi:focus-sidebar-search', handleFocusSidebarSearch as EventListener);
       };
-  }, [appearance.uiVersion, openV2CommandSearch, uiVersion]);
+  }, [isV2Ui, openV2CommandSearch, v2UseLegacySidebarFilter]);
 
   useEffect(() => {
       if (!isV2CommandSearchOpen) return;
@@ -1225,6 +1429,20 @@ const Sidebar: React.FC<{
       }, 0);
       return () => window.clearTimeout(timer);
   }, [isV2CommandSearchOpen]);
+
+  useEffect(() => {
+      if (!isV2CommandSearchOpen) return;
+      const handleV2CommandSearchGlobalKeyDown = (event: KeyboardEvent) => {
+          if (!shouldCloseV2CommandSearchOnGlobalKey({ key: event.key, isOpen: isV2CommandSearchOpen })) {
+              return;
+          }
+          event.preventDefault();
+          event.stopPropagation();
+          closeV2CommandSearch();
+      };
+      window.addEventListener('keydown', handleV2CommandSearchGlobalKeyDown, true);
+      return () => window.removeEventListener('keydown', handleV2CommandSearchGlobalKeyDown, true);
+  }, [closeV2CommandSearch, isV2CommandSearchOpen]);
   
   // Connection Status State: key -> 'success' | 'error'
   const [connectionStates, setConnectionStates] = useState<Record<string, 'success' | 'error'>>({});
@@ -1237,18 +1455,26 @@ const Sidebar: React.FC<{
   const [isCreateSchemaModalOpen, setIsCreateSchemaModalOpen] = useState(false);
   const [createSchemaForm] = Form.useForm();
   const [createSchemaTarget, setCreateSchemaTarget] = useState<any>(null);
+  const [isRenameSchemaModalOpen, setIsRenameSchemaModalOpen] = useState(false);
+  const [renameSchemaForm] = Form.useForm();
+  const [renameSchemaTarget, setRenameSchemaTarget] = useState<any>(null);
   const [isRenameDbModalOpen, setIsRenameDbModalOpen] = useState(false);
   const [renameDbForm] = Form.useForm();
   const [renameDbTarget, setRenameDbTarget] = useState<any>(null);
   const [isRenameTableModalOpen, setIsRenameTableModalOpen] = useState(false);
   const [renameTableForm] = Form.useForm();
   const [renameTableTarget, setRenameTableTarget] = useState<any>(null);
+  const [messagePublishTarget, setMessagePublishTarget] = useState<SidebarMessagePublishTarget | null>(null);
   const [isRenameViewModalOpen, setIsRenameViewModalOpen] = useState(false);
   const [renameViewForm] = Form.useForm();
   const [renameViewTarget, setRenameViewTarget] = useState<any>(null);
   const [isRenameSavedQueryModalOpen, setIsRenameSavedQueryModalOpen] = useState(false);
   const [renameSavedQueryForm] = Form.useForm();
   const [renameSavedQueryTarget, setRenameSavedQueryTarget] = useState<SavedQuery | null>(null);
+  const [isExternalSQLFileModalOpen, setIsExternalSQLFileModalOpen] = useState(false);
+  const [externalSQLFileForm] = Form.useForm();
+  const [externalSQLFileModalMode, setExternalSQLFileModalMode] = useState<ExternalSQLFileModalMode>('create');
+  const [externalSQLFileTarget, setExternalSQLFileTarget] = useState<any>(null);
 
   // Connection Tag Modals
   const [isCreateTagModalOpen, setIsCreateTagModalOpen] = useState(false);
@@ -1325,7 +1551,7 @@ const Sidebar: React.FC<{
               loadTables(node);
           }
       });
-  }, [autoFetchVisible, externalSQLDirectories, savedQueries]);
+  }, [autoFetchVisible, savedQueries]);
 
   useEffect(() => {
     const previousSignatures = connectionReloadSignaturesRef.current;
@@ -1457,9 +1683,13 @@ const Sidebar: React.FC<{
 
       orderedNodes.push(...Array.from(tagNodesById.values()));
       orderedNodes.push(...Array.from(ungroupedNodesById.values()));
-      return orderedNodes;
+      if (allSavedQueriesNode) {
+        orderedNodes.push(allSavedQueriesNode);
+      }
+      const externalSQLRootNode = prev.find((node) => node.type === 'external-sql-root');
+      return externalSQLRootNode ? [...orderedNodes, externalSQLRootNode] : orderedNodes;
     });
-  }, [connections, connectionTags, sidebarRootOrder]);
+  }, [connections, connectionTags, sidebarRootOrder, allSavedQueriesNode]);
 
   const handleDuplicateConnection = async (conn: SavedConnection) => {
     if (!conn?.id) return;
@@ -1565,6 +1795,51 @@ const Sidebar: React.FC<{
     };
   };
 
+  const buildExternalSQLRootTreeNode = useCallback((
+      directories: ExternalSQLDirectory[] = externalSQLDirectories,
+      directoryTrees: Record<string, ExternalSQLTreeEntry[]> = externalSQLDirectoryTreesRef.current,
+  ): TreeNode => decorateExternalSQLTreeNode(buildExternalSQLRootNode({
+      directories,
+      directoryTrees,
+  })), [externalSQLDirectories]);
+
+  const refreshGlobalExternalSQLRootNode = useCallback(async (
+      showSuccess = false,
+      directoriesOverride?: ExternalSQLDirectory[],
+  ) => {
+      const targetDirectories = directoriesOverride || externalSQLDirectories;
+      const directoryTrees: Record<string, ExternalSQLTreeEntry[]> = {};
+      await Promise.all(targetDirectories.map(async (directory) => {
+          const directoryRes = await ListSQLDirectory(directory.path);
+          if (!directoryRes.success) {
+              message.warning({
+                  key: `external-sql-${directory.id}`,
+                  content: `SQL 目录读取失败: ${directory.name} (${directoryRes.message})`,
+              });
+              directoryTrees[directory.id] = [];
+              return;
+          }
+          directoryTrees[directory.id] = Array.isArray(directoryRes.data)
+              ? directoryRes.data as ExternalSQLTreeEntry[]
+              : [];
+      }));
+      externalSQLDirectoryTreesRef.current = directoryTrees;
+      const rootNode = buildExternalSQLRootTreeNode(targetDirectories, directoryTrees);
+      setTreeData((prev) => {
+          const withoutExternalRoot = prev.filter((node) => node.type !== 'external-sql-root');
+          const nextTreeData = [...withoutExternalRoot, rootNode];
+          treeDataRef.current = nextTreeData;
+          return nextTreeData;
+      });
+      if (showSuccess) {
+          message.success('外部 SQL 目录已刷新');
+      }
+  }, [buildExternalSQLRootTreeNode, externalSQLDirectories]);
+
+  useEffect(() => {
+      void refreshGlobalExternalSQLRootNode(false);
+  }, [refreshGlobalExternalSQLRootNode]);
+
   const getNodeDatabaseContext = (node: any): { connectionId: string; dbName: string; dbNodeKey: string } | null => {
     if (!node) return null;
     if (node.type === 'database') {
@@ -1597,6 +1872,7 @@ const Sidebar: React.FC<{
       'highgo',
       'vastbase',
       'opengauss',
+      'gaussdb',
       'open_gauss',
       'open-gauss',
       'sqlserver',
@@ -1611,6 +1887,7 @@ const Sidebar: React.FC<{
       'highgo',
       'vastbase',
       'opengauss',
+      'gaussdb',
       'open_gauss',
       'open-gauss',
       'sqlserver',
@@ -1632,23 +1909,16 @@ const Sidebar: React.FC<{
       const rawName = String(tableName || '').trim();
       if (!rawName) return rawName;
       if (!shouldHideSchemaPrefix(conn)) return rawName;
-      const lastDotIndex = rawName.lastIndexOf('.');
-      if (lastDotIndex <= 0 || lastDotIndex >= rawName.length - 1) return rawName;
-      return rawName.substring(lastDotIndex + 1);
+      const parsed = splitQualifiedName(rawName);
+      return parsed.objectName || rawName;
   };
 
   const getMetadataDialect = (conn: SavedConnection | undefined): string => {
-      const type = normalizeDriverType(String(conn?.config?.type || '').trim());
-      if (type === 'custom') {
-          const driver = normalizeDriverType(String(conn?.config?.driver || '').trim());
-          if (driver === 'diros' || driver === 'doris') return 'mysql';
-          if (driver === 'oceanbase') return normalizeOceanBaseProtocol(conn?.config?.oceanBaseProtocol) === 'oracle' ? 'oracle' : 'mysql';
-          return driver;
-      }
-      if (type === 'oceanbase' && normalizeOceanBaseProtocol(conn?.config?.oceanBaseProtocol) === 'oracle') return 'oracle';
-      if (type === 'mariadb' || type === 'oceanbase' || type === 'diros' || type === 'sphinx') return 'mysql';
-      if (type === 'dameng') return 'dm';
-      return type;
+      return resolveSidebarMetadataDialect(
+          conn?.config?.type || '',
+          conn?.config?.driver || '',
+          conn?.config?.oceanBaseProtocol,
+      );
   };
 
   const supportsDatabaseEvents = (conn: SavedConnection | undefined): boolean => {
@@ -1725,6 +1995,19 @@ const Sidebar: React.FC<{
       return '';
   };
 
+  const extractSqlServerDefinitionRows = (rows: any[], definitionKeys: string[]): string => {
+      if (!Array.isArray(rows) || rows.length === 0) return '';
+      const directDefinition = getCaseInsensitiveRawValue(rows[0] as Record<string, any>, definitionKeys);
+      if (directDefinition !== undefined && directDefinition !== null && String(directDefinition).trim() !== '') {
+          return String(directDefinition);
+      }
+      return rows
+          .map((row) => getCaseInsensitiveRawValue(row as Record<string, any>, ['Text', 'text']))
+          .filter((value) => value !== undefined && value !== null)
+          .map((value) => String(value))
+          .join('');
+  };
+
   const getMySQLShowTablesName = (row: Record<string, any>): string => {
       for (const key of Object.keys(row || {})) {
           if (!key.toLowerCase().startsWith('tables_in_')) continue;
@@ -1766,6 +2049,7 @@ const Sidebar: React.FC<{
           case 'vastbase':
           case 'highgo':
           case 'opengauss':
+          case 'gaussdb':
               return [
                   "SELECT n.nspname || '.' || c.relname AS table_name, c.reltuples::bigint AS table_rows",
                   'FROM pg_class c',
@@ -1819,16 +2103,19 @@ const Sidebar: React.FC<{
       return `${schema}.${name}`;
   };
 
+  const buildSidebarObjectKeyName = (dbName: string, schemaName: string, objectName: string): string => {
+      const schema = String(schemaName || '').trim();
+      const name = String(objectName || '').trim();
+      if (!schema || !name || name.includes('.')) return name;
+      if (schema.toLowerCase() === String(dbName || '').trim().toLowerCase()) return name;
+      return `${schema}.${name}`;
+  };
+
   const splitQualifiedName = (qualifiedName: string): { schemaName: string; objectName: string } => {
-      const raw = String(qualifiedName || '').trim();
-      if (!raw) return { schemaName: '', objectName: '' };
-      const idx = raw.lastIndexOf('.');
-      if (idx <= 0 || idx >= raw.length - 1) {
-          return { schemaName: '', objectName: raw };
-      }
+      const parsed = splitQualifiedNameLast(qualifiedName);
       return {
-          schemaName: raw.substring(0, idx),
-          objectName: raw.substring(idx + 1),
+          schemaName: parsed.parentPath,
+          objectName: parsed.objectName,
       };
   };
 
@@ -1875,22 +2162,16 @@ const Sidebar: React.FC<{
       switch (dialect) {
           case 'mysql':
           case 'starrocks': {
-              const dbIdent = String(dbName || '').replace(/`/g, '``').trim();
-              return normalizeMetadataQuerySpecs([
-                  {
-                      sql: safeDbName
-                          ? `SELECT TABLE_NAME AS view_name, TABLE_SCHEMA AS schema_name FROM information_schema.views WHERE table_schema = '${safeDbName}' ORDER BY TABLE_NAME`
-                          : '',
-                  },
-                  { sql: dbIdent ? `SHOW FULL TABLES FROM \`${dbIdent}\`` : '' },
-                  { sql: `SHOW FULL TABLES` },
-              ]);
+              return normalizeMetadataQuerySpecs(
+                  buildMySQLCompatibleViewMetadataSqls(dbName).map((sql) => ({ sql })),
+              );
           }
           case 'postgres':
           case 'kingbase':
           case 'highgo':
           case 'vastbase':
           case 'opengauss':
+          case 'gaussdb':
               return [{ sql: `SELECT schemaname AS schema_name, viewname AS view_name FROM pg_catalog.pg_views WHERE schemaname != 'information_schema' AND schemaname NOT LIKE 'pg|_%' ESCAPE '|' ORDER BY schemaname, viewname` }];
           case 'sqlserver': {
               const safeDb = quoteSqlServerIdentifier(dbName || 'master');
@@ -1937,6 +2218,7 @@ const Sidebar: React.FC<{
           case 'highgo':
           case 'vastbase':
           case 'opengauss':
+          case 'gaussdb':
               return [{ sql: `SELECT DISTINCT event_object_schema AS schema_name, event_object_table AS table_name, trigger_name FROM information_schema.triggers WHERE trigger_schema NOT IN ('pg_catalog', 'information_schema') AND trigger_schema NOT LIKE 'pg|_%' ESCAPE '|' ORDER BY event_object_schema, event_object_table, trigger_name` }];
           case 'sqlserver': {
               const safeDb = quoteSqlServerIdentifier(dbName || 'master');
@@ -1986,6 +2268,7 @@ const Sidebar: React.FC<{
           case 'highgo':
           case 'vastbase':
           case 'opengauss':
+          case 'gaussdb':
               return normalizeMetadataQuerySpecs([
                   {
                       // PostgreSQL 11+ / 部分 PG-like：通过 prokind 区分 FUNCTION/PROCEDURE
@@ -2082,27 +2365,29 @@ const Sidebar: React.FC<{
       return { results, hasSuccessfulQuery };
   };
 
-  const loadViews = async (conn: any, dbName: string): Promise<{ views: string[]; supported: boolean }> => {
+  const loadViews = async (conn: any, dbName: string): Promise<{ views: SidebarViewMetadataEntry[]; supported: boolean }> => {
       const savedConn = conn as SavedConnection;
       const dialect = getMetadataDialect(savedConn);
       const querySpecs = buildViewsMetadataQuerySpecs(dialect, dbName);
       const { results, hasSuccessfulQuery } = await queryMetadataRowsBySpecs(conn, dbName, querySpecs);
       const seen = new Set<string>();
-      const views: string[] = [];
+      const views: SidebarViewMetadataEntry[] = [];
 
       results.forEach((queryResult) => {
           queryResult.rows.forEach((row) => {
               const tableType = getCaseInsensitiveValue(row, ['table_type', 'table type', 'type']);
-              if (tableType && tableType.toUpperCase() !== 'VIEW') return;
+              if (!isSidebarViewTableType(tableType)) return;
               const schemaName = getCaseInsensitiveValue(row, ['schema_name', 'schemaname', 'owner', 'table_schema', 'db']);
               const viewName =
                   getCaseInsensitiveValue(row, ['view_name', 'viewname', 'table_name', 'name'])
                   || getMySQLShowTablesName(row)
                   || getFirstRowValue(row);
-              const fullName = normalizeSidebarViewName(dialect, dbName, schemaName, viewName);
-              if (!fullName || seen.has(fullName)) return;
-              seen.add(fullName);
-              views.push(fullName);
+              const entry = normalizeSidebarViewMetadataEntry(dialect, dbName, schemaName, viewName);
+              if (!entry) return;
+              const uniqueKey = `${entry.schemaName.toLowerCase()}@@${entry.viewName.toLowerCase()}`;
+              if (seen.has(uniqueKey)) return;
+              seen.add(uniqueKey);
+              views.push(entry);
           });
       });
       return { views, supported: hasSuccessfulQuery };
@@ -2111,7 +2396,7 @@ const Sidebar: React.FC<{
   const loadStarRocksMaterializedViews = async (
       conn: any,
       dbName: string
-  ): Promise<{ views: string[]; supported: boolean }> => {
+  ): Promise<{ views: SidebarViewMetadataEntry[]; supported: boolean }> => {
       const dialect = getMetadataDialect(conn as SavedConnection);
       if (dialect !== 'starrocks') {
           return { views: [], supported: false };
@@ -2130,7 +2415,7 @@ const Sidebar: React.FC<{
       ]);
       const { results, hasSuccessfulQuery } = await queryMetadataRowsBySpecs(conn, dbName, querySpecs);
       const seen = new Set<string>();
-      const views: string[] = [];
+      const views: SidebarViewMetadataEntry[] = [];
 
       results.forEach((queryResult) => {
           queryResult.rows.forEach((row) => {
@@ -2138,10 +2423,12 @@ const Sidebar: React.FC<{
               const viewName =
                   getCaseInsensitiveValue(row, ['object_name', 'view_name', 'table_name', 'name', 'materialized_view_name', 'mv_name'])
                   || getFirstRowValue(row);
-              const fullName = normalizeSidebarViewName(dialect, dbName, schemaName, viewName);
-              if (!fullName || seen.has(fullName)) return;
-              seen.add(fullName);
-              views.push(fullName);
+              const entry = normalizeSidebarViewMetadataEntry(dialect, dbName, schemaName, viewName);
+              if (!entry) return;
+              const uniqueKey = `${entry.schemaName.toLowerCase()}@@${entry.viewName.toLowerCase()}`;
+              if (seen.has(uniqueKey)) return;
+              seen.add(uniqueKey);
+              views.push(entry);
           });
       });
 
@@ -2337,10 +2624,8 @@ const Sidebar: React.FC<{
 	          console.warn('检查驱动代理更新状态失败', error);
 	      }
 	  };
-
 		  const loadDatabases = async (node: any) => {
 		      const conn = node.dataRef as SavedConnection;
-		      void warnIfConnectionDriverAgentNeedsUpdate(conn);
 		      const loadKey = `dbs-${conn.id}`;
 	      if (loadingNodesRef.current.has(loadKey)) return;
 	      loadingNodesRef.current.add(loadKey);
@@ -2566,8 +2851,6 @@ const Sidebar: React.FC<{
       loadingNodesRef.current.add(loadKey);
       
       const dbQueries = savedQueries.filter(q => q.connectionId === conn.id && q.dbName === dbName);
-      const dbExternalSQLDirectories = useStore.getState().externalSQLDirectories.filter(directory => directory.connectionId === conn.id && directory.dbName === dbName);
-      
       const queriesNode: TreeNode = {
           title: t('sidebar.tree.saved_queries'),
           key: `${key}-queries`,
@@ -2636,7 +2919,7 @@ const Sidebar: React.FC<{
 	                loadDatabaseEvents(conn, conn.dbName),
 	            ]);
                 const externalSQLDirectoryResults = await Promise.all(
-                    dbExternalSQLDirectories.map(async (directory) => {
+                    externalSQLDirectories.map(async (directory: ExternalSQLDirectory) => {
                         const directoryRes = await ListSQLDirectory(directory.path);
                         if (!directoryRes.success) {
                             message.warning({
@@ -2662,36 +2945,35 @@ const Sidebar: React.FC<{
                     dbNodeKey: String(key),
                     connectionId: String(conn.id),
                     dbName: String(conn.dbName),
-                    directories: dbExternalSQLDirectories,
+                    directories: externalSQLDirectories,
                     directoryTrees: externalSQLTrees,
                     labels: {
                         root: t('sidebar.external_sql.root'),
                         directoryFallback: t('sidebar.external_sql.directory_fallback'),
                     },
                 }));
-
-            const viewRows: string[] = Array.isArray(viewsResult.views) ? viewsResult.views : [];
-            const materializedViewRows: string[] = Array.isArray(materializedViewsResult.views) ? materializedViewsResult.views : [];
+            const viewRows: SidebarViewMetadataEntry[] = Array.isArray(viewsResult.views) ? viewsResult.views : [];
+            const materializedViewRows: SidebarViewMetadataEntry[] = Array.isArray(materializedViewsResult.views) ? materializedViewsResult.views : [];
             const triggerRows: any[] = Array.isArray(triggersResult.triggers) ? triggersResult.triggers : [];
             const routineRows: any[] = Array.isArray(routinesResult.routines) ? routinesResult.routines : [];
             const eventRows: any[] = Array.isArray(eventsResult.events) ? eventsResult.events : [];
             const schemaRows: string[] = Array.isArray(schemasResult.schemas) ? schemasResult.schemas : [];
 
-            const viewEntries = viewRows.map((viewName: string) => {
-                const parsed = splitQualifiedName(viewName);
+            const viewEntries = viewRows.map((entry: SidebarViewMetadataEntry) => {
+                const parsed = splitQualifiedName(entry.viewName);
                 return {
-                    viewName,
-	                    schemaName: parsed.schemaName,
-	                    displayName: getSidebarTableDisplayName(conn, viewName),
+                    viewName: entry.viewName,
+	                    schemaName: entry.schemaName || parsed.schemaName,
+	                    displayName: getSidebarTableDisplayName(conn, entry.viewName),
 	                };
 	            });
 
-            const materializedViewEntries = materializedViewRows.map((viewName: string) => {
-                const parsed = splitQualifiedName(viewName);
+            const materializedViewEntries = materializedViewRows.map((entry: SidebarViewMetadataEntry) => {
+                const parsed = splitQualifiedName(entry.viewName);
                 return {
-                    viewName,
-                    schemaName: parsed.schemaName,
-                    displayName: getSidebarTableDisplayName(conn, viewName),
+                    viewName: entry.viewName,
+                    schemaName: entry.schemaName || parsed.schemaName,
+                    displayName: getSidebarTableDisplayName(conn, entry.viewName),
                 };
             });
 
@@ -2808,30 +3090,36 @@ const Sidebar: React.FC<{
 	                };
 	            };
 
-	            const buildViewNode = (entry: { viewName: string; schemaName: string; displayName: string }): TreeNode => ({
-	                title: entry.displayName,
-	                key: `${conn.id}-${conn.dbName}-view-${entry.viewName}`,
-	                icon: <EyeOutlined />,
-	                type: 'view',
-	                dataRef: { ...conn, viewName: entry.viewName, tableName: entry.viewName, schemaName: entry.schemaName },
-	                isLeaf: true,
-	            });
+	            const buildViewNode = (entry: { viewName: string; schemaName: string; displayName: string }): TreeNode => {
+	                const keyName = buildSidebarObjectKeyName(conn.dbName, entry.schemaName, entry.viewName);
+	                return {
+	                    title: entry.displayName,
+	                    key: `${conn.id}-${conn.dbName}-view-${keyName}`,
+	                    icon: <EyeOutlined />,
+	                    type: 'view',
+	                    dataRef: { ...conn, viewName: entry.viewName, tableName: entry.viewName, schemaName: entry.schemaName },
+	                    isLeaf: true,
+	                };
+	            };
 
-	            const buildMaterializedViewNode = (entry: { viewName: string; schemaName: string; displayName: string }): TreeNode => ({
-	                title: entry.displayName,
-	                key: `${conn.id}-${conn.dbName}-materialized-view-${entry.viewName}`,
-	                icon: <ThunderboltOutlined />,
-	                type: 'materialized-view',
-	                dataRef: { ...conn, viewName: entry.viewName, tableName: entry.viewName, schemaName: entry.schemaName, objectKind: 'materialized-view' },
-	                isLeaf: true,
-	            });
+	            const buildMaterializedViewNode = (entry: { viewName: string; schemaName: string; displayName: string }): TreeNode => {
+	                const keyName = buildSidebarObjectKeyName(conn.dbName, entry.schemaName, entry.viewName);
+	                return {
+	                    title: entry.displayName,
+	                    key: `${conn.id}-${conn.dbName}-materialized-view-${keyName}`,
+	                    icon: <ThunderboltOutlined />,
+	                    type: 'materialized-view',
+	                    dataRef: { ...conn, viewName: entry.viewName, tableName: entry.viewName, schemaName: entry.schemaName, objectKind: 'materialized-view' },
+	                    isLeaf: true,
+	                };
+	            };
 
 	            const buildTriggerNode = (entry: { triggerName: string; tableName: string; schemaName: string; displayName: string }): TreeNode => ({
 	                title: entry.displayName,
 	                key: `${conn.id}-${conn.dbName}-trigger-${entry.triggerName}-${entry.tableName}`,
 	                icon: <FunctionOutlined />,
 	                type: 'db-trigger',
-	                dataRef: { ...conn, triggerName: entry.triggerName, triggerTableName: entry.tableName, schemaName: entry.schemaName },
+	                dataRef: { ...conn, triggerName: entry.triggerName, triggerTableName: entry.tableName, tableName: entry.tableName, schemaName: entry.schemaName },
 	                isLeaf: true,
 	            });
 
@@ -2952,7 +3240,7 @@ const Sidebar: React.FC<{
 	                        };
 	                    });
 
-	                replaceTreeNodeChildren(key, [queriesNode, externalSQLRootNode, ...schemaNodes]);
+	                replaceTreeNodeChildren(key, [queriesNode, ...schemaNodes]);
 	            } else {
 	                const includeMaterializedViews = getMetadataDialect(conn as SavedConnection) === 'starrocks';
 	                const includeEvents = supportsDatabaseEvents(conn as SavedConnection);
@@ -2965,7 +3253,7 @@ const Sidebar: React.FC<{
 	                    ...(includeEvents ? [buildObjectGroup(key as string, 'events', '事件', <ClockCircleOutlined />, eventEntries.map(buildEventNode))] : []),
 	                ];
 
-	                replaceTreeNodeChildren(key, [queriesNode, externalSQLRootNode, ...groupedNodes]);
+	                replaceTreeNodeChildren(key, [queriesNode, ...groupedNodes]);
 	            }
 	          } else {
 	            setConnectionStates(prev => ({ ...prev, [key as string]: 'error' }));
@@ -2981,10 +3269,11 @@ const Sidebar: React.FC<{
 
   const locateObjectInSidebarRef = useRef<(detail: unknown) => Promise<void>>(async () => {});
 
-  const waitForSidebarLoadKey = async (loadKey: string) => {
-      for (let attempt = 0; attempt < 30 && loadingNodesRef.current.has(loadKey); attempt += 1) {
-          await new Promise(resolve => window.setTimeout(resolve, 50));
+  const waitForSidebarLoadKey = async (loadKey: string): Promise<boolean> => {
+      for (let attempt = 0; attempt < SIDEBAR_LOCATE_LOAD_WAIT_ATTEMPTS && loadingNodesRef.current.has(loadKey); attempt += 1) {
+          await new Promise(resolve => window.setTimeout(resolve, SIDEBAR_LOCATE_LOAD_WAIT_INTERVAL_MS));
       }
+      return !loadingNodesRef.current.has(loadKey);
   };
 
   const locateObjectInSidebar = async (detail: unknown) => {
@@ -2994,6 +3283,29 @@ const Sidebar: React.FC<{
           return;
       }
 
+      if (request.objectGroup === 'externalSqlFiles') {
+          await refreshGlobalExternalSQLRootNode(false);
+          const target = resolveSidebarLocateTarget(request, { groupBySchema: false });
+          const path = findSidebarNodePathForLocate(treeDataRef.current as SidebarLocateTreeNodeLike[], target);
+          if (!path) {
+              message.warning(`SQL 文件未在外部 SQL 目录中找到：${request.filePath}`);
+              return;
+          }
+          const targetKey = path[path.length - 1];
+          const targetNode = findTreeNodeByKey(treeDataRef.current, targetKey);
+          setSearchValue('');
+          mergeExpandedTreeKeys(path.slice(0, -1));
+          setSelectedKeys([targetKey]);
+          selectedNodesRef.current = targetNode ? [targetNode] : [];
+          const connectionId = String(request.connectionId || activeContext?.connectionId || activeTab?.connectionId || '').trim();
+          const dbName = String(request.dbName || activeContext?.dbName || activeTab?.dbName || '').trim();
+          if (connectionId) {
+              setActiveContext({ connectionId, dbName });
+          }
+          scrollSidebarTreeToKey(targetKey);
+          return;
+      }
+
       const conn = connections.find(item => item.id === request.connectionId);
       if (!conn) {
           message.warning('未找到当前表对应的连接');
@@ -3003,7 +3315,15 @@ const Sidebar: React.FC<{
       const target = resolveSidebarLocateTarget(request, {
           groupBySchema: shouldHideSchemaPrefix(conn),
       });
-      const objectLabel = request.objectGroup === 'materializedViews' ? '物化视图' : (request.objectGroup === 'views' ? '视图' : '表');
+      const objectLabel = request.objectGroup === 'materializedViews'
+          ? '物化视图'
+          : request.objectGroup === 'views'
+              ? '视图'
+              : request.objectGroup === 'triggers'
+                  ? '触发器'
+                  : request.objectGroup === 'routines'
+                      ? '函数/存储过程'
+                      : '表';
 
       let path = findSidebarNodePathForLocate(treeDataRef.current as SidebarLocateTreeNodeLike[], target);
       const dbLoadKey = `dbs-${request.connectionId}`;
@@ -3016,7 +3336,11 @@ const Sidebar: React.FC<{
               return;
           }
           if (loadingNodesRef.current.has(dbLoadKey)) {
-              await waitForSidebarLoadKey(dbLoadKey);
+              const loaded = await waitForSidebarLoadKey(dbLoadKey);
+              if (!loaded) {
+                  message.info(`数据库节点仍在加载中：${request.dbName}，请稍后再试`);
+                  return;
+              }
           } else {
               await loadDatabases(connectionNode);
           }
@@ -3031,7 +3355,11 @@ const Sidebar: React.FC<{
       path = findSidebarNodePathForLocate(treeDataRef.current as SidebarLocateTreeNodeLike[], target);
       if (!path) {
           if (loadingNodesRef.current.has(tableLoadKey)) {
-              await waitForSidebarLoadKey(tableLoadKey);
+              const loaded = await waitForSidebarLoadKey(tableLoadKey);
+              if (!loaded) {
+                  message.info(`${objectLabel}所在数据库对象仍在加载中：${request.dbName}，请稍后再试`);
+                  return;
+              }
           } else {
               await loadTables(dbNode);
           }
@@ -3093,7 +3421,7 @@ const Sidebar: React.FC<{
   }, []);
 
   const onLoadData = async ({ key, children, dataRef, type }: any) => {
-    if (type === 'tag') return;
+    if (type === 'tag' || type === 'all-saved-queries' || type === 'saved-query-group' || type === 'unmatched-saved-queries') return;
     if (hasSidebarLazyChildren(children)) return;
 
     if (type === 'connection') {
@@ -3102,6 +3430,8 @@ const Sidebar: React.FC<{
         await loadJVMResources({ key, dataRef });
     } else if (type === 'database') {
         await loadTables({ key, dataRef });
+    } else if (type === 'external-sql-root') {
+        await refreshGlobalExternalSQLRootNode(false);
     } else if (type === 'table') {
         // Expand table to show object categories
         const conn = dataRef; 
@@ -3145,22 +3475,34 @@ const Sidebar: React.FC<{
     }
   };
 
+  const isStructureOnlyDbType = (connectionId: string): boolean => {
+      const conn = connections.find(c => c.id === connectionId);
+      if (!conn) return false;
+      const dbType = resolveDataSourceType(conn.config);
+      return dbType === 'elasticsearch' || dbType === 'mongodb' || dbType === 'redis' || dbType === 'iotdb';
+  };
+
   const openDesign = (node: any, initialTab: string, readOnly: boolean = false) => {
       const { tableName, dbName, id } = node.dataRef;
+      const forceReadOnly = readOnly || isStructureOnlyDbType(id);
       addTab({
           id: `design-${id}-${dbName}-${tableName}`,
-          title: `${readOnly ? '表结构' : '设计表'} (${tableName})`,
+          title: `${forceReadOnly ? '表结构' : '设计表'} (${tableName})`,
           type: 'design',
           connectionId: id,
           dbName: dbName,
           tableName: tableName,
           initialTab: initialTab,
-          readOnly: readOnly
+          readOnly: forceReadOnly
       });
   };
 
   const openNewTableDesign = (node: any) => {
       const { dbName, id } = node.dataRef;
+      if (isStructureOnlyDbType(id)) {
+          message.warning('当前数据源暂不支持可视化新建表');
+          return;
+      }
       addTab({
           id: `new-table-${id}-${dbName}-${Date.now()}`,
           title: `新建表 - ${dbName}`,
@@ -3173,8 +3515,6 @@ const Sidebar: React.FC<{
       });
   };
 
-  const isV2Ui = (uiVersion ?? appearance.uiVersion) === 'v2';
-
   const onSelect = (keys: React.Key[], info: any) => {
       if (isV2Ui && info?.node?.type === 'v2-table-section') {
           return;
@@ -3212,8 +3552,6 @@ const Sidebar: React.FC<{
           setActiveContext({ connectionId: nodeConnectionId || dataRef.id, dbName: dataRef.dbName });
       } else if (type === 'saved-query') {
           setActiveContext({ connectionId: dataRef.connectionId, dbName: dataRef.dbName });
-      } else if (type === 'external-sql-root' || type === 'external-sql-directory' || type === 'external-sql-folder' || type === 'external-sql-file') {
-          setActiveContext({ connectionId: dataRef.connectionId, dbName: dataRef.dbName });
       } else if (type === 'redis-db') {
           setActiveContext({ connectionId: dataRef.id, dbName: `db${dataRef.redisDB}` });
       }
@@ -3272,7 +3610,6 @@ const Sidebar: React.FC<{
       } else if (type === 'table' || type === 'view' || type === 'materialized-view' || type === 'db-trigger' || type === 'db-event' || type === 'routine') {
           setActiveContext({ connectionId: nodeConnectionId || dataRef.id, dbName: dataRef.dbName });
       } else if (type === 'saved-query') setActiveContext({ connectionId: dataRef.connectionId, dbName: dataRef.dbName });
-      else if (type === 'external-sql-root' || type === 'external-sql-directory' || type === 'external-sql-folder' || type === 'external-sql-file') setActiveContext({ connectionId: dataRef.connectionId, dbName: dataRef.dbName });
       else if (type === 'redis-db') setActiveContext({ connectionId: dataRef.id, dbName: `db${dataRef.redisDB}` });
 
       if (node.type === 'table') {
@@ -3286,10 +3623,11 @@ const Sidebar: React.FC<{
               connectionId: id,
               dbName,
               tableName,
+              objectType: 'table',
           });
           return;
       } else if (node.type === 'view' || node.type === 'materialized-view') {
-          const { viewName, dbName, id } = node.dataRef;
+          const { viewName, dbName, id, schemaName } = node.dataRef;
           addTab({
               id: node.key,
               title: viewName,
@@ -3297,6 +3635,9 @@ const Sidebar: React.FC<{
               connectionId: id,
               dbName,
               tableName: viewName,
+              objectType: node.type === 'materialized-view' ? 'materialized-view' : 'view',
+              schemaName,
+              sidebarLocateKey: String(node.key || ''),
           });
           return;
       } else if (node.type === 'saved-query') {
@@ -3325,14 +3666,17 @@ const Sidebar: React.FC<{
           });
           return;
       } else if (node.type === 'db-trigger') {
-          const { triggerName, dbName, id } = node.dataRef;
+          const { triggerName, triggerTableName, schemaName, dbName, id } = node.dataRef;
           addTab({
               id: `trigger-${node.key}`,
               title: `触发器: ${triggerName}`,
               type: 'trigger',
               connectionId: id,
               dbName,
-              triggerName
+              triggerName,
+              triggerTableName,
+              schemaName,
+              sidebarLocateKey: String(node.key || ''),
           });
           return;
       } else if (node.type === 'db-event') {
@@ -3398,17 +3742,25 @@ const Sidebar: React.FC<{
       }
   };
 
+  const resolveCopyObjectNameLabel = (node: any): string => {
+      if (node?.type === 'view') return '视图名称';
+      if (node?.type === 'materialized-view') return '物化视图名称';
+      if (node?.type === 'db-event') return '事件名称';
+      return '表名';
+  };
+
   const handleCopyTableName = async (node: any) => {
-      const tableName = resolveSidebarTableNameForCopy(node);
-      if (!tableName) {
-          message.warning('表名为空，无法复制');
+      const objectName = resolveSidebarTableNameForCopy(node);
+      const label = resolveCopyObjectNameLabel(node);
+      if (!objectName) {
+          message.warning(`${label}为空，无法复制`);
           return;
       }
       try {
-          await navigator.clipboard.writeText(tableName);
-          message.success('表名已复制到剪贴板');
+          await navigator.clipboard.writeText(objectName);
+          message.success(`${label}已复制到剪贴板`);
       } catch (e: any) {
-          message.error('复制表名失败: ' + (e?.message || String(e)));
+          message.error(`复制${label}失败: ` + (e?.message || String(e)));
       }
   };
 
@@ -3506,6 +3858,39 @@ const Sidebar: React.FC<{
       }
   };
 
+  const handleExportSchemaSQL = async (node: any, includeData: boolean) => {
+      const conn = node?.dataRef;
+      const dbName = String(conn?.dbName || '').trim();
+      const schemaName = String(conn?.schemaName || '').trim();
+      if (!conn || !dbName || !schemaName) {
+          message.error('未找到目标模式，无法导出');
+          return;
+      }
+      const hide = message.loading(
+          includeData
+              ? `正在备份模式 ${schemaName} (结构+数据)...`
+              : `正在导出模式 ${schemaName} 表结构...`,
+          0,
+      );
+      try {
+          const res = await (window as any).go.app.App.ExportSchemaSQL(
+              buildRpcConnectionConfig(conn.config, { database: dbName }) as any,
+              dbName,
+              schemaName,
+              includeData,
+          );
+          hide();
+          if (res.success) {
+              message.success('导出成功');
+          } else if (res.message !== '已取消') {
+              message.error('导出失败: ' + res.message);
+          }
+      } catch (e: any) {
+          hide();
+          message.error('导出失败: ' + (e?.message || String(e)));
+      }
+  };
+
   const handleExportTablesSQL = async (nodes: any[], includeData: boolean) => {
       if (!nodes || nodes.length === 0) return;
       const first = nodes[0].dataRef;
@@ -3572,7 +3957,6 @@ const Sidebar: React.FC<{
   };
 
 	  const loadDatabasesForBatch = async (conn: SavedConnection) => {
-	      void warnIfConnectionDriverAgentNeedsUpdate(conn);
 	      const config = {
           ...conn.config,
           port: Number(conn.config.port),
@@ -3627,8 +4011,16 @@ const Sidebar: React.FC<{
       }
 
       const tableRows: any[] = Array.isArray(res.data) ? res.data : [];
-      const viewRows: string[] = Array.isArray(viewResult.views) ? viewResult.views : [];
-      const viewSet = new Set(viewRows.map((view: string) => view.toLowerCase()));
+      const viewRows: SidebarViewMetadataEntry[] = Array.isArray(viewResult.views) ? viewResult.views : [];
+      const viewSet = new Set(
+          viewRows.flatMap((view) => {
+              const names = [view.viewName.toLowerCase()];
+              if (view.schemaName && !view.viewName.includes('.')) {
+                  names.push(`${view.schemaName}.${view.viewName}`.toLowerCase());
+              }
+              return names;
+          })
+      );
 
       const tableObjects: BatchObjectItem[] = tableRows
           .map((row: any) => Object.values(row)[0] as string)
@@ -3641,13 +4033,16 @@ const Sidebar: React.FC<{
               dataRef: { ...conn, tableName, dbName, objectType: 'table' },
           }));
 
-      const viewObjects: BatchObjectItem[] = viewRows.map((viewName: string) => ({
-          title: getSidebarTableDisplayName(conn, viewName),
-          key: `${conn.id}-${dbName}-view-${viewName}`,
-          objectName: viewName,
-          objectType: 'view' as const,
-          dataRef: { ...conn, tableName: viewName, dbName, objectType: 'view' },
-      }));
+      const viewObjects: BatchObjectItem[] = viewRows.map((view) => {
+          const keyName = buildSidebarObjectKeyName(dbName, view.schemaName, view.viewName);
+          return {
+              title: getSidebarTableDisplayName(conn, view.viewName),
+              key: `${conn.id}-${dbName}-view-${keyName}`,
+              objectName: view.viewName,
+              objectType: 'view' as const,
+              dataRef: { ...conn, tableName: view.viewName, schemaName: view.schemaName, dbName, objectType: 'view' },
+          };
+      });
 
       tableObjects.sort((a, b) => a.title.toLowerCase().localeCompare(b.title.toLowerCase()));
       viewObjects.sort((a, b) => a.title.toLowerCase().localeCompare(b.title.toLowerCase()));
@@ -3883,7 +4278,6 @@ const Sidebar: React.FC<{
 
 	  const loadDatabasesForDbBatch = async (conn: SavedConnection) => {
 	      setBatchConnContext(conn);
-	      void warnIfConnectionDriverAgentNeedsUpdate(conn);
 
 	      const config = {
           ...conn.config,
@@ -3974,9 +4368,9 @@ const Sidebar: React.FC<{
   const handleRunSQLFile = async (node: any) => {
       const res = await OpenSQLFile();
       if (res.success) {
-          const data = res.data;
+          const data = normalizeSQLFileDialogData(res.data);
           // 大文件：后端返回文件路径，走流式执行
-          if (data && typeof data === 'object' && data.isLargeFile) {
+          if (data.isLargeFile) {
               const connId = node.type === 'connection' ? node.key : node.dataRef?.id;
               const dbName = node.dataRef?.dbName || '';
               const conn = connections.find(c => c.id === connId);
@@ -3984,19 +4378,20 @@ const Sidebar: React.FC<{
                   message.error(t('sidebar.message.connection_config_not_found'));
                   return;
               }
-              startSQLFileExecution(conn.config, dbName, data.filePath, data.fileSizeMB);
+              startSQLFileExecution(conn.config, dbName, data.filePath, data.fileSizeMB || '');
               return;
           }
           // 小文件：加载到编辑器
-          const sqlContent = data;
           const { dbName, id } = node.dataRef;
+          const connectionId = node.type === 'connection' ? String(node.key) : String(id || node.dataRef.id || '');
           addTab({
-              id: `query-${Date.now()}`,
-              title: t('sidebar.sql_file_exec.title'),
+              id: data.filePath ? buildExternalSQLTabId(connectionId, dbName || '', data.filePath) : `query-${Date.now()}`,
+              title: data.fileName || t('sidebar.sql_file_exec.title'),
               type: 'query',
-              connectionId: node.type === 'connection' ? node.key : node.dataRef.id,
+              connectionId,
               dbName: dbName,
-              query: sqlContent
+              query: data.content,
+              filePath: data.filePath || undefined,
           });
       } else if (res.message !== '已取消') {
           message.error(t('sidebar.message.read_file_failed', { error: res.message }));
@@ -4011,25 +4406,26 @@ const Sidebar: React.FC<{
       }
       const res = await OpenSQLFile();
       if (res.success) {
-          const data = res.data;
+          const data = normalizeSQLFileDialogData(res.data);
           // 大文件：后端流式执行
-          if (data && typeof data === 'object' && data.isLargeFile) {
+          if (data.isLargeFile) {
               const conn = connections.find(c => c.id === ctx.connectionId);
               if (!conn) {
                   message.error(t('sidebar.message.connection_config_not_found'));
                   return;
               }
-              startSQLFileExecution(conn.config, ctx.dbName || '', data.filePath, data.fileSizeMB);
+              startSQLFileExecution(conn.config, ctx.dbName || '', data.filePath, data.fileSizeMB || '');
               return;
           }
           // 小文件
           addTab({
-              id: `query-${Date.now()}`,
-              title: t('sidebar.sql_file_exec.title'),
+              id: data.filePath ? buildExternalSQLTabId(ctx.connectionId, ctx.dbName || '', data.filePath) : `query-${Date.now()}`,
+              title: data.fileName || t('sidebar.sql_file_exec.title'),
               type: 'query',
               connectionId: ctx.connectionId,
               dbName: ctx.dbName || undefined,
-              query: data
+              query: data.content,
+              filePath: data.filePath || undefined,
           });
       } else if (res.message !== '已取消') {
           message.error(t('sidebar.message.read_file_failed', { error: res.message }));
@@ -4103,13 +4499,80 @@ const Sidebar: React.FC<{
       }
   };
 
+  const normalizeExternalSQLFileName = (rawName: unknown): string => {
+      const name = String(rawName || '').trim();
+      if (!name) return '';
+      return /\.sql$/i.test(name) ? name : `${name}.sql`;
+  };
+
+  const normalizeExternalSQLDirectoryName = (rawName: unknown): string => {
+      return String(rawName || '').trim();
+  };
+
+  const getExternalSQLParentDirectoryPath = (node: any): string => {
+      const path = String(node?.dataRef?.path || '').trim();
+      if (node?.type === 'external-sql-directory' || node?.type === 'external-sql-folder') {
+          return path;
+      }
+      if (node?.type === 'external-sql-file') {
+          const index = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\'));
+          return index > 0 ? path.slice(0, index) : '';
+      }
+      return '';
+  };
+
+  const resolveExternalSQLExecutionContext = (): { connectionId: string; dbName: string } => {
+      const activeStoreContext = useStore.getState().activeContext;
+      const selectedConnectionId = selectedNodesRef.current
+          .map((node) => resolveSidebarNodeConnectionId(node, connectionIds))
+          .find(Boolean) || '';
+      return {
+          connectionId: String(
+              activeStoreContext?.connectionId
+              || activeTab?.connectionId
+              || selectedConnectionId
+              || '',
+          ).trim(),
+          dbName: String(
+              activeStoreContext?.dbName
+              || activeTab?.dbName
+              || '',
+          ).trim(),
+      };
+  };
+
+  const normalizeSQLFileDialogData = (data: unknown): { content: string; filePath: string; fileName: string; isLargeFile: boolean; fileSizeMB?: string } => {
+      if (data && typeof data === 'object') {
+          const payload = data as Record<string, unknown>;
+          const filePath = String(payload.filePath || '').trim();
+          return {
+              content: String(payload.content ?? ''),
+              filePath,
+              fileName: String(payload.name || filePath.split(/[\\/]/).filter(Boolean).pop() || '运行外部SQL文件').trim(),
+              isLargeFile: payload.isLargeFile === true,
+              fileSizeMB: String(payload.fileSizeMB || '').trim() || undefined,
+          };
+      }
+      return {
+          content: String(data || ''),
+          filePath: '',
+          fileName: '运行外部SQL文件',
+          isLargeFile: false,
+      };
+  };
+
   const openExternalSQLFile = async (fileNode: any) => {
-      const connectionId = String(fileNode?.dataRef?.connectionId || '').trim();
-      const dbName = String(fileNode?.dataRef?.dbName || '').trim();
+      const fileContext = {
+          connectionId: String(fileNode?.dataRef?.connectionId || '').trim(),
+          dbName: String(fileNode?.dataRef?.dbName || '').trim(),
+      };
+      const fallbackContext = resolveExternalSQLExecutionContext();
+      const connectionId = fileContext.connectionId || fallbackContext.connectionId;
+      const dbName = fileContext.dbName || fallbackContext.dbName;
       const filePath = String(fileNode?.dataRef?.path || '').trim();
       const fileName = String(fileNode?.dataRef?.name || fileNode?.title || t('sidebar.sql_file.default_name')).trim() || t('sidebar.sql_file.default_name');
-      if (!connectionId || !dbName || !filePath) {
-          message.error(t('sidebar.message.sql_file_context_incomplete'));
+      if (!filePath) {
+          message.error('SQL 文件路径不完整，无法打开');
           return;
       }
 
@@ -4123,6 +4586,10 @@ const Sidebar: React.FC<{
 
       const data = res.data;
       if (data && typeof data === 'object' && data.isLargeFile) {
+          if (!connectionId) {
+              message.warning('请先选择一个 Host 后再执行大 SQL 文件');
+              return;
+          }
           const conn = connections.find((item) => item.id === connectionId);
           if (!conn) {
               message.error(t('sidebar.message.connection_config_not_found'));
@@ -4137,22 +4604,226 @@ const Sidebar: React.FC<{
           title: fileName,
           type: 'query',
           connectionId,
-          dbName,
+          dbName: dbName || undefined,
           query: String(data || ''),
           filePath,
       });
   };
 
-  const handleAddExternalSQLDirectory = async (node: any) => {
-      const context = getNodeDatabaseContext(node);
-      if (!context?.connectionId || !context?.dbName || !context?.dbNodeKey) {
-          message.warning(t('sidebar.message.add_sql_directory_database_required'));
+  const openCreateExternalSQLFileModal = (node: any) => {
+      const directoryPath = getExternalSQLParentDirectoryPath(node);
+      if (!directoryPath) {
+          message.error('未找到可新建 SQL 文件的目录');
+          return;
+      }
+      setExternalSQLFileModalMode('create');
+      setExternalSQLFileTarget(node);
+      externalSQLFileForm.setFieldsValue({ name: 'new-query.sql' });
+      setIsExternalSQLFileModalOpen(true);
+  };
+
+  const openRenameExternalSQLFileModal = (node: any) => {
+      const currentName = String(node?.dataRef?.name || node?.title || '').trim();
+      if (!currentName) {
+          message.error('未找到可重命名的 SQL 文件');
+          return;
+      }
+      setExternalSQLFileModalMode('rename');
+      setExternalSQLFileTarget(node);
+      externalSQLFileForm.setFieldsValue({ name: currentName });
+      setIsExternalSQLFileModalOpen(true);
+  };
+
+  const openCreateExternalSQLDirectoryModal = (node: any) => {
+      const directoryPath = getExternalSQLParentDirectoryPath(node);
+      if (!directoryPath) {
+          message.error('未找到可新建目录的位置');
+          return;
+      }
+      setExternalSQLFileModalMode('create-directory');
+      setExternalSQLFileTarget(node);
+      externalSQLFileForm.setFieldsValue({ name: 'new-folder' });
+      setIsExternalSQLFileModalOpen(true);
+  };
+
+  const openRenameExternalSQLDirectoryModal = (node: any) => {
+      const currentName = String(node?.dataRef?.name || node?.title || '').trim();
+      if (!currentName) {
+          message.error('未找到可重命名的目录');
+          return;
+      }
+      setExternalSQLFileModalMode('rename-directory');
+      setExternalSQLFileTarget(node);
+      externalSQLFileForm.setFieldsValue({ name: currentName });
+      setIsExternalSQLFileModalOpen(true);
+  };
+
+  const handleExternalSQLFileModalOk = async () => {
+      try {
+          const values = await externalSQLFileForm.validateFields();
+          const isDirectoryMode = isExternalSQLDirectoryModalMode(externalSQLFileModalMode);
+          const name = isDirectoryMode
+              ? normalizeExternalSQLDirectoryName(values.name)
+              : normalizeExternalSQLFileName(values.name);
+          if (!name) {
+              message.error(isDirectoryMode ? '目录名不能为空' : 'SQL 文件名不能为空');
+              return;
+          }
+
+          if (externalSQLFileModalMode === 'create') {
+              const directoryPath = getExternalSQLParentDirectoryPath(externalSQLFileTarget);
+              if (!directoryPath) {
+                  message.error('未找到可新建 SQL 文件的目录');
+                  return;
+              }
+              const res = await CreateSQLFile(directoryPath, name);
+              if (!res.success) {
+                  message.error('新建 SQL 文件失败: ' + res.message);
+                  return;
+              }
+              await refreshGlobalExternalSQLRootNode(false);
+              message.success('SQL 文件已新建');
+          } else if (externalSQLFileModalMode === 'rename') {
+              const filePath = String(externalSQLFileTarget?.dataRef?.path || '').trim();
+              if (!filePath) {
+                  message.error('未找到可重命名的 SQL 文件');
+                  return;
+              }
+              const res = await RenameSQLFile(filePath, name);
+              if (!res.success) {
+                  message.error('重命名 SQL 文件失败: ' + res.message);
+                  return;
+              }
+              await refreshGlobalExternalSQLRootNode(false);
+              message.success('SQL 文件已重命名');
+          } else if (externalSQLFileModalMode === 'create-directory') {
+              const directoryPath = getExternalSQLParentDirectoryPath(externalSQLFileTarget);
+              if (!directoryPath) {
+                  message.error('未找到可新建目录的位置');
+                  return;
+              }
+              const res = await CreateSQLDirectory(directoryPath, name);
+              if (!res.success) {
+                  message.error('新建目录失败: ' + res.message);
+                  return;
+              }
+              await refreshGlobalExternalSQLRootNode(false);
+              message.success('目录已新建');
+          } else {
+              const directoryPath = String(externalSQLFileTarget?.dataRef?.path || '').trim();
+              if (!directoryPath) {
+                  message.error('未找到可重命名的目录');
+                  return;
+              }
+              const res = await RenameSQLDirectory(directoryPath, name);
+              if (!res.success) {
+                  message.error('重命名目录失败: ' + res.message);
+                  return;
+              }
+
+              if (externalSQLFileTarget?.type === 'external-sql-directory') {
+                  const payload = (res.data && typeof res.data === 'object') ? res.data as Record<string, unknown> : {};
+                  const nextPath = String(payload.directoryPath || payload.path || '').trim();
+                  const nextName = String(payload.name || name).trim();
+                  const oldDirectoryId = String(externalSQLFileTarget?.dataRef?.id || '').trim();
+                  if (!nextPath || !oldDirectoryId) {
+                      message.error('目录已重命名，但无法同步外部 SQL 目录列表，请重新添加目录');
+                      await refreshGlobalExternalSQLRootNode(false);
+                      return;
+                  }
+                  const nextDirectory: ExternalSQLDirectory = {
+                      id: buildExternalSQLDirectoryId('', '', nextPath),
+                      name: nextName || nextPath.split(/[\\/]/).filter(Boolean).pop() || 'SQL目录',
+                      path: nextPath,
+                      createdAt: Number(externalSQLFileTarget?.dataRef?.createdAt) || Date.now(),
+                  };
+                  deleteExternalSQLDirectory(oldDirectoryId);
+                  saveExternalSQLDirectory(nextDirectory);
+                  const nextDirectories = [
+                      ...externalSQLDirectories.filter((item) => item.id !== oldDirectoryId),
+                      nextDirectory,
+                  ];
+                  await refreshGlobalExternalSQLRootNode(false, nextDirectories);
+              } else {
+                  await refreshGlobalExternalSQLRootNode(false);
+              }
+              message.success('目录已重命名');
+          }
+
+          setIsExternalSQLFileModalOpen(false);
+          setExternalSQLFileTarget(null);
+          externalSQLFileForm.resetFields();
+      } catch {
+          // Validate failed
+      }
+  };
+
+  const handleDeleteExternalSQLFile = (node: any) => {
+      const filePath = String(node?.dataRef?.path || '').trim();
+      const fileName = String(node?.dataRef?.name || node?.title || 'SQL 文件').trim();
+      if (!filePath) {
+          message.error('未找到可删除的 SQL 文件');
           return;
       }
 
-      const currentDirectory = externalSQLDirectories.find((item) =>
-          item.connectionId === context.connectionId && item.dbName === context.dbName,
-      )?.path || '';
+      Modal.confirm({
+          title: '确认删除 SQL 文件',
+          content: `确定删除 "${fileName}" 吗？该操作会删除本地磁盘文件，无法恢复。`,
+          okText: '删除',
+          cancelText: '取消',
+          okButtonProps: { danger: true },
+          onOk: async () => {
+              const res = await DeleteSQLFile(filePath);
+              if (!res.success) {
+                  message.error('删除 SQL 文件失败: ' + res.message);
+                  return;
+              }
+              await refreshGlobalExternalSQLRootNode(false);
+              message.success('SQL 文件已删除');
+          },
+      });
+  };
+
+  const handleDeleteExternalSQLDirectory = (node: any) => {
+      const directoryPath = String(node?.dataRef?.path || '').trim();
+      const directoryName = String(node?.dataRef?.name || node?.title || '目录').trim();
+      if (!directoryPath) {
+          message.error('未找到可删除的目录');
+          return;
+      }
+
+      Modal.confirm({
+          title: '确认删除目录',
+          content: `确定删除 "${directoryName}" 吗？该操作会删除本地磁盘目录，且仅支持删除空目录。`,
+          okText: '删除',
+          cancelText: '取消',
+          okButtonProps: { danger: true },
+          onOk: async () => {
+              const res = await DeleteSQLDirectory(directoryPath);
+              if (!res.success) {
+                  message.error('删除目录失败: ' + res.message);
+                  return;
+              }
+
+              if (node?.type === 'external-sql-directory') {
+                  const directoryId = String(node?.dataRef?.id || '').trim();
+                  if (directoryId) {
+                      deleteExternalSQLDirectory(directoryId);
+                      const nextDirectories = externalSQLDirectories.filter((item) => item.id !== directoryId);
+                      await refreshGlobalExternalSQLRootNode(false, nextDirectories);
+                  } else {
+                      await refreshGlobalExternalSQLRootNode(false);
+                  }
+              } else {
+                  await refreshGlobalExternalSQLRootNode(false);
+              }
+              message.success('目录已删除');
+          },
+      });
+  };
+
+  const handleAddExternalSQLDirectory = async (node: any) => {
+      const currentDirectory = externalSQLDirectories[0]?.path || '';
       const selection = await SelectSQLDirectory(currentDirectory);
       if (!selection.success) {
           if (selection.message !== '已取消') {
@@ -4169,41 +4840,40 @@ const Sidebar: React.FC<{
           return;
       }
 
-      const directoryId = buildExternalSQLDirectoryId(context.connectionId, context.dbName, path);
-      saveExternalSQLDirectory({
+      const directoryId = buildExternalSQLDirectoryId('', '', path);
+      const nextDirectory: ExternalSQLDirectory = {
           id: directoryId,
           name: name || path.split(/[\\/]/).filter(Boolean).pop() || t('sidebar.sql_directory.default_name'),
           path,
-          connectionId: context.connectionId,
-          dbName: context.dbName,
           createdAt: Date.now(),
-      });
+      };
+      saveExternalSQLDirectory(nextDirectory);
 
-      setExpandedKeys((prev) => Array.from(new Set([...prev, context.dbNodeKey, `${context.dbNodeKey}-external-sql`])));
+      const nextDirectories = [
+          ...externalSQLDirectories.filter((item) => item.path.replace(/\\/g, '/').toLowerCase() !== path.replace(/\\/g, '/').toLowerCase()),
+          nextDirectory,
+      ];
+      setExpandedKeys((prev) => Array.from(new Set([...prev, 'external-sql-root'])));
       setAutoExpandParent(false);
-      await refreshDatabaseNode(context.dbNodeKey);
+      await refreshGlobalExternalSQLRootNode(false, nextDirectories);
       message.success(t('sidebar.message.external_sql_directory_added'));
   };
 
   const handleRemoveExternalSQLDirectory = async (node: any) => {
       const directoryId = String(node?.dataRef?.id || '').trim();
-      const dbNodeKey = String(node?.dataRef?.dbNodeKey || '').trim();
       if (!directoryId) {
           message.error(t('sidebar.message.external_sql_directory_not_found'));
           return;
       }
       deleteExternalSQLDirectory(directoryId);
-      await refreshDatabaseNode(dbNodeKey);
+      const nextDirectories = externalSQLDirectories.filter((item) => item.id !== directoryId);
+      await refreshGlobalExternalSQLRootNode(false, nextDirectories);
       message.success(t('sidebar.message.external_sql_directory_removed'));
   };
 
   const handleRefreshExternalSQLDirectory = async (node: any) => {
-      const dbNodeKey = String(node?.dataRef?.dbNodeKey || '').trim();
-      if (!dbNodeKey) {
-          message.warning(t('sidebar.message.external_sql_directory_context_missing'));
-          return;
-      }
-      await refreshDatabaseNode(dbNodeKey);
+      void node;
+      await refreshGlobalExternalSQLRootNode(true);
       message.success(t('sidebar.message.external_sql_directory_refreshed'));
   };
 
@@ -4272,6 +4942,89 @@ const Sidebar: React.FC<{
       }
   };
 
+  const openRenameSchemaModal = (node: any) => {
+      const dialect = getMetadataDialect(node?.dataRef as SavedConnection);
+      const schemaName = String(node?.dataRef?.schemaName || '').trim();
+      if (!isPostgresSchemaDialect(dialect) || !schemaName) {
+          message.warning('当前节点不支持通过此入口编辑模式');
+          return;
+      }
+      setRenameSchemaTarget(node);
+      renameSchemaForm.setFieldsValue({ newName: schemaName });
+      setIsRenameSchemaModalOpen(true);
+  };
+
+  const handleRenameSchema = async () => {
+      try {
+          const values = await renameSchemaForm.validateFields();
+          const node = renameSchemaTarget;
+          const conn = node?.dataRef;
+          const dbName = String(conn?.dbName || '').trim();
+          const oldSchemaName = String(conn?.schemaName || '').trim();
+          const newSchemaName = String(values?.newName || '').trim();
+          if (!conn || !dbName || !oldSchemaName || !newSchemaName) {
+              message.error('未找到目标模式，无法编辑');
+              return;
+          }
+          if (oldSchemaName === newSchemaName) {
+              message.warning('新旧模式名称相同，无需修改');
+              return;
+          }
+
+          const res = await (window as any).go.app.App.RenameSchema(
+              buildRpcConnectionConfig(conn.config, { database: dbName }) as any,
+              dbName,
+              oldSchemaName,
+              newSchemaName,
+          );
+          if (res.success) {
+              message.success('模式重命名成功');
+              const schemaKeyPrefix = `${conn.id}-${dbName}-schema-${oldSchemaName || 'default'}`;
+              setExpandedKeys(prev => prev.filter(k => !k.toString().startsWith(schemaKeyPrefix)));
+              setLoadedKeys(prev => prev.filter(k => !k.toString().startsWith(schemaKeyPrefix)));
+              await loadTables(getDatabaseNodeRef(conn, dbName));
+              setIsRenameSchemaModalOpen(false);
+              setRenameSchemaTarget(null);
+              renameSchemaForm.resetFields();
+          } else {
+              message.error('编辑失败: ' + res.message);
+          }
+      } catch (e) {
+          // Validate failed
+      }
+  };
+
+  const handleDeleteSchema = (node: any) => {
+      const conn = node?.dataRef;
+      const dbName = String(conn?.dbName || '').trim();
+      const schemaName = String(conn?.schemaName || '').trim();
+      if (!conn || !dbName || !schemaName) {
+          message.error('未找到目标模式，无法删除');
+          return;
+      }
+      Modal.confirm({
+          title: '确认删除模式',
+          content: `确定删除模式 "${schemaName}" 吗？这将删除该模式及其中所有对象，操作不可恢复。`,
+          okButtonProps: { danger: true },
+          onOk: async () => {
+              const res = await (window as any).go.app.App.DropSchema(
+                  buildRpcConnectionConfig(conn.config, { database: dbName }) as any,
+                  dbName,
+                  schemaName,
+              );
+              if (res.success) {
+                  message.success('模式删除成功');
+                  const schemaKeyPrefix = `${conn.id}-${dbName}-schema-${schemaName || 'default'}`;
+                  setExpandedKeys(prev => prev.filter(k => !k.toString().startsWith(schemaKeyPrefix)));
+                  setLoadedKeys(prev => prev.filter(k => !k.toString().startsWith(schemaKeyPrefix)));
+                  await loadTables(getDatabaseNodeRef(conn, dbName));
+              } else {
+                  message.error('删除失败: ' + res.message);
+              }
+          }
+      });
+  };
+
   const buildRuntimeConfig = (conn: any, overrideDatabase?: string, clearDatabase: boolean = false) => {
       return buildRpcConnectionConfig(conn.config, {
           database: resolveSidebarRuntimeDatabase(
@@ -4374,12 +5127,7 @@ const Sidebar: React.FC<{
   };
 
   const extractObjectName = (fullName: string) => {
-      const raw = String(fullName || '').trim();
-      const idx = raw.lastIndexOf('.');
-      if (idx >= 0 && idx < raw.length - 1) {
-          return raw.substring(idx + 1);
-      }
-      return raw;
+      return splitQualifiedName(String(fullName || '').trim()).objectName || String(fullName || '').trim();
   };
 
   const handleRenameDatabase = async () => {
@@ -4572,7 +5320,7 @@ const Sidebar: React.FC<{
 
   // --- 视图操作 ---
   const openViewDefinition = (node: any) => {
-      const { viewName, dbName, id } = node.dataRef;
+      const { viewName, dbName, id, schemaName } = node.dataRef;
       const isMaterialized = node.type === 'materialized-view' || node.dataRef?.objectKind === 'materialized-view';
       addTab({
           id: `view-def-${id}-${dbName}-${viewName}`,
@@ -4582,6 +5330,8 @@ const Sidebar: React.FC<{
           dbName,
           viewName,
           viewKind: isMaterialized ? 'materialized' : 'view',
+          schemaName,
+          sidebarLocateKey: String(node.key || ''),
       });
   };
 
@@ -4594,44 +5344,51 @@ const Sidebar: React.FC<{
 
       try {
           const config = buildRuntimeConfig(conn, dbName);
-          let query = '';
+          let queries: string[] = [];
           switch (dialect) {
               case 'mysql':
               case 'starrocks':
-                  query = `SHOW CREATE VIEW \`${viewName.replace(/`/g, '``')}\``;
+                  queries = [`SHOW CREATE VIEW \`${viewName.replace(/`/g, '``')}\``];
                   break;
-              case 'postgres': case 'kingbase': case 'highgo': case 'vastbase': case 'opengauss': {
-                  const parts = viewName.split('.');
-                  const schema = parts.length > 1 ? parts[0] : 'public';
-                  const name = parts.length > 1 ? parts[1] : viewName;
-                  query = `SELECT pg_get_viewdef('${escapeSQLLiteral(schema)}.${escapeSQLLiteral(name)}'::regclass, true) AS view_definition`;
+              case 'postgres': case 'kingbase': case 'highgo': case 'vastbase': case 'opengauss': case 'gaussdb': {
+                  const parts = splitQualifiedName(viewName);
+                  const schema = parts.schemaName || 'public';
+                  const name = parts.objectName || viewName;
+                  queries = [`SELECT pg_get_viewdef('${escapeSQLLiteral(schema)}.${escapeSQLLiteral(name)}'::regclass, true) AS view_definition`];
                   break;
               }
               case 'sqlserver':
-                  query = `SELECT OBJECT_DEFINITION(OBJECT_ID('${escapeSQLLiteral(viewName)}')) AS view_definition`;
+                  queries = buildSqlServerObjectDefinitionQueries('view', viewName, dbName, 'view_definition');
                   break;
               case 'sqlite':
-                  query = `SELECT sql AS view_definition FROM sqlite_master WHERE type='view' AND name='${escapeSQLLiteral(viewName)}'`;
+                  queries = [`SELECT sql AS view_definition FROM sqlite_master WHERE type='view' AND name='${escapeSQLLiteral(viewName)}'`];
                   break;
               case 'duckdb': {
                   const parts = splitQualifiedName(viewName);
                   const viewSchema = escapeSQLLiteral(parts.schemaName || 'main');
                   const viewObject = escapeSQLLiteral(parts.objectName || viewName);
-                  query = `SELECT view_definition FROM information_schema.views WHERE table_schema='${viewSchema}' AND table_name='${viewObject}' LIMIT 1`;
+                  queries = [`SELECT view_definition FROM information_schema.views WHERE table_schema='${viewSchema}' AND table_name='${viewObject}' LIMIT 1`];
                   break;
               }
           }
-          if (query) {
+          for (const query of queries) {
               const result = await DBQuery(buildRpcConnectionConfig(config) as any, dbName, query);
               if (result.success && Array.isArray(result.data) && result.data.length > 0) {
                   const row = result.data[0] as Record<string, any>;
-                  const def = row.view_definition || row.VIEW_DEFINITION || Object.values(row).find(v => typeof v === 'string' && String(v).length > 10) || '';
+                  const def = dialect === 'sqlserver'
+                      ? extractSqlServerDefinitionRows(result.data, ['view_definition', 'definition'])
+                      : row.view_definition || row.VIEW_DEFINITION || Object.values(row).find(v => typeof v === 'string' && String(v).length > 10) || '';
                   if (def) {
                       if (dialect === 'mysql') {
                           template = `-- 编辑视图 ${viewName}\n${normalizeMySQLViewDDLForEditing(viewName, def)}`;
+                      } else if (dialect === 'sqlserver') {
+                          template = /^\s*create\s+view\b/i.test(String(def))
+                              ? `-- 编辑视图 ${viewName}\n${def}`
+                              : `-- 编辑视图 ${viewName}\nCREATE VIEW ${viewName} AS\n${def}`;
                       } else {
                           template = `-- 编辑视图 ${viewName}\nCREATE OR REPLACE VIEW ${viewName} AS\n${def}`;
                       }
+                      break;
                   }
               }
           }
@@ -4657,7 +5414,7 @@ const Sidebar: React.FC<{
           case 'starrocks':
               template = `CREATE VIEW \`view_name\` AS\nSELECT column1, column2\nFROM table_name\nWHERE condition;`;
               break;
-          case 'postgres': case 'kingbase': case 'highgo': case 'vastbase': case 'opengauss':
+          case 'postgres': case 'kingbase': case 'highgo': case 'vastbase': case 'opengauss': case 'gaussdb':
               template = `CREATE OR REPLACE VIEW view_name AS\nSELECT column1, column2\nFROM table_name\nWHERE condition;`;
               break;
           case 'sqlserver':
@@ -4722,7 +5479,10 @@ const Sidebar: React.FC<{
       const conn = node.dataRef;
       const { tableName, dbName, id } = conn;
       const safeTable = String(tableName || 'table_name').trim();
-      const quotedTable = safeTable.includes('`') ? safeTable : safeTable.split('.').map(part => `\`${part.replace(/`/g, '``')}\``).join('.');
+      const safeTableParts = [splitQualifiedName(safeTable).schemaName, splitQualifiedName(safeTable).objectName].filter(Boolean);
+      const quotedTable = safeTable.includes('`')
+          ? safeTable
+          : (safeTableParts.length > 0 ? safeTableParts : [safeTable]).map(part => `\`${part.replace(/`/g, '``')}\``).join('.');
       addTab({
           id: `query-create-starrocks-rollup-${Date.now()}`,
           title: '新增 Rollup',
@@ -4810,17 +5570,17 @@ const Sidebar: React.FC<{
               return;
           }
 
-          saveQuery({
+          const persisted = await saveQuery({
               ...renameSavedQueryTarget,
               name: nextName,
           });
           const updateSavedQueryNode = (list: TreeNode[]): TreeNode[] =>
               list.map(node => {
-                  if (node.key === renameSavedQueryTarget.id) {
+                  if (node.type === 'saved-query' && node.dataRef?.id === renameSavedQueryTarget.id) {
                       return {
                           ...node,
-                          title: nextName,
-                          dataRef: { ...(node.dataRef || renameSavedQueryTarget), name: nextName },
+                          title: persisted.name,
+                          dataRef: { ...(node.dataRef || renameSavedQueryTarget), ...persisted },
                       };
                   }
                   return node.children ? { ...node, children: updateSavedQueryNode(node.children) } : node;
@@ -4830,16 +5590,51 @@ const Sidebar: React.FC<{
           setTreeData(nextTreeData);
           tabs
               .filter(tab => tab.type === 'query' && (tab.savedQueryId === renameSavedQueryTarget.id || tab.id === renameSavedQueryTarget.id))
-              .forEach(tab => updateQueryTabDraft(tab.id, { title: nextName }));
+              .forEach(tab => updateQueryTabDraft(tab.id, { title: persisted.name }));
           message.success(t('sidebar.message.saved_query_renamed'));
           setIsRenameSavedQueryModalOpen(false);
           setRenameSavedQueryTarget(null);
           renameSavedQueryForm.resetFields();
       } catch (e) {
-          // Validate failed
+          if (e instanceof Error) {
+              message.error('重命名查询失败: ' + e.message);
+          }
       }
   };
 
+  const isSavedQueryUnmatched = useCallback((query: SavedQuery): boolean => {
+      return query.bindingStatus === 'orphan' || !connectionIdSet.has(query.connectionId);
+  }, [connectionIdSet]);
+
+  const handleRebindSavedQuery = useCallback(async (query: SavedQuery, target: SavedConnection) => {
+      if (!query?.id || !target?.id) return;
+      try {
+          const backendApp = (window as any).go?.app?.App;
+          let persisted: SavedQuery;
+          if (typeof backendApp?.RebindSavedQuery === 'function') {
+              persisted = await backendApp.RebindSavedQuery(query.id, target.id);
+              await saveQuery(persisted);
+          } else {
+              persisted = await saveQuery({
+                  ...query,
+                  connectionId: target.id,
+                  originalConnectionId: query.originalConnectionId || query.connectionId,
+                  bindingStatus: 'active',
+              });
+          }
+          message.success(`查询已绑定到 ${target.name || target.id}`);
+          tabs
+              .filter(tab => tab.type === 'query' && (tab.savedQueryId === query.id || tab.id === query.id))
+              .forEach(tab => updateQueryTabDraft(tab.id, {
+                  title: persisted.name,
+                  connectionId: persisted.connectionId,
+                  dbName: persisted.dbName,
+              }));
+      } catch (error) {
+          message.error('绑定查询失败: ' + (error instanceof Error ? error.message : String(error)));
+      }
+  }, [saveQuery, tabs, updateQueryTabDraft]);
+
   // --- 函数/存储过程操作 ---
   const openRoutineDefinition = (node: any) => {
       const { routineName, routineType, dbName, id } = node.dataRef;
@@ -4886,13 +5681,13 @@ const Sidebar: React.FC<{
               case 'starrocks':
                   query = `SHOW CREATE ${routineType} \`${name.replace(/`/g, '``')}\``;
                   break;
-              case 'postgres': case 'kingbase': case 'highgo': case 'vastbase': case 'opengauss': {
+              case 'postgres': case 'kingbase': case 'highgo': case 'vastbase': case 'opengauss': case 'gaussdb': {
                   const schemaRef = schema || 'public';
                   query = `SELECT pg_get_functiondef(p.oid) AS routine_definition FROM pg_proc p JOIN pg_namespace n ON p.pronamespace = n.oid WHERE n.nspname = '${escapeSQLLiteral(schemaRef)}' AND p.proname = '${escapeSQLLiteral(name)}' LIMIT 1`;
                   break;
               }
               case 'sqlserver':
-                  query = `SELECT OBJECT_DEFINITION(OBJECT_ID('${escapeSQLLiteral(routineName)}')) AS routine_definition`;
+                  query = '';
                   break;
               case 'oracle': case 'dm': {
                   const owner = schema ? escapeSQLLiteral(schema).toUpperCase() : '';
@@ -4909,12 +5704,18 @@ const Sidebar: React.FC<{
                   break;
               }
           }
-          if (query) {
-              const result = await DBQuery(buildRpcConnectionConfig(config) as any, dbName, query);
+          const queries = dialect === 'sqlserver'
+              ? buildSqlServerObjectDefinitionQueries('routine', routineName, dbName, 'routine_definition')
+              : [query].filter(Boolean);
+          for (const queryText of queries) {
+              const result = await DBQuery(buildRpcConnectionConfig(config) as any, dbName, queryText);
               if (result.success && Array.isArray(result.data) && result.data.length > 0) {
                   if (dialect === 'oracle' || dialect === 'dm') {
                       const lines = result.data.map((row: any) => row.text || row.TEXT || Object.values(row)[0] || '').join('');
-                      if (lines) template = `-- 编辑${typeLabel} ${routineName}\nCREATE OR REPLACE ${lines}`;
+                      if (lines) {
+                          template = `-- 编辑${typeLabel} ${routineName}\nCREATE OR REPLACE ${lines}`;
+                          break;
+                      }
                   } else if (dialect === 'duckdb') {
                       const row = result.data[0] as Record<string, any>;
                       const ddl = buildDuckDBMacroDDL(
@@ -4923,11 +5724,19 @@ const Sidebar: React.FC<{
                           getCaseInsensitiveRawValue(row, ['parameters']),
                           getCaseInsensitiveRawValue(row, ['macro_definition'])
                       );
-                      if (ddl) template = `-- 编辑${typeLabel} ${routineName}\n${ddl}`;
+                      if (ddl) {
+                          template = `-- 编辑${typeLabel} ${routineName}\n${ddl}`;
+                          break;
+                      }
                   } else {
                       const row = result.data[0] as Record<string, any>;
-                      const def = row.routine_definition || row.ROUTINE_DEFINITION || Object.values(row).find(v => typeof v === 'string' && String(v).length > 10) || '';
-                      if (def) template = `-- 编辑${typeLabel} ${routineName}\n${def}`;
+                      const def = dialect === 'sqlserver'
+                          ? extractSqlServerDefinitionRows(result.data, ['routine_definition', 'definition'])
+                          : row.routine_definition || row.ROUTINE_DEFINITION || Object.values(row).find(v => typeof v === 'string' && String(v).length > 10) || '';
+                      if (def) {
+                          template = `-- 编辑${typeLabel} ${routineName}\n${def}`;
+                          break;
+                      }
                   }
               }
           }
@@ -4957,7 +5766,7 @@ const Sidebar: React.FC<{
                   ? `DELIMITER $$\nCREATE PROCEDURE proc_name(IN param1 INT)\nBEGIN\n    SELECT * FROM table_name WHERE id = param1;\nEND$$\nDELIMITER ;`
                   : `DELIMITER $$\nCREATE FUNCTION func_name(param1 INT)\nRETURNS INT\nDETERMINISTIC\nBEGIN\n    RETURN param1 * 2;\nEND$$\nDELIMITER ;`;
               break;
-          case 'postgres': case 'kingbase': case 'highgo': case 'vastbase': case 'opengauss':
+          case 'postgres': case 'kingbase': case 'highgo': case 'vastbase': case 'opengauss': case 'gaussdb':
               template = isProc
                   ? `CREATE OR REPLACE PROCEDURE proc_name(param1 integer)\nLANGUAGE plpgsql\nAS $$\nBEGIN\n    -- procedure body\nEND;\n$$;`
                   : `CREATE OR REPLACE FUNCTION func_name(param1 integer)\nRETURNS integer\nLANGUAGE plpgsql\nAS $$\nBEGIN\n    RETURN param1 * 2;\nEND;\n$$;`;
@@ -5016,6 +5825,37 @@ const Sidebar: React.FC<{
       });
   };
 
+  const resolveMessagePublishTarget = (node: any): SidebarMessagePublishTarget | null => {
+      const connectionId = String(node?.dataRef?.id || '').trim();
+      const liveConnection = connections.find((item) => item.id === connectionId);
+      const sourceConnection = (liveConnection || node?.dataRef) as SavedConnection | undefined;
+      if (!sourceConnection?.config) return null;
+      const capabilities = getDataSourceCapabilities(sourceConnection.config);
+      if (!capabilities.supportsMessagePublish) return null;
+
+      return {
+          connection: sourceConnection,
+          executionDbName: String(node?.dataRef?.dbName || ''),
+          destination: String(node?.dataRef?.tableName || node?.title || '').trim(),
+      };
+  };
+
+  const openMessagePublishModal = (node: any) => {
+      const target = resolveMessagePublishTarget(node);
+      if (!target) {
+          message.warning('当前对象不支持测试发送消息');
+          return;
+      }
+      setMessagePublishTarget(target);
+  };
+
+  const handleMessagePublishSuccess = (result: { destination: string; affectedRows: number }) => {
+      const destination = String(result.destination || '').trim();
+      const suffix = result.affectedRows > 0 ? `（已提交 ${result.affectedRows} 条）` : '';
+      message.success(`测试消息已发送到 ${destination || '目标'}${suffix}`);
+      setMessagePublishTarget(null);
+  };
+
   const handleV2TableContextMenuAction = (node: any, action: V2TableContextMenuActionKey) => {
       switch (action) {
           case 'pin-table':
@@ -5043,6 +5883,9 @@ const Sidebar: React.FC<{
               });
               return;
           }
+          case 'publish-message':
+              openMessagePublishModal(node);
+              return;
           case 'view-ddl':
               openTableDdlInDesigner(node);
               return;
@@ -5229,9 +6072,18 @@ const Sidebar: React.FC<{
       loadDatabases(node);
   };
 
-  const disconnectConnectionNode = (node: any) => {
+  const releaseConnectionResources = async (conn: SavedConnection | undefined) => {
+      if (!conn?.config) return;
+      const res = await DBReleaseConnection(buildRpcConnectionConfig(conn.config, { id: conn.id }) as any);
+      if (res && res.success === false) {
+          throw new Error(res.message || '释放连接失败');
+      }
+  };
+
+  const disconnectConnectionNode = async (node: any) => {
       const connKey = String(node?.key || node?.dataRef?.id || '');
       if (!connKey) return;
+      const conn = (connections.find((item) => item.id === connKey) || node?.dataRef) as SavedConnection | undefined;
       Array.from(loadingNodesRef.current).forEach((loadingKey) => {
           if (loadingKey === `dbs-${connKey}` || loadingKey.startsWith(`tables-${connKey}-`)) {
               loadingNodesRef.current.delete(loadingKey);
@@ -5250,6 +6102,11 @@ const Sidebar: React.FC<{
       setLoadedKeys(prev => prev.filter(k => k !== connKey && !k.toString().startsWith(`${connKey}-`)));
       replaceTreeNodeChildren(connKey, undefined);
       closeTabsByConnection(connKey);
+      try {
+          await releaseConnectionResources(conn);
+      } catch (error: any) {
+          message.warning(error?.message || '连接已从侧边栏断开，但后端连接释放失败');
+      }
       message.success(t('connection.sidebar.disconnect.success'));
   };
 
@@ -5339,7 +6196,7 @@ const Sidebar: React.FC<{
               void handleDuplicateConnection(node.dataRef as SavedConnection);
               return;
           case 'disconnect':
-              disconnectConnectionNode(node);
+              void disconnectConnectionNode(node);
               return;
           case 'delete':
               deleteConnectionNode(node);
@@ -5560,6 +6417,10 @@ const Sidebar: React.FC<{
       if (scopes.includes('object') && (isV2SidebarObjectNode(node) || node.type === 'object-group') && title.includes(keyword)) {
           return true;
       }
+      if (node.type === 'external-sql-root' || node.type === 'external-sql-directory' || node.type === 'external-sql-folder' || node.type === 'external-sql-file') {
+          const pathText = String(node?.dataRef?.path || '').toLowerCase();
+          return title.includes(keyword) || pathText.includes(keyword);
+      }
       return false;
   };
 
@@ -5579,7 +6440,10 @@ const Sidebar: React.FC<{
               const shouldKeepFullSubtree = isSmartMode
                   || item.type === 'connection'
                   || item.type === 'database'
-                  || item.type === 'tag';
+                  || item.type === 'tag'
+                  || item.type === 'external-sql-root'
+                  || item.type === 'external-sql-directory'
+                  || item.type === 'external-sql-folder';
               if (item.children && shouldKeepFullSubtree) {
                   result.push(item);
               } else if (item.children && filteredChildren.length > 0) {
@@ -5710,49 +6574,15 @@ const Sidebar: React.FC<{
 		  ], [activeShortcutPlatform, onCreateConnection, onToggleAI, onToggleLogPanel, shortcutOptions]);
 
 	  const v2CommandSearchQuery = useMemo(
-	      () => parseV2CommandSearchQuery(v2CommandSearchValue),
-	      [v2CommandSearchValue],
+	      () => parseV2CommandSearchQuery(deferredV2CommandSearchValue),
+	      [deferredV2CommandSearchValue],
 	  );
 	  const normalizedV2CommandSearchValue = v2CommandSearchQuery.normalizedKeyword;
 	  const v2CommandSearchObjectMode = v2CommandSearchQuery.mode === 'object';
 	  const v2CommandSearchAiMode = v2CommandSearchQuery.mode === 'ai';
 	  const filteredCommandSearchTreeItems = useMemo(() => {
-	      if (v2CommandSearchAiMode) return [];
-	      const matchLimit = v2CommandSearchObjectMode ? 16 : 8;
-	      if (!normalizedV2CommandSearchValue) {
-	          return commandSearchTreeItems
-	              .filter((item) => !v2CommandSearchObjectMode || (
-	                  item.kind === 'node'
-	                  && (item.node.type === 'table' || item.node.type === 'view' || item.node.type === 'materialized-view')
-	              ))
-	              .slice(0, matchLimit);
-	      }
-	      return commandSearchTreeItems
-	          .filter((item) => {
-	              if (item.kind !== 'node') return false;
-	              const node = item.node;
-	              const dataRef = node.dataRef || {};
-	              if (v2CommandSearchObjectMode && node.type !== 'table' && node.type !== 'view' && node.type !== 'materialized-view') {
-	                  return false;
-	              }
-	              const tableName = String(dataRef.tableName || dataRef.viewName || item.title || '').toLowerCase();
-	              if (v2CommandSearchObjectMode) {
-	                  return tableName.includes(normalizedV2CommandSearchValue)
-	                      || String(item.title || '').toLowerCase().includes(normalizedV2CommandSearchValue);
-	              }
-	              const haystack = [
-	                  item.title,
-	                  item.meta,
-	                  dataRef.tableName,
-                  dataRef.viewName,
-                  dataRef.dbName,
-                  dataRef.name,
-	                  dataRef.config?.host,
-	              ].filter(Boolean).join(' ').toLowerCase();
-	              return haystack.includes(normalizedV2CommandSearchValue);
-	          })
-	          .slice(0, matchLimit);
-	  }, [commandSearchTreeItems, normalizedV2CommandSearchValue, v2CommandSearchAiMode, v2CommandSearchObjectMode]);
+	      return filterV2CommandSearchTreeItems(commandSearchTreeItems, v2CommandSearchQuery);
+	  }, [commandSearchTreeItems, v2CommandSearchQuery]);
 
 	  const filteredCommandSearchActionItems = useMemo(() => {
 	      if (v2CommandSearchObjectMode || v2CommandSearchAiMode) return [];
@@ -5838,12 +6668,14 @@ const Sidebar: React.FC<{
       return String(activeTab?.dbName || '').trim();
   }, [activeContext, activeTab?.dbName]);
   const activeConnectionTreeData = useMemo(() => {
+      const externalSQLNodes = displayTreeData.filter((node) => node.type === 'external-sql-root');
       if (!activeConnection) return displayTreeData;
       const activeConnectionNode = displayTreeData.find((node) => node.type === 'connection' && node.key === activeConnection.id);
       if (activeConnectionNode) {
-          return activeConnectionNode.children && activeConnectionNode.children.length > 0
-              ? activeConnectionNode.children
-              : [];
+          return [
+              ...(activeConnectionNode.children && activeConnectionNode.children.length > 0 ? activeConnectionNode.children : []),
+              ...externalSQLNodes,
+          ];
       }
       const filterTree = (nodes: TreeNode[]): TreeNode[] => nodes.flatMap((node) => {
           if (node.type === 'tag') {
@@ -5857,7 +6689,7 @@ const Sidebar: React.FC<{
       });
 
       const filtered = filterTree(displayTreeData);
-      return filtered;
+      return [...filtered, ...externalSQLNodes];
   }, [activeConnection, displayTreeData]);
   const v2VisibleTreeData = useMemo(() => {
       if (v2ExplorerFilter === 'all') {
@@ -5865,6 +6697,13 @@ const Sidebar: React.FC<{
       }
       return filterV2ExplorerTreeByKind(activeConnectionTreeData, v2ExplorerFilter);
   }, [activeConnectionTreeData, displayTreeData, v2ExplorerFilter]);
+  const v2TreeHorizontalScrollWidth = useMemo(
+      () => estimateV2TreeHorizontalScrollWidth(v2VisibleTreeData, treeViewportWidth),
+      [treeViewportWidth, v2VisibleTreeData],
+  );
+  const effectiveTreeHeight = isV2Ui && v2TreeHorizontalScrollWidth
+      ? Math.max(1, treeHeight - V2_TREE_HORIZONTAL_SCROLL_BOTTOM_RESERVE)
+      : treeHeight;
   const v2TreeMetrics = useMemo(() => {
       const databaseTableCounts = new Map<React.Key, number>();
       const objectGroupCounts = new Map<React.Key, number>();
@@ -5978,6 +6817,7 @@ const Sidebar: React.FC<{
       const iconType = resolveConnectionIconType(conn);
       if (iconType === 'mysql' || iconType === 'mariadb' || iconType === 'oceanbase') return 'MY';
       if (iconType === 'postgres') return 'PG';
+      if (iconType === 'gaussdb') return 'GS';
       if (iconType === 'redis') return 'R';
       if (iconType === 'mongodb') return 'MO';
       if (iconType === 'oracle') return 'OR';
@@ -6118,7 +6958,7 @@ const Sidebar: React.FC<{
       const dbName = String(conn?.dbName || '').trim();
       const tableName = String(conn?.tableName || node?.title || '').trim();
       const objectName = extractObjectName(tableName);
-      const schemaName = String(conn?.schemaName || (tableName.includes('.') ? tableName.split('.').slice(0, -1).join('.') : '')).trim();
+      const schemaName = String(conn?.schemaName || splitQualifiedName(tableName).schemaName || '').trim();
       switch (dialect) {
           case 'mysql':
           case 'starrocks':
@@ -6133,7 +6973,8 @@ const Sidebar: React.FC<{
           case 'kingbase':
           case 'vastbase':
           case 'highgo':
-          case 'opengauss': {
+          case 'opengauss':
+          case 'gaussdb': {
               const schema = schemaName || 'public';
               return [
                   "SELECT c.reltuples::bigint AS table_rows, pg_total_relation_size(c.oid) AS data_length, pg_indexes_size(c.oid) AS index_length, 'heap' AS engine",
@@ -6188,6 +7029,7 @@ const Sidebar: React.FC<{
       const statsKey = getV2TableContextMenuStatsKey(node);
       const stats = v2TableContextMenuStats[statsKey];
       const isStarRocks = getMetadataDialect(node.dataRef as SavedConnection) === 'starrocks';
+      const supportsMessagePublish = Boolean(resolveMessagePublishTarget(node));
       const isPinned = isSidebarTablePinned(
           pinnedSidebarTables,
           String(node?.dataRef?.id || ''),
@@ -6203,6 +7045,7 @@ const Sidebar: React.FC<{
               isPinned={isPinned}
               supportsTruncate={supportsTableTruncateAction(node.dataRef?.config?.type, node.dataRef?.config?.driver)}
               supportsStarRocksRollup={isStarRocks}
+              supportsMessagePublish={supportsMessagePublish}
               onAction={(action) => {
                   setContextMenu(null);
                   handleV2TableContextMenuAction(node, action);
@@ -6249,6 +7092,40 @@ const Sidebar: React.FC<{
       );
   };
 
+  const handleV2SchemaContextMenuAction = (node: any, action: V2SchemaContextMenuActionKey) => {
+      switch (action) {
+          case 'rename-schema':
+              openRenameSchemaModal(node);
+              return;
+          case 'refresh-schema':
+              void loadTables(getDatabaseNodeRef(node?.dataRef, String(node?.dataRef?.dbName || '').trim()));
+              return;
+          case 'export-schema':
+              void handleExportSchemaSQL(node, false);
+              return;
+          case 'backup-schema-sql':
+              void handleExportSchemaSQL(node, true);
+              return;
+          case 'drop-schema':
+              handleDeleteSchema(node);
+              return;
+          default:
+              return;
+      }
+  };
+
+  const renderV2SchemaContextMenu = (node: any) => (
+      <V2SchemaContextMenuView
+          dbName={String(node?.dataRef?.dbName || '')}
+          schemaName={String(node?.dataRef?.schemaName || node?.title || '')}
+          shortcutPlatform={activeShortcutPlatform}
+          onAction={(action) => {
+              setContextMenu(null);
+              handleV2SchemaContextMenuAction(node, action);
+          }}
+      />
+  );
+
   const renderV2ConnectionContextMenu = (node: any) => {
       const conn = node.dataRef as SavedConnection;
       const capabilities = getDataSourceCapabilities(conn?.config);
@@ -6289,6 +7166,7 @@ const Sidebar: React.FC<{
       if (!menu.node) return null;
       if (menu.kind === 'v2-table') return renderV2TableContextMenu(menu.node);
       if (menu.kind === 'v2-database') return renderV2DatabaseContextMenu(menu.node);
+      if (menu.kind === 'v2-schema') return renderV2SchemaContextMenu(menu.node);
       if (menu.kind === 'v2-table-group') return renderV2TableGroupContextMenu(menu.node);
       if (menu.kind === 'v2-connection') return renderV2ConnectionContextMenu(menu.node);
       if (menu.kind === 'v2-connection-group') return renderV2ConnectionGroupContextMenu(menu.node);
@@ -6393,6 +7271,7 @@ const Sidebar: React.FC<{
   const renderV2TreeTitle = (node: any, hoverTitle: string, statusBadge: React.ReactNode) => {
       const rawTitle = String(node.title ?? '');
       const groupKey = String(node?.dataRef?.groupKey || '');
+      const dragText = resolveSidebarObjectDragText(node);
       if (node.type === 'v2-table-section') {
           return (
               <span
@@ -6477,10 +7356,32 @@ const Sidebar: React.FC<{
           <span
               className={titleClassName}
               title={hoverTitle}
+              draggable={!!dragText}
               data-node-type={node.type}
               data-group-key={groupKey || undefined}
               data-sidebar-node-key={String(node.key || '')}
               data-sidebar-node-type={String(node.type || '')}
+              onDragStart={dragText ? (event) => {
+                  snapshotTreeSelectionBeforeDrag();
+                  treeDragSelectSuppressUntilRef.current = Date.now() + 600;
+                  setIsTreeDragging(true);
+                  event.stopPropagation();
+                  event.dataTransfer.effectAllowed = 'copy';
+                  event.dataTransfer.setData('text/plain', dragText);
+                  event.dataTransfer.setData(
+                      SIDEBAR_SQL_EDITOR_DRAG_MIME,
+                      encodeSidebarSqlEditorDragPayload({
+                          text: dragText,
+                          nodeType: node.type,
+                          connectionId: String(node?.dataRef?.id || ''),
+                          dbName: String(node?.dataRef?.dbName || ''),
+                      }),
+                  );
+              } : undefined}
+              onDragEnd={dragText ? () => {
+                  restoreTreeSelectionAfterDrag();
+                  setIsTreeDragging(false);
+              } : undefined}
           >
               {statusBadge}
               <span className="gn-v2-tree-label">{displayTitle}</span>
@@ -6541,6 +7442,7 @@ const Sidebar: React.FC<{
       }
       if (node.type === 'table' || node.type === 'view' || node.type === 'materialized-view') {
           void locateObjectInSidebar({
+              tabId: String(node.key || ''),
               connectionId: dataRef.id,
               dbName: dataRef.dbName,
               tableName: dataRef.tableName || dataRef.viewName,
@@ -6573,15 +7475,19 @@ const Sidebar: React.FC<{
           setV2CommandActiveIndex((prev) => Math.max(prev - 1, 0));
           return;
       }
-	      if (event.key === 'Enter') {
-	          event.preventDefault();
-	          if (v2CommandSearchAiMode && !v2CommandSearchQuery.aiPrompt) {
-	              message.warning('请输入要问 AI 的问题');
-	              return;
-	          }
-	          runCommandSearchItem(commandSearchFlatItems[v2CommandActiveIndex]);
-	          return;
-	      }
+      if (event.key === 'Enter') {
+          if (!shouldRunV2CommandSearchEnter({
+              key: event.key,
+              isComposing: event.nativeEvent.isComposing,
+              keyCode: event.nativeEvent.keyCode,
+              activeItemCount: commandSearchFlatItems.length,
+          })) {
+              return;
+          }
+          event.preventDefault();
+          runCommandSearchItem(commandSearchFlatItems[v2CommandActiveIndex]);
+          return;
+      }
       if (event.key === 'Escape') {
           event.preventDefault();
           closeV2CommandSearch();
@@ -6636,10 +7542,29 @@ const Sidebar: React.FC<{
                           ref={commandSearchInputRef}
                           variant="borderless"
                           value={v2CommandSearchValue}
-                          onChange={(event) => setV2CommandSearchValue(event.target.value)}
+                          onChange={(event) => handleV2CommandSearchValueChange(event.target.value)}
                           onKeyDown={handleV2CommandSearchKeyDown}
                           placeholder={v2CommandSearchPlaceholder}
                       />
+                      <Tooltip title="同步输入内容到左侧筛选">
+                          <span className="gn-v2-command-filter-switch" aria-label="同步到左侧筛选">
+                              <Switch
+                                  size="small"
+                                  checked={v2CommandSearchPersistentFilterEnabled}
+                                  onChange={toggleV2CommandSearchPersistentFilter}
+                              />
+                          </span>
+                      </Tooltip>
+                      <Tooltip title={v2PersistedSidebarFilter ? '重置侧栏筛选' : '没有已同步的侧栏筛选'}>
+                          <Button
+                              size="small"
+                              type="text"
+                              icon={<ReloadOutlined />}
+                              aria-label="重置侧栏筛选"
+                              disabled={!v2PersistedSidebarFilter}
+                              onClick={resetV2SidebarFilter}
+                          />
+                      </Tooltip>
                       <kbd>esc</kbd>
                   </div>
                   <div className="gn-v2-command-list">
@@ -6675,19 +7600,62 @@ const Sidebar: React.FC<{
     const conn = node.dataRef as SavedConnection;
     const isRedis = conn?.config?.type === 'redis';
 
+    if (node.type === 'object-group' && node.dataRef?.groupKey === 'schema') {
+        const dialect = getMetadataDialect(node.dataRef as SavedConnection);
+        const schemaName = String(node?.dataRef?.schemaName || '').trim();
+        if (!isPostgresSchemaDialect(dialect) || !schemaName) {
+            return [];
+        }
+        return [
+            {
+                key: 'rename-schema',
+                label: '编辑模式',
+                icon: <EditOutlined />,
+                onClick: () => openRenameSchemaModal(node)
+            },
+            {
+                key: 'refresh-schema',
+                label: '刷新',
+                icon: <ReloadOutlined />,
+                onClick: () => void loadTables(getDatabaseNodeRef(node.dataRef, node.dataRef.dbName))
+            },
+            {
+                key: 'export-schema',
+                label: '导出当前模式表结构 (SQL)',
+                icon: <ExportOutlined />,
+                onClick: () => void handleExportSchemaSQL(node, false)
+            },
+            {
+                key: 'backup-schema-sql',
+                label: '备份当前模式全部表 (结构+数据 SQL)',
+                icon: <SaveOutlined />,
+                onClick: () => void handleExportSchemaSQL(node, true)
+            },
+            { type: 'divider' },
+            {
+                key: 'drop-schema',
+                label: '删除模式',
+                icon: <DeleteOutlined />,
+                danger: true,
+                onClick: () => handleDeleteSchema(node)
+            },
+        ];
+    }
+
     // 表分组节点的右键菜单
     if (node.type === 'object-group' && node.dataRef?.groupKey === 'tables') {
         const groupData = node.dataRef; // { ...conn, dbName, groupKey }
         const sortPreferenceKey = `${groupData.id}-${groupData.dbName}`;
         const currentSort = tableSortPreference[sortPreferenceKey] || 'name';
+        const canCreateTable = !isStructureOnlyDbType(String(groupData.id || ''));
 
         return [
-            {
+            ...(canCreateTable ? [{
                 key: 'new-table',
                 label: '新建表',
                 icon: <TableOutlined />,
                 onClick: () => openNewTableDesign(node)
-            },
+            }] : []),
             { type: 'divider' },
             {
                 key: 'sort-by-name',
@@ -6869,7 +7837,7 @@ const Sidebar: React.FC<{
                     key: 'disconnect',
                     label: t('connection.sidebar.menu.disconnect'),
                     icon: <DisconnectOutlined />,
-                    onClick: () => disconnectConnectionNode(node)
+                    onClick: () => void disconnectConnectionNode(node)
                 },
                 {
                     key: 'delete',
@@ -6972,7 +7940,7 @@ const Sidebar: React.FC<{
                  key: 'disconnect',
                  label: t('connection.sidebar.menu.disconnect'),
                  icon: <DisconnectOutlined />,
-                 onClick: () => disconnectConnectionNode(node)
+                 onClick: () => void disconnectConnectionNode(node)
              },
              {
                  key: 'delete',
@@ -7035,13 +8003,14 @@ const Sidebar: React.FC<{
        const capabilities = getDataSourceCapabilities(databaseConn?.config);
        const isStarRocks = dialect === 'starrocks';
        const supportsSchemaActions = isPostgresSchemaDialect(dialect);
+       const canCreateTable = !isStructureOnlyDbType(String(databaseConn?.id || ''));
        return [
-           {
+           ...(canCreateTable ? [{
                 key: 'new-table',
                 label: t('sidebar.menu.create_table'),
                 icon: <TableOutlined />,
                 onClick: () => openNewTableDesign(node)
-            },
+            }] : []),
             ...(supportsSchemaActions ? [
                 {
                     key: 'new-schema',
@@ -7136,6 +8105,12 @@ const Sidebar: React.FC<{
                 icon: <CodeOutlined />,
                 onClick: () => openViewDefinition(node)
             },
+            {
+                key: 'copy-view-name',
+                label: '复制名称',
+                icon: <CopyOutlined />,
+                onClick: () => handleCopyTableName(node)
+            },
             { type: 'divider' },
             {
                 key: 'edit-view',
@@ -7198,6 +8173,12 @@ const Sidebar: React.FC<{
                 icon: <CodeOutlined />,
                 onClick: () => openViewDefinition(node)
             },
+            {
+                key: 'copy-materialized-view-name',
+                label: '复制名称',
+                icon: <CopyOutlined />,
+                onClick: () => handleCopyTableName(node)
+            },
             {
                 key: 'new-query',
                 label: t('sidebar.menu.new_query'),
@@ -7273,6 +8254,7 @@ const Sidebar: React.FC<{
         ];
     } else if (node.type === 'table') {
         const isStarRocks = getMetadataDialect(node.dataRef as SavedConnection) === 'starrocks';
+        const messagePublishTarget = resolveMessagePublishTarget(node);
         return [
             {
                 key: 'new-query',
@@ -7291,10 +8273,16 @@ const Sidebar: React.FC<{
                    });
                 }
             },
+            ...(messagePublishTarget ? [{
+                key: 'publish-message',
+                label: '测试发送消息',
+                icon: <SendOutlined />,
+                onClick: () => openMessagePublishModal(node),
+            }] : []),
             { type: 'divider' },
             {
                 key: 'design-table',
-                label: '设计表',
+                label: isStructureOnlyDbType(String(node.dataRef?.id || '')) ? '表结构' : '设计表',
                 icon: <EditOutlined />,
                 onClick: () => openDesign(node, 'columns', false)
             },
@@ -7378,7 +8366,24 @@ const Sidebar: React.FC<{
 
     // 已存查询节点的右键菜单
     if (node.type === 'saved-query') {
-        const q = node.dataRef;
+        const q = node.dataRef as SavedQuery;
+        const rebindMenuItems: MenuProps['items'] = isSavedQueryUnmatched(q)
+            ? [
+                {
+                    key: 'rebind-query',
+                    label: '绑定到连接',
+                    icon: <LinkOutlined />,
+                    disabled: connections.length === 0,
+                    children: connections.length > 0
+                        ? connections.map((conn) => ({
+                            key: `rebind-query-${conn.id}`,
+                            label: conn.name || conn.id,
+                            onClick: () => void handleRebindSavedQuery(q, conn),
+                        }))
+                        : undefined,
+                },
+            ]
+            : [];
         return [
             {
                 key: 'open-query',
@@ -7396,6 +8401,7 @@ const Sidebar: React.FC<{
                     });
                 }
             },
+            ...rebindMenuItems,
             { type: 'divider' },
             {
                 key: 'rename-query',
@@ -7413,12 +8419,17 @@ const Sidebar: React.FC<{
                         title: t('sidebar.modal.confirm_delete.title'),
                         content: t('sidebar.modal.confirm_delete_saved_query.content', { name: resolveSavedQueryDisplayName(q.name) }),
                         okButtonProps: { danger: true },
-                        onOk: () => {
-                            deleteQuery(q.id);
+                        onOk: async () => {
+                            try {
+                                await deleteQuery(q.id);
+                            } catch (e) {
+                                message.error('删除查询失败: ' + (e instanceof Error ? e.message : String(e)));
+                                throw e;
+                            }
                             // 从树中移除节点
                             const removeNode = (list: TreeNode[]): TreeNode[] =>
                                 list
-                                    .filter(n => n.key !== node.key)
+                                    .filter(n => !(n.type === 'saved-query' && n.dataRef?.id === q.id))
                                     .map(n => n.children ? { ...n, children: removeNode(n.children) } : n);
                             const nextTreeData = removeNode(treeDataRef.current);
                             treeDataRef.current = nextTreeData;
@@ -7446,6 +8457,31 @@ const Sidebar: React.FC<{
 
     if (node.type === 'external-sql-directory') {
         return [
+            {
+                key: 'new-external-sql-file',
+                label: '新建 SQL 文件',
+                icon: <FileAddOutlined />,
+                onClick: () => {
+                    openCreateExternalSQLFileModal(node);
+                }
+            },
+            {
+                key: 'new-external-sql-directory',
+                label: '新建目录',
+                icon: <FolderAddOutlined />,
+                onClick: () => {
+                    openCreateExternalSQLDirectoryModal(node);
+                }
+            },
+            {
+                key: 'rename-external-sql-directory',
+                label: '重命名目录',
+                icon: <EditOutlined />,
+                onClick: () => {
+                    openRenameExternalSQLDirectoryModal(node);
+                }
+            },
+            { type: 'divider' },
             {
                 key: 'refresh-external-sql-directory',
                 label: t('sidebar.menu.refresh_directory'),
@@ -7463,6 +8499,62 @@ const Sidebar: React.FC<{
                 onClick: () => {
                     void handleRemoveExternalSQLDirectory(node);
                 }
+            },
+            {
+                key: 'delete-external-sql-directory',
+                label: '删除本地目录',
+                icon: <DeleteOutlined />,
+                danger: true,
+                onClick: () => {
+                    handleDeleteExternalSQLDirectory(node);
+                }
+            }
+        ];
+    }
+
+    if (node.type === 'external-sql-folder') {
+        return [
+            {
+                key: 'new-external-sql-file',
+                label: '新建 SQL 文件',
+                icon: <FileAddOutlined />,
+                onClick: () => {
+                    openCreateExternalSQLFileModal(node);
+                }
+            },
+            {
+                key: 'new-external-sql-directory',
+                label: '新建目录',
+                icon: <FolderAddOutlined />,
+                onClick: () => {
+                    openCreateExternalSQLDirectoryModal(node);
+                }
+            },
+            {
+                key: 'rename-external-sql-directory',
+                label: '重命名目录',
+                icon: <EditOutlined />,
+                onClick: () => {
+                    openRenameExternalSQLDirectoryModal(node);
+                }
+            },
+            {
+                key: 'refresh-external-sql-directory',
+                label: '刷新目录',
+                icon: <ReloadOutlined />,
+                onClick: () => {
+                    void handleRefreshExternalSQLDirectory(node);
+                }
+            },
+            { type: 'divider' },
+            {
+                key: 'delete-external-sql-directory',
+                label: '删除目录',
+                icon: <DeleteOutlined />,
+                danger: true,
+                onClick: () => {
+                    handleDeleteExternalSQLDirectory(node);
+                }
             }
         ];
     }
@@ -7476,6 +8568,40 @@ const Sidebar: React.FC<{
                 onClick: () => {
                     void openExternalSQLFile(node);
                 }
+            },
+            {
+                key: 'rename-external-sql-file',
+                label: '重命名 SQL 文件',
+                icon: <EditOutlined />,
+                onClick: () => {
+                    openRenameExternalSQLFileModal(node);
+                }
+            },
+            {
+                key: 'new-external-sql-file-sibling',
+                label: '在此目录新建 SQL 文件',
+                icon: <FileAddOutlined />,
+                onClick: () => {
+                    openCreateExternalSQLFileModal(node);
+                }
+            },
+            {
+                key: 'new-external-sql-directory-sibling',
+                label: '在此目录新建目录',
+                icon: <FolderAddOutlined />,
+                onClick: () => {
+                    openCreateExternalSQLDirectoryModal(node);
+                }
+            },
+            { type: 'divider' },
+            {
+                key: 'delete-external-sql-file',
+                label: '删除 SQL 文件',
+                icon: <DeleteOutlined />,
+                danger: true,
+                onClick: () => {
+                    handleDeleteExternalSQLFile(node);
+                }
             }
         ];
     }
@@ -7497,13 +8623,13 @@ const Sidebar: React.FC<{
     ) : null;
 
     const displayTitle = String(node.title ?? '');
+    const dragText = resolveSidebarObjectDragText(node);
     let hoverTitle = displayTitle;
     if (node.type === 'table' || node.type === 'view' || node.type === 'materialized-view' || node.type === 'db-event') {
         const rawTableName = String(node?.dataRef?.tableName || node?.dataRef?.viewName || node?.dataRef?.eventName || '').trim();
         const conn = node?.dataRef as SavedConnection | undefined;
         if (rawTableName && shouldHideSchemaPrefix(conn)) {
-            const lastDotIndex = rawTableName.lastIndexOf('.');
-            if (lastDotIndex > 0 && lastDotIndex < rawTableName.length - 1) {
+            if (splitQualifiedName(rawTableName).schemaName) {
                 hoverTitle = rawTableName;
             }
         }
@@ -7571,6 +8697,38 @@ const Sidebar: React.FC<{
         return renderV2TreeTitle(node, hoverTitle, statusBadge);
     }
 
+    if (dragText) {
+        return (
+            <span
+                title={hoverTitle}
+                draggable
+                onDragStart={(event) => {
+                    snapshotTreeSelectionBeforeDrag();
+                    treeDragSelectSuppressUntilRef.current = Date.now() + 600;
+                    setIsTreeDragging(true);
+                    event.stopPropagation();
+                    event.dataTransfer.effectAllowed = 'copy';
+                    event.dataTransfer.setData('text/plain', dragText);
+                    event.dataTransfer.setData(
+                        SIDEBAR_SQL_EDITOR_DRAG_MIME,
+                        encodeSidebarSqlEditorDragPayload({
+                            text: dragText,
+                            nodeType: node.type,
+                            connectionId: String(node?.dataRef?.id || ''),
+                            dbName: String(node?.dataRef?.dbName || ''),
+                        }),
+                    );
+                }}
+                onDragEnd={() => {
+                    restoreTreeSelectionAfterDrag();
+                    setIsTreeDragging(false);
+                }}
+            >
+                {statusBadge}{displayTitle}
+            </span>
+        );
+    }
+
     return <span title={hoverTitle}>{statusBadge}{displayTitle}</span>;
   };
 
@@ -7738,6 +8896,28 @@ const Sidebar: React.FC<{
           });
           return;
       }
+      if (
+          isV2Ui
+          && node?.type === 'object-group'
+          && node?.dataRef?.groupKey === 'schema'
+          && isPostgresSchemaDialect(getMetadataDialect(node.dataRef as SavedConnection))
+          && String(node?.dataRef?.schemaName || '').trim()
+      ) {
+          const position = resolveSidebarContextMenuPosition(event.clientX, event.clientY);
+          setContextMenu({
+              x: position.x,
+              y: position.y,
+              sourceX: event.clientX,
+              sourceY: event.clientY,
+              items: [],
+              kind: 'v2-schema',
+              node,
+              rootClassName: 'gn-v2-table-context-menu-popup',
+              overlayStyle: { width: 264, maxWidth: 'calc(100vw - 24px)' },
+              maxHeight: position.maxHeight,
+          });
+          return;
+      }
       if (isV2Ui && node?.type === 'object-group' && node?.dataRef?.groupKey === 'tables') {
           const position = resolveSidebarContextMenuPosition(event.clientX, event.clientY);
           setContextMenu({
@@ -8006,13 +9186,13 @@ const Sidebar: React.FC<{
               <Tooltip title={canLocateActiveTab ? v2LocateCurrentTableLabel : v2LocateCurrentTableUnavailableLabel} placement="right">
                   <span className="gn-v2-rail-action-wrap">
                       <button
-                          type="button"
-                          className="gn-v2-rail-tool gn-v2-rail-action"
-                          onClick={handleLocateActiveTabInSidebar}
-                          aria-label={v2LocateCurrentTableLabel}
-                          data-sidebar-locate-current-tab-action="true"
-                          disabled={!canLocateActiveTab}
-                      >
+                           type="button"
+                           className="gn-v2-rail-tool gn-v2-rail-action"
+                           onClick={handleLocateActiveTabInSidebar}
+                           aria-label={v2LocateCurrentTableLabel}
+                           data-sidebar-locate-current-tab-action="true"
+                           disabled={!canLocateActiveTab}
+                       >
                           <AimOutlined />
                       </button>
                   </span>
@@ -8094,26 +9274,62 @@ const Sidebar: React.FC<{
             </div>
         )}
         <div className={isV2Ui ? 'gn-v2-explorer-search' : undefined} style={{ padding: '8px 14px', borderBottom: `1px solid ${darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)'}` }}>
-            {isV2Ui ? (
-                <button
-                    type="button"
-                    className="gn-v2-explorer-command-trigger"
-                    onClick={() => {
-                        openV2CommandSearch();
-                        onFocusCommandSearch?.();
-                    }}
-                    aria-label={v2CommandSearchLabel}
-                >
-                    <SearchOutlined />
-                    <span>{v2CommandSearchPlaceholder}</span>
-                    {focusSidebarSearchShortcutTokens.length > 0 ? (
-                        <span className="gn-v2-search-shortcut" aria-hidden="true">
-                            {focusSidebarSearchShortcutTokens.map((token, index) => (
-                                <kbd key={`${token}-${index}`}>{token}</kbd>
-                            ))}
-                        </span>
-                    ) : null}
-                </button>
+            {isV2Ui && !v2UseLegacySidebarFilter ? (
+                <div className="gn-v2-explorer-command-row" data-v2-sidebar-search-mode="command">
+                    <button
+                        type="button"
+                        className="gn-v2-explorer-command-trigger"
+                        onClick={() => {
+                            openV2CommandSearch();
+                            onFocusCommandSearch?.();
+                        }}
+                        aria-label={v2CommandSearchLabel}
+                    >
+                        <SearchOutlined />
+                        <span>{v2PersistedSidebarFilter || v2CommandSearchPlaceholder}</span>
+                        {focusSidebarSearchShortcutTokens.length > 0 ? (
+                            <span className="gn-v2-search-shortcut" aria-hidden="true">
+                                {focusSidebarSearchShortcutTokens.map((token, index) => (
+                                    <kbd key={`${token}-${index}`}>{token}</kbd>
+                                ))}
+                            </span>
+                        ) : null}
+                    </button>
+                    <Tooltip title={v2PersistedSidebarFilter ? '重置侧栏筛选' : '没有已同步的侧栏筛选'}>
+                        <button
+                            type="button"
+                            className="gn-v2-explorer-filter-action"
+                            aria-label="重置侧栏筛选"
+                            disabled={!v2PersistedSidebarFilter}
+                            onClick={resetV2SidebarFilter}
+                        >
+                            <ReloadOutlined />
+                        </button>
+                    </Tooltip>
+                </div>
+            ) : isV2Ui ? (
+                <div className="gn-v2-explorer-legacy-filter-row" data-v2-sidebar-search-mode="filter">
+                    <Input
+                        {...noAutoCapInputProps}
+                        ref={searchInputRef}
+                        value={searchValue}
+                        placeholder={t('sidebar.search.placeholder')}
+                        onChange={onSearch}
+                        size="small"
+                        prefix={<SearchOutlined />}
+                    />
+                    <Tooltip title={searchValue ? '重置侧栏筛选' : '没有筛选内容'}>
+                        <button
+                            type="button"
+                            className="gn-v2-explorer-filter-action"
+                            aria-label="重置侧栏筛选"
+                            disabled={!searchValue}
+                            onClick={resetV2SidebarFilter}
+                        >
+                            <ReloadOutlined />
+                        </button>
+                    </Tooltip>
+                </div>
             ) : (
                 <Input
                     {...noAutoCapInputProps}
@@ -8255,13 +9471,13 @@ const Sidebar: React.FC<{
                 </Tooltip>
             </div>
             <div data-sidebar-legacy-toolbar-item="true" style={legacyToolbarItemStyle}>
-                <Tooltip title={canLocateActiveTab ? '定位当前打开表' : '当前标签页没有可定位的表'}>
+                <Tooltip title={canLocateActiveTab ? '定位当前标签页' : '当前标签页没有可定位的内容'}>
                     <span style={legacyToolbarDisabledWrapStyle}>
                         <Button
                             size="small"
                             type="text"
                             icon={<AimOutlined />}
-                            aria-label="定位当前打开表"
+                            aria-label="定位当前标签页"
                             data-sidebar-locate-current-tab-action="true"
                             disabled={!canLocateActiveTab}
                             onClick={handleLocateActiveTabInSidebar}
@@ -8273,7 +9489,15 @@ const Sidebar: React.FC<{
         </div>
         )}
 
-        <div ref={treeContainerRef} className={`sidebar-tree-scroll-shell${isV2Ui ? ' gn-v2-explorer-tree-shell' : ''}`} style={{ flex: 1, overflow: 'hidden', minHeight: 0 }}>
+        <div
+            ref={treeContainerRef}
+            className={`sidebar-tree-scroll-shell${isV2Ui ? ' gn-v2-explorer-tree-shell' : ''}`}
+            style={{
+                flex: 1,
+                overflow: 'hidden',
+                minHeight: 0,
+            }}
+        >
             <div className="sidebar-tree-scroll-content">
                 <Tree
                     ref={treeRef}
@@ -8308,7 +9532,8 @@ const Sidebar: React.FC<{
                     autoExpandParent={autoExpandParent}
                     selectedKeys={selectedKeys}
                     blockNode
-                    height={treeHeight}
+                    height={effectiveTreeHeight}
+                    scrollWidth={isV2Ui ? v2TreeHorizontalScrollWidth : undefined}
                     onRightClick={onRightClick}
                 />
             </div>
@@ -8456,6 +9681,23 @@ const Sidebar: React.FC<{
             </Form>
         </Modal>
 
+        <Modal
+            title={`编辑模式${renameSchemaTarget?.dataRef?.dbName && renameSchemaTarget?.dataRef?.schemaName ? ` (${renameSchemaTarget.dataRef.dbName}.${renameSchemaTarget.dataRef.schemaName})` : ''}`}
+            open={isRenameSchemaModalOpen}
+            onOk={handleRenameSchema}
+            onCancel={() => {
+                setIsRenameSchemaModalOpen(false);
+                setRenameSchemaTarget(null);
+                renameSchemaForm.resetFields();
+            }}
+        >
+            <Form form={renameSchemaForm} layout="vertical">
+                <Form.Item name="newName" label="模式名称" rules={[{ required: true, message: '请输入模式名称' }]}>
+                    <Input {...noAutoCapInputProps} />
+                </Form.Item>
+            </Form>
+        </Modal>
+
         <Modal
             title={renameDbTarget?.dataRef?.dbName ? t('sidebar.modal.rename_database.title', { name: renameDbTarget.dataRef.dbName }) : t('sidebar.menu.rename_database')}
             open={isRenameDbModalOpen}
@@ -8526,6 +9768,49 @@ const Sidebar: React.FC<{
             </Form>
         </Modal>
 
+        <Modal
+            title={
+                externalSQLFileModalMode === 'create'
+                    ? '新建 SQL 文件'
+                    : externalSQLFileModalMode === 'rename'
+                        ? '重命名 SQL 文件'
+                        : externalSQLFileModalMode === 'create-directory'
+                            ? '新建目录'
+                            : '重命名目录'
+            }
+            open={isExternalSQLFileModalOpen}
+            onOk={handleExternalSQLFileModalOk}
+            onCancel={() => {
+                setIsExternalSQLFileModalOpen(false);
+                setExternalSQLFileTarget(null);
+                externalSQLFileForm.resetFields();
+            }}
+            okText={externalSQLFileModalMode === 'create' || externalSQLFileModalMode === 'create-directory' ? '新建' : '重命名'}
+            cancelText="取消"
+        >
+            <Form form={externalSQLFileForm} layout="vertical">
+                <Form.Item
+                    name="name"
+                    label={isExternalSQLDirectoryModalMode(externalSQLFileModalMode) ? '目录名' : 'SQL 文件名'}
+                    rules={[
+                        { required: true, message: isExternalSQLDirectoryModalMode(externalSQLFileModalMode) ? '请输入目录名' : '请输入 SQL 文件名' },
+                        {
+                            validator: async (_, value) => {
+                                const name = String(value || '').trim();
+                                if (!name) return;
+                                if (/[\\/]/.test(name) || name === '.' || name === '..') {
+                                    throw new Error(isExternalSQLDirectoryModalMode(externalSQLFileModalMode) ? '目录名不能包含路径分隔符' : '文件名不能包含路径分隔符');
+                                }
+                            },
+                        },
+                    ]}
+                    extra={isExternalSQLDirectoryModalMode(externalSQLFileModalMode) ? '目录只会显示在外部 SQL 目录树中，非 SQL 文件仍不会显示' : '不输入 .sql 后缀时会自动补齐'}
+                >
+                    <Input {...noAutoCapInputProps} placeholder={isExternalSQLDirectoryModalMode(externalSQLFileModalMode) ? '例如：reports' : '例如：report.sql'} />
+                </Form.Item>
+            </Form>
+        </Modal>
+
         <Modal
             title={renderSidebarModalTitle(<TableOutlined />, "批量操作表", "按对象批量导出结构、数据或完整备份。")}
             open={isBatchModalOpen}
@@ -8860,6 +10145,14 @@ const Sidebar: React.FC<{
             connectionId={findInDbContext.connectionId}
             dbName={findInDbContext.dbName}
         />
+        <MessagePublishModal
+            open={Boolean(messagePublishTarget)}
+            connection={messagePublishTarget?.connection || null}
+            executionDbName={messagePublishTarget?.executionDbName || ''}
+            defaultDestination={messagePublishTarget?.destination || ''}
+            onCancel={() => setMessagePublishTarget(null)}
+            onSuccess={handleMessagePublishSuccess}
+        />
     </div>
   );
 });
diff --git a/frontend/src/components/SnippetSettingsModal.tsx b/frontend/src/components/SnippetSettingsModal.tsx
index a7ba44f..41b3ba3 100644
--- a/frontend/src/components/SnippetSettingsModal.tsx
+++ b/frontend/src/components/SnippetSettingsModal.tsx
@@ -26,6 +26,7 @@ const emptyDraft = (): DraftSnippet => ({
   prefix: '',
   name: '',
   description: '',
+  syntaxHelp: '',
   body: '',
   isBuiltin: false,
 });
@@ -122,6 +123,7 @@ export default function SnippetSettingsModal({
       prefix,
       name: draft.name.trim(),
       description: draft.description?.trim() || undefined,
+      syntaxHelp: draft.syntaxHelp?.trim() || undefined,
       body: draft.body,
       isBuiltin: draft.isBuiltin,
       createdAt: draft.createdAt ?? Date.now(),
@@ -150,36 +152,58 @@ export default function SnippetSettingsModal({
       resetBuiltinSqlSnippet(id);
       const original = BUILTIN_SNIPPET_MAP[id];
       if (original && selectedId === id) {
-        setDraft({ ...original });
+        setDraft({ ...original, syntaxHelp: original.syntaxHelp || '' });
       }
       void message.success('已重置为默认');
     },
     [resetBuiltinSqlSnippet, selectedId],
   );
 
-  const syntaxHelpItems = [
-    {
-      key: 'syntax',
-      label: '片段语法说明',
-      children: (
-        <div style={{ fontSize: 12, lineHeight: 1.8, color: mutedColor, fontFamily: 'var(--gn-font-mono)' }}>
-          <div>{'${1:占位符}   第一个 Tab 位，占位符为提示文字'}</div>
-          <div>{'${2:默认值}   第二个 Tab 位，默认值可直接确认'}</div>
-          <div>{'$0            最终光标位置'}</div>
-          <div>{'${1:表名}     同一数字在多处出现时会同步编辑'}</div>
-          <div style={{ marginTop: 6, fontWeight: 600, color: textColor }}>{'内置变量（展开时自动替换为实际值）：'}</div>
-          <div>{'${CURRENT_YEAR}-${CURRENT_MONTH}-${CURRENT_DATE}  当前日期'}</div>
-          <div>{'${CURRENT_HOUR}:${CURRENT_MINUTE}:${CURRENT_SECOND}  当前时间'}</div>
-          <div>{'${CURRENT_SECONDS_UNIX}  Unix 时间戳'}</div>
-          <div>{'${UUID}       随机 UUID'}</div>
-          <div>{'${RANDOM}     6 位随机数'}</div>
-          <div style={{ marginTop: 8, fontFamily: 'inherit', color: textColor }}>
-            {'示例：SELECT ${1:列名} FROM ${2:表名} WHERE date >= \'${CURRENT_YEAR}-${CURRENT_MONTH}-${CURRENT_DATE}\';$0'}
+  const syntaxHelpItems = useMemo(
+    () => [
+      {
+        key: 'snippet-help',
+        label: '片段语法说明（可编辑）',
+        children: (
+          <Input.TextArea
+            data-sql-snippet-syntax-help-editor="true"
+            value={draft.syntaxHelp || ''}
+            onChange={(e) => setDraft((d) => ({ ...d, syntaxHelp: e.target.value }))}
+            placeholder="展示在补全详情中的用法说明，例如占位符含义、参数约定或注意事项"
+            maxLength={1000}
+            autoSize={{ minRows: 4, maxRows: 8 }}
+            style={{
+              fontSize: 12,
+              resize: 'none',
+              fontFamily: 'var(--gn-font-mono)',
+            }}
+          />
+        ),
+      },
+      {
+        key: 'syntax',
+        label: '占位符语法参考',
+        children: (
+          <div style={{ fontSize: 12, lineHeight: 1.8, color: mutedColor, fontFamily: 'var(--gn-font-mono)' }}>
+            <div>{'${1:占位符}   第一个 Tab 位，占位符为提示文字'}</div>
+            <div>{'${2:默认值}   第二个 Tab 位，默认值可直接确认'}</div>
+            <div>{'$0            最终光标位置'}</div>
+            <div>{'${1:表名}     同一数字在多处出现时会同步编辑'}</div>
+            <div style={{ marginTop: 6, fontWeight: 600, color: textColor }}>{'内置变量（展开时自动替换为实际值）：'}</div>
+            <div>{'${CURRENT_YEAR}-${CURRENT_MONTH}-${CURRENT_DATE}  当前日期'}</div>
+            <div>{'${CURRENT_HOUR}:${CURRENT_MINUTE}:${CURRENT_SECOND}  当前时间'}</div>
+            <div>{'${CURRENT_SECONDS_UNIX}  Unix 时间戳'}</div>
+            <div>{'${UUID}       随机 UUID'}</div>
+            <div>{'${RANDOM}     6 位随机数'}</div>
+            <div style={{ marginTop: 8, fontFamily: 'inherit', color: textColor }}>
+              {'示例：SELECT ${1:列名} FROM ${2:表名} WHERE date >= \'${CURRENT_YEAR}-${CURRENT_MONTH}-${CURRENT_DATE}\';$0'}
+            </div>
           </div>
-        </div>
-      ),
-    },
-  ];
+        ),
+      },
+    ],
+    [draft.syntaxHelp, mutedColor, textColor],
+  );
 
   const showEditor = isCreating || selectedSnippet;
 
@@ -215,14 +239,9 @@ export default function SnippetSettingsModal({
       styles={{
         content: shellStyle,
         header: { background: 'transparent', borderBottom: 'none', paddingBottom: 8 },
-        body: { paddingTop: 8 },
-        footer: { background: 'transparent', borderTop: 'none', paddingTop: 40 },
+        body: { paddingTop: 8, paddingBottom: 24 },
       }}
-      footer={[
-        <Button key="close" type="primary" onClick={onClose}>
-          关闭
-        </Button>,
-      ]}
+      footer={null}
     >
       <div style={{ display: 'flex', gap: 16, minHeight: 420 }}>
         {/* Left: snippet list */}
@@ -367,38 +386,12 @@ export default function SnippetSettingsModal({
                 />
                 <Collapse
                   size="small"
+                  defaultActiveKey={['snippet-help']}
                   items={syntaxHelpItems}
                   style={{ marginTop: 8, background: 'transparent' }}
                 />
               </div>
 
-              <div style={{ display: 'flex', gap: 8, justifyContent: 'flex-end', paddingTop: 4 }}>
-                {draft.isBuiltin && draft.createdAt && (
-                  <Popconfirm
-                    title="重置为默认"
-                    description="将恢复此内置片段的原始内容"
-                    onConfirm={() => handleReset(draft.id)}
-                  >
-                    <Button icon={<UndoOutlined />} size="small">
-                      重置为默认
-                    </Button>
-                  </Popconfirm>
-                )}
-                {!draft.isBuiltin && !isCreating && (
-                  <Popconfirm
-                    title="删除片段"
-                    description="确定要删除此片段吗？"
-                    onConfirm={() => handleDelete(draft.id)}
-                  >
-                    <Button danger icon={<DeleteOutlined />} size="small">
-                      删除
-                    </Button>
-                  </Popconfirm>
-                )}
-                <Button type="primary" icon={<SaveOutlined />} size="small" onClick={handleSave}>
-                  保存
-                </Button>
-              </div>
             </div>
           ) : (
             <div
@@ -416,6 +409,49 @@ export default function SnippetSettingsModal({
           )}
         </div>
       </div>
+      <div
+        data-sql-snippet-action-row="true"
+        style={{
+          display: 'flex',
+          gap: 12,
+          justifyContent: 'flex-end',
+          alignItems: 'center',
+          paddingTop: 18,
+          marginTop: 18,
+          borderTop: overlayTheme.sectionBorder,
+        }}
+      >
+        {showEditor && draft.isBuiltin && draft.createdAt && (
+          <Popconfirm
+            title="重置为默认"
+            description="将恢复此内置片段的原始内容"
+            onConfirm={() => handleReset(draft.id)}
+          >
+            <Button icon={<UndoOutlined />} size="large" style={{ minWidth: 118 }}>
+              重置为默认
+            </Button>
+          </Popconfirm>
+        )}
+        {showEditor && !draft.isBuiltin && !isCreating && (
+          <Popconfirm
+            title="删除片段"
+            description="确定要删除此片段吗？"
+            onConfirm={() => handleDelete(draft.id)}
+          >
+            <Button danger icon={<DeleteOutlined />} size="large" style={{ minWidth: 96 }}>
+              删除
+            </Button>
+          </Popconfirm>
+        )}
+        {showEditor && (
+          <Button type="primary" icon={<SaveOutlined />} size="large" style={{ minWidth: 96 }} onClick={handleSave}>
+            保存
+          </Button>
+        )}
+        <Button size="large" style={{ minWidth: 96 }} onClick={onClose}>
+          关闭
+        </Button>
+      </div>
     </Modal>
   );
 }
diff --git a/frontend/src/components/TabManager.hover.test.tsx b/frontend/src/components/TabManager.hover.test.tsx
index cbd12ea..2618101 100644
--- a/frontend/src/components/TabManager.hover.test.tsx
+++ b/frontend/src/components/TabManager.hover.test.tsx
@@ -6,12 +6,14 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 import {
   TAB_WORKBENCH_CLASS_NAME,
   resolveTabHoverOpen,
+  resolveTabHoverTitle,
   shouldShowV2ConnectionLabel,
   TabHoverInfo,
   stopTabHoverDragPropagation,
 } from './TabManager';
 import { setCurrentLanguage } from '../i18n';
 import type { TabData } from '../types';
+import { buildTabDisplayModel } from '../utils/tabDisplay';
 
 const stripSourceComments = (source: string): string =>
   source
@@ -128,6 +130,34 @@ describe('TabManager hover info', () => {
     expect(getTabKindLabelSource).not.toMatch(/return '(TABLE|DESIGN|DB|REDIS|JVM|TRG|MV|VIEW|EVT|FUNC|TAB)'/);
   });
 
+  it('keeps v2 hover title focused on the tab object instead of appending secondary display fields', () => {
+    const tab: TabData = {
+      id: 'overview-1',
+      title: '表概览 - front_end_sys',
+      type: 'table-overview',
+      connectionId: 'conn-1',
+      dbName: 'front_end_sys',
+    };
+    const displayModel = buildTabDisplayModel(tab, {
+      id: 'conn-1',
+      name: '开发240',
+      config: {
+        type: 'mysql',
+        host: '192.168.1.240',
+        port: 3306,
+        user: 'root',
+        database: 'front_end_sys',
+      },
+    }, {
+      layout: 'double',
+      primaryElements: ['object', 'kind'],
+      secondaryElements: ['connection', 'database'],
+    });
+
+    expect(displayModel.fullTitle).toContain('[开发240]');
+    expect(resolveTabHoverTitle(displayModel, displayModel.fullTitle)).toBe('表概览 - front_end_sys');
+  });
+
   it('stops hover card pointer events from reaching tab drag listeners without blocking text selection', () => {
     const event = {
       preventDefault: vi.fn(),
@@ -146,6 +176,13 @@ describe('TabManager hover info', () => {
     expect(resolveTabHoverOpen(false, true)).toBe(false);
   });
 
+  it('opens tab display settings from the v2 tab context menu', () => {
+    const source = readFileSync(new URL('./TabManager.tsx', import.meta.url), 'utf8');
+
+    expect(source).toContain("new CustomEvent('gonavi:open-tab-display-settings')");
+    expect(source).toContain("if (typeof window === 'undefined')");
+  });
+
   it('hides the v2 gray connection suffix when the title already carries the same prefix', () => {
     expect(shouldShowV2ConnectionLabel('[本地] videos', '本地')).toBe(false);
     expect(shouldShowV2ConnectionLabel('[缓存 | 10.0.0.8] db2', '缓存')).toBe(false);
@@ -217,6 +254,29 @@ describe('TabManager hover info', () => {
     expect(source).toMatch(/const items = useMemo\([\s\S]*\), \[[^\]]*languagePreference[^\]]*\]\);/);
   });
 
+  it('renders tab labels from appearance tab display settings', () => {
+    const source = readFileSync(new URL('./TabManager.tsx', import.meta.url), 'utf8');
+
+    expect(source).toContain('buildTabDisplayModel(tab, connection, appearance.tabDisplay)');
+    expect(source).toContain('displayModel={displayModel}');
+    expect(source).toContain('displayModel.primaryParts.map(renderV2TabDisplayPart)');
+    expect(source).toContain("if (part.key === 'kind')");
+    expect(source).toContain('className="gn-v2-tab-kind"');
+    expect(source).toContain('hasDoubleLineTabLabel');
+    expect(source).toContain('gn-v2-main-tabs-double');
+    expect(source).toContain('showSecondaryLine');
+    expect(source).toContain('gn-v2-tab-label-secondary');
+    expect(source).toContain('gn-v2-tab-label-rich');
+    expect(source).toContain('gn-v2-tab-label-double');
+    expect(source).toContain('gn-v2-tab-label-main tab-title-text');
+    expect(source).toContain("key: 'tab-display-settings'");
+    expect(source).toContain('label: \'标签设置\'');
+    expect(source).toContain('icon: <SettingOutlined />');
+    expect(source).toContain('onClick: openTabDisplaySettings');
+    expect(source).toContain("rootClassName={isV2Ui ? 'gn-v2-tab-context-menu-popup' : undefined}");
+    expect(source).not.toContain('gn-v2-main-tabs-rich');
+  });
+
   it('wires hover card tab-switch and drag-blocking handlers with selectable text styles', () => {
     const source = readFileSync(new URL('./TabManager.tsx', import.meta.url), 'utf8');
 
@@ -238,7 +298,31 @@ describe('TabManager hover info', () => {
     expect(source).toMatch(/\.gn-v2-tab-hover-card \{[^}]*cursor: text;[^}]*user-select: text;/s);
     expect(source).toContain("--gn-v2-tab-hover-grid-columns: 56px minmax(0, 1fr);");
     expect(source).toMatch(/\.gn-v2-tab-hover-head \{[^}]*display: grid;[^}]*grid-template-columns: var\(--gn-v2-tab-hover-grid-columns\);/s);
+    expect(source).toMatch(/\.gn-v2-tab-hover-head > strong \{[^}]*overflow-wrap: anywhere;[^}]*white-space: normal;/s);
     expect(source).toMatch(/\.gn-v2-tab-hover-row \{[^}]*grid-template-columns: var\(--gn-v2-tab-hover-grid-columns\);/s);
     expect(source).toMatch(/\.gn-v2-tab-hover-card \* \{[^}]*user-select: text;/s);
   });
+
+  it('guards closing opened SQL file tabs with save confirmation', () => {
+    const source = readFileSync(new URL('./TabManager.tsx', import.meta.url), 'utf8');
+
+    expect(source).toContain('ReadSQLFile(filePath)');
+    expect(source).toContain('isSQLFileMissingReadResult(res)');
+    expect(source).toContain('isSQLFileMissingErrorMessage(errorMessage)');
+    expect(source).toContain("title: '关闭已丢失的 SQL 文件标签？'");
+    expect(source).toContain('关闭后将丢弃标签内的本地草稿');
+    expect(source).toContain('confirmDirtyTabsOrClose();');
+    expect(source).toContain("getSQLFileTabDraft(tab.id, String(tab.query ?? ''))");
+    expect(source).toContain('hasSQLFileTabUnsavedChanges({ ...tab, query: draft }, normalizeSQLFileReadContent(res.data))');
+    expect(source).toContain("title: '保存 SQL 文件修改？'");
+    expect(source).toContain("okText: '保存并关闭'");
+    expect(source).toContain('不保存');
+    expect(source).toContain('WriteSQLFile(filePath, draft)');
+    expect(source).toContain('clearSQLFileTabDraft(tab.id)');
+    expect(source).toContain('closeTabsWithSQLFilePrompt([id], () => closeTab(id))');
+    expect(source).toContain('closeTabsWithSQLFilePrompt(getCloseOtherTabIds(tabs, tab.id), () => closeOtherTabs(tab.id))');
+    expect(source).toContain('closeTabsWithSQLFilePrompt(getCloseTabsToLeftIds(tabs, tab.id), () => closeTabsToLeft(tab.id))');
+    expect(source).toContain('closeTabsWithSQLFilePrompt(getCloseTabsToRightIds(tabs, tab.id), () => closeTabsToRight(tab.id))');
+    expect(source).toContain('closeTabsWithSQLFilePrompt(tabs.map((item) => item.id), () => closeAllTabs())');
+  });
 });
diff --git a/frontend/src/components/TabManager.tsx b/frontend/src/components/TabManager.tsx
index d43043a..40ac1b4 100644
--- a/frontend/src/components/TabManager.tsx
+++ b/frontend/src/components/TabManager.tsx
@@ -1,6 +1,6 @@
-import React, { useMemo, useRef, useState } from 'react';
-import { Button, Dropdown, Tabs, Tooltip } from 'antd';
-import { AppstoreOutlined, CloseOutlined, ConsoleSqlOutlined, DatabaseOutlined, PlusOutlined, RobotOutlined } from '@ant-design/icons';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
+import { Button, Dropdown, message, Modal, Tabs, Tooltip } from 'antd';
+import { AppstoreOutlined, CloseOutlined, ConsoleSqlOutlined, DatabaseOutlined, PlusOutlined, RobotOutlined, SettingOutlined } from '@ant-design/icons';
 import type { MenuProps, TabsProps } from 'antd';
 import { DndContext, PointerSensor, closestCenter, useSensor, useSensors } from '@dnd-kit/core';
 import type { DragStartEvent, DragEndEvent } from '@dnd-kit/core';
@@ -24,8 +24,22 @@ import JVMDiagnosticConsole from './JVMDiagnosticConsole';
 import JVMMonitoringDashboard from './JVMMonitoringDashboard';
 import type { TabData } from '../types';
 import { t } from '../i18n';
-import { buildTabDisplayTitle } from '../utils/tabDisplay';
-import { resolveConnectionHostSummary } from '../utils/tabDisplay';
+import {
+  buildTabDisplayModel,
+  resolveConnectionHostSummary,
+  type TabDisplayPart,
+  type TabDisplayModel,
+} from '../utils/tabDisplay';
+import { ReadSQLFile, WriteSQLFile } from '../../wailsjs/go/app/App';
+import {
+  getSQLFileTabPath,
+  hasSQLFileTabUnsavedChanges,
+  isSQLFileMissingErrorMessage,
+  isSQLFileMissingReadResult,
+  isSQLFileQueryTab,
+  normalizeSQLFileReadContent,
+} from '../utils/sqlFileTabDirty';
+import { clearSQLFileTabDraft, getSQLFileTabDraft } from '../utils/sqlFileTabDrafts';
 
 const getTabKindLabel = (tab: TabData): string => {
   if (tab.type === 'query') return t('tab_manager.kind_badge.query');
@@ -83,6 +97,21 @@ const getTabObjectLabel = (tab: TabData): string => {
   return '';
 };
 
+const getCloseOtherTabIds = (tabs: TabData[], id: string): string[] =>
+  tabs.filter((tab) => tab.id !== id).map((tab) => tab.id);
+
+const getCloseTabsToLeftIds = (tabs: TabData[], id: string): string[] => {
+  const index = tabs.findIndex((tab) => tab.id === id);
+  if (index <= 0) return [];
+  return tabs.slice(0, index).map((tab) => tab.id);
+};
+
+const getCloseTabsToRightIds = (tabs: TabData[], id: string): string[] => {
+  const index = tabs.findIndex((tab) => tab.id === id);
+  if (index < 0 || index >= tabs.length - 1) return [];
+  return tabs.slice(index + 1).map((tab) => tab.id);
+};
+
 export const stopTabHoverDragPropagation = (event: React.SyntheticEvent<HTMLElement>) => {
   event.stopPropagation();
 };
@@ -90,6 +119,13 @@ export const stopTabHoverDragPropagation = (event: React.SyntheticEvent<HTMLElem
 export const resolveTabHoverOpen = (isHoverInfoOpen: boolean, isTabMenuOpen: boolean) =>
   isHoverInfoOpen && !isTabMenuOpen;
 
+export const openTabDisplaySettings = () => {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  window.dispatchEvent(new CustomEvent('gonavi:open-tab-display-settings'));
+};
+
 export const shouldShowV2ConnectionLabel = (displayTitle: string, connectionLabel?: string): boolean => {
   const normalizedConnectionLabel = String(connectionLabel || '').trim();
   if (!normalizedConnectionLabel) {
@@ -106,8 +142,28 @@ export const shouldShowV2ConnectionLabel = (displayTitle: string, connectionLabe
   return !prefixedConnectionPattern.test(normalizedDisplayTitle);
 };
 
+export const resolveTabHoverTitle = (displayModel: TabDisplayModel | undefined, fallbackTitle: string): string => {
+  if (!displayModel) {
+    return fallbackTitle;
+  }
+
+  const objectPart = [...displayModel.primaryParts, ...displayModel.secondaryParts]
+    .find((part) => part.key === 'object');
+  if (objectPart?.text) {
+    return objectPart.text;
+  }
+
+  const primaryText = displayModel.primaryParts
+    .filter((part) => part.key !== 'kind')
+    .map((part) => part.text)
+    .join(' ')
+    .trim();
+  return primaryText || displayModel.primaryText || fallbackTitle;
+};
+
 type TabHoverInfoProps = {
   tab: TabData;
+  displayModel?: TabDisplayModel;
   displayTitle: string;
   connectionLabel?: string;
   hostSummary?: string;
@@ -115,16 +171,22 @@ type TabHoverInfoProps = {
 
 export const TabHoverInfo: React.FC<TabHoverInfoProps> = ({
   tab,
+  displayModel,
   displayTitle,
   connectionLabel,
   hostSummary,
 }) => {
   const objectLabel = getTabObjectLabel(tab);
+  const hoverTitle = resolveTabHoverTitle(displayModel, displayTitle);
+  const schemaPart = displayModel
+    ? [...displayModel.primaryParts, ...displayModel.secondaryParts].find((part) => part.key === 'schema')
+    : undefined;
   const rows = [
     [t('tab_manager.hover.label.type'), getTabKindTooltipLabel(tab)],
     [t('tab_manager.hover.label.connection'), connectionLabel || t('tab_manager.hover.fallback.unbound_connection')],
     ['Host', hostSummary || t('tab_manager.hover.fallback.host_not_configured')],
     [t('tab_manager.hover.label.database'), tab.dbName || t('tab_manager.hover.fallback.database_not_specified')],
+    ['Schema', schemaPart?.value],
     [t('tab_manager.hover.label.object'), objectLabel],
   ].filter(([, value]) => Boolean(value));
 
@@ -148,7 +210,7 @@ export const TabHoverInfo: React.FC<TabHoverInfoProps> = ({
     >
       <div className="gn-v2-tab-hover-head">
         <span>{getTabKindLabel(tab)}</span>
-        <strong>{displayTitle}</strong>
+        <strong>{hoverTitle}</strong>
       </div>
       <div className="gn-v2-tab-hover-rows">
         {rows.map(([label, value]) => (
@@ -164,6 +226,7 @@ export const TabHoverInfo: React.FC<TabHoverInfoProps> = ({
 
 type SortableTabLabelProps = {
   tab: TabData;
+  displayModel: TabDisplayModel;
   displayTitle: string;
   menuItems: MenuProps['items'];
   connectionLabel?: string;
@@ -172,8 +235,24 @@ type SortableTabLabelProps = {
   onClose?: () => void;
 };
 
+const renderV2TabDisplayPart = (part: TabDisplayPart) => {
+  if (part.key === 'kind') {
+    return (
+      <span className="gn-v2-tab-kind" key={part.key}>
+        {part.text}
+      </span>
+    );
+  }
+  return (
+    <span className={`gn-v2-tab-label-part gn-v2-tab-label-part-${part.key}`} key={part.key}>
+      {part.text}
+    </span>
+  );
+};
+
 const SortableTabLabel: React.FC<SortableTabLabelProps> = ({
   tab,
+  displayModel,
   displayTitle,
   menuItems,
   connectionLabel,
@@ -199,17 +278,30 @@ const SortableTabLabel: React.FC<SortableTabLabelProps> = ({
     setIsHoverInfoOpen(open && !isTabMenuOpen);
   };
 
+  const tabDisplayPartCount = displayModel.primaryParts.length + displayModel.secondaryParts.length;
+  const showSecondaryLine = isV2Ui && displayModel.layout === 'double' && Boolean(displayModel.secondaryText);
   const labelNode = (
     <span
-      className={`tab-dnd-label${isV2Ui ? ' gn-v2-tab-label' : ''}`}
+      className={`tab-dnd-label${isV2Ui ? ' gn-v2-tab-label' : ''}${showSecondaryLine ? ' gn-v2-tab-label-double' : ''}${tabDisplayPartCount >= 4 ? ' gn-v2-tab-label-rich' : ''}`}
       onContextMenu={handleTabLabelContextMenu}
       title={isV2Ui ? undefined : displayTitle}
     >
-      {isV2Ui ? <span className="gn-v2-tab-kind">{getTabKindLabel(tab)}</span> : null}
-      <span className="tab-title-text">{displayTitle}</span>
-      {isV2Ui && shouldShowV2ConnectionLabel(displayTitle, connectionLabel) ? (
-        <span className="gn-v2-tab-conn">{connectionLabel}</span>
-      ) : null}
+      {isV2Ui ? (
+        <span className="gn-v2-tab-label-content">
+          <span className="gn-v2-tab-label-main tab-title-text">
+            {displayModel.primaryParts.length > 0
+              ? displayModel.primaryParts.map(renderV2TabDisplayPart)
+              : displayModel.primaryText}
+          </span>
+          {showSecondaryLine ? (
+            <span className="gn-v2-tab-label-secondary" title={displayModel.secondaryText}>
+              {displayModel.secondaryText}
+            </span>
+          ) : null}
+        </span>
+      ) : (
+        <span className="tab-title-text">{displayTitle}</span>
+      )}
       {isV2Ui && onClose ? (
         <button
           type="button"
@@ -232,6 +324,7 @@ const SortableTabLabel: React.FC<SortableTabLabelProps> = ({
       title={(
         <TabHoverInfo
           tab={tab}
+          displayModel={displayModel}
           displayTitle={displayTitle}
           connectionLabel={connectionLabel}
           hostSummary={hostSummary}
@@ -249,7 +342,12 @@ const SortableTabLabel: React.FC<SortableTabLabelProps> = ({
   ) : labelNode;
 
   return (
-    <Dropdown menu={{ items: menuItems }} trigger={['contextMenu']} onOpenChange={handleTabMenuOpenChange}>
+    <Dropdown
+      menu={{ items: menuItems }}
+      trigger={['contextMenu']}
+      onOpenChange={handleTabMenuOpenChange}
+      rootClassName={isV2Ui ? 'gn-v2-tab-context-menu-popup' : undefined}
+    >
       {wrappedLabel}
     </Dropdown>
   );
@@ -353,14 +451,152 @@ const TabManager: React.FC = React.memo(() => {
   );
   const isV2Ui = appearance.uiVersion === 'v2';
   const hasTabs = tabs.length > 0;
+  const pendingCloseTabIdsRef = useRef<Set<string>>(new Set());
 
   const onChange = (newActiveKey: string) => {
     setActiveTab(newActiveKey);
   };
 
+  const requestCloseSQLFileTabs = useCallback(async (
+    targetTabs: TabData[],
+    closeConfirmedTabs: () => void,
+  ) => {
+    const candidateTabs = targetTabs.filter(isSQLFileQueryTab);
+    if (candidateTabs.length === 0) {
+      closeConfirmedTabs();
+      return;
+    }
+
+    const closeConfirmedTabsAndClearDrafts = () => {
+      closeConfirmedTabs();
+      candidateTabs.forEach((tab) => clearSQLFileTabDraft(tab.id));
+    };
+
+    const dirtyTabs: Array<{ tab: TabData; draft: string }> = [];
+    const missingFileTabs: Array<{ tab: TabData; filePath: string }> = [];
+    for (const tab of candidateTabs) {
+      const filePath = getSQLFileTabPath(tab);
+      if (!filePath) continue;
+      try {
+        const res = await ReadSQLFile(filePath);
+        if (!res.success) {
+          if (isSQLFileMissingReadResult(res)) {
+            missingFileTabs.push({ tab, filePath });
+            continue;
+          }
+          message.error(`读取 SQL 文件失败，已取消关闭：${res.message || filePath}`);
+          return;
+        }
+        const draft = getSQLFileTabDraft(tab.id, String(tab.query ?? ''));
+        if (hasSQLFileTabUnsavedChanges({ ...tab, query: draft }, normalizeSQLFileReadContent(res.data))) {
+          dirtyTabs.push({ tab, draft });
+        }
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        if (isSQLFileMissingErrorMessage(errorMessage)) {
+          missingFileTabs.push({ tab, filePath });
+          continue;
+        }
+        message.error('读取 SQL 文件失败，已取消关闭：' + errorMessage);
+        return;
+      }
+    }
+
+    const confirmDirtyTabsOrClose = () => {
+      if (dirtyTabs.length === 0) {
+        closeConfirmedTabsAndClearDrafts();
+        return;
+      }
+
+      const firstDirtyTab = dirtyTabs[0].tab;
+      const dirtyFilePath = getSQLFileTabPath(firstDirtyTab);
+      const dirtyLabel = dirtyTabs.length === 1
+        ? `“${firstDirtyTab.title || dirtyFilePath}”`
+        : `${dirtyTabs.length} 个 SQL 文件`;
+
+      let destroyConfirm: (() => void) | null = null;
+      const confirmRef = Modal.confirm({
+        title: '保存 SQL 文件修改？',
+        content: `${dirtyLabel} 有未保存修改，是否保存后再关闭？`,
+        okText: '保存并关闭',
+        cancelText: '取消',
+        closable: true,
+        maskClosable: true,
+        okButtonProps: { type: 'primary' },
+        footer: (_, { OkBtn, CancelBtn }) => (
+          <>
+            <Button
+              onClick={() => {
+                destroyConfirm?.();
+                closeConfirmedTabsAndClearDrafts();
+              }}
+            >
+              不保存
+            </Button>
+            <CancelBtn />
+            <OkBtn />
+          </>
+        ),
+        onOk: async () => {
+          try {
+            for (const { tab, draft } of dirtyTabs) {
+              const filePath = getSQLFileTabPath(tab);
+              if (!filePath) continue;
+              const res = await WriteSQLFile(filePath, draft);
+              if (!res.success) {
+                throw new Error(`保存 ${tab.title || filePath} 失败：${res.message || '未知错误'}`);
+              }
+            }
+            message.success('SQL 文件已保存');
+            closeConfirmedTabsAndClearDrafts();
+          } catch (error) {
+            message.error(error instanceof Error ? error.message : String(error));
+            throw error;
+          }
+        },
+      });
+      destroyConfirm = confirmRef.destroy;
+    };
+
+    if (missingFileTabs.length > 0) {
+      const firstMissing = missingFileTabs[0];
+      const missingLabel = missingFileTabs.length === 1
+        ? `“${firstMissing.tab.title || firstMissing.filePath}”`
+        : `${missingFileTabs.length} 个 SQL 文件标签`;
+      Modal.confirm({
+        title: '关闭已丢失的 SQL 文件标签？',
+        content: `${missingLabel} 对应的外部 SQL 文件已不存在或已被移动，关闭后将丢弃标签内的本地草稿。`,
+        okText: dirtyTabs.length > 0 ? '继续关闭' : '关闭标签',
+        cancelText: '取消',
+        closable: true,
+        maskClosable: true,
+        okButtonProps: { danger: true },
+        onOk: () => {
+          confirmDirtyTabsOrClose();
+        },
+      });
+      return;
+    }
+
+    confirmDirtyTabsOrClose();
+  }, []);
+
+  const closeTabsWithSQLFilePrompt = useCallback((targetIds: string[], closeConfirmedTabs: () => void) => {
+    const uniqueIds = Array.from(new Set(targetIds.map((id) => String(id || '').trim()).filter(Boolean)));
+    if (uniqueIds.length === 0) return;
+    const dedupeKey = uniqueIds.slice().sort().join('\n');
+    if (pendingCloseTabIdsRef.current.has(dedupeKey)) return;
+    pendingCloseTabIdsRef.current.add(dedupeKey);
+    const targetTabs = tabs.filter((tab) => uniqueIds.includes(tab.id));
+    void requestCloseSQLFileTabs(targetTabs, closeConfirmedTabs).finally(() => {
+      pendingCloseTabIdsRef.current.delete(dedupeKey);
+    });
+  }, [requestCloseSQLFileTabs, tabs]);
+
   const onEdit = (targetKey: React.MouseEvent | React.KeyboardEvent | string, action: 'add' | 'remove') => {
     if (action === 'remove') {
-      closeTab(targetKey as string);
+      const id = String(targetKey || '');
+      closeTabsWithSQLFilePrompt([id], () => closeTab(id));
     }
   };
 
@@ -438,6 +674,13 @@ const TabManager: React.FC = React.memo(() => {
   }, [tabs, activeTabId, addTab, setActiveTab, connections]);
 
   const tabIds = useMemo(() => tabs.map((tab) => tab.id), [tabs]);
+  const hasDoubleLineTabLabel = useMemo(() => (
+    tabs.some((tab) => {
+      const connection = connections.find((conn) => conn.id === tab.connectionId);
+      const displayModel = buildTabDisplayModel(tab, connection, appearance.tabDisplay);
+      return displayModel.layout === 'double' && Boolean(displayModel.secondaryText);
+    })
+  ), [appearance.tabDisplay, connections, tabs]);
 
   const renderTabBar: TabsProps['renderTabBar'] = (tabBarProps, DefaultTabBar) => (
     <DefaultTabBar {...tabBarProps}>
@@ -447,35 +690,43 @@ const TabManager: React.FC = React.memo(() => {
 
   const items = useMemo(() => tabs.map((tab, index) => {
     const connection = connections.find((conn) => conn.id === tab.connectionId);
-    const displayTitle = buildTabDisplayTitle(tab, connection);
+    const displayModel = buildTabDisplayModel(tab, connection, appearance.tabDisplay);
+    const displayTitle = displayModel.fullTitle;
     const hostSummary = resolveConnectionHostSummary(connection?.config);
     const tabIsActive = tab.id === activeTabId;
 
     const menuItems: MenuProps['items'] = [
+      {
+        key: 'tab-display-settings',
+        icon: <SettingOutlined />,
+        label: '标签设置',
+        onClick: openTabDisplaySettings,
+      },
+      { type: 'divider' },
       {
         key: 'close-other',
         label: t('tab_manager.menu.close_other'),
         disabled: tabs.length <= 1,
-        onClick: () => closeOtherTabs(tab.id),
+        onClick: () => closeTabsWithSQLFilePrompt(getCloseOtherTabIds(tabs, tab.id), () => closeOtherTabs(tab.id)),
       },
       {
         key: 'close-left',
         label: t('tab_manager.menu.close_left'),
         disabled: index === 0,
-        onClick: () => closeTabsToLeft(tab.id),
+        onClick: () => closeTabsWithSQLFilePrompt(getCloseTabsToLeftIds(tabs, tab.id), () => closeTabsToLeft(tab.id)),
       },
       {
         key: 'close-right',
         label: t('tab_manager.menu.close_right'),
         disabled: index === tabs.length - 1,
-        onClick: () => closeTabsToRight(tab.id),
+        onClick: () => closeTabsWithSQLFilePrompt(getCloseTabsToRightIds(tabs, tab.id), () => closeTabsToRight(tab.id)),
       },
       { type: 'divider' },
       {
         key: 'close-all',
         label: t('tab_manager.menu.close_all'),
         disabled: tabs.length === 0,
-        onClick: () => closeAllTabs(),
+        onClick: () => closeTabsWithSQLFilePrompt(tabs.map((item) => item.id), () => closeAllTabs()),
       },
     ];
     
@@ -483,19 +734,20 @@ const TabManager: React.FC = React.memo(() => {
       label: (
         <SortableTabLabel
           tab={tab}
+          displayModel={displayModel}
           displayTitle={displayTitle}
           menuItems={menuItems}
           connectionLabel={connection?.name}
           hostSummary={hostSummary}
           isV2Ui={isV2Ui}
-          onClose={() => closeTab(tab.id)}
+          onClose={() => closeTabsWithSQLFilePrompt([tab.id], () => closeTab(tab.id))}
         />
       ),
       key: tab.id,
       closable: !isV2Ui,
       children: <TabContent tab={tab} isActive={tabIsActive} />,
     };
-  }), [tabs, connections, activeTabId, closeOtherTabs, closeTabsToLeft, closeTabsToRight, closeAllTabs, closeTab, isV2Ui, languagePreference]);
+  }), [tabs, connections, appearance.tabDisplay, activeTabId, closeOtherTabs, closeTabsToLeft, closeTabsToRight, closeAllTabs, closeTab, closeTabsWithSQLFilePrompt, isV2Ui, languagePreference]);
 
   const handleOpenConnectionModal = () => {
     const target = document.querySelector<HTMLButtonElement>('[data-gonavi-create-connection-action="true"]');
@@ -703,13 +955,12 @@ body[data-theme='dark'] .main-tabs .ant-tabs-tab.ant-tabs-tab-active {
             }
             body[data-ui-version='v2'] .gn-v2-tab-hover-head > strong {
               min-width: 0;
-              overflow: hidden;
+              overflow-wrap: anywhere;
               color: var(--gn-fg-1);
               font-size: var(--gn-font-size-sm, 12px);
               font-weight: 700;
               line-height: 18px;
-              text-overflow: ellipsis;
-              white-space: nowrap;
+              white-space: normal;
             }
             body[data-ui-version='v2'] .gn-v2-tab-hover-rows {
               display: grid;
@@ -746,7 +997,7 @@ body[data-theme='dark'] .main-tabs .ant-tabs-tab.ant-tabs-tab-active {
         >
           <SortableContext items={tabIds} strategy={horizontalListSortingStrategy}>
             <Tabs
-                className={`main-tabs${isV2Ui ? ' gn-v2-main-tabs' : ''}`}
+                className={`main-tabs${isV2Ui ? ' gn-v2-main-tabs' : ''}${hasDoubleLineTabLabel ? ' gn-v2-main-tabs-double' : ''}`}
                 type="editable-card"
                 destroyOnHidden={false}
                 onChange={(newActiveKey) => {
diff --git a/frontend/src/components/TableDesigner.trigger-edit.test.ts b/frontend/src/components/TableDesigner.trigger-edit.test.ts
new file mode 100644
index 0000000..7de3c25
--- /dev/null
+++ b/frontend/src/components/TableDesigner.trigger-edit.test.ts
@@ -0,0 +1,38 @@
+import { readFileSync } from 'node:fs';
+
+import { describe, expect, it } from 'vitest';
+
+const tableDesignerSource = readFileSync(
+  new URL('./TableDesigner.tsx', import.meta.url),
+  'utf8',
+);
+
+const getFunctionBlock = (source: string, name: string): string => {
+  const start = source.indexOf(`const ${name} = () => {`);
+  expect(start).toBeGreaterThanOrEqual(0);
+  const nextFunction = source.indexOf('\n  const ', start + 1);
+  expect(nextFunction).toBeGreaterThan(start);
+  return source.slice(start, nextFunction);
+};
+
+describe('TableDesigner trigger edit entry', () => {
+  it('opens trigger edits in an object-edit query tab instead of the fixed modal', () => {
+    const editBlock = getFunctionBlock(tableDesignerSource, 'handleEditTrigger');
+
+    expect(editBlock).toContain('setActiveContext({ connectionId: tab.connectionId, dbName });');
+    expect(editBlock).toContain('addTab({');
+    expect(editBlock).toContain("type: 'query'");
+    expect(editBlock).toContain("queryMode: 'object-edit'");
+    expect(editBlock).toContain('buildEditableTriggerSql(selectedTrigger.name, createSql');
+    expect(editBlock).toContain('dropSql: buildDropTriggerSql(selectedTrigger.name)');
+    expect(editBlock).not.toContain('setIsTriggerEditModalOpen(true)');
+  });
+
+  it('keeps trigger creation on the existing modal path', () => {
+    const createBlock = getFunctionBlock(tableDesignerSource, 'handleCreateTrigger');
+
+    expect(createBlock).toContain("setTriggerEditMode('create')");
+    expect(createBlock).toContain('setTriggerEditSql(generateTriggerTemplate())');
+    expect(createBlock).toContain('setIsTriggerEditModalOpen(true)');
+  });
+});
diff --git a/frontend/src/components/TableDesigner.tsx b/frontend/src/components/TableDesigner.tsx
index b8a3d8a..644b250 100644
--- a/frontend/src/components/TableDesigner.tsx
+++ b/frontend/src/components/TableDesigner.tsx
@@ -11,6 +11,7 @@ import { DBGetColumns, DBGetIndexes, DBQuery, DBGetForeignKeys, DBGetTriggers, D
 import { hasIndexFormChanged, normalizeIndexFormFromRow, shouldRestoreOriginalIndex, toggleIndexSelection as getNextIndexSelection, type IndexDisplaySnapshot } from './tableDesignerIndexUtils';
 import { buildIndexCreateSqlPreview } from './tableDesignerIndexSql';
 import { buildAlterTablePreviewSql, buildCreateTablePreviewSql, hasAlterTableDraftChanges, type StarRocksCreateTableOptions, type StarRocksDistributionType, type StarRocksKeyModel, type StarRocksTableKind } from './tableDesignerSchemaSql';
+import { summarizeDuckDbPrimaryKeyChange } from './tableDesignerDuckDbPrimaryKey';
 import { normalizeSchemaStatementForExecution, parseTableCommentFromDDL, splitSchemaExecutionStatements } from './tableDesignerExecutionSql';
 import TableDesignerSqlPreview from './TableDesignerSqlPreview';
 import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
@@ -21,6 +22,7 @@ import {
     getColumnDefinitionExtra,
     normalizeColumnDefinition,
 } from '../utils/columnDefinition';
+import { buildEditableTriggerSql } from '../utils/triggerEditSql';
 import {
     isMysqlFamilyDialect as isMysqlFamilySqlDialect,
     isOracleLikeDialect as isOracleLikeSqlDialect,
@@ -31,6 +33,7 @@ import {
     resolveColumnTypeOptions,
     resolveSqlDialect,
 } from '../utils/sqlDialect';
+import { splitQualifiedNameLast, stripIdentifierQuotes } from '../utils/qualifiedName';
 
 interface EditableColumn extends ColumnDefinition {
     _key: string;
@@ -382,7 +385,23 @@ const SortableRow = ({ children, ...props }: RowProps) => {
   );
 };
 
-const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
+const renderDesignerCellField = (content: React.ReactNode, className?: string) => (
+  <div className={`table-designer-cell-field${className ? ` ${className}` : ''}`}>
+    {content}
+  </div>
+);
+
+const renderDesignerCellCheck = (content: React.ReactNode, className?: string) => (
+  <div className={`table-designer-cell-check${className ? ` ${className}` : ''}`}>
+    {content}
+  </div>
+);
+
+const renderDesignerHeaderTitle = (title: string) => (
+  <span className="table-designer-header-title">{title}</span>
+);
+
+const TableDesigner: React.FC<{ tab: TabData; embedded?: boolean }> = ({ tab, embedded = false }) => {
   const isNewTable = !tab.tableName;
   
   const [columns, setColumns] = useState<EditableColumn[]>([]);
@@ -453,8 +472,11 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
   const [commentEditorColumnKey, setCommentEditorColumnKey] = useState('');
   const [commentEditorColumnName, setCommentEditorColumnName] = useState('');
   const [commentEditorValue, setCommentEditorValue] = useState('');
+  const [inlineCommentEditingKey, setInlineCommentEditingKey] = useState('');
   
   const connections = useStore(state => state.connections);
+  const addTab = useStore(state => state.addTab);
+  const setActiveContext = useStore(state => state.setActiveContext);
   const theme = useStore(state => state.theme);
   const appearance = useStore(state => state.appearance);
   const i18nLanguage = useTableDesignerI18nLanguage();
@@ -483,6 +505,7 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
 
   const openCommentEditor = useCallback((record: EditableColumn) => {
       if (!record?._key) return;
+      setInlineCommentEditingKey('');
       setCommentEditorColumnKey(record._key);
       setCommentEditorColumnName(record.name || '');
       setCommentEditorValue(record.comment || '');
@@ -543,6 +566,10 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
       setSelectedColumnRowKeys(prev => prev.filter(key => columns.some(c => c._key === key)));
   }, [columns]);
 
+  useEffect(() => {
+      setInlineCommentEditingKey(prev => (prev && columns.some(c => c._key === prev) ? prev : ''));
+  }, [columns]);
+
   useEffect(() => {
       return () => {
           if (focusHighlightTimerRef.current !== null) {
@@ -577,6 +604,15 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
       return true;
   }, [activeKey, readOnly]);
 
+  const startInlineCommentEdit = useCallback((record: EditableColumn) => {
+      if (readOnly || !record?._key) return;
+      setInlineCommentEditingKey(record._key);
+  }, [readOnly]);
+
+  const finishInlineCommentEdit = useCallback(() => {
+      setInlineCommentEditingKey('');
+  }, []);
+
   useEffect(() => {
       const pendingKey = pendingFocusColumnKeyRef.current;
       if (!pendingKey || activeKey !== 'columns') return;
@@ -603,64 +639,80 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
       const columnTypeOptions = resolveColumnTypeOptions(getDbType());
       const initialCols = [
           { 
-              title: t('table_designer.column.name', undefined, i18nLanguage),
+              title: renderDesignerHeaderTitle(t('table_designer.column.name', undefined, i18nLanguage)),
               dataIndex: 'name', 
               key: 'name', 
               width: 180,
               render: (text: string, record: EditableColumn) => readOnly ? text : (
-                  <Input {...noAutoCapInputProps} value={text} onChange={e => handleColumnChange(record._key, 'name', e.target.value)} variant="borderless" />
+                  renderDesignerCellField(
+                      <Input {...noAutoCapInputProps} value={text} onChange={e => handleColumnChange(record._key, 'name', e.target.value)} variant="borderless" />
+                  )
               )
           },
           { 
-              title: t('table_designer.column.type', undefined, i18nLanguage),
+              title: renderDesignerHeaderTitle(t('table_designer.column.type', undefined, i18nLanguage)),
               dataIndex: 'type', 
               key: 'type', 
               width: 150,
               render: (text: string, record: EditableColumn) => readOnly ? text : (
-                  <AutoComplete options={columnTypeOptions} value={text} onChange={val => handleColumnChange(record._key, 'type', val)} style={{ width: '100%' }} variant="borderless" />
+                  renderDesignerCellField(
+                      <AutoComplete options={columnTypeOptions} value={text} onChange={val => handleColumnChange(record._key, 'type', val)} style={{ width: '100%' }} variant="borderless" />,
+                      'is-compact'
+                  )
               )
           },
           { 
-              title: t('table_designer.column.primary_key', undefined, i18nLanguage),
+              title: renderDesignerHeaderTitle(t('table_designer.column.primary_key', undefined, i18nLanguage)),
               dataIndex: 'key', 
               key: 'key', 
               width: 60,
               align: 'center',
               render: (text: string, record: EditableColumn) => (
-                  <Checkbox checked={text === 'PRI'} disabled={readOnly} onChange={e => handleColumnChange(record._key, 'key', e.target.checked ? 'PRI' : '')} />
+                  renderDesignerCellCheck(
+                      <Checkbox checked={text === 'PRI'} disabled={readOnly} onChange={e => handleColumnChange(record._key, 'key', e.target.checked ? 'PRI' : '')} />,
+                      'is-left-aligned'
+                  )
               )
           },
           {
-              title: t('table_designer.column.auto_increment', undefined, i18nLanguage),
+              title: renderDesignerHeaderTitle(t('table_designer.column.auto_increment', undefined, i18nLanguage)),
               dataIndex: 'isAutoIncrement',
               key: 'isAutoIncrement',
               width: 60,
               align: 'center',
               render: (val: boolean, record: EditableColumn) => (
-                  <Checkbox checked={val} disabled={readOnly} onChange={e => handleColumnChange(record._key, 'isAutoIncrement', e.target.checked)} />
+                  renderDesignerCellCheck(
+                      <Checkbox checked={val} disabled={readOnly} onChange={e => handleColumnChange(record._key, 'isAutoIncrement', e.target.checked)} />,
+                      'is-left-aligned'
+                  )
               )
           },
           { 
-              title: t('table_designer.column.not_null', undefined, i18nLanguage),
+              title: renderDesignerHeaderTitle(t('table_designer.column.not_null', undefined, i18nLanguage)),
               dataIndex: 'nullable', 
               key: 'nullable', 
               width: 80,
               align: 'center',
               render: (text: string, record: EditableColumn) => (
-                  <Checkbox checked={text === 'NO'} disabled={readOnly || record.key === 'PRI'} onChange={e => handleColumnChange(record._key, 'nullable', e.target.checked ? 'NO' : 'YES')} />
+                  renderDesignerCellCheck(
+                      <Checkbox checked={text === 'NO'} disabled={readOnly || record.key === 'PRI'} onChange={e => handleColumnChange(record._key, 'nullable', e.target.checked ? 'NO' : 'YES')} />,
+                      'is-left-aligned'
+                  )
               )
           },
           { 
-              title: t('table_designer.column.default', undefined, i18nLanguage),
+              title: renderDesignerHeaderTitle(t('table_designer.column.default', undefined, i18nLanguage)),
               dataIndex: 'default', 
               key: 'default', 
               width: 180, // Increased default width
               render: (text: string, record: EditableColumn) => readOnly ? text : (
-                  <AutoComplete options={COMMON_DEFAULTS} value={text} onChange={val => handleColumnChange(record._key, 'default', val)} style={{ width: '100%' }} variant="borderless" placeholder="NULL" />
+                  renderDesignerCellField(
+                      <AutoComplete options={COMMON_DEFAULTS} value={text} onChange={val => handleColumnChange(record._key, 'default', val)} style={{ width: '100%' }} variant="borderless" placeholder="NULL" />
+                  )
               )
           },
           { 
-              title: t('table_designer.column.comment', undefined, i18nLanguage),
+              title: renderDesignerHeaderTitle(t('table_designer.column.comment', undefined, i18nLanguage)),
               dataIndex: 'comment', 
               key: 'comment',
               width: 200,
@@ -669,13 +721,26 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
                       <div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{text || ''}</div>
                   </Tooltip>
               ) : (
-                  <div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
-                      <Input
-                          value={text}
-                          onChange={e => handleColumnChange(record._key, 'comment', e.target.value)}
-                          onDoubleClick={() => openCommentEditor(record)}
-                          variant="borderless"
-                      />
+                  <div className="table-designer-cell-field table-designer-comment-field">
+                      {inlineCommentEditingKey !== record._key ? (
+                          <Tooltip title={text || ''}>
+                              <div
+                                  className={`table-designer-comment-display${text ? '' : ' is-empty'}`}
+                                  onDoubleClick={() => startInlineCommentEdit(record)}
+                              >
+                                  {text || '\u00A0'}
+                              </div>
+                          </Tooltip>
+                      ) : (
+                          <Input
+                              value={text}
+                              onChange={e => handleColumnChange(record._key, 'comment', e.target.value)}
+                              onBlur={finishInlineCommentEdit}
+                              onPressEnter={finishInlineCommentEdit}
+                              autoFocus={inlineCommentEditingKey === record._key}
+                              variant="borderless"
+                          />
+                      )}
                       <Tooltip title={t('table_designer.tooltip.edit_comment_popup', undefined, i18nLanguage)}>
                           <Button
                               type="text"
@@ -688,16 +753,25 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
               )
           },
           ...(readOnly ? [] : [{
-              title: t('table_designer.column.actions', undefined, i18nLanguage),
+              title: renderDesignerHeaderTitle(t('table_designer.column.actions', undefined, i18nLanguage)),
               key: 'action',
-              width: 60,
+              width: 92,
+              className: 'table-designer-action-column',
+              onHeaderCell: () => ({ className: 'table-designer-action-column' }),
               render: (_: any, record: EditableColumn) => (
-                  <Button type="text" danger icon={<DeleteOutlined />} onClick={() => handleDeleteColumn(record._key)} />
+                  <div className="table-designer-action-cell">
+                      <Tooltip title={t('table_designer.tooltip.edit_comment_popup', undefined, i18nLanguage)}>
+                          <Button type="text" size="small" icon={<EditOutlined />} onClick={() => openCommentEditor(record)} />
+                      </Tooltip>
+                      <Tooltip title={t('table_designer.action.delete', undefined, i18nLanguage)}>
+                          <Button type="text" size="small" danger icon={<DeleteOutlined />} onClick={() => handleDeleteColumn(record._key)} />
+                      </Tooltip>
+                  </div>
               )
           }])
       ];
       setTableColumns(initialCols);
-  }, [connections, i18nLanguage, openCommentEditor, readOnly, tab.connectionId]); // Re-create when datasource dialect, language, or readonly state changes
+  }, [connections, finishInlineCommentEdit, i18nLanguage, inlineCommentEditingKey, openCommentEditor, readOnly, startInlineCommentEdit, tab.connectionId]); // Re-create when datasource dialect, language, inline comment state, or readonly state changes
 
   const flushResizeGhost = useCallback(() => {
     resizeRafRef.current = null;
@@ -885,6 +959,7 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
       if (normalized === 'mssql' || normalized === 'sql_server' || normalized === 'sql-server') return 'sqlserver';
       if (normalized === 'doris') return 'diros';
       if (normalized === 'open_gauss' || normalized === 'open-gauss') return 'opengauss';
+      if (normalized === 'gauss_db' || normalized === 'gauss-db') return 'gaussdb';
       return normalized;
   };
 
@@ -936,6 +1011,7 @@ END;`;
       case 'highgo':
       case 'vastbase':
       case 'opengauss':
+      case 'gaussdb':
         return `CREATE OR REPLACE FUNCTION trigger_function_name()
 RETURNS TRIGGER AS $$
 BEGIN
@@ -994,6 +1070,7 @@ END;`;
       case 'highgo':
       case 'vastbase':
       case 'opengauss':
+      case 'gaussdb':
         return `DROP TRIGGER IF EXISTS "${triggerName}" ON "${tblName}"`;
       case 'sqlserver':
         return `DROP TRIGGER IF EXISTS [${triggerName}]`;
@@ -1016,8 +1093,6 @@ END;`;
 
   const handleEditTrigger = () => {
     if (!selectedTrigger) return;
-    setTriggerEditMode('edit');
-    // 构建完整的 CREATE TRIGGER 语句
     const dbType = getDbType();
     const tblName = tab.tableName || '';
     let createSql = '';
@@ -1031,8 +1106,19 @@ ${selectedTrigger.statement}`;
       createSql = selectedTrigger.statement || '-- Trigger definition unavailable';
     }
 
-    setTriggerEditSql(createSql);
-    setIsTriggerEditModalOpen(true);
+    const dbName = String(tab.dbName || '').trim();
+    setActiveContext({ connectionId: tab.connectionId, dbName });
+    addTab({
+      id: `query-edit-trigger-${tab.connectionId}-${dbName}-${tab.tableName || ''}-${selectedTrigger.name}-${Date.now()}`,
+      title: `修改触发器: ${selectedTrigger.name}`,
+      type: 'query',
+      connectionId: tab.connectionId,
+      dbName,
+      query: buildEditableTriggerSql(selectedTrigger.name, createSql, {
+        dropSql: buildDropTriggerSql(selectedTrigger.name),
+      }),
+      queryMode: 'object-edit',
+    });
   };
 
   const handleDeleteTrigger = () => {
@@ -1418,26 +1504,11 @@ ${selectedTrigger.statement}`;
   const escapeDoubleQuoteIdentifier = (name: string) => String(name || '').replace(/"/g, '""');
   const escapeSqlString = (value: string) => String(value || '').replace(/'/g, "''");
 
-  const stripIdentifierQuotes = (part: string): string => {
-      const text = String(part || '').trim();
-      if (!text) return '';
-      if ((text.startsWith('`') && text.endsWith('`')) || (text.startsWith('"') && text.endsWith('"'))) {
-          return text.slice(1, -1).trim();
-      }
-      if (text.startsWith('[') && text.endsWith(']')) {
-          return text.slice(1, -1).trim();
-      }
-      return text;
-  };
-
   const splitQualifiedName = (qualifiedName: string): { schemaName: string; objectName: string } => {
-      const raw = String(qualifiedName || '').trim();
-      if (!raw) return { schemaName: '', objectName: '' };
-      const idx = raw.lastIndexOf('.');
-      if (idx <= 0 || idx >= raw.length - 1) return { schemaName: '', objectName: raw };
+      const parsed = splitQualifiedNameLast(qualifiedName);
       return {
-          schemaName: stripIdentifierQuotes(raw.substring(0, idx)),
-          objectName: stripIdentifierQuotes(raw.substring(idx + 1)),
+          schemaName: parsed.parentPath,
+          objectName: parsed.objectName,
       };
   };
 
@@ -1445,7 +1516,7 @@ ${selectedTrigger.statement}`;
   const isOracleLikeDialect = (dbType: string): boolean => isOracleLikeSqlDialect(dbType);
   const isSqlServerDialect = (dbType: string): boolean => isSqlServerSqlDialect(dbType);
   const isMysqlLikeDialect = (dbType: string): boolean => isMysqlFamilySqlDialect(dbType);
-  const isNonRelationalDialect = (dbType: string): boolean => dbType === 'redis' || dbType === 'mongodb';
+  const isNonRelationalDialect = (dbType: string): boolean => dbType === 'redis' || dbType === 'mongodb' || dbType === 'elasticsearch';
   const lacksAlterForeignKeySupport = (dbType: string): boolean => dbType === 'sqlite' || dbType === 'duckdb' || dbType === 'tdengine';
   const lacksTableCommentSupport = (dbType: string): boolean => dbType === 'sqlite';
 
@@ -2213,6 +2284,13 @@ END;`;
           setIsPreviewOpen(true);
       } else {
           const tableInfo = resolveTableInfo();
+          if (tableInfo.dbType === 'duckdb') {
+              const pkChange = summarizeDuckDbPrimaryKeyChange(originalColumns, columns);
+              if (pkChange.isUnsupportedChange) {
+                  message.warning('DuckDB 当前仅支持为无主键表新增主键；已有主键的修改或删除需要通过重建表完成。');
+                  return;
+              }
+          }
           const sql = buildAlterTablePreviewSql({
               dbType: tableInfo.dbType,
               tableName: tableInfo.qualifiedName,
@@ -2281,29 +2359,36 @@ END;`;
 
   const columnSelectCol = useMemo(() => ({
       title: () => (
-          <Checkbox
-              checked={isAllColumnsSelected}
-              indeterminate={isColumnsIndeterminate}
-              onChange={(e: any) => setSelectedColumnRowKeys(e.target.checked ? allColumnKeys : [])}
-              style={{ margin: 0 }}
-          />
+          <div className="table-designer-select-check">
+              <Checkbox
+                  checked={isAllColumnsSelected}
+                  indeterminate={isColumnsIndeterminate}
+                  onChange={(e: any) => setSelectedColumnRowKeys(e.target.checked ? allColumnKeys : [])}
+                  style={{ margin: 0 }}
+              />
+          </div>
       ),
       dataIndex: '_select',
       key: '_select',
-      width: 48,
+      width: 44,
+      className: 'table-designer-select-column',
+      onHeaderCell: () => ({ className: 'table-designer-select-column' }),
+      onCell: () => ({ className: 'table-designer-select-column' }),
       render: (_: any, record: any) => (
-          <Checkbox
-              checked={selectedColumnRowKeys.includes(record._key)}
-              onChange={(e: any) => {
-                  e.stopPropagation();
-                  setSelectedColumnRowKeys((prev: string[]) =>
-                      e.target.checked
-                          ? [...prev, record._key]
-                          : prev.filter((k: string) => k !== record._key)
-                  );
-              }}
-              style={{ margin: 0 }}
-          />
+          <div className="table-designer-select-check">
+              <Checkbox
+                  checked={selectedColumnRowKeys.includes(record._key)}
+                  onChange={(e: any) => {
+                      e.stopPropagation();
+                      setSelectedColumnRowKeys((prev: string[]) =>
+                          e.target.checked
+                              ? [...prev, record._key]
+                              : prev.filter((k: string) => k !== record._key)
+                      );
+                  }}
+                  style={{ margin: 0 }}
+              />
+          </div>
       ),
   }), [selectedColumnRowKeys, allColumnKeys, isAllColumnsSelected, isColumnsIndeterminate]);
 
@@ -2401,6 +2486,9 @@ END;`;
       dataIndex: '_select',
       key: '_select',
       width: 48,
+      className: 'table-designer-select-column',
+      onHeaderCell: () => ({ className: 'table-designer-select-column' }),
+      onCell: () => ({ className: 'table-designer-select-column' }),
       render: (_: any, record: any) => (
           <span
               onClick={(e) => {
@@ -2618,7 +2706,11 @@ END;`;
   );
 
   return (
-    <div ref={shellRef} className={`table-designer-shell${isV2Ui ? ' gn-v2-table-designer' : ''}`} style={{ display: 'flex', flexDirection: 'column', height: '100%', minHeight: 0, padding: '6px 0', position: 'relative' }}>
+    <div
+        ref={shellRef}
+        className={`table-designer-shell${isV2Ui ? ' gn-v2-table-designer' : ''}${embedded ? ' is-embedded' : ''}`}
+        style={{ display: 'flex', flexDirection: 'column', height: '100%', minHeight: 0, padding: embedded ? 0 : '6px 0', position: 'relative' }}
+    >
         <style>{`
             .table-designer-shell .ant-table,
             .table-designer-shell .ant-table-wrapper,
@@ -2650,6 +2742,116 @@ END;`;
             .table-designer-shell .ant-table-tbody td .ant-select .ant-select-selector {
                 padding-left: 0 !important;
             }
+            .table-designer-shell .table-designer-cell-field {
+                display: flex;
+                align-items: center;
+                min-height: 34px;
+                padding: 0 10px;
+                border: 1px solid ${darkMode ? 'rgba(255,255,255,0.10)' : 'rgba(0,0,0,0.10)'};
+                border-radius: 10px;
+                background: ${darkMode ? 'rgba(255,255,255,0.02)' : 'rgba(255,255,255,0.72)'};
+                box-sizing: border-box;
+            }
+            .table-designer-shell .table-designer-cell-field .ant-input,
+            .table-designer-shell .table-designer-cell-field .ant-select,
+            .table-designer-shell .table-designer-cell-field .ant-select-selector,
+            .table-designer-shell .table-designer-cell-field .ant-select-selection-search,
+            .table-designer-shell .table-designer-cell-field .ant-select-selection-item {
+                background: transparent !important;
+            }
+            .table-designer-shell .table-designer-cell-field .ant-input,
+            .table-designer-shell .table-designer-cell-field .ant-select-selection-item,
+            .table-designer-shell .table-designer-cell-field input {
+                font-size: 13px;
+                line-height: 1.4;
+            }
+            .table-designer-shell .table-designer-cell-field .ant-select {
+                width: 100%;
+            }
+            .table-designer-shell .table-designer-cell-field .ant-select-selector,
+            .table-designer-shell .table-designer-cell-field .ant-input {
+                padding: 0 !important;
+                box-shadow: none !important;
+            }
+            .table-designer-shell .table-designer-cell-field.is-compact {
+                padding-right: 6px;
+            }
+            .table-designer-shell .table-designer-cell-check {
+                display: inline-flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                min-height: 34px;
+            }
+            .table-designer-shell .table-designer-cell-check .ant-checkbox-wrapper {
+                margin-inline-end: 0 !important;
+            }
+            .table-designer-shell .table-designer-cell-check.is-left-aligned {
+                justify-content: flex-start;
+            }
+            .table-designer-shell .table-designer-header-title {
+                display: inline-flex;
+                align-items: center;
+                justify-content: flex-start;
+                width: 100%;
+                line-height: 1.1;
+                white-space: nowrap;
+            }
+            .table-designer-shell .table-designer-select-check {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+                min-height: 28px;
+            }
+            .table-designer-shell .table-designer-select-check .ant-checkbox-wrapper {
+                margin-inline-end: 0 !important;
+            }
+            .table-designer-shell .table-designer-select-column {
+                text-align: center !important;
+                vertical-align: middle !important;
+            }
+            .table-designer-shell .table-designer-action-column {
+                text-align: left !important;
+            }
+            .table-designer-shell .table-designer-comment-field {
+                gap: 4px;
+                padding-right: 4px;
+            }
+            .table-designer-shell .table-designer-comment-field .ant-input {
+                flex: 1;
+                min-width: 0;
+            }
+            .table-designer-shell .table-designer-comment-display {
+                flex: 1;
+                min-width: 0;
+                min-height: 28px;
+                display: flex;
+                align-items: center;
+                font: inherit;
+                line-height: 1.4;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                cursor: text;
+            }
+            .table-designer-shell .table-designer-comment-display.is-empty {
+                color: ${darkMode ? 'rgba(255,255,255,0.28)' : 'rgba(0,0,0,0.28)'};
+            }
+            .table-designer-shell .table-designer-action-cell {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                gap: 6px;
+                width: 100%;
+            }
+            .table-designer-shell .table-designer-action-cell .ant-btn {
+                width: 28px;
+                height: 28px;
+                padding: 0;
+                border-radius: 8px;
+            }
             .table-designer-shell .ant-table-thead > tr > th::before {
                 display: none !important;
             }
@@ -2665,6 +2867,12 @@ END;`;
             .table-designer-shell .ant-tabs-nav {
                 margin-bottom: 8px !important;
             }
+            .table-designer-shell.gn-v2-table-designer .ant-tabs-nav {
+                margin-bottom: 0 !important;
+            }
+            .table-designer-shell.is-embedded .ant-tabs-nav {
+                margin-bottom: 0 !important;
+            }
             .table-designer-shell .ant-tabs-nav::before {
                 border-bottom-color: ${darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.08)'} !important;
             }
@@ -2675,6 +2883,100 @@ END;`;
             .table-designer-shell .ant-tabs-tab {
                 transition: color 0.15s ease !important;
             }
+            .table-designer-shell.gn-v2-table-designer .ant-tabs-nav-wrap,
+            .table-designer-shell.gn-v2-table-designer .ant-tabs-nav-list {
+                width: auto !important;
+                min-height: 34px !important;
+                align-items: center !important;
+            }
+            .table-designer-shell.gn-v2-table-designer .ant-tabs-tab {
+                width: auto !important;
+                min-width: 0 !important;
+                max-width: none !important;
+                min-height: 34px !important;
+                margin: 0 !important;
+                padding: 0 12px !important;
+                border-right: 0 !important;
+                border-bottom: 0 !important;
+                white-space: nowrap !important;
+            }
+            .table-designer-shell.gn-v2-table-designer .ant-tabs-tab-btn {
+                width: auto !important;
+                display: inline-flex !important;
+                align-items: center !important;
+                justify-content: center !important;
+            }
+            .table-designer-shell.is-embedded .ant-tabs-nav-wrap,
+            .table-designer-shell.is-embedded .ant-tabs-nav-list {
+                width: auto !important;
+                min-height: 34px !important;
+                align-items: center !important;
+            }
+            .table-designer-shell.is-embedded .ant-tabs-tab {
+                width: auto !important;
+                min-width: 0 !important;
+                max-width: none !important;
+                min-height: 34px !important;
+                margin: 0 !important;
+                padding: 0 12px !important;
+                border-right: 0 !important;
+                border-bottom: 0 !important;
+                white-space: nowrap !important;
+            }
+            .table-designer-shell.is-embedded .ant-tabs-tab-btn {
+                width: auto !important;
+                display: inline-flex !important;
+                align-items: center !important;
+                justify-content: center !important;
+            }
+            .table-designer-shell.gn-v2-table-designer .table-designer-cell-field {
+                min-height: 28px;
+                padding-inline: 0;
+                border: none !important;
+                border-radius: 0;
+                background: transparent !important;
+                box-shadow: none !important;
+            }
+            .table-designer-shell.gn-v2-table-designer .table-designer-cell-field .ant-input,
+            .table-designer-shell.gn-v2-table-designer .table-designer-cell-field .ant-input:focus,
+            .table-designer-shell.gn-v2-table-designer .table-designer-cell-field .ant-input-focused,
+            .table-designer-shell.gn-v2-table-designer .table-designer-cell-field .ant-select-selector,
+            .table-designer-shell.gn-v2-table-designer .table-designer-cell-field .ant-select-focused .ant-select-selector {
+                border: none !important;
+                box-shadow: none !important;
+                background: transparent !important;
+            }
+            .table-designer-shell.gn-v2-table-designer .table-designer-comment-display,
+            .table-designer-shell.gn-v2-table-designer .table-designer-comment-field .ant-input,
+            .table-designer-shell.gn-v2-table-designer .table-designer-comment-field .ant-input input {
+                font-size: 12px !important;
+                line-height: 1.4 !important;
+                font-family: inherit !important;
+            }
+            .table-designer-shell.gn-v2-table-designer .table-designer-cell-field.is-compact {
+                padding-right: 0;
+            }
+            .table-designer-shell.gn-v2-table-designer .table-designer-comment-field {
+                padding-right: 0;
+            }
+            .table-designer-shell.gn-v2-table-designer .table-designer-cell-check {
+                min-height: 30px;
+            }
+            .table-designer-shell.gn-v2-table-designer .table-designer-select-check {
+                min-height: 22px;
+            }
+            .table-designer-shell.is-embedded .table-designer-select-check {
+                min-height: 14px !important;
+            }
+            .table-designer-shell.gn-v2-table-designer .table-designer-action-cell {
+                justify-content: flex-start;
+                gap: 4px;
+            }
+            .table-designer-shell.gn-v2-table-designer .table-designer-action-cell .ant-btn {
+                width: 26px;
+                height: 26px;
+                border-radius: 7px;
+            }
             .table-designer-shell .ant-tabs-content-holder,
             .table-designer-shell .ant-tabs-content,
             .table-designer-shell .ant-tabs-tabpane {
@@ -2727,11 +3029,11 @@ END;`;
             style={{
                 padding: '10px 12px 8px 12px',
                 borderBottom: `1px solid ${panelToolbarBorder}`,
-                borderTopLeftRadius: panelRadius,
-                borderTopRightRadius: panelRadius,
+                borderTopLeftRadius: embedded ? 0 : panelRadius,
+                borderTopRightRadius: embedded ? 0 : panelRadius,
                 borderLeft: `1px solid ${panelFrameColor}`,
                 borderRight: `1px solid ${panelFrameColor}`,
-                borderTop: `1px solid ${panelFrameColor}`,
+                borderTop: embedded ? 'none' : `1px solid ${panelFrameColor}`,
                 background: panelToolbarBg,
                 display: 'flex',
                 gap: '8px',
@@ -2801,9 +3103,9 @@ END;`;
             style={{
                 flex: 1,
                 minHeight: 0,
-                padding: '8px 10px 10px 10px',
-                borderBottomLeftRadius: panelRadius,
-                borderBottomRightRadius: panelRadius,
+                padding: embedded ? 0 : '0 10px 10px 10px',
+                borderBottomLeftRadius: embedded ? 0 : panelRadius,
+                borderBottomRightRadius: embedded ? 0 : panelRadius,
                 borderLeft: `1px solid ${panelFrameColor}`,
                 borderRight: `1px solid ${panelFrameColor}`,
                 borderBottom: `1px solid ${panelFrameColor}`,
@@ -2827,7 +3129,7 @@ END;`;
                         key: 'indexes',
                         label: t('table_designer.tab.indexes', undefined, i18nLanguage),
                         children: (
-                            <div className={`index-table-wrap${isV2Ui ? ' gn-v2-designer-tab-content' : ''}`} style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+                            <div className={`index-table-wrap${isV2Ui ? ' gn-v2-designer-tab-content gn-v2-designer-index-table' : ''}`} style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
                                 {!readOnly && (
                                     <div className={isV2Ui ? 'gn-v2-designer-actionbar' : undefined} style={{ display: 'flex', gap: 8 }}>
                                         <Button size="small" icon={<PlusOutlined />} disabled={!supportsIndexSchemaOps()} onClick={openCreateIndexModal}>{t('table_designer.action.add', undefined, i18nLanguage)}</Button>
@@ -2955,9 +3257,13 @@ END;`;
                                     >
                                         {t('table_designer.action.view_statement', undefined, i18nLanguage)}
                                     </Button>
-                                    <Button size="small" icon={<PlusOutlined />} onClick={handleCreateTrigger}>{t('table_designer.action.add', undefined, i18nLanguage)}</Button>
-                                    <Button size="small" icon={<EditOutlined />} disabled={!selectedTrigger} onClick={handleEditTrigger}>{t('table_designer.action.edit', undefined, i18nLanguage)}</Button>
-                                    <Button size="small" icon={<DeleteOutlined />} danger disabled={!selectedTrigger} onClick={handleDeleteTrigger}>{t('table_designer.action.delete', undefined, i18nLanguage)}</Button>
+                                    {!readOnly && (
+                                        <>
+                                            <Button size="small" icon={<PlusOutlined />} onClick={handleCreateTrigger}>{t('table_designer.action.add', undefined, i18nLanguage)}</Button>
+                                            <Button size="small" icon={<EditOutlined />} disabled={!selectedTrigger} onClick={handleEditTrigger}>{t('table_designer.action.edit', undefined, i18nLanguage)}</Button>
+                                            <Button size="small" icon={<DeleteOutlined />} danger disabled={!selectedTrigger} onClick={handleDeleteTrigger}>{t('table_designer.action.delete', undefined, i18nLanguage)}</Button>
+                                        </>
+                                    )}
                                     <span style={{ marginLeft: 'auto', color: '#888', fontSize: 12, alignSelf: 'center' }}>
                                         {selectedTrigger
                                             ? t('table_designer.selection.trigger_selected', { name: selectedTrigger.name }, i18nLanguage)
@@ -3007,11 +3313,11 @@ END;`;
                     }
                 ] : []),
                 ...(!isNewTable ? [{
-                    key: 'ddl',
-                    label: 'DDL',
-                    icon: <FileTextOutlined />,
-                    children: (
-                        <div className={isV2Ui ? 'gn-v2-designer-ddl-shell' : undefined} style={{ height: 'calc(100vh - 200px)', border: `1px solid ${panelFrameColor}`, borderRadius: panelRadius, background: panelBodyBg }}>
+                        key: 'ddl',
+                        label: 'DDL',
+                        icon: <FileTextOutlined />,
+                        children: (
+                        <div className={isV2Ui ? 'gn-v2-designer-ddl-shell' : undefined} style={{ height: '100%', minHeight: 320, border: `1px solid ${panelFrameColor}`, borderRadius: panelRadius, background: panelBodyBg }}>
                             <Editor
                                 height="100%"
                                 language="sql"
diff --git a/frontend/src/components/TableOverview.tdengine.test.tsx b/frontend/src/components/TableOverview.tdengine.test.tsx
new file mode 100644
index 0000000..89aa300
--- /dev/null
+++ b/frontend/src/components/TableOverview.tdengine.test.tsx
@@ -0,0 +1,162 @@
+import React from 'react';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import TableOverview from './TableOverview';
+
+const storeState = vi.hoisted(() => ({
+  theme: 'light',
+  appearance: { uiVersion: 'legacy' as const },
+  connections: [
+    {
+      id: 'conn-1',
+      config: {
+        type: 'tdengine',
+        host: '127.0.0.1',
+        port: 6041,
+        user: 'root',
+        password: 'taosdata',
+        database: 'metrics',
+        useSSH: false,
+        ssh: { host: '', port: 22, user: '', password: '', keyPath: '' },
+      },
+    },
+  ],
+  addTab: vi.fn(),
+  setActiveContext: vi.fn(),
+  setAIPanelVisible: vi.fn(),
+  addAIContext: vi.fn(),
+  pinnedSidebarTables: [] as string[],
+  setSidebarTablePinned: vi.fn(),
+}));
+
+const backendApp = vi.hoisted(() => ({
+  DBGetTables: vi.fn(),
+  DBQuery: vi.fn(),
+  DBShowCreateTable: vi.fn(),
+  ExportTable: vi.fn(),
+  DropTable: vi.fn(),
+  RenameTable: vi.fn(),
+}));
+
+const messageApi = vi.hoisted(() => ({
+  error: vi.fn(),
+}));
+
+vi.mock('../store', () => ({
+  useStore: (selector: (state: typeof storeState) => any) => selector(storeState),
+  buildSidebarTablePinKey: (connectionId: string, dbName: string, tableName: string, schemaName: string) =>
+    `${connectionId}:${dbName}:${schemaName}:${tableName}`,
+}));
+
+vi.mock('../../wailsjs/go/app/App', () => backendApp);
+vi.mock('../utils/autoFetchVisibility', () => ({
+  useAutoFetchVisibility: () => true,
+}));
+vi.mock('../utils/connectionRpcConfig', () => ({
+  buildRpcConnectionConfig: (config: unknown) => config,
+}));
+vi.mock('./V2TableContextMenu', () => ({
+  V2TableContextMenuView: () => null,
+}));
+
+vi.mock('@ant-design/icons', () => {
+  const Icon = () => <span />;
+  return {
+    TableOutlined: Icon,
+    SearchOutlined: Icon,
+    ReloadOutlined: Icon,
+    SortAscendingOutlined: Icon,
+    DatabaseOutlined: Icon,
+    ConsoleSqlOutlined: Icon,
+    EditOutlined: Icon,
+    CopyOutlined: Icon,
+    SaveOutlined: Icon,
+    DeleteOutlined: Icon,
+    ExportOutlined: Icon,
+    AppstoreOutlined: Icon,
+    UnorderedListOutlined: Icon,
+    WarningOutlined: Icon,
+  };
+});
+
+vi.mock('antd', () => {
+  const Button = ({ children, onClick, ...rest }: any) => <button type="button" onClick={onClick} {...rest}>{children}</button>;
+  const Input: any = ({ value, onChange, ...rest }: any) => <input value={value} onChange={onChange} {...rest} />;
+  Input.Search = ({ value, onChange, ...rest }: any) => <input value={value} onChange={onChange} {...rest} />;
+  const Spin = ({ children }: any) => <div>{children}</div>;
+  const Empty = ({ description }: any) => <div>{description}</div>;
+  const Dropdown = ({ children }: any) => <div>{children}</div>;
+  const Tooltip = ({ children }: any) => <div>{children}</div>;
+  const Modal: any = ({ children }: any) => <div>{children}</div>;
+  Modal.confirm = vi.fn();
+  return {
+    Button,
+    Dropdown,
+    Empty,
+    Input,
+    Modal,
+    Spin,
+    Tooltip,
+    message: messageApi,
+  };
+});
+
+const flushPromises = async () => {
+  await act(async () => {
+    await Promise.resolve();
+    await Promise.resolve();
+    await Promise.resolve();
+  });
+};
+
+const collectText = (node: any): string => {
+  if (!node) {
+    return '';
+  }
+  if (typeof node === 'string') {
+    return node;
+  }
+  if (Array.isArray(node)) {
+    return node.map((item) => collectText(item)).join('');
+  }
+  return collectText(node.children || []);
+};
+
+describe('TableOverview tdengine compatibility', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    backendApp.DBGetTables.mockResolvedValue({
+      success: true,
+      data: [
+        { Table: 'd001' },
+        { Table: 'meters' },
+      ],
+    });
+    backendApp.DBQuery.mockResolvedValue({
+      success: false,
+      message: '[0x2600] syntax error near',
+    });
+  });
+
+  it('loads tdengine overview rows through DBGetTables instead of direct metadata SQL', async () => {
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<TableOverview tab={{
+        id: 'tab-1',
+        title: '表概览 - metrics',
+        type: 'table-overview',
+        connectionId: 'conn-1',
+        dbName: 'metrics',
+      } as any} />);
+    });
+    await flushPromises();
+
+    expect(backendApp.DBGetTables).toHaveBeenCalledWith(expect.any(Object), 'metrics');
+    expect(backendApp.DBQuery).not.toHaveBeenCalled();
+    expect(messageApi.error).not.toHaveBeenCalled();
+    const renderedText = collectText(renderer!.toJSON());
+    expect(renderedText).toContain('meters');
+    expect(renderedText).toContain('d001');
+  });
+});
diff --git a/frontend/src/components/TableOverview.tsx b/frontend/src/components/TableOverview.tsx
index 8402f89..35a7e4f 100644
--- a/frontend/src/components/TableOverview.tsx
+++ b/frontend/src/components/TableOverview.tsx
@@ -4,7 +4,7 @@ import { Input, Spin, Empty, Dropdown, message, Tooltip, Modal, Button } from 'a
 import type { MenuProps } from 'antd';
 import { TableOutlined, SearchOutlined, ReloadOutlined, SortAscendingOutlined, DatabaseOutlined, ConsoleSqlOutlined, EditOutlined, CopyOutlined, SaveOutlined, DeleteOutlined, ExportOutlined, AppstoreOutlined, UnorderedListOutlined, WarningOutlined } from '@ant-design/icons';
 import { buildSidebarTablePinKey, useStore } from '../store';
-import { DBQuery, DBShowCreateTable, ExportTable, DropTable, RenameTable } from '../../wailsjs/go/app/App';
+import { DBGetTables, DBQuery, DBShowCreateTable, ExportTable, DropTable, RenameTable } from '../../wailsjs/go/app/App';
 import type { TabData } from '../types';
 import { useAutoFetchVisibility } from '../utils/autoFetchVisibility';
 import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
@@ -120,18 +120,25 @@ const getMetadataDialect = (connType: string, driver?: string, oceanBaseProtocol
     if (type === 'custom') {
         const d = (driver || '').trim().toLowerCase();
         if (d === 'diros' || d === 'doris') return 'mysql';
+        if (d === 'goldendb' || d === 'greatdb' || d === 'gdb') return 'mysql';
         if (d === 'oceanbase') return normalizeOceanBaseProtocol(oceanBaseProtocol) === 'oracle' ? 'oracle' : 'mysql';
         if (d === 'opengauss' || d === 'open_gauss' || d === 'open-gauss') return 'opengauss';
+        if (d === 'gaussdb' || d === 'gauss_db' || d === 'gauss-db') return 'gaussdb';
         return d;
     }
     if (type === 'oceanbase' && normalizeOceanBaseProtocol(oceanBaseProtocol) === 'oracle') return 'oracle';
-    if (type === 'mariadb' || type === 'oceanbase' || type === 'diros' || type === 'sphinx') return 'mysql';
+    if (type === 'goldendb' || type === 'mariadb' || type === 'oceanbase' || type === 'diros' || type === 'sphinx') return 'mysql';
     if (type === 'dameng') return 'dm';
     return type;
 };
 
 const buildTableStatusSQL = (dialect: string, dbName: string, schemaName?: string): string => {
         const escapeLiteral = (s: string) => s.replace(/'/g, "''");
+        const iotdbDevicePattern = (name: string) => {
+            const normalized = String(name || '').trim().replace(/[`"]/g, '');
+            if (!normalized) return '';
+            return normalized.endsWith('.**') ? normalized : `${normalized}.**`;
+        };
         switch (dialect) {
         case 'mysql':
         case 'starrocks':
@@ -153,7 +160,8 @@ ORDER BY table_name`;
         case 'kingbase':
         case 'vastbase':
         case 'highgo':
-        case 'opengauss': {
+        case 'opengauss':
+        case 'gaussdb': {
             const schema = schemaName || 'public';
             return `
 SELECT
@@ -188,6 +196,12 @@ ORDER BY s.name, t.name`;
         }
         case 'clickhouse':
             return `SELECT name AS table_name, comment AS table_comment, total_rows AS table_rows, total_bytes AS data_length, 0 AS index_length FROM system.tables WHERE database = '${escapeLiteral(dbName)}' AND engine NOT IN ('View', 'MaterializedView') ORDER BY name`;
+        case 'tdengine':
+            return `SHOW TABLES FROM \`${dbName.replace(/`/g, '``')}\``;
+        case 'iotdb': {
+            const pattern = iotdbDevicePattern(dbName);
+            return pattern ? `SHOW DEVICES ${pattern}` : 'SHOW DEVICES';
+        }
         case 'dm':
         case 'oracle': {
             const owner = (schemaName || dbName).toUpperCase();
@@ -217,7 +231,7 @@ const parseTableStats = (dialect: string, rows: Record<string, any>[]): TableSta
         };
 
         return {
-            name: strVal(['Name', 'table_name', 'tablename', 'TABLE_NAME']),
+            name: strVal(['Name', 'name', 'table_name', 'tablename', 'TABLE_NAME', 'Table', 'table', 'Device', 'device']),
             comment: strVal(['Comment', 'table_comment', 'TABLE_COMMENT', 'comments']),
             rows: numVal(['Rows', 'table_rows', 'TABLE_ROWS', 'num_rows', 'reltuples', 'total_rows']),
             dataSize: numVal(['Data_length', 'data_length', 'DATA_LENGTH', 'total_bytes']),
@@ -261,6 +275,7 @@ const TableOverview: React.FC<TableOverviewProps> = ({ tab }) => {
         [connection?.config?.driver, connection?.config?.oceanBaseProtocol, connection?.config?.type]
     );
     const schemaName = String((tab as any).schemaName || '').trim();
+    const supportsDesignWrite = metadataDialect !== 'iotdb';
     const autoFetchVisible = useAutoFetchVisibility();
 
     const loadData = useCallback(async () => {
@@ -275,6 +290,15 @@ const TableOverview: React.FC<TableOverviewProps> = ({ tab }) => {
                 useSSH: connection.config.useSSH || false,
                 ssh: connection.config.ssh || { host: '', port: 22, user: '', password: '', keyPath: '' },
             };
+            if (metadataDialect === 'tdengine') {
+                const res = await DBGetTables(buildRpcConnectionConfig(config) as any, tab.dbName || '');
+                if (res.success && Array.isArray(res.data)) {
+                    setTables(parseTableStats(metadataDialect, res.data));
+                } else {
+                    message.error('获取表信息失败: ' + (res.message || '未知错误'));
+                }
+                return;
+            }
             const sql = buildTableStatusSQL(metadataDialect, tab.dbName || '', schemaName);
             const res = await DBQuery(buildRpcConnectionConfig(config) as any, tab.dbName || '', sql);
             if (res.success && Array.isArray(res.data)) {
@@ -410,23 +434,25 @@ const TableOverview: React.FC<TableOverviewProps> = ({ tab }) => {
             connectionId: connection.id,
             dbName: tab.dbName,
             tableName,
+            objectType: 'table',
         });
     }, [connection, tab.dbName, addTab, setActiveContext]);
 
     const openDesign = useCallback((tableName: string) => {
         if (!connection) return;
         setActiveContext({ connectionId: connection.id, dbName: tab.dbName || '' });
+        const structureOnly = !supportsDesignWrite;
         addTab({
             id: `design-${connection.id}-${tab.dbName}-${tableName}`,
-            title: `设计表 (${tableName})`,
+            title: `${structureOnly ? '表结构' : '设计表'} (${tableName})`,
             type: 'design',
             connectionId: connection.id,
             dbName: tab.dbName,
             tableName,
             initialTab: 'columns',
-            readOnly: false,
+            readOnly: structureOnly,
         });
-    }, [connection, tab.dbName, addTab, setActiveContext]);
+    }, [connection, tab.dbName, addTab, setActiveContext, supportsDesignWrite]);
 
     const openTableDdl = useCallback((tableName: string) => {
         if (!connection) return;
@@ -858,7 +884,7 @@ const TableOverview: React.FC<TableOverviewProps> = ({ tab }) => {
     const buildLegacyTableContextMenuItems = useCallback((table: TableStatRow): MenuProps['items'] => [
         { key: 'new-query', label: '新建查询', icon: <ConsoleSqlOutlined />, onClick: () => openQueryForTable(table.name) },
         { type: 'divider' },
-        { key: 'design-table', label: '设计表', icon: <EditOutlined />, onClick: () => openDesign(table.name) },
+        { key: 'design-table', label: supportsDesignWrite ? '设计表' : '表结构', icon: <EditOutlined />, onClick: () => openDesign(table.name) },
         { key: 'copy-table-name', label: '复制表名', icon: <CopyOutlined />, onClick: () => handleCopyTableName(table.name) },
         { key: 'copy-structure', label: '复制表结构', icon: <CopyOutlined />, onClick: () => handleCopyStructure(table.name) },
         { key: 'backup-table', label: '备份表 (SQL)', icon: <SaveOutlined />, onClick: () => handleExport(table.name, 'sql') },
@@ -886,6 +912,7 @@ const TableOverview: React.FC<TableOverviewProps> = ({ tab }) => {
         handleTableDataDangerAction,
         openDesign,
         openQueryForTable,
+        supportsDesignWrite,
     ]);
 
     const renderOverviewSectionTitle = (section: OverviewTableSection) => {
diff --git a/frontend/src/components/TriggerViewer.object-edit.test.tsx b/frontend/src/components/TriggerViewer.object-edit.test.tsx
new file mode 100644
index 0000000..cbecf87
--- /dev/null
+++ b/frontend/src/components/TriggerViewer.object-edit.test.tsx
@@ -0,0 +1,388 @@
+import React from 'react';
+import { act, create } from 'react-test-renderer';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import type { TabData } from '../types';
+import TriggerViewer from './TriggerViewer';
+
+const storeState = vi.hoisted(() => ({
+  connections: [
+    {
+      id: 'conn-1',
+      name: 'local',
+      config: {
+        type: 'postgres',
+        host: '127.0.0.1',
+        port: 5432,
+        user: 'postgres',
+        password: '',
+        database: 'main',
+      },
+    },
+  ],
+  theme: 'light',
+  addTab: vi.fn(),
+  setActiveContext: vi.fn(),
+}));
+
+const backendApp = vi.hoisted(() => ({
+  DBQuery: vi.fn(),
+}));
+
+vi.mock('../store', () => ({
+  useStore: (selector: (state: typeof storeState) => any) => selector(storeState),
+}));
+
+vi.mock('../../wailsjs/go/app/App', () => backendApp);
+
+vi.mock('@ant-design/icons', () => ({
+  EditOutlined: () => <span data-icon="edit" />,
+}));
+
+vi.mock('./MonacoEditor', () => ({
+  default: ({ value, options }: any) => (
+    <pre data-editor="true" data-readonly={String(options?.readOnly)}>
+      {value}
+    </pre>
+  ),
+}));
+
+vi.mock('antd', () => ({
+  Spin: ({ tip }: any) => <div>{tip}</div>,
+  Alert: ({ message, description }: any) => <div>{message}{description}</div>,
+  Button: ({ children, onClick, icon }: any) => (
+    <button type="button" onClick={onClick}>
+      {icon}
+      {children}
+    </button>
+  ),
+}));
+
+const flushPromises = async (count = 6) => {
+  for (let i = 0; i < count; i += 1) {
+    await Promise.resolve();
+  }
+};
+
+const findButtonText = (node: any): string => (
+  (node.children || [])
+    .map((item: any) => (typeof item === 'string' ? item : findButtonText(item)))
+    .join('')
+);
+
+const tab: TabData = {
+  id: 'trigger-conn-1-main-audit.users_bi',
+  title: '触发器: audit.users_bi',
+  type: 'trigger',
+  connectionId: 'conn-1',
+  dbName: 'main',
+  triggerName: 'audit.users_bi',
+  triggerTableName: 'audit.users',
+  schemaName: 'audit',
+};
+
+describe('TriggerViewer object edit entry', () => {
+  beforeEach(() => {
+    storeState.addTab.mockReset();
+    storeState.setActiveContext.mockReset();
+    storeState.connections[0].config.type = 'postgres';
+    backendApp.DBQuery.mockReset();
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [{ trigger_definition: 'CREATE TRIGGER users_bi BEFORE INSERT ON audit.users EXECUTE FUNCTION audit.audit_users();' }],
+    });
+  });
+
+  it('opens an editable query tab for trigger definitions', async () => {
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<TriggerViewer tab={tab} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      button.props.onClick();
+    });
+
+    expect(storeState.setActiveContext).toHaveBeenCalledWith({ connectionId: 'conn-1', dbName: 'main' });
+    expect(storeState.addTab).toHaveBeenCalledWith(expect.objectContaining({
+      title: '修改触发器: audit.users_bi',
+      type: 'query',
+      connectionId: 'conn-1',
+      dbName: 'main',
+      queryMode: 'object-edit',
+      query: expect.stringContaining('CREATE TRIGGER users_bi BEFORE INSERT'),
+    }));
+  });
+
+  it('uses SQL Server catalog metadata when loading trigger definitions', async () => {
+    storeState.connections[0].config.type = 'sqlserver';
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [{ trigger_definition: 'CREATE TRIGGER [audit].[users_bi] ON [audit].[users] AFTER INSERT AS SELECT 1;' }],
+    });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<TriggerViewer tab={tab} />);
+      await flushPromises();
+    });
+
+    const sql = String(backendApp.DBQuery.mock.calls[0][2] || '');
+    expect(sql).toContain('FROM [main].sys.all_sql_modules AS m');
+    expect(sql).toContain("WHERE o.name = N'users_bi'");
+    expect(sql).toContain("AND s.name = N'audit'");
+    expect(sql).toContain("o.type IN ('TR', 'TA')");
+    expect(sql).not.toContain('OBJECT_DEFINITION');
+    expect(String(renderer.root.findAll((node: any) => node.props['data-editor'] === 'true')[0].children.join(''))).toContain('CREATE TRIGGER [audit].[users_bi]');
+  });
+
+  it('adds CREATE OR REPLACE for trigger source snippets returned without ddl prefix', async () => {
+    storeState.connections[0].config.type = 'oracle';
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [{
+        TRIGGER_BODY: 'TRIGGER users_bi\nBEFORE INSERT ON audit.users\nFOR EACH ROW\nBEGIN\n  :NEW.created_at := SYSDATE;\nEND;',
+      }],
+    });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<TriggerViewer tab={tab} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      button.props.onClick();
+    });
+
+    const query = storeState.addTab.mock.calls[0][0].query;
+    expect(query).toContain('CREATE OR REPLACE TRIGGER users_bi');
+    expect(query).toContain('BEFORE INSERT ON audit.users');
+    expect(query).toContain(':NEW.created_at := SYSDATE;');
+    expect(query).not.toContain('请补全 CREATE TRIGGER 语句');
+  });
+
+  it('adds trigger name for trigger body snippets returned without ddl header', async () => {
+    storeState.connections[0].config.type = 'oracle';
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [{
+        TRIGGER_BODY: 'BEFORE UPDATE ON audit.users\nFOR EACH ROW\nBEGIN\n  :NEW.updated_at := SYSDATE;\nEND;',
+      }],
+    });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<TriggerViewer tab={tab} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      button.props.onClick();
+    });
+
+    const query = storeState.addTab.mock.calls[0][0].query;
+    expect(query).toContain('CREATE OR REPLACE TRIGGER audit.users_bi');
+    expect(query).toContain('BEFORE UPDATE ON audit.users');
+    expect(query).toContain(':NEW.updated_at := SYSDATE;');
+    expect(query).not.toContain('请补全 CREATE TRIGGER 语句');
+  });
+
+  it('rebuilds mysql trigger ddl from metadata rows when only action statement is available', async () => {
+    storeState.connections[0].config.type = 'mysql';
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      data: [{
+        TRIGGER_NAME: 'users_bi',
+        TRIGGER_SCHEMA: 'main',
+        EVENT_OBJECT_SCHEMA: 'audit',
+        EVENT_OBJECT_TABLE: 'users',
+        ACTION_TIMING: 'BEFORE',
+        EVENT_MANIPULATION: 'INSERT',
+        ACTION_ORIENTATION: 'ROW',
+        ACTION_STATEMENT: 'SET NEW.created_at = NOW()',
+      }],
+    });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<TriggerViewer tab={tab} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      button.props.onClick();
+    });
+
+    const query = storeState.addTab.mock.calls[0][0].query;
+    expect(query).toContain('CREATE TRIGGER `main`.`users_bi`');
+    expect(query).toContain('BEFORE INSERT ON `audit`.`users`');
+    expect(query).toContain('FOR EACH ROW');
+    expect(query).toContain('SET NEW.created_at = NOW();');
+    expect(query).not.toContain('请补全 CREATE TRIGGER 语句');
+  });
+
+  it('rebuilds oracle trigger ddl from metadata rows when body query returns fragments only', async () => {
+    storeState.connections[0].config.type = 'oracle';
+    backendApp.DBQuery
+      .mockResolvedValueOnce({ success: true, data: [] })
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{
+          OWNER: 'AUDIT',
+          TABLE_OWNER: 'AUDIT',
+          TABLE_NAME: 'USERS',
+          TRIGGER_NAME: 'USERS_BU',
+          TRIGGER_TYPE: 'BEFORE EACH ROW',
+          TRIGGERING_EVENT: 'UPDATE',
+          WHEN_CLAUSE: 'NEW.UPDATED_AT IS NULL',
+          TRIGGER_BODY: 'BEGIN\n  :NEW.UPDATED_AT := SYSDATE;\nEND;',
+        }],
+      })
+      .mockResolvedValueOnce({ success: true, data: [] })
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{
+          OWNER: 'AUDIT',
+          TABLE_OWNER: 'AUDIT',
+          TABLE_NAME: 'USERS',
+          TRIGGER_NAME: 'USERS_BU',
+          TRIGGER_TYPE: 'BEFORE EACH ROW',
+          TRIGGERING_EVENT: 'UPDATE',
+          WHEN_CLAUSE: 'NEW.UPDATED_AT IS NULL',
+          TRIGGER_BODY: 'BEGIN\n  :NEW.UPDATED_AT := SYSDATE;\nEND;',
+        }],
+      });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<TriggerViewer tab={{
+        ...tab,
+        id: 'trigger-conn-1-main-audit.users_bu',
+        title: '触发器: audit.users_bu',
+        triggerName: 'audit.users_bu',
+      }} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      button.props.onClick();
+    });
+
+    const query = storeState.addTab.mock.calls[0][0].query;
+    expect(query).toContain('CREATE OR REPLACE TRIGGER AUDIT.USERS_BU');
+    expect(query).toContain('BEFORE UPDATE ON AUDIT.USERS');
+    expect(query).toContain('FOR EACH ROW');
+    expect(query).toContain('WHEN (NEW.UPDATED_AT IS NULL)');
+    expect(query).toContain(':NEW.UPDATED_AT := SYSDATE;');
+  });
+
+  it('reloads the latest trigger definition before opening object edit', async () => {
+    backendApp.DBQuery
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{ trigger_definition: 'CREATE TRIGGER users_bi BEFORE INSERT ON audit.users EXECUTE FUNCTION audit.audit_users();' }],
+      })
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{ trigger_definition: 'CREATE TRIGGER users_bi BEFORE INSERT OR UPDATE ON audit.users EXECUTE FUNCTION audit.audit_users_v2();' }],
+      });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<TriggerViewer tab={tab} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      await button.props.onClick();
+      await flushPromises();
+    });
+
+    expect(backendApp.DBQuery).toHaveBeenCalledTimes(2);
+    const query = storeState.addTab.mock.calls[0][0].query;
+    expect(query).toContain('CREATE TRIGGER users_bi BEFORE INSERT OR UPDATE ON audit.users');
+    expect(query).toContain('audit.audit_users_v2()');
+
+    const editor = renderer.root.findAll((node: any) => node.props['data-editor'] === 'true')[0];
+    expect(String(editor.children.join(''))).toContain('CREATE TRIGGER users_bi BEFORE INSERT OR UPDATE ON audit.users');
+  });
+
+  it('keeps the current trigger definition visible when refresh for object edit fails', async () => {
+    backendApp.DBQuery
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{ trigger_definition: 'CREATE TRIGGER users_bi BEFORE INSERT ON audit.users EXECUTE FUNCTION audit.audit_users();' }],
+      })
+      .mockResolvedValueOnce({
+        success: false,
+        message: 'refresh failed',
+        data: [],
+      });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<TriggerViewer tab={tab} />);
+      await flushPromises();
+    });
+
+    const button = renderer.root.findAll((node: any) => node.type === 'button' && findButtonText(node).includes('对象修改'))[0];
+
+    await act(async () => {
+      await button.props.onClick();
+      await flushPromises();
+    });
+
+    expect(storeState.addTab).not.toHaveBeenCalled();
+    expect(String(renderer.root.findAll((node: any) => node.props['data-editor'] === 'true')[0].children.join(''))).toContain('CREATE TRIGGER users_bi BEFORE INSERT ON audit.users');
+    expect(findButtonText(renderer.root)).toContain('刷新最新定义失败');
+    expect(findButtonText(renderer.root)).toContain('refresh failed');
+  });
+
+  it('does not keep the previous trigger definition when switching objects and the new load fails', async () => {
+    backendApp.DBQuery
+      .mockResolvedValueOnce({
+        success: true,
+        data: [{ trigger_definition: 'CREATE TRIGGER users_bi BEFORE INSERT ON audit.users EXECUTE FUNCTION audit.audit_users();' }],
+      })
+      .mockResolvedValueOnce({
+        success: false,
+        message: 'load failed',
+        data: [],
+      });
+
+    let renderer: any;
+    await act(async () => {
+      renderer = create(<TriggerViewer tab={tab} />);
+      await flushPromises();
+    });
+
+    await act(async () => {
+      renderer.update(<TriggerViewer tab={{
+        ...tab,
+        id: 'trigger-conn-1-main-audit.users_bu',
+        title: '触发器: audit.users_bu',
+        triggerName: 'audit.users_bu',
+      }} />);
+      await flushPromises();
+    });
+
+    expect(findButtonText(renderer.root)).toContain('加载失败');
+    expect(findButtonText(renderer.root)).toContain('load failed');
+    expect(renderer.root.findAll((node: any) => node.props['data-editor'] === 'true')).toHaveLength(0);
+    expect(findButtonText(renderer.root)).not.toContain('CREATE TRIGGER users_bi BEFORE INSERT');
+  });
+});
diff --git a/frontend/src/components/TriggerViewer.tsx b/frontend/src/components/TriggerViewer.tsx
index ef59bd2..8264bde 100644
--- a/frontend/src/components/TriggerViewer.tsx
+++ b/frontend/src/components/TriggerViewer.tsx
@@ -1,41 +1,149 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import Editor from './MonacoEditor';
-import { Spin, Alert } from 'antd';
+import { Button, Spin, Alert } from 'antd';
+import { EditOutlined } from '@ant-design/icons';
 import { TabData } from '../types';
 import { useStore } from '../store';
 import { DBQuery } from '../../wailsjs/go/app/App';
 import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
 import { normalizeOceanBaseProtocol } from '../utils/oceanBaseProtocol';
+import { splitQualifiedNameLast } from '../utils/qualifiedName';
+import { buildEditableTriggerSql } from '../utils/triggerEditSql';
+import { buildSqlServerObjectDefinitionQueries } from '../utils/sqlServerObjectDefinition';
 
 interface TriggerViewerProps {
     tab: TabData;
 }
 
+const getCaseInsensitiveRawValue = (row: Record<string, any>, keys: string[]): any => {
+    const normalizedKeyMap = new Map<string, string>();
+    Object.keys(row || {}).forEach((key) => normalizedKeyMap.set(key.toLowerCase(), key));
+    for (const key of keys) {
+        const matchedKey = normalizedKeyMap.get(String(key || '').toLowerCase());
+        if (!matchedKey) continue;
+        const value = row[matchedKey];
+        if (value !== undefined && value !== null && String(value).trim() !== '') {
+            return value;
+        }
+    }
+    return undefined;
+};
+
+const buildMySQLTriggerDDLFromMetadata = (
+    row: Record<string, any>,
+    fallbackTriggerName: string,
+    fallbackTableName: string,
+): string => {
+    const triggerName = String(
+        getCaseInsensitiveRawValue(row, ['trigger_name', 'Trigger', 'TRIGGER_NAME'])
+        || splitQualifiedNameLast(fallbackTriggerName).objectName
+        || fallbackTriggerName,
+    ).trim();
+    const triggerSchema = String(getCaseInsensitiveRawValue(row, ['trigger_schema', 'TRIGGER_SCHEMA']) || '').trim();
+    const eventSchema = String(getCaseInsensitiveRawValue(row, ['event_object_schema', 'EVENT_OBJECT_SCHEMA']) || '').trim();
+    const eventTable = String(
+        getCaseInsensitiveRawValue(row, ['event_object_table', 'EVENT_OBJECT_TABLE', 'table_name', 'TABLE_NAME'])
+        || splitQualifiedNameLast(fallbackTableName).objectName
+        || fallbackTableName,
+    ).trim();
+    const actionTiming = String(getCaseInsensitiveRawValue(row, ['action_timing', 'ACTION_TIMING']) || '').trim().toUpperCase();
+    const eventManipulation = String(getCaseInsensitiveRawValue(row, ['event_manipulation', 'EVENT_MANIPULATION']) || '').trim().toUpperCase();
+    const actionOrientation = String(getCaseInsensitiveRawValue(row, ['action_orientation', 'ACTION_ORIENTATION']) || '').trim().toUpperCase();
+    const actionStatement = String(getCaseInsensitiveRawValue(row, ['action_statement', 'ACTION_STATEMENT']) || '').trim();
+
+    if (!triggerName || !eventTable || !actionTiming || !eventManipulation || !actionStatement) {
+        return '';
+    }
+
+    const qualifiedTriggerName = triggerSchema ? `\`${triggerSchema.replace(/`/g, '``')}\`.\`${triggerName.replace(/`/g, '``')}\`` : `\`${triggerName.replace(/`/g, '``')}\``;
+    const qualifiedTableName = eventSchema ? `\`${eventSchema.replace(/`/g, '``')}\`.\`${eventTable.replace(/`/g, '``')}\`` : `\`${eventTable.replace(/`/g, '``')}\``;
+    const orientationClause = actionOrientation === 'ROW' ? '\nFOR EACH ROW' : '';
+    return `CREATE TRIGGER ${qualifiedTriggerName}\n${actionTiming} ${eventManipulation} ON ${qualifiedTableName}${orientationClause}\n${actionStatement}`;
+};
+
+const buildOracleLikeTriggerDDLFromMetadata = (
+    row: Record<string, any>,
+    fallbackTriggerName: string,
+    fallbackTableName: string,
+): string => {
+    const triggerName = String(
+        getCaseInsensitiveRawValue(row, ['trigger_name', 'TRIGGER_NAME'])
+        || splitQualifiedNameLast(fallbackTriggerName).objectName
+        || fallbackTriggerName,
+    ).trim();
+    const owner = String(getCaseInsensitiveRawValue(row, ['owner', 'OWNER']) || splitQualifiedNameLast(fallbackTriggerName).parentPath || '').trim();
+    const tableOwner = String(getCaseInsensitiveRawValue(row, ['table_owner', 'TABLE_OWNER']) || splitQualifiedNameLast(fallbackTableName).parentPath || '').trim();
+    const tableName = String(
+        getCaseInsensitiveRawValue(row, ['table_name', 'TABLE_NAME'])
+        || splitQualifiedNameLast(fallbackTableName).objectName
+        || fallbackTableName,
+    ).trim();
+    const triggerType = String(getCaseInsensitiveRawValue(row, ['trigger_type', 'TRIGGER_TYPE']) || '').trim();
+    const triggeringEvent = String(getCaseInsensitiveRawValue(row, ['triggering_event', 'TRIGGERING_EVENT']) || '').trim();
+    const whenClause = String(getCaseInsensitiveRawValue(row, ['when_clause', 'WHEN_CLAUSE']) || '').trim();
+    const triggerBody = String(getCaseInsensitiveRawValue(row, ['trigger_body', 'TRIGGER_BODY']) || '').trim();
+
+    if (!triggerName || !tableName || !triggerType || !triggeringEvent || !triggerBody) {
+        return '';
+    }
+
+    const qualifiedTriggerName = owner ? `${owner}.${triggerName}` : triggerName;
+    const qualifiedTableName = tableOwner ? `${tableOwner}.${tableName}` : tableName;
+    const normalizedWhenClause = whenClause ? `\nWHEN (${whenClause.replace(/^\((.*)\)$/s, '$1')})` : '';
+    const normalizedTriggerType = triggerType.replace(/\s+/g, ' ').trim();
+    const triggerTypeMatch = normalizedTriggerType.match(/^(BEFORE|AFTER|INSTEAD OF)(?:\s+(EACH ROW|STATEMENT))?$/i);
+    if (triggerTypeMatch) {
+        const timing = String(triggerTypeMatch[1] || '').toUpperCase();
+        const firingLevel = String(triggerTypeMatch[2] || '').toUpperCase();
+        const forEachRowClause = firingLevel === 'EACH ROW' ? '\nFOR EACH ROW' : '';
+        return `CREATE OR REPLACE TRIGGER ${qualifiedTriggerName}\n${timing} ${triggeringEvent} ON ${qualifiedTableName}${forEachRowClause}${normalizedWhenClause}\n${triggerBody}`;
+    }
+    return `CREATE OR REPLACE TRIGGER ${qualifiedTriggerName}\n${triggerType} ${triggeringEvent} ON ${qualifiedTableName}${normalizedWhenClause}\n${triggerBody}`;
+};
+
 const TriggerViewer: React.FC<TriggerViewerProps> = ({ tab }) => {
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
     const [triggerDefinition, setTriggerDefinition] = useState<string>('');
+    const [openingObjectEdit, setOpeningObjectEdit] = useState(false);
+    const isMountedRef = useRef(true);
+    const loadedDefinitionKeyRef = useRef('');
 
     const connections = useStore(state => state.connections);
     const theme = useStore(state => state.theme);
+    const addTab = useStore(state => state.addTab);
+    const setActiveContext = useStore(state => state.setActiveContext);
     const darkMode = theme === 'dark';
+    const objectIdentityKey = [
+        tab.connectionId,
+        tab.dbName,
+        tab.type,
+        tab.triggerName,
+        tab.triggerTableName,
+        tab.schemaName,
+    ].map((item) => String(item || '')).join('||');
 
     // 透明 Monaco Editor 主题由 MonacoEditor 包装组件按需注册（含 stickyScroll 不透明背景）
 
     const escapeSQLLiteral = (raw: string): string => String(raw || '').replace(/'/g, "''");
-    const quoteSqlServerIdentifier = (raw: string): string => `[${String(raw || '').replace(/]/g, ']]')}]`;
+    const parseSchemaAndName = (fullName: string): { schema: string; name: string } => {
+        const parsed = splitQualifiedNameLast(fullName);
+        return { schema: parsed.parentPath, name: parsed.objectName };
+    };
 
     const getMetadataDialect = (conn: any): string => {
         const type = String(conn?.config?.type || '').trim().toLowerCase();
         if (type === 'custom') {
             const driver = String(conn?.config?.driver || '').trim().toLowerCase();
             if (driver === 'diros' || driver === 'doris') return 'mysql';
+            if (driver === 'goldendb' || driver === 'greatdb' || driver === 'gdb') return 'mysql';
             if (driver === 'oceanbase') return normalizeOceanBaseProtocol(conn?.config?.oceanBaseProtocol) === 'oracle' ? 'oracle' : 'mysql';
             if (driver === 'opengauss' || driver === 'open_gauss' || driver === 'open-gauss') return 'opengauss';
+            if (driver === 'gaussdb' || driver === 'gauss_db' || driver === 'gauss-db') return 'gaussdb';
             return driver;
         }
         if (type === 'oceanbase' && normalizeOceanBaseProtocol(conn?.config?.oceanBaseProtocol) === 'oracle') return 'oracle';
-        if (type === 'mariadb' || type === 'oceanbase' || type === 'diros' || type === 'sphinx') return 'mysql';
+        if (type === 'goldendb' || type === 'mariadb' || type === 'oceanbase' || type === 'diros' || type === 'sphinx') return 'mysql';
         if (type === 'dameng') return 'dm';
         return type;
     };
@@ -49,15 +157,16 @@ const TriggerViewer: React.FC<TriggerViewerProps> = ({ tab }) => {
     };
 
     const buildShowTriggerQueries = (dialect: string, triggerName: string, dbName: string): string[] => {
-        const safeTriggerName = escapeSQLLiteral(triggerName);
+        const { schema, name } = parseSchemaAndName(triggerName);
+        const safeTriggerName = escapeSQLLiteral(name);
         const safeDbName = escapeSQLLiteral(dbName);
         switch (dialect) {
             case 'mysql':
             case 'starrocks':
                 return [
-                    `SHOW CREATE TRIGGER \`${triggerName.replace(/`/g, '``')}\``,
+                    `SHOW CREATE TRIGGER \`${name.replace(/`/g, '``')}\``,
                     safeDbName
-                        ? `SELECT ACTION_STATEMENT AS trigger_definition FROM information_schema.triggers WHERE trigger_schema = '${safeDbName}' AND trigger_name = '${safeTriggerName}' LIMIT 1`
+                        ? `SELECT TRIGGER_NAME, TRIGGER_SCHEMA, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, ACTION_TIMING, EVENT_MANIPULATION, ACTION_ORIENTATION, ACTION_STATEMENT FROM information_schema.triggers WHERE trigger_schema = '${safeDbName}' AND trigger_name = '${safeTriggerName}' LIMIT 1`
                         : '',
                     safeDbName
                         ? `SHOW TRIGGERS FROM \`${dbName.replace(/`/g, '``')}\` LIKE '${safeTriggerName}'`
@@ -68,6 +177,7 @@ const TriggerViewer: React.FC<TriggerViewerProps> = ({ tab }) => {
             case 'highgo':
             case 'vastbase':
             case 'opengauss':
+            case 'gaussdb':
                 return [`SELECT pg_get_triggerdef(t.oid, true) AS trigger_definition
 FROM pg_trigger t
 JOIN pg_class c ON t.tgrelid = c.oid
@@ -75,14 +185,26 @@ WHERE t.tgname = '${safeTriggerName}'
   AND NOT t.tgisinternal
 LIMIT 1`];
             case 'sqlserver': {
-                return [`SELECT OBJECT_DEFINITION(OBJECT_ID('${safeTriggerName.replace(/'/g, "''")}')) AS trigger_definition`];
+                return buildSqlServerObjectDefinitionQueries('trigger', triggerName, dbName, 'trigger_definition');
             }
             case 'oracle':
             case 'dm':
-                if (!safeDbName) {
-                    return [`SELECT TRIGGER_BODY FROM USER_TRIGGERS WHERE TRIGGER_NAME = '${safeTriggerName.toUpperCase()}'`];
+                if (schema) {
+                    return [
+                        `SELECT DBMS_METADATA.GET_DDL('TRIGGER', '${safeTriggerName.toUpperCase()}', '${escapeSQLLiteral(schema).toUpperCase()}') AS trigger_definition FROM DUAL`,
+                        `SELECT OWNER, TABLE_OWNER, TABLE_NAME, TRIGGER_NAME, TRIGGER_TYPE, TRIGGERING_EVENT, WHEN_CLAUSE, TRIGGER_BODY FROM ALL_TRIGGERS WHERE OWNER = '${escapeSQLLiteral(schema).toUpperCase()}' AND TRIGGER_NAME = '${safeTriggerName.toUpperCase()}'`,
+                    ];
                 }
-                return [`SELECT TRIGGER_BODY FROM ALL_TRIGGERS WHERE OWNER = '${safeDbName.toUpperCase()}' AND TRIGGER_NAME = '${safeTriggerName.toUpperCase()}'`];
+                if (!safeDbName) {
+                    return [
+                        `SELECT DBMS_METADATA.GET_DDL('TRIGGER', '${safeTriggerName.toUpperCase()}') AS trigger_definition FROM DUAL`,
+                        `SELECT TABLE_NAME, TRIGGER_NAME, TRIGGER_TYPE, TRIGGERING_EVENT, WHEN_CLAUSE, TRIGGER_BODY FROM USER_TRIGGERS WHERE TRIGGER_NAME = '${safeTriggerName.toUpperCase()}'`,
+                    ];
+                }
+                return [
+                    `SELECT DBMS_METADATA.GET_DDL('TRIGGER', '${safeTriggerName.toUpperCase()}', '${safeDbName.toUpperCase()}') AS trigger_definition FROM DUAL`,
+                    `SELECT OWNER, TABLE_OWNER, TABLE_NAME, TRIGGER_NAME, TRIGGER_TYPE, TRIGGERING_EVENT, WHEN_CLAUSE, TRIGGER_BODY FROM ALL_TRIGGERS WHERE OWNER = '${safeDbName.toUpperCase()}' AND TRIGGER_NAME = '${safeTriggerName.toUpperCase()}'`,
+                ];
             case 'sqlite':
                 return [`SELECT sql FROM sqlite_master WHERE type = 'trigger' AND name = '${safeTriggerName}'`];
             case 'duckdb':
@@ -154,21 +276,25 @@ LIMIT 1`];
         return '';
     };
 
-    const extractTriggerDefinition = (dialect: string, data: any[]): string => {
+    const extractTriggerDefinition = (dialect: string, data: any[], fallbackTriggerName: string, fallbackTableName: string): string => {
         if (!data || data.length === 0) {
             return '-- 未找到触发器定义';
         }
 
-        const row = data[0];
+        const row = data[0] as Record<string, any>;
 
         switch (dialect) {
             case 'mysql':
             case 'starrocks': {
                 // MySQL SHOW CREATE TRIGGER returns: Trigger, sql_mode, SQL Original Statement, ...
                 const keys = Object.keys(row);
+                const metadataDDL = buildMySQLTriggerDDLFromMetadata(row, fallbackTriggerName, fallbackTableName);
                 if (row.trigger_definition || row.TRIGGER_DEFINITION) {
                     return String(row.trigger_definition || row.TRIGGER_DEFINITION);
                 }
+                if (metadataDDL) {
+                    return metadataDDL;
+                }
                 if (row.ACTION_STATEMENT || row.action_statement) {
                     return String(row.ACTION_STATEMENT || row.action_statement);
                 }
@@ -187,14 +313,33 @@ LIMIT 1`];
             case 'kingbase':
             case 'highgo':
             case 'vastbase':
-            case 'opengauss': {
+            case 'opengauss':
+            case 'gaussdb': {
                 return row.trigger_definition || row.TRIGGER_DEFINITION || Object.values(row)[0] || '';
             }
             case 'sqlserver': {
-                return row.trigger_definition || row.TRIGGER_DEFINITION || Object.values(row)[0] || '';
+                const directDefinition = getCaseInsensitiveRawValue(row, ['trigger_definition', 'definition']);
+                if (directDefinition !== undefined && directDefinition !== null && String(directDefinition).trim() !== '') {
+                    return String(directDefinition);
+                }
+                const helpTextDefinition = data
+                    .map((item) => getCaseInsensitiveRawValue(item, ['Text', 'text']))
+                    .filter((value) => value !== undefined && value !== null)
+                    .map((value) => String(value))
+                    .join('');
+                if (helpTextDefinition.trim()) return helpTextDefinition;
+                return Object.values(row)[0] || '';
             }
             case 'oracle':
             case 'dm': {
+                const ddl = String(row.trigger_definition || row.TRIGGER_DEFINITION || '').trim();
+                if (ddl) {
+                    return ddl;
+                }
+                const metadataDDL = buildOracleLikeTriggerDDLFromMetadata(row, fallbackTriggerName, fallbackTableName);
+                if (metadataDDL) {
+                    return metadataDDL;
+                }
                 return row.trigger_body || row.TRIGGER_BODY || Object.values(row)[0] || '';
             }
             case 'sqlite': {
@@ -205,79 +350,101 @@ LIMIT 1`];
         }
     };
 
-    useEffect(() => {
-        const loadTriggerDefinition = async () => {
-            setLoading(true);
-            setError(null);
+    const loadTriggerDefinition = async (): Promise<{ success: boolean; definition?: string; error?: string }> => {
+        const conn = connections.find(c => c.id === tab.connectionId);
+        if (!conn) {
+            return { success: false, error: '未找到数据库连接' };
+        }
 
-            const conn = connections.find(c => c.id === tab.connectionId);
-            if (!conn) {
-                setError('未找到数据库连接');
-                setLoading(false);
-                return;
-            }
+        const triggerName = tab.triggerName || '';
+        const dbName = tab.dbName || '';
 
-            const triggerName = tab.triggerName || '';
-            const dbName = tab.dbName || '';
+        if (!triggerName) {
+            return { success: false, error: '触发器名称为空' };
+        }
 
-            if (!triggerName) {
-                setError('触发器名称为空');
-                setLoading(false);
-                return;
-            }
+        const dialect = getMetadataDialect(conn);
+        const queries = buildShowTriggerQueries(dialect, triggerName, dbName);
+        const sphinxLike = isSphinxConnection(conn) && dialect === 'mysql';
 
-            const dialect = getMetadataDialect(conn);
-            const queries = buildShowTriggerQueries(dialect, triggerName, dbName);
-            const sphinxLike = isSphinxConnection(conn) && dialect === 'mysql';
+        if (!queries.length || String(queries[0] || '').startsWith('--')) {
+            return { success: true, definition: String(queries[0] || '-- 暂不支持该数据库类型的触发器定义查看') };
+        }
 
-            if (!queries.length || String(queries[0] || '').startsWith('--')) {
-                setTriggerDefinition(String(queries[0] || '-- 暂不支持该数据库类型的触发器定义查看'));
-                setLoading(false);
-                return;
-            }
+        try {
+            const config = {
+                ...conn.config,
+                port: Number(conn.config.port),
+                password: conn.config.password || '',
+                database: conn.config.database || '',
+                useSSH: conn.config.useSSH || false,
+                ssh: conn.config.ssh || { host: '', port: 22, user: '', password: '', keyPath: '' }
+            };
 
-            try {
-                const config = {
-                    ...conn.config,
-                    port: Number(conn.config.port),
-                    password: conn.config.password || '',
-                    database: conn.config.database || '',
-                    useSSH: conn.config.useSSH || false,
-                    ssh: conn.config.ssh || { host: '', port: 22, user: '', password: '', keyPath: '' }
+            const result = await runQueryCandidates(config, dbName, queries);
+
+            if (result.success && Array.isArray(result.data) && result.data.length > 0) {
+                return {
+                    success: true,
+                    definition: extractTriggerDefinition(dialect, result.data, triggerName, String(tab.triggerTableName || '')),
                 };
+            }
 
-                const result = await runQueryCandidates(config, dbName, queries);
-
-                if (result.success && Array.isArray(result.data) && result.data.length > 0) {
-                    const definition = extractTriggerDefinition(dialect, result.data);
-                    setTriggerDefinition(definition);
-                    return;
-                }
-
-                if (result.success) {
-                    if (sphinxLike) {
-                        const version = await getVersionHint(config, dbName);
-                        const versionText = version ? `（版本: ${version}）` : '';
-                        setTriggerDefinition(`-- 当前 Sphinx 实例${versionText}未返回触发器定义。\n-- 已执行多套兼容查询，可能是版本能力限制或对象类型不支持。`);
-                        return;
-                    }
-                    setTriggerDefinition('-- 未找到触发器定义');
-                } else if (sphinxLike) {
+            if (result.success) {
+                if (sphinxLike) {
                     const version = await getVersionHint(config, dbName);
                     const versionText = version ? `（版本: ${version}）` : '';
-                    setTriggerDefinition(`-- 当前 Sphinx 实例${versionText}不支持触发器定义查询。\n-- 已自动尝试兼容语句，返回失败信息: ${result.message || 'unknown error'}`);
-                } else {
-                    setError(result.message || '查询触发器定义失败');
+                    return {
+                        success: true,
+                        definition: `-- 当前 Sphinx 实例${versionText}未返回触发器定义。\n-- 已执行多套兼容查询，可能是版本能力限制或对象类型不支持。`
+                    };
                 }
-            } catch (e: any) {
-                setError('查询触发器定义失败: ' + (e?.message || String(e)));
-            } finally {
-                setLoading(false);
+                return { success: true, definition: '-- 未找到触发器定义' };
             }
+
+            if (sphinxLike) {
+                const version = await getVersionHint(config, dbName);
+                const versionText = version ? `（版本: ${version}）` : '';
+                return {
+                    success: true,
+                    definition: `-- 当前 Sphinx 实例${versionText}不支持触发器定义查询。\n-- 已自动尝试兼容语句，返回失败信息: ${result.message || 'unknown error'}`
+                };
+            }
+
+            return { success: false, error: result.message || '查询触发器定义失败' };
+        } catch (e: any) {
+            return { success: false, error: '查询触发器定义失败: ' + (e?.message || String(e)) };
+        }
+    };
+
+    useEffect(() => {
+        let cancelled = false;
+        const syncTriggerDefinition = async () => {
+            setLoading(true);
+            setError(null);
+            const result = await loadTriggerDefinition();
+            if (cancelled) {
+                return;
+            }
+            if (result.success) {
+                loadedDefinitionKeyRef.current = objectIdentityKey;
+                setTriggerDefinition(String(result.definition || ''));
+            } else {
+                setError(result.error || '查询触发器定义失败');
+            }
+            setLoading(false);
         };
 
-        loadTriggerDefinition();
-    }, [tab.connectionId, tab.dbName, tab.triggerName, connections]);
+        syncTriggerDefinition();
+
+        return () => {
+            cancelled = true;
+        };
+    }, [tab.connectionId, tab.dbName, tab.triggerName, connections, objectIdentityKey]);
+
+    useEffect(() => () => {
+        isMountedRef.current = false;
+    }, []);
 
     if (loading) {
         return (
@@ -287,7 +454,10 @@ LIMIT 1`];
         );
     }
 
-    if (error) {
+    const displayedDefinition = loadedDefinitionKeyRef.current === objectIdentityKey ? triggerDefinition : '';
+    const hasDefinition = String(displayedDefinition || '').trim() !== '';
+
+    if (error && !hasDefinition) {
         return (
             <div style={{ padding: 16 }}>
                 <Alert type="error" message="加载失败" description={error} showIcon />
@@ -295,18 +465,63 @@ LIMIT 1`];
         );
     }
 
+    const triggerName = String(tab.triggerName || '').trim();
+    const dbName = String(tab.dbName || '').trim();
+    const openObjectEditQuery = async () => {
+        if (!triggerName || openingObjectEdit) return;
+        setOpeningObjectEdit(true);
+        setError(null);
+        try {
+            const result = await loadTriggerDefinition();
+            if (!isMountedRef.current) {
+                return;
+            }
+            if (!result.success) {
+                setError(result.error || '查询触发器定义失败');
+                return;
+            }
+            const latestDefinition = String(result.definition || '');
+            loadedDefinitionKeyRef.current = objectIdentityKey;
+            setTriggerDefinition(latestDefinition);
+            setActiveContext({ connectionId: tab.connectionId, dbName });
+            addTab({
+                id: `query-edit-trigger-${tab.connectionId}-${dbName}-${Date.now()}`,
+                title: `修改触发器: ${triggerName}`,
+                type: 'query',
+                connectionId: tab.connectionId,
+                dbName,
+                query: buildEditableTriggerSql(triggerName, latestDefinition),
+                queryMode: 'object-edit',
+            });
+        } finally {
+            if (isMountedRef.current) {
+                setOpeningObjectEdit(false);
+            }
+        }
+    };
+
     return (
         <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
-            <div style={{ padding: '8px 16px', borderBottom: darkMode ? '1px solid #303030' : '1px solid #f0f0f0' }}>
-                <strong>触发器: </strong>{tab.triggerName}
-                {tab.dbName && <span style={{ marginLeft: 16, color: '#888' }}>数据库: {tab.dbName}</span>}
+            <div style={{ padding: '8px 16px', borderBottom: darkMode ? '1px solid #303030' : '1px solid #f0f0f0', display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12 }}>
+                <div style={{ minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+                    <strong>触发器: </strong>{tab.triggerName}
+                    {tab.dbName && <span style={{ marginLeft: 16, color: '#888' }}>数据库: {tab.dbName}</span>}
+                </div>
+                <Button size="small" icon={<EditOutlined />} onClick={openObjectEditQuery} disabled={!triggerName} loading={openingObjectEdit}>
+                    对象修改
+                </Button>
             </div>
+            {error && hasDefinition && (
+                <div style={{ padding: '8px 16px 0' }}>
+                    <Alert type="warning" message="刷新最新定义失败" description={error} showIcon />
+                </div>
+            )}
             <div style={{ flex: 1, minHeight: 0 }}>
                 <Editor
                     height="100%"
                     language="sql"
                     theme={darkMode ? 'transparent-dark' : 'transparent-light'}
-                    value={triggerDefinition}
+                    value={displayedDefinition}
                     options={{
                         readOnly: true,
                         minimap: { enabled: false },
diff --git a/frontend/src/components/V2TableContextMenu.tsx b/frontend/src/components/V2TableContextMenu.tsx
index b5fda10..1f0fec9 100644
--- a/frontend/src/components/V2TableContextMenu.tsx
+++ b/frontend/src/components/V2TableContextMenu.tsx
@@ -11,6 +11,7 @@ import {
   FolderOpenOutlined,
   FolderOutlined,
   SaveOutlined,
+  SendOutlined,
   LinkOutlined,
   ReloadOutlined,
   TableOutlined,
@@ -26,6 +27,7 @@ import {
   FolderAddOutlined,
   HddOutlined,
   PushpinOutlined,
+  UndoOutlined,
   SortAscendingOutlined,
   SortDescendingOutlined,
   VerticalAlignBottomOutlined,
@@ -40,6 +42,7 @@ export type V2TableContextMenuActionKey =
   | 'design-table'
   | 'open-new-tab'
   | 'new-query'
+  | 'publish-message'
   | 'view-ddl'
   | 'view-er'
   | 'copy-table-name'
@@ -168,6 +171,7 @@ export const V2TableContextMenuView: React.FC<{
   isPinned?: boolean;
   supportsTruncate?: boolean;
   supportsStarRocksRollup?: boolean;
+  supportsMessagePublish?: boolean;
   onAction?: (action: V2TableContextMenuActionKey) => void;
 }> = ({
   tableName,
@@ -176,6 +180,7 @@ export const V2TableContextMenuView: React.FC<{
   isPinned = false,
   supportsTruncate = true,
   supportsStarRocksRollup = false,
+  supportsMessagePublish = false,
   onAction,
 }) => {
   const renderItems = (items: V2TableContextMenuItemConfig[]) => renderV2ContextMenuItems(
@@ -222,6 +227,7 @@ export const V2TableContextMenuView: React.FC<{
           { action: 'design-table', icon: <EditOutlined />, title: `${t('sidebar.menu.design_table')} · ${t('sidebar.v2_table_menu.design_table_detail')}`, kbd: primaryShortcut('D', shortcutPlatform) },
           { action: 'open-new-tab', icon: <FileAddOutlined />, title: t('sidebar.v2_table_menu.open_in_new_tab'), kbd: primaryShortcut('Enter', shortcutPlatform) },
           { action: 'new-query', icon: <ConsoleSqlOutlined />, title: t('sidebar.menu.new_query') },
+          ...(supportsMessagePublish ? [{ action: 'publish-message' as const, icon: <SendOutlined />, title: '测试发送消息' }] : []),
         ])}
 
         <div className="gn-v2-context-menu-section-title">{t('sidebar.v2_table_menu.metadata_section')}</div>
@@ -332,6 +338,13 @@ export type V2DatabaseContextMenuActionKey =
   | 'run-sql'
   | 'drop-db';
 
+export type V2SchemaContextMenuActionKey =
+  | 'rename-schema'
+  | 'refresh-schema'
+  | 'export-schema'
+  | 'backup-schema-sql'
+  | 'drop-schema';
+
 export const V2DatabaseContextMenuView: React.FC<{
   dbName: string;
   shortcutPlatform?: ShortcutPlatform;
@@ -405,6 +418,53 @@ export const V2DatabaseContextMenuView: React.FC<{
   );
 };
 
+export const V2SchemaContextMenuView: React.FC<{
+  dbName: string;
+  schemaName: string;
+  shortcutPlatform?: ShortcutPlatform;
+  onAction?: (action: V2SchemaContextMenuActionKey) => void;
+}> = ({
+  dbName,
+  schemaName,
+  shortcutPlatform = DEFAULT_V2_CONTEXT_MENU_SHORTCUT_PLATFORM,
+  onAction,
+}) => {
+  const renderItems = (items: V2TableContextMenuItemConfig[]) => renderV2ContextMenuItems(
+    items,
+    onAction as (action: string) => void,
+  );
+
+  return (
+    <div className="gn-v2-table-context-menu gn-v2-database-context-menu" data-v2-schema-context-menu="true" role="menu">
+      <V2ContextMenuHeader
+        icon={<FolderOpenOutlined />}
+        title={schemaName}
+        meta={`${dbName || '当前数据库'} · 模式操作`}
+        pill="SCHEMA"
+      />
+
+      <div className="gn-v2-context-menu-body">
+        <div className="gn-v2-context-menu-section-title">维护</div>
+        {renderItems([
+          { action: 'rename-schema', icon: <EditOutlined />, title: '编辑模式', kbd: 'F2', featured: true },
+          { action: 'refresh-schema', icon: <ReloadOutlined />, title: '刷新对象树', kbd: primaryShortcut('R', shortcutPlatform) },
+        ])}
+
+        <div className="gn-v2-context-menu-section-title">导出与备份</div>
+        {renderItems([
+          { action: 'export-schema', icon: <ExportOutlined />, title: '导出当前模式表结构 · SQL' },
+          { action: 'backup-schema-sql', icon: <SaveOutlined />, title: '备份当前模式全部表 · 结构 + 数据' },
+        ])}
+
+        <div className="gn-v2-context-menu-divider" />
+        {renderItems([
+          { action: 'drop-schema', icon: <DeleteOutlined />, title: '删除模式 · DROP CASCADE', tone: 'danger', kbd: '⌫' },
+        ])}
+      </div>
+    </div>
+  );
+};
+
 const DEFAULT_V2_CONTEXT_MENU_SHORTCUT_PLATFORM: ShortcutPlatform = 'windows';
 
 const primaryShortcut = (
@@ -566,6 +626,7 @@ export type V2CellContextMenuActionKey =
   | 'copy-row-for-paste'
   | 'paste-row-as-new'
   | 'copy-column-data'
+  | 'undo-cell-change'
   | 'set-null'
   | 'edit-row'
   | 'fill-selected'
@@ -676,6 +737,7 @@ export const V2CellContextMenuView: React.FC<{
   rowLabel?: string;
   selectedRowCount?: number;
   canModifyData?: boolean;
+  canUndoCellChange?: boolean;
   copiedRowCount?: number;
   canPasteCopiedColumns?: boolean;
   supportsCopyInsert?: boolean;
@@ -687,6 +749,7 @@ export const V2CellContextMenuView: React.FC<{
   rowLabel,
   selectedRowCount = 0,
   canModifyData = false,
+  canUndoCellChange = false,
   copiedRowCount = 0,
   canPasteCopiedColumns = false,
   supportsCopyInsert = true,
@@ -718,6 +781,12 @@ export const V2CellContextMenuView: React.FC<{
           <>
             <div className="gn-v2-context-menu-section-title">{t('data_grid.context_menu.edit_section')}</div>
             {renderItems([
+              {
+                action: 'undo-cell-change',
+                icon: <UndoOutlined />,
+                title: '撤销此单元格修改',
+                disabled: !canUndoCellChange,
+              },
               { action: 'set-null', icon: <ClearOutlined />, title: t('data_grid.batch_fill.set_null') },
               { action: 'edit-row', icon: <EditOutlined />, title: t('data_grid.context_menu.edit_row'), kbd: '↵' },
               { action: 'copy-row-for-paste', icon: <CopyOutlined />, title: t('data_grid.context_menu.copy_row_as_new') },
diff --git a/frontend/src/components/ai/AIBuiltinToolsCatalog.test.tsx b/frontend/src/components/ai/AIBuiltinToolsCatalog.test.tsx
new file mode 100644
index 0000000..dda8f9d
--- /dev/null
+++ b/frontend/src/components/ai/AIBuiltinToolsCatalog.test.tsx
@@ -0,0 +1,130 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AIBuiltinToolsCatalog from './AIBuiltinToolsCatalog';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+const renderCatalog = () => (
+  <AIBuiltinToolsCatalog
+    darkMode={false}
+    overlayTheme={buildOverlayWorkbenchTheme(false)}
+    cardBg="#fff"
+    cardBorder="rgba(0,0,0,0.08)"
+  />
+);
+
+describe('AIBuiltinToolsCatalog', () => {
+  it('renders the workspace flows, snapshot tools, and local saved-sql discovery tools', () => {
+    const markup = renderToStaticMarkup(renderCatalog());
+
+    expect(markup).toContain('字段反查表');
+    expect(markup).toContain('get_all_columns');
+    expect(markup).toContain('结构深挖');
+    expect(markup).toContain('get_indexes');
+    expect(markup).toContain('get_foreign_keys');
+    expect(markup).toContain('get_triggers');
+    expect(markup).toContain('一键结构快照');
+    expect(markup).toContain('inspect_table_bundle');
+    expect(markup).toContain('全库快速摸底');
+    expect(markup).toContain('inspect_database_bundle');
+    expect(markup).toContain('AI 应用健康总览');
+    expect(markup).toContain('inspect_app_health');
+    expect(markup).toContain('导出 AI 排障支持包');
+    expect(markup).toContain('inspect_ai_support_bundle');
+    expect(markup).toContain('不含密钥和数据库密码');
+    expect(markup).toContain('选择 AI 工具路线');
+    expect(markup).toContain('inspect_ai_tool_catalog');
+    expect(markup).toContain('每个工具 arguments 怎么填');
+    expect(markup).toContain('一键体检 AI 配置');
+    expect(markup).toContain('inspect_ai_setup_health');
+    expect(markup).toContain('查看 AI 当前能力');
+    expect(markup).toContain('inspect_ai_runtime');
+    expect(markup).toContain('核对写入安全边界');
+    expect(markup).toContain('inspect_ai_safety');
+    expect(markup).toContain('排查供应商与模型');
+    expect(markup).toContain('inspect_ai_providers');
+    expect(markup).toContain('排查聊天发送状态');
+    expect(markup).toContain('inspect_ai_chat_readiness');
+    expect(markup).toContain('追踪 AI 上游请求');
+    expect(markup).toContain('inspect_ai_upstream_logs');
+    expect(markup).toContain('请求体预览');
+    expect(markup).toContain('排查 MCP 接入状态');
+    expect(markup).toContain('inspect_mcp_setup');
+    expect(markup).toContain('inspect_mcp_runtime_failures');
+    expect(markup).toContain('运行期失败日志');
+    expect(markup).toContain('新增 MCP 填写指引');
+    expect(markup).toContain('inspect_mcp_authoring_guide');
+    expect(markup).toContain('inspect_mcp_draft');
+    expect(markup).toContain('真实校验器试算');
+    expect(markup).toContain('排查 Docker MCP 启动');
+    expect(markup).toContain('inspect_mcp_docker_setup');
+    expect(markup).toContain('docker run 参数是否拆对');
+    expect(markup).toContain('查看 MCP 工具参数');
+    expect(markup).toContain('inspect_mcp_tool_schema');
+    expect(markup).toContain('inputSchema');
+    expect(markup).toContain('查看当前提示与 Skills');
+    expect(markup).toContain('inspect_ai_guidance');
+    expect(markup).toContain('查看当前 AI 上下文');
+    expect(markup).toContain('inspect_ai_context');
+    expect(markup).toContain('查看当前连接');
+    expect(markup).toContain('inspect_current_connection');
+    expect(markup).toContain('核对数据源能力边界');
+    expect(markup).toContain('inspect_connection_capabilities');
+    expect(markup).toContain('盘点本地连接资产');
+    expect(markup).toContain('inspect_saved_connections');
+    expect(markup).toContain('诊断 Redis 单机/哨兵/集群配置');
+    expect(markup).toContain('inspect_redis_topology');
+    expect(markup).toContain('Sentinel master');
+    expect(markup).toContain('盘点外部 SQL 目录');
+    expect(markup).toContain('inspect_external_sql_directories');
+    expect(markup).toContain('读取外部 SQL 文件');
+    expect(markup).toContain('inspect_external_sql_file');
+    expect(markup).toContain('读取当前页签');
+    expect(markup).toContain('inspect_active_tab');
+    expect(markup).toContain('盘点当前工作区');
+    expect(markup).toContain('inspect_workspace_tabs');
+    expect(markup).toContain('查看当前快捷键配置');
+    expect(markup).toContain('inspect_shortcuts');
+    expect(markup).toContain('回看最近执行记录');
+    expect(markup).toContain('inspect_recent_sql_logs');
+    expect(markup).toContain('总结最近 SQL 活动');
+    expect(markup).toContain('inspect_recent_sql_activity');
+    expect(markup).toContain('核对 SQL 编辑器事务');
+    expect(markup).toContain('inspect_sql_editor_transaction');
+    expect(markup).toContain('待提交事务');
+    expect(markup).toContain('SQL 风险预检');
+    expect(markup).toContain('inspect_sql_risk');
+    expect(markup).toContain('WHERE 条件');
+    expect(markup).toContain('排查应用日志');
+    expect(markup).toContain('inspect_app_logs');
+    expect(markup).toContain('排查连接失败与冷却');
+    expect(markup).toContain('inspect_recent_connection_failures');
+    expect(markup).toContain('排查 AI 气泡渲染异常');
+    expect(markup).toContain('inspect_ai_last_render_error');
+    expect(markup).toContain('诊断 AI 消息流');
+    expect(markup).toContain('inspect_ai_message_flow');
+    expect(markup).toContain('诊断 AI 上下文体量');
+    expect(markup).toContain('inspect_ai_context_budget');
+    expect(markup).toContain('messageLimit');
+    expect(markup).toContain('治理前端大文件');
+    expect(markup).toContain('inspect_codebase_hotspots');
+    expect(markup).toContain('大文件和拆分热点');
+    expect(markup).toContain('复用历史 SQL');
+    expect(markup).toContain('inspect_saved_queries');
+    expect(markup).toContain('回看 AI 历史对话');
+    expect(markup).toContain('inspect_ai_sessions');
+    expect(markup).toContain('查找模板片段');
+    expect(markup).toContain('inspect_sql_snippets');
+    expect(markup).toContain('理解样例数据');
+    expect(markup).toContain('preview_table_rows');
+    expect(markup).toContain('参数提示');
+    expect(markup).toContain('搜索工具、流程或参数');
+    expect(markup).toContain('当前显示');
+    expect(markup).toContain('类型：string');
+    expect(markup).toContain('默认：160');
+    expect(markup).toContain('示例：');
+    expect(markup).toContain('filePath');
+    expect(markup).toContain('正文预览最多返回多少字符');
+  });
+});
diff --git a/frontend/src/components/ai/AIBuiltinToolsCatalog.tsx b/frontend/src/components/ai/AIBuiltinToolsCatalog.tsx
new file mode 100644
index 0000000..4e8456e
--- /dev/null
+++ b/frontend/src/components/ai/AIBuiltinToolsCatalog.tsx
@@ -0,0 +1,224 @@
+import React, { useState } from 'react';
+import { SearchOutlined, ToolOutlined } from '@ant-design/icons';
+
+import {
+  BUILTIN_TOOL_FLOWS,
+  describeBuiltinToolParameters,
+  filterBuiltinToolFlows,
+  filterBuiltinTools,
+} from '../../utils/aiBuiltinToolCatalog';
+import { BUILTIN_AI_TOOL_INFO } from '../../utils/aiToolRegistry';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+interface AIBuiltinToolsCatalogProps {
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBg: string;
+  cardBorder: string;
+}
+
+export const AIBuiltinToolsCatalog: React.FC<AIBuiltinToolsCatalogProps> = ({
+  darkMode,
+  overlayTheme,
+  cardBg,
+  cardBorder,
+}) => {
+  const [searchText, setSearchText] = useState('');
+  const visibleFlows = filterBuiltinToolFlows(BUILTIN_TOOL_FLOWS, searchText);
+  const visibleTools = filterBuiltinTools(BUILTIN_AI_TOOL_INFO, searchText);
+
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+      <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginBottom: 4 }}>
+        AI 助手在处理数据库相关问题时，可以自动调用以下内置工具获取真实数据，全程无需人工干预。
+      </div>
+      <label
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          gap: 8,
+          padding: '8px 10px',
+          borderRadius: 10,
+          border: `1px solid ${cardBorder}`,
+          background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.78)',
+        }}
+      >
+        <SearchOutlined style={{ color: overlayTheme.mutedText }} />
+        <input
+          aria-label="搜索内置工具"
+          value={searchText}
+          onChange={(event) => setSearchText(event.target.value)}
+          placeholder="搜索工具、流程或参数，例如 mcp / lineLimit / allowMutating / 事务"
+          style={{
+            flex: 1,
+            border: 'none',
+            outline: 'none',
+            background: 'transparent',
+            color: overlayTheme.titleText,
+            fontSize: 13,
+          }}
+        />
+        {searchText && (
+          <button
+            type="button"
+            onClick={() => setSearchText('')}
+            style={{
+              border: 'none',
+              background: 'transparent',
+              color: overlayTheme.mutedText,
+              cursor: 'pointer',
+              fontSize: 12,
+            }}
+          >
+            清除
+          </button>
+        )}
+      </label>
+      <div style={{ fontSize: 12, color: overlayTheme.mutedText }}>
+        当前显示 {visibleFlows.length}/{BUILTIN_TOOL_FLOWS.length} 条推荐流程，{visibleTools.length}/{BUILTIN_AI_TOOL_INFO.length} 个内置工具。
+      </div>
+      {visibleFlows.length > 0 && (
+        <div style={{ display: 'grid', gap: 8 }}>
+          {visibleFlows.map((flow) => (
+            <div
+              key={flow.title}
+              style={{
+                fontSize: 12,
+                color: overlayTheme.mutedText,
+                padding: '10px 12px',
+                borderRadius: 10,
+                background: cardBg,
+                border: `1px solid ${cardBorder}`,
+              }}
+            >
+              <div style={{ fontWeight: 700, color: overlayTheme.titleText }}>{flow.title}</div>
+              <div style={{ marginTop: 4, fontFamily: 'var(--gn-font-mono)' }}>{flow.steps}</div>
+              <div style={{ marginTop: 4, opacity: 0.8, lineHeight: 1.6 }}>{flow.description}</div>
+            </div>
+          ))}
+        </div>
+      )}
+      {visibleTools.length === 0 && (
+        <div
+          style={{
+            padding: '18px 16px',
+            borderRadius: 14,
+            border: `1px dashed ${cardBorder}`,
+            background: cardBg,
+            color: overlayTheme.mutedText,
+            fontSize: 13,
+            lineHeight: 1.7,
+          }}
+        >
+          没有匹配的内置工具。可以改搜更宽泛的关键词，例如 mcp、日志、连接、事务、快捷键、schema。
+        </div>
+      )}
+      {visibleTools.map((tool) => {
+      const parameterDetails = describeBuiltinToolParameters(tool);
+      return (
+        <div
+          key={tool.name}
+          style={{
+            padding: '14px 16px',
+            borderRadius: 14,
+            border: `1px solid ${cardBorder}`,
+            background: cardBg,
+            transition: 'all 0.2s ease',
+          }}
+        >
+          <div style={{ display: 'flex', alignItems: 'center', gap: 10, marginBottom: 8 }}>
+            <span style={{ fontSize: 20 }}>{tool.icon}</span>
+            <div>
+              <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, fontFamily: 'var(--gn-font-mono)' }}>
+                {tool.name}
+              </div>
+              <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginTop: 2 }}>{tool.desc}</div>
+            </div>
+          </div>
+          <div
+            style={{
+              fontSize: 13,
+              color: overlayTheme.mutedText,
+              lineHeight: 1.6,
+              padding: '8px 12px',
+              background: darkMode ? 'rgba(0,0,0,0.15)' : 'rgba(0,0,0,0.02)',
+              borderRadius: 8,
+            }}
+          >
+            {tool.detail}
+          </div>
+          <div style={{ marginTop: 8, fontSize: 12, color: overlayTheme.mutedText, opacity: 0.7, display: 'flex', alignItems: 'center', gap: 6 }}>
+            <ToolOutlined style={{ fontSize: 12 }} />
+            <span>参数：</span>
+            <code style={{ fontFamily: 'var(--gn-font-mono)', fontSize: 12, padding: '1px 6px', borderRadius: 4, background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)' }}>
+              {tool.params}
+            </code>
+          </div>
+          {parameterDetails.length > 0 && (
+            <div style={{ marginTop: 10, display: 'grid', gap: 8 }}>
+              <div style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText }}>参数提示</div>
+              <div style={{ display: 'grid', gap: 8 }}>
+                {parameterDetails.map((item) => (
+                  <div
+                    key={`${tool.name}-${item.name}`}
+                    style={{
+                      padding: '8px 10px',
+                      borderRadius: 10,
+                      border: `1px solid ${cardBorder}`,
+                      background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.76)',
+                      display: 'flex',
+                      flexDirection: 'column',
+                      gap: 4,
+                    }}
+                  >
+                    <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+                      <code style={{ fontFamily: 'var(--gn-font-mono)', fontSize: 12 }}>{item.name}</code>
+                      <span style={{ fontSize: 11, color: overlayTheme.mutedText }}>
+                        类型：{item.typeLabel}
+                      </span>
+                      <span
+                        style={{
+                          padding: '1px 8px',
+                          borderRadius: 999,
+                          fontSize: 11,
+                          fontWeight: 700,
+                          color: item.required ? '#b45309' : '#475569',
+                          background: item.required
+                            ? (darkMode ? 'rgba(245,158,11,0.18)' : 'rgba(245,158,11,0.12)')
+                            : (darkMode ? 'rgba(148,163,184,0.18)' : 'rgba(148,163,184,0.12)'),
+                        }}
+                      >
+                        {item.required ? '必填' : '可选'}
+                      </span>
+                      {item.enumValues.length > 0 && (
+                        <span style={{ fontSize: 11, color: overlayTheme.mutedText }}>
+                          可选值：{item.enumValues.join(' / ')}
+                        </span>
+                      )}
+                      {item.defaultValue && (
+                        <span style={{ fontSize: 11, color: overlayTheme.mutedText }}>
+                          默认：{item.defaultValue}
+                        </span>
+                      )}
+                    </div>
+                    {item.description && (
+                      <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>{item.description}</div>
+                    )}
+                    {item.exampleValue && (
+                      <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>
+                        示例：<code style={{ fontFamily: 'var(--gn-font-mono)' }}>{item.exampleValue}</code>
+                      </div>
+                    )}
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+        </div>
+      );
+      })}
+    </div>
+  );
+};
+
+export default AIBuiltinToolsCatalog;
diff --git a/frontend/src/components/ai/AIChatAttachmentStrip.tsx b/frontend/src/components/ai/AIChatAttachmentStrip.tsx
new file mode 100644
index 0000000..52ba5d6
--- /dev/null
+++ b/frontend/src/components/ai/AIChatAttachmentStrip.tsx
@@ -0,0 +1,149 @@
+import React from 'react';
+import { FileTextOutlined, WarningOutlined } from '@ant-design/icons';
+
+import type { AIChatAttachment } from '../../types';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import { formatAIChatAttachmentSize } from './aiChatAttachments';
+
+interface AIChatAttachmentStripProps {
+  attachments: AIChatAttachment[];
+  onRemove: (index: number) => void;
+  overlayTheme: OverlayWorkbenchTheme;
+  variant: 'legacy' | 'v2';
+}
+
+const formatAttachmentKind = (attachment: AIChatAttachment): string => {
+  if (attachment.kind === 'markdown') return 'MD';
+  if (attachment.kind === 'pdf') return 'PDF';
+  if (attachment.kind === 'word') return 'Word';
+  if (attachment.kind === 'excel') return 'Excel';
+  if (attachment.kind === 'text') return 'Text';
+  if (attachment.kind === 'image') return 'Image';
+  return 'File';
+};
+
+const AttachmentFileChip: React.FC<{
+  attachment: AIChatAttachment;
+  onRemove: () => void;
+  overlayTheme: OverlayWorkbenchTheme;
+  variant: 'legacy' | 'v2';
+}> = ({ attachment, onRemove, overlayTheme, variant }) => {
+  if (variant === 'v2') {
+    return (
+      <div className={`gn-v2-ai-attachment-file${attachment.extractWarning ? ' has-warning' : ''}`}>
+        <FileTextOutlined />
+        <span className="gn-v2-ai-attachment-file-name" title={attachment.name}>{attachment.name}</span>
+        <span className="gn-v2-ai-attachment-file-meta">
+          {formatAttachmentKind(attachment)} · {formatAIChatAttachmentSize(attachment.size)}
+        </span>
+        {attachment.extractWarning ? <WarningOutlined title={attachment.extractWarning} /> : null}
+        <button type="button" onClick={onRemove} aria-label="移除附件">×</button>
+      </div>
+    );
+  }
+
+  return (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        gap: 6,
+        maxWidth: 220,
+        minHeight: 34,
+        border: overlayTheme.shellBorder,
+        borderRadius: 8,
+        padding: '4px 8px',
+        color: overlayTheme.titleText,
+        background: 'rgba(0,0,0,0.03)',
+      }}
+      title={attachment.extractWarning || attachment.name}
+    >
+      <FileTextOutlined />
+      <span style={{ minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', fontSize: 12 }}>
+        {attachment.name}
+      </span>
+      <span style={{ color: overlayTheme.mutedText, fontSize: 11, flexShrink: 0 }}>
+        {formatAttachmentKind(attachment)}
+      </span>
+      {attachment.extractWarning ? <WarningOutlined style={{ color: '#faad14', flexShrink: 0 }} /> : null}
+      <button
+        type="button"
+        onClick={onRemove}
+        aria-label="移除附件"
+        style={{ border: 'none', background: 'transparent', cursor: 'pointer', color: overlayTheme.mutedText, padding: 0 }}
+      >
+        ×
+      </button>
+    </div>
+  );
+};
+
+export const AIChatAttachmentStrip: React.FC<AIChatAttachmentStripProps> = ({
+  attachments,
+  onRemove,
+  overlayTheme,
+  variant,
+}) => {
+  if (attachments.length === 0) {
+    return null;
+  }
+
+  if (variant === 'v2') {
+    return (
+      <div className="gn-v2-ai-attachment-row">
+        {attachments.map((attachment, index) => (
+          attachment.kind === 'image' && attachment.dataUrl ? (
+            <div key={attachment.id || index} className="gn-v2-ai-attachment-thumb">
+              <img src={attachment.dataUrl} alt={`Draft ${index}`} />
+              <button
+                type="button"
+                onClick={() => onRemove(index)}
+                aria-label="移除图片"
+              >
+                ×
+              </button>
+            </div>
+          ) : (
+            <AttachmentFileChip
+              key={attachment.id || index}
+              attachment={attachment}
+              overlayTheme={overlayTheme}
+              variant="v2"
+              onRemove={() => onRemove(index)}
+            />
+          )
+        ))}
+      </div>
+    );
+  }
+
+  return (
+    <>
+      {attachments.map((attachment, index) => (
+        attachment.kind === 'image' && attachment.dataUrl ? (
+          <div key={attachment.id || index} style={{ position: 'relative', width: 60, height: 60, borderRadius: 6, overflow: 'hidden', border: overlayTheme.shellBorder }}>
+            <img src={attachment.dataUrl} style={{ width: '100%', height: '100%', objectFit: 'cover' }} alt={`Draft ${index}`} />
+            <button
+              type="button"
+              onClick={() => onRemove(index)}
+              aria-label="移除图片"
+              style={{ position: 'absolute', top: 2, right: 2, background: 'rgba(0,0,0,0.5)', color: '#fff', borderRadius: '50%', width: 16, height: 16, display: 'flex', alignItems: 'center', justifyContent: 'center', cursor: 'pointer', fontSize: 10, border: 'none', padding: 0 }}
+            >
+              ×
+            </button>
+          </div>
+        ) : (
+          <AttachmentFileChip
+            key={attachment.id || index}
+            attachment={attachment}
+            overlayTheme={overlayTheme}
+            variant="legacy"
+            onRemove={() => onRemove(index)}
+          />
+        )
+      ))}
+    </>
+  );
+};
+
+export default AIChatAttachmentStrip;
diff --git a/frontend/src/components/ai/AIChatComposerActions.tsx b/frontend/src/components/ai/AIChatComposerActions.tsx
new file mode 100644
index 0000000..d74322b
--- /dev/null
+++ b/frontend/src/components/ai/AIChatComposerActions.tsx
@@ -0,0 +1,153 @@
+import React from 'react';
+import { Button, Tooltip } from 'antd';
+import { CodeOutlined, PictureOutlined, SendOutlined, StopOutlined, TableOutlined } from '@ant-design/icons';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import { AI_CHAT_ATTACHMENT_ACCEPT } from './aiChatAttachments';
+
+interface AIChatComposerActionsProps {
+  variant: 'legacy' | 'v2';
+  input: string;
+  draftAttachmentCount: number;
+  sending: boolean;
+  darkMode: boolean;
+  textColor: string;
+  mutedColor: string;
+  overlayTheme: OverlayWorkbenchTheme;
+  fileInputRef: React.RefObject<HTMLInputElement>;
+  onAttachmentUpload: React.ChangeEventHandler<HTMLInputElement>;
+  onOpenContext: () => void;
+  onOpenSlashMenu?: () => void;
+  onSend: () => void;
+  onStop: () => void;
+}
+
+const buttonIconStyle = { fontSize: 16 };
+
+const AIChatComposerActions: React.FC<AIChatComposerActionsProps> = ({
+  variant,
+  input,
+  draftAttachmentCount,
+  sending,
+  darkMode,
+  textColor,
+  mutedColor,
+  overlayTheme,
+  fileInputRef,
+  onAttachmentUpload,
+  onOpenContext,
+  onOpenSlashMenu,
+  onSend,
+  onStop,
+}) => {
+  const canSend = input.trim().length > 0 || draftAttachmentCount > 0;
+  const isV2 = variant === 'v2';
+  const legacyIconButtonStyle: React.CSSProperties = {
+    color: overlayTheme.mutedText,
+    border: 'none',
+    background: 'transparent',
+    padding: '0 4px',
+    height: 26,
+  };
+  const v2IconButtonStyle: React.CSSProperties = {
+    color: overlayTheme.mutedText,
+    border: 'none',
+    background: 'transparent',
+  };
+
+  return (
+    <div
+      className={isV2 ? 'gn-v2-ai-input-actions' : undefined}
+      style={isV2 ? undefined : { display: 'flex', gap: 6, alignItems: 'center', flexShrink: 0 }}
+    >
+      <input
+        type="file"
+        accept={AI_CHAT_ATTACHMENT_ACCEPT}
+        multiple
+        ref={fileInputRef}
+        style={{ display: 'none' }}
+        onChange={onAttachmentUpload}
+      />
+      <Tooltip title="上传附件（图片、Markdown、Word、Excel、PDF、文本）">
+        <Button
+          type="text"
+          icon={<PictureOutlined style={isV2 ? undefined : buttonIconStyle} />}
+          onClick={() => fileInputRef.current?.click()}
+          style={isV2 ? v2IconButtonStyle : legacyIconButtonStyle}
+          onMouseEnter={isV2 ? undefined : (event) => { event.currentTarget.style.color = textColor; }}
+          onMouseLeave={isV2 ? undefined : (event) => { event.currentTarget.style.color = overlayTheme.mutedText; }}
+        />
+      </Tooltip>
+      <Tooltip title="关联附带数据库表上下文">
+        <Button
+          type="text"
+          icon={<TableOutlined style={isV2 ? undefined : buttonIconStyle} />}
+          onClick={onOpenContext}
+          style={isV2 ? v2IconButtonStyle : legacyIconButtonStyle}
+          onMouseEnter={isV2 ? undefined : (event) => { event.currentTarget.style.color = textColor; }}
+          onMouseLeave={isV2 ? undefined : (event) => { event.currentTarget.style.color = overlayTheme.mutedText; }}
+        />
+      </Tooltip>
+      {isV2 && (
+        <Tooltip title="快捷命令">
+          <Button
+            type="text"
+            icon={<CodeOutlined />}
+            onClick={onOpenSlashMenu}
+            style={v2IconButtonStyle}
+          />
+        </Tooltip>
+      )}
+      {sending ? (
+        <button
+          type={isV2 ? 'button' : undefined}
+          className={isV2 ? 'ai-chat-send-btn ai-chat-stop-btn gn-v2-ai-send' : 'ai-chat-send-btn ai-chat-stop-btn'}
+          onClick={onStop}
+          title="停止生成"
+          style={isV2 ? undefined : {
+            background: 'rgba(255,77,79,0.1)',
+            color: '#ff4d4f',
+            border: '1px solid rgba(255,77,79,0.2)',
+            width: 26,
+            height: 26,
+            borderRadius: 6,
+            padding: 0,
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            cursor: 'pointer',
+            flexShrink: 0,
+          }}
+        >
+          {isV2 ? <StopOutlined /> : <div style={{ width: 10, height: 10, background: 'currentColor', borderRadius: 2 }} />}
+        </button>
+      ) : (
+        <button
+          type={isV2 ? 'button' : undefined}
+          className={isV2 ? 'ai-chat-send-btn gn-v2-ai-send' : 'ai-chat-send-btn'}
+          onClick={() => onSend()}
+          disabled={!canSend}
+          title="发送"
+          style={isV2 ? undefined : {
+            background: canSend ? overlayTheme.iconBg : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.04)'),
+            color: canSend ? overlayTheme.iconColor : mutedColor,
+            width: 26,
+            height: 26,
+            borderRadius: 6,
+            border: 'none',
+            padding: 0,
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            cursor: canSend ? 'pointer' : 'not-allowed',
+            flexShrink: 0,
+          }}
+        >
+          <SendOutlined />
+        </button>
+      )}
+    </div>
+  );
+};
+
+export default AIChatComposerActions;
diff --git a/frontend/src/components/ai/AIChatComposerNotice.tsx b/frontend/src/components/ai/AIChatComposerNotice.tsx
new file mode 100644
index 0000000..8d483c4
--- /dev/null
+++ b/frontend/src/components/ai/AIChatComposerNotice.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import { Button } from 'antd';
+import { ExclamationCircleFilled } from '@ant-design/icons';
+
+import type { AIComposerNotice } from '../../utils/aiComposerNotice';
+
+interface AIChatComposerNoticeProps {
+  composerNotice?: AIComposerNotice | null;
+  darkMode: boolean;
+  textColor: string;
+  mutedColor: string;
+  onComposerNoticeAction?: () => void;
+}
+
+const resolveNoticePalette = (tone: AIComposerNotice['tone'] | undefined, darkMode: boolean) => {
+  if (tone === 'error') {
+    return darkMode
+      ? {
+        background: 'rgba(255,120,117,0.12)',
+        borderColor: 'rgba(255,120,117,0.24)',
+        iconColor: '#ff7875',
+      }
+      : {
+        background: 'rgba(255,77,79,0.08)',
+        borderColor: 'rgba(255,77,79,0.16)',
+        iconColor: '#ff4d4f',
+      };
+  }
+
+  return darkMode
+    ? {
+      background: 'rgba(250,173,20,0.12)',
+      borderColor: 'rgba(250,173,20,0.22)',
+      iconColor: '#ffd666',
+    }
+    : {
+      background: 'rgba(250,173,20,0.08)',
+      borderColor: 'rgba(250,173,20,0.18)',
+      iconColor: '#d48806',
+    };
+};
+
+export const AIChatComposerNotice: React.FC<AIChatComposerNoticeProps> = ({
+  composerNotice,
+  darkMode,
+  textColor,
+  mutedColor,
+  onComposerNoticeAction,
+}) => {
+  if (!composerNotice) {
+    return null;
+  }
+
+  const palette = resolveNoticePalette(composerNotice.tone, darkMode);
+  const actionLabel = composerNotice.action?.label;
+
+  return (
+    <div
+      data-ai-chat-composer-notice="true"
+      style={{
+        display: 'flex',
+        alignItems: 'flex-start',
+        gap: 8,
+        padding: '8px 10px',
+        borderRadius: 12,
+        background: palette.background,
+        border: `1px solid ${palette.borderColor}`,
+      }}
+    >
+      <ExclamationCircleFilled style={{ color: palette.iconColor, fontSize: 14, marginTop: 1, flexShrink: 0 }} />
+      <div style={{ minWidth: 0 }}>
+        <div style={{ fontSize: 12, fontWeight: 600, color: textColor, lineHeight: 1.4 }}>
+          {composerNotice.title}
+        </div>
+        <div style={{ fontSize: 11, color: mutedColor, lineHeight: 1.5, marginTop: 2, wordBreak: 'break-word' }}>
+          {composerNotice.description}
+        </div>
+        {actionLabel && typeof onComposerNoticeAction === 'function' && (
+          <Button
+            size="small"
+            type="default"
+            onClick={onComposerNoticeAction}
+            style={{ marginTop: 8, borderRadius: 8 }}
+          >
+            {actionLabel}
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default AIChatComposerNotice;
diff --git a/frontend/src/components/ai/AIChatComposerStatus.tsx b/frontend/src/components/ai/AIChatComposerStatus.tsx
new file mode 100644
index 0000000..3ce49de
--- /dev/null
+++ b/frontend/src/components/ai/AIChatComposerStatus.tsx
@@ -0,0 +1,189 @@
+import React from 'react';
+import { Button } from 'antd';
+import {
+  CloseOutlined,
+  CheckCircleFilled,
+  ExclamationCircleFilled,
+  LoadingOutlined,
+} from '@ant-design/icons';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import type { AIComposerNoticeAction } from '../../utils/aiComposerNotice';
+import type { AIChatReadinessSnapshot } from './aiChatReadiness';
+
+interface AIChatComposerStatusProps {
+  snapshot: AIChatReadinessSnapshot;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  onAction?: (actionKey: AIComposerNoticeAction) => void;
+  onDismiss?: () => void;
+}
+
+const resolvePalette = (
+  severity: AIChatReadinessSnapshot['severity'],
+  darkMode: boolean,
+) => {
+  if (severity === 'success') {
+    return darkMode
+      ? {
+        background: 'rgba(34,197,94,0.12)',
+        borderColor: 'rgba(34,197,94,0.24)',
+        iconColor: '#4ade80',
+        labelColor: '#86efac',
+      }
+      : {
+        background: 'rgba(34,197,94,0.08)',
+        borderColor: 'rgba(34,197,94,0.16)',
+        iconColor: '#16a34a',
+        labelColor: '#166534',
+      };
+  }
+  if (severity === 'error') {
+    return darkMode
+      ? {
+        background: 'rgba(255,120,117,0.12)',
+        borderColor: 'rgba(255,120,117,0.24)',
+        iconColor: '#ff7875',
+        labelColor: '#ffb4b2',
+      }
+      : {
+        background: 'rgba(255,77,79,0.08)',
+        borderColor: 'rgba(255,77,79,0.16)',
+        iconColor: '#ff4d4f',
+        labelColor: '#991b1b',
+      };
+  }
+  if (severity === 'info') {
+    return darkMode
+      ? {
+        background: 'rgba(59,130,246,0.12)',
+        borderColor: 'rgba(59,130,246,0.24)',
+        iconColor: '#60a5fa',
+        labelColor: '#93c5fd',
+      }
+      : {
+        background: 'rgba(59,130,246,0.08)',
+        borderColor: 'rgba(59,130,246,0.14)',
+        iconColor: '#2563eb',
+        labelColor: '#1d4ed8',
+      };
+  }
+  return darkMode
+    ? {
+      background: 'rgba(250,173,20,0.12)',
+      borderColor: 'rgba(250,173,20,0.22)',
+      iconColor: '#ffd666',
+      labelColor: '#ffe58f',
+    }
+    : {
+      background: 'rgba(250,173,20,0.08)',
+      borderColor: 'rgba(250,173,20,0.18)',
+      iconColor: '#d48806',
+      labelColor: '#92400e',
+    };
+};
+
+const resolveIcon = (snapshot: AIChatReadinessSnapshot) => {
+  if (snapshot.status === 'loading_models') {
+    return <LoadingOutlined style={{ fontSize: 14 }} />;
+  }
+  if (snapshot.ready) {
+    return <CheckCircleFilled style={{ fontSize: 14 }} />;
+  }
+  return <ExclamationCircleFilled style={{ fontSize: 14 }} />;
+};
+
+const AIChatComposerStatus: React.FC<AIChatComposerStatusProps> = ({
+  snapshot,
+  darkMode,
+  overlayTheme,
+  onAction,
+  onDismiss,
+}) => {
+  const palette = resolvePalette(snapshot.severity, darkMode);
+  const handleAction = () => {
+    if (snapshot.action && typeof onAction === 'function') {
+      onAction(snapshot.action.key);
+    }
+  };
+  const canDismiss = typeof onDismiss === 'function';
+
+  return (
+    <div
+      data-ai-chat-composer-status="true"
+      style={{
+        display: 'flex',
+        alignItems: 'flex-start',
+        justifyContent: 'space-between',
+        gap: 10,
+        padding: '8px 10px',
+        borderRadius: 12,
+        background: palette.background,
+        border: `1px solid ${palette.borderColor}`,
+      }}
+    >
+      <div style={{ display: 'flex', alignItems: 'flex-start', gap: 8, minWidth: 0 }}>
+        <div style={{ color: palette.iconColor, marginTop: 1, flexShrink: 0 }}>
+          {resolveIcon(snapshot)}
+        </div>
+        <div style={{ minWidth: 0 }}>
+          <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+            <span
+              style={{
+                fontSize: 11,
+                fontWeight: 700,
+                padding: '2px 8px',
+                borderRadius: 999,
+                color: palette.labelColor,
+                background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(255,255,255,0.72)',
+              }}
+            >
+              {snapshot.label}
+            </span>
+            <span style={{ fontSize: 12, fontWeight: 600, color: overlayTheme.titleText }}>
+              {snapshot.title}
+            </span>
+          </div>
+          <div
+            style={{
+              fontSize: 11,
+              color: overlayTheme.mutedText,
+              lineHeight: 1.5,
+              marginTop: 4,
+              wordBreak: 'break-word',
+            }}
+          >
+            {snapshot.description}
+          </div>
+        </div>
+      </div>
+      {(snapshot.action && typeof onAction === 'function') || canDismiss ? (
+        <div style={{ display: 'flex', alignItems: 'center', gap: 6, flexShrink: 0 }}>
+          {snapshot.action && typeof onAction === 'function' && (
+            <Button
+              size="small"
+              type="default"
+              onClick={handleAction}
+              style={{ borderRadius: 8 }}
+            >
+              {snapshot.action.label}
+            </Button>
+          )}
+          {canDismiss && (
+            <Button
+              aria-label="关闭 AI 状态提示"
+              title="关闭"
+              size="small"
+              type="text"
+              icon={<CloseOutlined />}
+              onClick={onDismiss}
+              style={{ borderRadius: 8 }}
+            />
+          )}
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default AIChatComposerStatus;
diff --git a/frontend/src/components/ai/AIChatContextPreview.tsx b/frontend/src/components/ai/AIChatContextPreview.tsx
new file mode 100644
index 0000000..235b4bb
--- /dev/null
+++ b/frontend/src/components/ai/AIChatContextPreview.tsx
@@ -0,0 +1,108 @@
+import React from 'react';
+import { Tag } from 'antd';
+import { DatabaseOutlined, DownOutlined, PlusOutlined, TableOutlined } from '@ant-design/icons';
+
+import type { AIContextItem } from '../../types';
+
+interface AIChatContextPreviewProps {
+  variant: 'legacy' | 'v2';
+  activeContextItems: AIContextItem[];
+  contextExpanded: boolean;
+  darkMode: boolean;
+  textColor: string;
+  onToggleExpanded: () => void;
+  onOpenContext: () => void;
+  onRemoveContext: (dbName: string, tableName: string) => void;
+}
+
+const renderContextTableChips = (
+  activeContextItems: AIContextItem[],
+  onRemoveContext: (dbName: string, tableName: string) => void,
+  className?: string,
+  style?: React.CSSProperties,
+) => activeContextItems.map((ctx, idx) => (
+  <Tag
+    key={`ctx-${idx}`}
+    closable
+    onClose={(event) => {
+      event.preventDefault();
+      onRemoveContext(ctx.dbName, ctx.tableName);
+    }}
+    className={className}
+    style={style}
+  >
+    <TableOutlined />
+    <span>{ctx.tableName}</span>
+  </Tag>
+));
+
+export const AIChatContextPreview: React.FC<AIChatContextPreviewProps> = ({
+  variant,
+  activeContextItems,
+  contextExpanded,
+  darkMode,
+  textColor,
+  onToggleExpanded,
+  onOpenContext,
+  onRemoveContext,
+}) => {
+  if (variant === 'v2') {
+    return (
+      <>
+        <div className="ai-chat-input-preview-area gn-v2-ai-context-row">
+          <button
+            type="button"
+            className={`gn-v2-ai-context-toggle${contextExpanded ? ' is-expanded' : ''}`}
+            onClick={onToggleExpanded}
+            aria-expanded={contextExpanded}
+          >
+            <TableOutlined />
+            <span>关联上下文</span>
+            <strong>{activeContextItems.length}</strong>
+            <DownOutlined />
+          </button>
+          <button
+            type="button"
+            className="gn-v2-ai-context-add"
+            onClick={onOpenContext}
+          >
+            <PlusOutlined />
+            <span>添加</span>
+          </button>
+        </div>
+
+        {contextExpanded && activeContextItems.length > 0 && (
+          <div className="gn-v2-ai-context-detail" data-ai-context-detail="true">
+            <div className="gn-v2-ai-context-detail-title">当前上下文 · {activeContextItems.length}</div>
+            {renderContextTableChips(activeContextItems, onRemoveContext, 'gn-v2-ai-context-table-chip', { margin: 0 })}
+          </div>
+        )}
+      </>
+    );
+  }
+
+  if (activeContextItems.length === 0) {
+    return null;
+  }
+
+  return (
+    <>
+      <Tag
+        onClick={onToggleExpanded}
+        style={{ background: darkMode ? 'rgba(24, 144, 255, 0.15)' : 'rgba(24, 144, 255, 0.08)', border: 'none', color: '#1890ff', borderRadius: 12, padding: '4px 10px', display: 'flex', alignItems: 'center', gap: 4, margin: 0, cursor: 'pointer', transition: 'all 0.3s' }}
+      >
+        <span style={{ fontSize: 13, fontWeight: 500, display: 'flex', alignItems: 'center', gap: 6 }}>
+          <DatabaseOutlined /> 关联上下文 ({activeContextItems.length}) {contextExpanded ? '▴' : '▾'}
+        </span>
+      </Tag>
+      {contextExpanded && renderContextTableChips(
+        activeContextItems,
+        onRemoveContext,
+        undefined,
+        { background: darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.04)', border: 'none', color: textColor, borderRadius: 12, padding: '4px 10px', display: 'flex', alignItems: 'center', gap: 4, margin: 0 },
+      )}
+    </>
+  );
+};
+
+export default AIChatContextPreview;
diff --git a/frontend/src/components/ai/AIChatHeader.test.tsx b/frontend/src/components/ai/AIChatHeader.test.tsx
new file mode 100644
index 0000000..b3a4edc
--- /dev/null
+++ b/frontend/src/components/ai/AIChatHeader.test.tsx
@@ -0,0 +1,14 @@
+import { readFileSync } from 'node:fs';
+import { describe, expect, it } from 'vitest';
+
+const headerSource = readFileSync(new URL('./AIChatHeader.tsx', import.meta.url), 'utf8');
+const v2ThemeCss = readFileSync(new URL('../../v2-theme.css', import.meta.url), 'utf8');
+
+describe('AIChatHeader export affordance', () => {
+  it('does not expose chat export UI or markdown export implementation', () => {
+    expect(headerSource).not.toContain('exportToMarkdown');
+    expect(headerSource).not.toContain('导出为 Markdown');
+    expect(headerSource).not.toContain('gn-v2-ai-export-button');
+    expect(v2ThemeCss).not.toContain('gn-v2-ai-export-button');
+  });
+});
diff --git a/frontend/src/components/ai/AIChatInput.notice.test.tsx b/frontend/src/components/ai/AIChatInput.notice.test.tsx
index 7ffb358..a7d5b08 100644
--- a/frontend/src/components/ai/AIChatInput.notice.test.tsx
+++ b/frontend/src/components/ai/AIChatInput.notice.test.tsx
@@ -3,6 +3,8 @@ import { renderToStaticMarkup } from 'react-dom/server';
 import { describe, expect, it, vi } from 'vitest';
 
 import { AIChatInput } from './AIChatInput';
+import AIChatComposerStatus from './AIChatComposerStatus';
+import { buildAIChatReadinessSnapshot } from './aiChatReadiness';
 import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
 
 vi.mock('../../store', () => ({
@@ -20,23 +22,37 @@ vi.mock('../../../wailsjs/go/app/App', () => ({
   DBGetColumns: vi.fn(),
 }));
 
-const renderAIChatInput = (overrides: Partial<React.ComponentProps<typeof AIChatInput>> = {}) => renderToStaticMarkup(
+const baseProvider = {
+  id: 'provider-1',
+  type: 'openai' as const,
+  name: 'OpenAI 主账号',
+  apiKey: '',
+  hasSecret: true,
+  baseUrl: 'https://api.openai.com/v1',
+  model: '',
+  models: [] as string[],
+  maxTokens: 32000,
+  temperature: 0.2,
+};
+
+const buildAIChatInput = (overrides: Partial<React.ComponentProps<typeof AIChatInput>> = {}) => (
   <AIChatInput
     input=""
     setInput={() => {}}
-    draftImages={[]}
-    setDraftImages={() => {}}
+    draftAttachments={[]}
+    setDraftAttachments={() => {}}
     sending={false}
     onSend={() => {}}
     onStop={() => {}}
     handleKeyDown={() => {}}
     activeConnName=""
     activeContext={null}
-    activeProvider={{ model: '', models: [] }}
+    activeProvider={baseProvider}
     dynamicModels={[]}
     loadingModels={false}
     sendShortcutBinding={{ combo: 'Enter', enabled: true }}
     composerNotice={null}
+    onComposerAction={() => {}}
     onModelChange={() => {}}
     onFetchModels={() => {}}
     textareaRef={React.createRef<HTMLTextAreaElement>()}
@@ -49,21 +65,24 @@ const renderAIChatInput = (overrides: Partial<React.ComponentProps<typeof AIChat
   />
 );
 
+const renderAIChatInput = (overrides: Partial<React.ComponentProps<typeof AIChatInput>> = {}) =>
+  renderToStaticMarkup(buildAIChatInput(overrides));
+
 describe('AIChatInput notice layout', () => {
   it('renders the composer notice above the input editor', () => {
     const markup = renderToStaticMarkup(
       <AIChatInput
         input=""
         setInput={() => {}}
-        draftImages={[]}
-        setDraftImages={() => {}}
+        draftAttachments={[]}
+        setDraftAttachments={() => {}}
         sending={false}
         onSend={() => {}}
         onStop={() => {}}
         handleKeyDown={() => {}}
         activeConnName=""
         activeContext={null}
-        activeProvider={{ model: '', models: [] }}
+        activeProvider={baseProvider}
         dynamicModels={[]}
         loadingModels={false}
         sendShortcutBinding={{ combo: 'Enter', enabled: true }}
@@ -71,7 +90,12 @@ describe('AIChatInput notice layout', () => {
           tone: 'error',
           title: '模型列表加载失败',
           description: '请检查供应商入口和 API Key。',
+          action: {
+            key: 'reload-models',
+            label: '重新加载模型',
+          },
         }}
+        onComposerAction={() => {}}
         onModelChange={() => {}}
         onFetchModels={() => {}}
         textareaRef={React.createRef<HTMLTextAreaElement>()}
@@ -96,20 +120,21 @@ describe('AIChatInput notice layout', () => {
       <AIChatInput
         input=""
         setInput={() => {}}
-        draftImages={[]}
-        setDraftImages={() => {}}
+        draftAttachments={[]}
+        setDraftAttachments={() => {}}
         sending={false}
         onSend={() => {}}
         onStop={() => {}}
         handleKeyDown={() => {}}
         activeConnName=""
         activeContext={null}
-        activeProvider={{ model: '', models: [] }}
+        activeProvider={baseProvider}
         dynamicModels={[]}
         loadingModels={false}
         sendShortcutBinding={{ combo: 'Meta+Enter', enabled: true }}
         shortcutPlatform="mac"
         composerNotice={null}
+        onComposerAction={() => {}}
         onModelChange={() => {}}
         onFetchModels={() => {}}
         textareaRef={React.createRef<HTMLTextAreaElement>()}
@@ -129,19 +154,20 @@ describe('AIChatInput notice layout', () => {
       <AIChatInput
         input=""
         setInput={() => {}}
-        draftImages={[]}
-        setDraftImages={() => {}}
+        draftAttachments={[]}
+        setDraftAttachments={() => {}}
         sending={false}
         onSend={() => {}}
         onStop={() => {}}
         handleKeyDown={() => {}}
         activeConnName=""
         activeContext={null}
-        activeProvider={{ model: 'gpt-5.5', models: ['gpt-5.5'] }}
+        activeProvider={{ ...baseProvider, model: 'gpt-5.5', models: ['gpt-5.5'] }}
         dynamicModels={[]}
         loadingModels={false}
         sendShortcutBinding={{ combo: 'Enter', enabled: true }}
         composerNotice={null}
+        onComposerAction={() => {}}
         onModelChange={() => {}}
         onFetchModels={() => {}}
         textareaRef={React.createRef<HTMLTextAreaElement>()}
@@ -167,6 +193,15 @@ describe('AIChatInput notice layout', () => {
     expect(sendButton).not.toContain('disabled');
   });
 
+  it('keeps v2 composer action controls available after rendering the input', () => {
+    const markup = renderAIChatInput({ input: 'select 1' });
+
+    expect(markup).toContain('gn-v2-ai-input-actions');
+    expect(markup).toContain('aria-label="picture"');
+    expect(markup).toContain('aria-label="table"');
+    expect(markup).toContain('aria-label="code"');
+  });
+
   it('keeps the legacy composer free of v2-only layout classes by default', () => {
     const markup = renderAIChatInput({ isV2Ui: false, input: 'select 1' });
 
@@ -176,4 +211,71 @@ describe('AIChatInput notice layout', () => {
     expect(markup).not.toContain('gn-v2-ai-model-select');
     expect(markup).not.toContain('gn-v2-ai-send');
   });
+
+  it('renders an actionable composer notice button when the notice provides an action', () => {
+    const markup = renderAIChatInput({
+      composerNotice: {
+        tone: 'warning',
+        title: '还没有可用供应商',
+        description: '先在 AI 设置里添加并启用一个模型供应商。',
+        action: {
+          key: 'open-settings',
+          label: '打开 AI 设置',
+        },
+      },
+      onComposerAction: () => {},
+    });
+
+    expect(markup).toContain('打开 AI 设置');
+  });
+
+  it('renders a proactive readiness status when no active provider is configured yet', () => {
+    const markup = renderAIChatInput({ activeProvider: null });
+
+    expect(markup).toContain('data-ai-chat-composer-status="true"');
+    expect(markup).toContain('还没有配置 AI 供应商');
+    expect(markup).toContain('打开 AI 设置');
+  });
+
+  it('surfaces incomplete provider state before send when base url or secret is missing', () => {
+    const markup = renderAIChatInput({
+      activeProvider: {
+        id: 'provider-1',
+        type: 'custom',
+        name: '自建代理',
+        apiKey: '',
+        hasSecret: false,
+        baseUrl: '',
+        model: '',
+        models: [],
+        maxTokens: 16000,
+        temperature: 0.7,
+      },
+    });
+
+    expect(markup).toContain('自建代理 还缺少 密钥、接口地址');
+    expect(markup).toContain('修复供应商配置');
+  });
+
+  it('renders a dismiss affordance for the non-blocking ready composer status', () => {
+    const snapshot = buildAIChatReadinessSnapshot({
+      activeProvider: {
+        ...baseProvider,
+        model: 'MiniMax-M2.7-highspeed',
+        models: ['MiniMax-M2.7-highspeed'],
+      },
+    });
+    const markup = renderToStaticMarkup(
+      <AIChatComposerStatus
+        snapshot={snapshot}
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        onDismiss={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('data-ai-chat-composer-status="true"');
+    expect(markup).toContain('aria-label="关闭 AI 状态提示"');
+    expect(markup).toContain('title="关闭"');
+  });
 });
diff --git a/frontend/src/components/ai/AIChatInput.tsx b/frontend/src/components/ai/AIChatInput.tsx
index 149e261..ef8fcfb 100644
--- a/frontend/src/components/ai/AIChatInput.tsx
+++ b/frontend/src/components/ai/AIChatInput.tsx
@@ -1,32 +1,44 @@
 import React from 'react';
-import { Input, Select, Tooltip, Modal, Checkbox, Spin, message, Button, Tag } from 'antd';
-import { CodeOutlined, DatabaseOutlined, DownOutlined, PlusOutlined, SendOutlined, StopOutlined, TableOutlined, SearchOutlined, PictureOutlined, ExclamationCircleFilled } from '@ant-design/icons';
+import { Input, Tooltip } from 'antd';
+import { DatabaseOutlined } from '@ant-design/icons';
 import { useStore } from '../../store';
-import { DBGetTables, DBShowCreateTable, DBGetDatabases, DBGetColumns } from '../../../wailsjs/go/app/App';
 import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
-import type { AIComposerNotice } from '../../utils/aiComposerNotice';
-import { buildRpcConnectionConfig } from '../../utils/connectionRpcConfig';
-import { resolveAITableSchemaToolResult } from '../../utils/aiTableSchemaTool';
+import type { AIComposerNotice, AIComposerNoticeAction } from '../../utils/aiComposerNotice';
+import type { AIProviderConfig } from '../../types';
 import { getAIChatSendShortcutLabel } from '../../utils/aiChatSendShortcut';
 import type { ShortcutPlatform, ShortcutPlatformBinding } from '../../utils/shortcuts';
+import AIContextSelectorModal from './AIContextSelectorModal';
+import AISlashCommandMenu from './AISlashCommandMenu';
+import AIChatComposerNotice from './AIChatComposerNotice';
+import AIChatComposerStatus from './AIChatComposerStatus';
+import AIChatComposerActions from './AIChatComposerActions';
+import AIChatAttachmentStrip from './AIChatAttachmentStrip';
+import AIChatContextPreview from './AIChatContextPreview';
+import AIChatProviderModelSelect from './AIChatProviderModelSelect';
+import { buildAIChatReadinessSnapshot } from './aiChatReadiness';
+import { useAIChatContextBinding } from './useAIChatContextBinding';
+import { useAIChatDraftAttachments } from './useAIChatDraftAttachments';
+import { useAISlashCommandMenu } from './useAISlashCommandMenu';
+import type { AIChatAttachment } from '../../types';
 
 interface AIChatInputProps {
     input: string;
     setInput: (val: string) => void;
-    draftImages: string[];
-    setDraftImages: React.Dispatch<React.SetStateAction<string[]>>;
+    draftAttachments: AIChatAttachment[];
+    setDraftAttachments: React.Dispatch<React.SetStateAction<AIChatAttachment[]>>;
     sending: boolean;
     onSend: () => void;
     onStop: () => void;
     handleKeyDown: (e: React.KeyboardEvent) => void;
     activeConnName: string;
-    activeContext: any;
-    activeProvider: any;
+    activeContext: { connectionId?: string | null; dbName?: string | null } | null;
+    activeProvider: AIProviderConfig | null;
     dynamicModels: string[];
     loadingModels: boolean;
     sendShortcutBinding: ShortcutPlatformBinding;
     shortcutPlatform?: ShortcutPlatform;
     composerNotice?: AIComposerNotice | null;
+    onComposerAction?: (actionKey: AIComposerNoticeAction) => void;
     onModelChange: (val: string) => void;
     onFetchModels: () => void;
     textareaRef: React.RefObject<HTMLTextAreaElement>;
@@ -40,212 +52,107 @@ interface AIChatInputProps {
 }
 
 export const AIChatInput: React.FC<AIChatInputProps> = ({
-    input, setInput, draftImages, setDraftImages, sending, onSend, onStop, handleKeyDown,
+    input, setInput, draftAttachments, setDraftAttachments, sending, onSend, onStop, handleKeyDown,
     activeConnName, activeContext, activeProvider, dynamicModels, loadingModels,
-    sendShortcutBinding, shortcutPlatform = 'windows', composerNotice,
+    sendShortcutBinding, shortcutPlatform = 'windows', composerNotice, onComposerAction,
     onModelChange, onFetchModels, textareaRef, darkMode, textColor, mutedColor, overlayTheme,
     contextUsageChars, maxContextChars, isV2Ui = false
 }) => {
-    const [contextOpen, setContextOpen] = React.useState(false);
-    const [contextLoading, setContextLoading] = React.useState(false);
-    const [contextTables, setContextTables] = React.useState<{name: string}[]>([]);
-    const [selectedTableKeys, setSelectedTableKeys] = React.useState<string[]>([]);
-    const [searchText, setSearchText] = React.useState('');
-    const [appendingContext, setAppendingContext] = React.useState(false);
-
-    const fileInputRef = React.useRef<HTMLInputElement>(null);
-    const handleImageUpload = (e: React.ChangeEvent<HTMLInputElement>) => {
-        const files = Array.from(e.target.files || []);
-        files.forEach(file => {
-            if (file.type.indexOf('image') !== -1) {
-                const reader = new FileReader();
-                reader.onload = (event) => {
-                    if (event.target?.result) {
-                        setDraftImages(prev => [...prev, event.target!.result as string]);
-                    }
-                };
-                reader.readAsDataURL(file);
-            }
-        });
-        if (fileInputRef.current) {
-            fileInputRef.current.value = '';
-        }
-    };
-
-    const [dbList, setDbList] = React.useState<string[]>([]);
-    const [selectedDbName, setSelectedDbName] = React.useState<string>('');
-
-    const filteredTables = contextTables.filter(t => t.name.toLowerCase().includes(searchText.toLowerCase()));
-    const [contextExpanded, setContextExpanded] = React.useState(false);
-    const composerNoticePalette = React.useMemo(() => {
-        if (composerNotice?.tone === 'error') {
-            return darkMode
-                ? {
-                    background: 'rgba(255,120,117,0.12)',
-                    borderColor: 'rgba(255,120,117,0.24)',
-                    iconColor: '#ff7875',
-                }
-                : {
-                    background: 'rgba(255,77,79,0.08)',
-                    borderColor: 'rgba(255,77,79,0.16)',
-                    iconColor: '#ff4d4f',
-                };
-        }
-
-        return darkMode
-            ? {
-                background: 'rgba(250,173,20,0.12)',
-                borderColor: 'rgba(250,173,20,0.22)',
-                iconColor: '#ffd666',
-            }
-            : {
-                background: 'rgba(250,173,20,0.08)',
-                borderColor: 'rgba(250,173,20,0.18)',
-                iconColor: '#d48806',
-            };
-    }, [composerNotice, darkMode]);
-
-    // Slash commands
-    const [showSlashMenu, setShowSlashMenu] = React.useState(false);
-    const [slashFilter, setSlashFilter] = React.useState('');
-    const slashCommands = React.useMemo(() => [
-        { cmd: '/query',    label: '🔍 自然语言查询', desc: '用中文描述你想查什么',   prompt: '帮我写一条 SQL 查询：' },
-        { cmd: '/sql',      label: '📝 生成 SQL',     desc: '描述需求自动生成语句', prompt: '请根据以下需求生成 SQL：' },
-        { cmd: '/explain',  label: '💡 解释 SQL',     desc: '解释选中 SQL 的逻辑',  prompt: '请解释以下 SQL 的执行逻辑和每一步的作用：\n```sql\n\n```' },
-        { cmd: '/optimize', label: '⚡ 优化分析',     desc: '分析 SQL 性能瓶颈',    prompt: '请分析以下 SQL 的性能问题，并给出优化后的版本：\n```sql\n\n```' },
-        { cmd: '/schema',   label: '🏗️ 表设计评审',   desc: '评审表结构设计质量',   prompt: '请全面评审当前关联表的设计，包括字段类型、范式、索引策略等方面的改进建议：' },
-        { cmd: '/index',    label: '📊 索引建议',     desc: '推荐最优索引方案',      prompt: '请基于当前表结构和常见查询场景，推荐最优的索引方案并给出建表语句：' },
-        { cmd: '/diff',     label: '🔄 表对比',       desc: '对比两表差异生成变更',  prompt: '请对比以下两张表的结构差异，并生成从旧版本迁移到新版本的 ALTER 语句：' },
-        { cmd: '/mock',     label: '🎲 造测试数据',   desc: '生成 INSERT 测试数据', prompt: '请为当前关联的表生成 10 条符合业务语义的测试数据 INSERT 语句：' },
-    ], []);
-    const filteredSlashCmds = slashCommands.filter(c => c.cmd.startsWith(slashFilter.toLowerCase()));
-
     const aiContexts = useStore(state => state.aiContexts);
     const addAIContext = useStore(state => state.addAIContext);
     const removeAIContext = useStore(state => state.removeAIContext);
 
     const connectionKey = activeContext?.connectionId ? `${activeContext.connectionId}:${activeContext.dbName || ''}` : 'default';
     const activeContextItems = aiContexts[connectionKey] || [];
-
-    const fetchTablesForDb = async (dbName: string, connConfig: any) => {
-        setContextLoading(true);
-        setSelectedDbName(dbName);
-        try {
-            const res = await DBGetTables(buildRpcConnectionConfig(connConfig), dbName);
-            if (res.success && Array.isArray(res.data)) {
-                setContextTables(res.data.map(r => ({ name: Object.values(r)[0] as string })));
-            } else {
-                message.error('获取表格失败: ' + res.message);
-                setContextTables([]);
-            }
-        } catch (e: any) {
-            message.error(e.message);
-            setContextTables([]);
-        } finally {
-            setContextLoading(false);
+    const composerReadiness = React.useMemo(() => buildAIChatReadinessSnapshot({
+        activeProvider,
+        dynamicModels,
+        loadingModels,
+        activeContext,
+        activeContextItems,
+    }), [activeProvider, dynamicModels, loadingModels, activeContext, activeContextItems]);
+    const composerStatusKey = React.useMemo(() => [
+        composerReadiness.status,
+        composerReadiness.activeProvider?.id || '',
+        composerReadiness.activeProvider?.model || '',
+        activeContext?.connectionId || '',
+        activeContext?.dbName || '',
+        composerReadiness.contextAttachedCount,
+        composerReadiness.selectableModelCount,
+    ].join('|'), [
+        composerReadiness.status,
+        composerReadiness.activeProvider?.id,
+        composerReadiness.activeProvider?.model,
+        activeContext?.connectionId,
+        activeContext?.dbName,
+        composerReadiness.contextAttachedCount,
+        composerReadiness.selectableModelCount,
+    ]);
+    const [dismissedComposerStatusKey, setDismissedComposerStatusKey] = React.useState<string | null>(null);
+    React.useEffect(() => {
+        setDismissedComposerStatusKey(null);
+    }, [composerStatusKey]);
+    const isComposerStatusDismissed = composerReadiness.ready && dismissedComposerStatusKey === composerStatusKey;
+    const handleDismissComposerStatus = React.useCallback(() => {
+        if (composerReadiness.ready) {
+            setDismissedComposerStatusKey(composerStatusKey);
         }
-    };
+    }, [composerReadiness.ready, composerStatusKey]);
+    const {
+        appendingContext,
+        contextExpanded,
+        contextLoading,
+        contextOpen,
+        dbList,
+        filteredTables,
+        handleAppendContext,
+        handleDbChange,
+        handleOpenContext,
+        handleRemoveContextItem,
+        searchText,
+        selectedDbName,
+        selectedTableKeys,
+        setContextExpanded,
+        setContextOpen,
+        setSearchText,
+        setSelectedTableKeys,
+    } = useAIChatContextBinding({
+        activeContext,
+        activeContextItems,
+        connectionKey,
+        addAIContext,
+        removeAIContext,
+    });
 
-    const handleOpenContext = async () => {
-        if (!activeContext?.connectionId) {
-            message.warning('请先在左侧选择一个数据库作为所聊上下文');
-            return;
+    const {
+        fileInputRef,
+        handleAttachmentUpload,
+        handlePasteImages,
+        handleRemoveDraftAttachment,
+    } = useAIChatDraftAttachments({
+        setDraftAttachments,
+    });
+
+    const {
+        filteredSlashCmds,
+        handleComposerInputChange,
+        handleOpenSlashMenu,
+        handleSelectSlashCommand,
+        showSlashMenu,
+    } = useAISlashCommandMenu({
+        setInput,
+        textareaRef,
+    });
+
+    const handleComposerNoticeAction = React.useCallback(() => {
+        if (composerNotice?.action?.key && typeof onComposerAction === 'function') {
+            onComposerAction(composerNotice.action.key);
         }
-        const conn = useStore.getState().connections.find(c => c.id === activeContext.connectionId);
-        if (!conn) return;
-
-        setContextOpen(true);
-        setContextLoading(true);
-        setSearchText('');
-        // Store dbName::tableName composite keys
-        setSelectedTableKeys(activeContextItems.map(c => `${c.dbName}::${c.tableName}`));
-        
-        try {
-            // Fetch databases
-            const dbRes = await DBGetDatabases(buildRpcConnectionConfig(conn.config) as any);
-            if (dbRes.success && Array.isArray(dbRes.data)) {
-                const databases = dbRes.data.map((r: any) => Object.values(r)[0] as string);
-                setDbList(databases);
-            }
-
-            // Fetch tables for the active contextual database
-            const initDbName = activeContext.dbName || '';
-            setSelectedDbName(initDbName);
-            const tablesRes = await DBGetTables(buildRpcConnectionConfig(conn.config) as any, initDbName);
-            if (tablesRes.success && Array.isArray(tablesRes.data)) {
-                setContextTables(tablesRes.data.map((r: any) => ({ name: Object.values(r)[0] as string })));
-            } else {
-                setContextTables([]);
-            }
-        } catch (e: any) {
-            message.error(e.message);
-        } finally {
-            setContextLoading(false);
-        }
-    };
-
-    const handleAppendContext = async () => {
-        const conn = useStore.getState().connections.find(c => c.id === activeContext.connectionId);
-        if (!conn) return;
-
-        setAppendingContext(true);
-        try {
-            let addedCount = 0;
-            let removedCount = 0;
-
-            for (const cx of activeContextItems) {
-                const key = `${cx.dbName}::${cx.tableName}`;
-                if (!selectedTableKeys.includes(key)) {
-                    removeAIContext(connectionKey, cx.dbName, cx.tableName);
-                    removedCount++;
-                }
-            }
-
-            for (const key of selectedTableKeys) {
-                const [dbName, tableName] = key.split('::');
-                if (!dbName || !tableName) continue;
-
-                if (activeContextItems.find(c => c.dbName === dbName && c.tableName === tableName)) {
-                    continue;
-                }
-                const rpcConfig = buildRpcConnectionConfig(conn.config) as any;
-                const schemaResult = await resolveAITableSchemaToolResult({
-                    tableName,
-                    fetchDDL: () => DBShowCreateTable(rpcConfig, dbName, tableName),
-                    fetchColumns: () => DBGetColumns(rpcConfig, dbName, tableName),
-                });
-                if (!schemaResult.success) {
-                    message.error(`获取表 ${dbName}.${tableName} 结构失败: ${schemaResult.content}`);
-                }
-
-                if (schemaResult.success && schemaResult.content) {
-                    addAIContext(connectionKey, {
-                        dbName: dbName,
-                        tableName: tableName,
-                        ddl: schemaResult.content
-                    });
-                    addedCount++;
-                }
-            }
-            if (addedCount > 0 || removedCount > 0) {
-                if (addedCount > 0 && removedCount === 0) {
-                    message.success(`已添加 ${addedCount} 张表的结构到上下文`);
-                } else if (removedCount > 0 && addedCount === 0) {
-                    message.success(`已从上下文移除 ${removedCount} 张表的结构`);
-                } else {
-                    message.success(`上下文已同步更新：新增 ${addedCount}，移除 ${removedCount}`);
-                }
-                if (addedCount > 0) setContextExpanded(true);
-            } else {
-                message.info('选中的表未发生变化');
-            }
-            setContextOpen(false);
-        } catch (e: any) {
-            message.error(e.message);
-        } finally {
-            setAppendingContext(false);
-        }
-    };
+    }, [composerNotice?.action?.key, onComposerAction]);
+    const composerActionHandler = typeof onComposerAction === 'function' ? onComposerAction : undefined;
+    const composerNoticeActionHandler = composerNotice?.action?.key && composerActionHandler
+        ? handleComposerNoticeAction
+        : undefined;
 
     if (!isV2Ui) {
         return (
@@ -260,129 +167,60 @@ export const AIChatInput: React.FC<AIChatInputProps> = ({
                     padding: '8px 4px 8px'
                 }}>
                     <div className="ai-chat-input-preview-area" style={{ display: 'flex', gap: 6, flexWrap: 'wrap' }}>
-                        {activeContextItems.length > 0 && (
-                            <Tag
-                                onClick={() => setContextExpanded(!contextExpanded)}
-                                style={{ background: darkMode ? 'rgba(24, 144, 255, 0.15)' : 'rgba(24, 144, 255, 0.08)', border: 'none', color: '#1890ff', borderRadius: 12, padding: '4px 10px', display: 'flex', alignItems: 'center', gap: 4, margin: 0, cursor: 'pointer', transition: 'all 0.3s' }}
-                            >
-                                <span style={{ fontSize: 13, fontWeight: 500, display: 'flex', alignItems: 'center', gap: 6 }}>
-                                    <DatabaseOutlined /> 关联上下文 ({activeContextItems.length}) {contextExpanded ? '▴' : '▾'}
-                                </span>
-                            </Tag>
-                        )}
-
-                        {contextExpanded && activeContextItems.map((ctx, idx) => (
-                            <Tag
-                                key={`ctx-${idx}`}
-                                closable
-                                onClose={(e) => { e.preventDefault(); removeAIContext(connectionKey, ctx.dbName, ctx.tableName); }}
-                                style={{ background: darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.04)', border: 'none', color: textColor, borderRadius: 12, padding: '4px 10px', display: 'flex', alignItems: 'center', gap: 4, margin: 0 }}
-                            >
-                                <span style={{ fontSize: 13 }}>🗄️ {ctx.tableName}</span>
-                            </Tag>
-                        ))}
-                        {draftImages.map((b64, i) => (
-                            <div key={i} style={{ position: 'relative', width: 60, height: 60, borderRadius: 6, overflow: 'hidden', border: overlayTheme.shellBorder }}>
-                                <img src={b64} style={{ width: '100%', height: '100%', objectFit: 'cover' }} alt={`Draft ${i}`} />
-                                <div
-                                    onClick={() => setDraftImages(prev => prev.filter((_, idx) => idx !== i))}
-                                    style={{ position: 'absolute', top: 2, right: 2, background: 'rgba(0,0,0,0.5)', color: '#fff', borderRadius: '50%', width: 16, height: 16, display: 'flex', alignItems: 'center', justifyContent: 'center', cursor: 'pointer', fontSize: 10 }}
-                                >
-                                    ✕
-                                </div>
-                            </div>
-                        ))}
+                        <AIChatContextPreview
+                            variant="legacy"
+                            activeContextItems={activeContextItems}
+                            contextExpanded={contextExpanded}
+                            darkMode={darkMode}
+                            textColor={textColor}
+                            onToggleExpanded={() => setContextExpanded(!contextExpanded)}
+                            onOpenContext={handleOpenContext}
+                            onRemoveContext={handleRemoveContextItem}
+                        />
+                        <AIChatAttachmentStrip
+                            variant="legacy"
+                            attachments={draftAttachments}
+                            overlayTheme={overlayTheme}
+                            onRemove={handleRemoveDraftAttachment}
+                        />
                     </div>
-                    {composerNotice && (
-                        <div
-                            data-ai-chat-composer-notice="true"
-                            style={{
-                                display: 'flex',
-                                alignItems: 'flex-start',
-                                gap: 8,
-                                padding: '8px 10px',
-                                borderRadius: 12,
-                                background: composerNoticePalette.background,
-                                border: `1px solid ${composerNoticePalette.borderColor}`,
-                            }}
-                        >
-                            <ExclamationCircleFilled style={{ color: composerNoticePalette.iconColor, fontSize: 14, marginTop: 1, flexShrink: 0 }} />
-                            <div style={{ minWidth: 0 }}>
-                                <div style={{ fontSize: 12, fontWeight: 600, color: textColor, lineHeight: 1.4 }}>
-                                    {composerNotice.title}
-                                </div>
-                                <div style={{ fontSize: 11, color: mutedColor, lineHeight: 1.5, marginTop: 2, wordBreak: 'break-word' }}>
-                                    {composerNotice.description}
-                                </div>
-                            </div>
-                        </div>
+                    <AIChatComposerNotice
+                        composerNotice={composerNotice}
+                        darkMode={darkMode}
+                        textColor={textColor}
+                        mutedColor={mutedColor}
+                        onComposerNoticeAction={composerNoticeActionHandler}
+                    />
+                    {!composerNotice && !isComposerStatusDismissed && (
+                        <AIChatComposerStatus
+                            snapshot={composerReadiness}
+                            darkMode={darkMode}
+                            overlayTheme={overlayTheme}
+                            onAction={composerActionHandler}
+                            onDismiss={composerReadiness.ready ? handleDismissComposerStatus : undefined}
+                        />
                     )}
                     <div data-ai-chat-composer-input="true" style={{ position: 'relative' }}>
-                        {showSlashMenu && filteredSlashCmds.length > 0 && (
-                            <div style={{
+                        <AISlashCommandMenu
+                            visible={showSlashMenu}
+                            commands={filteredSlashCmds}
+                            darkMode={darkMode}
+                            textColor={textColor}
+                            mutedColor={mutedColor}
+                            onSelect={handleSelectSlashCommand}
+                            style={{
                                 position: 'absolute', bottom: '100%', left: 0, right: 0, marginBottom: 4,
                                 background: darkMode ? '#2a2a2a' : '#fff',
                                 border: `1px solid ${darkMode ? 'rgba(255,255,255,0.12)' : 'rgba(0,0,0,0.1)'}`,
                                 borderRadius: 8, boxShadow: '0 4px 16px rgba(0,0,0,0.15)', zIndex: 100,
                                 maxHeight: 220, overflowY: 'auto', padding: 4
-                            }}>
-                                {filteredSlashCmds.map(cmd => (
-                                    <div
-                                        key={cmd.cmd}
-                                        style={{
-                                            padding: '8px 12px', borderRadius: 6, cursor: 'pointer',
-                                            display: 'flex', alignItems: 'center', gap: 10,
-                                            transition: 'background 0.15s'
-                                        }}
-                                        onMouseEnter={e => e.currentTarget.style.background = darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.04)'}
-                                        onMouseLeave={e => e.currentTarget.style.background = 'transparent'}
-                                        onClick={() => {
-                                            setInput(cmd.prompt);
-                                            setShowSlashMenu(false);
-                                            setSlashFilter('');
-                                            textareaRef.current?.focus();
-                                        }}
-                                    >
-                                        <span style={{ fontSize: 14, fontWeight: 600, color: textColor, minWidth: 80 }}>{cmd.cmd}</span>
-                                        <span style={{ fontSize: 13, fontWeight: 500, color: textColor }}>{cmd.label}</span>
-                                        <span style={{ fontSize: 11, color: mutedColor, marginLeft: 'auto' }}>{cmd.desc}</span>
-                                    </div>
-                                ))}
-                            </div>
-                        )}
-                        <Input.TextArea
-                            onPaste={(e) => {
-                                const items = e.clipboardData?.items;
-                                if (!items) return;
-                                for (let i = 0; i < items.length; i++) {
-                                    if (items[i].type.indexOf('image') !== -1) {
-                                        e.preventDefault();
-                                        const blob = items[i].getAsFile();
-                                        if (blob) {
-                                            const reader = new FileReader();
-                                            reader.onload = (event) => {
-                                                if (event.target?.result) {
-                                                    setDraftImages(prev => [...prev, event.target!.result as string]);
-                                                }
-                                            };
-                                            reader.readAsDataURL(blob);
-                                        }
-                                    }
-                                }
                             }}
+                        />
+                        <Input.TextArea
+                            onPaste={handlePasteImages}
                             ref={textareaRef as any}
                             value={input}
-                            onChange={(e) => {
-                                const val = e.target.value;
-                                setInput(val);
-                                if (val.startsWith('/')) {
-                                    setSlashFilter(val.split(/\s/)[0]);
-                                    setShowSlashMenu(true);
-                                } else {
-                                    setShowSlashMenu(false);
-                                    setSlashFilter('');
-                                }
-                            }}
+                            onChange={(e) => handleComposerInputChange(e.target.value)}
                             onKeyDown={handleKeyDown as any}
                             placeholder={`输入消息... (${getAIChatSendShortcutLabel(sendShortcutBinding, shortcutPlatform)}，Shift+Enter 换行，/ 快捷命令)`}
                             variant="borderless"
@@ -408,25 +246,14 @@ export const AIChatInput: React.FC<AIChatInputProps> = ({
                                 </Tooltip>
                             )}
 
-                            {activeProvider && (
-                                <Select
-                                    size="small"
-                                    variant="filled"
-                                    value={activeProvider.model || undefined}
-                                    onChange={onModelChange}
-                                    onOpenChange={(open) => {
-                                        if (open && dynamicModels.length === 0 && (activeProvider.models || []).length === 0) {
-                                            onFetchModels();
-                                        }
-                                    }}
-                                    loading={loadingModels}
-                                    options={(dynamicModels.length > 0 ? dynamicModels : (activeProvider.models || [])).map((m: string) => ({ label: m, value: m }))}
-                                    style={{ width: 130, fontSize: 11, background: 'transparent' }}
-                                    styles={{ popup: { root: { minWidth: 200 } } }}
-                                    showSearch
-                                    placeholder="选择模型"
-                                />
-                            )}
+                            <AIChatProviderModelSelect
+                                activeProvider={activeProvider}
+                                dynamicModels={dynamicModels}
+                                loadingModels={loadingModels}
+                                variant="legacy"
+                                onModelChange={onModelChange}
+                                onFetchModels={onFetchModels}
+                            />
 
                             {contextUsageChars !== undefined && maxContextChars !== undefined && (
                                 <Tooltip title={`当前会话记忆已用字符。达到限制（${(maxContextChars/1000).toFixed(0)}k）时将触发自动压缩。`}>
@@ -444,192 +271,42 @@ export const AIChatInput: React.FC<AIChatInputProps> = ({
                             )}
                         </div>
 
-                        <div style={{ display: 'flex', gap: 6, alignItems: 'center', flexShrink: 0 }}>
-                            <input
-                                type="file"
-                                accept="image/*"
-                                multiple
-                                ref={fileInputRef}
-                                style={{ display: 'none' }}
-                                onChange={handleImageUpload}
-                            />
-                            <Tooltip title="上传图片/截图">
-                                <Button
-                                    type="text"
-                                    icon={<PictureOutlined style={{ fontSize: 16 }} />}
-                                    onClick={() => fileInputRef.current?.click()}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent', padding: '0 4px', height: 26 }}
-                                    onMouseEnter={e => e.currentTarget.style.color = textColor}
-                                    onMouseLeave={e => e.currentTarget.style.color = overlayTheme.mutedText}
-                                />
-                            </Tooltip>
-                            <Tooltip title="关联附带数据库表上下文">
-                                <Button
-                                    type="text"
-                                    icon={<TableOutlined style={{ fontSize: 16 }} />}
-                                    onClick={handleOpenContext}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent', padding: '0 4px', height: 26 }}
-                                    onMouseEnter={e => e.currentTarget.style.color = textColor}
-                                    onMouseLeave={e => e.currentTarget.style.color = overlayTheme.mutedText}
-                                />
-                            </Tooltip>
-                            {sending ? (
-                                <button
-                                    className="ai-chat-send-btn ai-chat-stop-btn"
-                                    onClick={onStop}
-                                    title="停止生成"
-                                    style={{
-                                        background: 'rgba(255,77,79,0.1)',
-                                        color: '#ff4d4f', border: '1px solid rgba(255,77,79,0.2)',
-                                        width: 26, height: 26, borderRadius: 6, padding: 0,
-                                        display: 'flex', alignItems: 'center', justifyContent: 'center', cursor: 'pointer', flexShrink: 0
-                                    }}
-                                >
-                                    <div style={{ width: 10, height: 10, background: 'currentColor', borderRadius: 2 }} />
-                                </button>
-                            ) : (
-                                <button
-                                    className="ai-chat-send-btn"
-                                    onClick={() => onSend()}
-                                    disabled={!input.trim() && draftImages.length === 0}
-                                    title="发送"
-                                    style={{
-                                        background: (input.trim() || draftImages.length > 0) ? overlayTheme.iconBg : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.04)'),
-                                        color: (input.trim() || draftImages.length > 0) ? overlayTheme.iconColor : mutedColor,
-                                        width: 26, height: 26, borderRadius: 6, border: 'none', padding: 0,
-                                        display: 'flex', alignItems: 'center', justifyContent: 'center', cursor: (input.trim() || draftImages.length > 0) ? 'pointer' : 'not-allowed', flexShrink: 0
-                                    }}
-                                >
-                                    <SendOutlined />
-                                </button>
-                            )}
-                        </div>
+                        <AIChatComposerActions
+                            variant="legacy"
+                            input={input}
+                            draftAttachmentCount={draftAttachments.length}
+                            sending={sending}
+                            darkMode={darkMode}
+                            textColor={textColor}
+                            mutedColor={mutedColor}
+                            overlayTheme={overlayTheme}
+                            fileInputRef={fileInputRef}
+                            onAttachmentUpload={handleAttachmentUpload}
+                            onOpenContext={handleOpenContext}
+                            onSend={onSend}
+                            onStop={onStop}
+                        />
                     </div>
                 </div>
 
-                <Modal
-                    title={<span style={{ color: textColor }}>关联数据库表结构上下文</span>}
+                <AIContextSelectorModal
                     open={contextOpen}
-                    onCancel={() => setContextOpen(false)}
-                    onOk={handleAppendContext}
+                    loading={contextLoading}
                     confirmLoading={appendingContext}
-                    okText="同步所选表至上下文"
-                    cancelText="取消"
-                    centered
-                    styles={{
-                        content: { background: darkMode ? '#1e1e1e' : '#ffffff', border: overlayTheme.shellBorder },
-                        header: { background: darkMode ? '#1e1e1e' : '#ffffff', borderBottom: overlayTheme.shellBorder },
-                        body: { padding: '20px 24px' }
-                    }}
-                >
-                    <Spin spinning={contextLoading}>
-                        <div style={{ marginBottom: 16, display: 'flex', gap: 12 }}>
-                            {dbList.length > 0 && (
-                                <Select
-                                    value={selectedDbName}
-                                    onChange={val => {
-                                        const c = useStore.getState().connections.find(conn => conn.id === activeContext?.connectionId);
-                                        if (c) fetchTablesForDb(val, c.config);
-                                    }}
-                                    options={dbList.map(d => ({ label: d, value: d }))}
-                                    style={{ width: 160, flexShrink: 0 }}
-                                    placeholder="切换数据库"
-                                    showSearch
-                                />
-                            )}
-                            <Input
-                                placeholder="在当前库搜索表名..."
-                                prefix={<SearchOutlined style={{ color: overlayTheme.mutedText }} />}
-                                value={searchText}
-                                onChange={e => setSearchText(e.target.value)}
-                                style={{ background: darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.04)', border: 'none', flexGrow: 1 }}
-                            />
-                        </div>
-                        {filteredTables.length > 0 ? (
-                            <div style={{ display: 'flex', flexDirection: 'column' }}>
-                                <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', borderBottom: `1px solid ${darkMode ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.1)'}`, paddingBottom: 12, marginBottom: 8 }}>
-                                    <Checkbox
-                                        indeterminate={
-                                            filteredTables.length > 0 &&
-                                            filteredTables.some(t => selectedTableKeys.includes(`${selectedDbName}::${t.name}`)) &&
-                                            !filteredTables.every(t => selectedTableKeys.includes(`${selectedDbName}::${t.name}`))
-                                        }
-                                        checked={filteredTables.length > 0 && filteredTables.every(t => selectedTableKeys.includes(`${selectedDbName}::${t.name}`))}
-                                        onChange={(e) => {
-                                            if (e.target.checked) {
-                                                const newSelected = new Set([...selectedTableKeys, ...filteredTables.map(t => `${selectedDbName}::${t.name}`)]);
-                                                setSelectedTableKeys(Array.from(newSelected));
-                                            } else {
-                                                const filteredKeys = filteredTables.map(t => `${selectedDbName}::${t.name}`);
-                                                setSelectedTableKeys(selectedTableKeys.filter(key => !filteredKeys.includes(key)));
-                                            }
-                                        }}
-                                        style={{ color: textColor, fontWeight: 'bold' }}
-                                    >
-                                        全选匹配的表 ({filteredTables.length})
-                                    </Checkbox>
-                                    <Button
-                                        type="link"
-                                        size="small"
-                                        style={{ padding: 0, height: 'auto', fontSize: 13 }}
-                                        onClick={() => {
-                                            const filteredKeys = filteredTables.map(t => `${selectedDbName}::${t.name}`);
-                                            const remainingSelected = selectedTableKeys.filter(key => !filteredKeys.includes(key));
-                                            const toAdd = filteredKeys.filter(key => !selectedTableKeys.includes(key));
-                                            setSelectedTableKeys([...remainingSelected, ...toAdd]);
-                                        }}
-                                    >
-                                        反选匹配结果
-                                    </Button>
-                                </div>
-                                <div style={{ maxHeight: 300, overflowY: 'auto', margin: '0 -24px', padding: '0 24px' }}>
-                                    <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
-                                        {filteredTables.map(t => {
-                                            const key = `${selectedDbName}::${t.name}`;
-                                            const isSelected = selectedTableKeys.includes(key);
-                                            return (
-                                                <div
-                                                    key={key}
-                                                    style={{
-                                                        padding: '6px 10px',
-                                                        borderRadius: 6,
-                                                        transition: 'background 0.2s',
-                                                        cursor: 'pointer'
-                                                    }}
-                                                    onMouseEnter={e => e.currentTarget.style.background = darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.03)'}
-                                                    onMouseLeave={e => e.currentTarget.style.background = 'transparent'}
-                                                    onClick={(e) => {
-                                                        if ((e.target as HTMLElement).tagName.toLowerCase() === 'input') return;
-                                                        if (isSelected) {
-                                                            setSelectedTableKeys(selectedTableKeys.filter(k => k !== key));
-                                                        } else {
-                                                            setSelectedTableKeys([...selectedTableKeys, key]);
-                                                        }
-                                                    }}
-                                                >
-                                                    <Checkbox
-                                                        checked={isSelected}
-                                                        onChange={(e) => {
-                                                            if (e.target.checked) setSelectedTableKeys([...selectedTableKeys, key]);
-                                                            else setSelectedTableKeys(selectedTableKeys.filter(k => k !== key));
-                                                        }}
-                                                        style={{ color: textColor, width: '100%' }}
-                                                    >
-                                                        <span style={{ fontSize: 13, userSelect: 'none' }}>{t.name}</span>
-                                                    </Checkbox>
-                                                </div>
-                                            );
-                                        })}
-                                    </div>
-                                </div>
-                            </div>
-                        ) : (
-                            <div style={{ padding: '40px 0', textAlign: 'center', color: overlayTheme.mutedText }}>
-                                没有找到匹配 '{searchText}' 的表
-                            </div>
-                        )}
-                    </Spin>
-                </Modal>
+                    darkMode={darkMode}
+                    textColor={textColor}
+                    overlayTheme={overlayTheme}
+                    dbList={dbList}
+                    selectedDbName={selectedDbName}
+                    searchText={searchText}
+                    filteredTables={filteredTables}
+                    selectedTableKeys={selectedTableKeys}
+                    onCancel={() => setContextOpen(false)}
+                    onConfirm={handleAppendContext}
+                    onDbChange={handleDbChange}
+                    onSearchTextChange={setSearchText}
+                    onSelectedTableKeysChange={setSelectedTableKeys}
+                />
             </div>
         );
     }
@@ -645,216 +322,80 @@ export const AIChatInput: React.FC<AIChatInputProps> = ({
                 gap: 8,
                 padding: '8px 4px 8px'
             }}>
-                <div className="ai-chat-input-preview-area gn-v2-ai-context-row">
-                    <button
-                        type="button"
-                        className={`gn-v2-ai-context-toggle${contextExpanded ? ' is-expanded' : ''}`}
-                        onClick={() => setContextExpanded(!contextExpanded)}
-                        aria-expanded={contextExpanded}
-                    >
-                        <TableOutlined />
-                        <span>关联上下文</span>
-                        <strong>{activeContextItems.length}</strong>
-                        <DownOutlined />
-                    </button>
-                    <button
-                        type="button"
-                        className="gn-v2-ai-context-add"
-                        onClick={handleOpenContext}
-                    >
-                        <PlusOutlined />
-                        <span>添加</span>
-                    </button>
-                </div>
-
-                {contextExpanded && activeContextItems.length > 0 && (
-                    <div className="gn-v2-ai-context-detail" data-ai-context-detail="true">
-                        <div className="gn-v2-ai-context-detail-title">当前上下文 · {activeContextItems.length}</div>
-                        {activeContextItems.map((ctx, idx) => (
-                            <Tag
-                                key={`ctx-${idx}`}
-                                closable
-                                onClose={(e) => { e.preventDefault(); removeAIContext(connectionKey, ctx.dbName, ctx.tableName); }}
-                                className="gn-v2-ai-context-table-chip"
-                                style={{ margin: 0 }}
-                            >
-                                <TableOutlined />
-                                <span>{ctx.tableName}</span>
-                            </Tag>
-                        ))}
-                    </div>
-                )}
-
-                {draftImages.length > 0 && (
-                    <div className="gn-v2-ai-attachment-row">
-                        {draftImages.map((b64, i) => (
-                            <div key={i} className="gn-v2-ai-attachment-thumb">
-                                <img src={b64} alt={`Draft ${i}`} />
-                                <button
-                                    type="button"
-                                    onClick={() => setDraftImages(prev => prev.filter((_, idx) => idx !== i))}
-                                    aria-label="移除图片"
-                                >
-                                    ✕
-                                </button>
-                            </div>
-                        ))}
-                    </div>
-                )}
-                {composerNotice && (
-                    <div
-                        data-ai-chat-composer-notice="true"
-                        style={{
-                            display: 'flex',
-                            alignItems: 'flex-start',
-                            gap: 8,
-                            padding: '8px 10px',
-                            borderRadius: 12,
-                            background: composerNoticePalette.background,
-                            border: `1px solid ${composerNoticePalette.borderColor}`,
-                        }}
-                    >
-                        <ExclamationCircleFilled style={{ color: composerNoticePalette.iconColor, fontSize: 14, marginTop: 1, flexShrink: 0 }} />
-                        <div style={{ minWidth: 0 }}>
-                            <div style={{ fontSize: 12, fontWeight: 600, color: textColor, lineHeight: 1.4 }}>
-                                {composerNotice.title}
-                            </div>
-                            <div style={{ fontSize: 11, color: mutedColor, lineHeight: 1.5, marginTop: 2, wordBreak: 'break-word' }}>
-                                {composerNotice.description}
-                            </div>
-                        </div>
-                    </div>
+                <AIChatContextPreview
+                    variant="v2"
+                    activeContextItems={activeContextItems}
+                    contextExpanded={contextExpanded}
+                    darkMode={darkMode}
+                    textColor={textColor}
+                    onToggleExpanded={() => setContextExpanded(!contextExpanded)}
+                    onOpenContext={handleOpenContext}
+                    onRemoveContext={handleRemoveContextItem}
+                />
+                <AIChatAttachmentStrip
+                    variant="v2"
+                    attachments={draftAttachments}
+                    overlayTheme={overlayTheme}
+                    onRemove={handleRemoveDraftAttachment}
+                />
+                <AIChatComposerNotice
+                    composerNotice={composerNotice}
+                    darkMode={darkMode}
+                    textColor={textColor}
+                    mutedColor={mutedColor}
+                    onComposerNoticeAction={composerNoticeActionHandler}
+                />
+                {!composerNotice && !isComposerStatusDismissed && (
+                    <AIChatComposerStatus
+                        snapshot={composerReadiness}
+                        darkMode={darkMode}
+                        overlayTheme={overlayTheme}
+                        onAction={composerActionHandler}
+                        onDismiss={composerReadiness.ready ? handleDismissComposerStatus : undefined}
+                    />
                 )}
                 <div className="gn-v2-ai-input-box" data-ai-chat-composer-input="true" style={{ position: 'relative' }}>
-                    {showSlashMenu && filteredSlashCmds.length > 0 && (
-                        <div className="gn-v2-ai-slash-menu" style={{
+                    <AISlashCommandMenu
+                        visible={showSlashMenu}
+                        commands={filteredSlashCmds}
+                        darkMode={darkMode}
+                        textColor={textColor}
+                        mutedColor={mutedColor}
+                        className="gn-v2-ai-slash-menu"
+                        style={{
                             background: darkMode ? '#2a2a2a' : '#fff',
                             border: `1px solid ${darkMode ? 'rgba(255,255,255,0.12)' : 'rgba(0,0,0,0.1)'}`,
-                        }}>
-                            {filteredSlashCmds.map(cmd => (
-                                <div
-                                    key={cmd.cmd}
-                                    style={{
-                                        padding: '8px 12px', borderRadius: 6, cursor: 'pointer',
-                                        display: 'flex', alignItems: 'center', gap: 10,
-                                        transition: 'background 0.15s'
-                                    }}
-                                    onMouseEnter={e => e.currentTarget.style.background = darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.04)'}
-                                    onMouseLeave={e => e.currentTarget.style.background = 'transparent'}
-                                    onClick={() => {
-                                        setInput(cmd.prompt);
-                                        setShowSlashMenu(false);
-                                        setSlashFilter('');
-                                        textareaRef.current?.focus();
-                                    }}
-                                >
-                                    <span style={{ fontSize: 14, fontWeight: 600, color: textColor, minWidth: 80 }}>{cmd.cmd}</span>
-                                    <span style={{ fontSize: 13, fontWeight: 500, color: textColor }}>{cmd.label}</span>
-                                    <span style={{ fontSize: 11, color: mutedColor, marginLeft: 'auto' }}>{cmd.desc}</span>
-                                </div>
-                            ))}
-                        </div>
-                    )}
+                        }}
+                        onSelect={handleSelectSlashCommand}
+                    />
                     <div className="gn-v2-ai-input-surface">
                         <Input.TextArea
-                            onPaste={(e) => {
-                                const items = e.clipboardData?.items;
-                                if (!items) return;
-                                for (let i = 0; i < items.length; i++) {
-                                    if (items[i].type.indexOf('image') !== -1) {
-                                        e.preventDefault();
-                                        const blob = items[i].getAsFile();
-                                        if (blob) {
-                                            const reader = new FileReader();
-                                            reader.onload = (event) => {
-                                                if (event.target?.result) {
-                                                    setDraftImages(prev => [...prev, event.target!.result as string]);
-                                                }
-                                            };
-                                            reader.readAsDataURL(blob);
-                                        }
-                                    }
-                                }
-                            }}
+                            onPaste={handlePasteImages}
                             ref={textareaRef as any}
                             value={input}
-                            onChange={(e) => {
-                                const val = e.target.value;
-                                setInput(val);
-                                // Slash command detection
-                                if (val.startsWith('/')) {
-                                    setSlashFilter(val.split(/\s/)[0]);
-                                    setShowSlashMenu(true);
-                                } else {
-                                    setShowSlashMenu(false);
-                                    setSlashFilter('');
-                                }
-                            }}
+                            onChange={(e) => handleComposerInputChange(e.target.value)}
                             onKeyDown={handleKeyDown as any}
                             placeholder={`输入消息... ${getAIChatSendShortcutLabel(sendShortcutBinding, shortcutPlatform)} · / 命令`}
                             variant="borderless"
                             autoSize={{ minRows: 1, maxRows: 8 }}
                             style={{ color: textColor, width: '100%', padding: 0, resize: 'none' }}
                         />
-                        <div className="gn-v2-ai-input-actions">
-                            <input
-                                type="file"
-                                accept="image/*"
-                                multiple
-                                ref={fileInputRef}
-                                style={{ display: 'none' }}
-                                onChange={handleImageUpload}
-                            />
-                            <Tooltip title="上传图片/截图">
-                                <Button
-                                    type="text"
-                                    icon={<PictureOutlined />}
-                                    onClick={() => fileInputRef.current?.click()}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent' }}
-                                />
-                            </Tooltip>
-                            <Tooltip title="关联附带数据库表上下文">
-                                <Button
-                                    type="text"
-                                    icon={<TableOutlined />}
-                                    onClick={handleOpenContext}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent' }}
-                                />
-                            </Tooltip>
-                            <Tooltip title="快捷命令">
-                                <Button
-                                    type="text"
-                                    icon={<CodeOutlined />}
-                                    onClick={() => {
-                                        setInput('/');
-                                        setSlashFilter('/');
-                                        setShowSlashMenu(true);
-                                        textareaRef.current?.focus();
-                                    }}
-                                    style={{ color: overlayTheme.mutedText, border: 'none', background: 'transparent' }}
-                                />
-                            </Tooltip>
-                            {sending ? (
-                                <button
-                                    type="button"
-                                    className="ai-chat-send-btn ai-chat-stop-btn gn-v2-ai-send"
-                                    onClick={onStop}
-                                    title="停止生成"
-                                >
-                                    <StopOutlined />
-                                </button>
-                            ) : (
-                                <button
-                                    type="button"
-                                    className="ai-chat-send-btn gn-v2-ai-send"
-                                    onClick={() => onSend()}
-                                    disabled={!input.trim() && draftImages.length === 0}
-                                    title="发送"
-                                >
-                                    <SendOutlined />
-                                </button>
-                            )}
-                        </div>
+                        <AIChatComposerActions
+                            variant="v2"
+                            input={input}
+                            draftAttachmentCount={draftAttachments.length}
+                            sending={sending}
+                            darkMode={darkMode}
+                            textColor={textColor}
+                            mutedColor={mutedColor}
+                            overlayTheme={overlayTheme}
+                            fileInputRef={fileInputRef}
+                            onAttachmentUpload={handleAttachmentUpload}
+                            onOpenContext={handleOpenContext}
+                            onOpenSlashMenu={handleOpenSlashMenu}
+                            onSend={onSend}
+                            onStop={onStop}
+                        />
                     </div>
                 </div>
                 <div className="gn-v2-ai-model-bar">
@@ -868,24 +409,14 @@ export const AIChatInput: React.FC<AIChatInputProps> = ({
                         </Tooltip>
                     )}
 
-                    {activeProvider && (
-                        <Select
-                            size="small"
-                            value={activeProvider.model || undefined}
-                            onChange={onModelChange}
-                            onOpenChange={(open) => {
-                                if (open && dynamicModels.length === 0 && (activeProvider.models || []).length === 0) {
-                                    onFetchModels();
-                                }
-                            }}
-                            loading={loadingModels}
-                            options={(dynamicModels.length > 0 ? dynamicModels : (activeProvider.models || [])).map((m: string) => ({ label: m, value: m }))}
-                            styles={{ popup: { root: { minWidth: 200 } } }}
-                            placeholder="选择模型"
-                            className="gn-v2-ai-model-select"
-                            suffixIcon={<DownOutlined />}
-                        />
-                    )}
+                    <AIChatProviderModelSelect
+                        activeProvider={activeProvider}
+                        dynamicModels={dynamicModels}
+                        loadingModels={loadingModels}
+                        variant="v2"
+                        onModelChange={onModelChange}
+                        onFetchModels={onFetchModels}
+                    />
 
                     <div className="gn-v2-ai-model-spacer" />
 
@@ -902,130 +433,24 @@ export const AIChatInput: React.FC<AIChatInputProps> = ({
                 </div>
             </div>
 
-            <Modal
-                title={<span style={{ color: textColor }}>关联数据库表结构上下文</span>}
+            <AIContextSelectorModal
                 open={contextOpen}
-                onCancel={() => setContextOpen(false)}
-                onOk={handleAppendContext}
+                loading={contextLoading}
                 confirmLoading={appendingContext}
-                okText="同步所选表至上下文"
-                cancelText="取消"
-                centered
-                styles={{
-                    content: { background: darkMode ? '#1e1e1e' : '#ffffff', border: overlayTheme.shellBorder },
-                    header: { background: darkMode ? '#1e1e1e' : '#ffffff', borderBottom: overlayTheme.shellBorder },
-                    body: { padding: '20px 24px' }
-                }}
-            >
-                <Spin spinning={contextLoading}>
-                    <div style={{ marginBottom: 16, display: 'flex', gap: 12 }}>
-                        {dbList.length > 0 && (
-                            <Select 
-                                value={selectedDbName}
-                                onChange={val => {
-                                    const c = useStore.getState().connections.find(conn => conn.id === activeContext?.connectionId);
-                                    if (c) fetchTablesForDb(val, c.config);
-                                }}
-                                options={dbList.map(d => ({ label: d, value: d }))}
-                                style={{ width: 160, flexShrink: 0 }}
-                                placeholder="切换数据库"
-                                showSearch
-                            />
-                        )}
-                        <Input 
-                            placeholder="在当前库搜索表名..." 
-                            prefix={<SearchOutlined style={{ color: overlayTheme.mutedText }} />} 
-                            value={searchText}
-                            onChange={e => setSearchText(e.target.value)}
-                            style={{ background: darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.04)', border: 'none', flexGrow: 1 }}
-                        />
-                    </div>
-                    {filteredTables.length > 0 ? (
-                        <div style={{ display: 'flex', flexDirection: 'column' }}>
-                            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', borderBottom: `1px solid ${darkMode ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.1)'}`, paddingBottom: 12, marginBottom: 8 }}>
-                                <Checkbox
-                                    indeterminate={
-                                        filteredTables.length > 0 &&
-                                        filteredTables.some(t => selectedTableKeys.includes(`${selectedDbName}::${t.name}`)) && 
-                                        !filteredTables.every(t => selectedTableKeys.includes(`${selectedDbName}::${t.name}`))
-                                    }
-                                    checked={filteredTables.length > 0 && filteredTables.every(t => selectedTableKeys.includes(`${selectedDbName}::${t.name}`))}
-                                    onChange={(e) => {
-                                        if (e.target.checked) {
-                                            const newSelected = new Set([...selectedTableKeys, ...filteredTables.map(t => `${selectedDbName}::${t.name}`)]);
-                                            setSelectedTableKeys(Array.from(newSelected));
-                                        } else {
-                                            const filteredKeys = filteredTables.map(t => `${selectedDbName}::${t.name}`);
-                                            setSelectedTableKeys(selectedTableKeys.filter(key => !filteredKeys.includes(key)));
-                                        }
-                                    }}
-                                    style={{ color: textColor, fontWeight: 'bold' }}
-                                >
-                                    全选匹配的表 ({filteredTables.length})
-                                </Checkbox>
-                                <Button 
-                                    type="link" 
-                                    size="small" 
-                                    style={{ padding: 0, height: 'auto', fontSize: 13 }}
-                                    onClick={() => {
-                                        const filteredKeys = filteredTables.map(t => `${selectedDbName}::${t.name}`);
-                                        const remainingSelected = selectedTableKeys.filter(key => !filteredKeys.includes(key));
-                                        const toAdd = filteredKeys.filter(key => !selectedTableKeys.includes(key));
-                                        setSelectedTableKeys([...remainingSelected, ...toAdd]);
-                                    }}
-                                >
-                                    反选匹配结果
-                                </Button>
-                            </div>
-                            <div style={{ maxHeight: 300, overflowY: 'auto', margin: '0 -24px', padding: '0 24px' }}>
-                                <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
-                                    {filteredTables.map(t => {
-                                        const key = `${selectedDbName}::${t.name}`;
-                                        const isSelected = selectedTableKeys.includes(key);
-                                        return (
-                                        <div 
-                                            key={key}
-                                            style={{ 
-                                                padding: '6px 10px', 
-                                                borderRadius: 6, 
-                                                transition: 'background 0.2s',
-                                                cursor: 'pointer'
-                                            }}
-                                            onMouseEnter={e => e.currentTarget.style.background = darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.03)'}
-                                            onMouseLeave={e => e.currentTarget.style.background = 'transparent'}
-                                            onClick={(e) => {
-                                                // If click originated from the checkbox input itself, let its onChange handle it to avoid duplicate toggle
-                                                if ((e.target as HTMLElement).tagName.toLowerCase() === 'input') return;
-                                                if (isSelected) {
-                                                    setSelectedTableKeys(selectedTableKeys.filter(k => k !== key));
-                                                } else {
-                                                    setSelectedTableKeys([...selectedTableKeys, key]);
-                                                }
-                                            }}
-                                        >
-                                            <Checkbox 
-                                                checked={isSelected}
-                                                onChange={(e) => {
-                                                    if (e.target.checked) setSelectedTableKeys([...selectedTableKeys, key]);
-                                                    else setSelectedTableKeys(selectedTableKeys.filter(k => k !== key));
-                                                }}
-                                                style={{ color: textColor, width: '100%' }}
-                                            >
-                                                <span style={{ fontSize: 13, userSelect: 'none' }}>{t.name}</span>
-                                            </Checkbox>
-                                        </div>
-                                        );
-                                    })}
-                                </div>
-                            </div>
-                        </div>
-                    ) : (
-                        <div style={{ padding: '40px 0', textAlign: 'center', color: overlayTheme.mutedText }}>
-                            没有找到匹配 '{searchText}' 的表
-                        </div>
-                    )}
-                </Spin>
-            </Modal>
+                darkMode={darkMode}
+                textColor={textColor}
+                overlayTheme={overlayTheme}
+                dbList={dbList}
+                selectedDbName={selectedDbName}
+                searchText={searchText}
+                filteredTables={filteredTables}
+                selectedTableKeys={selectedTableKeys}
+                onCancel={() => setContextOpen(false)}
+                onConfirm={handleAppendContext}
+                onDbChange={handleDbChange}
+                onSearchTextChange={setSearchText}
+                onSelectedTableKeysChange={setSelectedTableKeys}
+            />
         </div>
     );
 };
diff --git a/frontend/src/components/ai/AIChatPanelConversationView.test.tsx b/frontend/src/components/ai/AIChatPanelConversationView.test.tsx
new file mode 100644
index 0000000..4b588d3
--- /dev/null
+++ b/frontend/src/components/ai/AIChatPanelConversationView.test.tsx
@@ -0,0 +1,86 @@
+import React, { createRef } from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AIChatPanelConversationView from './AIChatPanelConversationView';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+describe('AIChatPanelConversationView', () => {
+  it('renders the welcome state when the chat mode has no messages', () => {
+    const markup = renderToStaticMarkup(
+      <AIChatPanelConversationView
+        mode="chat"
+        messages={[]}
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        textColor="#0f172a"
+        mutedColor="#64748b"
+        quickActionBg="rgba(255,255,255,0.8)"
+        quickActionBorder="1px solid rgba(0,0,0,0.06)"
+        showScrollBottom={false}
+        contextTableNames={['sales.orders']}
+        isV2Ui
+        insights={[]}
+        sessions={[]}
+        activeSessionId="session-1"
+        activeConnectionId={undefined}
+        activeConnectionConfig={undefined}
+        activeDbName={undefined}
+        messagesEndRef={createRef<HTMLDivElement>()}
+        onScrollMessages={() => {}}
+        onQuickAction={() => {}}
+        onSelectSession={() => {}}
+        onEditMessage={() => {}}
+        onRetryMessage={() => {}}
+        onDeleteMessage={() => {}}
+        onMessageRenderError={() => {}}
+        onScrollBottom={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('你好，我是 GoNavi AI');
+    expect(markup).toContain('已自动关联');
+    expect(markup).toContain('生成 SQL');
+  });
+
+  it('renders inline history mode content and the scroll-bottom affordance', () => {
+    const markup = renderToStaticMarkup(
+      <AIChatPanelConversationView
+        mode="history"
+        messages={[]}
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        textColor="#0f172a"
+        mutedColor="#64748b"
+        quickActionBg="rgba(255,255,255,0.8)"
+        quickActionBorder="1px solid rgba(0,0,0,0.06)"
+        showScrollBottom
+        contextTableNames={[]}
+        isV2Ui
+        insights={[]}
+        sessions={[
+          { id: 'session-1', title: '当前会话', updatedAt: 1710000000000 },
+          { id: 'session-2', title: '旧会话', updatedAt: 1700000000000 },
+        ]}
+        activeSessionId="session-1"
+        activeConnectionId={undefined}
+        activeConnectionConfig={undefined}
+        activeDbName={undefined}
+        messagesEndRef={createRef<HTMLDivElement>()}
+        onScrollMessages={() => {}}
+        onQuickAction={() => {}}
+        onSelectSession={() => {}}
+        onEditMessage={() => {}}
+        onRetryMessage={() => {}}
+        onDeleteMessage={() => {}}
+        onMessageRenderError={() => {}}
+        onScrollBottom={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('gn-v2-ai-history-card is-active');
+    expect(markup).toContain('当前会话');
+    expect(markup).toContain('旧会话');
+    expect(markup).toContain('down');
+  });
+});
diff --git a/frontend/src/components/ai/AIChatPanelConversationView.tsx b/frontend/src/components/ai/AIChatPanelConversationView.tsx
new file mode 100644
index 0000000..771d076
--- /dev/null
+++ b/frontend/src/components/ai/AIChatPanelConversationView.tsx
@@ -0,0 +1,162 @@
+import React from 'react';
+import { DownOutlined } from '@ant-design/icons';
+
+import type { RpcConnectionConfig } from '../../utils/connectionRpcConfig';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import type { AIChatMessage } from '../../types';
+import { AIChatWelcome } from './AIChatWelcome';
+import { AIMessageBubble } from './AIMessageBubble';
+import AIMessageRenderBoundary from './AIMessageRenderBoundary';
+import AIChatPanelModeContent, {
+  type AIChatInlineHistorySession,
+  type AIChatInsightItem,
+  type AIChatPanelMode,
+} from './AIChatPanelModeContent';
+
+interface AIChatPanelConversationViewProps {
+  mode: AIChatPanelMode;
+  messages: AIChatMessage[];
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  textColor: string;
+  mutedColor: string;
+  quickActionBg: string;
+  quickActionBorder: string;
+  showScrollBottom: boolean;
+  contextTableNames: string[];
+  isV2Ui: boolean;
+  insights: AIChatInsightItem[];
+  sessions: AIChatInlineHistorySession[];
+  activeSessionId: string;
+  activeConnectionId?: string;
+  activeConnectionConfig?: RpcConnectionConfig;
+  activeDbName?: string;
+  messagesEndRef: React.Ref<HTMLDivElement>;
+  onScrollMessages: (event: React.UIEvent<HTMLDivElement>) => void;
+  onQuickAction: (prompt: string, autoSend?: boolean) => void;
+  onSelectSession: (sessionId: string) => void;
+  onEditMessage: (message: AIChatMessage) => void;
+  onRetryMessage: (message: AIChatMessage) => void;
+  onDeleteMessage: (id: string) => void;
+  onMessageRenderError: (error: Error, errorInfo: React.ErrorInfo, message: AIChatMessage) => void;
+  onScrollBottom: () => void;
+}
+
+const AIChatPanelConversationView: React.FC<AIChatPanelConversationViewProps> = ({
+  mode,
+  messages,
+  darkMode,
+  overlayTheme,
+  textColor,
+  mutedColor,
+  quickActionBg,
+  quickActionBorder,
+  showScrollBottom,
+  contextTableNames,
+  isV2Ui,
+  insights,
+  sessions,
+  activeSessionId,
+  activeConnectionId,
+  activeConnectionConfig,
+  activeDbName,
+  messagesEndRef,
+  onScrollMessages,
+  onQuickAction,
+  onSelectSession,
+  onEditMessage,
+  onRetryMessage,
+  onDeleteMessage,
+  onMessageRenderError,
+  onScrollBottom,
+}) => (
+  <>
+    <div className="ai-chat-messages" onScroll={onScrollMessages}>
+      {mode === 'chat' && (
+        messages.length === 0 ? (
+          <AIChatWelcome
+            overlayTheme={overlayTheme}
+            quickActionBg={quickActionBg}
+            quickActionBorder={quickActionBorder}
+            textColor={textColor}
+            mutedColor={mutedColor}
+            onQuickAction={onQuickAction}
+            contextTableNames={contextTableNames}
+            isV2Ui={isV2Ui}
+          />
+        ) : (
+          messages.map((message) => (
+            <AIMessageRenderBoundary
+              key={message.id}
+              msg={message}
+              darkMode={darkMode}
+              overlayTheme={overlayTheme}
+              onDeleteMessage={onDeleteMessage}
+              onError={onMessageRenderError}
+            >
+              <AIMessageBubble
+                msg={message}
+                darkMode={darkMode}
+                overlayTheme={overlayTheme}
+                textColor={textColor}
+                onEdit={onEditMessage}
+                onRetry={onRetryMessage}
+                onDelete={onDeleteMessage}
+                activeConnectionId={activeConnectionId}
+                activeConnectionConfig={activeConnectionConfig}
+                activeDbName={activeDbName}
+                allMessages={messages}
+              />
+            </AIMessageRenderBoundary>
+          ))
+        )
+      )}
+
+      <AIChatPanelModeContent
+        mode={mode}
+        insights={insights}
+        sessions={sessions}
+        activeSessionId={activeSessionId}
+        onSelectSession={onSelectSession}
+      />
+
+      <div ref={messagesEndRef} />
+    </div>
+
+    {showScrollBottom && (
+      <div
+        onClick={onScrollBottom}
+        style={{
+          position: 'absolute',
+          bottom: 120,
+          right: 20,
+          width: 32,
+          height: 32,
+          borderRadius: '50%',
+          background: darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.05)',
+          backdropFilter: 'blur(8px)',
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          cursor: 'pointer',
+          color: textColor,
+          boxShadow: '0 4px 12px rgba(0,0,0,0.1)',
+          zIndex: 10,
+          transition: 'all 0.2s ease',
+        }}
+        onMouseEnter={(event) => {
+          event.currentTarget.style.transform = 'scale(1.1)';
+          event.currentTarget.style.background = darkMode ? 'rgba(255, 255, 255, 0.15)' : 'rgba(0, 0, 0, 0.1)';
+        }}
+        onMouseLeave={(event) => {
+          event.currentTarget.style.transform = 'scale(1)';
+          event.currentTarget.style.background = darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.05)';
+        }}
+      >
+        <DownOutlined style={{ fontSize: 14 }} />
+      </div>
+    )}
+  </>
+);
+
+export default AIChatPanelConversationView;
diff --git a/frontend/src/components/ai/AIChatPanelModeContent.test.tsx b/frontend/src/components/ai/AIChatPanelModeContent.test.tsx
new file mode 100644
index 0000000..1fab95d
--- /dev/null
+++ b/frontend/src/components/ai/AIChatPanelModeContent.test.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AIChatPanelModeContent from './AIChatPanelModeContent';
+
+describe('AIChatPanelModeContent', () => {
+  it('renders insight cards for the automatic insights mode', () => {
+    const markup = renderToStaticMarkup(
+      <AIChatPanelModeContent
+        mode="insights"
+        insights={[
+          {
+            tone: 'info',
+            title: '已关联 3 张表',
+            body: '当前对话会带上 orders、customers、products 的结构上下文。',
+          },
+          {
+            tone: 'warn',
+            title: '2 条最近查询失败',
+            body: 'Unknown column foo',
+          },
+        ]}
+        sessions={[]}
+        activeSessionId="session-1"
+        onSelectSession={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('gn-v2-ai-insight-card tone-info');
+    expect(markup).toContain('已关联 3 张表');
+    expect(markup).toContain('2 条最近查询失败');
+    expect(markup).toContain('Unknown column foo');
+  });
+
+  it('renders an empty state when there is no inline history session', () => {
+    const markup = renderToStaticMarkup(
+      <AIChatPanelModeContent
+        mode="history"
+        insights={[]}
+        sessions={[]}
+        activeSessionId="session-1"
+        onSelectSession={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('gn-v2-ai-empty-note');
+    expect(markup).toContain('暂无历史会话');
+  });
+
+  it('marks the active inline history session', () => {
+    const markup = renderToStaticMarkup(
+      <AIChatPanelModeContent
+        mode="history"
+        insights={[]}
+        sessions={[
+          { id: 'session-1', title: '当前会话', updatedAt: 1710000000000 },
+          { id: 'session-2', title: '旧会话', updatedAt: 1700000000000 },
+        ]}
+        activeSessionId="session-1"
+        onSelectSession={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('gn-v2-ai-history-card is-active');
+    expect(markup).toContain('当前会话');
+    expect(markup).toContain('旧会话');
+  });
+});
diff --git a/frontend/src/components/ai/AIChatPanelModeContent.tsx b/frontend/src/components/ai/AIChatPanelModeContent.tsx
new file mode 100644
index 0000000..7b02653
--- /dev/null
+++ b/frontend/src/components/ai/AIChatPanelModeContent.tsx
@@ -0,0 +1,98 @@
+import React from 'react';
+import { DatabaseOutlined, HistoryOutlined, TableOutlined, WarningOutlined } from '@ant-design/icons';
+
+export type AIChatPanelMode = 'chat' | 'insights' | 'history';
+
+export interface AIChatInsightItem {
+  tone: 'info' | 'accent' | 'warn';
+  title: string;
+  body: string;
+}
+
+export interface AIChatInlineHistorySession {
+  id: string;
+  title: string;
+  updatedAt: number;
+}
+
+interface AIChatPanelModeContentProps {
+  mode: AIChatPanelMode;
+  insights: AIChatInsightItem[];
+  sessions: AIChatInlineHistorySession[];
+  activeSessionId: string;
+  onSelectSession: (sessionId: string) => void;
+}
+
+const renderInsightIcon = (tone: AIChatInsightItem['tone']) => {
+  if (tone === 'warn') {
+    return <WarningOutlined />;
+  }
+  if (tone === 'accent') {
+    return <DatabaseOutlined />;
+  }
+  return <TableOutlined />;
+};
+
+const AIChatPanelModeContent: React.FC<AIChatPanelModeContentProps> = ({
+  mode,
+  insights,
+  sessions,
+  activeSessionId,
+  onSelectSession,
+}) => {
+  if (mode === 'insights') {
+    return (
+      <div className="gn-v2-ai-insights-list">
+        {insights.map((item) => (
+          <div className={`gn-v2-ai-insight-card tone-${item.tone}`} key={item.title}>
+            <span className="gn-v2-ai-insight-icon">{renderInsightIcon(item.tone)}</span>
+            <div>
+              <strong>{item.title}</strong>
+              <p>{item.body}</p>
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+  if (mode === 'history') {
+    if (sessions.length === 0) {
+      return (
+        <div className="gn-v2-ai-history-list">
+          <div className="gn-v2-ai-empty-note">暂无历史会话</div>
+        </div>
+      );
+    }
+
+    return (
+      <div className="gn-v2-ai-history-list">
+        {sessions.map((session) => (
+          <button
+            key={session.id}
+            type="button"
+            className={`gn-v2-ai-history-card${session.id === activeSessionId ? ' is-active' : ''}`}
+            onClick={() => onSelectSession(session.id)}
+          >
+            <span>
+              <HistoryOutlined />
+              <strong>{session.title || '新对话'}</strong>
+            </span>
+            <small>
+              {new Date(session.updatedAt).toLocaleString(undefined, {
+                month: 'numeric',
+                day: 'numeric',
+                hour: '2-digit',
+                minute: '2-digit',
+              })}
+            </small>
+          </button>
+        ))}
+      </div>
+    );
+  }
+
+  return null;
+};
+
+export default AIChatPanelModeContent;
diff --git a/frontend/src/components/ai/AIChatProviderModelSelect.tsx b/frontend/src/components/ai/AIChatProviderModelSelect.tsx
new file mode 100644
index 0000000..20c9585
--- /dev/null
+++ b/frontend/src/components/ai/AIChatProviderModelSelect.tsx
@@ -0,0 +1,73 @@
+import React from 'react';
+import { Select } from 'antd';
+import { DownOutlined } from '@ant-design/icons';
+
+import type { AIProviderConfig } from '../../types';
+
+interface AIChatProviderModelSelectProps {
+  activeProvider?: AIProviderConfig | null;
+  dynamicModels: string[];
+  loadingModels: boolean;
+  variant: 'legacy' | 'v2';
+  onModelChange: (value: string) => void;
+  onFetchModels: () => void;
+}
+
+const AIChatProviderModelSelect: React.FC<AIChatProviderModelSelectProps> = ({
+  activeProvider,
+  dynamicModels,
+  loadingModels,
+  variant,
+  onModelChange,
+  onFetchModels,
+}) => {
+  if (!activeProvider) {
+    return null;
+  }
+
+  const options = (dynamicModels.length > 0 ? dynamicModels : (activeProvider.models || []))
+    .map((item) => String(item || '').trim())
+    .filter(Boolean)
+    .map((model) => ({ label: model, value: model }));
+
+  const handleOpenChange = (open: boolean) => {
+    if (open && options.length === 0) {
+      onFetchModels();
+    }
+  };
+
+  if (variant === 'legacy') {
+    return (
+      <Select
+        size="small"
+        variant="filled"
+        value={activeProvider.model || undefined}
+        onChange={onModelChange}
+        onOpenChange={handleOpenChange}
+        loading={loadingModels}
+        options={options}
+        style={{ width: 130, fontSize: 11, background: 'transparent' }}
+        styles={{ popup: { root: { minWidth: 200 } } }}
+        showSearch
+        placeholder="选择模型"
+      />
+    );
+  }
+
+  return (
+    <Select
+      size="small"
+      value={activeProvider.model || undefined}
+      onChange={onModelChange}
+      onOpenChange={handleOpenChange}
+      loading={loadingModels}
+      options={options}
+      styles={{ popup: { root: { minWidth: 200 } } }}
+      placeholder="选择模型"
+      className="gn-v2-ai-model-select"
+      suffixIcon={<DownOutlined />}
+    />
+  );
+};
+
+export default AIChatProviderModelSelect;
diff --git a/frontend/src/components/ai/AIContextSelectorModal.test.tsx b/frontend/src/components/ai/AIContextSelectorModal.test.tsx
new file mode 100644
index 0000000..e6fb04e
--- /dev/null
+++ b/frontend/src/components/ai/AIContextSelectorModal.test.tsx
@@ -0,0 +1,19 @@
+import { describe, expect, it } from 'vitest';
+import { readFileSync } from 'node:fs';
+
+const source = readFileSync(new URL('./AIContextSelectorModal.tsx', import.meta.url), 'utf8');
+
+describe('AIContextSelectorModal', () => {
+  it('keeps the batch-selection actions after extracting the context modal', () => {
+    expect(source).toContain('同步所选表至上下文');
+    expect(source).toContain('全选匹配的表');
+    expect(source).toContain('反选匹配结果');
+    expect(source).toContain('handleToggleAll');
+    expect(source).toContain('handleInvertSelection');
+  });
+
+  it('shows a dedicated empty-state copy for databases without tables', () => {
+    expect(source).toContain("当前数据库没有可关联的表");
+    expect(source).toContain("没有找到匹配");
+  });
+});
diff --git a/frontend/src/components/ai/AIContextSelectorModal.tsx b/frontend/src/components/ai/AIContextSelectorModal.tsx
new file mode 100644
index 0000000..79f4018
--- /dev/null
+++ b/frontend/src/components/ai/AIContextSelectorModal.tsx
@@ -0,0 +1,191 @@
+import React from 'react';
+import { Button, Checkbox, Input, Modal, Select, Spin } from 'antd';
+import { SearchOutlined } from '@ant-design/icons';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+interface ContextTableItem {
+  name: string;
+}
+
+interface AIContextSelectorModalProps {
+  open: boolean;
+  loading: boolean;
+  confirmLoading: boolean;
+  darkMode: boolean;
+  textColor: string;
+  overlayTheme: OverlayWorkbenchTheme;
+  dbList: string[];
+  selectedDbName: string;
+  searchText: string;
+  filteredTables: ContextTableItem[];
+  selectedTableKeys: string[];
+  onCancel: () => void;
+  onConfirm: () => void;
+  onDbChange: (dbName: string) => void;
+  onSearchTextChange: (value: string) => void;
+  onSelectedTableKeysChange: (keys: string[]) => void;
+}
+
+export const AIContextSelectorModal: React.FC<AIContextSelectorModalProps> = ({
+  open,
+  loading,
+  confirmLoading,
+  darkMode,
+  textColor,
+  overlayTheme,
+  dbList,
+  selectedDbName,
+  searchText,
+  filteredTables,
+  selectedTableKeys,
+  onCancel,
+  onConfirm,
+  onDbChange,
+  onSearchTextChange,
+  onSelectedTableKeysChange,
+}) => {
+  const matchedKeys = filteredTables.map((table) => `${selectedDbName}::${table.name}`);
+  const allSelected = matchedKeys.length > 0 && matchedKeys.every((key) => selectedTableKeys.includes(key));
+  const partiallySelected = matchedKeys.length > 0 && matchedKeys.some((key) => selectedTableKeys.includes(key)) && !allSelected;
+
+  const handleToggleAll = (checked: boolean) => {
+    if (checked) {
+      const nextSelected = new Set([...selectedTableKeys, ...matchedKeys]);
+      onSelectedTableKeysChange(Array.from(nextSelected));
+      return;
+    }
+    onSelectedTableKeysChange(selectedTableKeys.filter((key) => !matchedKeys.includes(key)));
+  };
+
+  const handleInvertSelection = () => {
+    const remainingSelected = selectedTableKeys.filter((key) => !matchedKeys.includes(key));
+    const keysToAdd = matchedKeys.filter((key) => !selectedTableKeys.includes(key));
+    onSelectedTableKeysChange([...remainingSelected, ...keysToAdd]);
+  };
+
+  const handleToggleSingle = (key: string, checked: boolean) => {
+    if (checked) {
+      onSelectedTableKeysChange([...selectedTableKeys, key]);
+      return;
+    }
+    onSelectedTableKeysChange(selectedTableKeys.filter((selectedKey) => selectedKey !== key));
+  };
+
+  return (
+    <Modal
+      title={<span style={{ color: textColor }}>关联数据库表结构上下文</span>}
+      open={open}
+      onCancel={onCancel}
+      onOk={onConfirm}
+      confirmLoading={confirmLoading}
+      okText="同步所选表至上下文"
+      cancelText="取消"
+      centered
+      styles={{
+        content: { background: darkMode ? '#1e1e1e' : '#ffffff', border: overlayTheme.shellBorder },
+        header: { background: darkMode ? '#1e1e1e' : '#ffffff', borderBottom: overlayTheme.shellBorder },
+        body: { padding: '20px 24px' },
+      }}
+    >
+      <Spin spinning={loading}>
+        <div style={{ marginBottom: 16, display: 'flex', gap: 12 }}>
+          {dbList.length > 0 && (
+            <Select
+              value={selectedDbName}
+              onChange={onDbChange}
+              options={dbList.map((dbName) => ({ label: dbName, value: dbName }))}
+              style={{ width: 160, flexShrink: 0 }}
+              placeholder="切换数据库"
+              showSearch
+            />
+          )}
+          <Input
+            placeholder="在当前库搜索表名..."
+            prefix={<SearchOutlined style={{ color: overlayTheme.mutedText }} />}
+            value={searchText}
+            onChange={(event) => onSearchTextChange(event.target.value)}
+            style={{ background: darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.04)', border: 'none', flexGrow: 1 }}
+          />
+        </div>
+
+        {filteredTables.length > 0 ? (
+          <div style={{ display: 'flex', flexDirection: 'column' }}>
+            <div
+              style={{
+                display: 'flex',
+                justifyContent: 'space-between',
+                alignItems: 'center',
+                borderBottom: `1px solid ${darkMode ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.1)'}`,
+                paddingBottom: 12,
+                marginBottom: 8,
+              }}
+            >
+              <Checkbox
+                indeterminate={partiallySelected}
+                checked={allSelected}
+                onChange={(event) => handleToggleAll(event.target.checked)}
+                style={{ color: textColor, fontWeight: 'bold' }}
+              >
+                全选匹配的表 ({filteredTables.length})
+              </Checkbox>
+              <Button
+                type="link"
+                size="small"
+                style={{ padding: 0, height: 'auto', fontSize: 13 }}
+                onClick={handleInvertSelection}
+              >
+                反选匹配结果
+              </Button>
+            </div>
+            <div style={{ maxHeight: 300, overflowY: 'auto', margin: '0 -24px', padding: '0 24px' }}>
+              <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
+                {filteredTables.map((table) => {
+                  const key = `${selectedDbName}::${table.name}`;
+                  const selected = selectedTableKeys.includes(key);
+                  return (
+                    <div
+                      key={key}
+                      style={{
+                        padding: '6px 10px',
+                        borderRadius: 6,
+                        transition: 'background 0.2s',
+                        cursor: 'pointer',
+                      }}
+                      onMouseEnter={(event) => {
+                        event.currentTarget.style.background = darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.03)';
+                      }}
+                      onMouseLeave={(event) => {
+                        event.currentTarget.style.background = 'transparent';
+                      }}
+                      onClick={(event) => {
+                        if ((event.target as HTMLElement).tagName.toLowerCase() === 'input') {
+                          return;
+                        }
+                        handleToggleSingle(key, !selected);
+                      }}
+                    >
+                      <Checkbox
+                        checked={selected}
+                        onChange={(event) => handleToggleSingle(key, event.target.checked)}
+                        style={{ color: textColor, width: '100%' }}
+                      >
+                        <span style={{ fontSize: 13, userSelect: 'none' }}>{table.name}</span>
+                      </Checkbox>
+                    </div>
+                  );
+                })}
+              </div>
+            </div>
+          </div>
+        ) : (
+          <div style={{ padding: '40px 0', textAlign: 'center', color: overlayTheme.mutedText }}>
+            {searchText ? `没有找到匹配 '${searchText}' 的表` : '当前数据库没有可关联的表'}
+          </div>
+        )}
+      </Spin>
+    </Modal>
+  );
+};
+
+export default AIContextSelectorModal;
diff --git a/frontend/src/components/ai/AIHistoryDrawer.test.tsx b/frontend/src/components/ai/AIHistoryDrawer.test.tsx
new file mode 100644
index 0000000..a6cb3f0
--- /dev/null
+++ b/frontend/src/components/ai/AIHistoryDrawer.test.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { readFileSync } from 'node:fs';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('antd', async () => {
+  const actual = await vi.importActual<typeof import('antd')>('antd');
+  return {
+    ...actual,
+    Drawer: ({ children }: { children?: React.ReactNode }) => <div data-testid="mock-drawer">{children}</div>,
+  };
+});
+
+import { AIHistoryDrawer } from './AIHistoryDrawer';
+
+const setAIActiveSessionId = vi.fn();
+const deleteAISession = vi.fn();
+
+let mockState = {
+  aiChatSessions: [] as Array<{ id: string; title: string; updatedAt: number }>,
+  setAIActiveSessionId,
+  deleteAISession,
+};
+
+vi.mock('../../store', () => ({
+  useStore: (selector: (state: typeof mockState) => unknown) => selector(mockState),
+}));
+
+const source = readFileSync(new URL('./AIHistoryDrawer.tsx', import.meta.url), 'utf8');
+const drawerOpenTag = source.match(/<Drawer[\s\S]*?>/)?.[0] || '';
+
+const renderHistoryDrawer = () => renderToStaticMarkup(
+  <AIHistoryDrawer
+    open
+    onClose={() => {}}
+    bgColor="#ffffff"
+    darkMode={false}
+    textColor="#162033"
+    mutedColor="rgba(16,24,40,0.55)"
+    borderColor="rgba(0,0,0,0.12)"
+    onCreateNew={() => {}}
+    sessionId="current-session"
+  />
+);
+
+describe('AIHistoryDrawer', () => {
+  beforeEach(() => {
+    setAIActiveSessionId.mockReset();
+    deleteAISession.mockReset();
+    mockState = {
+      aiChatSessions: [],
+      setAIActiveSessionId,
+      deleteAISession,
+    };
+  });
+
+  it('uses antd v5 drawer style props instead of deprecated style/bodyStyle props', () => {
+    expect(drawerOpenTag).toContain("rootStyle={{ position: 'absolute' }}");
+    expect(drawerOpenTag).toContain('styles={{');
+    expect(drawerOpenTag).not.toContain('bodyStyle=');
+    expect(drawerOpenTag).not.toMatch(/\n\s*style=\{\{/);
+  });
+
+  it('renders recent sessions before older sessions', () => {
+    mockState = {
+      ...mockState,
+      aiChatSessions: [
+        { id: 'older-session', title: '较早会话', updatedAt: 1710000000000 },
+        { id: 'newer-session', title: '较新会话', updatedAt: 1720000000000 },
+      ],
+    };
+
+    const markup = renderHistoryDrawer();
+
+    expect(markup.indexOf('较新会话')).toBeGreaterThanOrEqual(0);
+    expect(markup.indexOf('较早会话')).toBeGreaterThanOrEqual(0);
+    expect(markup.indexOf('较新会话')).toBeLessThan(markup.indexOf('较早会话'));
+  });
+
+  it('renders the dedicated empty state when there is no history session', () => {
+    const markup = renderHistoryDrawer();
+
+    expect(markup).toContain('还没有历史对话');
+  });
+});
diff --git a/frontend/src/components/ai/AIHistoryDrawer.tsx b/frontend/src/components/ai/AIHistoryDrawer.tsx
index 7f80e7c..eb890fb 100644
--- a/frontend/src/components/ai/AIHistoryDrawer.tsx
+++ b/frontend/src/components/ai/AIHistoryDrawer.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { Drawer, Button, Tooltip, Input } from 'antd';
 import { MenuFoldOutlined, PlusOutlined, DeleteOutlined, SearchOutlined } from '@ant-design/icons';
 import { useStore } from '../../store';
-import { useI18n } from '../../i18n/provider';
+import { useOptionalI18n } from '../../i18n/provider';
 
 interface AIHistoryDrawerProps {
     open: boolean;
@@ -19,18 +19,37 @@ interface AIHistoryDrawerProps {
 export const AIHistoryDrawer: React.FC<AIHistoryDrawerProps> = ({
     open, onClose, bgColor, darkMode, textColor, mutedColor, borderColor, onCreateNew, sessionId
 }) => {
-    const { t } = useI18n();
+    const i18n = useOptionalI18n();
+    const t = i18n?.t ?? ((key: string) => key);
     const aiChatSessions = useStore(state => state.aiChatSessions);
     const setAIActiveSessionId = useStore(state => state.setAIActiveSessionId);
     const deleteAISession = useStore(state => state.deleteAISession);
 
     const [searchText, setSearchText] = useState('');
+    const normalizedSearchText = searchText.trim().toLowerCase();
     const defaultSessionTitle = t('ai_chat.history.default_session_title');
 
-    const filteredSessions = aiChatSessions.filter(s => 
-        !searchText || s.title.toLowerCase().includes(searchText.toLowerCase())
+    React.useEffect(() => {
+        if (!open && searchText) {
+            setSearchText('');
+        }
+    }, [open, searchText]);
+
+    const sortedSessions = React.useMemo(
+        () => [...aiChatSessions].sort((left, right) => right.updatedAt - left.updatedAt),
+        [aiChatSessions],
     );
 
+    const filteredSessions = React.useMemo(
+        () => sortedSessions.filter((session) =>
+            !normalizedSearchText || (session.title && session.title.toLowerCase().includes(normalizedSearchText))),
+        [normalizedSearchText, sortedSessions],
+    );
+
+    const emptyStateText = !i18n && aiChatSessions.length === 0
+        ? '还没有历史对话'
+        : t('ai_chat.history.empty.no_matches');
+
     return (
         <Drawer
             placement="left"
@@ -38,9 +57,18 @@ export const AIHistoryDrawer: React.FC<AIHistoryDrawerProps> = ({
             onClose={onClose}
             open={open}
             getContainer={false}
-            style={{ position: 'absolute', background: bgColor || (darkMode ? '#1e1e1e' : '#f8f9fa') }}
+            rootStyle={{ position: 'absolute' }}
             width={260}
-            bodyStyle={{ padding: 0, display: 'flex', flexDirection: 'column' }}
+            styles={{
+                content: {
+                    background: bgColor || (darkMode ? '#1e1e1e' : '#f8f9fa'),
+                },
+                body: {
+                    padding: 0,
+                    display: 'flex',
+                    flexDirection: 'column',
+                },
+            }}
         >
             <div style={{ padding: '16px 16px 12px', display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
                 <span style={{ fontSize: 14, fontWeight: 600, color: textColor }}>{t('ai_chat.history.title')}</span>
@@ -50,10 +78,10 @@ export const AIHistoryDrawer: React.FC<AIHistoryDrawerProps> = ({
             </div>
 
             <div style={{ padding: '0 12px 12px' }}>
-                <Button 
-                    type="dashed" 
-                    block 
-                    icon={<PlusOutlined />} 
+                <Button
+                    type="dashed"
+                    block
+                    icon={<PlusOutlined />}
                     onClick={() => { onCreateNew(); onClose(); }}
                     style={{ borderColor: borderColor, color: textColor, background: 'transparent' }}
                 >
@@ -62,9 +90,10 @@ export const AIHistoryDrawer: React.FC<AIHistoryDrawerProps> = ({
             </div>
 
             <div style={{ padding: '0 12px 12px' }}>
-                <Input 
+                <Input
                     placeholder={t('ai_chat.history.search.placeholder')}
                     prefix={<SearchOutlined style={{ color: mutedColor }} />}
+                    allowClear
                     value={searchText}
                     onChange={e => setSearchText(e.target.value)}
                     variant="filled"
@@ -75,10 +104,10 @@ export const AIHistoryDrawer: React.FC<AIHistoryDrawerProps> = ({
 
             <div style={{ flex: 1, overflowY: 'auto', padding: '0 10px 16px' }} className="ai-history-list">
                 {filteredSessions.length === 0 ? (
-                    <div style={{ padding: '30px 0', textAlign: 'center', color: mutedColor, fontSize: 12 }}>{t('ai_chat.history.empty.no_matches')}</div>
+                    <div style={{ padding: '30px 0', textAlign: 'center', color: mutedColor, fontSize: 12 }}>{emptyStateText}</div>
                 ) : (
                     filteredSessions.map(session => (
-                        <div 
+                        <div
                             key={session.id}
                             className={`ai-history-item ${sessionId === session.id ? 'active' : ''}`}
                             onClick={() => { setAIActiveSessionId(session.id); onClose(); }}
@@ -103,12 +132,12 @@ export const AIHistoryDrawer: React.FC<AIHistoryDrawerProps> = ({
                                 </div>
                             </div>
                             <Tooltip title={t('ai_chat.history.tooltip.delete')}>
-                                <Button 
+                                <Button
                                     className="ai-history-delete-btn"
-                                    type="text" 
-                                    size="small" 
-                                    danger 
-                                    icon={<DeleteOutlined />} 
+                                    type="text"
+                                    size="small"
+                                    danger
+                                    icon={<DeleteOutlined />}
                                     onClick={(e) => {
                                         e.stopPropagation();
                                         deleteAISession(session.id);
diff --git a/frontend/src/components/ai/AIMCPArgumentHints.test.tsx b/frontend/src/components/ai/AIMCPArgumentHints.test.tsx
new file mode 100644
index 0000000..3104d64
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPArgumentHints.test.tsx
@@ -0,0 +1,154 @@
+import React from 'react';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+import { describe, expect, it, vi } from 'vitest';
+
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPArgumentHints from './AIMCPArgumentHints';
+
+const flattenRendererText = (node: any): string => {
+  if (node == null || typeof node === 'boolean') {
+    return '';
+  }
+  if (typeof node === 'string' || typeof node === 'number') {
+    return String(node);
+  }
+  if (Array.isArray(node)) {
+    return node.map((item) => flattenRendererText(item)).join('');
+  }
+  return flattenRendererText(node.children ?? node.props?.children);
+};
+
+describe('AIMCPArgumentHints', () => {
+  it('can append missing required args from command-specific hints', async () => {
+    const onArgsChange = vi.fn();
+    let renderer!: ReactTestRenderer;
+
+    await act(async () => {
+      renderer = create(
+        <AIMCPArgumentHints
+          command="docker"
+          args={['run', '--rm']}
+          onArgsChange={onArgsChange}
+          cardBorder="rgba(0,0,0,0.08)"
+          darkMode={false}
+          overlayTheme={buildOverlayWorkbenchTheme(false)}
+        />,
+      );
+    });
+
+    const buttons = renderer.root.findAll(
+      (node) => node.type === 'button' && flattenRendererText(node).includes('一键补齐缺失必填参数'),
+    );
+
+    expect(buttons.length).toBe(1);
+    expect(flattenRendererText(buttons[0])).toContain('-i / mcp/server-fetch:latest');
+
+    await act(async () => {
+      buttons[0].props.onClick();
+    });
+
+    expect(onArgsChange).toHaveBeenCalledWith(['run', '--rm', '-i', 'mcp/server-fetch:latest']);
+  });
+
+  it('can split a full command line pasted into the command field', async () => {
+    const onArgsChange = vi.fn();
+    const onCommandArgsChange = vi.fn();
+    let renderer!: ReactTestRenderer;
+
+    await act(async () => {
+      renderer = create(
+        <AIMCPArgumentHints
+          command="docker run --rm mcp/server-fetch:latest"
+          args={['--env', 'API_KEY=secret']}
+          onArgsChange={onArgsChange}
+          onCommandArgsChange={onCommandArgsChange}
+          cardBorder="rgba(0,0,0,0.08)"
+          darkMode={false}
+          overlayTheme={buildOverlayWorkbenchTheme(false)}
+        />,
+      );
+    });
+
+    const text = flattenRendererText(renderer.toJSON());
+    expect(text).toContain('启动命令字段里还包含 3 个参数');
+    expect(text).not.toContain('一键补齐缺失必填参数');
+
+    const buttons = renderer.root.findAll(
+      (node) => node.type === 'button' && flattenRendererText(node).includes('一键拆分启动命令字段'),
+    );
+
+    expect(buttons.length).toBe(1);
+
+    await act(async () => {
+      buttons[0].props.onClick();
+    });
+
+    expect(onArgsChange).not.toHaveBeenCalled();
+    expect(onCommandArgsChange).toHaveBeenCalledWith('docker', [
+      'run',
+      '--rm',
+      'mcp/server-fetch:latest',
+      '--env',
+      'API_KEY=secret',
+    ]);
+  });
+
+  it('renders business argument hints without leaking sensitive values', async () => {
+    let renderer!: ReactTestRenderer;
+
+    await act(async () => {
+      renderer = create(
+        <AIMCPArgumentHints
+          command="uvx"
+          args={[
+            'mcp-server-demo',
+            '--stdio',
+            '--api-key=sk-real-secret',
+            '--directory',
+            'D:\\Work',
+          ]}
+          cardBorder="rgba(0,0,0,0.08)"
+          darkMode={false}
+          overlayTheme={buildOverlayWorkbenchTheme(false)}
+        />,
+      );
+    });
+
+    const text = flattenRendererText(renderer.toJSON());
+    expect(text).toContain('参数逐项说明');
+    expect(text).toContain('已识别业务参数');
+    expect(text).toContain('--api-key');
+    expect(text).toContain('API Key');
+    expect(text).toContain('不要截图真实值');
+    expect(text).toContain('--directory');
+    expect(text).toContain('授权目录');
+    expect(text).toContain('值已脱敏');
+    expect(text).not.toContain('sk-real-secret');
+  });
+
+  it('renders fallback explanations for unknown MCP args', async () => {
+    let renderer!: ReactTestRenderer;
+
+    await act(async () => {
+      renderer = create(
+        <AIMCPArgumentHints
+          command="acme-mcp-server"
+          args={['--tenant', 'prod', 'target-a']}
+          cardBorder="rgba(0,0,0,0.08)"
+          darkMode={false}
+          overlayTheme={buildOverlayWorkbenchTheme(false)}
+        />,
+      );
+    });
+
+    const text = flattenRendererText(renderer.toJSON());
+    expect(text).toContain('参数逐项说明');
+    expect(text).toContain('--tenant');
+    expect(text).toContain('未识别参数');
+    expect(text).toContain('GoNavi 不能从参数名 --tenant 准确判断业务含义');
+    expect(text).toContain('prod');
+    expect(text).toContain('未识别参数的值');
+    expect(text).toContain('target-a');
+    expect(text).toContain('位置参数');
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPArgumentHints.tsx b/frontend/src/components/ai/AIMCPArgumentHints.tsx
new file mode 100644
index 0000000..4a406b6
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPArgumentHints.tsx
@@ -0,0 +1,275 @@
+import React from 'react';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import { buildMCPArgumentDetailHints } from '../../utils/mcpArgumentDetailHints';
+import { buildMCPArgumentHintProfile } from '../../utils/mcpArgumentHints';
+import { splitShellLikeCommand } from '../../utils/mcpCommandDraft';
+import { buildMCPHintStyle, mcpLabelStyle } from './AIMCPHelpBlock';
+
+interface AIMCPArgumentHintsProps {
+  command: string;
+  args?: string[];
+  onArgsChange?: (args: string[]) => void;
+  onCommandArgsChange?: (command: string, args: string[]) => void;
+  cardBorder: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+}
+
+const buildMissingRequiredArgs = (
+  profile: NonNullable<ReturnType<typeof buildMCPArgumentHintProfile>>,
+): string[] =>
+  profile.steps
+    .filter((step) => step.required && !step.satisfied)
+    .flatMap((step) => splitShellLikeCommand(step.example).tokens)
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+const mergeArgs = (left: string[], right: string[]): string[] => {
+  const seen = new Set<string>();
+  const result: string[] = [];
+  for (const item of [...left, ...right]) {
+    const text = String(item || '').trim();
+    if (!text) continue;
+    const key = text.toLowerCase();
+    if (seen.has(key)) continue;
+    seen.add(key);
+    result.push(text);
+  }
+  return result;
+};
+
+const businessHintCategoryLabel = {
+  secret: '敏感',
+  path: '路径',
+  endpoint: '地址',
+  network: '网络',
+  mode: '模式',
+  runtime: '运行时',
+  generic: '业务',
+};
+
+const businessHintCategoryColor = {
+  secret: '#b45309',
+  path: '#7c3aed',
+  endpoint: '#2563eb',
+  network: '#0f766e',
+  mode: '#475569',
+  runtime: '#64748b',
+  generic: '#64748b',
+};
+
+const AIMCPArgumentHints: React.FC<AIMCPArgumentHintsProps> = ({
+  command,
+  args,
+  onArgsChange,
+  onCommandArgsChange,
+  cardBorder,
+  darkMode,
+  overlayTheme,
+}) => {
+  const profile = buildMCPArgumentHintProfile(command, args);
+  if (!profile) {
+    return null;
+  }
+  const missingRequiredArgs = buildMissingRequiredArgs(profile);
+  const argumentHints = buildMCPArgumentDetailHints(profile.commandName, [
+    ...profile.inlineArgs,
+    ...(args || []),
+  ]);
+  const canApplyMissingArgs = Boolean(onArgsChange && missingRequiredArgs.length > 0 && profile.inlineArgs.length === 0);
+  const canSplitInlineArgs = Boolean(onCommandArgsChange && profile.inlineArgs.length > 0);
+
+  return (
+    <div
+      style={{
+        padding: '10px 12px',
+        borderRadius: 10,
+        border: `1px dashed ${cardBorder}`,
+        background: darkMode ? 'rgba(255,255,255,0.025)' : 'rgba(255,255,255,0.7)',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 8,
+      }}
+    >
+      <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>
+        当前命令 {profile.commandName} 的参数提示
+      </div>
+      <div style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText }}>
+        {profile.title}
+      </div>
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>{profile.summary}</div>
+      {profile.commandFieldWarning ? (
+        <div style={buildMCPHintStyle('#b45309')}>{profile.commandFieldWarning}</div>
+      ) : null}
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>{profile.orderHint}</div>
+      <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8 }}>
+        {profile.steps.map((step) => (
+          <span
+            key={step.key}
+            style={{
+              padding: '4px 9px',
+              borderRadius: 999,
+              fontSize: 12,
+              border: `1px solid ${cardBorder}`,
+              color: step.satisfied ? '#16a34a' : (step.required ? '#b45309' : overlayTheme.mutedText),
+              background: step.satisfied
+                ? (darkMode ? 'rgba(34,197,94,0.14)' : 'rgba(34,197,94,0.10)')
+                : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(255,255,255,0.82)'),
+            }}
+            title={step.detail}
+          >
+            {step.label}: <code style={{ fontFamily: 'var(--gn-font-mono)' }}>{step.example}</code>
+            {step.required ? ' *' : ''}
+          </span>
+        ))}
+      </div>
+      {argumentHints.length > 0 ? (
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+          <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>
+            参数逐项说明
+          </div>
+          <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(220px, 1fr))', gap: 8 }}>
+            {argumentHints.map((hint) => (
+              <div
+                key={hint.key}
+                style={{
+                  padding: '8px 10px',
+                  borderRadius: 10,
+                  border: `1px solid ${cardBorder}`,
+                  background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.82)',
+                  display: 'flex',
+                  flexDirection: 'column',
+                  gap: 5,
+                }}
+              >
+                <div style={{ display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap' }}>
+                  <code style={{ fontFamily: 'var(--gn-font-mono)', fontSize: 12, color: overlayTheme.titleText }}>
+                    {hint.argument}
+                  </code>
+                  <span
+                    style={{
+                      padding: '1px 7px',
+                      borderRadius: 999,
+                      fontSize: 11,
+                      fontWeight: 700,
+                      color: businessHintCategoryColor[hint.category],
+                      background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(15,23,42,0.05)',
+                    }}
+                  >
+                    {businessHintCategoryLabel[hint.category]}
+                  </span>
+                  {hint.sensitive ? <span style={buildMCPHintStyle('#b45309')}>值已脱敏</span> : null}
+                </div>
+                <div style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText }}>{hint.label}</div>
+                <div style={buildMCPHintStyle(overlayTheme.mutedText)}>{hint.detail}</div>
+                <div style={buildMCPHintStyle(hint.sensitive ? '#b45309' : overlayTheme.mutedText)}>
+                  应填：{hint.valueHint}
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      ) : null}
+      {profile.businessHints.length > 0 ? (
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+          <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>
+            已识别业务参数
+          </div>
+          <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(220px, 1fr))', gap: 8 }}>
+            {profile.businessHints.map((hint) => (
+              <div
+                key={hint.key}
+                style={{
+                  padding: '8px 10px',
+                  borderRadius: 10,
+                  border: `1px solid ${cardBorder}`,
+                  background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.82)',
+                  display: 'flex',
+                  flexDirection: 'column',
+                  gap: 5,
+                }}
+              >
+                <div style={{ display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap' }}>
+                  <code style={{ fontFamily: 'var(--gn-font-mono)', fontSize: 12, color: overlayTheme.titleText }}>
+                    {hint.argument}
+                  </code>
+                  <span
+                    style={{
+                      padding: '1px 7px',
+                      borderRadius: 999,
+                      fontSize: 11,
+                      fontWeight: 700,
+                      color: businessHintCategoryColor[hint.category],
+                      background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(15,23,42,0.05)',
+                    }}
+                  >
+                    {businessHintCategoryLabel[hint.category]}
+                  </span>
+                  {hint.sensitive ? <span style={buildMCPHintStyle('#b45309')}>不要截图真实值</span> : null}
+                </div>
+                <div style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText }}>{hint.label}</div>
+                <div style={buildMCPHintStyle(overlayTheme.mutedText)}>{hint.detail}</div>
+                <div style={buildMCPHintStyle(hint.sensitive ? '#b45309' : overlayTheme.mutedText)}>
+                  应填：{hint.valueHint}
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      ) : null}
+      {profile.nextActions.length > 0 ? (
+        <div style={buildMCPHintStyle('#b45309')}>
+          下一步：{profile.nextActions.join('；')}
+        </div>
+      ) : (
+        <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+          必填参数看起来已经齐了，测试失败时再对照 README 检查业务参数和环境变量。
+        </div>
+      )}
+      {canApplyMissingArgs ? (
+        <button
+          type="button"
+          onClick={() => onArgsChange?.([...(args || []), ...missingRequiredArgs])}
+          style={{
+            alignSelf: 'flex-start',
+            padding: '5px 11px',
+            borderRadius: 999,
+            border: `1px solid ${cardBorder}`,
+            background: darkMode ? 'rgba(245,158,11,0.14)' : 'rgba(245,158,11,0.10)',
+            color: '#b45309',
+            fontSize: 12,
+            fontWeight: 700,
+            cursor: 'pointer',
+          }}
+        >
+          一键补齐缺失必填参数：{missingRequiredArgs.join(' / ')}
+        </button>
+      ) : null}
+      {canSplitInlineArgs ? (
+        <button
+          type="button"
+          onClick={() => onCommandArgsChange?.(
+            profile.normalizedCommand,
+            mergeArgs(profile.inlineArgs, args || []),
+          )}
+          style={{
+            alignSelf: 'flex-start',
+            padding: '5px 11px',
+            borderRadius: 999,
+            border: `1px solid ${cardBorder}`,
+            background: darkMode ? 'rgba(37,99,235,0.16)' : 'rgba(37,99,235,0.10)',
+            color: '#2563eb',
+            fontSize: 12,
+            fontWeight: 700,
+            cursor: 'pointer',
+          }}
+        >
+          一键拆分启动命令字段：保留 {profile.normalizedCommand}，移动 {profile.inlineArgs.length} 个参数
+        </button>
+      ) : null}
+    </div>
+  );
+};
+
+export default AIMCPArgumentHints;
diff --git a/frontend/src/components/ai/AIMCPClientInstallPanel.test.tsx b/frontend/src/components/ai/AIMCPClientInstallPanel.test.tsx
new file mode 100644
index 0000000..2abf4cf
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPClientInstallPanel.test.tsx
@@ -0,0 +1,326 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AIMCPClientInstallPanel from './AIMCPClientInstallPanel';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+describe('AIMCPClientInstallPanel', () => {
+  it('renders a clearer external-client selection flow with one selected target and one action button', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPClientInstallPanel
+        statuses={[
+          {
+            client: 'claude-code',
+            displayName: 'Claude Code',
+            installed: false,
+            matchesCurrent: false,
+            clientDetected: false,
+            clientCommand: 'claude',
+            message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+          },
+          {
+            client: 'codex',
+            displayName: 'Codex',
+            installed: true,
+            matchesCurrent: false,
+            clientDetected: true,
+            clientCommand: 'codex',
+            clientPath: 'C:/Users/mock/AppData/Roaming/npm/codex.cmd',
+            message: '已检测到 Codex 中的 GoNavi MCP 记录，但与当前 GoNavi 安装路径不一致，建议更新',
+            configPath: '~/.codex/config.toml',
+            command: 'gonavi-mcp-server',
+            args: ['stdio'],
+          },
+        ]}
+        selectedClient="codex"
+        selectedStatus={{
+          client: 'codex',
+          displayName: 'Codex',
+          installed: true,
+          matchesCurrent: false,
+          clientDetected: true,
+          clientCommand: 'codex',
+          clientPath: 'C:/Users/mock/AppData/Roaming/npm/codex.cmd',
+          message: '已检测到 Codex 中的 GoNavi MCP 记录，但与当前 GoNavi 安装路径不一致，建议更新',
+          configPath: '~/.codex/config.toml',
+          command: 'gonavi-mcp-server',
+          args: ['stdio'],
+        }}
+        selectedCommandText="gonavi-mcp-server stdio"
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        loading={false}
+        statusLoading={false}
+        onSelectClient={() => {}}
+        onRefreshStatus={() => {}}
+        onCopyConfigPath={() => {}}
+        onCopyLaunchCommand={() => {}}
+        onInstall={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('这里是在把 GoNavi MCP 接入 Claude Code / Codex / OpenClaw / Hermans');
+    expect(markup).toContain('给外部工具调用');
+    expect(markup).toContain('OpenClaw、Hermans 这类云端 Agent 会提供远程接入说明');
+    expect(markup).toContain('接入外部客户端');
+    expect(markup).toContain('选择外部客户端');
+    expect(markup).toContain('选择目标客户端');
+    expect(markup).toContain('写入或复制配置');
+    expect(markup).toContain('重启或配置目标端');
+    expect(markup).toContain('未接入');
+    expect(markup).toContain('需更新');
+    expect(markup).toContain('外部工具接入状态：已存在旧配置，需更新');
+    expect(markup).toContain('外部工具接入状态：未接入');
+    expect(markup).toContain('复制配置路径');
+    expect(markup).toContain('复制启动命令');
+    expect(markup).toContain('更新 Codex 接入配置');
+    expect(markup).toContain('已选客户端状态');
+    expect(markup).toContain('CLI 检测：已检测到 codex');
+    expect(markup).toContain('当前已选中，将只对这个客户端执行写入或更新');
+    expect(markup).toContain('当前目标客户端：Codex');
+  });
+
+  it('shows an already-connected label and supports prewriting config when the client command is not detected locally', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPClientInstallPanel
+        statuses={[
+          {
+            client: 'claude-code',
+            displayName: 'Claude Code',
+            installed: false,
+            matchesCurrent: false,
+            clientDetected: false,
+            clientCommand: 'claude',
+            message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+          },
+          {
+            client: 'codex',
+            displayName: 'Codex',
+            installed: true,
+            matchesCurrent: true,
+            clientDetected: true,
+            clientCommand: 'codex',
+            message: '已检测到 Codex 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+          },
+        ]}
+        selectedClient="claude-code"
+        selectedStatus={{
+          client: 'claude-code',
+          displayName: 'Claude Code',
+          installed: false,
+          matchesCurrent: false,
+          clientDetected: false,
+          clientCommand: 'claude',
+          message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+        }}
+        selectedCommandText="gonavi-mcp-server stdio"
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        loading={false}
+        statusLoading={false}
+        onSelectClient={() => {}}
+        onRefreshStatus={() => {}}
+        onCopyConfigPath={() => {}}
+        onCopyLaunchCommand={() => {}}
+        onInstall={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('安装到 Claude Code（外部工具）');
+    expect(markup).toContain('CLI 检测：未检测到 claude');
+    expect(markup).toContain('未检测到本机 claude 命令');
+    expect(markup).toContain('已接入');
+  });
+
+  it('renders remote Agent clients as bridge guidance instead of local installs', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPClientInstallPanel
+        statuses={[
+          {
+            client: 'openclaw',
+            displayName: 'OpenClaw',
+            installMode: 'remote',
+            installed: false,
+            matchesCurrent: false,
+            clientDetected: false,
+            clientCommand: 'openclaw',
+            message: 'OpenClaw 通常部署在云端 Linux；请通过远程 MCP 桥接接入 Windows GoNavi，不要复制数据库密码。',
+          },
+          {
+            client: 'hermans',
+            displayName: 'Hermans',
+            installMode: 'remote',
+            installed: false,
+            matchesCurrent: false,
+            clientDetected: false,
+            clientCommand: 'hermans',
+            message: 'Hermans 这类远程 Agent 请通过远程 MCP 桥接接入 Windows GoNavi，不要复制数据库密码。',
+          },
+        ]}
+        selectedClient="openclaw"
+        selectedStatus={{
+          client: 'openclaw',
+          displayName: 'OpenClaw',
+          installMode: 'remote',
+          installed: false,
+          matchesCurrent: false,
+          clientDetected: false,
+          clientCommand: 'openclaw',
+          message: 'OpenClaw 通常部署在云端 Linux；请通过远程 MCP 桥接接入 Windows GoNavi，不要复制数据库密码。',
+        }}
+        selectedCommandText=""
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        loading={false}
+        statusLoading={false}
+        onSelectClient={() => {}}
+        onRefreshStatus={() => {}}
+        onCopyConfigPath={() => {}}
+        onCopyLaunchCommand={() => {}}
+        onInstall={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('远程桥接');
+    expect(markup).toContain('当前已选中，将复制远程接入说明');
+    expect(markup).toContain('远程接入边界');
+    expect(markup).toContain('云端 Agent 默认通过 schema-only MCP 工具读取连接摘要、库表和 DDL');
+    expect(markup).toContain('不注册 execute_sql');
+    expect(markup).toContain('OpenClaw 远程 MCP 快速配置');
+    expect(markup).toContain('公网/隧道 URL');
+    expect(markup).toContain('云端 Agent 能访问到的 Streamable HTTP MCP 地址');
+    expect(markup).toContain('不要填 Windows 本机的 127.0.0.1');
+    expect(markup).toContain('Bearer Token');
+    expect(markup).toContain('Windows 启动命令和云端 Agent 配置必须一致');
+    expect(markup).toContain('不要把数据库密码当 token 填进去');
+    expect(markup).toContain('本机监听地址');
+    expect(markup).toContain('MCP 路径');
+    expect(markup).toContain('配置到云端 Agent');
+    expect(markup).toContain('无 GUI / CLI 生成配置');
+    expect(markup).toContain('&quot;type&quot;: &quot;streamable-http&quot;');
+    expect(markup).toContain('&quot;url&quot;: &quot;https://&lt;你的域名或隧道地址&gt;/mcp&quot;');
+    expect(markup).toContain('&quot;Authorization&quot;: &quot;Bearer &lt;随机token&gt;&quot;');
+    expect(markup).toContain('GoNavi.exe mcp-server remote-config --client openclaw --url https://&lt;你的域名或隧道地址&gt;/mcp --token &lt;随机token&gt; --schema-only');
+    expect(markup).toContain('Windows 启动 GoNavi MCP HTTP');
+    expect(markup).toContain('GoNavi.exe mcp-server http --addr 127.0.0.1:8765 --path /mcp --token &lt;随机token&gt; --schema-only');
+    expect(markup).toContain('独立二进制：gonavi-mcp-server http --addr 127.0.0.1:8765 --path /mcp --token &lt;随机token&gt; --schema-only');
+    expect(markup).toContain('验证顺序');
+    expect(markup).toContain('安全边界');
+    expect(markup).toContain('数据库账号和密码仍保存在 Windows GoNavi');
+    expect(markup).toContain('默认 --schema-only 不注册 execute_sql');
+    expect(markup).toContain('CLI 检测：远程 Agent 不需要检测本机 openclaw 命令');
+    expect(markup).toContain('复制 OpenClaw 远程接入说明');
+  });
+
+  it('makes repeated install avoidance explicit when the selected client already matches current GoNavi', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPClientInstallPanel
+        statuses={[
+          {
+            client: 'claude-code',
+            displayName: 'Claude Code',
+            installed: true,
+            matchesCurrent: true,
+            clientDetected: true,
+            clientCommand: 'claude',
+            message: '已检测到 Claude Code 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+          },
+          {
+            client: 'codex',
+            displayName: 'Codex',
+            installed: false,
+            matchesCurrent: false,
+            clientDetected: false,
+            clientCommand: 'codex',
+            message: '未检测到 Codex 用户级 GoNavi MCP 配置',
+          },
+        ]}
+        selectedClient="claude-code"
+        selectedStatus={{
+          client: 'claude-code',
+          displayName: 'Claude Code',
+          installed: true,
+          matchesCurrent: true,
+          clientDetected: true,
+          clientCommand: 'claude',
+          message: '已检测到 Claude Code 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+        }}
+        selectedCommandText="gonavi-mcp-server stdio"
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        loading={false}
+        statusLoading={false}
+        onSelectClient={() => {}}
+        onRefreshStatus={() => {}}
+        onCopyConfigPath={() => {}}
+        onCopyLaunchCommand={() => {}}
+        onInstall={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('当前状态：已接入当前 GoNavi，无需重复操作');
+    expect(markup).toContain('Claude Code 已接入，无需重复安装');
+    expect(markup).toContain('下面的主按钮会自动禁用，避免重复写入');
+  });
+
+  it('prefers the client that already matches current GoNavi over another stale installed record', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPClientInstallPanel
+        statuses={[
+          {
+            client: 'claude-code',
+            displayName: 'Claude Code',
+            installed: true,
+            matchesCurrent: true,
+            clientDetected: true,
+            clientCommand: 'claude',
+            message: '已检测到 Claude Code 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+          },
+          {
+            client: 'codex',
+            displayName: 'Codex',
+            installed: true,
+            matchesCurrent: false,
+            clientDetected: true,
+            clientCommand: 'codex',
+            message: '已检测到 Codex 中的 GoNavi MCP 记录，但与当前 GoNavi 安装路径不一致，建议更新',
+          },
+        ]}
+        selectedClient="claude-code"
+        selectedStatus={{
+          client: 'claude-code',
+          displayName: 'Claude Code',
+          installed: true,
+          matchesCurrent: true,
+          clientDetected: true,
+          clientCommand: 'claude',
+          message: '已检测到 Claude Code 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+        }}
+        selectedCommandText="gonavi-mcp-server stdio"
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        loading={false}
+        statusLoading={false}
+        onSelectClient={() => {}}
+        onRefreshStatus={() => {}}
+        onCopyConfigPath={() => {}}
+        onCopyLaunchCommand={() => {}}
+        onInstall={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('已选客户端状态');
+    expect(markup).toContain('当前状态：已接入当前 GoNavi，无需重复操作');
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPClientInstallPanel.tsx b/frontend/src/components/ai/AIMCPClientInstallPanel.tsx
new file mode 100644
index 0000000..7f50396
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPClientInstallPanel.tsx
@@ -0,0 +1,133 @@
+import React from 'react';
+import { Button } from 'antd';
+
+import type { AIMCPClientInstallStatus } from '../../types';
+import {
+  isRemoteMCPClientStatus,
+  type MCPClientKey,
+} from '../../utils/mcpClientInstallStatus';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPClientSelectorPanel from './AIMCPClientSelectorPanel';
+import AIMCPClientStatusPanel from './AIMCPClientStatusPanel';
+import {
+  getMCPClientDetectionSummary,
+  resolveMCPClientInstallActionLabel,
+} from './mcpClientInstallPanelState';
+
+interface AIMCPClientInstallPanelProps {
+  statuses: AIMCPClientInstallStatus[];
+  selectedClient: MCPClientKey;
+  selectedStatus?: AIMCPClientInstallStatus;
+  selectedCommandText: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBg: string;
+  cardBorder: string;
+  loading: boolean;
+  statusLoading: boolean;
+  onSelectClient: (client: MCPClientKey) => void;
+  onRefreshStatus: () => void;
+  onCopyConfigPath: () => void;
+  onCopyLaunchCommand: () => void;
+  onInstall: () => void;
+}
+
+const AIMCPClientInstallPanel: React.FC<AIMCPClientInstallPanelProps> = ({
+  statuses,
+  selectedClient,
+  selectedStatus,
+  selectedCommandText,
+  darkMode,
+  overlayTheme,
+  cardBg,
+  cardBorder,
+  loading,
+  statusLoading,
+  onSelectClient,
+  onRefreshStatus,
+  onCopyConfigPath,
+  onCopyLaunchCommand,
+  onInstall,
+}) => {
+  const selectedIsRemoteClient = isRemoteMCPClientStatus(selectedStatus);
+
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+      <div
+        style={{
+          padding: '16px',
+          borderRadius: 14,
+          border: `1px solid ${cardBorder}`,
+          background: cardBg,
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 14,
+        }}
+      >
+        <div
+          style={{
+            padding: '12px 14px',
+            borderRadius: 12,
+            border: `1px solid ${darkMode ? 'rgba(96,165,250,0.16)' : 'rgba(96,165,250,0.18)'}`,
+            background: darkMode ? 'rgba(59,130,246,0.08)' : 'rgba(59,130,246,0.05)',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 6,
+          }}
+        >
+          <div style={{ fontWeight: 700, fontSize: 13, color: overlayTheme.titleText }}>
+            这里是在把 GoNavi MCP 接入 Claude Code / Codex / OpenClaw / Hermans，给外部工具调用，不是给 GoNavi 自己安装插件。
+          </div>
+          <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+            Claude Code 和 Codex 会写入本机用户级 MCP 配置；OpenClaw、Hermans 这类云端 Agent 会提供远程接入说明，避免把数据库密码复制到云端。
+          </div>
+        </div>
+
+        <AIMCPClientSelectorPanel
+          statuses={statuses}
+          selectedClient={selectedClient}
+          darkMode={darkMode}
+          overlayTheme={overlayTheme}
+          cardBorder={cardBorder}
+          statusLoading={statusLoading}
+          onSelectClient={onSelectClient}
+        />
+
+        <AIMCPClientStatusPanel
+          selectedStatus={selectedStatus}
+          selectedCommandText={selectedCommandText}
+          darkMode={darkMode}
+          overlayTheme={overlayTheme}
+          cardBorder={cardBorder}
+          statusLoading={statusLoading}
+          onRefreshStatus={onRefreshStatus}
+          onCopyConfigPath={onCopyConfigPath}
+          onCopyLaunchCommand={onCopyLaunchCommand}
+        />
+
+        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: 12, flexWrap: 'wrap' }}>
+          <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>
+            {getMCPClientDetectionSummary(selectedStatus)}
+            {!selectedIsRemoteClient && (
+              <>
+                {' '}
+                已经接入当前这份 GoNavi 时，下面的主按钮会自动禁用，避免重复写入。
+              </>
+            )}
+          </div>
+          <Button
+            type={selectedStatus?.matchesCurrent ? 'default' : 'primary'}
+            onClick={onInstall}
+            loading={loading}
+            disabled={Boolean(selectedStatus?.matchesCurrent)}
+            style={{ borderRadius: 10, fontWeight: 600, width: 208, maxWidth: '100%', height: 40 }}
+          >
+            {resolveMCPClientInstallActionLabel(selectedStatus)}
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AIMCPClientInstallPanel;
diff --git a/frontend/src/components/ai/AIMCPClientSelectorPanel.test.tsx b/frontend/src/components/ai/AIMCPClientSelectorPanel.test.tsx
new file mode 100644
index 0000000..65729a3
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPClientSelectorPanel.test.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPClientSelectorPanel from './AIMCPClientSelectorPanel';
+
+describe('AIMCPClientSelectorPanel', () => {
+  it('renders local install and remote bridge choices with clear state labels', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPClientSelectorPanel
+        statuses={[
+          {
+            client: 'codex',
+            displayName: 'Codex',
+            installed: true,
+            matchesCurrent: true,
+            clientDetected: true,
+            clientCommand: 'codex',
+            message: '已检测到 Codex 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+          },
+          {
+            client: 'openclaw',
+            displayName: 'OpenClaw',
+            installMode: 'remote',
+            installed: false,
+            matchesCurrent: false,
+            clientDetected: false,
+            clientCommand: 'openclaw',
+            message: 'OpenClaw 通常部署在云端 Linux；请通过远程 MCP 桥接接入 Windows GoNavi。',
+          },
+        ]}
+        selectedClient="openclaw"
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBorder="rgba(0,0,0,0.08)"
+        statusLoading={false}
+        onSelectClient={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('接入外部客户端');
+    expect(markup).toContain('选择目标客户端');
+    expect(markup).toContain('写入或复制配置');
+    expect(markup).toContain('重启或配置目标端');
+    expect(markup).toContain('Codex');
+    expect(markup).toContain('已接入');
+    expect(markup).toContain('OpenClaw');
+    expect(markup).toContain('远程桥接');
+    expect(markup).toContain('当前已选中，将复制远程接入说明');
+    expect(markup).toContain('云端 Agent');
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPClientSelectorPanel.tsx b/frontend/src/components/ai/AIMCPClientSelectorPanel.tsx
new file mode 100644
index 0000000..57e47d7
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPClientSelectorPanel.tsx
@@ -0,0 +1,186 @@
+import React from 'react';
+import { CheckCircleFilled } from '@ant-design/icons';
+
+import type { AIMCPClientInstallStatus } from '../../types';
+import {
+  isMCPClientKey,
+  isRemoteMCPClientStatus,
+  type MCPClientKey,
+} from '../../utils/mcpClientInstallStatus';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import {
+  getMCPClientInstallStateLabel,
+  getMCPClientOptionSummary,
+  getMCPClientStatusTone,
+} from './mcpClientInstallPanelState';
+
+interface AIMCPClientSelectorPanelProps {
+  statuses: AIMCPClientInstallStatus[];
+  selectedClient: MCPClientKey;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBorder: string;
+  statusLoading: boolean;
+  onSelectClient: (client: MCPClientKey) => void;
+}
+
+const MCP_CLIENT_INSTALL_STEPS = [
+  { step: '1', title: '选择目标客户端', detail: '本机 Claude/Codex 可自动安装，OpenClaw/Hermans 走远程接入说明。' },
+  { step: '2', title: '写入或复制配置', detail: '自动安装只改用户级 MCP 配置；远程 Agent 复制桥接说明。' },
+  { step: '3', title: '重启或配置目标端', detail: '本机 CLI 重启后验证；云端 Agent 配置远程 MCP 地址后验证。' },
+];
+
+const AIMCPClientSelectorPanel: React.FC<AIMCPClientSelectorPanelProps> = ({
+  statuses,
+  selectedClient,
+  darkMode,
+  overlayTheme,
+  cardBorder,
+  statusLoading,
+  onSelectClient,
+}) => (
+  <>
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
+      <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText }}>接入外部客户端</div>
+      <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+        先选择 1 个目标客户端。本机 CLI 可自动写入或更新配置；远程 Agent 需要通过 MCP 桥接/隧道访问当前 GoNavi，不应保存数据库连接密码。
+      </div>
+    </div>
+    <div
+      style={{
+        display: 'grid',
+        gridTemplateColumns: 'repeat(auto-fit, minmax(180px, 1fr))',
+        gap: 10,
+      }}
+    >
+      {MCP_CLIENT_INSTALL_STEPS.map((item) => (
+        <div
+          key={item.step}
+          style={{
+            padding: '12px 14px',
+            borderRadius: 12,
+            border: `1px solid ${cardBorder}`,
+            background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.76)',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 5,
+          }}
+        >
+          <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+            <div
+              style={{
+                width: 22,
+                height: 22,
+                borderRadius: 999,
+                background: overlayTheme.selectedText,
+                color: '#fff',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                fontSize: 12,
+                fontWeight: 700,
+                flexShrink: 0,
+              }}
+            >
+              {item.step}
+            </div>
+            <div style={{ fontWeight: 700, fontSize: 13, color: overlayTheme.titleText }}>{item.title}</div>
+          </div>
+          <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>{item.detail}</div>
+        </div>
+      ))}
+    </div>
+
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+      <div style={{ fontWeight: 700, fontSize: 13, color: overlayTheme.titleText }}>选择外部客户端</div>
+      <div
+        role="radiogroup"
+        aria-label="选择要安装 GoNavi MCP 的外部客户端"
+        style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(220px, 1fr))', gap: 10 }}
+      >
+        {statuses.map((status) => {
+          const client = isMCPClientKey(status.client) ? status.client : 'claude-code';
+          const remoteClient = isRemoteMCPClientStatus(status);
+          const active = selectedClient === client;
+          const tone = getMCPClientStatusTone(status, darkMode);
+          return (
+            <button
+              key={status.client}
+              type="button"
+              role="radio"
+              aria-checked={active}
+              onClick={() => onSelectClient(client)}
+              style={{
+                padding: '14px 16px',
+                borderRadius: 12,
+                border: `1.5px solid ${active ? overlayTheme.selectedText : cardBorder}`,
+                background: active ? overlayTheme.selectedBg : (darkMode ? 'rgba(255,255,255,0.02)' : 'rgba(255,255,255,0.7)'),
+                cursor: 'pointer',
+                display: 'flex',
+                flexDirection: 'column',
+                alignItems: 'stretch',
+                gap: 10,
+                textAlign: 'left',
+                minHeight: 98,
+                transition: 'all 0.2s ease',
+                opacity: statusLoading ? 0.72 : 1,
+              }}
+            >
+              <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 10 }}>
+                <div style={{ display: 'flex', alignItems: 'center', gap: 10, minWidth: 0 }}>
+                  <div
+                    aria-hidden
+                    style={{
+                      width: 22,
+                      height: 22,
+                      borderRadius: 999,
+                      border: `1.5px solid ${active ? overlayTheme.selectedText : darkMode ? 'rgba(255,255,255,0.16)' : 'rgba(15,23,42,0.16)'}`,
+                      background: active ? overlayTheme.selectedText : 'transparent',
+                      display: 'flex',
+                      alignItems: 'center',
+                      justifyContent: 'center',
+                      flexShrink: 0,
+                    }}
+                  >
+                    {active ? <CheckCircleFilled style={{ color: '#fff', fontSize: 12 }} /> : null}
+                  </div>
+                  <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, minWidth: 0 }}>
+                    {status.displayName}
+                  </div>
+                </div>
+                <div
+                  style={{
+                    padding: '4px 10px',
+                    borderRadius: 999,
+                    fontSize: 11,
+                    fontWeight: 700,
+                    color: tone.color,
+                    background: tone.bg,
+                    width: 80,
+                    textAlign: 'center',
+                    flexShrink: 0,
+                  }}
+                >
+                  {tone.label}
+                </div>
+              </div>
+              <div style={{ fontSize: 12, color: overlayTheme.titleText, lineHeight: 1.7 }}>
+                {getMCPClientOptionSummary(status)}
+              </div>
+              <div style={{ fontSize: 12, color: active ? overlayTheme.selectedText : overlayTheme.mutedText, lineHeight: 1.6, fontWeight: 700 }}>
+                {getMCPClientInstallStateLabel(status)}
+              </div>
+              <div style={{ fontSize: 11, color: overlayTheme.mutedText, lineHeight: 1.6 }}>
+                {active
+                  ? (remoteClient ? '当前已选中，将复制远程接入说明。' : '当前已选中，将只对这个客户端执行写入或更新。')
+                  : (remoteClient ? '点击后查看远程接入方式。' : '点击后切换到这个客户端。')}
+              </div>
+            </button>
+          );
+        })}
+      </div>
+    </div>
+  </>
+);
+
+export default AIMCPClientSelectorPanel;
diff --git a/frontend/src/components/ai/AIMCPClientStatusPanel.test.tsx b/frontend/src/components/ai/AIMCPClientStatusPanel.test.tsx
new file mode 100644
index 0000000..2576bd6
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPClientStatusPanel.test.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPClientStatusPanel from './AIMCPClientStatusPanel';
+
+describe('AIMCPClientStatusPanel', () => {
+  it('renders selected remote client status, boundary notes, and remote quick-start actions', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPClientStatusPanel
+        selectedStatus={{
+          client: 'hermans',
+          displayName: 'Hermans',
+          installMode: 'remote',
+          installed: false,
+          matchesCurrent: false,
+          clientDetected: false,
+          clientCommand: 'hermans',
+          message: 'Hermans 这类远程 Agent 请通过远程 MCP 桥接接入 Windows GoNavi，不要复制数据库密码。',
+        }}
+        selectedCommandText=""
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBorder="rgba(0,0,0,0.08)"
+        statusLoading={false}
+        onRefreshStatus={() => {}}
+        onCopyConfigPath={() => {}}
+        onCopyLaunchCommand={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('已选客户端状态');
+    expect(markup).toContain('当前目标客户端：Hermans');
+    expect(markup).toContain('需要通过远程 MCP 桥接调用当前 GoNavi');
+    expect(markup).toContain('远程接入边界');
+    expect(markup).toContain('不注册 execute_sql');
+    expect(markup).toContain('Hermans 远程 MCP 快速配置');
+    expect(markup).toContain('CLI 检测：远程 Agent 不需要检测本机 hermans 命令');
+    expect(markup).toContain('刷新状态');
+    expect(markup).toContain('复制配置路径');
+    expect(markup).toContain('复制启动命令');
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPClientStatusPanel.tsx b/frontend/src/components/ai/AIMCPClientStatusPanel.tsx
new file mode 100644
index 0000000..399e0e9
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPClientStatusPanel.tsx
@@ -0,0 +1,170 @@
+import React from 'react';
+import { Button } from 'antd';
+import { CopyOutlined, ReloadOutlined } from '@ant-design/icons';
+
+import type { AIMCPClientInstallStatus } from '../../types';
+import {
+  buildRemoteMCPClientQuickStart,
+  isRemoteMCPClientStatus,
+} from '../../utils/mcpClientInstallStatus';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPRemoteQuickStartPanel from './AIMCPRemoteQuickStartPanel';
+import {
+  getMCPClientStatusSummary,
+  getMCPClientStatusTone,
+  getSelectedMCPClientStateLine,
+  resolveMCPClientCommandName,
+} from './mcpClientInstallPanelState';
+
+interface AIMCPClientStatusPanelProps {
+  selectedStatus?: AIMCPClientInstallStatus;
+  selectedCommandText: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBorder: string;
+  statusLoading: boolean;
+  onRefreshStatus: () => void;
+  onCopyConfigPath: () => void;
+  onCopyLaunchCommand: () => void;
+}
+
+const AIMCPClientStatusPanel: React.FC<AIMCPClientStatusPanelProps> = ({
+  selectedStatus,
+  selectedCommandText,
+  darkMode,
+  overlayTheme,
+  cardBorder,
+  statusLoading,
+  onRefreshStatus,
+  onCopyConfigPath,
+  onCopyLaunchCommand,
+}) => {
+  const selectedIsRemoteClient = isRemoteMCPClientStatus(selectedStatus);
+  const remoteQuickStart = selectedIsRemoteClient
+    ? buildRemoteMCPClientQuickStart(selectedStatus)
+    : null;
+
+  return (
+    <div
+      style={{
+        padding: '12px 14px',
+        borderRadius: 12,
+        border: `1px solid ${cardBorder}`,
+        background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.78)',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 6,
+      }}
+    >
+      <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
+        <div style={{ fontWeight: 700, fontSize: 13, color: overlayTheme.titleText }}>
+          已选客户端状态
+        </div>
+        <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+          当前目标客户端：{selectedStatus?.displayName || '未选择客户端'}
+        </div>
+        <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+          <div style={{ fontWeight: 700, fontSize: 13, color: overlayTheme.titleText }}>
+            {getMCPClientStatusSummary(selectedStatus)}
+          </div>
+          {selectedStatus && (
+            <div
+              style={{
+                padding: '3px 9px',
+                borderRadius: 999,
+                fontSize: 11,
+                fontWeight: 700,
+                color: getMCPClientStatusTone(selectedStatus, darkMode).color,
+                background: getMCPClientStatusTone(selectedStatus, darkMode).bg,
+              }}
+            >
+              {getMCPClientStatusTone(selectedStatus, darkMode).label}
+            </div>
+          )}
+        </div>
+      </div>
+      <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+        当前状态：{getSelectedMCPClientStateLine(selectedStatus)}
+      </div>
+      {selectedIsRemoteClient && (
+        <div
+          style={{
+            padding: '10px 12px',
+            borderRadius: 10,
+            border: `1px solid ${darkMode ? 'rgba(56,189,248,0.22)' : 'rgba(14,165,233,0.18)'}`,
+            background: darkMode ? 'rgba(14,165,233,0.08)' : 'rgba(14,165,233,0.06)',
+            fontSize: 12,
+            color: overlayTheme.mutedText,
+            lineHeight: 1.7,
+          }}
+        >
+          远程接入边界：数据库连接信息和密码仍保存在 Windows GoNavi；云端 Agent 默认通过 schema-only MCP 工具读取连接摘要、库表和 DDL，不注册 execute_sql。跨机器接入请使用 GoNavi Streamable HTTP 模式，并配合 token、隧道或反向代理。
+        </div>
+      )}
+      {remoteQuickStart && (
+        <AIMCPRemoteQuickStartPanel
+          quickStart={remoteQuickStart}
+          darkMode={darkMode}
+          overlayTheme={overlayTheme}
+          cardBorder={cardBorder}
+        />
+      )}
+      <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+        CLI 检测：{selectedIsRemoteClient
+          ? `远程 Agent 不需要检测本机 ${resolveMCPClientCommandName(selectedStatus)} 命令`
+          : selectedStatus?.clientDetected
+            ? `已检测到 ${resolveMCPClientCommandName(selectedStatus)}`
+            : `未检测到 ${resolveMCPClientCommandName(selectedStatus)}，仍可先写配置`}
+      </div>
+      {selectedStatus?.clientPath && (
+        <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6, fontFamily: 'var(--gn-font-mono)' }}>
+          命令路径：{selectedStatus.clientPath}
+        </div>
+      )}
+      <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+        检测结果：{selectedStatus?.message || '未检测到接入状态'}
+      </div>
+      {selectedStatus?.configPath && (
+        <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6, fontFamily: 'var(--gn-font-mono)' }}>
+          配置文件：{selectedStatus.configPath}
+        </div>
+      )}
+      {selectedCommandText && (
+        <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6, fontFamily: 'var(--gn-font-mono)' }}>
+          启动命令：{selectedCommandText}
+        </div>
+      )}
+      <div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
+        <Button
+          size="small"
+          icon={<ReloadOutlined />}
+          loading={statusLoading}
+          onClick={onRefreshStatus}
+          style={{ borderRadius: 8 }}
+        >
+          刷新状态
+        </Button>
+        <Button
+          size="small"
+          icon={<CopyOutlined />}
+          disabled={!selectedStatus?.configPath}
+          onClick={onCopyConfigPath}
+          style={{ borderRadius: 8 }}
+        >
+          复制配置路径
+        </Button>
+        <Button
+          size="small"
+          icon={<CopyOutlined />}
+          disabled={!selectedCommandText}
+          onClick={onCopyLaunchCommand}
+          style={{ borderRadius: 8 }}
+        >
+          复制启动命令
+        </Button>
+      </div>
+    </div>
+  );
+};
+
+export default AIMCPClientStatusPanel;
diff --git a/frontend/src/components/ai/AIMCPCommandDraftPreview.test.tsx b/frontend/src/components/ai/AIMCPCommandDraftPreview.test.tsx
new file mode 100644
index 0000000..214f96a
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPCommandDraftPreview.test.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AIMCPCommandDraftPreview from './AIMCPCommandDraftPreview';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+describe('AIMCPCommandDraftPreview', () => {
+  it('renders parsed env keys, command, and args so users can verify the split result before applying', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPCommandDraftPreview
+        draft={{
+          command: 'python',
+          args: ['-m', 'your_mcp_server', '--stdio'],
+          env: {
+            OPENAI_API_KEY: '***',
+            HTTP_PROXY: 'http://127.0.0.1:7890',
+          },
+        }}
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBorder="rgba(0,0,0,0.08)"
+      />,
+    );
+
+    expect(markup).toContain('自动拆分预览');
+    expect(markup).toContain('环境变量');
+    expect(markup).toContain('OPENAI_API_KEY');
+    expect(markup).toContain('HTTP_PROXY');
+    expect(markup).toContain('启动命令');
+    expect(markup).toContain('python');
+    expect(markup).toContain('命令参数');
+    expect(markup).toContain('your_mcp_server');
+    expect(markup).toContain('--stdio');
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPCommandDraftPreview.tsx b/frontend/src/components/ai/AIMCPCommandDraftPreview.tsx
new file mode 100644
index 0000000..4c7d8b7
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPCommandDraftPreview.tsx
@@ -0,0 +1,98 @@
+import React from 'react';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import type { ParsedMCPCommandDraft } from '../../utils/mcpCommandDraft';
+
+interface AIMCPCommandDraftPreviewProps {
+  draft: ParsedMCPCommandDraft;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBorder: string;
+}
+
+const chipStyle = (darkMode: boolean, overlayTheme: OverlayWorkbenchTheme): React.CSSProperties => ({
+  padding: '4px 8px',
+  borderRadius: 999,
+  fontSize: 12,
+  color: overlayTheme.titleText,
+  background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(15,23,42,0.05)',
+  fontFamily: 'var(--gn-font-mono)',
+});
+
+const sectionTitleStyle = (overlayTheme: OverlayWorkbenchTheme): React.CSSProperties => ({
+  fontSize: 12,
+  fontWeight: 700,
+  color: overlayTheme.titleText,
+});
+
+const sectionHintStyle = (overlayTheme: OverlayWorkbenchTheme): React.CSSProperties => ({
+  fontSize: 11,
+  color: overlayTheme.mutedText,
+  lineHeight: 1.6,
+});
+
+const AIMCPCommandDraftPreview: React.FC<AIMCPCommandDraftPreviewProps> = ({
+  draft,
+  darkMode,
+  overlayTheme,
+  cardBorder,
+}) => {
+  const envKeys = Object.keys(draft.env || {});
+
+  return (
+    <div
+      style={{
+        padding: '10px 12px',
+        borderRadius: 10,
+        border: `1px solid ${cardBorder}`,
+        background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.72)',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 10,
+      }}
+    >
+      <div>
+        <div style={sectionTitleStyle(overlayTheme)}>自动拆分预览</div>
+        <div style={{ ...sectionHintStyle(overlayTheme), marginTop: 4 }}>
+          点击“自动拆分到下方字段”后，会把这份解析结果写进服务名称下面的启动配置区域。
+        </div>
+      </div>
+
+      <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(180px, 1fr))', gap: 12 }}>
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
+          <div style={sectionTitleStyle(overlayTheme)}>环境变量</div>
+          <div style={sectionHintStyle(overlayTheme)}>
+            {envKeys.length > 0 ? `会写入 ${envKeys.length} 条环境变量。` : '这条命令里没有检测到前缀环境变量。'}
+          </div>
+          <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8 }}>
+            {envKeys.length > 0 ? envKeys.map((key) => (
+              <span key={key} style={chipStyle(darkMode, overlayTheme)}>{key}</span>
+            )) : <span style={chipStyle(darkMode, overlayTheme)}>无</span>}
+          </div>
+        </div>
+
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
+          <div style={sectionTitleStyle(overlayTheme)}>启动命令</div>
+          <div style={sectionHintStyle(overlayTheme)}>这里只会保留真正的可执行程序本身。</div>
+          <code style={{ ...chipStyle(darkMode, overlayTheme), borderRadius: 10, display: 'inline-block' }}>
+            {draft.command}
+          </code>
+        </div>
+
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
+          <div style={sectionTitleStyle(overlayTheme)}>命令参数</div>
+          <div style={sectionHintStyle(overlayTheme)}>
+            {draft.args.length > 0 ? `会拆成 ${draft.args.length} 个独立参数标签。` : '这条命令里没有检测到额外参数。'}
+          </div>
+          <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8 }}>
+            {draft.args.length > 0 ? draft.args.map((arg) => (
+              <span key={arg} style={chipStyle(darkMode, overlayTheme)}>{arg}</span>
+            )) : <span style={chipStyle(darkMode, overlayTheme)}>无</span>}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AIMCPCommandDraftPreview;
diff --git a/frontend/src/components/ai/AIMCPEnvHints.tsx b/frontend/src/components/ai/AIMCPEnvHints.tsx
new file mode 100644
index 0000000..a67cdde
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPEnvHints.tsx
@@ -0,0 +1,115 @@
+import React from 'react';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import { buildMCPEnvHintProfile } from '../../utils/mcpEnvHints';
+import { buildMCPHintStyle, mcpLabelStyle } from './AIMCPHelpBlock';
+
+interface AIMCPEnvHintsProps {
+  command: string;
+  args?: string[];
+  env?: Record<string, string>;
+  cardBorder: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+}
+
+const categoryLabel = {
+  secret: '密钥',
+  endpoint: '地址',
+  proxy: '代理',
+  path: '路径',
+  runtime: '运行时',
+  generic: '自定义',
+};
+
+const categoryColor = {
+  secret: '#b45309',
+  endpoint: '#2563eb',
+  proxy: '#0f766e',
+  path: '#7c3aed',
+  runtime: '#475569',
+  generic: '#64748b',
+};
+
+const AIMCPEnvHints: React.FC<AIMCPEnvHintsProps> = ({
+  command,
+  args,
+  env,
+  cardBorder,
+  darkMode,
+  overlayTheme,
+}) => {
+  const profile = buildMCPEnvHintProfile(command, args, env);
+  if (!profile) {
+    return null;
+  }
+
+  return (
+    <div
+      style={{
+        padding: '10px 12px',
+        borderRadius: 10,
+        border: `1px dashed ${cardBorder}`,
+        background: darkMode ? 'rgba(255,255,255,0.025)' : 'rgba(255,255,255,0.7)',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 8,
+      }}
+    >
+      <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>环境变量用途提示</div>
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+        已识别 {profile.envVarCount} 个变量，其中 {profile.secretLikeCount} 个像密钥；这里只解释 key 的用途和风险，不会显示 value。
+      </div>
+      <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(220px, 1fr))', gap: 8 }}>
+        {profile.items.map((item) => (
+          <div
+            key={item.key}
+            style={{
+              padding: '8px 10px',
+              borderRadius: 10,
+              border: `1px solid ${cardBorder}`,
+              background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.82)',
+              display: 'flex',
+              flexDirection: 'column',
+              gap: 5,
+            }}
+          >
+            <div style={{ display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap' }}>
+              <code style={{ fontFamily: 'var(--gn-font-mono)', fontSize: 12, color: overlayTheme.titleText }}>{item.key}</code>
+              <span
+                style={{
+                  padding: '1px 7px',
+                  borderRadius: 999,
+                  fontSize: 11,
+                  fontWeight: 700,
+                  color: categoryColor[item.category],
+                  background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(15,23,42,0.05)',
+                }}
+              >
+                {categoryLabel[item.category]}
+              </span>
+              {item.known ? <span style={buildMCPHintStyle('#16a34a')}>已识别</span> : null}
+            </div>
+            <div style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText }}>{item.label}</div>
+            <div style={buildMCPHintStyle(overlayTheme.mutedText)}>{item.detail}</div>
+            <div style={buildMCPHintStyle(item.empty || item.placeholder ? '#b45309' : overlayTheme.mutedText)}>
+              应填：{item.valueHint}
+              {item.empty ? ' 当前值为空。' : ''}
+              {item.placeholder ? ' 当前像示例占位值。' : ''}
+            </div>
+          </div>
+        ))}
+      </div>
+      {profile.warnings.length > 0 ? (
+        <div style={buildMCPHintStyle('#b45309')}>
+          注意：{profile.warnings.join('；')}
+        </div>
+      ) : null}
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+        下一步：{profile.nextActions.join('；')}
+      </div>
+    </div>
+  );
+};
+
+export default AIMCPEnvHints;
diff --git a/frontend/src/components/ai/AIMCPFieldGuideCard.tsx b/frontend/src/components/ai/AIMCPFieldGuideCard.tsx
new file mode 100644
index 0000000..10a8f7d
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPFieldGuideCard.tsx
@@ -0,0 +1,71 @@
+import React from 'react';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import type { MCPFieldGuide } from '../../utils/mcpServerGuidance';
+import { buildMCPFieldTone, buildMCPHintStyle } from './AIMCPHelpBlock';
+
+interface AIMCPFieldGuideCardProps {
+  item: MCPFieldGuide;
+  cardBorder: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  compact?: boolean;
+}
+
+const AIMCPFieldGuideCard: React.FC<AIMCPFieldGuideCardProps> = ({
+  item,
+  cardBorder,
+  darkMode,
+  overlayTheme,
+  compact = false,
+}) => {
+  const tone = buildMCPFieldTone(item.fieldState, darkMode);
+  return (
+    <div
+      style={{
+        padding: compact ? '10px 12px' : '10px 12px',
+        borderRadius: compact ? 12 : 10,
+        border: `1px solid ${cardBorder}`,
+        background: darkMode ? 'rgba(255,255,255,0.025)' : 'rgba(255,255,255,0.78)',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 6,
+      }}
+    >
+      <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+        <div style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText }}>{item.title}</div>
+        <span
+          style={{
+            padding: '2px 8px',
+            borderRadius: 999,
+            fontSize: 11,
+            fontWeight: 700,
+            color: tone.color,
+            background: tone.bg,
+          }}
+        >
+          {tone.label}
+        </span>
+      </div>
+      <div style={{ fontSize: 12, lineHeight: 1.6, color: overlayTheme.titleText }}>{item.summary}</div>
+      {!compact && <div style={buildMCPHintStyle(overlayTheme.mutedText)}>{item.detail}</div>}
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+        <strong>应填：</strong>
+        {item.fill}
+      </div>
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+        <strong>不要填：</strong>
+        {item.avoid}
+      </div>
+      {item.example ? (
+        <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+          示例值：
+          {' '}
+          <code style={{ fontFamily: 'var(--gn-font-mono)' }}>{item.example}</code>
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default AIMCPFieldGuideCard;
diff --git a/frontend/src/components/ai/AIMCPHTTPServerPanel.test.tsx b/frontend/src/components/ai/AIMCPHTTPServerPanel.test.tsx
new file mode 100644
index 0000000..a4e6f70
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPHTTPServerPanel.test.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPHTTPServerPanel from './AIMCPHTTPServerPanel';
+
+const findElement = (node: any, predicate: (element: any) => boolean): any => {
+  if (node == null || typeof node === 'boolean' || typeof node === 'string' || typeof node === 'number') {
+    return null;
+  }
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      const match = findElement(item, predicate);
+      if (match) {
+        return match;
+      }
+    }
+    return null;
+  }
+  if (predicate(node)) {
+    return node;
+  }
+  return findElement(node.props?.children, predicate);
+};
+
+const buildPanelProps = () => ({
+  status: {
+    running: true,
+    addr: '127.0.0.1:8765',
+    path: '/mcp',
+    url: 'http://127.0.0.1:8765/mcp',
+    schemaOnly: true,
+    authorizationHeader: 'Bearer gnv_test',
+    message: 'GoNavi MCP HTTP 服务已启动',
+  },
+  draft: {
+    addr: '127.0.0.1:8765',
+    path: '/mcp',
+    authorizationHeader: 'Bearer gnv_test',
+  },
+  loading: false,
+  cardBg: '#fff',
+  cardBorder: 'rgba(0,0,0,0.08)',
+  darkMode: false,
+  overlayTheme: buildOverlayWorkbenchTheme(false),
+  onDraftChange: () => {},
+  onToggle: () => {},
+  onCopyURL: () => {},
+  onCopyAuthorization: () => {},
+});
+
+describe('AIMCPHTTPServerPanel', () => {
+  it('renders the in-app MCP HTTP switch and remote connection details', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPHTTPServerPanel {...buildPanelProps()} />,
+    );
+
+    expect(markup).toContain('GoNavi MCP HTTP 服务');
+    expect(markup).toContain('已启动');
+    expect(markup).toContain('schema-only');
+    expect(markup).toContain('监听地址 / 端口');
+    expect(markup).toContain('Authorization');
+    expect(markup).toContain('127.0.0.1:8765');
+    expect(markup).toContain('http://127.0.0.1:8765/mcp');
+    expect(markup).toContain('复制 Authorization');
+  });
+
+  it('keeps Authorization read-only but revealable while running', () => {
+    const tree = AIMCPHTTPServerPanel(buildPanelProps());
+    const passwordInput = findElement(
+      tree,
+      (node) => node.props?.placeholder === 'Bearer gnv_xxx（留空自动生成）',
+    );
+
+    expect(passwordInput).toBeTruthy();
+    expect(passwordInput.props.disabled).toBe(false);
+    expect(passwordInput.props.readOnly).toBe(true);
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPHTTPServerPanel.tsx b/frontend/src/components/ai/AIMCPHTTPServerPanel.tsx
new file mode 100644
index 0000000..ab85564
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPHTTPServerPanel.tsx
@@ -0,0 +1,155 @@
+import React from 'react';
+import { Button, Input, Switch, Tag } from 'antd';
+import { CopyOutlined } from '@ant-design/icons';
+
+import type { AIMCPHTTPServerStatus } from '../../types';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+export interface AIMCPHTTPServerDraft {
+  addr: string;
+  path: string;
+  authorizationHeader: string;
+}
+
+export interface AIMCPHTTPServerPanelProps {
+  status: AIMCPHTTPServerStatus;
+  draft: AIMCPHTTPServerDraft;
+  loading: boolean;
+  cardBg: string;
+  cardBorder: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  onDraftChange: (patch: Partial<AIMCPHTTPServerDraft>) => void;
+  onToggle: (checked: boolean) => void;
+  onCopyURL: () => void;
+  onCopyAuthorization: () => void;
+}
+
+const AIMCPHTTPServerPanel: React.FC<AIMCPHTTPServerPanelProps> = ({
+  status,
+  draft,
+  loading,
+  cardBg,
+  cardBorder,
+  darkMode,
+  overlayTheme,
+  onDraftChange,
+  onToggle,
+  onCopyURL,
+  onCopyAuthorization,
+}) => {
+  const running = status?.running === true;
+  const url = String(status?.url || '').trim();
+  const authorizationHeader = String(status?.authorizationHeader || '').trim();
+  const inputStyle: React.CSSProperties = {
+    borderRadius: 10,
+    background: darkMode ? 'rgba(15,23,42,0.82)' : '#fff',
+  };
+
+  return (
+    <div
+      style={{
+        padding: '14px 16px',
+        borderRadius: 14,
+        border: `1px solid ${cardBorder}`,
+        background: cardBg,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 12,
+      }}
+    >
+      <div style={{ display: 'flex', justifyContent: 'space-between', gap: 12, alignItems: 'flex-start' }}>
+        <div style={{ minWidth: 0 }}>
+          <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+            <div style={{ fontWeight: 800, fontSize: 14, color: overlayTheme.titleText }}>GoNavi MCP HTTP 服务</div>
+            <Tag color={running ? 'success' : 'default'} style={{ marginInlineEnd: 0 }}>
+              {running ? '已启动' : '未启动'}
+            </Tag>
+            <Tag color="blue" style={{ marginInlineEnd: 0 }}>
+              schema-only
+            </Tag>
+          </div>
+          <div style={{ marginTop: 6, fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+            给 OpenClaw、Hermans 等远程 Agent 使用。打开后监听本机地址，只开放连接、库表、字段和 DDL 等结构读取工具。
+          </div>
+        </div>
+        <Switch
+          checked={running}
+          loading={loading}
+          onChange={onToggle}
+          checkedChildren="开"
+          unCheckedChildren="关"
+        />
+      </div>
+      <div
+        style={{
+          borderRadius: 12,
+          border: `1px solid ${cardBorder}`,
+          background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.72)',
+          padding: '10px 12px',
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 8,
+        }}
+      >
+        <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(220px, 1fr))', gap: 8 }}>
+          <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
+            <span style={{ fontSize: 11, fontWeight: 700, color: overlayTheme.mutedText }}>监听地址 / 端口</span>
+            <Input
+              size="small"
+              value={draft.addr}
+              disabled={running || loading}
+              placeholder="127.0.0.1:8765"
+              onChange={(event) => onDraftChange({ addr: event.target.value })}
+              style={inputStyle}
+            />
+          </div>
+          <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
+            <span style={{ fontSize: 11, fontWeight: 700, color: overlayTheme.mutedText }}>Authorization</span>
+            <Input.Password
+              size="small"
+              value={draft.authorizationHeader}
+              disabled={loading}
+              readOnly={running || loading}
+              placeholder="Bearer gnv_xxx（留空自动生成）"
+              autoComplete="off"
+              onChange={(event) => onDraftChange({ authorizationHeader: event.target.value })}
+              style={inputStyle}
+            />
+          </div>
+        </div>
+        <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+          {running
+            ? status.message || '服务运行中，可把 URL 和 Authorization Header 配置到远程 MCP 客户端。'
+            : '可自定义本机监听端口和 Bearer Token；留空 Authorization 时启动会自动生成随机 Token。'}
+        </div>
+        <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8, alignItems: 'center' }}>
+          <code
+            style={{
+              fontSize: 12,
+              color: overlayTheme.titleText,
+              background: darkMode ? 'rgba(0,0,0,0.22)' : 'rgba(0,0,0,0.04)',
+              borderRadius: 8,
+              padding: '4px 7px',
+            }}
+          >
+            {url || 'http://127.0.0.1:8765/mcp'}
+          </code>
+          <Button size="small" icon={<CopyOutlined />} disabled={!running || !url} onClick={onCopyURL}>
+            复制 URL
+          </Button>
+          <Button
+            size="small"
+            icon={<CopyOutlined />}
+            disabled={!running || !authorizationHeader}
+            onClick={onCopyAuthorization}
+          >
+            复制 Authorization
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AIMCPHTTPServerPanel;
diff --git a/frontend/src/components/ai/AIMCPHelpBlock.tsx b/frontend/src/components/ai/AIMCPHelpBlock.tsx
new file mode 100644
index 0000000..ccfa2d8
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPHelpBlock.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import type { MCPFieldState } from '../../utils/mcpServerGuidance';
+
+export const mcpLabelStyle: React.CSSProperties = {
+  fontSize: 12,
+  fontWeight: 700,
+};
+
+export const buildMCPHintStyle = (mutedText: string): React.CSSProperties => ({
+  fontSize: 12,
+  color: mutedText,
+  lineHeight: 1.6,
+});
+
+export const buildMCPFieldTone = (kind: MCPFieldState, darkMode: boolean) => {
+  switch (kind) {
+    case 'required':
+      return {
+        label: '必填',
+        color: '#b45309',
+        bg: darkMode ? 'rgba(245,158,11,0.18)' : 'rgba(245,158,11,0.12)',
+      };
+    case 'fixed':
+      return {
+        label: '固定',
+        color: '#2563eb',
+        bg: darkMode ? 'rgba(59,130,246,0.18)' : 'rgba(59,130,246,0.12)',
+      };
+    default:
+      return {
+        label: '可选',
+        color: '#475569',
+        bg: darkMode ? 'rgba(148,163,184,0.18)' : 'rgba(148,163,184,0.12)',
+      };
+  }
+};
+
+interface AIMCPHelpBlockProps {
+  title: string;
+  description: string;
+  overlayTheme: OverlayWorkbenchTheme;
+  darkMode: boolean;
+  fieldState: MCPFieldState;
+  example?: string;
+  children: React.ReactNode;
+}
+
+const AIMCPHelpBlock: React.FC<AIMCPHelpBlockProps> = ({
+  title,
+  description,
+  overlayTheme,
+  darkMode,
+  fieldState,
+  example,
+  children,
+}) => {
+  const tone = buildMCPFieldTone(fieldState, darkMode);
+
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
+      <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+        <div style={mcpLabelStyle}>{title}</div>
+        <span
+          style={{
+            padding: '2px 8px',
+            borderRadius: 999,
+            fontSize: 11,
+            fontWeight: 700,
+            color: tone.color,
+            background: tone.bg,
+          }}
+        >
+          {tone.label}
+        </span>
+      </div>
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+        {description}
+        {example ? (
+          <>
+            {' '}例如：<code style={{ fontFamily: 'var(--gn-font-mono)' }}>{example}</code>
+          </>
+        ) : null}
+      </div>
+      {children}
+    </div>
+  );
+};
+
+export default AIMCPHelpBlock;
diff --git a/frontend/src/components/ai/AIMCPQuickAddServerPanel.test.tsx b/frontend/src/components/ai/AIMCPQuickAddServerPanel.test.tsx
new file mode 100644
index 0000000..9ae8e16
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPQuickAddServerPanel.test.tsx
@@ -0,0 +1,109 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+import { describe, expect, it, vi } from 'vitest';
+
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPQuickAddServerPanel from './AIMCPQuickAddServerPanel';
+
+vi.mock('antd', async () => {
+  const React = await import('react');
+  return {
+    Input: {
+      TextArea: (props: any) => React.createElement('textarea', props),
+    },
+    Button: ({ icon, children, ...props }: any) => React.createElement('button', props, icon, children),
+  };
+});
+
+vi.mock('@ant-design/icons', async () => {
+  const React = await import('react');
+  return {
+    PlusOutlined: () => React.createElement('span', { 'data-testid': 'plus-icon' }),
+  };
+});
+
+const buildQuickAddPanel = (onAddServer = () => {}) => (
+  <AIMCPQuickAddServerPanel
+    cardBg="#fff"
+    cardBorder="rgba(0,0,0,0.08)"
+    inputBg="#fff"
+    darkMode={false}
+    overlayTheme={buildOverlayWorkbenchTheme(false)}
+    onAddServer={onAddServer}
+  />
+);
+
+const flattenRendererText = (node: any): string => {
+  if (node == null || typeof node === 'boolean') {
+    return '';
+  }
+  if (typeof node === 'string' || typeof node === 'number') {
+    return String(node);
+  }
+  if (Array.isArray(node)) {
+    return node.map((item) => flattenRendererText(item)).join('');
+  }
+  return flattenRendererText(node.children ?? node.props?.children);
+};
+
+const findTemplateButton = (renderer: ReactTestRenderer, label: string) => {
+  const matches = renderer.root.findAll(
+    (node) => node.type === 'button' && flattenRendererText(node).includes(label),
+  );
+  expect(matches.length).toBe(1);
+  return matches[0];
+};
+
+describe('AIMCPQuickAddServerPanel', () => {
+  it('renders a top-level full-command entry for creating MCP drafts', () => {
+    const markup = renderToStaticMarkup(
+      buildQuickAddPanel(),
+    );
+
+    expect(markup).toContain('一行命令快速新增');
+    expect(markup).toContain('先选最接近的模板');
+    expect(markup).toContain('command、args 和 env');
+    expect(markup).toContain('常见启动方式模板');
+    expect(markup).toContain('npx 包');
+    expect(markup).toContain('npx -y @modelcontextprotocol/server-filesystem --stdio');
+    expect(markup).toContain('Docker 镜像');
+    expect(markup).toContain('docker run --rm -i mcp/server-fetch:latest');
+    expect(markup).toContain('粘贴完整命令');
+    expect(markup).toContain('$env:GITHUB_TOKEN=...; uvx mcp-server-github --stdio');
+    expect(markup).toContain('解析并新增草稿');
+  });
+
+  it('seeds a new npx MCP draft from the quick-add template', async () => {
+    const onAddServer = vi.fn();
+    let renderer!: ReactTestRenderer;
+
+    await act(async () => {
+      renderer = create(buildQuickAddPanel(onAddServer));
+    });
+
+    findTemplateButton(renderer, 'npx 包').props.onClick();
+
+    expect(onAddServer).toHaveBeenCalledWith(expect.objectContaining({
+      command: 'npx',
+      args: ['-y', '@modelcontextprotocol/server-filesystem', '--stdio'],
+    }));
+  });
+
+  it('seeds a docker MCP draft from the quick-add template', async () => {
+    const onAddServer = vi.fn();
+    let renderer!: ReactTestRenderer;
+
+    await act(async () => {
+      renderer = create(buildQuickAddPanel(onAddServer));
+    });
+
+    findTemplateButton(renderer, 'Docker 镜像').props.onClick();
+
+    expect(onAddServer).toHaveBeenCalledWith(expect.objectContaining({
+      command: 'docker',
+      args: ['run', '--rm', '-i', 'mcp/server-fetch:latest'],
+      timeoutSeconds: 45,
+    }));
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPQuickAddServerPanel.tsx b/frontend/src/components/ai/AIMCPQuickAddServerPanel.tsx
new file mode 100644
index 0000000..b67723e
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPQuickAddServerPanel.tsx
@@ -0,0 +1,148 @@
+import React from 'react';
+import { Button, Input } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+
+import type { AIMCPServerConfig } from '../../types';
+import {
+  parseMCPCommandDraft,
+  type ParseMCPCommandDraftResult,
+} from '../../utils/mcpCommandDraft';
+import {
+  buildMCPLaunchPreview,
+  MCP_COMMAND_PARSE_EXAMPLE,
+} from '../../utils/mcpServerGuidance';
+import { buildMCPQuickAddServerSeed } from '../../utils/mcpServerDraftSeed';
+import { MCP_SERVER_DRAFT_TEMPLATES } from '../../utils/mcpServerTemplates';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPCommandDraftPreview from './AIMCPCommandDraftPreview';
+import { buildMCPHintStyle, mcpLabelStyle } from './AIMCPHelpBlock';
+
+interface AIMCPQuickAddServerPanelProps {
+  cardBg: string;
+  cardBorder: string;
+  inputBg: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  onAddServer: (seed?: Partial<AIMCPServerConfig>) => void;
+}
+
+const renderParseSummary = (
+  rawCommandDraft: string,
+  parsedCommandDraft: ParseMCPCommandDraftResult,
+  overlayTheme: OverlayWorkbenchTheme,
+) => {
+  if (!rawCommandDraft.trim()) {
+    return '支持带引号路径、带空格参数，以及 KEY=VALUE / $env:KEY=VALUE; / set KEY=VALUE && 环境变量前缀。';
+  }
+  if (!parsedCommandDraft.ok || !parsedCommandDraft.draft) {
+    return parsedCommandDraft.error || '完整命令解析失败，请检查命令格式。';
+  }
+  const envCount = Object.keys(parsedCommandDraft.draft.env || {}).length;
+  return (
+    <span style={{ color: overlayTheme.mutedText }}>
+      将解析为：命令 {parsedCommandDraft.draft.command}，参数 {parsedCommandDraft.draft.args.length} 个，环境变量 {envCount} 个。
+    </span>
+  );
+};
+
+const AIMCPQuickAddServerPanel: React.FC<AIMCPQuickAddServerPanelProps> = ({
+  cardBg,
+  cardBorder,
+  inputBg,
+  darkMode,
+  overlayTheme,
+  onAddServer,
+}) => {
+  const [rawCommandDraft, setRawCommandDraft] = React.useState('');
+  const parsedCommandDraft = parseMCPCommandDraft(rawCommandDraft);
+
+  const handleAddFromCommand = () => {
+    if (!parsedCommandDraft.ok || !parsedCommandDraft.draft) {
+      return;
+    }
+    onAddServer(buildMCPQuickAddServerSeed(parsedCommandDraft.draft));
+    setRawCommandDraft('');
+  };
+
+  return (
+    <div
+      style={{
+        padding: '14px 16px',
+        borderRadius: 14,
+        border: `1px solid ${cardBorder}`,
+        background: cardBg,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 10,
+      }}
+    >
+      <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
+        <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText, fontSize: 14 }}>一行命令快速新增</div>
+        <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+          先选最接近的模板，或直接粘贴 README 里的一整行启动命令。GoNavi 会先拆成 command、args 和 env，再生成一个可继续编辑的 MCP 草稿。
+        </div>
+      </div>
+      <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+        <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>常见启动方式模板</div>
+        <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+          不确定 command 和 args 怎么拆时，直接点一个模板新增草稿；每张卡片下面展示的就是 GoNavi 实际会启动的命令预览。
+        </div>
+        <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(180px, 1fr))', gap: 10 }}>
+          {MCP_SERVER_DRAFT_TEMPLATES.map((template) => (
+            <button
+              key={template.key}
+              type="button"
+              onClick={() => onAddServer(template.seed)}
+              style={{
+                textAlign: 'left',
+                padding: '12px 13px',
+                borderRadius: 12,
+                border: `1px solid ${cardBorder}`,
+                background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.72)',
+                color: overlayTheme.titleText,
+                cursor: 'pointer',
+              }}
+            >
+              <div style={{ fontSize: 13, fontWeight: 700 }}>{template.title}</div>
+              <div style={{ marginTop: 4, fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>{template.description}</div>
+              <code style={{ display: 'block', marginTop: 8, fontFamily: 'var(--gn-font-mono)', fontSize: 12, whiteSpace: 'pre-wrap', overflowWrap: 'anywhere', color: overlayTheme.titleText }}>
+                {buildMCPLaunchPreview(String(template.seed.command || ''), template.seed.args)}
+              </code>
+              <div style={{ marginTop: 6, fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>{template.detail}</div>
+            </button>
+          ))}
+        </div>
+      </div>
+      <Input.TextArea
+        rows={2}
+        value={rawCommandDraft}
+        onChange={(event) => setRawCommandDraft(event.target.value)}
+        placeholder={`粘贴完整命令，例如：\n${MCP_COMMAND_PARSE_EXAMPLE}`}
+        style={{ borderRadius: 10, background: inputBg, border: `1px solid ${cardBorder}`, fontFamily: 'var(--gn-font-mono)' }}
+      />
+      <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12, flexWrap: 'wrap' }}>
+        <div style={{ ...buildMCPHintStyle(parsedCommandDraft.ok || !rawCommandDraft.trim() ? overlayTheme.mutedText : '#dc2626') }}>
+          {renderParseSummary(rawCommandDraft, parsedCommandDraft, overlayTheme)}
+        </div>
+        <Button
+          icon={<PlusOutlined />}
+          onClick={handleAddFromCommand}
+          disabled={!parsedCommandDraft.ok}
+          style={{ borderRadius: 10, fontWeight: 600 }}
+        >
+          解析并新增草稿
+        </Button>
+      </div>
+      {parsedCommandDraft.ok && parsedCommandDraft.draft && rawCommandDraft.trim() && (
+        <AIMCPCommandDraftPreview
+          draft={parsedCommandDraft.draft}
+          darkMode={darkMode}
+          overlayTheme={overlayTheme}
+          cardBorder={cardBorder}
+        />
+      )}
+    </div>
+  );
+};
+
+export default AIMCPQuickAddServerPanel;
diff --git a/frontend/src/components/ai/AIMCPRemoteQuickStartPanel.test.tsx b/frontend/src/components/ai/AIMCPRemoteQuickStartPanel.test.tsx
new file mode 100644
index 0000000..faf7ab0
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPRemoteQuickStartPanel.test.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import { buildRemoteMCPClientQuickStart } from '../../utils/mcpClientInstallStatus';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPRemoteQuickStartPanel from './AIMCPRemoteQuickStartPanel';
+
+describe('AIMCPRemoteQuickStartPanel', () => {
+  it('renders remote MCP bridge parameters and safe launch snippets for cloud agents', () => {
+    const quickStart = buildRemoteMCPClientQuickStart({
+      client: 'openclaw',
+      displayName: 'OpenClaw',
+    });
+
+    const markup = renderToStaticMarkup(
+      <AIMCPRemoteQuickStartPanel
+        quickStart={quickStart}
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBorder="rgba(0,0,0,0.08)"
+      />,
+    );
+
+    expect(markup).toContain('OpenClaw 远程 MCP 快速配置');
+    expect(markup).toContain('公网/隧道 URL');
+    expect(markup).toContain('Bearer Token');
+    expect(markup).toContain('配置到云端 Agent');
+    expect(markup).toContain('无 GUI / CLI 生成配置');
+    expect(markup).toContain('Windows 启动 GoNavi MCP HTTP');
+    expect(markup).toContain('&quot;type&quot;: &quot;streamable-http&quot;');
+    expect(markup).toContain('GoNavi.exe mcp-server remote-config --client openclaw');
+    expect(markup).toContain('gonavi-mcp-server http --addr 127.0.0.1:8765');
+    expect(markup).toContain('默认 --schema-only 不注册 execute_sql');
+    expect(markup).not.toContain('password');
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPRemoteQuickStartPanel.tsx b/frontend/src/components/ai/AIMCPRemoteQuickStartPanel.tsx
new file mode 100644
index 0000000..5099398
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPRemoteQuickStartPanel.tsx
@@ -0,0 +1,171 @@
+import React from 'react';
+
+import {
+  REMOTE_MCP_PARAMETER_GUIDES,
+  type RemoteMCPClientQuickStart,
+} from '../../utils/mcpClientInstallStatus';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+interface AIMCPRemoteQuickStartPanelProps {
+  quickStart: RemoteMCPClientQuickStart;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBorder: string;
+}
+
+interface RemoteCommandCardProps {
+  title: string;
+  children: React.ReactNode;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBorder: string;
+}
+
+const remoteCodeStyle = (overlayTheme: OverlayWorkbenchTheme): React.CSSProperties => ({
+  display: 'block',
+  marginTop: 8,
+  fontFamily: 'var(--gn-font-mono)',
+  fontSize: 11,
+  color: overlayTheme.titleText,
+  whiteSpace: 'pre-wrap',
+  overflowWrap: 'anywhere',
+});
+
+const RemoteCommandCard: React.FC<RemoteCommandCardProps> = ({
+  title,
+  children,
+  darkMode,
+  overlayTheme,
+  cardBorder,
+}) => (
+  <div
+    style={{
+      padding: '10px 12px',
+      borderRadius: 10,
+      border: `1px solid ${cardBorder}`,
+      background: darkMode ? 'rgba(15,23,42,0.55)' : 'rgba(255,255,255,0.78)',
+    }}
+  >
+    <div style={{ fontWeight: 700, fontSize: 12, color: overlayTheme.titleText }}>
+      {title}
+    </div>
+    {children}
+  </div>
+);
+
+const AIMCPRemoteQuickStartPanel: React.FC<AIMCPRemoteQuickStartPanelProps> = ({
+  quickStart,
+  darkMode,
+  overlayTheme,
+  cardBorder,
+}) => (
+  <div
+    style={{
+      padding: '12px 14px',
+      borderRadius: 12,
+      border: `1px solid ${darkMode ? 'rgba(56,189,248,0.2)' : 'rgba(14,165,233,0.18)'}`,
+      background: darkMode ? 'rgba(14,165,233,0.06)' : 'rgba(240,249,255,0.78)',
+      display: 'flex',
+      flexDirection: 'column',
+      gap: 10,
+    }}
+  >
+    <div style={{ fontWeight: 700, fontSize: 13, color: overlayTheme.titleText }}>
+      {quickStart.displayName} 远程 MCP 快速配置
+    </div>
+    <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+      下面分别给云端 Agent、无 GUI/CLI 场景和 Windows GoNavi 使用。云端只保存 MCP URL 和 Bearer Token，不保存数据库账号密码；默认 schema-only 只暴露结构工具。
+    </div>
+    <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(210px, 1fr))', gap: 10 }}>
+      {REMOTE_MCP_PARAMETER_GUIDES.map((item) => (
+        <div
+          key={item.key}
+          style={{
+            padding: '10px 12px',
+            borderRadius: 10,
+            border: `1px solid ${cardBorder}`,
+            background: darkMode ? 'rgba(15,23,42,0.42)' : 'rgba(255,255,255,0.72)',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 5,
+          }}
+        >
+          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 8 }}>
+            <div style={{ fontWeight: 700, fontSize: 12, color: overlayTheme.titleText }}>
+              {item.title}
+            </div>
+            <span
+              style={{
+                padding: '2px 7px',
+                borderRadius: 999,
+                fontSize: 11,
+                color: item.required ? '#dc2626' : overlayTheme.mutedText,
+                background: item.required
+                  ? (darkMode ? 'rgba(248,113,113,0.12)' : 'rgba(254,226,226,0.7)')
+                  : (darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(15,23,42,0.05)'),
+              }}
+            >
+              {item.required ? '必填' : '可选'}
+            </span>
+          </div>
+          <div style={{ fontSize: 12, color: overlayTheme.titleText, lineHeight: 1.6 }}>
+            应填：{item.fill}
+          </div>
+          <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>
+            示例：<code style={{ fontFamily: 'var(--gn-font-mono)' }}>{item.example}</code>
+          </div>
+          <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>
+            避免：{item.avoid}
+          </div>
+        </div>
+      ))}
+    </div>
+    <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(260px, 1fr))', gap: 10 }}>
+      <RemoteCommandCard title="配置到云端 Agent" darkMode={darkMode} overlayTheme={overlayTheme} cardBorder={cardBorder}>
+        <code style={remoteCodeStyle(overlayTheme)}>
+          {quickStart.configJson}
+        </code>
+      </RemoteCommandCard>
+      <RemoteCommandCard title="无 GUI / CLI 生成配置" darkMode={darkMode} overlayTheme={overlayTheme} cardBorder={cardBorder}>
+        <code style={remoteCodeStyle(overlayTheme)}>
+          {quickStart.configCommand}
+        </code>
+        <div style={{ marginTop: 8, fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>
+          用于生成可粘贴到 {quickStart.displayName} 的远程 MCP 配置，不会读取或输出数据库密码。
+        </div>
+      </RemoteCommandCard>
+      <RemoteCommandCard title="Windows 启动 GoNavi MCP HTTP" darkMode={darkMode} overlayTheme={overlayTheme} cardBorder={cardBorder}>
+        <code style={remoteCodeStyle(overlayTheme)}>
+          {quickStart.launchCommand}
+        </code>
+        <div style={{ marginTop: 8, fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>
+          独立二进制：{quickStart.standaloneCommand}
+        </div>
+      </RemoteCommandCard>
+    </div>
+    <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(220px, 1fr))', gap: 10 }}>
+      <div>
+        <div style={{ fontWeight: 700, fontSize: 12, color: overlayTheme.titleText }}>验证顺序</div>
+        <div style={{ marginTop: 5, display: 'flex', flexDirection: 'column', gap: 4 }}>
+          {quickStart.verificationSteps.map((item) => (
+            <div key={item} style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>
+              {item}
+            </div>
+          ))}
+        </div>
+      </div>
+      <div>
+        <div style={{ fontWeight: 700, fontSize: 12, color: overlayTheme.titleText }}>安全边界</div>
+        <div style={{ marginTop: 5, display: 'flex', flexDirection: 'column', gap: 4 }}>
+          {quickStart.securityNotes.map((item) => (
+            <div key={item} style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6 }}>
+              {item}
+            </div>
+          ))}
+        </div>
+      </div>
+    </div>
+  </div>
+);
+
+export default AIMCPRemoteQuickStartPanel;
diff --git a/frontend/src/components/ai/AIMCPServerCard.test.tsx b/frontend/src/components/ai/AIMCPServerCard.test.tsx
new file mode 100644
index 0000000..1ec6bb2
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPServerCard.test.tsx
@@ -0,0 +1,152 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AIMCPServerCard from './AIMCPServerCard';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+describe('AIMCPServerCard', () => {
+  it('renders explicit MCP parameter hints, required badges, and the actual launch preview for command, args, and env', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPServerCard
+        server={{
+          id: 'mcp-1',
+          name: '',
+          transport: 'stdio',
+          command: 'node',
+          args: ['server.js', '--stdio'],
+          env: {},
+          enabled: true,
+          timeoutSeconds: 20,
+        }}
+        serverTools={[]}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        inputBg="#fff"
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        loading={false}
+        onChange={() => {}}
+        onTest={() => {}}
+        onSave={() => {}}
+        onDelete={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('启动命令只填可执行程序本身');
+    expect(markup).toContain('推荐填写顺序');
+    expect(markup).toContain('小白用户可以按这个顺序填');
+    expect(markup).toContain('字段速查');
+    expect(markup).toContain('保存后显示给你和 AI 看的名字');
+    expect(markup).toContain('示例值：');
+    expect(markup).toContain('Filesystem / Browser / GitHub');
+    expect(markup).toContain('-y / @modelcontextprotocol/server-filesystem / --stdio / server.js');
+    expect(markup).toContain('当前固定为 stdio');
+    expect(markup).toContain('单次工具发现或调用最多等待多久');
+    expect(markup).toContain('必填');
+    expect(markup).toContain('可选');
+    expect(markup).toContain('固定');
+    expect(markup).toContain('直接粘贴完整命令');
+    expect(markup).toContain('自动拆分到下方字段');
+    expect(markup).toContain('$env:KEY=VALUE;');
+    expect(markup).toContain('set KEY=VALUE &amp;&amp;');
+    expect(markup).toContain('npx -y package --stdio');
+    expect(markup).toContain('-y、@modelcontextprotocol/server-filesystem、--stdio、server.js');
+    expect(markup).toContain('每个参数单独录入一个标签');
+    expect(markup).toContain('当前命令 node 的参数提示');
+    expect(markup).toContain('Node 脚本参数顺序建议');
+    expect(markup).toContain('推荐顺序：脚本路径 -&gt; --stdio -&gt; 服务自己的业务参数');
+    expect(markup).toContain('必填参数看起来已经齐了');
+    expect(markup).toContain('每行一个 KEY=VALUE');
+    expect(markup).toContain('没有等号或 key 含空格的行不会保存');
+    expect(markup).toContain('不要把 npx -y package --stdio、node server.js --stdio 或 docker run -i image 整串都塞进这里');
+    expect(markup).toContain('不要写 export');
+    expect(markup).toContain('当前阶段只支持 stdio');
+    expect(markup).toContain('实际启动命令预览');
+    expect(markup).toContain('配置检查');
+    expect(markup).toContain('服务名称为空');
+    expect(markup).toContain('建议检查');
+    expect(markup).toContain('操作说明');
+    expect(markup).toContain('测试工具发现');
+    expect(markup).toContain('不会保存配置');
+    expect(markup).toContain('测试通过后，上方会显示这条服务实际发现到的工具');
+    expect(markup).toContain('默认 20 秒');
+    expect(markup).toContain('稍宽松 45 秒');
+    expect(markup).toContain('慢启动 60 秒');
+    expect(markup).toContain('npx -y @modelcontextprotocol/server-filesystem --stdio');
+    expect(markup).toContain('node server.js --stdio');
+    expect(markup).toContain('$env:GITHUB_TOKEN=...; uvx mcp-server-github --stdio');
+  });
+
+  it('renders actionable validation when command and args are mixed together', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPServerCard
+        server={{
+          id: 'mcp-1',
+          name: 'Node MCP',
+          transport: 'stdio',
+          command: 'node server.js --stdio',
+          args: [],
+          env: {},
+          enabled: true,
+          timeoutSeconds: 20,
+        }}
+        serverTools={[]}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        inputBg="#fff"
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        loading={false}
+        onChange={() => {}}
+        onTest={() => {}}
+        onSave={() => {}}
+        onDelete={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('启动命令可能填成了整行命令');
+    expect(markup).toContain('把脚本名、模块名、--stdio 和环境变量拆到命令参数或环境变量里');
+    expect(markup).toContain('命令参数可能缺少脚本或模块名');
+  });
+
+  it('renders env key purpose hints without requiring users to guess common MCP variables', () => {
+    const markup = renderToStaticMarkup(
+      <AIMCPServerCard
+        server={{
+          id: 'mcp-2',
+          name: 'GitHub MCP',
+          transport: 'stdio',
+          command: 'uvx',
+          args: ['mcp-server-github', '--stdio'],
+          env: {
+            GITHUB_TOKEN: '...',
+            HTTPS_PROXY: 'http://127.0.0.1:7890',
+          },
+          enabled: true,
+          timeoutSeconds: 20,
+        }}
+        serverTools={[]}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        inputBg="#fff"
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        loading={false}
+        onChange={() => {}}
+        onTest={() => {}}
+        onSave={() => {}}
+        onDelete={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('环境变量用途提示');
+    expect(markup).toContain('只解释 key 的用途和风险，不会显示 value');
+    expect(markup).toContain('GITHUB_TOKEN');
+    expect(markup).toContain('GitHub Token');
+    expect(markup).toContain('HTTPS_PROXY');
+    expect(markup).toContain('HTTPS 代理');
+    expect(markup).toContain('当前像示例占位值');
+    expect(markup).toContain('密钥类变量只保存在本机配置');
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPServerCard.tsx b/frontend/src/components/ai/AIMCPServerCard.tsx
new file mode 100644
index 0000000..89ba87c
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPServerCard.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import type { AIMCPServerConfig, AIMCPToolDescriptor } from '../../types';
+import { parseMCPCommandDraft } from '../../utils/mcpCommandDraft';
+import { formatMCPEnvDraft, parseMCPEnvDraft } from '../../utils/mcpEnvDraft';
+import { buildMCPLaunchPreview } from '../../utils/mcpServerGuidance';
+import { validateMCPServerDraft } from '../../utils/mcpServerValidation';
+import AIMCPServerFormPanel from './AIMCPServerFormPanel';
+import AIMCPServerGuidePanel from './AIMCPServerGuidePanel';
+
+interface AIMCPServerCardProps {
+  server: AIMCPServerConfig;
+  serverTools: AIMCPToolDescriptor[];
+  cardBg: string;
+  cardBorder: string;
+  inputBg: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  loading: boolean;
+  onChange: (patch: Partial<AIMCPServerConfig>) => void;
+  onTest: () => void;
+  onSave: () => void;
+  onDelete: () => void;
+}
+
+export const AIMCPServerCard: React.FC<AIMCPServerCardProps> = ({
+  server,
+  serverTools,
+  cardBg,
+  cardBorder,
+  inputBg,
+  darkMode,
+  overlayTheme,
+  loading,
+  onChange,
+  onTest,
+  onSave,
+  onDelete,
+}) => {
+  const [rawCommandDraft, setRawCommandDraft] = React.useState('');
+  const [envDraft, setEnvDraft] = React.useState(() => formatMCPEnvDraft(server.env));
+  const launchPreview = buildMCPLaunchPreview(server.command, server.args);
+  const parsedCommandDraft = parseMCPCommandDraft(rawCommandDraft);
+  const parsedEnvDraft = parseMCPEnvDraft(envDraft);
+  const validation = validateMCPServerDraft(server, parsedEnvDraft);
+
+  React.useEffect(() => {
+    setEnvDraft(formatMCPEnvDraft(server.env));
+  }, [server.id]);
+
+  const handleApplyCommandDraft = () => {
+    if (!parsedCommandDraft.ok || !parsedCommandDraft.draft) {
+      return;
+    }
+    setEnvDraft(formatMCPEnvDraft(parsedCommandDraft.draft.env));
+    onChange({
+      command: parsedCommandDraft.draft.command,
+      args: parsedCommandDraft.draft.args,
+      env: parsedCommandDraft.draft.env,
+    });
+  };
+
+  const handleEnvDraftChange = (nextValue: string) => {
+    setEnvDraft(nextValue);
+    onChange({ env: parseMCPEnvDraft(nextValue).env });
+  };
+
+  return (
+    <div style={{ padding: '14px 16px', borderRadius: 14, border: `1px solid ${cardBorder}`, background: cardBg, display: 'flex', flexDirection: 'column', gap: 12 }}>
+      <AIMCPServerGuidePanel
+        cardBorder={cardBorder}
+        inputBg={inputBg}
+        darkMode={darkMode}
+        overlayTheme={overlayTheme}
+        rawCommandDraft={rawCommandDraft}
+        parsedCommandDraft={parsedCommandDraft}
+        onApplyCommandDraft={handleApplyCommandDraft}
+        onRawCommandDraftChange={setRawCommandDraft}
+      />
+      <AIMCPServerFormPanel
+        server={server}
+        serverTools={serverTools}
+        launchPreview={launchPreview}
+        envDraft={envDraft}
+        parsedEnvDraft={parsedEnvDraft}
+        validation={validation}
+        cardBorder={cardBorder}
+        inputBg={inputBg}
+        darkMode={darkMode}
+        overlayTheme={overlayTheme}
+        loading={loading}
+        onChange={onChange}
+        onEnvDraftChange={handleEnvDraftChange}
+        onTest={onTest}
+        onSave={onSave}
+        onDelete={onDelete}
+      />
+    </div>
+  );
+};
+
+export default AIMCPServerCard;
diff --git a/frontend/src/components/ai/AIMCPServerFormPanel.tsx b/frontend/src/components/ai/AIMCPServerFormPanel.tsx
new file mode 100644
index 0000000..06b2bc8
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPServerFormPanel.tsx
@@ -0,0 +1,219 @@
+import React from 'react';
+import { Button, Input, Popconfirm, Select } from 'antd';
+import { DeleteOutlined } from '@ant-design/icons';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import type { AIMCPServerConfig, AIMCPToolDescriptor } from '../../types';
+import type { ParsedMCPEnvDraft } from '../../utils/mcpEnvDraft';
+import type { MCPServerDraftValidation } from '../../utils/mcpServerValidation';
+import AIMCPHelpBlock, { buildMCPHintStyle, mcpLabelStyle } from './AIMCPHelpBlock';
+import AIMCPArgumentHints from './AIMCPArgumentHints';
+import AIMCPEnvHints from './AIMCPEnvHints';
+import AIMCPServerValidationPanel from './AIMCPServerValidationPanel';
+import AIMCPToolSchemaSummary from './AIMCPToolSchemaSummary';
+
+interface AIMCPServerFormPanelProps {
+  server: AIMCPServerConfig;
+  serverTools: AIMCPToolDescriptor[];
+  launchPreview: string;
+  envDraft: string;
+  parsedEnvDraft: ParsedMCPEnvDraft;
+  validation: MCPServerDraftValidation;
+  cardBorder: string;
+  inputBg: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  loading: boolean;
+  onChange: (patch: Partial<AIMCPServerConfig>) => void;
+  onEnvDraftChange: (value: string) => void;
+  onTest: () => void;
+  onSave: () => void;
+  onDelete: () => void;
+}
+
+const AIMCPServerFormPanel: React.FC<AIMCPServerFormPanelProps> = ({
+  server,
+  serverTools,
+  launchPreview,
+  envDraft,
+  parsedEnvDraft,
+  validation,
+  cardBorder,
+  inputBg,
+  darkMode,
+  overlayTheme,
+  loading,
+  onChange,
+  onEnvDraftChange,
+  onTest,
+  onSave,
+  onDelete,
+}) => (
+  <>
+    <div style={{ display: 'grid', gridTemplateColumns: 'minmax(0,1fr) 132px', gap: 12 }}>
+      <AIMCPHelpBlock title="服务名称" description="给这个 MCP 起一个你自己能识别的名字，后面 AI 工具列表里会直接显示；不要只写 server、test 这类看不出用途的名字。" overlayTheme={overlayTheme} darkMode={darkMode} fieldState="required" example="Filesystem / Browser / GitHub">
+        <Input
+          value={server.name}
+          onChange={(event) => onChange({ name: event.target.value })}
+          placeholder="服务名称，例如：Filesystem / Browser / GitHub"
+          style={{ borderRadius: 10, background: inputBg, border: `1px solid ${cardBorder}` }}
+        />
+      </AIMCPHelpBlock>
+      <AIMCPHelpBlock title="启用状态" description="临时不用可以先禁用，保留配置但不参与 AI 工具发现。" overlayTheme={overlayTheme} darkMode={darkMode} fieldState="optional">
+        <Select
+          value={server.enabled ? 'enabled' : 'disabled'}
+          onChange={(value) => onChange({ enabled: value === 'enabled' })}
+          options={[{ label: '已启用', value: 'enabled' }, { label: '已禁用', value: 'disabled' }]}
+        />
+      </AIMCPHelpBlock>
+    </div>
+
+    <div style={{ display: 'grid', gridTemplateColumns: '132px minmax(0,1fr) 132px', gap: 12 }}>
+      <AIMCPHelpBlock title="传输方式" description="当前阶段只支持 stdio，表示 GoNavi 会在本机启动这个进程，并通过标准输入输出与它通信。" overlayTheme={overlayTheme} darkMode={darkMode} fieldState="fixed">
+        <Select
+          value={server.transport}
+          onChange={(value) => onChange({ transport: value as AIMCPServerConfig['transport'] })}
+          options={[{ label: 'stdio', value: 'stdio' }]}
+        />
+      </AIMCPHelpBlock>
+      <AIMCPHelpBlock title="启动命令" description="这里只填命令本身；如果是 npx/node/uvx/python/docker 这类启动器，把包名、脚本名、模块名或 docker run 参数放到下面的参数里。不要把 npx -y package --stdio、node server.js --stdio 或 docker run -i image 整串都塞进这里。" overlayTheme={overlayTheme} darkMode={darkMode} fieldState="required" example="npx / node / uvx / python / docker">
+        <Input
+          value={server.command}
+          onChange={(event) => onChange({ command: event.target.value })}
+          placeholder="启动命令，例如：npx / node / uvx / python / docker"
+          style={{ borderRadius: 10, background: inputBg, border: `1px solid ${cardBorder}` }}
+        />
+      </AIMCPHelpBlock>
+      <AIMCPHelpBlock title="超时(秒)" description="工具发现和工具调用单次最多等多久。大多数本机工具保持默认 20 秒即可；远端服务或启动慢的脚本再调大。" overlayTheme={overlayTheme} darkMode={darkMode} fieldState="optional" example="20">
+        <Input
+          type="number"
+          min={3}
+          max={120}
+          value={server.timeoutSeconds}
+          onChange={(event) => onChange({ timeoutSeconds: Number(event.target.value) || 20 })}
+          placeholder="超时(秒)"
+          style={{ borderRadius: 10, background: inputBg, border: `1px solid ${cardBorder}` }}
+        />
+        <div style={{ display: 'flex', gap: 8, flexWrap: 'wrap' }}>
+          {[
+            { label: '默认 20 秒', value: 20 },
+            { label: '稍宽松 45 秒', value: 45 },
+            { label: '慢启动 60 秒', value: 60 },
+          ].map((option) => (
+            <button
+              key={option.value}
+              type="button"
+              onClick={() => onChange({ timeoutSeconds: option.value })}
+              style={{
+                padding: '4px 10px',
+                borderRadius: 999,
+                border: `1px solid ${cardBorder}`,
+                background: server.timeoutSeconds === option.value
+                  ? (darkMode ? 'rgba(59,130,246,0.18)' : 'rgba(59,130,246,0.12)')
+                  : (darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.75)'),
+                color: server.timeoutSeconds === option.value ? '#2563eb' : overlayTheme.mutedText,
+                fontSize: 12,
+                cursor: 'pointer',
+              }}
+            >
+              {option.label}
+            </button>
+          ))}
+        </div>
+      </AIMCPHelpBlock>
+    </div>
+
+    <AIMCPHelpBlock title="命令参数" description="每个参数单独录入一个标签；命令本体不要填在这里。比如 npx -y package --stdio，要把 -y、package 和 --stdio 分开填；node server.js --stdio 要把 server.js 和 --stdio 分开填；docker run --rm -i image 要把 run、--rm、-i 和镜像名分开填。不确定怎么拆时，优先回到上面的“完整命令”框自动拆分。" overlayTheme={overlayTheme} darkMode={darkMode} fieldState="optional" example="-y、@modelcontextprotocol/server-filesystem、--stdio、server.js、run、--rm、-i、image">
+      <Select
+        mode="tags"
+        value={server.args || []}
+        onChange={(value) => onChange({ args: value })}
+        placeholder="命令参数，回车录入，例如：-y、包名、--stdio"
+        style={{ width: '100%' }}
+      />
+      <AIMCPArgumentHints
+        command={server.command}
+        args={server.args}
+        onArgsChange={(args) => onChange({ args })}
+        onCommandArgsChange={(command, args) => onChange({ command, args })}
+        cardBorder={cardBorder}
+        darkMode={darkMode}
+        overlayTheme={overlayTheme}
+      />
+    </AIMCPHelpBlock>
+
+    {launchPreview && (
+      <div style={{ padding: '10px 12px', borderRadius: 10, border: `1px solid ${cardBorder}`, background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.72)' }}>
+        <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>实际启动命令预览</div>
+        <div style={{ ...buildMCPHintStyle(overlayTheme.mutedText), marginTop: 4 }}>
+          GoNavi 会按下面的形式启动进程，方便你确认命令和参数是不是拆对了。
+        </div>
+        <code style={{ display: 'block', marginTop: 8, fontFamily: 'var(--gn-font-mono)', fontSize: 12, whiteSpace: 'pre-wrap', overflowWrap: 'anywhere' }}>
+          {launchPreview}
+        </code>
+      </div>
+    )}
+
+    <AIMCPHelpBlock title="环境变量" description="每行一个 KEY=VALUE，通常用于 API Key、工作目录、服务地址等配置；不需要时可以留空。这里会保存到本机配置，并在启动 MCP 进程时作为环境变量传入；不要写 export，也不要把密钥写进聊天内容。" overlayTheme={overlayTheme} darkMode={darkMode} fieldState="optional" example="OPENAI_API_KEY=...">
+      <Input.TextArea
+        rows={3}
+        value={envDraft}
+        onChange={(event) => onEnvDraftChange(event.target.value)}
+        placeholder={"环境变量，每行一个 KEY=VALUE，例如：\nOPENAI_API_KEY=...\nGITHUB_TOKEN=..."}
+        style={{ borderRadius: 10, background: inputBg, border: `1px solid ${cardBorder}`, fontFamily: 'var(--gn-font-mono)' }}
+      />
+      <div style={{ ...buildMCPHintStyle(parsedEnvDraft.invalidLines.length > 0 ? '#d97706' : overlayTheme.mutedText) }}>
+        {envDraft.trim()
+          ? parsedEnvDraft.invalidLines.length > 0
+            ? `已识别 ${parsedEnvDraft.validLines} 条环境变量，另有 ${parsedEnvDraft.invalidLines.length} 行格式无效，本次不会保存：${parsedEnvDraft.invalidLines.slice(0, 2).join(' / ')}`
+            : `已识别 ${parsedEnvDraft.validLines} 条环境变量。`
+          : '每行都要写成 KEY=VALUE；没有等号或 key 含空格的行不会保存。'}
+      </div>
+      <AIMCPEnvHints
+        command={server.command}
+        args={server.args}
+        env={parsedEnvDraft.env}
+        cardBorder={cardBorder}
+        darkMode={darkMode}
+        overlayTheme={overlayTheme}
+      />
+    </AIMCPHelpBlock>
+
+    <AIMCPServerValidationPanel
+      validation={validation}
+      cardBorder={cardBorder}
+      darkMode={darkMode}
+      overlayTheme={overlayTheme}
+    />
+
+    <AIMCPToolSchemaSummary
+      tools={serverTools}
+      cardBorder={cardBorder}
+      darkMode={darkMode}
+      overlayTheme={overlayTheme}
+    />
+
+    <div style={{ padding: '10px 12px', borderRadius: 10, border: `1px solid ${cardBorder}`, background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.72)' }}>
+      <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>操作说明</div>
+      <div style={{ ...buildMCPHintStyle(overlayTheme.mutedText), marginTop: 4 }}>
+        <strong>测试工具发现</strong>
+        {' '}只会按当前字段试启动一次，检查能发现哪些工具，不会保存配置。
+        {' '}<strong>保存</strong>
+        {' '}才会把这条 MCP 长期写入本地配置。
+        {serverTools.length > 0
+          ? ' 当前上方列出的工具，就是最近一次测试成功后发现到的别名。'
+          : ' 建议先测试成功，再保存；测试通过后，上方会显示这条服务实际发现到的工具。'}
+      </div>
+    </div>
+
+    <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 8 }}>
+      <Button onClick={onTest} loading={loading} disabled={!validation.canTest} style={{ borderRadius: 10 }}>测试工具发现</Button>
+      <Button type="primary" onClick={onSave} loading={loading} disabled={!validation.canSave} style={{ borderRadius: 10, fontWeight: 600 }}>保存</Button>
+      <Popconfirm title="删除这个 MCP 服务？" okText="删除" cancelText="取消" onConfirm={onDelete}>
+        <Button danger icon={<DeleteOutlined />} style={{ borderRadius: 10 }}>删除</Button>
+      </Popconfirm>
+    </div>
+  </>
+);
+
+export default AIMCPServerFormPanel;
diff --git a/frontend/src/components/ai/AIMCPServerGuidePanel.tsx b/frontend/src/components/ai/AIMCPServerGuidePanel.tsx
new file mode 100644
index 0000000..575c198
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPServerGuidePanel.tsx
@@ -0,0 +1,161 @@
+import React from 'react';
+import { Button, Input } from 'antd';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import type { ParseMCPCommandDraftResult } from '../../utils/mcpCommandDraft';
+import {
+  MCP_COMMAND_EXAMPLES,
+  MCP_COMMAND_PARSE_EXAMPLE,
+  MCP_FIELD_GUIDES,
+  MCP_SERVER_FILL_STEPS,
+  MCP_TROUBLESHOOTING_GUIDES,
+} from '../../utils/mcpServerGuidance';
+import AIMCPCommandDraftPreview from './AIMCPCommandDraftPreview';
+import AIMCPFieldGuideCard from './AIMCPFieldGuideCard';
+import { buildMCPHintStyle, mcpLabelStyle } from './AIMCPHelpBlock';
+
+interface AIMCPServerGuidePanelProps {
+  cardBorder: string;
+  inputBg: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  rawCommandDraft: string;
+  parsedCommandDraft: ParseMCPCommandDraftResult;
+  onApplyCommandDraft: () => void;
+  onRawCommandDraftChange: (value: string) => void;
+}
+
+const AIMCPServerGuidePanel: React.FC<AIMCPServerGuidePanelProps> = ({
+  cardBorder,
+  inputBg,
+  darkMode,
+  overlayTheme,
+  rawCommandDraft,
+  parsedCommandDraft,
+  onApplyCommandDraft,
+  onRawCommandDraftChange,
+}) => (
+  <>
+    <div style={{ padding: '10px 12px', borderRadius: 10, border: `1px dashed ${cardBorder}`, background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.7)' }}>
+      <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>填写示例</div>
+      <div style={{ ...buildMCPHintStyle(overlayTheme.mutedText), marginTop: 4 }}>
+        启动命令只填可执行程序本身，不要把参数混在一起。常见形式：
+        {' '}
+        <code style={{ fontFamily: 'var(--gn-font-mono)' }}>{MCP_COMMAND_EXAMPLES.join(' / ')}</code>
+      </div>
+    </div>
+
+    <div style={{ padding: '12px 14px', borderRadius: 12, border: `1px solid ${cardBorder}`, background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.76)', display: 'flex', flexDirection: 'column', gap: 8 }}>
+      <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>推荐填写顺序</div>
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+        小白用户可以按这个顺序填：先选上面的模板或粘整行命令，再确认下面的必填项，最后只在需要时补参数、环境变量和超时。
+      </div>
+      <div style={{ display: 'flex', flexWrap: 'wrap', gap: 8 }}>
+        {MCP_SERVER_FILL_STEPS.map((item) => (
+          <span
+            key={item.step}
+            style={{
+              padding: '4px 10px',
+              borderRadius: 999,
+              fontSize: 12,
+              color: overlayTheme.titleText,
+              background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(15,23,42,0.05)',
+            }}
+          >
+            {item.step}. {item.title}
+          </span>
+        ))}
+      </div>
+    </div>
+
+    <div style={{ padding: '12px 14px', borderRadius: 12, border: `1px solid ${cardBorder}`, background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.76)', display: 'flex', flexDirection: 'column', gap: 10 }}>
+      <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>字段速查</div>
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+        如果看到某个参数名不知道该填什么，先看这一块；下面每个字段也都有更具体的示例和注意事项。
+      </div>
+      <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(210px, 1fr))', gap: 10 }}>
+        {MCP_FIELD_GUIDES.map((item) => (
+          <AIMCPFieldGuideCard
+            key={item.key}
+            item={item}
+            cardBorder={cardBorder}
+            darkMode={darkMode}
+            overlayTheme={overlayTheme}
+          />
+        ))}
+      </div>
+    </div>
+
+    <div style={{ padding: '12px 14px', borderRadius: 12, border: `1px solid ${cardBorder}`, background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.76)', display: 'flex', flexDirection: 'column', gap: 10 }}>
+      <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>常见填错现象</div>
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+        如果测试失败，先按这里反查要改哪个字段；大多数问题都不是 MCP 坏了，而是命令、参数或环境变量拆错了。
+      </div>
+      <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(230px, 1fr))', gap: 10 }}>
+        {MCP_TROUBLESHOOTING_GUIDES.map((item) => (
+          <div
+            key={item.key}
+            style={{
+              padding: '10px 12px',
+              borderRadius: 10,
+              border: `1px solid ${cardBorder}`,
+              background: darkMode ? 'rgba(255,255,255,0.025)' : 'rgba(255,255,255,0.78)',
+              display: 'flex',
+              flexDirection: 'column',
+              gap: 6,
+            }}
+          >
+            <div style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText }}>{item.symptom}</div>
+            <div style={{ fontSize: 12, lineHeight: 1.6, color: overlayTheme.titleText }}>
+              常见原因：{item.likelyCause}
+            </div>
+            <div style={buildMCPHintStyle(overlayTheme.mutedText)}>处理方式：{item.fix}</div>
+            {item.example ? (
+              <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+                示例：
+                {' '}
+                <code style={{ fontFamily: 'var(--gn-font-mono)' }}>{item.example}</code>
+              </div>
+            ) : null}
+          </div>
+        ))}
+      </div>
+    </div>
+
+    <div style={{ padding: '12px', borderRadius: 12, border: `1px solid ${cardBorder}`, background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.76)', display: 'flex', flexDirection: 'column', gap: 8 }}>
+      <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>只有一条完整命令？</div>
+      <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+        直接粘贴完整命令，GoNavi 会自动拆成“启动命令 / 命令参数 / 环境变量”三块；支持 Unix 的 KEY=VALUE，也支持 Windows PowerShell 的 $env:KEY=VALUE; 和 cmd 的 set KEY=VALUE && 写法。
+      </div>
+      <Input.TextArea
+        rows={2}
+        value={rawCommandDraft}
+        onChange={(event) => onRawCommandDraftChange(event.target.value)}
+        placeholder={`直接粘贴完整命令，例如：\n${MCP_COMMAND_PARSE_EXAMPLE}`}
+        style={{ borderRadius: 10, background: inputBg, border: `1px solid ${cardBorder}`, fontFamily: 'var(--gn-font-mono)' }}
+      />
+      <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12, flexWrap: 'wrap' }}>
+        <div style={{ ...buildMCPHintStyle(parsedCommandDraft.ok ? overlayTheme.mutedText : '#dc2626') }}>
+          {rawCommandDraft.trim()
+            ? parsedCommandDraft.ok && parsedCommandDraft.draft
+              ? `将解析为：命令 ${parsedCommandDraft.draft.command}，参数 ${parsedCommandDraft.draft.args.length} 个，环境变量 ${Object.keys(parsedCommandDraft.draft.env).length} 个。`
+              : parsedCommandDraft.error
+            : '支持带引号路径、带空格参数，以及 KEY=VALUE / $env:KEY=VALUE; / set KEY=VALUE && 环境变量前缀。'}
+        </div>
+        <Button onClick={onApplyCommandDraft} disabled={!parsedCommandDraft.ok} style={{ borderRadius: 10 }}>
+          自动拆分到下方字段
+        </Button>
+      </div>
+      {parsedCommandDraft.ok && parsedCommandDraft.draft && rawCommandDraft.trim() && (
+        <AIMCPCommandDraftPreview
+          draft={parsedCommandDraft.draft}
+          darkMode={darkMode}
+          overlayTheme={overlayTheme}
+          cardBorder={cardBorder}
+        />
+      )}
+    </div>
+  </>
+);
+
+export default AIMCPServerGuidePanel;
diff --git a/frontend/src/components/ai/AIMCPServerValidationPanel.tsx b/frontend/src/components/ai/AIMCPServerValidationPanel.tsx
new file mode 100644
index 0000000..143a2b2
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPServerValidationPanel.tsx
@@ -0,0 +1,107 @@
+import React from 'react';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import type { MCPServerDraftIssue, MCPServerDraftValidation } from '../../utils/mcpServerValidation';
+import { buildMCPHintStyle, mcpLabelStyle } from './AIMCPHelpBlock';
+
+interface AIMCPServerValidationPanelProps {
+  validation: MCPServerDraftValidation;
+  cardBorder: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+}
+
+const getIssueTone = (issue: MCPServerDraftIssue, darkMode: boolean) => {
+  if (issue.severity === 'error') {
+    return {
+      label: '需修复',
+      color: '#dc2626',
+      bg: darkMode ? 'rgba(220,38,38,0.18)' : 'rgba(220,38,38,0.10)',
+    };
+  }
+  if (issue.severity === 'warning') {
+    return {
+      label: '建议检查',
+      color: '#b45309',
+      bg: darkMode ? 'rgba(245,158,11,0.18)' : 'rgba(245,158,11,0.12)',
+    };
+  }
+  return {
+    label: '提示',
+    color: '#2563eb',
+    bg: darkMode ? 'rgba(59,130,246,0.18)' : 'rgba(59,130,246,0.12)',
+  };
+};
+
+const AIMCPServerValidationPanel: React.FC<AIMCPServerValidationPanelProps> = ({
+  validation,
+  cardBorder,
+  darkMode,
+  overlayTheme,
+}) => {
+  const hasIssues = validation.issues.length > 0;
+  const summaryText = validation.errorCount > 0
+    ? `发现 ${validation.errorCount} 个必须修复的问题，修复后才能测试或保存。`
+    : validation.warningCount > 0
+      ? `发现 ${validation.warningCount} 个建议检查项，仍可测试和保存。`
+      : '当前配置可以测试和保存。';
+
+  return (
+    <div
+      style={{
+        padding: '10px 12px',
+        borderRadius: 10,
+        border: `1px solid ${cardBorder}`,
+        background: darkMode ? 'rgba(255,255,255,0.03)' : 'rgba(255,255,255,0.72)',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 8,
+      }}
+    >
+      <div style={{ ...mcpLabelStyle, color: overlayTheme.titleText }}>配置检查</div>
+      <div style={buildMCPHintStyle(validation.errorCount > 0 ? '#dc2626' : overlayTheme.mutedText)}>
+        {summaryText}
+      </div>
+      {hasIssues ? (
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+          {validation.issues.map((issue) => {
+            const tone = getIssueTone(issue, darkMode);
+            return (
+              <div
+                key={issue.key}
+                style={{
+                  padding: '8px 10px',
+                  borderRadius: 10,
+                  border: `1px solid ${cardBorder}`,
+                  background: darkMode ? 'rgba(255,255,255,0.025)' : 'rgba(255,255,255,0.78)',
+                  display: 'flex',
+                  flexDirection: 'column',
+                  gap: 4,
+                }}
+              >
+                <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+                  <span
+                    style={{
+                      padding: '2px 8px',
+                      borderRadius: 999,
+                      fontSize: 11,
+                      fontWeight: 700,
+                      color: tone.color,
+                      background: tone.bg,
+                    }}
+                  >
+                    {tone.label}
+                  </span>
+                  <span style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText }}>{issue.title}</span>
+                </div>
+                <div style={buildMCPHintStyle(overlayTheme.mutedText)}>{issue.detail}</div>
+              </div>
+            );
+          })}
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default AIMCPServerValidationPanel;
diff --git a/frontend/src/components/ai/AIMCPToolSchemaSummary.test.tsx b/frontend/src/components/ai/AIMCPToolSchemaSummary.test.tsx
new file mode 100644
index 0000000..dea5d70
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPToolSchemaSummary.test.tsx
@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest';
+
+import type { AIMCPToolDescriptor } from '../../types';
+import { buildMCPToolMinimalArgumentsExample } from './AIMCPToolSchemaSummary';
+
+const buildTool = (inputSchema: AIMCPToolDescriptor['inputSchema']): AIMCPToolDescriptor => ({
+  alias: 'execute_sql',
+  serverId: 'gonavi',
+  serverName: 'GoNavi',
+  originalName: 'execute_sql',
+  inputSchema,
+});
+
+describe('AIMCPToolSchemaSummary', () => {
+  it('builds a minimal arguments example from required schema fields', () => {
+    const example = buildMCPToolMinimalArgumentsExample(buildTool({
+      type: 'object',
+      required: ['connectionId', 'sql', 'allowMutating'],
+      properties: {
+        connectionId: { type: 'string' },
+        dbName: { type: 'string' },
+        sql: { type: 'string' },
+        allowMutating: { type: 'boolean', default: true },
+      },
+    }));
+
+    expect(example).toBe('{"connectionId":"<connectionId>","sql":"<sql>","allowMutating":true}');
+  });
+
+  it('uses enum, array, object, and number placeholders when defaults are absent', () => {
+    const example = buildMCPToolMinimalArgumentsExample(buildTool({
+      type: 'object',
+      required: ['mode', 'limit', 'filters', 'tags'],
+      properties: {
+        mode: { enum: ['safe', 'force'] },
+        limit: { type: 'number' },
+        filters: { type: 'object', properties: { status: { type: 'string' } } },
+        tags: { type: 'array', items: { type: 'string' } },
+      },
+    }));
+
+    expect(example).toBe('{"mode":"safe","limit":0,"filters":{},"tags":[]}');
+  });
+
+  it('returns an empty object when no required parameters are declared', () => {
+    const example = buildMCPToolMinimalArgumentsExample(buildTool({
+      type: 'object',
+      properties: {
+        keyword: { type: 'string' },
+      },
+    }));
+
+    expect(example).toBe('{}');
+  });
+});
diff --git a/frontend/src/components/ai/AIMCPToolSchemaSummary.tsx b/frontend/src/components/ai/AIMCPToolSchemaSummary.tsx
new file mode 100644
index 0000000..6893403
--- /dev/null
+++ b/frontend/src/components/ai/AIMCPToolSchemaSummary.tsx
@@ -0,0 +1,191 @@
+import React from 'react';
+
+import type { AIMCPToolDescriptor } from '../../types';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import { buildMCPHintStyle } from './AIMCPHelpBlock';
+
+const MAX_PARAMETER_PREVIEW = 6;
+
+type JSONSchemaRecord = Record<string, any>;
+
+const isRecord = (value: unknown): value is JSONSchemaRecord =>
+  Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+
+const readSchemaType = (schema: JSONSchemaRecord): string => {
+  if (Array.isArray(schema.type)) {
+    return schema.type.map((item) => String(item)).filter(Boolean).join('|') || 'unknown';
+  }
+  if (typeof schema.type === 'string' && schema.type.trim()) {
+    return schema.type.trim();
+  }
+  if (Array.isArray(schema.enum)) {
+    return 'enum';
+  }
+  if (isRecord(schema.properties)) {
+    return 'object';
+  }
+  if (isRecord(schema.items)) {
+    return 'array';
+  }
+  return 'unknown';
+};
+
+const readRequiredSet = (schema: JSONSchemaRecord): Set<string> => new Set(
+  Array.isArray(schema.required)
+    ? schema.required.map((item) => String(item)).filter(Boolean)
+    : [],
+);
+
+const readExampleValue = (name: string, schema: JSONSchemaRecord): unknown => {
+  if (Object.prototype.hasOwnProperty.call(schema, 'default')) {
+    const value = schema.default;
+    if (value === null || ['string', 'number', 'boolean'].includes(typeof value)) {
+      return value;
+    }
+  }
+  if (Array.isArray(schema.enum) && schema.enum.length > 0) {
+    const value = schema.enum[0];
+    if (value === null || ['string', 'number', 'boolean'].includes(typeof value)) {
+      return value;
+    }
+  }
+
+  const type = readSchemaType(schema);
+  if (type.includes('boolean')) return false;
+  if (type.includes('number') || type.includes('integer')) return 0;
+  if (type.includes('array')) return [];
+  if (type.includes('object')) return {};
+  return `<${name}>`;
+};
+
+export const buildMCPToolMinimalArgumentsExample = (tool: AIMCPToolDescriptor): string => {
+  const inputSchema = isRecord(tool.inputSchema) ? tool.inputSchema : {};
+  const properties = isRecord(inputSchema.properties) ? inputSchema.properties : {};
+  const requiredSet = readRequiredSet(inputSchema);
+  const example = Object.entries(properties).reduce<Record<string, unknown>>((acc, [name, rawSchema]) => {
+    if (!requiredSet.has(name)) {
+      return acc;
+    }
+    acc[name] = readExampleValue(name, isRecord(rawSchema) ? rawSchema : {});
+    return acc;
+  }, {});
+  return JSON.stringify(example);
+};
+
+const summarizeToolParameters = (tool: AIMCPToolDescriptor) => {
+  const inputSchema = isRecord(tool.inputSchema) ? tool.inputSchema : {};
+  const properties = isRecord(inputSchema.properties) ? inputSchema.properties : {};
+  const requiredSet = readRequiredSet(inputSchema);
+  const parameters = Object.entries(properties).map(([name, rawSchema]) => {
+    const schema = isRecord(rawSchema) ? rawSchema : {};
+    return {
+      name,
+      required: requiredSet.has(name),
+      type: readSchemaType(schema),
+      description: String(schema.description || schema.title || '').trim(),
+    };
+  });
+
+  return {
+    hasInputSchema: Object.keys(inputSchema).length > 0,
+    parameters,
+    requiredCount: parameters.filter((item) => item.required).length,
+    minimalArgumentsExample: buildMCPToolMinimalArgumentsExample(tool),
+    truncated: parameters.length > MAX_PARAMETER_PREVIEW,
+  };
+};
+
+interface AIMCPToolSchemaSummaryProps {
+  tools: AIMCPToolDescriptor[];
+  cardBorder: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+}
+
+const AIMCPToolSchemaSummary: React.FC<AIMCPToolSchemaSummaryProps> = ({
+  tools,
+  cardBorder,
+  darkMode,
+  overlayTheme,
+}) => {
+  if (tools.length === 0) {
+    return null;
+  }
+
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+      <div style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText }}>已发现工具和参数提示</div>
+      <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(230px, 1fr))', gap: 8 }}>
+        {tools.map((tool) => {
+          const summary = summarizeToolParameters(tool);
+          const previewParameters = summary.parameters.slice(0, MAX_PARAMETER_PREVIEW);
+          return (
+            <div
+              key={tool.alias}
+              style={{
+                padding: '10px 12px',
+                borderRadius: 10,
+                border: `1px solid ${cardBorder}`,
+                background: darkMode ? 'rgba(255,255,255,0.025)' : 'rgba(255,255,255,0.78)',
+                display: 'flex',
+                flexDirection: 'column',
+                gap: 6,
+              }}
+            >
+              <div style={{ fontSize: 12, fontWeight: 700, color: overlayTheme.titleText, overflowWrap: 'anywhere' }}>
+                {tool.alias}
+              </div>
+              {tool.description ? (
+                <div style={buildMCPHintStyle(overlayTheme.mutedText)}>{tool.description}</div>
+              ) : null}
+              <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+                {summary.hasInputSchema
+                  ? `参数 ${summary.parameters.length} 个，必填 ${summary.requiredCount} 个；星号表示必填。`
+                  : '未声明 inputSchema，调用参数需参考服务文档或用 /mcptool 继续查看。'}
+              </div>
+              {summary.hasInputSchema ? (
+                <div style={buildMCPHintStyle(overlayTheme.mutedText)}>
+                  最小 arguments 示例：
+                  {' '}
+                  <code style={{ fontFamily: 'var(--gn-font-mono)', overflowWrap: 'anywhere' }}>
+                    {summary.minimalArgumentsExample}
+                  </code>
+                </div>
+              ) : null}
+              {previewParameters.length > 0 ? (
+                <div style={{ display: 'flex', flexWrap: 'wrap', gap: 6 }}>
+                  {previewParameters.map((parameter) => (
+                    <span
+                      key={parameter.name}
+                      title={parameter.description || undefined}
+                      style={{
+                        padding: '3px 7px',
+                        borderRadius: 999,
+                        background: parameter.required
+                          ? (darkMode ? 'rgba(59,130,246,0.18)' : 'rgba(37,99,235,0.10)')
+                          : (darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(15,23,42,0.05)'),
+                        color: parameter.required ? '#2563eb' : overlayTheme.mutedText,
+                        fontSize: 12,
+                        fontFamily: 'var(--gn-font-mono)',
+                      }}
+                    >
+                      {parameter.name}
+                      {parameter.required ? '*' : ''}: {parameter.type}
+                    </span>
+                  ))}
+                  {summary.truncated ? (
+                    <span style={{ ...buildMCPHintStyle(overlayTheme.mutedText), padding: '3px 0' }}>
+                      还有 {summary.parameters.length - MAX_PARAMETER_PREVIEW} 个参数，使用 /mcptool 查看完整 schema
+                    </span>
+                  ) : null}
+                </div>
+              ) : null}
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+};
+
+export default AIMCPToolSchemaSummary;
diff --git a/frontend/src/components/ai/AIMessageBubble.test.tsx b/frontend/src/components/ai/AIMessageBubble.test.tsx
new file mode 100644
index 0000000..3499732
--- /dev/null
+++ b/frontend/src/components/ai/AIMessageBubble.test.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import { AIMessageBubble } from './AIMessageBubble';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+describe('AIMessageBubble', () => {
+  it('renders thinking, tool progress and raw error actions after extracting status blocks', () => {
+    const markup = renderToStaticMarkup(
+      <AIMessageBubble
+        msg={{
+          id: 'assistant-1',
+          role: 'assistant',
+          content: '这里是诊断结论。',
+          thinking: '先看连接，再看表结构。',
+          rawError: 'driver timeout',
+          timestamp: Date.now(),
+          tool_calls: [
+            {
+              id: 'tool-1',
+              type: 'function',
+              function: {
+                name: 'get_foreign_keys',
+                arguments: '{}',
+              },
+            },
+          ],
+        }}
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        textColor="#1f2937"
+        onEdit={() => {}}
+        onRetry={() => {}}
+        onDelete={() => {}}
+        allMessages={[
+          {
+            id: 'tool-result-1',
+            role: 'tool',
+            content: '[{\"fk\":\"orders.customer_id\"}]',
+            timestamp: Date.now(),
+            tool_call_id: 'tool-1',
+            tool_name: 'get_foreign_keys',
+          },
+        ]}
+      />,
+    );
+
+    expect(markup).toContain('GoNavi AI');
+    expect(markup).toContain('思考过程');
+    expect(markup).toContain('梳理外键关系');
+    expect(markup).toContain('复制报错原文');
+    expect(markup).toContain('数据探针执行完毕');
+  });
+});
diff --git a/frontend/src/components/ai/AIMessageBubble.tsx b/frontend/src/components/ai/AIMessageBubble.tsx
index f7b8999..d37af4b 100644
--- a/frontend/src/components/ai/AIMessageBubble.tsx
+++ b/frontend/src/components/ai/AIMessageBubble.tsx
@@ -1,832 +1,455 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState } from 'react';
 import { Button, Tooltip, message } from 'antd';
-import { UserOutlined, RobotOutlined, EditOutlined, ReloadOutlined, DeleteOutlined, CheckOutlined, CopyOutlined, PlayCircleOutlined, ApiOutlined, LoadingOutlined, CaretRightOutlined, CaretDownOutlined } from '@ant-design/icons';
-import ReactMarkdown from 'react-markdown';
-import remarkGfm from 'remark-gfm';
-import mermaid from 'mermaid';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import { vscDarkPlus, vs } from 'react-syntax-highlighter/dist/esm/styles/prism';
-import type { AIChatMessage, AIToolCall } from '../../types';
+import {
+  CheckOutlined,
+  CopyOutlined,
+  DeleteOutlined,
+  EditOutlined,
+  FileTextOutlined,
+  ReloadOutlined,
+  WarningOutlined,
+  RobotOutlined,
+  UserOutlined,
+} from '@ant-design/icons';
+
+import type { AIChatMessage } from '../../types';
 import { useStore } from '../../store';
 import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
-import { normalizeAiMarkdown } from '../../utils/aiMarkdown';
 import { extractJVMChangePlan, resolveJVMAIPlanTargetTabId } from '../../utils/jvmAiPlan';
 import {
-    parseJVMDiagnosticPlan,
-    resolveJVMDiagnosticPlanTargetTabId,
+  parseJVMDiagnosticPlan,
+  resolveJVMDiagnosticPlanTargetTabId,
 } from '../../utils/jvmDiagnosticPlan';
-import { buildAIReadonlyPreviewSQL } from '../../utils/aiSqlLimit';
-// 🔧 性能优化：将 ReactMarkdown 包装为 Memo 组件并提取固定的 plugins
-const remarkPlugins = [remarkGfm];
-
-const MemoizedMarkdown = React.memo(({ 
-    content, 
-    darkMode, 
-    overlayTheme, 
-    activeConnectionConfig, 
-    activeConnectionId, 
-    activeDbName 
-}: {
-    content: string;
-    darkMode: boolean;
-    overlayTheme: OverlayWorkbenchTheme;
-    activeConnectionConfig?: any;
-    activeConnectionId?: string;
-    activeDbName?: string;
-}) => {
-    const normalizedContent = React.useMemo(() => normalizeAiMarkdown(content), [content]);
-    // 缓存 components 对象，避免每次渲染都生成新的函数引用击穿内部子组件的 memo
-    const components = React.useMemo(() => ({
-        code({ node, inline, className, children, ...props }: any) {
-            const match = /language-(\w+)/.exec(className || '');
-            if (!inline && match && match[1] === 'mermaid') {
-                return <MermaidRenderer chart={String(children).replace(/\n$/, '')} darkMode={darkMode} />;
-            }
-            return !inline && match ? (
-                <AIBlockHashRender match={match} darkMode={darkMode} overlayTheme={overlayTheme} children={children} activeConnectionConfig={activeConnectionConfig} activeConnectionId={activeConnectionId} activeDbName={activeDbName} />
-            ) : (
-                <code className={className} {...props}>
-                    {children}
-                </code>
-            );
-        }
-    }), [darkMode, overlayTheme, activeConnectionConfig, activeConnectionId, activeDbName]);
-
-    return (
-        <ReactMarkdown remarkPlugins={remarkPlugins} components={components}>
-            {normalizedContent}
-        </ReactMarkdown>
-    );
-});
+import { AIMessageMarkdown } from './messageBubble/AIMessageMarkdown';
+import { AIThinkingBlock, AIToolCallingBlock } from './messageBubble/AIMessageStatusBlocks';
+import { formatAIChatAttachmentSize } from './aiChatAttachments';
 
 interface AIMessageBubbleProps {
-    msg: AIChatMessage;
-    darkMode: boolean;
-    overlayTheme: OverlayWorkbenchTheme;
-    textColor: string;
-    onEdit: (msg: AIChatMessage) => void;
-    onRetry: (msg: AIChatMessage) => void;
-    onDelete: (id: string) => void;
-    activeConnectionId?: string;
-    activeConnectionConfig?: any;
-    activeDbName?: string;
-    allMessages?: AIChatMessage[];
+  msg: AIChatMessage;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  textColor: string;
+  onEdit: (msg: AIChatMessage) => void;
+  onRetry: (msg: AIChatMessage) => void;
+  onDelete: (id: string) => void;
+  activeConnectionId?: string;
+  activeConnectionConfig?: any;
+  activeDbName?: string;
+  allMessages?: AIChatMessage[];
 }
 
-const AIToolResultItem: React.FC<{ resultMsg: AIChatMessage, darkMode: boolean, overlayTheme: OverlayWorkbenchTheme }> = ({ resultMsg, darkMode, overlayTheme }) => {
-    const [toolExpanded, setToolExpanded] = useState(false);
-    const charCount = resultMsg.content ? resultMsg.content.length : 0;
-    return (
-        <div style={{
-            background: darkMode ? 'rgba(0,0,0,0.1)' : 'rgba(0,0,0,0.02)',
-            borderRadius: 6,
-            padding: '6px 10px',
-            border: `1px solid ${darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)'}`,
-            marginTop: 8,
-            width: '100%'
-        }}>
-            <div 
-                style={{ display: 'flex', alignItems: 'center', cursor: 'pointer', gap: 6, fontSize: 12, color: overlayTheme.mutedText }}
-                onClick={() => setToolExpanded(!toolExpanded)}
-            >
-                {toolExpanded ? <CaretDownOutlined /> : <CaretRightOutlined />}
-                <ApiOutlined style={{ color: '#1677ff' }} />
-                <span>探针执行结果 (<span style={{ fontFamily: 'var(--gn-font-mono)', color: overlayTheme.iconColor }}>{resultMsg.tool_name || 'unknown'}</span>)</span>
-                <span style={{ fontSize: 11, marginLeft: 8, opacity: 0.6 }}>{charCount > 0 ? `${charCount} 个字符` : '无数据'}</span>
-            </div>
-            {toolExpanded && (
-                <div style={{ marginTop: 8, fontSize: 12, color: overlayTheme.mutedText, fontFamily: 'var(--gn-font-mono)', whiteSpace: 'pre-wrap', wordBreak: 'break-all', maxHeight: 300, overflowY: 'auto', background: darkMode ? 'rgba(0,0,0,0.2)' : 'rgba(0,0,0,0.03)', padding: 8, borderRadius: 6 }}>
-                    {resultMsg.content}
-                </div>
-            )}
-        </div>
-    );
-};
+interface AIMessageActionBarProps {
+  msg: AIChatMessage;
+  isUser: boolean;
+  isCopied: boolean;
+  textColor: string;
+  mutedText: string;
+  onEdit: (msg: AIChatMessage) => void;
+  onRetry: (msg: AIChatMessage) => void;
+  onDelete: (id: string) => void;
+  onCopy: () => void;
+}
 
-const MermaidRenderer = ({ chart, darkMode }: { chart: string, darkMode: boolean }) => {
-    const containerRef = React.useRef<HTMLDivElement>(null);
-
-    React.useEffect(() => {
-        if (containerRef.current) {
-            try {
-                mermaid.initialize({ startOnLoad: false, theme: darkMode ? 'dark' : 'default' });
-                const id = `mermaid-${Math.random().toString(36).substring(2)}`;
-                (async () => {
-                    const result: any = await mermaid.render(id, chart);
-                    if (containerRef.current) {
-                        containerRef.current.innerHTML = result.svg || result;
-                    }
-                })().catch((e: any) => {
-                    if (containerRef.current) {
-                        containerRef.current.innerHTML = `<div style="color:#ef4444; padding:12px; background:rgba(239,68,68,0.1); border-radius:6px; font-size:12px">Mermaid 解析失败: ${e.message}</div>`;
-                    }
-                });
-            } catch (e: any) {
-                if (containerRef.current) {
-                    containerRef.current.innerHTML = `<div style="color:#ef4444; padding:12px; background:rgba(239,68,68,0.1); border-radius:6px; font-size:12px">Mermaid 渲染异常: ${e.message}</div>`;
-                }
-            }
-        }
-    }, [chart, darkMode]);
-
-    return <div ref={containerRef} className="ai-mermaid-container" style={{ margin: '16px 0', display: 'flex', justifyContent: 'flex-start', overflowX: 'auto' }} />;
-};
-
-const CodeCopyBtn = ({ text }: { text: string }) => {
-    const [copied, setCopied] = useState(false);
-    return (
-        <span 
-            className="ai-code-copy-btn" 
-            onClick={() => { 
-                navigator.clipboard.writeText(text); 
-                setCopied(true); 
-                setTimeout(() => setCopied(false), 2000); 
-            }}
-            style={{ 
-                cursor: 'pointer', 
-                display: 'flex', 
-                alignItems: 'center', 
-                opacity: copied ? 1 : 0.6,
-                transition: 'opacity 0.2s',
-            }}
-            onMouseEnter={(e) => { e.currentTarget.style.opacity = '1'; }}
-            onMouseLeave={(e) => { e.currentTarget.style.opacity = copied ? '1' : '0.6'; }}
+const AIMessageAttachmentSummary: React.FC<{
+  msg: AIChatMessage;
+  overlayTheme: OverlayWorkbenchTheme;
+}> = ({ msg, overlayTheme }) => {
+  const fileAttachments = (msg.attachments || []).filter((attachment) => attachment.kind !== 'image');
+  if (fileAttachments.length === 0) {
+    return null;
+  }
+  return (
+    <div style={{ display: 'flex', gap: 6, flexWrap: 'wrap', marginBottom: 10 }}>
+      {fileAttachments.map((attachment) => (
+        <div
+          key={attachment.id}
+          title={attachment.extractWarning || attachment.name}
+          style={{
+            display: 'inline-flex',
+            alignItems: 'center',
+            gap: 6,
+            maxWidth: 260,
+            padding: '4px 8px',
+            borderRadius: 8,
+            border: overlayTheme.shellBorder,
+            color: overlayTheme.titleText,
+            background: 'rgba(0,0,0,0.03)',
+            fontSize: 12,
+          }}
         >
-            {copied ? <CheckOutlined style={{ color: '#52c41a' }} /> : <CopyOutlined />} 
-            <span style={{ marginLeft: 4 }}>{copied ? '已复制' : '复制代码'}</span>
-        </span>
-    );
-};
-
-const CodeRunBtn = ({ text, connectionId, dbName }: { text: string; connectionId?: string; dbName?: string }) => {
-    // 解析 SQL 顶部的 @context 注释，格式：-- @context connectionId=xxx dbName=yyy
-    const contextMatch = text.match(/^--\s*@context\s+connectionId=(\S+)\s+dbName=(\S+)/m);
-    const resolvedConnId = contextMatch?.[1] || connectionId;
-    const resolvedDbName = contextMatch?.[2] || dbName;
-    // 发送给查询编辑器时去掉 @context 注释行
-    const cleanSql = text.replace(/^--\s*@context\s+.*\n?/gm, '').trim();
-    const sqlDetail = (runImmediately: boolean) => ({ sql: cleanSql, runImmediately, connectionId: resolvedConnId, dbName: resolvedDbName });
-    const handleExecute = async () => {
-        try {
-            const Service = (window as any).go?.aiservice?.Service;
-            if (Service?.AICheckSQL) {
-                const result = await Service.AICheckSQL(text);
-                if (!result.allowed) {
-                    message.error(`🔒 安全策略拦截：当前安全级别不允许执行 ${result.operationType} 类型的 SQL。请在 AI 设置中调整安全级别。`);
-                    return;
-                }
-                if (result.requiresConfirm) {
-                    const { Modal } = await import('antd');
-                    Modal.confirm({
-                        title: '⚠️ 安全确认',
-                        content: result.warningMessage || `此 SQL 为 ${result.operationType} 操作，确定要执行吗？`,
-                        okText: '确认执行',
-                        cancelText: '取消',
-                        okButtonProps: { danger: true },
-                        onOk: () => {
-                            window.dispatchEvent(new CustomEvent('gonavi:insert-sql', { detail: sqlDetail(true) }));
-                        },
-                    });
-                    return;
-                }
-            }
-            // Safety check passed or not available, execute directly
-            window.dispatchEvent(new CustomEvent('gonavi:insert-sql', { detail: sqlDetail(true) }));
-        } catch (e) {
-            // If safety check fails, still allow manual execution
-            window.dispatchEvent(new CustomEvent('gonavi:insert-sql', { detail: sqlDetail(true) }));
-        }
-    };
-
-    return (
-        <div style={{ display: 'flex', gap: 10, alignItems: 'center' }}>
-            <Tooltip title="将该段 SQL 注入查询工作区（可快捷修改或执行）">
-                <span 
-                    className="ai-code-run-btn" 
-                    onClick={() => {
-                        window.dispatchEvent(new CustomEvent('gonavi:insert-sql', { detail: sqlDetail(false) }));
-                    }}
-                    style={{ 
-                        cursor: 'pointer', display: 'flex', alignItems: 'center', 
-                        opacity: 0.6, transition: 'opacity 0.2s', padding: '0 4px', color: '#10b981'
-                    }}
-                    onMouseEnter={(e) => { e.currentTarget.style.opacity = '1'; }}
-                    onMouseLeave={(e) => { e.currentTarget.style.opacity = '0.6'; }}
-                >
-                    <PlayCircleOutlined /> 
-                    <span style={{ marginLeft: 4 }}>插入</span>
-                </span>
-            </Tooltip>
-            <Tooltip title="立即执行（受 AI 安全策略管控）">
-                <span 
-                    className="ai-code-run-btn" 
-                    onClick={handleExecute}
-                    style={{ 
-                        cursor: 'pointer', display: 'flex', alignItems: 'center', 
-                        opacity: 0.6, transition: 'opacity 0.2s', padding: '0 4px', color: '#1677ff'
-                    }}
-                    onMouseEnter={(e) => { e.currentTarget.style.opacity = '1'; }}
-                    onMouseLeave={(e) => { e.currentTarget.style.opacity = '0.6'; }}
-                >
-                    <PlayCircleOutlined />
-                    <span style={{ marginLeft: 4 }}>执行</span>
-                </span>
-            </Tooltip>
+          <FileTextOutlined />
+          <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{attachment.name}</span>
+          <span style={{ color: overlayTheme.mutedText, flexShrink: 0 }}>{formatAIChatAttachmentSize(attachment.size)}</span>
+          {attachment.extractWarning ? <WarningOutlined style={{ color: '#faad14', flexShrink: 0 }} /> : null}
         </div>
-    );
+      ))}
+    </div>
+  );
 };
 
-// 阶段2: 代码块体验升级 (折叠展开、行号显示、内联SQL预览)
-const AIBlockHashRender = ({ match, darkMode, overlayTheme, children, activeConnectionConfig, activeConnectionId, activeDbName }: any) => {
-    const codeText = String(children).replace(/\n$/, '');
-    // 将 @context 注释行从显示文本中剔除，用户无需看到内部元数据
-    const displayText = codeText.replace(/^--\s*@context\s+.*\n?/gm, '').trim();
-    const [expanded, setExpanded] = useState(false);
-    const [previewData, setPreviewData] = useState<any[] | null>(null);
-    const [previewCols, setPreviewCols] = useState<string[]>([]);
-    const [previewLoading, setPreviewLoading] = useState(false);
-    const [previewError, setPreviewError] = useState('');
-    const [previewExpanded, setPreviewExpanded] = useState(false);
-    
-    const MAX_HEIGHT = 300;
-    const isLongCode = displayText.split('\n').length > 15;
-    const isSql = match[1] === 'sql';
-    const isSelectQuery = isSql && /^\s*(SELECT|SHOW|DESCRIBE|DESC|EXPLAIN)\b/i.test(displayText.trim());
+const AIMessageActionBar: React.FC<AIMessageActionBarProps> = ({
+  msg,
+  isUser,
+  isCopied,
+  textColor,
+  mutedText,
+  onEdit,
+  onRetry,
+  onDelete,
+  onCopy,
+}) => (
+  <div className="ai-message-actions" style={{ display: 'flex', gap: 8, opacity: 0, transition: 'opacity 0.2s', padding: '0 4px' }}>
+    <Tooltip title={isCopied ? '已复制' : '复制全文'}>
+      {isCopied ? (
+        <CheckOutlined className="ai-action-icon" style={{ color: '#10b981' }} />
+      ) : (
+        <CopyOutlined
+          className="ai-action-icon"
+          onClick={onCopy}
+          style={{ cursor: 'pointer', color: mutedText }}
+          onMouseEnter={(event) => { event.currentTarget.style.color = textColor; }}
+          onMouseLeave={(event) => { event.currentTarget.style.color = mutedText; }}
+        />
+      )}
+    </Tooltip>
+    {isUser ? (
+      <Tooltip title="编辑此条消息（移除其后所有记录并重新发送）">
+        <EditOutlined
+          className="ai-action-icon"
+          onClick={() => onEdit(msg)}
+          style={{ cursor: 'pointer', color: mutedText }}
+          onMouseEnter={(event) => { event.currentTarget.style.color = textColor; }}
+          onMouseLeave={(event) => { event.currentTarget.style.color = mutedText; }}
+        />
+      </Tooltip>
+    ) : (
+      <Tooltip title="重新生成（移除此条并触发上次用户输入重发）">
+        <ReloadOutlined
+          className="ai-action-icon"
+          onClick={() => onRetry(msg)}
+          style={{ cursor: 'pointer', color: mutedText }}
+          onMouseEnter={(event) => { event.currentTarget.style.color = textColor; }}
+          onMouseLeave={(event) => { event.currentTarget.style.color = mutedText; }}
+        />
+      </Tooltip>
+    )}
+    <Tooltip title="删除单条消息">
+      <DeleteOutlined
+        className="ai-action-icon"
+        onClick={() => onDelete(msg.id)}
+        style={{ cursor: 'pointer', color: mutedText }}
+        onMouseEnter={(event) => { event.currentTarget.style.color = '#ef4444'; }}
+        onMouseLeave={(event) => { event.currentTarget.style.color = mutedText; }}
+      />
+    </Tooltip>
+  </div>
+);
 
-    const handleInlineExecute = async () => {
-        if (!activeConnectionConfig || previewLoading) return;
-        setPreviewLoading(true);
-        setPreviewError('');
-        setPreviewData(null);
-        try {
-            const { DBQuery } = await import('../../../wailsjs/go/app/App');
-            const previewSql = buildAIReadonlyPreviewSQL(
-                activeConnectionConfig?.type || '',
-                displayText,
-                50,
-                activeConnectionConfig?.driver || '',
-            );
-            const res = await DBQuery(activeConnectionConfig, activeDbName || '', previewSql);
-            if (res.success && Array.isArray(res.data)) {
-                const rows = res.data as any[];
-                const cols = rows.length > 0 ? Object.keys(rows[0]) : [];
-                setPreviewCols(cols);
-                setPreviewData(rows.slice(0, 20));
-                setPreviewExpanded(true);
-            } else {
-                setPreviewError(res.message || '查询无结果');
-            }
-        } catch (err: any) {
-            setPreviewError(err?.message || '执行失败');
-        } finally {
-            setPreviewLoading(false);
+const AIRawErrorButton: React.FC<{
+  messageId: string;
+  rawError: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+}> = ({ messageId, rawError, darkMode, overlayTheme }) => (
+  <div style={{ marginTop: 8 }}>
+    <button
+      onClick={() => {
+        navigator.clipboard.writeText(rawError || '');
+        const button = document.getElementById(`raw-err-btn-${messageId}`);
+        if (button) {
+          button.textContent = '✅ 已复制';
+          setTimeout(() => {
+            button.textContent = '📋 复制报错原文';
+          }, 1500);
         }
-    };
+      }}
+      id={`raw-err-btn-${messageId}`}
+      style={{
+        fontSize: 12,
+        padding: '3px 10px',
+        borderRadius: 6,
+        cursor: 'pointer',
+        border: `1px solid ${darkMode ? 'rgba(255,255,255,0.12)' : 'rgba(0,0,0,0.08)'}`,
+        background: darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)',
+        color: overlayTheme.mutedText,
+        transition: 'all 0.15s ease',
+      }}
+    >
+      📋 复制报错原文
+    </button>
+  </div>
+);
 
-    return (
-        <div className="ai-code-block-container" style={{ margin: '12px 0', border: overlayTheme.sectionBorder, borderRadius: 6, overflow: 'hidden' }}>
-            <div className="ai-code-header" style={{
-                display: 'flex', justifyContent: 'space-between', alignItems: 'center',
-                padding: '6px 12px', background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)',
-                fontSize: 12, color: overlayTheme.mutedText
-            }}>
-                <span style={{ fontFamily: 'var(--gn-font-mono)' }}>{match[1]}</span>
-                <div style={{ display: 'flex', gap: 12, alignItems: 'center' }}>
-                    {isSql && <CodeRunBtn text={codeText} connectionId={activeConnectionId} dbName={activeDbName} />}
-                    {isSelectQuery && activeConnectionConfig && (
-                        <Tooltip title="在聊天内预览查询结果（最多20行）">
-                            <span
-                                onClick={handleInlineExecute}
-                                style={{
-                                    cursor: previewLoading ? 'wait' : 'pointer', display: 'flex', alignItems: 'center',
-                                    opacity: previewLoading ? 1 : 0.6, transition: 'opacity 0.2s', padding: '0 4px', color: '#faad14'
-                                }}
-                                onMouseEnter={(e) => { if (!previewLoading) e.currentTarget.style.opacity = '1'; }}
-                                onMouseLeave={(e) => { if (!previewLoading) e.currentTarget.style.opacity = '0.6'; }}
-                            >
-                                {previewLoading ? '⏳' : '👁'}
-                                <span style={{ marginLeft: 4 }}>{previewLoading ? '执行中...' : '预览'}</span>
-                            </span>
-                        </Tooltip>
-                    )}
-                    <CodeCopyBtn text={displayText} />
-                </div>
-            </div>
+export const AIMessageBubble: React.FC<AIMessageBubbleProps> = React.memo(({
+  msg,
+  darkMode,
+  overlayTheme,
+  textColor,
+  onEdit,
+  onRetry,
+  onDelete,
+  activeConnectionId,
+  activeConnectionConfig,
+  activeDbName,
+  allMessages,
+}) => {
+  const [isCopied, setIsCopied] = useState(false);
+  const isUser = msg.role === 'user';
+  const toolMessages = allMessages || [];
 
-            <div style={{ position: 'relative' }}>
-                <SyntaxHighlighter
-                    style={darkMode ? vscDarkPlus as any : vs as any}
-                    language={match[1]}
-                    PreTag="div"
-                    showLineNumbers={true}
-                    customStyle={{ 
-                        margin: 0, 
-                        borderRadius: 0, 
-                        background: darkMode ? 'rgba(0,0,0,0.25)' : 'rgba(0,0,0,0.02)',
-                        maxHeight: expanded ? 'none' : (isLongCode ? MAX_HEIGHT : 'none'),
-                        overflowY: expanded ? 'auto' : 'hidden',
-                        fontSize: '14px',
-                        lineHeight: 1.6
-                    }}
-                    codeTagProps={{
-                        style: {
-                            fontSize: '14px',
-                            fontFamily: 'var(--gn-font-mono)'
-                        }
-                    }}
-                >
-                    {displayText}
-                </SyntaxHighlighter>
-
-                {!expanded && isLongCode && (
-                    <div 
-                        style={{
-                            position: 'absolute',
-                            bottom: 0, left: 0, right: 0,
-                            height: 60,
-                            background: `linear-gradient(to bottom, transparent, ${darkMode ? 'rgba(0,0,0,0.8)' : 'rgba(255,255,255,0.9)'})`,
-                            display: 'flex', alignItems: 'flex-end', justifyContent: 'center',
-                            paddingBottom: 8, cursor: 'pointer'
-                        }}
-                        onClick={() => setExpanded(true)}
-                    >
-                        <span style={{ fontSize: 12, color: overlayTheme.iconColor, background: darkMode ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.05)', padding: '2px 8px', borderRadius: 12 }}>
-                            展开全部代码
-                        </span>
-                    </div>
-                )}
-                {expanded && isLongCode && (
-                    <div 
-                        style={{
-                            display: 'flex', justifyContent: 'center', padding: '6px 0',
-                            background: darkMode ? 'rgba(0,0,0,0.3)' : 'rgba(0,0,0,0.02)', cursor: 'pointer',
-                            borderTop: `1px solid ${darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)'}`
-                        }}
-                        onClick={() => setExpanded(false)}
-                    >
-                        <span style={{ fontSize: 12, color: overlayTheme.iconColor }}>收起代码</span>
-                    </div>
-                )}
-            </div>
-
-            {/* Inline SQL Preview Results */}
-            {previewError && (
-                <div style={{ padding: '8px 12px', fontSize: 12, color: '#ef4444', background: darkMode ? 'rgba(239,68,68,0.1)' : 'rgba(239,68,68,0.05)', borderTop: `1px solid ${darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)'}` }}>
-                    ❌ {previewError}
-                </div>
-            )}
-            {previewExpanded && previewData && previewData.length > 0 && (
-                <div style={{ borderTop: `1px solid ${darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'}` }}>
-                    <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', padding: '4px 12px', background: darkMode ? 'rgba(250,173,20,0.08)' : 'rgba(250,173,20,0.05)' }}>
-                        <span style={{ fontSize: 11, color: overlayTheme.mutedText }}>📊 预览结果（{previewData.length} 行 × {previewCols.length} 列）</span>
-                        <span style={{ fontSize: 11, color: overlayTheme.mutedText, cursor: 'pointer' }} onClick={() => setPreviewExpanded(false)}>收起 ▴</span>
-                    </div>
-                    <div style={{ overflowX: 'auto', maxHeight: 200, overflowY: 'auto' }}>
-                        <table style={{ width: '100%', borderCollapse: 'collapse', fontSize: 11, fontFamily: 'var(--gn-font-mono)' }}>
-                            <thead>
-                                <tr>
-                                    {previewCols.map(col => (
-                                        <th key={col} style={{ padding: '4px 8px', textAlign: 'left', background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)', color: overlayTheme.titleText, fontWeight: 600, whiteSpace: 'nowrap', borderBottom: `1px solid ${darkMode ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.08)'}` }}>
-                                            {col}
-                                        </th>
-                                    ))}
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {previewData.map((row, ri) => (
-                                    <tr key={ri}>
-                                        {previewCols.map(col => (
-                                            <td key={col} style={{ padding: '3px 8px', color: overlayTheme.mutedText, whiteSpace: 'nowrap', borderBottom: `1px solid ${darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.03)'}`, maxWidth: 200, overflow: 'hidden', textOverflow: 'ellipsis' }}>
-                                                {row[col] === null ? <span style={{ color: '#999', fontStyle: 'italic' }}>NULL</span> : String(row[col])}
-                                            </td>
-                                        ))}
-                                    </tr>
-                                ))}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            )}
-            {!previewExpanded && previewData && previewData.length > 0 && (
-                <div 
-                    style={{ padding: '4px 12px', cursor: 'pointer', fontSize: 11, color: overlayTheme.mutedText, background: darkMode ? 'rgba(250,173,20,0.05)' : 'rgba(250,173,20,0.03)', borderTop: `1px solid ${darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.03)'}` }}
-                    onClick={() => setPreviewExpanded(true)}
-                >
-                    📊 查看结果（{previewData.length} 行）▾
-                </div>
-            )}
-        </div>
-    );
-};
-
-// 可折叠思考过程组件
-const ThinkingBlock: React.FC<{ displayThinking: string; totalLen: number; isTyping: boolean; isGlobalLoading: boolean; darkMode: boolean; overlayTheme: any; hasContent: boolean }> = ({ displayThinking, totalLen, isTyping, isGlobalLoading, darkMode, overlayTheme, hasContent }) => {
-    // 如果整体在loading，且尚未吐出content，我们认为真正的思考还在进行；如果吐出content了，思考框就算告一段落
-    const isActivelyThinking = isGlobalLoading && !hasContent;
-    const [expanded, setExpanded] = useState(isActivelyThinking);
-    const contentRef = React.useRef<HTMLDivElement>(null);
-
-    React.useEffect(() => { if (isActivelyThinking) setExpanded(true); }, [isActivelyThinking]);
-    
-    // 断开连接或思考结束时，若已有内容且不再产生新内容则默认收起
-    React.useEffect(() => {
-        if (!isGlobalLoading) setExpanded(false);
-    }, [isGlobalLoading]);
-
-    // 自动滚动到思考内容底部
-    React.useEffect(() => {
-        if (expanded && isTyping && contentRef.current) {
-            contentRef.current.scrollTop = contentRef.current.scrollHeight;
-        }
-    }, [displayThinking, expanded, isTyping]);
-
-    return (
-        <div style={{
-            marginBottom: hasContent ? 8 : 0,
-            borderRadius: 6,
-            border: `1px solid ${darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'}`,
-            overflow: 'hidden',
-        }}>
-            <div
-                onClick={() => setExpanded(e => !e)}
-                style={{
-                    display: 'flex', alignItems: 'center', gap: 6,
-                    padding: '6px 10px', cursor: 'pointer',
-                    background: darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)',
-                    fontSize: 12, color: overlayTheme.mutedText, userSelect: 'none',
-                }}
-            >
-                <span style={{ transition: 'transform 0.2s', transform: expanded ? 'rotate(90deg)' : 'rotate(0deg)', fontSize: 10 }}>▶</span>
-                <span>💭 思考过程</span>
-                {isActivelyThinking && <span style={{ fontSize: 10, color: '#8b5cf6', animation: 'pulse 1.5s ease-in-out infinite' }}>思考中...</span>}
-                {!isActivelyThinking && <span style={{ fontSize: 10, opacity: 0.5 }}>({displayThinking.length} 字)</span>}
-            </div>
-            <div className={`ai-expand-transition ${expanded ? 'expanded' : 'collapsed'}`}>
-                <div ref={contentRef} style={{
-                    padding: expanded ? '8px 12px' : '0 12px',
-                    borderLeft: '3px solid #8b5cf6',
-                    margin: '0 8px 8px',
-                    fontSize: 12, lineHeight: 1.7,
-                    color: overlayTheme.mutedText,
-                    fontStyle: 'italic',
-                    whiteSpace: 'pre-wrap', wordBreak: 'break-word',
-                    maxHeight: 400, overflowY: 'auto',
-                }}>
-                    {displayThinking}
-                    {isTyping && <span className="ai-blinking-cursor" style={{ background: '#8b5cf6', marginLeft: 4, width: 6, height: 12, display: 'inline-block', verticalAlign: 'middle', opacity: 0.8 }} />}
-                </div>
-            </div>
-        </div>
-    );
-};
-
-// 工具调用进度面板聚合展示组件
-const AIToolCallingBlock: React.FC<{ tool_calls: AIToolCall[]; loading: boolean; allMessages: AIChatMessage[]; darkMode: boolean; overlayTheme: any; hasContent: boolean }> = ({ tool_calls, loading, allMessages, darkMode, overlayTheme, hasContent }) => {
-    const totalCalls = tool_calls.length;
-    const allDone = tool_calls.every(tc => allMessages?.find(m => m.role === 'tool' && m.tool_call_id === tc.id));
-    const [expanded, setExpanded] = useState(!allDone && loading);
-    
-    // 断开连接或执行完毕时，若已完成则默认收起
-    React.useEffect(() => {
-        if (allDone || !loading) setExpanded(false);
-    }, [allDone, loading]);
-
-    // 显示友好的人类可读动作名
-    const getHumanActionName = (fname: string) => {
-        if (fname === 'get_connections') return '获取可用连接信息';
-        if (fname === 'get_databases') return '扫描数据库列表';
-        if (fname === 'get_tables') return '分析表结构信息';
-        return fname;
-    };
-
-    return (
-        <div style={{
-            background: darkMode ? 'rgba(0,0,0,0.15)' : 'rgba(0,0,0,0.025)',
-            borderRadius: 8, fontSize: 12, overflow: 'hidden',
-            border: `1px solid ${darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'}`,
-            marginTop: hasContent ? 12 : 0,
-            display: 'flex', flexDirection: 'column',
-        }}>
-            <div 
-                onClick={() => setExpanded(!expanded)}
-                style={{ 
-                    display: 'flex', alignItems: 'center', justifyContent: 'space-between', 
-                    padding: '8px 12px', cursor: 'pointer', userSelect: 'none',
-                    background: darkMode ? 'rgba(255,255,255,0.02)' : 'rgba(0,0,0,0.01)',
-                }}
-            >
-                <div style={{ display: 'flex', alignItems: 'center', gap: 8, color: overlayTheme.titleText, fontWeight: 500 }}>
-                    {!allDone && loading ? (
-                        <div className="ai-spinning-ring" />
-                    ) : (
-                        <CheckOutlined style={{ color: '#10b981' }} />
-                    )}
-                    <span>{!allDone && loading ? '正在执行数据探针...' : `数据探针执行完毕 (${totalCalls} 项)`}</span>
-                </div>
-                <span style={{ transition: 'transform 0.2s', transform: expanded ? 'rotate(90deg)' : 'rotate(0deg)', fontSize: 10, color: overlayTheme.mutedText }}>▶</span>
-            </div>
-            <div className={`ai-expand-transition ${expanded ? 'expanded' : 'collapsed'}`}>
-                <div style={{ padding: expanded ? '4px 12px 12px' : '0 12px' }}>
-                    {tool_calls.map((tc, idx) => {
-                        const resultMsg = allMessages?.find(m => m.role === 'tool' && m.tool_call_id === tc.id);
-                        const isDone = !!resultMsg;
-                        const actionName = getHumanActionName(tc.function.name);
-                        return (
-                            <div key={tc.id} style={{ 
-                                display: 'flex', flexDirection: 'column', gap: 4, 
-                                marginTop: 6, paddingLeft: 8,
-                                borderLeft: `2px solid ${isDone ? '#10b981' : (loading ? '#1677ff' : overlayTheme.shellBorder)}`,
-                            }}>
-                                <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
-                                    {isDone 
-                                        ? <CheckOutlined style={{ color: '#10b981', fontSize: 11 }} /> 
-                                        : (loading ? <div className="ai-spinning-ring" style={{ width: 10, height: 10, borderWidth: 1.5 }} /> : <ApiOutlined style={{ color: overlayTheme.mutedText, fontSize: 11 }} />)
-                                    }
-                                    <span style={{ color: isDone ? overlayTheme.mutedText : overlayTheme.titleText }}>{actionName}</span>
-                                </div>
-                                {resultMsg && <AIToolResultItem resultMsg={resultMsg} darkMode={darkMode} overlayTheme={overlayTheme} />}
-                            </div>
-                        );
-                    })}
-                </div>
-            </div>
-        </div>
-    );
-};
-
-export const AIMessageBubble: React.FC<AIMessageBubbleProps> = React.memo(({ msg, darkMode, overlayTheme, textColor, onEdit, onRetry, onDelete, activeConnectionId, activeConnectionConfig, activeDbName, allMessages }) => {
-    const [isCopied, setIsCopied] = useState(false);
-    const isUser = msg.role === 'user';
-    
-    // 从 content 中提取 <think>...</think> 标签内容（部分模型如 MiniMax、DeepSeek 会以文本形式返回思考过程）
-    const { displayContent, parsedThinking } = React.useMemo(() => {
-        const content = msg.content || '';
-        // 优先使用后端已结构化的 thinking 字段（如 Claude API 原生 thinking）
-        if (msg.thinking) {
-            return { displayContent: content, parsedThinking: msg.thinking };
-        }
-        // 尝试从 content 中提取 <think>...</think> 标签
-        const thinkRegex = /<think>([\s\S]*?)(?:<\/think>|$)/g;
-        let thinkParts: string[] = [];
-        let cleanContent = content;
-        let match;
-        while ((match = thinkRegex.exec(content)) !== null) {
-            thinkParts.push(match[1].trim());
-        }
-        if (thinkParts.length > 0) {
-            // 移除所有 <think>...</think> 标签（含未闭合的）
-            cleanContent = content.replace(/<think>[\s\S]*?(?:<\/think>|$)/g, '').trim();
-            return { displayContent: cleanContent, parsedThinking: thinkParts.join('\n\n') };
-        }
-        return { displayContent: content, parsedThinking: '' };
-    }, [msg.content, msg.thinking]);
-    const jvmPlan = React.useMemo(() => {
-        if (isUser) {
-            return null;
-        }
-        return extractJVMChangePlan(displayContent);
-    }, [displayContent, isUser]);
-    const jvmDiagnosticPlan = React.useMemo(() => {
-        if (isUser) {
-            return null;
-        }
-        return parseJVMDiagnosticPlan(displayContent);
-    }, [displayContent, isUser]);
-    const isTypingThinking = !!(msg.loading && msg.phase === 'thinking');
-    
-    if (msg.role === 'tool') return null;
-
-    // 如果是纯空壳的加载状态（connecting，或还在思考/工具阶段但还没吐出一个字的 content）
-    const isWaitState = msg.phase === 'connecting' || 
-                       (msg.loading && !msg.content && (msg.phase === 'thinking' || msg.phase === 'tool_calling'));
-
-    if (isWaitState) {
-        return (
-            <div className="ai-ide-message" style={{ borderBottom: 'none', padding: '8px 16px' }}>
-                <div style={{
-                    background: darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)',
-                    borderRadius: 12, padding: '14px 16px',
-                }}>
-                    <div style={{ display: 'flex', alignItems: 'center', gap: 8, color: overlayTheme.mutedText }}>
-                        <div className="ai-wave-pulse">
-                            <span /> <span /> <span />
-                        </div>
-                        <span style={{ fontSize: 13, opacity: 0.8 }}>{msg.content || '正在建立连接'}...</span>
-                    </div>
-
-                    {/* 即使在波纹过渡态，如果有 thinking / tool_calls 也要显示出来，只是把它们压在波纹下面 */}
-                    <div style={{ marginTop: parsedThinking || (msg.tool_calls && msg.tool_calls.length > 0) ? 12 : 0 }}>
-                        {!isUser && parsedThinking && (
-                            <ThinkingBlock 
-                                displayThinking={parsedThinking}
-                                totalLen={parsedThinking.length}
-                                isTyping={isTypingThinking}
-                                isGlobalLoading={!!msg.loading}
-                                darkMode={darkMode} 
-                                overlayTheme={overlayTheme} 
-                                hasContent={false} 
-                            />
-                        )}
-                        {!isUser && msg.tool_calls && msg.tool_calls.length > 0 && (
-                            <AIToolCallingBlock 
-                                tool_calls={msg.tool_calls} 
-                                loading={!!msg.loading} 
-                                allMessages={allMessages || []} 
-                                darkMode={darkMode} 
-                                overlayTheme={overlayTheme} 
-                                hasContent={false} 
-                            />
-                        )}
-                    </div>
-                </div>
-            </div>
-        );
+  const { displayContent, parsedThinking } = React.useMemo(() => {
+    const content = msg.content || '';
+    if (msg.thinking) {
+      return { displayContent: content, parsedThinking: msg.thinking };
     }
+    const thinkRegex = /<think>([\s\S]*?)(?:<\/think>|$)/g;
+    const thinkParts: string[] = [];
+    let match: RegExpExecArray | null;
+    while ((match = thinkRegex.exec(content)) !== null) {
+      thinkParts.push(match[1].trim());
+    }
+    if (thinkParts.length > 0) {
+      return {
+        displayContent: content.replace(/<think>[\s\S]*?(?:<\/think>|$)/g, '').trim(),
+        parsedThinking: thinkParts.join('\n\n'),
+      };
+    }
+    return { displayContent: content, parsedThinking: '' };
+  }, [msg.content, msg.thinking]);
 
+  const jvmPlan = React.useMemo(() => {
+    if (isUser) {
+      return null;
+    }
+    return extractJVMChangePlan(displayContent);
+  }, [displayContent, isUser]);
+
+  const jvmDiagnosticPlan = React.useMemo(() => {
+    if (isUser) {
+      return null;
+    }
+    return parseJVMDiagnosticPlan(displayContent);
+  }, [displayContent, isUser]);
+
+  const isTypingThinking = Boolean(msg.loading && msg.phase === 'thinking');
+
+  if (msg.role === 'tool') {
+    return null;
+  }
+
+  const isWaitState = msg.phase === 'connecting'
+    || (msg.loading && !msg.content && (msg.phase === 'thinking' || msg.phase === 'tool_calling'));
+
+  if (isWaitState) {
     return (
-        <div className="ai-ide-message" style={{ borderBottom: 'none', padding: '8px 16px' }}>
-            <div style={{
-                background: isUser ? (darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)') : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)'),
-                borderRadius: 12,
-                padding: '14px 16px',
-            }}>
-                <div className="ai-ide-message-header" style={{ 
-                    color: isUser ? overlayTheme.mutedText : overlayTheme.titleText,
-                    marginBottom: isUser ? 6 : 10,
-                    display: 'flex', justifyContent: 'space-between', alignItems: 'center'
-                }}>
-                    <div>
-                    {isUser 
-                        ? <><UserOutlined /> <span>You</span></>
-                        : <><RobotOutlined style={{ color: overlayTheme.iconColor }} /> <span>GoNavi AI</span></>}
-                    </div>
-                    {/* 气泡操作栏 */}
-                    <div className="ai-message-actions" style={{ display: 'flex', gap: 8, opacity: 0, transition: 'opacity 0.2s', padding: '0 4px' }}>
-                        <Tooltip title={isCopied ? "已复制" : "复制全文"}>
-                            {isCopied ? (
-                                <CheckOutlined className="ai-action-icon" style={{ color: '#10b981' }} />
-                            ) : (
-                                <CopyOutlined className="ai-action-icon" onClick={() => {
-                                    navigator.clipboard.writeText(msg.content);
-                                    setIsCopied(true);
-                                    setTimeout(() => setIsCopied(false), 2000);
-                                }} style={{ cursor: 'pointer', color: overlayTheme.mutedText }} onMouseEnter={e => e.currentTarget.style.color = textColor} onMouseLeave={e => e.currentTarget.style.color = overlayTheme.mutedText} />
-                            )}
-                        </Tooltip>
-                        {isUser ? (
-                            <Tooltip title="编辑此条消息（移除其后所有记录并重新发送）">
-                                <EditOutlined className="ai-action-icon" onClick={() => onEdit(msg)} style={{ cursor: 'pointer', color: overlayTheme.mutedText }} onMouseEnter={e => e.currentTarget.style.color = textColor} onMouseLeave={e => e.currentTarget.style.color = overlayTheme.mutedText} />
-                            </Tooltip>
-                        ) : (
-                            <Tooltip title="重新生成（移除此条并触发上次用户输入重发）">
-                                <ReloadOutlined className="ai-action-icon" onClick={() => onRetry(msg)} style={{ cursor: 'pointer', color: overlayTheme.mutedText }} onMouseEnter={e => e.currentTarget.style.color = textColor} onMouseLeave={e => e.currentTarget.style.color = overlayTheme.mutedText} />
-                            </Tooltip>
-                        )}
-                        <Tooltip title="删除单条消息">
-                            <DeleteOutlined className="ai-action-icon" onClick={() => onDelete(msg.id)} style={{ cursor: 'pointer', color: overlayTheme.mutedText }} onMouseEnter={e => e.currentTarget.style.color = '#ef4444'} onMouseLeave={e => e.currentTarget.style.color = overlayTheme.mutedText} />
-                        </Tooltip>
-                    </div>
-                </div>
-                <div className="ai-ide-message-content ai-markdown-content" style={{ color: textColor }}>
-                    {msg.images && msg.images.length > 0 && (
-                        <div style={{ display: 'flex', gap: 8, flexWrap: 'wrap', marginBottom: 12 }}>
-                            {msg.images.map((img, i) => (
-                                <img key={i} src={img} alt={`Attached ${i}`} style={{ maxWidth: 200, maxHeight: 200, borderRadius: 8, objectFit: 'contain', border: overlayTheme.shellBorder }} />
-                            ))}
-                        </div>
-                    )}
-                    {/* 可折叠思考过程 */}
-                    {!isUser && parsedThinking && (
-                        <ThinkingBlock 
-                            displayThinking={parsedThinking}
-                            totalLen={parsedThinking.length}
-                            isTyping={isTypingThinking}
-                            isGlobalLoading={!!msg.loading}
-                            darkMode={darkMode} 
-                            overlayTheme={overlayTheme} 
-                            hasContent={!!msg.content} 
-                        />
-                    )}
-                    {isUser ? (
-                        <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word', fontSize: 13 }}>{msg.content}</div>
-                    ) : (
-                        <MemoizedMarkdown 
-                            content={displayContent}
-                            darkMode={darkMode}
-                            overlayTheme={overlayTheme}
-                            activeConnectionConfig={activeConnectionConfig}
-                            activeConnectionId={activeConnectionId}
-                            activeDbName={activeDbName}
-                        />
-                    )}
-                    {!isUser && jvmPlan && (
-                        <div style={{ marginTop: 12 }}>
-                            <Button
-                                size="small"
-                                type="primary"
-                                onClick={() => {
-                                    const targetContext = msg.jvmPlanContext;
-                                    if (!targetContext) {
-                                        message.warning('这条 JVM 计划缺少来源页签上下文，请在目标 JVM 资源页重新生成。');
-                                        return;
-                                    }
-
-                                    const store = useStore.getState();
-                                    const targetTabId = resolveJVMAIPlanTargetTabId(store.tabs, targetContext);
-                                    if (!targetTabId) {
-                                        message.warning('未找到与该 JVM 计划匹配的资源页签，请先打开原目标资源后再应用。');
-                                        return;
-                                    }
-
-                                    window.dispatchEvent(new CustomEvent('gonavi:jvm-apply-ai-plan', {
-                                        detail: {
-                                            plan: jvmPlan,
-                                            targetTabId,
-                                            connectionId: targetContext.connectionId,
-                                            providerMode: targetContext.providerMode,
-                                            resourcePath: targetContext.resourcePath,
-                                        },
-                                    }));
-                                }}
-                            >
-                                应用到 JVM 预览
-                            </Button>
-                        </div>
-                    )}
-                    {!isUser && jvmDiagnosticPlan && (
-                        <div style={{ marginTop: 12 }}>
-                            <Button
-                                size="small"
-                                type="primary"
-                                onClick={() => {
-                                    const targetContext = msg.jvmDiagnosticPlanContext;
-                                    if (!targetContext) {
-                                        message.warning('这条诊断计划缺少来源页签上下文，请在目标诊断控制台重新生成。');
-                                        return;
-                                    }
-
-                                    const store = useStore.getState();
-                                    const targetTabId = resolveJVMDiagnosticPlanTargetTabId(
-                                        store.tabs,
-                                        store.connections,
-                                        targetContext,
-                                    );
-                                    if (!targetTabId) {
-                                        message.warning('未找到与该诊断计划匹配的诊断控制台页签，请先打开原目标控制台后再应用。');
-                                        return;
-                                    }
-
-                                    window.dispatchEvent(new CustomEvent('gonavi:jvm-apply-diagnostic-plan', {
-                                        detail: {
-                                            plan: jvmDiagnosticPlan,
-                                            targetTabId,
-                                            connectionId: targetContext.connectionId,
-                                            transport: targetContext.transport,
-                                        },
-                                    }));
-                                }}
-                            >
-                                应用到诊断控制台
-                            </Button>
-                        </div>
-                    )}
-                    {/* 错误原文复制按钮 */}
-                    {!isUser && msg.rawError && (
-                        <div style={{ marginTop: 8 }}>
-                            <button
-                                onClick={() => {
-                                    navigator.clipboard.writeText(msg.rawError || '');
-                                    const btn = document.getElementById(`raw-err-btn-${msg.id}`);
-                                    if (btn) { btn.textContent = '✅ 已复制'; setTimeout(() => { btn.textContent = '📋 复制报错原文'; }, 1500); }
-                                }}
-                                id={`raw-err-btn-${msg.id}`}
-                                style={{
-                                    fontSize: 12, padding: '3px 10px', borderRadius: 6, cursor: 'pointer',
-                                    border: `1px solid ${darkMode ? 'rgba(255,255,255,0.12)' : 'rgba(0,0,0,0.08)'}`,
-                                    background: darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)',
-                                    color: overlayTheme.mutedText, transition: 'all 0.15s ease',
-                                }}
-                            >
-                                📋 复制报错原文
-                            </button>
-                        </div>
-                    )}
-                    {/* 工具调用进度展示 */}
-                    {!isUser && msg.tool_calls && msg.tool_calls.length > 0 && (
-                        <AIToolCallingBlock 
-                            tool_calls={msg.tool_calls} 
-                            loading={!!msg.loading} 
-                            allMessages={allMessages || []} 
-                            darkMode={darkMode} 
-                            overlayTheme={overlayTheme} 
-                            hasContent={!!msg.content} 
-                        />
-                    )}
-                    {msg.loading && msg.phase !== 'tool_calling' && msg.content && (
-                        <span className="ai-blinking-cursor" style={{ background: overlayTheme.iconColor }} />
-                    )}
-                </div>
+      <div className="ai-ide-message" style={{ borderBottom: 'none', padding: '8px 16px' }}>
+        <div style={{
+          background: darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)',
+          borderRadius: 12,
+          padding: '14px 16px',
+        }}>
+          <div style={{ display: 'flex', alignItems: 'center', gap: 8, color: overlayTheme.mutedText }}>
+            <div className="ai-wave-pulse">
+              <span /> <span /> <span />
             </div>
+            <span style={{ fontSize: 13, opacity: 0.8 }}>{msg.content || '正在建立连接'}...</span>
+          </div>
+
+          <div style={{ marginTop: parsedThinking || (msg.tool_calls && msg.tool_calls.length > 0) ? 12 : 0 }}>
+            {!isUser && parsedThinking && (
+              <AIThinkingBlock
+                displayThinking={parsedThinking}
+                isTyping={isTypingThinking}
+                isGlobalLoading={Boolean(msg.loading)}
+                darkMode={darkMode}
+                overlayTheme={overlayTheme}
+                hasContent={false}
+              />
+            )}
+            {!isUser && msg.tool_calls && msg.tool_calls.length > 0 && (
+              <AIToolCallingBlock
+                toolCalls={msg.tool_calls}
+                loading={Boolean(msg.loading)}
+                allMessages={toolMessages}
+                darkMode={darkMode}
+                overlayTheme={overlayTheme}
+                hasContent={false}
+              />
+            )}
+          </div>
         </div>
+      </div>
     );
+  }
+
+  return (
+    <div className="ai-ide-message" style={{ borderBottom: 'none', padding: '8px 16px' }}>
+      <div style={{
+        background: isUser ? (darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)') : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)'),
+        borderRadius: 12,
+        padding: '14px 16px',
+      }}>
+        <div className="ai-ide-message-header" style={{
+          color: isUser ? overlayTheme.mutedText : overlayTheme.titleText,
+          marginBottom: isUser ? 6 : 10,
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+        }}>
+          <div>
+            {isUser
+              ? <><UserOutlined /> <span>You</span></>
+              : <><RobotOutlined style={{ color: overlayTheme.iconColor }} /> <span>GoNavi AI</span></>}
+          </div>
+          <AIMessageActionBar
+            msg={msg}
+            isUser={isUser}
+            isCopied={isCopied}
+            textColor={textColor}
+            mutedText={overlayTheme.mutedText}
+            onEdit={onEdit}
+            onRetry={onRetry}
+            onDelete={onDelete}
+            onCopy={() => {
+              navigator.clipboard.writeText(msg.content);
+              setIsCopied(true);
+              setTimeout(() => setIsCopied(false), 2000);
+            }}
+          />
+        </div>
+
+        <div className="ai-ide-message-content ai-markdown-content" style={{ color: textColor }}>
+          {msg.images && msg.images.length > 0 && (
+            <div style={{ display: 'flex', gap: 8, flexWrap: 'wrap', marginBottom: 12 }}>
+              {msg.images.map((image, index) => (
+                <img key={index} src={image} alt={`Attached ${index}`} style={{ maxWidth: 200, maxHeight: 200, borderRadius: 8, objectFit: 'contain', border: overlayTheme.shellBorder }} />
+              ))}
+            </div>
+          )}
+          <AIMessageAttachmentSummary msg={msg} overlayTheme={overlayTheme} />
+
+          {!isUser && parsedThinking && (
+            <AIThinkingBlock
+              displayThinking={parsedThinking}
+              isTyping={isTypingThinking}
+              isGlobalLoading={Boolean(msg.loading)}
+              darkMode={darkMode}
+              overlayTheme={overlayTheme}
+              hasContent={Boolean(msg.content)}
+            />
+          )}
+
+          {isUser ? (
+            <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word', fontSize: 13 }}>{msg.content}</div>
+          ) : (
+            <AIMessageMarkdown
+              content={displayContent}
+              darkMode={darkMode}
+              overlayTheme={overlayTheme}
+              activeConnectionConfig={activeConnectionConfig}
+              activeConnectionId={activeConnectionId}
+              activeDbName={activeDbName}
+            />
+          )}
+
+          {!isUser && jvmPlan && (
+            <div style={{ marginTop: 12 }}>
+              <Button
+                size="small"
+                type="primary"
+                onClick={() => {
+                  const targetContext = msg.jvmPlanContext;
+                  if (!targetContext) {
+                    message.warning('这条 JVM 计划缺少来源页签上下文，请在目标 JVM 资源页重新生成。');
+                    return;
+                  }
+
+                  const store = useStore.getState();
+                  const targetTabId = resolveJVMAIPlanTargetTabId(store.tabs, targetContext);
+                  if (!targetTabId) {
+                    message.warning('未找到与该 JVM 计划匹配的资源页签，请先打开原目标资源后再应用。');
+                    return;
+                  }
+
+                  window.dispatchEvent(new CustomEvent('gonavi:jvm-apply-ai-plan', {
+                    detail: {
+                      plan: jvmPlan,
+                      targetTabId,
+                      connectionId: targetContext.connectionId,
+                      providerMode: targetContext.providerMode,
+                      resourcePath: targetContext.resourcePath,
+                    },
+                  }));
+                }}
+              >
+                应用到 JVM 预览
+              </Button>
+            </div>
+          )}
+
+          {!isUser && jvmDiagnosticPlan && (
+            <div style={{ marginTop: 12 }}>
+              <Button
+                size="small"
+                type="primary"
+                onClick={() => {
+                  const targetContext = msg.jvmDiagnosticPlanContext;
+                  if (!targetContext) {
+                    message.warning('这条诊断计划缺少来源页签上下文，请在目标诊断控制台重新生成。');
+                    return;
+                  }
+
+                  const store = useStore.getState();
+                  const targetTabId = resolveJVMDiagnosticPlanTargetTabId(
+                    store.tabs,
+                    store.connections,
+                    targetContext,
+                  );
+                  if (!targetTabId) {
+                    message.warning('未找到与该诊断计划匹配的诊断控制台页签，请先打开原目标控制台后再应用。');
+                    return;
+                  }
+
+                  window.dispatchEvent(new CustomEvent('gonavi:jvm-apply-diagnostic-plan', {
+                    detail: {
+                      plan: jvmDiagnosticPlan,
+                      targetTabId,
+                      connectionId: targetContext.connectionId,
+                      transport: targetContext.transport,
+                    },
+                  }));
+                }}
+              >
+                应用到诊断控制台
+              </Button>
+            </div>
+          )}
+
+          {!isUser && msg.rawError && (
+            <AIRawErrorButton
+              messageId={msg.id}
+              rawError={msg.rawError}
+              darkMode={darkMode}
+              overlayTheme={overlayTheme}
+            />
+          )}
+
+          {!isUser && msg.tool_calls && msg.tool_calls.length > 0 && (
+            <AIToolCallingBlock
+              toolCalls={msg.tool_calls}
+              loading={Boolean(msg.loading)}
+              allMessages={toolMessages}
+              darkMode={darkMode}
+              overlayTheme={overlayTheme}
+              hasContent={Boolean(msg.content)}
+            />
+          )}
+
+          {msg.loading && msg.phase !== 'tool_calling' && msg.content && (
+            <span className="ai-blinking-cursor" style={{ background: overlayTheme.iconColor }} />
+          )}
+        </div>
+      </div>
+    </div>
+  );
 });
diff --git a/frontend/src/components/ai/AIMessageRenderBoundary.tsx b/frontend/src/components/ai/AIMessageRenderBoundary.tsx
new file mode 100644
index 0000000..8243e42
--- /dev/null
+++ b/frontend/src/components/ai/AIMessageRenderBoundary.tsx
@@ -0,0 +1,109 @@
+import React from 'react';
+
+import type { AIChatMessage } from '../../types';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+interface AIMessageRenderBoundaryProps {
+  children: React.ReactNode;
+  msg: AIChatMessage;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  onDeleteMessage: (id: string) => void;
+  onError?: (error: Error, errorInfo: React.ErrorInfo, msg: AIChatMessage) => void;
+}
+
+interface AIMessageRenderBoundaryState {
+  hasError: boolean;
+  error: Error | null;
+}
+
+export class AIMessageRenderBoundary extends React.Component<
+  AIMessageRenderBoundaryProps,
+  AIMessageRenderBoundaryState
+> {
+  constructor(props: AIMessageRenderBoundaryProps) {
+    super(props);
+    this.state = { hasError: false, error: null };
+  }
+
+  static getDerivedStateFromError(error: Error): AIMessageRenderBoundaryState {
+    return { hasError: true, error };
+  }
+
+  componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
+    this.props.onError?.(error, errorInfo, this.props.msg);
+  }
+
+  private handleRetryRender = () => {
+    this.setState({ hasError: false, error: null });
+  };
+
+  render() {
+    if (this.state.hasError) {
+      const { msg, darkMode, overlayTheme, onDeleteMessage } = this.props;
+      return (
+        <div className="ai-ide-message" style={{ borderBottom: 'none', padding: '8px 16px' }}>
+          <div style={{
+            background: darkMode ? 'rgba(239,68,68,0.08)' : 'rgba(239,68,68,0.05)',
+            border: `1px solid ${darkMode ? 'rgba(248,113,113,0.32)' : 'rgba(239,68,68,0.18)'}`,
+            borderRadius: 12,
+            padding: '14px 16px',
+          }}>
+            <div style={{ fontSize: 13, fontWeight: 600, color: overlayTheme.titleText }}>
+              这条 AI 消息渲染失败，已自动隔离
+            </div>
+            <div style={{ marginTop: 6, fontSize: 12, lineHeight: 1.6, color: overlayTheme.mutedText }}>
+              其余对话仍可继续使用。你可以先删除这条异常消息，再继续操作。
+            </div>
+            <div style={{
+              marginTop: 10,
+              padding: '8px 10px',
+              borderRadius: 8,
+              background: darkMode ? 'rgba(0,0,0,0.18)' : 'rgba(0,0,0,0.03)',
+              fontSize: 12,
+              color: overlayTheme.titleText,
+              wordBreak: 'break-word',
+              whiteSpace: 'pre-wrap',
+            }}>
+              {this.state.error?.message || '未知渲染错误'}
+            </div>
+            <div style={{ marginTop: 12, display: 'flex', gap: 8 }}>
+              <button
+                type="button"
+                onClick={this.handleRetryRender}
+                style={{
+                  border: overlayTheme.sectionBorder,
+                  background: 'transparent',
+                  color: overlayTheme.titleText,
+                  borderRadius: 8,
+                  padding: '6px 12px',
+                  cursor: 'pointer',
+                }}
+              >
+                重试渲染
+              </button>
+              <button
+                type="button"
+                onClick={() => onDeleteMessage(msg.id)}
+                style={{
+                  border: '1px solid rgba(239,68,68,0.28)',
+                  background: darkMode ? 'rgba(239,68,68,0.08)' : 'rgba(239,68,68,0.05)',
+                  color: '#ef4444',
+                  borderRadius: 8,
+                  padding: '6px 12px',
+                  cursor: 'pointer',
+                }}
+              >
+                删除这条消息
+              </button>
+            </div>
+          </div>
+        </div>
+      );
+    }
+
+    return this.props.children;
+  }
+}
+
+export default AIMessageRenderBoundary;
diff --git a/frontend/src/components/ai/AIPanelErrorBoundary.tsx b/frontend/src/components/ai/AIPanelErrorBoundary.tsx
new file mode 100644
index 0000000..edc0ad1
--- /dev/null
+++ b/frontend/src/components/ai/AIPanelErrorBoundary.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+
+interface AIPanelErrorBoundaryProps {
+  children: React.ReactNode;
+  fallback: (error: Error | null) => React.ReactNode;
+  onError?: (error: Error, errorInfo: React.ErrorInfo) => void;
+}
+
+interface AIPanelErrorBoundaryState {
+  hasError: boolean;
+  error: Error | null;
+}
+
+class AIPanelErrorBoundary extends React.Component<
+  AIPanelErrorBoundaryProps,
+  AIPanelErrorBoundaryState
+> {
+  constructor(props: AIPanelErrorBoundaryProps) {
+    super(props);
+    this.state = { hasError: false, error: null };
+  }
+
+  static getDerivedStateFromError(error: Error): AIPanelErrorBoundaryState {
+    return { hasError: true, error };
+  }
+
+  componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
+    this.props.onError?.(error, errorInfo);
+  }
+
+  render() {
+    if (this.state.hasError) {
+      return this.props.fallback(this.state.error);
+    }
+
+    return this.props.children;
+  }
+}
+
+export default AIPanelErrorBoundary;
diff --git a/frontend/src/components/ai/AISettingsChoiceSections.test.tsx b/frontend/src/components/ai/AISettingsChoiceSections.test.tsx
new file mode 100644
index 0000000..13bcedc
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsChoiceSections.test.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AISettingsContextSection from './AISettingsContextSection';
+import AISettingsSafetySection from './AISettingsSafetySection';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+const overlayTheme = buildOverlayWorkbenchTheme(false);
+
+describe('AI settings readonly sections', () => {
+  it('renders the safety cards and keeps the selected level visible', () => {
+    const markup = renderToStaticMarkup(
+      <AISettingsSafetySection
+        safetyLevel="readonly"
+        darkMode={false}
+        overlayTheme={overlayTheme}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        onChange={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('只读模式');
+    expect(markup).toContain('读写模式');
+    expect(markup).toContain('完全模式');
+  });
+
+  it('renders the context cards and keeps the selected level visible', () => {
+    const markup = renderToStaticMarkup(
+      <AISettingsContextSection
+        contextLevel="with_samples"
+        darkMode={false}
+        overlayTheme={overlayTheme}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        onChange={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('仅 Schema');
+    expect(markup).toContain('含采样数据');
+    expect(markup).toContain('含查询结果');
+  });
+});
diff --git a/frontend/src/components/ai/AISettingsContextSection.tsx b/frontend/src/components/ai/AISettingsContextSection.tsx
new file mode 100644
index 0000000..236aac3
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsContextSection.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import { CheckOutlined } from '@ant-design/icons';
+
+import type { AIContextLevel } from '../../types';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+const CONTEXT_OPTIONS: { label: string; value: AIContextLevel; desc: string; icon: string }[] = [
+  { label: '仅 Schema', value: 'schema_only', desc: '只传递表/列结构信息给 AI', icon: '📋' },
+  { label: '含采样数据', value: 'with_samples', desc: '包含少量采样数据帮助 AI 理解数据特征', icon: '📊' },
+  { label: '含查询结果', value: 'with_results', desc: '传递最近的查询结果作为上下文', icon: '📑' },
+];
+
+interface AISettingsContextSectionProps {
+  contextLevel: AIContextLevel;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBg: string;
+  cardBorder: string;
+  onChange: (level: AIContextLevel) => void;
+}
+
+const AISettingsContextSection: React.FC<AISettingsContextSectionProps> = ({
+  contextLevel,
+  darkMode,
+  overlayTheme,
+  cardBg,
+  cardBorder,
+  onChange,
+}) => (
+  <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+    <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginBottom: 8 }}>
+      控制发送给 AI 的数据库上下文信息量
+    </div>
+    {CONTEXT_OPTIONS.map((opt) => {
+      const active = contextLevel === opt.value;
+      return (
+        <div
+          key={opt.value}
+          onClick={() => onChange(opt.value)}
+          style={{
+            padding: '14px 16px',
+            borderRadius: 14,
+            cursor: 'pointer',
+            transition: 'all 0.2s ease',
+            border: `1.5px solid ${active ? overlayTheme.selectedText : cardBorder}`,
+            background: active ? overlayTheme.selectedBg : cardBg,
+            display: 'flex',
+            alignItems: 'flex-start',
+            gap: 14,
+          }}
+        >
+          <div
+            style={{
+              width: 36,
+              height: 36,
+              borderRadius: 10,
+              display: 'grid',
+              placeItems: 'center',
+              fontSize: 18,
+              flexShrink: 0,
+              background: active ? overlayTheme.iconBg : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.03)'),
+              color: active ? overlayTheme.iconColor : overlayTheme.mutedText,
+              transition: 'all 0.2s ease',
+            }}
+          >
+            {opt.icon}
+          </div>
+          <div style={{ flex: 1 }}>
+            <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, display: 'flex', alignItems: 'center', gap: 8 }}>
+              {opt.label}
+              {active && <CheckOutlined style={{ color: overlayTheme.iconColor, fontSize: 14 }} />}
+            </div>
+            <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginTop: 4, lineHeight: '1.5' }}>{opt.desc}</div>
+          </div>
+        </div>
+      );
+    })}
+  </div>
+);
+
+export default AISettingsContextSection;
diff --git a/frontend/src/components/ai/AISettingsMCPSection.test.tsx b/frontend/src/components/ai/AISettingsMCPSection.test.tsx
new file mode 100644
index 0000000..1684642
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsMCPSection.test.tsx
@@ -0,0 +1,233 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it, vi } from 'vitest';
+
+import AISettingsMCPSection from './AISettingsMCPSection';
+import type { AISettingsMCPSectionProps } from './AISettingsMCPSection';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+const findElement = (node: any, predicate: (element: any) => boolean): any => {
+  if (node == null || typeof node === 'boolean' || typeof node === 'string' || typeof node === 'number') {
+    return null;
+  }
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      const match = findElement(item, predicate);
+      if (match) {
+        return match;
+      }
+    }
+    return null;
+  }
+  if (predicate(node)) {
+    return node;
+  }
+  return findElement(node.props?.children, predicate);
+};
+
+const buildMCPSectionProps = (patch: Partial<AISettingsMCPSectionProps> = {}): AISettingsMCPSectionProps => ({
+  mcpClientStatuses: [
+    {
+      client: 'claude-code',
+      displayName: 'Claude Code',
+      installed: false,
+      matchesCurrent: false,
+      clientDetected: false,
+      clientCommand: 'claude',
+      message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+    },
+    {
+      client: 'codex',
+      displayName: 'Codex',
+      installed: false,
+      matchesCurrent: false,
+      clientDetected: true,
+      clientCommand: 'codex',
+      clientPath: 'C:/Users/mock/AppData/Roaming/npm/codex.cmd',
+      message: '未检测到 Codex 用户级 GoNavi MCP 配置',
+    },
+  ],
+  selectedMCPClient: 'claude-code',
+  selectedMCPClientStatus: {
+    client: 'claude-code',
+    displayName: 'Claude Code',
+    installed: false,
+    matchesCurrent: false,
+    clientDetected: false,
+    clientCommand: 'claude',
+    message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+  },
+  selectedMCPClientCommandText: '',
+  mcpHTTPServerStatus: {
+    running: false,
+    addr: '127.0.0.1:8765',
+    path: '/mcp',
+    url: 'http://127.0.0.1:8765/mcp',
+    schemaOnly: true,
+    message: 'GoNavi MCP HTTP 服务未启动',
+  },
+  mcpHTTPServerDraft: {
+    addr: '127.0.0.1:8765',
+    path: '/mcp',
+    authorizationHeader: 'Bearer gnv_test',
+  },
+  mcpServers: [],
+  mcpTools: [],
+  darkMode: false,
+  overlayTheme: buildOverlayWorkbenchTheme(false),
+  cardBg: '#fff',
+  cardBorder: 'rgba(0,0,0,0.08)',
+  inputBg: '#fff',
+  loading: false,
+  mcpClientStatusLoading: false,
+  mcpHTTPServerLoading: false,
+  onUpdateHTTPServerDraft: () => {},
+  onToggleHTTPServer: () => {},
+  onCopyHTTPServerURL: () => {},
+  onCopyHTTPServerAuthorization: () => {},
+  onSelectClient: () => {},
+  onRefreshStatus: () => {},
+  onCopyConfigPath: () => {},
+  onCopyLaunchCommand: () => {},
+  onInstallSelectedClient: () => {},
+  onAddServer: () => {},
+  onUpdateServerDraft: () => {},
+  onTestServer: () => {},
+  onSaveServer: () => {},
+  onDeleteServer: () => {},
+  ...patch,
+});
+
+describe('AISettingsMCPSection', () => {
+  it('renders the extracted MCP client installer and server management entry point', () => {
+    const markup = renderToStaticMarkup(
+      <AISettingsMCPSection {...buildMCPSectionProps()} />,
+    );
+
+    expect(markup).toContain('GoNavi MCP HTTP 服务');
+    expect(markup).toContain('可自定义本机监听端口和 Bearer Token');
+    expect(markup).toContain('http://127.0.0.1:8765/mcp');
+    expect(markup).toContain('复制 Authorization');
+    expect(markup).toContain('接入外部客户端');
+    expect(markup).toContain('尚未把当前 GoNavi MCP 接入到这里');
+    expect(markup).toContain('一行命令快速新增');
+    expect(markup).toContain('先选最接近的模板');
+    expect(markup).toContain('解析并新增草稿');
+    expect(markup).toContain('新增 MCP 参数速查');
+    expect(markup).toContain('command');
+    expect(markup).toContain('args');
+    expect(markup).toContain('env');
+    expect(markup).toContain('timeout');
+    expect(markup).toContain('只填程序名或启动器本身');
+    expect(markup).toContain('应填：');
+    expect(markup).toContain('填 npx、node、uvx、python、docker，或某个 exe 的绝对路径');
+    expect(markup).toContain('不要填整行命令，例如不要填 npx -y pkg --stdio');
+    expect(markup).toContain('把脚本名、模块名、开关参数拆开逐项填写');
+    expect(markup).toContain('不要再填 npx/node/uvx/python/docker');
+    expect(markup).toContain('给 MCP Server 传入 KEY=VALUE 形式的配置');
+    expect(markup).toContain('不要写 export、set 或 $env: 前缀');
+    expect(markup).toContain('单次工具发现或调用最多等待多久');
+    expect(markup).toContain('常见启动方式模板');
+    expect(markup).toContain('npx 包');
+    expect(markup).toContain('npx -y @modelcontextprotocol/server-filesystem --stdio');
+    expect(markup).toContain('Node 脚本');
+    expect(markup).toContain('Docker 镜像');
+    expect(markup).toContain('docker run -i --rm image');
+    expect(markup).toContain('新增 MCP 服务');
+    expect(markup).toContain('还没有 MCP 服务');
+    expect(markup).toContain('npx -y package --stdio');
+  });
+
+  it('renders troubleshooting hints when a server draft exists', () => {
+    const markup = renderToStaticMarkup(
+      <AISettingsMCPSection
+        {...buildMCPSectionProps({
+          mcpServers: [{
+            id: 'mcp-local',
+            name: 'Local MCP',
+            transport: 'stdio',
+            command: 'node',
+            args: ['server.js', '--stdio'],
+            env: {},
+            enabled: true,
+            timeoutSeconds: 20,
+          }],
+          mcpTools: [
+            {
+              alias: 'execute_sql',
+              serverId: 'mcp-local',
+              serverName: 'Local MCP',
+              originalName: 'execute_sql',
+              description: '执行 SQL',
+              inputSchema: {
+                type: 'object',
+                required: ['connectionId', 'sql'],
+                properties: {
+                  connectionId: { type: 'string', description: '连接 ID' },
+                  dbName: { type: 'string', description: '数据库名' },
+                  sql: { type: 'string', description: 'SQL 文本' },
+                  allowMutating: { type: 'boolean', description: '显式允许写操作' },
+                },
+              },
+            },
+            {
+              alias: 'legacy_tool',
+              serverId: 'mcp-local',
+              serverName: 'Local MCP',
+              originalName: 'legacy_tool',
+            },
+          ],
+        })}
+      />,
+    );
+
+    expect(markup).toContain('常见填错现象');
+    expect(markup).toContain('测试提示找不到命令');
+    expect(markup).toContain('认证失败、401 或 403');
+    expect(markup).toContain('当前只支持 stdio');
+    expect(markup).toContain('不要把密钥写进聊天内容');
+    expect(markup).toContain('已发现工具和参数提示');
+    expect(markup).toContain('execute_sql');
+    expect(markup).toContain('参数 4 个，必填 2 个');
+    expect(markup).toContain('最小 arguments 示例');
+    expect(markup).toContain('&quot;connectionId&quot;:&quot;&lt;connectionId&gt;&quot;');
+    expect(markup).toContain('&quot;sql&quot;:&quot;&lt;sql&gt;&quot;');
+    expect(markup).toContain('connectionId*: string');
+    expect(markup).toContain('sql*: string');
+    expect(markup).toContain('allowMutating: boolean');
+    expect(markup).toContain('legacy_tool');
+    expect(markup).toContain('未声明 inputSchema');
+  });
+
+  it('toggles the in-app MCP HTTP service from the switch panel', () => {
+    const onToggleHTTPServer = vi.fn();
+    const tree = AISettingsMCPSection(buildMCPSectionProps({
+      onToggleHTTPServer,
+    }));
+
+    const httpPanel = findElement(
+      tree,
+      (node) => node.props?.onToggle === onToggleHTTPServer,
+    );
+    expect(httpPanel).toBeTruthy();
+    httpPanel.props.onToggle(true);
+
+    expect(onToggleHTTPServer).toHaveBeenCalledWith(true);
+  });
+
+  it('passes MCP HTTP draft updates through the switch panel', () => {
+    const onUpdateHTTPServerDraft = vi.fn();
+    const tree = AISettingsMCPSection(buildMCPSectionProps({
+      onUpdateHTTPServerDraft,
+    }));
+
+    const httpPanel = findElement(
+      tree,
+      (node) => node.props?.onDraftChange === onUpdateHTTPServerDraft,
+    );
+    expect(httpPanel).toBeTruthy();
+    httpPanel.props.onDraftChange({ addr: '127.0.0.1:9123' });
+
+    expect(onUpdateHTTPServerDraft).toHaveBeenCalledWith({ addr: '127.0.0.1:9123' });
+  });
+});
diff --git a/frontend/src/components/ai/AISettingsMCPSection.tsx b/frontend/src/components/ai/AISettingsMCPSection.tsx
new file mode 100644
index 0000000..14aba83
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsMCPSection.tsx
@@ -0,0 +1,179 @@
+import React from 'react';
+import { Button } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+
+import type { AIMCPClientInstallStatus, AIMCPHTTPServerStatus, AIMCPServerConfig, AIMCPToolDescriptor } from '../../types';
+import type { MCPClientKey } from '../../utils/mcpClientInstallStatus';
+import { MCP_FIELD_GUIDES } from '../../utils/mcpServerGuidance';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AIMCPClientInstallPanel from './AIMCPClientInstallPanel';
+import AIMCPFieldGuideCard from './AIMCPFieldGuideCard';
+import AIMCPHTTPServerPanel from './AIMCPHTTPServerPanel';
+import type { AIMCPHTTPServerDraft } from './AIMCPHTTPServerPanel';
+import AIMCPQuickAddServerPanel from './AIMCPQuickAddServerPanel';
+import AIMCPServerCard from './AIMCPServerCard';
+
+export type { MCPClientKey } from '../../utils/mcpClientInstallStatus';
+
+export interface AISettingsMCPSectionProps {
+  mcpClientStatuses: AIMCPClientInstallStatus[];
+  selectedMCPClient: MCPClientKey;
+  selectedMCPClientStatus?: AIMCPClientInstallStatus;
+  selectedMCPClientCommandText: string;
+  mcpHTTPServerStatus: AIMCPHTTPServerStatus;
+  mcpHTTPServerDraft: AIMCPHTTPServerDraft;
+  mcpServers: AIMCPServerConfig[];
+  mcpTools: AIMCPToolDescriptor[];
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBg: string;
+  cardBorder: string;
+  inputBg: string;
+  loading: boolean;
+  mcpClientStatusLoading: boolean;
+  mcpHTTPServerLoading: boolean;
+  onUpdateHTTPServerDraft: (patch: Partial<AIMCPHTTPServerDraft>) => void;
+  onToggleHTTPServer: (checked: boolean) => void;
+  onCopyHTTPServerURL: () => void;
+  onCopyHTTPServerAuthorization: () => void;
+  onSelectClient: (client: MCPClientKey) => void;
+  onRefreshStatus: () => void;
+  onCopyConfigPath: () => void;
+  onCopyLaunchCommand: () => void;
+  onInstallSelectedClient: () => void;
+  onAddServer: (seed?: Partial<AIMCPServerConfig>) => void;
+  onUpdateServerDraft: (id: string, patch: Partial<AIMCPServerConfig>) => void;
+  onTestServer: (server: AIMCPServerConfig) => void;
+  onSaveServer: (server: AIMCPServerConfig) => void;
+  onDeleteServer: (id: string) => void;
+}
+
+const AISettingsMCPSection: React.FC<AISettingsMCPSectionProps> = ({
+  mcpClientStatuses,
+  selectedMCPClient,
+  selectedMCPClientStatus,
+  selectedMCPClientCommandText,
+  mcpHTTPServerStatus,
+  mcpHTTPServerDraft,
+  mcpServers,
+  mcpTools,
+  darkMode,
+  overlayTheme,
+  cardBg,
+  cardBorder,
+  inputBg,
+  loading,
+  mcpClientStatusLoading,
+  mcpHTTPServerLoading,
+  onUpdateHTTPServerDraft,
+  onToggleHTTPServer,
+  onCopyHTTPServerURL,
+  onCopyHTTPServerAuthorization,
+  onSelectClient,
+  onRefreshStatus,
+  onCopyConfigPath,
+  onCopyLaunchCommand,
+  onInstallSelectedClient,
+  onAddServer,
+  onUpdateServerDraft,
+  onTestServer,
+  onSaveServer,
+  onDeleteServer,
+}) => (
+  <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+    <AIMCPHTTPServerPanel
+      status={mcpHTTPServerStatus}
+      draft={mcpHTTPServerDraft}
+      loading={mcpHTTPServerLoading}
+      cardBg={cardBg}
+      cardBorder={cardBorder}
+      darkMode={darkMode}
+      overlayTheme={overlayTheme}
+      onDraftChange={onUpdateHTTPServerDraft}
+      onToggle={onToggleHTTPServer}
+      onCopyURL={onCopyHTTPServerURL}
+      onCopyAuthorization={onCopyHTTPServerAuthorization}
+    />
+    <AIMCPClientInstallPanel
+      statuses={mcpClientStatuses}
+      selectedClient={selectedMCPClient}
+      selectedStatus={selectedMCPClientStatus}
+      selectedCommandText={selectedMCPClientCommandText}
+      darkMode={darkMode}
+      overlayTheme={overlayTheme}
+      cardBg={cardBg}
+      cardBorder={cardBorder}
+      loading={loading}
+      statusLoading={mcpClientStatusLoading}
+      onSelectClient={onSelectClient}
+      onRefreshStatus={onRefreshStatus}
+      onCopyConfigPath={onCopyConfigPath}
+      onCopyLaunchCommand={onCopyLaunchCommand}
+      onInstall={onInstallSelectedClient}
+    />
+    <AIMCPQuickAddServerPanel
+      cardBg={cardBg}
+      cardBorder={cardBorder}
+      inputBg={inputBg}
+      darkMode={darkMode}
+      overlayTheme={overlayTheme}
+      onAddServer={onAddServer}
+    />
+    <div
+      style={{
+        padding: '14px 16px',
+        borderRadius: 14,
+        border: `1px solid ${cardBorder}`,
+        background: cardBg,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 10,
+      }}
+    >
+      <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText }}>新增 MCP 参数速查</div>
+      <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.7 }}>
+        先确认这几个字段再新增服务：`command` 只填可执行程序，`args` 才放脚本名和 --stdio，`env` 每行一个 KEY=VALUE，`timeout` 控制单次工具发现或调用等待时间。
+      </div>
+      <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(170px, 1fr))', gap: 10 }}>
+        {MCP_FIELD_GUIDES.filter((item) => ['command', 'args', 'env', 'timeout'].includes(item.key)).map((item) => (
+          <AIMCPFieldGuideCard
+            key={item.key}
+            item={item}
+            cardBorder={cardBorder}
+            darkMode={darkMode}
+            overlayTheme={overlayTheme}
+            compact
+          />
+        ))}
+      </div>
+    </div>
+    <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: 12 }}>
+      <div style={{ fontSize: 12, color: overlayTheme.mutedText }}>支持命令、参数、环境变量和超时；不确定怎么填时先看卡片里的“字段速查”，保存后会自动进入 AI 工具列表。</div>
+      <Button icon={<PlusOutlined />} onClick={() => onAddServer()} style={{ borderRadius: 10 }}>新增 MCP 服务</Button>
+    </div>
+    {mcpServers.length === 0 && (
+      <div style={{ padding: '18px 16px', borderRadius: 14, border: `1px dashed ${cardBorder}`, background: cardBg, color: overlayTheme.mutedText }}>
+        还没有 MCP 服务。常见形式是 `npx -y package --stdio`、`node server.js`、`uvx some-mcp-server`、`python -m server`、`docker run --rm -i image`。
+      </div>
+    )}
+    {mcpServers.map((server) => (
+      <AIMCPServerCard
+        key={server.id}
+        server={server}
+        serverTools={mcpTools.filter((tool) => tool.serverId === server.id)}
+        cardBg={cardBg}
+        cardBorder={cardBorder}
+        inputBg={inputBg}
+        darkMode={darkMode}
+        overlayTheme={overlayTheme}
+        loading={loading}
+        onChange={(patch) => onUpdateServerDraft(server.id, patch)}
+        onTest={() => onTestServer(server)}
+        onSave={() => onSaveServer(server)}
+        onDelete={() => onDeleteServer(server.id)}
+      />
+    ))}
+  </div>
+);
+
+export default AISettingsMCPSection;
diff --git a/frontend/src/components/ai/AISettingsPromptsSection.test.tsx b/frontend/src/components/ai/AISettingsPromptsSection.test.tsx
new file mode 100644
index 0000000..8b084b6
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsPromptsSection.test.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AISettingsPromptsSection from './AISettingsPromptsSection';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+describe('AISettingsPromptsSection', () => {
+  it('renders editable user prompts and readonly builtin prompt blocks after extraction', () => {
+    const markup = renderToStaticMarkup(
+      <AISettingsPromptsSection
+        builtinPrompts={{ 数据库: '生成 SQL 前必须先确认字段名。' }}
+        userPromptSettings={{
+          global: '',
+          database: '',
+          jvm: '',
+          jvmDiagnostic: '',
+        }}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        inputBg="#fff"
+        darkMode={false}
+        loading={false}
+        onChangeUserPrompt={() => {}}
+        onSave={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('用户级自定义提示词');
+    expect(markup).toContain('全局补充提示词');
+    expect(markup).toContain('保存自定义提示词');
+    expect(markup).toContain('数据库');
+    expect(markup).toContain('生成 SQL 前必须先确认字段名');
+  });
+});
diff --git a/frontend/src/components/ai/AISettingsPromptsSection.tsx b/frontend/src/components/ai/AISettingsPromptsSection.tsx
new file mode 100644
index 0000000..2a1c2a3
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsPromptsSection.tsx
@@ -0,0 +1,160 @@
+import React from 'react';
+import { Button, Input } from 'antd';
+import { RobotOutlined } from '@ant-design/icons';
+
+import type { AIUserPromptSettings } from '../../types';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+interface AISettingsPromptsSectionProps {
+  builtinPrompts: Record<string, string>;
+  userPromptSettings: AIUserPromptSettings;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBg: string;
+  cardBorder: string;
+  inputBg: string;
+  darkMode: boolean;
+  loading: boolean;
+  onChangeUserPrompt: (key: keyof AIUserPromptSettings, value: string) => void;
+  onSave: () => void;
+}
+
+const USER_PROMPT_FIELDS: Array<{
+  key: keyof AIUserPromptSettings;
+  title: string;
+  desc: string;
+  rows: number;
+}> = [
+  {
+    key: 'global',
+    title: '全局补充提示词',
+    desc: '对所有 AI 会话生效，例如“先给结论”“回答保持简洁”。',
+    rows: 4,
+  },
+  {
+    key: 'database',
+    title: '数据库会话补充提示词',
+    desc: '仅数据库/SQL 场景生效，例如“生成 SQL 前必须先确认字段名”。',
+    rows: 5,
+  },
+  {
+    key: 'jvm',
+    title: 'JVM 资源分析补充提示词',
+    desc: '仅 JVM 资源浏览/分析场景生效。',
+    rows: 4,
+  },
+  {
+    key: 'jvmDiagnostic',
+    title: 'JVM 诊断补充提示词',
+    desc: '仅 JVM 诊断工作台生效，例如“先给计划，再给命令”。',
+    rows: 4,
+  },
+];
+
+const AISettingsPromptsSection: React.FC<AISettingsPromptsSectionProps> = ({
+  builtinPrompts,
+  userPromptSettings,
+  overlayTheme,
+  cardBg,
+  cardBorder,
+  inputBg,
+  darkMode,
+  loading,
+  onChangeUserPrompt,
+  onSave,
+}) => (
+  <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+    <div
+      style={{
+        padding: '14px 16px',
+        borderRadius: 14,
+        border: `1px solid ${cardBorder}`,
+        background: cardBg,
+      }}
+    >
+      <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, marginBottom: 6 }}>
+        用户级自定义提示词
+      </div>
+      <div style={{ fontSize: 13, color: overlayTheme.mutedText, lineHeight: 1.6, marginBottom: 14 }}>
+        这里的内容会在系统内置提示词之后，以 system message 的形式追加注入。
+        适合放你的个人风格偏好、输出约束、团队规范。涉及安全红线时，系统规则仍然优先。
+      </div>
+
+      {USER_PROMPT_FIELDS.map((item) => (
+        <div key={item.key} style={{ marginTop: 14 }}>
+          <div style={{ fontWeight: 600, fontSize: 13, color: overlayTheme.titleText, marginBottom: 4 }}>
+            {item.title}
+          </div>
+          <div style={{ fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.6, marginBottom: 8 }}>
+            {item.desc}
+          </div>
+          <Input.TextArea
+            rows={item.rows}
+            value={userPromptSettings[item.key]}
+            onChange={(event) => onChangeUserPrompt(item.key, event.target.value)}
+            placeholder="留空表示不额外追加"
+            style={{
+              borderRadius: 10,
+              background: inputBg,
+              border: `1px solid ${cardBorder}`,
+              fontFamily: 'var(--gn-font-mono)',
+              resize: 'vertical',
+            }}
+          />
+        </div>
+      ))}
+
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: 16 }}>
+        <Button type="primary" onClick={onSave} loading={loading} style={{ borderRadius: 10, fontWeight: 600 }}>
+          保存自定义提示词
+        </Button>
+      </div>
+    </div>
+
+    <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginBottom: 4 }}>
+      以下为当前版本 GoNavi 预设的底层 AI 提示词（只读）。它们会先于上面的用户级提示词注入到对应场景的请求上下文中。
+    </div>
+    {Object.entries(builtinPrompts).map(([title, promptText]) => (
+      <div
+        key={title}
+        style={{
+          padding: '12px',
+          borderRadius: 12,
+          border: `1px solid ${cardBorder}`,
+          background: cardBg,
+        }}
+      >
+        <div
+          style={{
+            fontWeight: 700,
+            fontSize: 14,
+            color: overlayTheme.titleText,
+            marginBottom: 8,
+            display: 'flex',
+            alignItems: 'center',
+            gap: 6,
+          }}
+        >
+          <RobotOutlined style={{ color: overlayTheme.iconColor }} /> {title}
+        </div>
+        <div
+          style={{
+            background: darkMode ? 'rgba(0,0,0,0.2)' : 'rgba(255,255,255,0.8)',
+            padding: '10px 12px',
+            borderRadius: 8,
+            fontSize: 13,
+            color: overlayTheme.mutedText,
+            whiteSpace: 'pre-wrap',
+            fontFamily: 'var(--gn-font-mono)',
+            lineHeight: 1.5,
+            userSelect: 'text',
+            border: darkMode ? '1px solid rgba(255,255,255,0.03)' : '1px solid rgba(0,0,0,0.02)',
+          }}
+        >
+          {promptText}
+        </div>
+      </div>
+    ))}
+  </div>
+);
+
+export default AISettingsPromptsSection;
diff --git a/frontend/src/components/ai/AISettingsProvidersSection.test.tsx b/frontend/src/components/ai/AISettingsProvidersSection.test.tsx
new file mode 100644
index 0000000..e143d1f
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsProvidersSection.test.tsx
@@ -0,0 +1,111 @@
+import React from 'react';
+import { Form } from 'antd';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import type { AIProviderConfig } from '../../types';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import AISettingsProvidersSection from './AISettingsProvidersSection';
+
+const providerPresets = [
+  { key: 'openai', label: 'OpenAI', icon: <span>O</span>, desc: 'GPT', defaultBaseUrl: 'https://api.openai.com/v1' },
+  { key: 'custom', label: '自定义', icon: <span>C</span>, desc: '自定义接口', defaultBaseUrl: 'https://example.com' },
+];
+
+const provider: AIProviderConfig = {
+  id: 'provider-1',
+  name: 'OpenAI',
+  type: 'openai',
+  apiKey: '',
+  baseUrl: 'https://api.openai.com/v1',
+  model: 'gpt-4o',
+  maxTokens: 4096,
+  temperature: 0.7,
+};
+
+const overlayTheme = buildOverlayWorkbenchTheme(false);
+
+describe('AISettingsProvidersSection', () => {
+  it('renders provider cards in list mode', () => {
+    const Wrap = () => {
+      const [form] = Form.useForm();
+      return (
+        <AISettingsProvidersSection
+          providers={[provider]}
+          activeProviderId="provider-1"
+          editingProvider={null}
+          isEditing={false}
+          form={form}
+          providerPresets={providerPresets}
+          loading={false}
+          testStatus="idle"
+          primaryPasswordVisible={false}
+          darkMode={false}
+          overlayTheme={overlayTheme}
+          cardBg="#fff"
+          cardBorder="rgba(0,0,0,0.08)"
+          inputBg="#fff"
+          onPrimaryPasswordVisibleChange={() => {}}
+          resolveProviderPreset={() => ({ label: 'OpenAI', icon: <span>O</span> })}
+          resolvePresetByKey={(key) => providerPresets.find((item) => item.key === key) || providerPresets[0]}
+          onAddProvider={() => {}}
+          onEditProvider={() => {}}
+          onDeleteProvider={() => {}}
+          onSetActiveProvider={() => {}}
+          onCancelEdit={() => {}}
+          onPresetChange={() => {}}
+          onTestProvider={() => {}}
+          onSaveProvider={() => {}}
+        />
+      );
+    };
+
+    const markup = renderToStaticMarkup(<Wrap />);
+    expect(markup).toContain('OpenAI');
+    expect(markup).toContain('gpt-4o');
+    expect(markup).toContain('添加模型供应商');
+  });
+
+  it('renders provider form in editing mode', () => {
+    const Wrap = () => {
+      const [form] = Form.useForm();
+      return (
+        <AISettingsProvidersSection
+          providers={[provider]}
+          activeProviderId="provider-1"
+          editingProvider={provider}
+          isEditing
+          form={form}
+          providerPresets={providerPresets}
+          watchedPresetKey="custom"
+          watchedApiFormat="openai"
+          loading={false}
+          testStatus="idle"
+          primaryPasswordVisible={false}
+          darkMode={false}
+          overlayTheme={overlayTheme}
+          cardBg="#fff"
+          cardBorder="rgba(0,0,0,0.08)"
+          inputBg="#fff"
+          onPrimaryPasswordVisibleChange={() => {}}
+          resolveProviderPreset={() => ({ label: 'OpenAI', icon: <span>O</span> })}
+          resolvePresetByKey={(key) => providerPresets.find((item) => item.key === key) || providerPresets[0]}
+          onAddProvider={() => {}}
+          onEditProvider={() => {}}
+          onDeleteProvider={() => {}}
+          onSetActiveProvider={() => {}}
+          onCancelEdit={() => {}}
+          onPresetChange={() => {}}
+          onTestProvider={() => {}}
+          onSaveProvider={() => {}}
+        />
+      );
+    };
+
+    const markup = renderToStaticMarkup(<Wrap />);
+    expect(markup).toContain('编辑模型供应商');
+    expect(markup).toContain('供应商名称');
+    expect(markup).toContain('API Endpoint (URL)');
+    expect(markup).toContain('测试连接');
+  });
+});
diff --git a/frontend/src/components/ai/AISettingsProvidersSection.tsx b/frontend/src/components/ai/AISettingsProvidersSection.tsx
new file mode 100644
index 0000000..81d9d01
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsProvidersSection.tsx
@@ -0,0 +1,391 @@
+import React from 'react';
+import { Button, Form, Input, Popconfirm, Select, Space, Tooltip } from 'antd';
+import { ApiOutlined, AppstoreOutlined, CheckOutlined, DeleteOutlined, EditOutlined, KeyOutlined, LinkOutlined, PlusOutlined, RobotOutlined } from '@ant-design/icons';
+import type { FormInstance } from 'antd/es/form';
+
+import type { AIProviderConfig } from '../../types';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+import {
+  PROVIDER_PRESET_CARD_BASE_STYLE,
+  PROVIDER_PRESET_CARD_CONTENT_STYLE,
+  PROVIDER_PRESET_CARD_DESCRIPTION_STYLE,
+  PROVIDER_PRESET_GRID_STYLE,
+  PROVIDER_PRESET_CARD_TITLE_STYLE,
+} from '../../utils/aiSettingsPresetLayout';
+
+export interface AISettingsProviderPresetOption {
+  key: string;
+  label: string;
+  icon: React.ReactNode;
+  desc: string;
+  defaultBaseUrl: string;
+}
+
+interface MatchedProviderPreset {
+  label: string;
+  icon: React.ReactNode;
+}
+
+interface AISettingsProvidersSectionProps {
+  providers: AIProviderConfig[];
+  activeProviderId: string;
+  editingProvider: AIProviderConfig | null;
+  isEditing: boolean;
+  form: FormInstance;
+  providerPresets: AISettingsProviderPresetOption[];
+  watchedPresetKey?: string;
+  watchedApiFormat?: string;
+  loading: boolean;
+  testStatus: 'idle' | 'success' | 'error';
+  primaryPasswordVisible: boolean;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBg: string;
+  cardBorder: string;
+  inputBg: string;
+  onPrimaryPasswordVisibleChange: (visible: boolean) => void;
+  resolveProviderPreset: (provider: Pick<AIProviderConfig, 'type' | 'baseUrl' | 'apiFormat'>) => MatchedProviderPreset;
+  resolvePresetByKey: (presetKey: string) => AISettingsProviderPresetOption;
+  onAddProvider: () => void;
+  onEditProvider: (provider: AIProviderConfig) => void;
+  onDeleteProvider: (id: string) => void;
+  onSetActiveProvider: (id: string) => void;
+  onCancelEdit: () => void;
+  onPresetChange: (presetKey: string) => void;
+  onTestProvider: () => void;
+  onSaveProvider: () => void;
+}
+
+const fieldGroupStyle = (cardBorder: string, cardBg: string): React.CSSProperties => ({
+  padding: '14px 16px',
+  borderRadius: 12,
+  border: `1px solid ${cardBorder}`,
+  background: cardBg,
+  marginBottom: 12,
+});
+
+const fieldLabelStyle = (sectionLabelColor: string): React.CSSProperties => ({
+  fontSize: 13,
+  fontWeight: 700,
+  textTransform: 'uppercase',
+  letterSpacing: '0.08em',
+  color: sectionLabelColor,
+  marginBottom: 10,
+  display: 'flex',
+  alignItems: 'center',
+  gap: 6,
+});
+
+const AISettingsProvidersSection: React.FC<AISettingsProvidersSectionProps> = ({
+  providers,
+  activeProviderId,
+  editingProvider,
+  isEditing,
+  form,
+  providerPresets,
+  watchedPresetKey,
+  watchedApiFormat,
+  loading,
+  testStatus,
+  primaryPasswordVisible,
+  darkMode,
+  overlayTheme,
+  cardBg,
+  cardBorder,
+  inputBg,
+  onPrimaryPasswordVisibleChange,
+  resolveProviderPreset,
+  resolvePresetByKey,
+  onAddProvider,
+  onEditProvider,
+  onDeleteProvider,
+  onSetActiveProvider,
+  onCancelEdit,
+  onPresetChange,
+  onTestProvider,
+  onSaveProvider,
+}) => {
+  const presetKeyFromForm = watchedPresetKey || (editingProvider as (AIProviderConfig & { presetKey?: string }) | null)?.presetKey || 'openai';
+  const sectionLabelColor = darkMode ? 'rgba(255,255,255,0.5)' : 'rgba(0,0,0,0.4)';
+  const currentFieldGroupStyle = fieldGroupStyle(cardBorder, cardBg);
+  const currentFieldLabelStyle = fieldLabelStyle(sectionLabelColor);
+
+  if (!isEditing) {
+    return (
+      <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+        {providers.length === 0 && (
+          <div style={{
+            textAlign: 'center',
+            padding: '36px 20px',
+            color: overlayTheme.mutedText,
+            fontSize: 14,
+            border: `1px dashed ${cardBorder}`,
+            borderRadius: 14,
+            background: cardBg,
+          }}>
+            <RobotOutlined style={{ fontSize: 32, marginBottom: 12, opacity: 0.3, display: 'block' }} />
+            暂未配置模型供应商
+            <br />
+            <span style={{ fontSize: 13, opacity: 0.6 }}>添加一个以开始使用 AI 助手</span>
+          </div>
+        )}
+        {providers.map((provider) => {
+          const matchedPreset = resolveProviderPreset(provider);
+          const isActive = provider.id === activeProviderId;
+          return (
+            <div
+              key={provider.id}
+              onClick={() => onSetActiveProvider(provider.id)}
+              style={{
+                padding: '14px 16px',
+                borderRadius: 14,
+                cursor: 'pointer',
+                transition: 'all 0.2s ease',
+                border: `1.5px solid ${isActive ? overlayTheme.selectedText : cardBorder}`,
+                background: isActive ? overlayTheme.selectedBg : cardBg,
+                display: 'flex',
+                alignItems: 'center',
+                gap: 14,
+              }}
+            >
+              <div style={{
+                width: 36,
+                height: 36,
+                borderRadius: 10,
+                display: 'grid',
+                placeItems: 'center',
+                background: isActive ? overlayTheme.iconBg : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)'),
+                color: isActive ? overlayTheme.iconColor : overlayTheme.mutedText,
+                fontSize: 18,
+                flexShrink: 0,
+                transition: 'all 0.2s ease',
+              }}>
+                {matchedPreset.icon || <ApiOutlined />}
+              </div>
+              <div style={{ flex: 1, minWidth: 0 }}>
+                <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, display: 'flex', alignItems: 'center', gap: 8 }}>
+                  {provider.name || provider.type}
+                  {isActive && <CheckOutlined style={{ color: overlayTheme.iconColor, fontSize: 13 }} />}
+                </div>
+                <div style={{ fontSize: 12, color: overlayTheme.mutedText, marginTop: 4, display: 'flex', alignItems: 'center', gap: 6 }}>
+                  <span>{matchedPreset.label}</span>
+                  <span style={{ opacity: 0.4 }}>·</span>
+                  <span style={{ fontFamily: 'var(--gn-font-mono)', fontSize: 12 }}>{provider.model || '未选择模型'}</span>
+                </div>
+              </div>
+              <Space size={2}>
+                <Tooltip title="编辑">
+                  <Button
+                    type="text"
+                    size="small"
+                    icon={<EditOutlined />}
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      onEditProvider(provider);
+                    }}
+                    style={{ color: overlayTheme.mutedText }}
+                  />
+                </Tooltip>
+                <Popconfirm
+                  title="确认删除？"
+                  onConfirm={() => onDeleteProvider(provider.id)}
+                  okButtonProps={{ danger: true }}
+                  okText="删除"
+                  cancelText="取消"
+                >
+                  <Button
+                    type="text"
+                    size="small"
+                    icon={<DeleteOutlined />}
+                    danger
+                    onClick={(event) => event.stopPropagation()}
+                  />
+                </Popconfirm>
+              </Space>
+            </div>
+          );
+        })}
+        <Button
+          type="dashed"
+          icon={<PlusOutlined />}
+          onClick={onAddProvider}
+          style={{ borderRadius: 12, height: 42, borderColor: darkMode ? 'rgba(255,255,255,0.12)' : undefined }}
+        >
+          添加模型供应商
+        </Button>
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      <div style={{ marginBottom: 16, display: 'flex', alignItems: 'center', gap: 10 }}>
+        <Button size="small" onClick={onCancelEdit} style={{ borderRadius: 8 }}>← 返回</Button>
+        <span style={{ fontWeight: 700, fontSize: 16, color: overlayTheme.titleText }}>
+          {editingProvider?.id ? '编辑模型供应商' : '添加模型供应商'}
+        </span>
+      </div>
+
+      <Form form={form} layout="vertical" size="small">
+        <div style={currentFieldGroupStyle}>
+          <div style={currentFieldLabelStyle}>
+            <AppstoreOutlined style={{ fontSize: 14 }} /> 服务类型
+          </div>
+          <Form.Item name="presetKey" noStyle>
+            <div style={PROVIDER_PRESET_GRID_STYLE}>
+              {providerPresets.map((preset) => (
+                <div
+                  key={preset.key}
+                  onClick={() => {
+                    form.setFieldValue('presetKey', preset.key);
+                    onPresetChange(preset.key);
+                  }}
+                  style={{
+                    ...PROVIDER_PRESET_CARD_BASE_STYLE,
+                    border: `1.5px solid ${presetKeyFromForm === preset.key ? overlayTheme.selectedText : 'transparent'}`,
+                    background: presetKeyFromForm === preset.key ? overlayTheme.selectedBg : (darkMode ? 'rgba(255,255,255,0.02)' : 'rgba(255,255,255,0.72)'),
+                    boxShadow: presetKeyFromForm === preset.key ? 'none' : (darkMode ? 'inset 0 0 0 1px rgba(255,255,255,0.028)' : 'inset 0 0 0 1px rgba(16,24,40,0.03)'),
+                  }}
+                >
+                  <div style={{
+                    color: presetKeyFromForm === preset.key ? overlayTheme.iconColor : overlayTheme.mutedText,
+                    fontSize: 18,
+                    marginTop: 2,
+                    transition: 'all 0.2s ease',
+                    flexShrink: 0,
+                  }}>
+                    {preset.icon}
+                  </div>
+                  <div style={PROVIDER_PRESET_CARD_CONTENT_STYLE}>
+                    <div style={{ ...PROVIDER_PRESET_CARD_TITLE_STYLE, fontSize: 13, fontWeight: 700, color: overlayTheme.titleText, lineHeight: 1.3 }}>{preset.label}</div>
+                    <div style={{ ...PROVIDER_PRESET_CARD_DESCRIPTION_STYLE, fontSize: 12, color: overlayTheme.mutedText, lineHeight: 1.4 }}>{preset.desc}</div>
+                  </div>
+                </div>
+              ))}
+            </div>
+          </Form.Item>
+          <Form.Item name="type" hidden><Input /></Form.Item>
+        </div>
+
+        {(presetKeyFromForm === 'custom' || presetKeyFromForm === 'ollama') && (
+          <div style={{ ...currentFieldGroupStyle, marginTop: 16 }}>
+            <div style={currentFieldLabelStyle}>
+              <RobotOutlined style={{ fontSize: 14 }} /> 基本信息
+            </div>
+
+            <Form.Item label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>供应商名称</span>} name="name" rules={[{ required: true, message: '请输入名称' }]} style={{ marginBottom: 16 }}>
+              <Input
+                placeholder="例如：我的自建 OpenAI / 专属大模型"
+                size="middle"
+                style={{ borderRadius: 8, background: inputBg, border: `1px solid ${cardBorder}` }}
+              />
+            </Form.Item>
+
+            {presetKeyFromForm === 'custom' && (
+              <Form.Item label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>API 格式</span>} name="apiFormat" style={{ marginBottom: 16 }}>
+                <div style={{
+                  display: 'inline-flex',
+                  padding: 4,
+                  background: darkMode ? 'rgba(0,0,0,0.2)' : 'rgba(0,0,0,0.04)',
+                  borderRadius: 8,
+                  gap: 4,
+                }}>
+                  {[{ value: 'openai', label: 'OpenAI' }, { value: 'anthropic', label: 'Anthropic' }, { value: 'gemini', label: 'Gemini' }, { value: 'claude-cli', label: 'Claude CLI' }].map((format) => (
+                    <div
+                      key={format.value}
+                      onClick={() => form.setFieldsValue({ apiFormat: format.value })}
+                      style={{
+                        padding: '6px 16px',
+                        borderRadius: 6,
+                        fontSize: 13,
+                        fontWeight: watchedApiFormat === format.value ? 600 : 500,
+                        cursor: 'pointer',
+                        background: watchedApiFormat === format.value ? (darkMode ? '#374151' : '#ffffff') : 'transparent',
+                        color: watchedApiFormat === format.value ? overlayTheme.titleText : overlayTheme.mutedText,
+                        boxShadow: watchedApiFormat === format.value ? '0 1px 3px rgba(0,0,0,0.1)' : 'none',
+                        transition: 'all 0.2s ease',
+                      }}
+                    >
+                      {format.label}
+                    </div>
+                  ))}
+                </div>
+              </Form.Item>
+            )}
+
+            <Form.Item label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>可用模型列表（可选配置）</span>} name="models" style={{ marginBottom: 0 }}>
+              <Select mode="tags" size="middle" placeholder="配置指定的模型ID，留空则默认去服务端拉取" style={{ width: '100%' }} />
+            </Form.Item>
+          </div>
+        )}
+        <Form.Item name="model" hidden><Input /></Form.Item>
+        <Form.Item name="name" hidden><Input /></Form.Item>
+
+        <div style={{ ...currentFieldGroupStyle, marginTop: 16 }}>
+          <div style={currentFieldLabelStyle}>
+            <KeyOutlined style={{ fontSize: 14 }} /> 认证 & 连接
+          </div>
+          <Form.Item
+            label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>API Key</span>}
+            name="apiKey"
+            rules={[{
+              validator: (_, value) => {
+                const apiKey = String(value || '').trim();
+                if (apiKey || editingProvider?.id) {
+                  return Promise.resolve();
+                }
+                return Promise.reject(new Error('请输入 API Key'));
+              },
+            }]}
+            style={{ marginBottom: 16 }}
+          >
+            <Input.Password
+              placeholder="sk-... / 你的 API Key"
+              size="middle"
+              visibilityToggle={{
+                visible: primaryPasswordVisible,
+                onVisibleChange: onPrimaryPasswordVisibleChange,
+              }}
+              style={{ borderRadius: 8, background: inputBg, border: `1px solid ${cardBorder}` }}
+            />
+          </Form.Item>
+
+          {(presetKeyFromForm === 'custom' || presetKeyFromForm === 'ollama') && (
+            <Form.Item label={<span style={{ fontWeight: 500, color: overlayTheme.titleText }}>API Endpoint (URL)</span>} name="baseUrl" rules={[{ required: true, message: '请输入有效的接口地址' }]} style={{ marginBottom: 0 }}>
+              <Input
+                placeholder={resolvePresetByKey(presetKeyFromForm).defaultBaseUrl || 'https://...'}
+                size="middle"
+                suffix={<LinkOutlined style={{ color: overlayTheme.mutedText }} />}
+                style={{ borderRadius: 8, background: inputBg, border: `1px solid ${cardBorder}` }}
+              />
+            </Form.Item>
+          )}
+        </div>
+
+        <div style={{
+          display: 'flex',
+          gap: 8,
+          justifyContent: 'flex-end',
+          marginTop: 12,
+          paddingTop: 16,
+          borderTop: `1px solid ${cardBorder}`,
+          paddingBottom: 24,
+        }}>
+          <Button
+            onClick={onTestProvider}
+            loading={loading}
+            style={{ borderRadius: 10 }}
+            icon={testStatus === 'success' ? <CheckOutlined style={{ color: '#22c55e' }} /> : undefined}
+          >
+            {testStatus === 'success' ? '连接正常' : testStatus === 'error' ? '重新测试' : '测试连接'}
+          </Button>
+          <Button type="primary" onClick={onSaveProvider} loading={loading} style={{ borderRadius: 10, fontWeight: 600 }}>
+            保存
+          </Button>
+        </div>
+      </Form>
+    </div>
+  );
+};
+
+export default AISettingsProvidersSection;
diff --git a/frontend/src/components/ai/AISettingsSafetySection.tsx b/frontend/src/components/ai/AISettingsSafetySection.tsx
new file mode 100644
index 0000000..861f188
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsSafetySection.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import { CheckOutlined } from '@ant-design/icons';
+
+import type { AISafetyLevel } from '../../types';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+const SAFETY_OPTIONS: { label: string; value: AISafetyLevel; desc: string; color: string; icon: string }[] = [
+  { label: '只读模式', value: 'readonly', desc: 'AI 仅可执行 SELECT 等查询操作，最安全', color: '#22c55e', icon: '🔒' },
+  { label: '读写模式', value: 'readwrite', desc: 'AI 可执行 INSERT/UPDATE/DELETE，危险操作需二次确认', color: '#f59e0b', icon: '⚠️' },
+  { label: '完全模式', value: 'full', desc: 'AI 可执行所有操作（含 DDL），高危操作自动告警', color: '#ef4444', icon: '🔓' },
+];
+
+interface AISettingsSafetySectionProps {
+  safetyLevel: AISafetyLevel;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBg: string;
+  cardBorder: string;
+  onChange: (level: AISafetyLevel) => void;
+}
+
+const AISettingsSafetySection: React.FC<AISettingsSafetySectionProps> = ({
+  safetyLevel,
+  darkMode,
+  overlayTheme,
+  cardBg,
+  cardBorder,
+  onChange,
+}) => (
+  <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
+    <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginBottom: 8 }}>
+      控制 AI 可执行的 SQL 操作类型，保护数据安全
+    </div>
+    {SAFETY_OPTIONS.map((opt) => {
+      const active = safetyLevel === opt.value;
+      return (
+        <div
+          key={opt.value}
+          onClick={() => onChange(opt.value)}
+          style={{
+            padding: '14px 16px',
+            borderRadius: 14,
+            cursor: 'pointer',
+            transition: 'all 0.2s ease',
+            border: `1.5px solid ${active ? (opt.color === '#ef4444' ? opt.color : overlayTheme.selectedText) : cardBorder}`,
+            background: active ? (opt.color === '#ef4444' ? `${opt.color}15` : overlayTheme.selectedBg) : cardBg,
+            display: 'flex',
+            alignItems: 'flex-start',
+            gap: 14,
+          }}
+        >
+          <div
+            style={{
+              width: 36,
+              height: 36,
+              borderRadius: 10,
+              display: 'grid',
+              placeItems: 'center',
+              fontSize: 18,
+              flexShrink: 0,
+              background: active ? (opt.color === '#ef4444' ? `${opt.color}25` : overlayTheme.iconBg) : (darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.03)'),
+              color: active ? (opt.color === '#ef4444' ? opt.color : overlayTheme.iconColor) : overlayTheme.mutedText,
+              transition: 'all 0.2s ease',
+            }}
+          >
+            {opt.icon}
+          </div>
+          <div style={{ flex: 1 }}>
+            <div style={{ fontWeight: 700, fontSize: 14, color: overlayTheme.titleText, display: 'flex', alignItems: 'center', gap: 8 }}>
+              {opt.label}
+              {active && <CheckOutlined style={{ color: opt.color === '#ef4444' ? opt.color : overlayTheme.iconColor, fontSize: 14 }} />}
+            </div>
+            <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginTop: 4, lineHeight: '1.5' }}>{opt.desc}</div>
+          </div>
+        </div>
+      );
+    })}
+  </div>
+);
+
+export default AISettingsSafetySection;
diff --git a/frontend/src/components/ai/AISettingsSidebar.test.tsx b/frontend/src/components/ai/AISettingsSidebar.test.tsx
new file mode 100644
index 0000000..f5adce1
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsSidebar.test.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AISettingsSidebar from './AISettingsSidebar';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+describe('AISettingsSidebar', () => {
+  it('renders the ai settings navigation with the active section highlighted', () => {
+    const markup = renderToStaticMarkup(
+      <AISettingsSidebar
+        activeSection="mcp"
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        onSelectSection={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('设置导航');
+    expect(markup).toContain('MCP 服务');
+    expect(markup).toContain('内置工具');
+    expect(markup).toContain('aria-pressed="true"');
+  });
+});
diff --git a/frontend/src/components/ai/AISettingsSidebar.tsx b/frontend/src/components/ai/AISettingsSidebar.tsx
new file mode 100644
index 0000000..2164e7a
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsSidebar.tsx
@@ -0,0 +1,89 @@
+import React from 'react';
+import {
+  ApiOutlined,
+  AppstoreOutlined,
+  ExperimentOutlined,
+  RobotOutlined,
+  SafetyCertificateOutlined,
+  ToolOutlined,
+} from '@ant-design/icons';
+
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+export type AISettingsSectionKey =
+  | 'providers'
+  | 'safety'
+  | 'context'
+  | 'mcp'
+  | 'skills'
+  | 'prompts'
+  | 'tools';
+
+const AI_SETTINGS_NAV_ITEMS: Array<{
+  key: AISettingsSectionKey;
+  title: string;
+  description: string;
+  icon: React.ReactNode;
+}> = [
+  { key: 'providers', title: '模型供应商', description: '配置大模型接口与秘钥', icon: <ApiOutlined /> },
+  { key: 'safety', title: '安全控制', description: '限制 AI 操作风险级别', icon: <SafetyCertificateOutlined /> },
+  { key: 'context', title: '上下文', description: '配置携带的数据架构信息', icon: <RobotOutlined /> },
+  { key: 'mcp', title: 'MCP 服务', description: '把 GoNavi 接入外部客户端并管理工具源', icon: <AppstoreOutlined /> },
+  { key: 'skills', title: 'Skills', description: '配置可复用提示模块', icon: <ExperimentOutlined /> },
+  { key: 'tools', title: '内置工具', description: '查看 AI 可调用的数据探针', icon: <ToolOutlined /> },
+  { key: 'prompts', title: '内置提示词', description: '查看系统预设的底层要求', icon: <ExperimentOutlined /> },
+];
+
+interface AISettingsSidebarProps {
+  activeSection: AISettingsSectionKey;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  onSelectSection: (section: AISettingsSectionKey) => void;
+}
+
+const AISettingsSidebar: React.FC<AISettingsSidebarProps> = ({
+  activeSection,
+  darkMode,
+  overlayTheme,
+  onSelectSection,
+}) => (
+  <div style={{ minHeight: 0, height: '100%', overflowY: 'auto', overflowX: 'hidden', padding: '0 6px 28px 12px' }}>
+    <div style={{ marginBottom: 12, fontWeight: 600, color: overlayTheme.titleText }}>设置导航</div>
+    <div style={{ display: 'grid', gap: 10 }}>
+      {AI_SETTINGS_NAV_ITEMS.map((item) => {
+        const active = activeSection === item.key;
+        return (
+          <button
+            key={item.key}
+            type="button"
+            aria-pressed={active}
+            onClick={() => onSelectSection(item.key)}
+            style={{
+              textAlign: 'left',
+              padding: '12px 14px',
+              borderRadius: 12,
+              border: `1px solid ${active
+                ? (darkMode ? 'rgba(255,214,102,0.3)' : 'rgba(24,144,255,0.24)')
+                : (darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(16,24,40,0.08)')}`,
+              background: active
+                ? (darkMode ? 'linear-gradient(180deg, rgba(255,214,102,0.12) 0%, rgba(255,214,102,0.06) 100%)' : 'linear-gradient(180deg, rgba(24,144,255,0.10) 0%, rgba(24,144,255,0.05) 100%)')
+                : (darkMode ? 'rgba(255,255,255,0.02)' : 'rgba(255,255,255,0.72)'),
+              color: active ? (darkMode ? '#f5f7ff' : '#162033') : (darkMode ? 'rgba(255,255,255,0.82)' : '#3f4b5e'),
+              cursor: 'pointer',
+            }}
+          >
+            <div style={{ display: 'flex', alignItems: 'center', gap: 10 }}>
+              <span style={{ fontSize: 16 }}>{item.icon}</span>
+              <span style={{ fontSize: 14, fontWeight: 700 }}>{item.title}</span>
+            </div>
+            <div style={{ marginTop: 6, fontSize: 12, lineHeight: 1.6, color: active ? (darkMode ? 'rgba(255,255,255,0.68)' : 'rgba(22,32,51,0.68)') : 'rgba(128,128,128,0.7)' }}>
+              {item.description}
+            </div>
+          </button>
+        );
+      })}
+    </div>
+  </div>
+);
+
+export default AISettingsSidebar;
diff --git a/frontend/src/components/ai/AISettingsSkillsSection.test.tsx b/frontend/src/components/ai/AISettingsSkillsSection.test.tsx
new file mode 100644
index 0000000..5317d01
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsSkillsSection.test.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AISettingsSkillsSection from './AISettingsSkillsSection';
+import { buildOverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+describe('AISettingsSkillsSection', () => {
+  it('renders the extracted skill configuration section', () => {
+    const markup = renderToStaticMarkup(
+      <AISettingsSkillsSection
+        skills={[]}
+        skillRequiredToolOptions={[]}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        cardBg="#fff"
+        cardBorder="rgba(0,0,0,0.08)"
+        inputBg="#fff"
+        loading={false}
+        onAddSkill={() => {}}
+        onUpdateSkillDraft={() => {}}
+        onSaveSkill={() => {}}
+        onDeleteSkill={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('新增 Skill');
+    expect(markup).toContain('还没有 Skill');
+    expect(markup).toContain('命名的提示模块');
+  });
+});
diff --git a/frontend/src/components/ai/AISettingsSkillsSection.tsx b/frontend/src/components/ai/AISettingsSkillsSection.tsx
new file mode 100644
index 0000000..8bab4c8
--- /dev/null
+++ b/frontend/src/components/ai/AISettingsSkillsSection.tsx
@@ -0,0 +1,110 @@
+import React from 'react';
+import { Button, Input, Popconfirm, Select } from 'antd';
+import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
+
+import type { AISkillConfig, AISkillScope } from '../../types';
+import type { OverlayWorkbenchTheme } from '../../utils/overlayWorkbenchTheme';
+
+interface AISettingsSkillsSectionProps {
+  skills: AISkillConfig[];
+  skillRequiredToolOptions: Array<{ label: string; value: string }>;
+  overlayTheme: OverlayWorkbenchTheme;
+  cardBg: string;
+  cardBorder: string;
+  inputBg: string;
+  loading: boolean;
+  onAddSkill: () => void;
+  onUpdateSkillDraft: (id: string, patch: Partial<AISkillConfig>) => void;
+  onSaveSkill: (skill: AISkillConfig) => void;
+  onDeleteSkill: (id: string) => void;
+}
+
+const SKILL_SCOPE_OPTIONS: Array<{ value: AISkillScope; label: string; desc: string }> = [
+  { value: 'global', label: '全局', desc: '所有 AI 会话都启用' },
+  { value: 'database', label: '数据库', desc: '仅 SQL / 数据库场景启用' },
+  { value: 'jvm', label: 'JVM 资源', desc: '仅 JVM 资源分析场景启用' },
+  { value: 'jvmDiagnostic', label: 'JVM 诊断', desc: '仅 JVM 诊断工作台启用' },
+];
+
+const AISettingsSkillsSection: React.FC<AISettingsSkillsSectionProps> = ({
+  skills,
+  skillRequiredToolOptions,
+  overlayTheme,
+  cardBg,
+  cardBorder,
+  inputBg,
+  loading,
+  onAddSkill,
+  onUpdateSkillDraft,
+  onSaveSkill,
+  onDeleteSkill,
+}) => (
+  <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+    <div style={{ fontSize: 13, color: overlayTheme.mutedText, marginBottom: 4 }}>
+      Skill 不是另一条大提示词，而是“命名的提示模块 + 作用域 + 工具依赖”。当前阶段仍建议保留在主仓库内，不需要单独新建 GitHub 仓库；只有未来要做共享 skill pack 分发时，再考虑拆仓。
+    </div>
+    <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: 12 }}>
+      <div style={{ fontSize: 12, color: overlayTheme.mutedText }}>启用后会按 scope 注入对应会话；如果依赖的工具不存在，该 Skill 会被自动跳过。</div>
+      <Button icon={<PlusOutlined />} onClick={onAddSkill} style={{ borderRadius: 10 }}>新增 Skill</Button>
+    </div>
+    {skills.length === 0 && (
+      <div style={{ padding: '18px 16px', borderRadius: 14, border: `1px dashed ${cardBorder}`, background: cardBg, color: overlayTheme.mutedText }}>
+        还没有 Skill。你可以给数据库、JVM、诊断场景分别定义专用的 system prompt。
+      </div>
+    )}
+    {skills.map((skill) => (
+      <div key={skill.id} style={{ padding: '14px 16px', borderRadius: 14, border: `1px solid ${cardBorder}`, background: cardBg, display: 'flex', flexDirection: 'column', gap: 12 }}>
+        <div style={{ display: 'grid', gridTemplateColumns: 'minmax(0,1fr) 132px', gap: 12 }}>
+          <Input
+            value={skill.name}
+            onChange={(event) => onUpdateSkillDraft(skill.id, { name: event.target.value })}
+            placeholder="Skill 名称，例如：SQL 审查 / JVM 诊断计划"
+            style={{ borderRadius: 10, background: inputBg, border: `1px solid ${cardBorder}` }}
+          />
+          <Select
+            value={skill.enabled ? 'enabled' : 'disabled'}
+            onChange={(value) => onUpdateSkillDraft(skill.id, { enabled: value === 'enabled' })}
+            options={[{ label: '已启用', value: 'enabled' }, { label: '已禁用', value: 'disabled' }]}
+          />
+        </div>
+        <Input
+          value={skill.description || ''}
+          onChange={(event) => onUpdateSkillDraft(skill.id, { description: event.target.value })}
+          placeholder="给自己看的说明，例如：输出 SQL 前必须先确认字段名和风险"
+          style={{ borderRadius: 10, background: inputBg, border: `1px solid ${cardBorder}` }}
+        />
+        <Select
+          mode="multiple"
+          value={skill.scopes || []}
+          onChange={(value) => onUpdateSkillDraft(skill.id, { scopes: value as AISkillScope[] })}
+          options={SKILL_SCOPE_OPTIONS.map((option) => ({ label: `${option.label} · ${option.desc}`, value: option.value }))}
+          placeholder="选择这个 Skill 要作用到哪些场景"
+          style={{ width: '100%' }}
+        />
+        <Select
+          mode="multiple"
+          value={skill.requiredTools || []}
+          onChange={(value) => onUpdateSkillDraft(skill.id, { requiredTools: value })}
+          options={skillRequiredToolOptions}
+          placeholder="可选：声明这个 Skill 依赖哪些工具"
+          style={{ width: '100%' }}
+        />
+        <Input.TextArea
+          rows={6}
+          value={skill.systemPrompt}
+          onChange={(event) => onUpdateSkillDraft(skill.id, { systemPrompt: event.target.value })}
+          placeholder="输入这条 Skill 要追加的 system prompt。建议聚焦一个明确能力，不要和全局提示词重复。"
+          style={{ borderRadius: 10, background: inputBg, border: `1px solid ${cardBorder}`, fontFamily: 'var(--gn-font-mono)', resize: 'vertical' }}
+        />
+        <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 8 }}>
+          <Button type="primary" onClick={() => onSaveSkill(skill)} loading={loading} style={{ borderRadius: 10, fontWeight: 600 }}>保存</Button>
+          <Popconfirm title="删除这个 Skill？" okText="删除" cancelText="取消" onConfirm={() => onDeleteSkill(skill.id)}>
+            <Button danger icon={<DeleteOutlined />} style={{ borderRadius: 10 }}>删除</Button>
+          </Popconfirm>
+        </div>
+      </div>
+    ))}
+  </div>
+);
+
+export default AISettingsSkillsSection;
diff --git a/frontend/src/components/ai/AISlashCommandMenu.test.tsx b/frontend/src/components/ai/AISlashCommandMenu.test.tsx
new file mode 100644
index 0000000..6fe9fb5
--- /dev/null
+++ b/frontend/src/components/ai/AISlashCommandMenu.test.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+
+import AISlashCommandMenu from './AISlashCommandMenu';
+
+describe('AISlashCommandMenu', () => {
+  it('renders an empty-state hint when the slash filter has no matches', () => {
+    const markup = renderToStaticMarkup(
+      <AISlashCommandMenu
+        visible
+        commands={[]}
+        darkMode={false}
+        textColor="#162033"
+        mutedColor="rgba(16,24,40,0.55)"
+        onSelect={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('data-ai-chat-slash-empty="true"');
+    expect(markup).toContain('没有匹配的快捷命令');
+    expect(markup).toContain('/sql');
+    expect(markup).toContain('/health');
+    expect(markup).toContain('/mcpadd');
+  });
+
+  it('renders grouped slash command entries when matches exist', () => {
+    const markup = renderToStaticMarkup(
+      <AISlashCommandMenu
+        visible
+        commands={[{
+          cmd: '/sql',
+          label: '生成 SQL',
+          desc: '描述需求自动生成语句',
+          prompt: '请根据以下需求生成 SQL：',
+          category: 'generate',
+        }]}
+        darkMode={false}
+        textColor="#162033"
+        mutedColor="rgba(16,24,40,0.55)"
+        onSelect={() => {}}
+      />,
+    );
+
+    expect(markup).toContain('/sql');
+    expect(markup).toContain('生成 SQL');
+    expect(markup).toContain('data-ai-chat-slash-group="generate"');
+    expect(markup).toContain('SQL 生成');
+    expect(markup).not.toContain('没有匹配的快捷命令');
+  });
+});
diff --git a/frontend/src/components/ai/AISlashCommandMenu.tsx b/frontend/src/components/ai/AISlashCommandMenu.tsx
new file mode 100644
index 0000000..690a335
--- /dev/null
+++ b/frontend/src/components/ai/AISlashCommandMenu.tsx
@@ -0,0 +1,132 @@
+import React from 'react';
+
+import {
+  DEFAULT_AI_SLASH_COMMANDS,
+  getFeaturedAISlashCommands,
+  groupAISlashCommands,
+  type AISlashCommandDefinition,
+} from './aiSlashCommands';
+
+interface AISlashCommandMenuProps {
+  visible: boolean;
+  commands: AISlashCommandDefinition[];
+  darkMode: boolean;
+  textColor: string;
+  mutedColor: string;
+  className?: string;
+  style?: React.CSSProperties;
+  onSelect: (command: AISlashCommandDefinition) => void;
+}
+
+const featuredCommands = getFeaturedAISlashCommands();
+
+const commandCardStyle = (darkMode: boolean): React.CSSProperties => ({
+  padding: '10px 12px',
+  borderRadius: 10,
+  cursor: 'pointer',
+  display: 'flex',
+  flexDirection: 'column',
+  gap: 4,
+  transition: 'background 0.15s',
+});
+
+export const AISlashCommandMenu: React.FC<AISlashCommandMenuProps> = ({
+  visible,
+  commands,
+  darkMode,
+  textColor,
+  mutedColor,
+  className,
+  style,
+  onSelect,
+}) => {
+  if (!visible) {
+    return null;
+  }
+
+  const groups = groupAISlashCommands(commands);
+
+  return (
+    <div
+      data-ai-chat-slash-menu="true"
+      className={className}
+      style={style}
+    >
+      {groups.length > 0 ? (
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 10, padding: 6 }}>
+          {groups.map((group) => (
+            <div key={group.key} data-ai-chat-slash-group={group.key} style={{ display: 'flex', flexDirection: 'column', gap: 6 }}>
+              <div style={{ padding: '2px 6px 0' }}>
+                <div style={{ fontSize: 11, fontWeight: 700, color: textColor }}>{group.title}</div>
+                <div style={{ fontSize: 11, color: mutedColor, lineHeight: 1.5 }}>{group.description}</div>
+              </div>
+              <div style={{ display: 'grid', gap: 4 }}>
+                {group.commands.map((command) => (
+                  <div
+                    key={command.cmd}
+                    style={commandCardStyle(darkMode)}
+                    onMouseEnter={(event) => {
+                      event.currentTarget.style.background = darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.04)';
+                    }}
+                    onMouseLeave={(event) => {
+                      event.currentTarget.style.background = 'transparent';
+                    }}
+                    onClick={() => onSelect(command)}
+                  >
+                    <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+                      <span style={{ fontSize: 13, fontWeight: 700, color: textColor, minWidth: 74 }}>{command.cmd}</span>
+                      <span style={{ fontSize: 12, fontWeight: 600, color: textColor }}>{command.label}</span>
+                    </div>
+                    <div style={{ fontSize: 11, color: mutedColor, lineHeight: 1.5, paddingLeft: 82 }}>{command.desc}</div>
+                  </div>
+                ))}
+              </div>
+            </div>
+          ))}
+        </div>
+      ) : (
+        <div
+          data-ai-chat-slash-empty="true"
+          style={{
+            padding: '12px 14px',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 8,
+          }}
+        >
+          <div style={{ fontSize: 12, fontWeight: 600, color: textColor }}>
+            没有匹配的快捷命令
+          </div>
+          <div style={{ fontSize: 11, color: mutedColor, lineHeight: 1.5 }}>
+            可以先试这些更常用的入口，快速走到生成 SQL、AI 体检或 MCP 排查。
+          </div>
+          <div style={{ display: 'flex', flexWrap: 'wrap', gap: 6 }}>
+            {featuredCommands.map((command) => (
+              <button
+                key={command.cmd}
+                type="button"
+                onClick={() => onSelect(command)}
+                style={{
+                  borderRadius: 999,
+                  border: `1px solid ${darkMode ? 'rgba(255,255,255,0.14)' : 'rgba(15,23,42,0.12)'}`,
+                  background: darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(255,255,255,0.82)',
+                  color: textColor,
+                  fontSize: 11,
+                  padding: '4px 10px',
+                  cursor: 'pointer',
+                }}
+              >
+                {command.cmd}
+              </button>
+            ))}
+          </div>
+          <div style={{ fontSize: 11, color: mutedColor, lineHeight: 1.5 }}>
+            当前共提供 {DEFAULT_AI_SLASH_COMMANDS.length} 个 slash 命令，支持按命令名、中文说明或关键词搜索。
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default AISlashCommandMenu;
diff --git a/frontend/src/components/ai/aiAppHealthInsights.test.ts b/frontend/src/components/ai/aiAppHealthInsights.test.ts
new file mode 100644
index 0000000..4dc4ca3
--- /dev/null
+++ b/frontend/src/components/ai/aiAppHealthInsights.test.ts
@@ -0,0 +1,244 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildAIAppHealthSnapshot } from './aiAppHealthInsights';
+
+describe('buildAIAppHealthSnapshot', () => {
+  it('marks the app health as degraded when logs and connection failures show runtime problems', () => {
+    const snapshot = buildAIAppHealthSnapshot({
+      providers: [{
+        id: 'provider-1',
+        type: 'openai',
+        name: 'OpenAI 主账号',
+        apiKey: '',
+        hasSecret: true,
+        baseUrl: 'https://api.openai.com/v1',
+        model: 'gpt-5.4',
+        models: ['gpt-5.4'],
+        maxTokens: 32000,
+        temperature: 0.2,
+      }],
+      activeProviderId: 'provider-1',
+      safetyLevel: 'readonly',
+      contextLevel: 'schema_only',
+      builtinToolNames: ['inspect_app_health', 'inspect_ai_setup_health', 'inspect_app_logs'],
+      mcpServers: [{
+        id: 'server-1',
+        name: 'GoNavi MCP',
+        transport: 'stdio',
+        command: 'gonavi-mcp-server',
+        args: ['stdio'],
+        env: {},
+        enabled: true,
+        timeoutSeconds: 20,
+      }],
+      mcpClientStatuses: [],
+      mcpTools: [],
+      userPromptSettings: {
+        global: '',
+        database: '',
+        jvm: '',
+        jvmDiagnostic: '',
+      },
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      aiContexts: {
+        'conn-1:crm': [],
+      },
+      connections: [{
+        id: 'conn-1',
+        name: '主库',
+        config: {
+          type: 'mysql',
+          host: '127.0.0.1',
+          port: 3306,
+          user: 'root',
+        },
+      }],
+      tabs: [{
+        id: 'query-1',
+        title: '订单查询',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'select * from orders',
+      }],
+      activeTabId: 'query-1',
+      appLogReadResult: {
+        success: true,
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          requestedLineLimit: 120,
+          lines: [
+            '2026/06/10 09:00:00.000000 [INFO] started',
+            '2026/06/10 09:00:01.000000 [ERROR] MCP server boot failed',
+          ],
+        },
+      },
+      connectionFailureReadResult: {
+        success: true,
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          requestedLineLimit: 120,
+          lines: [
+            '2026/06/10 09:01:00.000000 [ERROR] 建立数据库连接失败：类型=mysql 地址=127.0.0.1:3306 数据库=crm 用户=root；错误链：连接建立后验证失败：127.0.0.1:3306 验证失败: Error 1064 (42000): syntax error',
+            '2026/06/10 09:01:01.000000 [WARN] 命中数据库连接失败冷却：类型=mysql 地址=127.0.0.1:3306 数据库=crm 缓存Key=abc 剩余=29s 原因=连接建立后验证失败：127.0.0.1:3306 验证失败: Error 1064 (42000): syntax error',
+          ],
+        },
+      },
+    });
+
+    expect(snapshot.status).toBe('degraded');
+    expect(snapshot.summary.appLogErrorCount).toBe(1);
+    expect(snapshot.summary.recentConnectionFailureCount).toBe(2);
+    expect(snapshot.summary.activeTabTitle).toBe('订单查询');
+    expect(snapshot.warnings).toContain('最近应用日志里有 1 条 ERROR，需要优先查看 inspect_app_logs');
+    expect(snapshot.nextActions).toContain('调用 inspect_recent_connection_failures 查看最新连接失败根因，再决定是否检查当前连接或保存连接配置');
+    expect(snapshot.appLog.lines).toHaveLength(0);
+    expect(snapshot.appLog.linesOmitted).toBe(true);
+  });
+
+  it('marks missing provider pieces as blocked even when logs are clean', () => {
+    const snapshot = buildAIAppHealthSnapshot({
+      providers: [{
+        id: 'provider-1',
+        type: 'openai',
+        name: 'OpenAI 主账号',
+        apiKey: '',
+        hasSecret: false,
+        baseUrl: '',
+        model: '',
+        models: [],
+        maxTokens: 32000,
+        temperature: 0.2,
+      }],
+      activeProviderId: 'provider-1',
+      appLogReadResult: {
+        success: true,
+        data: { lines: ['2026/06/10 09:00:00.000000 [INFO] started'] },
+      },
+      connectionFailureReadResult: {
+        success: true,
+        data: { lines: [] },
+      },
+    });
+
+    expect(snapshot.status).toBe('blocked');
+    expect(snapshot.blockers).toContain('当前活动供应商缺少 API Key / Secret');
+    expect(snapshot.blockers).toContain('当前活动供应商缺少接口地址');
+    expect(snapshot.summary.chatReady).toBe(false);
+  });
+
+  it('marks the app health as degraded when the last ai message render error is present', () => {
+    const snapshot = buildAIAppHealthSnapshot({
+      providers: [{
+        id: 'provider-1',
+        type: 'openai',
+        name: 'OpenAI 主账号',
+        apiKey: '',
+        hasSecret: true,
+        baseUrl: 'https://api.openai.com/v1',
+        model: 'gpt-5.4',
+        models: ['gpt-5.4'],
+        maxTokens: 32000,
+        temperature: 0.2,
+      }],
+      activeProviderId: 'provider-1',
+      safetyLevel: 'readonly',
+      contextLevel: 'schema_only',
+      builtinToolNames: ['inspect_app_health', 'inspect_ai_last_render_error'],
+      mcpServers: [{
+        id: 'server-1',
+        name: 'Browser',
+        transport: 'stdio',
+        command: 'uvx',
+        args: ['mcp-server-browser'],
+        env: {},
+        enabled: true,
+        timeoutSeconds: 20,
+      }],
+      mcpClientStatuses: [{
+        client: 'codex',
+        displayName: 'Codex',
+        installed: true,
+        matchesCurrent: true,
+        clientDetected: true,
+        clientCommand: 'codex',
+        clientPath: 'C:/Tools/codex.exe',
+        configPath: 'C:/Users/demo/.codex/config.toml',
+        command: 'gonavi-mcp-server',
+        args: ['stdio'],
+        message: '已接入当前 GoNavi MCP',
+      }],
+      mcpTools: [{
+        alias: 'browser_open',
+        originalName: 'browser_open',
+        serverId: 'server-1',
+        serverName: 'Browser',
+        title: '打开页面',
+      }],
+      userPromptSettings: {
+        global: '回答前先核对上下文。',
+        database: '',
+        jvm: '',
+        jvmDiagnostic: '',
+      },
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      aiContexts: {
+        'conn-1:crm': [{
+          dbName: 'crm',
+          tableName: 'orders',
+          ddl: 'CREATE TABLE orders (...)',
+        }],
+      },
+      connections: [{
+        id: 'conn-1',
+        name: '主库',
+        config: {
+          type: 'mysql',
+          host: '127.0.0.1',
+          port: 3306,
+          user: 'root',
+        },
+      }],
+      tabs: [{
+        id: 'query-1',
+        title: '订单查询',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'select * from orders',
+      }],
+      activeTabId: 'query-1',
+      appLogReadResult: {
+        success: true,
+        data: { lines: ['2026/06/10 09:00:00.000000 [INFO] started'] },
+      },
+      connectionFailureReadResult: {
+        success: true,
+        data: { lines: [] },
+      },
+      lastRenderErrorSnapshot: {
+        hasError: true,
+        summary: '已记录到最近一次 AI 消息渲染异常',
+        messageId: 'msg-1',
+        role: 'assistant',
+        recordedAt: 1780700000000,
+        contentPreview: '回复预览',
+        errorMessage: 'Cannot read properties of undefined',
+        nextActions: ['先按 messageId 和 contentPreview 对照当前会话。'],
+      },
+    });
+
+    expect(snapshot.status).toBe('degraded');
+    expect(snapshot.summary.hasLastAIMessageRenderError).toBe(true);
+    expect(snapshot.summary.lastAIMessageRenderErrorId).toBe('msg-1');
+    expect(snapshot.warnings).toContain('最近记录到 AI 消息渲染异常，可能影响回复气泡展示或 Markdown 渲染');
+    expect(snapshot.nextActions).toContain('调用 inspect_ai_last_render_error 查看最近一次气泡渲染异常的 messageId、内容预览和组件栈');
+    expect(snapshot.lastRenderError.errorMessage).toBe('Cannot read properties of undefined');
+  });
+});
diff --git a/frontend/src/components/ai/aiAppHealthInsights.ts b/frontend/src/components/ai/aiAppHealthInsights.ts
new file mode 100644
index 0000000..6cbfc1f
--- /dev/null
+++ b/frontend/src/components/ai/aiAppHealthInsights.ts
@@ -0,0 +1,327 @@
+import type {
+  AIContextItem,
+  AIMCPClientInstallStatus,
+  AIMCPServerConfig,
+  AIMCPToolDescriptor,
+  AIProviderConfig,
+  AISafetyLevel,
+  AISkillConfig,
+  AIUserPromptSettings,
+  SavedConnection,
+  TabData,
+} from '../../types';
+import { buildAISetupHealthSnapshot } from './aiSetupHealthInsights';
+import { buildAppLogSnapshot } from './aiAppLogInsights';
+import { buildRecentConnectionFailureSnapshot } from './aiConnectionFailureInsights';
+import { buildActiveTabSnapshot, buildWorkspaceTabsSnapshot } from './aiWorkspaceInsights';
+
+type AIAppHealthStatus = 'ready' | 'needs_attention' | 'degraded' | 'blocked';
+
+interface AILastRenderErrorHealthSnapshot {
+  hasError: boolean;
+  summary: string;
+  messageId?: string;
+  role?: string;
+  recordedAt?: number | null;
+  contentPreview?: string;
+  errorMessage?: string;
+  stackPreview?: string;
+  componentStackPreview?: string;
+  nextActions?: string[];
+}
+
+const DEFAULT_APP_HEALTH_LOG_LIMIT = 120;
+const MAX_APP_HEALTH_LOG_LIMIT = 240;
+
+const appendUnique = (items: string[], value: string) => {
+  const trimmed = String(value || '').trim();
+  if (!trimmed || items.includes(trimmed)) {
+    return;
+  }
+  items.push(trimmed);
+};
+
+const normalizeAppHealthLogLimit = (value: unknown): number => {
+  const normalized = Math.floor(Number(value) || DEFAULT_APP_HEALTH_LOG_LIMIT);
+  if (normalized < 1) return 1;
+  if (normalized > MAX_APP_HEALTH_LOG_LIMIT) return MAX_APP_HEALTH_LOG_LIMIT;
+  return normalized;
+};
+
+const resolveActiveContextKey = (activeContext?: { connectionId?: string | null; dbName?: string | null } | null): string =>
+  activeContext?.connectionId ? `${activeContext.connectionId}:${activeContext.dbName || ''}` : 'default';
+
+const buildUnreadLogSnapshot = (message: string, lineLimit: number) => ({
+  readable: false,
+  logPath: '',
+  requestedLineLimit: lineLimit,
+  returnedLineCount: 0,
+  fileWindowTruncated: false,
+  matchedLinesTruncated: false,
+  levelBreakdown: {
+    INFO: 0,
+    WARN: 0,
+    ERROR: 0,
+    OTHER: 0,
+  },
+  hasWarnings: false,
+  hasErrors: false,
+  lines: [] as string[],
+  linesOmitted: false,
+  message,
+});
+
+const buildEmptyLastRenderErrorSnapshot = (): AILastRenderErrorHealthSnapshot => ({
+  hasError: false,
+  summary: '当前还没有记录到 AI 消息渲染异常。',
+  nextActions: [],
+});
+
+const summarizeAppLogSnapshot = (
+  readResult: any,
+  options: {
+    keyword?: unknown;
+    lineLimit: number;
+    includeLogLines?: boolean;
+  },
+) => {
+  if (!readResult?.success) {
+    return buildUnreadLogSnapshot(
+      `GoNavi 应用日志暂不可读: ${readResult?.message || '当前环境未提供日志读取能力'}`,
+      options.lineLimit,
+    );
+  }
+
+  const snapshot = buildAppLogSnapshot({
+    readResult,
+    keyword: options.keyword,
+    lineLimit: options.lineLimit,
+  });
+  return {
+    readable: true,
+    ...snapshot,
+    lines: options.includeLogLines ? snapshot.lines : [],
+    linesOmitted: !options.includeLogLines && snapshot.lines.length > 0,
+  };
+};
+
+const summarizeConnectionFailures = (
+  readResult: any,
+  options: {
+    keyword?: unknown;
+    lineLimit: number;
+  },
+) => {
+  if (!readResult?.success) {
+    return {
+      readable: false,
+      logPath: '',
+      keyword: String(options.keyword || '').trim(),
+      requestedLineLimit: options.lineLimit,
+      returnedLineCount: 0,
+      fileWindowTruncated: false,
+      matchedLinesTruncated: false,
+      failureEventCount: 0,
+      hasRecentFailures: false,
+      primaryCategory: '',
+      primaryCategoryLabel: '',
+      cooldownHitCount: 0,
+      validationFailureCount: 0,
+      sshFailureCount: 0,
+      categorySummary: [],
+      addresses: [],
+      latestFailureAt: '',
+      latestFailure: null,
+      recentFailures: [],
+      nextActions: [] as string[],
+      message: `连接失败日志暂不可读: ${readResult?.message || '当前环境未提供日志读取能力'}`,
+    };
+  }
+
+  return {
+    readable: true,
+    ...buildRecentConnectionFailureSnapshot({
+      readResult,
+      keyword: options.keyword,
+      lineLimit: options.lineLimit,
+    }),
+  };
+};
+
+export const buildAIAppHealthSnapshot = (params: {
+  providers?: AIProviderConfig[];
+  activeProviderId?: string | null;
+  safetyLevel?: AISafetyLevel | string;
+  contextLevel?: string;
+  skills?: AISkillConfig[];
+  mcpServers?: AIMCPServerConfig[];
+  mcpClientStatuses?: AIMCPClientInstallStatus[];
+  mcpTools?: AIMCPToolDescriptor[];
+  dynamicModels?: string[];
+  builtinToolNames?: string[];
+  userPromptSettings?: AIUserPromptSettings;
+  activeContext?: { connectionId?: string | null; dbName?: string | null } | null;
+  aiContexts?: Record<string, AIContextItem[]>;
+  connections?: SavedConnection[];
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  appLogReadResult?: any;
+  connectionFailureReadResult?: any;
+  lastRenderErrorSnapshot?: AILastRenderErrorHealthSnapshot;
+  keyword?: unknown;
+  connectionKeyword?: unknown;
+  lineLimit?: unknown;
+  includeLogLines?: boolean;
+}) => {
+  const connections = Array.isArray(params.connections) ? params.connections : [];
+  const tabs = Array.isArray(params.tabs) ? params.tabs : [];
+  const lineLimit = normalizeAppHealthLogLimit(params.lineLimit);
+  const activeContextKey = resolveActiveContextKey(params.activeContext);
+  const activeContextItems = params.aiContexts?.[activeContextKey] || [];
+  const setupHealth = buildAISetupHealthSnapshot({
+    providers: params.providers,
+    activeProviderId: params.activeProviderId,
+    safetyLevel: params.safetyLevel,
+    contextLevel: params.contextLevel,
+    skills: params.skills,
+    mcpServers: params.mcpServers,
+    mcpClientStatuses: params.mcpClientStatuses,
+    mcpTools: params.mcpTools,
+    dynamicModels: params.dynamicModels,
+    builtinToolNames: params.builtinToolNames,
+    userPromptSettings: params.userPromptSettings,
+    activeContext: params.activeContext,
+    activeContextItems,
+  });
+  const appLog = summarizeAppLogSnapshot(params.appLogReadResult, {
+    keyword: params.keyword,
+    lineLimit,
+    includeLogLines: params.includeLogLines === true,
+  });
+  const lastRenderError = params.lastRenderErrorSnapshot || buildEmptyLastRenderErrorSnapshot();
+  const connectionFailures = summarizeConnectionFailures(params.connectionFailureReadResult, {
+    keyword: params.connectionKeyword ?? params.keyword,
+    lineLimit,
+  });
+  const workspace = buildWorkspaceTabsSnapshot({
+    tabs,
+    activeTabId: params.activeTabId,
+    connections,
+    includeContent: false,
+    limit: 8,
+  });
+  const activeTab = buildActiveTabSnapshot({
+    tabs,
+    activeTabId: params.activeTabId,
+    connections,
+    includeContent: false,
+  });
+  const activeTabTitle = activeTab.hasActiveTab && 'title' in activeTab ? activeTab.title : '';
+  const activeTabType = activeTab.hasActiveTab && 'type' in activeTab ? activeTab.type : '';
+
+  const blockers = [...setupHealth.blockers];
+  const warnings = [...setupHealth.warnings];
+  const nextActions = [...setupHealth.nextActions];
+
+  if (!appLog.readable) {
+    appendUnique(warnings, '当前无法读取 GoNavi 应用日志，启动异常和 MCP/连接错误缺少日志证据');
+    appendUnique(nextActions, '确认当前运行环境支持读取 gonavi.log 后，再调用 inspect_app_logs 下钻日志细节');
+  } else {
+    const errorCount = Number(appLog.levelBreakdown.ERROR) || 0;
+    const warnCount = Number(appLog.levelBreakdown.WARN) || 0;
+    if (errorCount > 0) {
+      appendUnique(warnings, `最近应用日志里有 ${errorCount} 条 ERROR，需要优先查看 inspect_app_logs`);
+      appendUnique(nextActions, '调用 inspect_app_logs 查看最近 ERROR/WARN 原文，确认是否影响 AI、MCP 或数据库连接');
+    } else if (warnCount > 0) {
+      appendUnique(warnings, `最近应用日志里有 ${warnCount} 条 WARN，建议确认是否为已知可忽略警告`);
+      appendUnique(nextActions, '如用户反馈不稳定，先调用 inspect_app_logs 查看 WARN 是否集中在 AI/MCP/连接链路');
+    }
+  }
+
+  if (!connectionFailures.readable) {
+    appendUnique(warnings, '当前无法读取连接失败日志，数据库连接冷却和验证失败缺少结构化证据');
+  } else if (connectionFailures.failureEventCount > 0) {
+    appendUnique(warnings, `最近识别到 ${connectionFailures.failureEventCount} 条连接失败/冷却记录`);
+    appendUnique(nextActions, '调用 inspect_recent_connection_failures 查看最新连接失败根因，再决定是否检查当前连接或保存连接配置');
+    connectionFailures.nextActions.forEach((action: string) => appendUnique(nextActions, action));
+  }
+
+  if (workspace.totalTabs === 0) {
+    appendUnique(warnings, '当前工作区没有打开任何页签，AI 缺少可直接读取的活动编辑器上下文');
+    appendUnique(nextActions, '如果要分析当前 SQL，先打开或选中目标 SQL 页签，再调用 inspect_active_tab');
+  }
+
+  if (lastRenderError.hasError) {
+    appendUnique(warnings, '最近记录到 AI 消息渲染异常，可能影响回复气泡展示或 Markdown 渲染');
+    appendUnique(nextActions, '调用 inspect_ai_last_render_error 查看最近一次气泡渲染异常的 messageId、内容预览和组件栈');
+    (lastRenderError.nextActions || []).forEach((action) => appendUnique(nextActions, action));
+  }
+
+  const status: AIAppHealthStatus = blockers.length > 0
+    ? 'blocked'
+    : connectionFailures.failureEventCount > 0 || Number(appLog.levelBreakdown.ERROR) > 0 || lastRenderError.hasError
+      ? 'degraded'
+      : warnings.length > 0
+        ? 'needs_attention'
+        : 'ready';
+
+  const message = status === 'ready'
+    ? '当前 AI 应用健康总览通过，AI 配置、日志、连接失败和工作区上下文都没有明显异常'
+    : status === 'blocked'
+      ? `当前 AI 应用健康存在 ${blockers.length} 个阻塞项，优先修复供应商和发送前置条件`
+      : status === 'degraded'
+        ? '当前 AI 应用健康存在运行期异常信号，建议先下钻日志或连接失败记录'
+        : `当前 AI 应用健康整体可用，但还有 ${warnings.length} 个建议项`;
+
+  return {
+    status,
+    ready: status === 'ready',
+    message,
+    blockers,
+    warnings,
+    nextActions,
+    summary: {
+      aiSetupStatus: setupHealth.status,
+      chatReady: setupHealth.summary.chatReady,
+      hasActiveProvider: setupHealth.summary.hasActiveProvider,
+      activeProviderName: setupHealth.summary.activeProviderName,
+      safetyLevel: setupHealth.summary.safetyLevel,
+      contextLevel: setupHealth.summary.contextLevel,
+      providerCount: setupHealth.summary.providerCount,
+      enabledSkillCount: setupHealth.summary.enabledSkillCount,
+      customPromptCount: setupHealth.summary.customPromptCount,
+      mcpServerCount: setupHealth.summary.mcpServerCount,
+      enabledMCPServerCount: setupHealth.summary.enabledMCPServerCount,
+      discoveredMCPToolCount: setupHealth.summary.discoveredMCPToolCount,
+      totalAvailableToolCount: setupHealth.summary.totalAvailableToolCount,
+      connectionCount: connections.length,
+      activeContextConnectionId: params.activeContext?.connectionId || '',
+      activeContextDbName: params.activeContext?.dbName || '',
+      workspaceTabCount: workspace.totalTabs,
+      activeTabId: params.activeTabId || '',
+      activeTabTitle,
+      activeTabType,
+      appLogReadable: appLog.readable,
+      appLogErrorCount: Number(appLog.levelBreakdown.ERROR) || 0,
+      appLogWarnCount: Number(appLog.levelBreakdown.WARN) || 0,
+      recentConnectionFailureCount: connectionFailures.failureEventCount,
+      primaryConnectionFailureLabel: connectionFailures.primaryCategoryLabel,
+      hasLastAIMessageRenderError: lastRenderError.hasError,
+      lastAIMessageRenderErrorId: lastRenderError.messageId || '',
+    },
+    aiSetup: {
+      status: setupHealth.status,
+      ready: setupHealth.ready,
+      message: setupHealth.message,
+      blockers: setupHealth.blockers,
+      warnings: setupHealth.warnings,
+      nextActions: setupHealth.nextActions,
+      summary: setupHealth.summary,
+    },
+    appLog,
+    lastRenderError,
+    connectionFailures,
+    workspace,
+    activeTab,
+  };
+};
diff --git a/frontend/src/components/ai/aiAppLogInsights.test.ts b/frontend/src/components/ai/aiAppLogInsights.test.ts
new file mode 100644
index 0000000..0216f5d
--- /dev/null
+++ b/frontend/src/components/ai/aiAppLogInsights.test.ts
@@ -0,0 +1,48 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildAppLogSnapshot } from './aiAppLogInsights';
+
+describe('buildAppLogSnapshot', () => {
+  it('keeps returned lines and computes level breakdown', () => {
+    const snapshot = buildAppLogSnapshot({
+      readResult: {
+        success: true,
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          requestedLineLimit: 50,
+          matchedLinesTruncated: true,
+          lines: [
+            '2026/06/09 10:00:00.000000 [INFO] started',
+            '2026/06/09 10:00:01.000000 [WARN] slow mcp boot',
+            '2026/06/09 10:00:02.000000 [ERROR] mysql dial failed',
+          ],
+        },
+      },
+    });
+
+    expect(snapshot.logPath).toContain('gonavi.log');
+    expect(snapshot.returnedLineCount).toBe(3);
+    expect(snapshot.matchedLinesTruncated).toBe(true);
+    expect(snapshot.levelBreakdown.INFO).toBe(1);
+    expect(snapshot.levelBreakdown.WARN).toBe(1);
+    expect(snapshot.levelBreakdown.ERROR).toBe(1);
+    expect(snapshot.hasWarnings).toBe(true);
+    expect(snapshot.hasErrors).toBe(true);
+  });
+
+  it('returns an empty-state message when keyword filtering yields nothing', () => {
+    const snapshot = buildAppLogSnapshot({
+      readResult: {
+        success: true,
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          lines: [],
+        },
+      },
+      keyword: 'mcp',
+    });
+
+    expect(snapshot.returnedLineCount).toBe(0);
+    expect(snapshot.message).toContain('mcp');
+  });
+});
diff --git a/frontend/src/components/ai/aiAppLogInsights.ts b/frontend/src/components/ai/aiAppLogInsights.ts
new file mode 100644
index 0000000..aa47b7f
--- /dev/null
+++ b/frontend/src/components/ai/aiAppLogInsights.ts
@@ -0,0 +1,67 @@
+const DEFAULT_APP_LOG_LIMIT = 80;
+const MAX_APP_LOG_LIMIT = 200;
+
+const normalizeAppLogLimit = (input: unknown): number => {
+  const value = Math.floor(Number(input) || DEFAULT_APP_LOG_LIMIT);
+  if (value < 1) return 1;
+  if (value > MAX_APP_LOG_LIMIT) return MAX_APP_LOG_LIMIT;
+  return value;
+};
+
+const normalizeLogLines = (input: unknown): string[] =>
+  Array.isArray(input)
+    ? input.map((line) => String(line || '').trim()).filter(Boolean)
+    : [];
+
+const buildLevelBreakdown = (lines: string[]) => {
+  const breakdown = {
+    INFO: 0,
+    WARN: 0,
+    ERROR: 0,
+    OTHER: 0,
+  };
+  lines.forEach((line) => {
+    if (line.includes('[INFO]')) {
+      breakdown.INFO += 1;
+    } else if (line.includes('[WARN]')) {
+      breakdown.WARN += 1;
+    } else if (line.includes('[ERROR]')) {
+      breakdown.ERROR += 1;
+    } else {
+      breakdown.OTHER += 1;
+    }
+  });
+  return breakdown;
+};
+
+export const buildAppLogSnapshot = (params: {
+  readResult?: any;
+  keyword?: unknown;
+  lineLimit?: unknown;
+}) => {
+  const data = params.readResult?.data && typeof params.readResult.data === 'object'
+    ? params.readResult.data as Record<string, unknown>
+    : {};
+  const lines = normalizeLogLines(data.lines);
+  const levelBreakdown = buildLevelBreakdown(lines);
+  const keyword = String(data.keyword || params.keyword || '').trim();
+  const requestedLineLimit = normalizeAppLogLimit(data.requestedLineLimit ?? params.lineLimit);
+
+  return {
+    logPath: String(data.logPath || ''),
+    keyword,
+    requestedLineLimit,
+    returnedLineCount: lines.length,
+    fileWindowTruncated: data.fileWindowTruncated === true,
+    matchedLinesTruncated: data.matchedLinesTruncated === true,
+    levelBreakdown,
+    hasWarnings: levelBreakdown.WARN > 0,
+    hasErrors: levelBreakdown.ERROR > 0,
+    lines,
+    message: lines.length > 0
+      ? ''
+      : keyword
+        ? `最近日志里没有匹配关键词“${keyword}”的记录`
+        : '最近日志里暂无可读记录',
+  };
+};
diff --git a/frontend/src/components/ai/aiChatAttachments.test.ts b/frontend/src/components/ai/aiChatAttachments.test.ts
new file mode 100644
index 0000000..6b23a17
--- /dev/null
+++ b/frontend/src/components/ai/aiChatAttachments.test.ts
@@ -0,0 +1,81 @@
+import { describe, expect, it } from 'vitest';
+import { strToU8, zipSync } from 'fflate';
+import {
+  appendAIChatAttachmentsToContent,
+  buildAIChatAttachmentPromptText,
+  createAIChatAttachmentFromFile,
+  resolveAIChatAttachmentKind,
+} from './aiChatAttachments';
+
+const makeFile = (parts: BlobPart[], name: string, type: string): File => {
+  const blob = new Blob(parts, { type });
+  return Object.assign(blob, { name, lastModified: 0 }) as File;
+};
+
+describe('aiChatAttachments', () => {
+  it('extracts markdown text so it can be sent to AI', async () => {
+    const attachment = await createAIChatAttachmentFromFile(makeFile(['# Report\n\nhello'], 'report.md', 'text/markdown'));
+
+    expect(attachment.kind).toBe('markdown');
+    expect(attachment.text).toContain('# Report');
+    expect(buildAIChatAttachmentPromptText([attachment])).toContain('hello');
+  });
+
+  it('extracts docx document text from Office Open XML', async () => {
+    const bytes = zipSync({
+      'word/document.xml': strToU8('<w:document><w:body><w:p><w:r><w:t>用户增长</w:t></w:r></w:p><w:p><w:r><w:t>GMV &amp; 留存</w:t></w:r></w:p></w:body></w:document>'),
+    });
+    const attachment = await createAIChatAttachmentFromFile(makeFile([bytes], 'plan.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'));
+
+    expect(attachment.kind).toBe('word');
+    expect(attachment.text).toContain('用户增长');
+    expect(attachment.text).toContain('GMV & 留存');
+  });
+
+  it('extracts xlsx worksheet rows with shared strings', async () => {
+    const bytes = zipSync({
+      'xl/sharedStrings.xml': strToU8('<sst><si><t>姓名</t></si><si><t>张三</t></si></sst>'),
+      'xl/worksheets/sheet1.xml': strToU8('<worksheet><sheetData><row><c t="s"><v>0</v></c><c><v>100</v></c></row><row><c t="s"><v>1</v></c><c><v>88</v></c></row></sheetData></worksheet>'),
+    });
+    const attachment = await createAIChatAttachmentFromFile(makeFile([bytes], 'score.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'));
+
+    expect(attachment.kind).toBe('excel');
+    expect(attachment.text).toContain('姓名\t100');
+    expect(attachment.text).toContain('张三\t88');
+  });
+
+  it('extracts lightweight PDF literal text and keeps a warning about limitations', async () => {
+    const attachment = await createAIChatAttachmentFromFile(makeFile(['%PDF-1.4\nBT (Invoice total 42) Tj ET\n%%EOF'], 'invoice.pdf', 'application/pdf'));
+
+    expect(attachment.kind).toBe('pdf');
+    expect(attachment.text).toContain('Invoice total 42');
+    expect(attachment.extractWarning).toContain('轻量文本提取');
+  });
+
+  it('appends non-image attachments to the upstream user content', () => {
+    const content = appendAIChatAttachmentsToContent('帮我总结', [{
+      id: 'att-1',
+      name: 'report.txt',
+      mimeType: 'text/plain',
+      size: 12,
+      kind: 'text',
+      text: '核心指标下降',
+    }]);
+
+    expect(content).toContain('帮我总结');
+    expect(content).toContain('<用户上传附件>');
+    expect(content).toContain('核心指标下降');
+  });
+
+  it('keeps images out of the prompt text because they are sent through multimodal payload fields', () => {
+    expect(resolveAIChatAttachmentKind({ name: 'screen.png', type: 'image/png' })).toBe('image');
+    expect(buildAIChatAttachmentPromptText([{
+      id: 'att-img',
+      name: 'screen.png',
+      mimeType: 'image/png',
+      size: 10,
+      kind: 'image',
+      dataUrl: 'data:image/png;base64,abc',
+    }])).toBe('');
+  });
+});
diff --git a/frontend/src/components/ai/aiChatAttachments.ts b/frontend/src/components/ai/aiChatAttachments.ts
new file mode 100644
index 0000000..5728840
--- /dev/null
+++ b/frontend/src/components/ai/aiChatAttachments.ts
@@ -0,0 +1,311 @@
+import { strFromU8, unzipSync } from 'fflate';
+import type { AIChatAttachment, AIChatAttachmentKind } from '../../types';
+
+export const AI_CHAT_ATTACHMENT_ACCEPT = [
+  'image/*',
+  '.md',
+  '.markdown',
+  '.txt',
+  '.csv',
+  '.tsv',
+  '.json',
+  '.sql',
+  '.log',
+  '.xml',
+  '.yaml',
+  '.yml',
+  '.pdf',
+  '.doc',
+  '.docx',
+  '.xls',
+  '.xlsx',
+].join(',');
+
+const MAX_ATTACHMENT_BYTES = 15 * 1024 * 1024;
+const MAX_ATTACHMENT_TEXT_CHARS = 60000;
+const MAX_PROMPT_TEXT_CHARS = 50000;
+
+const textExtensions = new Set([
+  'md',
+  'markdown',
+  'txt',
+  'csv',
+  'tsv',
+  'json',
+  'sql',
+  'log',
+  'xml',
+  'yaml',
+  'yml',
+]);
+
+const nextAttachmentId = () => `att-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+
+export const formatAIChatAttachmentSize = (size: number): string => {
+  if (!Number.isFinite(size) || size <= 0) return '0 B';
+  if (size < 1024) return `${size} B`;
+  if (size < 1024 * 1024) return `${(size / 1024).toFixed(1)} KB`;
+  return `${(size / 1024 / 1024).toFixed(1)} MB`;
+};
+
+const getFileExtension = (name: string): string => {
+  const match = String(name || '').trim().toLowerCase().match(/\.([a-z0-9]+)$/);
+  return match?.[1] || '';
+};
+
+export const resolveAIChatAttachmentKind = (file: Pick<File, 'name' | 'type'>): AIChatAttachmentKind => {
+  const mimeType = String(file.type || '').toLowerCase();
+  const extension = getFileExtension(file.name);
+  if (mimeType.startsWith('image/')) return 'image';
+  if (extension === 'md' || extension === 'markdown') return 'markdown';
+  if (extension === 'pdf' || mimeType === 'application/pdf') return 'pdf';
+  if (extension === 'doc' || extension === 'docx' || mimeType.includes('word')) return 'word';
+  if (extension === 'xls' || extension === 'xlsx' || mimeType.includes('spreadsheet') || mimeType.includes('excel')) return 'excel';
+  if (textExtensions.has(extension) || mimeType.startsWith('text/')) return 'text';
+  return 'document';
+};
+
+const clampExtractedText = (raw: string): { text: string; truncated: boolean } => {
+  const normalized = raw
+    .replace(/\r\n?/g, '\n')
+    .replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F]+/g, ' ')
+    .replace(/[ \t]+\n/g, '\n')
+    .replace(/\n{3,}/g, '\n\n')
+    .trim();
+  if (normalized.length <= MAX_ATTACHMENT_TEXT_CHARS) {
+    return { text: normalized, truncated: false };
+  }
+  return {
+    text: normalized.slice(0, MAX_ATTACHMENT_TEXT_CHARS).trimEnd(),
+    truncated: true,
+  };
+};
+
+const decodeXmlEntities = (value: string): string => value
+  .replace(/&lt;/g, '<')
+  .replace(/&gt;/g, '>')
+  .replace(/&amp;/g, '&')
+  .replace(/&quot;/g, '"')
+  .replace(/&apos;/g, "'");
+
+const collectXmlTextTags = (xml: string): string[] => {
+  const values: string[] = [];
+  const tagPattern = /<(?:[a-zA-Z0-9_]+:)?t\b[^>]*>([\s\S]*?)<\/(?:[a-zA-Z0-9_]+:)?t>/g;
+  let match: RegExpExecArray | null;
+  while ((match = tagPattern.exec(xml))) {
+    values.push(decodeXmlEntities(match[1].replace(/<[^>]+>/g, '')));
+  }
+  return values;
+};
+
+const extractDocxText = (entries: Record<string, Uint8Array>): string => {
+  const xmlPaths = Object.keys(entries)
+    .filter((path) => /^word\/(?:document|header\d+|footer\d+|footnotes|endnotes)\.xml$/i.test(path))
+    .sort((left, right) => {
+      if (left === 'word/document.xml') return -1;
+      if (right === 'word/document.xml') return 1;
+      return left.localeCompare(right);
+    });
+  return xmlPaths.map((path) => {
+    const xml = strFromU8(entries[path]);
+    const prepared = xml
+      .replace(/<w:tab\s*\/>/g, '\t')
+      .replace(/<w:(?:br|cr)\b[^>]*\/>/g, '\n')
+      .replace(/<\/w:p>/g, '\n');
+    return collectXmlTextTags(prepared).join('');
+  }).filter(Boolean).join('\n\n');
+};
+
+const extractSharedStrings = (entries: Record<string, Uint8Array>): string[] => {
+  const sharedStrings = entries['xl/sharedStrings.xml'];
+  if (!sharedStrings) return [];
+  const xml = strFromU8(sharedStrings);
+  const blocks = xml.match(/<si\b[\s\S]*?<\/si>/g) || [];
+  return blocks.map((block: string) => collectXmlTextTags(block).join(''));
+};
+
+const extractCellValue = (cellXml: string, sharedStrings: string[]): string => {
+  const type = cellXml.match(/\bt="([^"]+)"/)?.[1] || '';
+  if (type === 'inlineStr') {
+    return collectXmlTextTags(cellXml).join('');
+  }
+  const value = decodeXmlEntities(cellXml.match(/<v>([\s\S]*?)<\/v>/)?.[1] || '').trim();
+  if (type === 's') {
+    const index = Number.parseInt(value, 10);
+    return Number.isFinite(index) ? (sharedStrings[index] || '') : value;
+  }
+  return value;
+};
+
+const extractXlsxText = (entries: Record<string, Uint8Array>): string => {
+  const sharedStrings = extractSharedStrings(entries);
+  const sheetPaths = Object.keys(entries)
+    .filter((path) => /^xl\/worksheets\/sheet\d+\.xml$/i.test(path))
+    .sort((left, right) => left.localeCompare(right, undefined, { numeric: true }));
+  return sheetPaths.map((path) => {
+    const xml = strFromU8(entries[path]);
+    const rows = xml.match(/<row\b[\s\S]*?<\/row>/g) || [];
+    const lines = rows.map((rowXml: string) => {
+      const cells = rowXml.match(/<c\b[\s\S]*?<\/c>/g) || [];
+      return cells.map((cellXml: string) => extractCellValue(cellXml, sharedStrings)).join('\t').trimEnd();
+    }).filter((line: string) => line.trim().length > 0);
+    if (lines.length === 0) return '';
+    const sheetName = path.replace(/^xl\/worksheets\//i, '').replace(/\.xml$/i, '');
+    return `[工作表: ${sheetName}]\n${lines.join('\n')}`;
+  }).filter(Boolean).join('\n\n');
+};
+
+const decodePdfLiteralString = (value: string): string => value
+  .slice(1, -1)
+  .replace(/\\n/g, '\n')
+  .replace(/\\r/g, '\n')
+  .replace(/\\t/g, '\t')
+  .replace(/\\([()\\])/g, '$1')
+  .replace(/\\([0-7]{1,3})/g, (_, octal) => String.fromCharCode(Number.parseInt(octal, 8)));
+
+const bytesToBinaryString = (bytes: Uint8Array): string => {
+  const chunks: string[] = [];
+  const chunkSize = 0x8000;
+  for (let offset = 0; offset < bytes.length; offset += chunkSize) {
+    chunks.push(String.fromCharCode(...bytes.slice(offset, offset + chunkSize)));
+  }
+  return chunks.join('');
+};
+
+const extractPdfText = (bytes: Uint8Array): { text: string; warning?: string } => {
+  const raw = bytesToBinaryString(bytes);
+  const values: string[] = [];
+  const literalPattern = /\((?:\\.|[^\\)]){1,2000}\)/g;
+  let match: RegExpExecArray | null;
+  while ((match = literalPattern.exec(raw)) && values.length < 5000) {
+    const decoded = decodePdfLiteralString(match[0]).trim();
+    if (decoded && /[\p{L}\p{N}\u4e00-\u9fa5]/u.test(decoded)) {
+      values.push(decoded);
+    }
+  }
+  const text = values.join('\n');
+  const warning = text
+    ? 'PDF 已使用轻量文本提取；扫描件或压缩字体内容可能无法完整读取。'
+    : '未从 PDF 中提取到可读文本；如果是扫描件或复杂编码 PDF，请复制正文后再发送。';
+  return { text, warning };
+};
+
+const extractLegacyOfficeText = (bytes: Uint8Array): { text: string; warning: string } => {
+  const raw = bytesToBinaryString(bytes);
+  const matches = raw.match(/[A-Za-z0-9\u4e00-\u9fa5][\x20-\x7E\u4e00-\u9fa5]{3,}/g) || [];
+  return {
+    text: Array.from(new Set(matches)).join('\n'),
+    warning: '旧版 Office 二进制格式仅做轻量文本片段提取；建议转为 docx/xlsx 后上传以获得更完整正文。',
+  };
+};
+
+const extractOfficeOpenXmlText = (bytes: Uint8Array, kind: AIChatAttachmentKind): string => {
+  const entries = unzipSync(bytes);
+  if (kind === 'word') return extractDocxText(entries);
+  if (kind === 'excel') return extractXlsxText(entries);
+  return '';
+};
+
+const readFileAsDataUrl = (file: File): Promise<string> => new Promise((resolve, reject) => {
+  const reader = new FileReader();
+  reader.onload = () => resolve(String(reader.result || ''));
+  reader.onerror = () => reject(reader.error || new Error('读取文件失败'));
+  reader.readAsDataURL(file);
+});
+
+export const createAIChatAttachmentFromFile = async (file: File): Promise<AIChatAttachment> => {
+  const kind = resolveAIChatAttachmentKind(file);
+  const base: Omit<AIChatAttachment, 'kind'> = {
+    id: nextAttachmentId(),
+    name: file.name || 'unnamed',
+    mimeType: file.type || 'application/octet-stream',
+    size: file.size || 0,
+  };
+  if (kind === 'image') {
+    return { ...base, kind, dataUrl: await readFileAsDataUrl(file) };
+  }
+  if (file.size > MAX_ATTACHMENT_BYTES) {
+    return {
+      ...base,
+      kind,
+      extractWarning: `文件超过 ${formatAIChatAttachmentSize(MAX_ATTACHMENT_BYTES)}，已附加文件信息但未读取正文。`,
+    };
+  }
+  try {
+    if (kind === 'text' || kind === 'markdown') {
+      const { text, truncated } = clampExtractedText(await file.text());
+      return { ...base, kind, text, textTruncated: truncated };
+    }
+
+    const bytes = new Uint8Array(await file.arrayBuffer());
+    const extension = getFileExtension(file.name);
+    if ((kind === 'word' || kind === 'excel') && (extension === 'docx' || extension === 'xlsx')) {
+      const { text, truncated } = clampExtractedText(extractOfficeOpenXmlText(bytes, kind));
+      return { ...base, kind, text, textTruncated: truncated };
+    }
+    if (kind === 'pdf') {
+      const extracted = extractPdfText(bytes);
+      const { text, truncated } = clampExtractedText(extracted.text);
+      return { ...base, kind, text, textTruncated: truncated, extractWarning: extracted.warning };
+    }
+    if ((kind === 'word' || kind === 'excel') && (extension === 'doc' || extension === 'xls')) {
+      const extracted = extractLegacyOfficeText(bytes);
+      const { text, truncated } = clampExtractedText(extracted.text);
+      return { ...base, kind, text, textTruncated: truncated, extractWarning: extracted.warning };
+    }
+    return {
+      ...base,
+      kind,
+      extractWarning: '当前文件类型已附加，但暂未提取正文；如需模型分析内容，请改用 markdown、txt、docx、xlsx 或 pdf。',
+    };
+  } catch (error: any) {
+    return {
+      ...base,
+      kind,
+      extractWarning: `附件正文提取失败：${error?.message || String(error)}`,
+    };
+  }
+};
+
+export const buildAIChatAttachmentPromptText = (attachments: AIChatAttachment[] = []): string => {
+  const documentAttachments = attachments.filter((attachment) => attachment.kind !== 'image');
+  if (documentAttachments.length === 0) return '';
+  return documentAttachments.map((attachment, index) => {
+    const content = String(attachment.text || '').trim();
+    const truncatedContent = content.length > MAX_PROMPT_TEXT_CHARS
+      ? `${content.slice(0, MAX_PROMPT_TEXT_CHARS).trimEnd()}\n\n[附件正文过长，已截断]`
+      : content;
+    const fence = truncatedContent.includes('```') ? '~~~' : '```';
+    const lines = [
+      `### 附件 ${index + 1}: ${attachment.name}`,
+      `- 类型: ${attachment.kind}`,
+      `- MIME: ${attachment.mimeType || 'unknown'}`,
+      `- 大小: ${formatAIChatAttachmentSize(attachment.size)}`,
+    ];
+    if (attachment.extractWarning) {
+      lines.push(`- 提取说明: ${attachment.extractWarning}`);
+    }
+    if (attachment.textTruncated) {
+      lines.push('- 提取说明: 附件正文较长，已截断后发送。');
+    }
+    if (truncatedContent) {
+      lines.push('', fence, truncatedContent, fence);
+    } else {
+      lines.push('', '未提取到可发送的附件正文。');
+    }
+    return lines.join('\n');
+  }).join('\n\n');
+};
+
+export const appendAIChatAttachmentsToContent = (content: string, attachments: AIChatAttachment[] = []): string => {
+  const attachmentPrompt = buildAIChatAttachmentPromptText(attachments);
+  if (!attachmentPrompt) return content;
+  const userContent = String(content || '').trim();
+  return [
+    userContent || '请根据以下附件内容继续处理。',
+    '',
+    '<用户上传附件>',
+    attachmentPrompt,
+    '</用户上传附件>',
+  ].join('\n');
+};
diff --git a/frontend/src/components/ai/aiChatPanelDerivedState.test.ts b/frontend/src/components/ai/aiChatPanelDerivedState.test.ts
new file mode 100644
index 0000000..269d54d
--- /dev/null
+++ b/frontend/src/components/ai/aiChatPanelDerivedState.test.ts
@@ -0,0 +1,109 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  buildAIChatInlineHistorySessions,
+  buildAIChatInsights,
+  calculateAIContextUsageChars,
+  collectAIChatContextTableNames,
+  inferAIChatConnectionContext,
+  resolveAIChatPanelMode,
+} from './aiChatPanelDerivedState';
+
+describe('aiChatPanelDerivedState', () => {
+  it('falls back to tool context matches when the active context is incomplete', () => {
+    const result = inferAIChatConnectionContext({
+      activeConnectionId: '',
+      activeDbName: '',
+      messages: [
+        { id: '1', role: 'user', content: '帮我看看 orders 和 order_items 的问题', timestamp: 1 },
+      ],
+      toolContextEntries: [
+        { connectionId: 'conn-customers', dbName: 'crm', tables: ['customers'] },
+        { connectionId: 'conn-orders', dbName: 'sales', tables: ['orders', 'order_items'] },
+      ],
+    });
+
+    expect(result).toEqual({
+      inferredConnectionId: 'conn-orders',
+      inferredDbName: 'sales',
+    });
+  });
+
+  it('builds insight cards from recent sql logs and linked table contexts', () => {
+    const insights = buildAIChatInsights({
+      contextTableNames: ['sales.orders', 'sales.order_items', 'sales.customers', 'sales.payments'],
+      sqlLogs: [
+        {
+          id: 'log-1',
+          timestamp: 1,
+          sql: 'SELECT * FROM orders',
+          status: 'success',
+          duration: 1520,
+        },
+        {
+          id: 'log-2',
+          timestamp: 2,
+          sql: 'UPDATE orders SET status = 1',
+          status: 'error',
+          duration: 120,
+          message: 'Deadlock found',
+        },
+      ],
+    });
+
+    expect(insights[0]).toMatchObject({
+      tone: 'info',
+      title: '已关联 4 张表',
+    });
+    expect(insights[0].body).toContain('sales.orders、sales.order_items、sales.customers');
+    expect(insights[1]).toMatchObject({
+      tone: 'warn',
+      title: '最近最慢查询 1,520ms',
+    });
+    expect(insights[2]).toMatchObject({
+      tone: 'warn',
+      title: '1 条最近查询失败',
+      body: 'Deadlock found',
+    });
+    expect(insights[3]).toMatchObject({
+      tone: 'warn',
+      title: '检测到 1 条写操作',
+    });
+  });
+
+  it('collects context table names, usage chars, panel mode, and inline history sessions', () => {
+    expect(collectAIChatContextTableNames({
+      aiContexts: {
+        'conn-1:analytics': [
+          { dbName: 'analytics', tableName: 'orders', ddl: 'create table orders (...)' },
+          { dbName: 'analytics', tableName: 'events', ddl: 'create table events (...)' },
+        ],
+      },
+      activeConnectionId: 'conn-1',
+      activeDbName: 'analytics',
+    })).toEqual(['analytics.orders', 'analytics.events']);
+
+    expect(calculateAIContextUsageChars([
+      {
+        id: 'msg-1',
+        role: 'assistant',
+        content: 'abc',
+        reasoning_content: 'xy',
+        tool_calls: [{ id: 'tool-1', type: 'function', function: { name: 'inspect', arguments: '{}' } }],
+        timestamp: 1,
+      },
+    ])).toBeGreaterThan(5);
+
+    expect(buildAIChatInlineHistorySessions([
+      { id: '1', title: 'one', updatedAt: 1 },
+      { id: '2', title: 'two', updatedAt: 2 },
+      { id: '3', title: 'three', updatedAt: 3 },
+    ], 2)).toEqual([
+      { id: '1', title: 'one', updatedAt: 1 },
+      { id: '2', title: 'two', updatedAt: 2 },
+    ]);
+
+    expect(resolveAIChatPanelMode(true, 'history')).toBe('history');
+    expect(resolveAIChatPanelMode(false, 'history')).toBe('chat');
+  });
+});
diff --git a/frontend/src/components/ai/aiChatPanelDerivedState.ts b/frontend/src/components/ai/aiChatPanelDerivedState.ts
new file mode 100644
index 0000000..586be67
--- /dev/null
+++ b/frontend/src/components/ai/aiChatPanelDerivedState.ts
@@ -0,0 +1,132 @@
+import type { SqlLog } from '../../store';
+import type { AIChatMessage, AIContextItem } from '../../types';
+import type { AIToolContextEntry } from './aiLocalToolExecutor';
+import type { AIChatInlineHistorySession, AIChatInsightItem, AIChatPanelMode } from './AIChatPanelModeContent';
+
+interface InferAIChatConnectionContextArgs {
+  activeConnectionId?: string;
+  activeDbName?: string;
+  messages: AIChatMessage[];
+  toolContextEntries: Iterable<AIToolContextEntry>;
+}
+
+interface CollectAIChatContextTableNamesArgs {
+  aiContexts: Record<string, AIContextItem[]>;
+  activeConnectionId?: string;
+  activeDbName?: string;
+}
+
+interface BuildAIChatInsightsArgs {
+  contextTableNames: string[];
+  sqlLogs: SqlLog[];
+}
+
+export const inferAIChatConnectionContext = ({
+  activeConnectionId,
+  activeDbName,
+  messages,
+  toolContextEntries,
+}: InferAIChatConnectionContextArgs) => {
+  let inferredConnectionId = activeConnectionId;
+  let inferredDbName = activeDbName;
+
+  if (!inferredConnectionId || !inferredDbName) {
+    const allMsgText = messages.map((item) => item.content || '').join(' ');
+    let bestMatch: { connectionId: string; dbName: string } | null = null;
+    let bestScore = 0;
+
+    for (const entry of toolContextEntries) {
+      let score = 0;
+      for (const table of entry.tables) {
+        if (allMsgText.includes(table)) {
+          score += 1;
+        }
+      }
+      if (score > bestScore) {
+        bestScore = score;
+        bestMatch = { connectionId: entry.connectionId, dbName: entry.dbName };
+      }
+    }
+
+    if (bestMatch) {
+      if (!inferredConnectionId) {
+        inferredConnectionId = bestMatch.connectionId;
+      }
+      if (!inferredDbName) {
+        inferredDbName = bestMatch.dbName;
+      }
+    }
+  }
+
+  return {
+    inferredConnectionId,
+    inferredDbName,
+  };
+};
+
+export const calculateAIContextUsageChars = (messages: AIChatMessage[]) =>
+  messages.reduce(
+    (sum, item) =>
+      sum
+      + (item.content?.length || 0)
+      + (item.reasoning_content?.length || 0)
+      + JSON.stringify(item.tool_calls || []).length,
+    0,
+  );
+
+export const collectAIChatContextTableNames = ({
+  aiContexts,
+  activeConnectionId,
+  activeDbName,
+}: CollectAIChatContextTableNamesArgs) => {
+  const contextKey = activeConnectionId ? `${activeConnectionId}:${activeDbName || ''}` : 'default';
+  return (aiContexts[contextKey] || []).map((item) => `${item.dbName}.${item.tableName}`);
+};
+
+export const buildAIChatInsights = ({
+  contextTableNames,
+  sqlLogs,
+}: BuildAIChatInsightsArgs): AIChatInsightItem[] => {
+  const recentLogs = sqlLogs.slice(0, 24);
+  const slowest = recentLogs
+    .filter((log) => log.status === 'success')
+    .sort((left, right) => right.duration - left.duration)[0];
+  const errors = recentLogs.filter((log) => log.status === 'error');
+  const writeCount = recentLogs.filter((log) => /\b(INSERT|UPDATE|DELETE|ALTER|DROP|CREATE)\b/i.test(log.sql)).length;
+  const contextCount = contextTableNames.length;
+
+  return [
+    {
+      tone: 'info',
+      title: contextCount > 0 ? `已关联 ${contextCount} 张表` : '尚未关联表结构',
+      body: contextCount > 0
+        ? `当前对话会带上 ${contextTableNames.slice(0, 3).join('、')}${contextCount > 3 ? ' 等表' : ''} 的结构上下文。`
+        : '在表页打开 AI 后会自动关联当前表，也可以在输入框上方手动添加上下文。',
+    },
+    {
+      tone: slowest && slowest.duration > 1000 ? 'warn' : 'accent',
+      title: slowest ? `最近最慢查询 ${Math.round(slowest.duration).toLocaleString()}ms` : '暂无查询耗时样本',
+      body: slowest ? slowest.sql.slice(0, 140) : '执行查询后这里会显示可用于优化分析的 SQL 线索。',
+    },
+    {
+      tone: errors.length > 0 ? 'warn' : 'info',
+      title: errors.length > 0 ? `${errors.length} 条最近查询失败` : '最近查询状态正常',
+      body: errors[0]?.message || (recentLogs.length > 0 ? `已记录 ${recentLogs.length} 条最近 SQL，可直接让 AI 解释或优化。` : '暂无 SQL 日志。'),
+    },
+    {
+      tone: writeCount > 0 ? 'warn' : 'accent',
+      title: writeCount > 0 ? `检测到 ${writeCount} 条写操作` : '当前以只读分析为主',
+      body: writeCount > 0 ? '涉及写入的 SQL 建议先生成预览与回滚语句，再执行提交。' : 'AI 默认优先解释、生成 SELECT、分析 Schema 与优化索引。',
+    },
+  ];
+};
+
+export const buildAIChatInlineHistorySessions = (
+  sessions: AIChatInlineHistorySession[],
+  limit = 8,
+) => sessions.slice(0, limit);
+
+export const resolveAIChatPanelMode = (
+  isV2Ui: boolean,
+  activePanelMode: AIChatPanelMode,
+): AIChatPanelMode => (isV2Ui ? activePanelMode : 'chat');
diff --git a/frontend/src/components/ai/aiChatPayloadDispatch.test.ts b/frontend/src/components/ai/aiChatPayloadDispatch.test.ts
new file mode 100644
index 0000000..4109bd6
--- /dev/null
+++ b/frontend/src/components/ai/aiChatPayloadDispatch.test.ts
@@ -0,0 +1,238 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { dispatchAIChatPayload } from './aiChatPayloadDispatch';
+
+describe('aiChatPayloadDispatch', () => {
+  const originalWindow = (globalThis as any).window;
+
+  afterEach(() => {
+    (globalThis as any).window = originalWindow;
+    vi.restoreAllMocks();
+  });
+
+  it('prefers streaming when AIChatStream is available', async () => {
+    const AIChatStream = vi.fn().mockResolvedValue(undefined);
+    const addAIChatMessage = vi.fn();
+    const setSending = vi.fn();
+
+    (globalThis as any).window = {
+      go: {
+        aiservice: {
+          Service: { AIChatStream },
+        },
+      },
+    };
+
+    const result = await dispatchAIChatPayload({
+      sid: 'session-1',
+      messages: [{ role: 'user', content: 'hello' }],
+      tools: [],
+      addAIChatMessage,
+      setSending,
+      nextMessageId: () => 'msg-stream',
+    });
+
+    expect(result).toBe('stream');
+    expect(AIChatStream).toHaveBeenCalledWith('session-1', [{ role: 'user', content: 'hello' }], []);
+    expect(addAIChatMessage).not.toHaveBeenCalled();
+    expect(setSending).not.toHaveBeenCalled();
+  });
+
+  it('appends a non-stream assistant message when only AIChatSend is available', async () => {
+    const AIChatSend = vi.fn().mockResolvedValue({
+      success: true,
+      content: 'done',
+      reasoning_content: 'thinking',
+    });
+    const addAIChatMessage = vi.fn();
+    const setSending = vi.fn();
+    const onNonStreamSuccess = vi.fn();
+
+    (globalThis as any).window = {
+      go: {
+        aiservice: {
+          Service: { AIChatSend },
+        },
+      },
+    };
+
+    const result = await dispatchAIChatPayload({
+      sid: 'session-1',
+      messages: [{ role: 'user', content: 'hello' }],
+      tools: [],
+      addAIChatMessage,
+      setSending,
+      nextMessageId: () => 'msg-send',
+      onNonStreamSuccess,
+    });
+
+    expect(result).toBe('send');
+    expect(addAIChatMessage).toHaveBeenCalledWith('session-1', expect.objectContaining({
+      id: 'msg-send',
+      role: 'assistant',
+      content: 'done',
+      thinking: 'thinking',
+      reasoning_content: 'thinking',
+    }));
+    expect(setSending).toHaveBeenCalledWith(false);
+    expect(onNonStreamSuccess).toHaveBeenCalled();
+  });
+
+  it('settles the pending assistant message when falling back to non-stream send', async () => {
+    const AIChatSend = vi.fn().mockResolvedValue({
+      success: true,
+      content: 'done',
+      reasoning_content: 'thinking',
+    });
+    const addAIChatMessage = vi.fn();
+    const updateAIChatMessage = vi.fn();
+    const setSending = vi.fn();
+
+    (globalThis as any).window = {
+      go: {
+        aiservice: {
+          Service: { AIChatSend },
+        },
+      },
+    };
+
+    const result = await dispatchAIChatPayload({
+      sid: 'session-1',
+      messages: [{ role: 'user', content: 'hello' }],
+      tools: [],
+      addAIChatMessage,
+      updateAIChatMessage,
+      setSending,
+      nextMessageId: () => 'msg-send',
+      pendingAssistantMessageId: 'assistant-connecting',
+    });
+
+    expect(result).toBe('send');
+    expect(addAIChatMessage).not.toHaveBeenCalled();
+    expect(updateAIChatMessage).toHaveBeenCalledWith('session-1', 'assistant-connecting', expect.objectContaining({
+      content: 'done',
+      thinking: 'thinking',
+      reasoning_content: 'thinking',
+      loading: false,
+      phase: 'idle',
+    }));
+    expect(setSending).toHaveBeenCalledWith(false);
+  });
+
+  it('emits the unavailable message when the AI service is missing', async () => {
+    const addAIChatMessage = vi.fn();
+    const setSending = vi.fn();
+    (globalThis as any).window = {};
+
+    const result = await dispatchAIChatPayload({
+      sid: 'session-1',
+      messages: [{ role: 'user', content: 'hello' }],
+      tools: [],
+      addAIChatMessage,
+      setSending,
+      nextMessageId: () => 'msg-unavailable',
+      unavailableContent: '❌ AI Service 未就绪',
+    });
+
+    expect(result).toBe('unavailable');
+    expect(addAIChatMessage).toHaveBeenCalledWith('session-1', expect.objectContaining({
+      id: 'msg-unavailable',
+      content: '❌ AI Service 未就绪',
+    }));
+    expect(setSending).toHaveBeenCalledWith(false);
+  });
+
+  it('settles the pending assistant message when the AI service is missing', async () => {
+    const addAIChatMessage = vi.fn();
+    const updateAIChatMessage = vi.fn();
+    const setSending = vi.fn();
+    (globalThis as any).window = {};
+
+    const result = await dispatchAIChatPayload({
+      sid: 'session-1',
+      messages: [{ role: 'user', content: 'hello' }],
+      tools: [],
+      addAIChatMessage,
+      updateAIChatMessage,
+      setSending,
+      nextMessageId: () => 'msg-unavailable',
+      pendingAssistantMessageId: 'assistant-connecting',
+    });
+
+    expect(result).toBe('unavailable');
+    expect(addAIChatMessage).not.toHaveBeenCalled();
+    expect(updateAIChatMessage).toHaveBeenCalledWith('session-1', 'assistant-connecting', expect.objectContaining({
+      content: '❌ AI Service 未就绪',
+      loading: false,
+      phase: 'idle',
+    }));
+    expect(setSending).toHaveBeenCalledWith(false);
+  });
+
+  it('sanitizes thrown errors and preserves the raw error when the cleaned text changes', async () => {
+    const AIChatSend = vi.fn().mockRejectedValue(new Error('<html><title>502 Bad Gateway</title></html>'));
+    const addAIChatMessage = vi.fn();
+    const setSending = vi.fn();
+
+    (globalThis as any).window = {
+      go: {
+        aiservice: {
+          Service: { AIChatSend },
+        },
+      },
+    };
+
+    const result = await dispatchAIChatPayload({
+      sid: 'session-1',
+      messages: [{ role: 'user', content: 'hello' }],
+      tools: [],
+      addAIChatMessage,
+      setSending,
+      nextMessageId: () => 'msg-error',
+    });
+
+    expect(result).toBe('error');
+    expect(addAIChatMessage).toHaveBeenCalledWith('session-1', expect.objectContaining({
+      id: 'msg-error',
+      content: '❌ 发送失败: HTTP 502: 502 Bad Gateway',
+      rawError: '<html><title>502 Bad Gateway</title></html>',
+    }));
+    expect(setSending).toHaveBeenCalledWith(false);
+  });
+
+  it('settles the pending assistant message when streaming startup throws', async () => {
+    const AIChatStream = vi.fn().mockRejectedValue(new Error('<html><title>502 Bad Gateway</title></html>'));
+    const addAIChatMessage = vi.fn();
+    const updateAIChatMessage = vi.fn();
+    const setSending = vi.fn();
+
+    (globalThis as any).window = {
+      go: {
+        aiservice: {
+          Service: { AIChatStream },
+        },
+      },
+    };
+
+    const result = await dispatchAIChatPayload({
+      sid: 'session-1',
+      messages: [{ role: 'user', content: 'hello' }],
+      tools: [],
+      addAIChatMessage,
+      updateAIChatMessage,
+      setSending,
+      nextMessageId: () => 'msg-error',
+      pendingAssistantMessageId: 'assistant-connecting',
+    });
+
+    expect(result).toBe('error');
+    expect(addAIChatMessage).not.toHaveBeenCalled();
+    expect(updateAIChatMessage).toHaveBeenCalledWith('session-1', 'assistant-connecting', expect.objectContaining({
+      content: '❌ 发送失败: HTTP 502: 502 Bad Gateway',
+      rawError: '<html><title>502 Bad Gateway</title></html>',
+      loading: false,
+      phase: 'idle',
+    }));
+    expect(setSending).toHaveBeenCalledWith(false);
+  });
+});
diff --git a/frontend/src/components/ai/aiChatPayloadDispatch.ts b/frontend/src/components/ai/aiChatPayloadDispatch.ts
new file mode 100644
index 0000000..14660be
--- /dev/null
+++ b/frontend/src/components/ai/aiChatPayloadDispatch.ts
@@ -0,0 +1,158 @@
+import type {
+  AIChatMessage,
+  JVMAIPlanContext,
+  JVMDiagnosticPlanContext,
+} from '../../types';
+import type { AIChatToolDefinition } from '../../utils/aiToolRegistry';
+import { sanitizeErrorMsg } from '../../utils/aiChatRuntime';
+
+interface AIChatService {
+  AIChatStream?: (sid: string, messages: any[], tools: AIChatToolDefinition[]) => Promise<any>;
+  AIChatSend?: (messages: any[], tools: AIChatToolDefinition[]) => Promise<any>;
+}
+
+interface DispatchAIChatPayloadOptions {
+  sid: string;
+  messages: any[];
+  tools: AIChatToolDefinition[];
+  addAIChatMessage: (sid: string, message: AIChatMessage) => void;
+  updateAIChatMessage?: (
+    sid: string,
+    messageId: string,
+    patch: Partial<AIChatMessage>,
+  ) => void;
+  setSending: (sending: boolean) => void;
+  nextMessageId: () => string;
+  pendingAssistantMessageId?: string;
+  jvmPlanContext?: JVMAIPlanContext;
+  jvmDiagnosticPlanContext?: JVMDiagnosticPlanContext;
+  unavailableContent?: string;
+  onNonStreamSuccess?: () => void;
+}
+
+const getAIChatService = (): AIChatService | undefined =>
+  (window as any)?.go?.aiservice?.Service;
+
+const settleAssistantMessage = ({
+  sid,
+  patch,
+  addAIChatMessage,
+  updateAIChatMessage,
+  nextMessageId,
+  pendingAssistantMessageId,
+}: {
+  sid: string;
+  patch: Partial<AIChatMessage>;
+  addAIChatMessage: (sid: string, message: AIChatMessage) => void;
+  updateAIChatMessage?: (
+    sid: string,
+    messageId: string,
+    patch: Partial<AIChatMessage>,
+  ) => void;
+  nextMessageId: () => string;
+  pendingAssistantMessageId?: string;
+}) => {
+  const settledPatch: Partial<AIChatMessage> = {
+    ...patch,
+    loading: false,
+    phase: 'idle',
+  };
+
+  if (pendingAssistantMessageId && updateAIChatMessage) {
+    updateAIChatMessage(sid, pendingAssistantMessageId, settledPatch);
+    return;
+  }
+
+  addAIChatMessage(sid, {
+    id: nextMessageId(),
+    role: 'assistant',
+    timestamp: Date.now(),
+    ...settledPatch,
+  } as AIChatMessage);
+};
+
+export const dispatchAIChatPayload = async ({
+  sid,
+  messages,
+  tools,
+  addAIChatMessage,
+  updateAIChatMessage,
+  setSending,
+  nextMessageId,
+  pendingAssistantMessageId,
+  jvmPlanContext,
+  jvmDiagnosticPlanContext,
+  unavailableContent,
+  onNonStreamSuccess,
+}: DispatchAIChatPayloadOptions): Promise<'stream' | 'send' | 'unavailable' | 'error'> => {
+  try {
+    const service = getAIChatService();
+    if (service?.AIChatStream) {
+      await service.AIChatStream(sid, messages, tools);
+      return 'stream';
+    }
+
+    if (service?.AIChatSend) {
+      const result = await service.AIChatSend(messages, tools);
+      const rawError = result?.error || '未知错误';
+      const cleanError = sanitizeErrorMsg(rawError);
+
+      settleAssistantMessage({
+        sid,
+        addAIChatMessage,
+        updateAIChatMessage,
+        nextMessageId,
+        pendingAssistantMessageId,
+        patch: {
+          content: result?.success ? result.content : `❌ ${cleanError}`,
+          thinking: result?.success ? result.reasoning_content : undefined,
+          reasoning_content: result?.success ? result.reasoning_content : undefined,
+          rawError: !result?.success && cleanError !== rawError ? rawError : undefined,
+          jvmPlanContext,
+          jvmDiagnosticPlanContext,
+        },
+      });
+      setSending(false);
+      if (result?.success) {
+        onNonStreamSuccess?.();
+      }
+      return 'send';
+    }
+
+    const resolvedUnavailableContent = unavailableContent || (pendingAssistantMessageId ? '❌ AI Service 未就绪' : '');
+    if (resolvedUnavailableContent) {
+      settleAssistantMessage({
+        sid,
+        addAIChatMessage,
+        updateAIChatMessage,
+        nextMessageId,
+        pendingAssistantMessageId,
+        patch: {
+          content: resolvedUnavailableContent,
+          jvmPlanContext,
+          jvmDiagnosticPlanContext,
+        },
+      });
+    }
+    setSending(false);
+    return 'unavailable';
+  } catch (error: any) {
+    const rawError = error?.message || String(error);
+    const cleanError = sanitizeErrorMsg(rawError);
+    settleAssistantMessage({
+      sid,
+      addAIChatMessage,
+      updateAIChatMessage,
+      nextMessageId,
+      pendingAssistantMessageId,
+      patch: {
+        content: `❌ 发送失败: ${cleanError}`,
+        rawError: cleanError !== rawError ? rawError : undefined,
+        jvmPlanContext,
+        jvmDiagnosticPlanContext,
+      },
+    });
+    setSending(false);
+    return 'error';
+  }
+};
diff --git a/frontend/src/components/ai/aiChatReadiness.test.ts b/frontend/src/components/ai/aiChatReadiness.test.ts
new file mode 100644
index 0000000..65ac298
--- /dev/null
+++ b/frontend/src/components/ai/aiChatReadiness.test.ts
@@ -0,0 +1,95 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildAIChatReadinessSnapshot } from './aiChatReadiness';
+
+describe('buildAIChatReadinessSnapshot', () => {
+  it('reports missing provider when no active provider is configured', () => {
+    const snapshot = buildAIChatReadinessSnapshot({
+      providers: [],
+      activeProviderId: '',
+    });
+
+    expect(snapshot.status).toBe('missing_provider');
+    expect(snapshot.ready).toBe(false);
+    expect(snapshot.action?.key).toBe('open-settings');
+    expect(snapshot.title).toContain('还没有配置 AI 供应商');
+  });
+
+  it('reports incomplete provider when secret or base url is missing', () => {
+    const snapshot = buildAIChatReadinessSnapshot({
+      providers: [{
+        id: 'provider-1',
+        type: 'custom',
+        name: '自建代理',
+        apiKey: '',
+        hasSecret: false,
+        baseUrl: '',
+        model: 'gpt-5.5',
+        models: ['gpt-5.5'],
+        maxTokens: 16000,
+        temperature: 0.7,
+      }],
+      activeProviderId: 'provider-1',
+    });
+
+    expect(snapshot.status).toBe('provider_incomplete');
+    expect(snapshot.issues).toEqual(['missing_secret', 'missing_base_url']);
+    expect(snapshot.action?.label).toContain('修复');
+    expect(snapshot.message).toContain('还缺少 密钥、接口地址');
+  });
+
+  it('reports missing model and available model count when provider has no selected model', () => {
+    const snapshot = buildAIChatReadinessSnapshot({
+      providers: [{
+        id: 'provider-1',
+        type: 'openai',
+        name: 'OpenAI 主账号',
+        apiKey: '',
+        hasSecret: true,
+        baseUrl: 'https://api.openai.com/v1',
+        model: '',
+        models: ['gpt-5.5', 'gpt-4.1'],
+        maxTokens: 32000,
+        temperature: 0.2,
+      }],
+      activeProviderId: 'provider-1',
+    });
+
+    expect(snapshot.status).toBe('missing_model');
+    expect(snapshot.selectableModelCount).toBe(2);
+    expect(snapshot.action?.key).toBe('reload-models');
+    expect(snapshot.description).toContain('当前已发现 2 个可选模型');
+  });
+
+  it('reports ready with context summary when provider and context are already attached', () => {
+    const snapshot = buildAIChatReadinessSnapshot({
+      providers: [{
+        id: 'provider-1',
+        type: 'openai',
+        name: 'OpenAI 主账号',
+        apiKey: '',
+        hasSecret: true,
+        baseUrl: 'https://api.openai.com/v1',
+        model: 'gpt-5.5',
+        models: ['gpt-5.5'],
+        maxTokens: 32000,
+        temperature: 0.2,
+      }],
+      activeProviderId: 'provider-1',
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'demo',
+      },
+      activeContextItems: [{
+        dbName: 'demo',
+        tableName: 'orders',
+        ddl: 'CREATE TABLE orders (...)',
+      }],
+    });
+
+    expect(snapshot.status).toBe('ready');
+    expect(snapshot.ready).toBe(true);
+    expect(snapshot.contextAttachedCount).toBe(1);
+    expect(snapshot.title).toContain('OpenAI 主账号 / gpt-5.5');
+  });
+});
diff --git a/frontend/src/components/ai/aiChatReadiness.ts b/frontend/src/components/ai/aiChatReadiness.ts
new file mode 100644
index 0000000..a3de8c8
--- /dev/null
+++ b/frontend/src/components/ai/aiChatReadiness.ts
@@ -0,0 +1,244 @@
+import type { AIContextItem, AIProviderConfig } from '../../types';
+
+export type AIChatReadinessActionKey = 'open-settings' | 'reload-models';
+
+export type AIChatReadinessStatus =
+  | 'missing_provider'
+  | 'provider_incomplete'
+  | 'missing_model'
+  | 'loading_models'
+  | 'ready';
+
+export type AIChatReadinessIssue =
+  | 'missing_secret'
+  | 'missing_base_url'
+  | 'missing_selected_model';
+
+export interface AIChatReadinessSnapshot {
+  status: AIChatReadinessStatus;
+  ready: boolean;
+  severity: 'success' | 'warning' | 'error' | 'info';
+  label: string;
+  title: string;
+  description: string;
+  providerCount: number;
+  hasActiveProvider: boolean;
+  hasConnectionContext: boolean;
+  contextAttachedCount: number;
+  selectableModelCount: number;
+  issues: AIChatReadinessIssue[];
+  action?: {
+    key: AIChatReadinessActionKey;
+    label: string;
+  };
+  activeProvider: null | {
+    id: string;
+    name: string;
+    type: string;
+    model: string;
+    baseUrl: string;
+    baseUrlHost: string;
+    hasSecret: boolean;
+    declaredModelCount: number;
+    dynamicModelCount: number;
+  };
+  message: string;
+}
+
+const trimText = (value: unknown): string => String(value || '').trim();
+
+const getProviderHost = (baseUrl: string): string => {
+  const normalized = trimText(baseUrl);
+  if (!normalized) {
+    return '';
+  }
+  try {
+    return new URL(normalized).host;
+  } catch {
+    return '';
+  }
+};
+
+const hasProviderSecret = (provider: AIProviderConfig): boolean =>
+  provider.hasSecret ?? Boolean(provider.secretRef || provider.apiKey);
+
+const getSelectedProvider = (params: {
+  providers?: AIProviderConfig[];
+  activeProvider?: AIProviderConfig | null;
+  activeProviderId?: string | null;
+}): AIProviderConfig | null => {
+  if (params.activeProvider) {
+    return params.activeProvider;
+  }
+  const providers = Array.isArray(params.providers) ? params.providers : [];
+  const activeProviderId = trimText(params.activeProviderId);
+  if (!activeProviderId) {
+    return null;
+  }
+  return providers.find((provider) => provider.id === activeProviderId) || null;
+};
+
+export const formatAIChatProviderIssueLabels = (issues: AIChatReadinessIssue[]): string[] => {
+  const issueLabels: Record<AIChatReadinessIssue, string> = {
+    missing_secret: '密钥',
+    missing_base_url: '接口地址',
+    missing_selected_model: '模型',
+  };
+  return issues
+    .map((issue) => issueLabels[issue])
+    .filter(Boolean);
+};
+
+export const buildAIChatReadinessSnapshot = (params: {
+  providers?: AIProviderConfig[];
+  activeProvider?: AIProviderConfig | null;
+  activeProviderId?: string | null;
+  dynamicModels?: string[];
+  loadingModels?: boolean;
+  activeContext?: { connectionId?: string | null; dbName?: string | null } | null;
+  activeContextItems?: AIContextItem[];
+}): AIChatReadinessSnapshot => {
+  const providers = Array.isArray(params.providers) ? params.providers : [];
+  const activeProvider = getSelectedProvider(params);
+  const providerCount = providers.length > 0 ? providers.length : (activeProvider ? 1 : 0);
+  const dynamicModels = (Array.isArray(params.dynamicModels) ? params.dynamicModels : [])
+    .map((item) => trimText(item))
+    .filter(Boolean);
+  const activeContextItems = Array.isArray(params.activeContextItems) ? params.activeContextItems : [];
+  const declaredModels = activeProvider?.models?.map((item) => trimText(item)).filter(Boolean) || [];
+  const selectableModelCount = dynamicModels.length > 0 ? dynamicModels.length : declaredModels.length;
+  const hasConnectionContext = Boolean(trimText(params.activeContext?.connectionId));
+  const contextAttachedCount = activeContextItems.length;
+
+  if (!activeProvider) {
+    const title = providers.length > 0
+      ? '已配置供应商，但当前没有选中生效项'
+      : '还没有配置 AI 供应商';
+    const description = providers.length > 0
+      ? '先在 AI 设置里选中一个活动供应商，然后再发送。'
+      : '先在 AI 设置里添加并启用一个模型供应商。';
+    return {
+      status: 'missing_provider',
+      ready: false,
+      severity: 'warning',
+      label: '未就绪',
+      title,
+      description,
+      providerCount,
+      hasActiveProvider: false,
+      hasConnectionContext,
+      contextAttachedCount,
+      selectableModelCount: 0,
+      issues: [],
+      action: {
+        key: 'open-settings',
+        label: '打开 AI 设置',
+      },
+      activeProvider: null,
+      message: `${title}。${description}`,
+    };
+  }
+
+  const issues: AIChatReadinessIssue[] = [];
+  if (!hasProviderSecret(activeProvider)) {
+    issues.push('missing_secret');
+  }
+  if (!trimText(activeProvider.baseUrl)) {
+    issues.push('missing_base_url');
+  }
+  if (!trimText(activeProvider.model)) {
+    issues.push('missing_selected_model');
+  }
+
+  const providerSummary = {
+    id: activeProvider.id,
+    name: trimText(activeProvider.name),
+    type: activeProvider.type,
+    model: trimText(activeProvider.model),
+    baseUrl: trimText(activeProvider.baseUrl),
+    baseUrlHost: getProviderHost(activeProvider.baseUrl),
+    hasSecret: hasProviderSecret(activeProvider),
+    declaredModelCount: declaredModels.length,
+    dynamicModelCount: dynamicModels.length,
+  };
+
+  const blockingProviderIssues = issues.filter((issue) => issue !== 'missing_selected_model');
+  if (blockingProviderIssues.length > 0) {
+    const missingLabels = formatAIChatProviderIssueLabels(blockingProviderIssues);
+    const title = `${providerSummary.name || providerSummary.id || '当前供应商'} 还缺少 ${missingLabels.join('、')}`;
+    const description = '先补全供应商配置再发送，避免请求直接失败。';
+    return {
+      status: 'provider_incomplete',
+      ready: false,
+      severity: 'error',
+      label: '需修复',
+      title,
+      description,
+      providerCount,
+      hasActiveProvider: true,
+      hasConnectionContext,
+      contextAttachedCount,
+      selectableModelCount,
+      issues,
+      action: {
+        key: 'open-settings',
+        label: '修复供应商配置',
+      },
+      activeProvider: providerSummary,
+      message: `${title}。${description}`,
+    };
+  }
+
+  if (!providerSummary.model) {
+    const title = params.loadingModels
+      ? `正在加载 ${providerSummary.name || providerSummary.id || '当前供应商'} 的模型列表`
+      : `先为 ${providerSummary.name || providerSummary.id || '当前供应商'} 选择一个模型`;
+    const description = selectableModelCount > 0
+      ? `当前已发现 ${selectableModelCount} 个可选模型，选中后即可发送。`
+      : '如果列表为空，请检查供应商入口、密钥和模型权限。';
+    return {
+      status: params.loadingModels ? 'loading_models' : 'missing_model',
+      ready: false,
+      severity: params.loadingModels ? 'info' : 'warning',
+      label: params.loadingModels ? '加载中' : '未选模型',
+      title,
+      description,
+      providerCount,
+      hasActiveProvider: true,
+      hasConnectionContext,
+      contextAttachedCount,
+      selectableModelCount,
+      issues,
+      action: {
+        key: 'reload-models',
+        label: '重新加载模型',
+      },
+      activeProvider: providerSummary,
+      message: `${title}。${description}`,
+    };
+  }
+
+  const title = `AI 已就绪：${providerSummary.name || providerSummary.id} / ${providerSummary.model}`;
+  const description = contextAttachedCount > 0
+    ? `当前已关联 ${contextAttachedCount} 张表结构上下文，可直接发送。`
+    : hasConnectionContext
+      ? '已选中当前连接；如需更准的数据库语义，建议再关联表结构上下文。'
+      : '可直接发送；如需更准的数据库语义，建议先选中连接或关联表结构。';
+
+  return {
+    status: 'ready',
+    ready: true,
+    severity: 'success',
+    label: '已就绪',
+    title,
+    description,
+    providerCount,
+    hasActiveProvider: true,
+    hasConnectionContext,
+    contextAttachedCount,
+    selectableModelCount,
+    issues: [],
+    activeProvider: providerSummary,
+    message: `${title}。${description}`,
+  };
+};
diff --git a/frontend/src/components/ai/aiChatSessionInsights.test.ts b/frontend/src/components/ai/aiChatSessionInsights.test.ts
new file mode 100644
index 0000000..ee71723
--- /dev/null
+++ b/frontend/src/components/ai/aiChatSessionInsights.test.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  buildAIChatSessionsSnapshot,
+  buildAIMessageFlowSnapshot,
+} from './aiChatSessionInsights';
+
+describe('aiChatSessionInsights', () => {
+  it('filters and summarizes ai sessions with previews from local history', () => {
+    const snapshot = buildAIChatSessionsSnapshot({
+      aiChatSessions: [
+        { id: 'session-1', title: '支付异常排查', updatedAt: 200 },
+        { id: 'session-2', title: '库存核对', updatedAt: 100 },
+      ],
+      aiChatHistory: {
+        'session-1': [
+          { id: 'msg-1', role: 'user', content: '帮我看支付超时', timestamp: 101 },
+          { id: 'msg-2', role: 'assistant', content: '先检查支付回调日志', timestamp: 102 },
+        ],
+        'session-2': [
+          { id: 'msg-3', role: 'user', content: '库存差异怎么查', timestamp: 103 },
+        ],
+      },
+      activeSessionId: 'session-2',
+      keyword: '支付',
+      limit: 5,
+    });
+
+    expect(snapshot.totalSessions).toBe(2);
+    expect(snapshot.totalMatched).toBe(1);
+    expect(snapshot.sessions[0]).toMatchObject({
+      id: 'session-1',
+      title: '支付异常排查',
+      isActive: false,
+      messageCount: 2,
+      firstUserPromptPreview: '帮我看支付超时',
+      latestMessagePreview: '先检查支付回调日志',
+    });
+  });
+
+  it('diagnoses active ai message flow anomalies', () => {
+    const snapshot = buildAIMessageFlowSnapshot({
+      aiChatSessions: [
+        { id: 'session-1', title: '气泡异常排查', updatedAt: 300 },
+      ],
+      aiChatHistory: {
+        'session-1': [
+          { id: 'msg-1', role: 'user', content: '为什么回复变成多个气泡', timestamp: 101 },
+          {
+            id: 'msg-2',
+            role: 'assistant',
+            content: '我先检查消息流',
+            timestamp: 102,
+            tool_calls: [{ id: 'tool-1', type: 'function', function: { name: 'inspect_ai_runtime', arguments: '{}' } }],
+          },
+          { id: 'msg-3', role: 'assistant', content: '这里被拆成了第二个气泡', timestamp: 103 },
+          { id: 'msg-4', role: 'assistant', content: '', timestamp: 104 },
+        ],
+      },
+      activeSessionId: 'session-1',
+      limit: 10,
+    });
+
+    expect(snapshot.found).toBe(true);
+    expect(snapshot.title).toBe('气泡异常排查');
+    expect(snapshot.totalMessages).toBe(4);
+    expect(snapshot.unresolvedToolCallCount).toBe(1);
+    expect(snapshot.consecutiveAssistantPairCount).toBe(2);
+    expect(snapshot.emptyAssistantMessageCount).toBe(1);
+    expect(snapshot.warnings).toContain('有 1 个工具调用没有匹配到 tool 结果消息');
+    expect(snapshot.nextActions).toContain('检查流式追加逻辑是否复用了同一个 assistantMsgId，而不是为同一轮回复新建 assistant 消息');
+    expect(snapshot.messages[1]).toMatchObject({
+      id: 'msg-2',
+      toolCallNames: ['inspect_ai_runtime'],
+      toolCallIds: ['tool-1'],
+    });
+  });
+});
diff --git a/frontend/src/components/ai/aiChatSessionInsights.ts b/frontend/src/components/ai/aiChatSessionInsights.ts
new file mode 100644
index 0000000..e186234
--- /dev/null
+++ b/frontend/src/components/ai/aiChatSessionInsights.ts
@@ -0,0 +1,272 @@
+import type { AIChatMessage } from '../../types';
+
+interface AIChatSessionMeta {
+  id: string;
+  title: string;
+  updatedAt: number;
+}
+
+const AI_CHAT_SESSION_PREVIEW_LIMIT = 240;
+const AI_MESSAGE_FLOW_PREVIEW_LIMIT = 180;
+
+const normalizeLimit = (input: unknown, fallback: number, max: number): number => {
+  const value = Math.floor(Number(input) || fallback);
+  if (value < 1) return 1;
+  if (value > max) return max;
+  return value;
+};
+
+const normalizeKeyword = (input: unknown): string => String(input || '').trim().toLowerCase();
+
+const buildPreviewText = (messages: AIChatMessage[]) => {
+  const firstUserMessage = messages.find((message) => message.role === 'user' && String(message.content || '').trim());
+  const latestMeaningfulMessage = [...messages]
+    .reverse()
+    .find((message) => String(message.content || '').trim() || String(message.reasoning_content || '').trim());
+
+  const firstUserPrompt = String(firstUserMessage?.content || '').trim();
+  const latestMessageText = String(
+    latestMeaningfulMessage?.content || latestMeaningfulMessage?.reasoning_content || '',
+  ).trim();
+
+  return {
+    firstUserPrompt,
+    latestMessageText,
+  };
+};
+
+const matchesKeyword = (keyword: string, fields: Array<string | undefined>) => {
+  if (!keyword) {
+    return true;
+  }
+  return fields.some((field) => String(field || '').toLowerCase().includes(keyword));
+};
+
+export const buildAIChatSessionsSnapshot = (params: {
+  aiChatSessions?: AIChatSessionMeta[];
+  aiChatHistory?: Record<string, AIChatMessage[]>;
+  activeSessionId?: string | null;
+  keyword?: unknown;
+  limit?: unknown;
+  includePreview?: unknown;
+}) => {
+  const {
+    aiChatSessions = [],
+    aiChatHistory = {},
+    activeSessionId = null,
+    keyword,
+    limit,
+    includePreview = true,
+  } = params;
+
+  const safeKeyword = normalizeKeyword(keyword);
+  const safeLimit = normalizeLimit(limit, 10, 50);
+  const shouldIncludePreview = includePreview !== false;
+  const sessionMetaMap = new Map(aiChatSessions.map((session) => [session.id, session]));
+
+  const sessionIds = new Set<string>([
+    ...aiChatSessions.map((session) => session.id),
+    ...Object.keys(aiChatHistory || {}),
+  ]);
+
+  const allSessions = [...sessionIds].map((sessionId) => {
+    const meta = sessionMetaMap.get(sessionId);
+    const messages = [...(aiChatHistory[sessionId] || [])].sort((left, right) => left.timestamp - right.timestamp);
+    const updatedAt = Number(
+      meta?.updatedAt || messages[messages.length - 1]?.timestamp || messages[0]?.timestamp || 0,
+    );
+    const { firstUserPrompt, latestMessageText } = buildPreviewText(messages);
+    const firstUserPromptPreview = shouldIncludePreview
+      ? firstUserPrompt.slice(0, AI_CHAT_SESSION_PREVIEW_LIMIT)
+      : '';
+    const latestMessagePreview = shouldIncludePreview
+      ? latestMessageText.slice(0, AI_CHAT_SESSION_PREVIEW_LIMIT)
+      : '';
+
+    return {
+      id: sessionId,
+      title: String(meta?.title || '').trim() || '未命名会话',
+      updatedAt,
+      isActive: sessionId === activeSessionId,
+      messageCount: messages.length,
+      userMessageCount: messages.filter((message) => message.role === 'user').length,
+      assistantMessageCount: messages.filter((message) => message.role === 'assistant').length,
+      toolMessageCount: messages.filter((message) => message.role === 'tool').length,
+      hasToolMessages: messages.some((message) => message.role === 'tool'),
+      hasErrorMessages: messages.some((message) => String(message.content || '').includes('❌')),
+      lastMessageRole: messages[messages.length - 1]?.role || '',
+      lastMessageAt: Number(messages[messages.length - 1]?.timestamp || 0),
+      firstUserPromptPreview,
+      firstUserPromptTruncated: shouldIncludePreview && firstUserPrompt.length > firstUserPromptPreview.length,
+      latestMessagePreview,
+      latestMessageTruncated: shouldIncludePreview && latestMessageText.length > latestMessagePreview.length,
+    };
+  });
+
+  const filteredSessions = allSessions
+    .filter((session) =>
+      matchesKeyword(safeKeyword, [
+        session.id,
+        session.title,
+        session.firstUserPromptPreview,
+        session.latestMessagePreview,
+      ]))
+    .sort((left, right) => {
+      if (left.isActive && !right.isActive) {
+        return -1;
+      }
+      if (!left.isActive && right.isActive) {
+        return 1;
+      }
+      return right.updatedAt - left.updatedAt;
+    });
+
+  const visibleSessions = filteredSessions.slice(0, safeLimit);
+
+  return {
+    activeSessionId: activeSessionId || '',
+    keyword: safeKeyword,
+    includePreview: shouldIncludePreview,
+    limit: safeLimit,
+    totalSessions: allSessions.length,
+    totalMatched: filteredSessions.length,
+    returnedSessions: visibleSessions.length,
+    truncated: filteredSessions.length > visibleSessions.length,
+    sessions: visibleSessions,
+  };
+};
+
+const buildMessagePreview = (message: AIChatMessage, previewLimit: number): string => {
+  const raw = String(message.content || message.reasoning_content || '').trim();
+  return raw.slice(0, previewLimit);
+};
+
+const getToolCallNames = (message: AIChatMessage): string[] => (
+  (message.tool_calls || [])
+    .map((toolCall) => String(toolCall?.function?.name || '').trim())
+    .filter(Boolean)
+);
+
+export const buildAIMessageFlowSnapshot = (params: {
+  aiChatSessions?: AIChatSessionMeta[];
+  aiChatHistory?: Record<string, AIChatMessage[]>;
+  activeSessionId?: string | null;
+  sessionId?: unknown;
+  limit?: unknown;
+  includeContent?: unknown;
+  previewLimit?: unknown;
+}) => {
+  const {
+    aiChatSessions = [],
+    aiChatHistory = {},
+    activeSessionId = null,
+    sessionId,
+    limit,
+    includeContent = true,
+    previewLimit,
+  } = params;
+
+  const requestedSessionId = String(sessionId || activeSessionId || '').trim();
+  const safeLimit = normalizeLimit(limit, 24, 80);
+  const safePreviewLimit = normalizeLimit(previewLimit, AI_MESSAGE_FLOW_PREVIEW_LIMIT, 1000);
+  const shouldIncludeContent = includeContent !== false;
+  const sessionMetaMap = new Map(aiChatSessions.map((session) => [session.id, session]));
+  const messages = requestedSessionId
+    ? [...(aiChatHistory[requestedSessionId] || [])].sort((left, right) => left.timestamp - right.timestamp)
+    : [];
+  const toolResultsByCallId = new Map(
+    messages
+      .filter((message) => message.role === 'tool' && message.tool_call_id)
+      .map((message) => [String(message.tool_call_id), message]),
+  );
+
+  const assistantMessages = messages.filter((message) => message.role === 'assistant');
+  const toolCallMessages = assistantMessages.filter((message) => (message.tool_calls || []).length > 0);
+  const unresolvedToolCalls = toolCallMessages.flatMap((message) =>
+    (message.tool_calls || [])
+      .filter((toolCall) => !toolResultsByCallId.has(toolCall.id))
+      .map((toolCall) => ({
+        assistantMessageId: message.id,
+        toolCallId: toolCall.id,
+        toolName: toolCall.function?.name || '',
+      })),
+  );
+  const emptyAssistantMessages = assistantMessages.filter((message) =>
+    !String(message.content || '').trim()
+    && !String(message.reasoning_content || '').trim()
+    && !(message.tool_calls || []).length
+    && !message.loading,
+  );
+
+  const consecutiveAssistantPairs: Array<{ previousMessageId: string; nextMessageId: string }> = [];
+  for (let index = 1; index < messages.length; index += 1) {
+    if (messages[index - 1]?.role === 'assistant' && messages[index]?.role === 'assistant') {
+      consecutiveAssistantPairs.push({
+        previousMessageId: messages[index - 1].id,
+        nextMessageId: messages[index].id,
+      });
+    }
+  }
+
+  const warnings = [
+    unresolvedToolCalls.length > 0 ? `有 ${unresolvedToolCalls.length} 个工具调用没有匹配到 tool 结果消息` : '',
+    consecutiveAssistantPairs.length > 0 ? `发现 ${consecutiveAssistantPairs.length} 组连续 assistant 消息，可能存在回复被拆成多个气泡` : '',
+    emptyAssistantMessages.length > 0 ? `发现 ${emptyAssistantMessages.length} 条空 assistant 消息` : '',
+    messages.some((message) => message.loading) ? '会话中仍有 loading 消息，可能还在流式生成或上次中断未清理' : '',
+  ].filter(Boolean);
+
+  const nextActions = [
+    unresolvedToolCalls.length > 0 ? '优先核对 useAIChatLocalTools 是否为每个 tool_call_id 写入 tool 消息' : '',
+    consecutiveAssistantPairs.length > 0 ? '检查流式追加逻辑是否复用了同一个 assistantMsgId，而不是为同一轮回复新建 assistant 消息' : '',
+    emptyAssistantMessages.length > 0 ? '检查异常或取消路径是否留下了空 assistant 占位消息' : '',
+    warnings.length === 0 ? '消息流未发现明显结构异常，可继续结合 inspect_ai_last_render_error 或 inspect_app_logs 排查渲染/运行时问题' : '',
+  ].filter(Boolean);
+
+  const recentMessages = messages.slice(-safeLimit).map((message) => {
+    const preview = shouldIncludeContent ? buildMessagePreview(message, safePreviewLimit) : '';
+    const toolCallNames = getToolCallNames(message);
+    return {
+      id: message.id,
+      role: message.role,
+      phase: message.phase || '',
+      timestamp: message.timestamp,
+      loading: Boolean(message.loading),
+      contentLength: String(message.content || '').length,
+      reasoningLength: String(message.reasoning_content || '').length,
+      preview,
+      previewTruncated: shouldIncludeContent
+        && String(message.content || message.reasoning_content || '').trim().length > preview.length,
+      toolCallCount: (message.tool_calls || []).length,
+      toolCallNames,
+      toolCallIds: (message.tool_calls || []).map((toolCall) => toolCall.id),
+      toolCallId: message.tool_call_id || '',
+      toolName: message.tool_name || '',
+      success: message.success,
+    };
+  });
+
+  const meta = requestedSessionId ? sessionMetaMap.get(requestedSessionId) : undefined;
+  return {
+    activeSessionId: activeSessionId || '',
+    requestedSessionId,
+    found: Boolean(requestedSessionId && (messages.length > 0 || meta)),
+    title: String(meta?.title || '').trim(),
+    updatedAt: Number(meta?.updatedAt || messages[messages.length - 1]?.timestamp || 0),
+    totalMessages: messages.length,
+    returnedMessages: recentMessages.length,
+    truncated: messages.length > recentMessages.length,
+    userMessageCount: messages.filter((message) => message.role === 'user').length,
+    assistantMessageCount: assistantMessages.length,
+    toolMessageCount: messages.filter((message) => message.role === 'tool').length,
+    systemMessageCount: messages.filter((message) => message.role === 'system').length,
+    assistantToolCallMessageCount: toolCallMessages.length,
+    unresolvedToolCallCount: unresolvedToolCalls.length,
+    emptyAssistantMessageCount: emptyAssistantMessages.length,
+    consecutiveAssistantPairCount: consecutiveAssistantPairs.length,
+    unresolvedToolCalls,
+    consecutiveAssistantPairs,
+    warnings,
+    nextActions,
+    messages: recentMessages,
+  };
+};
diff --git a/frontend/src/components/ai/aiCodebaseHotspotInsights.ts b/frontend/src/components/ai/aiCodebaseHotspotInsights.ts
new file mode 100644
index 0000000..f4ba02c
--- /dev/null
+++ b/frontend/src/components/ai/aiCodebaseHotspotInsights.ts
@@ -0,0 +1,261 @@
+export interface CodebaseHotspotEntry {
+  path: string;
+  lines: number;
+  area: string;
+  riskLevel: 'medium' | 'high' | 'critical';
+  readiness: 'readyToExtract' | 'needsCharacterizationTests';
+  why: string;
+  preferredNextSlice: string;
+  safeSeam: string;
+  suggestedSlices: string[];
+  testTargets: string[];
+  verificationPlan: string[];
+}
+
+export interface CodebaseHotspotSnapshotOptions {
+  keyword?: string;
+  minLines?: number;
+  limit?: number;
+  includeRecommendations?: boolean;
+}
+
+const CODEBASE_HOTSPOT_SNAPSHOT: CodebaseHotspotEntry[] = [
+  {
+    path: 'frontend/src/components/Sidebar.tsx',
+    lines: 8901,
+    area: 'workspace-navigation',
+    riskLevel: 'critical',
+    readiness: 'needsCharacterizationTests',
+    why: '左侧树、命令面板、上下文菜单和连接动作集中在单文件，修改入口多且回归面大。',
+    preferredNextSlice: '外部 SQL 目录弹窗',
+    safeSeam: '优先抽出无状态弹窗/菜单配置，再处理依赖连接树状态的动作分发。',
+    suggestedSlices: ['V2 命令面板', '外部 SQL 目录弹窗', '连接树动作', '批量操作弹窗'],
+    testTargets: ['Sidebar.locate-toolbar.test.tsx', 'sidebarV2Utils.test.ts'],
+    verificationPlan: [
+      'npm --prefix frontend test -- Sidebar.locate-toolbar.test.tsx sidebarV2Utils.test.ts',
+      'npm --prefix frontend run build',
+      '浏览器打开侧边栏，验证连接树、右键菜单和外部 SQL 目录入口可用。',
+    ],
+  },
+  {
+    path: 'frontend/src/components/DataGrid.tsx',
+    lines: 8080,
+    area: 'result-grid',
+    riskLevel: 'critical',
+    readiness: 'needsCharacterizationTests',
+    why: '结果展示、编辑、DDL、导出和列操作耦合，容易让单点修复影响查询结果区。',
+    preferredNextSlice: '结果导出工具栏',
+    safeSeam: '优先抽出纯展示工具栏和菜单项生成，不先移动数据编辑事务状态。',
+    suggestedSlices: ['结果导出工具栏', '列头菜单', 'DDL 视图', '单元格编辑事务提示'],
+    testTargets: ['DataGrid.layout.test.tsx', 'DataGrid.ddl.test.tsx'],
+    verificationPlan: [
+      'npm --prefix frontend test -- DataGrid.layout.test.tsx DataGrid.ddl.test.tsx',
+      'npm --prefix frontend run build',
+      '浏览器执行查询并验证结果表、导出、列菜单和表格编辑入口。',
+    ],
+  },
+  {
+    path: 'frontend/src/components/ConnectionModal.tsx',
+    lines: 6811,
+    area: 'connection-form',
+    riskLevel: 'critical',
+    readiness: 'readyToExtract',
+    why: '多数据源连接表单仍集中在一个组件，新增数据源或密钥规则时容易互相影响。',
+    preferredNextSlice: 'TLS 配置区',
+    safeSeam: '连接表单已有 presentation utils，可先抽出按数据源显示的配置分区组件。',
+    suggestedSlices: ['SSH/代理配置区', 'TLS 配置区', 'MongoDB 配置区', 'JVM 配置区'],
+    testTargets: ['ConnectionModal.edit-password.test.tsx', 'connectionModalPresentation.test.ts'],
+    verificationPlan: [
+      'npm --prefix frontend test -- ConnectionModal.edit-password.test.tsx connectionModalPresentation.test.ts',
+      'npm --prefix frontend run build',
+      '浏览器打开新增/编辑连接弹窗，切换 MySQL、Oracle、MongoDB、Redis 表单。',
+    ],
+  },
+  {
+    path: 'frontend/src/components/QueryEditor.tsx',
+    lines: 5275,
+    area: 'sql-editor',
+    riskLevel: 'critical',
+    readiness: 'readyToExtract',
+    why: 'SQL 编辑、执行、事务、结果区布局和快捷键状态集中，事务和结果区回归风险高。',
+    preferredNextSlice: '编辑器工具栏',
+    safeSeam: '工具栏 JSX 可通过 props 透传状态和回调，避免触碰 SQL 执行、事务和结果分页逻辑。',
+    suggestedSlices: ['结果区工具栏', '事务状态条', '执行日志提示', '编辑器快捷键绑定'],
+    testTargets: ['QueryEditor.result-panel.test.tsx', 'useSqlEditorTransactionController.test.ts'],
+    verificationPlan: [
+      'npm --prefix frontend test -- QueryEditor.external-sql-save.test.tsx useSqlEditorTransactionController.test.tsx',
+      'npm --prefix frontend run build',
+      '浏览器打开 SQL 编辑器，验证连接/库选择、运行、保存、美化、结果区显隐和 AI 菜单。',
+    ],
+  },
+  {
+    path: 'frontend/src/components/TableDesigner.tsx',
+    lines: 3549,
+    area: 'table-designer',
+    riskLevel: 'high',
+    readiness: 'needsCharacterizationTests',
+    why: '字段编辑、索引、外键、分区和 DDL 生成集中，数据库方言差异容易扩散。',
+    preferredNextSlice: '字段编辑表格',
+    safeSeam: '先补字段类型/长度/NULL/默认值快照测试，再抽字段编辑表格。',
+    suggestedSlices: ['字段编辑表格', '索引配置面板', '外键配置面板', '方言 DDL 预览'],
+    testTargets: ['TableDesigner.*.test.tsx', 'tableDesignerSchemaSql.test.ts'],
+    verificationPlan: [
+      'npm --prefix frontend test -- tableDesignerSchemaSql.test.ts',
+      'npm --prefix frontend run build',
+      '浏览器打开对象设计，验证字段、索引、外键和 DDL 预览。',
+    ],
+  },
+  {
+    path: 'frontend/src/components/RedisViewer.tsx',
+    lines: 2120,
+    area: 'redis-browser',
+    riskLevel: 'high',
+    readiness: 'readyToExtract',
+    why: 'Key 浏览、不同数据结构编辑、TTL、编码显示和新增弹窗集中，Redis Cluster/Sentinel 后续验证面较宽。',
+    preferredNextSlice: 'Key 搜索栏',
+    safeSeam: '先抽出搜索栏和拓扑提示，避免提前改动各数据结构编辑器。',
+    suggestedSlices: ['Key 搜索栏', 'String/List/Set/ZSet/Hash/Stream 编辑器', '新增 Key 弹窗'],
+    testTargets: ['redisViewerTree.test.ts', 'RedisViewer.*.test.tsx'],
+    verificationPlan: [
+      'npm --prefix frontend test -- redisViewerTree.test.ts',
+      'npm --prefix frontend run build',
+      '浏览器打开 Redis 连接，验证 key 搜索、刷新、TTL 和新增入口。',
+    ],
+  },
+  {
+    path: 'frontend/src/components/DriverManagerModal.tsx',
+    lines: 1729,
+    area: 'driver-manager',
+    riskLevel: 'high',
+    readiness: 'readyToExtract',
+    why: '驱动安装、状态展示、下载和可选代理逻辑较多，适合继续拆出状态卡片和操作区。',
+    preferredNextSlice: '驱动状态列表',
+    safeSeam: '状态列表是展示型组件，可先抽出再保留安装/下载动作在父组件。',
+    suggestedSlices: ['驱动状态列表', '安装操作区', '下载日志区'],
+    testTargets: ['DriverManagerModal.*.test.tsx'],
+    verificationPlan: [
+      'npm --prefix frontend test -- DriverManagerModal.*.test.tsx',
+      'npm --prefix frontend run build',
+      '浏览器打开驱动管理，验证状态展示、安装按钮和日志区域。',
+    ],
+  },
+  {
+    path: 'frontend/src/components/DataSyncModal.tsx',
+    lines: 1526,
+    area: 'data-sync',
+    riskLevel: 'high',
+    readiness: 'needsCharacterizationTests',
+    why: '数据同步连接、表映射、预检查和执行结果集中，数据库方言问题容易隐藏。',
+    preferredNextSlice: '同步预检查结果',
+    safeSeam: '先把预检查结果做成纯展示组件，保留连接选择和执行动作在父组件。',
+    suggestedSlices: ['连接选择区', '表映射区', '同步预检查结果', '执行日志区'],
+    testTargets: ['DataSyncModal.*.test.tsx'],
+    verificationPlan: [
+      'npm --prefix frontend test -- DataSyncModal.*.test.tsx',
+      'npm --prefix frontend run build',
+      '浏览器打开数据同步，验证连接选择、表映射、预检查和执行日志。',
+    ],
+  },
+  {
+    path: 'frontend/src/components/JVMDiagnosticConsole.tsx',
+    lines: 1146,
+    area: 'jvm-diagnostics',
+    riskLevel: 'medium',
+    readiness: 'readyToExtract',
+    why: '诊断命令、输出块、权限提示和会话状态可继续拆分，降低 JVM 诊断回归面。',
+    preferredNextSlice: '诊断输出区',
+    safeSeam: '输出区主要依赖命令结果数组，可先抽成展示组件。',
+    suggestedSlices: ['命令输入区', '诊断输出区', '权限提示区'],
+    testTargets: ['JVMDiagnosticConsole.*.test.tsx'],
+    verificationPlan: [
+      'npm --prefix frontend test -- JVMDiagnosticConsole.*.test.tsx',
+      'npm --prefix frontend run build',
+      '浏览器打开 JVM 诊断面板，验证命令输入、输出和权限提示。',
+    ],
+  },
+];
+
+const normalizeKeyword = (value: unknown): string => String(value || '').trim().toLowerCase();
+
+const clampNumber = (value: unknown, fallback: number, min: number, max: number): number => {
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed)) {
+    return fallback;
+  }
+  return Math.max(min, Math.min(max, Math.floor(parsed)));
+};
+
+const matchesKeyword = (entry: CodebaseHotspotEntry, keyword: string): boolean => {
+  if (!keyword) {
+    return true;
+  }
+  return [
+    entry.path,
+    entry.area,
+    entry.riskLevel,
+    entry.why,
+    ...entry.suggestedSlices,
+    ...entry.testTargets,
+  ].some((item) => item.toLowerCase().includes(keyword));
+};
+
+export const buildCodebaseHotspotSnapshot = ({
+  keyword,
+  minLines,
+  limit,
+  includeRecommendations = true,
+}: CodebaseHotspotSnapshotOptions = {}) => {
+  const normalizedKeyword = normalizeKeyword(keyword);
+  const normalizedMinLines = clampNumber(minLines, 1000, 1, 20000);
+  const normalizedLimit = clampNumber(limit, 8, 1, 30);
+  const matched = CODEBASE_HOTSPOT_SNAPSHOT
+    .filter((entry) => entry.lines >= normalizedMinLines)
+    .filter((entry) => matchesKeyword(entry, normalizedKeyword))
+    .slice(0, normalizedLimit);
+  const criticalCount = matched.filter((entry) => entry.riskLevel === 'critical').length;
+  const highCount = matched.filter((entry) => entry.riskLevel === 'high').length;
+
+  return {
+    kind: 'codebase_hotspots',
+    source: 'static_maintainability_snapshot',
+    evidence: {
+      measuredAt: '2026-06-12',
+      note: '基于当前仓库前端文件行数热点快照；拆分前应优先选择 readyToExtract 且已有测试覆盖的 slice。',
+    },
+    filters: {
+      keyword: normalizedKeyword || undefined,
+      minLines: normalizedMinLines,
+      limit: normalizedLimit,
+      includeRecommendations,
+    },
+    summary: {
+      totalKnownHotspots: CODEBASE_HOTSPOT_SNAPSHOT.length,
+      totalMatched: matched.length,
+      maxLines: matched[0]?.lines || 0,
+      criticalCount,
+      highCount,
+    },
+    hotspots: matched.map((entry, index) => ({
+      rank: index + 1,
+      path: entry.path,
+      lines: entry.lines,
+      area: entry.area,
+      riskLevel: entry.riskLevel,
+      readiness: entry.readiness,
+      why: entry.why,
+      preferredNextSlice: includeRecommendations ? entry.preferredNextSlice : undefined,
+      safeSeam: includeRecommendations ? entry.safeSeam : undefined,
+      suggestedSlices: includeRecommendations ? entry.suggestedSlices : [],
+      testTargets: includeRecommendations ? entry.testTargets : [],
+      verificationPlan: includeRecommendations ? entry.verificationPlan : [],
+    })),
+    nextActions: includeRecommendations
+      ? [
+        '优先选择 readiness=readyToExtract 且已有测试覆盖的 slice 做小步拆分，避免直接重写整个大组件。',
+        '每次拆分都要先确认 safeSeam，不跨越 SQL 执行、事务、连接密钥或数据库方言边界。',
+        '拆分后至少运行对应组件测试、相关 utils 测试和 npm --prefix frontend run build。',
+        '涉及可见 UI 的拆分需要用浏览器打开真实页面做一次冒烟验证。',
+      ]
+      : [],
+  };
+};
diff --git a/frontend/src/components/ai/aiConnectionCapabilitiesInsights.test.ts b/frontend/src/components/ai/aiConnectionCapabilitiesInsights.test.ts
new file mode 100644
index 0000000..f532b9f
--- /dev/null
+++ b/frontend/src/components/ai/aiConnectionCapabilitiesInsights.test.ts
@@ -0,0 +1,109 @@
+import { describe, expect, it } from 'vitest';
+
+import type { SavedConnection, TabData } from '../../types';
+import { buildConnectionCapabilitiesSnapshot } from './aiConnectionCapabilitiesInsights';
+
+describe('aiConnectionCapabilitiesInsights', () => {
+  it('builds the current connection capability snapshot from active context', () => {
+    const connections: SavedConnection[] = [{
+      id: 'conn-1',
+      name: '订单主库',
+      config: {
+        type: 'mysql',
+        host: '127.0.0.1',
+        port: 3306,
+        user: 'root',
+      },
+    }];
+
+    const snapshot = buildConnectionCapabilitiesSnapshot({
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      connections,
+    });
+
+    if (!snapshot.hasConnection || !snapshot.capabilities) {
+      throw new Error('expected active connection snapshot');
+    }
+
+    expect(snapshot.hasConnection).toBe(true);
+    expect(snapshot.resolvedFrom).toBe('activeContext');
+    expect(snapshot.connectionName).toBe('订单主库');
+    expect(snapshot.resolvedType).toBe('mysql');
+    expect(snapshot.capabilities.supportsQueryEditor).toBe(true);
+    expect(snapshot.capabilities.supportsCreateDatabase).toBe(true);
+    expect(snapshot.capabilities.supportsRenameDatabase).toBe(false);
+    expect(snapshot.restrictions).toContain('rename_database_hidden');
+  });
+
+  it('supports inspecting an explicit saved connection and resolves Oracle-like OceanBase capabilities', () => {
+    const connections: SavedConnection[] = [{
+      id: 'conn-ob',
+      name: 'OceanBase Oracle 租户',
+      config: {
+        type: 'custom',
+        driver: 'oceanbase',
+        oceanBaseProtocol: 'oracle',
+        host: '10.0.0.18',
+        port: 2881,
+        user: 'sys',
+      },
+    }];
+    const tabs: TabData[] = [{
+      id: 'tab-1',
+      title: '示例页签',
+      type: 'query',
+      connectionId: 'conn-ob',
+      dbName: 'SYS',
+      query: 'select 1',
+    }];
+
+    const snapshot = buildConnectionCapabilitiesSnapshot({
+      connectionId: 'conn-ob',
+      tabs,
+      activeTabId: 'tab-1',
+      connections,
+    });
+
+    if (!snapshot.hasConnection || !snapshot.capabilities) {
+      throw new Error('expected explicit connection snapshot');
+    }
+
+    expect(snapshot.hasConnection).toBe(true);
+    expect(snapshot.resolvedFrom).toBe('explicit');
+    expect(snapshot.resolvedType).toBe('oracle');
+    expect(snapshot.capabilities.supportsCreateDatabase).toBe(false);
+    expect(snapshot.capabilities.supportsDropDatabase).toBe(false);
+    expect(snapshot.restrictions).toContain('create_database_hidden');
+    expect(snapshot.restrictions).toContain('drop_database_hidden');
+  });
+
+  it('includes publish_message when the datasource exposes message publish capability', () => {
+    const connections: SavedConnection[] = [{
+      id: 'conn-kafka',
+      name: '订单事件总线',
+      config: {
+        type: 'kafka',
+        host: '127.0.0.1',
+        port: 9092,
+        user: '',
+        database: 'orders.events',
+      },
+    }];
+
+    const snapshot = buildConnectionCapabilitiesSnapshot({
+      connectionId: 'conn-kafka',
+      connections,
+    });
+
+    if (!snapshot.hasConnection || !snapshot.capabilities) {
+      throw new Error('expected kafka connection snapshot');
+    }
+
+    expect(snapshot.capabilities.supportsMessagePublish).toBe(true);
+    expect(snapshot.supportedActions).toContain('publish_message');
+    expect(snapshot.uiHints.join(' ')).toContain('测试发送消息入口');
+  });
+});
diff --git a/frontend/src/components/ai/aiConnectionCapabilitiesInsights.ts b/frontend/src/components/ai/aiConnectionCapabilitiesInsights.ts
new file mode 100644
index 0000000..8c68fdc
--- /dev/null
+++ b/frontend/src/components/ai/aiConnectionCapabilitiesInsights.ts
@@ -0,0 +1,101 @@
+import type { SavedConnection, TabData } from '../../types';
+import {
+  getDataSourceCapabilities,
+  resolveDataSourceType,
+} from '../../utils/dataSourceCapabilities';
+
+export const buildConnectionCapabilitiesSnapshot = (params: {
+  connectionId?: string | null;
+  activeContext?: { connectionId: string; dbName?: string } | null;
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  connections: SavedConnection[];
+}) => {
+  const {
+    connectionId,
+    activeContext = null,
+    tabs = [],
+    activeTabId = null,
+    connections,
+  } = params;
+
+  const trimmedExplicitConnectionId = String(connectionId || '').trim();
+  const activeTab = tabs.find((tab) => tab.id === activeTabId);
+  const fallbackConnectionId = String(
+    trimmedExplicitConnectionId
+      || activeContext?.connectionId
+      || activeTab?.connectionId
+      || '',
+  ).trim();
+
+  if (!fallbackConnectionId) {
+    return {
+      hasConnection: false,
+      message: '当前没有可用于能力分析的连接',
+    };
+  }
+
+  const connection = connections.find((item) => item.id === fallbackConnectionId);
+  if (!connection) {
+    return {
+      hasConnection: false,
+      connectionId: fallbackConnectionId,
+      message: '目标连接在本地缓存中不存在',
+    };
+  }
+
+  const resolvedType = resolveDataSourceType(connection.config);
+  const capabilities = getDataSourceCapabilities(connection.config);
+  const supportedActions = [
+    capabilities.supportsQueryEditor ? 'query_editor' : '',
+    capabilities.supportsSqlQueryExport ? 'sql_query_export' : '',
+    capabilities.supportsCopyInsert ? 'copy_insert' : '',
+    capabilities.supportsCreateDatabase ? 'create_database' : '',
+    capabilities.supportsRenameDatabase ? 'rename_database' : '',
+    capabilities.supportsDropDatabase ? 'drop_database' : '',
+    capabilities.supportsMessagePublish ? 'publish_message' : '',
+    capabilities.supportsApproximateTableCount ? 'approximate_table_count' : '',
+    capabilities.supportsApproximateTotalPages ? 'approximate_total_pages' : '',
+  ].filter(Boolean);
+  const restrictions = [
+    !capabilities.supportsQueryEditor ? 'query_editor_disabled' : '',
+    capabilities.forceReadOnlyQueryResult ? 'force_readonly_query_result' : '',
+    capabilities.preferManualTotalCount ? 'prefer_manual_total_count' : '',
+    !capabilities.supportsCreateDatabase ? 'create_database_hidden' : '',
+    !capabilities.supportsRenameDatabase ? 'rename_database_hidden' : '',
+    !capabilities.supportsDropDatabase ? 'drop_database_hidden' : '',
+  ].filter(Boolean);
+
+  const uiHints = [
+    capabilities.forceReadOnlyQueryResult
+      ? '当前数据源的查询结果默认按只读方式展示，不提供直接编辑结果集。'
+      : '当前数据源的查询结果在满足定位条件时可进入编辑路径。',
+    capabilities.preferManualTotalCount
+      ? '结果总数优先走手动统计或延迟统计，避免直接依赖快速总数。'
+      : '结果总数可以优先使用常规统计路径。',
+    capabilities.supportsApproximateTableCount
+      ? '表浏览场景允许显示近似行数，减少大表统计开销。'
+      : '表浏览场景默认不使用近似行数。',
+    capabilities.supportsMessagePublish
+      ? '当前数据源提供测试发送消息入口，适合做 Topic/Queue 的联调验证。'
+      : '当前数据源未暴露测试发送消息入口。',
+  ];
+
+  return {
+    hasConnection: true,
+    resolvedFrom: trimmedExplicitConnectionId
+      ? 'explicit'
+      : (activeContext?.connectionId ? 'activeContext' : 'activeTab'),
+    connectionId: connection.id,
+    connectionName: connection.name,
+    configuredType: connection.config?.type || '',
+    resolvedType,
+    driver: connection.config?.driver || '',
+    oceanBaseProtocol: connection.config?.oceanBaseProtocol || '',
+    capabilities,
+    supportedActions,
+    restrictions,
+    uiHints,
+    message: `当前连接 ${connection.name} (${resolvedType || connection.config?.type || 'unknown'}) 已解析出 ${supportedActions.length} 项前端能力信号`,
+  };
+};
diff --git a/frontend/src/components/ai/aiConnectionFailureInsights.test.ts b/frontend/src/components/ai/aiConnectionFailureInsights.test.ts
new file mode 100644
index 0000000..1678aa5
--- /dev/null
+++ b/frontend/src/components/ai/aiConnectionFailureInsights.test.ts
@@ -0,0 +1,67 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildRecentConnectionFailureSnapshot } from './aiConnectionFailureInsights';
+
+describe('buildRecentConnectionFailureSnapshot', () => {
+  it('summarizes recent validation failures and cooldown hits from gonavi.log lines', () => {
+    const snapshot = buildRecentConnectionFailureSnapshot({
+      readResult: {
+        success: true,
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          requestedLineLimit: 120,
+          lines: [
+            '2026/06/06 19:42:36.037552 [INFO] 获取数据库连接：类型=mysql 地址=10.188.101.184:1523 数据库=(default) 用户=glzc 超时=30s 拓扑=single SSH=192.168.66.28:22 用户=wyeye 缓存Key=026837d0a1b6 启动阶段=稳定期(age=34.322s)',
+            '2026/06/06 19:42:37.088288 [ERROR] 建立数据库连接失败：类型=mysql 地址=10.188.101.184:1523 数据库=(default) 用户=glzc 超时=30s 拓扑=single SSH=192.168.66.28:22 用户=wyeye 缓存Key=026837d0a1b6；错误链：连接建立后验证失败：10.188.101.184:1523 验证失败: Error 10004 (HY000): Parametric information is abnormal.（详细日志：C:/Users/demo/.GoNavi/Logs/gonavi.log） -> 连接建立后验证失败：10.188.101.184:1523 验证失败: Error 10004 (HY000): Parametric information is abnormal.',
+            '2026/06/06 19:42:37.094045 [ERROR] DBGetDatabases 获取连接失败：类型=mysql 地址=10.188.101.184:1523 数据库=(default) 用户=glzc 超时=30s 拓扑=single SSH=192.168.66.28:22 用户=wyeye；错误链：连接建立后验证失败：10.188.101.184:1523 验证失败: Error 10004 (HY000): Parametric information is abnormal.（详细日志：C:/Users/demo/.GoNavi/Logs/gonavi.log） -> 连接建立后验证失败：10.188.101.184:1523 验证失败: Error 10004 (HY000): Parametric information is abnormal.',
+            '2026/06/06 19:42:37.101316 [WARN] 命中数据库连接失败冷却：类型=mysql 地址=10.188.101.184:1523 数据库=(default) 用户=glzc 超时=30s 拓扑=single SSH=192.168.66.28:22 用户=wyeye 缓存Key=026837d0a1b6 剩余=29s 原因=连接建立后验证失败：10.188.101.184:1523 验证失败: Error 10004 (HY000): Parametric information is abnormal.（详细日志：C:/Users/demo/.GoNavi/Logs/gonavi.log）',
+          ],
+        },
+      },
+    });
+
+    expect(snapshot.failureEventCount).toBe(3);
+    expect(snapshot.primaryCategory).toBe('parameter_compatibility');
+    expect(snapshot.cooldownHitCount).toBe(1);
+    expect(snapshot.addresses[0]?.address).toBe('10.188.101.184:1523');
+    expect(snapshot.latestFailure?.cooldownSeconds).toBe(29);
+    expect(snapshot.nextActions.join('\n')).toContain('multiStatements');
+  });
+
+  it('recognizes mysql compatibility fallback syntax errors as parameter or compatibility issues', () => {
+    const snapshot = buildRecentConnectionFailureSnapshot({
+      readResult: {
+        success: true,
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          lines: [
+            '2026/06/07 15:50:35.000000 [ERROR] DBGetDatabases 获取连接失败：类型=mysql 地址=127.0.0.1:48749 数据库=(default) 用户=root；错误链：连接最近失败，正在冷却中，请 29s 后重试；上次错误：连接建立后验证失败：127.0.0.1:48749 [默认兼容参数] 验证失败: Error 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'%2Cutf8\' at line 1；127.0.0.1:48749 [禁用 multiStatements 兼容重试] 验证失败: Error 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'%2Cutf8\' at line 1',
+          ],
+        },
+      },
+    });
+
+    expect(snapshot.failureEventCount).toBe(1);
+    expect(snapshot.primaryCategory).toBe('parameter_compatibility');
+    expect(snapshot.recentFailures[0]?.rootCause).toContain('%2Cutf8');
+    expect(snapshot.nextActions.join('\n')).toContain('连接参数');
+  });
+
+  it('returns an empty-state message when the tail has no connection-related failures', () => {
+    const snapshot = buildRecentConnectionFailureSnapshot({
+      readResult: {
+        success: true,
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          lines: [
+            '2026/06/09 10:00:00.000000 [INFO] started',
+            '2026/06/09 10:00:01.000000 [INFO] ai ready',
+          ],
+        },
+      },
+    });
+
+    expect(snapshot.failureEventCount).toBe(0);
+    expect(snapshot.message).toContain('没有识别到连接失败');
+  });
+});
diff --git a/frontend/src/components/ai/aiConnectionFailureInsights.ts b/frontend/src/components/ai/aiConnectionFailureInsights.ts
new file mode 100644
index 0000000..17ad271
--- /dev/null
+++ b/frontend/src/components/ai/aiConnectionFailureInsights.ts
@@ -0,0 +1,412 @@
+const DEFAULT_CONNECTION_FAILURE_LOG_LIMIT = 120;
+const MAX_CONNECTION_FAILURE_LOG_LIMIT = 240;
+const MAX_RECENT_FAILURES = 8;
+
+type ConnectionFailureCategory =
+  | 'cooldown'
+  | 'parameter_compatibility'
+  | 'validation'
+  | 'authentication'
+  | 'timeout'
+  | 'network'
+  | 'ssh'
+  | 'startup'
+  | 'other';
+
+type ConnectionFailureEventType =
+  | 'connection_failure'
+  | 'connection_operation_failure'
+  | 'cooldown_hit'
+  | 'ssh_failure';
+
+interface ConnectionFailureEvent {
+  rawLine: string;
+  timestamp: string;
+  level: string;
+  eventType: ConnectionFailureEventType;
+  category: ConnectionFailureCategory;
+  categoryLabel: string;
+  connectionType: string;
+  address: string;
+  dbName: string;
+  sshAddress: string;
+  rootCause: string;
+  cooldownSeconds: number | null;
+}
+
+const CONNECTION_FAILURE_CATEGORY_LABELS: Record<ConnectionFailureCategory, string> = {
+  cooldown: '冷却重试',
+  parameter_compatibility: '连接参数/兼容性',
+  validation: '连接验证失败',
+  authentication: '认证失败',
+  timeout: '连接超时',
+  network: '网络不可达',
+  ssh: 'SSH 隧道失败',
+  startup: '驱动/进程启动失败',
+  other: '其他连接异常',
+};
+
+const normalizeLogLines = (input: unknown): string[] =>
+  Array.isArray(input)
+    ? input.map((line) => String(line || '').trim()).filter(Boolean)
+    : [];
+
+const normalizeConnectionFailureLimit = (input: unknown): number => {
+  const value = Math.floor(Number(input) || DEFAULT_CONNECTION_FAILURE_LOG_LIMIT);
+  if (value < 1) {
+    return 1;
+  }
+  if (value > MAX_CONNECTION_FAILURE_LOG_LIMIT) {
+    return MAX_CONNECTION_FAILURE_LOG_LIMIT;
+  }
+  return value;
+};
+
+const extractLogTimestamp = (line: string): string => {
+  const match = String(line || '').match(/^(\d{4}\/\d{2}\/\d{2}\s+\d{2}:\d{2}:\d{2}(?:\.\d+)?)/);
+  return match?.[1] || '';
+};
+
+const extractLogLevelAndPayload = (line: string) => {
+  const match = String(line || '').match(/\[(INFO|WARN|ERROR)\]\s*(.*)$/);
+  if (match) {
+    return {
+      level: match[1],
+      payload: String(match[2] || '').trim(),
+    };
+  }
+  return {
+    level: 'OTHER',
+    payload: String(line || '').trim(),
+  };
+};
+
+const extractField = (payload: string, field: string): string => {
+  const match = payload.match(new RegExp(`${field}=([^\\s]+)`));
+  return String(match?.[1] || '').trim();
+};
+
+const extractAddressCandidates = (text: string): string[] => {
+  const matches = text.match(/\b(?:\d{1,3}(?:\.\d{1,3}){3}|localhost|[A-Za-z0-9._-]+):\d+\b/g);
+  return Array.isArray(matches) ? Array.from(new Set(matches)) : [];
+};
+
+const sanitizeRootCause = (value: string): string =>
+  String(value || '')
+    .replace(/（详细日志：[^）]+）/g, '')
+    .replace(/\s+/g, ' ')
+    .replace(/\s*->\s*/g, ' -> ')
+    .trim();
+
+const extractRootCause = (payload: string): string => {
+  const errorChainIndex = payload.indexOf('错误链：');
+  if (errorChainIndex >= 0) {
+    return sanitizeRootCause(payload.slice(errorChainIndex + '错误链：'.length));
+  }
+
+  const reasonIndex = payload.indexOf('原因=');
+  if (reasonIndex >= 0) {
+    return sanitizeRootCause(payload.slice(reasonIndex + '原因='.length));
+  }
+
+  const cooldownIndex = payload.indexOf('连接最近失败，正在冷却中');
+  if (cooldownIndex >= 0) {
+    return sanitizeRootCause(payload.slice(cooldownIndex));
+  }
+
+  const sshFailureIndex = payload.indexOf('SSH 连接建立失败：');
+  if (sshFailureIndex >= 0) {
+    return sanitizeRootCause(payload.slice(sshFailureIndex + 'SSH 连接建立失败：'.length));
+  }
+
+  const validationIndex = payload.indexOf('连接建立后验证失败：');
+  if (validationIndex >= 0) {
+    return sanitizeRootCause(payload.slice(validationIndex));
+  }
+
+  return sanitizeRootCause(payload);
+};
+
+const extractCooldownSeconds = (payload: string, rootCause: string): number | null => {
+  const target = `${payload} ${rootCause}`;
+  const match = target.match(/(?:剩余=|请\s*)(\d+)s(?:\s*后重试)?/);
+  if (!match) {
+    return null;
+  }
+  const value = Number(match[1]);
+  return Number.isFinite(value) ? value : null;
+};
+
+const inferConnectionFailureCategory = (
+  payload: string,
+  rootCause: string,
+): ConnectionFailureCategory => {
+  const text = `${payload} ${rootCause}`;
+  const lowerText = text.toLowerCase();
+  const errorText = rootCause || payload;
+  const lowerErrorText = errorText.toLowerCase();
+
+  if (
+    text.includes('SSH 连接建立失败')
+    || /ssh\s+(dial|handshake|tunnel)/i.test(text)
+    || /ssh.*(认证失败|连接失败|超时)/i.test(text)
+  ) {
+    return 'ssh';
+  }
+  if (
+    lowerErrorText.includes('connect timeout')
+    || lowerErrorText.includes('i/o timeout')
+    || lowerErrorText.includes('deadline exceeded')
+    || errorText.includes('连接超时')
+    || /超时(?!\=)/.test(errorText)
+  ) {
+    return 'timeout';
+  }
+  if (
+    lowerText.includes('access denied')
+    || lowerText.includes('authentication failed')
+    || lowerText.includes('password')
+    || text.includes('凭据')
+    || text.includes('认证')
+    || text.includes('登录失败')
+  ) {
+    return 'authentication';
+  }
+  if (
+    lowerText.includes('parametric information is abnormal')
+    || lowerText.includes('error 1064')
+    || lowerText.includes('%2cutf8')
+    || lowerText.includes('multistatements')
+    || text.includes('兼容参数')
+    || lowerText.includes('syntax')
+    || lowerText.includes('dsn')
+    || text.includes('参数')
+  ) {
+    return 'parameter_compatibility';
+  }
+  if (text.includes('验证失败')) {
+    return 'validation';
+  }
+  if (
+    lowerText.includes('connection refused')
+    || lowerText.includes('dial tcp')
+    || lowerText.includes('no route')
+    || lowerText.includes('network is unreachable')
+    || lowerText.includes('refused')
+  ) {
+    return 'network';
+  }
+  if (lowerText.includes('spawn') || text.includes('启动失败') || text.includes('拉起失败')) {
+    return 'startup';
+  }
+  if (text.includes('冷却')) {
+    return 'cooldown';
+  }
+  return 'other';
+};
+
+const detectConnectionFailureEventType = (payload: string): ConnectionFailureEventType | null => {
+  if (payload.includes('命中数据库连接失败冷却：') || payload.includes('连接最近失败，正在冷却中')) {
+    return 'cooldown_hit';
+  }
+  if (payload.includes('SSH 连接建立失败：')) {
+    return 'ssh_failure';
+  }
+  if (payload.includes('建立数据库连接失败：')) {
+    return 'connection_failure';
+  }
+  if (/DB[A-Za-z0-9_]+\s+获取连接失败：/.test(payload)) {
+    return 'connection_operation_failure';
+  }
+  return null;
+};
+
+const buildConnectionFailureEvent = (line: string): ConnectionFailureEvent | null => {
+  const timestamp = extractLogTimestamp(line);
+  const { level, payload } = extractLogLevelAndPayload(line);
+  const eventType = detectConnectionFailureEventType(payload);
+  if (!eventType) {
+    return null;
+  }
+
+  const rootCause = extractRootCause(payload);
+  const extractedType = extractField(payload, '类型');
+  const extractedAddress = extractField(payload, '地址');
+  const addressCandidates = extractAddressCandidates(rootCause);
+  const address = extractedAddress || addressCandidates[0] || '';
+  const category = inferConnectionFailureCategory(payload, rootCause);
+
+  return {
+    rawLine: line,
+    timestamp,
+    level,
+    eventType,
+    category,
+    categoryLabel: CONNECTION_FAILURE_CATEGORY_LABELS[category],
+    connectionType: extractedType,
+    address,
+    dbName: extractField(payload, '数据库'),
+    sshAddress: extractField(payload, 'SSH'),
+    rootCause,
+    cooldownSeconds: extractCooldownSeconds(payload, rootCause),
+  };
+};
+
+const appendUnique = (items: string[], value: string) => {
+  const normalized = String(value || '').trim();
+  if (!normalized || items.includes(normalized)) {
+    return;
+  }
+  items.push(normalized);
+};
+
+const buildNextActions = (events: ConnectionFailureEvent[]): string[] => {
+  const categories = new Set(events.map((event) => event.category));
+  const hasCooldownEvent = events.some((event) => event.eventType === 'cooldown_hit');
+  const nextActions: string[] = [];
+  const latestEvent = events[events.length - 1];
+
+  if (hasCooldownEvent || categories.has('cooldown')) {
+    appendUnique(nextActions, '先修复上一次真实连接错误，再重试；只反复刷新会持续命中连接冷却。');
+  }
+  if (categories.has('parameter_compatibility')) {
+    appendUnique(nextActions, '优先核对连接参数、DSN 和协议兼容性，尤其是 multiStatements、charset、额外 query 参数和 URL 编码。');
+  }
+  if (categories.has('validation')) {
+    appendUnique(nextActions, '检查服务端返回的验证失败细节，确认当前数据库类型、驱动协议、库名或 Service Name 与目标服务匹配。');
+  }
+  if (categories.has('authentication')) {
+    appendUnique(nextActions, '核对用户名、密码、认证库、租户或 Service Name 是否正确，确认服务端是否允许当前账号登录。');
+  }
+  if (categories.has('ssh')) {
+    appendUnique(nextActions, '核对 SSH 跳板机地址、端口、账号和隧道目标地址，必要时先验证跳板机到数据库的连通性。');
+  }
+  if (categories.has('timeout') || categories.has('network')) {
+    appendUnique(nextActions, '检查目标地址、端口、防火墙、代理和隧道链路是否可达，确认服务端当前确实在监听。');
+  }
+  if (categories.has('startup')) {
+    appendUnique(nextActions, '检查驱动进程或外部依赖是否能正常启动，必要时先在本机或目标主机单独验证启动命令。');
+  }
+  if (latestEvent?.address) {
+    appendUnique(nextActions, `如需核对当前界面里的连接是否还是同一目标，可再调用 inspect_current_connection 检查是否仍指向 ${latestEvent.address}。`);
+  }
+  if (nextActions.length === 0) {
+    appendUnique(nextActions, '先结合 inspect_current_connection 和 inspect_saved_connections 核对当前连接配置，再扩大日志窗口继续排查。');
+  }
+  return nextActions;
+};
+
+export const buildRecentConnectionFailureSnapshot = (params: {
+  readResult?: any;
+  keyword?: unknown;
+  lineLimit?: unknown;
+}) => {
+  const data = params.readResult?.data && typeof params.readResult.data === 'object'
+    ? params.readResult.data as Record<string, unknown>
+    : {};
+  const lines = normalizeLogLines(data.lines);
+  const keyword = String(data.keyword || params.keyword || '').trim();
+  const requestedLineLimit = normalizeConnectionFailureLimit(data.requestedLineLimit ?? params.lineLimit);
+  const events = lines
+    .map((line) => buildConnectionFailureEvent(line))
+    .filter((event): event is ConnectionFailureEvent => Boolean(event));
+  const latestEvent = events[events.length - 1];
+
+  const categoryCounts = new Map<ConnectionFailureCategory, number>();
+  const addressCounts = new Map<string, { count: number; connectionTypes: Set<string>; lastSeenAt: string }>();
+  events.forEach((event) => {
+    categoryCounts.set(event.category, (categoryCounts.get(event.category) || 0) + 1);
+    if (!event.address) {
+      return;
+    }
+    const current = addressCounts.get(event.address) || {
+      count: 0,
+      connectionTypes: new Set<string>(),
+      lastSeenAt: '',
+    };
+    current.count += 1;
+    if (event.connectionType) {
+      current.connectionTypes.add(event.connectionType);
+    }
+    current.lastSeenAt = event.timestamp || current.lastSeenAt;
+    addressCounts.set(event.address, current);
+  });
+
+  const categorySummary = Array.from(categoryCounts.entries())
+    .sort((left, right) => right[1] - left[1])
+    .map(([category, count]) => ({
+      category,
+      label: CONNECTION_FAILURE_CATEGORY_LABELS[category],
+      count,
+    }));
+  const primaryCategory = categorySummary[0]?.category || '';
+
+  const addresses = Array.from(addressCounts.entries())
+    .sort((left, right) => right[1].count - left[1].count)
+    .map(([address, summary]) => ({
+      address,
+      count: summary.count,
+      connectionTypes: Array.from(summary.connectionTypes),
+      lastSeenAt: summary.lastSeenAt,
+    }));
+
+  return {
+    logPath: String(data.logPath || ''),
+    keyword,
+    requestedLineLimit,
+    returnedLineCount: lines.length,
+    fileWindowTruncated: data.fileWindowTruncated === true,
+    matchedLinesTruncated: data.matchedLinesTruncated === true,
+    failureEventCount: events.length,
+    hasRecentFailures: events.length > 0,
+    primaryCategory,
+    primaryCategoryLabel: primaryCategory
+      ? CONNECTION_FAILURE_CATEGORY_LABELS[primaryCategory as ConnectionFailureCategory]
+      : '',
+    cooldownHitCount: events.filter((event) => event.eventType === 'cooldown_hit').length,
+    validationFailureCount: events.filter((event) => event.category === 'validation').length,
+    sshFailureCount: events.filter((event) => event.category === 'ssh').length,
+    categorySummary,
+    addresses,
+    latestFailureAt: latestEvent?.timestamp || '',
+    latestFailure: latestEvent
+      ? {
+        timestamp: latestEvent.timestamp,
+        level: latestEvent.level,
+        eventType: latestEvent.eventType,
+        category: latestEvent.category,
+        categoryLabel: latestEvent.categoryLabel,
+        connectionType: latestEvent.connectionType,
+        address: latestEvent.address,
+        dbName: latestEvent.dbName,
+        sshAddress: latestEvent.sshAddress,
+        cooldownSeconds: latestEvent.cooldownSeconds,
+        rootCause: latestEvent.rootCause,
+        rawLine: latestEvent.rawLine,
+      }
+      : null,
+    recentFailures: events
+      .slice(-MAX_RECENT_FAILURES)
+      .reverse()
+      .map((event) => ({
+        timestamp: event.timestamp,
+        level: event.level,
+        eventType: event.eventType,
+        category: event.category,
+        categoryLabel: event.categoryLabel,
+        connectionType: event.connectionType,
+        address: event.address,
+        dbName: event.dbName,
+        sshAddress: event.sshAddress,
+        cooldownSeconds: event.cooldownSeconds,
+        rootCause: event.rootCause,
+        rawLine: event.rawLine,
+      })),
+    nextActions: buildNextActions(events),
+    message: events.length > 0
+      ? `最近日志里识别到 ${events.length} 条连接相关异常，最新一条是 ${latestEvent?.categoryLabel || '连接异常'}`
+      : keyword
+        ? `最近日志里没有找到与“${keyword}”相关的连接失败记录`
+        : '最近日志里没有识别到连接失败、验证失败或连接冷却记录',
+  };
+};
diff --git a/frontend/src/components/ai/aiConnectionInsights.test.ts b/frontend/src/components/ai/aiConnectionInsights.test.ts
new file mode 100644
index 0000000..9b19b70
--- /dev/null
+++ b/frontend/src/components/ai/aiConnectionInsights.test.ts
@@ -0,0 +1,109 @@
+import { describe, expect, it } from 'vitest';
+
+import type { SavedConnection, TabData } from '../../types';
+import { buildCurrentConnectionSnapshot } from './aiConnectionInsights';
+
+const baseConnection: SavedConnection = {
+  id: 'conn-1',
+  name: '生产主库',
+  config: {
+    type: 'mysql',
+    host: '10.0.0.8',
+    port: 3306,
+    user: 'reader',
+    database: 'crm',
+    driver: 'mysql',
+    useSSH: true,
+    ssh: {
+      host: '192.168.1.20',
+      port: 22,
+      user: 'jump',
+    },
+    useProxy: true,
+    proxy: {
+      type: 'socks5',
+      host: '127.0.0.1',
+      port: 1080,
+    },
+  },
+};
+
+describe('buildCurrentConnectionSnapshot', () => {
+  it('returns a structured summary for the active connection and tab', () => {
+    const tabs: TabData[] = [{
+      id: 'tab-1',
+      title: 'orders',
+      type: 'table',
+      connectionId: 'conn-1',
+      dbName: 'crm',
+      tableName: 'orders',
+      readOnly: true,
+    }];
+
+    const snapshot = buildCurrentConnectionSnapshot({
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      tabs,
+      activeTabId: 'tab-1',
+      connections: [baseConnection],
+    });
+
+    expect(snapshot).toMatchObject({
+      hasActiveConnection: true,
+      connectionId: 'conn-1',
+      connectionName: '生产主库',
+      connectionType: 'mysql',
+      host: '10.0.0.8',
+      port: 3306,
+      activeDbName: 'crm',
+      useSSH: true,
+      sshHost: '192.168.1.20',
+      sshUser: 'jump',
+      useProxy: true,
+      proxyType: 'socks5',
+      activeTabId: 'tab-1',
+      activeTabType: 'table',
+      activeTableName: 'orders',
+      readOnly: true,
+    });
+  });
+
+  it('falls back to the active tab when no explicit active context exists', () => {
+    const snapshot = buildCurrentConnectionSnapshot({
+      activeContext: null,
+      tabs: [{
+        id: 'tab-query-1',
+        title: '订单排查',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'select * from orders limit 10',
+      }],
+      activeTabId: 'tab-query-1',
+      connections: [baseConnection],
+    });
+
+    expect(snapshot).toMatchObject({
+      hasActiveConnection: true,
+      connectionId: 'conn-1',
+      activeDbName: 'crm',
+      activeTabType: 'query',
+    });
+  });
+
+  it('returns an empty-state message when no active connection can be resolved', () => {
+    const snapshot = buildCurrentConnectionSnapshot({
+      activeContext: null,
+      tabs: [],
+      activeTabId: null,
+      connections: [baseConnection],
+    });
+
+    expect(snapshot).toEqual({
+      hasActiveConnection: false,
+      message: '当前没有活动连接',
+    });
+  });
+});
diff --git a/frontend/src/components/ai/aiConnectionInsights.ts b/frontend/src/components/ai/aiConnectionInsights.ts
new file mode 100644
index 0000000..0be9c5b
--- /dev/null
+++ b/frontend/src/components/ai/aiConnectionInsights.ts
@@ -0,0 +1,84 @@
+import type { SavedConnection, TabData } from '../../types';
+
+export const buildCurrentConnectionSnapshot = (params: {
+  activeContext?: { connectionId: string; dbName?: string } | null;
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  connections: SavedConnection[];
+}) => {
+  const {
+    activeContext = null,
+    tabs = [],
+    activeTabId = null,
+    connections,
+  } = params;
+  const activeTab = tabs.find((tab) => tab.id === activeTabId);
+  const connectionId = String(activeContext?.connectionId || activeTab?.connectionId || '').trim();
+  const activeDbName = String(activeContext?.dbName || activeTab?.dbName || '').trim();
+
+  if (!connectionId) {
+    return {
+      hasActiveConnection: false,
+      message: '当前没有活动连接',
+    };
+  }
+
+  const connection = connections.find((item) => item.id === connectionId);
+  if (!connection) {
+    return {
+      hasActiveConnection: false,
+      connectionId,
+      message: '当前活动连接在本地缓存中不存在',
+    };
+  }
+
+  const config = connection.config || {};
+  const ssh = config.useSSH ? config.ssh : undefined;
+  const proxy = config.useProxy ? config.proxy : undefined;
+  const httpTunnel = config.useHttpTunnel ? config.httpTunnel : undefined;
+  const configuredHosts = Array.isArray(config.hosts)
+    ? config.hosts.map((item) => String(item || '').trim()).filter(Boolean)
+    : [];
+
+  return {
+    hasActiveConnection: true,
+    connectionId: connection.id,
+    connectionName: connection.name,
+    connectionType: config.type || '',
+    host: config.host || '',
+    port: typeof config.port === 'number' ? config.port : null,
+    user: config.user || '',
+    activeDbName: activeDbName || config.database || '',
+    configuredDatabase: config.database || '',
+    driver: config.driver || '',
+    topology: config.topology || 'single',
+    hosts: configuredHosts,
+    useSSL: config.useSSL === true,
+    sslMode: config.sslMode || '',
+    useSSH: config.useSSH === true,
+    sshHost: ssh?.host || '',
+    sshPort: typeof ssh?.port === 'number' ? ssh.port : null,
+    sshUser: ssh?.user || '',
+    useProxy: config.useProxy === true,
+    proxyType: proxy?.type || '',
+    proxyHost: proxy?.host || '',
+    proxyPort: typeof proxy?.port === 'number' ? proxy.port : null,
+    useHttpTunnel: config.useHttpTunnel === true,
+    httpTunnelHost: httpTunnel?.host || '',
+    httpTunnelPort: typeof httpTunnel?.port === 'number' ? httpTunnel.port : null,
+    hasURI: Boolean(String(config.uri || '').trim()),
+    hasDSN: Boolean(String(config.dsn || '').trim()),
+    hasConnectionParams: Boolean(String(config.connectionParams || '').trim()),
+    clickHouseProtocol: config.clickHouseProtocol || '',
+    oceanBaseProtocol: config.oceanBaseProtocol || '',
+    replicaSet: config.replicaSet || '',
+    authSource: config.authSource || '',
+    readPreference: config.readPreference || '',
+    mongoSrv: config.mongoSrv === true,
+    redisDB: typeof config.redisDB === 'number' ? config.redisDB : null,
+    readOnly: activeTab?.readOnly === true || config.jvm?.readOnly === true,
+    activeTabId: activeTab?.id || '',
+    activeTabType: activeTab?.type || '',
+    activeTableName: activeTab?.tableName || '',
+  };
+};
diff --git a/frontend/src/components/ai/aiContextBudgetInsights.test.ts b/frontend/src/components/ai/aiContextBudgetInsights.test.ts
new file mode 100644
index 0000000..b197609
--- /dev/null
+++ b/frontend/src/components/ai/aiContextBudgetInsights.test.ts
@@ -0,0 +1,91 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildAIContextBudgetSnapshot } from './aiContextBudgetInsights';
+
+describe('aiContextBudgetInsights', () => {
+  it('summarizes context budget sources and warns when schema/tool results are oversized', () => {
+    const longToolResult = 'x'.repeat(22000);
+    const longDDL = `CREATE TABLE big_table (${Array.from({ length: 300 }, (_, index) => `c${index} varchar(255)`).join(',')})`;
+    const snapshot = buildAIContextBudgetSnapshot({
+      activeSessionId: 'session-1',
+      aiChatSessions: [{ id: 'session-1', title: '上下文体量排查', updatedAt: 1 }],
+      aiChatHistory: {
+        'session-1': [
+          { id: 'msg-1', role: 'user', content: 'AI 变慢了', timestamp: 1 },
+          {
+            id: 'msg-2',
+            role: 'assistant',
+            content: '先看日志',
+            timestamp: 2,
+            tool_calls: [{ id: 'tool-1', type: 'function', function: { name: 'inspect_app_logs', arguments: '{}' } }],
+          },
+          { id: 'msg-3', role: 'tool', content: longToolResult, timestamp: 3, tool_call_id: 'tool-1' },
+        ],
+      },
+      aiContexts: {
+        'conn-1:crm': [
+          { dbName: 'crm', tableName: 'big_table', ddl: longDDL },
+        ],
+      },
+      mcpTools: [{
+        alias: 'remote_probe',
+        serverId: 'mcp-1',
+        serverName: 'demo',
+        originalName: 'probe',
+        inputSchema: {
+          type: 'object',
+          properties: Object.fromEntries(Array.from({ length: 20 }, (_, index) => [`field${index}`, { type: 'string' }])),
+        },
+      }],
+      skills: [{
+        id: 'skill-1',
+        name: '结构审查',
+        systemPrompt: '先看结构',
+        enabled: true,
+        scopes: ['database'],
+      }],
+      userPromptSettings: {
+        global: '全局提示',
+        database: '数据库提示',
+        jvm: '',
+        jvmDiagnostic: '',
+      },
+    });
+
+    expect(snapshot.foundSession).toBe(true);
+    expect(snapshot.title).toBe('上下文体量排查');
+    expect(snapshot.messageWindow.toolResultChars).toBe(22000);
+    expect(snapshot.messageWindow.unresolvedToolCallCount).toBe(0);
+    expect(snapshot.schemaContext.tableCount).toBe(1);
+    expect(snapshot.schemaContext.largestTables[0]).toMatchObject({ tableName: 'big_table' });
+    expect(snapshot.toolCatalog.mcpToolCount).toBe(1);
+    expect(snapshot.promptsAndSkills.enabledSkillNames).toContain('结构审查');
+    expect(snapshot.warnings).toContain('最近工具结果较长，可能导致后续回答被日志或大结果集稀释');
+    expect(snapshot.nextActions).toContain('降低 inspect_app_logs / inspect_recent_sql_logs / includeDDL / includeLogLines 的返回量');
+  });
+
+  it('reports missing sessions and unresolved tool calls', () => {
+    const snapshot = buildAIContextBudgetSnapshot({
+      activeSessionId: 'missing',
+      aiChatSessions: [],
+      aiChatHistory: {
+        missing: [
+          {
+            id: 'msg-1',
+            role: 'assistant',
+            content: '调用工具',
+            timestamp: 1,
+            tool_calls: [{ id: 'tool-1', type: 'function', function: { name: 'inspect_ai_runtime', arguments: '{}' } }],
+          },
+        ],
+      },
+      includeDetails: false,
+    });
+
+    expect(snapshot.foundSession).toBe(false);
+    expect(snapshot.messageWindow.unresolvedToolCallCount).toBe(1);
+    expect(snapshot.warnings).toContain('未找到目标 AI 会话，消息体量统计只覆盖空窗口');
+    expect(snapshot.warnings).toContain('最近消息窗口内有 1 个未闭环工具调用');
+    expect(snapshot.nextActions).toContain('先调用 inspect_ai_message_flow 确认工具调用是否缺少 tool 结果消息');
+  });
+});
diff --git a/frontend/src/components/ai/aiContextBudgetInsights.ts b/frontend/src/components/ai/aiContextBudgetInsights.ts
new file mode 100644
index 0000000..51dcffe
--- /dev/null
+++ b/frontend/src/components/ai/aiContextBudgetInsights.ts
@@ -0,0 +1,246 @@
+import type {
+  AIChatMessage,
+  AIContextItem,
+  AIMCPToolDescriptor,
+  AISkillConfig,
+  AIUserPromptSettings,
+} from '../../types';
+
+type ContextRiskLevel = 'low' | 'medium' | 'high' | 'critical';
+
+interface BuildAIContextBudgetSnapshotOptions {
+  aiContexts?: Record<string, AIContextItem[]>;
+  aiChatHistory?: Record<string, AIChatMessage[]>;
+  aiChatSessions?: Array<{ id: string; title: string; updatedAt: number }>;
+  activeSessionId?: string | null;
+  sessionId?: unknown;
+  messageLimit?: unknown;
+  includeDetails?: unknown;
+  mcpTools?: AIMCPToolDescriptor[];
+  skills?: AISkillConfig[];
+  userPromptSettings?: AIUserPromptSettings;
+}
+
+const DEFAULT_MESSAGE_LIMIT = 40;
+const MAX_MESSAGE_LIMIT = 120;
+const MESSAGE_PREVIEW_LIMIT = 160;
+
+const clampNumber = (value: unknown, fallback: number, min: number, max: number): number => {
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed)) {
+    return fallback;
+  }
+  return Math.min(max, Math.max(min, Math.round(parsed)));
+};
+
+const charCount = (value: unknown): number => String(value || '').length;
+
+const estimateTokens = (chars: number): number => Math.ceil(Math.max(0, chars) / 3);
+
+const previewText = (value: unknown, limit = MESSAGE_PREVIEW_LIMIT): string => {
+  const normalized = String(value || '').replace(/\s+/g, ' ').trim();
+  if (normalized.length <= limit) {
+    return normalized;
+  }
+  return `${normalized.slice(0, limit)}...`;
+};
+
+const classifyRisk = (estimatedInputChars: number): ContextRiskLevel => {
+  if (estimatedInputChars >= 120000) {
+    return 'critical';
+  }
+  if (estimatedInputChars >= 70000) {
+    return 'high';
+  }
+  if (estimatedInputChars >= 30000) {
+    return 'medium';
+  }
+  return 'low';
+};
+
+const appendUnique = (items: string[], item: string) => {
+  if (!items.includes(item)) {
+    items.push(item);
+  }
+};
+
+const getMessagePayloadChars = (message: AIChatMessage): number =>
+  charCount(message.content)
+  + charCount(message.thinking)
+  + charCount(message.reasoning_content)
+  + (message.tool_calls ? charCount(JSON.stringify(message.tool_calls)) : 0);
+
+export const buildAIContextBudgetSnapshot = ({
+  aiContexts = {},
+  aiChatHistory = {},
+  aiChatSessions = [],
+  activeSessionId = null,
+  sessionId,
+  messageLimit,
+  includeDetails,
+  mcpTools = [],
+  skills = [],
+  userPromptSettings,
+}: BuildAIContextBudgetSnapshotOptions) => {
+  const requestedSessionId = String(sessionId || activeSessionId || '').trim();
+  const allMessages = requestedSessionId ? (aiChatHistory[requestedSessionId] || []) : [];
+  const effectiveMessageLimit = clampNumber(messageLimit, DEFAULT_MESSAGE_LIMIT, 1, MAX_MESSAGE_LIMIT);
+  const inspectedMessages = allMessages.slice(-effectiveMessageLimit);
+  const shouldIncludeDetails = includeDetails !== false;
+  const session = aiChatSessions.find((item) => item.id === requestedSessionId);
+
+  const messageRoleCounts = inspectedMessages.reduce<Record<string, number>>((acc, message) => {
+    acc[message.role] = (acc[message.role] || 0) + 1;
+    return acc;
+  }, {});
+  const messagePayloadChars = inspectedMessages.reduce((sum, message) => sum + getMessagePayloadChars(message), 0);
+  const toolResultChars = inspectedMessages
+    .filter((message) => message.role === 'tool')
+    .reduce((sum, message) => sum + charCount(message.content), 0);
+  const thinkingChars = inspectedMessages.reduce(
+    (sum, message) => sum + charCount(message.thinking) + charCount(message.reasoning_content),
+    0,
+  );
+  const unresolvedToolCallIds = new Set<string>();
+  inspectedMessages.forEach((message) => {
+    (message.tool_calls || []).forEach((toolCall) => unresolvedToolCallIds.add(toolCall.id));
+    if (message.role === 'tool' && message.tool_call_id) {
+      unresolvedToolCallIds.delete(message.tool_call_id);
+    }
+  });
+
+  const contextEntries = Object.entries(aiContexts).flatMap(([contextKey, items]) => (
+    (items || []).map((item) => ({ contextKey, item }))
+  ));
+  const ddlChars = contextEntries.reduce((sum, entry) => sum + charCount(entry.item.ddl), 0);
+  const largestTables = contextEntries
+    .map((entry) => ({
+      contextKey: entry.contextKey,
+      dbName: entry.item.dbName,
+      tableName: entry.item.tableName,
+      ddlChars: charCount(entry.item.ddl),
+    }))
+    .sort((left, right) => right.ddlChars - left.ddlChars)
+    .slice(0, shouldIncludeDetails ? 8 : 3);
+
+  const mcpSchemaChars = mcpTools.reduce((sum, tool) => (
+    sum
+    + charCount(tool.alias)
+    + charCount(tool.description)
+    + charCount(tool.inputSchema ? JSON.stringify(tool.inputSchema) : '')
+  ), 0);
+  const largestMCPTools = [...mcpTools]
+    .map((tool) => ({
+      alias: tool.alias,
+      serverName: tool.serverName,
+      schemaChars: charCount(tool.inputSchema ? JSON.stringify(tool.inputSchema) : ''),
+    }))
+    .sort((left, right) => right.schemaChars - left.schemaChars)
+    .slice(0, shouldIncludeDetails ? 8 : 3);
+
+  const enabledSkills = skills.filter((skill) => skill.enabled);
+  const skillPromptChars = enabledSkills.reduce((sum, skill) => (
+    sum + charCount(skill.name) + charCount(skill.description) + charCount(skill.systemPrompt)
+  ), 0);
+  const userPromptChars = userPromptSettings
+    ? charCount(userPromptSettings.global)
+      + charCount(userPromptSettings.database)
+      + charCount(userPromptSettings.jvm)
+      + charCount(userPromptSettings.jvmDiagnostic)
+    : 0;
+
+  const estimatedInputChars = messagePayloadChars + ddlChars + mcpSchemaChars + skillPromptChars + userPromptChars;
+  const riskLevel = classifyRisk(estimatedInputChars);
+  const warnings: string[] = [];
+  const nextActions: string[] = [];
+
+  if (!requestedSessionId || !session) {
+    appendUnique(warnings, '未找到目标 AI 会话，消息体量统计只覆盖空窗口');
+    appendUnique(nextActions, '先打开或选中目标 AI 会话，再重新调用 inspect_ai_context_budget');
+  }
+  if (riskLevel === 'critical') {
+    appendUnique(warnings, '当前 AI 输入上下文体量达到 critical，可能导致回复慢、截断或模型忽略关键约束');
+  } else if (riskLevel === 'high') {
+    appendUnique(warnings, '当前 AI 输入上下文体量偏高，复杂问题前建议先收窄上下文');
+  }
+  if (ddlChars >= 60000 || contextEntries.length >= 30) {
+    appendUnique(warnings, '已挂载表结构较多或 DDL 较长，可能挤占用户问题和工具结果空间');
+    appendUnique(nextActions, '只保留本轮相关表，必要时改用 inspect_table_bundle 按需读取目标表');
+  }
+  if (messagePayloadChars >= 40000) {
+    appendUnique(warnings, '当前会话最近消息内容较长，可能影响后续回复稳定性');
+    appendUnique(nextActions, '新开会话或先让 AI 总结当前结论，再继续下一轮复杂任务');
+  }
+  if (toolResultChars >= 20000) {
+    appendUnique(warnings, '最近工具结果较长，可能导致后续回答被日志或大结果集稀释');
+    appendUnique(nextActions, '降低 inspect_app_logs / inspect_recent_sql_logs / includeDDL / includeLogLines 的返回量');
+  }
+  if (mcpTools.length >= 40 || mcpSchemaChars >= 30000) {
+    appendUnique(warnings, '当前暴露的 MCP 工具或 schema 较多，模型选择工具时可能更容易走偏');
+    appendUnique(nextActions, '临时禁用无关 MCP 服务，或先调用 inspect_ai_tool_catalog 按关键词收窄工具路线');
+  }
+  if (enabledSkills.length >= 8 || skillPromptChars >= 16000) {
+    appendUnique(warnings, '当前启用 Skills 较多或提示词较长，可能叠加冲突约束');
+    appendUnique(nextActions, '仅保留本轮任务相关 Skills，完成后再恢复其它 Skills');
+  }
+  if (unresolvedToolCallIds.size > 0) {
+    appendUnique(warnings, `最近消息窗口内有 ${unresolvedToolCallIds.size} 个未闭环工具调用`);
+    appendUnique(nextActions, '先调用 inspect_ai_message_flow 确认工具调用是否缺少 tool 结果消息');
+  }
+  if (warnings.length === 0) {
+    appendUnique(nextActions, '当前上下文体量可控，可继续按具体问题调用更窄的结构、日志或 SQL 风险探针');
+  }
+
+  const largestMessages = inspectedMessages
+    .map((message) => ({
+      id: message.id,
+      role: message.role,
+      chars: getMessagePayloadChars(message),
+      preview: shouldIncludeDetails ? previewText(message.content) : undefined,
+    }))
+    .sort((left, right) => right.chars - left.chars)
+    .slice(0, shouldIncludeDetails ? 8 : 3);
+
+  return {
+    requestedSessionId: requestedSessionId || null,
+    activeSessionId,
+    foundSession: Boolean(session),
+    title: session?.title || '',
+    riskLevel,
+    estimatedInputChars,
+    estimatedInputTokens: estimateTokens(estimatedInputChars),
+    messageWindow: {
+      totalMessages: allMessages.length,
+      inspectedMessages: inspectedMessages.length,
+      limit: effectiveMessageLimit,
+      roleCounts: messageRoleCounts,
+      payloadChars: messagePayloadChars,
+      thinkingChars,
+      toolResultChars,
+      unresolvedToolCallCount: unresolvedToolCallIds.size,
+      largestMessages,
+    },
+    schemaContext: {
+      contextCount: Object.keys(aiContexts).length,
+      tableCount: contextEntries.length,
+      ddlChars,
+      estimatedTokens: estimateTokens(ddlChars),
+      largestTables,
+    },
+    toolCatalog: {
+      mcpToolCount: mcpTools.length,
+      mcpSchemaChars,
+      estimatedTokens: estimateTokens(mcpSchemaChars),
+      largestMCPTools,
+    },
+    promptsAndSkills: {
+      userPromptChars,
+      enabledSkillCount: enabledSkills.length,
+      skillPromptChars,
+      estimatedTokens: estimateTokens(userPromptChars + skillPromptChars),
+      enabledSkillNames: enabledSkills.map((skill) => skill.name).slice(0, shouldIncludeDetails ? 20 : 8),
+    },
+    warnings,
+    nextActions,
+  };
+};
diff --git a/frontend/src/components/ai/aiContextInsights.ts b/frontend/src/components/ai/aiContextInsights.ts
new file mode 100644
index 0000000..5e4fc0a
--- /dev/null
+++ b/frontend/src/components/ai/aiContextInsights.ts
@@ -0,0 +1,85 @@
+import type { AIContextItem, SavedConnection } from '../../types';
+
+const DEFAULT_DDL_PREVIEW_LIMIT = 320;
+const DEFAULT_DDL_INCLUDE_LIMIT = 4000;
+
+const normalizeDDLLimit = (input: unknown): number => {
+  const value = Math.floor(Number(input) || DEFAULT_DDL_INCLUDE_LIMIT);
+  if (value < 200) return 200;
+  if (value > 12000) return 12000;
+  return value;
+};
+
+const buildConnectionKey = (activeContext?: { connectionId: string; dbName: string } | null): string =>
+  activeContext?.connectionId ? `${activeContext.connectionId}:${activeContext.dbName || ''}` : 'default';
+
+const sliceText = (value: string, limit: number): { text: string; truncated: boolean; charCount: number } => {
+  const normalized = String(value || '').trim();
+  const visible = normalized.slice(0, limit);
+  return {
+    text: visible,
+    truncated: normalized.length > visible.length,
+    charCount: normalized.length,
+  };
+};
+
+const buildTableContextSnapshot = (params: {
+  item: AIContextItem;
+  includeDDL: boolean;
+  ddlLimit: number;
+}) => {
+  const { item, includeDDL, ddlLimit } = params;
+  const preview = sliceText(item.ddl, DEFAULT_DDL_PREVIEW_LIMIT);
+  const ddl = includeDDL ? sliceText(item.ddl, ddlLimit) : null;
+
+  return {
+    dbName: item.dbName,
+    tableName: item.tableName,
+    ddlPreview: preview.text,
+    ddlPreviewTruncated: preview.truncated,
+    ddlCharCount: preview.charCount,
+    ddl: ddl?.text,
+    ddlTruncated: ddl?.truncated || false,
+  };
+};
+
+export const buildAIContextSnapshot = (params: {
+  activeContext?: { connectionId: string; dbName: string } | null;
+  aiContexts?: Record<string, AIContextItem[]>;
+  connections: SavedConnection[];
+  includeDDL?: boolean;
+  ddlLimit?: unknown;
+}) => {
+  const {
+    activeContext = null,
+    aiContexts = {},
+    connections,
+    includeDDL = false,
+    ddlLimit,
+  } = params;
+  const contextKey = buildConnectionKey(activeContext);
+  const activeContextItems = aiContexts[contextKey] || [];
+  const activeConnection = activeContext?.connectionId
+    ? connections.find((connection) => connection.id === activeContext.connectionId)
+    : undefined;
+
+  return {
+    hasActiveContext: activeContextItems.length > 0,
+    contextKey,
+    connectionId: activeContext?.connectionId || '',
+    connectionName: activeConnection?.name || '',
+    connectionType: activeConnection?.config?.type || '',
+    dbName: activeContext?.dbName || '',
+    tableCount: activeContextItems.length,
+    includeDDL,
+    tables: activeContextItems.map((item) =>
+      buildTableContextSnapshot({
+        item,
+        includeDDL,
+        ddlLimit: normalizeDDLLimit(ddlLimit),
+      })),
+    message: activeContextItems.length > 0
+      ? `当前已关联 ${activeContextItems.length} 张表结构上下文`
+      : '当前没有已关联的 AI 表结构上下文',
+  };
+};
diff --git a/frontend/src/components/ai/aiDatabaseBundleTools.ts b/frontend/src/components/ai/aiDatabaseBundleTools.ts
new file mode 100644
index 0000000..7492287
--- /dev/null
+++ b/frontend/src/components/ai/aiDatabaseBundleTools.ts
@@ -0,0 +1,186 @@
+import type { SavedConnection } from '../../types';
+import { buildRpcConnectionConfig } from '../../utils/connectionRpcConfig';
+import { resolveAITableSchemaToolResult } from '../../utils/aiTableSchemaTool';
+import type { AILocalToolRuntime } from './aiLocalToolRuntime';
+import {
+  buildPreviewSQLForTable,
+  normalizeColumns,
+  normalizeColumnsWithTable,
+  normalizePerTableColumnLimit,
+  normalizePreviewLimit,
+  normalizeTableLimit,
+  normalizeTableList,
+} from './aiDatabaseToolHelpers';
+
+interface DatabaseToolExecutionResult {
+  content: string;
+  success: boolean;
+}
+
+interface InspectDatabaseBundleOptions {
+  args: Record<string, any>;
+  connection: SavedConnection;
+  runtime: AILocalToolRuntime;
+}
+
+export const inspectTableBundle = async ({
+  args,
+  connection,
+  runtime,
+}: InspectDatabaseBundleOptions): Promise<DatabaseToolExecutionResult> => {
+  try {
+    const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+    const safeTable = args.tableName ? String(args.tableName).trim() : '';
+    if (!safeTable) return { content: 'tableName 不能为空', success: false };
+    const includeSampleRows = args.includeSampleRows === true;
+    const sampleLimit = normalizePreviewLimit(args.sampleLimit ?? 10);
+    const rpcConfig = buildRpcConnectionConfig(connection.config) as any;
+    const results = await Promise.allSettled([
+      runtime.getColumns(rpcConfig, safeDbName, safeTable),
+      runtime.getIndexes(rpcConfig, safeDbName, safeTable),
+      runtime.getForeignKeys(rpcConfig, safeDbName, safeTable),
+      runtime.getTriggers(rpcConfig, safeDbName, safeTable),
+      resolveAITableSchemaToolResult({
+        tableName: safeTable,
+        fetchDDL: () => runtime.showCreateTable(rpcConfig, safeDbName, safeTable),
+        fetchColumns: () => runtime.getColumns(rpcConfig, safeDbName, safeTable),
+      }),
+      includeSampleRows
+        ? runtime.query(rpcConfig, safeDbName, buildPreviewSQLForTable(connection, safeTable, sampleLimit))
+        : Promise.resolve(undefined),
+    ]);
+    const warnings: string[] = [];
+    const payload: Record<string, unknown> = {
+      dbName: safeDbName,
+      tableName: safeTable,
+      columns: [],
+      indexes: [],
+      foreignKeys: [],
+      triggers: [],
+      ddl: '',
+    };
+    const columnsResult = results[0];
+    const indexesResult = results[1];
+    const foreignKeysResult = results[2];
+    const triggersResult = results[3];
+    const ddlResult = results[4];
+    const sampleRowsResult = results[5];
+    if (columnsResult.status === 'fulfilled' && columnsResult.value?.success && Array.isArray(columnsResult.value.data)) {
+      payload.columns = normalizeColumns(columnsResult.value.data);
+    } else {
+      warnings.push(`字段列表获取失败：${columnsResult.status === 'fulfilled' ? (columnsResult.value?.message || '未知错误') : String(columnsResult.reason)}`);
+    }
+    if (indexesResult.status === 'fulfilled' && indexesResult.value?.success && Array.isArray(indexesResult.value.data)) {
+      payload.indexes = indexesResult.value.data;
+    } else {
+      warnings.push(`索引定义获取失败：${indexesResult.status === 'fulfilled' ? (indexesResult.value?.message || '未知错误') : String(indexesResult.reason)}`);
+    }
+    if (foreignKeysResult.status === 'fulfilled' && foreignKeysResult.value?.success && Array.isArray(foreignKeysResult.value.data)) {
+      payload.foreignKeys = foreignKeysResult.value.data;
+    } else {
+      warnings.push(`外键关系获取失败：${foreignKeysResult.status === 'fulfilled' ? (foreignKeysResult.value?.message || '未知错误') : String(foreignKeysResult.reason)}`);
+    }
+    if (triggersResult.status === 'fulfilled' && triggersResult.value?.success && Array.isArray(triggersResult.value.data)) {
+      payload.triggers = triggersResult.value.data;
+    } else {
+      warnings.push(`触发器获取失败：${triggersResult.status === 'fulfilled' ? (triggersResult.value?.message || '未知错误') : String(triggersResult.reason)}`);
+    }
+    if (ddlResult.status === 'fulfilled' && ddlResult.value?.success) {
+      payload.ddl = ddlResult.value.content;
+    } else {
+      warnings.push(`DDL 获取失败：${ddlResult.status === 'fulfilled' ? (ddlResult.value?.content || '未知错误') : String(ddlResult.reason)}`);
+    }
+    if (includeSampleRows) {
+      if (sampleRowsResult.status === 'fulfilled' && sampleRowsResult.value?.success) {
+        const rows = Array.isArray(sampleRowsResult.value.data) ? sampleRowsResult.value.data : [];
+        payload.sampleRows = {
+          limit: sampleLimit,
+          rowCount: rows.length,
+          rows: rows.slice(0, sampleLimit),
+        };
+      } else {
+        warnings.push(`样例数据获取失败：${sampleRowsResult.status === 'fulfilled' ? (sampleRowsResult.value?.message || '未知错误') : String(sampleRowsResult.reason)}`);
+      }
+    }
+    if (warnings.length > 0) {
+      payload.warnings = warnings;
+    }
+    return { content: JSON.stringify(payload), success: true };
+  } catch (error: any) {
+    return { content: `获取表结构快照失败: ${error?.message || error}`, success: false };
+  }
+};
+
+export const inspectDatabaseBundle = async ({
+  args,
+  connection,
+  runtime,
+}: InspectDatabaseBundleOptions): Promise<DatabaseToolExecutionResult> => {
+  try {
+    const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+    if (!safeDbName) return { content: 'dbName 不能为空', success: false };
+    const includeColumns = args.includeColumns !== false;
+    const tableLimit = normalizeTableLimit(args.tableLimit);
+    const perTableColumnLimit = normalizePerTableColumnLimit(args.perTableColumnLimit);
+    const rpcConfig = buildRpcConnectionConfig(connection.config) as any;
+    const results = await Promise.allSettled([
+      runtime.getTables(rpcConfig, safeDbName),
+      includeColumns ? runtime.getAllColumns(rpcConfig, safeDbName) : Promise.resolve(undefined),
+    ]);
+    const warnings: string[] = [];
+    const tablesResult = results[0];
+    const allColumnsResult = results[1];
+    const allColumns = allColumnsResult.status === 'fulfilled' && allColumnsResult.value?.success && Array.isArray(allColumnsResult.value.data)
+      ? normalizeColumnsWithTable(allColumnsResult.value.data)
+      : [];
+    const tableNamesFromColumns = Array.from(new Set(allColumns.map((column) => column.tableName).filter(Boolean)));
+    let tableNames: string[] = [];
+    if (tablesResult.status === 'fulfilled' && tablesResult.value?.success && Array.isArray(tablesResult.value.data)) {
+      tableNames = normalizeTableList(tablesResult.value.data).filter(Boolean);
+    } else if (tableNamesFromColumns.length > 0) {
+      tableNames = tableNamesFromColumns;
+      warnings.push(`表列表获取失败，已退回字段摘要推断：${tablesResult.status === 'fulfilled' ? (tablesResult.value?.message || '未知错误') : String(tablesResult.reason)}`);
+    } else {
+      warnings.push(`表列表获取失败：${tablesResult.status === 'fulfilled' ? (tablesResult.value?.message || '未知错误') : String(tablesResult.reason)}`);
+    }
+    if (includeColumns && allColumnsResult.status === 'fulfilled' && (!allColumnsResult.value?.success || !Array.isArray(allColumnsResult.value.data))) {
+      warnings.push(`字段摘要获取失败：${allColumnsResult.value?.message || '未知错误'}`);
+    } else if (includeColumns && allColumnsResult.status === 'rejected') {
+      warnings.push(`字段摘要获取失败：${String(allColumnsResult.reason)}`);
+    }
+    const uniqueTableNames = Array.from(new Set(tableNames.filter(Boolean)));
+    const visibleTableNames = uniqueTableNames.slice(0, tableLimit);
+    const columnsByTable = new Map<string, ReturnType<typeof normalizeColumnsWithTable>>();
+    allColumns.forEach((column) => {
+      const tableName = String(column.tableName || '').trim();
+      if (!tableName) return;
+      const current = columnsByTable.get(tableName) || [];
+      current.push(column);
+      columnsByTable.set(tableName, current);
+    });
+    const payload: Record<string, unknown> = {
+      dbName: safeDbName,
+      tableCount: uniqueTableNames.length,
+      totalColumns: allColumns.length,
+      tables: visibleTableNames,
+      truncatedTables: uniqueTableNames.length > visibleTableNames.length,
+    };
+    if (includeColumns) {
+      payload.tableSummaries = visibleTableNames.map((tableName) => {
+        const tableColumns = columnsByTable.get(tableName) || [];
+        return {
+          tableName,
+          columnCount: tableColumns.length,
+          truncatedColumns: tableColumns.length > perTableColumnLimit,
+          columns: tableColumns.slice(0, perTableColumnLimit),
+        };
+      });
+    }
+    if (warnings.length > 0) {
+      payload.warnings = warnings;
+    }
+    return { content: JSON.stringify(payload), success: true };
+  } catch (error: any) {
+    return { content: `获取数据库结构总览失败: ${error?.message || error}`, success: false };
+  }
+};
diff --git a/frontend/src/components/ai/aiDatabaseToolExecutor.ts b/frontend/src/components/ai/aiDatabaseToolExecutor.ts
new file mode 100644
index 0000000..b6dbbd5
--- /dev/null
+++ b/frontend/src/components/ai/aiDatabaseToolExecutor.ts
@@ -0,0 +1,290 @@
+import type { SavedConnection } from '../../types';
+import { buildRpcConnectionConfig } from '../../utils/connectionRpcConfig';
+import { buildAIReadonlyPreviewSQL } from '../../utils/aiSqlLimit';
+import { resolveAITableSchemaToolResult } from '../../utils/aiTableSchemaTool';
+import type { AILocalToolRuntime, AIToolContextEntry } from './aiLocalToolRuntime';
+import {
+  buildPreviewSQLForTable,
+  normalizeColumns,
+  normalizeColumnsWithTable,
+  normalizePreviewLimit,
+  normalizeTableList,
+} from './aiDatabaseToolHelpers';
+import { inspectDatabaseBundle, inspectTableBundle } from './aiDatabaseBundleTools';
+
+interface ExecuteDatabaseToolCallOptions {
+  toolName: string;
+  args: Record<string, any>;
+  connections: SavedConnection[];
+  toolContextMap: Map<string, AIToolContextEntry>;
+  runtime: AILocalToolRuntime;
+}
+
+interface ToolExecutionResult {
+  content: string;
+  success: boolean;
+}
+
+const findConnection = (connections: SavedConnection[], connectionId: string) =>
+  connections.find((connection) => connection.id === connectionId);
+
+const resolveConnectionOrFailure = (
+  connections: SavedConnection[],
+  connectionId: string,
+): { connection: SavedConnection | null; failure?: ToolExecutionResult } => {
+  const connection = findConnection(connections, connectionId);
+  if (!connection) {
+    return {
+      connection: null,
+      failure: {
+        content: 'Connection not found',
+        success: false,
+      },
+    };
+  }
+  return { connection };
+};
+
+export async function executeDatabaseToolCall(
+  options: ExecuteDatabaseToolCallOptions,
+): Promise<ToolExecutionResult | null> {
+  const { toolName, args, connections, toolContextMap, runtime } = options;
+
+  switch (toolName) {
+    case 'get_connections': {
+      const availableConnections = connections.map((connection) => ({
+        id: connection.id,
+        name: connection.name,
+        type: connection.config?.type,
+        host: (connection.config as any)?.host || (connection.config as any)?.addr || '',
+      }));
+      return {
+        content: JSON.stringify(availableConnections),
+        success: true,
+      };
+    }
+    case 'get_databases': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const result = await runtime.getDatabases(buildRpcConnectionConfig(resolved.connection.config) as any);
+        if (result?.success && Array.isArray(result.data)) {
+          let databaseNames = result.data.map((row: any) => row.Database || row.database || Object.values(row)[0]);
+          if (databaseNames.length > 50) {
+            databaseNames = [...databaseNames.slice(0, 50), '...(截断)'];
+          }
+          return { content: JSON.stringify(databaseNames), success: true };
+        }
+        return { content: result?.message || 'Failed to fetch DBs', success: false };
+      } catch (error: any) {
+        return { content: `获取数据库列表失败: ${error?.message || error}`, success: false };
+      }
+    }
+    case 'get_tables': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const rawDbName = args.dbName || args.database;
+        const safeDbName = rawDbName ? String(rawDbName).trim() : '';
+        const result = await runtime.getTables(buildRpcConnectionConfig(resolved.connection.config) as any, safeDbName);
+        if (result?.success && Array.isArray(result.data)) {
+          let tableNames = normalizeTableList(result.data);
+          if (tableNames.length > 150) {
+            tableNames = [...tableNames.slice(0, 150), '...(截断)'];
+          }
+          toolContextMap.set(`${args.connectionId}:${safeDbName}`, {
+            connectionId: args.connectionId,
+            dbName: safeDbName,
+            tables: tableNames.filter((tableName) => tableName !== '...(截断)'),
+          });
+          return { content: JSON.stringify(tableNames), success: true };
+        }
+        return { content: result?.message || 'Failed to fetch Tables', success: false };
+      } catch (error: any) {
+        return { content: `获取表列表失败: ${error?.message || error}`, success: false };
+      }
+    }
+    case 'get_all_columns': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+        const result = await runtime.getAllColumns(buildRpcConnectionConfig(resolved.connection.config) as any, safeDbName);
+        if (result?.success && Array.isArray(result.data)) {
+          const allColumns = normalizeColumnsWithTable(result.data);
+          const tableNames = Array.from(new Set(allColumns.map((column) => column.tableName).filter(Boolean)));
+          const limitedColumns = allColumns.slice(0, 400);
+          return {
+            content: JSON.stringify({
+              dbName: safeDbName,
+              tableCount: tableNames.length,
+              totalColumns: allColumns.length,
+              truncated: allColumns.length > limitedColumns.length,
+              columns: limitedColumns,
+            }),
+            success: true,
+          };
+        }
+        return { content: result?.message || 'Failed to fetch all columns', success: false };
+      } catch (error: any) {
+        return { content: `获取全库字段摘要失败: ${error?.message || error}`, success: false };
+      }
+    }
+    case 'get_columns': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+        const safeTable = args.tableName ? String(args.tableName).trim() : '';
+        const result = await runtime.getColumns(buildRpcConnectionConfig(resolved.connection.config) as any, safeDbName, safeTable);
+        if (result?.success && Array.isArray(result.data)) {
+          const columns = normalizeColumns(result.data);
+          const fieldNames = columns.map((column) => column.field).join(', ');
+          return {
+            content: `⚠️ 以下为 ${safeTable} 表的真实字段列表。生成 SQL 时只能使用这些 field 值作为列名，必须原样使用，禁止修改、缩写或自行拼凑字段名。\n可用字段：${fieldNames}\n详细信息：${JSON.stringify(columns)}`,
+            success: true,
+          };
+        }
+        return { content: result?.message || 'Failed to fetch columns', success: false };
+      } catch (error: any) {
+        return { content: `获取字段列表失败: ${error?.message || error}`, success: false };
+      }
+    }
+    case 'get_indexes': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+        const safeTable = args.tableName ? String(args.tableName).trim() : '';
+        const result = await runtime.getIndexes(buildRpcConnectionConfig(resolved.connection.config) as any, safeDbName, safeTable);
+        return {
+          content: result?.success && Array.isArray(result.data) ? JSON.stringify(result.data) : (result?.message || 'Failed to fetch indexes'),
+          success: !!result?.success && Array.isArray(result.data),
+        };
+      } catch (error: any) {
+        return { content: `获取索引定义失败: ${error?.message || error}`, success: false };
+      }
+    }
+    case 'get_foreign_keys': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+        const safeTable = args.tableName ? String(args.tableName).trim() : '';
+        const result = await runtime.getForeignKeys(buildRpcConnectionConfig(resolved.connection.config) as any, safeDbName, safeTable);
+        return {
+          content: result?.success && Array.isArray(result.data) ? JSON.stringify(result.data) : (result?.message || 'Failed to fetch foreign keys'),
+          success: !!result?.success && Array.isArray(result.data),
+        };
+      } catch (error: any) {
+        return { content: `获取外键关系失败: ${error?.message || error}`, success: false };
+      }
+    }
+    case 'get_triggers': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+        const safeTable = args.tableName ? String(args.tableName).trim() : '';
+        const result = await runtime.getTriggers(buildRpcConnectionConfig(resolved.connection.config) as any, safeDbName, safeTable);
+        return {
+          content: result?.success && Array.isArray(result.data) ? JSON.stringify(result.data) : (result?.message || 'Failed to fetch triggers'),
+          success: !!result?.success && Array.isArray(result.data),
+        };
+      } catch (error: any) {
+        return { content: `获取触发器定义失败: ${error?.message || error}`, success: false };
+      }
+    }
+    case 'get_table_ddl': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+        const safeTable = args.tableName ? String(args.tableName).trim() : '';
+        const rpcConfig = buildRpcConnectionConfig(resolved.connection.config) as any;
+        const result = await resolveAITableSchemaToolResult({
+          tableName: safeTable,
+          fetchDDL: () => runtime.showCreateTable(rpcConfig, safeDbName, safeTable),
+          fetchColumns: () => runtime.getColumns(rpcConfig, safeDbName, safeTable),
+        });
+        return { content: result.content, success: result.success };
+      } catch (error: any) {
+        return { content: `获取建表语句失败: ${error?.message || error}`, success: false };
+      }
+    }
+    case 'inspect_table_bundle': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      return inspectTableBundle({ args, connection: resolved.connection, runtime });
+    }
+    case 'inspect_database_bundle': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      return inspectDatabaseBundle({ args, connection: resolved.connection, runtime });
+    }
+    case 'preview_table_rows': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+        const safeTable = args.tableName ? String(args.tableName).trim() : '';
+        if (!safeTable) return { content: 'tableName 不能为空', success: false };
+        const safeLimit = normalizePreviewLimit(args.limit);
+        const previewSQL = buildPreviewSQLForTable(resolved.connection, safeTable, safeLimit);
+        const result = await runtime.query(buildRpcConnectionConfig(resolved.connection.config) as any, safeDbName, previewSQL);
+        if (result?.success) {
+          const rows = Array.isArray(result.data) ? result.data : [];
+          return {
+            content: JSON.stringify({
+              dbName: safeDbName,
+              tableName: safeTable,
+              limit: safeLimit,
+              rowCount: rows.length,
+              rows: rows.slice(0, safeLimit),
+            }),
+            success: true,
+          };
+        }
+        return { content: result?.message || 'Failed to preview table rows', success: false };
+      } catch (error: any) {
+        return { content: `预览表样例数据失败: ${error?.message || error}`, success: false };
+      }
+    }
+    case 'execute_sql': {
+      const resolved = resolveConnectionOrFailure(connections, args.connectionId);
+      if (resolved.failure || !resolved.connection) return resolved.failure || null;
+      try {
+        const safeDbName = args.dbName ? String(args.dbName).trim() : '';
+        const safeSql = args.sql ? String(args.sql).trim() : '';
+        if (typeof runtime.checkSQL === 'function') {
+          const checkResult = await runtime.checkSQL(safeSql);
+          if (checkResult && checkResult.allowed === false) {
+            return {
+              content: `安全策略拦截：当前安全级别不允许执行 ${checkResult.operationType} 类型的 SQL。请将 SQL 展示给用户，让用户手动执行。`,
+              success: false,
+            };
+          }
+        }
+        const finalSql = buildAIReadonlyPreviewSQL(
+          resolved.connection.config?.type || '',
+          safeSql,
+          50,
+          resolved.connection.config?.driver || '',
+        );
+        const result = await runtime.query(buildRpcConnectionConfig(resolved.connection.config) as any, safeDbName, finalSql);
+        if (result?.success) {
+          const rows = Array.isArray(result.data) ? result.data : [];
+          return {
+            content: JSON.stringify({ rowCount: rows.length, data: rows.slice(0, 50) }),
+            success: true,
+          };
+        }
+        return { content: result?.message || 'SQL 执行失败', success: false };
+      } catch (error: any) {
+        return { content: `SQL 执行异常: ${error?.message || error}`, success: false };
+      }
+    }
+    default:
+      return null;
+  }
+}
diff --git a/frontend/src/components/ai/aiDatabaseToolHelpers.ts b/frontend/src/components/ai/aiDatabaseToolHelpers.ts
new file mode 100644
index 0000000..89b2324
--- /dev/null
+++ b/frontend/src/components/ai/aiDatabaseToolHelpers.ts
@@ -0,0 +1,60 @@
+import type { SavedConnection } from '../../types';
+import { buildPaginatedSelectSQL, quoteQualifiedIdent } from '../../utils/sql';
+
+export const normalizeTableList = (rows: any[]): string[] =>
+  rows.map((row) => row.Table || row.table || (Object.values(row)[0] as string));
+
+export const normalizeColumns = (rows: any[]) =>
+  rows.map((column) => {
+    const keys = Object.keys(column);
+    return {
+      field: column.Field || column.field || column.COLUMN_NAME || column.column_name || column.Name || column.name || (keys.length > 0 ? column[keys[0]] : ''),
+      type: column.Type || column.type || column.DATA_TYPE || column.data_type || (keys.length > 1 ? column[keys[1]] : ''),
+      nullable: column.Null || column.null || column.IS_NULLABLE || column.is_nullable || column.Nullable || column.nullable || '',
+      default: column.Default || column.default || column.COLUMN_DEFAULT || column.column_default || column.DefaultValue || '',
+      comment: column.Comment || column.comment || column.COLUMN_COMMENT || column.column_comment || column.Description || '',
+    };
+  });
+
+export const normalizeColumnsWithTable = (rows: any[]) =>
+  rows.map((column) => {
+    const keys = Object.keys(column);
+    return {
+      tableName: column.TableName || column.tableName || column.TABLE_NAME || column.table_name || (keys.length > 0 ? column[keys[0]] : ''),
+      name: column.Name || column.name || column.COLUMN_NAME || column.column_name || (keys.length > 1 ? column[keys[1]] : ''),
+      type: column.Type || column.type || column.DATA_TYPE || column.data_type || (keys.length > 2 ? column[keys[2]] : ''),
+      comment: column.Comment || column.comment || column.COLUMN_COMMENT || column.column_comment || '',
+    };
+  });
+
+export const normalizePreviewLimit = (input: unknown): number => {
+  const value = Math.floor(Number(input) || 20);
+  if (value < 1) return 1;
+  if (value > 100) return 100;
+  return value;
+};
+
+export const normalizeTableLimit = (input: unknown): number => {
+  const value = Math.floor(Number(input) || 80);
+  if (value < 1) return 1;
+  if (value > 200) return 200;
+  return value;
+};
+
+export const normalizePerTableColumnLimit = (input: unknown): number => {
+  const value = Math.floor(Number(input) || 8);
+  if (value < 1) return 1;
+  if (value > 30) return 30;
+  return value;
+};
+
+export const buildPreviewSQLForTable = (connection: SavedConnection, tableName: string, limit: number): string => {
+  const dbType = String(connection.config?.type || '').trim();
+  return buildPaginatedSelectSQL(
+    dbType,
+    `SELECT * FROM ${quoteQualifiedIdent(dbType, tableName)}`,
+    '',
+    limit,
+    0,
+  );
+};
diff --git a/frontend/src/components/ai/aiExternalSqlFileInsights.test.ts b/frontend/src/components/ai/aiExternalSqlFileInsights.test.ts
new file mode 100644
index 0000000..553a39b
--- /dev/null
+++ b/frontend/src/components/ai/aiExternalSqlFileInsights.test.ts
@@ -0,0 +1,69 @@
+import { describe, expect, it } from 'vitest';
+
+import type { ExternalSQLDirectory, SavedConnection, TabData } from '../../types';
+import { buildExternalSQLFileSnapshot } from './aiExternalSqlFileInsights';
+
+const connections: SavedConnection[] = [
+  {
+    id: 'conn-1',
+    name: '本地开发库',
+    config: {
+      type: 'mysql',
+      host: '127.0.0.1',
+      port: 3306,
+      user: 'root',
+    },
+  },
+];
+
+describe('aiExternalSqlFileInsights', () => {
+  it('builds a file snapshot with directory metadata, open tab context, and truncated content preview', () => {
+    const externalSQLDirectories: ExternalSQLDirectory[] = [
+      {
+        id: 'dir-1',
+        name: '报表脚本',
+        path: 'D:/sql/reports',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        createdAt: 1,
+      },
+    ];
+    const tabs: TabData[] = [
+      {
+        id: 'tab-1',
+        title: 'daily.sql',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        filePath: 'D:/sql/reports/daily.sql',
+        query: 'select 1',
+      },
+    ];
+
+    const snapshot = buildExternalSQLFileSnapshot({
+      filePath: 'D:/sql/reports/daily.sql',
+      previewCharLimit: 12,
+      readResult: {
+        content: 'SELECT * FROM orders WHERE status = \'paid\';',
+        filePath: 'D:/sql/reports/daily.sql',
+        name: 'daily.sql',
+      },
+      externalSQLDirectories,
+      connections,
+      tabs,
+    });
+
+    expect(snapshot.hasMatchedDirectory).toBe(true);
+    expect(snapshot.directory).toMatchObject({
+      name: '报表脚本',
+      connectionName: '本地开发库',
+      connectionType: 'mysql',
+      dbName: 'crm',
+    });
+    expect(snapshot.hasOpenTab).toBe(true);
+    expect(snapshot.openTabCount).toBe(1);
+    expect(snapshot.fileName).toBe('daily.sql');
+    expect(snapshot.contentPreview).toBe('SELECT * FRO');
+    expect(snapshot.truncated).toBe(true);
+  });
+});
diff --git a/frontend/src/components/ai/aiExternalSqlFileInsights.ts b/frontend/src/components/ai/aiExternalSqlFileInsights.ts
new file mode 100644
index 0000000..2370283
--- /dev/null
+++ b/frontend/src/components/ai/aiExternalSqlFileInsights.ts
@@ -0,0 +1,116 @@
+import type { ExternalSQLDirectory, SavedConnection, TabData } from '../../types';
+import {
+  findBestMatchingExternalSQLDirectory,
+  normalizeExternalSQLPath,
+} from './aiExternalSqlPathUtils';
+
+const normalizePreviewCharLimit = (input: unknown): number => {
+  const value = Math.floor(Number(input) || 12000);
+  if (value < 1) return 1;
+  if (value > 40000) return 40000;
+  return value;
+};
+
+const normalizeFileReadPayload = (
+  readResult: unknown,
+): {
+  content: string;
+  filePath: string;
+  name: string;
+  isLargeFile: boolean;
+  fileSize: number;
+  fileSizeMB: string;
+} => {
+  if (typeof readResult === 'string') {
+    return {
+      content: readResult,
+      filePath: '',
+      name: '',
+      isLargeFile: false,
+      fileSize: 0,
+      fileSizeMB: '',
+    };
+  }
+  if (!readResult || typeof readResult !== 'object') {
+    return {
+      content: '',
+      filePath: '',
+      name: '',
+      isLargeFile: false,
+      fileSize: 0,
+      fileSizeMB: '',
+    };
+  }
+  const payload = readResult as Record<string, unknown>;
+  return {
+    content: typeof payload.content === 'string' ? payload.content : '',
+    filePath: String(payload.filePath || '').trim(),
+    name: String(payload.name || '').trim(),
+    isLargeFile: payload.isLargeFile === true,
+    fileSize: Number(payload.fileSize || 0),
+    fileSizeMB: String(payload.fileSizeMB || '').trim(),
+  };
+};
+
+export const buildExternalSQLFileSnapshot = (params: {
+  filePath: unknown;
+  previewCharLimit?: unknown;
+  readResult?: unknown;
+  externalSQLDirectories?: ExternalSQLDirectory[];
+  connections: SavedConnection[];
+  tabs?: TabData[];
+}) => {
+  const {
+    filePath,
+    previewCharLimit,
+    readResult,
+    externalSQLDirectories = [],
+    connections,
+    tabs = [],
+  } = params;
+
+  const requestedFilePath = normalizeExternalSQLPath(filePath);
+  const payload = normalizeFileReadPayload(readResult);
+  const resolvedFilePath = normalizeExternalSQLPath(payload.filePath || requestedFilePath);
+  const matchedDirectory = findBestMatchingExternalSQLDirectory(resolvedFilePath, externalSQLDirectories);
+  const matchedConnection = connections.find((item) => item.id === matchedDirectory?.connectionId);
+  const matchingTabs = tabs.filter(
+    (tab) => normalizeExternalSQLPath(tab.filePath || '').toLowerCase() === resolvedFilePath.toLowerCase(),
+  );
+  const previewLimit = normalizePreviewCharLimit(previewCharLimit);
+  const previewContent = payload.content.slice(0, previewLimit);
+  const inferredName = payload.name || resolvedFilePath.split('/').filter(Boolean).pop() || '';
+
+  return {
+    requestedFilePath,
+    resolvedFilePath,
+    fileName: inferredName,
+    previewCharLimit: previewLimit,
+    hasMatchedDirectory: Boolean(matchedDirectory),
+    directory: matchedDirectory ? {
+      id: matchedDirectory.id,
+      name: matchedDirectory.name,
+      path: matchedDirectory.path,
+      connectionId: matchedDirectory.connectionId || '',
+      connectionName: matchedConnection?.name || '',
+      connectionType: matchedConnection?.config?.type || '',
+      dbName: matchedDirectory.dbName || '',
+    } : null,
+    hasOpenTab: matchingTabs.length > 0,
+    openTabCount: matchingTabs.length,
+    openTabs: matchingTabs.slice(0, 5).map((tab) => ({
+      tabId: tab.id,
+      title: tab.title,
+      dbName: tab.dbName || '',
+      connectionId: tab.connectionId || '',
+      isActiveFileTab: true,
+    })),
+    isLargeFile: payload.isLargeFile,
+    fileSize: payload.fileSize,
+    fileSizeMB: payload.fileSizeMB,
+    hasContentPreview: previewContent.length > 0,
+    truncated: payload.content.length > previewContent.length,
+    contentPreview: previewContent,
+    contentLength: payload.content.length,
+  };
+};
diff --git a/frontend/src/components/ai/aiExternalSqlInsights.test.ts b/frontend/src/components/ai/aiExternalSqlInsights.test.ts
new file mode 100644
index 0000000..91d0e23
--- /dev/null
+++ b/frontend/src/components/ai/aiExternalSqlInsights.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from 'vitest';
+
+import type { ExternalSQLDirectory, SavedConnection, TabData } from '../../types';
+import { buildExternalSQLDirectoriesSnapshot } from './aiExternalSqlInsights';
+
+const connections: SavedConnection[] = [
+  {
+    id: 'conn-1',
+    name: '本地开发库',
+    config: {
+      type: 'mysql',
+      host: '127.0.0.1',
+      port: 3306,
+      user: 'root',
+    },
+  },
+];
+
+describe('aiExternalSqlInsights', () => {
+  it('filters configured external sql directories and reports matching open file tabs', () => {
+    const externalSQLDirectories: ExternalSQLDirectory[] = [
+      {
+        id: 'dir-1',
+        name: '报表脚本',
+        path: 'D:/sql/reports',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        createdAt: 2,
+      },
+      {
+        id: 'dir-2',
+        name: '运维脚本',
+        path: 'D:/sql/ops',
+        createdAt: 1,
+      },
+    ];
+    const tabs: TabData[] = [
+      {
+        id: 'tab-1',
+        title: '日报.sql',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        filePath: 'D:/sql/reports/daily.sql',
+        query: 'select 1',
+      },
+      {
+        id: 'tab-2',
+        title: '用户.sql',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        filePath: 'D:/sql/reports/users/detail.sql',
+        query: 'select 2',
+      },
+    ];
+
+    const snapshot = buildExternalSQLDirectoriesSnapshot({
+      externalSQLDirectories,
+      connections,
+      tabs,
+      keyword: '报表',
+    });
+
+    expect(snapshot.totalMatched).toBe(1);
+    expect(snapshot.returnedDirectories).toBe(1);
+    expect(snapshot.totalOpenExternalSqlTabs).toBe(2);
+    expect(snapshot.boundConnectionCount).toBe(1);
+    expect(snapshot.directories[0]).toMatchObject({
+      id: 'dir-1',
+      connectionName: '本地开发库',
+      connectionType: 'mysql',
+      dbName: 'crm',
+      openFileTabCount: 2,
+      hasBoundConnection: true,
+    });
+    expect(snapshot.directories[0].openFileTitles[0].title).toBe('日报.sql');
+  });
+});
diff --git a/frontend/src/components/ai/aiExternalSqlInsights.ts b/frontend/src/components/ai/aiExternalSqlInsights.ts
new file mode 100644
index 0000000..c4c909b
--- /dev/null
+++ b/frontend/src/components/ai/aiExternalSqlInsights.ts
@@ -0,0 +1,105 @@
+import type { ExternalSQLDirectory, SavedConnection, TabData } from '../../types';
+import {
+  isExternalSQLPathInsideDirectory,
+} from './aiExternalSqlPathUtils';
+
+const normalizeLimit = (input: unknown, fallback: number, max: number): number => {
+  const value = Math.floor(Number(input) || fallback);
+  if (value < 1) return 1;
+  if (value > max) return max;
+  return value;
+};
+
+const normalizeKeyword = (input: unknown): string => String(input || '').trim().toLowerCase();
+
+const matchesKeyword = (keyword: string, fields: Array<string | undefined>): boolean => {
+  if (!keyword) {
+    return true;
+  }
+  return fields.some((field) => String(field || '').toLowerCase().includes(keyword));
+};
+
+export const buildExternalSQLDirectoriesSnapshot = (params: {
+  externalSQLDirectories?: ExternalSQLDirectory[];
+  connections: SavedConnection[];
+  tabs?: TabData[];
+  keyword?: unknown;
+  connectionId?: unknown;
+  dbName?: unknown;
+  limit?: unknown;
+}) => {
+  const {
+    externalSQLDirectories = [],
+    connections,
+    tabs = [],
+    keyword,
+    connectionId,
+    dbName,
+    limit,
+  } = params;
+
+  const safeKeyword = normalizeKeyword(keyword);
+  const safeConnectionId = String(connectionId || '').trim();
+  const safeDbName = String(dbName || '').trim();
+  const safeLimit = normalizeLimit(limit, 20, 100);
+  const externalSqlTabs = tabs.filter((tab) => String(tab.filePath || '').trim());
+
+  const filteredDirectories = [...externalSQLDirectories]
+    .sort((left, right) => Number(right.createdAt || 0) - Number(left.createdAt || 0))
+    .filter((directory) => {
+      if (safeConnectionId && String(directory.connectionId || '').trim() !== safeConnectionId) {
+        return false;
+      }
+      if (safeDbName && String(directory.dbName || '').trim() !== safeDbName) {
+        return false;
+      }
+      const connection = connections.find((item) => item.id === directory.connectionId);
+      return matchesKeyword(safeKeyword, [
+        directory.id,
+        directory.name,
+        directory.path,
+        directory.connectionId,
+        directory.dbName,
+        connection?.name,
+        connection?.config?.type,
+      ]);
+    });
+
+  const visibleDirectories = filteredDirectories.slice(0, safeLimit).map((directory) => {
+    const connection = connections.find((item) => item.id === directory.connectionId);
+    const matchingTabs = externalSqlTabs.filter((tab) => isExternalSQLPathInsideDirectory(String(tab.filePath || ''), directory.path));
+
+    return {
+      id: directory.id,
+      name: directory.name,
+      path: directory.path,
+      connectionId: directory.connectionId || '',
+      connectionName: connection?.name || '',
+      connectionType: connection?.config?.type || '',
+      dbName: directory.dbName || '',
+      createdAt: Number(directory.createdAt || 0),
+      hasBoundConnection: Boolean(String(directory.connectionId || '').trim()),
+      openFileTabCount: matchingTabs.length,
+      openFileTitles: matchingTabs.slice(0, 5).map((tab) => ({
+        tabId: tab.id,
+        title: tab.title,
+        filePath: tab.filePath || '',
+        dbName: tab.dbName || '',
+      })),
+    };
+  });
+
+  return {
+    keyword: safeKeyword,
+    connectionId: safeConnectionId,
+    dbName: safeDbName,
+    limit: safeLimit,
+    totalMatched: filteredDirectories.length,
+    returnedDirectories: visibleDirectories.length,
+    truncated: filteredDirectories.length > visibleDirectories.length,
+    totalConfiguredDirectories: externalSQLDirectories.length,
+    totalOpenExternalSqlTabs: externalSqlTabs.length,
+    boundConnectionCount: filteredDirectories.filter((item) => String(item.connectionId || '').trim()).length,
+    directories: visibleDirectories,
+  };
+};
diff --git a/frontend/src/components/ai/aiExternalSqlPathUtils.ts b/frontend/src/components/ai/aiExternalSqlPathUtils.ts
new file mode 100644
index 0000000..5d6ef05
--- /dev/null
+++ b/frontend/src/components/ai/aiExternalSqlPathUtils.ts
@@ -0,0 +1,29 @@
+import type { ExternalSQLDirectory } from '../../types';
+
+export const normalizeExternalSQLPath = (input: unknown): string =>
+  String(input || '').trim().replace(/\\/g, '/').replace(/\/+$/u, '');
+
+export const isExternalSQLPathInsideDirectory = (filePath: string, directoryPath: string): boolean => {
+  if (!filePath || !directoryPath) {
+    return false;
+  }
+  const normalizedFilePath = normalizeExternalSQLPath(filePath).toLowerCase();
+  const normalizedDirectoryPath = normalizeExternalSQLPath(directoryPath).toLowerCase();
+  if (!normalizedFilePath || !normalizedDirectoryPath) {
+    return false;
+  }
+  return normalizedFilePath === normalizedDirectoryPath || normalizedFilePath.startsWith(`${normalizedDirectoryPath}/`);
+};
+
+export const findBestMatchingExternalSQLDirectory = (
+  filePath: string,
+  directories: ExternalSQLDirectory[],
+): ExternalSQLDirectory | undefined => {
+  const normalizedFilePath = normalizeExternalSQLPath(filePath).toLowerCase();
+  if (!normalizedFilePath) {
+    return undefined;
+  }
+  return [...directories]
+    .filter((directory) => isExternalSQLPathInsideDirectory(normalizedFilePath, directory.path))
+    .sort((left, right) => normalizeExternalSQLPath(right.path).length - normalizeExternalSQLPath(left.path).length)[0];
+};
diff --git a/frontend/src/components/ai/aiLastRenderErrorInsights.ts b/frontend/src/components/ai/aiLastRenderErrorInsights.ts
new file mode 100644
index 0000000..4b31f83
--- /dev/null
+++ b/frontend/src/components/ai/aiLastRenderErrorInsights.ts
@@ -0,0 +1,56 @@
+const DEFAULT_PREVIEW_LIMIT = 240;
+const DEFAULT_STACK_LIMIT = 1200;
+
+const truncateText = (value: unknown, limit: number) => {
+  const text = String(value || '');
+  if (!text) {
+    return '';
+  }
+  return text.length > limit ? `${text.slice(0, limit)}...` : text;
+};
+
+const resolveGlobalRenderError = () => {
+  const globalRecord = globalThis as Record<string, unknown>;
+  const direct = globalRecord.__gonaviLastAIMessageRenderError;
+  if (direct && typeof direct === 'object') {
+    return direct as Record<string, unknown>;
+  }
+
+  const rootWindow = globalRecord.window as Record<string, unknown> | undefined;
+  const fromWindow = rootWindow?.__gonaviLastAIMessageRenderError;
+  if (fromWindow && typeof fromWindow === 'object') {
+    return fromWindow as Record<string, unknown>;
+  }
+
+  return null;
+};
+
+export const buildAILastRenderErrorSnapshot = () => {
+  const renderError = resolveGlobalRenderError();
+  if (!renderError) {
+    return {
+      hasError: false,
+      summary: '当前还没有记录到 AI 消息渲染异常。',
+      nextActions: [
+        '如果用户反馈 AI 某条消息空白、白块或只出现局部报错，再重新触发问题后读取这里。',
+        '如果是整块 AI 面板异常，再结合 inspect_ai_setup_health 和 inspect_app_logs 一起看。',
+      ],
+    };
+  }
+
+  return {
+    hasError: true,
+    summary: '已记录到最近一次 AI 消息渲染异常，可据此定位是哪条消息、哪段渲染逻辑和报错栈摘要。',
+    messageId: String(renderError.messageId || ''),
+    role: String(renderError.role || ''),
+    recordedAt: typeof renderError.recordedAt === 'number' ? renderError.recordedAt : null,
+    contentPreview: truncateText(renderError.contentPreview, DEFAULT_PREVIEW_LIMIT),
+    errorMessage: truncateText(renderError.message, DEFAULT_PREVIEW_LIMIT),
+    stackPreview: truncateText(renderError.stack, DEFAULT_STACK_LIMIT),
+    componentStackPreview: truncateText(renderError.componentStack, DEFAULT_STACK_LIMIT),
+    nextActions: [
+      '先按 messageId 和 contentPreview 对照当前会话，确认是哪条气泡触发的渲染异常。',
+      '如果需要继续缩小范围，再结合最近一次用户输入、工具结果和相关组件代码排查。',
+    ],
+  };
+};
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.aiConfigInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.aiConfigInspection.test.ts
new file mode 100644
index 0000000..cc2f8e5
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.aiConfigInspection.test.ts
@@ -0,0 +1,501 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor AI config inspection tools', () => {
+  it('returns the current ai runtime snapshot so the model can inspect provider, safety, skills, and tools', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_runtime', {}),
+      connections: [buildConnection()],
+      mcpTools: [{
+        alias: 'browser_open',
+        originalName: 'browser_open',
+        serverId: 'server-1',
+        serverName: 'browser',
+        title: '打开浏览器',
+        description: '打开页面',
+      }],
+      skills: [{
+        id: 'skill-1',
+        name: '结构审查',
+        systemPrompt: '先核对字段',
+        enabled: true,
+        scopes: ['database'],
+        requiredTools: ['get_columns'],
+      }],
+      dynamicModels: ['gpt-5.4', 'gpt-4.1'],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getAIRuntimeState: vi.fn().mockResolvedValue({
+          activeProviderId: 'provider-1',
+          providers: [{
+            id: 'provider-1',
+            type: 'openai',
+            name: 'OpenAI 主账号',
+            apiKey: '',
+            hasSecret: true,
+            baseUrl: 'https://api.openai.com/v1',
+            model: 'gpt-5.4',
+            models: ['gpt-5.4', 'gpt-4.1'],
+            maxTokens: 32000,
+            temperature: 0.2,
+          }],
+          safetyLevel: 'readonly',
+          contextLevel: 'with_samples',
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"hasActiveProvider":true');
+    expect(result.content).toContain('"name":"OpenAI 主账号"');
+    expect(result.content).toContain('"safetyLevel":"readonly"');
+    expect(result.content).toContain('"contextLevel":"with_samples"');
+    expect(result.content).toContain('"enabledSkillCount":1');
+    expect(result.content).toContain('"alias":"browser_open"');
+    expect(result.content).toContain('"builtinToolCount":');
+  });
+
+  it('returns the current ai safety snapshot so the model can inspect write boundaries and readonly guards', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_safety', {}),
+      connections: [{
+        id: 'jvm-1',
+        name: 'JVM 诊断环境',
+        config: {
+          type: 'jvm',
+          host: '10.0.0.8',
+          port: 0,
+          user: '',
+          jvm: {
+            environment: 'uat',
+            readOnly: true,
+            diagnostic: {
+              transport: 'agent-bridge',
+              allowObserveCommands: true,
+              allowTraceCommands: true,
+              allowMutatingCommands: false,
+            },
+          },
+        },
+      }],
+      tabs: [{
+        id: 'diag-tab-1',
+        title: 'JVM 诊断',
+        type: 'jvm-diagnostic',
+        connectionId: 'jvm-1',
+        readOnly: true,
+      }],
+      activeTabId: 'diag-tab-1',
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getAIRuntimeState: vi.fn().mockResolvedValue({
+          safetyLevel: 'readwrite',
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"safetyLevel":"readwrite"');
+    expect(result.content).toContain('"allowDML":true');
+    expect(result.content).toContain('"allowDDL":false');
+    expect(result.content).toContain('"readOnly":true');
+    expect(result.content).toContain('"allowMutatingCommands":false');
+    expect(result.content).toContain('allowMutating=true');
+  });
+
+  it('returns the current ai provider snapshot so the model can inspect provider readiness and model selection', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_providers', {}),
+      connections: [buildConnection()],
+      mcpTools: [],
+      dynamicModels: ['gpt-5.4', 'gpt-4.1-mini'],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getAIRuntimeState: vi.fn().mockResolvedValue({
+          activeProviderId: 'provider-1',
+          providers: [
+            {
+              id: 'provider-1',
+              type: 'openai',
+              name: 'OpenAI 主账号',
+              apiKey: '',
+              hasSecret: true,
+              baseUrl: 'https://api.openai.com/v1',
+              model: 'gpt-5.4',
+              models: ['gpt-5.4', 'gpt-4.1'],
+              maxTokens: 32000,
+              temperature: 0.2,
+            },
+            {
+              id: 'provider-2',
+              type: 'custom',
+              name: '自建代理',
+              apiKey: '',
+              hasSecret: false,
+              baseUrl: '',
+              model: '',
+              models: [],
+              headers: {
+                Authorization: 'Bearer secret-token',
+              },
+              maxTokens: 16000,
+              temperature: 0.7,
+            },
+          ],
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"providerCount":2');
+    expect(result.content).toContain('"missingSecretCount":1');
+    expect(result.content).toContain('"name":"OpenAI 主账号"');
+    expect(result.content).toContain('"name":"自建代理"');
+    expect(result.content).toContain('"issues":["missing_secret","missing_base_url","missing_selected_model","missing_declared_models"]');
+    expect(result.content).not.toContain('secret-token');
+  });
+
+  it('returns the current chat readiness snapshot so the model can inspect why ai input cannot send yet', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_chat_readiness', {}),
+      connections: [buildConnection()],
+      mcpTools: [],
+      dynamicModels: ['gpt-5.5', 'gpt-4.1-mini'],
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'demo',
+      },
+      aiContexts: {
+        'conn-1:demo': [{
+          dbName: 'demo',
+          tableName: 'orders',
+          ddl: 'CREATE TABLE orders (...)',
+        }],
+      },
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getAIRuntimeState: vi.fn().mockResolvedValue({
+          activeProviderId: 'provider-1',
+          providers: [{
+            id: 'provider-1',
+            type: 'openai',
+            name: 'OpenAI 主账号',
+            apiKey: '',
+            hasSecret: true,
+            baseUrl: 'https://api.openai.com/v1',
+            model: '',
+            models: ['gpt-5.5', 'gpt-4.1-mini'],
+            maxTokens: 32000,
+            temperature: 0.2,
+          }],
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"status":"missing_model"');
+    expect(result.content).toContain('"contextAttachedCount":1');
+    expect(result.content).toContain('"selectableModelCount":2');
+    expect(result.content).toContain('OpenAI 主账号');
+  });
+
+  it('returns the ai tool catalog so the model can choose probes and build arguments', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_tool_catalog', {
+        keyword: 'mcp',
+        limit: 8,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [{
+        alias: 'github_create_issue',
+        originalName: 'create_issue',
+        serverId: 'github-server',
+        serverName: 'GitHub',
+        title: '创建 Issue',
+        description: 'Create a GitHub issue',
+        inputSchema: {
+          type: 'object',
+          required: ['owner', 'repo', 'title'],
+          properties: {
+            owner: { type: 'string', description: '仓库 owner' },
+            repo: { type: 'string', description: '仓库名' },
+            title: { type: 'string', description: 'Issue 标题' },
+          },
+        },
+      }],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"keyword":"mcp"');
+    expect(result.content).toContain('新增 MCP 填写指引');
+    expect(result.content).toContain('"name":"inspect_mcp_draft"');
+    expect(result.content).toContain('"name":"fullCommand"');
+    expect(result.content).toContain('"alias":"github_create_issue"');
+    expect(result.content).toContain('"requiredParameters":["owner","repo","title"]');
+    expect(result.content).toContain('调用带参数工具前');
+  });
+
+  it('returns the current mcp setup snapshot so the model can inspect configured servers and client install state', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_mcp_setup', {}),
+      connections: [buildConnection()],
+      mcpTools: [{
+        alias: 'browser_open',
+        originalName: 'browser_open',
+        serverId: 'server-1',
+        serverName: 'Browser',
+        title: '打开页面',
+        description: '打开页面',
+      }],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getMCPServers: vi.fn().mockResolvedValue([
+          {
+            id: 'server-1',
+            name: 'Browser',
+            transport: 'stdio',
+            command: 'uvx',
+            args: ['mcp-server-browser'],
+            env: {
+              OPENAI_API_KEY: '***',
+            },
+            enabled: true,
+            timeoutSeconds: 20,
+          },
+          {
+            id: 'server-2',
+            name: 'Broken',
+            transport: 'stdio',
+            command: '',
+            args: [],
+            env: {},
+            enabled: true,
+            timeoutSeconds: 1,
+          },
+        ]),
+        getMCPClientInstallStatuses: vi.fn().mockResolvedValue([
+          {
+            client: 'codex',
+            displayName: 'Codex',
+            installed: true,
+            matchesCurrent: false,
+            clientDetected: true,
+            clientCommand: 'codex',
+            clientPath: 'C:/Tools/codex.exe',
+            configPath: 'C:/Users/demo/.codex/config.toml',
+            command: 'gonavi-mcp-server',
+            args: ['stdio'],
+            message: '检测到旧的 GoNavi 路径',
+          },
+        ]),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"serverCount":2');
+    expect(result.content).toContain('"name":"Browser"');
+    expect(result.content).toContain('"launchCommandPreview":"uvx mcp-server-browser"');
+    expect(result.content).toContain('"serverConfigurationIssueCount":2');
+    expect(result.content).toContain('"serversWithConfigurationErrors":1');
+    expect(result.content).toContain('"key":"command-missing"');
+    expect(result.content).toContain('"displayName":"Codex"');
+    expect(result.content).toContain('"launchCommandPreview":"gonavi-mcp-server stdio"');
+  });
+
+  it('returns the builtin mcp authoring guide so the model can explain how to fill command, args, env, and templates', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_mcp_authoring_guide', {}),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"supportsWholeCommandAutoSplit":true');
+    expect(result.content).toContain('"fullCommandPasteExample":"$env:GITHUB_TOKEN=...; uvx mcp-server-github --stdio"');
+    expect(result.content).toContain('"title":"启动命令"');
+    expect(result.content).toContain('"example":"npx / node / uvx / python / docker"');
+    expect(result.content).toContain('PowerShell $env:KEY=VALUE;');
+    expect(result.content).toContain('"title":"npx 包"');
+    expect(result.content).toContain('"exampleLaunchPreview":"npx -y @modelcontextprotocol/server-filesystem --stdio"');
+    expect(result.content).toContain('"title":"uvx 工具"');
+    expect(result.content).toContain('"exampleLaunchPreview":"uvx some-mcp-server"');
+  });
+
+  it('validates an mcp draft with the real command splitter and server validator', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_mcp_draft', {
+        fullCommand: '$env:GITHUB_TOKEN="ghp test"; uvx mcp-server-github --stdio',
+        timeoutSeconds: 45,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"command":"uvx"');
+    expect(result.content).toContain('"args":["mcp-server-github","--stdio"]');
+    expect(result.content).toContain('"envKeys":["GITHUB_TOKEN"]');
+    expect(result.content).toContain('"envHints"');
+    expect(result.content).toContain('"label":"GitHub Token"');
+    expect(result.content).toContain('"secretLikeCount":1');
+    expect(result.content).toContain('"launchCommandPreview":"uvx mcp-server-github --stdio"');
+    expect(result.content).toContain('"suggestedServerSeed"');
+    expect(result.content).toContain('"name":"mcp-server-github"');
+    expect(result.content).toContain('"env":{"GITHUB_TOKEN":"***"}');
+    expect(result.content).toContain('"fullCommand":"GITHUB_TOKEN=*** uvx mcp-server-github --stdio"');
+    expect(result.content).not.toContain('ghp test');
+    expect(result.content).toContain('"recommendedTemplate":{"key":"uvx"');
+    expect(result.content).toContain('"canSave":true');
+  });
+
+  it('returns MCP argument hints and redacts sensitive inline argument values', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_mcp_draft', {
+        fullCommand: 'uvx mcp-server-demo --stdio --api-key=sk-real-secret --directory D:\\Work',
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"argumentHints"');
+    expect(result.content).toContain('"argumentDetailHints"');
+    expect(result.content).toContain('"businessHints"');
+    expect(result.content).toContain('"argument":"--api-key"');
+    expect(result.content).toContain('"label":"API Key"');
+    expect(result.content).toContain('"sensitive":true');
+    expect(result.content).toContain('"argument":"--directory"');
+    expect(result.content).toContain('"label":"授权目录"');
+    expect(result.content).toContain('"label":"授权目录的值"');
+    expect(result.content).toContain('"argsRedacted":true');
+    expect(result.content).toContain('"--api-key=***"');
+    expect(result.content).not.toContain('sk-real-secret');
+  });
+
+  it('returns mcp tool input schemas so the model can build arguments from discovered tool metadata', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_mcp_tool_schema', {
+        alias: 'github_create_issue',
+      }),
+      connections: [buildConnection()],
+      mcpTools: [{
+        alias: 'github_create_issue',
+        originalName: 'create_issue',
+        serverId: 'github-server',
+        serverName: 'GitHub',
+        title: '创建 Issue',
+        description: 'Create a GitHub issue',
+        inputSchema: {
+          type: 'object',
+          required: ['owner', 'repo', 'title'],
+          properties: {
+            owner: { type: 'string', description: '仓库 owner' },
+            repo: { type: 'string', description: '仓库名' },
+            title: { type: 'string', description: 'Issue 标题' },
+            state: { type: 'string', enum: ['open', 'closed'] },
+          },
+        },
+      }],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"alias":"github_create_issue"');
+    expect(result.content).toContain('"requiredParameters":["owner","repo","title"]');
+    expect(result.content).toContain('"path":"state"');
+    expect(result.content).toContain('"enumValues":["open","closed"]');
+    expect(result.content).toContain('调用 github_create_issue 前必须提供：owner, repo, title');
+  });
+
+  it('returns the current ai guidance snapshot so the model can inspect active prompts and enabled skills', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_guidance', {}),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      userPromptSettings: {
+        global: '回答前先核对上下文。',
+        database: '生成 SQL 时只读优先。',
+        jvm: '',
+        jvmDiagnostic: '',
+      },
+      skills: [{
+        id: 'skill-1',
+        name: '结构审查',
+        description: '优先核对字段',
+        systemPrompt: '先看字段和索引，再给结论。',
+        enabled: true,
+        scopes: ['database'],
+        requiredTools: ['get_columns'],
+      }],
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"customPromptCount":2');
+    expect(result.content).toContain('"scope":"global"');
+    expect(result.content).toContain('回答前先核对上下文');
+    expect(result.content).toContain('"enabledSkillCount":1');
+    expect(result.content).toContain('"name":"结构审查"');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.aiSetupHealth.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.aiSetupHealth.test.ts
new file mode 100644
index 0000000..2d54b7e
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.aiSetupHealth.test.ts
@@ -0,0 +1,115 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_ai_setup_health', () => {
+  it('returns an actionable ai setup health snapshot for diagnosing provider, mcp, and guidance issues together', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_setup_health', {}),
+      connections: [buildConnection()],
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      aiContexts: {
+        'conn-1:crm': [],
+      },
+      mcpTools: [],
+      skills: [{
+        id: 'skill-1',
+        name: '结构审查',
+        description: '优先核对字段',
+        systemPrompt: '先看字段和索引，再给结论。',
+        enabled: true,
+        scopes: ['database'],
+        requiredTools: ['get_columns'],
+      }],
+      userPromptSettings: {
+        global: '回答前先核对上下文。',
+        database: '',
+        jvm: '',
+        jvmDiagnostic: '',
+      },
+      dynamicModels: ['gpt-5.4', 'gpt-4.1'],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getAIRuntimeState: vi.fn().mockResolvedValue({
+          activeProviderId: 'provider-1',
+          providers: [{
+            id: 'provider-1',
+            type: 'openai',
+            name: 'OpenAI 主账号',
+            apiKey: '',
+            hasSecret: true,
+            baseUrl: 'https://api.openai.com/v1',
+            model: 'gpt-5.4',
+            models: ['gpt-5.4', 'gpt-4.1'],
+            maxTokens: 32000,
+            temperature: 0.2,
+          }],
+          safetyLevel: 'readonly',
+          contextLevel: 'schema_only',
+        }),
+        getMCPServers: vi.fn().mockResolvedValue([
+          {
+            id: 'server-1',
+            name: 'Browser',
+            transport: 'stdio',
+            command: 'uvx',
+            args: ['mcp-server-browser'],
+            env: {},
+            enabled: true,
+            timeoutSeconds: 20,
+          },
+        ]),
+        getMCPClientInstallStatuses: vi.fn().mockResolvedValue([
+          {
+            client: 'codex',
+            displayName: 'Codex',
+            installed: false,
+            matchesCurrent: false,
+            clientDetected: true,
+            clientCommand: 'codex',
+            clientPath: 'C:/Tools/codex.exe',
+            configPath: 'C:/Users/demo/.codex/config.toml',
+            command: 'gonavi-mcp-server',
+            args: ['stdio'],
+            message: '未检测到 Codex 用户级 GoNavi MCP 配置',
+          },
+        ]),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"status":"needs_attention"');
+    expect(result.content).toContain('"activeProviderName":"OpenAI 主账号"');
+    expect(result.content).toContain('"chatStatus":"ready"');
+    expect(result.content).toContain('"enabledMCPServerCount":1');
+    expect(result.content).toContain('"currentExternalClientCount":0');
+    expect(result.content).toContain('如需让外部 Agent 使用 GoNavi MCP');
+    expect(result.content).toContain('当前聊天已就绪，但还没有挂载任何表结构上下文');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.aiUpstreamLogInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.aiUpstreamLogInspection.test.ts
new file mode 100644
index 0000000..a9ced1b
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.aiUpstreamLogInspection.test.ts
@@ -0,0 +1,182 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildToolCall = (
+  name: string,
+  args: Record<string, unknown>,
+): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_ai_upstream_logs', () => {
+  it('returns sanitized upstream request payloads and request lifecycle summaries from gonavi.log', async () => {
+    const readAppLogTail = vi.fn().mockResolvedValue({
+      success: true,
+      data: {
+        logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+        keyword: 'openai',
+        requestedLineLimit: 160,
+        fileWindowTruncated: false,
+        matchedLinesTruncated: false,
+        lines: [
+          '2026/06/11 11:20:00.000000 [INFO] AI 上游请求开始：requestId=openai-123 provider=openai method=POST endpoint=https://api.example.com/v1/chat/completions?key=[REDACTED] body={"model":"gpt-5.5","messages":[{"role":"user","content":"hello"}],"api_key":"[REDACTED]"}',
+          '2026/06/11 11:20:01.000000 [INFO] AI 上游请求完成：requestId=openai-123 provider=openai endpoint=https://api.example.com/v1/chat/completions?key=[REDACTED] status=200 duration=981ms',
+          '2026/06/11 11:20:02.000000 [WARN] AI 上游请求失败：requestId=gemini-456 provider=gemini endpoint=https://generativelanguage.googleapis.com duration=2s err=upstream Authorization Bearer abcdefghijklmnopqrstuvwxyz failed',
+        ],
+      },
+    });
+
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_upstream_logs', {
+        provider: 'openai',
+        includeBody: true,
+      }),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readAppLogTail,
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(readAppLogTail).toHaveBeenCalledWith(160, 'openai');
+    expect(result.content).toContain('"logPath":"C:/Users/demo/.GoNavi/Logs/gonavi.log"');
+    expect(result.content).toContain('"upstreamEventCount":2');
+    expect(result.content).toContain('"requestId":"openai-123"');
+    expect(result.content).toContain('"provider":"openai"');
+    expect(result.content).toContain('"state":"completed"');
+    expect(result.content).toContain('"status":200');
+    expect(result.content).toContain('"bodyPreview"');
+    expect(result.content).toContain('gpt-5.5');
+    expect(result.content).toContain('"bodySummary"');
+    expect(result.content).toContain('"messageCount":1');
+    expect(result.content).toContain('"toolCount":0');
+    expect(result.content).not.toContain('abcdefghijklmnopqrstuvwxyz');
+  });
+
+  it('summarizes payload shape without exposing prompt content when body preview is disabled', async () => {
+    const readAppLogTail = vi.fn().mockResolvedValue({
+      success: true,
+      data: {
+        logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+        keyword: 'AI 上游请求',
+        requestedLineLimit: 160,
+        lines: [
+          '2026/06/11 13:20:00.000000 [INFO] AI 上游请求开始：requestId=openai-tools-123 provider=openai method=POST endpoint=https://api.example.com/v1/chat/completions body={"model":"gpt-5.5","stream":true,"messages":[{"role":"system","content":"system secret password=abc123"},{"role":"user","content":"user private text"}],"tools":[{"type":"function","function":{"name":"inspect_app_health","description":"inspect app","parameters":{"type":"object","properties":{}}}}],"tool_choice":"auto","response_format":{"type":"json_object"},"api_key":"sk-should-not-leak"}',
+          '2026/06/11 13:20:01.000000 [INFO] AI 上游请求完成：requestId=openai-tools-123 provider=openai endpoint=https://api.example.com/v1/chat/completions status=200 duration=981ms',
+        ],
+      },
+    });
+
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_upstream_logs', {
+        includeBody: false,
+      }),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readAppLogTail,
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(readAppLogTail).toHaveBeenCalledWith(160, 'AI 上游请求');
+    expect(result.content).toContain('"payloadSummaryEnabled":true');
+    expect(result.content).not.toContain('"bodyPreview"');
+    expect(result.content).not.toContain('password=abc123');
+    expect(result.content).not.toContain('user private text');
+    expect(result.content).not.toContain('sk-should-not-leak');
+    expect(result.content).toContain('"bodySummary"');
+    expect(result.content).toContain('"model":"gpt-5.5"');
+    expect(result.content).toContain('"messageCount":2');
+    expect(result.content).toContain('"system":1');
+    expect(result.content).toContain('"user":1');
+    expect(result.content).toContain('"toolCount":1');
+    expect(result.content).toContain('"toolNames":["inspect_app_health"]');
+    expect(result.content).toContain('"hasStream":true');
+    expect(result.content).toContain('"hasToolChoice":true');
+    expect(result.content).toContain('"hasResponseFormat":true');
+  });
+
+  it('returns an actionable empty-state message when no upstream request log is available', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_upstream_logs', {
+        requestId: 'openai-missing',
+      }),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readAppLogTail: vi.fn().mockResolvedValue({
+          success: true,
+          data: {
+            logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+            keyword: 'openai-missing',
+            requestedLineLimit: 160,
+            lines: [],
+          },
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"upstreamEventCount":0');
+    expect(result.content).toContain('请先发送一次 AI 消息');
+    expect(result.content).toContain('扩大 lineLimit');
+  });
+
+  it('summarizes CLI upstream requests that complete without an HTTP status code', async () => {
+    const readAppLogTail = vi.fn().mockResolvedValue({
+      success: true,
+      data: {
+        logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+        keyword: 'ClaudeCLI',
+        requestedLineLimit: 160,
+        lines: [
+          '2026/06/11 12:20:00.000000 [INFO] AI 上游请求开始：requestId=claudecli-123 provider=ClaudeCLI method=CLI endpoint=https://proxy.example.com/api/anthropic body={"command":"claude","args":["-p","[prompt logged separately]"],"prompt":"hello","has_api_key":true}',
+          '2026/06/11 12:20:01.000000 [INFO] AI 上游请求完成：requestId=claudecli-123 provider=ClaudeCLI endpoint=https://proxy.example.com/api/anthropic duration=981ms',
+        ],
+      },
+    });
+
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_upstream_logs', {
+        provider: 'ClaudeCLI',
+        includeBody: true,
+      }),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readAppLogTail,
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(readAppLogTail).toHaveBeenCalledWith(160, 'ClaudeCLI');
+    expect(result.content).toContain('"requestId":"claudecli-123"');
+    expect(result.content).toContain('"provider":"ClaudeCLI"');
+    expect(result.content).toContain('"method":"CLI"');
+    expect(result.content).toContain('"state":"completed"');
+    expect(result.content).toContain('"duration":"981ms"');
+    expect(result.content).toContain('"hasBody":true');
+    expect(result.content).not.toContain('"status":0');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.appHealthInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.appHealthInspection.test.ts
new file mode 100644
index 0000000..e736014
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.appHealthInspection.test.ts
@@ -0,0 +1,124 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_app_health', () => {
+  afterEach(() => {
+    delete (globalThis as Record<string, unknown>).__gonaviLastAIMessageRenderError;
+  });
+
+  it('returns an app-level health snapshot across ai setup, logs, connection failures, and workspace tabs', async () => {
+    (globalThis as Record<string, unknown>).__gonaviLastAIMessageRenderError = {
+      messageId: 'msg-render-1',
+      role: 'assistant',
+      contentPreview: '这是一条触发渲染异常的 AI 回复预览',
+      message: 'Cannot read properties of undefined',
+      stack: 'TypeError: Cannot read properties of undefined\n    at AIMessageBubble.tsx:12:3',
+      componentStack: '\n    at AIMessageBubble\n    at AIChatPanelConversationView',
+      recordedAt: 1780700000000,
+    };
+
+    const readAppLogTail = vi.fn()
+      .mockResolvedValueOnce({
+        success: true,
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          requestedLineLimit: 120,
+          lines: [
+            '2026/06/10 09:00:00.000000 [INFO] started',
+            '2026/06/10 09:00:01.000000 [ERROR] MCP server boot failed',
+          ],
+        },
+      })
+      .mockResolvedValueOnce({
+        success: true,
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          requestedLineLimit: 120,
+          lines: [
+            '2026/06/10 09:01:00.000000 [ERROR] 建立数据库连接失败：类型=mysql 地址=127.0.0.1:3306 数据库=crm 用户=root；错误链：连接建立后验证失败：127.0.0.1:3306 验证失败: Error 1064 (42000): syntax error',
+          ],
+        },
+      });
+
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_app_health', {
+        lineLimit: 120,
+      }),
+      connections: [buildConnection()],
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      tabs: [{
+        id: 'query-1',
+        title: '订单查询',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'select * from orders',
+      }],
+      activeTabId: 'query-1',
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getAIRuntimeState: vi.fn().mockResolvedValue({
+          activeProviderId: 'provider-1',
+          providers: [{
+            id: 'provider-1',
+            type: 'openai',
+            name: 'OpenAI 主账号',
+            apiKey: '',
+            hasSecret: true,
+            baseUrl: 'https://api.openai.com/v1',
+            model: 'gpt-5.4',
+            models: ['gpt-5.4'],
+            maxTokens: 32000,
+            temperature: 0.2,
+          }],
+          safetyLevel: 'readonly',
+          contextLevel: 'schema_only',
+        }),
+        getMCPServers: vi.fn().mockResolvedValue([]),
+        getMCPClientInstallStatuses: vi.fn().mockResolvedValue([]),
+        readAppLogTail,
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"status":"degraded"');
+    expect(result.content).toContain('"activeProviderName":"OpenAI 主账号"');
+    expect(result.content).toContain('"appLogErrorCount":1');
+    expect(result.content).toContain('"recentConnectionFailureCount":1');
+    expect(result.content).toContain('"activeTabTitle":"订单查询"');
+    expect(result.content).toContain('"hasLastAIMessageRenderError":true');
+    expect(result.content).toContain('"lastAIMessageRenderErrorId":"msg-render-1"');
+    expect(result.content).toContain('"messageId":"msg-render-1"');
+    expect(result.content).toContain('inspect_ai_last_render_error');
+    expect(result.content).toContain('inspect_recent_connection_failures');
+    expect(readAppLogTail).toHaveBeenCalledWith(120, '');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.appLogInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.appLogInspection.test.ts
new file mode 100644
index 0000000..0f588dc
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.appLogInspection.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildToolCall = (
+  name: string,
+  args: Record<string, unknown>,
+): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_app_logs', () => {
+  it('returns the recent app-log snapshot so the model can diagnose startup and connection failures from real logs', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_app_logs', {
+        keyword: 'mysql',
+        lineLimit: 20,
+      }),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readAppLogTail: vi.fn().mockResolvedValue({
+          success: true,
+          data: {
+            logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+            keyword: 'mysql',
+            requestedLineLimit: 20,
+            fileWindowTruncated: false,
+            matchedLinesTruncated: false,
+            lines: [
+              '2026/06/09 10:00:02.000000 [ERROR] mysql dial failed: connect timeout',
+            ],
+          },
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"logPath":"C:/Users/demo/.GoNavi/Logs/gonavi.log"');
+    expect(result.content).toContain('"keyword":"mysql"');
+    expect(result.content).toContain('"ERROR":1');
+    expect(result.content).toContain('connect timeout');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.codebaseHotspots.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.codebaseHotspots.test.ts
new file mode 100644
index 0000000..818e63d
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.codebaseHotspots.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '本地开发库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+describe('aiLocalToolExecutor inspect_codebase_hotspots', () => {
+  it('returns frontend large-file hotspots and refactor test targets without source content', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_codebase_hotspots', {
+        keyword: 'QueryEditor',
+        minLines: 1000,
+        limit: 5,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.toolName).toBe('inspect_codebase_hotspots');
+    expect(result.content).toContain('"kind":"codebase_hotspots"');
+    expect(result.content).toContain('frontend/src/components/QueryEditor.tsx');
+    expect(result.content).toContain('"riskLevel":"critical"');
+    expect(result.content).toContain('"readiness":"readyToExtract"');
+    expect(result.content).toContain('"preferredNextSlice":"编辑器工具栏"');
+    expect(result.content).toContain('工具栏 JSX 可通过 props 透传状态和回调');
+    expect(result.content).toContain('事务状态条');
+    expect(result.content).toContain('QueryEditor.result-panel.test.tsx');
+    expect(result.content).toContain('QueryEditor.external-sql-save.test.tsx');
+    expect(result.content).toContain('浏览器打开 SQL 编辑器');
+    expect(result.content).not.toContain('import React');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.connectionFailureInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.connectionFailureInspection.test.ts
new file mode 100644
index 0000000..36f7316
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.connectionFailureInspection.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildToolCall = (
+  name: string,
+  args: Record<string, unknown>,
+): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_recent_connection_failures', () => {
+  it('returns a structured snapshot for recent connection failures, cooldown hits, and compatibility errors', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_recent_connection_failures', {
+        keyword: 'mysql',
+        lineLimit: 120,
+      }),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readAppLogTail: vi.fn().mockResolvedValue({
+          success: true,
+          data: {
+            logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+            keyword: 'mysql',
+            requestedLineLimit: 120,
+            lines: [
+              '2026/06/07 15:50:35.000000 [ERROR] 建立数据库连接失败：类型=mysql 地址=127.0.0.1:48749 数据库=(default) 用户=root；错误链：连接建立后验证失败：127.0.0.1:48749 [默认兼容参数] 验证失败: Error 1064 (42000): You have an error in your SQL syntax near \'%2Cutf8\' at line 1',
+              '2026/06/07 15:50:36.000000 [WARN] 命中数据库连接失败冷却：类型=mysql 地址=127.0.0.1:48749 数据库=(default) 用户=root 剩余=29s 原因=连接建立后验证失败：127.0.0.1:48749 [禁用 multiStatements 兼容重试] 验证失败: Error 1064 (42000): You have an error in your SQL syntax near \'%2Cutf8\' at line 1',
+            ],
+          },
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"primaryCategory":"parameter_compatibility"');
+    expect(result.content).toContain('"cooldownHitCount":1');
+    expect(result.content).toContain('127.0.0.1:48749');
+    expect(result.content).toContain('multiStatements');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.connectionInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.connectionInspection.test.ts
new file mode 100644
index 0000000..928d211
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.connectionInspection.test.ts
@@ -0,0 +1,219 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor connection inspection tools', () => {
+  it('returns the current connection snapshot so the model can inspect host, db, and ssh state', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_current_connection', {}),
+      connections: [{
+        id: 'conn-1',
+        name: '主库',
+        config: {
+          type: 'mysql',
+          host: '10.188.101.184',
+          port: 1523,
+          user: 'glzc',
+          database: 'crm',
+          useSSH: true,
+          ssh: {
+            host: '192.168.66.28',
+            port: 22,
+            user: 'wyeye',
+          },
+        },
+      }],
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      tabs: [{
+        id: 'tab-query-1',
+        title: '订单分析',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'select * from orders limit 20',
+      }],
+      activeTabId: 'tab-query-1',
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"hasActiveConnection":true');
+    expect(result.content).toContain('"connectionName":"主库"');
+    expect(result.content).toContain('"host":"10.188.101.184"');
+    expect(result.content).toContain('"port":1523');
+    expect(result.content).toContain('"activeDbName":"crm"');
+    expect(result.content).toContain('"useSSH":true');
+    expect(result.content).toContain('"sshHost":"192.168.66.28"');
+    expect(result.content).toContain('"activeTabType":"query"');
+  });
+
+  it('returns the current connection capability snapshot so the model can inspect supported UI actions', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_connection_capabilities', {}),
+      connections: [{
+        id: 'conn-1',
+        name: '分析库',
+        config: {
+          type: 'clickhouse',
+          host: '10.10.1.30',
+          port: 8123,
+          user: 'default',
+          database: 'analytics',
+        },
+      }],
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'analytics',
+      },
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"connectionName":"分析库"');
+    expect(result.content).toContain('"resolvedType":"clickhouse"');
+    expect(result.content).toContain('"supportsCreateDatabase":true');
+    expect(result.content).toContain('"supportsRenameDatabase":false');
+    expect(result.content).toContain('"forceReadOnlyQueryResult":true');
+    expect(result.content).toContain('force_readonly_query_result');
+  });
+
+  it('returns the local saved connections snapshot so the model can find matching data sources by type or keyword', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_saved_connections', {
+        type: 'mysql',
+        keyword: '订单',
+      }),
+      connections: [
+        {
+          id: 'conn-1',
+          name: '订单主库',
+          config: {
+            type: 'mysql',
+            host: '10.10.1.18',
+            port: 3306,
+            user: 'root',
+            database: 'crm',
+            useSSH: true,
+            ssh: {
+              host: '192.168.1.8',
+              port: 22,
+              user: 'ops',
+            },
+          },
+        },
+        {
+          id: 'conn-2',
+          name: '分析仓库',
+          config: {
+            type: 'postgres',
+            host: '10.10.1.20',
+            port: 5432,
+            user: 'analyst',
+            database: 'dw',
+          },
+        },
+      ],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"totalMatched":1');
+    expect(result.content).toContain('"typeBreakdown":{"mysql":1}');
+    expect(result.content).toContain('"name":"订单主库"');
+    expect(result.content).toContain('"useSSH":true');
+    expect(result.content).not.toContain('分析仓库');
+  });
+
+  it('returns a Redis topology snapshot with Sentinel and Cluster risks', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_redis_topology', {
+        keyword: '订单',
+      }),
+      connections: [
+        {
+          id: 'redis-sentinel',
+          name: '订单 Redis Sentinel',
+          config: {
+            type: 'redis',
+            host: 'sentinel-a.local',
+            port: 6379,
+            hosts: ['sentinel-b.local:26379'],
+            topology: 'sentinel',
+            user: 'app',
+            password: 'redis-secret',
+            redisSentinelPassword: 'sentinel-secret',
+          },
+          hasRedisSentinelPassword: true,
+        },
+        {
+          id: 'redis-cluster',
+          name: '缓存集群',
+          config: {
+            type: 'redis',
+            host: '10.10.1.10',
+            port: 6379,
+            user: '',
+            topology: 'cluster',
+            hosts: ['10.10.1.11:6379'],
+            redisDB: 3,
+            useSSH: true,
+          },
+        },
+      ],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"totalRedisConnections":2');
+    expect(result.content).toContain('"totalMatched":1');
+    expect(result.content).toContain('"topology":"sentinel"');
+    expect(result.content).toContain('Sentinel master 名称为空');
+    expect(result.content).toContain('Sentinel 主地址端口是 6379');
+    expect(result.content).not.toContain('redis-secret');
+    expect(result.content).not.toContain('sentinel-secret');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.externalSqlInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.externalSqlInspection.test.ts
new file mode 100644
index 0000000..69df613
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.externalSqlInspection.test.ts
@@ -0,0 +1,161 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, ExternalSQLDirectory, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor external SQL inspection tools', () => {
+  it('returns configured external sql directories so the model can locate local script assets', async () => {
+    const externalSQLDirectories: ExternalSQLDirectory[] = [
+      {
+        id: 'dir-1',
+        name: '报表脚本',
+        path: 'D:/sql/reports',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        createdAt: 2,
+      },
+      {
+        id: 'dir-2',
+        name: '运维脚本',
+        path: 'D:/sql/ops',
+        createdAt: 1,
+      },
+    ];
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_external_sql_directories', {
+        keyword: '报表',
+      }),
+      connections: [buildConnection()],
+      tabs: [
+        {
+          id: 'tab-1',
+          title: '日报.sql',
+          type: 'query',
+          connectionId: 'conn-1',
+          dbName: 'crm',
+          filePath: 'D:/sql/reports/daily.sql',
+          query: 'select 1',
+        },
+      ],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      externalSQLDirectories,
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"totalMatched":1');
+    expect(result.content).toContain('"name":"报表脚本"');
+    expect(result.content).toContain('"connectionName":"主库"');
+    expect(result.content).toContain('"openFileTabCount":1');
+    expect(result.content).toContain('日报.sql');
+    expect(result.content).not.toContain('运维脚本');
+  });
+
+  it('reads a configured external sql file so the model can inspect script content directly', async () => {
+    const readSQLFile = vi.fn().mockResolvedValue({
+      success: true,
+      data: {
+        content: 'SELECT * FROM orders WHERE status = \'paid\';',
+        filePath: 'D:/sql/reports/daily.sql',
+        name: 'daily.sql',
+      },
+    });
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_external_sql_file', {
+        filePath: 'D:/sql/reports/daily.sql',
+        previewCharLimit: 18,
+      }),
+      connections: [buildConnection()],
+      tabs: [
+        {
+          id: 'tab-1',
+          title: 'daily.sql',
+          type: 'query',
+          connectionId: 'conn-1',
+          dbName: 'crm',
+          filePath: 'D:/sql/reports/daily.sql',
+          query: 'select 1',
+        },
+      ],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      externalSQLDirectories: [
+        {
+          id: 'dir-1',
+          name: '报表脚本',
+          path: 'D:/sql/reports',
+          connectionId: 'conn-1',
+          dbName: 'crm',
+          createdAt: 1,
+        },
+      ],
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readSQLFile,
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(readSQLFile).toHaveBeenCalledWith('D:/sql/reports/daily.sql');
+    expect(result.content).toContain('"fileName":"daily.sql"');
+    expect(result.content).toContain('"connectionName":"主库"');
+    expect(result.content).toContain('"hasOpenTab":true');
+    expect(result.content).toContain('SELECT * FROM orde');
+  });
+
+  it('blocks external sql file reads outside configured directories', async () => {
+    const readSQLFile = vi.fn();
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_external_sql_file', {
+        filePath: 'D:/private/secret.sql',
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      externalSQLDirectories: [
+        {
+          id: 'dir-1',
+          name: '报表脚本',
+          path: 'D:/sql/reports',
+          connectionId: 'conn-1',
+          dbName: 'crm',
+          createdAt: 1,
+        },
+      ],
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readSQLFile,
+      },
+    });
+
+    expect(result.success).toBe(false);
+    expect(result.content).toContain('目标文件不在已配置的外部 SQL 目录中');
+    expect(readSQLFile).not.toHaveBeenCalled();
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.lastRenderError.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.lastRenderError.test.ts
new file mode 100644
index 0000000..02fb953
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.lastRenderError.test.ts
@@ -0,0 +1,69 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildToolCall = (
+  name: string,
+  args: Record<string, unknown>,
+): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_ai_last_render_error', () => {
+  afterEach(() => {
+    delete (globalThis as Record<string, unknown>).__gonaviLastAIMessageRenderError;
+  });
+
+  it('returns the last isolated ai message render error so the model can diagnose blank bubbles from real frontend evidence', async () => {
+    (globalThis as Record<string, unknown>).__gonaviLastAIMessageRenderError = {
+      messageId: 'msg-1',
+      role: 'assistant',
+      contentPreview: '这是一条触发渲染异常的 AI 回复预览',
+      message: 'Cannot read properties of undefined',
+      stack: 'TypeError: Cannot read properties of undefined\n    at Bubble.tsx:12:3',
+      componentStack: '\n    at AIMessageBubble\n    at AIChatPanelConversationView',
+      recordedAt: 1780700000000,
+    };
+
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_last_render_error', {}),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"hasError":true');
+    expect(result.content).toContain('"messageId":"msg-1"');
+    expect(result.content).toContain('"role":"assistant"');
+    expect(result.content).toContain('Cannot read properties of undefined');
+    expect(result.content).toContain('AIMessageBubble');
+  });
+
+  it('returns an empty snapshot when no render failure has been recorded yet', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_last_render_error', {}),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"hasError":false');
+    expect(result.content).toContain('当前还没有记录到 AI 消息渲染异常');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.localAssetsInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.localAssetsInspection.test.ts
new file mode 100644
index 0000000..0664b28
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.localAssetsInspection.test.ts
@@ -0,0 +1,351 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor local asset inspection tools', () => {
+  it('returns local saved queries so the model can reuse historical sql scripts', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_saved_queries', {
+        keyword: '支付',
+        connectionId: 'conn-1',
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      savedQueries: [
+        {
+          id: 'saved-1',
+          name: '支付订单核对',
+          sql: 'SELECT * FROM orders WHERE status = \'paid\'',
+          connectionId: 'conn-1',
+          dbName: 'crm',
+          createdAt: 2,
+        },
+        {
+          id: 'saved-2',
+          name: '用户列表',
+          sql: 'SELECT * FROM users',
+          connectionId: 'conn-1',
+          dbName: 'crm',
+          createdAt: 1,
+        },
+      ],
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"totalMatched":1');
+    expect(result.content).toContain('支付订单核对');
+    expect(result.content).toContain('"connectionName":"主库"');
+    expect(result.content).toContain('status = \'paid\'');
+  });
+
+  it('returns local ai chat sessions so the model can locate previous conversations by title or preview', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_sessions', {
+        keyword: '支付',
+        limit: 5,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      aiChatSessions: [
+        { id: 'session-1', title: '支付异常排查', updatedAt: 200 },
+        { id: 'session-2', title: '用户列表', updatedAt: 100 },
+      ],
+      aiChatHistory: {
+        'session-1': [
+          { id: 'msg-1', role: 'user', content: '帮我排查支付超时', timestamp: 101 },
+          { id: 'msg-2', role: 'assistant', content: '先看最近错误日志', timestamp: 102 },
+        ],
+        'session-2': [
+          { id: 'msg-3', role: 'user', content: '列出最近注册用户', timestamp: 103 },
+        ],
+      },
+      activeSessionId: 'session-2',
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"totalMatched":1');
+    expect(result.content).toContain('支付异常排查');
+    expect(result.content).toContain('帮我排查支付超时');
+    expect(result.content).toContain('先看最近错误日志');
+    expect(result.content).not.toContain('列出最近注册用户');
+  });
+
+  it('returns ai message flow diagnostics for the active session', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_message_flow', {
+        limit: 8,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      aiChatSessions: [
+        { id: 'session-1', title: '消息流异常', updatedAt: 200 },
+      ],
+      aiChatHistory: {
+        'session-1': [
+          { id: 'msg-1', role: 'user', content: 'AI 回复拆成多个气泡', timestamp: 101 },
+          {
+            id: 'msg-2',
+            role: 'assistant',
+            content: '先调用探针',
+            timestamp: 102,
+            tool_calls: [{ id: 'tool-1', type: 'function', function: { name: 'inspect_ai_runtime', arguments: '{}' } }],
+          },
+          { id: 'msg-3', role: 'assistant', content: '继续回答', timestamp: 103 },
+        ],
+      },
+      activeSessionId: 'session-1',
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"requestedSessionId":"session-1"');
+    expect(result.content).toContain('"unresolvedToolCallCount":1');
+    expect(result.content).toContain('"consecutiveAssistantPairCount":1');
+    expect(result.content).toContain('回复拆成多个气泡');
+  });
+
+  it('returns ai context budget diagnostics for the active session', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_context_budget', {
+        messageLimit: 10,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [{
+        alias: 'remote_probe',
+        originalName: 'remote_probe',
+        serverId: 'server-1',
+        serverName: '远程工具',
+        inputSchema: {
+          type: 'object',
+          properties: {
+            keyword: { type: 'string' },
+          },
+        },
+      }],
+      toolContextMap: new Map(),
+      aiChatSessions: [
+        { id: 'session-1', title: '上下文预算排查', updatedAt: 200 },
+      ],
+      aiChatHistory: {
+        'session-1': [
+          { id: 'msg-1', role: 'user', content: 'AI 变慢是不是上下文太大', timestamp: 101 },
+          { id: 'msg-2', role: 'tool', content: 'x'.repeat(21000), timestamp: 102, tool_call_id: 'tool-1' },
+        ],
+      },
+      activeSessionId: 'session-1',
+      aiContexts: {
+        'conn-1:crm': [
+          { dbName: 'crm', tableName: 'orders', ddl: 'CREATE TABLE orders(id bigint, amount decimal(10,2));' },
+        ],
+      },
+      skills: [{
+        id: 'skill-1',
+        name: 'SQL 审查',
+        systemPrompt: '先检查风险',
+        enabled: true,
+        scopes: ['database'],
+      }],
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"title":"上下文预算排查"');
+    expect(result.content).toContain('"toolResultChars":21000');
+    expect(result.content).toContain('"tableName":"orders"');
+    expect(result.content).toContain('"mcpToolCount":1');
+    expect(result.content).toContain('最近工具结果较长');
+  });
+
+  it('returns an ai support bundle with health, message flow, context budget, and remote MCP evidence', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_support_bundle', {
+        keyword: 'mcp',
+        publicUrl: 'https://agent.example.com/mcp',
+        tokenConfigured: false,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [{
+        alias: 'remote_probe',
+        originalName: 'remote_probe',
+        serverId: 'server-1',
+        serverName: '远程工具',
+        description: '读取远程信息',
+        inputSchema: {
+          type: 'object',
+          required: ['keyword'],
+          properties: {
+            keyword: { type: 'string', description: '关键词' },
+          },
+        },
+      }],
+      toolContextMap: new Map(),
+      aiChatSessions: [
+        { id: 'session-1', title: 'AI 稳定性排障', updatedAt: 200 },
+      ],
+      aiChatHistory: {
+        'session-1': [
+          { id: 'msg-1', role: 'user', content: 'AI 最近不稳定', timestamp: 101 },
+          {
+            id: 'msg-2',
+            role: 'assistant',
+            content: '先看支持包',
+            timestamp: 102,
+            tool_calls: [{ id: 'tool-1', type: 'function', function: { name: 'inspect_app_health', arguments: '{}' } }],
+          },
+          { id: 'msg-3', role: 'assistant', content: '继续分析', timestamp: 103 },
+        ],
+      },
+      activeSessionId: 'session-1',
+      aiContexts: {
+        'conn-1:crm': [
+          { dbName: 'crm', tableName: 'orders', ddl: 'CREATE TABLE orders(id bigint);' },
+        ],
+      },
+      skills: [{
+        id: 'skill-1',
+        name: 'SQL 审查',
+        systemPrompt: '先检查风险',
+        enabled: true,
+        scopes: ['database'],
+      }],
+      runtime: {
+        getAIRuntimeState: vi.fn(async () => ({
+          providers: [{
+            id: 'provider-1',
+            name: 'OpenAI',
+            type: 'openai' as const,
+            apiKey: '',
+            baseUrl: 'https://api.example.com',
+            model: 'gpt-5',
+            hasSecret: true,
+            maxTokens: 4096,
+            temperature: 0.2,
+          }],
+          activeProviderId: 'provider-1',
+          safetyLevel: 'readonly',
+          contextLevel: 'schema_only',
+        })),
+        getMCPServers: vi.fn(async () => [{
+          id: 'server-1',
+          name: '远程工具',
+          transport: 'stdio' as const,
+          command: 'node',
+          args: ['server.js'],
+          env: { TOKEN: 'secret-value' },
+          enabled: true,
+          timeoutSeconds: 20,
+        }]),
+        getMCPClientInstallStatuses: vi.fn(async () => [{
+          client: 'openclaw',
+          displayName: 'OpenClaw',
+          installMode: 'remote' as const,
+          installed: false,
+          matchesCurrent: false,
+          clientDetected: false,
+          message: 'OpenClaw 走远程 MCP 桥接',
+        }]),
+        readAppLogTail: vi.fn(async () => ({
+          success: true,
+          logPath: 'C:/Users/mock/.GoNavi/Logs/gonavi.log',
+          lines: [
+            '2026/06/11 10:00:00 [WARN] MCP mock warning',
+            '2026/06/11 10:00:01 [ERROR] MCP mock error',
+          ],
+          fileWindowTruncated: false,
+          matchedLinesTruncated: false,
+        })),
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"kind":"ai_support_bundle"');
+    expect(result.content).toContain('"databasePasswordsIncluded":false');
+    expect(result.content).toContain('"providerSecretsIncluded":false');
+    expect(result.content).toContain('"mcpEnvValuesIncluded":false');
+    expect(result.content).toContain('"unresolvedToolCallCount":1');
+    expect(result.content).toContain('"consecutiveAssistantPairCount":1');
+    expect(result.content).toContain('"remoteMCPPublicUrl":"https://agent.example.com/mcp"');
+    expect(result.content).toContain('尚未确认 Bearer Token');
+    expect(result.content).not.toContain('secret-value');
+  });
+
+  it('returns sql snippets so the model can inspect local query templates', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_sql_snippets', {
+        keyword: '支付',
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      sqlSnippets: [
+        {
+          id: 'snippet-1',
+          prefix: 'sel',
+          name: 'SELECT 模板',
+          body: 'SELECT * FROM ${1:table};',
+          isBuiltin: true,
+          createdAt: 1,
+        },
+        {
+          id: 'snippet-2',
+          prefix: 'pay',
+          name: '支付模板',
+          description: '支付对账',
+          body: 'SELECT * FROM pay_orders WHERE created_at >= ${1:start};',
+          isBuiltin: false,
+          createdAt: 2,
+        },
+      ],
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"totalMatched":1');
+    expect(result.content).toContain('"prefix":"pay"');
+    expect(result.content).toContain('"customCount":1');
+    expect(result.content).toContain('pay_orders');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.mcpDockerSetup.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.mcpDockerSetup.test.ts
new file mode 100644
index 0000000..6165023
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.mcpDockerSetup.test.ts
@@ -0,0 +1,60 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_mcp_docker_setup', () => {
+  it('returns docker mcp configuration issues through the unified local tool executor', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_mcp_docker_setup', {}),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getMCPServers: vi.fn().mockResolvedValue([
+          {
+            id: 'docker-broken',
+            name: 'Docker Broken',
+            transport: 'stdio',
+            command: 'docker',
+            args: ['run', '--rm'],
+            env: {},
+            enabled: true,
+            timeoutSeconds: 10,
+          },
+        ]),
+      },
+    });
+
+    if (!result.success) {
+      throw new Error(result.content);
+    }
+    expect(result.success).toBe(true);
+    expect(result.toolName).toBe('inspect_mcp_docker_setup');
+    expect(result.content).toContain('"dockerServerCount":1');
+    expect(result.content).toContain('"docker-interactive-missing"');
+    expect(result.content).toContain('Docker 首次拉起可能较慢');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.mcpRemoteAccess.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.mcpRemoteAccess.test.ts
new file mode 100644
index 0000000..1da3858
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.mcpRemoteAccess.test.ts
@@ -0,0 +1,62 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_mcp_remote_access', () => {
+  it('returns remote mcp access guidance through the unified local tool executor', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_mcp_remote_access', {
+        publicUrl: 'https://mcp.example.com/gonavi',
+        exposeStrategy: 'tailscale',
+        tokenConfigured: true,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getMCPClientInstallStatuses: vi.fn().mockResolvedValue([
+          {
+            client: 'hermans',
+            displayName: 'Hermans',
+            installMode: 'remote',
+            installed: false,
+            matchesCurrent: false,
+            clientDetected: false,
+            clientCommand: 'hermans',
+            message: 'Hermans 通过远程 MCP 桥接接入',
+          },
+        ]),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"mode":"streamable-http"');
+    expect(result.content).toContain('"publicUrl":"https://mcp.example.com/gonavi/mcp"');
+    expect(result.content).toContain('Authorization: Bearer <随机token>');
+    expect(result.content).toContain('"displayName":"Hermans"');
+    expect(result.content).toContain('"cloudAgentNeedsDatabasePassword":false');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.mcpRuntimeFailureInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.mcpRuntimeFailureInspection.test.ts
new file mode 100644
index 0000000..4afc8e8
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.mcpRuntimeFailureInspection.test.ts
@@ -0,0 +1,89 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildToolCall = (
+  name: string,
+  args: Record<string, unknown>,
+): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_mcp_runtime_failures', () => {
+  it('returns structured MCP runtime failure diagnostics from gonavi.log and configured servers', async () => {
+    const readAppLogTail = vi.fn().mockResolvedValue({
+      success: true,
+      data: {
+        logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+        keyword: 'GitHub',
+        requestedLineLimit: 160,
+        lines: [
+          '2026/06/11 10:00:00.000000 [WARN] 列出 MCP 工具失败(server=GitHub): exec: "uvx": executable file not found in %PATH%',
+        ],
+      },
+    });
+    const getMCPServers = vi.fn().mockResolvedValue([{
+      id: 'github',
+      name: 'GitHub',
+      transport: 'stdio',
+      command: 'uvx',
+      args: ['mcp-server-github', '--stdio'],
+      env: { GITHUB_TOKEN: 'secret-value' },
+      enabled: true,
+      timeoutSeconds: 20,
+    }]);
+
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_mcp_runtime_failures', {
+        serverName: 'GitHub',
+      }),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readAppLogTail,
+        getMCPServers,
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(readAppLogTail).toHaveBeenCalledWith(160, 'GitHub');
+    expect(getMCPServers).toHaveBeenCalledTimes(1);
+    expect(result.content).toContain('"failureEventCount":1');
+    expect(result.content).toContain('"list_tools_failed":1');
+    expect(result.content).toContain('"command_not_found":1');
+    expect(result.content).toContain('"name":"GitHub"');
+    expect(result.content).toContain('"envKeys":["GITHUB_TOKEN"]');
+    expect(result.content).toContain('检查 command 是否只填可执行程序本身');
+    expect(result.content).not.toContain('secret-value');
+  });
+
+  it('returns a clear failure when app logs cannot be read', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_mcp_runtime_failures', {}),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        readAppLogTail: vi.fn().mockResolvedValue({
+          success: false,
+          message: 'log file missing',
+        }),
+      },
+    });
+
+    expect(result.success).toBe(false);
+    expect(result.content).toContain('读取 MCP 运行期失败日志失败');
+    expect(result.content).toContain('log file missing');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.shortcutInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.shortcutInspection.test.ts
new file mode 100644
index 0000000..f16b540
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.shortcutInspection.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+import {
+  cloneShortcutOptions,
+  DEFAULT_SHORTCUT_OPTIONS,
+} from '../../utils/shortcuts';
+
+const buildToolCall = (
+  name: string,
+  args: Record<string, unknown>,
+): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor inspect_shortcuts', () => {
+  it('returns the real shortcut snapshot so the model can answer Win/Mac shortcut questions from state', async () => {
+    const shortcutOptions = cloneShortcutOptions(DEFAULT_SHORTCUT_OPTIONS);
+    shortcutOptions.toggleQueryResultsPanel.windows = {
+      combo: 'Ctrl+Shift+Y',
+      enabled: true,
+    };
+
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_shortcuts', {
+        keyword: '结果区',
+      }),
+      connections: [],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getShortcutOptions: vi.fn().mockResolvedValue(shortcutOptions),
+        getShortcutPlatform: vi.fn().mockResolvedValue('windows'),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"currentPlatform":"windows"');
+    expect(result.content).toContain('"action":"toggleQueryResultsPanel"');
+    expect(result.content).toContain('"combo":"Ctrl+Shift+Y"');
+    expect(result.content).toContain('"defaultCombo":"Ctrl+Shift+M"');
+    expect(result.content).toContain('"isCustomized":true');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.sqlRiskInspection.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.sqlRiskInspection.test.ts
new file mode 100644
index 0000000..bb2639c
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.sqlRiskInspection.test.ts
@@ -0,0 +1,76 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIToolCall, SavedConnection } from '../../types';
+import { executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor sql risk inspection', () => {
+  it('inspects SQL risk from the active query tab and applies the AI safety check', async () => {
+    const checkSQL = vi.fn().mockResolvedValue({
+      allowed: false,
+      operationType: 'UPDATE',
+    });
+
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_sql_risk', {}),
+      connections: [buildConnection()],
+      tabs: [{
+        id: 'tab-risk-1',
+        title: '批量更新',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'UPDATE users SET status = 0',
+      }],
+      activeTabId: 'tab-risk-1',
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        checkSQL,
+      },
+    });
+
+    const payload = JSON.parse(result.content);
+    expect(result.success).toBe(true);
+    expect(checkSQL).toHaveBeenCalledWith('UPDATE users SET status = 0');
+    expect(payload).toMatchObject({
+      hasSql: true,
+      source: 'active_tab',
+      riskLevel: 'critical',
+      requiresUserConfirmation: true,
+      safetyCheck: {
+        allowed: false,
+        operationType: 'UPDATE',
+      },
+      activeTab: {
+        id: 'tab-risk-1',
+        connectionName: '主库',
+        dbName: 'crm',
+      },
+    });
+    expect(payload.activityKinds).toContain('write');
+    expect(payload.warnings).toContain('UPDATE 缺少 WHERE 条件，可能更新整表数据');
+    expect(payload.warnings).toContain('当前 AI 安全策略不允许执行 UPDATE 类型 SQL');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.test.ts b/frontend/src/components/ai/aiLocalToolExecutor.test.ts
new file mode 100644
index 0000000..ef39f0b
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.test.ts
@@ -0,0 +1,574 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { AIMCPToolDescriptor, AIToolCall, SavedConnection } from '../../types';
+import { buildToolResultMessage, executeLocalAIToolCall } from './aiLocalToolExecutor';
+
+const buildConnection = (): SavedConnection => ({
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+});
+
+const buildToolCall = (name: string, args: Record<string, unknown>): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: JSON.stringify(args),
+  },
+});
+
+describe('aiLocalToolExecutor', () => {
+  it('caches validated table context after get_tables succeeds', async () => {
+    const toolContextMap = new Map();
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('get_tables', { connectionId: 'conn-1', dbName: 'crm' }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap,
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn().mockResolvedValue({
+          success: true,
+          data: [{ Table: 'users' }, { Table: 'orders' }],
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('users');
+    expect(toolContextMap.get('conn-1:crm')).toEqual({
+      connectionId: 'conn-1',
+      dbName: 'crm',
+      tables: ['users', 'orders'],
+    });
+  });
+
+  it('returns the current active tab snapshot so the model can inspect the editor draft directly', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_active_tab', {
+        includeContent: true,
+      }),
+      connections: [buildConnection()],
+      tabs: [{
+        id: 'tab-query-1',
+        title: '订单查询',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'SELECT id, status FROM orders WHERE status = \'paid\'',
+        filePath: 'D:/sql/orders.sql',
+      }],
+      activeTabId: 'tab-query-1',
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"hasActiveTab":true');
+    expect(result.content).toContain('"type":"query"');
+    expect(result.content).toContain('"connectionName":"主库"');
+    expect(result.content).toContain('"contentKind":"sql"');
+    expect(result.content).toContain('SELECT id, status FROM orders');
+  });
+
+  it('returns a workspace tab overview so the model can inspect which editors are currently open', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_workspace_tabs', {
+        limit: 2,
+        includeContent: true,
+      }),
+      connections: [buildConnection()],
+      tabs: [
+        {
+          id: 'tab-query-1',
+          title: '订单查询',
+          type: 'query',
+          connectionId: 'conn-1',
+          dbName: 'crm',
+          query: 'SELECT * FROM orders WHERE status = \'paid\'',
+        },
+        {
+          id: 'tab-table-1',
+          title: 'users',
+          type: 'table',
+          connectionId: 'conn-1',
+          dbName: 'crm',
+          tableName: 'users',
+        },
+        {
+          id: 'tab-redis-1',
+          title: '缓存命令',
+          type: 'redis-command',
+          connectionId: 'conn-1',
+          query: 'GET order:1',
+          redisDB: 2,
+        },
+      ],
+      activeTabId: 'tab-query-1',
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"activeTabId":"tab-query-1"');
+    expect(result.content).toContain('"totalTabs":3');
+    expect(result.content).toContain('"returnedTabs":2');
+    expect(result.content).toContain('"truncated":true');
+    expect(result.content).toContain('"isActive":true');
+    expect(result.content).toContain('"title":"订单查询"');
+    expect(result.content).toContain('SELECT * FROM orders');
+  });
+
+  it('returns the current linked AI context so the model can inspect which table schemas are already mounted', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_ai_context', {
+        includeDDL: true,
+        ddlLimit: 80,
+      }),
+      connections: [buildConnection()],
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      aiContexts: {
+        'conn-1:crm': [
+          {
+            dbName: 'crm',
+            tableName: 'orders',
+            ddl: 'CREATE TABLE orders (id bigint primary key, status varchar(32), amount decimal(10,2));',
+          },
+        ],
+      },
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"hasActiveContext":true');
+    expect(result.content).toContain('"connectionName":"主库"');
+    expect(result.content).toContain('"tableName":"orders"');
+    expect(result.content).toContain('"includeDDL":true');
+    expect(result.content).toContain('CREATE TABLE orders');
+  });
+
+  it('blocks execute_sql when the AI safety check rejects the statement', async () => {
+    const query = vi.fn();
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('execute_sql', {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        sql: 'DELETE FROM users',
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getColumns: vi.fn(),
+        getIndexes: vi.fn(),
+        getForeignKeys: vi.fn(),
+        getTriggers: vi.fn(),
+        showCreateTable: vi.fn(),
+        query,
+        checkSQL: vi.fn().mockResolvedValue({
+          allowed: false,
+          operationType: 'DELETE',
+        }),
+      },
+    });
+
+    expect(result.success).toBe(false);
+    expect(result.content).toContain('安全策略拦截');
+    expect(query).not.toHaveBeenCalled();
+  });
+
+  it('returns a cross-table column summary for get_all_columns', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('get_all_columns', {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getAllColumns: vi.fn().mockResolvedValue({
+          success: true,
+          data: [
+            { TableName: 'users', Name: 'email', Type: 'varchar(255)', Comment: '用户邮箱' },
+            { TableName: 'orders', Name: 'user_id', Type: 'bigint', Comment: '关联用户' },
+          ],
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"tableCount":2');
+    expect(result.content).toContain('"tableName":"users"');
+    expect(result.content).toContain('"name":"email"');
+  });
+
+  it('returns index definitions and resolves the tool label for MCP descriptors', async () => {
+    const mcpTools: AIMCPToolDescriptor[] = [{
+      alias: 'custom_tool',
+      originalName: 'custom_tool',
+      serverId: 'server-1',
+      serverName: 'demo',
+      title: '自定义探针',
+      description: '',
+    }];
+    const indexResult = await executeLocalAIToolCall({
+      toolCall: buildToolCall('get_indexes', {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        tableName: 'users',
+      }),
+      connections: [buildConnection()],
+      mcpTools,
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getColumns: vi.fn(),
+        getIndexes: vi.fn().mockResolvedValue({
+          success: true,
+          data: [{ keyName: 'idx_users_email', nonUnique: 0 }],
+        }),
+        getForeignKeys: vi.fn(),
+        getTriggers: vi.fn(),
+        showCreateTable: vi.fn(),
+        query: vi.fn(),
+      },
+    });
+    const message = buildToolResultMessage({
+      id: 'msg-1',
+      timestamp: 1,
+      toolCall: buildToolCall('custom_tool', {}),
+      execution: {
+        content: 'ok',
+        success: true,
+        toolName: '自定义探针',
+      },
+    });
+
+    expect(indexResult.success).toBe(true);
+    expect(indexResult.content).toContain('idx_users_email');
+    expect(message.tool_name).toBe('自定义探针');
+  });
+
+  it('previews sample rows for a table without forcing the model to handwrite select limit sql', async () => {
+    const query = vi.fn().mockResolvedValue({
+      success: true,
+      data: [
+        { id: 1, status: 'paid', amount: 120.5 },
+        { id: 2, status: 'pending', amount: null },
+      ],
+    });
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('preview_table_rows', {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        tableName: 'orders',
+        limit: 5,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getColumns: vi.fn(),
+        getIndexes: vi.fn(),
+        getForeignKeys: vi.fn(),
+        getTriggers: vi.fn(),
+        showCreateTable: vi.fn(),
+        query,
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(query).toHaveBeenCalledWith(expect.anything(), 'crm', 'SELECT * FROM `orders` LIMIT 5 OFFSET 0');
+    expect(result.content).toContain('"tableName":"orders"');
+    expect(result.content).toContain('"status":"paid"');
+    expect(result.content).toContain('"rowCount":2');
+  });
+
+  it('returns a full table snapshot bundle with optional sample rows in one tool call', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_table_bundle', {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        tableName: 'orders',
+        includeSampleRows: true,
+        sampleLimit: 2,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getColumns: vi.fn().mockResolvedValue({
+          success: true,
+          data: [{ Field: 'id', Type: 'bigint', Null: 'NO', Comment: '主键' }],
+        }),
+        getIndexes: vi.fn().mockResolvedValue({
+          success: true,
+          data: [{ keyName: 'PRIMARY', seqInIndex: 1 }],
+        }),
+        getForeignKeys: vi.fn().mockResolvedValue({
+          success: true,
+          data: [{ columnName: 'user_id', refTable: 'users' }],
+        }),
+        getTriggers: vi.fn().mockResolvedValue({
+          success: true,
+          data: [{ triggerName: 'orders_bi' }],
+        }),
+        showCreateTable: vi.fn().mockResolvedValue({
+          success: true,
+          data: [{ ddl: 'CREATE TABLE orders (...)' }],
+        }),
+        query: vi.fn().mockResolvedValue({
+          success: true,
+          data: [{ id: 1, status: 'paid' }, { id: 2, status: 'pending' }],
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"tableName":"orders"');
+    expect(result.content).toContain('"field":"id"');
+    expect(result.content).toContain('"keyName":"PRIMARY"');
+    expect(result.content).toContain('"triggerName":"orders_bi"');
+    expect(result.content).toContain('"sampleRows"');
+    expect(result.content).toContain('"status":"paid"');
+  });
+
+  it('returns recent sql logs and supports filtering only failed statements', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_recent_sql_logs', {
+        limit: 2,
+        status: 'error',
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      sqlLogs: [
+        {
+          id: 'log-1',
+          timestamp: 3,
+          sql: 'DELETE FROM users WHERE id = 9',
+          status: 'error',
+          duration: 120,
+          message: 'permission denied',
+          dbName: 'crm',
+        },
+        {
+          id: 'log-2',
+          timestamp: 2,
+          sql: 'SELECT * FROM users LIMIT 10',
+          status: 'success',
+          duration: 18,
+          dbName: 'crm',
+          affectedRows: 10,
+        },
+        {
+          id: 'log-3',
+          timestamp: 1,
+          sql: 'UPDATE orders SET status = \'paid\' WHERE id = 1',
+          status: 'error',
+          duration: 95,
+          message: 'row lock timeout',
+          dbName: 'crm',
+        },
+      ],
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"status":"error"');
+    expect(result.content).toContain('"totalMatched":2');
+    expect(result.content).toContain('permission denied');
+    expect(result.content).toContain('row lock timeout');
+    expect(result.content).not.toContain('SELECT * FROM users LIMIT 10');
+  });
+
+  it('returns a recent sql activity summary so the model can quickly spot writes, ddl, and repeated failures', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_recent_sql_activity', {
+        limit: 3,
+        activityKind: 'write',
+        dbName: 'crm',
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      sqlLogs: [
+        {
+          id: 'log-1',
+          timestamp: 4,
+          sql: 'DELETE FROM users WHERE id = 9',
+          status: 'error',
+          duration: 120,
+          message: 'permission denied',
+          dbName: 'crm',
+        },
+        {
+          id: 'log-2',
+          timestamp: 3,
+          sql: 'UPDATE orders SET status = \'paid\' WHERE id = 1',
+          status: 'error',
+          duration: 95,
+          message: 'row lock timeout',
+          dbName: 'crm',
+        },
+        {
+          id: 'log-3',
+          timestamp: 2,
+          sql: 'ALTER TABLE orders ADD COLUMN note varchar(32)',
+          status: 'success',
+          duration: 160,
+          dbName: 'crm',
+        },
+        {
+          id: 'log-4',
+          timestamp: 1,
+          sql: 'SELECT * FROM users LIMIT 10',
+          status: 'success',
+          duration: 18,
+          dbName: 'crm',
+          affectedRows: 10,
+        },
+      ],
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"activityKind":"write"');
+    expect(result.content).toContain('"totalMatched":2');
+    expect(result.content).toContain('"writeCount":2');
+    expect(result.content).toContain('"statementTypeBreakdown":{"delete":1,"update":1}');
+    expect(result.content).toContain('permission denied');
+    expect(result.content).toContain('row lock timeout');
+    expect(result.content).not.toContain('ALTER TABLE orders');
+    expect(result.content).not.toContain('SELECT * FROM users LIMIT 10');
+  });
+
+  it('returns sql editor transaction settings, active dml semantics, and pending transactions', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_sql_editor_transaction', {}),
+      connections: [buildConnection()],
+      tabs: [{
+        id: 'tab-query-1',
+        title: '订单更新',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'UPDATE orders SET status = \'paid\' WHERE id = 1',
+        resultPanelVisible: true,
+      }],
+      activeTabId: 'tab-query-1',
+      mcpTools: [],
+      toolContextMap: new Map(),
+      sqlLogs: [{
+        id: 'log-1',
+        timestamp: 10,
+        sql: 'UPDATE orders SET status = \'paid\' WHERE id = 1',
+        status: 'success',
+        duration: 42,
+        dbName: 'crm',
+        affectedRows: 1,
+      }],
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn(),
+        getSqlEditorTransactionState: vi.fn().mockResolvedValue({
+          commitMode: 'auto',
+          autoCommitDelayMs: 3000,
+          pendingTransactions: {
+            'tab-query-1': {
+              id: 'tx-1',
+              tabId: 'tab-query-1',
+              commitMode: 'auto',
+              autoCommitDelayMs: 3000,
+              createdAt: 1000,
+              autoCommitDueAt: Date.now() + 3000,
+            },
+          },
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"commitMode":"auto"');
+    expect(result.content).toContain('"transactionAlwaysOnForDML":true');
+    expect(result.content).toContain('"usesManagedTransaction":true');
+    expect(result.content).toContain('"pendingTransactionCount":1');
+    expect(result.content).toContain('"activePendingTransaction"');
+    expect(result.content).toContain('自动提交，但 DML 仍会先进入托管事务');
+    expect(result.content).toContain('UPDATE orders SET status');
+  });
+
+  it('returns a database overview bundle with per-table column previews in one tool call', async () => {
+    const result = await executeLocalAIToolCall({
+      toolCall: buildToolCall('inspect_database_bundle', {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        tableLimit: 5,
+        perTableColumnLimit: 1,
+      }),
+      connections: [buildConnection()],
+      mcpTools: [],
+      toolContextMap: new Map(),
+      runtime: {
+        getDatabases: vi.fn(),
+        getTables: vi.fn().mockResolvedValue({
+          success: true,
+          data: [{ Table: 'users' }, { Table: 'orders' }],
+        }),
+        getAllColumns: vi.fn().mockResolvedValue({
+          success: true,
+          data: [
+            { TableName: 'users', Name: 'id', Type: 'bigint', Comment: '主键' },
+            { TableName: 'users', Name: 'email', Type: 'varchar(255)', Comment: '邮箱' },
+            { TableName: 'orders', Name: 'id', Type: 'bigint', Comment: '主键' },
+          ],
+        }),
+      },
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.content).toContain('"dbName":"crm"');
+    expect(result.content).toContain('"tableCount":2');
+    expect(result.content).toContain('"tableName":"users"');
+    expect(result.content).toContain('"columnCount":2');
+    expect(result.content).toContain('"truncatedColumns":true');
+  });
+});
diff --git a/frontend/src/components/ai/aiLocalToolExecutor.ts b/frontend/src/components/ai/aiLocalToolExecutor.ts
new file mode 100644
index 0000000..a3a3dba
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolExecutor.ts
@@ -0,0 +1,174 @@
+import type { SqlLog } from '../../store';
+import type {
+  AIChatMessage,
+  AIContextItem,
+  AIMCPToolDescriptor,
+  AISkillConfig,
+  AIToolCall,
+  AIUserPromptSettings,
+  SavedConnection,
+  SavedQuery,
+  SqlSnippet,
+  ExternalSQLDirectory,
+  TabData,
+} from '../../types';
+import { executeDatabaseToolCall } from './aiDatabaseToolExecutor';
+import {
+  buildDefaultLocalToolRuntime,
+  type AILocalToolRuntime,
+  type AIToolContextEntry,
+} from './aiLocalToolRuntime';
+import { executeSnapshotInspectionToolCall } from './aiSnapshotInspectionToolExecutor';
+
+export type { AILocalToolRuntime, AIToolContextEntry } from './aiLocalToolRuntime';
+
+export interface ExecuteLocalAIToolCallOptions {
+  toolCall: AIToolCall;
+  connections: SavedConnection[];
+  activeContext?: { connectionId: string; dbName: string } | null;
+  aiContexts?: Record<string, AIContextItem[]>;
+  aiChatHistory?: Record<string, AIChatMessage[]>;
+  aiChatSessions?: Array<{ id: string; title: string; updatedAt: number }>;
+  activeSessionId?: string | null;
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  mcpTools: AIMCPToolDescriptor[];
+  toolContextMap: Map<string, AIToolContextEntry>;
+  sqlLogs?: SqlLog[];
+  savedQueries?: SavedQuery[];
+  sqlSnippets?: SqlSnippet[];
+  externalSQLDirectories?: ExternalSQLDirectory[];
+  skills?: AISkillConfig[];
+  userPromptSettings?: AIUserPromptSettings;
+  dynamicModels?: string[];
+  runtime?: Partial<AILocalToolRuntime>;
+}
+
+export interface ExecuteLocalAIToolCallResult {
+  content: string;
+  success: boolean;
+  toolName: string;
+}
+
+const buildToolName = (toolCall: AIToolCall, descriptor?: AIMCPToolDescriptor) =>
+  descriptor?.title || descriptor?.originalName || toolCall.function.name;
+
+export async function executeLocalAIToolCall({
+  toolCall,
+  connections,
+  activeContext = null,
+  aiContexts = {},
+  aiChatHistory = {},
+  aiChatSessions = [],
+  activeSessionId = null,
+  tabs = [],
+  activeTabId = null,
+  mcpTools,
+  toolContextMap,
+  sqlLogs = [],
+  savedQueries = [],
+  sqlSnippets = [],
+  externalSQLDirectories = [],
+  skills = [],
+  userPromptSettings,
+  dynamicModels = [],
+  runtime,
+}: ExecuteLocalAIToolCallOptions): Promise<ExecuteLocalAIToolCallResult> {
+  const mergedRuntime: AILocalToolRuntime = { ...buildDefaultLocalToolRuntime(), ...(runtime || {}) };
+  const descriptor = mcpTools.find((tool) => tool.alias === toolCall.function.name);
+
+  try {
+    const args = JSON.parse(toolCall.function.arguments || '{}');
+
+    const snapshotInspectionResult = await executeSnapshotInspectionToolCall({
+      toolName: toolCall.function.name,
+      args,
+      activeContext,
+      aiContexts,
+      aiChatHistory,
+      aiChatSessions,
+      activeSessionId,
+      connections,
+      tabs,
+      activeTabId,
+      mcpTools,
+      sqlLogs,
+      savedQueries,
+      sqlSnippets,
+      externalSQLDirectories,
+      skills,
+      userPromptSettings,
+      dynamicModels,
+      runtime: mergedRuntime,
+    });
+    if (snapshotInspectionResult) {
+      return {
+        content: snapshotInspectionResult.content,
+        success: snapshotInspectionResult.success,
+        toolName: buildToolName(toolCall, descriptor),
+      };
+    }
+
+    const databaseToolResult = await executeDatabaseToolCall({
+      toolName: toolCall.function.name,
+      args,
+      connections,
+      toolContextMap,
+      runtime: mergedRuntime,
+    });
+    if (databaseToolResult) {
+      return {
+        content: databaseToolResult.content,
+        success: databaseToolResult.success,
+        toolName: buildToolName(toolCall, descriptor),
+      };
+    }
+
+    if (!descriptor) {
+      return {
+        content: `Unknown function: ${toolCall.function.name}`,
+        success: false,
+        toolName: buildToolName(toolCall),
+      };
+    }
+
+    try {
+      const result = await mergedRuntime.callMCPTool?.(toolCall.function.name, toolCall.function.arguments || '{}');
+      return {
+        content: String(result?.content || (result?.isError ? 'MCP 工具调用失败' : '')),
+        success: !!result && !result.isError,
+        toolName: buildToolName(toolCall, descriptor),
+      };
+    } catch (error: any) {
+      return {
+        content: `MCP 工具调用失败: ${error?.message || error}`,
+        success: false,
+        toolName: buildToolName(toolCall, descriptor),
+      };
+    }
+  } catch (error: any) {
+    return {
+      content: error?.message || String(error),
+      success: false,
+      toolName: buildToolName(toolCall, descriptor),
+    };
+  }
+}
+
+export function buildToolResultMessage(params: {
+  id: string;
+  timestamp: number;
+  toolCall: AIToolCall;
+  execution: ExecuteLocalAIToolCallResult;
+}): AIChatMessage {
+  const { id, timestamp, toolCall, execution } = params;
+  return {
+    id,
+    role: 'tool',
+    content: execution.content,
+    timestamp,
+    tool_call_id: toolCall.id,
+    tool_name: execution.toolName,
+    success: execution.success,
+  };
+}
diff --git a/frontend/src/components/ai/aiLocalToolRuntime.ts b/frontend/src/components/ai/aiLocalToolRuntime.ts
new file mode 100644
index 0000000..7e8c8e9
--- /dev/null
+++ b/frontend/src/components/ai/aiLocalToolRuntime.ts
@@ -0,0 +1,117 @@
+import { DBGetAllColumns, DBGetDatabases, DBGetTables, ReadAppLogTail, ReadSQLFile } from '../../../wailsjs/go/app/App';
+import { useStore } from '../../store';
+import { isMacLikePlatform } from '../../utils/appearance';
+import { getShortcutPlatform } from '../../utils/shortcuts';
+
+import type { AISnapshotInspectionRuntime } from './aiSnapshotInspectionToolTypes';
+
+export interface AIToolContextEntry {
+  connectionId: string;
+  dbName: string;
+  tables: string[];
+}
+
+export interface AILocalToolRuntime extends AISnapshotInspectionRuntime {
+  getDatabases: (config: any) => Promise<any>;
+  getTables: (config: any, dbName: string) => Promise<any>;
+  getAllColumns: (config: any, dbName: string) => Promise<any>;
+  readAppLogTail: (lineLimit: number, keyword: string) => Promise<any>;
+  readSQLFile: (filePath: string) => Promise<any>;
+  getColumns: (config: any, dbName: string, tableName: string) => Promise<any>;
+  getIndexes: (config: any, dbName: string, tableName: string) => Promise<any>;
+  getForeignKeys: (config: any, dbName: string, tableName: string) => Promise<any>;
+  getTriggers: (config: any, dbName: string, tableName: string) => Promise<any>;
+  showCreateTable: (config: any, dbName: string, tableName: string) => Promise<any>;
+  query: (config: any, dbName: string, sql: string) => Promise<any>;
+  checkSQL?: (sql: string) => Promise<{ allowed?: boolean; operationType?: string } | undefined>;
+  callMCPTool?: (name: string, args: string) => Promise<{ content?: string; isError?: boolean } | undefined>;
+}
+
+const getAIService = () => (window as any).go?.aiservice?.Service;
+
+export const buildDefaultLocalToolRuntime = (): AILocalToolRuntime => ({
+  getDatabases: DBGetDatabases,
+  getTables: DBGetTables,
+  getAllColumns: DBGetAllColumns,
+  readAppLogTail: (lineLimit, keyword) => ReadAppLogTail(lineLimit, String(keyword || '')),
+  readSQLFile: ReadSQLFile,
+  getColumns: async (config, dbName, tableName) => {
+    const mod = await import('../../../wailsjs/go/app/App');
+    return mod.DBGetColumns(config, dbName, tableName);
+  },
+  getIndexes: async (config, dbName, tableName) => {
+    const mod = await import('../../../wailsjs/go/app/App');
+    return mod.DBGetIndexes(config, dbName, tableName);
+  },
+  getForeignKeys: async (config, dbName, tableName) => {
+    const mod = await import('../../../wailsjs/go/app/App');
+    return mod.DBGetForeignKeys(config, dbName, tableName);
+  },
+  getTriggers: async (config, dbName, tableName) => {
+    const mod = await import('../../../wailsjs/go/app/App');
+    return mod.DBGetTriggers(config, dbName, tableName);
+  },
+  showCreateTable: async (config, dbName, tableName) => {
+    const mod = await import('../../../wailsjs/go/app/App');
+    return mod.DBShowCreateTable(config, dbName, tableName);
+  },
+  query: async (config, dbName, sql) => {
+    const mod = await import('../../../wailsjs/go/app/App');
+    return mod.DBQuery(config, dbName, sql);
+  },
+  checkSQL: async (sql) => {
+    const service = getAIService();
+    if (typeof service?.AICheckSQL !== 'function') {
+      return undefined;
+    }
+    return service.AICheckSQL(sql);
+  },
+  callMCPTool: async (name, args) => {
+    const service = getAIService();
+    if (typeof service?.AICallMCPTool !== 'function') {
+      return undefined;
+    }
+    return service.AICallMCPTool(name, args);
+  },
+  getAIRuntimeState: async () => {
+    const service = getAIService();
+    if (!service) {
+      return undefined;
+    }
+    const [providers, activeProviderId, safetyLevel, contextLevel] = await Promise.all([
+      typeof service.AIGetProviders === 'function' ? service.AIGetProviders() : Promise.resolve([]),
+      typeof service.AIGetActiveProvider === 'function' ? service.AIGetActiveProvider() : Promise.resolve(''),
+      typeof service.AIGetSafetyLevel === 'function' ? service.AIGetSafetyLevel() : Promise.resolve(''),
+      typeof service.AIGetContextLevel === 'function' ? service.AIGetContextLevel() : Promise.resolve(''),
+    ]);
+    return {
+      providers: Array.isArray(providers) ? providers : [],
+      activeProviderId: String(activeProviderId || '').trim(),
+      safetyLevel: String(safetyLevel || '').trim(),
+      contextLevel: String(contextLevel || '').trim(),
+    };
+  },
+  getMCPServers: async () => {
+    const service = getAIService();
+    if (typeof service?.AIGetMCPServers !== 'function') {
+      return undefined;
+    }
+    return service.AIGetMCPServers();
+  },
+  getMCPClientInstallStatuses: async () => {
+    const service = getAIService();
+    if (typeof service?.AIGetMCPClientInstallStatuses !== 'function') {
+      return undefined;
+    }
+    return service.AIGetMCPClientInstallStatuses();
+  },
+  getSqlEditorTransactionState: async () => {
+    const state = useStore.getState();
+    return {
+      ...state.sqlEditorTransactionOptions,
+      pendingTransactions: state.sqlEditorPendingTransactions,
+    };
+  },
+  getShortcutOptions: async () => useStore.getState().shortcutOptions,
+  getShortcutPlatform: async () => getShortcutPlatform(isMacLikePlatform()),
+});
diff --git a/frontend/src/components/ai/aiMCPAuthoringGuideInsights.ts b/frontend/src/components/ai/aiMCPAuthoringGuideInsights.ts
new file mode 100644
index 0000000..55a7254
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPAuthoringGuideInsights.ts
@@ -0,0 +1,40 @@
+import {
+  MCP_AUTHORING_NOTES,
+  MCP_COMMAND_EXAMPLES,
+  MCP_COMMAND_PARSE_EXAMPLE,
+  MCP_FIELD_GUIDES,
+  MCP_SERVER_FILL_STEPS,
+  buildMCPLaunchPreview,
+} from '../../utils/mcpServerGuidance';
+import { MCP_SERVER_DRAFT_TEMPLATES } from '../../utils/mcpServerTemplates';
+
+export const buildMCPAuthoringGuideSnapshot = () => ({
+  fullCommandPasteExample: MCP_COMMAND_PARSE_EXAMPLE,
+  commandExamples: MCP_COMMAND_EXAMPLES,
+  supportsWholeCommandAutoSplit: true,
+  recommendedSteps: MCP_SERVER_FILL_STEPS.map((item) => ({
+    step: item.step,
+    title: item.title,
+    detail: item.detail,
+  })),
+  fieldGuides: MCP_FIELD_GUIDES.map((item) => ({
+    key: item.key,
+    title: item.title,
+    summary: item.summary,
+    detail: item.detail,
+    example: item.example || '',
+    required: item.fieldState === 'required',
+    fixed: item.fieldState === 'fixed',
+  })),
+  templates: MCP_SERVER_DRAFT_TEMPLATES.map((template) => ({
+    key: template.key,
+    title: template.title,
+    description: template.description,
+    detail: template.detail,
+    exampleLaunchPreview: buildMCPLaunchPreview(
+      String(template.seed.command || ''),
+      Array.isArray(template.seed.args) ? template.seed.args : [],
+    ),
+  })),
+  notes: MCP_AUTHORING_NOTES,
+});
diff --git a/frontend/src/components/ai/aiMCPDockerInsights.test.ts b/frontend/src/components/ai/aiMCPDockerInsights.test.ts
new file mode 100644
index 0000000..c0c3ba0
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPDockerInsights.test.ts
@@ -0,0 +1,89 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildMCPDockerSetupSnapshot } from './aiMCPDockerInsights';
+
+describe('aiMCPDockerInsights', () => {
+  it('summarizes docker mcp servers and flags missing stdio-critical args', () => {
+    const snapshot = buildMCPDockerSetupSnapshot({
+      mcpServers: [
+        {
+          id: 'docker-broken',
+          name: 'Docker Broken',
+          transport: 'stdio',
+          command: 'docker',
+          args: ['--rm'],
+          env: {},
+          enabled: true,
+          timeoutSeconds: 10,
+        },
+        {
+          id: 'node-ok',
+          name: 'Node OK',
+          transport: 'stdio',
+          command: 'node',
+          args: ['server.js'],
+          env: {},
+          enabled: true,
+          timeoutSeconds: 20,
+        },
+      ],
+      mcpTools: [],
+    });
+
+    expect(snapshot.dockerServerCount).toBe(1);
+    expect(snapshot.incompleteServerCount).toBe(1);
+    expect(snapshot.servers[0].docker.hasRun).toBe(false);
+    expect(snapshot.servers[0].docker.hasInteractive).toBe(false);
+    expect(snapshot.servers[0].docker.image).toBe('');
+    expect(snapshot.servers[0].nextActions.join('\n')).toContain('run');
+    expect(snapshot.servers[0].nextActions.join('\n')).toContain('-i');
+    expect(snapshot.warnings).toContain('有 1 个 Docker MCP 缺少 run、-i 或镜像名等关键参数');
+  });
+
+  it('handles complete docker run options without treating option values as images', () => {
+    const snapshot = buildMCPDockerSetupSnapshot({
+      mcpServers: [
+        {
+          id: 'docker-ok',
+          name: 'Docker OK',
+          transport: 'stdio',
+          command: 'C:\\Program Files\\Docker\\docker.exe',
+          args: [
+            'run',
+            '--rm',
+            '-i',
+            '-p',
+            '8080:8080',
+            '-v',
+            'C:\\workspace:/workspace',
+            '-e',
+            'API_KEY=***',
+            'ghcr.io/acme/mcp-server:latest',
+          ],
+          env: { DOCKER_HOST: 'npipe:////./pipe/docker_engine' },
+          enabled: true,
+          timeoutSeconds: 45,
+        },
+      ],
+      mcpTools: [
+        {
+          alias: 'docker_probe',
+          originalName: 'probe',
+          serverId: 'docker-ok',
+          serverName: 'Docker OK',
+        },
+      ],
+    });
+
+    expect(snapshot.incompleteServerCount).toBe(0);
+    expect(snapshot.servers[0].docker).toMatchObject({
+      hasRun: true,
+      hasInteractive: true,
+      hasRm: true,
+      image: 'ghcr.io/acme/mcp-server:latest',
+    });
+    expect(snapshot.servers[0].envKeys).toEqual(['DOCKER_HOST']);
+    expect(snapshot.servers[0].discoveredToolCount).toBe(1);
+    expect(snapshot.servers[0].nextActions).toEqual([]);
+  });
+});
diff --git a/frontend/src/components/ai/aiMCPDockerInsights.ts b/frontend/src/components/ai/aiMCPDockerInsights.ts
new file mode 100644
index 0000000..c833a40
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPDockerInsights.ts
@@ -0,0 +1,201 @@
+import type { AIMCPServerConfig, AIMCPToolDescriptor } from '../../types';
+import { buildMCPLaunchPreview } from '../../utils/mcpServerGuidance';
+import { validateMCPServerDraft } from '../../utils/mcpServerValidation';
+
+const toTrimmedString = (value: unknown): string => String(value ?? '').trim();
+
+const normalizeCommandName = (command: unknown): string => {
+  const raw = toTrimmedString(command);
+  const lastPathPart = raw.split(/[\\/]/u).pop() || raw;
+  return lastPathPart
+    .replace(/\.(exe|cmd|bat|ps1)$/iu, '')
+    .toLowerCase();
+};
+
+const normalizeArgs = (args: unknown): string[] =>
+  (Array.isArray(args) ? args : [])
+    .map(toTrimmedString)
+    .filter(Boolean);
+
+const isDockerServer = (server: AIMCPServerConfig): boolean =>
+  normalizeCommandName(server.command) === 'docker';
+
+const hasArg = (args: string[], expected: string): boolean =>
+  args.some((arg) => arg.toLowerCase() === expected.toLowerCase());
+
+const findDockerImage = (args: string[]): string => {
+  const runIndex = args.findIndex((arg) => arg.toLowerCase() === 'run');
+  const candidates = runIndex >= 0 ? args.slice(runIndex + 1) : args;
+  for (let index = 0; index < candidates.length; index += 1) {
+    const arg = candidates[index];
+    if (!arg || arg.startsWith('-')) {
+      const lower = arg.toLowerCase();
+      if ([
+        '-e',
+        '--env',
+        '--name',
+        '--network',
+        '-v',
+        '--volume',
+        '-p',
+        '--publish',
+        '--entrypoint',
+        '-w',
+        '--workdir',
+        '-u',
+        '--user',
+        '--platform',
+        '-h',
+        '--hostname',
+      ].includes(lower)) {
+        index += 1;
+      }
+      continue;
+    }
+    return arg;
+  }
+  return '';
+};
+
+const getServerToolCount = (serverId: string, tools: AIMCPToolDescriptor[]): number =>
+  tools.filter((tool) => tool.serverId === serverId).length;
+
+const buildDockerNextActions = (params: {
+  enabled: boolean;
+  hasRun: boolean;
+  hasInteractive: boolean;
+  image: string;
+  timeoutSeconds: number;
+  issueKeys: Set<string>;
+  discoveredToolCount: number;
+}): string[] => {
+  const actions: string[] = [];
+  if (!params.hasRun) {
+    actions.push('在 args 中补充 run，例如 docker run --rm -i <image>');
+  }
+  if (!params.hasInteractive) {
+    actions.push('在 args 中补充 -i 或 --interactive，确保 MCP stdio 不会立即断开');
+  }
+  if (!params.image) {
+    actions.push('在 docker run 选项之后补充 README 提供的镜像名');
+  }
+  if (params.timeoutSeconds < 20 || params.issueKeys.has('timeout-out-of-range')) {
+    actions.push('Docker 首次拉起可能较慢，建议 timeoutSeconds 使用 45 或 60');
+  }
+  if (params.enabled && params.discoveredToolCount === 0 && actions.length === 0) {
+    actions.push('配置结构看起来完整但未发现工具，建议点击“测试工具发现”确认 Docker、镜像和容器内依赖可用');
+  }
+  if (!params.enabled) {
+    actions.push('该 Docker MCP 当前未启用；确认配置后再启用并测试工具发现');
+  }
+  return actions;
+};
+
+export const buildMCPDockerSetupSnapshot = (params: {
+  mcpServers?: AIMCPServerConfig[];
+  mcpTools?: AIMCPToolDescriptor[];
+  includeDisabled?: boolean;
+  serverId?: string;
+}) => {
+  const {
+    mcpServers = [],
+    mcpTools = [],
+    includeDisabled = true,
+    serverId = '',
+  } = params;
+
+  const dockerServers = (Array.isArray(mcpServers) ? mcpServers : [])
+    .filter(isDockerServer)
+    .filter((server) => includeDisabled || server.enabled !== false)
+    .filter((server) => !toTrimmedString(serverId) || server.id === toTrimmedString(serverId))
+    .map((server) => {
+      const args = normalizeArgs(server.args);
+      const validation = validateMCPServerDraft(server);
+      const issueKeys = new Set(validation.issues.map((issue) => issue.key));
+      const discoveredToolCount = getServerToolCount(server.id, mcpTools);
+      const hasRun = hasArg(args, 'run');
+      const hasInteractive = hasArg(args, '-i') || hasArg(args, '--interactive');
+      const hasRm = hasArg(args, '--rm');
+      const image = findDockerImage(args);
+      const enabled = server.enabled !== false;
+      const timeoutSeconds = Number(server.timeoutSeconds) || 20;
+
+      return {
+        id: server.id,
+        name: server.name,
+        enabled,
+        command: server.command,
+        args,
+        timeoutSeconds,
+        launchCommandPreview: buildMCPLaunchPreview(server.command, args),
+        envKeys: Object.keys(server.env || {}).sort(),
+        envVarCount: Object.keys(server.env || {}).length,
+        discoveredToolCount,
+        docker: {
+          hasRun,
+          hasInteractive,
+          hasRm,
+          image,
+          imageLooksPlaceholder: /^(image|your-image|mcp\/server-fetch:latest)$/iu.test(image),
+        },
+        validation: {
+          errorCount: validation.errorCount,
+          warningCount: validation.warningCount,
+          canTest: validation.canTest,
+          canSave: validation.canSave,
+          issues: validation.issues,
+        },
+        nextActions: buildDockerNextActions({
+          enabled,
+          hasRun,
+          hasInteractive,
+          image,
+          timeoutSeconds,
+          issueKeys,
+          discoveredToolCount,
+        }),
+      };
+    })
+    .sort((left, right) => String(left.name || '').localeCompare(String(right.name || '')));
+
+  const enabledDockerServerCount = dockerServers.filter((server) => server.enabled).length;
+  const incompleteServerCount = dockerServers.filter((server) =>
+    !server.docker.hasRun || !server.docker.hasInteractive || !server.docker.image,
+  ).length;
+  const warningServerCount = dockerServers.filter((server) => server.validation.warningCount > 0).length;
+  const serversWithoutDiscoveredTools = dockerServers.filter((server) => server.enabled && server.discoveredToolCount === 0).length;
+  const warnings: string[] = [];
+  const nextActions: string[] = [];
+
+  if (dockerServers.length === 0) {
+    nextActions.push('如果 README 提供的是 docker run -i --rm <image>，可在 MCP 设置中选择“Docker 镜像”模板新建服务');
+  }
+  if (incompleteServerCount > 0) {
+    warnings.push(`有 ${incompleteServerCount} 个 Docker MCP 缺少 run、-i 或镜像名等关键参数`);
+    nextActions.push('先修复 Docker MCP 关键参数，再重新测试工具发现');
+  } else if (warningServerCount > 0) {
+    warnings.push(`有 ${warningServerCount} 个 Docker MCP 仍存在配置告警`);
+    nextActions.push('打开对应 Docker MCP 服务，按配置检查提示确认参数和超时时间');
+  }
+  if (serversWithoutDiscoveredTools > 0) {
+    warnings.push(`有 ${serversWithoutDiscoveredTools} 个已启用 Docker MCP 暂未发现工具`);
+    nextActions.push('确认本机 Docker 可用、镜像已拉取，并点击“测试工具发现”刷新工具列表');
+  }
+
+  return {
+    dockerServerCount: dockerServers.length,
+    enabledDockerServerCount,
+    disabledDockerServerCount: dockerServers.length - enabledDockerServerCount,
+    incompleteServerCount,
+    warningServerCount,
+    serversWithoutDiscoveredTools,
+    servers: dockerServers,
+    warnings,
+    nextActions,
+    message: dockerServers.length > 0
+      ? incompleteServerCount > 0
+        ? `当前有 ${dockerServers.length} 个 Docker MCP，其中 ${incompleteServerCount} 个关键参数不完整`
+        : `当前有 ${dockerServers.length} 个 Docker MCP，其中 ${enabledDockerServerCount} 个已启用`
+      : '当前没有 Docker MCP 服务',
+  };
+};
diff --git a/frontend/src/components/ai/aiMCPDraftInspectionInsights.test.ts b/frontend/src/components/ai/aiMCPDraftInspectionInsights.test.ts
new file mode 100644
index 0000000..fddc18d
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPDraftInspectionInsights.test.ts
@@ -0,0 +1,96 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildMCPDraftInspectionSnapshot } from './aiMCPDraftInspectionInsights';
+
+describe('aiMCPDraftInspectionInsights', () => {
+  it('parses a full MCP launch command and returns reusable field values', () => {
+    const snapshot = buildMCPDraftInspectionSnapshot({
+      fullCommand: '$env:GITHUB_TOKEN="ghp test"; uvx mcp-server-github --stdio',
+      timeoutSeconds: 45,
+    });
+
+    expect(snapshot.parse).toMatchObject({
+      ok: true,
+      command: 'uvx',
+      args: ['mcp-server-github', '--stdio'],
+      envKeys: ['GITHUB_TOKEN'],
+    });
+    expect(snapshot.input.fullCommand).toBe('GITHUB_TOKEN=*** uvx mcp-server-github --stdio');
+    expect(snapshot.draft.launchCommandPreview).toBe('uvx mcp-server-github --stdio');
+    expect(snapshot.draft.envKeys).toEqual(['GITHUB_TOKEN']);
+    expect(snapshot.draft.envHints).toMatchObject({
+      envVarCount: 1,
+      secretLikeCount: 1,
+      items: [{
+        key: 'GITHUB_TOKEN',
+        category: 'secret',
+        label: 'GitHub Token',
+        sensitive: true,
+        known: true,
+      }],
+    });
+    expect(snapshot.draft.envHints?.nextActions.join('\n')).toContain('密钥类变量只保存在本机配置');
+    expect(snapshot.draft.timeoutSeconds).toBe(45);
+    expect(snapshot.draft.suggestedServerSeed).toMatchObject({
+      name: 'mcp-server-github',
+      transport: 'stdio',
+      command: 'uvx',
+      args: ['mcp-server-github', '--stdio'],
+      env: { GITHUB_TOKEN: '***' },
+      envRedacted: true,
+      timeoutSeconds: 45,
+    });
+    expect(snapshot.draft.recommendedTemplate).toMatchObject({
+      key: 'uvx',
+      title: 'uvx 工具',
+      confidence: 'high',
+    });
+    expect(snapshot.validation.canSave).toBe(true);
+    expect(snapshot.nextActions).toContain('当前草稿可以保存并测试工具发现；如果发现 0 个工具，再检查服务是否支持 stdio。');
+    expect(JSON.stringify(snapshot)).not.toContain('ghp test');
+  });
+
+  it('validates split fields and returns concrete next actions for common mistakes', () => {
+    const snapshot = buildMCPDraftInspectionSnapshot({
+      command: 'npx -y @modelcontextprotocol/server-filesystem --stdio',
+      args: ['env', 'GITHUB_TOKEN=abc'],
+      envText: 'export TOKEN=abc',
+      timeoutSeconds: 1,
+    });
+
+    expect(snapshot.draft.command).toBe('npx -y @modelcontextprotocol/server-filesystem --stdio');
+    expect(snapshot.validation.errorCount).toBe(1);
+    expect(snapshot.validation.warningCount).toBeGreaterThanOrEqual(3);
+    expect(snapshot.validation.issues.map((issue) => issue.key)).toEqual(expect.arrayContaining([
+      'command-whole-line',
+      'args-contain-env-or-shell-glue',
+      'env-invalid-lines',
+      'timeout-out-of-range',
+    ]));
+    expect(snapshot.nextActions.join('\n')).toContain('把整行命令放到完整命令框自动拆分');
+    expect(snapshot.nextActions.join('\n')).toContain('环境变量改成每行 KEY=VALUE');
+  });
+
+  it('applies the docker template and explains docker-specific missing args', () => {
+    const snapshot = buildMCPDraftInspectionSnapshot({
+      templateKey: 'docker',
+      args: ['run', '--rm'],
+      timeoutSeconds: 10,
+    });
+
+    expect(snapshot.draft.command).toBe('docker');
+    expect(snapshot.draft.recommendedTemplate).toMatchObject({
+      key: 'docker',
+      title: 'Docker 镜像',
+    });
+    expect(snapshot.draft.suggestedServerSeed).toMatchObject({
+      name: 'docker',
+      command: 'docker',
+      timeoutSeconds: 10,
+    });
+    expect(snapshot.validation.issues.map((issue) => issue.key)).toContain('docker-interactive-missing');
+    expect(snapshot.validation.issues.map((issue) => issue.key)).toContain('docker-image-missing');
+    expect(snapshot.nextActions.join('\n')).toContain('Docker MCP 的 args 里补 -i');
+    expect(snapshot.nextActions.join('\n')).toContain('Docker MCP 的 args 里补 README 提供的镜像名');
+  });
+});
diff --git a/frontend/src/components/ai/aiMCPDraftInspectionInsights.ts b/frontend/src/components/ai/aiMCPDraftInspectionInsights.ts
new file mode 100644
index 0000000..47de81c
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPDraftInspectionInsights.ts
@@ -0,0 +1,307 @@
+import type { AIMCPServerConfig } from '../../types';
+import { buildMCPArgumentDetailHints } from '../../utils/mcpArgumentDetailHints';
+import { buildMCPArgumentHintProfile } from '../../utils/mcpArgumentHints';
+import { parseMCPCommandDraft, type ParseMCPCommandDraftResult } from '../../utils/mcpCommandDraft';
+import { buildMCPEnvHintProfile } from '../../utils/mcpEnvHints';
+import { parseMCPEnvDraft } from '../../utils/mcpEnvDraft';
+import { buildMCPLaunchPreview } from '../../utils/mcpServerGuidance';
+import { buildMCPServerDraftSeed } from '../../utils/mcpServerDraftSeed';
+import { MCP_SERVER_DRAFT_TEMPLATES } from '../../utils/mcpServerTemplates';
+import { validateMCPServerDraft } from '../../utils/mcpServerValidation';
+
+const toTrimmedString = (value: unknown): string => String(value ?? '').trim();
+
+const normalizeArgs = (value: unknown): string[] => {
+  if (Array.isArray(value)) {
+    return value.map(toTrimmedString).filter(Boolean);
+  }
+  const text = toTrimmedString(value);
+  if (!text) {
+    return [];
+  }
+  return text
+    .split(/\r?\n|,/u)
+    .map(toTrimmedString)
+    .filter(Boolean);
+};
+
+const normalizeTimeoutSeconds = (value: unknown, fallback: number): number => {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+};
+
+const redactEnvValues = (env: Record<string, string>): Record<string, string> =>
+  Object.fromEntries(Object.keys(env).sort().map((key) => [key, env[key] ? '***' : '']));
+
+const isSensitiveArgFlag = (arg: string): boolean => {
+  const flag = toTrimmedString(arg).split('=')[0].replace(/^-+/u, '').toLowerCase();
+  return /(token|api-?key|secret|password|pass|credential)/iu.test(flag);
+};
+
+const redactSensitiveArgValues = (args: string[]): string[] => {
+  const result: string[] = [];
+  let redactNext = false;
+  for (const arg of args) {
+    const text = toTrimmedString(arg);
+    if (!text) {
+      continue;
+    }
+    if (redactNext && !text.startsWith('-')) {
+      result.push('***');
+      redactNext = false;
+      continue;
+    }
+    redactNext = false;
+    if (isSensitiveArgFlag(text)) {
+      const equalsIndex = text.indexOf('=');
+      if (equalsIndex >= 0) {
+        result.push(`${text.slice(0, equalsIndex)}=***`);
+      } else {
+        result.push(text);
+        redactNext = true;
+      }
+      continue;
+    }
+    result.push(text);
+  }
+  return result;
+};
+
+const buildRedactedFullCommand = (
+  fullCommand: string,
+  parsedCommand: ParseMCPCommandDraftResult | null,
+): string => {
+  if (!fullCommand) {
+    return '';
+  }
+  if (!parsedCommand?.ok || !parsedCommand.draft) {
+    return '[解析失败，原始命令已隐藏]';
+  }
+  return [
+    ...Object.keys(parsedCommand.draft.env || {}).sort().map((key) => `${key}=***`),
+    buildMCPLaunchPreview(parsedCommand.draft.command, redactSensitiveArgValues(parsedCommand.draft.args)),
+  ].filter(Boolean).join(' ');
+};
+
+const getTemplateSeed = (templateKey: unknown): Partial<AIMCPServerConfig> => {
+  const normalizedKey = toTrimmedString(templateKey).toLowerCase();
+  if (!normalizedKey) {
+    return {};
+  }
+  return MCP_SERVER_DRAFT_TEMPLATES.find((template) => template.key === normalizedKey)?.seed || {};
+};
+
+const resolveRecommendedTemplate = (command: string, args: string[]) => {
+  const normalizedCommand = toTrimmedString(command).toLowerCase();
+  if (!normalizedCommand) {
+    return null;
+  }
+
+  const commandTemplate = MCP_SERVER_DRAFT_TEMPLATES.find((template) => {
+    const seedCommand = toTrimmedString(template.seed.command).toLowerCase();
+    if (seedCommand === normalizedCommand) {
+      return true;
+    }
+    return template.key === 'exe' && /\.(exe|cmd|bat)$/iu.test(normalizedCommand);
+  });
+  if (!commandTemplate) {
+    return null;
+  }
+
+  return {
+    key: commandTemplate.key,
+    title: commandTemplate.title,
+    description: commandTemplate.description,
+    exampleLaunchPreview: buildMCPLaunchPreview(
+      toTrimmedString(commandTemplate.seed.command),
+      Array.isArray(commandTemplate.seed.args) ? commandTemplate.seed.args : [],
+    ),
+    confidence: args.length > 0 ? 'high' : 'medium',
+  };
+};
+
+const buildNextActions = (params: {
+  errorCount: number;
+  warningCount: number;
+  issueKeys: Set<string>;
+  hasFullCommand: boolean;
+}): string[] => {
+  const { errorCount, warningCount, issueKeys, hasFullCommand } = params;
+  const actions: string[] = [];
+
+  if (issueKeys.has('command-missing')) {
+    actions.push('先粘贴 README 里的完整启动命令，或至少填写 node、npx、uvx、python、exe 之一作为 command。');
+  }
+  if (issueKeys.has('command-whole-line')) {
+    actions.push('把整行命令放到完整命令框自动拆分；command 只保留可执行程序，脚本名、包名和 --stdio 放到 args。');
+  }
+  if (issueKeys.has('args-missing-for-launcher')) {
+    actions.push('给启动器补齐参数：npx 通常需要 -y 和包名，node 需要 server.js，python 需要 -m 模块名，uvx 需要包名，docker 需要 run、-i 和镜像名。');
+  }
+  if (issueKeys.has('docker-run-missing')) {
+    actions.push('Docker MCP 的 command 填 docker，args 里单独补 run。');
+  }
+  if (issueKeys.has('docker-interactive-missing')) {
+    actions.push('Docker MCP 的 args 里补 -i 或 --interactive，避免 stdio 连接立即断开。');
+  }
+  if (issueKeys.has('docker-image-missing')) {
+    actions.push('Docker MCP 的 args 里补 README 提供的镜像名，例如 mcp/server-fetch:latest。');
+  }
+  if (issueKeys.has('args-contain-env-or-shell-glue') || issueKeys.has('env-invalid-lines')) {
+    actions.push('环境变量改成每行 KEY=VALUE；不要把 export、set、env、&& 或 $env:KEY=VALUE; 放进 args。');
+  }
+  if (issueKeys.has('timeout-out-of-range')) {
+    actions.push('把 timeout 调整到 20 秒；慢启动服务可改成 45 或 60 秒。');
+  }
+  if (errorCount === 0 && warningCount === 0) {
+    actions.push('当前草稿可以保存并测试工具发现；如果发现 0 个工具，再检查服务是否支持 stdio。');
+  } else if (errorCount === 0) {
+    actions.push('当前草稿可以测试，但建议先处理 warning，避免工具发现超时或发现 0 个工具。');
+  }
+  if (!hasFullCommand) {
+    actions.push('如果仍不确定怎么拆，优先把原始完整命令传给 fullCommand 让 GoNavi 试算。');
+  }
+
+  return actions;
+};
+
+export const buildMCPDraftInspectionSnapshot = (args: Record<string, unknown> = {}) => {
+  const templateSeed = getTemplateSeed(args.templateKey);
+  const fullCommand = toTrimmedString(args.fullCommand ?? args.commandLine ?? args.rawCommand);
+  const parsedCommand = fullCommand ? parseMCPCommandDraft(fullCommand) : null;
+  const envDraftText = toTrimmedString(args.envText ?? args.envDraft);
+  const parsedEnvDraft = envDraftText ? parseMCPEnvDraft(envDraftText) : undefined;
+
+  const baseName = toTrimmedString(templateSeed.name) || 'MCP 草稿';
+  let command = toTrimmedString(templateSeed.command);
+  let commandArgs = Array.isArray(templateSeed.args) ? templateSeed.args.map(toTrimmedString).filter(Boolean) : [];
+  let env: Record<string, string> = { ...(templateSeed.env || {}) };
+
+  if (parsedCommand?.ok && parsedCommand.draft) {
+    command = parsedCommand.draft.command;
+    commandArgs = parsedCommand.draft.args;
+    env = {
+      ...env,
+      ...parsedCommand.draft.env,
+    };
+  }
+  if (args.command !== undefined) {
+    command = toTrimmedString(args.command);
+  }
+  if (args.args !== undefined) {
+    commandArgs = normalizeArgs(args.args);
+  }
+  if (parsedEnvDraft) {
+    env = {
+      ...env,
+      ...parsedEnvDraft.env,
+    };
+  }
+
+  const server: Pick<AIMCPServerConfig, 'name' | 'transport' | 'command' | 'args' | 'timeoutSeconds'> = {
+    name: toTrimmedString(args.name ?? args.serverName) || baseName,
+    transport: 'stdio',
+    command,
+    args: commandArgs,
+    timeoutSeconds: normalizeTimeoutSeconds(args.timeoutSeconds, Number(templateSeed.timeoutSeconds) || 20),
+  };
+  const validation = validateMCPServerDraft(server, parsedEnvDraft);
+  const issueKeys = new Set(validation.issues.map((issue) => issue.key));
+  const recommendedTemplate = resolveRecommendedTemplate(command, commandArgs);
+  const argumentHintProfile = buildMCPArgumentHintProfile(command, commandArgs);
+  const redactedCommandArgs = redactSensitiveArgValues(commandArgs);
+  const envHintProfile = buildMCPEnvHintProfile(command, commandArgs, env);
+  const suggestedServerSeed = buildMCPServerDraftSeed({
+    name: toTrimmedString(args.name ?? args.serverName) || undefined,
+    command,
+    args: commandArgs,
+    env,
+    timeoutSeconds: server.timeoutSeconds,
+  });
+
+  return {
+    input: {
+      hasFullCommand: Boolean(fullCommand),
+      templateKey: toTrimmedString(args.templateKey),
+      fullCommand: buildRedactedFullCommand(fullCommand, parsedCommand),
+    },
+    parse: parsedCommand
+      ? {
+          ok: parsedCommand.ok,
+          error: parsedCommand.error || '',
+          command: parsedCommand.draft?.command || '',
+          args: redactSensitiveArgValues(parsedCommand.draft?.args || []),
+          argsRedacted: JSON.stringify(redactSensitiveArgValues(parsedCommand.draft?.args || [])) !== JSON.stringify(parsedCommand.draft?.args || []),
+          envKeys: Object.keys(parsedCommand.draft?.env || {}).sort(),
+        }
+      : {
+          ok: false,
+          error: '未提供 fullCommand，已按分字段草稿校验。',
+          command: '',
+          args: [],
+          envKeys: [],
+        },
+    draft: {
+      name: server.name,
+      transport: server.transport,
+      command,
+      args: redactedCommandArgs,
+      argsRedacted: JSON.stringify(redactedCommandArgs) !== JSON.stringify(commandArgs),
+      envKeys: Object.keys(env).sort(),
+      envVarCount: Object.keys(env).length,
+      argumentHints: argumentHintProfile ? {
+        commandName: argumentHintProfile.commandName,
+        title: argumentHintProfile.title,
+        summary: argumentHintProfile.summary,
+        orderHint: argumentHintProfile.orderHint,
+        steps: argumentHintProfile.steps,
+        argumentDetailHints: buildMCPArgumentDetailHints(argumentHintProfile.commandName, commandArgs),
+        businessHints: argumentHintProfile.businessHints,
+        nextActions: argumentHintProfile.nextActions,
+      } : null,
+      envHints: envHintProfile ? {
+        envVarCount: envHintProfile.envVarCount,
+        secretLikeCount: envHintProfile.secretLikeCount,
+        endpointLikeCount: envHintProfile.endpointLikeCount,
+        items: envHintProfile.items.map((item) => ({
+          key: item.key,
+          category: item.category,
+          label: item.label,
+          detail: item.detail,
+          valueHint: item.valueHint,
+          sensitive: item.sensitive,
+          known: item.known,
+          empty: item.empty,
+          placeholder: item.placeholder,
+        })),
+        warnings: envHintProfile.warnings,
+        nextActions: envHintProfile.nextActions,
+      } : null,
+      invalidEnvLines: parsedEnvDraft?.invalidLines || [],
+      timeoutSeconds: server.timeoutSeconds,
+      launchCommandPreview: buildMCPLaunchPreview(command, redactedCommandArgs),
+      recommendedTemplate,
+      suggestedServerSeed: {
+        ...suggestedServerSeed,
+        args: redactSensitiveArgValues(suggestedServerSeed.args || []),
+        env: redactEnvValues(env),
+        envRedacted: Object.keys(env).length > 0,
+        argsRedacted: JSON.stringify(redactSensitiveArgValues(suggestedServerSeed.args || [])) !== JSON.stringify(suggestedServerSeed.args || []),
+      },
+    },
+    validation: {
+      errorCount: validation.errorCount,
+      warningCount: validation.warningCount,
+      infoCount: validation.infoCount,
+      canTest: validation.canTest,
+      canSave: validation.canSave,
+      issues: validation.issues,
+    },
+    nextActions: buildNextActions({
+      errorCount: validation.errorCount,
+      warningCount: validation.warningCount,
+      issueKeys,
+      hasFullCommand: Boolean(fullCommand),
+    }),
+  };
+};
diff --git a/frontend/src/components/ai/aiMCPInsights.test.ts b/frontend/src/components/ai/aiMCPInsights.test.ts
new file mode 100644
index 0000000..0dbefaa
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPInsights.test.ts
@@ -0,0 +1,94 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildMCPSetupSnapshot } from './aiMCPInsights';
+
+describe('aiMCPInsights', () => {
+  it('builds a combined snapshot for local mcp servers, tools, and external client install state', () => {
+    const snapshot = buildMCPSetupSnapshot({
+      mcpServers: [
+        {
+          id: 'server-1',
+          name: 'Browser',
+          transport: 'stdio',
+          command: 'uvx',
+          args: ['mcp-server-browser'],
+          env: {
+            OPENAI_API_KEY: '***',
+            BASE_URL: 'http://127.0.0.1',
+          },
+          enabled: true,
+          timeoutSeconds: 20,
+        },
+      ],
+      mcpClientStatuses: [
+        {
+          client: 'claude-code',
+          displayName: 'Claude Code',
+          installed: true,
+          matchesCurrent: true,
+          clientDetected: true,
+          clientCommand: 'claude',
+          clientPath: 'C:/Tools/claude.exe',
+          configPath: 'C:/Users/demo/.claude/mcp.json',
+          command: 'gonavi-mcp-server',
+          args: ['stdio'],
+          message: '已写入当前 GoNavi 路径',
+        },
+      ],
+      mcpTools: [
+        {
+          alias: 'browser_open',
+          originalName: 'browser_open',
+          serverId: 'server-1',
+          serverName: 'Browser',
+          title: '打开页面',
+        },
+      ],
+    });
+
+    expect(snapshot.serverCount).toBe(1);
+    expect(snapshot.enabledServerCount).toBe(1);
+    expect(snapshot.discoveredMCPToolCount).toBe(1);
+    expect(snapshot.serverConfigurationIssueCount).toBe(0);
+    expect(snapshot.servers[0].launchCommandPreview).toBe('uvx mcp-server-browser');
+    expect(snapshot.servers[0].configurationIssueCount).toBe(0);
+    expect(snapshot.servers[0].envVarCount).toBe(2);
+    expect(snapshot.servers[0].discoveredToolCount).toBe(1);
+    expect(snapshot.clients[0].displayName).toBe('Claude Code');
+    expect(snapshot.clients[0].launchCommandPreview).toBe('gonavi-mcp-server stdio');
+    expect(snapshot.currentClientCount).toBe(1);
+  });
+
+  it('surfaces saved mcp server launch validation issues for ai diagnostics', () => {
+    const snapshot = buildMCPSetupSnapshot({
+      mcpServers: [
+        {
+          id: 'server-1',
+          name: 'Broken',
+          transport: 'stdio',
+          command: '',
+          args: [],
+          env: {},
+          enabled: true,
+          timeoutSeconds: 1,
+        },
+      ],
+      mcpClientStatuses: [],
+      mcpTools: [],
+    });
+
+    expect(snapshot.serverConfigurationIssueCount).toBe(2);
+    expect(snapshot.serversWithConfigurationErrors).toBe(1);
+    expect(snapshot.enabledServersWithConfigurationIssues).toBe(1);
+    expect(snapshot.servers[0].configurationErrorCount).toBe(1);
+    expect(snapshot.servers[0].configurationWarningCount).toBe(1);
+    expect(snapshot.servers[0].configurationCanTest).toBe(false);
+    expect(snapshot.servers[0].configurationIssues.map((issue) => issue.key)).toEqual([
+      'command-missing',
+      'timeout-out-of-range',
+    ]);
+    expect(snapshot.warnings).toContain('有 1 个 MCP 服务存在启动配置错误，测试和工具发现可能失败');
+    expect(snapshot.nextActions).toContain('先修复 MCP 服务配置检查里的错误项，再重新测试服务');
+    expect(snapshot.message).toContain('2 个配置检查项需要确认');
+  });
+});
diff --git a/frontend/src/components/ai/aiMCPInsights.ts b/frontend/src/components/ai/aiMCPInsights.ts
new file mode 100644
index 0000000..22eb0ce
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPInsights.ts
@@ -0,0 +1,126 @@
+import type { AIMCPClientInstallStatus, AIMCPServerConfig, AIMCPToolDescriptor } from '../../types';
+import { validateMCPServerDraft } from '../../utils/mcpServerValidation';
+
+const SERVER_TOOL_PREVIEW_LIMIT = 20;
+
+const quoteCommandPart = (value: string): string => {
+  const text = String(value || '').trim();
+  if (!text) {
+    return '';
+  }
+  return /[\s"]/u.test(text) ? `"${text.replace(/"/g, '\\"')}"` : text;
+};
+
+const formatLaunchPreview = (command?: string, args?: string[]): string =>
+  [String(command || '').trim(), ...(Array.isArray(args) ? args : [])]
+    .map((item) => quoteCommandPart(String(item || '').trim()))
+    .filter(Boolean)
+    .join(' ');
+
+const sortByName = <T extends { name?: string }>(items: T[]): T[] =>
+  items.slice().sort((left, right) => String(left.name || '').localeCompare(String(right.name || '')));
+
+export const buildMCPSetupSnapshot = (params: {
+  mcpServers?: AIMCPServerConfig[];
+  mcpClientStatuses?: AIMCPClientInstallStatus[];
+  mcpTools?: AIMCPToolDescriptor[];
+}) => {
+  const {
+    mcpServers = [],
+    mcpClientStatuses = [],
+    mcpTools = [],
+  } = params;
+
+  const normalizedServers = sortByName(
+    (Array.isArray(mcpServers) ? mcpServers : []).map((server) => {
+      const serverTools = mcpTools
+        .filter((tool) => tool.serverId === server.id)
+        .map((tool) => ({
+          alias: tool.alias,
+          title: tool.title || tool.originalName || tool.alias,
+        }));
+      const validation = validateMCPServerDraft(server);
+      return {
+        id: server.id,
+        name: server.name,
+        transport: server.transport,
+        enabled: server.enabled !== false,
+        timeoutSeconds: server.timeoutSeconds,
+        command: server.command,
+        args: Array.isArray(server.args) ? server.args : [],
+        launchCommandPreview: formatLaunchPreview(server.command, server.args),
+        envKeys: Object.keys(server.env || {}).sort(),
+        envVarCount: Object.keys(server.env || {}).length,
+        discoveredToolCount: serverTools.length,
+        discoveredTools: serverTools.slice(0, SERVER_TOOL_PREVIEW_LIMIT),
+        discoveredToolsTruncated: serverTools.length > SERVER_TOOL_PREVIEW_LIMIT,
+        configurationIssueCount: validation.issues.length,
+        configurationErrorCount: validation.errorCount,
+        configurationWarningCount: validation.warningCount,
+        configurationCanTest: validation.canTest,
+        configurationIssues: validation.issues,
+      };
+    }),
+  );
+
+  const normalizedClientStatuses = (Array.isArray(mcpClientStatuses) ? mcpClientStatuses : [])
+    .map((status) => ({
+      client: status.client,
+      displayName: status.displayName,
+      installMode: status.installMode || 'auto',
+      installed: status.installed,
+      matchesCurrent: status.matchesCurrent,
+      clientDetected: status.clientDetected === true,
+      clientCommand: status.clientCommand || '',
+      clientPath: status.clientPath || '',
+      configPath: status.configPath || '',
+      launchCommandPreview: formatLaunchPreview(status.command, status.args),
+      message: status.message || '',
+    }))
+    .sort((left, right) => left.displayName.localeCompare(right.displayName));
+
+  const enabledServerCount = normalizedServers.filter((server) => server.enabled).length;
+  const installedClientCount = normalizedClientStatuses.filter((item) => item.installed).length;
+  const currentClientCount = normalizedClientStatuses.filter((item) => item.matchesCurrent).length;
+  const serversWithConfigurationErrors = normalizedServers.filter((server) => server.configurationErrorCount > 0).length;
+  const serversWithConfigurationWarnings = normalizedServers.filter((server) => server.configurationWarningCount > 0).length;
+  const serverConfigurationIssueCount = normalizedServers
+    .reduce((total, server) => total + server.configurationIssueCount, 0);
+  const enabledServersWithConfigurationIssues = normalizedServers
+    .filter((server) => server.enabled && server.configurationIssueCount > 0)
+    .length;
+  const warnings: string[] = [];
+  const nextActions: string[] = [];
+
+  if (serversWithConfigurationErrors > 0) {
+    warnings.push(`有 ${serversWithConfigurationErrors} 个 MCP 服务存在启动配置错误，测试和工具发现可能失败`);
+    nextActions.push('先修复 MCP 服务配置检查里的错误项，再重新测试服务');
+  } else if (serversWithConfigurationWarnings > 0) {
+    warnings.push(`有 ${serversWithConfigurationWarnings} 个 MCP 服务存在启动配置告警，建议在排查工具发现失败前先确认`);
+    nextActions.push('打开对应 MCP 服务，按配置检查提示拆分启动命令、参数和超时时间');
+  }
+
+  return {
+    serverCount: normalizedServers.length,
+    enabledServerCount,
+    disabledServerCount: normalizedServers.length - enabledServerCount,
+    discoveredMCPToolCount: Array.isArray(mcpTools) ? mcpTools.length : 0,
+    serverConfigurationIssueCount,
+    serversWithConfigurationErrors,
+    serversWithConfigurationWarnings,
+    enabledServersWithConfigurationIssues,
+    servers: normalizedServers,
+    clientInstallCount: normalizedClientStatuses.length,
+    installedClientCount,
+    currentClientCount,
+    detectedClientCount: normalizedClientStatuses.filter((item) => item.clientDetected).length,
+    clients: normalizedClientStatuses,
+    warnings,
+    nextActions,
+    message: normalizedServers.length > 0
+      ? serverConfigurationIssueCount > 0
+        ? `当前共配置 ${normalizedServers.length} 个 MCP 服务，其中 ${enabledServerCount} 个已启用，${serverConfigurationIssueCount} 个配置检查项需要确认`
+        : `当前共配置 ${normalizedServers.length} 个 MCP 服务，其中 ${enabledServerCount} 个已启用`
+      : '当前还没有配置任何 MCP 服务',
+  };
+};
diff --git a/frontend/src/components/ai/aiMCPRemoteAccessInsights.test.ts b/frontend/src/components/ai/aiMCPRemoteAccessInsights.test.ts
new file mode 100644
index 0000000..d02a8ec
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPRemoteAccessInsights.test.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildMCPRemoteAccessSnapshot } from './aiMCPRemoteAccessInsights';
+
+describe('aiMCPRemoteAccessInsights', () => {
+  it('builds a secure remote mcp access guide for cloud agents', () => {
+    const snapshot = buildMCPRemoteAccessSnapshot({
+      publicUrl: 'https://mcp.example.com/gonavi',
+      exposeStrategy: 'cloudflare_tunnel',
+      tokenConfigured: true,
+      mcpClientStatuses: [
+        {
+          client: 'openclaw',
+          displayName: 'OpenClaw',
+          installMode: 'remote',
+          installed: false,
+          matchesCurrent: false,
+          clientDetected: false,
+          clientCommand: 'openclaw',
+          message: 'OpenClaw 通常部署在云端 Linux',
+        },
+      ],
+    });
+
+    expect(snapshot.mode).toBe('streamable-http');
+    expect(snapshot.endpoint.publicUrl).toBe('https://mcp.example.com/gonavi/mcp');
+    expect(snapshot.endpoint.authHeader).toBe('Authorization: Bearer <随机token>');
+    expect(snapshot.launchCommands.appBinary).toContain('GoNavi.exe mcp-server http');
+    expect(snapshot.selectedStrategy.key).toBe('cloudflare_tunnel');
+    expect(snapshot.remoteClients.some((client) => client.client === 'openclaw')).toBe(true);
+    expect(snapshot.remoteClients.find((client) => client.client === 'openclaw')?.guide).toContain('数据库连接、账号和密码继续保存在 Windows');
+    expect(snapshot.securityBoundary.databaseSecretsStayLocal).toBe(true);
+    expect(snapshot.securityBoundary.cloudAgentNeedsDatabasePassword).toBe(false);
+    expect(snapshot.securityBoundary.mutatingSqlStillRequiresAllowMutating).toBe(true);
+    expect(snapshot.warnings).toHaveLength(0);
+    expect(snapshot.nextActions.join('\n')).toContain('不要把数据库密码复制到云端 Agent');
+  });
+
+  it('warns when public url or bearer token readiness is missing', () => {
+    const snapshot = buildMCPRemoteAccessSnapshot({
+      tokenConfigured: false,
+      mcpClientStatuses: [],
+    });
+
+    expect(snapshot.endpoint.localUrl).toBe('http://127.0.0.1:8765/mcp');
+    expect(snapshot.remoteClients.map((client) => client.client)).toEqual(['openclaw', 'hermans']);
+    expect(snapshot.warnings).toContain('尚未提供云端 Agent 可访问的 MCP URL；远程 Agent 不能直接访问 Windows 本机 127.0.0.1。');
+    expect(snapshot.warnings).toContain('尚未确认 Bearer Token；HTTP MCP 必须配置随机 token，不能无鉴权暴露。');
+  });
+});
diff --git a/frontend/src/components/ai/aiMCPRemoteAccessInsights.ts b/frontend/src/components/ai/aiMCPRemoteAccessInsights.ts
new file mode 100644
index 0000000..a626181
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPRemoteAccessInsights.ts
@@ -0,0 +1,166 @@
+import type { AIMCPClientInstallStatus } from '../../types';
+import {
+  buildRemoteMCPClientGuide,
+  isRemoteMCPClientStatus,
+  normalizeMCPClientStatuses,
+} from '../../utils/mcpClientInstallStatus';
+
+type MCPRemoteExposeStrategyKey =
+  | 'reverse_proxy'
+  | 'ssh_reverse_tunnel'
+  | 'cloudflare_tunnel'
+  | 'tailscale'
+  | 'custom';
+
+const DEFAULT_HTTP_ADDR = '127.0.0.1:8765';
+const DEFAULT_HTTP_PATH = '/mcp';
+
+const REMOTE_EXPOSE_STRATEGIES: Array<{
+  key: MCPRemoteExposeStrategyKey;
+  title: string;
+  detail: string;
+  risk: string;
+}> = [
+  {
+    key: 'reverse_proxy',
+    title: '内网反向代理',
+    detail: '适合 Windows GoNavi 和云端 Agent 之间已有可信内网或网关的团队环境。',
+    risk: '需要网关层继续限制来源 IP、TLS 和 Bearer Token，不要裸露公网。',
+  },
+  {
+    key: 'ssh_reverse_tunnel',
+    title: 'SSH 反向隧道',
+    detail: '适合临时把 Windows 本机的 127.0.0.1:8765 映射到云端 Linux。配置简单，但要保证 SSH 账号和端口受控。',
+    risk: '隧道断开后云端 Agent 会不可用，适合 PoC 或受控运维环境。',
+  },
+  {
+    key: 'cloudflare_tunnel',
+    title: 'Cloudflare Tunnel',
+    detail: '适合没有固定公网入口的 Windows 机器，通过 Cloudflare Access 叠加身份校验。',
+    risk: '必须启用 Access / Zero Trust 规则，不能只依赖随机 URL。',
+  },
+  {
+    key: 'tailscale',
+    title: 'Tailscale / WireGuard',
+    detail: '适合把 Windows GoNavi 和云端 Agent 放进同一个私有网络，优先走内网地址。',
+    risk: '需要控制 ACL，只允许目标 Agent 访问 GoNavi MCP 端口。',
+  },
+  {
+    key: 'custom',
+    title: '自定义桥接',
+    detail: '适合已有企业网关、堡垒机或专用 MCP 网关的环境。',
+    risk: '需要明确 TLS、鉴权、审计和来源限制，避免把本机数据库能力暴露给未知 Agent。',
+  },
+];
+
+const normalizePath = (value: unknown): string => {
+  const raw = String(value || DEFAULT_HTTP_PATH).trim();
+  if (!raw) {
+    return DEFAULT_HTTP_PATH;
+  }
+  return raw.startsWith('/') ? raw : `/${raw}`;
+};
+
+const normalizeLocalAddr = (value: unknown): string => {
+  const raw = String(value || DEFAULT_HTTP_ADDR).trim();
+  return raw || DEFAULT_HTTP_ADDR;
+};
+
+const normalizePublicUrl = (value: unknown, path: string): string => {
+  const raw = String(value || '').trim();
+  if (!raw) {
+    return '';
+  }
+  const normalizedPath = normalizePath(path);
+  const withoutTrailingSlash = raw.replace(/\/+$/u, '');
+  return withoutTrailingSlash.endsWith(normalizedPath)
+    ? withoutTrailingSlash
+    : `${withoutTrailingSlash}${normalizedPath}`;
+};
+
+const buildHttpLaunchCommand = (binary: string, addr: string, path: string): string =>
+  `${binary} mcp-server http --addr ${addr} --path ${path} --token <随机token>`;
+
+const buildStandaloneLaunchCommand = (addr: string, path: string): string =>
+  `gonavi-mcp-server http --addr ${addr} --path ${path} --token <随机token>`;
+
+const resolveStrategy = (value: unknown) => {
+  const key = String(value || '').trim() as MCPRemoteExposeStrategyKey;
+  return REMOTE_EXPOSE_STRATEGIES.find((item) => item.key === key) || REMOTE_EXPOSE_STRATEGIES[0];
+};
+
+export const buildMCPRemoteAccessSnapshot = (params: {
+  mcpClientStatuses?: AIMCPClientInstallStatus[];
+  publicUrl?: string;
+  localAddr?: string;
+  path?: string;
+  exposeStrategy?: MCPRemoteExposeStrategyKey | string;
+  tokenConfigured?: boolean;
+} = {}) => {
+  const localAddr = normalizeLocalAddr(params.localAddr);
+  const path = normalizePath(params.path);
+  const localUrl = `http://${localAddr}${path}`;
+  const publicUrl = normalizePublicUrl(params.publicUrl, path);
+  const selectedStrategy = resolveStrategy(params.exposeStrategy);
+  const clientStatuses = normalizeMCPClientStatuses(params.mcpClientStatuses);
+  const remoteClients = clientStatuses
+    .filter(isRemoteMCPClientStatus)
+    .map((status) => ({
+      client: status.client,
+      displayName: status.displayName,
+      installMode: status.installMode || 'remote',
+      message: status.message || '',
+      guide: buildRemoteMCPClientGuide(status),
+    }));
+
+  const warnings: string[] = [];
+  const nextActions: string[] = [
+    '在 Windows 本机启动 GoNavi MCP HTTP 模式，并确认 /healthz 可访问。',
+    '通过隧道、反向代理或私有网络只暴露 /mcp 给指定云端 Agent。',
+    '在 OpenClaw/Hermans 里配置 Streamable HTTP MCP URL 和 Authorization Bearer Token。',
+    '先调用 get_connections 获取 connectionId，再读取库表结构；不要把数据库密码复制到云端 Agent。',
+  ];
+
+  if (!publicUrl) {
+    warnings.push('尚未提供云端 Agent 可访问的 MCP URL；远程 Agent 不能直接访问 Windows 本机 127.0.0.1。');
+  } else if (!/^https:\/\//iu.test(publicUrl) && !/^http:\/\/(127\.0\.0\.1|localhost|\[::1\])/iu.test(publicUrl)) {
+    warnings.push('远程 MCP URL 不是 HTTPS；如果不是私有网络地址，建议加 TLS 或放到受控隧道后面。');
+  }
+
+  if (params.tokenConfigured === false) {
+    warnings.push('尚未确认 Bearer Token；HTTP MCP 必须配置随机 token，不能无鉴权暴露。');
+  }
+
+  return {
+    mode: 'streamable-http',
+    message: publicUrl
+      ? `远程 Agent 应通过 ${publicUrl} 访问 GoNavi MCP，并使用 Bearer Token 鉴权`
+      : '远程 Agent 需要通过受控隧道或反向代理访问 Windows GoNavi MCP HTTP 入口',
+    endpoint: {
+      localAddr,
+      path,
+      localUrl,
+      publicUrl,
+      healthCheckPath: '/healthz',
+      authHeader: 'Authorization: Bearer <随机token>',
+    },
+    launchCommands: {
+      appBinary: buildHttpLaunchCommand('GoNavi.exe', localAddr, path),
+      standaloneBinary: buildStandaloneLaunchCommand(localAddr, path),
+      tokenEnvFallback: 'GONAVI_MCP_HTTP_TOKEN=<随机token> gonavi-mcp-server http --addr 127.0.0.1:8765 --path /mcp',
+    },
+    selectedStrategy,
+    exposeStrategies: REMOTE_EXPOSE_STRATEGIES,
+    remoteClients,
+    securityBoundary: {
+      databaseSecretsStayLocal: true,
+      cloudAgentNeedsDatabasePassword: false,
+      httpBearerTokenRequired: true,
+      executeSqlStillRequiresAISafetyPolicy: true,
+      mutatingSqlStillRequiresAllowMutating: true,
+      recommendedBindAddress: '127.0.0.1，除非前面有受控网关或私有网络',
+    },
+    warnings,
+    nextActions,
+  };
+};
diff --git a/frontend/src/components/ai/aiMCPRuntimeFailureInsights.test.ts b/frontend/src/components/ai/aiMCPRuntimeFailureInsights.test.ts
new file mode 100644
index 0000000..a2ad60b
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPRuntimeFailureInsights.test.ts
@@ -0,0 +1,118 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildMCPRuntimeFailureSnapshot } from './aiMCPRuntimeFailureInsights';
+
+describe('buildMCPRuntimeFailureSnapshot', () => {
+  it('classifies MCP list-tools failures and joins them with configured servers', () => {
+    const snapshot = buildMCPRuntimeFailureSnapshot({
+      readResult: {
+        data: {
+          logPath: 'C:/Users/demo/.GoNavi/Logs/gonavi.log',
+          keyword: 'MCP',
+          requestedLineLimit: 160,
+          lines: [
+            '2026/06/11 10:00:00.000000 [WARN] 列出 MCP 工具失败(server=GitHub): exec: "uvx": executable file not found in %PATH%',
+            '2026/06/11 10:00:01.000000 [WARN] 列出 MCP 工具失败(server=DockerFetch): context deadline exceeded',
+          ],
+        },
+      },
+      mcpServers: [
+        {
+          id: 'github',
+          name: 'GitHub',
+          transport: 'stdio',
+          command: 'uvx',
+          args: ['mcp-server-github', '--stdio'],
+          env: { GITHUB_TOKEN: 'secret-value' },
+          enabled: true,
+          timeoutSeconds: 20,
+        },
+        {
+          id: 'docker-fetch',
+          name: 'DockerFetch',
+          transport: 'stdio',
+          command: 'docker',
+          args: ['run', '--rm', '-i', 'mcp/server-fetch:latest'],
+          env: {},
+          enabled: true,
+          timeoutSeconds: 20,
+        },
+      ],
+      mcpTools: [],
+    });
+
+    expect(snapshot.failureEventCount).toBe(2);
+    expect(snapshot.breakdown).toMatchObject({
+      list_tools_failed: 2,
+      command_not_found: 1,
+      timeout: 1,
+    });
+    expect(snapshot.failureServerNames).toEqual(['GitHub', 'DockerFetch']);
+    expect(snapshot.serverSummaries.find((server) => server.name === 'DockerFetch')).toMatchObject({
+      name: 'DockerFetch',
+      discoveredToolCount: 0,
+      recentFailureCount: 1,
+      probableCauses: ['timeout'],
+    });
+    expect(snapshot.nextActions.join('\n')).toContain('检查 command 是否只填可执行程序本身');
+    expect(snapshot.nextActions.join('\n')).toContain('提高 timeoutSeconds 到 45 或 60');
+    expect(JSON.stringify(snapshot)).not.toContain('secret-value');
+  });
+
+  it('detects HTTP MCP process failures and redacts secret-like log values', () => {
+    const snapshot = buildMCPRuntimeFailureSnapshot({
+      readResult: {
+        data: {
+          lines: [
+            '2026/06/11 10:00:00.000000 [ERROR] GoNavi MCP HTTP 服务启动失败：listen tcp 127.0.0.1:8765: bind: permission denied GONAVI_MCP_HTTP_TOKEN=abcdef1234567890',
+            '2026/06/11 10:00:01.000000 [ERROR] GoNavi MCP HTTP 服务异常退出：exit status 1',
+          ],
+        },
+      },
+      includeLines: true,
+    });
+
+    expect(snapshot.failureEventCount).toBe(2);
+    expect(snapshot.breakdown).toMatchObject({
+      http_start_failed: 1,
+      http_process_exited: 1,
+      permission: 1,
+      process_exit: 1,
+    });
+    expect(snapshot.events[0].linePreview).toContain('GONAVI_MCP_HTTP_TOKEN=***');
+    expect(snapshot.lines?.join('\n')).not.toContain('abcdef1234567890');
+  });
+
+  it('returns an actionable empty state when no MCP failures are found', () => {
+    const snapshot = buildMCPRuntimeFailureSnapshot({
+      readResult: {
+        data: {
+          lines: [
+            '2026/06/11 10:00:00.000000 [INFO] GoNavi MCP HTTP 服务已启动',
+          ],
+        },
+      },
+      mcpServers: [{
+        id: 'ok',
+        name: 'OK',
+        transport: 'stdio',
+        command: 'node',
+        args: ['server.js', '--stdio'],
+        env: {},
+        enabled: true,
+        timeoutSeconds: 20,
+      }],
+      mcpTools: [{
+        alias: 'mcp__ok__ping',
+        serverId: 'ok',
+        serverName: 'OK',
+        originalName: 'ping',
+      }],
+    });
+
+    expect(snapshot.failureEventCount).toBe(0);
+    expect(snapshot.message).toContain('没有发现 MCP 启动、工具发现或工具调用失败信号');
+    expect(snapshot.nextActions.join('\n')).toContain('扩大 lineLimit');
+    expect(snapshot.serverSummaries[0].discoveredToolCount).toBe(1);
+  });
+});
diff --git a/frontend/src/components/ai/aiMCPRuntimeFailureInsights.ts b/frontend/src/components/ai/aiMCPRuntimeFailureInsights.ts
new file mode 100644
index 0000000..9a9d19c
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPRuntimeFailureInsights.ts
@@ -0,0 +1,266 @@
+import type { AIMCPServerConfig, AIMCPToolDescriptor } from '../../types';
+import { buildMCPLaunchPreview } from '../../utils/mcpServerGuidance';
+
+const DEFAULT_MCP_RUNTIME_LOG_LIMIT = 160;
+const MAX_MCP_RUNTIME_LOG_LIMIT = 200;
+
+type MCPRuntimeFailureKind =
+  | 'list_tools_failed'
+  | 'tool_call_failed'
+  | 'http_start_failed'
+  | 'http_process_exited'
+  | 'configuration_error'
+  | 'mcp_warning'
+  | 'mcp_error';
+
+type MCPRuntimeCause =
+  | 'command_not_found'
+  | 'timeout'
+  | 'permission'
+  | 'auth'
+  | 'network'
+  | 'stdio_closed'
+  | 'process_exit'
+  | 'argument_error'
+  | 'transport'
+  | 'unknown';
+
+interface MCPRuntimeFailureEvent {
+  kind: MCPRuntimeFailureKind;
+  cause: MCPRuntimeCause;
+  level: 'INFO' | 'WARN' | 'ERROR' | 'OTHER';
+  serverName: string;
+  linePreview: string;
+  nextAction: string;
+}
+
+const secretLikeValuePatterns = [
+  /bearer\s+[a-z0-9._~+/=-]{8,}/giu,
+  /\bsk-[a-z0-9._-]{8,}/giu,
+  /\bgh[pousr]_[a-z0-9_]{8,}/giu,
+  /\bxox[baprs]-[a-z0-9-]{8,}/giu,
+  /([A-Za-z_][A-Za-z0-9_]*(?:TOKEN|SECRET|PASSWORD|API[_-]?KEY)[A-Za-z0-9_]*)=([^\s;&]+)/giu,
+];
+
+const normalizeLimit = (input: unknown): number => {
+  const value = Math.floor(Number(input) || DEFAULT_MCP_RUNTIME_LOG_LIMIT);
+  if (value < 1) return 1;
+  if (value > MAX_MCP_RUNTIME_LOG_LIMIT) return MAX_MCP_RUNTIME_LOG_LIMIT;
+  return value;
+};
+
+const normalizeLogLines = (input: unknown): string[] =>
+  Array.isArray(input)
+    ? input.map((line) => String(line || '').trim()).filter(Boolean)
+    : [];
+
+const redactLogLine = (line: string): string => {
+  let next = line;
+  secretLikeValuePatterns.forEach((pattern) => {
+    next = next.replace(pattern, (_match, key) => (typeof key === 'string' && key ? `${key}=***` : '[REDACTED]'));
+  });
+  return next.length > 2000 ? `${next.slice(0, 2000)}...[truncated ${next.length - 2000} chars]` : next;
+};
+
+const detectLevel = (line: string): MCPRuntimeFailureEvent['level'] => {
+  if (line.includes('[ERROR]')) return 'ERROR';
+  if (line.includes('[WARN]')) return 'WARN';
+  if (line.includes('[INFO]')) return 'INFO';
+  return 'OTHER';
+};
+
+const extractServerName = (line: string): string => {
+  const match = line.match(/server=([^)]+)\)/iu);
+  return String(match?.[1] || '').trim();
+};
+
+const detectFailureKind = (line: string): MCPRuntimeFailureKind | null => {
+  if (line.includes('列出 MCP 工具失败')) return 'list_tools_failed';
+  if (line.includes('调用 MCP 工具失败') || line.includes('MCP 工具调用失败')) return 'tool_call_failed';
+  if (line.includes('GoNavi MCP HTTP 服务启动失败')) return 'http_start_failed';
+  if (line.includes('GoNavi MCP HTTP 服务异常退出') || line.includes('MCP HTTP 子进程已退出')) return 'http_process_exited';
+  if (line.includes('MCP 服务命令不能为空') || line.includes('暂不支持的 MCP transport')) return 'configuration_error';
+  if (line.toLowerCase().includes('mcp') && line.includes('[ERROR]')) return 'mcp_error';
+  if (line.toLowerCase().includes('mcp') && line.includes('[WARN]')) return 'mcp_warning';
+  return null;
+};
+
+const detectCause = (line: string): MCPRuntimeCause => {
+  const lower = line.toLowerCase();
+  if (/(executable file not found|not found|no such file|cannot find|找不到|无法找到)/iu.test(line)) {
+    return 'command_not_found';
+  }
+  if (/(context deadline exceeded|timeout|timed out|超时|deadline)/iu.test(line)) {
+    return 'timeout';
+  }
+  if (/(permission denied|access is denied|operation not permitted|权限)/iu.test(line)) {
+    return 'permission';
+  }
+  if (/(401|403|unauthorized|forbidden|authentication|认证|鉴权)/iu.test(line)) {
+    return 'auth';
+  }
+  if (/(connection refused|connectex|econnrefused|network|dial tcp|refused|连接被拒绝)/iu.test(line)) {
+    return 'network';
+  }
+  if (/(stdio|eof|closed pipe|broken pipe|stdin|stdout|标准输入|标准输出)/iu.test(line)) {
+    return 'stdio_closed';
+  }
+  if (/(exit status|exited|异常退出|子进程已退出|process exited)/iu.test(line)) {
+    return 'process_exit';
+  }
+  if (/(invalid character|invalid json|arguments|参数|schema|unmarshal)/iu.test(line)) {
+    return 'argument_error';
+  }
+  if (lower.includes('transport')) {
+    return 'transport';
+  }
+  return 'unknown';
+};
+
+const causeNextAction: Record<MCPRuntimeCause, string> = {
+  command_not_found: '检查 command 是否只填可执行程序本身，并确认该命令在 PATH 中或使用绝对路径。',
+  timeout: '提高 timeoutSeconds 到 45 或 60，并确认服务启动后会保持 stdio 连接。',
+  permission: '检查可执行文件权限、杀毒/系统拦截和工作目录访问权限。',
+  auth: '检查环境变量里的 Token/API Key 是否已配置、未过期且权限范围足够。',
+  network: '检查 MCP 依赖的远端地址、代理、VPN 或本机端口是否可达。',
+  stdio_closed: '确认 README 要求的 --stdio/stdin 参数已填写；Docker 场景确认 args 包含 -i。',
+  process_exit: '单独在终端运行启动命令，查看进程启动后为什么立即退出。',
+  argument_error: '先调用 inspect_mcp_tool_schema 读取真实 inputSchema，再修正工具 arguments JSON。',
+  transport: '当前 GoNavi 新增 MCP 只支持 stdio，HTTP MCP 请使用 GoNavi HTTP 服务或对应远程接入说明。',
+  unknown: '结合 inspect_mcp_setup 查看配置，再调用 inspect_app_logs 扩大日志窗口确认原始错误。',
+};
+
+const parseFailureEvent = (line: string): MCPRuntimeFailureEvent | null => {
+  const kind = detectFailureKind(line);
+  if (!kind) {
+    return null;
+  }
+  const cause = detectCause(line);
+  return {
+    kind,
+    cause,
+    level: detectLevel(line),
+    serverName: extractServerName(line),
+    linePreview: redactLogLine(line),
+    nextAction: causeNextAction[cause],
+  };
+};
+
+const buildBreakdown = (events: MCPRuntimeFailureEvent[]) =>
+  events.reduce<Record<string, number>>((acc, event) => {
+    acc[event.kind] = (acc[event.kind] || 0) + 1;
+    acc[event.cause] = (acc[event.cause] || 0) + 1;
+    return acc;
+  }, {});
+
+const toTrimmedString = (value: unknown): string => String(value ?? '').trim();
+
+const getServerToolCount = (serverId: string, tools: AIMCPToolDescriptor[]): number =>
+  tools.filter((tool) => tool.serverId === serverId).length;
+
+const matchesServer = (event: MCPRuntimeFailureEvent, server: AIMCPServerConfig): boolean => {
+  const serverName = event.serverName.toLowerCase();
+  if (!serverName) return false;
+  return serverName === toTrimmedString(server.name).toLowerCase()
+    || serverName === toTrimmedString(server.id).toLowerCase();
+};
+
+const buildServerSummaries = (
+  servers: AIMCPServerConfig[],
+  tools: AIMCPToolDescriptor[],
+  events: MCPRuntimeFailureEvent[],
+) => servers.map((server) => {
+  const serverEvents = events.filter((event) => matchesServer(event, server));
+  return {
+    id: server.id,
+    name: server.name,
+    enabled: server.enabled !== false,
+    transport: server.transport,
+    launchCommandPreview: redactLogLine(buildMCPLaunchPreview(server.command, server.args)),
+    timeoutSeconds: server.timeoutSeconds,
+    envKeys: Object.keys(server.env || {}).sort(),
+    discoveredToolCount: getServerToolCount(server.id, tools),
+    recentFailureCount: serverEvents.length,
+    recentFailureKinds: Array.from(new Set(serverEvents.map((event) => event.kind))),
+    probableCauses: Array.from(new Set(serverEvents.map((event) => event.cause))),
+  };
+});
+
+const collectNextActions = (
+  events: MCPRuntimeFailureEvent[],
+  serverSummaries: ReturnType<typeof buildServerSummaries>,
+): string[] => {
+  const actions = Array.from(new Set(events.map((event) => event.nextAction)));
+  const enabledServersWithoutTools = serverSummaries.filter((server) => server.enabled && server.discoveredToolCount === 0);
+  if (enabledServersWithoutTools.length > 0) {
+    actions.push('有已启用 MCP 服务暂未发现工具，优先点击“测试工具发现”刷新并确认启动命令可独立运行。');
+  }
+  if (events.some((event) => event.kind === 'list_tools_failed')) {
+    actions.push('工具列表为空时先修复启动/发现失败，再排查单个工具 arguments。');
+  }
+  if (actions.length === 0) {
+    actions.push('最近日志未发现 MCP 失败信号；如果刚刚复现过问题，请扩大 lineLimit 或改用 serverName 精确过滤。');
+  }
+  return actions;
+};
+
+export const buildMCPRuntimeFailureSnapshot = (params: {
+  readResult?: any;
+  mcpServers?: AIMCPServerConfig[];
+  mcpTools?: AIMCPToolDescriptor[];
+  keyword?: unknown;
+  serverName?: unknown;
+  lineLimit?: unknown;
+  includeLines?: unknown;
+}) => {
+  const data = params.readResult?.data && typeof params.readResult.data === 'object'
+    ? params.readResult.data as Record<string, unknown>
+    : {};
+  const keyword = toTrimmedString(data.keyword || params.serverName || params.keyword || 'MCP');
+  const requestedLineLimit = normalizeLimit(data.requestedLineLimit ?? params.lineLimit);
+  const serverNameFilter = toTrimmedString(params.serverName).toLowerCase();
+  const textFilter = toTrimmedString(params.keyword).toLowerCase();
+  const includeLines = params.includeLines === true;
+  const lines = normalizeLogLines(data.lines);
+  const events = lines
+    .map(parseFailureEvent)
+    .filter((event): event is MCPRuntimeFailureEvent => Boolean(event))
+    .filter((event) => !serverNameFilter || event.serverName.toLowerCase().includes(serverNameFilter) || event.linePreview.toLowerCase().includes(serverNameFilter))
+    .filter((event) => !textFilter || event.linePreview.toLowerCase().includes(textFilter));
+  const serverSummaries = buildServerSummaries(
+    Array.isArray(params.mcpServers) ? params.mcpServers : [],
+    Array.isArray(params.mcpTools) ? params.mcpTools : [],
+    events,
+  );
+  const failureServerNames = Array.from(new Set(events.map((event) => event.serverName).filter(Boolean)));
+  const warnings: string[] = [];
+
+  if (events.length > 0) {
+    warnings.push(`最近日志中发现 ${events.length} 条 MCP 运行期异常信号。`);
+  }
+  const serversWithoutTools = serverSummaries.filter((server) => server.enabled && server.discoveredToolCount === 0).length;
+  if (serversWithoutTools > 0) {
+    warnings.push(`有 ${serversWithoutTools} 个已启用 MCP 服务当前未发现工具。`);
+  }
+
+  return {
+    logPath: String(data.logPath || ''),
+    keyword,
+    serverNameFilter: toTrimmedString(params.serverName),
+    requestedLineLimit,
+    returnedLineCount: lines.length,
+    fileWindowTruncated: data.fileWindowTruncated === true,
+    matchedLinesTruncated: data.matchedLinesTruncated === true,
+    failureEventCount: events.length,
+    failureServerNames,
+    breakdown: buildBreakdown(events),
+    events,
+    serverSummaries,
+    warnings,
+    nextActions: collectNextActions(events, serverSummaries),
+    lines: includeLines ? lines.map(redactLogLine) : undefined,
+    message: events.length > 0
+      ? `最近日志中发现 ${events.length} 条 MCP 运行期异常信号`
+      : '最近日志里没有发现 MCP 启动、工具发现或工具调用失败信号。',
+  };
+};
diff --git a/frontend/src/components/ai/aiMCPToolSchemaInsights.test.ts b/frontend/src/components/ai/aiMCPToolSchemaInsights.test.ts
new file mode 100644
index 0000000..6a47dba
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPToolSchemaInsights.test.ts
@@ -0,0 +1,99 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildMCPToolSchemaSnapshot } from './aiMCPToolSchemaInsights';
+
+describe('aiMCPToolSchemaInsights', () => {
+  it('summarizes discovered mcp tool input schemas with required, enum, and nested parameter hints', () => {
+    const snapshot = buildMCPToolSchemaSnapshot({
+      alias: 'github_create_issue',
+      mcpTools: [
+        {
+          alias: 'github_create_issue',
+          originalName: 'create_issue',
+          serverId: 'github-server',
+          serverName: 'GitHub',
+          title: '创建 Issue',
+          description: 'Create a GitHub issue',
+          inputSchema: {
+            type: 'object',
+            required: ['owner', 'repo', 'title'],
+            properties: {
+              owner: { type: 'string', description: '仓库 owner' },
+              repo: { type: 'string', description: '仓库名' },
+              title: { type: 'string', description: 'Issue 标题' },
+              priority: { type: 'string', enum: ['low', 'medium', 'high'], default: 'medium' },
+              labels: {
+                type: 'array',
+                items: { type: 'string' },
+              },
+              metadata: {
+                type: 'object',
+                properties: {
+                  milestone: { type: 'string', description: '里程碑' },
+                },
+              },
+            },
+          },
+        },
+      ],
+    });
+
+    expect(snapshot.matchedToolCount).toBe(1);
+    expect(snapshot.tools[0].alias).toBe('github_create_issue');
+    expect(snapshot.tools[0].requiredParameters).toEqual(['owner', 'repo', 'title']);
+    expect(snapshot.tools[0].parameters.map((item) => item.path)).toContain('metadata.milestone');
+    expect(snapshot.tools[0].parameters.find((item) => item.path === 'priority')?.enumValues).toEqual(['low', 'medium', 'high']);
+    expect(snapshot.tools[0].parameters.find((item) => item.path === 'labels')?.arrayItemType).toBe('string');
+    expect(snapshot.tools[0].usageHints).toContain('调用 github_create_issue 前必须提供：owner, repo, title');
+    expect(snapshot.tools[0].usageHints).toContain('priority 只能从枚举值中选择：low / medium / high');
+    expect(snapshot.tools[0].inputSchema).toBeUndefined();
+  });
+
+  it('can include the raw schema when deep debugging a mcp tool argument mismatch', () => {
+    const snapshot = buildMCPToolSchemaSnapshot({
+      alias: 'browser_open',
+      includeSchema: true,
+      mcpTools: [
+        {
+          alias: 'browser_open',
+          originalName: 'open',
+          serverId: 'browser-server',
+          serverName: 'Browser',
+          inputSchema: {
+            type: 'object',
+            required: ['url'],
+            properties: {
+              url: { type: 'string', description: '要打开的 URL' },
+            },
+          },
+        },
+      ],
+    });
+
+    expect(snapshot.tools[0].inputSchema).toEqual({
+      type: 'object',
+      required: ['url'],
+      properties: {
+        url: { type: 'string', description: '要打开的 URL' },
+      },
+    });
+  });
+
+  it('returns actionable warnings when no discovered mcp tool matches the query', () => {
+    const snapshot = buildMCPToolSchemaSnapshot({
+      keyword: 'github',
+      mcpTools: [
+        {
+          alias: 'browser_open',
+          originalName: 'open',
+          serverId: 'browser-server',
+          serverName: 'Browser',
+        },
+      ],
+    });
+
+    expect(snapshot.matchedToolCount).toBe(0);
+    expect(snapshot.warnings).toContain('没有找到匹配的 MCP 工具。');
+    expect(snapshot.nextActions[0]).toContain('inspect_mcp_setup');
+  });
+});
diff --git a/frontend/src/components/ai/aiMCPToolSchemaInsights.ts b/frontend/src/components/ai/aiMCPToolSchemaInsights.ts
new file mode 100644
index 0000000..0be6631
--- /dev/null
+++ b/frontend/src/components/ai/aiMCPToolSchemaInsights.ts
@@ -0,0 +1,296 @@
+import type { AIMCPToolDescriptor } from '../../types';
+
+const DEFAULT_TOOL_LIMIT = 8;
+const MAX_TOOL_LIMIT = 30;
+const MAX_PARAMETER_HINTS = 40;
+const MAX_ENUM_VALUES = 12;
+const MAX_SCHEMA_DEPTH = 2;
+
+interface JSONSchemaRecord {
+  [key: string]: any;
+}
+
+const isRecord = (value: unknown): value is JSONSchemaRecord =>
+  Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+
+const normalizeSearchText = (value: unknown): string =>
+  String(value || '').trim().toLowerCase();
+
+const readSchemaType = (schema: JSONSchemaRecord): string => {
+  const rawType = schema.type;
+  if (Array.isArray(rawType)) {
+    return rawType.map((item) => String(item)).filter(Boolean).join('|') || 'unknown';
+  }
+  if (typeof rawType === 'string' && rawType.trim()) {
+    return rawType.trim();
+  }
+  if (Array.isArray(schema.enum)) {
+    return 'enum';
+  }
+  if (Array.isArray(schema.anyOf)) {
+    return 'anyOf';
+  }
+  if (Array.isArray(schema.oneOf)) {
+    return 'oneOf';
+  }
+  if (isRecord(schema.properties)) {
+    return 'object';
+  }
+  if (isRecord(schema.items)) {
+    return 'array';
+  }
+  return 'unknown';
+};
+
+const readRequiredSet = (schema: JSONSchemaRecord): Set<string> =>
+  new Set(
+    Array.isArray(schema.required)
+      ? schema.required.map((item) => String(item)).filter(Boolean)
+      : [],
+  );
+
+const readDescription = (schema: JSONSchemaRecord): string => {
+  const description = String(schema.description || '').trim();
+  if (description) {
+    return description;
+  }
+  return String(schema.title || '').trim();
+};
+
+const readEnumValues = (schema: JSONSchemaRecord): string[] =>
+  Array.isArray(schema.enum)
+    ? schema.enum.slice(0, MAX_ENUM_VALUES).map((item) => String(item))
+    : [];
+
+const readDefaultValue = (schema: JSONSchemaRecord): string => {
+  if (!Object.prototype.hasOwnProperty.call(schema, 'default')) {
+    return '';
+  }
+  const value = schema.default;
+  if (value === null) {
+    return 'null';
+  }
+  if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+    return String(value);
+  }
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+};
+
+export interface MCPToolSchemaParameterHint {
+  path: string;
+  name: string;
+  required: boolean;
+  type: string;
+  description: string;
+  enumValues: string[];
+  enumValuesTruncated: boolean;
+  defaultValue: string;
+  nestedPropertyCount: number;
+  arrayItemType: string;
+}
+
+const buildParameterHints = (
+  schema: JSONSchemaRecord,
+  pathPrefix = '',
+  depth = 0,
+): MCPToolSchemaParameterHint[] => {
+  if (!isRecord(schema.properties)) {
+    return [];
+  }
+
+  const requiredSet = readRequiredSet(schema);
+  const hints: MCPToolSchemaParameterHint[] = [];
+  Object.entries(schema.properties).forEach(([name, rawChildSchema]) => {
+    if (hints.length >= MAX_PARAMETER_HINTS) {
+      return;
+    }
+    const childSchema = isRecord(rawChildSchema) ? rawChildSchema : {};
+    const path = pathPrefix ? `${pathPrefix}.${name}` : name;
+    const childProperties = isRecord(childSchema.properties) ? childSchema.properties : {};
+    const itemSchema = isRecord(childSchema.items) ? childSchema.items : {};
+    const enumValues = readEnumValues(childSchema);
+    hints.push({
+      path,
+      name,
+      required: requiredSet.has(name),
+      type: readSchemaType(childSchema),
+      description: readDescription(childSchema),
+      enumValues,
+      enumValuesTruncated: Array.isArray(childSchema.enum) && childSchema.enum.length > MAX_ENUM_VALUES,
+      defaultValue: readDefaultValue(childSchema),
+      nestedPropertyCount: Object.keys(childProperties).length,
+      arrayItemType: isRecord(childSchema.items) ? readSchemaType(itemSchema) : '',
+    });
+
+    if (depth >= MAX_SCHEMA_DEPTH || hints.length >= MAX_PARAMETER_HINTS) {
+      return;
+    }
+    if (Object.keys(childProperties).length > 0) {
+      hints.push(...buildParameterHints(childSchema, path, depth + 1).slice(0, MAX_PARAMETER_HINTS - hints.length));
+      return;
+    }
+    if (isRecord(itemSchema.properties)) {
+      hints.push(...buildParameterHints(itemSchema, `${path}[]`, depth + 1).slice(0, MAX_PARAMETER_HINTS - hints.length));
+    }
+  });
+  return hints.slice(0, MAX_PARAMETER_HINTS);
+};
+
+const matchesKeyword = (tool: AIMCPToolDescriptor, keyword: string): boolean => {
+  if (!keyword) {
+    return true;
+  }
+  return [
+    tool.alias,
+    tool.originalName,
+    tool.title,
+    tool.description,
+    tool.serverId,
+    tool.serverName,
+  ].some((item) => normalizeSearchText(item).includes(keyword));
+};
+
+const buildUsageHints = (params: {
+  tool: AIMCPToolDescriptor;
+  hasInputSchema: boolean;
+  parameterHints: MCPToolSchemaParameterHint[];
+}) => {
+  const { tool, hasInputSchema, parameterHints } = params;
+  const hints: string[] = [];
+  const requiredTopLevel = parameterHints
+    .filter((item) => item.required && !item.path.includes('.'))
+    .map((item) => item.path);
+  const enumHint = parameterHints.find((item) => item.enumValues.length > 0);
+  const nestedHint = parameterHints.find((item) => item.nestedPropertyCount > 0 || item.path.includes('.'));
+
+  if (!hasInputSchema) {
+    hints.push('这个 MCP 工具没有声明 inputSchema；调用前优先查看服务 README 或先用空对象试探。');
+  }
+  if (requiredTopLevel.length > 0) {
+    hints.push(`调用 ${tool.alias} 前必须提供：${requiredTopLevel.join(', ')}`);
+  }
+  if (enumHint) {
+    hints.push(`${enumHint.path} 只能从枚举值中选择：${enumHint.enumValues.join(' / ')}`);
+  }
+  if (nestedHint) {
+    hints.push('嵌套对象和数组参数必须按 JSON 结构传入，不要把对象整体写成字符串。');
+  }
+  if (parameterHints.length > 0) {
+    hints.push('调用前只传 schema 中声明的字段；不确定字段含义时先向用户确认，而不是猜测。');
+  }
+  return hints;
+};
+
+export const buildMCPToolSchemaSnapshot = (params: {
+  mcpTools?: AIMCPToolDescriptor[];
+  alias?: string;
+  serverId?: string;
+  keyword?: string;
+  includeSchema?: boolean;
+  limit?: number;
+}) => {
+  const {
+    mcpTools = [],
+    alias = '',
+    serverId = '',
+    keyword = '',
+    includeSchema = false,
+  } = params;
+  const normalizedAlias = normalizeSearchText(alias);
+  const normalizedServerId = normalizeSearchText(serverId);
+  const normalizedKeyword = normalizeSearchText(keyword);
+  const limit = Math.max(1, Math.min(MAX_TOOL_LIMIT, Number(params.limit) || DEFAULT_TOOL_LIMIT));
+  const allTools = Array.isArray(mcpTools) ? mcpTools : [];
+
+  const matchedTools = allTools
+    .filter((tool) => {
+      if (normalizedAlias) {
+        const aliasText = normalizeSearchText(tool.alias);
+        const originalText = normalizeSearchText(tool.originalName);
+        if (aliasText !== normalizedAlias && originalText !== normalizedAlias) {
+          return false;
+        }
+      }
+      if (normalizedServerId && normalizeSearchText(tool.serverId) !== normalizedServerId) {
+        return false;
+      }
+      return matchesKeyword(tool, normalizedKeyword);
+    })
+    .sort((left, right) => {
+      if (normalizedAlias) {
+        const leftExact = normalizeSearchText(left.alias) === normalizedAlias ? 0 : 1;
+        const rightExact = normalizeSearchText(right.alias) === normalizedAlias ? 0 : 1;
+        if (leftExact !== rightExact) {
+          return leftExact - rightExact;
+        }
+      }
+      return String(left.alias || '').localeCompare(String(right.alias || ''));
+    });
+
+  const tools = matchedTools.slice(0, limit).map((tool) => {
+    const inputSchema = isRecord(tool.inputSchema) ? tool.inputSchema : {};
+    const parameterHints = buildParameterHints(inputSchema);
+    const topLevelParameters = parameterHints.filter((item) => !item.path.includes('.'));
+    const requiredParameters = topLevelParameters
+      .filter((item) => item.required)
+      .map((item) => item.path);
+    const hasInputSchema = Object.keys(inputSchema).length > 0;
+
+    return {
+      alias: tool.alias,
+      originalName: tool.originalName,
+      title: tool.title || tool.originalName || tool.alias,
+      description: tool.description || '',
+      serverId: tool.serverId,
+      serverName: tool.serverName,
+      hasInputSchema,
+      parameterCount: topLevelParameters.length,
+      parameterHintCount: parameterHints.length,
+      parameterHintsTruncated: parameterHints.length >= MAX_PARAMETER_HINTS,
+      requiredParameterCount: requiredParameters.length,
+      requiredParameters,
+      parameters: parameterHints,
+      usageHints: buildUsageHints({ tool, hasInputSchema, parameterHints }),
+      inputSchema: includeSchema ? inputSchema : undefined,
+    };
+  });
+
+  const warnings: string[] = [];
+  const nextActions: string[] = [];
+  if (allTools.length === 0) {
+    warnings.push('当前没有发现任何 MCP 工具，可能还没有配置 MCP 服务，或服务测试/发现失败。');
+    nextActions.push('先调用 inspect_mcp_setup 查看 MCP 服务是否启用并已发现工具。');
+  } else if (matchedTools.length === 0) {
+    warnings.push('没有找到匹配的 MCP 工具。');
+    nextActions.push('先调用 inspect_mcp_setup 查看当前实际发现到的 MCP 工具 alias，再用 alias 精确查询。');
+  } else if (tools.some((tool) => !tool.hasInputSchema)) {
+    warnings.push('部分 MCP 工具没有声明 inputSchema，参数说明可能不完整。');
+    nextActions.push('没有 schema 的工具需要回到 MCP 服务 README 或工具返回错误继续确认参数。');
+  }
+
+  return {
+    query: {
+      alias: alias || '',
+      serverId: serverId || '',
+      keyword: keyword || '',
+      includeSchema: includeSchema === true,
+      limit,
+    },
+    totalMCPToolCount: allTools.length,
+    matchedToolCount: matchedTools.length,
+    returnedToolCount: tools.length,
+    toolsTruncated: matchedTools.length > tools.length,
+    tools,
+    warnings,
+    nextActions,
+    message: matchedTools.length > 0
+      ? `已找到 ${matchedTools.length} 个 MCP 工具，返回 ${tools.length} 个参数 schema 摘要`
+      : allTools.length > 0
+        ? '没有找到匹配的 MCP 工具'
+        : '当前还没有可用 MCP 工具 schema',
+  };
+};
diff --git a/frontend/src/components/ai/aiPromptInsights.test.ts b/frontend/src/components/ai/aiPromptInsights.test.ts
new file mode 100644
index 0000000..cd3d07b
--- /dev/null
+++ b/frontend/src/components/ai/aiPromptInsights.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildAIGuidanceSnapshot } from './aiPromptInsights';
+
+describe('aiPromptInsights', () => {
+  it('summarizes active custom prompts and enabled skills for runtime inspection', () => {
+    const snapshot = buildAIGuidanceSnapshot({
+      userPromptSettings: {
+        global: '回答前先核对上下文。',
+        database: '默认只读优先。',
+        jvm: '',
+        jvmDiagnostic: '',
+      },
+      skills: [
+        {
+          id: 'skill-1',
+          name: '结构审查',
+          description: '优先核对字段和索引',
+          systemPrompt: '先看字段，再给结论。',
+          enabled: true,
+          scopes: ['database'],
+          requiredTools: ['get_columns'],
+        },
+        {
+          id: 'skill-2',
+          name: 'JVM 诊断',
+          description: '诊断命令审查',
+          systemPrompt: '先列风险。',
+          enabled: false,
+          scopes: ['jvmDiagnostic'],
+        },
+      ],
+    });
+
+    expect(snapshot.customPromptCount).toBe(2);
+    expect(snapshot.customPrompts.find((item) => item.scope === 'global')?.enabled).toBe(true);
+    expect(snapshot.enabledSkillCount).toBe(1);
+    expect(snapshot.disabledSkillCount).toBe(1);
+    expect(snapshot.enabledSkills[0].name).toBe('结构审查');
+    expect(snapshot.enabledSkills[0].requiredTools).toEqual(['get_columns']);
+  });
+});
diff --git a/frontend/src/components/ai/aiPromptInsights.ts b/frontend/src/components/ai/aiPromptInsights.ts
new file mode 100644
index 0000000..9f32547
--- /dev/null
+++ b/frontend/src/components/ai/aiPromptInsights.ts
@@ -0,0 +1,60 @@
+import type { AISkillConfig, AIUserPromptSettings } from '../../types';
+
+const PROMPT_SCOPE_LABELS: Record<keyof AIUserPromptSettings, string> = {
+  global: '全局',
+  database: '数据库会话',
+  jvm: 'JVM 资源分析',
+  jvmDiagnostic: 'JVM 诊断',
+};
+
+export const buildAIGuidanceSnapshot = (params: {
+  userPromptSettings?: AIUserPromptSettings;
+  skills?: AISkillConfig[];
+}) => {
+  const userPromptSettings = params.userPromptSettings || {
+    global: '',
+    database: '',
+    jvm: '',
+    jvmDiagnostic: '',
+  };
+  const skills = Array.isArray(params.skills) ? params.skills : [];
+
+  const customPrompts = (Object.keys(PROMPT_SCOPE_LABELS) as Array<keyof AIUserPromptSettings>).map((scope) => {
+    const content = String(userPromptSettings[scope] || '').trim();
+    return {
+      scope,
+      label: PROMPT_SCOPE_LABELS[scope],
+      enabled: content.length > 0,
+      charCount: content.length,
+      content,
+    };
+  });
+
+  const enabledSkills = skills
+    .filter((skill) => skill?.enabled)
+    .map((skill) => ({
+      id: skill.id,
+      name: skill.name,
+      description: skill.description || '',
+      scopes: Array.isArray(skill.scopes) ? skill.scopes : [],
+      requiredTools: Array.isArray(skill.requiredTools) ? skill.requiredTools : [],
+      systemPrompt: String(skill.systemPrompt || '').trim(),
+      systemPromptCharCount: String(skill.systemPrompt || '').trim().length,
+    }))
+    .sort((left, right) => left.name.localeCompare(right.name));
+
+  const disabledSkillCount = skills.filter((skill) => skill && !skill.enabled).length;
+  const enabledPromptCount = customPrompts.filter((item) => item.enabled).length;
+
+  return {
+    customPromptCount: enabledPromptCount,
+    customPrompts,
+    skillCount: skills.length,
+    enabledSkillCount: enabledSkills.length,
+    disabledSkillCount,
+    enabledSkills,
+    message: enabledPromptCount > 0 || enabledSkills.length > 0
+      ? `当前已启用 ${enabledPromptCount} 条自定义提示词、${enabledSkills.length} 个 Skills`
+      : '当前没有启用自定义提示词或 Skills',
+  };
+};
diff --git a/frontend/src/components/ai/aiProviderInsights.test.ts b/frontend/src/components/ai/aiProviderInsights.test.ts
new file mode 100644
index 0000000..cbf3456
--- /dev/null
+++ b/frontend/src/components/ai/aiProviderInsights.test.ts
@@ -0,0 +1,73 @@
+import { describe, expect, it } from 'vitest';
+
+import type { AIProviderConfig } from '../../types';
+import { buildAIProviderSnapshot } from './aiProviderInsights';
+
+describe('aiProviderInsights', () => {
+  it('returns a sanitized provider snapshot with missing-secret and missing-model diagnostics', () => {
+    const providers: AIProviderConfig[] = [
+      {
+        id: 'provider-1',
+        type: 'openai',
+        name: 'OpenAI 主账号',
+        apiKey: '',
+        hasSecret: true,
+        baseUrl: 'https://api.openai.com/v1',
+        model: 'gpt-5.4',
+        models: ['gpt-5.4', 'gpt-4.1'],
+        maxTokens: 32000,
+        temperature: 0.2,
+      },
+      {
+        id: 'provider-2',
+        type: 'custom',
+        name: '自建代理',
+        apiKey: 'sk-secret',
+        hasSecret: false,
+        baseUrl: '',
+        model: '',
+        models: [],
+        headers: {
+          Authorization: 'Bearer secret-token',
+        },
+        apiFormat: 'openai',
+        maxTokens: 16000,
+        temperature: 0.7,
+      },
+    ];
+
+    const snapshot = buildAIProviderSnapshot({
+      providers,
+      activeProviderId: 'provider-1',
+      dynamicModels: ['gpt-5.4', 'gpt-4.1-mini'],
+    });
+
+    expect(snapshot).toMatchObject({
+      hasActiveProvider: true,
+      providerCount: 2,
+      readyProviderCount: 1,
+      providersNeedingAttentionCount: 1,
+      missingSecretCount: 1,
+      missingSelectedModelCount: 1,
+      missingBaseUrlCount: 1,
+      dynamicModelCount: 2,
+    });
+    expect(snapshot.activeProvider).toMatchObject({
+      id: 'provider-1',
+      name: 'OpenAI 主账号',
+      baseUrlHost: 'api.openai.com',
+      status: 'ready',
+    });
+    expect(snapshot.providers[1]).toMatchObject({
+      id: 'provider-2',
+      hasSecret: false,
+      hasHeaders: true,
+      headerKeys: ['Authorization'],
+      issues: ['missing_secret', 'missing_base_url', 'missing_selected_model', 'missing_declared_models'],
+      status: 'needs_attention',
+    });
+    expect(snapshot.message).toContain('正在使用 OpenAI 主账号');
+    expect(JSON.stringify(snapshot)).not.toContain('apiKey');
+    expect(JSON.stringify(snapshot)).not.toContain('secret-token');
+  });
+});
diff --git a/frontend/src/components/ai/aiProviderInsights.ts b/frontend/src/components/ai/aiProviderInsights.ts
new file mode 100644
index 0000000..999f49b
--- /dev/null
+++ b/frontend/src/components/ai/aiProviderInsights.ts
@@ -0,0 +1,140 @@
+import type { AIProviderConfig } from '../../types';
+
+const DECLARED_MODEL_PREVIEW_LIMIT = 12;
+const DYNAMIC_MODEL_PREVIEW_LIMIT = 20;
+
+const sliceList = <T,>(items: T[], limit: number) => {
+  const list = Array.isArray(items) ? items : [];
+  return {
+    items: list.slice(0, limit),
+    truncated: list.length > limit,
+    total: list.length,
+  };
+};
+
+const trimText = (value: unknown): string => String(value || '').trim();
+
+const hasProviderSecret = (provider: AIProviderConfig): boolean =>
+  provider.hasSecret ?? Boolean(provider.secretRef || provider.apiKey);
+
+const getProviderHost = (baseUrl: string): string => {
+  const normalized = trimText(baseUrl);
+  if (!normalized) {
+    return '';
+  }
+  try {
+    return new URL(normalized).host;
+  } catch {
+    return '';
+  }
+};
+
+const buildProviderIssues = (provider: AIProviderConfig): string[] => {
+  const issues: string[] = [];
+  const hasSecret = hasProviderSecret(provider);
+  const baseUrl = trimText(provider.baseUrl);
+  const model = trimText(provider.model);
+  const declaredModels = Array.isArray(provider.models)
+    ? provider.models.map((item) => trimText(item)).filter(Boolean)
+    : [];
+
+  if (!hasSecret) {
+    issues.push('missing_secret');
+  }
+  if (!baseUrl) {
+    issues.push('missing_base_url');
+  }
+  if (!model) {
+    issues.push('missing_selected_model');
+  }
+  if (declaredModels.length === 0) {
+    issues.push('missing_declared_models');
+  }
+
+  return issues;
+};
+
+export const buildAIProviderSnapshot = (params: {
+  providers?: AIProviderConfig[];
+  activeProviderId?: string | null;
+  dynamicModels?: string[];
+}) => {
+  const providers = Array.isArray(params.providers) ? params.providers : [];
+  const activeProviderId = trimText(params.activeProviderId);
+  const dynamicModelPreview = sliceList(
+    (Array.isArray(params.dynamicModels) ? params.dynamicModels : [])
+      .map((item) => trimText(item))
+      .filter(Boolean),
+    DYNAMIC_MODEL_PREVIEW_LIMIT,
+  );
+
+  const providerSummaries = providers.map((provider) => {
+    const declaredModelPreview = sliceList(
+      (Array.isArray(provider.models) ? provider.models : [])
+        .map((item) => trimText(item))
+        .filter(Boolean),
+      DECLARED_MODEL_PREVIEW_LIMIT,
+    );
+    const headerKeys = Object.keys(provider.headers || {})
+      .map((item) => trimText(item))
+      .filter(Boolean)
+      .sort((left, right) => left.localeCompare(right));
+    const issues = buildProviderIssues(provider);
+
+    return {
+      id: provider.id,
+      name: trimText(provider.name),
+      type: provider.type,
+      apiFormat: trimText(provider.apiFormat) || 'openai',
+      active: provider.id === activeProviderId,
+      baseUrl: trimText(provider.baseUrl),
+      baseUrlHost: getProviderHost(provider.baseUrl),
+      model: trimText(provider.model),
+      declaredModelCount: declaredModelPreview.total,
+      declaredModels: declaredModelPreview.items,
+      declaredModelsTruncated: declaredModelPreview.truncated,
+      hasSecret: hasProviderSecret(provider),
+      hasHeaders: headerKeys.length > 0,
+      headerKeys,
+      maxTokens: Number(provider.maxTokens) || 0,
+      temperature: Number(provider.temperature) || 0,
+      issues,
+      issueCount: issues.length,
+      status: issues.length === 0 ? 'ready' : 'needs_attention',
+    };
+  });
+
+  const activeProvider = providerSummaries.find((provider) => provider.active) || null;
+  const providersNeedingAttention = providerSummaries.filter((provider) => provider.issueCount > 0);
+  const providerHosts = Array.from(
+    new Set(
+      providerSummaries
+        .map((provider) => provider.baseUrlHost)
+        .filter(Boolean),
+    ),
+  ).sort((left, right) => left.localeCompare(right));
+
+  return {
+    hasActiveProvider: Boolean(activeProvider),
+    activeProviderId,
+    activeProvider,
+    providerCount: providerSummaries.length,
+    readyProviderCount: providerSummaries.length - providersNeedingAttention.length,
+    providersNeedingAttentionCount: providersNeedingAttention.length,
+    missingSecretCount: providerSummaries.filter((provider) => provider.issues.includes('missing_secret')).length,
+    missingSelectedModelCount: providerSummaries.filter((provider) => provider.issues.includes('missing_selected_model')).length,
+    missingBaseUrlCount: providerSummaries.filter((provider) => provider.issues.includes('missing_base_url')).length,
+    providers: providerSummaries,
+    providerHosts,
+    dynamicModelCount: dynamicModelPreview.total,
+    dynamicModels: dynamicModelPreview.items,
+    dynamicModelsTruncated: dynamicModelPreview.truncated,
+    message: providerSummaries.length === 0
+      ? '当前没有配置 AI 供应商'
+      : activeProvider
+        ? activeProvider.issueCount > 0
+          ? `当前正在使用 ${activeProvider.name || activeProvider.id}，但还有 ${activeProvider.issueCount} 项待检查`
+          : `当前共配置 ${providerSummaries.length} 个供应商，正在使用 ${activeProvider.name || activeProvider.id}`
+        : `当前已配置 ${providerSummaries.length} 个供应商，但尚未选择活动供应商`,
+  };
+};
diff --git a/frontend/src/components/ai/aiRedisTopologyInsights.test.ts b/frontend/src/components/ai/aiRedisTopologyInsights.test.ts
new file mode 100644
index 0000000..d551285
--- /dev/null
+++ b/frontend/src/components/ai/aiRedisTopologyInsights.test.ts
@@ -0,0 +1,146 @@
+import { describe, expect, it } from 'vitest';
+
+import type { SavedConnection } from '../../types';
+import { buildRedisTopologySnapshot } from './aiRedisTopologyInsights';
+
+const buildRedisConnection = (
+  id: string,
+  name: string,
+  config: Partial<SavedConnection['config']>,
+  extra: Partial<SavedConnection> = {},
+): SavedConnection => ({
+  id,
+  name,
+  config: {
+    type: 'redis',
+    host: '127.0.0.1',
+    port: 6379,
+    user: '',
+    ...config,
+  },
+  ...extra,
+});
+
+describe('buildRedisTopologySnapshot', () => {
+  it('summarizes Redis Sentinel settings without exposing passwords', () => {
+    const snapshot = buildRedisTopologySnapshot({
+      connections: [
+        buildRedisConnection('redis-sentinel', '生产 Redis Sentinel', {
+          host: 'sentinel-a.local',
+          port: 6379,
+          hosts: ['sentinel-b.local:26379'],
+          topology: 'sentinel',
+          user: 'app',
+          password: 'redis-secret',
+          redisSentinelUser: 'sentinel-user',
+          redisSentinelPassword: 'sentinel-secret',
+          redisDB: 2,
+          useSSL: true,
+          sslMode: 'required',
+        }, {
+          hasRedisSentinelPassword: true,
+        }),
+      ],
+      keyword: '生产',
+    });
+
+    expect(snapshot.totalRedisConnections).toBe(1);
+    expect(snapshot.totalMatched).toBe(1);
+    expect(snapshot.topologyBreakdown).toEqual({ sentinel: 1 });
+    expect(snapshot.blockedCount).toBe(1);
+    expect(snapshot.connections[0].status).toBe('blocked');
+    expect(snapshot.connections[0].backendAdapter).toBe('go-redis FailoverClient');
+    expect(snapshot.connections[0].effectiveTopology).toBe('sentinel');
+    expect(snapshot.connections[0].topologyMismatch).toBe(false);
+    expect(snapshot.connections[0].sentinelMaster).toBe('');
+    expect(snapshot.connections[0].hasRedisAuth).toBe(true);
+    expect(snapshot.connections[0].hasSentinelAuth).toBe(true);
+    expect(snapshot.connections[0].safeUriExample).toContain('rediss://app:<hidden>@sentinel-a.local:6379,sentinel-b.local:26379/2');
+    expect(snapshot.connections[0].safeUriExample).toContain('topology=sentinel');
+    expect(snapshot.connections[0].safeUriExample).toContain('sentinel_user=sentinel-user');
+    expect(snapshot.connections[0].safeUriExample).toContain('sentinel_password=%3Chidden%3E');
+    expect(snapshot.connections[0].dbSemantics).toMatchObject({
+      physicalDb: 2,
+      mode: 'failover_selected_db',
+    });
+    expect(snapshot.connections[0].warnings).toContain('Sentinel master 名称为空，go-redis FailoverClient 无法发现主节点');
+    expect(snapshot.connections[0].warnings).toContain('Sentinel 主地址端口是 6379，请确认这里填写的是 Sentinel 端口，常见默认值是 26379');
+    expect(snapshot.connections[0].blockingReasons).toContain('Sentinel master 名称为空，go-redis FailoverClient 无法发现主节点');
+    expect(snapshot.connections[0].nextActions.join('\n')).toContain('补充 Sentinel master 名称');
+    expect(JSON.stringify(snapshot)).not.toContain('redis-secret');
+    expect(JSON.stringify(snapshot)).not.toContain('sentinel-secret');
+  });
+
+  it('reports cluster logical-db and SSH risks', () => {
+    const snapshot = buildRedisTopologySnapshot({
+      connections: [
+        buildRedisConnection('redis-cluster', '订单 Redis Cluster', {
+          host: '10.10.1.10',
+          port: 6379,
+          hosts: ['10.10.1.11:6379', '10.10.1.12:6379'],
+          topology: 'cluster',
+          redisDB: 4,
+          useSSH: true,
+        }, {
+          includeRedisDatabases: [0, 4],
+        }),
+      ],
+      connectionId: 'redis-cluster',
+    });
+
+    expect(snapshot.connections[0].topology).toBe('cluster');
+    expect(snapshot.connections[0].effectiveTopology).toBe('cluster');
+    expect(snapshot.connections[0].topologyMismatch).toBe(false);
+    expect(snapshot.connections[0].status).toBe('blocked');
+    expect(snapshot.connections[0].backendAdapter).toBe('go-redis ClusterClient');
+    expect(snapshot.connections[0].seedAddressCount).toBe(3);
+    expect(snapshot.connections[0].safeUriExample).toBe('redis://10.10.1.10:6379,10.10.1.11:6379,10.10.1.12:6379/0?topology=cluster');
+    expect(snapshot.connections[0].dbSemantics).toMatchObject({
+      physicalDb: 0,
+      selectedDb: 4,
+      mode: 'cluster_logical_namespace',
+    });
+    expect(snapshot.connections[0].warnings).toContain('Redis Cluster 当前后端不支持 SSH 隧道，请改用直连、代理或远程 MCP HTTP 方案');
+    expect(snapshot.connections[0].warnings).toContain('Redis Cluster 物理上只支持 db0；GoNavi 会用 __gonavi_db_N__: 前缀模拟逻辑库隔离');
+    expect(snapshot.connections[0].nextActions.join('\n')).toContain('关闭 SSH 隧道');
+    expect(snapshot.connections[0].recommendations?.join('\n')).toContain('种子节点');
+  });
+
+  it('filters out non-Redis connections and warns about multi-host single mode', () => {
+    const snapshot = buildRedisTopologySnapshot({
+      connections: [
+        buildRedisConnection('redis-single', '缓存单机', {
+          host: 'redis.local',
+          port: 6379,
+          topology: 'single',
+          hosts: ['redis-2.local:6379'],
+        }),
+        {
+          id: 'mysql-1',
+          name: '业务库',
+          config: {
+            type: 'mysql',
+            host: 'mysql.local',
+            port: 3306,
+            user: 'root',
+          },
+        },
+      ],
+    });
+
+    expect(snapshot.totalRedisConnections).toBe(1);
+    expect(snapshot.connections).toHaveLength(1);
+    expect(snapshot.connections[0].status).toBe('needs_attention');
+    expect(snapshot.connections[0].topology).toBe('single');
+    expect(snapshot.connections[0].effectiveTopology).toBe('cluster');
+    expect(snapshot.connections[0].topologyMismatch).toBe(true);
+    expect(snapshot.connections[0].backendAdapter).toBe('go-redis ClusterClient');
+    expect(snapshot.connections[0].safeUriExample).toBe('redis://redis.local:6379,redis-2.local:6379/0?topology=cluster');
+    expect(snapshot.connections[0].dbSemantics).toMatchObject({
+      physicalDb: 0,
+      mode: 'cluster_logical_namespace',
+    });
+    expect(snapshot.connections[0].warnings).toContain('单机模式下存在多个节点地址，后端会按多节点集群路径处理，建议显式改为 Cluster 模式');
+    expect(snapshot.connections[0].nextActions.join('\n')).toContain('显式切换为 Cluster 模式');
+  });
+});
diff --git a/frontend/src/components/ai/aiRedisTopologyInsights.ts b/frontend/src/components/ai/aiRedisTopologyInsights.ts
new file mode 100644
index 0000000..14dccbb
--- /dev/null
+++ b/frontend/src/components/ai/aiRedisTopologyInsights.ts
@@ -0,0 +1,362 @@
+import type { SavedConnection } from '../../types';
+
+type RedisTopology = 'single' | 'cluster' | 'sentinel';
+
+const normalizeText = (input: unknown): string => String(input || '').trim();
+
+const normalizeLowerText = (input: unknown): string => normalizeText(input).toLowerCase();
+
+const normalizeLimit = (input: unknown, fallback: number, max: number): number => {
+  const value = Math.floor(Number(input) || fallback);
+  if (value < 1) return 1;
+  if (value > max) return max;
+  return value;
+};
+
+const normalizeRedisTopology = (input: unknown): RedisTopology => {
+  const value = normalizeLowerText(input);
+  if (value === 'cluster') return 'cluster';
+  if (value === 'sentinel') return 'sentinel';
+  return 'single';
+};
+
+const resolveEffectiveRedisTopology = (
+  configuredTopology: RedisTopology,
+  seedAddresses: string[],
+): RedisTopology => {
+  if (configuredTopology === 'sentinel') return 'sentinel';
+  if (configuredTopology === 'cluster' || seedAddresses.length > 1) return 'cluster';
+  return 'single';
+};
+
+const topologyAdapterName = (topology: RedisTopology): string => {
+  if (topology === 'sentinel') return 'go-redis FailoverClient';
+  if (topology === 'cluster') return 'go-redis ClusterClient';
+  return 'go-redis Client';
+};
+
+const topologyModeLabel = (topology: RedisTopology): string => {
+  if (topology === 'sentinel') return 'Redis Sentinel';
+  if (topology === 'cluster') return 'Redis Cluster';
+  return 'Redis 单机';
+};
+
+const buildSeedAddresses = (connection: SavedConnection): string[] => {
+  const config = connection.config || {};
+  const defaultPort = Number.isFinite(Number(config.port)) ? Number(config.port) : 6379;
+  const primary = normalizeText(config.host)
+    ? `${normalizeText(config.host)}:${defaultPort}`
+    : '';
+  const extraHosts = Array.isArray(config.hosts)
+    ? config.hosts.map((host) => normalizeText(host)).filter(Boolean)
+    : [];
+  return [primary, ...extraHosts].filter(Boolean);
+};
+
+const matchesKeyword = (keyword: string, connection: SavedConnection, seedAddresses: string[]): boolean => {
+  if (!keyword) return true;
+  const config = connection.config || {};
+  return [
+    connection.id,
+    connection.name,
+    config.type,
+    config.host,
+    config.user,
+    config.database,
+    config.topology,
+    config.redisSentinelMaster,
+    config.redisSentinelUser,
+    ...seedAddresses,
+  ].some((field) => normalizeLowerText(field).includes(keyword));
+};
+
+const buildRedisTopologyWarnings = (connection: SavedConnection, seedAddresses: string[]): string[] => {
+  const config = connection.config || {};
+  const configuredTopology = normalizeRedisTopology(config.topology);
+  const effectiveTopology = resolveEffectiveRedisTopology(configuredTopology, seedAddresses);
+  const warnings: string[] = [];
+
+  if (!normalizeText(config.host)) {
+    warnings.push('主机地址为空，连接前需要填写 Redis 节点或 Sentinel 地址');
+  }
+  if ((effectiveTopology === 'cluster' || effectiveTopology === 'sentinel') && config.useSSH === true) {
+    warnings.push(`${effectiveTopology === 'cluster' ? 'Redis Cluster' : 'Redis Sentinel'} 当前后端不支持 SSH 隧道，请改用直连、代理或远程 MCP HTTP 方案`);
+  }
+  if (configuredTopology === 'sentinel') {
+    if (!normalizeText(config.redisSentinelMaster)) {
+      warnings.push('Sentinel master 名称为空，go-redis FailoverClient 无法发现主节点');
+    }
+    if (seedAddresses.length < 2) {
+      warnings.push('Sentinel 只配置了一个节点，建议至少填写 2-3 个 Sentinel 地址以避免单点失败');
+    }
+    if (Number(config.port) === 6379) {
+      warnings.push('Sentinel 主地址端口是 6379，请确认这里填写的是 Sentinel 端口，常见默认值是 26379');
+    }
+  }
+  if (effectiveTopology === 'cluster') {
+    if (seedAddresses.length < 2) {
+      warnings.push('Cluster 只配置了一个种子节点，建议填写多个 master/replica 节点提高发现成功率');
+    }
+    const redisDB = Number(config.redisDB || 0);
+    const includeRedisDatabases = Array.isArray(connection.includeRedisDatabases)
+      ? connection.includeRedisDatabases.filter((item) => typeof item === 'number')
+      : [];
+    if (redisDB > 0 || includeRedisDatabases.some((item) => item > 0)) {
+      warnings.push('Redis Cluster 物理上只支持 db0；GoNavi 会用 __gonavi_db_N__: 前缀模拟逻辑库隔离');
+    }
+    if (normalizeText(config.redisSentinelMaster) || normalizeText(config.redisSentinelUser)) {
+      warnings.push('Cluster 模式下 Sentinel master / Sentinel 用户字段不会生效');
+    }
+  }
+  if (configuredTopology === 'single') {
+    if (seedAddresses.length > 1) {
+      warnings.push('单机模式下存在多个节点地址，后端会按多节点集群路径处理，建议显式改为 Cluster 模式');
+    }
+    if (normalizeText(config.redisSentinelMaster) || normalizeText(config.redisSentinelUser)) {
+      warnings.push('单机模式下 Sentinel 字段不会生效，如需哨兵发现请切换为 Sentinel 模式');
+    }
+  }
+
+  return warnings;
+};
+
+const isBlockingRedisWarning = (warning: string): boolean =>
+  warning.includes('主机地址为空') ||
+  warning.includes('master 名称为空') ||
+  warning.includes('不支持 SSH 隧道');
+
+const buildSafeRedisUriExample = (
+  connection: SavedConnection,
+  seedAddresses: string[],
+): string => {
+  const config = connection.config || {};
+  const configuredTopology = normalizeRedisTopology(config.topology);
+  const effectiveTopology = resolveEffectiveRedisTopology(configuredTopology, seedAddresses);
+  const scheme = config.useSSL === true ? 'rediss' : 'redis';
+  const hosts = seedAddresses.length > 0 ? seedAddresses : ['localhost:6379'];
+  const params = new URLSearchParams();
+  if (effectiveTopology === 'sentinel') {
+    params.set('topology', 'sentinel');
+    const masterName = normalizeText(config.redisSentinelMaster);
+    if (masterName) {
+      params.set('master', masterName);
+    }
+    const sentinelUser = normalizeText(config.redisSentinelUser);
+    if (sentinelUser) {
+      params.set('sentinel_user', sentinelUser);
+    }
+    if (normalizeText(config.redisSentinelPassword) || connection.hasRedisSentinelPassword === true) {
+      params.set('sentinel_password', '<hidden>');
+    }
+  } else if (effectiveTopology === 'cluster') {
+    params.set('topology', 'cluster');
+  }
+  if (config.useSSL === true) {
+    const sslMode = normalizeLowerText(config.sslMode || 'preferred');
+    if (sslMode === 'skip-verify' || sslMode === 'preferred') {
+      params.set('skip_verify', 'true');
+    }
+  }
+
+  const redisUser = normalizeText(config.user);
+  const hasRedisPassword = normalizeText(config.password) || connection.hasPrimaryPassword === true;
+  const auth = redisUser
+    ? `${encodeURIComponent(redisUser)}${hasRedisPassword ? ':<hidden>' : ''}@`
+    : hasRedisPassword
+      ? ':<hidden>@'
+      : '';
+  const redisDB = effectiveTopology === 'cluster' ? 0 : Number(config.redisDB || 0);
+  const query = params.toString();
+  return `${scheme}://${auth}${hosts.join(',')}/${Number.isFinite(redisDB) ? Math.max(0, Math.trunc(redisDB)) : 0}${query ? `?${query}` : ''}`;
+};
+
+const buildRedisDBSemantics = (
+  connection: SavedConnection,
+  effectiveTopology: RedisTopology,
+) => {
+  const config = connection.config || {};
+  const redisDB = typeof config.redisDB === 'number' ? config.redisDB : 0;
+  const includeRedisDatabases = Array.isArray(connection.includeRedisDatabases)
+    ? connection.includeRedisDatabases.filter((item) => typeof item === 'number')
+    : [];
+  if (effectiveTopology === 'cluster') {
+    return {
+      physicalDb: 0,
+      selectedDb: redisDB,
+      includeRedisDatabases,
+      mode: 'cluster_logical_namespace',
+      note: 'Redis Cluster 物理只支持 db0；GoNavi 用 __gonavi_db_N__: 前缀模拟多库视图。',
+    };
+  }
+  return {
+    physicalDb: redisDB,
+    selectedDb: redisDB,
+    includeRedisDatabases,
+    mode: effectiveTopology === 'sentinel' ? 'failover_selected_db' : 'selected_db',
+    note: effectiveTopology === 'sentinel'
+      ? 'Sentinel 发现 master 后连接指定 DB，切库会保留 Sentinel 配置重连。'
+      : '单机模式直接使用 Redis SELECT DB。',
+  };
+};
+
+const buildRedisNextActions = (
+  connection: SavedConnection,
+  warnings: string[],
+): string[] => {
+  const config = connection.config || {};
+  const topology = normalizeRedisTopology(config.topology);
+  const actions: string[] = [];
+  if (!normalizeText(config.host)) {
+    actions.push('先填写主机地址；Sentinel 模式填写 Sentinel 地址，Cluster 模式填写 Redis Cluster 种子节点。');
+  }
+  if (topology === 'sentinel' && !normalizeText(config.redisSentinelMaster)) {
+    actions.push('补充 Sentinel master 名称，例如 mymaster。');
+  }
+  if (warnings.some((warning) => warning.includes('不支持 SSH 隧道'))) {
+    actions.push('关闭 SSH 隧道，改用直连、代理/VPN，或使用 GoNavi MCP HTTP 让远端 Agent 通过本机 GoNavi 访问。');
+  }
+  if (warnings.some((warning) => warning.includes('26379'))) {
+    actions.push('把 Sentinel 主地址端口改为 26379，除非你的 Sentinel 明确监听其他端口。');
+  }
+  if (warnings.some((warning) => warning.includes('db0'))) {
+    actions.push('确认业务是否真的需要 Redis Cluster 多库视图；如果只是 key 分组，优先使用业务命名空间。');
+  }
+  if (warnings.some((warning) => warning.includes('多节点集群路径'))) {
+    actions.push('显式切换为 Cluster 模式，或删除附加节点只保留一个单机地址，避免配置拓扑和后端实际拓扑不一致。');
+  }
+  if (actions.length === 0) {
+    actions.push(`配置看起来可用于 ${topologyModeLabel(topology)}，下一步可以测试连接并查看 Redis DB/Key 树。`);
+  }
+  return actions;
+};
+
+const buildRedisTopologyRecommendations = (connection: SavedConnection, warnings: string[]): string[] => {
+  const config = connection.config || {};
+  const configuredTopology = normalizeRedisTopology(config.topology);
+  const seedAddresses = buildSeedAddresses(connection);
+  const effectiveTopology = resolveEffectiveRedisTopology(configuredTopology, seedAddresses);
+  const recommendations: string[] = [];
+
+  if (configuredTopology === 'sentinel') {
+    recommendations.push('确认主机和附加节点填写的是 Sentinel 地址，不是 Redis master 地址');
+    recommendations.push('分别填写 Redis 数据节点账号密码和 Sentinel 自身账号密码，二者不要混用');
+  } else if (effectiveTopology === 'cluster') {
+    recommendations.push('优先配置 2 个以上种子节点，并确认这些节点属于同一个 Redis Cluster');
+    recommendations.push('如果需要多库视图，优先在业务 key 上显式使用命名空间，避免误解 Cluster 的物理 db0 限制');
+  } else {
+    recommendations.push('单机模式只填写一个 Redis 地址；如果有多个节点，请改用 Cluster 或 Sentinel 模式');
+  }
+
+  if (warnings.some((warning) => warning.includes('SSH'))) {
+    recommendations.push('跨网络访问 Redis Cluster/Sentinel 时，优先使用网络代理、VPN 或 GoNavi MCP HTTP，而不是单端口 SSH 隧道');
+  }
+  if (config.useSSL === true) {
+    recommendations.push('已启用 TLS，连接失败时优先核对 sslMode、CA/证书路径和服务端 SNI');
+  }
+  return recommendations;
+};
+
+export const buildRedisTopologySnapshot = (params: {
+  connections: SavedConnection[];
+  connectionId?: unknown;
+  keyword?: unknown;
+  limit?: unknown;
+  includeRecommendations?: unknown;
+}) => {
+  const {
+    connections,
+    connectionId,
+    keyword,
+    limit,
+    includeRecommendations,
+  } = params;
+  const safeConnectionId = normalizeText(connectionId);
+  const safeKeyword = normalizeLowerText(keyword);
+  const safeLimit = normalizeLimit(limit, 20, 100);
+  const shouldIncludeRecommendations = includeRecommendations !== false;
+
+  const redisConnections = connections.filter((connection) =>
+    normalizeLowerText(connection.config?.type) === 'redis',
+  );
+  const matchedConnections = redisConnections.filter((connection) => {
+    if (safeConnectionId && connection.id !== safeConnectionId) {
+      return false;
+    }
+    return matchesKeyword(safeKeyword, connection, buildSeedAddresses(connection));
+  });
+
+  const topologyBreakdown = matchedConnections.reduce<Record<string, number>>((acc, connection) => {
+    const key = normalizeRedisTopology(connection.config?.topology);
+    acc[key] = (acc[key] || 0) + 1;
+    return acc;
+  }, {});
+
+  const visibleConnections = matchedConnections.slice(0, safeLimit).map((connection) => {
+    const config = connection.config || {};
+    const topology = normalizeRedisTopology(config.topology);
+    const seedAddresses = buildSeedAddresses(connection);
+    const effectiveTopology = resolveEffectiveRedisTopology(topology, seedAddresses);
+    const warnings = buildRedisTopologyWarnings(connection, seedAddresses);
+    const includeRedisDatabases = Array.isArray(connection.includeRedisDatabases)
+      ? connection.includeRedisDatabases.filter((item) => typeof item === 'number')
+      : [];
+    const blockingReasons = warnings.filter(isBlockingRedisWarning);
+    const status = blockingReasons.length > 0
+      ? 'blocked'
+      : warnings.length > 0
+        ? 'needs_attention'
+        : 'ready';
+    return {
+      id: connection.id,
+      name: connection.name,
+      topology,
+      topologyLabel: topologyModeLabel(topology),
+      effectiveTopology,
+      effectiveTopologyLabel: topologyModeLabel(effectiveTopology),
+      topologyMismatch: topology !== effectiveTopology,
+      status,
+      blockingReasons,
+      backendAdapter: topologyAdapterName(effectiveTopology),
+      host: normalizeText(config.host),
+      port: Number.isFinite(Number(config.port)) ? Number(config.port) : null,
+      seedAddresses,
+      seedAddressCount: seedAddresses.length,
+      redisDB: typeof config.redisDB === 'number' ? config.redisDB : 0,
+      includeRedisDatabases,
+      useSSL: config.useSSL === true,
+      sslMode: config.sslMode || '',
+      useSSH: config.useSSH === true,
+      useProxy: config.useProxy === true,
+      useHttpTunnel: config.useHttpTunnel === true,
+      sentinelMaster: topology === 'sentinel' ? normalizeText(config.redisSentinelMaster) : '',
+      hasRedisAuth: Boolean(normalizeText(config.user) || normalizeText(config.password) || connection.hasPrimaryPassword === true),
+      hasSentinelAuth: topology === 'sentinel'
+        ? Boolean(normalizeText(config.redisSentinelUser) || normalizeText(config.redisSentinelPassword) || connection.hasRedisSentinelPassword === true)
+        : false,
+      safeUriExample: buildSafeRedisUriExample(connection, seedAddresses),
+      dbSemantics: buildRedisDBSemantics(connection, effectiveTopology),
+      warnings,
+      nextActions: buildRedisNextActions(connection, warnings),
+      recommendations: shouldIncludeRecommendations
+        ? buildRedisTopologyRecommendations(connection, warnings)
+        : undefined,
+    };
+  });
+
+  const warningCount = visibleConnections.reduce((total, connection) => total + connection.warnings.length, 0);
+  const blockedCount = visibleConnections.filter((connection) => connection.status === 'blocked').length;
+
+  return {
+    connectionId: safeConnectionId,
+    keyword: safeKeyword,
+    limit: safeLimit,
+    totalRedisConnections: redisConnections.length,
+    totalMatched: matchedConnections.length,
+    returnedConnections: visibleConnections.length,
+    truncated: matchedConnections.length > visibleConnections.length,
+    topologyBreakdown,
+    warningCount,
+    blockedCount,
+    connections: visibleConnections,
+  };
+};
diff --git a/frontend/src/components/ai/aiRuntimeInsights.test.ts b/frontend/src/components/ai/aiRuntimeInsights.test.ts
new file mode 100644
index 0000000..1518f0b
--- /dev/null
+++ b/frontend/src/components/ai/aiRuntimeInsights.test.ts
@@ -0,0 +1,119 @@
+import { describe, expect, it } from 'vitest';
+
+import type { AIMCPToolDescriptor, AIProviderConfig, AISkillConfig } from '../../types';
+import { buildAIRuntimeSnapshot } from './aiRuntimeInsights';
+
+const providers: AIProviderConfig[] = [{
+  id: 'provider-1',
+  type: 'openai',
+  name: 'OpenAI 主账号',
+  apiKey: '',
+  hasSecret: true,
+  baseUrl: 'https://api.openai.com/v1',
+  model: 'gpt-5.4',
+  models: ['gpt-5.4', 'gpt-4.1'],
+  maxTokens: 32000,
+  temperature: 0.2,
+}];
+
+const skills: AISkillConfig[] = [
+  {
+    id: 'skill-1',
+    name: '结构审查',
+    systemPrompt: '先核对字段。',
+    enabled: true,
+    scopes: ['database'],
+    requiredTools: ['get_columns'],
+  },
+  {
+    id: 'skill-2',
+    name: '已禁用技能',
+    systemPrompt: 'ignore',
+    enabled: false,
+    scopes: ['global'],
+  },
+];
+
+const mcpTools: AIMCPToolDescriptor[] = [{
+  alias: 'browser_open',
+  originalName: 'browser_open',
+  serverId: 'server-1',
+  serverName: 'browser',
+  title: '打开浏览器',
+  description: '打开目标页面',
+}];
+
+describe('buildAIRuntimeSnapshot', () => {
+  it('returns a sanitized runtime snapshot for the active provider, tools, and skills', () => {
+    const snapshot = buildAIRuntimeSnapshot({
+      providers,
+      activeProviderId: 'provider-1',
+      safetyLevel: 'readonly',
+      contextLevel: 'with_samples',
+      skills,
+      mcpTools,
+      dynamicModels: ['gpt-5.4', 'gpt-4.1-mini'],
+      builtinToolNames: ['inspect_ai_runtime', 'get_columns', 'inspect_current_connection'],
+    });
+
+    expect(snapshot).toMatchObject({
+      hasActiveProvider: true,
+      providerCount: 1,
+      safetyLevel: 'readonly',
+      safetyLabel: '只读',
+      contextLevel: 'with_samples',
+      contextLabel: '结构+样例',
+      dynamicModelCount: 2,
+      enabledSkillCount: 1,
+      builtinToolCount: 3,
+      mcpToolCount: 1,
+      totalAvailableToolCount: 4,
+      capabilities: {
+        canWriteData: false,
+        canUseSampleContext: true,
+        hasExternalMCPTools: true,
+        hasCustomSkills: true,
+      },
+    });
+    expect(snapshot.activeProvider).toMatchObject({
+      id: 'provider-1',
+      name: 'OpenAI 主账号',
+      model: 'gpt-5.4',
+      hasSecret: true,
+    });
+    expect(JSON.stringify(snapshot)).not.toContain('apiKey');
+    expect(snapshot.enabledSkills).toEqual([
+      {
+        id: 'skill-1',
+        name: '结构审查',
+        scopes: ['database'],
+        requiredTools: ['get_columns'],
+      },
+    ]);
+    expect(snapshot.mcpTools).toEqual([
+      {
+        alias: 'browser_open',
+        title: '打开浏览器',
+        serverName: 'browser',
+      },
+    ]);
+  });
+
+  it('returns a clear empty state when no provider is active', () => {
+    const snapshot = buildAIRuntimeSnapshot({
+      providers: [],
+      activeProviderId: '',
+      safetyLevel: 'readonly',
+      contextLevel: 'schema_only',
+      skills: [],
+      mcpTools: [],
+      builtinToolNames: [],
+    });
+
+    expect(snapshot).toMatchObject({
+      hasActiveProvider: false,
+      activeProvider: null,
+      message: '当前未启用 AI 供应商',
+    });
+  });
+});
diff --git a/frontend/src/components/ai/aiRuntimeInsights.ts b/frontend/src/components/ai/aiRuntimeInsights.ts
new file mode 100644
index 0000000..6be7f1a
--- /dev/null
+++ b/frontend/src/components/ai/aiRuntimeInsights.ts
@@ -0,0 +1,140 @@
+import type {
+  AIContextLevel,
+  AIMCPToolDescriptor,
+  AIProviderConfig,
+  AISafetyLevel,
+  AISkillConfig,
+} from '../../types';
+
+const SAFETY_LEVEL_LABELS: Record<string, string> = {
+  readonly: '只读',
+  readwrite: '读写',
+  full: '完全开放',
+};
+
+const CONTEXT_LEVEL_LABELS: Record<string, string> = {
+  schema_only: '仅结构',
+  with_samples: '结构+样例',
+  with_results: '结构+结果',
+};
+
+const BUILTIN_TOOL_PREVIEW_LIMIT = 30;
+const MCP_TOOL_PREVIEW_LIMIT = 40;
+const DYNAMIC_MODEL_PREVIEW_LIMIT = 20;
+
+const sliceList = <T,>(items: T[], limit: number) => {
+  const list = Array.isArray(items) ? items : [];
+  return {
+    items: list.slice(0, limit),
+    truncated: list.length > limit,
+    total: list.length,
+  };
+};
+
+const normalizeSafetyLevel = (value: AISafetyLevel | string | undefined): string =>
+  String(value || 'unknown').trim() || 'unknown';
+
+const normalizeContextLevel = (value: AIContextLevel | string | undefined): string =>
+  String(value || 'unknown').trim() || 'unknown';
+
+export const buildAIRuntimeSnapshot = (params: {
+  providers?: AIProviderConfig[];
+  activeProviderId?: string | null;
+  safetyLevel?: AISafetyLevel | string;
+  contextLevel?: AIContextLevel | string;
+  skills?: AISkillConfig[];
+  mcpTools?: AIMCPToolDescriptor[];
+  dynamicModels?: string[];
+  builtinToolNames?: string[];
+}) => {
+  const {
+    providers = [],
+    activeProviderId = '',
+    safetyLevel,
+    contextLevel,
+    skills = [],
+    mcpTools = [],
+    dynamicModels = [],
+    builtinToolNames = [],
+  } = params;
+
+  const activeProvider = providers.find((provider) => provider.id === activeProviderId) || null;
+  const enabledSkills = skills.filter((skill) => skill?.enabled);
+  const builtinPreview = sliceList(
+    builtinToolNames
+      .map((name) => String(name || '').trim())
+      .filter(Boolean)
+      .sort((left, right) => left.localeCompare(right)),
+    BUILTIN_TOOL_PREVIEW_LIMIT,
+  );
+  const mcpPreview = sliceList(
+    mcpTools.map((tool) => ({
+      alias: tool.alias,
+      title: tool.title || tool.originalName || tool.alias,
+      serverName: tool.serverName,
+    })),
+    MCP_TOOL_PREVIEW_LIMIT,
+  );
+  const dynamicModelPreview = sliceList(
+    dynamicModels
+      .map((model) => String(model || '').trim())
+      .filter(Boolean),
+    DYNAMIC_MODEL_PREVIEW_LIMIT,
+  );
+  const normalizedSafetyLevel = normalizeSafetyLevel(safetyLevel);
+  const normalizedContextLevel = normalizeContextLevel(contextLevel);
+
+  return {
+    hasActiveProvider: Boolean(activeProvider),
+    activeProvider: activeProvider ? {
+      id: activeProvider.id,
+      name: activeProvider.name,
+      type: activeProvider.type,
+      apiFormat: activeProvider.apiFormat || 'openai',
+      model: activeProvider.model || '',
+      baseUrl: activeProvider.baseUrl || '',
+      hasSecret: activeProvider.hasSecret ?? Boolean(activeProvider.secretRef || activeProvider.apiKey),
+      declaredModelCount: Array.isArray(activeProvider.models) ? activeProvider.models.length : 0,
+    } : null,
+    providerCount: providers.length,
+    providers: providers.map((provider) => ({
+      id: provider.id,
+      name: provider.name,
+      type: provider.type,
+      active: provider.id === activeProviderId,
+      model: provider.model || '',
+    })),
+    safetyLevel: normalizedSafetyLevel,
+    safetyLabel: SAFETY_LEVEL_LABELS[normalizedSafetyLevel] || normalizedSafetyLevel,
+    contextLevel: normalizedContextLevel,
+    contextLabel: CONTEXT_LEVEL_LABELS[normalizedContextLevel] || normalizedContextLevel,
+    dynamicModelCount: dynamicModelPreview.total,
+    dynamicModels: dynamicModelPreview.items,
+    dynamicModelsTruncated: dynamicModelPreview.truncated,
+    enabledSkillCount: enabledSkills.length,
+    enabledSkills: enabledSkills.map((skill) => ({
+      id: skill.id,
+      name: skill.name,
+      scopes: Array.isArray(skill.scopes) ? skill.scopes : [],
+      requiredTools: Array.isArray(skill.requiredTools) ? skill.requiredTools : [],
+    })),
+    builtinToolCount: builtinPreview.total,
+    builtinTools: builtinPreview.items,
+    builtinToolsTruncated: builtinPreview.truncated,
+    mcpToolCount: mcpPreview.total,
+    mcpTools: mcpPreview.items,
+    mcpToolsTruncated: mcpPreview.truncated,
+    totalAvailableToolCount: builtinPreview.total + mcpPreview.total,
+    capabilities: {
+      canWriteData: normalizedSafetyLevel !== 'readonly',
+      canUseSampleContext: normalizedContextLevel === 'with_samples' || normalizedContextLevel === 'with_results',
+      canUseResultContext: normalizedContextLevel === 'with_results',
+      hasExternalMCPTools: mcpPreview.total > 0,
+      hasCustomSkills: enabledSkills.length > 0,
+      hasDynamicModelsLoaded: dynamicModelPreview.total > 0,
+    },
+    message: activeProvider
+      ? `当前 AI 正在使用 ${activeProvider.name || activeProvider.id}，共暴露 ${builtinPreview.total + mcpPreview.total} 个工具`
+      : '当前未启用 AI 供应商',
+  };
+};
diff --git a/frontend/src/components/ai/aiSafetyInsights.test.ts b/frontend/src/components/ai/aiSafetyInsights.test.ts
new file mode 100644
index 0000000..b437943
--- /dev/null
+++ b/frontend/src/components/ai/aiSafetyInsights.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildAISafetySnapshot } from './aiSafetyInsights';
+
+describe('buildAISafetySnapshot', () => {
+  it('describes readonly ai safety when no active connection is selected', () => {
+    const snapshot = buildAISafetySnapshot({
+      safetyLevel: 'readonly',
+      connections: [],
+    });
+
+    expect(snapshot.safetyLevel).toBe('readonly');
+    expect(snapshot.permissionMatrix.allowQuery).toBe(true);
+    expect(snapshot.permissionMatrix.allowDML).toBe(false);
+    expect(snapshot.permissionMatrix.allowDDL).toBe(false);
+    expect(snapshot.hasActiveConnection).toBe(false);
+    expect(snapshot.effectiveRestrictions).toContain('只读模式仅允许查询语句。');
+    expect(snapshot.recommendations).toContain('如需执行 INSERT/UPDATE/DELETE，请先把 AI 安全级别切到读写模式。');
+  });
+
+  it('includes jvm connection restrictions and MCP write confirmation hints', () => {
+    const snapshot = buildAISafetySnapshot({
+      safetyLevel: 'readwrite',
+      connections: [
+        {
+          id: 'jvm-1',
+          name: 'JVM 诊断环境',
+          config: {
+            type: 'jvm',
+            host: '10.0.0.8',
+            port: 0,
+            user: '',
+            jvm: {
+              environment: 'uat',
+              readOnly: true,
+              diagnostic: {
+                transport: 'agent-bridge',
+                allowObserveCommands: true,
+                allowTraceCommands: true,
+                allowMutatingCommands: false,
+              },
+            },
+          },
+        },
+      ],
+      tabs: [
+        {
+          id: 'diag-tab-1',
+          title: 'JVM 诊断',
+          type: 'jvm-diagnostic',
+          connectionId: 'jvm-1',
+          readOnly: true,
+        },
+      ],
+      activeTabId: 'diag-tab-1',
+    });
+
+    expect(snapshot.permissionMatrix.allowDML).toBe(true);
+    expect(snapshot.permissionMatrix.allowDDL).toBe(false);
+    expect(snapshot.activeConnection?.readOnly).toBe(true);
+    expect(snapshot.jvmGuards?.allowMutatingCommands).toBe(false);
+    expect(snapshot.effectiveRestrictions.join('\n')).toContain('allowMutating=true');
+    expect(snapshot.effectiveRestrictions.join('\n')).toContain('当前 JVM 诊断明确禁止 mutating 命令');
+  });
+});
diff --git a/frontend/src/components/ai/aiSafetyInsights.ts b/frontend/src/components/ai/aiSafetyInsights.ts
new file mode 100644
index 0000000..b9d5390
--- /dev/null
+++ b/frontend/src/components/ai/aiSafetyInsights.ts
@@ -0,0 +1,135 @@
+import type { AISafetyLevel, SavedConnection, TabData } from '../../types';
+
+const SAFETY_LEVEL_LABELS: Record<string, string> = {
+  readonly: '只读',
+  readwrite: '读写',
+  full: '完全开放',
+};
+
+const SAFETY_RULE_TEXTS: Record<string, string> = {
+  readonly: '只读模式仅允许查询语句。',
+  readwrite: '读写模式允许查询和 DML，DDL 仍会被阻止。',
+  full: '完全开放模式允许查询、DML 和 DDL；未识别操作仍会被阻止。',
+};
+
+const normalizeSafetyLevel = (value: AISafetyLevel | string | undefined): string => {
+  const level = String(value || 'readonly').trim().toLowerCase();
+  if (level === 'readwrite' || level === 'full') {
+    return level;
+  }
+  return 'readonly';
+};
+
+const buildPermissionMatrix = (safetyLevel: string) => ({
+  allowQuery: true,
+  allowDML: safetyLevel === 'readwrite' || safetyLevel === 'full',
+  allowDDL: safetyLevel === 'full',
+  requiresConfirmationForAllowedNonQuery: true,
+  requiresMCPAllowMutatingForAllowedNonQuery: true,
+});
+
+export const buildAISafetySnapshot = (params: {
+  safetyLevel?: AISafetyLevel | string;
+  activeContext?: { connectionId: string; dbName?: string } | null;
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  connections: SavedConnection[];
+}) => {
+  const {
+    safetyLevel,
+    activeContext = null,
+    tabs = [],
+    activeTabId = null,
+    connections,
+  } = params;
+
+  const normalizedSafetyLevel = normalizeSafetyLevel(safetyLevel);
+  const activeTab = tabs.find((tab) => tab.id === activeTabId);
+  const connectionId = String(activeContext?.connectionId || activeTab?.connectionId || '').trim();
+  const activeDbName = String(activeContext?.dbName || activeTab?.dbName || '').trim();
+  const connection = connectionId
+    ? connections.find((item) => item.id === connectionId)
+    : undefined;
+  const config = connection?.config;
+  const jvm = config?.jvm;
+  const diagnostic = jvm?.diagnostic;
+  const isJVMSession = config?.type === 'jvm';
+  const activeResultReadOnly = activeTab?.readOnly === true;
+  const jvmReadOnly = isJVMSession && jvm?.readOnly !== false;
+
+  const effectiveRestrictions = [
+    SAFETY_RULE_TEXTS[normalizedSafetyLevel] || SAFETY_RULE_TEXTS.readonly,
+  ];
+  if (normalizedSafetyLevel === 'readonly') {
+    effectiveRestrictions.push('当前安全级别下，任何 DML/DDL 都会被直接阻止。');
+  } else {
+    effectiveRestrictions.push('任何允许通过的非查询语句都仍然需要人工确认。');
+    effectiveRestrictions.push('如果通过 GoNavi MCP 的 execute_sql 执行非查询语句，还必须显式传 allowMutating=true。');
+  }
+  if (activeResultReadOnly) {
+    effectiveRestrictions.push('当前活动页签结果集是只读的，不能把它当成可直接回写的数据网格。');
+  }
+  if (jvmReadOnly) {
+    effectiveRestrictions.push('当前 JVM 连接本身是只读连接，默认只能按观察/排障思路生成诊断计划。');
+  }
+  if (isJVMSession && diagnostic?.allowMutatingCommands !== true) {
+    effectiveRestrictions.push('当前 JVM 诊断明确禁止 mutating 命令，即使 AI 安全级别允许写入，也不能假设这类命令能执行。');
+  }
+
+  const recommendations: string[] = [];
+  if (normalizedSafetyLevel === 'readonly') {
+    recommendations.push('如需执行 INSERT/UPDATE/DELETE，请先把 AI 安全级别切到读写模式。');
+    recommendations.push('如需执行 CREATE/ALTER/DROP/TRUNCATE 等结构变更，请切到完全开放模式。');
+  } else if (normalizedSafetyLevel === 'readwrite') {
+    recommendations.push('当前已经允许 DML；如果目标是改表结构，仍需要切到完全开放模式。');
+  }
+  if (activeResultReadOnly) {
+    recommendations.push('如果目标是编辑结果网格，请重新打开可编辑的表或查询结果，不要只看当前只读页签。');
+  }
+  if (jvmReadOnly) {
+    recommendations.push('当前 JVM 连接按只读策略回答；需要变更类诊断前先确认连接策略是否应调整。');
+  }
+  if (isJVMSession && diagnostic?.allowMutatingCommands !== true) {
+    recommendations.push('当前 JVM 诊断禁止 mutating 命令；如需执行高风险命令，应先调整诊断权限。');
+  }
+
+  return {
+    safetyLevel: normalizedSafetyLevel,
+    safetyLabel: SAFETY_LEVEL_LABELS[normalizedSafetyLevel] || normalizedSafetyLevel,
+    sqlRuleText: SAFETY_RULE_TEXTS[normalizedSafetyLevel] || SAFETY_RULE_TEXTS.readonly,
+    permissionMatrix: buildPermissionMatrix(normalizedSafetyLevel),
+    hasActiveConnection: Boolean(connection),
+    activeConnection: connection
+      ? {
+          connectionId: connection.id,
+          connectionName: connection.name,
+          connectionType: config?.type || '',
+          host: config?.host || '',
+          activeDbName: activeDbName || config?.database || '',
+          readOnly: activeResultReadOnly || jvmReadOnly,
+        }
+      : null,
+    activeTab: activeTab
+      ? {
+          id: activeTab.id,
+          title: activeTab.title || '',
+          type: activeTab.type || '',
+          readOnly: activeResultReadOnly,
+        }
+      : null,
+    jvmGuards: isJVMSession
+      ? {
+          readOnly: jvmReadOnly,
+          transport: diagnostic?.transport || 'agent-bridge',
+          allowObserveCommands: diagnostic?.allowObserveCommands !== false,
+          allowTraceCommands: diagnostic?.allowTraceCommands === true,
+          allowMutatingCommands: diagnostic?.allowMutatingCommands === true,
+        }
+      : null,
+    effectiveRestrictions,
+    recommendations,
+    message: connection
+      ? `当前 AI 安全级别为 ${SAFETY_LEVEL_LABELS[normalizedSafetyLevel] || normalizedSafetyLevel}，活动连接为 ${connection.name}`
+      : `当前 AI 安全级别为 ${SAFETY_LEVEL_LABELS[normalizedSafetyLevel] || normalizedSafetyLevel}，当前没有活动连接`,
+  };
+};
diff --git a/frontend/src/components/ai/aiSavedConnectionInsights.ts b/frontend/src/components/ai/aiSavedConnectionInsights.ts
new file mode 100644
index 0000000..c52e7cc
--- /dev/null
+++ b/frontend/src/components/ai/aiSavedConnectionInsights.ts
@@ -0,0 +1,118 @@
+import type { SavedConnection } from '../../types';
+
+const normalizeLimit = (input: unknown, fallback: number, max: number): number => {
+  const value = Math.floor(Number(input) || fallback);
+  if (value < 1) return 1;
+  if (value > max) return max;
+  return value;
+};
+
+const normalizeKeyword = (input: unknown): string => String(input || '').trim().toLowerCase();
+
+const matchesKeyword = (keyword: string, fields: Array<string | undefined>): boolean => {
+  if (!keyword) {
+    return true;
+  }
+  return fields.some((field) => String(field || '').toLowerCase().includes(keyword));
+};
+
+const normalizeTypeFilter = (input: unknown): string =>
+  String(input || '').trim().toLowerCase();
+
+export const buildSavedConnectionsSnapshot = (params: {
+  connections: SavedConnection[];
+  keyword?: unknown;
+  type?: unknown;
+  limit?: unknown;
+}) => {
+  const {
+    connections,
+    keyword,
+    type,
+    limit,
+  } = params;
+  const safeKeyword = normalizeKeyword(keyword);
+  const safeType = normalizeTypeFilter(type);
+  const safeLimit = normalizeLimit(limit, 20, 100);
+
+  const filteredConnections = connections.filter((connection) => {
+    const config = connection.config || {};
+    const connectionType = String(config.type || '').trim().toLowerCase();
+    if (safeType && connectionType !== safeType) {
+      return false;
+    }
+    return matchesKeyword(safeKeyword, [
+      connection.id,
+      connection.name,
+      config.type,
+      config.host,
+      config.database,
+      config.user,
+      config.driver,
+      config.topology,
+      config.ssh?.host,
+      config.proxy?.host,
+      config.httpTunnel?.host,
+    ]);
+  });
+
+  const visibleConnections = filteredConnections
+    .slice(0, safeLimit)
+    .map((connection) => {
+      const config = connection.config || {};
+      const includeDatabases = Array.isArray(connection.includeDatabases)
+        ? connection.includeDatabases.filter(Boolean)
+        : [];
+      const includeRedisDatabases = Array.isArray(connection.includeRedisDatabases)
+        ? connection.includeRedisDatabases.filter((item) => typeof item === 'number')
+        : [];
+
+      return {
+        id: connection.id,
+        name: connection.name,
+        type: config.type || '',
+        host: config.host || '',
+        port: typeof config.port === 'number' ? config.port : null,
+        user: config.user || '',
+        configuredDatabase: config.database || '',
+        driver: config.driver || '',
+        topology: config.topology || 'single',
+        useSSL: config.useSSL === true,
+        useSSH: config.useSSH === true,
+        sshHost: config.useSSH ? (config.ssh?.host || '') : '',
+        sshPort: config.useSSH && typeof config.ssh?.port === 'number' ? config.ssh.port : null,
+        useProxy: config.useProxy === true,
+        proxyType: config.useProxy ? (config.proxy?.type || '') : '',
+        proxyHost: config.useProxy ? (config.proxy?.host || '') : '',
+        proxyPort: config.useProxy && typeof config.proxy?.port === 'number' ? config.proxy.port : null,
+        useHttpTunnel: config.useHttpTunnel === true,
+        httpTunnelHost: config.useHttpTunnel ? (config.httpTunnel?.host || '') : '',
+        httpTunnelPort: config.useHttpTunnel && typeof config.httpTunnel?.port === 'number' ? config.httpTunnel.port : null,
+        hasOpaqueURI: connection.hasOpaqueURI === true,
+        hasOpaqueDSN: connection.hasOpaqueDSN === true,
+        hasConnectionParams: Boolean(String(config.connectionParams || '').trim()),
+        includeDatabaseCount: includeDatabases.length,
+        includeRedisDatabaseCount: includeRedisDatabases.length,
+      };
+    });
+
+  const typeBreakdown = filteredConnections.reduce<Record<string, number>>((acc, connection) => {
+    const key = String(connection.config?.type || 'unknown').trim() || 'unknown';
+    acc[key] = (acc[key] || 0) + 1;
+    return acc;
+  }, {});
+
+  return {
+    keyword: safeKeyword,
+    type: safeType,
+    limit: safeLimit,
+    totalMatched: filteredConnections.length,
+    returnedConnections: visibleConnections.length,
+    truncated: filteredConnections.length > visibleConnections.length,
+    sshEnabledCount: filteredConnections.filter((item) => item.config?.useSSH === true).length,
+    proxyEnabledCount: filteredConnections.filter((item) => item.config?.useProxy === true).length,
+    httpTunnelEnabledCount: filteredConnections.filter((item) => item.config?.useHttpTunnel === true).length,
+    typeBreakdown,
+    connections: visibleConnections,
+  };
+};
diff --git a/frontend/src/components/ai/aiSavedSqlInsights.test.ts b/frontend/src/components/ai/aiSavedSqlInsights.test.ts
new file mode 100644
index 0000000..20509fe
--- /dev/null
+++ b/frontend/src/components/ai/aiSavedSqlInsights.test.ts
@@ -0,0 +1,95 @@
+import { describe, expect, it } from 'vitest';
+
+import type { SavedConnection, SavedQuery, SqlSnippet } from '../../types';
+import { buildSavedQueriesSnapshot, buildSqlSnippetsSnapshot } from './aiSavedSqlInsights';
+
+const connections: SavedConnection[] = [
+  {
+    id: 'conn-1',
+    name: '本地开发库',
+    config: {
+      type: 'mysql',
+      host: '127.0.0.1',
+      port: 3306,
+      user: 'root',
+    },
+  },
+];
+
+describe('aiSavedSqlInsights', () => {
+  it('filters saved queries by keyword and returns sql previews with connection metadata', () => {
+    const savedQueries: SavedQuery[] = [
+      {
+        id: 'query-1',
+        name: '支付订单查询',
+        sql: 'SELECT * FROM orders WHERE status = "paid"',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        createdAt: 2,
+      },
+      {
+        id: 'query-2',
+        name: '用户清单',
+        sql: 'SELECT id, name FROM users',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        createdAt: 1,
+      },
+    ];
+
+    const snapshot = buildSavedQueriesSnapshot({
+      savedQueries,
+      connections,
+      keyword: '支付',
+    });
+
+    expect(snapshot.totalMatched).toBe(1);
+    expect(snapshot.queries).toHaveLength(1);
+    expect(snapshot.queries[0]).toMatchObject({
+      id: 'query-1',
+      connectionName: '本地开发库',
+      connectionType: 'mysql',
+      dbName: 'crm',
+    });
+    expect(snapshot.queries[0].sqlPreview).toContain('status = "paid"');
+  });
+
+  it('filters sql snippets by keyword and keeps builtin/custom counts', () => {
+    const sqlSnippets: SqlSnippet[] = [
+      {
+        id: 'snippet-1',
+        prefix: 'sel',
+        name: 'SELECT 模板',
+        description: '快速生成 select',
+        body: 'SELECT * FROM ${1:table};',
+        isBuiltin: true,
+        createdAt: 1,
+      },
+      {
+        id: 'snippet-2',
+        prefix: 'pay',
+        name: '支付对账',
+        description: '支付结果核对模板',
+        body: 'SELECT * FROM pay_orders WHERE created_at >= ${1:start};',
+        isBuiltin: false,
+        createdAt: 2,
+      },
+    ];
+
+    const snapshot = buildSqlSnippetsSnapshot({
+      sqlSnippets,
+      keyword: '支付',
+    });
+
+    expect(snapshot.totalMatched).toBe(1);
+    expect(snapshot.returnedSnippets).toBe(1);
+    expect(snapshot.builtinCount).toBe(0);
+    expect(snapshot.customCount).toBe(1);
+    expect(snapshot.snippets[0]).toMatchObject({
+      id: 'snippet-2',
+      prefix: 'pay',
+      isBuiltin: false,
+    });
+    expect(snapshot.snippets[0].bodyPreview).toContain('pay_orders');
+  });
+});
diff --git a/frontend/src/components/ai/aiSavedSqlInsights.ts b/frontend/src/components/ai/aiSavedSqlInsights.ts
new file mode 100644
index 0000000..2175a65
--- /dev/null
+++ b/frontend/src/components/ai/aiSavedSqlInsights.ts
@@ -0,0 +1,151 @@
+import type { SavedConnection, SavedQuery, SqlSnippet } from '../../types';
+
+const SAVED_QUERY_SQL_PREVIEW_LIMIT = 4000;
+const SQL_SNIPPET_BODY_PREVIEW_LIMIT = 2000;
+
+const normalizeLimit = (input: unknown, fallback: number, max: number): number => {
+  const value = Math.floor(Number(input) || fallback);
+  if (value < 1) return 1;
+  if (value > max) return max;
+  return value;
+};
+
+const normalizeKeyword = (input: unknown): string => String(input || '').trim().toLowerCase();
+
+const matchesKeyword = (keyword: string, fields: Array<string | undefined>): boolean => {
+  if (!keyword) {
+    return true;
+  }
+  return fields.some((field) => String(field || '').toLowerCase().includes(keyword));
+};
+
+export const buildSavedQueriesSnapshot = (params: {
+  savedQueries?: SavedQuery[];
+  connections: SavedConnection[];
+  keyword?: unknown;
+  connectionId?: unknown;
+  dbName?: unknown;
+  limit?: unknown;
+  includeSql?: unknown;
+}) => {
+  const {
+    savedQueries = [],
+    connections,
+    keyword,
+    connectionId,
+    dbName,
+    limit,
+    includeSql = true,
+  } = params;
+  const safeKeyword = normalizeKeyword(keyword);
+  const safeConnectionId = String(connectionId || '').trim();
+  const safeDbName = String(dbName || '').trim();
+  const safeLimit = normalizeLimit(limit, 12, 50);
+  const shouldIncludeSql = includeSql !== false;
+
+  const filteredQueries = [...savedQueries]
+    .sort((left, right) => Number(right.createdAt || 0) - Number(left.createdAt || 0))
+    .filter((query) => {
+      if (safeConnectionId && query.connectionId !== safeConnectionId) {
+        return false;
+      }
+      if (safeDbName && query.dbName !== safeDbName) {
+        return false;
+      }
+      const connection = connections.find((item) => item.id === query.connectionId);
+      return matchesKeyword(safeKeyword, [
+        query.name,
+        query.sql,
+        query.dbName,
+        connection?.name,
+        connection?.config?.type,
+      ]);
+    });
+
+  const visibleQueries = filteredQueries.slice(0, safeLimit).map((query) => {
+    const connection = connections.find((item) => item.id === query.connectionId);
+    const sqlText = String(query.sql || '').trim();
+    const sqlPreview = shouldIncludeSql ? sqlText.slice(0, SAVED_QUERY_SQL_PREVIEW_LIMIT) : '';
+
+    return {
+      id: query.id,
+      name: query.name,
+      connectionId: query.connectionId,
+      connectionName: connection?.name || '',
+      connectionType: connection?.config?.type || '',
+      dbName: query.dbName || '',
+      createdAt: Number(query.createdAt || 0),
+      sqlCharCount: sqlText.length,
+      sqlTruncated: shouldIncludeSql && sqlText.length > sqlPreview.length,
+      sqlPreview,
+    };
+  });
+
+  return {
+    keyword: safeKeyword,
+    connectionId: safeConnectionId,
+    dbName: safeDbName,
+    includeSql: shouldIncludeSql,
+    limit: safeLimit,
+    totalMatched: filteredQueries.length,
+    returnedQueries: visibleQueries.length,
+    truncated: filteredQueries.length > visibleQueries.length,
+    queries: visibleQueries,
+  };
+};
+
+export const buildSqlSnippetsSnapshot = (params: {
+  sqlSnippets?: SqlSnippet[];
+  keyword?: unknown;
+  limit?: unknown;
+  includeBody?: unknown;
+}) => {
+  const {
+    sqlSnippets = [],
+    keyword,
+    limit,
+    includeBody = true,
+  } = params;
+  const safeKeyword = normalizeKeyword(keyword);
+  const safeLimit = normalizeLimit(limit, 20, 80);
+  const shouldIncludeBody = includeBody !== false;
+
+  const filteredSnippets = [...sqlSnippets]
+    .sort((left, right) => left.prefix.localeCompare(right.prefix))
+    .filter((snippet) =>
+      matchesKeyword(safeKeyword, [
+        snippet.prefix,
+        snippet.name,
+        snippet.description,
+        snippet.body,
+      ]));
+
+  const visibleSnippets = filteredSnippets.slice(0, safeLimit).map((snippet) => {
+    const bodyText = String(snippet.body || '').trim();
+    const bodyPreview = shouldIncludeBody ? bodyText.slice(0, SQL_SNIPPET_BODY_PREVIEW_LIMIT) : '';
+
+    return {
+      id: snippet.id,
+      prefix: snippet.prefix,
+      name: snippet.name,
+      description: snippet.description || '',
+      isBuiltin: snippet.isBuiltin === true,
+      createdAt: Number(snippet.createdAt || 0),
+      bodyCharCount: bodyText.length,
+      bodyTruncated: shouldIncludeBody && bodyText.length > bodyPreview.length,
+      bodyPreview,
+    };
+  });
+
+  return {
+    keyword: safeKeyword,
+    includeBody: shouldIncludeBody,
+    limit: safeLimit,
+    totalMatched: filteredSnippets.length,
+    returnedSnippets: visibleSnippets.length,
+    truncated: filteredSnippets.length > visibleSnippets.length,
+    builtinCount: visibleSnippets.filter((snippet) => snippet.isBuiltin).length,
+    customCount: visibleSnippets.filter((snippet) => !snippet.isBuiltin).length,
+    snippets: visibleSnippets,
+  };
+};
diff --git a/frontend/src/components/ai/aiSettingsModalConfig.test.tsx b/frontend/src/components/ai/aiSettingsModalConfig.test.tsx
new file mode 100644
index 0000000..8b6f95e
--- /dev/null
+++ b/frontend/src/components/ai/aiSettingsModalConfig.test.tsx
@@ -0,0 +1,44 @@
+import { describe, expect, it } from 'vitest';
+
+import { QWEN_CODING_PLAN_ANTHROPIC_BASE_URL } from '../../utils/aiProviderPresets';
+import {
+  EMPTY_MCP_SERVER,
+  EMPTY_SKILL,
+  PROVIDER_PRESETS,
+  findPreset,
+  matchProviderPreset,
+} from './aiSettingsModalConfig';
+
+describe('aiSettingsModalConfig', () => {
+  it('finds the matching preset and falls back to custom when the key is unknown', () => {
+    expect(findPreset('openai').label).toBe('OpenAI');
+    expect(findPreset('missing-preset').key).toBe('custom');
+  });
+
+  it('matches an anthropic-compatible provider back to the qwen coding plan preset', () => {
+    const preset = matchProviderPreset({
+      type: 'custom',
+      baseUrl: QWEN_CODING_PLAN_ANTHROPIC_BASE_URL,
+      apiFormat: 'claude-cli',
+    });
+
+    expect(preset.key).toBe('qwen-coding-plan');
+  });
+
+  it('creates MCP server drafts and skill drafts with stable defaults', () => {
+    const server = EMPTY_MCP_SERVER({ name: 'Browser', args: ['stdio'] });
+    const skill = EMPTY_SKILL();
+
+    expect(server.transport).toBe('stdio');
+    expect(server.timeoutSeconds).toBe(20);
+    expect(server.args).toEqual(['stdio']);
+    expect(skill.enabled).toBe(true);
+    expect(skill.scopes).toEqual(['global']);
+  });
+
+  it('keeps the provider preset list available for the settings modal', () => {
+    expect(PROVIDER_PRESETS.some((item) => item.key === 'codex')).toBe(false);
+    expect(PROVIDER_PRESETS.some((item) => item.key === 'openai')).toBe(true);
+    expect(PROVIDER_PRESETS.some((item) => item.key === 'custom')).toBe(true);
+  });
+});
diff --git a/frontend/src/components/ai/aiSettingsModalConfig.tsx b/frontend/src/components/ai/aiSettingsModalConfig.tsx
new file mode 100644
index 0000000..a806d61
--- /dev/null
+++ b/frontend/src/components/ai/aiSettingsModalConfig.tsx
@@ -0,0 +1,119 @@
+import React from 'react';
+import {
+  ApiOutlined,
+  AppstoreOutlined,
+  CloudOutlined,
+  ExperimentOutlined,
+  ThunderboltOutlined,
+} from '@ant-design/icons';
+
+import type {
+  AIMCPServerConfig,
+  AIProviderConfig,
+  AIProviderType,
+  AISkillConfig,
+  AIUserPromptSettings,
+} from '../../types';
+import {
+  QWEN_BAILIAN_ANTHROPIC_BASE_URL,
+  QWEN_CODING_PLAN_ANTHROPIC_BASE_URL,
+  QWEN_CODING_PLAN_MODELS,
+  resolveProviderPresetKey,
+} from '../../utils/aiProviderPresets';
+
+export interface ProviderPreset {
+  key: string;
+  label: string;
+  icon: React.ReactNode;
+  desc: string;
+  color: string;
+  backendType: AIProviderType;
+  fixedApiFormat?: string;
+  defaultBaseUrl: string;
+  defaultModel: string;
+  models: string[];
+}
+
+export const PROVIDER_PRESETS: ProviderPreset[] = [
+  { key: 'openai', label: 'OpenAI', icon: <ApiOutlined />, desc: 'GPT-5.4 / 5.3 系列', color: '#10b981', backendType: 'openai', defaultBaseUrl: 'https://api.openai.com/v1', defaultModel: 'gpt-4o', models: [] },
+  { key: 'deepseek', label: 'DeepSeek', icon: <ThunderboltOutlined />, desc: 'DeepSeek-V4 / R1', color: '#3b82f6', backendType: 'openai', defaultBaseUrl: 'https://api.deepseek.com/v1', defaultModel: 'deepseek-chat', models: [] },
+  { key: 'qwen-bailian', label: '通义千问（百炼通用）', icon: <CloudOutlined />, desc: '百炼 Anthropic 兼容 / 模型从远端拉取', color: '#6366f1', backendType: 'anthropic', defaultBaseUrl: QWEN_BAILIAN_ANTHROPIC_BASE_URL, defaultModel: '', models: [] },
+  { key: 'qwen-coding-plan', label: '通义千问（Coding Plan）', icon: <CloudOutlined />, desc: 'Claude Code CLI 代理链路 / 使用官方支持模型清单', color: '#4f46e5', backendType: 'custom', fixedApiFormat: 'claude-cli', defaultBaseUrl: QWEN_CODING_PLAN_ANTHROPIC_BASE_URL, defaultModel: '', models: QWEN_CODING_PLAN_MODELS },
+  { key: 'zhipu', label: '智谱 GLM', icon: <ExperimentOutlined />, desc: 'GLM-5 / GLM-5-Turbo', color: '#0ea5e9', backendType: 'openai', defaultBaseUrl: 'https://open.bigmodel.cn/api/paas/v4', defaultModel: 'glm-4', models: [] },
+  { key: 'moonshot', label: 'Kimi', icon: <ExperimentOutlined />, desc: 'Kimi K2.5 (Anthropic 兼容)', color: '#0d9488', backendType: 'anthropic', defaultBaseUrl: 'https://api.moonshot.cn/anthropic', defaultModel: 'moonshot-v1-8k', models: [] },
+  { key: 'anthropic', label: 'Claude', icon: <ExperimentOutlined />, desc: 'Claude Opus/Sonnet', color: '#d97706', backendType: 'anthropic', defaultBaseUrl: 'https://api.anthropic.com', defaultModel: 'claude-3-5-sonnet-20241022', models: [] },
+  { key: 'gemini', label: 'Gemini', icon: <CloudOutlined />, desc: 'Gemini 3.1 / 2.5 系列', color: '#059669', backendType: 'gemini', defaultBaseUrl: 'https://generativelanguage.googleapis.com', defaultModel: 'gemini-2.5-flash', models: [] },
+  { key: 'volcengine-ark', label: '火山方舟', icon: <CloudOutlined />, desc: 'Ark 通用推理 / 豆包模型', color: '#0ea5e9', backendType: 'openai', defaultBaseUrl: 'https://ark.cn-beijing.volces.com/api/v3', defaultModel: '', models: [] },
+  { key: 'volcengine-coding', label: '火山 Coding Plan', icon: <CloudOutlined />, desc: 'Ark Code / Coding Plan', color: '#0284c7', backendType: 'openai', defaultBaseUrl: 'https://ark.cn-beijing.volces.com/api/coding/v3', defaultModel: '', models: [] },
+  { key: 'minimax', label: 'MiniMax', icon: <ExperimentOutlined />, desc: 'M3 / M2.7 系列 (Anthropic 兼容)', color: '#e11d48', backendType: 'anthropic', defaultBaseUrl: 'https://api.minimaxi.com/anthropic', defaultModel: 'MiniMax-M3', models: ['MiniMax-M3', 'MiniMax-M2.7', 'MiniMax-M2.7-highspeed'] },
+  { key: 'ollama', label: 'Ollama', icon: <AppstoreOutlined />, desc: '本地部署开源模型', color: '#78716c', backendType: 'openai', defaultBaseUrl: 'http://localhost:11434/v1', defaultModel: 'llama3', models: [] },
+  { key: 'custom', label: '自定义', icon: <AppstoreOutlined />, desc: '自定义 API 端点', color: '#64748b', backendType: 'custom', defaultBaseUrl: '', defaultModel: '', models: [] },
+];
+
+export const findPreset = (key: string): ProviderPreset =>
+  PROVIDER_PRESETS.find((preset) => preset.key === key) || PROVIDER_PRESETS[PROVIDER_PRESETS.length - 1];
+
+export const matchProviderPreset = (
+  provider: Pick<AIProviderConfig, 'type' | 'baseUrl' | 'apiFormat'>,
+): ProviderPreset => {
+  const presetKey = resolveProviderPresetKey(provider, PROVIDER_PRESETS, 'custom');
+  return findPreset(presetKey);
+};
+
+export const EMPTY_AI_USER_PROMPT_SETTINGS: AIUserPromptSettings = {
+  global: '',
+  database: '',
+  jvm: '',
+  jvmDiagnostic: '',
+};
+
+export const EMPTY_MCP_SERVER = (seed?: Partial<AIMCPServerConfig>): AIMCPServerConfig => {
+  const base: AIMCPServerConfig = {
+    id: `mcp-draft-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+    name: '',
+    transport: 'stdio',
+    command: '',
+    args: [],
+    env: {},
+    enabled: true,
+    timeoutSeconds: 20,
+  };
+  return {
+    ...base,
+    ...seed,
+    transport: seed?.transport || base.transport,
+    args: Array.isArray(seed?.args) ? seed.args : base.args,
+    env: seed?.env || base.env,
+    enabled: seed?.enabled ?? base.enabled,
+    timeoutSeconds: seed?.timeoutSeconds || base.timeoutSeconds,
+  };
+};
+
+const waitFor = (delayMs: number) => new Promise<void>((resolve) => {
+  window.setTimeout(resolve, delayMs);
+});
+
+const readAIService = () => (window as any).go?.aiservice?.Service;
+
+export const waitForAIService = async (attempts = 6, delayMs = 80) => {
+  for (let attempt = 0; attempt < attempts; attempt += 1) {
+    const service = readAIService();
+    if (service) {
+      return service;
+    }
+    if (attempt < attempts - 1) {
+      await waitFor(delayMs);
+    }
+  }
+  return readAIService();
+};
+
+export const EMPTY_SKILL = (): AISkillConfig => ({
+  id: `skill-draft-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+  name: '',
+  description: '',
+  systemPrompt: '',
+  enabled: true,
+  scopes: ['global'],
+  requiredTools: [],
+});
diff --git a/frontend/src/components/ai/aiSetupHealthInsights.test.ts b/frontend/src/components/ai/aiSetupHealthInsights.test.ts
new file mode 100644
index 0000000..d0454a0
--- /dev/null
+++ b/frontend/src/components/ai/aiSetupHealthInsights.test.ts
@@ -0,0 +1,210 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildAISetupHealthSnapshot } from './aiSetupHealthInsights';
+
+describe('buildAISetupHealthSnapshot', () => {
+  it('marks the setup as blocked when the active provider is missing critical pieces', () => {
+    const snapshot = buildAISetupHealthSnapshot({
+      providers: [{
+        id: 'provider-1',
+        type: 'openai',
+        name: 'OpenAI 主账号',
+        apiKey: '',
+        hasSecret: false,
+        baseUrl: '',
+        model: '',
+        models: [],
+        maxTokens: 32000,
+        temperature: 0.2,
+      }],
+      activeProviderId: 'provider-1',
+      builtinToolNames: ['inspect_ai_setup_health', 'inspect_ai_runtime'],
+      mcpServers: [],
+      mcpClientStatuses: [],
+      mcpTools: [],
+      skills: [],
+      dynamicModels: [],
+      userPromptSettings: {
+        global: '',
+        database: '',
+        jvm: '',
+        jvmDiagnostic: '',
+      },
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      activeContextItems: [],
+    });
+
+    expect(snapshot.status).toBe('blocked');
+    expect(snapshot.blockers).toContain('当前活动供应商缺少 API Key / Secret');
+    expect(snapshot.blockers).toContain('当前活动供应商缺少接口地址');
+    expect(snapshot.blockers).toContain('当前活动供应商还没有选中模型');
+    expect(snapshot.nextActions).toContain('补齐当前活动供应商的密钥');
+    expect(snapshot.nextActions).toContain('为当前活动供应商选择一个可用模型');
+    expect(snapshot.summary.chatReady).toBe(false);
+  });
+
+  it('summarizes a ready setup while still surfacing optional next-step guidance', () => {
+    const snapshot = buildAISetupHealthSnapshot({
+      providers: [{
+        id: 'provider-1',
+        type: 'openai',
+        name: 'OpenAI 主账号',
+        apiKey: '',
+        hasSecret: true,
+        baseUrl: 'https://api.openai.com/v1',
+        model: 'gpt-5.4',
+        models: ['gpt-5.4', 'gpt-4.1'],
+        maxTokens: 32000,
+        temperature: 0.2,
+      }],
+      activeProviderId: 'provider-1',
+      safetyLevel: 'readonly',
+      contextLevel: 'with_samples',
+      builtinToolNames: ['inspect_ai_setup_health', 'inspect_ai_runtime', 'get_columns'],
+      mcpServers: [{
+        id: 'server-1',
+        name: 'Browser',
+        transport: 'stdio',
+        command: 'uvx',
+        args: ['mcp-server-browser'],
+        env: {},
+        enabled: true,
+        timeoutSeconds: 20,
+      }],
+      mcpClientStatuses: [{
+        client: 'codex',
+        displayName: 'Codex',
+        installed: true,
+        matchesCurrent: true,
+        clientDetected: true,
+        clientCommand: 'codex',
+        clientPath: 'C:/Tools/codex.exe',
+        configPath: 'C:/Users/demo/.codex/config.toml',
+        command: 'gonavi-mcp-server',
+        args: ['stdio'],
+        message: '已接入当前 GoNavi MCP',
+      }],
+      mcpTools: [{
+        alias: 'browser_open',
+        originalName: 'browser_open',
+        serverId: 'server-1',
+        serverName: 'Browser',
+        title: '打开页面',
+        description: '打开页面',
+      }],
+      skills: [{
+        id: 'skill-1',
+        name: '结构审查',
+        description: '优先核对字段',
+        systemPrompt: '先看字段和索引，再给结论。',
+        enabled: true,
+        scopes: ['database'],
+        requiredTools: ['get_columns'],
+      }],
+      dynamicModels: ['gpt-5.4', 'gpt-4.1'],
+      userPromptSettings: {
+        global: '回答前先核对上下文。',
+        database: '',
+        jvm: '',
+        jvmDiagnostic: '',
+      },
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      activeContextItems: [{
+        dbName: 'crm',
+        tableName: 'orders',
+        ddl: 'CREATE TABLE orders (...)',
+      }],
+    });
+
+    expect(snapshot.status).toBe('ready');
+    expect(snapshot.ready).toBe(true);
+    expect(snapshot.blockers).toHaveLength(0);
+    expect(snapshot.summary.activeProviderName).toBe('OpenAI 主账号');
+    expect(snapshot.summary.currentExternalClientCount).toBe(1);
+    expect(snapshot.summary.enabledSkillCount).toBe(1);
+    expect(snapshot.mcp.message).toContain('当前共配置 1 个 MCP 服务');
+    expect(snapshot.guidance.enabledSkillPreview).toContain('结构审查');
+  });
+
+  it('includes mcp server configuration validation issues in setup health warnings', () => {
+    const snapshot = buildAISetupHealthSnapshot({
+      providers: [{
+        id: 'provider-1',
+        type: 'openai',
+        name: 'OpenAI 主账号',
+        apiKey: '',
+        hasSecret: true,
+        baseUrl: 'https://api.openai.com/v1',
+        model: 'gpt-5.4',
+        models: ['gpt-5.4'],
+        maxTokens: 32000,
+        temperature: 0.2,
+      }],
+      activeProviderId: 'provider-1',
+      safetyLevel: 'readonly',
+      contextLevel: 'schema_only',
+      builtinToolNames: ['inspect_ai_setup_health', 'inspect_mcp_setup'],
+      mcpServers: [{
+        id: 'server-1',
+        name: 'Broken',
+        transport: 'stdio',
+        command: '',
+        args: [],
+        env: {},
+        enabled: true,
+        timeoutSeconds: 1,
+      }],
+      mcpClientStatuses: [{
+        client: 'codex',
+        displayName: 'Codex',
+        installed: true,
+        matchesCurrent: true,
+        clientDetected: true,
+        clientCommand: 'codex',
+        clientPath: 'C:/Tools/codex.exe',
+        configPath: 'C:/Users/demo/.codex/config.toml',
+        command: 'gonavi-mcp-server',
+        args: ['stdio'],
+        message: '已接入当前 GoNavi MCP',
+      }],
+      mcpTools: [],
+      skills: [{
+        id: 'skill-1',
+        name: '结构审查',
+        description: '优先核对字段',
+        systemPrompt: '先看字段和索引，再给结论。',
+        enabled: true,
+        scopes: ['database'],
+        requiredTools: ['get_columns'],
+      }],
+      userPromptSettings: {
+        global: '回答前先核对上下文。',
+        database: '',
+        jvm: '',
+        jvmDiagnostic: '',
+      },
+      activeContext: {
+        connectionId: 'conn-1',
+        dbName: 'crm',
+      },
+      activeContextItems: [{
+        dbName: 'crm',
+        tableName: 'orders',
+        ddl: 'CREATE TABLE orders (...)',
+      }],
+    });
+
+    expect(snapshot.status).toBe('needs_attention');
+    expect(snapshot.summary.mcpServerConfigurationIssueCount).toBe(2);
+    expect(snapshot.summary.mcpServersWithConfigurationErrors).toBe(1);
+    expect(snapshot.warnings).toContain('有 1 个 MCP 服务存在启动配置错误，测试和工具发现可能失败');
+    expect(snapshot.nextActions).toContain('先修复 MCP 服务配置检查里的错误项，再重新测试服务');
+    expect(snapshot.mcp.servers[0].configurationIssues.map((issue) => issue.key)).toContain('command-missing');
+  });
+});
diff --git a/frontend/src/components/ai/aiSetupHealthInsights.ts b/frontend/src/components/ai/aiSetupHealthInsights.ts
new file mode 100644
index 0000000..05e6c7c
--- /dev/null
+++ b/frontend/src/components/ai/aiSetupHealthInsights.ts
@@ -0,0 +1,182 @@
+import type {
+  AIContextItem,
+  AIMCPClientInstallStatus,
+  AIMCPServerConfig,
+  AIMCPToolDescriptor,
+  AIProviderConfig,
+  AISafetyLevel,
+  AISkillConfig,
+  AIUserPromptSettings,
+} from '../../types';
+import { buildAIChatReadinessSnapshot } from './aiChatReadiness';
+import { buildAIGuidanceSnapshot } from './aiPromptInsights';
+import { buildAIProviderSnapshot } from './aiProviderInsights';
+import { buildAIRuntimeSnapshot } from './aiRuntimeInsights';
+import { buildMCPSetupSnapshot } from './aiMCPInsights';
+
+type AISetupHealthStatus = 'ready' | 'needs_attention' | 'blocked';
+
+const appendUnique = (items: string[], value: string) => {
+  const trimmed = String(value || '').trim();
+  if (!trimmed || items.includes(trimmed)) {
+    return;
+  }
+  items.push(trimmed);
+};
+
+const summarizeSkillNames = (skills: Array<{ name?: string }>) =>
+  skills
+    .map((skill) => String(skill?.name || '').trim())
+    .filter(Boolean)
+    .slice(0, 6);
+
+export const buildAISetupHealthSnapshot = (params: {
+  providers?: AIProviderConfig[];
+  activeProviderId?: string | null;
+  safetyLevel?: AISafetyLevel | string;
+  contextLevel?: string;
+  skills?: AISkillConfig[];
+  mcpServers?: AIMCPServerConfig[];
+  mcpClientStatuses?: AIMCPClientInstallStatus[];
+  mcpTools?: AIMCPToolDescriptor[];
+  dynamicModels?: string[];
+  builtinToolNames?: string[];
+  userPromptSettings?: AIUserPromptSettings;
+  activeContext?: { connectionId?: string | null; dbName?: string | null } | null;
+  activeContextItems?: AIContextItem[];
+}) => {
+  const activeContextItems = Array.isArray(params.activeContextItems) ? params.activeContextItems : [];
+  const runtimeSnapshot = buildAIRuntimeSnapshot({
+    providers: params.providers,
+    activeProviderId: params.activeProviderId,
+    safetyLevel: params.safetyLevel,
+    contextLevel: params.contextLevel,
+    skills: params.skills,
+    mcpTools: params.mcpTools,
+    dynamicModels: params.dynamicModels,
+    builtinToolNames: params.builtinToolNames,
+  });
+  const providerSnapshot = buildAIProviderSnapshot({
+    providers: params.providers,
+    activeProviderId: params.activeProviderId,
+    dynamicModels: params.dynamicModels,
+  });
+  const chatReadiness = buildAIChatReadinessSnapshot({
+    providers: params.providers,
+    activeProviderId: params.activeProviderId,
+    dynamicModels: params.dynamicModels,
+    activeContext: params.activeContext,
+    activeContextItems,
+  });
+  const mcpSnapshot = buildMCPSetupSnapshot({
+    mcpServers: params.mcpServers,
+    mcpClientStatuses: params.mcpClientStatuses,
+    mcpTools: params.mcpTools,
+  });
+  const guidanceSnapshot = buildAIGuidanceSnapshot({
+    userPromptSettings: params.userPromptSettings,
+    skills: params.skills,
+  });
+
+  const blockers: string[] = [];
+  const warnings: string[] = [];
+  const nextActions: string[] = [];
+
+  if (!providerSnapshot.hasActiveProvider) {
+    appendUnique(blockers, '当前没有活动 AI 供应商');
+    appendUnique(nextActions, '先在 AI 设置里添加并选中一个活动供应商');
+  }
+
+  const activeProviderIssues = providerSnapshot.activeProvider?.issues || [];
+  if (activeProviderIssues.includes('missing_secret')) {
+    appendUnique(blockers, '当前活动供应商缺少 API Key / Secret');
+    appendUnique(nextActions, '补齐当前活动供应商的密钥');
+  }
+  if (activeProviderIssues.includes('missing_base_url')) {
+    appendUnique(blockers, '当前活动供应商缺少接口地址');
+    appendUnique(nextActions, '补齐当前活动供应商的 baseUrl');
+  }
+  if (activeProviderIssues.includes('missing_selected_model') || chatReadiness.status === 'missing_model') {
+    appendUnique(blockers, '当前活动供应商还没有选中模型');
+    appendUnique(nextActions, '为当前活动供应商选择一个可用模型');
+  }
+  if (chatReadiness.status === 'loading_models') {
+    appendUnique(warnings, '当前正在加载模型列表，模型选择尚未完成');
+    appendUnique(nextActions, '等待模型列表加载完成后重新确认活动模型');
+  }
+
+  if (mcpSnapshot.serverCount === 0) {
+    appendUnique(warnings, '当前还没有配置任何 MCP 服务');
+    appendUnique(nextActions, '如需扩展 AI 工具能力，可新增并测试至少 1 个 MCP 服务');
+  }
+  mcpSnapshot.warnings.forEach((warning) => appendUnique(warnings, warning));
+  mcpSnapshot.nextActions.forEach((action) => appendUnique(nextActions, action));
+  if (mcpSnapshot.currentClientCount === 0) {
+    appendUnique(warnings, 'Claude Code / Codex 还没有本机客户端接入当前 GoNavi MCP，OpenClaw/Hermans 需要远程桥接');
+    appendUnique(nextActions, '如需让外部 Agent 使用 GoNavi MCP，本机客户端可接入 Claude Code/Codex，云端 Agent 先配置远程 MCP 桥接');
+  }
+  if (mcpSnapshot.enabledServerCount > 0 && runtimeSnapshot.mcpToolCount === 0) {
+    appendUnique(warnings, '已启用 MCP 服务，但当前还没有发现可用 MCP 工具');
+    appendUnique(nextActions, '逐条测试已启用的 MCP 服务，确认命令、参数和环境变量能正确发现工具');
+  }
+  if (guidanceSnapshot.customPromptCount === 0 && guidanceSnapshot.enabledSkillCount === 0) {
+    appendUnique(warnings, '当前没有自定义提示词或 Skills');
+    appendUnique(nextActions, '如需固定回答风格或工作流，可补充自定义提示词或启用 Skills');
+  }
+  if (chatReadiness.ready && params.activeContext?.connectionId && activeContextItems.length === 0) {
+    appendUnique(warnings, '当前聊天已就绪，但还没有挂载任何表结构上下文');
+    appendUnique(nextActions, '如需更准的 SQL / 结构建议，可先把目标表结构关联到 AI 上下文');
+  }
+
+  const status: AISetupHealthStatus = blockers.length > 0
+    ? 'blocked'
+    : warnings.length > 0
+      ? 'needs_attention'
+      : 'ready';
+
+  const message = status === 'ready'
+    ? '当前 AI 配置体检通过，供应商、聊天前置和 MCP 运行链路都处于可用状态'
+    : status === 'blocked'
+      ? `当前 AI 配置存在 ${blockers.length} 个阻塞项，优先修复活动供应商和聊天前置条件`
+      : `当前 AI 配置整体可用，但还有 ${warnings.length} 个建议项可以继续优化`;
+
+  return {
+    status,
+    ready: status === 'ready',
+    message,
+    blockers,
+    warnings,
+    nextActions,
+    summary: {
+      providerCount: providerSnapshot.providerCount,
+      readyProviderCount: providerSnapshot.readyProviderCount,
+      hasActiveProvider: providerSnapshot.hasActiveProvider,
+      activeProviderName: providerSnapshot.activeProvider?.name || providerSnapshot.activeProvider?.id || '',
+      chatStatus: chatReadiness.status,
+      chatReady: chatReadiness.ready,
+      safetyLevel: runtimeSnapshot.safetyLevel,
+      safetyLabel: runtimeSnapshot.safetyLabel,
+      contextLevel: runtimeSnapshot.contextLevel,
+      contextLabel: runtimeSnapshot.contextLabel,
+      enabledSkillCount: guidanceSnapshot.enabledSkillCount,
+      customPromptCount: guidanceSnapshot.customPromptCount,
+      mcpServerCount: mcpSnapshot.serverCount,
+      enabledMCPServerCount: mcpSnapshot.enabledServerCount,
+      mcpServerConfigurationIssueCount: mcpSnapshot.serverConfigurationIssueCount,
+      mcpServersWithConfigurationErrors: mcpSnapshot.serversWithConfigurationErrors,
+      installedExternalClientCount: mcpSnapshot.installedClientCount,
+      currentExternalClientCount: mcpSnapshot.currentClientCount,
+      discoveredMCPToolCount: mcpSnapshot.discoveredMCPToolCount,
+      totalAvailableToolCount: runtimeSnapshot.totalAvailableToolCount,
+      contextAttachedCount: chatReadiness.contextAttachedCount,
+    },
+    runtime: runtimeSnapshot,
+    provider: providerSnapshot,
+    chatReadiness,
+    mcp: mcpSnapshot,
+    guidance: {
+      ...guidanceSnapshot,
+      enabledSkillPreview: summarizeSkillNames(guidanceSnapshot.enabledSkills),
+    },
+  };
+};
diff --git a/frontend/src/components/ai/aiShortcutInsights.test.ts b/frontend/src/components/ai/aiShortcutInsights.test.ts
new file mode 100644
index 0000000..b21c286
--- /dev/null
+++ b/frontend/src/components/ai/aiShortcutInsights.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildShortcutSnapshot } from './aiShortcutInsights';
+import {
+  cloneShortcutOptions,
+  DEFAULT_SHORTCUT_OPTIONS,
+} from '../../utils/shortcuts';
+
+describe('aiShortcutInsights', () => {
+  it('returns current-platform and cross-platform shortcut bindings with customization markers', () => {
+    const shortcutOptions = cloneShortcutOptions(DEFAULT_SHORTCUT_OPTIONS);
+    shortcutOptions.toggleQueryResultsPanel.windows = {
+      combo: 'Ctrl+Shift+Y',
+      enabled: true,
+    };
+
+    const snapshot = buildShortcutSnapshot({
+      shortcutOptions,
+      currentPlatform: 'windows',
+    });
+
+    const resultPanelShortcut = snapshot.actions.find(
+      (item) => item?.action === 'toggleQueryResultsPanel',
+    );
+
+    expect(snapshot.currentPlatform).toBe('windows');
+    expect(snapshot.totalActionCount).toBeGreaterThan(10);
+    expect(resultPanelShortcut?.currentPlatformBinding.combo).toBe('Ctrl+Shift+Y');
+    expect(resultPanelShortcut?.currentPlatformBinding.isCustomized).toBe(true);
+    expect(resultPanelShortcut?.platforms?.mac.combo).toBe('Meta+Shift+M');
+  });
+
+  it('supports filtering by action key or shortcut-related keywords', () => {
+    const byAction = buildShortcutSnapshot({
+      currentPlatform: 'windows',
+      action: 'toggleQueryResultsPanel',
+    });
+    const byKeyword = buildShortcutSnapshot({
+      currentPlatform: 'windows',
+      keyword: '结果区',
+    });
+
+    expect(byAction.matchedActionCount).toBe(1);
+    expect(byAction.actions[0]?.action).toBe('toggleQueryResultsPanel');
+    expect(byKeyword.actions.some((item) => item?.action === 'toggleQueryResultsPanel')).toBe(true);
+  });
+});
diff --git a/frontend/src/components/ai/aiShortcutInsights.ts b/frontend/src/components/ai/aiShortcutInsights.ts
new file mode 100644
index 0000000..dc2a139
--- /dev/null
+++ b/frontend/src/components/ai/aiShortcutInsights.ts
@@ -0,0 +1,151 @@
+import { isMacLikePlatform } from "../../utils/appearance";
+import {
+  DEFAULT_SHORTCUT_OPTIONS,
+  SHORTCUT_ACTION_META,
+  SHORTCUT_ACTION_ORDER,
+  getShortcutDisplayLabel,
+  getShortcutPlatform,
+  resolveShortcutBinding,
+  type ShortcutAction,
+  type ShortcutOptions,
+  type ShortcutPlatform,
+} from "../../utils/shortcuts";
+
+interface BuildShortcutSnapshotOptions {
+  shortcutOptions?: Partial<ShortcutOptions> | null;
+  currentPlatform?: ShortcutPlatform;
+  action?: string;
+  keyword?: string;
+  includeDisabled?: boolean;
+  includeAllPlatforms?: boolean;
+}
+
+interface ShortcutBindingSnapshot {
+  platform: ShortcutPlatform;
+  combo: string;
+  display: string;
+  enabled: boolean;
+  defaultCombo: string;
+  defaultDisplay: string;
+  defaultEnabled: boolean;
+  isCustomized: boolean;
+}
+
+const normalizeText = (value: unknown): string =>
+  String(value || "").trim().toLowerCase();
+
+const buildShortcutBindingSnapshot = (
+  shortcutOptions: Partial<ShortcutOptions> | null | undefined,
+  action: ShortcutAction,
+  platform: ShortcutPlatform,
+): ShortcutBindingSnapshot => {
+  const current = resolveShortcutBinding(shortcutOptions, action, platform);
+  const defaults = resolveShortcutBinding(DEFAULT_SHORTCUT_OPTIONS, action, platform);
+  return {
+    platform,
+    combo: current.combo,
+    display: current.enabled ? getShortcutDisplayLabel(current.combo, platform) : "-",
+    enabled: current.enabled !== false,
+    defaultCombo: defaults.combo,
+    defaultDisplay: defaults.enabled ? getShortcutDisplayLabel(defaults.combo, platform) : "-",
+    defaultEnabled: defaults.enabled !== false,
+    isCustomized:
+      current.combo !== defaults.combo || current.enabled !== defaults.enabled,
+  };
+};
+
+const matchesActionFilter = (
+  action: ShortcutAction,
+  filter: string,
+): boolean => !filter || normalizeText(action) === filter;
+
+const matchesKeywordFilter = (
+  searchText: string,
+  filter: string,
+): boolean => !filter || searchText.includes(filter);
+
+export const buildShortcutSnapshot = ({
+  shortcutOptions,
+  currentPlatform = getShortcutPlatform(isMacLikePlatform()),
+  action,
+  keyword,
+  includeDisabled = true,
+  includeAllPlatforms = true,
+}: BuildShortcutSnapshotOptions) => {
+  const normalizedAction = normalizeText(action);
+  const normalizedKeyword = normalizeText(keyword);
+
+  const actions = SHORTCUT_ACTION_ORDER
+    .map((shortcutAction) => {
+      const meta = SHORTCUT_ACTION_META[shortcutAction];
+      const windowsBinding = buildShortcutBindingSnapshot(
+        shortcutOptions,
+        shortcutAction,
+        "windows",
+      );
+      const macBinding = buildShortcutBindingSnapshot(
+        shortcutOptions,
+        shortcutAction,
+        "mac",
+      );
+      const currentBinding =
+        currentPlatform === "mac" ? macBinding : windowsBinding;
+
+      if (!includeDisabled && !currentBinding.enabled) {
+        return null;
+      }
+      if (!matchesActionFilter(shortcutAction, normalizedAction)) {
+        return null;
+      }
+
+      const searchText = normalizeText([
+        shortcutAction,
+        meta.label,
+        meta.description,
+        meta.scope || "global",
+        currentBinding.combo,
+        currentBinding.defaultCombo,
+        windowsBinding.combo,
+        windowsBinding.defaultCombo,
+        macBinding.combo,
+        macBinding.defaultCombo,
+      ].join(" "));
+      if (!matchesKeywordFilter(searchText, normalizedKeyword)) {
+        return null;
+      }
+
+      return {
+        action: shortcutAction,
+        label: meta.label,
+        description: meta.description,
+        scope: meta.scope || "global",
+        allowInEditable: meta.allowInEditable === true,
+        allowWithoutModifier: meta.allowWithoutModifier === true,
+        requiredKey: meta.requiredKey || null,
+        disallowShift: meta.disallowShift === true,
+        platformOnly: meta.platformOnly || null,
+        currentPlatformBinding: currentBinding,
+        platforms: includeAllPlatforms
+          ? {
+              windows: windowsBinding,
+              mac: macBinding,
+            }
+          : undefined,
+      };
+    })
+    .filter((item): item is NonNullable<typeof item> => Boolean(item));
+
+  return {
+    currentPlatform,
+    filters: {
+      action: normalizedAction || null,
+      keyword: normalizedKeyword || null,
+      includeDisabled,
+      includeAllPlatforms,
+    },
+    totalActionCount: SHORTCUT_ACTION_ORDER.length,
+    matchedActionCount: actions.length,
+    knownActions: SHORTCUT_ACTION_ORDER,
+    actions,
+  };
+};
diff --git a/frontend/src/components/ai/aiSlashCommands.test.ts b/frontend/src/components/ai/aiSlashCommands.test.ts
new file mode 100644
index 0000000..3e3fae3
--- /dev/null
+++ b/frontend/src/components/ai/aiSlashCommands.test.ts
@@ -0,0 +1,122 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  filterAISlashCommands,
+  getFeaturedAISlashCommands,
+  groupAISlashCommands,
+} from './aiSlashCommands';
+
+describe('aiSlashCommands', () => {
+  it('returns all default commands when only slash is present', () => {
+    const commands = filterAISlashCommands('/');
+
+    expect(commands.length).toBeGreaterThan(8);
+    expect(commands.some((command) => command.cmd === '/health')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/tools')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/budget')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/hotspots')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/mcp')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/mcpfail')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/mcpadd')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/mcpdraft')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/mcptool')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/connfail')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/shortcuts')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/applog')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/airender')).toBe(true);
+    expect(commands.some((command) => command.cmd === '/tx')).toBe(true);
+  });
+
+  it('supports filtering by chinese keywords in addition to command prefix', () => {
+    const commands = filterAISlashCommands('体检');
+
+    expect(commands.map((command) => command.cmd)).toContain('/health');
+    expect(commands.map((command) => command.cmd)).not.toContain('/mcpadd');
+  });
+
+  it('supports filtering builtin tool catalog diagnostics by keyword and command prefix', () => {
+    expect(filterAISlashCommands('工具目录').map((command) => command.cmd)).toContain('/tools');
+    expect(filterAISlashCommands('参数提示').map((command) => command.cmd)).toContain('/tools');
+    expect(filterAISlashCommands('/too').map((command) => command.cmd)).toContain('/tools');
+  });
+
+  it('supports filtering context budget diagnostics by keyword and command prefix', () => {
+    expect(filterAISlashCommands('上下文').map((command) => command.cmd)).toContain('/budget');
+    expect(filterAISlashCommands('变慢').map((command) => command.cmd)).toContain('/budget');
+    expect(filterAISlashCommands('/bud').map((command) => command.cmd)).toContain('/budget');
+  });
+
+  it('supports filtering code hotspot diagnostics by keyword and command prefix', () => {
+    expect(filterAISlashCommands('大文件').map((command) => command.cmd)).toContain('/hotspots');
+    expect(filterAISlashCommands('拆分').map((command) => command.cmd)).toContain('/hotspots');
+    expect(filterAISlashCommands('/hot').map((command) => command.cmd)).toContain('/hotspots');
+  });
+
+  it('supports filtering shortcut diagnostics by chinese keyword and command prefix', () => {
+    expect(filterAISlashCommands('快捷键').map((command) => command.cmd)).toContain('/shortcuts');
+    expect(filterAISlashCommands('/sho').map((command) => command.cmd)).toContain('/shortcuts');
+  });
+
+  it('supports filtering connection-failure diagnostics by chinese keyword and command prefix', () => {
+    expect(filterAISlashCommands('连接失败').map((command) => command.cmd)).toContain('/connfail');
+    expect(filterAISlashCommands('/conn').map((command) => command.cmd)).toContain('/connfail');
+  });
+
+  it('supports filtering app-log diagnostics by chinese keyword and command prefix', () => {
+    expect(filterAISlashCommands('日志').map((command) => command.cmd)).toContain('/applog');
+    expect(filterAISlashCommands('/app').map((command) => command.cmd)).toContain('/applog');
+  });
+
+  it('supports filtering ai-render diagnostics by chinese keyword and command prefix', () => {
+    expect(filterAISlashCommands('气泡空白').map((command) => command.cmd)).toContain('/airender');
+    expect(filterAISlashCommands('/air').map((command) => command.cmd)).toContain('/airender');
+  });
+
+  it('supports filtering sql editor transaction diagnostics by keyword and command prefix', () => {
+    expect(filterAISlashCommands('自动提交').map((command) => command.cmd)).toContain('/tx');
+    expect(filterAISlashCommands('未提交').map((command) => command.cmd)).toContain('/tx');
+    expect(filterAISlashCommands('/tx').map((command) => command.cmd)).toContain('/tx');
+  });
+
+  it('supports filtering mcp tool schema diagnostics by keyword and command prefix', () => {
+    expect(filterAISlashCommands('arguments').map((command) => command.cmd)).toContain('/mcptool');
+    expect(filterAISlashCommands('MCP工具参数').map((command) => command.cmd)).toContain('/mcptool');
+    expect(filterAISlashCommands('/mcpt').map((command) => command.cmd)).toContain('/mcptool');
+  });
+
+  it('supports filtering mcp runtime failure diagnostics by keyword and command prefix', () => {
+    expect(filterAISlashCommands('运行期失败').map((command) => command.cmd)).toContain('/mcpfail');
+    expect(filterAISlashCommands('工具发现0个').map((command) => command.cmd)).toContain('/mcpfail');
+    expect(filterAISlashCommands('stdio').map((command) => command.cmd)).toContain('/mcpfail');
+    expect(filterAISlashCommands('/mcpf').map((command) => command.cmd)).toContain('/mcpfail');
+  });
+
+  it('supports filtering mcp draft validation diagnostics by keyword and command prefix', () => {
+    expect(filterAISlashCommands('MCP草稿').map((command) => command.cmd)).toContain('/mcpdraft');
+    expect(filterAISlashCommands('启动命令').map((command) => command.cmd)).toContain('/mcpdraft');
+    expect(filterAISlashCommands('/mcpd').map((command) => command.cmd)).toContain('/mcpdraft');
+  });
+
+  it('groups commands by configured category order', () => {
+    const groups = groupAISlashCommands(filterAISlashCommands('/'));
+
+    expect(groups[0]?.key).toBe('generate');
+    expect(groups[1]?.key).toBe('review');
+    expect(groups[2]?.key).toBe('diagnose');
+  });
+
+  it('keeps featured commands available for empty-state quick picks', () => {
+    const featured = getFeaturedAISlashCommands().map((command) => command.cmd);
+
+    expect(featured).toContain('/sql');
+    expect(featured).toContain('/health');
+    expect(featured).toContain('/mcp');
+    expect(featured).toContain('/mcpadd');
+    expect(featured).toContain('/connfail');
+    expect(featured).toContain('/tx');
+    expect(featured).not.toContain('/tools');
+    expect(featured).not.toContain('/budget');
+    expect(featured).not.toContain('/mcpfail');
+    expect(featured).not.toContain('/shortcuts');
+  });
+});
diff --git a/frontend/src/components/ai/aiSlashCommands.ts b/frontend/src/components/ai/aiSlashCommands.ts
new file mode 100644
index 0000000..86c1c72
--- /dev/null
+++ b/frontend/src/components/ai/aiSlashCommands.ts
@@ -0,0 +1,99 @@
+export type AISlashCommandCategory = 'generate' | 'review' | 'diagnose';
+
+export interface AISlashCommandDefinition {
+  cmd: string;
+  label: string;
+  desc: string;
+  prompt: string;
+  category: AISlashCommandCategory;
+  keywords?: string[];
+  featured?: boolean;
+}
+
+export interface AISlashCommandCategoryMeta {
+  key: AISlashCommandCategory;
+  title: string;
+  description: string;
+}
+
+export interface AISlashCommandGroup extends AISlashCommandCategoryMeta {
+  commands: AISlashCommandDefinition[];
+}
+
+export const AI_SLASH_COMMAND_CATEGORIES: AISlashCommandCategoryMeta[] = [
+  {
+    key: 'generate',
+    title: 'SQL 生成',
+    description: '直接产出 SQL、测试数据或迁移草稿。',
+  },
+  {
+    key: 'review',
+    title: '结构评审',
+    description: '解释 SQL、评审表设计和索引策略。',
+  },
+  {
+    key: 'diagnose',
+    title: '诊断探针',
+    description: '优先调用内置探针看 AI、MCP 和最近 SQL 活动的真实状态。',
+  },
+];
+
+export const DEFAULT_AI_SLASH_COMMANDS: AISlashCommandDefinition[] = [
+  { cmd: '/query', label: '🔍 自然语言查询', desc: '用中文描述你想查什么', prompt: '帮我写一条 SQL 查询：', category: 'generate', featured: true, keywords: ['查询', '自然语言', '查数据'] },
+  { cmd: '/sql', label: '📝 生成 SQL', desc: '描述需求自动生成语句', prompt: '请根据以下需求生成 SQL：', category: 'generate', featured: true, keywords: ['sql', '生成', '查询语句'] },
+  { cmd: '/mock', label: '🎲 造测试数据', desc: '生成 INSERT 测试数据', prompt: '请为当前关联的表生成 10 条符合业务语义的测试数据 INSERT 语句：', category: 'generate', keywords: ['mock', '测试数据', 'insert'] },
+  { cmd: '/diff', label: '🔄 表对比', desc: '对比两表差异生成变更', prompt: '请对比以下两张表的结构差异，并生成从旧版本迁移到新版本的 ALTER 语句：', category: 'generate', keywords: ['diff', '迁移', 'alter'] },
+  { cmd: '/explain', label: '💡 解释 SQL', desc: '解释选中 SQL 的逻辑', prompt: '请解释以下 SQL 的执行逻辑和每一步的作用：\n```sql\n\n```', category: 'review', featured: true, keywords: ['解释', 'sql', '逻辑'] },
+  { cmd: '/optimize', label: '⚡ 优化分析', desc: '分析 SQL 性能瓶颈', prompt: '请分析以下 SQL 的性能问题，并给出优化后的版本：\n```sql\n\n```', category: 'review', keywords: ['优化', '索引', '性能'] },
+  { cmd: '/schema', label: '🏗️ 表设计评审', desc: '评审表结构设计质量', prompt: '请全面评审当前关联表的设计，包括字段类型、范式、索引策略等方面的改进建议：', category: 'review', keywords: ['schema', '表结构', '设计'] },
+  { cmd: '/index', label: '📊 索引建议', desc: '推荐最优索引方案', prompt: '请基于当前表结构和常见查询场景，推荐最优的索引方案并给出建表语句：', category: 'review', keywords: ['index', '索引', '慢查询'] },
+  { cmd: '/health', label: '🩺 AI 配置体检', desc: '调用体检探针总览当前 AI 配置', prompt: '请先调用 inspect_ai_setup_health，对当前 GoNavi AI 配置做一次完整体检，然后总结 blockers、warnings 和 nextActions。', category: 'diagnose', featured: true, keywords: ['health', '体检', 'ai配置', '探针'] },
+  { cmd: '/tools', label: '🧰 工具目录', desc: '按关键词选择该用哪个内置探针', prompt: '请先调用 inspect_ai_tool_catalog，按我的问题关键词筛选推荐流程、内置工具参数提示和当前 MCP 工具摘要，再告诉我下一步应该调用哪个工具。关键词：', category: 'diagnose', keywords: ['工具目录', '内置工具', 'toolcatalog', '参数提示', 'arguments', '探针路线'] },
+  { cmd: '/budget', label: '🧠 上下文体量', desc: '诊断消息、DDL、MCP schema 和 Skills 体量', prompt: '请先调用 inspect_ai_context_budget，检查当前会话消息、工具结果、DDL、MCP schema、提示词和 Skills 的体量风险，并给出应该收窄哪些上下文。', category: 'diagnose', keywords: ['上下文', 'context', '体量', '预算', '变慢', '乱答', 'schema太大', '工具结果'] },
+  { cmd: '/hotspots', label: '🧱 代码热点', desc: '查看大文件拆分候选和测试范围', prompt: '请先调用 inspect_codebase_hotspots，读取当前 GoNavi 前端大文件热点、建议拆分切片和测试目标，再告诉我下一步最适合拆哪个文件、拆到什么边界，以及需要跑哪些验证。关键词：', category: 'diagnose', keywords: ['大文件', '臃肿', '拆分', '重构', 'hotspots', '代码热点', '几千行'] },
+  { cmd: '/mcp', label: '🪛 排查 MCP 接入', desc: '检查 MCP 服务和外部客户端状态', prompt: '请先调用 inspect_mcp_setup，帮我盘点当前 MCP 服务、工具发现结果，以及 Claude Code / Codex 本机客户端和 OpenClaw / Hermans 远程 Agent 的接入状态。', category: 'diagnose', featured: true, keywords: ['mcp', 'codex', 'claude', 'openclaw', 'hermans', '外部客户端'] },
+  { cmd: '/mcpfail', label: '🧯 MCP 运行失败', desc: '读取 MCP 启动、发现和调用失败日志', prompt: '请先调用 inspect_mcp_runtime_failures，读取最近 MCP 启动、工具发现、工具调用、stdio、Docker 或 HTTP MCP 失败日志，结合当前 MCP 服务配置判断原因和 nextActions。关键词或服务名：', category: 'diagnose', keywords: ['mcpfail', 'mcp失败', '运行期失败', '工具发现0个', 'stdio', 'docker mcp', 'http mcp', '启动失败', '调用失败'] },
+  { cmd: '/mcpadd', label: '🧭 新增 MCP 指引', desc: '查看 command、args、env 和模板怎么填', prompt: '请先调用 inspect_mcp_authoring_guide；如果我贴了完整启动命令或草稿，再调用 inspect_mcp_draft 试算字段和校验问题；最后结合 inspect_mcp_setup，告诉我新增 GoNavi MCP 服务时 command、args、env、timeout 应该怎么填，以及最接近的模板应该选哪个。', category: 'diagnose', featured: true, keywords: ['mcp新增', 'command', 'args', 'env', '模板'] },
+  { cmd: '/mcpdraft', label: '🧪 MCP 草稿校验', desc: '校验一条 MCP 启动命令怎么拆', prompt: '请先调用 inspect_mcp_draft 校验我提供的 MCP fullCommand 或 command/args/env/timeout 草稿，返回自动拆分结果、启动预览、suggestedServerSeed、错误/告警和 nextActions；如果还缺字段说明，再补充调用 inspect_mcp_authoring_guide。', category: 'diagnose', keywords: ['mcp草稿', 'mcp校验', 'fullcommand', '启动命令', '参数拆分', 'command', 'args', 'env'] },
+  { cmd: '/mcptool', label: '🧩 MCP 工具参数', desc: '查看 MCP 工具 schema 和 arguments 写法', prompt: '请先调用 inspect_mcp_setup 找到当前已发现的 MCP 工具 alias；如果我已经给了工具名或关键词，再调用 inspect_mcp_tool_schema 读取对应 inputSchema，告诉我必填参数、字段类型、枚举值、嵌套路径，以及 arguments JSON 应该怎么写。', category: 'diagnose', keywords: ['mcp工具', 'mcp工具参数', 'schema', 'arguments', '参数', '工具调用', 'inputschema'] },
+  { cmd: '/connfail', label: '🧯 连接失败探针', desc: '总结最近连接失败、冷却和验证异常', prompt: '请先调用 inspect_recent_connection_failures，帮我总结最近数据库连接失败、连接冷却、验证失败和 SSH 隧道异常的真实日志结论；如果已经有明确地址或类型，再结合 inspect_current_connection 或 inspect_saved_connections 继续缩小范围。', category: 'diagnose', featured: true, keywords: ['连接失败', '冷却', '验证失败', 'ssh', 'mysql'] },
+  { cmd: '/shortcuts', label: '⌨️ 快捷键探针', desc: '读取当前 Win/Mac 快捷键配置', prompt: '请先调用 inspect_shortcuts，告诉我当前 GoNavi 的快捷键配置，尤其是执行 SQL、切换结果区、打开 AI 面板和 AI 发送消息这些动作在当前平台和另一平台分别怎么按，是否改过默认值。', category: 'diagnose', keywords: ['快捷键', 'shortcuts', '结果区', 'mac', 'windows'] },
+  { cmd: '/applog', label: '🪵 应用日志', desc: '回看最近 GoNavi 应用日志', prompt: '请先调用 inspect_app_logs，帮我看最近 GoNavi 应用日志里的错误和警告；如果我提到连接失败、MCP 拉起失败、启动异常或 gonavi.log，就优先结合关键词继续筛。', category: 'diagnose', keywords: ['日志', 'gonavi.log', 'mcp报错', '连接失败', '启动异常'] },
+  { cmd: '/airender', label: '🧯 AI 渲染异常', desc: '读取最近一次 AI 消息渲染失败记录', prompt: '请先调用 inspect_ai_last_render_error，告诉我最近一次 AI 消息渲染失败记录里是哪条消息、报错摘要是什么，以及下一步该怎么排查。', category: 'diagnose', keywords: ['渲染失败', '气泡空白', 'ai消息', 'render', '白块'] },
+  { cmd: '/safety', label: '🛡️ 查看写入安全', desc: '确认只读/写入边界和 allowMutating', prompt: '请先调用 inspect_ai_safety，告诉我当前 AI 和 GoNavi MCP 的写入边界、是否只读，以及 execute_sql 是否需要 allowMutating。', category: 'diagnose', keywords: ['安全', '只读', 'allowmutating', 'ddl', 'dml'] },
+  { cmd: '/activity', label: '🕘 最近 SQL 活动', desc: '总结最近执行、报错和热点', prompt: '请先调用 inspect_recent_sql_activity，帮我总结最近 SQL 活动、错误热点和主要读写类型。', category: 'diagnose', keywords: ['activity', 'sql日志', '最近执行', '报错'] },
+  { cmd: '/tx', label: '🔁 SQL 事务状态', desc: '查看 SQL 编辑器提交模式和待提交事务', prompt: '请先调用 inspect_sql_editor_transaction，告诉我 SQL 编辑器当前 DML 托管事务语义、手动/自动提交设置、活动 SQL 页签是否会进入事务、是否有待提交事务，以及下一步应该提交、回滚还是继续执行。', category: 'diagnose', featured: true, keywords: ['事务', 'transaction', '提交', '自动提交', '手动提交', '未提交', 'dml'] },
+];
+
+const buildCommandSearchText = (command: AISlashCommandDefinition): string => [
+  command.cmd,
+  command.label,
+  command.desc,
+  ...(command.keywords || []),
+].join(' ').toLowerCase();
+
+export const filterAISlashCommands = (filter: string): AISlashCommandDefinition[] => {
+  const normalized = String(filter || '').trim().toLowerCase();
+  if (!normalized || normalized === '/') {
+    return DEFAULT_AI_SLASH_COMMANDS;
+  }
+
+  const slashSearch = normalized.startsWith('/') ? normalized : `/${normalized}`;
+  const keywordSearch = normalized.startsWith('/') ? normalized.slice(1) : normalized;
+
+  return DEFAULT_AI_SLASH_COMMANDS.filter((command) => {
+    const searchText = buildCommandSearchText(command);
+    return command.cmd.startsWith(slashSearch) || searchText.includes(keywordSearch);
+  });
+};
+
+export const groupAISlashCommands = (commands: AISlashCommandDefinition[]): AISlashCommandGroup[] =>
+  AI_SLASH_COMMAND_CATEGORIES
+    .map((meta) => ({
+      ...meta,
+      commands: commands.filter((command) => command.category === meta.key),
+    }))
+    .filter((group) => group.commands.length > 0);
+
+export const getFeaturedAISlashCommands = (): AISlashCommandDefinition[] =>
+  DEFAULT_AI_SLASH_COMMANDS.filter((command) => command.featured);
diff --git a/frontend/src/components/ai/aiSnapshotInspectionAIConfigToolExecutor.ts b/frontend/src/components/ai/aiSnapshotInspectionAIConfigToolExecutor.ts
new file mode 100644
index 0000000..9da2bf7
--- /dev/null
+++ b/frontend/src/components/ai/aiSnapshotInspectionAIConfigToolExecutor.ts
@@ -0,0 +1,275 @@
+import type {
+  AIContextItem,
+  AIMCPToolDescriptor,
+  AISkillConfig,
+  AIUserPromptSettings,
+  SavedConnection,
+  TabData,
+} from '../../types';
+import { BUILTIN_AI_TOOL_INFO } from '../../utils/aiToolRegistry';
+import { buildAIChatReadinessSnapshot } from './aiChatReadiness';
+import { buildAIGuidanceSnapshot } from './aiPromptInsights';
+import { buildAIProviderSnapshot } from './aiProviderInsights';
+import { buildAIRuntimeSnapshot } from './aiRuntimeInsights';
+import { buildAISafetySnapshot } from './aiSafetyInsights';
+import { buildAIToolCatalogSnapshot } from './aiToolCatalogInsights';
+import { buildMCPAuthoringGuideSnapshot } from './aiMCPAuthoringGuideInsights';
+import { buildMCPDraftInspectionSnapshot } from './aiMCPDraftInspectionInsights';
+import { buildMCPDockerSetupSnapshot } from './aiMCPDockerInsights';
+import { buildAISetupHealthSnapshot } from './aiSetupHealthInsights';
+import { buildMCPSetupSnapshot } from './aiMCPInsights';
+import { buildMCPRemoteAccessSnapshot } from './aiMCPRemoteAccessInsights';
+import { buildMCPToolSchemaSnapshot } from './aiMCPToolSchemaInsights';
+import type {
+  AISnapshotInspectionRuntime,
+  AISnapshotInspectionRuntimeState,
+  SnapshotInspectionResult,
+} from './aiSnapshotInspectionToolTypes';
+
+const BUILTIN_AI_TOOL_NAMES = BUILTIN_AI_TOOL_INFO.map((item) => item.name);
+
+interface ExecuteAIConfigSnapshotToolCallOptions {
+  toolName: string;
+  args?: Record<string, any>;
+  activeContext?: { connectionId: string; dbName: string } | null;
+  aiContexts?: Record<string, AIContextItem[]>;
+  connections: SavedConnection[];
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  mcpTools: AIMCPToolDescriptor[];
+  skills?: AISkillConfig[];
+  userPromptSettings?: AIUserPromptSettings;
+  dynamicModels?: string[];
+  runtime?: AISnapshotInspectionRuntime;
+}
+
+const loadRuntimeState = async (
+  runtime: AISnapshotInspectionRuntime | undefined,
+): Promise<AISnapshotInspectionRuntimeState | undefined> =>
+  typeof runtime?.getAIRuntimeState === 'function'
+    ? runtime.getAIRuntimeState()
+    : undefined;
+
+const loadMCPSetupState = async (runtime: AISnapshotInspectionRuntime | undefined) =>
+  Promise.all([
+    typeof runtime?.getMCPServers === 'function' ? runtime.getMCPServers() : Promise.resolve(undefined),
+    typeof runtime?.getMCPClientInstallStatuses === 'function'
+      ? runtime.getMCPClientInstallStatuses()
+      : Promise.resolve(undefined),
+  ]);
+
+const loadMCPServers = async (runtime: AISnapshotInspectionRuntime | undefined) =>
+  typeof runtime?.getMCPServers === 'function'
+    ? runtime.getMCPServers()
+    : undefined;
+
+const loadMCPClientInstallStatuses = async (runtime: AISnapshotInspectionRuntime | undefined) =>
+  typeof runtime?.getMCPClientInstallStatuses === 'function'
+    ? runtime.getMCPClientInstallStatuses()
+    : undefined;
+
+export async function executeAIConfigSnapshotToolCall(
+  options: ExecuteAIConfigSnapshotToolCallOptions,
+): Promise<SnapshotInspectionResult | null> {
+  const {
+    toolName,
+    args = {},
+    activeContext = null,
+    aiContexts = {},
+    connections,
+    tabs = [],
+    activeTabId = null,
+    mcpTools,
+    skills = [],
+    userPromptSettings,
+    dynamicModels = [],
+    runtime,
+  } = options;
+
+  try {
+    switch (toolName) {
+      case 'inspect_ai_setup_health': {
+        const runtimeState = await loadRuntimeState(runtime);
+        const [mcpServers, mcpClientInstallStatuses] = await loadMCPSetupState(runtime);
+        const activeContextKey = activeContext?.connectionId
+          ? `${activeContext.connectionId}:${activeContext.dbName || ''}`
+          : 'default';
+        return {
+          content: JSON.stringify(buildAISetupHealthSnapshot({
+            providers: Array.isArray(runtimeState?.providers) ? runtimeState.providers : [],
+            activeProviderId: runtimeState?.activeProviderId || '',
+            safetyLevel: runtimeState?.safetyLevel,
+            contextLevel: runtimeState?.contextLevel,
+            skills,
+            mcpServers: Array.isArray(mcpServers) ? mcpServers : [],
+            mcpClientStatuses: Array.isArray(mcpClientInstallStatuses) ? mcpClientInstallStatuses : [],
+            mcpTools,
+            dynamicModels,
+            builtinToolNames: BUILTIN_AI_TOOL_NAMES,
+            userPromptSettings,
+            activeContext,
+            activeContextItems: aiContexts[activeContextKey] || [],
+          })),
+          success: true,
+        };
+      }
+      case 'inspect_ai_runtime': {
+        const runtimeState = await loadRuntimeState(runtime);
+        return {
+          content: JSON.stringify(buildAIRuntimeSnapshot({
+            providers: Array.isArray(runtimeState?.providers) ? runtimeState.providers : [],
+            activeProviderId: runtimeState?.activeProviderId || '',
+            safetyLevel: runtimeState?.safetyLevel,
+            contextLevel: runtimeState?.contextLevel,
+            skills,
+            mcpTools,
+            dynamicModels,
+            builtinToolNames: BUILTIN_AI_TOOL_NAMES,
+          })),
+          success: true,
+        };
+      }
+      case 'inspect_ai_safety': {
+        const runtimeState = await loadRuntimeState(runtime);
+        return {
+          content: JSON.stringify(buildAISafetySnapshot({
+            safetyLevel: runtimeState?.safetyLevel,
+            activeContext,
+            tabs,
+            activeTabId,
+            connections,
+          })),
+          success: true,
+        };
+      }
+      case 'inspect_ai_providers': {
+        const runtimeState = await loadRuntimeState(runtime);
+        return {
+          content: JSON.stringify(buildAIProviderSnapshot({
+            providers: Array.isArray(runtimeState?.providers) ? runtimeState.providers : [],
+            activeProviderId: runtimeState?.activeProviderId || '',
+            dynamicModels,
+          })),
+          success: true,
+        };
+      }
+      case 'inspect_ai_chat_readiness': {
+        const runtimeState = await loadRuntimeState(runtime);
+        const activeContextKey = activeContext?.connectionId
+          ? `${activeContext.connectionId}:${activeContext.dbName || ''}`
+          : 'default';
+        return {
+          content: JSON.stringify(buildAIChatReadinessSnapshot({
+            providers: Array.isArray(runtimeState?.providers) ? runtimeState.providers : [],
+            activeProviderId: runtimeState?.activeProviderId || '',
+            dynamicModels,
+            activeContext,
+            activeContextItems: aiContexts[activeContextKey] || [],
+          })),
+          success: true,
+        };
+      }
+      case 'inspect_ai_tool_catalog':
+        return {
+          content: JSON.stringify(buildAIToolCatalogSnapshot({
+            builtinTools: BUILTIN_AI_TOOL_INFO,
+            mcpTools,
+            keyword: args.keyword,
+            toolName: args.toolName,
+            includeMCPTools: args.includeMCPTools !== false,
+            limit: args.limit,
+          })),
+          success: true,
+        };
+      case 'inspect_mcp_setup': {
+        const [mcpServers, mcpClientInstallStatuses] = await loadMCPSetupState(runtime);
+        return {
+          content: JSON.stringify(buildMCPSetupSnapshot({
+            mcpServers: Array.isArray(mcpServers) ? mcpServers : [],
+            mcpClientStatuses: Array.isArray(mcpClientInstallStatuses) ? mcpClientInstallStatuses : [],
+            mcpTools,
+          })),
+          success: true,
+        };
+      }
+      case 'inspect_mcp_remote_access': {
+        const mcpClientInstallStatuses = await loadMCPClientInstallStatuses(runtime);
+        return {
+          content: JSON.stringify(buildMCPRemoteAccessSnapshot({
+            mcpClientStatuses: Array.isArray(mcpClientInstallStatuses) ? mcpClientInstallStatuses : [],
+            publicUrl: args.publicUrl,
+            localAddr: args.localAddr,
+            path: args.path,
+            exposeStrategy: args.exposeStrategy,
+            tokenConfigured: args.tokenConfigured,
+          })),
+          success: true,
+        };
+      }
+      case 'inspect_mcp_authoring_guide':
+        return {
+          content: JSON.stringify(buildMCPAuthoringGuideSnapshot()),
+          success: true,
+        };
+      case 'inspect_mcp_draft':
+        return {
+          content: JSON.stringify(buildMCPDraftInspectionSnapshot(args)),
+          success: true,
+        };
+      case 'inspect_mcp_docker_setup': {
+        const mcpServers = await loadMCPServers(runtime);
+        return {
+          content: JSON.stringify(buildMCPDockerSetupSnapshot({
+            mcpServers: Array.isArray(mcpServers) ? mcpServers : [],
+            mcpTools,
+            serverId: args.serverId,
+            includeDisabled: args.includeDisabled !== false,
+          })),
+          success: true,
+        };
+      }
+      case 'inspect_mcp_tool_schema':
+        return {
+          content: JSON.stringify(buildMCPToolSchemaSnapshot({
+            mcpTools,
+            alias: args.alias,
+            serverId: args.serverId,
+            keyword: args.keyword,
+            includeSchema: args.includeSchema === true,
+            limit: args.limit,
+          })),
+          success: true,
+        };
+      case 'inspect_ai_guidance':
+        return {
+          content: JSON.stringify(buildAIGuidanceSnapshot({
+            userPromptSettings,
+            skills,
+          })),
+          success: true,
+        };
+      default:
+        return null;
+    }
+  } catch (error: any) {
+    const label = {
+      inspect_ai_setup_health: '体检当前 AI 配置失败',
+      inspect_ai_runtime: '读取当前 AI 运行状态失败',
+      inspect_ai_safety: '读取当前 AI 安全边界失败',
+      inspect_ai_providers: '读取当前 AI 供应商配置失败',
+      inspect_ai_chat_readiness: '读取 AI 聊天发送前置状态失败',
+      inspect_ai_tool_catalog: '读取 AI 工具目录失败',
+      inspect_mcp_setup: '读取 MCP 配置状态失败',
+      inspect_mcp_remote_access: '读取 MCP 远程接入指引失败',
+      inspect_mcp_authoring_guide: '读取 MCP 新增填写指引失败',
+      inspect_mcp_draft: '校验 MCP 新增草稿失败',
+      inspect_mcp_docker_setup: '检查 Docker MCP 配置失败',
+      inspect_mcp_tool_schema: '读取 MCP 工具参数 schema 失败',
+      inspect_ai_guidance: '读取当前 AI 提示与技能配置失败',
+    }[toolName] || '读取 AI 配置探针失败';
+    return {
+      content: `${label}: ${error?.message || error}`,
+      success: false,
+    };
+  }
+}
diff --git a/frontend/src/components/ai/aiSnapshotInspectionAppHealthToolExecutor.ts b/frontend/src/components/ai/aiSnapshotInspectionAppHealthToolExecutor.ts
new file mode 100644
index 0000000..f104977
--- /dev/null
+++ b/frontend/src/components/ai/aiSnapshotInspectionAppHealthToolExecutor.ts
@@ -0,0 +1,189 @@
+import type {
+  AIChatMessage,
+  AIContextItem,
+  AIMCPToolDescriptor,
+  AISkillConfig,
+  AIUserPromptSettings,
+  SavedConnection,
+  TabData,
+} from '../../types';
+import { BUILTIN_AI_TOOL_INFO } from '../../utils/aiToolRegistry';
+import { buildAIAppHealthSnapshot } from './aiAppHealthInsights';
+import { buildAILastRenderErrorSnapshot } from './aiLastRenderErrorInsights';
+import { buildAISupportBundleSnapshot } from './aiSupportBundleInsights';
+import type {
+  AISnapshotInspectionRuntime,
+  AISnapshotInspectionRuntimeState,
+  SnapshotInspectionResult,
+} from './aiSnapshotInspectionToolTypes';
+
+const BUILTIN_AI_TOOL_NAMES = BUILTIN_AI_TOOL_INFO.map((item) => item.name);
+const DEFAULT_APP_HEALTH_LOG_LIMIT = 120;
+const MAX_APP_HEALTH_LOG_LIMIT = 240;
+
+interface ExecuteAppHealthSnapshotToolCallOptions {
+  toolName: string;
+  args: Record<string, any>;
+  activeContext?: { connectionId: string; dbName: string } | null;
+  aiContexts?: Record<string, AIContextItem[]>;
+  aiChatHistory?: Record<string, AIChatMessage[]>;
+  aiChatSessions?: Array<{ id: string; title: string; updatedAt: number }>;
+  activeSessionId?: string | null;
+  connections: SavedConnection[];
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  mcpTools: AIMCPToolDescriptor[];
+  skills?: AISkillConfig[];
+  userPromptSettings?: AIUserPromptSettings;
+  dynamicModels?: string[];
+  runtime?: AISnapshotInspectionRuntime;
+}
+
+const loadRuntimeState = async (
+  runtime: AISnapshotInspectionRuntime | undefined,
+): Promise<AISnapshotInspectionRuntimeState | undefined> =>
+  typeof runtime?.getAIRuntimeState === 'function'
+    ? runtime.getAIRuntimeState()
+    : undefined;
+
+const loadMCPSetupState = async (runtime: AISnapshotInspectionRuntime | undefined) =>
+  Promise.all([
+    typeof runtime?.getMCPServers === 'function' ? runtime.getMCPServers() : Promise.resolve(undefined),
+    typeof runtime?.getMCPClientInstallStatuses === 'function'
+      ? runtime.getMCPClientInstallStatuses()
+      : Promise.resolve(undefined),
+  ]);
+
+const readLogTail = async (
+  runtime: AISnapshotInspectionRuntime | undefined,
+  lineLimit: number,
+  keyword: string,
+) => {
+  if (typeof runtime?.readAppLogTail !== 'function') {
+    return { success: false, message: '当前环境暂不支持读取 GoNavi 应用日志' };
+  }
+  return runtime.readAppLogTail(lineLimit, keyword);
+};
+
+const normalizeLineLimit = (value: unknown): number => {
+  const normalized = Math.floor(Number(value) || DEFAULT_APP_HEALTH_LOG_LIMIT);
+  if (normalized < 1) return 1;
+  if (normalized > MAX_APP_HEALTH_LOG_LIMIT) return MAX_APP_HEALTH_LOG_LIMIT;
+  return normalized;
+};
+
+export async function executeAppHealthSnapshotToolCall(
+  options: ExecuteAppHealthSnapshotToolCallOptions,
+): Promise<SnapshotInspectionResult | null> {
+  const {
+    toolName,
+    args,
+    activeContext = null,
+    aiContexts = {},
+    aiChatHistory = {},
+    aiChatSessions = [],
+    activeSessionId = null,
+    connections,
+    tabs = [],
+    activeTabId = null,
+    mcpTools,
+    skills = [],
+    userPromptSettings,
+    dynamicModels = [],
+    runtime,
+  } = options;
+
+  if (toolName !== 'inspect_app_health' && toolName !== 'inspect_ai_support_bundle') {
+    return null;
+  }
+
+  try {
+    const lineLimit = normalizeLineLimit(args.lineLimit);
+    const keyword = String(args.keyword || '').trim();
+    const connectionKeyword = String(args.connectionKeyword ?? args.keyword ?? '').trim();
+    const [runtimeState, mcpState, appLogReadResult, connectionFailureReadResult] = await Promise.all([
+      loadRuntimeState(runtime),
+      loadMCPSetupState(runtime),
+      readLogTail(runtime, lineLimit, keyword),
+      readLogTail(runtime, lineLimit, connectionKeyword),
+    ]);
+    const [mcpServers, mcpClientInstallStatuses] = mcpState;
+
+    if (toolName === 'inspect_ai_support_bundle') {
+      return {
+        content: JSON.stringify(buildAISupportBundleSnapshot({
+          providers: Array.isArray(runtimeState?.providers) ? runtimeState.providers : [],
+          activeProviderId: runtimeState?.activeProviderId || '',
+          safetyLevel: runtimeState?.safetyLevel,
+          contextLevel: runtimeState?.contextLevel,
+          skills,
+          mcpServers: Array.isArray(mcpServers) ? mcpServers : [],
+          mcpClientStatuses: Array.isArray(mcpClientInstallStatuses) ? mcpClientInstallStatuses : [],
+          mcpTools,
+          dynamicModels,
+          builtinTools: BUILTIN_AI_TOOL_INFO,
+          builtinToolNames: BUILTIN_AI_TOOL_NAMES,
+          userPromptSettings,
+          activeContext,
+          aiContexts,
+          aiChatHistory,
+          aiChatSessions,
+          activeSessionId,
+          sessionId: args.sessionId,
+          connections,
+          tabs,
+          activeTabId,
+          appLogReadResult,
+          connectionFailureReadResult,
+          lastRenderErrorSnapshot: buildAILastRenderErrorSnapshot(),
+          keyword,
+          connectionKeyword,
+          lineLimit,
+          includeLogLines: args.includeLogLines === true,
+          includeMessageContent: args.includeMessageContent === true,
+          includeDetails: args.includeDetails === true,
+          publicUrl: args.publicUrl,
+          localAddr: args.localAddr,
+          path: args.path,
+          exposeStrategy: args.exposeStrategy,
+          tokenConfigured: args.tokenConfigured,
+        })),
+        success: true,
+      };
+    }
+
+    return {
+      content: JSON.stringify(buildAIAppHealthSnapshot({
+        providers: Array.isArray(runtimeState?.providers) ? runtimeState.providers : [],
+        activeProviderId: runtimeState?.activeProviderId || '',
+        safetyLevel: runtimeState?.safetyLevel,
+        contextLevel: runtimeState?.contextLevel,
+        skills,
+        mcpServers: Array.isArray(mcpServers) ? mcpServers : [],
+        mcpClientStatuses: Array.isArray(mcpClientInstallStatuses) ? mcpClientInstallStatuses : [],
+        mcpTools,
+        dynamicModels,
+        builtinToolNames: BUILTIN_AI_TOOL_NAMES,
+        userPromptSettings,
+        activeContext,
+        aiContexts,
+        connections,
+        tabs,
+        activeTabId,
+        appLogReadResult,
+        connectionFailureReadResult,
+        lastRenderErrorSnapshot: buildAILastRenderErrorSnapshot(),
+        keyword,
+        connectionKeyword,
+        lineLimit,
+        includeLogLines: args.includeLogLines === true,
+      })),
+      success: true,
+    };
+  } catch (error: any) {
+    return {
+      content: `${toolName === 'inspect_ai_support_bundle' ? '生成 AI 支持包失败' : '读取 AI 应用健康总览失败'}: ${error?.message || error}`,
+      success: false,
+    };
+  }
+}
diff --git a/frontend/src/components/ai/aiSnapshotInspectionConnectionToolExecutor.ts b/frontend/src/components/ai/aiSnapshotInspectionConnectionToolExecutor.ts
new file mode 100644
index 0000000..5d78e40
--- /dev/null
+++ b/frontend/src/components/ai/aiSnapshotInspectionConnectionToolExecutor.ts
@@ -0,0 +1,173 @@
+import type {
+  AIContextItem,
+  ExternalSQLDirectory,
+  SavedConnection,
+  TabData,
+} from '../../types';
+import { buildAIContextSnapshot } from './aiContextInsights';
+import { buildConnectionCapabilitiesSnapshot } from './aiConnectionCapabilitiesInsights';
+import { buildCurrentConnectionSnapshot } from './aiConnectionInsights';
+import { buildSavedConnectionsSnapshot } from './aiSavedConnectionInsights';
+import { buildRedisTopologySnapshot } from './aiRedisTopologyInsights';
+import { buildExternalSQLFileSnapshot } from './aiExternalSqlFileInsights';
+import { buildExternalSQLDirectoriesSnapshot } from './aiExternalSqlInsights';
+import { findBestMatchingExternalSQLDirectory } from './aiExternalSqlPathUtils';
+import {
+  buildActiveTabSnapshot,
+  buildWorkspaceTabsSnapshot,
+} from './aiWorkspaceInsights';
+import type {
+  AISnapshotInspectionRuntime,
+  SnapshotInspectionResult,
+} from './aiSnapshotInspectionToolTypes';
+
+interface ExecuteConnectionWorkspaceSnapshotToolCallOptions {
+  toolName: string;
+  args: Record<string, any>;
+  activeContext?: { connectionId: string; dbName: string } | null;
+  aiContexts?: Record<string, AIContextItem[]>;
+  connections: SavedConnection[];
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  externalSQLDirectories?: ExternalSQLDirectory[];
+  runtime?: AISnapshotInspectionRuntime;
+}
+
+export async function executeConnectionWorkspaceSnapshotToolCall({
+  toolName,
+  args,
+  activeContext = null,
+  aiContexts = {},
+  connections,
+  tabs = [],
+  activeTabId = null,
+  externalSQLDirectories = [],
+  runtime,
+}: ExecuteConnectionWorkspaceSnapshotToolCallOptions): Promise<SnapshotInspectionResult | null> {
+  switch (toolName) {
+    case 'inspect_current_connection':
+      return {
+        content: JSON.stringify(buildCurrentConnectionSnapshot({
+          activeContext,
+          tabs,
+          activeTabId,
+          connections,
+        })),
+        success: true,
+      };
+    case 'inspect_connection_capabilities':
+      return {
+        content: JSON.stringify(buildConnectionCapabilitiesSnapshot({
+          connectionId: args.connectionId,
+          activeContext,
+          tabs,
+          activeTabId,
+          connections,
+        })),
+        success: true,
+      };
+    case 'inspect_saved_connections':
+      return {
+        content: JSON.stringify(buildSavedConnectionsSnapshot({
+          connections,
+          keyword: args.keyword,
+          type: args.type,
+          limit: args.limit,
+        })),
+        success: true,
+      };
+    case 'inspect_redis_topology':
+      return {
+        content: JSON.stringify(buildRedisTopologySnapshot({
+          connections,
+          connectionId: args.connectionId,
+          keyword: args.keyword,
+          limit: args.limit,
+          includeRecommendations: args.includeRecommendations,
+        })),
+        success: true,
+      };
+    case 'inspect_external_sql_directories':
+      return {
+        content: JSON.stringify(buildExternalSQLDirectoriesSnapshot({
+          externalSQLDirectories,
+          connections,
+          tabs,
+          keyword: args.keyword,
+          connectionId: args.connectionId,
+          dbName: args.dbName,
+          limit: args.limit,
+        })),
+        success: true,
+      };
+    case 'inspect_external_sql_file': {
+      const requestedFilePath = String(args.filePath || '').trim();
+      if (!requestedFilePath) {
+        return {
+          content: '读取外部 SQL 文件失败: filePath 不能为空',
+          success: false,
+        };
+      }
+      if (!findBestMatchingExternalSQLDirectory(requestedFilePath, externalSQLDirectories)) {
+        return {
+          content: '读取外部 SQL 文件失败: 目标文件不在已配置的外部 SQL 目录中',
+          success: false,
+        };
+      }
+      const readResult = typeof runtime?.readSQLFile === 'function'
+        ? await runtime.readSQLFile(requestedFilePath)
+        : { success: false, message: '当前环境暂不支持读取本地 SQL 文件' };
+      if (!readResult?.success) {
+        return {
+          content: `读取外部 SQL 文件失败: ${readResult?.message || '未知错误'}`,
+          success: false,
+        };
+      }
+      return {
+        content: JSON.stringify(buildExternalSQLFileSnapshot({
+          filePath: requestedFilePath,
+          previewCharLimit: args.previewCharLimit,
+          readResult: readResult?.data,
+          externalSQLDirectories,
+          connections,
+          tabs,
+        })),
+        success: true,
+      };
+    }
+    case 'inspect_active_tab':
+      return {
+        content: JSON.stringify(buildActiveTabSnapshot({
+          tabs,
+          activeTabId,
+          connections,
+          includeContent: args.includeContent !== false,
+        })),
+        success: true,
+      };
+    case 'inspect_workspace_tabs':
+      return {
+        content: JSON.stringify(buildWorkspaceTabsSnapshot({
+          tabs,
+          activeTabId,
+          connections,
+          includeContent: args.includeContent === true,
+          limit: args.limit,
+        })),
+        success: true,
+      };
+    case 'inspect_ai_context':
+      return {
+        content: JSON.stringify(buildAIContextSnapshot({
+          activeContext,
+          aiContexts,
+          connections,
+          includeDDL: args.includeDDL === true,
+          ddlLimit: args.ddlLimit,
+        })),
+        success: true,
+      };
+    default:
+      return null;
+  }
+}
diff --git a/frontend/src/components/ai/aiSnapshotInspectionDiagnosticsToolExecutor.ts b/frontend/src/components/ai/aiSnapshotInspectionDiagnosticsToolExecutor.ts
new file mode 100644
index 0000000..45daed5
--- /dev/null
+++ b/frontend/src/components/ai/aiSnapshotInspectionDiagnosticsToolExecutor.ts
@@ -0,0 +1,309 @@
+import type {
+  AIContextItem,
+  AIMCPToolDescriptor,
+  AIChatMessage,
+  AISkillConfig,
+  AIUserPromptSettings,
+  SavedConnection,
+  SavedQuery,
+  SqlSnippet,
+  TabData,
+} from '../../types';
+import type { SqlLog } from '../../store';
+import {
+  buildAIChatSessionsSnapshot,
+  buildAIMessageFlowSnapshot,
+} from './aiChatSessionInsights';
+import { buildAIContextBudgetSnapshot } from './aiContextBudgetInsights';
+import { buildCodebaseHotspotSnapshot } from './aiCodebaseHotspotInsights';
+import {
+  buildSavedQueriesSnapshot,
+  buildSqlSnippetsSnapshot,
+} from './aiSavedSqlInsights';
+import { buildAppLogSnapshot } from './aiAppLogInsights';
+import { buildAIUpstreamLogSnapshot } from './aiUpstreamLogInsights';
+import {
+  buildRecentSqlActivitySnapshot,
+  buildRecentSqlLogsSnapshot,
+} from './aiSqlLogInsights';
+import { buildSqlEditorTransactionSnapshot } from './aiSqlEditorTransactionInsights';
+import { buildShortcutSnapshot } from './aiShortcutInsights';
+import { buildAILastRenderErrorSnapshot } from './aiLastRenderErrorInsights';
+import { buildRecentConnectionFailureSnapshot } from './aiConnectionFailureInsights';
+import { buildMCPRuntimeFailureSnapshot } from './aiMCPRuntimeFailureInsights';
+import type {
+  AISnapshotInspectionRuntime,
+  SnapshotInspectionResult,
+} from './aiSnapshotInspectionToolTypes';
+
+interface ExecuteDiagnosticsSnapshotToolCallOptions {
+  toolName: string;
+  args: Record<string, any>;
+  aiChatHistory?: Record<string, AIChatMessage[]>;
+  aiChatSessions?: Array<{ id: string; title: string; updatedAt: number }>;
+  activeSessionId?: string | null;
+  aiContexts?: Record<string, AIContextItem[]>;
+  connections: SavedConnection[];
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  mcpTools: AIMCPToolDescriptor[];
+  sqlLogs?: SqlLog[];
+  savedQueries?: SavedQuery[];
+  sqlSnippets?: SqlSnippet[];
+  skills?: AISkillConfig[];
+  userPromptSettings?: AIUserPromptSettings;
+  runtime?: AISnapshotInspectionRuntime;
+}
+
+export async function executeDiagnosticsSnapshotToolCall({
+  toolName,
+  args,
+  aiChatHistory = {},
+  aiChatSessions = [],
+  activeSessionId = null,
+  aiContexts = {},
+  connections,
+  tabs = [],
+  activeTabId = null,
+  mcpTools,
+  sqlLogs = [],
+  savedQueries = [],
+  sqlSnippets = [],
+  skills = [],
+  userPromptSettings,
+  runtime,
+}: ExecuteDiagnosticsSnapshotToolCallOptions): Promise<SnapshotInspectionResult | null> {
+  switch (toolName) {
+    case 'inspect_ai_sessions':
+      return {
+        content: JSON.stringify(buildAIChatSessionsSnapshot({
+          aiChatSessions,
+          aiChatHistory,
+          activeSessionId,
+          keyword: args.keyword,
+          limit: args.limit,
+          includePreview: args.includePreview !== false,
+        })),
+        success: true,
+      };
+    case 'inspect_ai_message_flow':
+      return {
+        content: JSON.stringify(buildAIMessageFlowSnapshot({
+          aiChatSessions,
+          aiChatHistory,
+          activeSessionId,
+          sessionId: args.sessionId,
+          limit: args.limit,
+          includeContent: args.includeContent !== false,
+          previewLimit: args.previewLimit,
+        })),
+        success: true,
+      };
+    case 'inspect_ai_context_budget':
+      return {
+        content: JSON.stringify(buildAIContextBudgetSnapshot({
+          aiContexts,
+          aiChatHistory,
+          aiChatSessions,
+          activeSessionId,
+          sessionId: args.sessionId,
+          messageLimit: args.messageLimit,
+          includeDetails: args.includeDetails,
+          mcpTools,
+          skills,
+          userPromptSettings,
+        })),
+        success: true,
+      };
+    case 'inspect_codebase_hotspots':
+      return {
+        content: JSON.stringify(buildCodebaseHotspotSnapshot({
+          keyword: args.keyword,
+          minLines: args.minLines,
+          limit: args.limit,
+          includeRecommendations: args.includeRecommendations !== false,
+        })),
+        success: true,
+      };
+    case 'inspect_recent_sql_logs':
+      return {
+        content: JSON.stringify(buildRecentSqlLogsSnapshot({
+          sqlLogs,
+          limit: args.limit,
+          status: args.status,
+        })),
+        success: true,
+      };
+    case 'inspect_recent_sql_activity':
+      return {
+        content: JSON.stringify(buildRecentSqlActivitySnapshot({
+          sqlLogs,
+          limit: args.limit,
+          status: args.status,
+          keyword: args.keyword,
+          dbName: args.dbName,
+          activityKind: args.activityKind,
+        })),
+        success: true,
+      };
+    case 'inspect_sql_editor_transaction': {
+      const transactionState = typeof runtime?.getSqlEditorTransactionState === 'function'
+        ? await runtime.getSqlEditorTransactionState()
+        : undefined;
+      return {
+        content: JSON.stringify(buildSqlEditorTransactionSnapshot({
+          transactionState,
+          tabs,
+          activeTabId,
+          connections,
+          sqlLogs,
+          includeSqlPreview: args.includeSqlPreview !== false,
+        })),
+        success: true,
+      };
+    }
+    case 'inspect_app_logs': {
+      const readResult = typeof runtime?.readAppLogTail === 'function'
+        ? await runtime.readAppLogTail(Number(args.lineLimit) || 80, String(args.keyword || ''))
+        : { success: false, message: '当前环境暂不支持读取 GoNavi 应用日志' };
+      if (!readResult?.success) {
+        return {
+          content: `读取 GoNavi 应用日志失败: ${readResult?.message || '未知错误'}`,
+          success: false,
+        };
+      }
+      return {
+        content: JSON.stringify(buildAppLogSnapshot({
+          readResult,
+          keyword: args.keyword,
+          lineLimit: args.lineLimit,
+        })),
+        success: true,
+      };
+    }
+    case 'inspect_ai_upstream_logs': {
+      const keyword = String(args.requestId || args.provider || args.keyword || 'AI 上游请求').trim();
+      const readResult = typeof runtime?.readAppLogTail === 'function'
+        ? await runtime.readAppLogTail(Number(args.lineLimit) || 160, keyword)
+        : { success: false, message: '当前环境暂不支持读取 GoNavi 应用日志' };
+      if (!readResult?.success) {
+        return {
+          content: `读取 AI 上游请求日志失败: ${readResult?.message || '未知错误'}`,
+          success: false,
+        };
+      }
+      return {
+        content: JSON.stringify(buildAIUpstreamLogSnapshot({
+          readResult,
+          provider: args.provider,
+          requestId: args.requestId,
+          keyword: args.keyword,
+          lineLimit: args.lineLimit,
+          requestLimit: args.requestLimit,
+          includeBody: args.includeBody !== false,
+          includeLines: args.includeLines === true,
+          bodyPreviewLimit: args.bodyPreviewLimit,
+          includePayloadSummary: args.includePayloadSummary !== false,
+        })),
+        success: true,
+      };
+    }
+    case 'inspect_recent_connection_failures': {
+      const readResult = typeof runtime?.readAppLogTail === 'function'
+        ? await runtime.readAppLogTail(Number(args.lineLimit) || 120, String(args.keyword || ''))
+        : { success: false, message: '当前环境暂不支持读取 GoNavi 应用日志' };
+      if (!readResult?.success) {
+        return {
+          content: `读取最近连接失败记录失败: ${readResult?.message || '未知错误'}`,
+          success: false,
+        };
+      }
+      return {
+        content: JSON.stringify(buildRecentConnectionFailureSnapshot({
+          readResult,
+          keyword: args.keyword,
+          lineLimit: args.lineLimit,
+        })),
+        success: true,
+      };
+    }
+    case 'inspect_mcp_runtime_failures': {
+      const keyword = String(args.serverName || args.keyword || 'MCP').trim();
+      const readResult = typeof runtime?.readAppLogTail === 'function'
+        ? await runtime.readAppLogTail(Number(args.lineLimit) || 160, keyword)
+        : { success: false, message: '当前环境暂不支持读取 GoNavi 应用日志' };
+      if (!readResult?.success) {
+        return {
+          content: `读取 MCP 运行期失败日志失败: ${readResult?.message || '未知错误'}`,
+          success: false,
+        };
+      }
+      const mcpServers = typeof runtime?.getMCPServers === 'function'
+        ? await runtime.getMCPServers().catch(() => undefined)
+        : undefined;
+      return {
+        content: JSON.stringify(buildMCPRuntimeFailureSnapshot({
+          readResult,
+          mcpServers: Array.isArray(mcpServers) ? mcpServers : [],
+          mcpTools,
+          keyword: args.keyword,
+          serverName: args.serverName,
+          lineLimit: args.lineLimit,
+          includeLines: args.includeLines === true,
+        })),
+        success: true,
+      };
+    }
+    case 'inspect_ai_last_render_error':
+      return {
+        content: JSON.stringify(buildAILastRenderErrorSnapshot()),
+        success: true,
+      };
+    case 'inspect_saved_queries':
+      return {
+        content: JSON.stringify(buildSavedQueriesSnapshot({
+          savedQueries,
+          connections,
+          keyword: args.keyword,
+          connectionId: args.connectionId,
+          dbName: args.dbName,
+          limit: args.limit,
+          includeSql: args.includeSql !== false,
+        })),
+        success: true,
+      };
+    case 'inspect_sql_snippets':
+      return {
+        content: JSON.stringify(buildSqlSnippetsSnapshot({
+          sqlSnippets,
+          keyword: args.keyword,
+          limit: args.limit,
+          includeBody: args.includeBody !== false,
+        })),
+        success: true,
+      };
+    case 'inspect_shortcuts': {
+      const [shortcutOptions, currentPlatform] = await Promise.all([
+        typeof runtime?.getShortcutOptions === 'function'
+          ? runtime.getShortcutOptions()
+          : Promise.resolve(undefined),
+        typeof runtime?.getShortcutPlatform === 'function'
+          ? runtime.getShortcutPlatform()
+          : Promise.resolve(undefined),
+      ]);
+      return {
+        content: JSON.stringify(buildShortcutSnapshot({
+          shortcutOptions,
+          currentPlatform,
+          action: args.action,
+          keyword: args.keyword,
+          includeDisabled: args.includeDisabled !== false,
+          includeAllPlatforms: args.includeAllPlatforms !== false,
+        })),
+        success: true,
+      };
+    }
+    default:
+      return null;
+  }
+}
diff --git a/frontend/src/components/ai/aiSnapshotInspectionSqlRiskToolExecutor.ts b/frontend/src/components/ai/aiSnapshotInspectionSqlRiskToolExecutor.ts
new file mode 100644
index 0000000..aa34c3c
--- /dev/null
+++ b/frontend/src/components/ai/aiSnapshotInspectionSqlRiskToolExecutor.ts
@@ -0,0 +1,48 @@
+import type { SavedConnection, TabData } from '../../types';
+import { buildSqlRiskSnapshot } from './aiSqlRiskInsights';
+import type {
+  AISnapshotInspectionRuntime,
+  SnapshotInspectionResult,
+} from './aiSnapshotInspectionToolTypes';
+
+interface ExecuteSqlRiskInspectionToolCallOptions {
+  toolName: string;
+  args: Record<string, any>;
+  connections: SavedConnection[];
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  runtime?: AISnapshotInspectionRuntime;
+}
+
+export async function executeSqlRiskInspectionToolCall({
+  toolName,
+  args,
+  connections,
+  tabs = [],
+  activeTabId = null,
+  runtime,
+}: ExecuteSqlRiskInspectionToolCallOptions): Promise<SnapshotInspectionResult | null> {
+  if (toolName !== 'inspect_sql_risk') {
+    return null;
+  }
+
+  const candidateSql = String(args.sql || '').trim();
+  const activeTab = tabs.find((tab) => tab.id === activeTabId);
+  const activeTabSql = activeTab?.type === 'query' ? String(activeTab.query || '').trim() : '';
+  const sqlForCheck = candidateSql || activeTabSql;
+  const safetyCheck = sqlForCheck && typeof runtime?.checkSQL === 'function'
+    ? await runtime.checkSQL(sqlForCheck)
+    : undefined;
+
+  return {
+    content: JSON.stringify(buildSqlRiskSnapshot({
+      sql: candidateSql,
+      previewCharLimit: args.previewCharLimit,
+      tabs,
+      activeTabId,
+      connections,
+      safetyCheck,
+    })),
+    success: true,
+  };
+}
diff --git a/frontend/src/components/ai/aiSnapshotInspectionToolExecutor.ts b/frontend/src/components/ai/aiSnapshotInspectionToolExecutor.ts
new file mode 100644
index 0000000..a43eac0
--- /dev/null
+++ b/frontend/src/components/ai/aiSnapshotInspectionToolExecutor.ts
@@ -0,0 +1,195 @@
+import type {
+  AIContextItem,
+  AIMCPToolDescriptor,
+  AIChatMessage,
+  AISkillConfig,
+  AIUserPromptSettings,
+  ExternalSQLDirectory,
+  SavedConnection,
+  SavedQuery,
+  SqlSnippet,
+  TabData,
+} from '../../types';
+import type { SqlLog } from '../../store';
+import { executeConnectionWorkspaceSnapshotToolCall } from './aiSnapshotInspectionConnectionToolExecutor';
+import { executeDiagnosticsSnapshotToolCall } from './aiSnapshotInspectionDiagnosticsToolExecutor';
+import { executeAIConfigSnapshotToolCall } from './aiSnapshotInspectionAIConfigToolExecutor';
+import { executeAppHealthSnapshotToolCall } from './aiSnapshotInspectionAppHealthToolExecutor';
+import type {
+  AISnapshotInspectionRuntime,
+  SnapshotInspectionResult,
+} from './aiSnapshotInspectionToolTypes';
+import { executeSqlRiskInspectionToolCall } from './aiSnapshotInspectionSqlRiskToolExecutor';
+
+interface ExecuteSnapshotInspectionToolCallOptions {
+  toolName: string;
+  args: Record<string, any>;
+  activeContext?: { connectionId: string; dbName: string } | null;
+  aiContexts?: Record<string, AIContextItem[]>;
+  aiChatHistory?: Record<string, AIChatMessage[]>;
+  aiChatSessions?: Array<{ id: string; title: string; updatedAt: number }>;
+  activeSessionId?: string | null;
+  connections: SavedConnection[];
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  mcpTools: AIMCPToolDescriptor[];
+  sqlLogs?: SqlLog[];
+  savedQueries?: SavedQuery[];
+  sqlSnippets?: SqlSnippet[];
+  externalSQLDirectories?: ExternalSQLDirectory[];
+  skills?: AISkillConfig[];
+  userPromptSettings?: AIUserPromptSettings;
+  dynamicModels?: string[];
+  runtime?: AISnapshotInspectionRuntime;
+}
+
+export async function executeSnapshotInspectionToolCall(
+  options: ExecuteSnapshotInspectionToolCallOptions,
+): Promise<SnapshotInspectionResult | null> {
+  const {
+    toolName,
+    args,
+    activeContext = null,
+    aiContexts = {},
+    aiChatHistory = {},
+    aiChatSessions = [],
+    activeSessionId = null,
+    connections,
+    tabs = [],
+    activeTabId = null,
+    mcpTools,
+    sqlLogs = [],
+    savedQueries = [],
+    sqlSnippets = [],
+    externalSQLDirectories = [],
+    skills = [],
+    userPromptSettings,
+    dynamicModels = [],
+    runtime,
+  } = options;
+
+  try {
+    const appHealthResult = await executeAppHealthSnapshotToolCall({
+      toolName,
+      args,
+      activeContext,
+      aiContexts,
+      aiChatHistory,
+      aiChatSessions,
+      activeSessionId,
+      connections,
+      tabs,
+      activeTabId,
+      mcpTools,
+      skills,
+      userPromptSettings,
+      dynamicModels,
+      runtime,
+    });
+    if (appHealthResult) {
+      return appHealthResult;
+    }
+
+    const aiConfigResult = await executeAIConfigSnapshotToolCall({
+      toolName,
+      args,
+      activeContext,
+      aiContexts,
+      connections,
+      tabs,
+      activeTabId,
+      mcpTools,
+      skills,
+      userPromptSettings,
+      dynamicModels,
+      runtime,
+    });
+    if (aiConfigResult) {
+      return aiConfigResult;
+    }
+
+    const sqlRiskResult = await executeSqlRiskInspectionToolCall({
+      toolName,
+      args,
+      connections,
+      tabs,
+      activeTabId,
+      runtime,
+    });
+    if (sqlRiskResult) {
+      return sqlRiskResult;
+    }
+
+    const connectionWorkspaceResult = await executeConnectionWorkspaceSnapshotToolCall({
+      toolName,
+      args,
+      activeContext,
+      aiContexts,
+      connections,
+      tabs,
+      activeTabId,
+      externalSQLDirectories,
+      runtime,
+    });
+    if (connectionWorkspaceResult) {
+      return connectionWorkspaceResult;
+    }
+
+    const diagnosticsResult = await executeDiagnosticsSnapshotToolCall({
+      toolName,
+      args,
+      aiChatHistory,
+      aiChatSessions,
+      activeSessionId,
+      aiContexts,
+      connections,
+      tabs,
+      activeTabId,
+      mcpTools,
+      sqlLogs,
+      savedQueries,
+      sqlSnippets,
+      skills,
+      userPromptSettings,
+      runtime,
+    });
+    if (diagnosticsResult) {
+      return diagnosticsResult;
+    }
+
+    return null;
+  } catch (error: any) {
+    const label = {
+      inspect_current_connection: '读取当前连接失败',
+      inspect_connection_capabilities: '读取当前连接能力矩阵失败',
+      inspect_saved_connections: '读取本地连接清单失败',
+      inspect_redis_topology: '读取 Redis 拓扑配置失败',
+      inspect_external_sql_directories: '读取外部 SQL 目录失败',
+      inspect_external_sql_file: '读取外部 SQL 文件失败',
+      inspect_ai_sessions: '读取本地 AI 会话清单失败',
+      inspect_active_tab: '读取当前活动页签失败',
+      inspect_workspace_tabs: '读取当前工作区页签失败',
+      inspect_ai_context: '读取当前 AI 上下文失败',
+      inspect_recent_sql_logs: '获取最近 SQL 日志失败',
+      inspect_recent_sql_activity: '汇总最近 SQL 活动失败',
+      inspect_sql_editor_transaction: '读取 SQL 编辑器事务状态失败',
+      inspect_sql_risk: '检查 SQL 风险失败',
+      inspect_app_logs: '读取 GoNavi 应用日志失败',
+      inspect_ai_upstream_logs: '读取 AI 上游请求日志失败',
+      inspect_recent_connection_failures: '汇总最近连接失败记录失败',
+      inspect_mcp_runtime_failures: '读取 MCP 运行期失败诊断失败',
+      inspect_ai_last_render_error: '读取最近一次 AI 渲染异常失败',
+      inspect_ai_message_flow: '读取 AI 消息流诊断失败',
+      inspect_ai_context_budget: '读取 AI 上下文体量诊断失败',
+      inspect_codebase_hotspots: '读取代码热点诊断失败',
+      inspect_saved_queries: '读取已保存查询失败',
+      inspect_sql_snippets: '读取 SQL 片段失败',
+      inspect_shortcuts: '读取快捷键配置失败',
+      inspect_app_health: '读取 AI 应用健康总览失败',
+    }[toolName] || '读取本地探针快照失败';
+    return {
+      content: `${label}: ${error?.message || error}`,
+      success: false,
+    };
+  }
+}
diff --git a/frontend/src/components/ai/aiSnapshotInspectionToolTypes.ts b/frontend/src/components/ai/aiSnapshotInspectionToolTypes.ts
new file mode 100644
index 0000000..b04c3c3
--- /dev/null
+++ b/frontend/src/components/ai/aiSnapshotInspectionToolTypes.ts
@@ -0,0 +1,49 @@
+import type {
+  AIMCPClientInstallStatus,
+  AIMCPServerConfig,
+  AIProviderConfig,
+  AISafetyLevel,
+} from '../../types';
+import type {
+  ShortcutOptions,
+  ShortcutPlatform,
+} from '../../utils/shortcuts';
+
+export interface AISnapshotInspectionRuntimeState {
+  providers?: AIProviderConfig[];
+  activeProviderId?: string;
+  safetyLevel?: AISafetyLevel | string;
+  contextLevel?: string;
+}
+
+export interface AISqlEditorPendingTransactionRuntimeState {
+  id: string;
+  tabId: string;
+  commitMode: string;
+  autoCommitDelayMs: number;
+  createdAt: number;
+  autoCommitDueAt?: number | null;
+}
+
+export interface AISqlEditorTransactionRuntimeState {
+  commitMode?: string;
+  autoCommitDelayMs?: number;
+  pendingTransactions?: Record<string, AISqlEditorPendingTransactionRuntimeState>;
+}
+
+export interface AISnapshotInspectionRuntime {
+  getAIRuntimeState?: () => Promise<AISnapshotInspectionRuntimeState | undefined>;
+  getMCPServers?: () => Promise<AIMCPServerConfig[] | undefined>;
+  getMCPClientInstallStatuses?: () => Promise<AIMCPClientInstallStatus[] | undefined>;
+  getShortcutOptions?: () => Promise<ShortcutOptions | undefined>;
+  getShortcutPlatform?: () => Promise<ShortcutPlatform | undefined>;
+  getSqlEditorTransactionState?: () => Promise<AISqlEditorTransactionRuntimeState | undefined>;
+  readAppLogTail?: (lineLimit: number, keyword: string) => Promise<any>;
+  readSQLFile?: (filePath: string) => Promise<any>;
+  checkSQL?: (sql: string) => Promise<{ allowed?: boolean; operationType?: string } | undefined>;
+}
+
+export interface SnapshotInspectionResult {
+  content: string;
+  success: boolean;
+}
diff --git a/frontend/src/components/ai/aiSqlEditorTransactionInsights.ts b/frontend/src/components/ai/aiSqlEditorTransactionInsights.ts
new file mode 100644
index 0000000..ade1bd4
--- /dev/null
+++ b/frontend/src/components/ai/aiSqlEditorTransactionInsights.ts
@@ -0,0 +1,235 @@
+import type { SqlLog } from '../../store';
+import type { SavedConnection, TabData } from '../../types';
+import { findSqlStatementRanges } from '../../utils/sqlStatementSelection';
+import { shouldUseSqlEditorManagedTransaction } from '../../utils/sqlEditorTransaction';
+import type {
+  AISqlEditorPendingTransactionRuntimeState,
+  AISqlEditorTransactionRuntimeState,
+} from './aiSnapshotInspectionToolTypes';
+
+type SqlEditorCommitMode = 'manual' | 'auto';
+
+const DEFAULT_AUTO_COMMIT_DELAY_MS = 5000;
+const SQL_PREVIEW_LIMIT = 1200;
+
+const normalizeCommitMode = (value: unknown): SqlEditorCommitMode =>
+  String(value || '').trim().toLowerCase() === 'auto' ? 'auto' : 'manual';
+
+const normalizeDelayMs = (value: unknown): number => {
+  const delayMs = Number(value);
+  return Number.isFinite(delayMs) && delayMs > 0 ? delayMs : DEFAULT_AUTO_COMMIT_DELAY_MS;
+};
+
+const splitStatements = (sql: string): string[] =>
+  findSqlStatementRanges(String(sql || ''))
+    .map((range) => String(range.text || '').trim())
+    .filter(Boolean);
+
+const hasTransactionControlStatement = (statement: string): boolean =>
+  /^\s*(begin|commit|rollback|savepoint|release)\b/i.test(statement)
+  || /^\s*start\s+transaction\b/i.test(statement);
+
+const buildTabSummary = (
+  tab: TabData | undefined,
+  connections: SavedConnection[],
+) => {
+  if (!tab) return null;
+  const connection = connections.find((item) => item.id === tab.connectionId);
+  return {
+    id: tab.id,
+    title: tab.title,
+    type: tab.type,
+    connectionId: tab.connectionId,
+    connectionName: connection?.name || '',
+    connectionType: connection?.config?.type || '',
+    dbName: tab.dbName || '',
+    filePath: tab.filePath || '',
+    resultPanelVisible: tab.resultPanelVisible === true,
+    readOnly: tab.readOnly === true,
+  };
+};
+
+const buildActiveSqlTabSnapshot = (params: {
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  connections: SavedConnection[];
+  includeSqlPreview?: boolean;
+}) => {
+  const { tabs = [], activeTabId = null, connections, includeSqlPreview = true } = params;
+  const activeTab = tabs.find((tab) => tab.id === activeTabId);
+  if (!activeTab) {
+    return {
+      hasActiveTab: false,
+      hasSql: false,
+      message: '当前没有活动页签',
+    };
+  }
+  if (activeTab.type !== 'query') {
+    return {
+      hasActiveTab: true,
+      hasSql: false,
+      message: '当前活动页签不是 SQL 编辑器页签',
+      tab: buildTabSummary(activeTab, connections),
+    };
+  }
+
+  const sql = String(activeTab.query || '').trim();
+  const statements = splitStatements(sql);
+  const hasExplicitTransactionControl = statements.some(hasTransactionControlStatement);
+  const usesManagedTransaction = shouldUseSqlEditorManagedTransaction(statements);
+
+  return {
+    hasActiveTab: true,
+    hasSql: sql.length > 0,
+    tab: buildTabSummary(activeTab, connections),
+    sqlPreview: includeSqlPreview ? sql.slice(0, SQL_PREVIEW_LIMIT) : '',
+    sqlCharCount: sql.length,
+    sqlTruncated: includeSqlPreview && sql.length > SQL_PREVIEW_LIMIT,
+    statementCount: statements.length,
+    hasExplicitTransactionControl,
+    usesManagedTransaction,
+    transactionSemantics: usesManagedTransaction
+      ? '执行 INSERT/UPDATE/DELETE/MERGE/REPLACE 等 DML 时会先进入 SQL 编辑器托管事务；提交设置只决定事务执行成功后何时 COMMIT。'
+      : hasExplicitTransactionControl
+        ? '检测到用户显式事务控制语句，GoNavi 不会再包一层 SQL 编辑器托管事务。'
+        : '当前 SQL 不会触发 SQL 编辑器托管事务；只读查询仍走普通查询路径。',
+  };
+};
+
+const buildPendingTransactionPreview = (params: {
+  item: AISqlEditorPendingTransactionRuntimeState;
+  tabs?: TabData[];
+  connections: SavedConnection[];
+  now: number;
+}) => {
+  const { item, tabs = [], connections, now } = params;
+  const tab = tabs.find((candidate) => candidate.id === item.tabId);
+  const commitMode = normalizeCommitMode(item.commitMode);
+  const dueAt = Number(item.autoCommitDueAt || 0);
+  const remainingMs = commitMode === 'auto' && dueAt > 0
+    ? Math.max(0, dueAt - now)
+    : null;
+
+  return {
+    id: item.id,
+    tabId: item.tabId,
+    tab: buildTabSummary(tab, connections),
+    commitMode,
+    autoCommitDelayMs: normalizeDelayMs(item.autoCommitDelayMs),
+    createdAt: Number(item.createdAt) || 0,
+    autoCommitDueAt: dueAt || null,
+    autoCommitRemainingMs: remainingMs,
+  };
+};
+
+const isRelevantSqlEditorTransactionLog = (log: SqlLog): boolean => {
+  const sql = String(log.sql || '');
+  const statements = splitStatements(sql);
+  if (shouldUseSqlEditorManagedTransaction(statements)) return true;
+  if (statements.some(hasTransactionControlStatement)) return true;
+  return /\b(transaction|commit|rollback)\b/i.test(sql)
+    || /事务|提交|回滚|transaction|commit|rollback/i.test(String(log.message || ''));
+};
+
+const buildRecentLogPreview = (log: SqlLog) => ({
+  id: log.id,
+  timestamp: log.timestamp,
+  status: log.status,
+  duration: log.duration,
+  dbName: log.dbName || '',
+  affectedRows: typeof log.affectedRows === 'number' ? log.affectedRows : null,
+  sqlPreview: String(log.sql || '').trim().slice(0, 1000),
+  message: log.message || '',
+});
+
+export const buildSqlEditorTransactionSnapshot = (params: {
+  transactionState?: AISqlEditorTransactionRuntimeState;
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  connections: SavedConnection[];
+  sqlLogs?: SqlLog[];
+  includeSqlPreview?: boolean;
+  now?: number;
+}) => {
+  const {
+    transactionState,
+    tabs = [],
+    activeTabId = null,
+    connections,
+    sqlLogs = [],
+    includeSqlPreview = true,
+    now = Date.now(),
+  } = params;
+  const commitMode = normalizeCommitMode(transactionState?.commitMode);
+  const autoCommitDelayMs = normalizeDelayMs(transactionState?.autoCommitDelayMs);
+  const pendingTransactions = Object.values(transactionState?.pendingTransactions || {})
+    .map((item) => buildPendingTransactionPreview({ item, tabs, connections, now }))
+    .sort((left, right) => right.createdAt - left.createdAt);
+  const activePendingTransaction = pendingTransactions.find((item) => item.tabId === activeTabId) || null;
+  const activeSqlTab = buildActiveSqlTabSnapshot({
+    tabs,
+    activeTabId,
+    connections,
+    includeSqlPreview,
+  });
+  const activeUsesManagedTransaction = activeSqlTab.hasActiveTab
+    && activeSqlTab.hasSql
+    && 'usesManagedTransaction' in activeSqlTab
+    && activeSqlTab.usesManagedTransaction === true;
+  const activeHasExplicitTransactionControl = activeSqlTab.hasActiveTab
+    && activeSqlTab.hasSql
+    && 'hasExplicitTransactionControl' in activeSqlTab
+    && activeSqlTab.hasExplicitTransactionControl === true;
+  const recentRelevantLogs = sqlLogs
+    .filter(isRelevantSqlEditorTransactionLog)
+    .slice(0, 8)
+    .map(buildRecentLogPreview);
+
+  const warnings: string[] = [];
+  if (pendingTransactions.length > 0) {
+    warnings.push(`当前有 ${pendingTransactions.length} 个 SQL 编辑器托管事务待提交或回滚`);
+  }
+  if (activePendingTransaction) {
+    warnings.push('当前活动 SQL 页签已有待处理事务，继续执行新的 DML 前应先提交或回滚');
+  }
+  if (activeUsesManagedTransaction && commitMode === 'auto') {
+    warnings.push('当前设置为自动提交，但 DML 仍会先进入托管事务，只是在延迟到期后自动 COMMIT');
+  }
+  if (activeHasExplicitTransactionControl) {
+    warnings.push('当前 SQL 已包含显式事务控制，SQL 编辑器不会再接管提交/回滚');
+  }
+
+  const nextActions: string[] = [];
+  if (activePendingTransaction) {
+    nextActions.push('先让用户在结果区事务条点击“提交”或“回滚”，或等待自动提交倒计时结束');
+  } else if (pendingTransactions.length > 0) {
+    nextActions.push('如要继续执行 DML，先切回对应 SQL 页签处理待提交事务');
+  }
+  if (activeUsesManagedTransaction) {
+    nextActions.push(commitMode === 'auto'
+      ? `说明当前 DML 会先开启托管事务，执行成功后约 ${Math.round(autoCommitDelayMs / 1000)} 秒自动提交`
+      : '说明当前 DML 会先开启托管事务，执行成功后需要手动点击提交或回滚');
+  }
+  if (!activeSqlTab.hasActiveTab || !activeSqlTab.hasSql) {
+    nextActions.push('先切换到包含 SQL 草稿的查询页签，或让用户贴出要执行的 SQL');
+  }
+  if (recentRelevantLogs.length > 0) {
+    nextActions.push('结合 recentRelevantLogs 回看最近写入/事务执行结果，必要时再调用 inspect_recent_sql_activity 下钻');
+  }
+
+  return {
+    commitPolicy: {
+      commitMode,
+      autoCommitDelayMs,
+      transactionAlwaysOnForDML: true,
+      semantics: 'SQL 编辑器执行 INSERT/UPDATE/DELETE/MERGE/REPLACE 等 DML 时始终先进入托管事务；“手动/自动”只控制执行成功后的 COMMIT 时机，不控制是否开启事务。',
+    },
+    activeSqlTab,
+    pendingTransactionCount: pendingTransactions.length,
+    activePendingTransaction,
+    pendingTransactions,
+    recentRelevantLogs,
+    warnings,
+    nextActions,
+  };
+};
diff --git a/frontend/src/components/ai/aiSqlLogInsights.test.ts b/frontend/src/components/ai/aiSqlLogInsights.test.ts
new file mode 100644
index 0000000..40b6fbe
--- /dev/null
+++ b/frontend/src/components/ai/aiSqlLogInsights.test.ts
@@ -0,0 +1,120 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildRecentSqlActivitySnapshot, buildRecentSqlLogsSnapshot } from './aiSqlLogInsights';
+
+describe('aiSqlLogInsights', () => {
+  it('keeps recent sql logs as structured previews with inferred statement metadata', () => {
+    const snapshot = buildRecentSqlLogsSnapshot({
+      status: 'all',
+      limit: 2,
+      sqlLogs: [
+        {
+          id: 'log-1',
+          timestamp: 2,
+          sql: '/* note */ SELECT * FROM users',
+          status: 'success',
+          duration: 10,
+          dbName: 'crm',
+          affectedRows: 2,
+        },
+        {
+          id: 'log-2',
+          timestamp: 1,
+          sql: 'DELETE FROM users WHERE id = 9',
+          status: 'error',
+          duration: 50,
+          dbName: 'crm',
+          message: 'permission denied',
+        },
+      ],
+    });
+
+    expect(snapshot.totalMatched).toBe(2);
+    expect(snapshot.logs[0]).toMatchObject({
+      statementType: 'select',
+      activityKind: 'read',
+    });
+    expect(snapshot.logs[1]).toMatchObject({
+      statementType: 'delete',
+      activityKind: 'write',
+    });
+  });
+
+  it('builds a recent sql activity summary with filters, breakdowns, slowest statements, and top errors', () => {
+    const snapshot = buildRecentSqlActivitySnapshot({
+      status: 'all',
+      activityKind: 'all',
+      keyword: 'orders',
+      dbName: 'crm',
+      limit: 5,
+      sqlLogs: [
+        {
+          id: 'log-1',
+          timestamp: 5,
+          sql: 'UPDATE orders SET status = \'paid\' WHERE id = 1',
+          status: 'error',
+          duration: 90,
+          dbName: 'crm',
+          message: 'row lock timeout',
+        },
+        {
+          id: 'log-2',
+          timestamp: 4,
+          sql: 'ALTER TABLE orders ADD COLUMN note varchar(32)',
+          status: 'success',
+          duration: 120,
+          dbName: 'crm',
+        },
+        {
+          id: 'log-3',
+          timestamp: 3,
+          sql: 'WITH recent AS (SELECT * FROM orders) SELECT * FROM recent',
+          status: 'success',
+          duration: 18,
+          dbName: 'crm',
+        },
+        {
+          id: 'log-4',
+          timestamp: 2,
+          sql: 'SET search_path TO analytics',
+          status: 'success',
+          duration: 5,
+          dbName: 'crm',
+        },
+        {
+          id: 'log-5',
+          timestamp: 1,
+          sql: 'SELECT * FROM users',
+          status: 'success',
+          duration: 12,
+          dbName: 'crm',
+        },
+      ],
+    });
+
+    expect(snapshot.totalMatched).toBe(3);
+    expect(snapshot.writeCount).toBe(1);
+    expect(snapshot.ddlCount).toBe(1);
+    expect(snapshot.readCount).toBe(1);
+    expect(snapshot.statementTypeBreakdown).toEqual({
+      alter: 1,
+      update: 1,
+      with: 1,
+    });
+    expect(snapshot.dbBreakdown).toEqual({
+      crm: 3,
+    });
+    expect(snapshot.topErrorMessages).toEqual([
+      { message: 'row lock timeout', count: 1 },
+    ]);
+    expect(snapshot.slowestStatements[0]).toMatchObject({
+      statementType: 'alter',
+      activityKind: 'ddl',
+    });
+    expect(snapshot.recentMutations).toHaveLength(2);
+    expect(snapshot.recentErrors[0]).toMatchObject({
+      statementType: 'update',
+      activityKind: 'write',
+    });
+  });
+});
diff --git a/frontend/src/components/ai/aiSqlLogInsights.ts b/frontend/src/components/ai/aiSqlLogInsights.ts
new file mode 100644
index 0000000..8322866
--- /dev/null
+++ b/frontend/src/components/ai/aiSqlLogInsights.ts
@@ -0,0 +1,316 @@
+import type { SqlLog } from '../../store';
+
+type SqlLogStatusFilter = 'all' | 'success' | 'error';
+type SqlActivityKind = 'read' | 'write' | 'ddl' | 'transaction' | 'session' | 'other';
+type SqlActivityKindFilter = 'all' | SqlActivityKind;
+type SqlStatementType =
+  | 'select'
+  | 'insert'
+  | 'update'
+  | 'delete'
+  | 'replace'
+  | 'merge'
+  | 'create'
+  | 'alter'
+  | 'drop'
+  | 'truncate'
+  | 'rename'
+  | 'show'
+  | 'describe'
+  | 'explain'
+  | 'use'
+  | 'set'
+  | 'begin'
+  | 'commit'
+  | 'rollback'
+  | 'with'
+  | 'other';
+
+const MAX_SQL_LOG_LIMIT = 100;
+const DEFAULT_SQL_LOG_LIMIT = 20;
+const DEFAULT_SQL_ACTIVITY_LIMIT = 30;
+
+const normalizeSqlLogLimit = (input: unknown, fallback = DEFAULT_SQL_LOG_LIMIT): number => {
+  const value = Math.floor(Number(input) || fallback);
+  if (value < 1) return 1;
+  if (value > MAX_SQL_LOG_LIMIT) return MAX_SQL_LOG_LIMIT;
+  return value;
+};
+
+const normalizeSqlLogStatus = (input: unknown): SqlLogStatusFilter => {
+  const value = String(input || 'all').trim().toLowerCase();
+  if (value === 'success' || value === 'error') {
+    return value;
+  }
+  return 'all';
+};
+
+const normalizeSqlActivityKind = (input: unknown): SqlActivityKindFilter => {
+  const value = String(input || 'all').trim().toLowerCase();
+  if (
+    value === 'read'
+    || value === 'write'
+    || value === 'ddl'
+    || value === 'transaction'
+    || value === 'session'
+    || value === 'other'
+  ) {
+    return value;
+  }
+  return 'all';
+};
+
+const stripLeadingSqlComments = (input: string): string => {
+  let text = String(input || '');
+  while (true) {
+    const trimmedStart = text.trimStart();
+    if (!trimmedStart) {
+      return '';
+    }
+    if (trimmedStart.startsWith('--') || trimmedStart.startsWith('#')) {
+      const lineEnd = trimmedStart.indexOf('\n');
+      text = lineEnd >= 0 ? trimmedStart.slice(lineEnd + 1) : '';
+      continue;
+    }
+    if (trimmedStart.startsWith('/*')) {
+      const blockEnd = trimmedStart.indexOf('*/');
+      if (blockEnd < 0) {
+        return '';
+      }
+      text = trimmedStart.slice(blockEnd + 2);
+      continue;
+    }
+    return trimmedStart;
+  }
+};
+
+const resolveWithStatementType = (normalizedSql: string): SqlStatementType => {
+  const writePatterns: Array<{ keyword: SqlStatementType; regex: RegExp }> = [
+    { keyword: 'insert', regex: /\binsert\s+into\b/u },
+    { keyword: 'update', regex: /\bupdate\b/u },
+    { keyword: 'delete', regex: /\bdelete\s+from\b/u },
+    { keyword: 'replace', regex: /\breplace\s+into\b/u },
+    { keyword: 'merge', regex: /\bmerge\s+into\b/u },
+  ];
+  const ddlPatterns: Array<{ keyword: SqlStatementType; regex: RegExp }> = [
+    { keyword: 'create', regex: /\bcreate\s+(table|view|index|schema|database)\b/u },
+    { keyword: 'alter', regex: /\balter\s+(table|view|index|schema|database)\b/u },
+    { keyword: 'drop', regex: /\bdrop\s+(table|view|index|schema|database)\b/u },
+    { keyword: 'truncate', regex: /\btruncate\s+table\b/u },
+    { keyword: 'rename', regex: /\brename\s+(table|to)\b/u },
+  ];
+
+  const writeMatch = writePatterns.find((item) => item.regex.test(normalizedSql));
+  if (writeMatch) {
+    return writeMatch.keyword;
+  }
+  const ddlMatch = ddlPatterns.find((item) => item.regex.test(normalizedSql));
+  if (ddlMatch) {
+    return ddlMatch.keyword;
+  }
+  return /\bselect\b/u.test(normalizedSql) ? 'with' : 'other';
+};
+
+const classifySqlStatement = (sql: string): { statementType: SqlStatementType; activityKind: SqlActivityKind } => {
+  const normalizedSql = stripLeadingSqlComments(sql).toLowerCase();
+  if (!normalizedSql) {
+    return { statementType: 'other', activityKind: 'other' };
+  }
+
+  const firstKeyword = normalizedSql.match(/^[a-z]+/u)?.[0] || 'other';
+  const statementType: SqlStatementType = (() => {
+    switch (firstKeyword) {
+      case 'select':
+      case 'insert':
+      case 'update':
+      case 'delete':
+      case 'replace':
+      case 'merge':
+      case 'create':
+      case 'alter':
+      case 'drop':
+      case 'truncate':
+      case 'rename':
+      case 'show':
+      case 'use':
+      case 'set':
+      case 'begin':
+      case 'commit':
+      case 'rollback':
+        return firstKeyword;
+      case 'desc':
+      case 'describe':
+        return 'describe';
+      case 'explain':
+        return 'explain';
+      case 'with':
+        return resolveWithStatementType(normalizedSql);
+      default:
+        return 'other';
+    }
+  })();
+
+  switch (statementType) {
+    case 'select':
+    case 'show':
+    case 'describe':
+    case 'explain':
+    case 'with':
+      return { statementType, activityKind: 'read' };
+    case 'insert':
+    case 'update':
+    case 'delete':
+    case 'replace':
+    case 'merge':
+      return { statementType, activityKind: 'write' };
+    case 'create':
+    case 'alter':
+    case 'drop':
+    case 'truncate':
+    case 'rename':
+      return { statementType, activityKind: 'ddl' };
+    case 'begin':
+    case 'commit':
+    case 'rollback':
+      return { statementType, activityKind: 'transaction' };
+    case 'use':
+    case 'set':
+      return { statementType, activityKind: 'session' };
+    default:
+      return { statementType: 'other', activityKind: 'other' };
+  }
+};
+
+const buildCountBreakdown = (items: string[]): Record<string, number> =>
+  Object.fromEntries(
+    Array.from(
+      items.reduce((map, item) => {
+        const key = String(item || 'unknown').trim() || 'unknown';
+        map.set(key, (map.get(key) || 0) + 1);
+        return map;
+      }, new Map<string, number>()).entries(),
+    ).sort((left, right) => right[1] - left[1] || left[0].localeCompare(right[0])),
+  );
+
+const buildLogPreview = (log: SqlLog) => {
+  const classification = classifySqlStatement(log.sql);
+  return {
+    id: log.id,
+    timestamp: log.timestamp,
+    status: log.status,
+    duration: log.duration,
+    dbName: log.dbName || '',
+    affectedRows: typeof log.affectedRows === 'number' ? log.affectedRows : null,
+    statementType: classification.statementType,
+    activityKind: classification.activityKind,
+    sql: log.sql,
+    message: log.message || '',
+  };
+};
+
+export const buildRecentSqlLogsSnapshot = (params: {
+  sqlLogs?: SqlLog[];
+  limit?: unknown;
+  status?: unknown;
+}) => {
+  const { sqlLogs = [], limit, status } = params;
+  const safeStatus = normalizeSqlLogStatus(status);
+  const safeLimit = normalizeSqlLogLimit(limit);
+  const filteredLogs = sqlLogs.filter((log) => safeStatus === 'all' || log.status === safeStatus);
+
+  return {
+    status: safeStatus,
+    limit: safeLimit,
+    totalMatched: filteredLogs.length,
+    successCount: filteredLogs.filter((log) => log.status === 'success').length,
+    errorCount: filteredLogs.filter((log) => log.status === 'error').length,
+    logs: filteredLogs.slice(0, safeLimit).map(buildLogPreview),
+  };
+};
+
+export const buildRecentSqlActivitySnapshot = (params: {
+  sqlLogs?: SqlLog[];
+  limit?: unknown;
+  status?: unknown;
+  keyword?: unknown;
+  dbName?: unknown;
+  activityKind?: unknown;
+}) => {
+  const { sqlLogs = [], limit, status, keyword, dbName, activityKind } = params;
+  const safeLimit = normalizeSqlLogLimit(limit, DEFAULT_SQL_ACTIVITY_LIMIT);
+  const safeStatus = normalizeSqlLogStatus(status);
+  const safeKeyword = String(keyword || '').trim().toLowerCase();
+  const safeDbName = String(dbName || '').trim().toLowerCase();
+  const safeActivityKind = normalizeSqlActivityKind(activityKind);
+
+  const enrichedLogs = sqlLogs.map(buildLogPreview);
+  const filteredLogs = enrichedLogs.filter((log) => {
+    if (safeStatus !== 'all' && log.status !== safeStatus) {
+      return false;
+    }
+    if (safeActivityKind !== 'all' && log.activityKind !== safeActivityKind) {
+      return false;
+    }
+    if (safeDbName && !String(log.dbName || '').toLowerCase().includes(safeDbName)) {
+      return false;
+    }
+    if (safeKeyword) {
+      const haystack = [
+        log.dbName,
+        log.statementType,
+        log.activityKind,
+        log.sql,
+        log.message,
+      ].join('\n').toLowerCase();
+      if (!haystack.includes(safeKeyword)) {
+        return false;
+      }
+    }
+    return true;
+  });
+
+  const statementTypeBreakdown = buildCountBreakdown(filteredLogs.map((log) => log.statementType));
+  const dbBreakdown = buildCountBreakdown(filteredLogs.map((log) => log.dbName || '(未指定数据库)'));
+  const errorMessageBreakdown = buildCountBreakdown(
+    filteredLogs
+      .filter((log) => log.status === 'error' && String(log.message || '').trim())
+      .map((log) => String(log.message || '').trim()),
+  );
+
+  const recentExamples = filteredLogs.slice(0, safeLimit);
+  const recentMutations = filteredLogs
+    .filter((log) => log.activityKind === 'write' || log.activityKind === 'ddl')
+    .slice(0, 5);
+  const recentErrors = filteredLogs
+    .filter((log) => log.status === 'error')
+    .slice(0, 5);
+  const slowestStatements = [...filteredLogs]
+    .sort((left, right) => right.duration - left.duration || right.timestamp - left.timestamp)
+    .slice(0, 5);
+
+  return {
+    status: safeStatus,
+    activityKind: safeActivityKind,
+    keyword: safeKeyword,
+    dbName: safeDbName,
+    limit: safeLimit,
+    totalMatched: filteredLogs.length,
+    successCount: filteredLogs.filter((log) => log.status === 'success').length,
+    errorCount: filteredLogs.filter((log) => log.status === 'error').length,
+    readCount: filteredLogs.filter((log) => log.activityKind === 'read').length,
+    writeCount: filteredLogs.filter((log) => log.activityKind === 'write').length,
+    ddlCount: filteredLogs.filter((log) => log.activityKind === 'ddl').length,
+    transactionCount: filteredLogs.filter((log) => log.activityKind === 'transaction').length,
+    sessionCount: filteredLogs.filter((log) => log.activityKind === 'session').length,
+    otherCount: filteredLogs.filter((log) => log.activityKind === 'other').length,
+    statementTypeBreakdown,
+    dbBreakdown,
+    topErrorMessages: Object.entries(errorMessageBreakdown)
+      .slice(0, 5)
+      .map(([message, count]) => ({ message, count })),
+    recentMutations,
+    recentErrors,
+    slowestStatements,
+    recentExamples,
+  };
+};
diff --git a/frontend/src/components/ai/aiSqlRiskInsights.test.ts b/frontend/src/components/ai/aiSqlRiskInsights.test.ts
new file mode 100644
index 0000000..4e34d95
--- /dev/null
+++ b/frontend/src/components/ai/aiSqlRiskInsights.test.ts
@@ -0,0 +1,66 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildSqlRiskSnapshot } from './aiSqlRiskInsights';
+
+const connections = [{
+  id: 'conn-1',
+  name: '主库',
+  config: {
+    type: 'mysql',
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+  },
+}];
+
+describe('aiSqlRiskInsights', () => {
+  it('classifies multi-statement destructive SQL as critical', () => {
+    const snapshot = buildSqlRiskSnapshot({
+      sql: 'DELETE FROM accounts; SELECT * FROM accounts;',
+      connections,
+    });
+
+    expect(snapshot.hasSql).toBe(true);
+    expect(snapshot.source).toBe('argument');
+    expect(snapshot.statementCount).toBe(2);
+    expect(snapshot.riskLevel).toBe('critical');
+    expect(snapshot.requiresUserConfirmation).toBe(true);
+    expect(snapshot.activityKinds).toContain('write');
+    expect(snapshot.activityKinds).toContain('read');
+    expect(snapshot.warnings).toContain('DELETE 缺少 WHERE 条件，可能删除整表数据');
+    expect(snapshot.warnings.join('\n')).toContain('批量执行前应逐条确认影响范围');
+  });
+
+  it('reads SQL from the active query tab and includes safety check result', () => {
+    const snapshot = buildSqlRiskSnapshot({
+      tabs: [{
+        id: 'tab-1',
+        title: '用户更新',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'UPDATE users SET status = 0',
+      }],
+      activeTabId: 'tab-1',
+      connections,
+      safetyCheck: {
+        allowed: false,
+        operationType: 'UPDATE',
+      },
+    });
+
+    expect(snapshot.hasSql).toBe(true);
+    expect(snapshot.source).toBe('active_tab');
+    expect(snapshot.activeTab).toMatchObject({
+      id: 'tab-1',
+      title: '用户更新',
+      connectionName: '主库',
+      connectionType: 'mysql',
+      dbName: 'crm',
+    });
+    expect(snapshot.riskLevel).toBe('critical');
+    expect(snapshot.safetyCheck).toMatchObject({ allowed: false, operationType: 'UPDATE' });
+    expect(snapshot.warnings).toContain('UPDATE 缺少 WHERE 条件，可能更新整表数据');
+    expect(snapshot.warnings).toContain('当前 AI 安全策略不允许执行 UPDATE 类型 SQL');
+  });
+});
diff --git a/frontend/src/components/ai/aiSqlRiskInsights.ts b/frontend/src/components/ai/aiSqlRiskInsights.ts
new file mode 100644
index 0000000..61e408e
--- /dev/null
+++ b/frontend/src/components/ai/aiSqlRiskInsights.ts
@@ -0,0 +1,283 @@
+import type { SavedConnection, TabData } from '../../types';
+import { findSqlStatementRanges } from '../../utils/sqlStatementSelection';
+
+type SqlRiskLevel = 'none' | 'low' | 'medium' | 'high' | 'critical';
+type SqlActivityKind = 'read' | 'write' | 'ddl' | 'transaction' | 'session' | 'routine' | 'other';
+
+interface SqlSafetyCheckResult {
+  allowed?: boolean;
+  operationType?: string;
+}
+
+const SQL_PREVIEW_LIMIT = 12000;
+
+const READ_TOKENS = new Set(['select', 'show', 'describe', 'desc', 'explain', 'with']);
+const WRITE_TOKENS = new Set(['insert', 'update', 'delete', 'merge', 'replace', 'upsert']);
+const DDL_TOKENS = new Set(['create', 'alter', 'drop', 'truncate', 'rename']);
+const TRANSACTION_TOKENS = new Set(['begin', 'start', 'commit', 'rollback', 'savepoint', 'release']);
+const SESSION_TOKENS = new Set(['set', 'use', 'reset']);
+const ROUTINE_TOKENS = new Set(['call', 'exec', 'execute']);
+
+const stripCommentsAndLiterals = (sql: string): string => {
+  const text = String(sql || '');
+  let result = '';
+  let inSingle = false;
+  let inDouble = false;
+  let inBacktick = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+
+  for (let index = 0; index < text.length; index += 1) {
+    const ch = text[index];
+    const next = index + 1 < text.length ? text[index + 1] : '';
+
+    if (inLineComment) {
+      if (ch === '\n') {
+        inLineComment = false;
+        result += '\n';
+      } else {
+        result += ' ';
+      }
+      continue;
+    }
+    if (inBlockComment) {
+      if (ch === '*' && next === '/') {
+        index += 1;
+        inBlockComment = false;
+      }
+      result += ' ';
+      continue;
+    }
+    if (!inSingle && !inDouble && !inBacktick && ch === '-' && next === '-') {
+      inLineComment = true;
+      result += '  ';
+      index += 1;
+      continue;
+    }
+    if (!inSingle && !inDouble && !inBacktick && ch === '/' && next === '*') {
+      inBlockComment = true;
+      result += '  ';
+      index += 1;
+      continue;
+    }
+    if (!inDouble && !inBacktick && ch === "'") {
+      inSingle = !inSingle;
+      result += ' ';
+      continue;
+    }
+    if (!inSingle && !inBacktick && ch === '"') {
+      inDouble = !inDouble;
+      result += ' ';
+      continue;
+    }
+    if (!inSingle && !inDouble && ch === '`') {
+      inBacktick = !inBacktick;
+      result += ' ';
+      continue;
+    }
+    result += (inSingle || inDouble || inBacktick) ? ' ' : ch;
+  }
+
+  return result;
+};
+
+const resolveFirstToken = (sql: string): string => {
+  const stripped = stripCommentsAndLiterals(sql).trim();
+  const match = stripped.match(/^[A-Za-z_][A-Za-z0-9_$#]*/);
+  return match?.[0]?.toLowerCase() || '';
+};
+
+const classifySqlActivity = (token: string): SqlActivityKind => {
+  if (READ_TOKENS.has(token)) return 'read';
+  if (WRITE_TOKENS.has(token)) return 'write';
+  if (DDL_TOKENS.has(token)) return 'ddl';
+  if (TRANSACTION_TOKENS.has(token)) return 'transaction';
+  if (SESSION_TOKENS.has(token)) return 'session';
+  if (ROUTINE_TOKENS.has(token)) return 'routine';
+  return 'other';
+};
+
+const escalateRisk = (current: SqlRiskLevel, next: SqlRiskLevel): SqlRiskLevel => {
+  const order: SqlRiskLevel[] = ['none', 'low', 'medium', 'high', 'critical'];
+  return order.indexOf(next) > order.indexOf(current) ? next : current;
+};
+
+const hasWhereClause = (statement: string): boolean =>
+  /\bwhere\b/i.test(stripCommentsAndLiterals(statement));
+
+const normalizeLimit = (limit: unknown): number => {
+  const value = Math.floor(Number(limit) || SQL_PREVIEW_LIMIT);
+  if (value < 200) return 200;
+  if (value > 40000) return 40000;
+  return value;
+};
+
+const buildStatementRisk = (statement: string) => {
+  const token = resolveFirstToken(statement);
+  const activityKind = classifySqlActivity(token);
+  const normalized = stripCommentsAndLiterals(statement);
+  const warnings: string[] = [];
+  let riskLevel: SqlRiskLevel = 'low';
+
+  if (!token) {
+    riskLevel = 'none';
+    warnings.push('未识别到有效 SQL 操作关键字');
+  }
+  if (activityKind === 'write') {
+    riskLevel = escalateRisk(riskLevel, 'high');
+    warnings.push('该语句会修改数据，执行前应确认目标库、条件和影响范围');
+  }
+  if (activityKind === 'ddl') {
+    riskLevel = escalateRisk(riskLevel, 'high');
+    warnings.push('该语句会修改数据库结构或对象，建议先备份并确认回滚方案');
+  }
+  if (activityKind === 'routine') {
+    riskLevel = escalateRisk(riskLevel, 'medium');
+    warnings.push('该语句会调用例程或过程，可能存在隐式写入或副作用');
+  }
+  if (/^\s*delete\b/i.test(normalized) && !hasWhereClause(statement)) {
+    riskLevel = escalateRisk(riskLevel, 'critical');
+    warnings.push('DELETE 缺少 WHERE 条件，可能删除整表数据');
+  }
+  if (/^\s*update\b/i.test(normalized) && !hasWhereClause(statement)) {
+    riskLevel = escalateRisk(riskLevel, 'critical');
+    warnings.push('UPDATE 缺少 WHERE 条件，可能更新整表数据');
+  }
+  if (/\btruncate\s+(?:table\s+)?[A-Za-z0-9_`"[\].]+/i.test(normalized)) {
+    riskLevel = escalateRisk(riskLevel, 'critical');
+    warnings.push('TRUNCATE 会快速清空表数据，通常不可按行回滚');
+  }
+  if (/\bdrop\s+(database|schema|table|view|materialized\s+view)\b/i.test(normalized)) {
+    riskLevel = escalateRisk(riskLevel, 'critical');
+    warnings.push('DROP 会删除数据库对象，执行前必须确认对象和备份');
+  }
+  if (/\bgrant\b|\brevoke\b/i.test(normalized)) {
+    riskLevel = escalateRisk(riskLevel, 'high');
+    warnings.push('GRANT / REVOKE 会改变权限边界，应确认授权对象和范围');
+  }
+
+  return {
+    token,
+    activityKind,
+    riskLevel,
+    warnings,
+    preview: statement.trim().slice(0, 1000),
+    charCount: statement.trim().length,
+  };
+};
+
+const resolveActiveSqlSource = (params: {
+  sql?: string;
+  tabs?: TabData[];
+  activeTabId?: string | null;
+}) => {
+  const explicitSql = String(params.sql || '').trim();
+  if (explicitSql) {
+    return {
+      source: 'argument' as const,
+      sql: explicitSql,
+      activeTab: null as TabData | null,
+    };
+  }
+
+  const activeTab = (params.tabs || []).find((tab) => tab.id === params.activeTabId) || null;
+  const tabSql = activeTab?.type === 'query' ? String(activeTab.query || '').trim() : '';
+  return {
+    source: activeTab ? 'active_tab' as const : 'none' as const,
+    sql: tabSql,
+    activeTab,
+  };
+};
+
+export const buildSqlRiskSnapshot = (params: {
+  sql?: string;
+  previewCharLimit?: unknown;
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  connections: SavedConnection[];
+  safetyCheck?: SqlSafetyCheckResult;
+}) => {
+  const { source, sql, activeTab } = resolveActiveSqlSource({
+    sql: params.sql,
+    tabs: params.tabs,
+    activeTabId: params.activeTabId,
+  });
+  const previewLimit = normalizeLimit(params.previewCharLimit);
+  const connection = activeTab
+    ? params.connections.find((item) => item.id === activeTab.connectionId)
+    : undefined;
+
+  if (!sql) {
+    return {
+      hasSql: false,
+      source,
+      message: activeTab
+        ? '当前活动页签不是 SQL 查询页签，或编辑区没有 SQL 内容'
+        : '未传入 SQL，且当前没有可读取的活动 SQL 查询页签',
+      activeTab: activeTab ? {
+        id: activeTab.id,
+        title: activeTab.title,
+        type: activeTab.type,
+      } : null,
+      safetyCheck: params.safetyCheck || null,
+      riskLevel: 'none' as SqlRiskLevel,
+      warnings: [],
+      nextActions: ['先传入 sql 参数，或切换到包含 SQL 草稿的查询页签'],
+    };
+  }
+
+  const statements = findSqlStatementRanges(sql).map((range) => range.text.trim()).filter(Boolean);
+  const statementRisks = statements.map(buildStatementRisk);
+  let riskLevel: SqlRiskLevel = statements.length > 0 ? 'low' : 'none';
+  const warnings: string[] = [];
+
+  if (statements.length > 1) {
+    riskLevel = escalateRisk(riskLevel, 'medium');
+    warnings.push(`检测到 ${statements.length} 条 SQL 语句，批量执行前应逐条确认影响范围`);
+  }
+
+  for (const statementRisk of statementRisks) {
+    riskLevel = escalateRisk(riskLevel, statementRisk.riskLevel);
+    for (const warning of statementRisk.warnings) {
+      if (!warnings.includes(warning)) warnings.push(warning);
+    }
+  }
+
+  if (params.safetyCheck?.allowed === false) {
+    riskLevel = escalateRisk(riskLevel, 'high');
+    warnings.push(`当前 AI 安全策略不允许执行 ${params.safetyCheck.operationType || '该'} 类型 SQL`);
+  }
+
+  const activityKinds = Array.from(new Set(statementRisks.map((item) => item.activityKind)));
+  const requiresUserConfirmation = activityKinds.some((kind) => kind === 'write' || kind === 'ddl' || kind === 'routine')
+    || riskLevel === 'critical';
+
+  return {
+    hasSql: true,
+    source,
+    sqlPreview: sql.slice(0, previewLimit),
+    sqlCharCount: sql.length,
+    sqlTruncated: sql.length > previewLimit,
+    statementCount: statements.length,
+    activityKinds,
+    riskLevel,
+    requiresUserConfirmation,
+    safetyCheck: params.safetyCheck || null,
+    activeTab: activeTab ? {
+      id: activeTab.id,
+      title: activeTab.title,
+      type: activeTab.type,
+      connectionId: activeTab.connectionId,
+      connectionName: connection?.name || '',
+      connectionType: connection?.config?.type || '',
+      dbName: activeTab.dbName || '',
+      filePath: activeTab.filePath || '',
+      readOnly: activeTab.readOnly === true,
+    } : null,
+    statements: statementRisks,
+    warnings,
+    nextActions: warnings.length > 0
+      ? ['先向用户说明风险点，再要求用户确认是否继续', '写入或 DDL 语句应先确认 WHERE、备份、目标库和影响范围']
+      : ['只读查询风险较低，仍建议先核对目标连接和库名'],
+  };
+};
diff --git a/frontend/src/components/ai/aiSupportBundleInsights.ts b/frontend/src/components/ai/aiSupportBundleInsights.ts
new file mode 100644
index 0000000..9b7584e
--- /dev/null
+++ b/frontend/src/components/ai/aiSupportBundleInsights.ts
@@ -0,0 +1,179 @@
+import type {
+  AIChatMessage,
+  AIContextItem,
+  AIMCPClientInstallStatus,
+  AIMCPServerConfig,
+  AIMCPToolDescriptor,
+  AIProviderConfig,
+  AISafetyLevel,
+  AISkillConfig,
+  AIUserPromptSettings,
+  SavedConnection,
+  TabData,
+} from '../../types';
+import type { AIBuiltinToolInfo } from '../../utils/aiBuiltinToolInfo.types';
+import { buildAIAppHealthSnapshot } from './aiAppHealthInsights';
+import { buildAIMessageFlowSnapshot } from './aiChatSessionInsights';
+import { buildAIContextBudgetSnapshot } from './aiContextBudgetInsights';
+import { buildMCPRemoteAccessSnapshot } from './aiMCPRemoteAccessInsights';
+import { buildAIToolCatalogSnapshot } from './aiToolCatalogInsights';
+
+const appendUnique = (items: string[], value: string) => {
+  const trimmed = String(value || '').trim();
+  if (!trimmed || items.includes(trimmed)) {
+    return;
+  }
+  items.push(trimmed);
+};
+
+export const buildAISupportBundleSnapshot = (params: {
+  providers?: AIProviderConfig[];
+  activeProviderId?: string | null;
+  safetyLevel?: AISafetyLevel | string;
+  contextLevel?: string;
+  skills?: AISkillConfig[];
+  mcpServers?: AIMCPServerConfig[];
+  mcpClientStatuses?: AIMCPClientInstallStatus[];
+  mcpTools?: AIMCPToolDescriptor[];
+  dynamicModels?: string[];
+  builtinTools?: AIBuiltinToolInfo[];
+  builtinToolNames?: string[];
+  userPromptSettings?: AIUserPromptSettings;
+  activeContext?: { connectionId?: string | null; dbName?: string | null } | null;
+  aiContexts?: Record<string, AIContextItem[]>;
+  aiChatHistory?: Record<string, AIChatMessage[]>;
+  aiChatSessions?: Array<{ id: string; title: string; updatedAt: number }>;
+  activeSessionId?: string | null;
+  sessionId?: unknown;
+  connections?: SavedConnection[];
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  appLogReadResult?: any;
+  connectionFailureReadResult?: any;
+  lastRenderErrorSnapshot?: any;
+  keyword?: unknown;
+  connectionKeyword?: unknown;
+  lineLimit?: unknown;
+  includeLogLines?: boolean;
+  includeMessageContent?: boolean;
+  includeDetails?: boolean;
+  publicUrl?: string;
+  localAddr?: string;
+  path?: string;
+  exposeStrategy?: string;
+  tokenConfigured?: boolean;
+}) => {
+  const aiChatHistory = params.aiChatHistory || {};
+  const aiChatSessions = params.aiChatSessions || [];
+  const requestedSessionId = String(params.sessionId || params.activeSessionId || '').trim();
+  const appHealth = buildAIAppHealthSnapshot({
+    providers: params.providers,
+    activeProviderId: params.activeProviderId,
+    safetyLevel: params.safetyLevel,
+    contextLevel: params.contextLevel,
+    skills: params.skills,
+    mcpServers: params.mcpServers,
+    mcpClientStatuses: params.mcpClientStatuses,
+    mcpTools: params.mcpTools,
+    dynamicModels: params.dynamicModels,
+    builtinToolNames: params.builtinToolNames,
+    userPromptSettings: params.userPromptSettings,
+    activeContext: params.activeContext,
+    aiContexts: params.aiContexts,
+    connections: params.connections,
+    tabs: params.tabs,
+    activeTabId: params.activeTabId,
+    appLogReadResult: params.appLogReadResult,
+    connectionFailureReadResult: params.connectionFailureReadResult,
+    lastRenderErrorSnapshot: params.lastRenderErrorSnapshot,
+    keyword: params.keyword,
+    connectionKeyword: params.connectionKeyword,
+    lineLimit: params.lineLimit,
+    includeLogLines: params.includeLogLines === true,
+  });
+  const messageFlow = buildAIMessageFlowSnapshot({
+    aiChatSessions,
+    aiChatHistory,
+    activeSessionId: params.activeSessionId,
+    sessionId: requestedSessionId,
+    limit: 32,
+    includeContent: params.includeMessageContent === true,
+    previewLimit: 240,
+  });
+  const contextBudget = buildAIContextBudgetSnapshot({
+    aiContexts: params.aiContexts,
+    aiChatHistory,
+    aiChatSessions,
+    activeSessionId: params.activeSessionId,
+    sessionId: requestedSessionId,
+    messageLimit: 50,
+    includeDetails: params.includeDetails === true,
+    mcpTools: params.mcpTools,
+    skills: params.skills,
+    userPromptSettings: params.userPromptSettings,
+  });
+  const remoteAccess = buildMCPRemoteAccessSnapshot({
+    mcpClientStatuses: params.mcpClientStatuses,
+    publicUrl: params.publicUrl,
+    localAddr: params.localAddr,
+    path: params.path,
+    exposeStrategy: params.exposeStrategy,
+    tokenConfigured: params.tokenConfigured,
+  });
+  const toolCatalog = buildAIToolCatalogSnapshot({
+    builtinTools: params.builtinTools || [],
+    mcpTools: params.mcpTools,
+    keyword: String(params.keyword || 'ai mcp 日志 连接 上下文').trim(),
+    includeMCPTools: true,
+    limit: 10,
+  });
+
+  const warnings: string[] = [];
+  const nextActions: string[] = [];
+  appHealth.warnings.forEach((item) => appendUnique(warnings, item));
+  contextBudget.warnings.forEach((item) => appendUnique(warnings, item));
+  messageFlow.warnings.forEach((item) => appendUnique(warnings, item));
+  remoteAccess.warnings.forEach((item) => appendUnique(warnings, item));
+  appHealth.nextActions.forEach((item) => appendUnique(nextActions, item));
+  contextBudget.nextActions.forEach((item) => appendUnique(nextActions, item));
+  messageFlow.nextActions.forEach((item) => appendUnique(nextActions, item));
+  remoteAccess.nextActions.forEach((item) => appendUnique(nextActions, item));
+
+  return {
+    kind: 'ai_support_bundle',
+    message: '已生成 GoNavi AI 支持包快照，可用于排查 AI、MCP、日志、连接和上下文体量问题',
+    privacy: {
+      databasePasswordsIncluded: false,
+      providerSecretsIncluded: false,
+      mcpEnvValuesIncluded: false,
+      logLinesIncluded: params.includeLogLines === true,
+      messageContentIncluded: params.includeMessageContent === true,
+      note: '默认只返回摘要和结构化计数；只有显式开启 includeLogLines/includeMessageContent 时才附带日志或消息内容预览。',
+    },
+    summary: {
+      appHealthStatus: appHealth.status,
+      appHealthReady: appHealth.ready,
+      aiSetupStatus: appHealth.summary.aiSetupStatus,
+      chatReady: appHealth.summary.chatReady,
+      contextRiskLevel: contextBudget.riskLevel,
+      estimatedInputChars: contextBudget.estimatedInputChars,
+      messageFlowWarningCount: messageFlow.warnings.length,
+      unresolvedToolCallCount: messageFlow.unresolvedToolCallCount,
+      consecutiveAssistantPairCount: messageFlow.consecutiveAssistantPairCount,
+      appLogErrorCount: appHealth.summary.appLogErrorCount,
+      appLogWarnCount: appHealth.summary.appLogWarnCount,
+      recentConnectionFailureCount: appHealth.summary.recentConnectionFailureCount,
+      mcpServerCount: appHealth.summary.mcpServerCount,
+      discoveredMCPToolCount: appHealth.summary.discoveredMCPToolCount,
+      remoteMCPPublicUrl: remoteAccess.endpoint.publicUrl,
+      toolCatalogReturned: toolCatalog.returned,
+    },
+    warnings,
+    nextActions,
+    appHealth,
+    messageFlow,
+    contextBudget,
+    remoteAccess,
+    toolCatalog,
+  };
+};
diff --git a/frontend/src/components/ai/aiSystemContextMessages.test.ts b/frontend/src/components/ai/aiSystemContextMessages.test.ts
new file mode 100644
index 0000000..f6eb013
--- /dev/null
+++ b/frontend/src/components/ai/aiSystemContextMessages.test.ts
@@ -0,0 +1,145 @@
+import { describe, expect, it } from 'vitest';
+
+import type {
+  AISkillConfig,
+  AIUserPromptSettings,
+  SavedConnection,
+  TabData,
+} from '../../types';
+import { buildAISystemContextMessages } from './aiSystemContextMessages';
+
+const userPromptSettings: AIUserPromptSettings = {
+  global: '回答前先核对上下文。',
+  database: '生成 SQL 时保持只读优先。',
+  jvm: '解释 JVM 资源时先说风险。',
+  jvmDiagnostic: '诊断命令必须说明预期信号。',
+};
+
+const connections: SavedConnection[] = [
+  {
+    id: 'conn-1',
+    name: '本地开发库',
+    config: {
+      type: 'mysql',
+      host: '127.0.0.1',
+      port: 3306,
+      user: 'root',
+    },
+  },
+  {
+    id: 'jvm-1',
+    name: 'JVM 诊断环境',
+    config: {
+      type: 'jvm',
+      host: '10.0.0.8',
+      port: 0,
+      user: '',
+      jvm: {
+        environment: 'uat',
+        readOnly: true,
+        diagnostic: {
+          transport: 'agent-bridge',
+          allowObserveCommands: true,
+          allowTraceCommands: false,
+          allowMutatingCommands: false,
+        },
+      },
+    },
+  },
+];
+
+describe('buildAISystemContextMessages', () => {
+  it('adds database workspace inspection guidance plus custom prompts and eligible skills', () => {
+    const skills: AISkillConfig[] = [
+      {
+        id: 'skill-1',
+        name: '结构审查',
+        description: '优先核对结构',
+        systemPrompt: '先看字段和索引，再给结论。',
+        enabled: true,
+        scopes: ['database'],
+        requiredTools: ['inspect_workspace_tabs', 'get_columns'],
+      },
+    ];
+
+    const messages = buildAISystemContextMessages({
+      activeContext: null,
+      aiContexts: {},
+      connections: [connections[0]],
+      tabs: [],
+      activeTabId: null,
+      availableToolNames: ['inspect_workspace_tabs', 'inspect_app_health', 'inspect_ai_support_bundle', 'inspect_ai_setup_health', 'inspect_ai_runtime', 'inspect_ai_safety', 'inspect_ai_providers', 'inspect_ai_chat_readiness', 'inspect_ai_upstream_logs', 'inspect_ai_tool_catalog', 'inspect_mcp_setup', 'inspect_mcp_runtime_failures', 'inspect_mcp_authoring_guide', 'inspect_mcp_draft', 'inspect_mcp_tool_schema', 'inspect_ai_guidance', 'inspect_ai_context', 'inspect_current_connection', 'inspect_connection_capabilities', 'inspect_saved_connections', 'inspect_external_sql_directories', 'inspect_external_sql_file', 'inspect_recent_sql_activity', 'inspect_sql_editor_transaction', 'inspect_sql_risk', 'inspect_recent_connection_failures', 'inspect_app_logs', 'inspect_ai_last_render_error', 'inspect_ai_message_flow', 'inspect_ai_context_budget', 'inspect_codebase_hotspots', 'inspect_saved_queries', 'inspect_ai_sessions', 'inspect_sql_snippets', 'inspect_shortcuts', 'get_columns'],
+      skills,
+      userPromptSettings,
+    });
+
+    const joined = messages.map((message) => message.content).join('\n');
+    expect(joined).toContain('inspect_workspace_tabs 盘点当前工作区');
+    expect(joined).toContain('inspect_app_health 获取 AI 配置、应用日志、连接失败、回复气泡渲染异常和工作区页签的全局健康总览');
+    expect(joined).toContain('inspect_ai_support_bundle 生成不含密钥和数据库密码的支持包');
+    expect(joined).toContain('inspect_ai_setup_health 先拿到整体现状');
+    expect(joined).toContain('inspect_ai_runtime 读取当前 AI 运行状态');
+    expect(joined).toContain('inspect_ai_safety 读取真实安全边界');
+    expect(joined).toContain('inspect_ai_providers 读取真实供应商配置');
+    expect(joined).toContain('inspect_ai_chat_readiness 读取真实发送前置状态');
+    expect(joined).toContain('inspect_ai_upstream_logs 读取脱敏后的真实请求日志');
+    expect(joined).toContain('inspect_ai_tool_catalog 按关键词读取真实工具目录');
+    expect(joined).toContain('inspect_mcp_setup 读取真实 MCP 配置');
+    expect(joined).toContain('inspect_mcp_runtime_failures 读取真实 MCP 运行期失败日志');
+    expect(joined).toContain('inspect_mcp_authoring_guide 读取真实新增指引和模板');
+    expect(joined).toContain('inspect_mcp_draft 返回自动拆分、启动预览、suggestedServerSeed、配置错误/告警和 nextActions');
+    expect(joined).toContain('inspect_mcp_tool_schema 读取真实 inputSchema');
+    expect(joined).toContain('inspect_ai_guidance 读取真实提示与技能配置');
+    expect(joined).toContain('inspect_ai_context 读取当前挂载的表结构上下文');
+    expect(joined).toContain('inspect_current_connection');
+    expect(joined).toContain('inspect_connection_capabilities');
+    expect(joined).toContain('inspect_saved_connections');
+    expect(joined).toContain('inspect_external_sql_directories');
+    expect(joined).toContain('inspect_external_sql_file');
+    expect(joined).toContain('inspect_recent_sql_activity');
+    expect(joined).toContain('inspect_sql_editor_transaction 读取真实提交设置');
+    expect(joined).toContain('inspect_sql_risk');
+    expect(joined).toContain('inspect_recent_connection_failures 读取真实连接失败总结');
+    expect(joined).toContain('inspect_app_logs 读取真实应用日志尾部');
+    expect(joined).toContain('inspect_ai_last_render_error 读取最近一次被隔离的前端渲染异常记录');
+    expect(joined).toContain('inspect_ai_message_flow 读取当前会话的真实消息结构');
+    expect(joined).toContain('inspect_ai_context_budget 读取消息、DDL、MCP schema、提示词和 Skills 的体量风险');
+    expect(joined).toContain('inspect_codebase_hotspots 读取大文件热点');
+    expect(joined).toContain('inspect_saved_queries');
+    expect(joined).toContain('inspect_ai_sessions');
+    expect(joined).toContain('inspect_sql_snippets');
+    expect(joined).toContain('inspect_shortcuts 读取真实快捷键配置和平台差异');
+    expect(joined).toContain('当前连接');
+    expect(joined).toContain('以下是当前用户的自定义补充提示词（全局）');
+    expect(joined).toContain('以下是当前用户的自定义补充提示词（数据库会话）');
+    expect(joined).toContain('以下是当前启用的 Skill「结构审查」');
+  });
+
+  it('builds the JVM diagnostic prompt when the active tab is a diagnostic workspace', () => {
+    const tabs: TabData[] = [
+      {
+        id: 'diag-tab-1',
+        title: 'JVM 诊断',
+        type: 'jvm-diagnostic',
+        connectionId: 'jvm-1',
+      },
+    ];
+
+    const messages = buildAISystemContextMessages({
+      activeContext: null,
+      aiContexts: {},
+      connections,
+      tabs,
+      activeTabId: 'diag-tab-1',
+      availableToolNames: [],
+      skills: [],
+      userPromptSettings,
+    });
+
+    expect(messages).toHaveLength(3);
+    expect(messages[0].content).toContain('你是 GoNavi 的 JVM 诊断助手');
+    expect(messages[0].content).toContain('transport 必须填写当前值 agent-bridge');
+    expect(messages[1].content).toContain('以下是当前用户的自定义补充提示词（全局）');
+    expect(messages[2].content).toContain('以下是当前用户的自定义补充提示词（JVM 诊断）');
+  });
+});
diff --git a/frontend/src/components/ai/aiSystemContextMessages.ts b/frontend/src/components/ai/aiSystemContextMessages.ts
new file mode 100644
index 0000000..43d28ba
--- /dev/null
+++ b/frontend/src/components/ai/aiSystemContextMessages.ts
@@ -0,0 +1,317 @@
+import type {
+  AIContextItem,
+  AISkillConfig,
+  AIUserPromptSettings,
+  ConnectionConfig,
+  JVMAIPlanContext,
+  JVMDiagnosticPlanContext,
+  SavedConnection,
+  TabData,
+} from '../../types';
+import {
+  appendDatabaseInspectionGuidanceMessages,
+  appendJVMInspectionGuidanceMessages,
+} from './aiSystemInspectionGuidance';
+
+export interface AISystemContextMessage {
+  role: 'system';
+  content: string;
+  images?: string[];
+}
+
+interface BuildAISystemContextMessagesOptions {
+  activeContext: { connectionId: string; dbName: string } | null;
+  aiContexts: Record<string, AIContextItem[]>;
+  connections: SavedConnection[];
+  tabs: TabData[];
+  activeTabId: string | null;
+  availableToolNames: string[];
+  skills: AISkillConfig[];
+  userPromptSettings: AIUserPromptSettings;
+  overrideJVMPlanContext?: JVMAIPlanContext;
+  overrideJVMDiagnosticPlanContext?: JVMDiagnosticPlanContext;
+}
+
+const appendCustomPrompt = (
+  messages: AISystemContextMessage[],
+  label: string,
+  content: string,
+) => {
+  const trimmed = String(content || '').trim();
+  if (!trimmed) {
+    return;
+  }
+  messages.push({
+    role: 'system',
+    content: `以下是当前用户的自定义补充提示词（${label}）。在不违反安全规则和事实约束的前提下，请优先遵循：\n${trimmed}`,
+  });
+};
+
+const appendCustomPromptGroup = (
+  messages: AISystemContextMessage[],
+  prompts: string[],
+  userPromptSettings: AIUserPromptSettings,
+) => {
+  appendCustomPrompt(messages, '全局', userPromptSettings.global);
+  prompts.forEach((prompt) => {
+    if (prompt === 'database') {
+      appendCustomPrompt(messages, '数据库会话', userPromptSettings.database);
+    } else if (prompt === 'jvm') {
+      appendCustomPrompt(messages, 'JVM 资源分析', userPromptSettings.jvm);
+    } else if (prompt === 'jvmDiagnostic') {
+      appendCustomPrompt(messages, 'JVM 诊断', userPromptSettings.jvmDiagnostic);
+    }
+  });
+};
+
+const appendSkillPromptGroup = (
+  messages: AISystemContextMessage[],
+  scopes: string[],
+  skills: AISkillConfig[],
+  availableToolNames: string[],
+) => {
+  const wantedScopes = new Set<string>(['global', ...scopes]);
+  const availableToolNameSet = new Set(availableToolNames);
+  skills.forEach((skill) => {
+    if (!skill?.enabled) {
+      return;
+    }
+    if (!Array.isArray(skill.scopes) || !skill.scopes.some((scope) => wantedScopes.has(scope))) {
+      return;
+    }
+    if (Array.isArray(skill.requiredTools) && skill.requiredTools.length > 0) {
+      const hasAllRequiredTools = skill.requiredTools.every((toolName) => availableToolNameSet.has(toolName));
+      if (!hasAllRequiredTools) {
+        return;
+      }
+    }
+    const promptText = String(skill.systemPrompt || '').trim();
+    if (!promptText) {
+      return;
+    }
+    const requiredToolText = Array.isArray(skill.requiredTools) && skill.requiredTools.length > 0
+      ? `\n依赖工具：${skill.requiredTools.join(', ')}`
+      : '';
+    messages.push({
+      role: 'system',
+      content: `以下是当前启用的 Skill「${skill.name}」${skill.description ? `（${skill.description}）` : ''}。请在本次回答中遵循它的约束和工作方式：${requiredToolText}\n${promptText}`,
+    });
+  });
+};
+
+const resolveDatabaseDisplayType = (config: ConnectionConfig | undefined): string => {
+  const dbType = config?.type || 'unknown';
+  return dbType === 'diros' ? 'Doris' : dbType.charAt(0).toUpperCase() + dbType.slice(1);
+};
+
+const resolveActiveTab = (params: {
+  tabs: TabData[];
+  connections: SavedConnection[];
+  activeTabId: string | null;
+  overrideJVMPlanContext?: JVMAIPlanContext;
+  overrideJVMDiagnosticPlanContext?: JVMDiagnosticPlanContext;
+}) => {
+  const {
+    tabs,
+    connections,
+    activeTabId,
+    overrideJVMPlanContext,
+    overrideJVMDiagnosticPlanContext,
+  } = params;
+
+  const matchesDiagnosticContext = (tab: TabData) => {
+    if (!overrideJVMDiagnosticPlanContext || tab.type !== 'jvm-diagnostic') {
+      return false;
+    }
+    const tabConnection = connections.find((connection) => connection.id === tab.connectionId);
+    const tabTransport = tabConnection?.config?.jvm?.diagnostic?.transport || 'agent-bridge';
+    return (
+      tab.connectionId === overrideJVMDiagnosticPlanContext.connectionId &&
+      tabTransport === overrideJVMDiagnosticPlanContext.transport
+    );
+  };
+
+  if (overrideJVMDiagnosticPlanContext) {
+    return (
+      tabs.find((tab) => tab.id === overrideJVMDiagnosticPlanContext.tabId && matchesDiagnosticContext(tab)) ||
+      tabs.find((tab) => matchesDiagnosticContext(tab))
+    );
+  }
+
+  if (overrideJVMPlanContext) {
+    return (
+      tabs.find((tab) => tab.id === overrideJVMPlanContext.tabId) ||
+      tabs.find(
+        (tab) =>
+          tab.type === 'jvm-resource' &&
+          tab.connectionId === overrideJVMPlanContext.connectionId &&
+          tab.providerMode === overrideJVMPlanContext.providerMode &&
+          String(tab.resourcePath || '').trim() === overrideJVMPlanContext.resourcePath,
+      )
+    );
+  }
+
+  return tabs.find((tab) => tab.id === activeTabId);
+};
+
+export function buildAISystemContextMessages({
+  activeContext,
+  aiContexts,
+  connections,
+  tabs,
+  activeTabId,
+  availableToolNames,
+  skills,
+  userPromptSettings,
+  overrideJVMPlanContext,
+  overrideJVMDiagnosticPlanContext,
+}: BuildAISystemContextMessagesOptions): AISystemContextMessage[] {
+  const connectionKey = activeContext?.connectionId ? `${activeContext.connectionId}:${activeContext.dbName || ''}` : 'default';
+  const activeContextItems = aiContexts[connectionKey] || [];
+  const systemMessages: AISystemContextMessage[] = [];
+  const activeTab = resolveActiveTab({
+    tabs,
+    connections,
+    activeTabId,
+    overrideJVMPlanContext,
+    overrideJVMDiagnosticPlanContext,
+  });
+  const activeConnection = activeTab?.connectionId
+    ? connections.find((connection) => connection.id === activeTab.connectionId)
+    : undefined;
+
+  if (
+    activeTab &&
+    activeTab.type === 'jvm-diagnostic' &&
+    activeConnection?.config?.type === 'jvm'
+  ) {
+    const diagnostic = activeConnection.config.jvm?.diagnostic;
+    const diagnosticTransport = overrideJVMDiagnosticPlanContext?.transport || diagnostic?.transport || 'agent-bridge';
+    const readOnly = activeConnection.config.jvm?.readOnly !== false;
+    const environment = activeConnection.config.jvm?.environment || 'unknown';
+    systemMessages.push({
+      role: 'system',
+      content: `你是 GoNavi 的 JVM 诊断助手。当前页签是 Arthas 兼容诊断工作台，目标是输出可回填到诊断控制台的结构化诊断计划。
+
+当前连接：${activeConnection.name}
+目标主机：${activeConnection.config.host || '-'}
+诊断 transport：${diagnosticTransport}
+运行环境：${environment}
+连接策略：${readOnly ? '默认按只读诊断思路回答，只生成观察、trace、排障命令，不要假设已经执行。' : '允许生成诊断命令，但仍然必须先给计划，再由用户决定是否执行。'}
+命令权限：observe=${diagnostic?.allowObserveCommands !== false ? '允许' : '禁止'}，trace=${diagnostic?.allowTraceCommands === true ? '允许' : '禁止'}，mutating=${diagnostic?.allowMutatingCommands === true ? '允许' : '禁止'}
+
+回答规则：
+1. 可以先给一小段分析，但必须包含且只包含一个 \`\`\`json 代码块。
+2. JSON 字段严格限定为 intent、transport、command、riskLevel、reason、expectedSignals。
+3. transport 必须填写当前值 ${diagnosticTransport}，不要编造其他 transport。
+4. command 必须是单条诊断命令，不要带 shell 提示符、换行拼接、多条命令或代码围栏。
+5. riskLevel 只能是 low、medium、high。
+6. expectedSignals 必须是字符串数组，描述执行后需要重点观察的信号。
+7. 如果命令权限不允许某类操作，就不要输出该类命令；无法满足时直接说明限制。`,
+    });
+    appendJVMInspectionGuidanceMessages(systemMessages, availableToolNames);
+    appendCustomPromptGroup(systemMessages, ['jvmDiagnostic'], userPromptSettings);
+    appendSkillPromptGroup(systemMessages, ['jvmDiagnostic'], skills, availableToolNames);
+    return systemMessages;
+  }
+
+  if (
+    activeTab &&
+    (activeTab.type === 'jvm-resource' || activeTab.type === 'jvm-overview' || activeTab.type === 'jvm-audit') &&
+    activeConnection?.config?.type === 'jvm'
+  ) {
+    const providerMode = activeTab.providerMode || activeConnection.config.jvm?.preferredMode || 'jmx';
+    const resourcePath = activeTab.resourcePath || '';
+    const readOnly = activeConnection.config.jvm?.readOnly !== false;
+    const environment = activeConnection.config.jvm?.environment || 'unknown';
+    systemMessages.push({
+      role: 'system',
+      content: `你是 GoNavi 的 JVM 运行时分析助手。当前上下文不是 SQL，而是 JVM 资源工作台。
+
+当前连接：${activeConnection.name}
+目标主机：${activeConnection.config.host || '-'}
+Provider 模式：${providerMode}
+运行环境：${environment}
+连接策略：${readOnly ? '只读连接，只能分析和生成变更计划，绝不能假设已执行写入。' : '可写连接，但任何修改都必须先生成预览并等待人工确认。'}
+${resourcePath ? `当前资源路径：${resourcePath}` : '当前未选中具体资源路径。'}
+
+回答规则：
+1. 你可以解释资源结构、风险、修改建议和回滚建议。
+2. 如果用户要求生成 JVM 修改方案，必须输出一个唯一的 \`\`\`json 代码块，并且 JSON 字段严格限定为 targetType、selector、action、payload、reason。
+3. action 优先使用当前资源快照或元数据里已经声明的 supportedActions；如果当前资源没有声明，再基于快照内容谨慎推断。
+4. selector.resourcePath 优先使用当前资源路径；如果当前路径未知，就明确说明无法精确定位，不要编造路径。
+5. payload 只能使用 {"format":"json","value":{...}} 或 {"format":"text","value":"..."} 这两种包装形式，不要输出脚本、命令或裸值。
+6. 不要输出脚本、命令或“已经执行成功”之类的表述。`,
+    });
+    appendJVMInspectionGuidanceMessages(systemMessages, availableToolNames);
+    appendCustomPromptGroup(systemMessages, ['jvm'], userPromptSettings);
+    appendSkillPromptGroup(systemMessages, ['jvm'], skills, availableToolNames);
+    return systemMessages;
+  }
+
+  let targetConnId = activeContext?.connectionId;
+  let targetDbName = activeContext?.dbName;
+  if (!targetConnId || !targetDbName) {
+    if (activeTab && activeTab.connectionId && activeTab.dbName) {
+      targetConnId = activeTab.connectionId;
+      targetDbName = activeTab.dbName;
+    }
+  }
+
+  if (activeContextItems.length > 0) {
+    const connection = connections.find((item) => item.id === targetConnId);
+    const dbDisplayType = resolveDatabaseDisplayType(connection?.config);
+    const ddlChunks = activeContextItems.map((item) => `-- Table: ${item.dbName}.${item.tableName}\n${item.ddl}`).join('\n\n');
+    systemMessages.push({
+      role: 'system',
+      content: `你是一个专业的数据库助手。当前连接的数据库类型是 ${dbDisplayType}。请使用 ${dbDisplayType} 方言生成 SQL。以下是用户关联的表结构信息，请在回答时优先参考：\n\n${ddlChunks}`,
+    });
+  } else if (targetConnId && targetDbName) {
+    const connection = connections.find((item) => item.id === targetConnId);
+    const dbDisplayType = resolveDatabaseDisplayType(connection?.config);
+    systemMessages.push({
+      role: 'system',
+      content: `你是一个专业的数据库助手。当前连接的数据库类型是 ${dbDisplayType}，当前数据库名为 ${targetDbName}。如果用户需要查询特定的表或者有关当前库的信息，你可以调用提供的 get_tables 工具来主动获取数据表信息。`,
+    });
+  } else {
+    const connList = connections.map((connection) => `{id: "${connection.id}", name: "${connection.name}", type: "${connection.config?.type || 'unknown'}"}`).join(', ');
+    systemMessages.push({
+      role: 'system',
+      content: `你是一个专业的数据库助手。用户目前在界面上没有选中任何具体的数据库或数据表用于充当上下文。
+
+重要规则：
+1. 如果你需要帮用户寻找目标表，千万不要凭空猜测表名！必须调用工具去获取真实数据。
+2. 完整工作流程：get_connections → get_databases → get_tables → get_columns → 生成 SQL。每一步都不可跳过。
+3. 【连接优先级 - 极重要】获取连接列表后，必须按以下优先级依次检索：
+   - 第一优先：host 为 localhost、127.0.0.1、或包含"本地"的连接
+   - 第二优先：name 或 host 包含"开发"、"dev"、"local" 的连接，或 host 为 10.x、192.168.x、172.16-31.x 等内网 IP 的连接
+   - 第三优先：其他连接（如"测试"、"生产"等）
+   如果在高优先级连接中已找到目标表，直接使用该连接，不再查找低优先级连接。
+4. 如果在当前数据库中未找到目标表，必须继续查询其他数据库，不要放弃。
+5. 只有当所有可能的数据库都已检查完毕，或者已经明确找到目标表时，才可以停止。
+6. 如果是常规问答（不涉及数据库查询）则正常作答即可。
+
+SQL 生成规则（极重要，必须严格遵守）：
+7. 如果用户提到“当前页签”“当前 SQL”“当前编辑器”“这条语句”，但消息里没有贴出具体内容，优先调用 inspect_active_tab 读取当前活动页签上下文，不要猜测当前工作区里打开的内容。
+8. 如果用户提到“当前开了哪些页签”“工作区里有哪些 tab”“我现在打开了哪些查询”，优先调用 inspect_workspace_tabs 盘点当前工作区，再决定深入哪个页签。
+9. 【字段精确性 - 绝对红线】生成 SQL 之前，必须先调用 get_columns 获取目标表的真实字段列表。SQL 中的每一个字段名必须与 get_columns 返回的 field 字段完全一致（区分大小写）。不得自行拼凑、缩写或联想字段名（例如字段是 channel 就必须写 channel，不得写成 pay_channel）。
+10. 如果用户在问索引优化、联表关系、触发器副作用、约束或 DDL 细节，在 get_columns 之后继续按需调用 get_indexes、get_foreign_keys、get_triggers、get_table_ddl，再给结论。
+11. 生成 SQL 时禁止使用 "database.table" 格式的限定前缀，只写表名本身。
+12. 报告结果时，连接名/ID 和数据库名必须严格来自同一个 get_tables 调用的实际参数。禁止将 A 连接的 connectionId 与 B 连接的 dbName 混搭。
+13. 如果有多个名称相似的数据库，请明确告诉用户目标表具体位于哪个数据库。
+14. 【关键】每个 SQL 代码块的第一行必须添加上下文声明注释，格式严格为：-- @context connectionId=<连接ID> dbName=<数据库名>。connectionId 和 dbName 必须来自同一个成功的 get_tables 调用（即你在该调用中传入的实际参数值）。示例：
+\`\`\`sql
+-- @context connectionId=1770778676549 dbName=mkefu_test
+SELECT * FROM users WHERE status = 1;
+\`\`\`
+
+当前存在的连接：[${connList || '无连接'}]`,
+    });
+  }
+
+  appendDatabaseInspectionGuidanceMessages(systemMessages, availableToolNames);
+
+  appendCustomPromptGroup(systemMessages, ['database'], userPromptSettings);
+  appendSkillPromptGroup(systemMessages, ['database'], skills, availableToolNames);
+  return systemMessages;
+}
diff --git a/frontend/src/components/ai/aiSystemInspectionGuidance.ts b/frontend/src/components/ai/aiSystemInspectionGuidance.ts
new file mode 100644
index 0000000..86420ab
--- /dev/null
+++ b/frontend/src/components/ai/aiSystemInspectionGuidance.ts
@@ -0,0 +1,251 @@
+import type { AISystemContextMessage } from './aiSystemContextMessages';
+
+const appendGuidanceIfToolAvailable = (
+  messages: AISystemContextMessage[],
+  availableToolNames: string[],
+  toolName: string,
+  content: string,
+) => {
+  if (!availableToolNames.includes(toolName)) {
+    return;
+  }
+  messages.push({ role: 'system', content });
+};
+
+const appendAIRuntimeInspectionGuidance = (
+  messages: AISystemContextMessage[],
+  availableToolNames: string[],
+) => {
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_runtime',
+    '如果用户提到“你现在用的哪个模型”“当前安全级别”“你现在能调用什么工具”“当前启用了哪些 skills / MCP 工具”，优先调用 inspect_ai_runtime 读取当前 AI 运行状态，不要凭记忆或假设回答。',
+  );
+};
+
+const appendAISafetyInspectionGuidance = (
+  messages: AISystemContextMessage[],
+  availableToolNames: string[],
+) => {
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_safety',
+    '如果用户提到“为什么现在不能写”“当前是不是只读”“DDL 能不能执行”“allowMutating 要不要传”，优先调用 inspect_ai_safety 读取真实安全边界，不要只凭界面现象或记忆猜测。',
+  );
+};
+
+export const appendJVMInspectionGuidanceMessages = (
+  messages: AISystemContextMessage[],
+  availableToolNames: string[],
+) => {
+  appendAIRuntimeInspectionGuidance(messages, availableToolNames);
+  appendAISafetyInspectionGuidance(messages, availableToolNames);
+};
+
+export const appendDatabaseInspectionGuidanceMessages = (
+  messages: AISystemContextMessage[],
+  availableToolNames: string[],
+) => {
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_context',
+    '如果用户提到“当前 AI 上下文”“当前关联了哪些表”“现在带了哪些表结构”，优先调用 inspect_ai_context 读取当前挂载的表结构上下文，不要凭记忆复述。',
+  );
+  appendAIRuntimeInspectionGuidance(messages, availableToolNames);
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_app_health',
+    '如果用户提到“AI 不稳定”“整体帮我看看”“GoNavi AI 现在还有哪些明显问题”“连接、MCP、日志一起排查”或“AI 回复气泡显示异常”，优先调用 inspect_app_health 获取 AI 配置、应用日志、连接失败、回复气泡渲染异常和工作区页签的全局健康总览，再决定下钻 inspect_ai_setup_health、inspect_app_logs、inspect_recent_connection_failures 或 inspect_ai_last_render_error。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_support_bundle',
+    '如果用户提到“AI 不成熟/不稳定”“帮我导出排障材料”“MCP、连接、日志、上下文一起看”或准备把问题交给开发定位，优先调用 inspect_ai_support_bundle 生成不含密钥和数据库密码的支持包，再根据 warnings 和 nextActions 下钻。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_tool_catalog',
+    '如果用户问题横跨多个功能、你不确定该先调用哪个内置工具，或用户问“你有哪些工具/这个工具参数怎么填/某类问题该用哪个探针”，优先调用 inspect_ai_tool_catalog 按关键词读取真实工具目录、推荐流程和参数提示，再选择具体探针。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_setup_health',
+    '如果用户提到“AI 为什么不好用”“帮我体检一下当前 AI 配置”“当前 AI 整体还有哪些明显问题”，优先调用 inspect_ai_setup_health 先拿到整体现状，再按需下钻 inspect_ai_providers、inspect_ai_chat_readiness、inspect_mcp_setup 或 inspect_ai_guidance。',
+  );
+  appendAISafetyInspectionGuidance(messages, availableToolNames);
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_chat_readiness',
+    '如果用户提到“为什么现在不能发送”“当前 AI 聊天到底缺什么配置”“输入区准备好了没有”，优先调用 inspect_ai_chat_readiness 读取真实发送前置状态，不要只凭界面现象或记忆判断。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_upstream_logs',
+    '如果用户提到“AI 上游请求”“请求入参/请求体”“requestId”“发给模型的 payload”“工具调用没触发”“上游接口报错具体传了什么”，优先调用 inspect_ai_upstream_logs 读取脱敏后的真实请求日志和 payload 结构摘要，再结合 inspect_ai_providers 或 inspect_ai_message_flow 继续定位。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_providers',
+    '如果用户提到“当前配了哪些供应商”“为什么模型列表为空”“API Key 有没有配”“为什么现在不能发送/没选中模型”，优先调用 inspect_ai_providers 读取真实供应商配置，不要凭记忆猜测。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_mcp_setup',
+    '如果用户提到“我现在配了哪些 MCP”“Claude/Codex 有没有接入 GoNavi MCP”“为什么外部客户端用不了”“当前 MCP 服务启用了哪些”，优先调用 inspect_mcp_setup 读取真实 MCP 配置和外部客户端接入状态，不要凭记忆猜测。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_mcp_runtime_failures',
+    '如果用户提到“新增 MCP 测试失败”“工具发现 0 个”“MCP 工具调用失败”“stdio 断开”“Docker MCP 退出”或“HTTP MCP 启动失败”，优先调用 inspect_mcp_runtime_failures 读取真实 MCP 运行期失败日志和当前服务发现状态，再决定是否下钻 inspect_mcp_draft、inspect_mcp_docker_setup 或 inspect_mcp_setup。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_mcp_authoring_guide',
+    '如果用户提到“新增 MCP 不知道 command/args/env/timeout 怎么填”“给我一个 node / uvx / python 模板”“为什么启动命令不能直接填整行”，优先调用 inspect_mcp_authoring_guide 读取真实新增指引和模板；如果用户已经贴出命令或草稿，再调用 inspect_mcp_draft 用真实校验器试算，不要凭记忆口述。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_mcp_draft',
+    '如果用户贴出 MCP README 启动命令、command/args/env/timeout 草稿，或问“这条 MCP 命令在 GoNavi 里怎么填”，优先调用 inspect_mcp_draft 返回自动拆分、启动预览、suggestedServerSeed、配置错误/告警和 nextActions，再给用户具体填写结果。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_mcp_tool_schema',
+    '如果用户提到“某个 MCP 工具参数怎么填”“MCP 工具调用报参数错误”“这个 MCP tool 的 arguments JSON 怎么写”，优先调用 inspect_mcp_tool_schema 读取真实 inputSchema；如果不知道 alias，先调用 inspect_mcp_setup 找到当前发现的工具 alias。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_guidance',
+    '如果用户提到“你现在带了哪些提示词”“当前生效的是哪些 Skills”“为什么你会这样回答”“当前数据库/JVM prompt 是什么”，优先调用 inspect_ai_guidance 读取真实提示与技能配置，不要凭记忆概括。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_shortcuts',
+    '如果用户提到“快捷键是什么”“Win 和 Mac 分别怎么按”“结果区/AI 面板/执行 SQL 的组合键”“我是不是改过默认快捷键”，优先调用 inspect_shortcuts 读取真实快捷键配置和平台差异，不要凭记忆回答默认值。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_recent_connection_failures',
+    '如果用户提到“为什么连接不上”“连接最近失败，正在冷却中”“验证失败”“SSH 隧道是不是有问题”“multiStatements / 参数兼容异常”，优先调用 inspect_recent_connection_failures 读取真实连接失败总结，再决定是否继续下钻 inspect_current_connection、inspect_saved_connections 或 inspect_app_logs。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_app_logs',
+    '如果用户提到“gonavi.log”“最近日志”“启动报错”“MCP 拉不起来”“数据库连接为什么失败”，优先调用 inspect_app_logs 读取真实应用日志尾部；必要时再结合关键词继续筛选，不要只凭弹窗或提示文案猜测。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_last_render_error',
+    '如果用户提到“AI 某条消息空白了”“某个气泡渲染失败”“消息块局部报错但面板没全挂”，优先调用 inspect_ai_last_render_error 读取最近一次被隔离的前端渲染异常记录，不要只凭截图现象猜测。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_message_flow',
+    '如果用户提到“AI 回复被拆成多个气泡”“工具调用后没继续回答”“消息流状态不对”“同一轮回答没有追加到同一个气泡”，优先调用 inspect_ai_message_flow 读取当前会话的真实消息结构、连续 assistant 消息和未闭环工具调用，不要只凭界面现象猜测。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_context_budget',
+    '如果用户提到“AI 变慢”“上下文太大”“表结构挂太多”“工具结果太长”“模型开始乱答”或复杂任务前需要判断是否该拆小上下文，优先调用 inspect_ai_context_budget 读取消息、DDL、MCP schema、提示词和 Skills 的体量风险，再决定收窄上下文或拆任务。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_codebase_hotspots',
+    '如果用户提到“几千行文件太臃肿”“继续拆分大组件”“下一步该拆哪个文件”“AI/MCP/UI 改动风险大不大”，优先调用 inspect_codebase_hotspots 读取大文件热点、建议拆分切片和测试目标，再制定改动范围。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_current_connection',
+    '如果用户提到“当前连接”“当前数据源”“我现在连的是哪个库/地址”“这个连接走没走 SSH/代理”，优先调用 inspect_current_connection 读取当前活动连接摘要，不要凭界面或记忆猜测。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_connection_capabilities',
+    '如果用户提到“为什么这里不能建库/删库/改库名”“为什么结果不能编辑”“这个数据源支持哪些前端动作”，优先调用 inspect_connection_capabilities 读取真实连接能力矩阵，不要凭数据库常识或记忆猜测。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_saved_connections',
+    '如果用户提到“本地存了哪些连接”“帮我找 mysql / postgres / redis 连接”“哪条连接配了 SSH/代理”，优先调用 inspect_saved_connections 读取真实本地连接清单，再决定继续查看哪条连接。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_redis_topology',
+    '如果用户提到“Redis 哨兵/集群”“Sentinel master”“Redis Cluster 多库”“切换 Redis DB 失败”“Redis 多节点怎么填”，优先调用 inspect_redis_topology 读取真实 Redis 拓扑、节点、认证状态和风险提示，不要凭默认端口或经验猜测。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_external_sql_directories',
+    '如果用户提到“外部 SQL 目录”“目录里的脚本”“某个 SQL 文件放在哪个目录”“当前打开的 SQL 文件来自哪里”，优先调用 inspect_external_sql_directories 读取真实外部 SQL 目录资产，再决定继续读取活动页签还是定位具体脚本。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_external_sql_file',
+    '如果用户已经给出了某个外部 SQL 文件路径，或明确提到“帮我看看这个目录里的 report.sql / job.sql 在写什么”，优先调用 inspect_external_sql_file 读取真实文件内容；如果这个文件已经在编辑器中打开，再结合 inspect_active_tab 看当前草稿。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_recent_sql_activity',
+    '如果用户提到“最近都执行了什么”“是不是刚删过数据”“最近主要在查还是在改”“哪个库最近报错最多”，优先调用 inspect_recent_sql_activity 先读最近 SQL 活动总结，再决定是否继续下钻 inspect_recent_sql_logs 看具体语句。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_sql_editor_transaction',
+    '如果用户提到“SQL 编辑器手动提交/自动提交”“当前有没有未提交事务”“执行 update/insert/delete 会不会自动提交”“事务语义是不是理解错了”，优先调用 inspect_sql_editor_transaction 读取真实提交设置、待提交事务和当前 SQL 页签是否会进入托管事务，不要凭记忆解释。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_sql_risk',
+    '如果用户要求你执行、删除、更新、DDL、批量 SQL，或问“这条 SQL 能不能跑/危险不危险”，优先调用 inspect_sql_risk 检查当前编辑区或传入 SQL 的语句数量、写入/DDL 风险、WHERE 条件和安全策略结果；发现 high/critical 风险时先解释风险并让用户确认，不要直接推进执行。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_saved_queries',
+    '如果用户提到“保存过的查询”“历史 SQL”“之前写过的语句”“帮我找以前那条脚本”，优先调用 inspect_saved_queries 读取本地已保存查询，再决定是否继续核对字段或复用 SQL。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_ai_sessions',
+    '如果用户提到“之前那条 AI 对话”“上次聊过的记录”“最近哪个会话说过这个问题”，优先调用 inspect_ai_sessions 读取本地 AI 会话清单和预览，再决定继续查看当前页签还是复用历史 SQL。',
+  );
+  appendGuidanceIfToolAvailable(
+    messages,
+    availableToolNames,
+    'inspect_sql_snippets',
+    '如果用户提到“SQL 片段”“snippet”“模板前缀”“常用模板”，优先调用 inspect_sql_snippets 读取本地 SQL 片段库，不要凭记忆编造现有模板。',
+  );
+};
diff --git a/frontend/src/components/ai/aiToolCatalogInsights.ts b/frontend/src/components/ai/aiToolCatalogInsights.ts
new file mode 100644
index 0000000..c1d60ce
--- /dev/null
+++ b/frontend/src/components/ai/aiToolCatalogInsights.ts
@@ -0,0 +1,193 @@
+import type { AIMCPToolDescriptor } from '../../types';
+import {
+  BUILTIN_TOOL_FLOWS,
+  describeBuiltinToolParameters,
+} from '../../utils/aiBuiltinToolCatalog';
+import type { AIBuiltinToolInfo } from '../../utils/aiBuiltinToolInfo.types';
+
+const DEFAULT_LIMIT = 12;
+const MAX_LIMIT = 40;
+
+const normalizeText = (value: unknown): string =>
+  String(value || '').trim().toLowerCase();
+
+const normalizeLimit = (value: unknown): number =>
+  Math.max(1, Math.min(MAX_LIMIT, Number(value) || DEFAULT_LIMIT));
+
+const matchesAnyText = (keyword: string, values: unknown[]): boolean =>
+  !keyword || values.some((value) => normalizeText(value).includes(keyword));
+
+const scoreKeywordMatch = (keyword: string, values: Array<{ value: unknown; weight: number }>): number =>
+  !keyword
+    ? 0
+    : values.reduce((score, item) => (
+        normalizeText(item.value).includes(keyword) ? score + item.weight : score
+      ), 0);
+
+const readMCPToolParameterSummary = (tool: AIMCPToolDescriptor) => {
+  const schema = tool.inputSchema && typeof tool.inputSchema === 'object'
+    ? tool.inputSchema as Record<string, any>
+    : {};
+  const properties = schema.properties && typeof schema.properties === 'object'
+    ? schema.properties as Record<string, any>
+    : {};
+  const required = Array.isArray(schema.required)
+    ? schema.required.map((item) => String(item)).filter(Boolean)
+    : [];
+
+  return {
+    hasInputSchema: Object.keys(schema).length > 0,
+    parameterCount: Object.keys(properties).length,
+    requiredParameters: required,
+  };
+};
+
+export const buildAIToolCatalogSnapshot = (params: {
+  builtinTools: AIBuiltinToolInfo[];
+  mcpTools?: AIMCPToolDescriptor[];
+  keyword?: string;
+  toolName?: string;
+  includeMCPTools?: boolean;
+  limit?: number;
+}) => {
+  const {
+    builtinTools,
+    mcpTools = [],
+    toolName = '',
+    includeMCPTools = true,
+  } = params;
+  const keyword = normalizeText(params.keyword);
+  const normalizedToolName = normalizeText(toolName);
+  const limit = normalizeLimit(params.limit);
+  const mcpKeyword = keyword || normalizedToolName;
+  const shouldReturnAllMCPTools = !mcpKeyword || mcpKeyword.includes('mcp') || mcpKeyword.includes('工具');
+
+  const matchedFlows = BUILTIN_TOOL_FLOWS
+    .filter((flow) => matchesAnyText(keyword, [flow.title, flow.steps, flow.description]))
+    .map((flow, index) => ({
+      flow,
+      index,
+      score: scoreKeywordMatch(keyword, [
+        { value: flow.title, weight: 100 },
+        { value: flow.steps, weight: 60 },
+        { value: flow.description, weight: 20 },
+      ]),
+    }))
+    .sort((left, right) => (right.score - left.score) || (left.index - right.index))
+    .map((item) => item.flow)
+    .slice(0, limit);
+
+  const matchedBuiltinTools = builtinTools
+    .filter((tool) => {
+      if (normalizedToolName) {
+        return normalizeText(tool.name) === normalizedToolName;
+      }
+      return matchesAnyText(keyword, [
+        tool.name,
+        tool.desc,
+        tool.detail,
+        tool.params,
+        ...describeBuiltinToolParameters(tool).flatMap((param) => [
+          param.name,
+          param.description,
+          param.enumValues.join(' '),
+        ]),
+      ]);
+    })
+    .map((tool, index) => ({
+      tool,
+      index,
+      score: normalizedToolName
+        ? 0
+        : scoreKeywordMatch(keyword, [
+            { value: tool.name, weight: 120 },
+            { value: tool.desc, weight: 100 },
+            { value: tool.params, weight: 60 },
+            { value: tool.detail, weight: 20 },
+            ...describeBuiltinToolParameters(tool).flatMap((param) => [
+              { value: param.name, weight: 40 },
+              { value: param.description, weight: 20 },
+              { value: param.enumValues.join(' '), weight: 20 },
+            ]),
+          ]),
+    }))
+    .sort((left, right) => (right.score - left.score) || (left.index - right.index))
+    .map((item) => item.tool)
+    .slice(0, limit)
+    .map((tool) => ({
+      name: tool.name,
+      desc: tool.desc,
+      detail: tool.detail,
+      params: tool.params,
+      parameters: describeBuiltinToolParameters(tool),
+    }));
+
+  const matchedMCPTools = includeMCPTools
+    ? mcpTools
+      .filter((tool) => shouldReturnAllMCPTools || matchesAnyText(mcpKeyword, [
+        tool.alias,
+        tool.originalName,
+        tool.title,
+        tool.description,
+        tool.serverId,
+        tool.serverName,
+      ]))
+      .slice(0, limit)
+      .map((tool) => ({
+        alias: tool.alias,
+        originalName: tool.originalName,
+        title: tool.title || tool.originalName || tool.alias,
+        description: tool.description || '',
+        serverId: tool.serverId,
+        serverName: tool.serverName,
+        ...readMCPToolParameterSummary(tool),
+      }))
+    : [];
+
+  const warnings: string[] = [];
+  const nextActions: string[] = [];
+
+  if (!keyword && !normalizedToolName) {
+    nextActions.push('先按用户问题关键词过滤，例如 mcp、连接失败、事务、快捷键、schema 或日志。');
+  }
+  if (includeMCPTools && mcpTools.length === 0) {
+    warnings.push('当前没有发现外部 MCP 工具；如果用户需要外部能力，先检查 MCP 服务配置和工具发现状态。');
+    nextActions.push('调用 inspect_mcp_setup 查看 MCP 服务和外部客户端接入状态。');
+  }
+  if (keyword && matchedFlows.length === 0 && matchedBuiltinTools.length === 0 && matchedMCPTools.length === 0) {
+    warnings.push('没有找到匹配的工具或推荐流程。');
+    nextActions.push('改用更宽泛关键词，或先调用 inspect_ai_runtime 查看当前完整工具清单。');
+  }
+  if (matchedBuiltinTools.some((tool) => tool.parameters.length > 0)) {
+    nextActions.push('调用带参数工具前，优先按 parameters.description 组装 arguments；缺少上下文时先向用户确认。');
+  }
+
+  return {
+    query: {
+      keyword: params.keyword || '',
+      toolName: toolName || '',
+      includeMCPTools,
+      limit,
+    },
+    totals: {
+      builtinToolCount: builtinTools.length,
+      flowCount: BUILTIN_TOOL_FLOWS.length,
+      mcpToolCount: Array.isArray(mcpTools) ? mcpTools.length : 0,
+    },
+    returned: {
+      flowCount: matchedFlows.length,
+      builtinToolCount: matchedBuiltinTools.length,
+      mcpToolCount: matchedMCPTools.length,
+    },
+    flows: matchedFlows,
+    builtinTools: matchedBuiltinTools,
+    mcpTools: matchedMCPTools,
+    warnings,
+    nextActions,
+    message: normalizedToolName
+      ? `已按工具名 ${toolName} 返回目录信息`
+      : keyword
+        ? `已按关键词 ${params.keyword} 返回工具目录建议`
+        : '已返回 GoNavi AI 工具目录摘要',
+  };
+};
diff --git a/frontend/src/components/ai/aiUpstreamLogInsights.ts b/frontend/src/components/ai/aiUpstreamLogInsights.ts
new file mode 100644
index 0000000..b9661ae
--- /dev/null
+++ b/frontend/src/components/ai/aiUpstreamLogInsights.ts
@@ -0,0 +1,413 @@
+const DEFAULT_AI_UPSTREAM_LOG_LIMIT = 160;
+const MAX_AI_UPSTREAM_LOG_LIMIT = 300;
+const DEFAULT_AI_UPSTREAM_REQUEST_LIMIT = 12;
+const MAX_AI_UPSTREAM_REQUEST_LIMIT = 40;
+const DEFAULT_AI_UPSTREAM_BODY_LIMIT = 6000;
+const MAX_AI_UPSTREAM_BODY_LIMIT = 12000;
+
+const secretLikeValuePatterns = [
+  /bearer\s+[a-z0-9._~+/=-]{8,}/gi,
+  /\bsk-[a-z0-9._-]{8,}/gi,
+  /\bgh[pousr]_[a-z0-9_]{8,}/gi,
+  /\bxox[baprs]-[a-z0-9-]{8,}/gi,
+];
+
+type AIUpstreamLogEventType = 'started' | 'completed' | 'failed' | 'other';
+
+interface AIUpstreamLogEvent {
+  type: AIUpstreamLogEventType;
+  requestId: string;
+  provider: string;
+  method: string;
+  endpoint: string;
+  status?: number;
+  duration?: string;
+  bodyPreview?: string;
+  bodySummary?: AIUpstreamPayloadSummary;
+  error?: string;
+  line: string;
+}
+
+interface AIUpstreamPayloadSummary {
+  parseable: boolean;
+  parseError?: string;
+  topLevelKeys?: string[];
+  model?: string;
+  messageCount?: number;
+  messageRoleCounts?: Record<string, number>;
+  toolCount?: number;
+  toolNames?: string[];
+  hasStream?: boolean;
+  hasToolChoice?: boolean;
+  hasResponseFormat?: boolean;
+  inputTextCharCount?: number;
+  warnings?: string[];
+}
+
+interface AIUpstreamRequestSummary {
+  requestId: string;
+  provider: string;
+  method: string;
+  endpoint: string;
+  state: 'started' | 'completed' | 'failed' | 'unknown';
+  status?: number;
+  duration?: string;
+  bodyPreview?: string;
+  bodySummary?: AIUpstreamPayloadSummary;
+  error?: string;
+  eventCount: number;
+  hasBody: boolean;
+}
+
+const clampNumber = (value: unknown, fallback: number, min: number, max: number): number => {
+  const normalized = Math.floor(Number(value) || fallback);
+  if (normalized < min) return min;
+  if (normalized > max) return max;
+  return normalized;
+};
+
+const normalizeLogLines = (input: unknown): string[] =>
+  Array.isArray(input)
+    ? input.map((line) => String(line || '').trim()).filter(Boolean)
+    : [];
+
+const redactAIUpstreamLogPreview = (value: string): string => {
+  let result = value;
+  secretLikeValuePatterns.forEach((pattern) => {
+    result = result.replace(pattern, '[REDACTED]');
+  });
+  return result.replace(/data:([^;,]+);base64,[a-z0-9+/=._-]+/gi, 'data:$1;base64,[REDACTED]');
+};
+
+const truncateText = (value: string, limit: number): string => {
+  if (value.length <= limit) {
+    return value;
+  }
+  return `${value.slice(0, limit)}...[truncated ${value.length - limit} chars]`;
+};
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  !!value && typeof value === 'object' && !Array.isArray(value);
+
+const asRecordArray = (value: unknown): Record<string, unknown>[] =>
+  Array.isArray(value) ? value.filter(isRecord) : [];
+
+const stringValue = (value: unknown): string | undefined =>
+  typeof value === 'string' && value.trim() ? value.trim() : undefined;
+
+const addName = (names: Set<string>, value: unknown) => {
+  const normalized = stringValue(value);
+  if (normalized) {
+    names.add(normalized);
+  }
+};
+
+const extractToolNames = (body: Record<string, unknown>): string[] => {
+  const names = new Set<string>();
+  asRecordArray(body.tools).forEach((tool) => {
+    addName(names, tool.name);
+    if (isRecord(tool.function)) {
+      addName(names, tool.function.name);
+    }
+    asRecordArray(tool.functionDeclarations).forEach((declaration) => addName(names, declaration.name));
+    asRecordArray(tool.function_declarations).forEach((declaration) => addName(names, declaration.name));
+  });
+  asRecordArray(body.functions).forEach((fn) => addName(names, fn.name));
+  return Array.from(names).slice(0, 30);
+};
+
+const countToolDefinitions = (body: Record<string, unknown>, toolNames: string[]): number => {
+  const tools = asRecordArray(body.tools);
+  const functionDeclarationCount = tools.reduce((total, tool) => {
+    const camelDeclarations = asRecordArray(tool.functionDeclarations).length;
+    const snakeDeclarations = asRecordArray(tool.function_declarations).length;
+    return total + camelDeclarations + snakeDeclarations;
+  }, 0);
+  const genericToolCount = tools.length;
+  const legacyFunctionCount = asRecordArray(body.functions).length;
+  return functionDeclarationCount || legacyFunctionCount || genericToolCount || toolNames.length;
+};
+
+const normalizeMessageRole = (message: Record<string, unknown>): string => {
+  const role = stringValue(message.role);
+  if (role) return role;
+  if (isRecord(message.author)) {
+    return stringValue(message.author.role) || 'unknown';
+  }
+  return 'unknown';
+};
+
+const getMessageLikeItems = (body: Record<string, unknown>): Record<string, unknown>[] => {
+  const messages = asRecordArray(body.messages);
+  if (messages.length > 0) return messages;
+  const contents = asRecordArray(body.contents);
+  if (contents.length > 0) return contents;
+  return [];
+};
+
+const addTextLength = (value: unknown): number => {
+  if (typeof value === 'string') return value.length;
+  if (Array.isArray(value)) return value.reduce((total, item) => total + addTextLength(item), 0);
+  if (!isRecord(value)) return 0;
+  return ['content', 'text', 'prompt', 'system', 'input'].reduce(
+    (total, key) => total + addTextLength(value[key]),
+    0,
+  );
+};
+
+const estimateInputTextChars = (body: Record<string, unknown>): number => {
+  const messageItems = getMessageLikeItems(body);
+  const messageChars = messageItems.reduce((total, item) => total + addTextLength(item), 0);
+  return messageChars
+    + addTextLength(body.system)
+    + addTextLength(body.prompt)
+    + addTextLength(body.input);
+};
+
+const summarizeAIUpstreamPayload = (bodyText: string): AIUpstreamPayloadSummary => {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(bodyText);
+  } catch (error: any) {
+    return {
+      parseable: false,
+      parseError: String(error?.message || error || 'invalid JSON'),
+      warnings: ['请求 body 不是完整 JSON，可能已被日志截断，无法生成结构化摘要'],
+    };
+  }
+
+  if (!isRecord(parsed)) {
+    return {
+      parseable: false,
+      parseError: 'request body is not a JSON object',
+      warnings: ['请求 body 不是 JSON object，无法识别模型、消息和工具字段'],
+    };
+  }
+
+  const topLevelKeys = Object.keys(parsed).slice(0, 30);
+  const messages = getMessageLikeItems(parsed);
+  const messageRoleCounts = messages.reduce<Record<string, number>>((acc, message) => {
+    const role = normalizeMessageRole(message);
+    acc[role] = (acc[role] || 0) + 1;
+    return acc;
+  }, {});
+  if (parsed.system !== undefined) {
+    messageRoleCounts.system = (messageRoleCounts.system || 0) + 1;
+  }
+  const toolNames = extractToolNames(parsed);
+  const toolCount = countToolDefinitions(parsed, toolNames);
+  const messageCount = messages.length + (parsed.system !== undefined ? 1 : 0) + (parsed.prompt !== undefined ? 1 : 0);
+  const inputTextCharCount = estimateInputTextChars(parsed);
+  const warnings: string[] = [];
+
+  if (messageCount === 0) {
+    warnings.push('未识别到 messages、contents、system 或 prompt 字段，请确认上游协议是否符合预期');
+  }
+  if (toolCount === 0) {
+    warnings.push('payload 未携带 tools/functions，模型无法发起工具调用');
+  }
+  if (inputTextCharCount > 60000) {
+    warnings.push('输入文本体量较大，必要时先收窄上下文或减少日志/DDL 内容');
+  }
+
+  return {
+    parseable: true,
+    topLevelKeys,
+    model: stringValue(parsed.model) || stringValue(parsed.modelName),
+    messageCount,
+    messageRoleCounts,
+    toolCount,
+    toolNames,
+    hasStream: parsed.stream === true || isRecord(parsed.stream_options),
+    hasToolChoice: parsed.tool_choice !== undefined || parsed.toolChoice !== undefined || parsed.toolConfig !== undefined,
+    hasResponseFormat: parsed.response_format !== undefined || parsed.responseFormat !== undefined || parsed.generationConfig !== undefined,
+    inputTextCharCount,
+    warnings: warnings.length > 0 ? warnings : undefined,
+  };
+};
+
+const extractField = (line: string, field: string): string => {
+  const match = line.match(new RegExp(`(?:^|[\\s：])${field}=([^\\s]+)`));
+  return match?.[1] || '';
+};
+
+const extractTailField = (line: string, field: string): string => {
+  const marker = ` ${field}=`;
+  const index = line.indexOf(marker);
+  if (index < 0) {
+    return '';
+  }
+  return line.slice(index + marker.length).trim();
+};
+
+const resolveEventType = (line: string): AIUpstreamLogEventType => {
+  if (line.includes('AI 上游请求开始')) return 'started';
+  if (line.includes('AI 上游请求完成')) return 'completed';
+  if (line.includes('AI 上游请求失败')) return 'failed';
+  return 'other';
+};
+
+const parseAIUpstreamLogEvent = (
+  line: string,
+  bodyPreviewLimit: number,
+  includePayloadSummary: boolean,
+): AIUpstreamLogEvent | null => {
+  if (!line.includes('AI 上游请求')) {
+    return null;
+  }
+
+  const type = resolveEventType(line);
+  const requestId = extractField(line, 'requestId');
+  const provider = extractField(line, 'provider');
+  const method = extractField(line, 'method');
+  const endpoint = extractField(line, 'endpoint');
+  const statusText = extractField(line, 'status');
+  const bodyText = extractTailField(line, 'body');
+  const errorText = extractTailField(line, 'err');
+  const duration = extractField(line, 'duration');
+
+  return {
+    type,
+    requestId,
+    provider,
+    method,
+    endpoint,
+    status: statusText ? Number(statusText) : undefined,
+    duration,
+    bodyPreview: bodyText ? truncateText(redactAIUpstreamLogPreview(bodyText), bodyPreviewLimit) : undefined,
+    bodySummary: bodyText && includePayloadSummary ? summarizeAIUpstreamPayload(bodyText) : undefined,
+    error: errorText ? truncateText(redactAIUpstreamLogPreview(errorText), 2000) : undefined,
+    line: truncateText(redactAIUpstreamLogPreview(line), 4000),
+  };
+};
+
+const matchesFilter = (event: AIUpstreamLogEvent, params: {
+  provider?: unknown;
+  requestId?: unknown;
+  keyword?: unknown;
+}): boolean => {
+  const provider = String(params.provider || '').trim().toLowerCase();
+  if (provider && event.provider.toLowerCase() !== provider) {
+    return false;
+  }
+  const requestId = String(params.requestId || '').trim().toLowerCase();
+  if (requestId && event.requestId.toLowerCase() !== requestId) {
+    return false;
+  }
+  const keyword = String(params.keyword || '').trim().toLowerCase();
+  if (!keyword) {
+    return true;
+  }
+  return [
+    event.requestId,
+    event.provider,
+    event.method,
+    event.endpoint,
+    event.bodyPreview,
+    event.error,
+  ].some((value) => String(value || '').toLowerCase().includes(keyword));
+};
+
+const summarizeAIUpstreamRequests = (
+  events: AIUpstreamLogEvent[],
+  includeBody: boolean,
+  requestLimit: number,
+): AIUpstreamRequestSummary[] => {
+  const requestMap = new Map<string, AIUpstreamRequestSummary>();
+  events.forEach((event) => {
+    const requestKey = event.requestId || `line-${requestMap.size + 1}`;
+    const existing = requestMap.get(requestKey) || {
+      requestId: event.requestId,
+      provider: event.provider,
+      method: event.method,
+      endpoint: event.endpoint,
+      state: 'unknown' as const,
+      eventCount: 0,
+      hasBody: false,
+    };
+    existing.provider = event.provider || existing.provider;
+    existing.method = event.method || existing.method;
+    existing.endpoint = event.endpoint || existing.endpoint;
+    existing.eventCount += 1;
+    if (event.type === 'started') existing.state = 'started';
+    if (event.type === 'completed') existing.state = 'completed';
+    if (event.type === 'failed') existing.state = 'failed';
+    if (event.status !== undefined) existing.status = event.status;
+    if (event.duration) existing.duration = event.duration;
+    if (event.bodyPreview) {
+      existing.hasBody = true;
+      if (includeBody) existing.bodyPreview = event.bodyPreview;
+    }
+    if (event.bodySummary) existing.bodySummary = event.bodySummary;
+    if (event.error) existing.error = event.error;
+    requestMap.set(requestKey, existing);
+  });
+  return Array.from(requestMap.values()).slice(-requestLimit);
+};
+
+export const buildAIUpstreamLogSnapshot = (params: {
+  readResult?: any;
+  provider?: unknown;
+  requestId?: unknown;
+  keyword?: unknown;
+  lineLimit?: unknown;
+  requestLimit?: unknown;
+  includeBody?: unknown;
+  includeLines?: unknown;
+  bodyPreviewLimit?: unknown;
+  includePayloadSummary?: unknown;
+}) => {
+  const data = params.readResult?.data && typeof params.readResult.data === 'object'
+    ? params.readResult.data as Record<string, unknown>
+    : {};
+  const requestedLineLimit = clampNumber(data.requestedLineLimit ?? params.lineLimit, DEFAULT_AI_UPSTREAM_LOG_LIMIT, 1, MAX_AI_UPSTREAM_LOG_LIMIT);
+  const requestLimit = clampNumber(params.requestLimit, DEFAULT_AI_UPSTREAM_REQUEST_LIMIT, 1, MAX_AI_UPSTREAM_REQUEST_LIMIT);
+  const bodyPreviewLimit = clampNumber(params.bodyPreviewLimit, DEFAULT_AI_UPSTREAM_BODY_LIMIT, 200, MAX_AI_UPSTREAM_BODY_LIMIT);
+  const includeBody = params.includeBody !== false;
+  const includeLines = params.includeLines === true;
+  const includePayloadSummary = params.includePayloadSummary !== false;
+  const lines = normalizeLogLines(data.lines);
+  const parsedEvents = lines
+    .map((line) => parseAIUpstreamLogEvent(line, bodyPreviewLimit, includePayloadSummary))
+    .filter((event): event is AIUpstreamLogEvent => Boolean(event))
+    .filter((event) => matchesFilter(event, params));
+  const eventBreakdown = {
+    started: parsedEvents.filter((event) => event.type === 'started').length,
+    completed: parsedEvents.filter((event) => event.type === 'completed').length,
+    failed: parsedEvents.filter((event) => event.type === 'failed').length,
+    other: parsedEvents.filter((event) => event.type === 'other').length,
+  };
+  const providers = Array.from(new Set(parsedEvents.map((event) => event.provider).filter(Boolean)));
+  const requestIds = Array.from(new Set(parsedEvents.map((event) => event.requestId).filter(Boolean)));
+  const requests = summarizeAIUpstreamRequests(parsedEvents, includeBody, requestLimit);
+
+  return {
+    logPath: String(data.logPath || ''),
+    keyword: String(data.keyword || params.requestId || params.provider || params.keyword || '').trim(),
+    providerFilter: String(params.provider || '').trim(),
+    requestIdFilter: String(params.requestId || '').trim(),
+    requestedLineLimit,
+    returnedLineCount: lines.length,
+    upstreamEventCount: parsedEvents.length,
+    requestCount: requests.length,
+    payloadSummaryEnabled: includePayloadSummary,
+    eventBreakdown,
+    providers,
+    requestIds,
+    requests,
+    lines: includeLines ? parsedEvents.map((event) => event.line) : undefined,
+    message: parsedEvents.length > 0
+      ? ''
+      : '最近日志里没有找到 AI 上游请求记录；请先发送一次 AI 消息，或扩大 lineLimit 后重试。',
+    nextActions: parsedEvents.length > 0
+      ? [
+          '如需核对完整入参，先用 requestId 精确过滤，再查看 bodyPreview 是否已被截断。',
+          '如果只有开始没有完成/失败，继续查看 inspect_app_logs 或扩大 lineLimit 排查请求是否超时。',
+        ]
+      : [
+          '确认当前构建已包含 AI 上游请求日志能力。',
+          '发送一次 AI 聊天消息后再调用本工具。',
+          '如果仍没有记录，调用 inspect_app_logs 读取最近 WARN/ERROR 原文。',
+        ],
+  };
+};
diff --git a/frontend/src/components/ai/aiWorkspaceInsights.ts b/frontend/src/components/ai/aiWorkspaceInsights.ts
new file mode 100644
index 0000000..a2ff5a5
--- /dev/null
+++ b/frontend/src/components/ai/aiWorkspaceInsights.ts
@@ -0,0 +1,146 @@
+import type { SavedConnection, TabData } from '../../types';
+
+const ACTIVE_TAB_CONTENT_LIMIT = 12000;
+const WORKSPACE_TAB_CONTENT_LIMIT = 4000;
+
+const normalizeWorkspaceTabLimit = (input: unknown): number => {
+  const value = Math.floor(Number(input) || 12);
+  if (value < 1) return 1;
+  if (value > 30) return 30;
+  return value;
+};
+
+const resolveContentKind = (tab: TabData, includeContent: boolean, trimmedContent: string): 'sql' | 'command' | 'text' | 'none' => {
+  if (!includeContent || !trimmedContent) {
+    return 'none';
+  }
+  if (tab.type === 'query') {
+    return 'sql';
+  }
+  if (tab.type === 'redis-command') {
+    return 'command';
+  }
+  return 'text';
+};
+
+const buildTabSnapshot = (params: {
+  tab: TabData;
+  activeTabId?: string | null;
+  connections: SavedConnection[];
+  includeContent: boolean;
+  contentLimit: number;
+}) => {
+  const { tab, activeTabId = null, connections, includeContent, contentLimit } = params;
+  const activeConnection = connections.find((connection) => connection.id === tab.connectionId);
+  const rawContent =
+    tab.type === 'query' || tab.type === 'redis-command'
+      ? String(tab.query || '')
+      : '';
+  const trimmedContent = rawContent.trim();
+  const visibleContent = includeContent ? trimmedContent.slice(0, contentLimit) : '';
+
+  return {
+    id: tab.id,
+    isActive: tab.id === activeTabId,
+    title: tab.title,
+    type: tab.type,
+    connectionId: tab.connectionId,
+    connectionName: activeConnection?.name || '',
+    connectionType: activeConnection?.config?.type || '',
+    dbName: tab.dbName || '',
+    tableName: tab.tableName || '',
+    filePath: tab.filePath || '',
+    readOnly: tab.readOnly === true,
+    queryMode: tab.queryMode || '',
+    providerMode: tab.providerMode || '',
+    resourcePath: tab.resourcePath || '',
+    resourceKind: tab.resourceKind || '',
+    redisDB: typeof tab.redisDB === 'number' ? tab.redisDB : null,
+    schemaName: tab.schemaName || '',
+    viewName: tab.viewName || '',
+    viewKind: tab.viewKind || '',
+    triggerName: tab.triggerName || '',
+    eventName: tab.eventName || '',
+    routineName: tab.routineName || '',
+    routineType: tab.routineType || '',
+    contentKind: resolveContentKind(tab, includeContent, trimmedContent),
+    content: visibleContent,
+    contentCharCount: trimmedContent.length,
+    contentTruncated: includeContent && trimmedContent.length > visibleContent.length,
+  };
+};
+
+export const buildActiveTabSnapshot = (params: {
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  connections: SavedConnection[];
+  includeContent?: boolean;
+}) => {
+  const {
+    tabs = [],
+    activeTabId = null,
+    connections,
+    includeContent = true,
+  } = params;
+  const activeTab = tabs.find((tab) => tab.id === activeTabId);
+  if (!activeTab) {
+    return {
+      hasActiveTab: false,
+      message: '当前没有活动页签',
+    };
+  }
+
+  return {
+    hasActiveTab: true,
+    tabId: activeTab.id,
+    ...buildTabSnapshot({
+      tab: activeTab,
+      activeTabId,
+      connections,
+      includeContent,
+      contentLimit: ACTIVE_TAB_CONTENT_LIMIT,
+    }),
+  };
+};
+
+export const buildWorkspaceTabsSnapshot = (params: {
+  tabs?: TabData[];
+  activeTabId?: string | null;
+  connections: SavedConnection[];
+  includeContent?: boolean;
+  limit?: unknown;
+}) => {
+  const {
+    tabs = [],
+    activeTabId = null,
+    connections,
+    includeContent = false,
+    limit,
+  } = params;
+  const safeLimit = normalizeWorkspaceTabLimit(limit);
+  const orderedTabs = [...tabs].sort((left, right) => {
+    if (left.id === activeTabId && right.id !== activeTabId) {
+      return -1;
+    }
+    if (right.id === activeTabId && left.id !== activeTabId) {
+      return 1;
+    }
+    return 0;
+  });
+  const visibleTabs = orderedTabs.slice(0, safeLimit);
+
+  return {
+    activeTabId,
+    totalTabs: orderedTabs.length,
+    returnedTabs: visibleTabs.length,
+    truncated: orderedTabs.length > visibleTabs.length,
+    tabs: visibleTabs.map((tab) =>
+      buildTabSnapshot({
+        tab,
+        activeTabId,
+        connections,
+        includeContent,
+        contentLimit: WORKSPACE_TAB_CONTENT_LIMIT,
+      })),
+  };
+};
diff --git a/frontend/src/components/ai/mcpClientInstallPanelState.test.ts b/frontend/src/components/ai/mcpClientInstallPanelState.test.ts
new file mode 100644
index 0000000..333395e
--- /dev/null
+++ b/frontend/src/components/ai/mcpClientInstallPanelState.test.ts
@@ -0,0 +1,87 @@
+import { describe, expect, it } from 'vitest';
+
+import type { AIMCPClientInstallStatus } from '../../types';
+import {
+  getMCPClientDetectionSummary,
+  getMCPClientInstallStateLabel,
+  getMCPClientOptionSummary,
+  getMCPClientStatusSummary,
+  getMCPClientStatusTone,
+  getSelectedMCPClientStateLine,
+  resolveMCPClientCommandName,
+  resolveMCPClientInstallActionLabel,
+} from './mcpClientInstallPanelState';
+
+const buildStatus = (patch: Partial<AIMCPClientInstallStatus>): AIMCPClientInstallStatus => ({
+  client: 'claude-code',
+  displayName: 'Claude Code',
+  installed: false,
+  matchesCurrent: false,
+  clientDetected: false,
+  clientCommand: 'claude',
+  message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+  ...patch,
+});
+
+describe('mcpClientInstallPanelState', () => {
+  it('marks a current client as already connected and prevents repeated install wording', () => {
+    const status = buildStatus({
+      installed: true,
+      matchesCurrent: true,
+      clientDetected: true,
+      message: '已检测到 Claude Code 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+    });
+
+    expect(getMCPClientStatusTone(status, false).label).toBe('已接入');
+    expect(getMCPClientInstallStateLabel(status)).toBe('外部工具接入状态：已接入当前 GoNavi');
+    expect(getSelectedMCPClientStateLine(status)).toBe('已接入当前 GoNavi，无需重复操作');
+    expect(resolveMCPClientInstallActionLabel(status)).toBe('Claude Code 已接入，无需重复安装');
+    expect(getMCPClientStatusSummary(status)).toContain('可直接在这个客户端里调用');
+  });
+
+  it('asks users to update stale external client records instead of reinstalling blindly', () => {
+    const status = buildStatus({
+      client: 'codex',
+      displayName: 'Codex',
+      installed: true,
+      matchesCurrent: false,
+      clientDetected: true,
+      clientCommand: 'codex',
+      message: '已检测到 Codex 中的 GoNavi MCP 记录，但与当前 GoNavi 安装路径不一致，建议更新',
+    });
+
+    expect(getMCPClientStatusTone(status, false).label).toBe('需更新');
+    expect(getMCPClientOptionSummary(status)).toContain('建议更新为当前安装路径');
+    expect(getSelectedMCPClientStateLine(status)).toBe('已存在旧接入记录，建议更新到当前 GoNavi 路径');
+    expect(resolveMCPClientInstallActionLabel(status)).toBe('更新 Codex 接入配置');
+  });
+
+  it('explains that config can be written before the target CLI is detected in PATH', () => {
+    const status = buildStatus({
+      clientDetected: false,
+      clientCommand: '',
+    });
+
+    expect(resolveMCPClientCommandName(status)).toBe('claude');
+    expect(getMCPClientDetectionSummary(status)).toContain('CLI 还没加入 PATH');
+    expect(resolveMCPClientInstallActionLabel(status)).toBe('安装到 Claude Code（外部工具）');
+  });
+
+  it('treats OpenClaw as a remote bridge target instead of a local install', () => {
+    const status = buildStatus({
+      client: 'openclaw',
+      displayName: 'OpenClaw',
+      installMode: 'remote',
+      clientCommand: 'openclaw',
+      message: 'OpenClaw 通常部署在云端 Linux；请通过远程 MCP 桥接接入 Windows GoNavi，不要复制数据库密码。',
+    });
+
+    expect(getMCPClientStatusTone(status, false).label).toBe('远程桥接');
+    expect(getMCPClientInstallStateLabel(status)).toBe('外部工具接入状态：需配置远程 MCP 桥接');
+    expect(getMCPClientOptionSummary(status)).toContain('默认 schema-only');
+    expect(getMCPClientOptionSummary(status)).toContain('不复制数据库密码');
+    expect(getMCPClientDetectionSummary(status)).toContain('本机无需检测 openclaw 命令');
+    expect(getSelectedMCPClientStateLine(status)).toContain('数据库密码仍留在 GoNavi 本机');
+    expect(resolveMCPClientInstallActionLabel(status)).toBe('复制 OpenClaw 远程接入说明');
+  });
+});
diff --git a/frontend/src/components/ai/mcpClientInstallPanelState.ts b/frontend/src/components/ai/mcpClientInstallPanelState.ts
new file mode 100644
index 0000000..cc9ebe3
--- /dev/null
+++ b/frontend/src/components/ai/mcpClientInstallPanelState.ts
@@ -0,0 +1,149 @@
+import type { AIMCPClientInstallStatus } from '../../types';
+import { isRemoteMCPClientStatus } from '../../utils/mcpClientInstallStatus';
+
+export interface MCPClientInstallStatusTone {
+  label: string;
+  color: string;
+  bg: string;
+}
+
+export const hasMCPClientStatusIssue = (status: AIMCPClientInstallStatus | undefined): boolean =>
+  /失败|异常|错误/u.test(String(status?.message || ''));
+
+export const getMCPClientStatusTone = (
+  status: AIMCPClientInstallStatus | undefined,
+  darkMode: boolean,
+): MCPClientInstallStatusTone => {
+  if (status?.matchesCurrent) {
+    return {
+      label: '已接入',
+      color: '#16a34a',
+      bg: darkMode ? 'rgba(34,197,94,0.18)' : 'rgba(34,197,94,0.12)',
+    };
+  }
+  if (status?.installed) {
+    return {
+      label: '需更新',
+      color: '#d97706',
+      bg: darkMode ? 'rgba(245,158,11,0.18)' : 'rgba(245,158,11,0.12)',
+    };
+  }
+  if (isRemoteMCPClientStatus(status)) {
+    return {
+      label: '远程桥接',
+      color: '#0284c7',
+      bg: darkMode ? 'rgba(56,189,248,0.16)' : 'rgba(14,165,233,0.10)',
+    };
+  }
+  if (hasMCPClientStatusIssue(status)) {
+    return {
+      label: '状态异常',
+      color: '#dc2626',
+      bg: darkMode ? 'rgba(239,68,68,0.18)' : 'rgba(239,68,68,0.1)',
+    };
+  }
+  return {
+    label: '未接入',
+    color: darkMode ? 'rgba(255,255,255,0.72)' : '#64748b',
+    bg: darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(100,116,139,0.08)',
+  };
+};
+
+export const getMCPClientInstallStateLabel = (status: AIMCPClientInstallStatus | undefined): string => {
+  if (status?.matchesCurrent) {
+    return '外部工具接入状态：已接入当前 GoNavi';
+  }
+  if (status?.installed) {
+    return '外部工具接入状态：已存在旧配置，需更新';
+  }
+  if (hasMCPClientStatusIssue(status)) {
+    return '外部工具接入状态：读取失败';
+  }
+  if (isRemoteMCPClientStatus(status)) {
+    return '外部工具接入状态：需配置远程 MCP 桥接';
+  }
+  return '外部工具接入状态：未接入';
+};
+
+export const resolveMCPClientCommandName = (status: AIMCPClientInstallStatus | undefined): string => {
+  const command = String(status?.clientCommand || '').trim();
+  if (command) {
+    return command;
+  }
+  return status?.client === 'codex' ? 'codex' : 'claude';
+};
+
+export const getMCPClientStatusSummary = (status: AIMCPClientInstallStatus | undefined): string => {
+  const label = status?.displayName || '这个客户端';
+  if (status?.matchesCurrent) {
+    return `${label} 已接入当前这份 GoNavi MCP，可直接在这个客户端里调用。`;
+  }
+  if (status?.installed) {
+    return `${label} 里已经有旧的 GoNavi 接入记录，更新后会切到当前这份 GoNavi。`;
+  }
+  if (hasMCPClientStatusIssue(status)) {
+    return `${label} 的接入状态读取失败，建议先刷新检测。`;
+  }
+  if (isRemoteMCPClientStatus(status)) {
+    return `${label} 通常运行在云端或远端机器，需要通过远程 MCP 桥接调用当前 GoNavi。`;
+  }
+  return `当前还没有把这份 GoNavi MCP 接入 ${label}。`;
+};
+
+export const getMCPClientOptionSummary = (status: AIMCPClientInstallStatus | undefined): string => {
+  if (status?.matchesCurrent) {
+    return '当前这份 GoNavi MCP 已接入到这个客户端。';
+  }
+  if (status?.installed) {
+    return '检测到旧的 GoNavi 接入记录，建议更新为当前安装路径。';
+  }
+  if (hasMCPClientStatusIssue(status)) {
+    return '接入状态读取异常，建议先刷新再处理。';
+  }
+  if (isRemoteMCPClientStatus(status)) {
+    return '适合云端 Agent：默认 schema-only 读取 GoNavi 表结构，不复制数据库密码，不暴露 SQL 执行。';
+  }
+  return '尚未把当前 GoNavi MCP 接入到这里。';
+};
+
+export const getMCPClientDetectionSummary = (status: AIMCPClientInstallStatus | undefined): string => {
+  const label = status?.displayName || '这个客户端';
+  const commandName = resolveMCPClientCommandName(status);
+  if (isRemoteMCPClientStatus(status)) {
+    return `${label} 通常不在这台 Windows 上运行，本机无需检测 ${commandName} 命令；请在云端配置远程 MCP 桥接地址。`;
+  }
+  if (status?.clientDetected) {
+    return `已检测到本机 ${commandName} 命令，接入或更新后重启 ${label} 即可验证。`;
+  }
+  return `未检测到本机 ${commandName} 命令；如果 CLI 还没加入 PATH，也可以先写入 ${label} 的接入配置，稍后再重启验证。`;
+};
+
+export const getSelectedMCPClientStateLine = (status: AIMCPClientInstallStatus | undefined): string => {
+  if (status?.matchesCurrent) {
+    return '已接入当前 GoNavi，无需重复操作';
+  }
+  if (status?.installed) {
+    return '已存在旧接入记录，建议更新到当前 GoNavi 路径';
+  }
+  if (hasMCPClientStatusIssue(status)) {
+    return '状态读取异常，建议先刷新检测';
+  }
+  if (isRemoteMCPClientStatus(status)) {
+    return '需要配置远程 MCP 桥接，数据库密码仍留在 GoNavi 本机';
+  }
+  return '当前还没有接入 GoNavi MCP';
+};
+
+export const resolveMCPClientInstallActionLabel = (status: AIMCPClientInstallStatus | undefined): string => {
+  const label = status?.displayName || '目标客户端';
+  if (status?.matchesCurrent) {
+    return `${label} 已接入，无需重复安装`;
+  }
+  if (status?.installed) {
+    return `更新 ${label} 接入配置`;
+  }
+  if (isRemoteMCPClientStatus(status)) {
+    return `复制 ${label} 远程接入说明`;
+  }
+  return `安装到 ${label}（外部工具）`;
+};
diff --git a/frontend/src/components/ai/messageBubble/AIMessageCodeBlock.tsx b/frontend/src/components/ai/messageBubble/AIMessageCodeBlock.tsx
new file mode 100644
index 0000000..8ba0f3d
--- /dev/null
+++ b/frontend/src/components/ai/messageBubble/AIMessageCodeBlock.tsx
@@ -0,0 +1,428 @@
+import React, { useState } from 'react';
+import { Tooltip, message } from 'antd';
+import { CheckOutlined, CopyOutlined, PlayCircleOutlined } from '@ant-design/icons';
+import mermaid from 'mermaid';
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import { vscDarkPlus, vs } from 'react-syntax-highlighter/dist/esm/styles/prism';
+
+import type { OverlayWorkbenchTheme } from '../../../utils/overlayWorkbenchTheme';
+import { buildAIReadonlyPreviewSQL } from '../../../utils/aiSqlLimit';
+
+interface AIMessageCodeBlockProps {
+  className?: string;
+  inline?: boolean;
+  children?: React.ReactNode;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  activeConnectionConfig?: any;
+  activeConnectionId?: string;
+  activeDbName?: string;
+}
+
+interface HighlightedCodeBlockProps {
+  language: string;
+  codeText: string;
+  displayText: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  activeConnectionConfig?: any;
+  activeConnectionId?: string;
+  activeDbName?: string;
+}
+
+const MermaidRenderer: React.FC<{ chart: string; darkMode: boolean }> = ({ chart, darkMode }) => {
+  const containerRef = React.useRef<HTMLDivElement>(null);
+
+  React.useEffect(() => {
+    if (!containerRef.current) {
+      return;
+    }
+    try {
+      mermaid.initialize({ startOnLoad: false, theme: darkMode ? 'dark' : 'default' });
+      const id = `mermaid-${Math.random().toString(36).slice(2)}`;
+      (async () => {
+        const result: any = await mermaid.render(id, chart);
+        if (containerRef.current) {
+          containerRef.current.innerHTML = result.svg || result;
+        }
+      })().catch((error: any) => {
+        if (containerRef.current) {
+          containerRef.current.innerHTML = `<div style="color:#ef4444; padding:12px; background:rgba(239,68,68,0.1); border-radius:6px; font-size:12px">Mermaid 解析失败: ${error.message}</div>`;
+        }
+      });
+    } catch (error: any) {
+      if (containerRef.current) {
+        containerRef.current.innerHTML = `<div style="color:#ef4444; padding:12px; background:rgba(239,68,68,0.1); border-radius:6px; font-size:12px">Mermaid 渲染异常: ${error.message}</div>`;
+      }
+    }
+  }, [chart, darkMode]);
+
+  return <div ref={containerRef} className="ai-mermaid-container" style={{ margin: '16px 0', display: 'flex', justifyContent: 'flex-start', overflowX: 'auto' }} />;
+};
+
+const CodeCopyButton: React.FC<{ text: string }> = ({ text }) => {
+  const [copied, setCopied] = useState(false);
+
+  return (
+    <span
+      className="ai-code-copy-btn"
+      onClick={() => {
+        navigator.clipboard.writeText(text);
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2000);
+      }}
+      style={{
+        cursor: 'pointer',
+        display: 'flex',
+        alignItems: 'center',
+        opacity: copied ? 1 : 0.6,
+        transition: 'opacity 0.2s',
+      }}
+      onMouseEnter={(event) => { event.currentTarget.style.opacity = '1'; }}
+      onMouseLeave={(event) => { event.currentTarget.style.opacity = copied ? '1' : '0.6'; }}
+    >
+      {copied ? <CheckOutlined style={{ color: '#52c41a' }} /> : <CopyOutlined />}
+      <span style={{ marginLeft: 4 }}>{copied ? '已复制' : '复制代码'}</span>
+    </span>
+  );
+};
+
+const CodeRunButton: React.FC<{ text: string; connectionId?: string; dbName?: string }> = ({ text, connectionId, dbName }) => {
+  const contextMatch = text.match(/^--\s*@context\s+connectionId=(\S+)\s+dbName=(\S+)/m);
+  const resolvedConnId = contextMatch?.[1] || connectionId;
+  const resolvedDbName = contextMatch?.[2] || dbName;
+  const cleanSql = text.replace(/^--\s*@context\s+.*\n?/gm, '').trim();
+  const sqlDetail = (runImmediately: boolean) => ({
+    sql: cleanSql,
+    runImmediately,
+    connectionId: resolvedConnId,
+    dbName: resolvedDbName,
+  });
+
+  const handleExecute = async () => {
+    try {
+      const Service = (window as any).go?.aiservice?.Service;
+      if (Service?.AICheckSQL) {
+        const result = await Service.AICheckSQL(text);
+        if (!result.allowed) {
+          message.error(`🔒 安全策略拦截：当前安全级别不允许执行 ${result.operationType} 类型的 SQL。请在 AI 设置中调整安全级别。`);
+          return;
+        }
+        if (result.requiresConfirm) {
+          const { Modal } = await import('antd');
+          Modal.confirm({
+            title: '⚠️ 安全确认',
+            content: result.warningMessage || `此 SQL 为 ${result.operationType} 操作，确定要执行吗？`,
+            okText: '确认执行',
+            cancelText: '取消',
+            okButtonProps: { danger: true },
+            onOk: () => {
+              window.dispatchEvent(new CustomEvent('gonavi:insert-sql', { detail: sqlDetail(true) }));
+            },
+          });
+          return;
+        }
+      }
+      window.dispatchEvent(new CustomEvent('gonavi:insert-sql', { detail: sqlDetail(true) }));
+    } catch {
+      window.dispatchEvent(new CustomEvent('gonavi:insert-sql', { detail: sqlDetail(true) }));
+    }
+  };
+
+  return (
+    <div style={{ display: 'flex', gap: 10, alignItems: 'center' }}>
+      <Tooltip title="将该段 SQL 注入查询工作区（可快捷修改或执行）">
+        <span
+          className="ai-code-run-btn"
+          onClick={() => {
+            window.dispatchEvent(new CustomEvent('gonavi:insert-sql', { detail: sqlDetail(false) }));
+          }}
+          style={{
+            cursor: 'pointer',
+            display: 'flex',
+            alignItems: 'center',
+            opacity: 0.6,
+            transition: 'opacity 0.2s',
+            padding: '0 4px',
+            color: '#10b981',
+          }}
+          onMouseEnter={(event) => { event.currentTarget.style.opacity = '1'; }}
+          onMouseLeave={(event) => { event.currentTarget.style.opacity = '0.6'; }}
+        >
+          <PlayCircleOutlined />
+          <span style={{ marginLeft: 4 }}>插入</span>
+        </span>
+      </Tooltip>
+      <Tooltip title="立即执行（受 AI 安全策略管控）">
+        <span
+          className="ai-code-run-btn"
+          onClick={handleExecute}
+          style={{
+            cursor: 'pointer',
+            display: 'flex',
+            alignItems: 'center',
+            opacity: 0.6,
+            transition: 'opacity 0.2s',
+            padding: '0 4px',
+            color: '#1677ff',
+          }}
+          onMouseEnter={(event) => { event.currentTarget.style.opacity = '1'; }}
+          onMouseLeave={(event) => { event.currentTarget.style.opacity = '0.6'; }}
+        >
+          <PlayCircleOutlined />
+          <span style={{ marginLeft: 4 }}>执行</span>
+        </span>
+      </Tooltip>
+    </div>
+  );
+};
+
+const HighlightedCodeBlock: React.FC<HighlightedCodeBlockProps> = ({
+  language,
+  codeText,
+  displayText,
+  darkMode,
+  overlayTheme,
+  activeConnectionConfig,
+  activeConnectionId,
+  activeDbName,
+}) => {
+  const [expanded, setExpanded] = useState(false);
+  const [previewData, setPreviewData] = useState<any[] | null>(null);
+  const [previewCols, setPreviewCols] = useState<string[]>([]);
+  const [previewLoading, setPreviewLoading] = useState(false);
+  const [previewError, setPreviewError] = useState('');
+  const [previewExpanded, setPreviewExpanded] = useState(false);
+  const isLongCode = displayText.split('\n').length > 15;
+  const isSql = language === 'sql';
+  const isSelectQuery = isSql && /^\s*(SELECT|SHOW|DESCRIBE|DESC|EXPLAIN)\b/i.test(displayText.trim());
+
+  const handleInlineExecute = async () => {
+    if (!activeConnectionConfig || previewLoading) {
+      return;
+    }
+    setPreviewLoading(true);
+    setPreviewError('');
+    setPreviewData(null);
+    try {
+      const { DBQuery } = await import('../../../../wailsjs/go/app/App');
+      const previewSql = buildAIReadonlyPreviewSQL(
+        activeConnectionConfig?.type || '',
+        displayText,
+        50,
+        activeConnectionConfig?.driver || '',
+      );
+      const response = await DBQuery(activeConnectionConfig, activeDbName || '', previewSql);
+      if (response.success && Array.isArray(response.data)) {
+        const rows = response.data as any[];
+        setPreviewCols(rows.length > 0 ? Object.keys(rows[0]) : []);
+        setPreviewData(rows.slice(0, 20));
+        setPreviewExpanded(true);
+      } else {
+        setPreviewError(response.message || '查询无结果');
+      }
+    } catch (error: any) {
+      setPreviewError(error?.message || '执行失败');
+    } finally {
+      setPreviewLoading(false);
+    }
+  };
+
+  return (
+    <div className="ai-code-block-container" style={{ margin: '12px 0', border: overlayTheme.sectionBorder, borderRadius: 6, overflow: 'hidden' }}>
+      <div
+        className="ai-code-header"
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+          padding: '6px 12px',
+          background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)',
+          fontSize: 12,
+          color: overlayTheme.mutedText,
+        }}
+      >
+        <span style={{ fontFamily: 'var(--gn-font-mono)' }}>{language}</span>
+        <div style={{ display: 'flex', gap: 12, alignItems: 'center' }}>
+          {isSql && <CodeRunButton text={codeText} connectionId={activeConnectionId} dbName={activeDbName} />}
+          {isSelectQuery && activeConnectionConfig && (
+            <Tooltip title="在聊天内预览查询结果（最多20行）">
+              <span
+                onClick={handleInlineExecute}
+                style={{
+                  cursor: previewLoading ? 'wait' : 'pointer',
+                  display: 'flex',
+                  alignItems: 'center',
+                  opacity: previewLoading ? 1 : 0.6,
+                  transition: 'opacity 0.2s',
+                  padding: '0 4px',
+                  color: '#faad14',
+                }}
+                onMouseEnter={(event) => {
+                  if (!previewLoading) {
+                    event.currentTarget.style.opacity = '1';
+                  }
+                }}
+                onMouseLeave={(event) => {
+                  if (!previewLoading) {
+                    event.currentTarget.style.opacity = '0.6';
+                  }
+                }}
+              >
+                {previewLoading ? '⏳' : '👁'}
+                <span style={{ marginLeft: 4 }}>{previewLoading ? '执行中...' : '预览'}</span>
+              </span>
+            </Tooltip>
+          )}
+          <CodeCopyButton text={displayText} />
+        </div>
+      </div>
+
+      <div style={{ position: 'relative' }}>
+        <SyntaxHighlighter
+          style={darkMode ? vscDarkPlus as any : vs as any}
+          language={language}
+          PreTag="div"
+          showLineNumbers
+          customStyle={{
+            margin: 0,
+            borderRadius: 0,
+            background: darkMode ? 'rgba(0,0,0,0.25)' : 'rgba(0,0,0,0.02)',
+            maxHeight: expanded ? 'none' : (isLongCode ? 300 : 'none'),
+            overflowY: expanded ? 'auto' : 'hidden',
+            fontSize: '14px',
+            lineHeight: 1.6,
+          }}
+          codeTagProps={{
+            style: {
+              fontSize: '14px',
+              fontFamily: 'var(--gn-font-mono)',
+            },
+          }}
+        >
+          {displayText}
+        </SyntaxHighlighter>
+
+        {!expanded && isLongCode && (
+          <div
+            style={{
+              position: 'absolute',
+              bottom: 0,
+              left: 0,
+              right: 0,
+              height: 60,
+              background: `linear-gradient(to bottom, transparent, ${darkMode ? 'rgba(0,0,0,0.8)' : 'rgba(255,255,255,0.9)'})`,
+              display: 'flex',
+              alignItems: 'flex-end',
+              justifyContent: 'center',
+              paddingBottom: 8,
+              cursor: 'pointer',
+            }}
+            onClick={() => setExpanded(true)}
+          >
+            <span style={{ fontSize: 12, color: overlayTheme.iconColor, background: darkMode ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.05)', padding: '2px 8px', borderRadius: 12 }}>
+              展开全部代码
+            </span>
+          </div>
+        )}
+        {expanded && isLongCode && (
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              padding: '6px 0',
+              background: darkMode ? 'rgba(0,0,0,0.3)' : 'rgba(0,0,0,0.02)',
+              cursor: 'pointer',
+              borderTop: `1px solid ${darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)'}`,
+            }}
+            onClick={() => setExpanded(false)}
+          >
+            <span style={{ fontSize: 12, color: overlayTheme.iconColor }}>收起代码</span>
+          </div>
+        )}
+      </div>
+
+      {previewError && (
+        <div style={{ padding: '8px 12px', fontSize: 12, color: '#ef4444', background: darkMode ? 'rgba(239,68,68,0.1)' : 'rgba(239,68,68,0.05)', borderTop: `1px solid ${darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)'}` }}>
+          ❌ {previewError}
+        </div>
+      )}
+      {previewExpanded && previewData && previewData.length > 0 && (
+        <div style={{ borderTop: `1px solid ${darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'}` }}>
+          <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', padding: '4px 12px', background: darkMode ? 'rgba(250,173,20,0.08)' : 'rgba(250,173,20,0.05)' }}>
+            <span style={{ fontSize: 11, color: overlayTheme.mutedText }}>📊 预览结果（{previewData.length} 行 × {previewCols.length} 列）</span>
+            <span style={{ fontSize: 11, color: overlayTheme.mutedText, cursor: 'pointer' }} onClick={() => setPreviewExpanded(false)}>收起 ▴</span>
+          </div>
+          <div style={{ overflowX: 'auto', maxHeight: 200, overflowY: 'auto' }}>
+            <table style={{ width: '100%', borderCollapse: 'collapse', fontSize: 11, fontFamily: 'var(--gn-font-mono)' }}>
+              <thead>
+                <tr>
+                  {previewCols.map((column) => (
+                    <th key={column} style={{ padding: '4px 8px', textAlign: 'left', background: darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.04)', color: overlayTheme.titleText, fontWeight: 600, whiteSpace: 'nowrap', borderBottom: `1px solid ${darkMode ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.08)'}` }}>
+                      {column}
+                    </th>
+                  ))}
+                </tr>
+              </thead>
+              <tbody>
+                {previewData.map((row, rowIndex) => (
+                  <tr key={rowIndex}>
+                    {previewCols.map((column) => (
+                      <td key={column} style={{ padding: '3px 8px', color: overlayTheme.mutedText, whiteSpace: 'nowrap', borderBottom: `1px solid ${darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.03)'}`, maxWidth: 200, overflow: 'hidden', textOverflow: 'ellipsis' }}>
+                        {row[column] === null ? <span style={{ color: '#999', fontStyle: 'italic' }}>NULL</span> : String(row[column])}
+                      </td>
+                    ))}
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </div>
+      )}
+      {!previewExpanded && previewData && previewData.length > 0 && (
+        <div
+          style={{ padding: '4px 12px', cursor: 'pointer', fontSize: 11, color: overlayTheme.mutedText, background: darkMode ? 'rgba(250,173,20,0.05)' : 'rgba(250,173,20,0.03)', borderTop: `1px solid ${darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.03)'}` }}
+          onClick={() => setPreviewExpanded(true)}
+        >
+          📊 查看结果（{previewData.length} 行）▾
+        </div>
+      )}
+    </div>
+  );
+};
+
+export const AIMessageCodeBlock: React.FC<AIMessageCodeBlockProps> = ({
+  className,
+  inline,
+  children,
+  darkMode,
+  overlayTheme,
+  activeConnectionConfig,
+  activeConnectionId,
+  activeDbName,
+}) => {
+  const match = /language-(\w+)/.exec(className || '');
+  if (!inline && match && match[1] === 'mermaid') {
+    return <MermaidRenderer chart={String(children).replace(/\n$/, '')} darkMode={darkMode} />;
+  }
+
+  if (!inline && match) {
+    const codeText = String(children).replace(/\n$/, '');
+    const displayText = codeText.replace(/^--\s*@context\s+.*\n?/gm, '').trim();
+
+    return (
+      <HighlightedCodeBlock
+        language={match[1]}
+        codeText={codeText}
+        displayText={displayText}
+        darkMode={darkMode}
+        overlayTheme={overlayTheme}
+        activeConnectionConfig={activeConnectionConfig}
+        activeConnectionId={activeConnectionId}
+        activeDbName={activeDbName}
+      />
+    );
+  }
+
+  return <code className={className}>{children}</code>;
+};
diff --git a/frontend/src/components/ai/messageBubble/AIMessageMarkdown.test.tsx b/frontend/src/components/ai/messageBubble/AIMessageMarkdown.test.tsx
new file mode 100644
index 0000000..ab3f8de
--- /dev/null
+++ b/frontend/src/components/ai/messageBubble/AIMessageMarkdown.test.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+import { describe, expect, it, vi } from 'vitest';
+
+import { AIMessageMarkdown } from './AIMessageMarkdown';
+import { buildOverlayWorkbenchTheme } from '../../../utils/overlayWorkbenchTheme';
+
+vi.mock('antd', () => ({
+  Tooltip: ({ children }: { children: React.ReactNode }) => children,
+  message: { error: vi.fn() },
+}));
+
+vi.mock('@ant-design/icons', () => ({
+  CheckOutlined: () => null,
+  CopyOutlined: () => null,
+  PlayCircleOutlined: () => null,
+}));
+
+describe('AIMessageMarkdown', () => {
+  it('keeps SQL code block actions after extracting markdown rendering', () => {
+    const markup = renderToStaticMarkup(
+      <AIMessageMarkdown
+        content={'```sql\nSELECT * FROM users;\n```'}
+        darkMode={false}
+        overlayTheme={buildOverlayWorkbenchTheme(false)}
+        activeConnectionConfig={{ type: 'mysql', driver: 'mysql' }}
+        activeConnectionId="conn-1"
+        activeDbName="demo"
+      />,
+    );
+
+    expect(markup).toContain('复制代码');
+    expect(markup).toContain('插入');
+    expect(markup).toContain('执行');
+    expect(markup).toContain('预览');
+  });
+
+  it('can switch between fenced code renderers without changing hook order', () => {
+    const overlayTheme = buildOverlayWorkbenchTheme(false);
+    let renderer: ReactTestRenderer | undefined;
+
+    try {
+      expect(() => {
+        act(() => {
+          renderer = create(
+            <AIMessageMarkdown
+              content={'```python\nprint("hello")\n```'}
+              darkMode={false}
+              overlayTheme={overlayTheme}
+            />,
+          );
+        });
+        act(() => {
+          renderer?.update(
+            <AIMessageMarkdown
+              content={'```mermaid\ngraph TD;\nA-->B;\n```'}
+              darkMode={false}
+              overlayTheme={overlayTheme}
+            />,
+          );
+        });
+        act(() => {
+          renderer?.update(
+            <AIMessageMarkdown
+              content={'普通 `inline` 代码'}
+              darkMode={false}
+              overlayTheme={overlayTheme}
+            />,
+          );
+        });
+      }).not.toThrow();
+    } finally {
+      act(() => {
+        renderer?.unmount();
+      });
+    }
+  });
+});
diff --git a/frontend/src/components/ai/messageBubble/AIMessageMarkdown.tsx b/frontend/src/components/ai/messageBubble/AIMessageMarkdown.tsx
new file mode 100644
index 0000000..52795a7
--- /dev/null
+++ b/frontend/src/components/ai/messageBubble/AIMessageMarkdown.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import ReactMarkdown from 'react-markdown';
+import remarkGfm from 'remark-gfm';
+
+import type { OverlayWorkbenchTheme } from '../../../utils/overlayWorkbenchTheme';
+import { normalizeAiMarkdown } from '../../../utils/aiMarkdown';
+import { AIMessageCodeBlock } from './AIMessageCodeBlock';
+
+const remarkPlugins = [remarkGfm];
+
+interface AIMessageMarkdownProps {
+  content: string;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  activeConnectionConfig?: any;
+  activeConnectionId?: string;
+  activeDbName?: string;
+}
+
+export const AIMessageMarkdown: React.FC<AIMessageMarkdownProps> = React.memo(({
+  content,
+  darkMode,
+  overlayTheme,
+  activeConnectionConfig,
+  activeConnectionId,
+  activeDbName,
+}) => {
+  const normalizedContent = React.useMemo(() => normalizeAiMarkdown(content), [content]);
+  const components = React.useMemo(() => ({
+    code({ inline, className, children }: any) {
+      return (
+        <AIMessageCodeBlock
+          inline={inline}
+          className={className}
+          darkMode={darkMode}
+          overlayTheme={overlayTheme}
+          activeConnectionConfig={activeConnectionConfig}
+          activeConnectionId={activeConnectionId}
+          activeDbName={activeDbName}
+        >
+          {children}
+        </AIMessageCodeBlock>
+      );
+    },
+  }), [darkMode, overlayTheme, activeConnectionConfig, activeConnectionId, activeDbName]);
+
+  return (
+    <ReactMarkdown remarkPlugins={remarkPlugins} components={components}>
+      {normalizedContent}
+    </ReactMarkdown>
+  );
+});
diff --git a/frontend/src/components/ai/messageBubble/AIMessageStatusBlocks.tsx b/frontend/src/components/ai/messageBubble/AIMessageStatusBlocks.tsx
new file mode 100644
index 0000000..e0114b6
--- /dev/null
+++ b/frontend/src/components/ai/messageBubble/AIMessageStatusBlocks.tsx
@@ -0,0 +1,269 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import { ApiOutlined, CaretDownOutlined, CaretRightOutlined, CheckOutlined } from '@ant-design/icons';
+
+import type { AIChatMessage, AIToolCall } from '../../../types';
+import type { OverlayWorkbenchTheme } from '../../../utils/overlayWorkbenchTheme';
+
+interface AIThinkingBlockProps {
+  displayThinking: string;
+  isTyping: boolean;
+  isGlobalLoading: boolean;
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  hasContent: boolean;
+}
+
+interface AIToolCallingBlockProps {
+  toolCalls: AIToolCall[];
+  loading: boolean;
+  allMessages: AIChatMessage[];
+  darkMode: boolean;
+  overlayTheme: OverlayWorkbenchTheme;
+  hasContent: boolean;
+}
+
+const TOOL_ACTION_LABELS: Record<string, string> = {
+  inspect_ai_runtime: '读取当前 AI 运行状态',
+  inspect_ai_safety: '读取当前 AI 安全边界',
+  inspect_ai_providers: '读取当前 AI 供应商与模型配置',
+  inspect_ai_chat_readiness: '读取当前 AI 聊天发送前置状态',
+  inspect_ai_tool_catalog: '读取 AI 工具目录和参数提示',
+  inspect_ai_support_bundle: '生成 AI 排障支持包',
+  inspect_mcp_setup: '读取当前 MCP 配置状态',
+  inspect_mcp_runtime_failures: '诊断 MCP 运行期失败',
+  inspect_mcp_authoring_guide: '读取 MCP 新增填写指引',
+  inspect_mcp_draft: '校验 MCP 新增草稿',
+  inspect_mcp_tool_schema: '读取 MCP 工具参数 schema',
+  inspect_ai_guidance: '读取当前 AI 提示与技能配置',
+  get_connections: '获取可用连接信息',
+  get_databases: '扫描数据库列表',
+  get_tables: '分析表结构信息',
+  get_all_columns: '汇总跨表字段摘要',
+  get_columns: '核对真实字段定义',
+  get_indexes: '检查索引定义',
+  get_foreign_keys: '梳理外键关系',
+  get_triggers: '检查触发器逻辑',
+  get_table_ddl: '提取建表语句',
+  inspect_table_bundle: '抓取完整表结构快照',
+  inspect_database_bundle: '抓取数据库结构总览',
+  inspect_current_connection: '读取当前连接摘要',
+  inspect_connection_capabilities: '读取当前连接能力矩阵',
+  inspect_saved_connections: '盘点本地已保存连接',
+  inspect_redis_topology: '诊断 Redis 拓扑配置',
+  inspect_external_sql_directories: '盘点外部 SQL 目录',
+  inspect_external_sql_file: '读取外部 SQL 文件',
+  inspect_ai_sessions: '盘点本地 AI 历史会话',
+  inspect_active_tab: '读取当前活动页签',
+  inspect_workspace_tabs: '盘点当前工作区页签',
+  inspect_recent_sql_logs: '回看最近 SQL 执行日志',
+  inspect_recent_sql_activity: '总结最近 SQL 活动',
+  inspect_sql_editor_transaction: '读取 SQL 编辑器事务状态',
+  inspect_app_logs: '回看 GoNavi 应用日志',
+  inspect_recent_connection_failures: '总结最近连接失败记录',
+  inspect_ai_last_render_error: '读取最近一次 AI 渲染异常',
+  inspect_ai_message_flow: '诊断当前 AI 消息流',
+  inspect_ai_context_budget: '诊断 AI 上下文体量风险',
+  inspect_codebase_hotspots: '读取代码大文件热点',
+  inspect_saved_queries: '检索本地已保存查询',
+  inspect_sql_snippets: '读取 SQL 片段模板',
+  inspect_shortcuts: '读取当前快捷键配置',
+  preview_table_rows: '预览真实样例数据',
+  execute_sql: '执行只读 SQL 验证',
+};
+
+const AIToolResultItem: React.FC<{ resultMsg: AIChatMessage; darkMode: boolean; overlayTheme: OverlayWorkbenchTheme }> = ({ resultMsg, darkMode, overlayTheme }) => {
+  const [toolExpanded, setToolExpanded] = useState(false);
+  const charCount = resultMsg.content ? resultMsg.content.length : 0;
+
+  return (
+    <div style={{
+      background: darkMode ? 'rgba(0,0,0,0.1)' : 'rgba(0,0,0,0.02)',
+      borderRadius: 6,
+      padding: '6px 10px',
+      border: `1px solid ${darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)'}`,
+      marginTop: 8,
+      width: '100%',
+    }}>
+      <div
+        style={{ display: 'flex', alignItems: 'center', cursor: 'pointer', gap: 6, fontSize: 12, color: overlayTheme.mutedText }}
+        onClick={() => setToolExpanded((prev) => !prev)}
+      >
+        {toolExpanded ? <CaretDownOutlined /> : <CaretRightOutlined />}
+        <ApiOutlined style={{ color: '#1677ff' }} />
+        <span>探针执行结果 (<span style={{ fontFamily: 'var(--gn-font-mono)', color: overlayTheme.iconColor }}>{resultMsg.tool_name || 'unknown'}</span>)</span>
+        <span style={{ fontSize: 11, marginLeft: 8, opacity: 0.6 }}>{charCount > 0 ? `${charCount} 个字符` : '无数据'}</span>
+      </div>
+      {toolExpanded && (
+        <div style={{ marginTop: 8, fontSize: 12, color: overlayTheme.mutedText, fontFamily: 'var(--gn-font-mono)', whiteSpace: 'pre-wrap', wordBreak: 'break-all', maxHeight: 300, overflowY: 'auto', background: darkMode ? 'rgba(0,0,0,0.2)' : 'rgba(0,0,0,0.03)', padding: 8, borderRadius: 6 }}>
+          {resultMsg.content}
+        </div>
+      )}
+    </div>
+  );
+};
+
+export const AIThinkingBlock: React.FC<AIThinkingBlockProps> = ({
+  displayThinking,
+  isTyping,
+  isGlobalLoading,
+  darkMode,
+  overlayTheme,
+  hasContent,
+}) => {
+  const isActivelyThinking = isGlobalLoading && !hasContent;
+  const [expanded, setExpanded] = useState(isActivelyThinking);
+  const contentRef = React.useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (isActivelyThinking) {
+      setExpanded(true);
+    }
+  }, [isActivelyThinking]);
+
+  useEffect(() => {
+    if (!isGlobalLoading) {
+      setExpanded(false);
+    }
+  }, [isGlobalLoading]);
+
+  useEffect(() => {
+    if (expanded && isTyping && contentRef.current) {
+      contentRef.current.scrollTop = contentRef.current.scrollHeight;
+    }
+  }, [displayThinking, expanded, isTyping]);
+
+  return (
+    <div style={{
+      marginBottom: hasContent ? 8 : 0,
+      borderRadius: 6,
+      border: `1px solid ${darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'}`,
+      overflow: 'hidden',
+    }}>
+      <div
+        onClick={() => setExpanded((prev) => !prev)}
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          gap: 6,
+          padding: '6px 10px',
+          cursor: 'pointer',
+          background: darkMode ? 'rgba(255,255,255,0.04)' : 'rgba(0,0,0,0.02)',
+          fontSize: 12,
+          color: overlayTheme.mutedText,
+          userSelect: 'none',
+        }}
+      >
+        <span style={{ transition: 'transform 0.2s', transform: expanded ? 'rotate(90deg)' : 'rotate(0deg)', fontSize: 10 }}>▶</span>
+        <span>💭 思考过程</span>
+        {isActivelyThinking && <span style={{ fontSize: 10, color: '#8b5cf6', animation: 'pulse 1.5s ease-in-out infinite' }}>思考中...</span>}
+        {!isActivelyThinking && <span style={{ fontSize: 10, opacity: 0.5 }}>({displayThinking.length} 字)</span>}
+      </div>
+      <div className={`ai-expand-transition ${expanded ? 'expanded' : 'collapsed'}`}>
+        <div ref={contentRef} style={{
+          padding: expanded ? '8px 12px' : '0 12px',
+          borderLeft: '3px solid #8b5cf6',
+          margin: '0 8px 8px',
+          fontSize: 12,
+          lineHeight: 1.7,
+          color: overlayTheme.mutedText,
+          fontStyle: 'italic',
+          whiteSpace: 'pre-wrap',
+          wordBreak: 'break-word',
+          maxHeight: 400,
+          overflowY: 'auto',
+        }}>
+          {displayThinking}
+          {isTyping && <span className="ai-blinking-cursor" style={{ background: '#8b5cf6', marginLeft: 4, width: 6, height: 12, display: 'inline-block', verticalAlign: 'middle', opacity: 0.8 }} />}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export const AIToolCallingBlock: React.FC<AIToolCallingBlockProps> = ({
+  toolCalls,
+  loading,
+  allMessages,
+  darkMode,
+  overlayTheme,
+  hasContent,
+}) => {
+  const toolResultsById = useMemo(() => {
+    return new Map(
+      allMessages
+        .filter((message) => message.role === 'tool' && message.tool_call_id)
+        .map((message) => [message.tool_call_id as string, message]),
+    );
+  }, [allMessages]);
+  const allDone = toolCalls.every((toolCall) => toolResultsById.has(toolCall.id));
+  const [expanded, setExpanded] = useState(!allDone && loading);
+
+  useEffect(() => {
+    if (allDone || !loading) {
+      setExpanded(false);
+    }
+  }, [allDone, loading]);
+
+  return (
+    <div style={{
+      background: darkMode ? 'rgba(0,0,0,0.15)' : 'rgba(0,0,0,0.025)',
+      borderRadius: 8,
+      fontSize: 12,
+      overflow: 'hidden',
+      border: `1px solid ${darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'}`,
+      marginTop: hasContent ? 12 : 0,
+      display: 'flex',
+      flexDirection: 'column',
+    }}>
+      <div
+        onClick={() => setExpanded((prev) => !prev)}
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'space-between',
+          padding: '8px 12px',
+          cursor: 'pointer',
+          userSelect: 'none',
+          background: darkMode ? 'rgba(255,255,255,0.02)' : 'rgba(0,0,0,0.01)',
+        }}
+      >
+        <div style={{ display: 'flex', alignItems: 'center', gap: 8, color: overlayTheme.titleText, fontWeight: 500 }}>
+          {!allDone && loading ? (
+            <div className="ai-spinning-ring" />
+          ) : (
+            <CheckOutlined style={{ color: '#10b981' }} />
+          )}
+          <span>{!allDone && loading ? '正在执行数据探针...' : `数据探针执行完毕 (${toolCalls.length} 项)`}</span>
+        </div>
+        <span style={{ transition: 'transform 0.2s', transform: expanded ? 'rotate(90deg)' : 'rotate(0deg)', fontSize: 10, color: overlayTheme.mutedText }}>▶</span>
+      </div>
+      <div className={`ai-expand-transition ${expanded ? 'expanded' : 'collapsed'}`}>
+        <div style={{ padding: expanded ? '4px 12px 12px' : '0 12px' }}>
+          {toolCalls.map((toolCall) => {
+            const resultMsg = toolResultsById.get(toolCall.id);
+            const isDone = Boolean(resultMsg);
+            const actionName = TOOL_ACTION_LABELS[toolCall.function.name] || toolCall.function.name;
+            return (
+              <div key={toolCall.id} style={{
+                display: 'flex',
+                flexDirection: 'column',
+                gap: 4,
+                marginTop: 6,
+                paddingLeft: 8,
+                borderLeft: `2px solid ${isDone ? '#10b981' : (loading ? '#1677ff' : overlayTheme.shellBorder)}`,
+              }}>
+                <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
+                  {isDone
+                    ? <CheckOutlined style={{ color: '#10b981', fontSize: 11 }} />
+                    : (loading ? <div className="ai-spinning-ring" style={{ width: 10, height: 10, borderWidth: 1.5 }} /> : <ApiOutlined style={{ color: overlayTheme.mutedText, fontSize: 11 }} />)}
+                  <span style={{ color: isDone ? overlayTheme.mutedText : overlayTheme.titleText }}>{actionName}</span>
+                </div>
+                {resultMsg && <AIToolResultItem resultMsg={resultMsg} darkMode={darkMode} overlayTheme={overlayTheme} />}
+              </div>
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/frontend/src/components/ai/useAIChatAutoContext.ts b/frontend/src/components/ai/useAIChatAutoContext.ts
new file mode 100644
index 0000000..a20d581
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatAutoContext.ts
@@ -0,0 +1,77 @@
+import { useEffect } from 'react';
+
+import { useStore } from '../../store';
+import type { TabData } from '../../types';
+import { buildRpcConnectionConfig } from '../../utils/connectionRpcConfig';
+
+interface UseAIChatAutoContextOptions {
+  aiPanelVisible: boolean;
+  activeTabId: string | null;
+  tabs: TabData[];
+}
+
+export const useAIChatAutoContext = ({
+  aiPanelVisible,
+  activeTabId,
+  tabs,
+}: UseAIChatAutoContextOptions) => {
+  useEffect(() => {
+    if (!aiPanelVisible) {
+      return;
+    }
+
+    const activeTab = tabs.find((tab) => tab.id === activeTabId);
+    if (!activeTab || (activeTab.type !== 'table' && activeTab.type !== 'design')) {
+      return;
+    }
+
+    const { connectionId, dbName, tableName } = activeTab;
+    if (!connectionId || !dbName || !tableName) {
+      return;
+    }
+
+    const connKey = `${connectionId}:${dbName}`;
+    const currentContexts = useStore.getState().aiContexts[connKey] || [];
+    if (currentContexts.find((context) => context.dbName === dbName && context.tableName === tableName)) {
+      return;
+    }
+
+    const connection = useStore.getState().connections.find((item) => item.id === connectionId);
+    if (!connection) {
+      return;
+    }
+
+    void import('../../../wailsjs/go/app/App')
+      .then(({ DBShowCreateTable }) =>
+        DBShowCreateTable(buildRpcConnectionConfig(connection.config) as any, dbName, tableName)
+          .then((result) => {
+            if (!result.success || !result.data) {
+              return;
+            }
+
+            let createSql = '';
+            if (typeof result.data === 'string') {
+              createSql = result.data;
+            } else if (Array.isArray(result.data) && result.data.length > 0) {
+              const row = result.data[0];
+              createSql = (
+                Object.values(row).find(
+                  (value) =>
+                    typeof value === 'string' &&
+                    (value.toUpperCase().includes('CREATE TABLE') || value.toUpperCase().includes('CREATE')),
+                ) ||
+                Object.values(row)[1] ||
+                Object.values(row)[0]
+              ) as string;
+            }
+
+            if (!createSql) {
+              return;
+            }
+
+            useStore.getState().addAIContext(connKey, { dbName, tableName, ddl: createSql });
+          }),
+      )
+      .catch((error) => console.error('Failed to auto-fetch table context', error));
+  }, [activeTabId, aiPanelVisible, tabs]);
+};
diff --git a/frontend/src/components/ai/useAIChatContextBinding.ts b/frontend/src/components/ai/useAIChatContextBinding.ts
new file mode 100644
index 0000000..efc9371
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatContextBinding.ts
@@ -0,0 +1,208 @@
+import React from 'react';
+import { message } from 'antd';
+
+import type { AIContextItem } from '../../types';
+import { useStore } from '../../store';
+import { buildRpcConnectionConfig } from '../../utils/connectionRpcConfig';
+import { resolveAITableSchemaToolResult } from '../../utils/aiTableSchemaTool';
+import { DBGetColumns, DBGetDatabases, DBGetTables, DBShowCreateTable } from '../../../wailsjs/go/app/App';
+
+interface ActiveContextRef {
+  connectionId?: string | null;
+  dbName?: string | null;
+}
+
+interface UseAIChatContextBindingParams {
+  activeContext: ActiveContextRef | null;
+  activeContextItems: AIContextItem[];
+  connectionKey: string;
+  addAIContext: (connectionKey: string, item: AIContextItem) => void;
+  removeAIContext: (connectionKey: string, dbName: string, tableName: string) => void;
+}
+
+export const useAIChatContextBinding = ({
+  activeContext,
+  activeContextItems,
+  connectionKey,
+  addAIContext,
+  removeAIContext,
+}: UseAIChatContextBindingParams) => {
+  const [contextOpen, setContextOpen] = React.useState(false);
+  const [contextLoading, setContextLoading] = React.useState(false);
+  const [contextTables, setContextTables] = React.useState<{ name: string }[]>([]);
+  const [selectedTableKeys, setSelectedTableKeys] = React.useState<string[]>([]);
+  const [searchText, setSearchText] = React.useState('');
+  const [appendingContext, setAppendingContext] = React.useState(false);
+  const [dbList, setDbList] = React.useState<string[]>([]);
+  const [selectedDbName, setSelectedDbName] = React.useState('');
+  const [contextExpanded, setContextExpanded] = React.useState(false);
+
+  const filteredTables = React.useMemo(
+    () => contextTables.filter((table) => table.name.toLowerCase().includes(searchText.toLowerCase())),
+    [contextTables, searchText],
+  );
+
+  const fetchTablesForDb = React.useCallback(async (dbName: string, connConfig: any) => {
+    setContextLoading(true);
+    setSelectedDbName(dbName);
+    try {
+      const res = await DBGetTables(buildRpcConnectionConfig(connConfig), dbName);
+      if (res.success && Array.isArray(res.data)) {
+        setContextTables(res.data.map((row) => ({ name: Object.values(row)[0] as string })));
+      } else {
+        message.error(`获取表格失败: ${res.message}`);
+        setContextTables([]);
+      }
+    } catch (error: any) {
+      message.error(error?.message || '获取表格失败');
+      setContextTables([]);
+    } finally {
+      setContextLoading(false);
+    }
+  }, []);
+
+  const handleOpenContext = React.useCallback(async () => {
+    if (!activeContext?.connectionId) {
+      message.warning('请先在左侧选择一个数据库作为所聊上下文');
+      return;
+    }
+
+    const connection = useStore.getState().connections.find((item) => item.id === activeContext.connectionId);
+    if (!connection) {
+      return;
+    }
+
+    setContextOpen(true);
+    setContextLoading(true);
+    setSearchText('');
+    setSelectedTableKeys(activeContextItems.map((item) => `${item.dbName}::${item.tableName}`));
+
+    try {
+      const dbRes = await DBGetDatabases(buildRpcConnectionConfig(connection.config) as any);
+      if (dbRes.success && Array.isArray(dbRes.data)) {
+        setDbList(dbRes.data.map((row: any) => Object.values(row)[0] as string));
+      }
+
+      const initialDbName = activeContext.dbName || '';
+      setSelectedDbName(initialDbName);
+      const tablesRes = await DBGetTables(buildRpcConnectionConfig(connection.config) as any, initialDbName);
+      if (tablesRes.success && Array.isArray(tablesRes.data)) {
+        setContextTables(tablesRes.data.map((row: any) => ({ name: Object.values(row)[0] as string })));
+      } else {
+        setContextTables([]);
+      }
+    } catch (error: any) {
+      message.error(error?.message || '读取上下文表失败');
+    } finally {
+      setContextLoading(false);
+    }
+  }, [activeContext, activeContextItems]);
+
+  const handleAppendContext = React.useCallback(async () => {
+    if (!activeContext?.connectionId) {
+      return;
+    }
+
+    const connection = useStore.getState().connections.find((item) => item.id === activeContext.connectionId);
+    if (!connection) {
+      return;
+    }
+
+    setAppendingContext(true);
+    try {
+      let addedCount = 0;
+      let removedCount = 0;
+
+      for (const item of activeContextItems) {
+        const key = `${item.dbName}::${item.tableName}`;
+        if (!selectedTableKeys.includes(key)) {
+          removeAIContext(connectionKey, item.dbName, item.tableName);
+          removedCount += 1;
+        }
+      }
+
+      for (const key of selectedTableKeys) {
+        const [dbName, tableName] = key.split('::');
+        if (!dbName || !tableName) {
+          continue;
+        }
+
+        if (activeContextItems.some((item) => item.dbName === dbName && item.tableName === tableName)) {
+          continue;
+        }
+
+        const rpcConfig = buildRpcConnectionConfig(connection.config) as any;
+        const schemaResult = await resolveAITableSchemaToolResult({
+          tableName,
+          fetchDDL: () => DBShowCreateTable(rpcConfig, dbName, tableName),
+          fetchColumns: () => DBGetColumns(rpcConfig, dbName, tableName),
+        });
+
+        if (!schemaResult.success) {
+          message.error(`获取表 ${dbName}.${tableName} 结构失败: ${schemaResult.content}`);
+          continue;
+        }
+
+        if (schemaResult.content) {
+          addAIContext(connectionKey, {
+            dbName,
+            tableName,
+            ddl: schemaResult.content,
+          });
+          addedCount += 1;
+        }
+      }
+
+      if (addedCount > 0 || removedCount > 0) {
+        if (addedCount > 0 && removedCount === 0) {
+          message.success(`已添加 ${addedCount} 张表的结构到上下文`);
+        } else if (removedCount > 0 && addedCount === 0) {
+          message.success(`已从上下文移除 ${removedCount} 张表的结构`);
+        } else {
+          message.success(`上下文已同步更新：新增 ${addedCount}，移除 ${removedCount}`);
+        }
+        if (addedCount > 0) {
+          setContextExpanded(true);
+        }
+      } else {
+        message.info('选中的表未发生变化');
+      }
+      setContextOpen(false);
+    } catch (error: any) {
+      message.error(error?.message || '同步 AI 上下文失败');
+    } finally {
+      setAppendingContext(false);
+    }
+  }, [activeContext, activeContextItems, addAIContext, connectionKey, removeAIContext, selectedTableKeys]);
+
+  const handleDbChange = React.useCallback((value: string) => {
+    const connection = useStore.getState().connections.find((item) => item.id === activeContext?.connectionId);
+    if (connection) {
+      void fetchTablesForDb(value, connection.config);
+    }
+  }, [activeContext?.connectionId, fetchTablesForDb]);
+
+  const handleRemoveContextItem = React.useCallback((dbName: string, tableName: string) => {
+    removeAIContext(connectionKey, dbName, tableName);
+  }, [connectionKey, removeAIContext]);
+
+  return {
+    appendingContext,
+    contextExpanded,
+    contextLoading,
+    contextOpen,
+    dbList,
+    filteredTables,
+    handleAppendContext,
+    handleDbChange,
+    handleOpenContext,
+    handleRemoveContextItem,
+    searchText,
+    selectedDbName,
+    selectedTableKeys,
+    setContextExpanded,
+    setContextOpen,
+    setSearchText,
+    setSelectedTableKeys,
+  };
+};
diff --git a/frontend/src/components/ai/useAIChatDraftAttachments.ts b/frontend/src/components/ai/useAIChatDraftAttachments.ts
new file mode 100644
index 0000000..120c9d7
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatDraftAttachments.ts
@@ -0,0 +1,65 @@
+import React from 'react';
+import { message } from 'antd';
+import type { AIChatAttachment } from '../../types';
+import { createAIChatAttachmentFromFile } from './aiChatAttachments';
+
+interface UseAIChatDraftAttachmentsParams {
+  setDraftAttachments: React.Dispatch<React.SetStateAction<AIChatAttachment[]>>;
+}
+
+export const useAIChatDraftAttachments = ({
+  setDraftAttachments,
+}: UseAIChatDraftAttachmentsParams) => {
+  const fileInputRef = React.useRef<HTMLInputElement>(null);
+
+  const appendDraftFiles = React.useCallback(async (files: File[]) => {
+    for (const file of files) {
+      const attachment = await createAIChatAttachmentFromFile(file);
+      setDraftAttachments((prev) => [...prev, attachment]);
+      if (attachment.extractWarning) {
+        message.warning(`${attachment.name}: ${attachment.extractWarning}`);
+      }
+    }
+  }, [setDraftAttachments]);
+
+  const handleAttachmentUpload = React.useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
+    const files = Array.from(event.target.files || []);
+    if (files.length > 0) {
+      void appendDraftFiles(files);
+    }
+    if (fileInputRef.current) {
+      fileInputRef.current.value = '';
+    }
+  }, [appendDraftFiles]);
+
+  const handlePasteImages = React.useCallback((event: React.ClipboardEvent<HTMLTextAreaElement>) => {
+    const items = event.clipboardData?.items;
+    if (!items) {
+      return;
+    }
+    const imageFiles: File[] = [];
+    for (let index = 0; index < items.length; index += 1) {
+      if (items[index].type.includes('image')) {
+        const blob = items[index].getAsFile();
+        if (blob) {
+          imageFiles.push(blob);
+        }
+      }
+    }
+    if (imageFiles.length > 0) {
+      event.preventDefault();
+      void appendDraftFiles(imageFiles);
+    }
+  }, [appendDraftFiles]);
+
+  const handleRemoveDraftAttachment = React.useCallback((index: number) => {
+    setDraftAttachments((prev) => prev.filter((_, currentIndex) => currentIndex !== index));
+  }, [setDraftAttachments]);
+
+  return {
+    fileInputRef,
+    handleAttachmentUpload,
+    handlePasteImages,
+    handleRemoveDraftAttachment,
+  };
+};
diff --git a/frontend/src/components/ai/useAIChatLocalTools.test.tsx b/frontend/src/components/ai/useAIChatLocalTools.test.tsx
new file mode 100644
index 0000000..ef69374
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatLocalTools.test.tsx
@@ -0,0 +1,194 @@
+import React, { useRef, useState } from 'react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+
+import { useStore } from '../../store';
+import type { AIToolCall } from '../../types';
+import { useAIChatLocalTools } from './useAIChatLocalTools';
+
+const dispatchAIChatPayloadMock = vi.hoisted(() => vi.fn(async (_options: any) => 'stream'));
+const executeLocalAIToolCallMock = vi.hoisted(() => vi.fn(async ({ toolCall }: { toolCall: AIToolCall }) => ({
+  content: `result:${toolCall.function.name}`,
+  success: true,
+  toolName: toolCall.function.name,
+})));
+
+vi.mock('./aiChatPayloadDispatch', () => ({
+  dispatchAIChatPayload: dispatchAIChatPayloadMock,
+}));
+
+vi.mock('./aiLocalToolExecutor', () => ({
+  executeLocalAIToolCall: executeLocalAIToolCallMock,
+  buildToolResultMessage: ({ id, timestamp, toolCall, execution }: any) => ({
+    id,
+    role: 'tool',
+    content: execution.content,
+    timestamp,
+    tool_call_id: toolCall.id,
+    tool_name: execution.toolName,
+    success: execution.success,
+  }),
+}));
+
+const SESSION_ID = 'session-local-tools';
+
+const buildToolCall = (name: string): AIToolCall => ({
+  id: `call-${name}`,
+  type: 'function',
+  function: {
+    name,
+    arguments: '{}',
+  },
+});
+
+const updateMessage = (
+  sessionId: string,
+  messageId: string,
+  patch: Parameters<ReturnType<typeof useStore.getState>['updateAIChatMessage']>[2],
+) => useStore.getState().updateAIChatMessage(sessionId, messageId, patch);
+
+let latestHook: ReturnType<typeof useAIChatLocalTools> | undefined;
+
+const LocalToolsHarness = () => {
+  const [sending, setSending] = useState(false);
+  const pendingJVMPlanContextRef = useRef<any>(undefined);
+  const pendingJVMDiagnosticPlanContextRef = useRef<any>(undefined);
+
+  latestHook = useAIChatLocalTools({
+    sid: SESSION_ID,
+    activeProviderModel: 'gpt-5',
+    availableTools: [{
+      type: 'function',
+      function: {
+        name: 'inspect_active_tab',
+        description: 'inspect tab',
+        parameters: { type: 'object', properties: {} },
+      },
+    }],
+    buildSystemContextMessages: async () => [{ role: 'system', content: 'system-context' }],
+    dynamicModels: ['gpt-5'],
+    mcpTools: [],
+    nextMessageId: () => `generated-${Math.random().toString(36).slice(2, 6)}`,
+    pendingJVMPlanContextRef,
+    pendingJVMDiagnosticPlanContextRef,
+    setSending,
+    skills: [],
+    updateAIChatMessage: updateMessage,
+    userPromptSettings: {
+      global: '',
+      database: '',
+      jvm: '',
+      jvmDiagnostic: '',
+    },
+  });
+
+  return <span data-sending={sending} />;
+};
+
+describe('useAIChatLocalTools', () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    dispatchAIChatPayloadMock.mockClear();
+    executeLocalAIToolCallMock.mockClear();
+    latestHook = undefined;
+    useStore.setState({
+      activeContext: { connectionId: 'conn-1', dbName: 'crm' },
+      aiChatHistory: {
+        [SESSION_ID]: [
+          { id: 'user-1', role: 'user', content: '查一下当前页签', timestamp: 1 },
+          {
+            id: 'assistant-1',
+            role: 'assistant',
+            content: '',
+            timestamp: 2,
+            loading: true,
+            phase: 'tool_calling',
+            tool_calls: [buildToolCall('inspect_active_tab')],
+          },
+        ],
+      },
+      aiChatSessions: [{ id: SESSION_ID, title: '查一下当前页签', updatedAt: 1 }],
+      aiActiveSessionId: SESSION_ID,
+      connections: [{
+        id: 'conn-1',
+        name: '主库',
+        config: {
+          type: 'mysql',
+          host: '127.0.0.1',
+          port: 3306,
+          user: 'root',
+        },
+      }],
+      tabs: [{
+        id: 'tab-1',
+        title: '订单查询',
+        type: 'query',
+        connectionId: 'conn-1',
+        dbName: 'crm',
+        query: 'select * from orders',
+      }],
+      activeTabId: 'tab-1',
+      aiContexts: {},
+      sqlLogs: [],
+      savedQueries: [],
+      sqlSnippets: [],
+      externalSQLDirectories: [],
+    });
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    useStore.setState({
+      activeContext: null,
+      aiChatHistory: {},
+      aiChatSessions: [],
+      aiActiveSessionId: null,
+      tabs: [],
+      activeTabId: null,
+      aiContexts: {},
+      sqlLogs: [],
+      savedQueries: [],
+      sqlSnippets: [],
+      externalSQLDirectories: [],
+    });
+  });
+
+  it('writes tool results, closes the tool-calling message, and excludes connecting placeholders from the chained request', async () => {
+    let renderer: ReactTestRenderer | undefined;
+    await act(async () => {
+      renderer = create(<LocalToolsHarness />);
+    });
+
+    expect(latestHook).toBeDefined();
+    const run = latestHook!.executeLocalTools([buildToolCall('inspect_active_tab')], 'assistant-1');
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(150);
+      await run;
+    });
+
+    const messages = useStore.getState().aiChatHistory[SESSION_ID] || [];
+    const assistant = messages.find((message) => message.id === 'assistant-1');
+    const toolResult = messages.find((message) => message.role === 'tool');
+    const connecting = messages.find((message) => message.phase === 'connecting');
+
+    expect(executeLocalAIToolCallMock).toHaveBeenCalledTimes(1);
+    expect(assistant).toMatchObject({ loading: false, phase: 'idle' });
+    expect(toolResult).toMatchObject({
+      content: 'result:inspect_active_tab',
+      success: true,
+      tool_name: 'inspect_active_tab',
+    });
+    expect(connecting).toMatchObject({ content: '汇总探针执行结果中', loading: true });
+
+    expect(dispatchAIChatPayloadMock).toHaveBeenCalledTimes(1);
+    const dispatchArgs = dispatchAIChatPayloadMock.mock.calls[0][0] as any;
+    expect(dispatchArgs.messages[0]).toEqual({ role: 'system', content: 'system-context' });
+    expect(JSON.stringify(dispatchArgs.messages)).toContain('result:inspect_active_tab');
+    expect(JSON.stringify(dispatchArgs.messages)).not.toContain('汇总探针执行结果中');
+    expect(dispatchArgs.tools).toHaveLength(1);
+
+    await act(async () => {
+      renderer?.unmount();
+    });
+  });
+});
diff --git a/frontend/src/components/ai/useAIChatLocalTools.ts b/frontend/src/components/ai/useAIChatLocalTools.ts
new file mode 100644
index 0000000..aaa22b7
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatLocalTools.ts
@@ -0,0 +1,252 @@
+import { useCallback, useRef } from 'react';
+import type { MutableRefObject } from 'react';
+
+import { useStore } from '../../store';
+import type {
+  AIChatMessage,
+  AIMCPToolDescriptor,
+  AISkillConfig,
+  AIToolCall,
+  AIUserPromptSettings,
+  JVMAIPlanContext,
+  JVMDiagnosticPlanContext,
+} from '../../types';
+import { compressContextIfNeeded, getDynamicMaxContextChars } from '../../utils/aiChatRuntime';
+import { toAIRequestMessage } from '../../utils/aiMessagePayload';
+import type { AIChatToolDefinition } from '../../utils/aiToolRegistry';
+import { dispatchAIChatPayload } from './aiChatPayloadDispatch';
+import {
+  buildToolResultMessage,
+  executeLocalAIToolCall,
+  type AIToolContextEntry,
+} from './aiLocalToolExecutor';
+
+interface UseAIChatLocalToolsOptions {
+  sid: string;
+  activeProviderModel?: string;
+  availableTools: AIChatToolDefinition[];
+  buildSystemContextMessages: (
+    overrideJVMPlanContext?: JVMAIPlanContext,
+    overrideJVMDiagnosticPlanContext?: JVMDiagnosticPlanContext,
+  ) => any[] | Promise<any[]>;
+  dynamicModels: string[];
+  mcpTools: AIMCPToolDescriptor[];
+  nextMessageId: () => string;
+  pendingJVMPlanContextRef: MutableRefObject<JVMAIPlanContext | undefined>;
+  pendingJVMDiagnosticPlanContextRef: MutableRefObject<JVMDiagnosticPlanContext | undefined>;
+  setSending: (sending: boolean) => void;
+  skills: AISkillConfig[];
+  updateAIChatMessage: (
+    sid: string,
+    messageId: string,
+    patch: Partial<AIChatMessage>,
+  ) => void;
+  userPromptSettings: AIUserPromptSettings;
+}
+
+const MAX_TOOL_CALL_ROUNDS = 15;
+const SOFT_LIMIT_ROUNDS = 10;
+
+export const useAIChatLocalTools = ({
+  sid,
+  activeProviderModel,
+  availableTools,
+  buildSystemContextMessages,
+  dynamicModels,
+  mcpTools,
+  nextMessageId,
+  pendingJVMPlanContextRef,
+  pendingJVMDiagnosticPlanContextRef,
+  setSending,
+  skills,
+  updateAIChatMessage,
+  userPromptSettings,
+}: UseAIChatLocalToolsOptions) => {
+  const toolCallRoundRef = useRef(0);
+  const totalToolRoundRef = useRef(0);
+  const toolContextMapRef = useRef<Map<string, AIToolContextEntry>>(new Map());
+
+  const resetToolCallState = useCallback(() => {
+    toolCallRoundRef.current = 0;
+    totalToolRoundRef.current = 0;
+  }, []);
+
+  const executeLocalTools = useCallback(async (toolCalls: AIToolCall[], currentAsstMsgId: string) => {
+    const store = useStore.getState();
+    const currentAsstMsg = (store.aiChatHistory[sid] || []).find((message) => message.id === currentAsstMsgId);
+    const inheritedJVMPlanContext = currentAsstMsg?.jvmPlanContext || pendingJVMPlanContextRef.current;
+    const inheritedJVMDiagnosticPlanContext =
+      currentAsstMsg?.jvmDiagnosticPlanContext || pendingJVMDiagnosticPlanContextRef.current;
+    pendingJVMPlanContextRef.current = inheritedJVMPlanContext;
+    pendingJVMDiagnosticPlanContextRef.current = inheritedJVMDiagnosticPlanContext;
+
+    totalToolRoundRef.current += 1;
+    if (totalToolRoundRef.current > MAX_TOOL_CALL_ROUNDS) {
+      updateAIChatMessage(sid, currentAsstMsgId, { loading: false, phase: 'idle' });
+      useStore.getState().addAIChatMessage(sid, {
+        id: nextMessageId(),
+        role: 'assistant',
+        content: `⚠️ 工具调用已达 ${MAX_TOOL_CALL_ROUNDS} 轮上限，自动终止循环。如需继续探索，请发送新的消息。`,
+        timestamp: Date.now(),
+        jvmPlanContext: inheritedJVMPlanContext,
+        jvmDiagnosticPlanContext: inheritedJVMDiagnosticPlanContext,
+      });
+      setSending(false);
+      return;
+    }
+
+    const results: AIChatMessage[] = [];
+    const currentConnections = useStore.getState().connections;
+    for (const toolCall of toolCalls) {
+      const currentState = useStore.getState();
+      const execution = await executeLocalAIToolCall({
+        toolCall,
+        connections: currentConnections,
+        activeContext: currentState.activeContext,
+        aiContexts: currentState.aiContexts,
+        aiChatHistory: currentState.aiChatHistory,
+        aiChatSessions: currentState.aiChatSessions,
+        activeSessionId: sid,
+        tabs: currentState.tabs,
+        activeTabId: currentState.activeTabId,
+        mcpTools,
+        toolContextMap: toolContextMapRef.current,
+        sqlLogs: currentState.sqlLogs,
+        savedQueries: currentState.savedQueries,
+        sqlSnippets: currentState.sqlSnippets,
+        externalSQLDirectories: currentState.externalSQLDirectories,
+        skills,
+        userPromptSettings,
+        dynamicModels,
+      });
+      const toolResultMsg: AIChatMessage = buildToolResultMessage({
+        id: nextMessageId(),
+        timestamp: Date.now(),
+        toolCall,
+        execution,
+      });
+      results.push(toolResultMsg);
+      useStore.getState().addAIChatMessage(sid, toolResultMsg);
+      await new Promise((resolve) => setTimeout(resolve, 150));
+    }
+
+    const anySuccess = results.some((message) => message.success === true);
+    if (anySuccess) {
+      toolCallRoundRef.current = 0;
+    } else {
+      toolCallRoundRef.current += 1;
+      if (toolCallRoundRef.current >= 3) {
+        useStore.getState().addAIChatMessage(sid, {
+          id: nextMessageId(),
+          role: 'assistant',
+          content: '⚠️ 探针连续 3 轮执行失败，自动终止。请检查连接状态后重试。',
+          timestamp: Date.now(),
+          jvmPlanContext: inheritedJVMPlanContext,
+          jvmDiagnosticPlanContext: inheritedJVMDiagnosticPlanContext,
+        });
+        setSending(false);
+        return;
+      }
+    }
+
+    try {
+      updateAIChatMessage(sid, currentAsstMsgId, { loading: false, phase: 'idle' });
+
+      const chainConnectingMsg: AIChatMessage = {
+        id: nextMessageId(),
+        role: 'assistant',
+        phase: 'connecting',
+        content: '汇总探针执行结果中',
+        timestamp: Date.now(),
+        loading: true,
+        jvmPlanContext: inheritedJVMPlanContext,
+        jvmDiagnosticPlanContext: inheritedJVMDiagnosticPlanContext,
+      };
+      useStore.getState().addAIChatMessage(sid, chainConnectingMsg);
+
+      const safeUpdateTransition = (text: string) => {
+        const currentMsg = useStore.getState().aiChatHistory[sid]?.find((message) => message.id === chainConnectingMsg.id);
+        if (currentMsg && currentMsg.phase === 'connecting' && currentMsg.loading) {
+          updateAIChatMessage(sid, chainConnectingMsg.id, { content: text });
+        }
+      };
+
+      setTimeout(() => safeUpdateTransition('向模型回传运行时数据'), 200);
+      setTimeout(() => safeUpdateTransition('模型大脑深度推理中'), 500);
+      setTimeout(() => safeUpdateTransition('等待下发操作指令'), 1200);
+      setTimeout(() => safeUpdateTransition('正在深度思考链路与逻辑'), 3000);
+
+      setSending(true);
+      const currentHistory = useStore.getState().aiChatHistory[sid] || [];
+      const messagesPayload = currentHistory
+        .filter((message) => message.phase !== 'connecting')
+        .map(toAIRequestMessage);
+      const sysMessages = await buildSystemContextMessages(
+        inheritedJVMPlanContext,
+        inheritedJVMDiagnosticPlanContext,
+      );
+
+      let finalMessagesPayload = messagesPayload;
+      const dynamicMaxLimit = getDynamicMaxContextChars(activeProviderModel);
+      const summary = await compressContextIfNeeded(sid, messagesPayload, dynamicMaxLimit);
+      if (summary) {
+        const compressedMsg: AIChatMessage = {
+          id: nextMessageId(),
+          role: 'assistant',
+          content: `【自动记忆重塑】已将超长历史探针数据和对话压缩为摘要：\n\n${summary}`,
+          timestamp: Date.now() - 1000,
+        };
+        const continueMsg: AIChatMessage = {
+          id: nextMessageId(),
+          role: 'user',
+          content: '请根据上述最新状态与探索结果，继续完成你先前未竟的分析或执行下一步。',
+          timestamp: Date.now() - 500,
+        };
+        useStore.getState().replaceAIChatHistory(sid, [compressedMsg, continueMsg, chainConnectingMsg]);
+        finalMessagesPayload = [
+          { role: 'assistant', content: compressedMsg.content },
+          { role: 'user', content: continueMsg.content },
+        ];
+      }
+
+      const allMessages = [...sysMessages, ...finalMessagesPayload];
+      const chainTools = totalToolRoundRef.current >= SOFT_LIMIT_ROUNDS ? [] : availableTools;
+
+      await dispatchAIChatPayload({
+        sid,
+        messages: allMessages,
+        tools: chainTools,
+        addAIChatMessage: (sessionId, message) => useStore.getState().addAIChatMessage(sessionId, message),
+        updateAIChatMessage,
+        setSending,
+        nextMessageId,
+        pendingAssistantMessageId: chainConnectingMsg.id,
+        jvmPlanContext: inheritedJVMPlanContext,
+        jvmDiagnosticPlanContext: inheritedJVMDiagnosticPlanContext,
+      });
+    } catch (error) {
+      console.error('Failed to chain tool call', error);
+      setSending(false);
+    }
+  }, [
+    activeProviderModel,
+    availableTools,
+    buildSystemContextMessages,
+    dynamicModels,
+    mcpTools,
+    nextMessageId,
+    pendingJVMDiagnosticPlanContextRef,
+    pendingJVMPlanContextRef,
+    setSending,
+    sid,
+    skills,
+    updateAIChatMessage,
+    userPromptSettings,
+  ]);
+
+  return {
+    executeLocalTools,
+    resetToolCallState,
+    toolContextMapRef,
+  };
+};
diff --git a/frontend/src/components/ai/useAIChatPanelResize.ts b/frontend/src/components/ai/useAIChatPanelResize.ts
new file mode 100644
index 0000000..c2139b9
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatPanelResize.ts
@@ -0,0 +1,106 @@
+import { useCallback, useEffect, useRef, useState, type MouseEvent as ReactMouseEvent } from 'react';
+
+interface UseAIChatPanelResizeOptions {
+  width: number;
+  isV2Ui: boolean;
+  onWidthChange?: (width: number) => void;
+}
+
+export const useAIChatPanelResize = ({
+  width,
+  isV2Ui,
+  onWidthChange,
+}: UseAIChatPanelResizeOptions) => {
+  const [panelWidth, setPanelWidth] = useState(width);
+  const [isResizing, setIsResizing] = useState(false);
+
+  const panelRef = useRef<HTMLDivElement>(null);
+  const ghostRef = useRef<HTMLDivElement>(null);
+  const panelRect = useRef<{ top: number; bottom: number; left: number } | null>(null);
+  const resizeStartX = useRef(0);
+  const resizeStartWidth = useRef(0);
+  const dragWidthRef = useRef(width);
+
+  useEffect(() => {
+    setPanelWidth(width);
+    dragWidthRef.current = width;
+  }, [width]);
+
+  const handleResizeStart = useCallback((event: ReactMouseEvent) => {
+    event.preventDefault();
+    setIsResizing(true);
+    resizeStartX.current = event.clientX;
+    resizeStartWidth.current = panelWidth;
+    dragWidthRef.current = panelWidth;
+    if (!panelRef.current) {
+      return;
+    }
+    const rect = panelRef.current.getBoundingClientRect();
+    panelRect.current = {
+      top: rect.top,
+      bottom: window.innerHeight - rect.bottom,
+      left: rect.left,
+    };
+  }, [panelWidth]);
+
+  useEffect(() => {
+    if (!isResizing) {
+      return;
+    }
+
+    let animationFrameId = 0;
+    const handleMouseMove = (event: MouseEvent) => {
+      if (animationFrameId) {
+        cancelAnimationFrame(animationFrameId);
+      }
+      animationFrameId = requestAnimationFrame(() => {
+        const delta = resizeStartX.current - event.clientX;
+        const minWidth = isV2Ui ? 300 : 280;
+        const maxWidth = isV2Ui ? 520 : 700;
+        const nextWidth = Math.min(Math.max(resizeStartWidth.current + delta, minWidth), maxWidth);
+        dragWidthRef.current = nextWidth;
+
+        if (!ghostRef.current || !panelRect.current) {
+          return;
+        }
+        const actualDelta = nextWidth - resizeStartWidth.current;
+        ghostRef.current.style.left = `${panelRect.current.left - actualDelta}px`;
+      });
+    };
+
+    const handleMouseUp = () => {
+      if (animationFrameId) {
+        cancelAnimationFrame(animationFrameId);
+      }
+      setIsResizing(false);
+      setPanelWidth(dragWidthRef.current);
+      onWidthChange?.(dragWidthRef.current);
+    };
+
+    document.addEventListener('mousemove', handleMouseMove);
+    document.addEventListener('mouseup', handleMouseUp);
+    document.body.style.cursor = 'col-resize';
+    document.body.style.userSelect = 'none';
+    document.body.style.pointerEvents = 'none';
+
+    return () => {
+      if (animationFrameId) {
+        cancelAnimationFrame(animationFrameId);
+      }
+      document.removeEventListener('mousemove', handleMouseMove);
+      document.removeEventListener('mouseup', handleMouseUp);
+      document.body.style.cursor = '';
+      document.body.style.userSelect = '';
+      document.body.style.pointerEvents = '';
+    };
+  }, [isResizing, isV2Ui, onWidthChange]);
+
+  return {
+    ghostRef,
+    handleResizeStart,
+    isResizing,
+    panelRect,
+    panelRef,
+    panelWidth,
+  };
+};
diff --git a/frontend/src/components/ai/useAIChatPlanContexts.ts b/frontend/src/components/ai/useAIChatPlanContexts.ts
new file mode 100644
index 0000000..ce26150
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatPlanContexts.ts
@@ -0,0 +1,60 @@
+import { useCallback, useRef } from 'react';
+
+import { useStore } from '../../store';
+import type { JVMAIPlanContext, JVMDiagnosticPlanContext } from '../../types';
+
+export const useAIChatPlanContexts = () => {
+  const pendingJVMPlanContextRef = useRef<JVMAIPlanContext | undefined>(undefined);
+  const pendingJVMDiagnosticPlanContextRef = useRef<JVMDiagnosticPlanContext | undefined>(undefined);
+
+  const getCurrentJVMPlanContext = useCallback((): JVMAIPlanContext | undefined => {
+    const state = useStore.getState();
+    const activeTab = state.tabs.find((tab) => tab.id === state.activeTabId);
+    if (!activeTab || activeTab.type !== 'jvm-resource') {
+      return undefined;
+    }
+
+    const activeConnection = state.connections.find((connection) => connection.id === activeTab.connectionId);
+    if (activeConnection?.config?.type !== 'jvm') {
+      return undefined;
+    }
+
+    const resourcePath = String(activeTab.resourcePath || '').trim();
+    if (!resourcePath) {
+      return undefined;
+    }
+
+    return {
+      tabId: activeTab.id,
+      connectionId: activeTab.connectionId,
+      providerMode: (activeTab.providerMode || activeConnection.config.jvm?.preferredMode || 'jmx') as JVMAIPlanContext['providerMode'],
+      resourcePath,
+    };
+  }, []);
+
+  const getCurrentJVMDiagnosticPlanContext = useCallback((): JVMDiagnosticPlanContext | undefined => {
+    const state = useStore.getState();
+    const activeTab = state.tabs.find((tab) => tab.id === state.activeTabId);
+    if (!activeTab || activeTab.type !== 'jvm-diagnostic') {
+      return undefined;
+    }
+
+    const activeConnection = state.connections.find((connection) => connection.id === activeTab.connectionId);
+    if (activeConnection?.config?.type !== 'jvm') {
+      return undefined;
+    }
+
+    return {
+      tabId: activeTab.id,
+      connectionId: activeTab.connectionId,
+      transport: activeConnection.config.jvm?.diagnostic?.transport || 'agent-bridge',
+    };
+  }, []);
+
+  return {
+    getCurrentJVMPlanContext,
+    getCurrentJVMDiagnosticPlanContext,
+    pendingJVMPlanContextRef,
+    pendingJVMDiagnosticPlanContextRef,
+  };
+};
diff --git a/frontend/src/components/ai/useAIChatRuntimeResources.ts b/frontend/src/components/ai/useAIChatRuntimeResources.ts
new file mode 100644
index 0000000..8103871
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatRuntimeResources.ts
@@ -0,0 +1,251 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import type {
+  AIMCPToolDescriptor,
+  AIProviderConfig,
+  AISkillConfig,
+  AIUserPromptSettings,
+} from '../../types';
+import type { AIComposerNotice, AIComposerNoticeAction } from '../../utils/aiComposerNotice';
+import { buildModelFetchFailedNotice } from '../../utils/aiComposerNotice';
+
+interface AIChatRuntimeService {
+  AIGetProviders?: () => Promise<AIProviderConfig[]>;
+  AIGetActiveProvider?: () => Promise<string>;
+  AIGetUserPromptSettings?: () => Promise<Partial<AIUserPromptSettings>>;
+  AIListMCPTools?: () => Promise<AIMCPToolDescriptor[]>;
+  AIGetSkills?: () => Promise<AISkillConfig[]>;
+  AISaveProvider?: (provider: AIProviderConfig & { apiKey?: string; hasSecret?: boolean }) => Promise<unknown>;
+  AIListModels?: () => Promise<{ success?: boolean; models?: string[]; error?: string } | undefined>;
+}
+
+interface UseAIChatRuntimeResourcesOptions {
+  onOpenSettings?: () => void;
+}
+
+export const EMPTY_AI_USER_PROMPT_SETTINGS: AIUserPromptSettings = {
+  global: '',
+  database: '',
+  jvm: '',
+  jvmDiagnostic: '',
+};
+
+export const useAIChatRuntimeResources = ({
+  onOpenSettings,
+}: UseAIChatRuntimeResourcesOptions) => {
+  const [activeProvider, setActiveProvider] = useState<AIProviderConfig | null>(null);
+  const [userPromptSettings, setUserPromptSettings] = useState<AIUserPromptSettings>(EMPTY_AI_USER_PROMPT_SETTINGS);
+  const [mcpTools, setMcpTools] = useState<AIMCPToolDescriptor[]>([]);
+  const [skills, setSkills] = useState<AISkillConfig[]>([]);
+  const [dynamicModels, setDynamicModels] = useState<string[]>([]);
+  const [loadingModels, setLoadingModels] = useState(false);
+  const [composerNotice, setComposerNotice] = useState<AIComposerNotice | null>(null);
+
+  const activeProviderIdRef = useRef<string | null>(null);
+
+  const getAIService = useCallback(
+    () => (window as any).go?.aiservice?.Service as AIChatRuntimeService | undefined,
+    [],
+  );
+
+  const loadActiveProvider = useCallback(async () => {
+    try {
+      const service = getAIService();
+      if (!service) {
+        setActiveProvider(null);
+        return;
+      }
+      const [providers, activeProviderId] = await Promise.all([
+        service.AIGetProviders?.(),
+        service.AIGetActiveProvider?.(),
+      ]);
+      if (!Array.isArray(providers) || !activeProviderId) {
+        setActiveProvider(null);
+        return;
+      }
+      const current = providers.find((item) => item.id === activeProviderId);
+      setActiveProvider(current || null);
+    } catch (error) {
+      console.warn('Failed to load active provider', error);
+      setActiveProvider(null);
+    }
+  }, [getAIService]);
+
+  useEffect(() => {
+    void loadActiveProvider();
+  }, [loadActiveProvider]);
+
+  const loadUserPromptSettings = useCallback(async () => {
+    try {
+      const service = getAIService();
+      if (!service?.AIGetUserPromptSettings) {
+        setUserPromptSettings(EMPTY_AI_USER_PROMPT_SETTINGS);
+        return;
+      }
+      const nextSettings = await service.AIGetUserPromptSettings();
+      setUserPromptSettings({
+        ...EMPTY_AI_USER_PROMPT_SETTINGS,
+        ...nextSettings,
+      });
+    } catch (error) {
+      console.warn('Failed to load user prompt settings', error);
+      setUserPromptSettings(EMPTY_AI_USER_PROMPT_SETTINGS);
+    }
+  }, [getAIService]);
+
+  const loadMCPTools = useCallback(async () => {
+    try {
+      const service = getAIService();
+      if (!service?.AIListMCPTools) {
+        setMcpTools([]);
+        return;
+      }
+      const nextTools = await service.AIListMCPTools();
+      setMcpTools(Array.isArray(nextTools) ? nextTools : []);
+    } catch (error) {
+      console.warn('Failed to load MCP tools', error);
+      setMcpTools([]);
+    }
+  }, [getAIService]);
+
+  const loadSkills = useCallback(async () => {
+    try {
+      const service = getAIService();
+      if (!service?.AIGetSkills) {
+        setSkills([]);
+        return;
+      }
+      const nextSkills = await service.AIGetSkills();
+      setSkills(Array.isArray(nextSkills) ? nextSkills : []);
+    } catch (error) {
+      console.warn('Failed to load skills', error);
+      setSkills([]);
+    }
+  }, [getAIService]);
+
+  useEffect(() => {
+    void loadUserPromptSettings();
+    void loadMCPTools();
+    void loadSkills();
+    const handleAIConfigChanged = () => {
+      void loadUserPromptSettings();
+      void loadMCPTools();
+      void loadSkills();
+      void loadActiveProvider();
+    };
+    window.addEventListener('gonavi:ai:config-changed', handleAIConfigChanged as EventListener);
+    return () => {
+      window.removeEventListener('gonavi:ai:config-changed', handleAIConfigChanged as EventListener);
+    };
+  }, [loadActiveProvider, loadMCPTools, loadSkills, loadUserPromptSettings]);
+
+  useEffect(() => {
+    const handleProviderChanged = () => {
+      setDynamicModels([]);
+      setComposerNotice(null);
+      activeProviderIdRef.current = null;
+      void loadActiveProvider();
+    };
+    window.addEventListener('gonavi:ai:provider-changed', handleProviderChanged);
+    return () => window.removeEventListener('gonavi:ai:provider-changed', handleProviderChanged);
+  }, [loadActiveProvider]);
+
+  const handleModelChange = useCallback(async (model: string) => {
+    if (!activeProvider) {
+      return;
+    }
+    try {
+      const service = getAIService();
+      const payload = {
+        ...activeProvider,
+        model,
+        apiKey: activeProvider.apiKey || '',
+        hasSecret: activeProvider.hasSecret ?? Boolean(activeProvider.secretRef),
+      };
+      await service?.AISaveProvider?.(payload);
+      setActiveProvider(payload);
+      setComposerNotice(null);
+    } catch (error) {
+      console.warn('Failed to update provider model', error);
+    }
+  }, [activeProvider, getAIService]);
+
+  useEffect(() => {
+    if (activeProvider?.id && activeProvider.id !== activeProviderIdRef.current) {
+      setDynamicModels([]);
+      setComposerNotice(null);
+      activeProviderIdRef.current = activeProvider.id;
+    }
+    if (!activeProvider) {
+      setDynamicModels([]);
+      setComposerNotice(null);
+      activeProviderIdRef.current = null;
+    }
+  }, [activeProvider]);
+
+  useEffect(() => {
+    if (activeProvider?.model && String(activeProvider.model).trim()) {
+      setComposerNotice(null);
+    }
+  }, [activeProvider?.model]);
+
+  const fetchDynamicModels = useCallback(async () => {
+    try {
+      setLoadingModels(true);
+      setComposerNotice(null);
+      const service = getAIService();
+      if (!service) {
+        return;
+      }
+      const result = await service.AIListModels?.();
+      if (result?.success && Array.isArray(result.models) && result.models.length > 0) {
+        const sortedModels = [...result.models].sort((left, right) => left.localeCompare(right));
+        setDynamicModels(sortedModels);
+        setComposerNotice(null);
+        return;
+      }
+      if (result && !result.success) {
+        setDynamicModels([]);
+        setComposerNotice(buildModelFetchFailedNotice(result.error));
+      }
+    } catch (error: any) {
+      console.warn('Failed to fetch models', error);
+      setDynamicModels([]);
+      setComposerNotice(buildModelFetchFailedNotice(`获取模型列表失败：${error?.message || '未知错误'}`));
+    } finally {
+      setLoadingModels(false);
+    }
+  }, [getAIService]);
+
+  const handleOpenSettingsFromPanel = useCallback(() => {
+    onOpenSettings?.();
+    window.setTimeout(() => {
+      void loadActiveProvider();
+    }, 500);
+  }, [loadActiveProvider, onOpenSettings]);
+
+  const handleComposerAction = useCallback((actionKey: AIComposerNoticeAction) => {
+    if (actionKey === 'open-settings') {
+      handleOpenSettingsFromPanel();
+      return;
+    }
+    if (actionKey === 'reload-models') {
+      void fetchDynamicModels();
+    }
+  }, [fetchDynamicModels, handleOpenSettingsFromPanel]);
+
+  return {
+    activeProvider,
+    composerNotice,
+    dynamicModels,
+    fetchDynamicModels,
+    handleComposerAction,
+    handleModelChange,
+    handleOpenSettingsFromPanel,
+    loadingModels,
+    mcpTools,
+    setComposerNotice,
+    skills,
+    userPromptSettings,
+  };
+};
diff --git a/frontend/src/components/ai/useAIChatSessionState.ts b/frontend/src/components/ai/useAIChatSessionState.ts
new file mode 100644
index 0000000..fa514a5
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatSessionState.ts
@@ -0,0 +1,57 @@
+import { useEffect, useMemo, useRef } from 'react';
+
+import {
+  loadAISessionFromBackend,
+  loadAISessionsFromBackend,
+  useStore,
+} from '../../store';
+
+interface UseAIChatSessionStateOptions {
+  aiActiveSessionId: string | null;
+  aiPanelVisible: boolean;
+  createNewAISession: () => void;
+}
+
+export const useAIChatSessionState = ({
+  aiActiveSessionId,
+  aiPanelVisible,
+  createNewAISession,
+}: UseAIChatSessionStateOptions) => {
+  const aiChatHistory = useStore((state) => state.aiChatHistory);
+  const aiChatSessions = useStore((state) => state.aiChatSessions);
+
+  useEffect(() => {
+    if (!aiActiveSessionId) {
+      createNewAISession();
+    }
+  }, [aiActiveSessionId, createNewAISession]);
+
+  const sid = aiActiveSessionId || 'session-fallback';
+  const messages = aiChatHistory[sid] || [];
+
+  const sessionsLoadedRef = useRef(false);
+  useEffect(() => {
+    if (!aiPanelVisible || sessionsLoadedRef.current) {
+      return;
+    }
+    sessionsLoadedRef.current = true;
+    loadAISessionsFromBackend();
+  }, [aiPanelVisible]);
+
+  useEffect(() => {
+    if (sid && sid !== 'session-fallback') {
+      loadAISessionFromBackend(sid);
+    }
+  }, [sid]);
+
+  const orderedAISessions = useMemo(
+    () => [...aiChatSessions].sort((left, right) => right.updatedAt - left.updatedAt),
+    [aiChatSessions],
+  );
+
+  return {
+    sid,
+    messages,
+    orderedAISessions,
+  };
+};
diff --git a/frontend/src/components/ai/useAIChatSessionTitleGenerator.test.tsx b/frontend/src/components/ai/useAIChatSessionTitleGenerator.test.tsx
new file mode 100644
index 0000000..eda3db0
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatSessionTitleGenerator.test.tsx
@@ -0,0 +1,122 @@
+import React from 'react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+
+import { useStore } from '../../store';
+import { useAIChatSessionTitleGenerator } from './useAIChatSessionTitleGenerator';
+
+const SESSION_ID = 'session-title';
+
+let currentGenerator: ((sessionId: string) => Promise<void>) | undefined;
+
+const TitleGeneratorHarness = ({
+  updateAISessionTitle,
+}: {
+  updateAISessionTitle: (sessionId: string, title: string) => void;
+}) => {
+  currentGenerator = useAIChatSessionTitleGenerator({ updateAISessionTitle });
+  return null;
+};
+
+describe('useAIChatSessionTitleGenerator', () => {
+  beforeEach(() => {
+    currentGenerator = undefined;
+    useStore.setState({
+      aiChatHistory: {
+        [SESSION_ID]: [
+          {
+            id: 'user-1',
+            role: 'user',
+            content: '帮我分析当前连接失败原因，并给出下一步排查建议，内容很长需要被截断',
+            timestamp: 1,
+          },
+          {
+            id: 'assistant-1',
+            role: 'assistant',
+            content: '可以',
+            timestamp: 2,
+          },
+        ],
+      },
+      aiChatSessions: [{ id: SESSION_ID, title: '新的对话', updatedAt: 1 }],
+      aiActiveSessionId: SESSION_ID,
+    });
+  });
+
+  afterEach(() => {
+    vi.unstubAllGlobals();
+    vi.restoreAllMocks();
+    useStore.setState({
+      aiChatHistory: {},
+      aiChatSessions: [],
+      aiActiveSessionId: null,
+    });
+  });
+
+  it('generates a cleaned session title from the first user message', async () => {
+    const AIChatSend = vi.fn().mockResolvedValue({ success: true, content: '"连接失败排查"' });
+    vi.stubGlobal('window', {
+      go: {
+        aiservice: {
+          Service: { AIChatSend },
+        },
+      },
+    });
+    const updateAISessionTitle = vi.fn();
+
+    await act(async () => {
+      create(<TitleGeneratorHarness updateAISessionTitle={updateAISessionTitle} />);
+    });
+    await act(async () => {
+      await currentGenerator?.(SESSION_ID);
+    });
+
+    expect(AIChatSend).toHaveBeenCalledTimes(1);
+    expect(AIChatSend.mock.calls[0][0]).toEqual([
+      {
+        role: 'system',
+        content:
+          'You are a summarizer. Provide a short 3-6 word title for this prompt. Do not use quotes, punctuation, or explain. Just the title in the same language as the prompt.',
+      },
+      {
+        role: 'user',
+        content: '帮我分析当前连接失败原因，并给出下一步排查建议，内容很长需要被截断'.slice(0, 50),
+      },
+    ]);
+    expect(updateAISessionTitle).toHaveBeenCalledWith(SESSION_ID, '连接失败排查');
+  });
+
+  it('keeps the generator stable when the title updater is stable', async () => {
+    vi.stubGlobal('window', {});
+    const updateAISessionTitle = vi.fn();
+    let renderer: ReactTestRenderer | undefined;
+
+    await act(async () => {
+      renderer = create(<TitleGeneratorHarness updateAISessionTitle={updateAISessionTitle} />);
+    });
+    const firstGenerator = currentGenerator;
+
+    await act(async () => {
+      renderer?.update(<TitleGeneratorHarness updateAISessionTitle={updateAISessionTitle} />);
+    });
+
+    expect(currentGenerator).toBe(firstGenerator);
+    await act(async () => {
+      renderer?.unmount();
+    });
+  });
+
+  it('skips generation when the Wails AI service is unavailable', async () => {
+    vi.stubGlobal('window', {});
+    const updateAISessionTitle = vi.fn();
+
+    await act(async () => {
+      create(<TitleGeneratorHarness updateAISessionTitle={updateAISessionTitle} />);
+    });
+    await act(async () => {
+      await currentGenerator?.(SESSION_ID);
+    });
+
+    expect(updateAISessionTitle).not.toHaveBeenCalled();
+  });
+});
diff --git a/frontend/src/components/ai/useAIChatSessionTitleGenerator.ts b/frontend/src/components/ai/useAIChatSessionTitleGenerator.ts
new file mode 100644
index 0000000..4915d6f
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatSessionTitleGenerator.ts
@@ -0,0 +1,41 @@
+import { useCallback } from 'react';
+
+import { useStore } from '../../store';
+
+interface UseAIChatSessionTitleGeneratorOptions {
+  updateAISessionTitle: (sessionId: string, title: string) => void;
+}
+
+const TITLE_PROMPT =
+  'You are a summarizer. Provide a short 3-6 word title for this prompt. Do not use quotes, punctuation, or explain. Just the title in the same language as the prompt.';
+
+export const useAIChatSessionTitleGenerator = ({
+  updateAISessionTitle,
+}: UseAIChatSessionTitleGeneratorOptions) => {
+  return useCallback(
+    async (currentSid: string) => {
+      try {
+        const Service = (window as any).go?.aiservice?.Service;
+        const historyLocal = useStore.getState().aiChatHistory[currentSid] || [];
+        if (!Service?.AIChatSend || historyLocal.length < 2) return;
+
+        const firstUserMsg = historyLocal.find((message) => message.role === 'user');
+        if (!firstUserMsg) return;
+
+        const snippet = firstUserMsg.content.slice(0, 50);
+        const titleReq = [
+          { role: 'system', content: TITLE_PROMPT },
+          { role: 'user', content: snippet },
+        ];
+        const response = await Service.AIChatSend(titleReq);
+        if (response?.success && response.content) {
+          const cleanTitle = response.content.trim().replace(/^["']|["']$/g, '');
+          updateAISessionTitle(currentSid, cleanTitle);
+        }
+      } catch (error) {
+        console.warn('Failed to auto-generate title', error);
+      }
+    },
+    [updateAISessionTitle],
+  );
+};
diff --git a/frontend/src/components/ai/useAIChatStreamSubscription.test.tsx b/frontend/src/components/ai/useAIChatStreamSubscription.test.tsx
new file mode 100644
index 0000000..a02a0e0
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatStreamSubscription.test.tsx
@@ -0,0 +1,167 @@
+import React, { useRef, useState } from 'react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+
+import { useStore } from '../../store';
+import { useAIChatStreamSubscription } from './useAIChatStreamSubscription';
+
+const runtimeMock = vi.hoisted(() => {
+  const handlers = new Map<string, (data: any) => void>();
+  return {
+    handlers,
+    EventsOn: vi.fn((eventName: string, handler: (data: any) => void) => {
+      handlers.set(eventName, handler);
+    }),
+    EventsOff: vi.fn((eventName: string) => {
+      handlers.delete(eventName);
+    }),
+  };
+});
+
+vi.mock('../../../wailsjs/runtime', () => ({
+  EventsOn: runtimeMock.EventsOn,
+  EventsOff: runtimeMock.EventsOff,
+}));
+
+const SESSION_ID = 'session-stream';
+let nextId = 0;
+
+const emitStreamChunk = async (data: any) => {
+  const handler = runtimeMock.handlers.get(`ai:stream:${SESSION_ID}`);
+  expect(handler).toBeTypeOf('function');
+  await act(async () => {
+    handler?.(data);
+    await Promise.resolve();
+  });
+};
+
+const appendMessage = (
+  sessionId: string,
+  message: Parameters<ReturnType<typeof useStore.getState>['addAIChatMessage']>[1],
+) => {
+  useStore.setState((state) => {
+    const messages = state.aiChatHistory[sessionId] || [];
+    return {
+      aiChatHistory: {
+        ...state.aiChatHistory,
+        [sessionId]: [...messages, message],
+      },
+    };
+  });
+};
+
+const patchMessage = (
+  sessionId: string,
+  messageId: string,
+  patch: Parameters<ReturnType<typeof useStore.getState>['updateAIChatMessage']>[2],
+) => {
+  useStore.setState((state) => {
+    const messages = state.aiChatHistory[sessionId];
+    if (!messages) {
+      return state;
+    }
+    return {
+      aiChatHistory: {
+        ...state.aiChatHistory,
+        [sessionId]: messages.map((message) =>
+          message.id === messageId ? { ...message, ...patch } : message,
+        ),
+      },
+    };
+  });
+};
+
+const StreamHarness = () => {
+  const [sending, setSending] = useState(true);
+  const nudgeCountRef = useRef(0);
+  const pendingJVMPlanContextRef = useRef<any>(undefined);
+  const pendingJVMDiagnosticPlanContextRef = useRef<any>(undefined);
+
+  useAIChatStreamSubscription({
+    sid: SESSION_ID,
+    sending,
+    setSending,
+    availableTools: [],
+    addAIChatMessage: appendMessage,
+    updateAIChatMessage: patchMessage,
+    buildSystemContextMessages: async () => [],
+    executeLocalTools: async () => {},
+    generateTitleForSession: async () => {},
+    nextMessageId: () => `assistant-created-${++nextId}`,
+    nudgeCountRef,
+    pendingJVMPlanContextRef,
+    pendingJVMDiagnosticPlanContextRef,
+  });
+
+  return null;
+};
+
+describe('useAIChatStreamSubscription', () => {
+  beforeEach(() => {
+    nextId = 0;
+    runtimeMock.handlers.clear();
+    runtimeMock.EventsOn.mockClear();
+    runtimeMock.EventsOff.mockClear();
+    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
+      callback(0);
+      return 1;
+    });
+    useStore.setState({
+      aiChatHistory: {
+        [SESSION_ID]: [
+          {
+            id: 'user-1',
+            role: 'user',
+            content: 'hello',
+            timestamp: 1,
+          },
+          {
+            id: 'assistant-connecting',
+            role: 'assistant',
+            phase: 'connecting',
+            content: '',
+            timestamp: 2,
+            loading: true,
+          },
+        ],
+      },
+      aiChatSessions: [{ id: SESSION_ID, title: 'hello', updatedAt: 1 }],
+      aiActiveSessionId: SESSION_ID,
+    });
+  });
+
+  afterEach(() => {
+    vi.unstubAllGlobals();
+    useStore.setState({
+      aiChatHistory: {},
+      aiChatSessions: [],
+      aiActiveSessionId: null,
+    });
+  });
+
+  it('keeps streamed chunks in the same assistant message after a parent rerender', async () => {
+    let renderer: ReactTestRenderer | undefined;
+
+    await act(async () => {
+      renderer = create(<StreamHarness />);
+    });
+
+    await emitStreamChunk({ content: 'Hello' });
+    await emitStreamChunk({ content: ' world' });
+
+    const messages = useStore.getState().aiChatHistory[SESSION_ID] || [];
+    const assistantMessages = messages.filter((message) => message.role === 'assistant');
+
+    expect(assistantMessages).toHaveLength(1);
+    expect(assistantMessages[0]).toMatchObject({
+      id: 'assistant-connecting',
+      phase: 'generating',
+      content: 'Hello world',
+      loading: true,
+    });
+
+    await act(async () => {
+      renderer?.unmount();
+    });
+  });
+});
diff --git a/frontend/src/components/ai/useAIChatStreamSubscription.ts b/frontend/src/components/ai/useAIChatStreamSubscription.ts
new file mode 100644
index 0000000..5c5d90c
--- /dev/null
+++ b/frontend/src/components/ai/useAIChatStreamSubscription.ts
@@ -0,0 +1,351 @@
+import { useEffect, useRef } from 'react';
+import type { MutableRefObject } from 'react';
+
+import { EventsOn, EventsOff } from '../../../wailsjs/runtime';
+import { useStore } from '../../store';
+import type {
+  AIChatMessage,
+  AIToolCall,
+  JVMAIPlanContext,
+  JVMDiagnosticPlanContext,
+} from '../../types';
+import { sanitizeErrorMsg } from '../../utils/aiChatRuntime';
+import { toAIRequestMessage } from '../../utils/aiMessagePayload';
+import type { AIChatToolDefinition } from '../../utils/aiToolRegistry';
+
+interface AIChatStreamChunk {
+  content?: string;
+  thinking?: string;
+  reasoning_content?: string;
+  tool_calls?: AIToolCall[];
+  done?: boolean;
+  error?: string;
+}
+
+interface UseAIChatStreamSubscriptionOptions {
+  sid: string;
+  sending: boolean;
+  setSending: (sending: boolean) => void;
+  availableTools: AIChatToolDefinition[];
+  addAIChatMessage: (sid: string, message: AIChatMessage) => void;
+  updateAIChatMessage: (
+    sid: string,
+    messageId: string,
+    patch: Partial<AIChatMessage>,
+  ) => void;
+  buildSystemContextMessages: (
+    overrideJVMPlanContext?: JVMAIPlanContext,
+    overrideJVMDiagnosticPlanContext?: JVMDiagnosticPlanContext,
+  ) => any[] | Promise<any[]>;
+  executeLocalTools: (toolCalls: AIToolCall[], currentAsstMsgId: string) => void | Promise<void>;
+  generateTitleForSession: (sid: string) => void | Promise<void>;
+  nextMessageId: () => string;
+  nudgeCountRef: MutableRefObject<number>;
+  pendingJVMPlanContextRef: MutableRefObject<JVMAIPlanContext | undefined>;
+  pendingJVMDiagnosticPlanContextRef: MutableRefObject<JVMDiagnosticPlanContext | undefined>;
+}
+
+interface AIChatStreamState {
+  sid: string;
+  assistantMsgId: string;
+  isFirstCompletion: boolean;
+  streamBuffer: {
+    thinking: string;
+    reasoningContent: string;
+    content: string;
+  };
+  flushPending: boolean;
+}
+
+const createAIChatStreamState = (sid: string): AIChatStreamState => ({
+  sid,
+  assistantMsgId: '',
+  isFirstCompletion: false,
+  streamBuffer: { thinking: '', reasoningContent: '', content: '' },
+  flushPending: false,
+});
+
+const resetAIChatStreamProgress = (state: AIChatStreamState) => {
+  state.assistantMsgId = '';
+  state.isFirstCompletion = false;
+  state.streamBuffer.thinking = '';
+  state.streamBuffer.reasoningContent = '';
+  state.streamBuffer.content = '';
+  state.flushPending = false;
+};
+
+export const useAIChatStreamSubscription = ({
+  sid,
+  sending,
+  setSending,
+  availableTools,
+  addAIChatMessage,
+  updateAIChatMessage,
+  buildSystemContextMessages,
+  executeLocalTools,
+  generateTitleForSession,
+  nextMessageId,
+  nudgeCountRef,
+  pendingJVMPlanContextRef,
+  pendingJVMDiagnosticPlanContextRef,
+}: UseAIChatStreamSubscriptionOptions) => {
+  const sendingRef = useRef(sending);
+  const streamStateRef = useRef(createAIChatStreamState(sid));
+
+  useEffect(() => {
+    sendingRef.current = sending;
+  }, [sending]);
+
+  useEffect(() => {
+    const eventName = `ai:stream:${sid}`;
+    if (streamStateRef.current.sid !== sid) {
+      streamStateRef.current = createAIChatStreamState(sid);
+    }
+    const streamState = streamStateRef.current;
+
+    // 缓冲高频 token，避免把流式吞吐直接转成同步重绘风暴
+    const streamBuffer = streamState.streamBuffer;
+
+    const flushStreamBuffer = () => {
+      streamState.flushPending = false;
+      if (!streamState.assistantMsgId) return;
+      const current = useStore.getState().aiChatHistory[sid];
+      const existing = current?.find((message) => message.id === streamState.assistantMsgId);
+      if (!existing) return;
+
+      const updates: Partial<AIChatMessage> = {};
+      if (streamBuffer.thinking) {
+        updates.thinking = (existing.thinking || '') + streamBuffer.thinking;
+        updates.phase = 'thinking';
+        streamBuffer.thinking = '';
+      }
+      if (streamBuffer.reasoningContent) {
+        updates.reasoning_content = (existing.reasoning_content || '') + streamBuffer.reasoningContent;
+        streamBuffer.reasoningContent = '';
+      }
+      if (streamBuffer.content) {
+        updates.content = (existing.content || '') + streamBuffer.content;
+        updates.phase = 'generating';
+        streamBuffer.content = '';
+      }
+
+      if (Object.keys(updates).length > 0) {
+        updateAIChatMessage(sid, streamState.assistantMsgId, updates);
+      }
+    };
+
+    const handler = (data: AIChatStreamChunk) => {
+      if (!streamState.assistantMsgId) {
+        const history = useStore.getState().aiChatHistory[sid] || [];
+        const lastMsg = history[history.length - 1];
+        if (lastMsg && lastMsg.role === 'assistant' && lastMsg.loading && lastMsg.phase === 'connecting') {
+          streamState.assistantMsgId = lastMsg.id;
+          updateAIChatMessage(sid, streamState.assistantMsgId, { content: '' });
+        }
+      }
+
+      if (data.error) {
+        const cleanErr = sanitizeErrorMsg(data.error);
+        const rawErr = cleanErr !== data.error ? data.error : undefined;
+        if (streamState.assistantMsgId) {
+          updateAIChatMessage(sid, streamState.assistantMsgId, {
+            content: `❌ 错误: ${cleanErr}`,
+            phase: 'idle',
+            loading: false,
+            rawError: rawErr,
+          });
+        } else {
+          addAIChatMessage(sid, {
+            id: nextMessageId(),
+            role: 'assistant',
+            phase: 'idle',
+            content: `❌ 错误: ${cleanErr}`,
+            rawError: rawErr,
+            timestamp: Date.now(),
+            jvmPlanContext: pendingJVMPlanContextRef.current,
+            jvmDiagnosticPlanContext: pendingJVMDiagnosticPlanContextRef.current,
+          });
+        }
+        resetAIChatStreamProgress(streamState);
+        setSending(false);
+        return;
+      }
+
+      if (data.tool_calls && data.tool_calls.length > 0) {
+        if (streamState.assistantMsgId) {
+          updateAIChatMessage(sid, streamState.assistantMsgId, { tool_calls: data.tool_calls, phase: 'tool_calling' });
+        } else {
+          streamState.assistantMsgId = nextMessageId();
+          addAIChatMessage(sid, {
+            id: streamState.assistantMsgId,
+            role: 'assistant',
+            phase: 'tool_calling',
+            content: '',
+            tool_calls: data.tool_calls,
+            timestamp: Date.now(),
+            loading: true,
+            jvmPlanContext: pendingJVMPlanContextRef.current,
+            jvmDiagnosticPlanContext: pendingJVMDiagnosticPlanContextRef.current,
+          });
+        }
+      }
+
+      const displayThinking = data.thinking || data.reasoning_content || '';
+      if (displayThinking || data.reasoning_content) {
+        if (!streamState.assistantMsgId) {
+          streamState.assistantMsgId = nextMessageId();
+          addAIChatMessage(sid, {
+            id: streamState.assistantMsgId,
+            role: 'assistant',
+            phase: 'thinking',
+            content: '',
+            thinking: displayThinking || undefined,
+            reasoning_content: data.reasoning_content || undefined,
+            timestamp: Date.now(),
+            loading: true,
+            jvmPlanContext: pendingJVMPlanContextRef.current,
+            jvmDiagnosticPlanContext: pendingJVMDiagnosticPlanContextRef.current,
+          });
+          if (sendingRef.current) setSending(false);
+        } else {
+          streamBuffer.thinking += displayThinking;
+          if (data.reasoning_content) {
+            streamBuffer.reasoningContent += data.reasoning_content;
+          }
+          if (sendingRef.current) setSending(false);
+        }
+      }
+
+      if (data.content) {
+        if (!streamState.assistantMsgId) {
+          streamState.assistantMsgId = nextMessageId();
+          addAIChatMessage(sid, {
+            id: streamState.assistantMsgId,
+            role: 'assistant',
+            phase: 'generating',
+            content: data.content,
+            timestamp: Date.now(),
+            loading: true,
+            jvmPlanContext: pendingJVMPlanContextRef.current,
+            jvmDiagnosticPlanContext: pendingJVMDiagnosticPlanContextRef.current,
+          });
+          setSending(false);
+          const currentHistory = useStore.getState().aiChatHistory[sid] || [];
+          if (currentHistory.length <= 1) streamState.isFirstCompletion = true;
+        } else {
+          streamBuffer.content += data.content;
+          if (sendingRef.current) setSending(false);
+        }
+      }
+
+      if (streamBuffer.thinking || streamBuffer.reasoningContent || streamBuffer.content) {
+        if (!streamState.flushPending) {
+          streamState.flushPending = true;
+          requestAnimationFrame(flushStreamBuffer);
+        }
+      }
+
+      if (data.done) {
+        if (streamBuffer.thinking || streamBuffer.reasoningContent || streamBuffer.content) {
+          flushStreamBuffer();
+        }
+        const doneAssistantId = streamState.assistantMsgId;
+        const doneIsFirst = streamState.isFirstCompletion;
+        resetAIChatStreamProgress(streamState);
+        setTimeout(() => {
+          const currentMsgs = useStore.getState().aiChatHistory[sid] || [];
+          for (const msg of currentMsgs) {
+            if (msg.id !== doneAssistantId && msg.loading && msg.phase === 'connecting') {
+              updateAIChatMessage(sid, msg.id, { loading: false, phase: 'idle' });
+            }
+          }
+
+          if (doneAssistantId) {
+            const current = useStore.getState().aiChatHistory[sid];
+            const existing = current?.find((message) => message.id === doneAssistantId);
+            if (existing && existing.tool_calls && existing.tool_calls.length > 0) {
+              nudgeCountRef.current = 0;
+              setTimeout(() => executeLocalTools(existing.tool_calls!, doneAssistantId), 50);
+              return;
+            }
+
+            if (
+              existing &&
+              nudgeCountRef.current < 2 &&
+              /(?:让我|我先|我来|现在|接下来|下面).*(?:查询|查找|获取|查看|检查|调用)|(?:获取|查询|查找|查看).*(?:信息|字段|列表|数据)[：:]?\s*$/.test(existing.content || '')
+            ) {
+              nudgeCountRef.current += 1;
+              updateAIChatMessage(sid, doneAssistantId, { loading: false, phase: 'idle' });
+              (async () => {
+                try {
+                  const currentHistory = useStore.getState().aiChatHistory[sid] || [];
+                  const messagesPayload = currentHistory.map(toAIRequestMessage);
+                  const sysMessages = await buildSystemContextMessages(
+                    existing.jvmPlanContext,
+                    existing.jvmDiagnosticPlanContext,
+                  );
+                  messagesPayload.push({
+                    role: 'user',
+                    content: '请直接使用 function call 调用工具执行操作，不要只用文字描述计划。',
+                  });
+                  const allMsg = [...sysMessages, ...messagesPayload];
+                  const service = (window as any).go?.aiservice?.Service;
+                  if (service?.AIChatStream) {
+                    await service.AIChatStream(sid, allMsg, availableTools);
+                  }
+                } catch (error) {
+                  console.error('Nudge failed', error);
+                  setSending(false);
+                }
+              })();
+              return;
+            }
+
+            if (doneIsFirst) generateTitleForSession(sid);
+
+            const hasContent = !!existing?.content?.trim();
+            const hasThinking = !!existing?.thinking?.trim();
+            const hasTools = !!existing?.tool_calls?.length;
+
+            if (!hasContent && !hasThinking && !hasTools) {
+              updateAIChatMessage(sid, doneAssistantId, {
+                content: '❌ 模型未能成功响应任何内容，可能遭遇频控、上下文超载或理解拒绝。',
+                loading: false,
+                phase: 'idle',
+              });
+            } else {
+              updateAIChatMessage(sid, doneAssistantId, { loading: false, phase: 'idle' });
+            }
+          } else {
+            addAIChatMessage(sid, {
+              id: nextMessageId(),
+              role: 'assistant',
+              content: '❌ 请求中断：未收到任何具体回复。',
+              timestamp: Date.now(),
+              loading: false,
+            });
+          }
+          setSending(false);
+        }, 50);
+      }
+    };
+
+    EventsOn(eventName, handler);
+    return () => {
+      EventsOff(eventName);
+    };
+  }, [
+    addAIChatMessage,
+    availableTools,
+    buildSystemContextMessages,
+    executeLocalTools,
+    generateTitleForSession,
+    nextMessageId,
+    nudgeCountRef,
+    pendingJVMDiagnosticPlanContextRef,
+    pendingJVMPlanContextRef,
+    setSending,
+    sid,
+    updateAIChatMessage,
+  ]);
+};
diff --git a/frontend/src/components/ai/useAIMCPClientInstaller.ts b/frontend/src/components/ai/useAIMCPClientInstaller.ts
new file mode 100644
index 0000000..1a7b057
--- /dev/null
+++ b/frontend/src/components/ai/useAIMCPClientInstaller.ts
@@ -0,0 +1,199 @@
+import { useCallback, useMemo, useState } from 'react';
+
+import type { AIMCPClientInstallStatus } from '../../types';
+import {
+  buildRemoteMCPClientGuide,
+  buildRemoteMCPClientQuickStart,
+  EMPTY_MCP_CLIENT_STATUSES,
+  formatMCPLaunchCommand,
+  isRemoteMCPClientStatus,
+  normalizeMCPClientStatuses,
+  pickPreferredMCPClient,
+  type MCPClientKey,
+} from '../../utils/mcpClientInstallStatus';
+
+interface MCPClientInstallResult {
+  success?: boolean;
+  client?: string;
+  message?: string;
+  configPath?: string;
+  command?: string;
+  args?: string[];
+}
+
+interface MCPClientMessageApi {
+  error: (content: string) => unknown;
+  success: (content: string) => unknown;
+  warning: (content: string) => unknown;
+}
+
+interface AIMCPClientInstallerService {
+  AIGetMCPClientInstallStatuses?: () => Promise<AIMCPClientInstallStatus[]>;
+  AIInstallClaudeCodeMCP?: () => Promise<MCPClientInstallResult>;
+  AIInstallCodexMCP?: () => Promise<MCPClientInstallResult>;
+}
+
+interface UseAIMCPClientInstallerOptions {
+  copyTextToClipboard: (text: string, successMessage: string) => Promise<void>;
+  messageApi: MCPClientMessageApi;
+  onAfterInstall?: () => void;
+  onBeforeInstall?: () => void;
+  onConfigChanged?: () => void;
+  resolveAIService: () => Promise<AIMCPClientInstallerService | null>;
+}
+
+export const useAIMCPClientInstaller = ({
+  copyTextToClipboard,
+  messageApi,
+  onAfterInstall,
+  onBeforeInstall,
+  onConfigChanged,
+  resolveAIService,
+}: UseAIMCPClientInstallerOptions) => {
+  const [mcpClientStatuses, setMCPClientStatuses] = useState<AIMCPClientInstallStatus[]>(EMPTY_MCP_CLIENT_STATUSES);
+  const [selectedMCPClient, setSelectedMCPClient] = useState<MCPClientKey>('claude-code');
+  const [mcpClientSelectionTouched, setMCPClientSelectionTouched] = useState(false);
+  const [mcpClientStatusLoading, setMCPClientStatusLoading] = useState(false);
+
+  const selectedMCPClientStatus = useMemo(
+    () => mcpClientStatuses.find((item) => item.client === selectedMCPClient) || mcpClientStatuses[0],
+    [mcpClientStatuses, selectedMCPClient],
+  );
+  const selectedMCPClientCommandText = useMemo(
+    () => isRemoteMCPClientStatus(selectedMCPClientStatus)
+      ? buildRemoteMCPClientQuickStart(selectedMCPClientStatus).launchCommand
+      : formatMCPLaunchCommand(selectedMCPClientStatus),
+    [selectedMCPClientStatus],
+  );
+
+  const syncMCPClientStatuses = useCallback((items?: AIMCPClientInstallStatus[]) => {
+    const normalizedStatuses = normalizeMCPClientStatuses(items);
+    setMCPClientStatuses(normalizedStatuses);
+    setSelectedMCPClient((prev) => pickPreferredMCPClient(normalizedStatuses, mcpClientSelectionTouched ? prev : undefined));
+  }, [mcpClientSelectionTouched]);
+
+  const handleSelectMCPClient = useCallback((client: MCPClientKey) => {
+    setMCPClientSelectionTouched(true);
+    setSelectedMCPClient(client);
+  }, []);
+
+  const resetMCPClientSelectionTouched = useCallback(() => {
+    setMCPClientSelectionTouched(false);
+  }, []);
+
+  const loadMCPClientStatuses = useCallback(async (options?: { silent?: boolean }) => {
+    const silent = options?.silent === true;
+    if (!silent) {
+      setMCPClientStatusLoading(true);
+    }
+    try {
+      const service = await resolveAIService();
+      if (typeof service?.AIGetMCPClientInstallStatuses !== 'function') {
+        return;
+      }
+      const result = await service.AIGetMCPClientInstallStatuses();
+      if (Array.isArray(result)) {
+        syncMCPClientStatuses(result);
+      }
+    } catch (error: any) {
+      if (silent) {
+        console.warn('[AI] refresh mcp client statuses failed', error);
+      } else {
+        void messageApi.error(error?.message || '刷新客户端安装状态失败');
+      }
+    } finally {
+      if (!silent) {
+        setMCPClientStatusLoading(false);
+      }
+    }
+  }, [messageApi, resolveAIService, syncMCPClientStatuses]);
+
+  const handleInstallSelectedMCPClient = useCallback(async () => {
+    const remoteClient = isRemoteMCPClientStatus(selectedMCPClientStatus);
+    const targetClient = selectedMCPClientStatus?.client === 'codex' ? 'codex' : 'claude-code';
+    const targetLabel = selectedMCPClientStatus?.displayName || (targetClient === 'codex' ? 'Codex' : 'Claude Code');
+    if (remoteClient) {
+      try {
+        onBeforeInstall?.();
+        setMCPClientSelectionTouched(true);
+        await copyTextToClipboard(
+          buildRemoteMCPClientGuide(selectedMCPClientStatus),
+          `${targetLabel} 远程接入说明已复制`,
+        );
+      } catch (error: any) {
+        void messageApi.error(error?.message || `复制 ${targetLabel} 远程接入说明失败`);
+      } finally {
+        onAfterInstall?.();
+      }
+      return;
+    }
+    if (selectedMCPClientStatus?.matchesCurrent) {
+      void messageApi.success(`${targetLabel} 已接入当前 GoNavi MCP，无需重复写入`);
+      return;
+    }
+    try {
+      onBeforeInstall?.();
+      setMCPClientSelectionTouched(true);
+      const service = await resolveAIService();
+      let result: MCPClientInstallResult;
+      if (targetClient === 'codex') {
+        if (typeof service?.AIInstallCodexMCP !== 'function') {
+          throw new Error('当前版本暂不支持自动安装 Codex MCP');
+        }
+        result = await service.AIInstallCodexMCP();
+      } else {
+        if (typeof service?.AIInstallClaudeCodeMCP !== 'function') {
+          throw new Error('当前版本暂不支持自动安装 Claude Code MCP');
+        }
+        result = await service.AIInstallClaudeCodeMCP();
+      }
+      await loadMCPClientStatuses({ silent: true });
+      onConfigChanged?.();
+      void messageApi.success(result?.message || `已写入 ${targetLabel} 用户级 MCP 配置`);
+    } catch (error: any) {
+      void messageApi.error(error?.message || `安装 ${targetLabel} MCP 失败`);
+    } finally {
+      onAfterInstall?.();
+    }
+  }, [copyTextToClipboard, loadMCPClientStatuses, messageApi, onAfterInstall, onBeforeInstall, onConfigChanged, resolveAIService, selectedMCPClientStatus]);
+
+  const handleCopySelectedMCPConfigPath = useCallback(async () => {
+    const configPath = String(selectedMCPClientStatus?.configPath || '').trim();
+    if (!configPath) {
+      void messageApi.warning('当前没有可复制的配置文件路径');
+      return;
+    }
+    try {
+      await copyTextToClipboard(configPath, '配置文件路径已复制');
+    } catch (error: any) {
+      void messageApi.error(error?.message || '复制配置文件路径失败');
+    }
+  }, [copyTextToClipboard, messageApi, selectedMCPClientStatus]);
+
+  const handleCopySelectedMCPLaunchCommand = useCallback(async () => {
+    if (!selectedMCPClientCommandText) {
+      void messageApi.warning('当前没有可复制的启动命令');
+      return;
+    }
+    try {
+      await copyTextToClipboard(selectedMCPClientCommandText, '启动命令已复制');
+    } catch (error: any) {
+      void messageApi.error(error?.message || '复制启动命令失败');
+    }
+  }, [copyTextToClipboard, messageApi, selectedMCPClientCommandText]);
+
+  return {
+    handleCopySelectedMCPConfigPath,
+    handleCopySelectedMCPLaunchCommand,
+    handleInstallSelectedMCPClient,
+    handleSelectMCPClient,
+    loadMCPClientStatuses,
+    mcpClientStatusLoading,
+    mcpClientStatuses,
+    resetMCPClientSelectionTouched,
+    selectedMCPClient,
+    selectedMCPClientCommandText,
+    selectedMCPClientStatus,
+    syncMCPClientStatuses,
+  };
+};
diff --git a/frontend/src/components/ai/useAISlashCommandMenu.ts b/frontend/src/components/ai/useAISlashCommandMenu.ts
new file mode 100644
index 0000000..a947131
--- /dev/null
+++ b/frontend/src/components/ai/useAISlashCommandMenu.ts
@@ -0,0 +1,61 @@
+import React from 'react';
+
+import { filterAISlashCommands, type AISlashCommandDefinition } from './aiSlashCommands';
+
+interface UseAISlashCommandMenuParams {
+  setInput: (val: string) => void;
+  textareaRef: React.RefObject<HTMLTextAreaElement>;
+}
+
+export const useAISlashCommandMenu = ({
+  setInput,
+  textareaRef,
+}: UseAISlashCommandMenuParams) => {
+  const [showSlashMenu, setShowSlashMenu] = React.useState(false);
+  const [slashFilter, setSlashFilter] = React.useState('');
+
+  const filteredSlashCmds = React.useMemo(
+    () => filterAISlashCommands(slashFilter),
+    [slashFilter],
+  );
+
+  const handleComposerInputChange = React.useCallback((value: string) => {
+    setInput(value);
+    if (value.startsWith('/')) {
+      setSlashFilter(value.split(/\s/u)[0] || '/');
+      setShowSlashMenu(true);
+      return;
+    }
+    setShowSlashMenu(false);
+    setSlashFilter('');
+  }, [setInput]);
+
+  const handleSelectSlashCommand = React.useCallback((command: AISlashCommandDefinition) => {
+    setInput(command.prompt);
+    setShowSlashMenu(false);
+    setSlashFilter('');
+    textareaRef.current?.focus();
+  }, [setInput, textareaRef]);
+
+  const handleOpenSlashMenu = React.useCallback(() => {
+    setInput('/');
+    setSlashFilter('/');
+    setShowSlashMenu(true);
+    textareaRef.current?.focus();
+  }, [setInput, textareaRef]);
+
+  const hideSlashMenu = React.useCallback(() => {
+    setShowSlashMenu(false);
+    setSlashFilter('');
+  }, []);
+
+  return {
+    filteredSlashCmds,
+    handleComposerInputChange,
+    handleOpenSlashMenu,
+    handleSelectSlashCommand,
+    hideSlashMenu,
+    showSlashMenu,
+    slashFilter,
+  };
+};
diff --git a/frontend/src/components/dataGridCopyInsert.test.ts b/frontend/src/components/dataGridCopyInsert.test.ts
index d4cd432..2c28acc 100644
--- a/frontend/src/components/dataGridCopyInsert.test.ts
+++ b/frontend/src/components/dataGridCopyInsert.test.ts
@@ -108,6 +108,20 @@ describe('buildCopyInsertSQL', () => {
     ]);
   });
 
+  it('accepts non-MySQL index metadata aliases when resolving safe unique locators', () => {
+    expect(resolveUniqueKeyGroupsFromIndexes([
+      { index_name: 'events_slug_key', column_name: 'slug', is_unique: 't', seq_in_index: '1', index_type: 'BTREE' } as any,
+      { INDEX_NAME: 'events_tenant_code_key', COLUMN_NAME: 'code', UNIQUE: true, COLUMN_POSITION: 2 } as any,
+      { INDEX_NAME: 'events_tenant_code_key', COLUMN_NAME: 'tenant_id', UNIQUE: true, COLUMN_POSITION: 1 } as any,
+      { indexName: 'events_ext_key', columnName: 'external_id', indexType: 'UNIQUE' } as any,
+      { index_name: 'idx_note', column_name: 'note', non_unique: '1' } as any,
+    ])).toEqual([
+      ['slug'],
+      ['tenant_id', 'code'],
+      ['external_id'],
+    ]);
+  });
+
   it('builds UPDATE SQL with a primary-key WHERE clause and keeps literal formatting aligned with INSERT', () => {
     const result = buildCopyUpdateSQL({
       dbType: 'mysql',
diff --git a/frontend/src/components/dataGridCopyInsert.ts b/frontend/src/components/dataGridCopyInsert.ts
index 8d62363..5df2048 100644
--- a/frontend/src/components/dataGridCopyInsert.ts
+++ b/frontend/src/components/dataGridCopyInsert.ts
@@ -428,13 +428,59 @@ export const resolveUniqueKeyGroupsFromIndexes = (indexes: IndexDefinition[] | u
     columns: Array<{ columnName: string; seqInIndex: number; order: number }>;
   };
 
+  const readIndexProp = (index: unknown, keys: string[]): unknown => {
+    const source = index as Record<string, unknown> | null | undefined;
+    if (!source || typeof source !== 'object') return undefined;
+    for (const key of keys) {
+      if (source[key] !== undefined && source[key] !== null) return source[key];
+    }
+    for (const [sourceKey, raw] of Object.entries(source)) {
+      if (keys.some((key) => sourceKey.toLowerCase() === key.toLowerCase())) {
+        return raw;
+      }
+    }
+    return undefined;
+  };
+
+  const readIndexText = (index: unknown, keys: string[]): string => {
+    const raw = readIndexProp(index, keys);
+    return raw === undefined || raw === null ? '' : String(raw).trim();
+  };
+
+  const readIndexBool = (index: unknown, keys: string[]): boolean | undefined => {
+    const raw = readIndexProp(index, keys);
+    if (raw === undefined || raw === null) return undefined;
+    if (typeof raw === 'boolean') return raw;
+    if (typeof raw === 'number') return raw !== 0;
+    const text = String(raw).trim().toLowerCase();
+    if (['1', 't', 'true', 'y', 'yes', 'unique'].includes(text)) return true;
+    if (['0', 'f', 'false', 'n', 'no', 'nonunique', 'non-unique'].includes(text)) return false;
+    return undefined;
+  };
+
+  const isUniqueIndex = (index: unknown): boolean => {
+    const nonUniqueRaw = readIndexProp(index, ['nonUnique', 'NonUnique', 'non_unique', 'NON_UNIQUE', 'Non_unique']);
+    if (nonUniqueRaw !== undefined && nonUniqueRaw !== null) {
+      if (typeof nonUniqueRaw === 'number') return nonUniqueRaw === 0;
+      const text = String(nonUniqueRaw).trim().toLowerCase();
+      if (['0', 'false', 'f', 'no', 'n'].includes(text)) return true;
+      if (['1', 'true', 't', 'yes', 'y'].includes(text)) return false;
+    }
+    const unique = readIndexBool(index, ['isUnique', 'is_unique', 'IS_UNIQUE', 'unique', 'UNIQUE']);
+    if (unique !== undefined) return unique;
+    const uniqueness = readIndexText(index, ['uniqueness', 'UNIQUENESS']);
+    if (uniqueness.toLowerCase() === 'unique') return true;
+    const indexType = readIndexText(index, ['indexType', 'IndexType', 'index_type', 'INDEX_TYPE']);
+    return indexType.toLowerCase() === 'unique';
+  };
+
   const buckets = new Map<string, IndexBucket>();
   (indexes || []).forEach((index, order) => {
-    if (index?.nonUnique !== 0) {
+    if (!isUniqueIndex(index)) {
       return;
     }
-    const name = String(index?.name || '').trim();
-    const columnName = String(index?.columnName || '').trim();
+    const name = readIndexText(index, ['name', 'Name', 'indexName', 'index_name', 'INDEX_NAME']);
+    const columnName = readIndexText(index, ['columnName', 'ColumnName', 'column_name', 'COLUMN_NAME']);
     if (!name || !columnName) {
       return;
     }
@@ -447,7 +493,9 @@ export const resolveUniqueKeyGroupsFromIndexes = (indexes: IndexDefinition[] | u
     }
     bucket.columns.push({
       columnName,
-      seqInIndex: Number.isFinite(Number(index?.seqInIndex)) ? Number(index.seqInIndex) : 0,
+      seqInIndex: Number.isFinite(Number(readIndexProp(index, ['seqInIndex', 'SeqInIndex', 'seq_in_index', 'SEQ_IN_INDEX', 'columnPosition', 'column_position'])))
+        ? Number(readIndexProp(index, ['seqInIndex', 'SeqInIndex', 'seq_in_index', 'SEQ_IN_INDEX', 'columnPosition', 'column_position']))
+        : 0,
       order,
     });
   });
diff --git a/frontend/src/components/dataGridTemporal.test.ts b/frontend/src/components/dataGridTemporal.test.ts
index 18ae576..99a8e9c 100644
--- a/frontend/src/components/dataGridTemporal.test.ts
+++ b/frontend/src/components/dataGridTemporal.test.ts
@@ -1,10 +1,26 @@
 import dayjs from 'dayjs';
 import { describe, expect, it } from 'vitest';
 
-import { resolveTemporalEditorSaveValue } from './dataGridTemporal';
+import { getTemporalPickerType, resolveTemporalEditorSaveValue } from './dataGridTemporal';
 
 describe('dataGridTemporal helpers', () => {
   it('prefers the picker selected date when form store has not caught up yet', () => {
     expect(resolveTemporalEditorSaveValue(undefined, dayjs('2026-04-12'), 'date')).toBe('2026-04-12');
   });
+
+  it('treats Oracle DATE as datetime because the type stores time to seconds', () => {
+    const pickerType = getTemporalPickerType('DATE', 'oracle');
+
+    expect(pickerType).toBe('datetime');
+    expect(resolveTemporalEditorSaveValue(undefined, dayjs('2026-06-11 19:42:13'), pickerType))
+      .toBe('2026-06-11 19:42:13');
+  });
+
+  it('keeps non Oracle DATE columns as date-only values', () => {
+    const pickerType = getTemporalPickerType('date', 'mysql');
+
+    expect(pickerType).toBe('date');
+    expect(resolveTemporalEditorSaveValue(undefined, dayjs('2026-06-11 19:42:13'), pickerType))
+      .toBe('2026-06-11');
+  });
 });
diff --git a/frontend/src/components/dataGridTemporal.ts b/frontend/src/components/dataGridTemporal.ts
index a6a0195..717c99d 100644
--- a/frontend/src/components/dataGridTemporal.ts
+++ b/frontend/src/components/dataGridTemporal.ts
@@ -1,4 +1,5 @@
 import dayjs from 'dayjs';
+import { isOracleLikeDialect } from '../utils/sqlDialect';
 
 export type TemporalPickerType = 'datetime' | 'date' | 'time' | 'year' | null;
 
@@ -9,20 +10,16 @@ export const TEMPORAL_FORMATS: Record<string, string> = {
   year: 'YYYY',
 };
 
-export const isTemporalColumnType = (columnType?: string): boolean => {
-  const raw = String(columnType || '').trim().toLowerCase();
-  if (!raw) return false;
-  if (raw.includes('datetime') || raw.includes('timestamp')) return true;
-  const base = raw.split(/[ (]/)[0];
-  return base === 'date' || base === 'time' || base === 'year';
+export const isTemporalColumnType = (columnType?: string, dbType?: string): boolean => {
+  return !!getTemporalPickerType(columnType, dbType);
 };
 
-export const getTemporalPickerType = (columnType?: string): TemporalPickerType => {
+export const getTemporalPickerType = (columnType?: string, dbType?: string): TemporalPickerType => {
   const raw = String(columnType || '').trim().toLowerCase();
   if (!raw) return null;
   if (raw.includes('datetime') || raw.includes('timestamp')) return 'datetime';
   const base = raw.split(/[ (]/)[0];
-  if (base === 'date') return 'date';
+  if (base === 'date') return isOracleLikeDialect(String(dbType || '')) ? 'datetime' : 'date';
   if (base === 'time') return 'time';
   if (base === 'year') return 'year';
   return null;
diff --git a/frontend/src/components/dataSyncEntryMode.ts b/frontend/src/components/dataSyncEntryMode.ts
new file mode 100644
index 0000000..f6e1d17
--- /dev/null
+++ b/frontend/src/components/dataSyncEntryMode.ts
@@ -0,0 +1,62 @@
+export type DataSyncEntryMode = 'sync' | 'schemaCompare' | 'dataCompare';
+
+export type DataSyncEntryModePresentation = {
+  title: string;
+  description: string;
+  heroTitle: string;
+  heroDescription: string;
+  optionTitle: string;
+  tableSelectLabel: string;
+  analyzeButtonText: string;
+  closeButtonText: string;
+  badgeText: string;
+  resultTitle: string;
+  readOnly: boolean;
+};
+
+export const resolveDataSyncEntryModePresentation = (entryMode: DataSyncEntryMode): DataSyncEntryModePresentation => {
+  switch (entryMode) {
+    case 'schemaCompare':
+      return {
+        title: '表结构比对',
+        description: '按源表与目标表生成结构差异、兼容风险和可审阅 SQL。',
+        heroTitle: '表结构比对',
+        heroDescription: '适合发布前核对两端表结构差异，只做分析与预览，不执行结构变更。',
+        optionTitle: '比对选项',
+        tableSelectLabel: '请选择需要比对结构的表：',
+        analyzeButtonText: '开始比对',
+        closeButtonText: '关闭',
+        badgeText: '结构比对',
+        resultTitle: '比对结果',
+        readOnly: true,
+      };
+    case 'dataCompare':
+      return {
+        title: '数据比对',
+        description: '按主键对比源表与目标表的数据差异，查看新增、更新和删除明细。',
+        heroTitle: '数据比对',
+        heroDescription: '适合核对两端数据一致性，只做差异分析与行级预览，不执行写入。',
+        optionTitle: '比对选项',
+        tableSelectLabel: '请选择需要比对数据的表：',
+        analyzeButtonText: '开始比对',
+        closeButtonText: '关闭',
+        badgeText: '数据比对',
+        resultTitle: '比对结果',
+        readOnly: true,
+      };
+    default:
+      return {
+        title: '数据同步工作台',
+        description: '按已有目标表完成差异对比、同步执行与结果确认。',
+        heroTitle: '数据同步',
+        heroDescription: '适合目标表已存在的场景，先做差异分析，再按勾选执行插入、更新或删除。',
+        optionTitle: '同步选项',
+        tableSelectLabel: '请选择需要同步的表：',
+        analyzeButtonText: '对比差异',
+        closeButtonText: '关闭',
+        badgeText: '同步模式',
+        resultTitle: '执行结果',
+        readOnly: false,
+      };
+  }
+};
diff --git a/frontend/src/components/dataSyncRequest.test.ts b/frontend/src/components/dataSyncRequest.test.ts
index b641a54..0b3d031 100644
--- a/frontend/src/components/dataSyncRequest.test.ts
+++ b/frontend/src/components/dataSyncRequest.test.ts
@@ -40,6 +40,8 @@ describe('buildDataSyncRequest', () => {
     const payload = buildDataSyncRequest({
       sourceConfig: { type: 'mysql' },
       targetConfig: { type: 'mysql' },
+      sourceDatabase: ' app ',
+      targetDatabase: ' warehouse ',
       selectedTables: ['users'],
       sourceDatasetMode: 'query',
       sourceQuery: '  SELECT id, name FROM active_users  ',
@@ -61,6 +63,8 @@ describe('buildDataSyncRequest', () => {
       autoAddColumns: false,
       targetTableStrategy: 'existing_only',
       createIndexes: false,
+      sourceDatabase: 'app',
+      targetDatabase: 'warehouse',
       jobId: 'job-1',
     });
   });
diff --git a/frontend/src/components/dataSyncRequest.ts b/frontend/src/components/dataSyncRequest.ts
index 43e821d..a921858 100644
--- a/frontend/src/components/dataSyncRequest.ts
+++ b/frontend/src/components/dataSyncRequest.ts
@@ -6,6 +6,8 @@ type TargetTableStrategy = 'existing_only' | 'auto_create_if_missing' | 'smart';
 type BuildDataSyncRequestParams = {
   sourceConfig: any;
   targetConfig: any;
+  sourceDatabase?: string;
+  targetDatabase?: string;
   selectedTables: string[];
   sourceDatasetMode: SourceDatasetMode;
   sourceQuery: string;
@@ -60,6 +62,8 @@ export const validateDataSyncSelection = ({
 export const buildDataSyncRequest = ({
   sourceConfig,
   targetConfig,
+  sourceDatabase,
+  targetDatabase,
   selectedTables,
   sourceDatasetMode,
   sourceQuery,
@@ -77,6 +81,8 @@ export const buildDataSyncRequest = ({
   return {
     sourceConfig,
     targetConfig,
+    sourceDatabase: String(sourceDatabase || '').trim(),
+    targetDatabase: String(targetDatabase || '').trim(),
     tables: selectedTables,
     sourceQuery: isQueryMode ? String(sourceQuery || '').trim() : undefined,
     content: isQueryMode ? 'data' : syncContent,
diff --git a/frontend/src/components/sidebarCoreUtils.test.ts b/frontend/src/components/sidebarCoreUtils.test.ts
new file mode 100644
index 0000000..3a7106e
--- /dev/null
+++ b/frontend/src/components/sidebarCoreUtils.test.ts
@@ -0,0 +1,63 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  isPostgresSchemaDialect,
+  normalizeDriverType,
+  normalizeMySQLViewDDLForEditing,
+  resolveSidebarContextMenuPosition,
+  resolveSidebarObjectDragText,
+} from './sidebarCoreUtils';
+
+describe('sidebarCoreUtils', () => {
+  it('keeps context menus inside the viewport', () => {
+    expect(resolveSidebarContextMenuPosition(790, 590, {
+      viewportWidth: 800,
+      viewportHeight: 600,
+      width: 240,
+      height: 300,
+      safeGap: 10,
+    })).toEqual({
+      x: 550,
+      y: 290,
+      maxHeight: 300,
+    });
+  });
+
+  it('normalizes MySQL view definitions for editor updates', () => {
+    expect(normalizeMySQLViewDDLForEditing('v_users', 'select * from users')).toBe(
+      'CREATE OR REPLACE VIEW v_users AS\nselect * from users;',
+    );
+    expect(normalizeMySQLViewDDLForEditing(
+      'v_users',
+      'CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_users` AS select 1;',
+    )).toBe('CREATE OR REPLACE VIEW `v_users` AS select 1;');
+    expect(normalizeMySQLViewDDLForEditing('v_users', '')).toBe('');
+  });
+
+  it('normalizes driver aliases used by sidebar metadata loaders', () => {
+    expect(normalizeDriverType('postgresql')).toBe('postgres');
+    expect(normalizeDriverType('open-gauss')).toBe('opengauss');
+    expect(normalizeDriverType('gauss-db')).toBe('gaussdb');
+    expect(normalizeDriverType('InterSystemsIRIS')).toBe('iris');
+    expect(isPostgresSchemaDialect('kingbase')).toBe(true);
+    expect(isPostgresSchemaDialect('gauss-db')).toBe(true);
+  });
+
+  it('resolves draggable object labels by object kind', () => {
+    expect(resolveSidebarObjectDragText({
+      type: 'table',
+      title: 'fallback_table',
+      dataRef: { tableName: 'users' },
+    })).toBe('users');
+    expect(resolveSidebarObjectDragText({
+      type: 'view',
+      title: 'fallback_view',
+      dataRef: { viewName: 'v_users' },
+    })).toBe('v_users');
+    expect(resolveSidebarObjectDragText({
+      type: 'db-trigger',
+      title: 'trg_users_audit',
+      dataRef: {},
+    })).toBe('trg_users_audit');
+  });
+});
diff --git a/frontend/src/components/sidebarCoreUtils.ts b/frontend/src/components/sidebarCoreUtils.ts
new file mode 100644
index 0000000..ba8fd9d
--- /dev/null
+++ b/frontend/src/components/sidebarCoreUtils.ts
@@ -0,0 +1,119 @@
+import type React from 'react';
+import type { SavedConnection } from '../types';
+import {
+  isPostgresSchemaDialect as resolveIsPostgresSchemaDialect,
+  normalizeDriverType as normalizeConnectionDriverType,
+  resolveSavedConnectionDriverType as resolveSavedConnectionDriverTypeBase,
+} from '../utils/connectionDriverType';
+
+const SIDEBAR_CONTEXT_MENU_SAFE_GAP = 8;
+export const SIDEBAR_CONTEXT_MENU_FALLBACK_WIDTH = 264;
+export const SIDEBAR_CONTEXT_MENU_FALLBACK_HEIGHT = 420;
+
+export type ExternalSQLFileModalMode = 'create' | 'rename' | 'create-directory' | 'rename-directory';
+export type SearchScope = 'smart' | 'object' | 'database' | 'host' | 'tag';
+
+type SidebarObjectNodeLike = {
+  title?: string;
+  type?: string;
+  dataRef?: any;
+};
+
+export const isExternalSQLDirectoryModalMode = (mode: ExternalSQLFileModalMode): boolean =>
+  mode === 'create-directory' || mode === 'rename-directory';
+
+export const resolveSidebarContextMenuPosition = (
+  x: number,
+  y: number,
+  options?: {
+    width?: number;
+    height?: number;
+    viewportWidth?: number;
+    viewportHeight?: number;
+    safeGap?: number;
+  },
+): { x: number; y: number; maxHeight: number } => {
+  const safeGap = options?.safeGap ?? SIDEBAR_CONTEXT_MENU_SAFE_GAP;
+  const viewportWidth = options?.viewportWidth ?? (typeof window === 'undefined' ? 1024 : window.innerWidth);
+  const viewportHeight = options?.viewportHeight ?? (typeof window === 'undefined' ? 768 : window.innerHeight);
+  const width = Math.max(0, options?.width ?? SIDEBAR_CONTEXT_MENU_FALLBACK_WIDTH);
+  const height = Math.max(0, options?.height ?? SIDEBAR_CONTEXT_MENU_FALLBACK_HEIGHT);
+  const maxX = Math.max(safeGap, viewportWidth - width - safeGap);
+  const maxY = Math.max(safeGap, viewportHeight - height - safeGap);
+  const nextX = Math.max(safeGap, Math.min(x, maxX));
+  const nextY = Math.max(safeGap, Math.min(y, maxY));
+  return {
+    x: nextX,
+    y: nextY,
+    maxHeight: Math.max(120, viewportHeight - nextY - safeGap),
+  };
+};
+
+export const isV2SidebarObjectNode = (node: Pick<SidebarObjectNodeLike, 'type'> | null | undefined): boolean => {
+  return node?.type === 'table'
+    || node?.type === 'view'
+    || node?.type === 'materialized-view'
+    || node?.type === 'db-trigger'
+    || node?.type === 'db-event'
+    || node?.type === 'routine';
+};
+
+export const resolveSidebarObjectDragText = (
+  node: Pick<SidebarObjectNodeLike, 'type' | 'title' | 'dataRef'> | null | undefined,
+): string => {
+  const dataRef = node?.dataRef || {};
+  if (node?.type === 'table') return String(dataRef.tableName || node?.title || '').trim();
+  if (node?.type === 'view' || node?.type === 'materialized-view') return String(dataRef.viewName || dataRef.tableName || node?.title || '').trim();
+  if (node?.type === 'db-trigger') return String(dataRef.triggerName || node?.title || '').trim();
+  if (node?.type === 'routine') return String(dataRef.routineName || node?.title || '').trim();
+  if (node?.type === 'db-event') return String(dataRef.eventName || node?.title || '').trim();
+  return '';
+};
+
+export const buildConnectionReloadSignature = (conn?: SavedConnection | null): string => {
+  if (!conn) return '';
+  return JSON.stringify({
+    config: conn.config || {},
+    includeDatabases: conn.includeDatabases || [],
+    includeRedisDatabases: conn.includeRedisDatabases || [],
+  });
+};
+
+export const isConnectionTreeKey = (key: React.Key, connectionId: string): boolean => {
+  const text = String(key);
+  return text === connectionId || text.startsWith(`${connectionId}-`);
+};
+
+export const normalizeDriverType = normalizeConnectionDriverType;
+export const resolveSavedConnectionDriverType = resolveSavedConnectionDriverTypeBase;
+export const isPostgresSchemaDialect = resolveIsPostgresSchemaDialect;
+
+export const SEARCH_SCOPE_OPTIONS: Array<{ value: SearchScope; label: string }> = [
+  { value: 'smart', label: '智能' },
+  { value: 'object', label: '表对象' },
+  { value: 'database', label: '库' },
+  { value: 'host', label: 'Host' },
+  { value: 'tag', label: '标签' },
+];
+
+export const SEARCH_SCOPE_LABEL_MAP: Record<SearchScope, string> = SEARCH_SCOPE_OPTIONS.reduce((acc, option) => {
+  acc[option.value] = option.label;
+  return acc;
+}, {} as Record<SearchScope, string>);
+
+export const normalizeMySQLViewDDLForEditing = (viewName: string, rawDefinition: unknown): string => {
+  const text = String(rawDefinition || '').trim();
+  if (!text) return '';
+
+  const normalized = text.replace(/\r\n/g, '\n').trim().replace(/;+\s*$/, '');
+  const createViewPrefixPattern = /^\s*create\s+(?:algorithm\s*=\s*\w+\s+)?(?:definer\s*=\s*(?:`[^`]+`|\S+)\s*@\s*(?:`[^`]+`|\S+)\s+)?(?:sql\s+security\s+(?:definer|invoker)\s+)?view\s+/i;
+  if (createViewPrefixPattern.test(normalized)) {
+    return `${normalized.replace(createViewPrefixPattern, 'CREATE OR REPLACE VIEW ')};`;
+  }
+
+  if (/^\s*(select|with)\b/i.test(normalized)) {
+    return `CREATE OR REPLACE VIEW ${viewName} AS\n${normalized};`;
+  }
+
+  return `${normalized};`;
+};
diff --git a/frontend/src/components/sidebarV2Utils.ts b/frontend/src/components/sidebarV2Utils.ts
new file mode 100644
index 0000000..e96ace6
--- /dev/null
+++ b/frontend/src/components/sidebarV2Utils.ts
@@ -0,0 +1,767 @@
+import type { ReactNode } from 'react';
+
+import {
+  buildSidebarRootConnectionToken,
+  buildSidebarRootTagToken,
+  buildSidebarTablePinKey,
+  resolveSidebarRootOrderTokens,
+} from '../store';
+import type { ConnectionTag, SavedConnection } from '../types';
+
+export type SidebarTreeNodeType =
+  | 'connection'
+  | 'database'
+  | 'table'
+  | 'view'
+  | 'materialized-view'
+  | 'db-trigger'
+  | 'db-event'
+  | 'routine'
+  | 'object-group'
+  | 'v2-table-section'
+  | 'queries-folder'
+  | 'saved-query'
+  | 'all-saved-queries'
+  | 'saved-query-group'
+  | 'unmatched-saved-queries'
+  | 'external-sql-root'
+  | 'external-sql-directory'
+  | 'external-sql-folder'
+  | 'external-sql-file'
+  | 'folder-columns'
+  | 'folder-indexes'
+  | 'folder-fks'
+  | 'folder-triggers'
+  | 'redis-db'
+  | 'tag'
+  | 'jvm-mode'
+  | 'jvm-resource'
+  | 'jvm-diagnostic'
+  | 'jvm-monitoring';
+
+export interface SidebarTreeNode {
+  title: string;
+  key: string;
+  isLeaf?: boolean;
+  selectable?: boolean;
+  children?: SidebarTreeNode[];
+  icon?: ReactNode;
+  dataRef?: any;
+  type?: SidebarTreeNodeType;
+}
+
+export const hasSidebarLazyChildren = (children: unknown): boolean => {
+  return Array.isArray(children) && children.length > 0;
+};
+
+export const shouldLoadSidebarNodeOnExpand = (
+  node: Pick<SidebarTreeNode, 'type' | 'children' | 'isLeaf'> | null | undefined,
+): boolean => {
+  if (!node || node.isLeaf === true || hasSidebarLazyChildren(node.children)) return false;
+  return node.type === 'connection'
+    || node.type === 'database'
+    || node.type === 'external-sql-root'
+    || node.type === 'table'
+    || node.type === 'jvm-mode'
+    || node.type === 'jvm-resource';
+};
+
+export const resolveSidebarTableNameForCopy = (
+  node: Pick<SidebarTreeNode, 'title' | 'dataRef'> | null | undefined,
+): string => {
+  return String(node?.dataRef?.tableName || node?.dataRef?.viewName || node?.dataRef?.eventName || node?.title || '').trim();
+};
+
+type SidebarTableSortPreference = 'name' | 'frequency';
+
+type SidebarTableEntryForSort = {
+  tableName: string;
+  schemaName?: string;
+  displayName: string;
+  rowCount?: number;
+};
+
+export const isSidebarTablePinned = (
+  pinnedKeys: string[],
+  connectionId: string,
+  dbName: string,
+  tableName: string,
+  schemaName = '',
+): boolean => {
+  const key = buildSidebarTablePinKey(connectionId, dbName, tableName, schemaName);
+  return !!key && pinnedKeys.includes(key);
+};
+
+export const sortSidebarTableEntries = <T extends SidebarTableEntryForSort>(
+  entries: T[],
+  options: {
+    connectionId: string;
+    dbName: string;
+    sortBy: SidebarTableSortPreference;
+    tableAccessCount?: Record<string, number>;
+    pinnedSidebarTables?: string[];
+  },
+): T[] => {
+  const pinnedKeys = options.pinnedSidebarTables || [];
+  const accessCount = options.tableAccessCount || {};
+  const compareByName = (a: T, b: T) => a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase());
+  const compareWithinPinnedGroup = (a: T, b: T) => {
+    if (options.sortBy === 'frequency') {
+      const keyA = `${options.connectionId}-${options.dbName}-${a.tableName}`;
+      const keyB = `${options.connectionId}-${options.dbName}-${b.tableName}`;
+      const countA = accessCount[keyA] || 0;
+      const countB = accessCount[keyB] || 0;
+      if (countA !== countB) {
+        return countB - countA;
+      }
+    }
+    return compareByName(a, b);
+  };
+
+  return [...entries].sort((a, b) => {
+    const pinnedA = isSidebarTablePinned(pinnedKeys, options.connectionId, options.dbName, a.tableName, a.schemaName || '');
+    const pinnedB = isSidebarTablePinned(pinnedKeys, options.connectionId, options.dbName, b.tableName, b.schemaName || '');
+    if (pinnedA !== pinnedB) {
+      return pinnedA ? -1 : 1;
+    }
+    return compareWithinPinnedGroup(a, b);
+  });
+};
+
+export const buildV2SidebarTableSectionedChildren = (
+  parentKey: string,
+  tableNodes: SidebarTreeNode[],
+): SidebarTreeNode[] => {
+  const pinnedTables = tableNodes.filter((node) => node?.dataRef?.pinnedSidebarTable);
+  if (pinnedTables.length === 0) return tableNodes;
+
+  const regularTables = tableNodes.filter((node) => !node?.dataRef?.pinnedSidebarTable);
+  const buildSectionNode = (kind: 'pinned' | 'all', title: string): SidebarTreeNode => ({
+    title,
+    key: `${parentKey}-v2-${kind}-tables-section`,
+    type: 'v2-table-section',
+    isLeaf: true,
+    selectable: false,
+    dataRef: {
+      sectionKind: kind,
+    },
+  });
+
+  return [
+    buildSectionNode('pinned', '置顶'),
+    ...pinnedTables,
+    buildSectionNode('all', '全部'),
+    ...regularTables,
+  ];
+};
+
+export const buildSidebarTableChildrenForUi = (
+  parentKey: string,
+  tableNodes: SidebarTreeNode[],
+  isV2Ui: boolean,
+): SidebarTreeNode[] => {
+  if (!isV2Ui) return tableNodes;
+  return buildV2SidebarTableSectionedChildren(parentKey, tableNodes);
+};
+
+export const formatSidebarRowCount = (count: number): string => {
+  if (!Number.isFinite(count) || count < 0) return '';
+  if (count >= 1_000_000) return `${(count / 1_000_000).toFixed(1)}M`;
+  if (count >= 1_000) return `${(count / 1_000).toFixed(1)}K`;
+  return String(Math.round(count));
+};
+
+export interface V2RailConnectionGroup {
+  id: string;
+  name: string;
+  connections: SavedConnection[];
+  isUngrouped?: boolean;
+  rootToken: string;
+}
+
+export const buildV2RailConnectionGroups = (
+  connections: SavedConnection[],
+  connectionTags: ConnectionTag[],
+  sidebarRootOrder: string[] = [],
+): V2RailConnectionGroup[] => {
+  const connectionById = new Map(connections.map((conn) => [conn.id, conn]));
+  const groupedConnectionIds = new Set<string>();
+  const tagGroups = new Map<string, V2RailConnectionGroup>();
+
+  connectionTags.forEach((tag) => {
+    const tagConnections: SavedConnection[] = [];
+    tag.connectionIds.forEach((connectionId) => {
+      const conn = connectionById.get(connectionId);
+      if (!conn || groupedConnectionIds.has(conn.id)) return;
+      groupedConnectionIds.add(conn.id);
+      tagConnections.push(conn);
+    });
+    if (tagConnections.length === 0) return;
+    tagGroups.set(tag.id, {
+      id: tag.id,
+      name: tag.name || '未命名分组',
+      connections: tagConnections,
+      rootToken: buildSidebarRootTagToken(tag.id),
+    });
+  });
+
+  const ungroupedConnectionMap = new Map(
+    connections
+      .filter((conn) => !groupedConnectionIds.has(conn.id))
+      .map((conn) => [conn.id, conn]),
+  );
+  const orderedRootTokens = resolveSidebarRootOrderTokens(
+    sidebarRootOrder,
+    connectionTags,
+    connections,
+  );
+  const groups: V2RailConnectionGroup[] = [];
+
+  orderedRootTokens.forEach((token) => {
+    if (token.startsWith('tag:')) {
+      const tagId = token.slice('tag:'.length);
+      const group = tagGroups.get(tagId);
+      if (!group) return;
+      groups.push(group);
+      tagGroups.delete(tagId);
+      return;
+    }
+    if (token.startsWith('connection:')) {
+      const connectionId = token.slice('connection:'.length);
+      const conn = ungroupedConnectionMap.get(connectionId);
+      if (!conn) return;
+      groups.push({
+        id: connectionId,
+        name: conn.name,
+        connections: [conn],
+        isUngrouped: true,
+        rootToken: buildSidebarRootConnectionToken(connectionId),
+      });
+      ungroupedConnectionMap.delete(connectionId);
+    }
+  });
+
+  tagGroups.forEach((group) => {
+    groups.push(group);
+  });
+  ungroupedConnectionMap.forEach((conn) => {
+    groups.push({
+      id: conn.id,
+      name: conn.name,
+      connections: [conn],
+      isUngrouped: true,
+      rootToken: buildSidebarRootConnectionToken(conn.id),
+    });
+  });
+
+  return groups;
+};
+
+export const getV2RailConnectionGroupBadgeText = (name: unknown, fallback = '组'): string => {
+  const trimmed = String(name ?? '').trim();
+  if (!trimmed) return fallback;
+  const cjkParts = trimmed.match(/[\u4e00-\u9fa5]/g);
+  if (cjkParts && cjkParts.length > 0) {
+    return cjkParts.slice(0, 1).join('');
+  }
+  const latinTokens = trimmed.match(/[a-z0-9]+/gi) || [];
+  if (latinTokens.length >= 2) {
+    const firstToken = latinTokens[0] || '';
+    const secondToken = latinTokens[1] || '';
+    return `${firstToken[0] || ''}${secondToken[0] || ''}`.toUpperCase();
+  }
+  if (latinTokens.length === 1) {
+    const token = latinTokens[0] || '';
+    const alphaPrefix = token.match(/^[a-z]+/i)?.[0] || '';
+    if (alphaPrefix) {
+      return alphaPrefix.slice(0, 2).toUpperCase();
+    }
+    const trailingDigits = token.match(/(\d{2,})$/)?.[1];
+    if (trailingDigits) {
+      return trailingDigits.slice(-2).toUpperCase();
+    }
+    return token.slice(0, 2).toUpperCase();
+  }
+  return trimmed.slice(0, 2);
+};
+
+export type V2ExplorerFilter = 'all' | 'tables' | 'views' | 'routines' | 'events';
+
+export const V2_EXPLORER_FILTER_OPTIONS: Array<{ key: V2ExplorerFilter; label: string }> = [
+  { key: 'all', label: '全部' },
+  { key: 'tables', label: '表' },
+  { key: 'views', label: '视图' },
+  { key: 'routines', label: '函数' },
+  { key: 'events', label: '事件' },
+];
+
+const V2_EXPLORER_FILTER_GROUP_KEYS: Record<Exclude<V2ExplorerFilter, 'all'>, string[]> = {
+  tables: ['tables'],
+  views: ['views', 'materializedViews'],
+  routines: ['routines'],
+  events: ['events'],
+};
+
+const V2_TREE_HORIZONTAL_SCROLL_MAX_WIDTH = 960;
+const V2_TREE_HORIZONTAL_SCROLL_BASE_WIDTH = 88;
+const V2_TREE_HORIZONTAL_SCROLL_INDENT_WIDTH = 24;
+const V2_TREE_HORIZONTAL_SCROLL_AVG_CHAR_WIDTH = 8;
+const V2_TREE_HORIZONTAL_SCROLL_VIEWPORT_BUFFER = 48;
+export const V2_TREE_HORIZONTAL_SCROLL_BOTTOM_RESERVE = 32;
+
+export const estimateV2TreeHorizontalScrollWidth = (
+  nodes: SidebarTreeNode[],
+  viewportWidth: number,
+): number | undefined => {
+  const safeViewportWidth = Math.max(0, Math.ceil(viewportWidth || 0));
+  let estimatedContentWidth = safeViewportWidth;
+
+  const visit = (items: SidebarTreeNode[], depth: number) => {
+    items.forEach((node) => {
+      const title = String(node?.title || '');
+      const metaText = node?.dataRef?.groupKey === 'tables' && Array.isArray(node.children)
+        ? String(node.children.length)
+        : '';
+      const nodeWidth = V2_TREE_HORIZONTAL_SCROLL_BASE_WIDTH
+        + (depth * V2_TREE_HORIZONTAL_SCROLL_INDENT_WIDTH)
+        + ((title.length + metaText.length) * V2_TREE_HORIZONTAL_SCROLL_AVG_CHAR_WIDTH);
+      estimatedContentWidth = Math.max(estimatedContentWidth, nodeWidth);
+      if (node.children?.length) {
+        visit(node.children, depth + 1);
+      }
+    });
+  };
+  visit(nodes, 0);
+
+  if (estimatedContentWidth <= safeViewportWidth + 8) {
+    return undefined;
+  }
+  const scrollWidth = Math.min(
+    V2_TREE_HORIZONTAL_SCROLL_MAX_WIDTH,
+    Math.max(safeViewportWidth + V2_TREE_HORIZONTAL_SCROLL_VIEWPORT_BUFFER, Math.ceil(estimatedContentWidth)),
+  );
+  return scrollWidth;
+};
+
+export const filterV2ExplorerTreeByKind = (
+  nodes: SidebarTreeNode[],
+  filter: V2ExplorerFilter,
+): SidebarTreeNode[] => {
+  if (filter === 'all') return nodes;
+  const allowedGroupKeys = new Set(V2_EXPLORER_FILTER_GROUP_KEYS[filter]);
+  const objectTypeMatches = (node: SidebarTreeNode): boolean => {
+    if (filter === 'tables') return node.type === 'table';
+    if (filter === 'views') return node.type === 'view' || node.type === 'materialized-view';
+    if (filter === 'routines') return node.type === 'routine';
+    if (filter === 'events') return node.type === 'db-event';
+    return false;
+  };
+
+  const visit = (node: SidebarTreeNode): SidebarTreeNode | null => {
+    if (node.type === 'external-sql-root') {
+      return null;
+    }
+    const groupKey = String(node?.dataRef?.groupKey || '');
+    if (node.type === 'object-group') {
+      if (allowedGroupKeys.has(groupKey)) {
+        return node;
+      }
+      if (groupKey === 'schema') {
+        const schemaChildren = (node.children || []).map(visit).filter(Boolean) as SidebarTreeNode[];
+        return schemaChildren.length > 0 ? { ...node, children: schemaChildren, isLeaf: false } : null;
+      }
+      return null;
+    }
+    if (objectTypeMatches(node)) {
+      return node;
+    }
+    if (node.type === 'database') {
+      const filteredChildren = (node.children || []).map(visit).filter(Boolean) as SidebarTreeNode[];
+      return filteredChildren.length > 0 ? { ...node, children: filteredChildren, isLeaf: false } : null;
+    }
+    return null;
+  };
+
+  return nodes.map(visit).filter(Boolean) as SidebarTreeNode[];
+};
+
+export type V2CommandSearchItem =
+  | {
+      key: string;
+      kind: 'node';
+      title: string;
+      meta: string;
+      icon: ReactNode;
+      node: SidebarTreeNode;
+    }
+  | {
+      key: string;
+      kind: 'action';
+      title: string;
+      meta: string;
+      shortcut?: string;
+      icon: ReactNode;
+      onRun: () => void;
+    }
+  | {
+      key: string;
+      kind: 'recent';
+      title: string;
+      meta: string;
+      icon: ReactNode;
+      sql: string;
+      connectionId?: string;
+      dbName?: string;
+    };
+
+export type V2CommandSearchMode = 'default' | 'object' | 'ai';
+
+export interface V2CommandSearchQuery {
+  mode: V2CommandSearchMode;
+  rawValue: string;
+  keyword: string;
+  normalizedKeyword: string;
+  aiPrompt: string;
+}
+
+export const parseV2CommandSearchQuery = (value: unknown): V2CommandSearchQuery => {
+  const rawValue = String(value ?? '');
+  const trimmedValue = rawValue.trim();
+  const firstChar = trimmedValue.charAt(0);
+
+  if (firstChar === '@' || firstChar === '＠') {
+    const keyword = trimmedValue.slice(1).trim();
+    return {
+      mode: 'object',
+      rawValue,
+      keyword,
+      normalizedKeyword: keyword.toLowerCase(),
+      aiPrompt: '',
+    };
+  }
+
+  if (firstChar === '?' || firstChar === '？') {
+    const aiPrompt = trimmedValue.slice(1).trim();
+    return {
+      mode: 'ai',
+      rawValue,
+      keyword: aiPrompt,
+      normalizedKeyword: aiPrompt.toLowerCase(),
+      aiPrompt,
+    };
+  }
+
+  return {
+    mode: 'default',
+    rawValue,
+    keyword: trimmedValue,
+    normalizedKeyword: trimmedValue.toLowerCase(),
+    aiPrompt: '',
+  };
+};
+
+const isV2CommandSearchObjectNode = (node: SidebarTreeNode): boolean => {
+  return node.type === 'table'
+    || node.type === 'view'
+    || node.type === 'materialized-view';
+};
+
+const V2_COMMAND_SEARCH_INITIAL_TREE_LIMIT = 24;
+
+export const filterV2CommandSearchTreeItems = (
+  items: V2CommandSearchItem[],
+  query: V2CommandSearchQuery,
+): V2CommandSearchItem[] => {
+  if (query.mode === 'ai') return [];
+  const normalizedKeyword = query.normalizedKeyword;
+  const objectMode = query.mode === 'object';
+  const matchedItems = items.filter((item) => {
+    if (item.kind !== 'node') return false;
+    const node = item.node;
+    const dataRef = node.dataRef || {};
+    if (objectMode && !isV2CommandSearchObjectNode(node)) {
+      return false;
+    }
+    if (!normalizedKeyword) return true;
+    const objectName = String(dataRef.tableName || dataRef.viewName || item.title || '').toLowerCase();
+    if (objectMode) {
+      return objectName.includes(normalizedKeyword)
+        || String(item.title || '').toLowerCase().includes(normalizedKeyword);
+    }
+    const haystack = [
+      item.title,
+      item.meta,
+      dataRef.tableName,
+      dataRef.viewName,
+      dataRef.dbName,
+      dataRef.name,
+      dataRef.config?.host,
+    ].filter(Boolean).join(' ').toLowerCase();
+    return haystack.includes(normalizedKeyword);
+  });
+  return normalizedKeyword ? matchedItems : matchedItems.slice(0, V2_COMMAND_SEARCH_INITIAL_TREE_LIMIT);
+};
+
+export interface V2CommandSearchEnterState {
+  key: string;
+  isComposing?: boolean;
+  keyCode?: number;
+  activeItemCount: number;
+}
+
+export const shouldRunV2CommandSearchEnter = ({
+  key,
+  isComposing,
+  keyCode,
+  activeItemCount,
+}: V2CommandSearchEnterState): boolean => {
+  if (key !== 'Enter') return false;
+  if (isComposing || keyCode === 229) return false;
+  return activeItemCount > 0;
+};
+
+export interface V2CommandSearchPersistentFilterState {
+  commandSearchValue: string;
+  persistedFilter: string;
+  enabled: boolean;
+  isOpen: boolean;
+}
+
+export const resolveV2CommandSearchPersistentFilter = ({
+  commandSearchValue,
+  persistedFilter,
+  enabled,
+  isOpen,
+}: V2CommandSearchPersistentFilterState): string => {
+  if (!enabled) return '';
+  if (!isOpen) return String(persistedFilter ?? '').trim();
+  return String(commandSearchValue ?? '').trim();
+};
+
+export interface V2CommandSearchGlobalKeyState {
+  key: string;
+  isOpen: boolean;
+}
+
+export const shouldCloseV2CommandSearchOnGlobalKey = ({
+  key,
+  isOpen,
+}: V2CommandSearchGlobalKeyState): boolean => {
+  if (!isOpen) return false;
+  const normalizedKey = String(key || '').toLowerCase();
+  return normalizedKey === 'escape' || normalizedKey === 'esc';
+};
+
+export const resolveSidebarConnectionIdFromKey = (
+  key: unknown,
+  connectionIds: string[],
+): string => {
+  const keyText = String(key ?? '').trim();
+  if (!keyText) return '';
+
+  const sortedIds = Array.from(new Set(connectionIds.filter(Boolean)))
+    .sort((a, b) => b.length - a.length);
+  return sortedIds.find((id) => keyText === id || keyText.startsWith(`${id}-`)) || '';
+};
+
+export const resolveSidebarNodeConnectionId = (
+  node: { key?: unknown; dataRef?: Record<string, unknown> } | null | undefined,
+  connectionIds: string[],
+): string => {
+  const directId = String(node?.dataRef?.id || node?.dataRef?.connectionId || '').trim();
+  if (directId && connectionIds.includes(directId)) return directId;
+  return resolveSidebarConnectionIdFromKey(node?.key, connectionIds);
+};
+
+export const normalizeSidebarTreeRelativeDropPosition = (
+  absoluteDropPosition: number,
+  nodePos: unknown,
+): number => {
+  const segments = String(nodePos || '').split('-');
+  const tailIndex = Number(segments[segments.length - 1] || 0);
+  return absoluteDropPosition - tailIndex;
+};
+
+export const resolveSidebarDropInsertBefore = (
+  relativeDropPosition: number,
+  metrics?: {
+    clientY?: number;
+    top?: number;
+    height?: number;
+  } | null,
+): boolean => {
+  if (relativeDropPosition < 0) return true;
+  if (relativeDropPosition > 0) return false;
+  const clientY = metrics?.clientY;
+  const top = metrics?.top;
+  const height = metrics?.height;
+  if (
+    typeof clientY !== 'number'
+    || typeof top !== 'number'
+    || typeof height !== 'number'
+    || !Number.isFinite(clientY)
+    || !Number.isFinite(top)
+    || !Number.isFinite(height)
+    || height <= 0
+  ) {
+    return false;
+  }
+  return clientY < (top + height / 2);
+};
+
+const resolveSidebarDropBaseElementFromDomEvent = (
+  event: {
+    clientX?: number;
+    clientY?: number;
+    target?: EventTarget | null;
+  } | null | undefined,
+): Element | null => {
+  if (typeof document === 'undefined') return null;
+  const fallbackTarget = event?.target && typeof (event.target as any).closest === 'function'
+    ? (event.target as unknown as Element)
+    : null;
+  const pointTarget = (
+    typeof event?.clientX === 'number'
+    && typeof event?.clientY === 'number'
+  )
+    ? document.elementFromPoint(event.clientX, event.clientY)
+    : null;
+  const baseElement = pointTarget || fallbackTarget;
+  if (!baseElement || typeof baseElement.closest !== 'function') return null;
+  return baseElement;
+};
+
+export const resolveSidebarDropNodeFromDomEvent = (
+  event: {
+    clientX?: number;
+    clientY?: number;
+    target?: EventTarget | null;
+  } | null | undefined,
+): { key: string; type: string } | null => {
+  const baseElement = resolveSidebarDropBaseElementFromDomEvent(event);
+  if (!baseElement) return null;
+  const marker = baseElement.closest('[data-sidebar-node-key]') as HTMLElement | null;
+  if (!marker) return null;
+  const key = String(marker.getAttribute('data-sidebar-node-key') || '').trim();
+  const type = String(marker.getAttribute('data-sidebar-node-type') || '').trim();
+  if (!key || !type) return null;
+  return { key, type };
+};
+
+export const resolveSidebarDropTargetMetricsFromDomEvent = (
+  event: {
+    clientX?: number;
+    clientY?: number;
+    target?: EventTarget | null;
+  } | null | undefined,
+): { top: number; height: number } | null => {
+  const baseElement = resolveSidebarDropBaseElementFromDomEvent(event);
+  if (!baseElement) return null;
+  const treeNode = baseElement.closest('.ant-tree-treenode') as HTMLElement | null;
+  if (!treeNode || typeof treeNode.getBoundingClientRect !== 'function') return null;
+  const rect = treeNode.getBoundingClientRect();
+  if (!Number.isFinite(rect.top) || !Number.isFinite(rect.height) || rect.height <= 0) {
+    return null;
+  }
+  return {
+    top: rect.top,
+    height: rect.height,
+  };
+};
+
+export const resolveSidebarTagDropInsertBefore = (options: {
+  currentTagOrder: string[];
+  dragTagId: string;
+  dropTagId: string;
+  relativeDropPosition: number;
+  fallbackInsertBefore: boolean;
+  metrics?: {
+    clientY?: number;
+    top?: number;
+    height?: number;
+  } | null;
+}): boolean => {
+  const {
+    currentTagOrder,
+    dragTagId,
+    dropTagId,
+    relativeDropPosition,
+    fallbackInsertBefore,
+    metrics,
+  } = options;
+
+  if (relativeDropPosition !== 0) {
+    return fallbackInsertBefore;
+  }
+
+  const clientY = metrics?.clientY;
+  const top = metrics?.top;
+  const height = metrics?.height;
+  if (
+    typeof clientY !== 'number'
+    || typeof top !== 'number'
+    || typeof height !== 'number'
+    || !Number.isFinite(clientY)
+    || !Number.isFinite(top)
+    || !Number.isFinite(height)
+    || height <= 0
+  ) {
+    return fallbackInsertBefore;
+  }
+
+  const ratio = (clientY - top) / height;
+  if (ratio < 0.35) return true;
+  if (ratio > 0.65) return false;
+
+  const dragIndex = currentTagOrder.indexOf(dragTagId);
+  const dropIndex = currentTagOrder.indexOf(dropTagId);
+  if (dragIndex === -1 || dropIndex === -1 || dragIndex === dropIndex) {
+    return fallbackInsertBefore;
+  }
+  return dragIndex > dropIndex;
+};
+
+export const shouldSkipSidebarSelectWhileDragging = (
+  isTreeDragging: boolean,
+  info: { selected?: boolean } | null | undefined,
+): boolean => isTreeDragging || !info?.selected;
+
+export const shouldSkipSidebarLoadOnExpandWhileDragging = (
+  isTreeDragging: boolean,
+  info: { expanded?: boolean; node?: Pick<SidebarTreeNode, 'type' | 'children' | 'isLeaf'> | null } | null | undefined,
+): boolean => {
+  if (isTreeDragging) return true;
+  if (!info?.expanded) return true;
+  return !shouldLoadSidebarNodeOnExpand(info.node);
+};
+
+export const resolveV2ActiveConnectionId = ({
+  activeContextConnectionId,
+  activeTabConnectionId,
+  selectedKeys,
+  connectionIds,
+  fallbackConnectionId,
+}: {
+  activeContextConnectionId?: unknown;
+  activeTabConnectionId?: unknown;
+  selectedKeys: unknown[];
+  connectionIds: string[];
+  fallbackConnectionId?: unknown;
+}): string => {
+  const connectionIdSet = new Set(connectionIds);
+  const normalizeDirectId = (value: unknown): string => {
+    const text = String(value || '').trim();
+    return text && connectionIdSet.has(text) ? text : '';
+  };
+  const selectedConnectionId = selectedKeys
+    .map((key) => resolveSidebarConnectionIdFromKey(key, connectionIds))
+    .find(Boolean) || '';
+
+  return normalizeDirectId(activeContextConnectionId)
+    || selectedConnectionId
+    || normalizeDirectId(fallbackConnectionId)
+    || normalizeDirectId(activeTabConnectionId)
+    || '';
+};
+
+export const shouldClearSidebarActiveContextOnEmptySelect = (isV2Ui: boolean): boolean => !isV2Ui;
diff --git a/frontend/src/components/tableDataDangerActions.test.ts b/frontend/src/components/tableDataDangerActions.test.ts
index bc40082..42d0196 100644
--- a/frontend/src/components/tableDataDangerActions.test.ts
+++ b/frontend/src/components/tableDataDangerActions.test.ts
@@ -5,11 +5,15 @@ import { supportsTableTruncateAction } from './tableDataDangerActions';
 describe('tableDataDangerActions', () => {
   it('supports native truncate for known relational dialects', () => {
     expect(supportsTableTruncateAction('mysql')).toBe(true);
+    expect(supportsTableTruncateAction('goldendb')).toBe(true);
     expect(supportsTableTruncateAction('oceanbase')).toBe(true);
     expect(supportsTableTruncateAction('postgres')).toBe(true);
     expect(supportsTableTruncateAction('opengauss')).toBe(true);
+    expect(supportsTableTruncateAction('gaussdb')).toBe(true);
     expect(supportsTableTruncateAction('iris')).toBe(true);
     expect(supportsTableTruncateAction('custom', 'postgresql')).toBe(true);
+    expect(supportsTableTruncateAction('custom', 'greatdb')).toBe(true);
+    expect(supportsTableTruncateAction('custom', 'gauss_db')).toBe(true);
     expect(supportsTableTruncateAction('custom', 'kingbase8')).toBe(true);
     expect(supportsTableTruncateAction('custom', 'intersystemsiris')).toBe(true);
   });
diff --git a/frontend/src/components/tableDataDangerActions.ts b/frontend/src/components/tableDataDangerActions.ts
index e5160e3..cd4fa38 100644
--- a/frontend/src/components/tableDataDangerActions.ts
+++ b/frontend/src/components/tableDataDangerActions.ts
@@ -13,6 +13,14 @@ const resolveCustomDriverDialect = (driver: string): string => {
     case 'open_gauss':
     case 'open-gauss':
       return 'opengauss';
+    case 'gaussdb':
+    case 'gauss_db':
+    case 'gauss-db':
+      return 'gaussdb';
+    case 'goldendb':
+    case 'greatdb':
+    case 'gdb':
+      return 'goldendb';
     case 'dm':
     case 'dameng':
     case 'dm8':
@@ -49,6 +57,8 @@ const resolveCustomDriverDialect = (driver: string): string => {
   }
 
   if (normalized.includes('opengauss') || normalized.includes('open_gauss') || normalized.includes('open-gauss')) return 'opengauss';
+  if (normalized.includes('gaussdb') || normalized.includes('gauss_db') || normalized.includes('gauss-db')) return 'gaussdb';
+  if (normalized.includes('goldendb') || normalized.includes('greatdb')) return 'goldendb';
   if (normalized.includes('postgres')) return 'postgres';
   if (normalized.includes('oceanbase')) return 'oceanbase';
   if (normalized.includes('kingbase')) return 'kingbase';
@@ -73,6 +83,7 @@ export const resolveTableDataActionDBType = (type: string, driver?: string): str
 export const supportsTableTruncateAction = (type: string, driver?: string): boolean => {
   switch (resolveTableDataActionDBType(type, driver)) {
     case 'mysql':
+    case 'goldendb':
     case 'mariadb':
     case 'oceanbase':
     case 'starrocks':
@@ -81,6 +92,7 @@ export const supportsTableTruncateAction = (type: string, driver?: string): bool
     case 'highgo':
     case 'vastbase':
     case 'opengauss':
+    case 'gaussdb':
     case 'sqlserver':
     case 'iris':
     case 'oracle':
diff --git a/frontend/src/components/tableDesignerDuckDbPrimaryKey.test.ts b/frontend/src/components/tableDesignerDuckDbPrimaryKey.test.ts
new file mode 100644
index 0000000..c0da633
--- /dev/null
+++ b/frontend/src/components/tableDesignerDuckDbPrimaryKey.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, it } from 'vitest';
+
+import type { EditableColumnSnapshot } from './tableDesignerSchemaSql';
+import { summarizeDuckDbPrimaryKeyChange } from './tableDesignerDuckDbPrimaryKey';
+
+const col = (overrides: Partial<EditableColumnSnapshot>): EditableColumnSnapshot => ({
+  _key: overrides._key || 'id',
+  name: overrides.name || 'id',
+  type: overrides.type || 'BIGINT',
+  nullable: overrides.nullable || 'NO',
+  default: overrides.default || '',
+  extra: overrides.extra || '',
+  comment: overrides.comment || '',
+  key: overrides.key || '',
+  isAutoIncrement: overrides.isAutoIncrement || false,
+});
+
+describe('tableDesignerDuckDbPrimaryKey', () => {
+  it('treats first primary key addition as supported', () => {
+    const summary = summarizeDuckDbPrimaryKeyChange(
+      [col({ _key: 'id', key: '' })],
+      [col({ _key: 'id', key: 'PRI' })],
+    );
+
+    expect(summary).toEqual({
+      hasChange: true,
+      isAddingPrimaryKey: true,
+      isUnsupportedChange: false,
+    });
+  });
+
+  it('treats replacing an existing primary key as unsupported', () => {
+    const summary = summarizeDuckDbPrimaryKeyChange(
+      [col({ _key: 'id', key: 'PRI' }), col({ _key: 'name', name: 'name', key: '' })],
+      [col({ _key: 'id', key: '' }), col({ _key: 'name', name: 'name', key: 'PRI' })],
+    );
+
+    expect(summary).toEqual({
+      hasChange: true,
+      isAddingPrimaryKey: false,
+      isUnsupportedChange: true,
+    });
+  });
+});
diff --git a/frontend/src/components/tableDesignerDuckDbPrimaryKey.ts b/frontend/src/components/tableDesignerDuckDbPrimaryKey.ts
new file mode 100644
index 0000000..4d93bbd
--- /dev/null
+++ b/frontend/src/components/tableDesignerDuckDbPrimaryKey.ts
@@ -0,0 +1,38 @@
+import type { EditableColumnSnapshot } from './tableDesignerSchemaSql';
+
+export interface DuckDbPrimaryKeyChangeSummary {
+  hasChange: boolean;
+  isAddingPrimaryKey: boolean;
+  isUnsupportedChange: boolean;
+}
+
+const collectPrimaryKeys = (columns: EditableColumnSnapshot[]): string[] => (
+  columns
+    .filter((column) => column.key === 'PRI')
+    .map((column) => String(column._key || '').trim())
+    .filter(Boolean)
+    .sort()
+);
+
+export const summarizeDuckDbPrimaryKeyChange = (
+  originalColumns: EditableColumnSnapshot[],
+  columns: EditableColumnSnapshot[],
+): DuckDbPrimaryKeyChangeSummary => {
+  const originalKeys = collectPrimaryKeys(originalColumns);
+  const nextKeys = collectPrimaryKeys(columns);
+  const hasChange = originalKeys.length !== nextKeys.length || originalKeys.some((key, index) => key !== nextKeys[index]);
+  if (!hasChange) {
+    return {
+      hasChange: false,
+      isAddingPrimaryKey: false,
+      isUnsupportedChange: false,
+    };
+  }
+
+  const isAddingPrimaryKey = originalKeys.length === 0 && nextKeys.length > 0;
+  return {
+    hasChange: true,
+    isAddingPrimaryKey,
+    isUnsupportedChange: !isAddingPrimaryKey,
+  };
+};
diff --git a/frontend/src/components/tableDesignerIndexSql.ts b/frontend/src/components/tableDesignerIndexSql.ts
index ab537f3..123cc82 100644
--- a/frontend/src/components/tableDesignerIndexSql.ts
+++ b/frontend/src/components/tableDesignerIndexSql.ts
@@ -23,7 +23,7 @@ export interface BuildIndexCreateSqlResult {
   severity?: 'error' | 'warning';
 }
 
-const isNonRelationalDialect = (dbType: string): boolean => dbType === 'redis' || dbType === 'mongodb';
+const isNonRelationalDialect = (dbType: string): boolean => dbType === 'redis' || dbType === 'mongodb' || dbType === 'elasticsearch';
 
 export const buildIndexCreateSqlPreview = (input: BuildIndexCreateSqlInput): BuildIndexCreateSqlResult => {
   const dbType = input.dbType;
diff --git a/frontend/src/components/tableDesignerSchemaSql.test.ts b/frontend/src/components/tableDesignerSchemaSql.test.ts
index c451d5e..a485eda 100644
--- a/frontend/src/components/tableDesignerSchemaSql.test.ts
+++ b/frontend/src/components/tableDesignerSchemaSql.test.ts
@@ -163,6 +163,43 @@ describe('tableDesignerSchemaSql', () => {
     expect(sql).not.toContain('MODIFY COLUMN');
   });
 
+  it('builds duckdb alter preview with add primary key when adding first primary key', () => {
+    const sql = buildAlterTablePreviewSql(buildInput({
+      dbType: 'duckdb',
+      tableName: 'main.events',
+      originalColumns: [
+        baseColumn({ _key: 'id', name: 'id', type: 'BIGINT', nullable: 'YES', key: '' }),
+        baseColumn({ _key: 'name', name: 'name', type: 'VARCHAR', nullable: 'YES', key: '' }),
+      ],
+      columns: [
+        baseColumn({ _key: 'id', name: 'id', type: 'BIGINT', nullable: 'NO', key: 'PRI' }),
+        baseColumn({ _key: 'name', name: 'name', type: 'VARCHAR', nullable: 'YES', key: '' }),
+      ],
+    }));
+
+    expect(sql).toContain('ALTER TABLE "main"."events"\nALTER COLUMN "id" SET NOT NULL;');
+    expect(sql).toContain('ALTER TABLE "main"."events"\nADD PRIMARY KEY ("id");');
+  });
+
+  it('marks unsupported duckdb primary key replacement with explicit warning comment', () => {
+    const sql = buildAlterTablePreviewSql(buildInput({
+      dbType: 'duckdb',
+      tableName: 'main.events',
+      originalColumns: [
+        baseColumn({ _key: 'id', name: 'id', type: 'BIGINT', nullable: 'NO', key: 'PRI' }),
+        baseColumn({ _key: 'name', name: 'name', type: 'VARCHAR', nullable: 'YES', key: '' }),
+      ],
+      columns: [
+        baseColumn({ _key: 'id', name: 'id', type: 'BIGINT', nullable: 'NO', key: '' }),
+        baseColumn({ _key: 'name', name: 'name', type: 'VARCHAR', nullable: 'NO', key: 'PRI' }),
+      ],
+    }));
+
+    expect(sql).toContain('-- DuckDB 当前仅支持为无主键表新增 PRIMARY KEY；已有主键的修改或删除需要通过重建表完成。');
+    expect(sql).not.toContain('DROP CONSTRAINT');
+    expect(sql).not.toContain('DROP PRIMARY KEY');
+  });
+
   it('builds doris alter preview without mysql-only syntax or metadata extra', () => {
     const sql = buildAlterTablePreviewSql(buildInput({
       dbType: 'doris',
diff --git a/frontend/src/components/tableDesignerSchemaSql.ts b/frontend/src/components/tableDesignerSchemaSql.ts
index c362e9f..c9f7802 100644
--- a/frontend/src/components/tableDesignerSchemaSql.ts
+++ b/frontend/src/components/tableDesignerSchemaSql.ts
@@ -10,6 +10,7 @@ import {
   unquoteSqlIdentifierPart,
   unquoteSqlIdentifierPath,
 } from '../utils/sqlDialect';
+import { splitQualifiedNameLast } from '../utils/qualifiedName';
 
 export interface EditableColumnSnapshot {
   _key: string;
@@ -78,18 +79,21 @@ export interface BuildStarRocksMaterializedViewPreviewInput {
   properties?: string;
 }
 
+const collectPrimaryKeyColumnKeys = (columns: EditableColumnSnapshot[]): string[] => (
+  columns
+    .filter((col) => col.key === 'PRI')
+    .map((col) => col._key)
+);
+
 const escapeSqlString = (value: string) => String(value || '').replace(/'/g, "''");
 
 const stripIdentifierQuotes = unquoteSqlIdentifierPart;
 
 const splitQualifiedName = (qualifiedName: string): { schemaName: string; objectName: string } => {
-  const raw = String(qualifiedName || '').trim();
-  if (!raw) return { schemaName: '', objectName: '' };
-  const idx = raw.lastIndexOf('.');
-  if (idx <= 0 || idx >= raw.length - 1) return { schemaName: '', objectName: raw };
+  const parsed = splitQualifiedNameLast(qualifiedName);
   return {
-    schemaName: stripIdentifierQuotes(raw.substring(0, idx)),
-    objectName: stripIdentifierQuotes(raw.substring(idx + 1)),
+    schemaName: parsed.parentPath,
+    objectName: parsed.objectName,
   };
 };
 
@@ -609,6 +613,21 @@ const buildDuckDbAlterPreviewSql = (input: BuildAlterTablePreviewInput): string
     }
   });
 
+  const origPKKeys = collectPrimaryKeyColumnKeys(input.originalColumns);
+  const newPKKeys = collectPrimaryKeyColumnKeys(input.columns);
+  const keysChanged = origPKKeys.length !== newPKKeys.length || !origPKKeys.every((key) => newPKKeys.includes(key));
+  if (keysChanged) {
+    if (origPKKeys.length === 0 && newPKKeys.length > 0) {
+      const pkNames = input.columns
+        .filter((col) => col.key === 'PRI')
+        .map((col) => quoteIdentifierPart(col.name, dbType))
+        .join(', ');
+      statements.push(`ALTER TABLE ${tableRef}\nADD PRIMARY KEY (${pkNames});`);
+    } else {
+      statements.push('-- DuckDB 当前仅支持为无主键表新增 PRIMARY KEY；已有主键的修改或删除需要通过重建表完成。');
+    }
+  }
+
   return statements.join('\n');
 };
 
diff --git a/frontend/src/components/useDataGridDdlView.ts b/frontend/src/components/useDataGridDdlView.ts
index da1bbab..5ab694c 100644
--- a/frontend/src/components/useDataGridDdlView.ts
+++ b/frontend/src/components/useDataGridDdlView.ts
@@ -1,6 +1,7 @@
 import React from 'react';
 import { DBShowCreateTable } from '../../wailsjs/go/app/App';
 import { buildRpcConnectionConfig } from '../utils/connectionRpcConfig';
+import { formatDdlForDisplay } from '../utils/ddlFormat';
 
 type GridViewMode = 'table' | 'json' | 'text' | 'fields' | 'ddl' | 'er';
 type DdlViewLayoutMode = 'bottom' | 'side';
@@ -20,6 +21,7 @@ interface UseDataGridDdlViewParams {
   messageApi: {
     error: (content: string) => void;
   };
+  dbType?: string;
 }
 
 export interface UseDataGridDdlViewResult {
@@ -54,6 +56,7 @@ export const useDataGridDdlView = ({
   closeCellEditModeRef,
   setTextRecordIndex,
   messageApi,
+  dbType,
 }: UseDataGridDdlViewParams): UseDataGridDdlViewResult => {
   const [viewMode, setViewMode] = React.useState<GridViewMode>('table');
   const [ddlModalOpen, setDdlModalOpen] = React.useState(false);
@@ -92,7 +95,7 @@ export const useDataGridDdlView = ({
       const res = await DBShowCreateTable(buildRpcConnectionConfig(currentConnConfig as any) as any, dbName || '', tableName);
       if (requestSeq !== ddlRequestSeqRef.current) return;
       if (res.success) {
-        setDdlText(String(res.data ?? ''));
+        setDdlText(formatDdlForDisplay(res.data, dbType || String((currentConnConfig as any)?.type || '')));
         return;
       }
       messageApi.error(res.message || '获取 DDL 失败');
@@ -104,7 +107,7 @@ export const useDataGridDdlView = ({
         setDdlLoading(false);
       }
     }
-  }, [canViewDdl, currentConnConfig, dbName, isV2Ui, messageApi, tableName]);
+  }, [canViewDdl, currentConnConfig, dbName, dbType, isV2Ui, messageApi, tableName]);
 
   React.useEffect(() => {
     if (isV2Ui || (viewMode !== 'fields' && viewMode !== 'ddl' && viewMode !== 'er')) return;
diff --git a/frontend/src/components/useSqlEditorTransactionController.test.tsx b/frontend/src/components/useSqlEditorTransactionController.test.tsx
new file mode 100644
index 0000000..53166de
--- /dev/null
+++ b/frontend/src/components/useSqlEditorTransactionController.test.tsx
@@ -0,0 +1,123 @@
+import React from 'react';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { useSqlEditorTransactionController } from './useSqlEditorTransactionController';
+import type { PendingSqlEditorTransaction } from './QueryEditorTransactionToolbar';
+
+const storeState = vi.hoisted(() => ({
+  setSqlEditorPendingTransaction: vi.fn(),
+}));
+
+const backendApp = vi.hoisted(() => ({
+  DBCommitTransaction: vi.fn(),
+  DBRollbackTransaction: vi.fn(),
+}));
+
+const messageApi = vi.hoisted(() => ({
+  error: vi.fn(),
+  success: vi.fn(),
+}));
+
+vi.mock('../store', () => ({
+  useStore: (selector: (state: typeof storeState) => unknown) => selector(storeState),
+}));
+
+vi.mock('../../wailsjs/go/app/App', () => backendApp);
+
+vi.mock('antd', () => ({
+  message: messageApi,
+}));
+
+const createPendingTransaction = (overrides: Partial<PendingSqlEditorTransaction> = {}): PendingSqlEditorTransaction => ({
+  id: 'tx-1',
+  commitMode: 'manual',
+  autoCommitDelayMs: 0,
+  createdAt: Date.now(),
+  statementCount: 1,
+  ...overrides,
+});
+
+describe('useSqlEditorTransactionController', () => {
+  let controller: ReturnType<typeof useSqlEditorTransactionController> | null = null;
+  let renderer: ReactTestRenderer | null = null;
+
+  const renderController = () => {
+    const Harness = () => {
+      controller = useSqlEditorTransactionController({ tabId: 'tab-1' });
+      return null;
+    };
+
+    act(() => {
+      renderer = create(<Harness />);
+    });
+  };
+
+  beforeEach(() => {
+    controller = null;
+    renderer = null;
+    storeState.setSqlEditorPendingTransaction.mockReset();
+    backendApp.DBCommitTransaction.mockReset();
+    backendApp.DBRollbackTransaction.mockReset();
+    messageApi.error.mockReset();
+    messageApi.success.mockReset();
+    backendApp.DBCommitTransaction.mockResolvedValue({ success: true, message: '事务已提交' });
+    backendApp.DBRollbackTransaction.mockResolvedValue({ success: true, message: '事务已回滚' });
+  });
+
+  afterEach(() => {
+    act(() => {
+      renderer?.unmount();
+    });
+  });
+
+  it('ignores duplicate finish requests for the same pending transaction', async () => {
+    renderController();
+
+    await act(async () => {
+      controller?.activatePendingSqlTransaction(createPendingTransaction());
+    });
+
+    await act(async () => {
+      const first = controller?.finishPendingSqlTransaction('commit', 'manual');
+      const second = controller?.finishPendingSqlTransaction('commit', 'manual');
+      await Promise.all([first, second]);
+    });
+
+    expect(backendApp.DBCommitTransaction).toHaveBeenCalledTimes(1);
+    expect(backendApp.DBCommitTransaction).toHaveBeenCalledWith('tx-1');
+    expect(backendApp.DBRollbackTransaction).not.toHaveBeenCalled();
+    expect(messageApi.success).toHaveBeenCalledWith('SQL 事务已提交');
+  });
+
+  it('does not rollback a transaction while its auto commit is in flight', async () => {
+    let resolveCommit!: (value: { success: boolean; message: string }) => void;
+    backendApp.DBCommitTransaction.mockReturnValue(new Promise((resolve) => {
+      resolveCommit = resolve;
+    }));
+    renderController();
+
+    await act(async () => {
+      controller?.activatePendingSqlTransaction(createPendingTransaction({
+        commitMode: 'auto',
+        autoCommitDelayMs: 0,
+      }));
+    });
+
+    const finishPromise = controller?.finishPendingSqlTransaction('commit', 'auto');
+    act(() => {
+      renderer?.unmount();
+      renderer = null;
+    });
+
+    expect(backendApp.DBRollbackTransaction).not.toHaveBeenCalled();
+    expect(backendApp.DBCommitTransaction).toHaveBeenCalledTimes(1);
+
+    await act(async () => {
+      resolveCommit({ success: true, message: '事务已提交' });
+      await finishPromise;
+    });
+
+    expect(messageApi.success).toHaveBeenCalledWith('SQL 事务已自动提交');
+  });
+});
diff --git a/frontend/src/components/useSqlEditorTransactionController.ts b/frontend/src/components/useSqlEditorTransactionController.ts
new file mode 100644
index 0000000..4ba0f00
--- /dev/null
+++ b/frontend/src/components/useSqlEditorTransactionController.ts
@@ -0,0 +1,135 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { message } from 'antd';
+
+import { DBCommitTransaction, DBRollbackTransaction } from '../../wailsjs/go/app/App';
+import { useStore } from '../store';
+import { formatSqlExecutionError } from '../utils/sqlErrorSemantics';
+import type { PendingSqlEditorTransaction } from './QueryEditorTransactionToolbar';
+
+type FinishSqlEditorTransactionAction = 'commit' | 'rollback';
+type FinishSqlEditorTransactionSource = 'manual' | 'auto';
+
+type UseSqlEditorTransactionControllerOptions = {
+  tabId: string;
+};
+
+export const useSqlEditorTransactionController = ({
+  tabId,
+}: UseSqlEditorTransactionControllerOptions) => {
+  const setSqlEditorPendingTransaction = useStore(state => state.setSqlEditorPendingTransaction);
+  const [pendingSqlTransaction, setPendingSqlTransaction] = useState<PendingSqlEditorTransaction | null>(null);
+  const pendingSqlTransactionRef = useRef<PendingSqlEditorTransaction | null>(null);
+  const finishingTransactionIdsRef = useRef<Set<string>>(new Set());
+  const autoCommitTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const autoCommitCountdownRef = useRef<ReturnType<typeof setInterval> | null>(null);
+  const [autoCommitRemainingSeconds, setAutoCommitRemainingSeconds] = useState<number | null>(null);
+
+  const clearAutoCommitTimer = useCallback(() => {
+    if (autoCommitTimerRef.current) {
+      clearTimeout(autoCommitTimerRef.current);
+      autoCommitTimerRef.current = null;
+    }
+    if (autoCommitCountdownRef.current) {
+      clearInterval(autoCommitCountdownRef.current);
+      autoCommitCountdownRef.current = null;
+    }
+    setAutoCommitRemainingSeconds(null);
+  }, []);
+
+  const updatePendingSqlTransaction = useCallback((transaction: PendingSqlEditorTransaction | null) => {
+    pendingSqlTransactionRef.current = transaction;
+    setPendingSqlTransaction(transaction);
+    setSqlEditorPendingTransaction(tabId, transaction);
+  }, [setSqlEditorPendingTransaction, tabId]);
+
+  const finishPendingSqlTransaction = useCallback(async (
+    action: FinishSqlEditorTransactionAction,
+    source: FinishSqlEditorTransactionSource = 'manual',
+    transactionId?: string,
+  ) => {
+    const transaction = pendingSqlTransactionRef.current;
+    if (!transaction || (transactionId && transaction.id !== transactionId)) {
+      return;
+    }
+    if (finishingTransactionIdsRef.current.has(transaction.id)) {
+      return;
+    }
+    clearAutoCommitTimer();
+    finishingTransactionIdsRef.current.add(transaction.id);
+    updatePendingSqlTransaction(null);
+    try {
+      const res = action === 'commit'
+        ? await DBCommitTransaction(transaction.id)
+        : await DBRollbackTransaction(transaction.id);
+      if (res?.success) {
+        if (action === 'commit') {
+          message.success(source === 'auto' ? 'SQL 事务已自动提交' : 'SQL 事务已提交');
+        } else {
+          message.success('SQL 事务已回滚');
+        }
+        return;
+      }
+      const fallback = action === 'commit' ? '提交失败' : '回滚失败';
+      message.error(`${source === 'auto' ? '自动提交失败' : fallback}: ${formatSqlExecutionError(res?.message || '未知错误')}`);
+    } catch (err: any) {
+      const fallback = action === 'commit' ? '提交失败' : '回滚失败';
+      message.error(`${source === 'auto' ? '自动提交失败' : fallback}: ${formatSqlExecutionError(err?.message || err || '未知错误')}`);
+    } finally {
+      finishingTransactionIdsRef.current.delete(transaction.id);
+    }
+  }, [clearAutoCommitTimer, updatePendingSqlTransaction]);
+
+  const activatePendingSqlTransaction = useCallback((transaction: PendingSqlEditorTransaction) => {
+    clearAutoCommitTimer();
+    const autoCommitDelayMs = Math.max(0, Number(transaction.autoCommitDelayMs) || 0);
+    const dueAt = transaction.commitMode === 'auto' ? Date.now() + autoCommitDelayMs : null;
+    const nextTransaction = { ...transaction, autoCommitDelayMs, autoCommitDueAt: dueAt };
+    updatePendingSqlTransaction(nextTransaction);
+    if (nextTransaction.commitMode !== 'auto' || !dueAt) {
+      return;
+    }
+    if (autoCommitDelayMs === 0) {
+      setAutoCommitRemainingSeconds(0);
+      autoCommitTimerRef.current = setTimeout(() => {
+        autoCommitTimerRef.current = null;
+        setAutoCommitRemainingSeconds(null);
+        void finishPendingSqlTransaction('commit', 'auto', nextTransaction.id);
+      }, 0);
+      return;
+    }
+    const updateRemaining = () => {
+      setAutoCommitRemainingSeconds(Math.max(1, Math.ceil((dueAt - Date.now()) / 1000)));
+    };
+    updateRemaining();
+    autoCommitCountdownRef.current = setInterval(updateRemaining, 250);
+    autoCommitTimerRef.current = setTimeout(() => {
+      autoCommitTimerRef.current = null;
+      if (autoCommitCountdownRef.current) {
+        clearInterval(autoCommitCountdownRef.current);
+        autoCommitCountdownRef.current = null;
+      }
+      setAutoCommitRemainingSeconds(null);
+      void finishPendingSqlTransaction('commit', 'auto', nextTransaction.id);
+    }, autoCommitDelayMs);
+  }, [clearAutoCommitTimer, finishPendingSqlTransaction, updatePendingSqlTransaction]);
+
+  useEffect(() => {
+    return () => {
+      clearAutoCommitTimer();
+      const transaction = pendingSqlTransactionRef.current;
+      if (transaction?.id) {
+        pendingSqlTransactionRef.current = null;
+        setSqlEditorPendingTransaction(tabId, null);
+        void DBRollbackTransaction(transaction.id);
+      }
+    };
+  }, [clearAutoCommitTimer, setSqlEditorPendingTransaction, tabId]);
+
+  return {
+    activatePendingSqlTransaction,
+    autoCommitRemainingSeconds,
+    finishPendingSqlTransaction,
+    pendingSqlTransaction,
+    pendingSqlTransactionRef,
+  };
+};
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 198262a..4f73e84 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -1,7 +1,6 @@
 import React, { useSyncExternalStore } from 'react'
 import ReactDOM from 'react-dom/client'
 import App from './App'
-import PerfDataGridHarness from './dev/PerfDataGridHarness'
 // import './index.css' // Optional global styles
 
 import { setCurrentLanguage, t } from './i18n'
@@ -21,12 +20,58 @@ const resolveDevHarnessMode = (): string => {
     }
 };
 
-if (typeof window !== 'undefined' && !(window as any).go) {
+if (typeof window !== 'undefined' && (!(window as any).go?.app?.App || !(window as any).go?.aiservice?.Service)) {
     const mockConnections: any[] = [];
+    const mockSavedQueries: any[] = [];
     const mockConnectionSecrets = new Map<string, any>();
     const mockProviders: any[] = [];
     const mockProviderSecrets = new Map<string, string>();
     let mockActiveProviderId = '';
+    let mockAISafetyLevel = 'readonly';
+    let mockAIContextLevel = 'schema_only';
+    let mockAIUserPromptSettings: any = {
+        global: '',
+        database: '',
+        jvm: '',
+        jvmDiagnostic: '',
+    };
+    let mockMCPServers: any[] = [];
+    let mockMCPHTTPServerStatus: any = {
+        running: false,
+        addr: '127.0.0.1:8765',
+        path: '/mcp',
+        url: 'http://127.0.0.1:8765/mcp',
+        schemaOnly: true,
+        message: 'GoNavi MCP HTTP 服务未启动',
+    };
+    let mockMCPClientStatuses: any[] = [
+        {
+            client: 'claude-code',
+            displayName: 'Claude Code',
+            installed: false,
+            matchesCurrent: false,
+            clientDetected: false,
+            clientCommand: 'claude',
+            message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+            configPath: 'C:/Users/mock/.claude.json',
+            command: 'C:/Program Files/GoNavi/GoNavi.exe',
+            args: ['mcp-server'],
+        },
+        {
+            client: 'codex',
+            displayName: 'Codex',
+            installed: true,
+            matchesCurrent: false,
+            clientDetected: true,
+            clientCommand: 'codex',
+            clientPath: 'C:/Users/mock/AppData/Roaming/npm/codex.cmd',
+            message: '已检测到 Codex 中的 GoNavi MCP 记录，但与当前 GoNavi 安装路径不一致，建议更新',
+            configPath: 'C:/Users/mock/.codex/config.toml',
+            command: 'C:/Old/GoNavi.exe',
+            args: ['mcp-server'],
+        },
+    ];
+    let mockSkills: any[] = [];
     let mockGlobalProxy: any = { enabled: false, type: 'socks5', host: '', port: 1080, user: '', password: '', hasPassword: false };
     let mockDataRootInfo: any = {
         path: 'C:/mock/.gonavi',
@@ -60,6 +105,7 @@ if (typeof window !== 'undefined' && !(window as any).go) {
             httpTunnelPassword: String(httpTunnel.password ?? existingSecrets.httpTunnelPassword ?? ''),
             mysqlReplicaPassword: String(config.mysqlReplicaPassword ?? existingSecrets.mysqlReplicaPassword ?? ''),
             mongoReplicaPassword: String(config.mongoReplicaPassword ?? existingSecrets.mongoReplicaPassword ?? ''),
+            redisSentinelPassword: String(config.redisSentinelPassword ?? existingSecrets.redisSentinelPassword ?? ''),
             uri: String(config.uri ?? existingSecrets.uri ?? ''),
             dsn: String(config.dsn ?? existingSecrets.dsn ?? ''),
         };
@@ -69,6 +115,7 @@ if (typeof window !== 'undefined' && !(window as any).go) {
         if (input?.clearHttpTunnelPassword) nextSecrets.httpTunnelPassword = '';
         if (input?.clearMySQLReplicaPassword) nextSecrets.mysqlReplicaPassword = '';
         if (input?.clearMongoReplicaPassword) nextSecrets.mongoReplicaPassword = '';
+        if (input?.clearRedisSentinelPassword) nextSecrets.redisSentinelPassword = '';
         if (input?.clearOpaqueURI) nextSecrets.uri = '';
         if (input?.clearOpaqueDSN) nextSecrets.dsn = '';
         mockConnectionSecrets.set(nextId, nextSecrets);
@@ -86,6 +133,7 @@ if (typeof window !== 'undefined' && !(window as any).go) {
                 dsn: '',
                 mysqlReplicaPassword: '',
                 mongoReplicaPassword: '',
+                redisSentinelPassword: '',
             },
             includeDatabases: Array.isArray(input?.includeDatabases) ? [...input.includeDatabases] : existing?.includeDatabases,
             includeRedisDatabases: Array.isArray(input?.includeRedisDatabases) ? [...input.includeRedisDatabases] : existing?.includeRedisDatabases,
@@ -97,6 +145,7 @@ if (typeof window !== 'undefined' && !(window as any).go) {
             hasHttpTunnelPassword: resolveBrowserMockSecretFlag(httpTunnel.password, !!input?.clearHttpTunnelPassword, existing?.hasHttpTunnelPassword),
             hasMySQLReplicaPassword: resolveBrowserMockSecretFlag(config.mysqlReplicaPassword, !!input?.clearMySQLReplicaPassword, existing?.hasMySQLReplicaPassword),
             hasMongoReplicaPassword: resolveBrowserMockSecretFlag(config.mongoReplicaPassword, !!input?.clearMongoReplicaPassword, existing?.hasMongoReplicaPassword),
+            hasRedisSentinelPassword: resolveBrowserMockSecretFlag(config.redisSentinelPassword, !!input?.clearRedisSentinelPassword, existing?.hasRedisSentinelPassword),
             hasOpaqueURI: resolveBrowserMockSecretFlag(config.uri, !!input?.clearOpaqueURI, existing?.hasOpaqueURI),
             hasOpaqueDSN: resolveBrowserMockSecretFlag(config.dsn, !!input?.clearOpaqueDSN, existing?.hasOpaqueDSN),
         };
@@ -104,6 +153,29 @@ if (typeof window !== 'undefined' && !(window as any).go) {
         return cloneBrowserMockValue(view);
     };
 
+    const saveMockQuery = (input: any) => {
+        const nextId = String(input?.id || `saved-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`);
+        const view = {
+            id: nextId,
+            name: String(input?.name || '未命名查询'),
+            sql: String(input?.sql || ''),
+            connectionId: String(input?.connectionId || ''),
+            dbName: String(input?.dbName || ''),
+            createdAt: Number.isFinite(Number(input?.createdAt)) ? Number(input.createdAt) : Date.now(),
+            connectionFingerprint: typeof input?.connectionFingerprint === 'string' ? input.connectionFingerprint : undefined,
+            fingerprintVersion: typeof input?.fingerprintVersion === 'string' ? input.fingerprintVersion : undefined,
+            bindingStatus: typeof input?.bindingStatus === 'string' ? input.bindingStatus : undefined,
+            originalConnectionId: typeof input?.originalConnectionId === 'string' ? input.originalConnectionId : undefined,
+        };
+        const index = mockSavedQueries.findIndex((item) => item.id === nextId);
+        if (index >= 0) {
+            mockSavedQueries[index] = view;
+        } else {
+            mockSavedQueries.push(view);
+        }
+        return cloneBrowserMockValue(view);
+    };
+
     const saveMockGlobalProxy = (input: any) => {
         const nextPassword = String(input?.password ?? '');
         mockGlobalProxy = {
@@ -145,7 +217,7 @@ if (typeof window !== 'undefined' && !(window as any).go) {
         return cloneBrowserMockValue(view);
     };
 
-    (window as any).go = {
+    const mockGo = {
         app: {
             App: {
                 CheckUpdate: async () => ({ success: false }),
@@ -168,6 +240,7 @@ if (typeof window !== 'undefined' && !(window as any).go) {
                             httpTunnel: { ...(existing.config?.httpTunnel || {}), password: secrets.httpTunnelPassword || '' },
                             mysqlReplicaPassword: secrets.mysqlReplicaPassword || '',
                             mongoReplicaPassword: secrets.mongoReplicaPassword || '',
+                            redisSentinelPassword: secrets.redisSentinelPassword || '',
                             uri: secrets.uri || '',
                             dsn: secrets.dsn || '',
                         },
@@ -201,9 +274,30 @@ if (typeof window !== 'undefined' && !(window as any).go) {
                 GetTableData: async () => ({ columns: [], rows: [], total: 0 }),
                 GetTableColumns: async () => [],
                 ExecuteQuery: async () => ({ columns: [], rows: [], time: 0 }),
-                GetSavedQueries: async () => [],
-                SaveQuery: async () => null,
-                DeleteQuery: async () => null,
+                GetSavedQueries: async () => cloneBrowserMockValue(mockSavedQueries),
+                SaveQuery: async (input: any) => saveMockQuery(input),
+                ImportSavedQueries: async (payload: any) => {
+                    const items = Array.isArray(payload) ? payload : payload?.queries;
+                    (Array.isArray(items) ? items : []).forEach((item) => saveMockQuery(item));
+                    return cloneBrowserMockValue(mockSavedQueries);
+                },
+                DeleteQuery: async (id: string) => {
+                    const index = mockSavedQueries.findIndex((item) => item.id === id);
+                    if (index >= 0) {
+                        mockSavedQueries.splice(index, 1);
+                    }
+                    return null;
+                },
+                RebindSavedQuery: async (id: string, connectionId: string) => {
+                    const existing = mockSavedQueries.find((item) => item.id === id);
+                    if (!existing) throw new Error('saved query not found');
+                    return saveMockQuery({
+                        ...existing,
+                        connectionId,
+                        originalConnectionId: existing.originalConnectionId || existing.connectionId,
+                        bindingStatus: 'active',
+                    });
+                },
                 GetAppInfo: async () => ({}),
                 GetDataRootDirectoryInfo: async () => ({ success: true, data: cloneBrowserMockValue(mockDataRootInfo) }),
                 CheckForUpdates: async () => ({ success: false }),
@@ -214,6 +308,43 @@ if (typeof window !== 'undefined' && !(window as any).go) {
                 SelectSQLDirectory: async (currentPath: string) => ({ success: false, message: currentPath ? '已取消' : '已取消' }),
                 ListSQLDirectory: async () => ({ success: true, data: [] }),
                 ReadSQLFile: async () => ({ success: false, message: '已取消' }),
+                ReadAppLogTail: async (lineLimit: number, keyword: string) => {
+                    const allLines = [
+                        '2026/06/09 10:10:00.000000 [INFO] 应用启动完成',
+                        '2026/06/09 10:10:05.000000 [WARN] MCP mock service slow start',
+                        '2026/06/09 10:10:09.000000 [ERROR] MySQL mock dial failed: connect timeout',
+                    ];
+                    const normalizedKeyword = String(keyword || '').trim().toLowerCase();
+                    const filtered = normalizedKeyword
+                        ? allLines.filter((line) => line.toLowerCase().includes(normalizedKeyword))
+                        : allLines;
+                    const safeLimit = Math.max(1, Math.min(Number(lineLimit) || 80, 200));
+                    const visibleLines = filtered.slice(-safeLimit);
+                    return {
+                        success: true,
+                        data: {
+                            logPath: 'C:/Users/mock/.GoNavi/Logs/gonavi.log',
+                            keyword: String(keyword || ''),
+                            requestedLineLimit: safeLimit,
+                            returnedLineCount: visibleLines.length,
+                            fileWindowTruncated: false,
+                            matchedLinesTruncated: filtered.length > visibleLines.length,
+                            levelBreakdown: {
+                                INFO: visibleLines.filter((line) => line.includes('[INFO]')).length,
+                                WARN: visibleLines.filter((line) => line.includes('[WARN]')).length,
+                                ERROR: visibleLines.filter((line) => line.includes('[ERROR]')).length,
+                                OTHER: visibleLines.filter((line) => !/\[(INFO|WARN|ERROR)\]/.test(line)).length,
+                            },
+                            lines: visibleLines,
+                        },
+                    };
+                },
+                CreateSQLFile: async (_directoryPath: string, _name: string) => ({ success: true, data: { filePath: '', name: _name } }),
+                CreateSQLDirectory: async (directoryPath: string, name: string) => ({ success: true, data: { directoryPath: `${directoryPath}/${name}`, name } }),
+                DeleteSQLFile: async (_filePath: string) => ({ success: true }),
+                DeleteSQLDirectory: async (_directoryPath: string) => ({ success: true }),
+                RenameSQLFile: async (_filePath: string, name: string) => ({ success: true, data: { filePath: _filePath, name } }),
+                RenameSQLDirectory: async (directoryPath: string, name: string) => ({ success: true, data: { directoryPath: `${directoryPath.replace(/[\\/][^\\/]*$/, '')}/${name}`, name } }),
                 WriteSQLFile: async (_filePath: string, _content: string) => ({ success: true }),
                 ExportSQLFile: async (_defaultName: string, _content: string) => ({ success: false, message: t('app.browser_mock.export_sql_unsupported') }),
                 InstallUpdateAndRestart: async () => ({ success: false }),
@@ -277,26 +408,182 @@ if (typeof window !== 'undefined' && !(window as any).go) {
                     mockActiveProviderId = id;
                     return null;
                 },
-                AIGetSafetyLevel: async () => 'readonly',
-                AIGetContextLevel: async () => 'schema_only',
+                AIGetSafetyLevel: async () => mockAISafetyLevel,
+                AIGetContextLevel: async () => mockAIContextLevel,
                 AIGetBuiltinPrompts: async () => ({}),
+                AIGetUserPromptSettings: async () => cloneBrowserMockValue(mockAIUserPromptSettings),
+                AISaveUserPromptSettings: async (input: any) => {
+                    mockAIUserPromptSettings = {
+                        global: String(input?.global || ''),
+                        database: String(input?.database || ''),
+                        jvm: String(input?.jvm || ''),
+                        jvmDiagnostic: String(input?.jvmDiagnostic || ''),
+                    };
+                    return null;
+                },
+                AIGetMCPClientInstallStatuses: async () => cloneBrowserMockValue(mockMCPClientStatuses),
+                AIGetMCPHTTPServerStatus: async () => cloneBrowserMockValue(mockMCPHTTPServerStatus),
+                AIStartMCPHTTPServer: async (input: any) => {
+                    const addr = String(input?.addr || '127.0.0.1:8765');
+                    const path = String(input?.path || '/mcp').startsWith('/') ? String(input?.path || '/mcp') : `/${String(input?.path || '/mcp')}`;
+                    const token = String(input?.token || 'gnv_browser_mock_token').trim() || 'gnv_browser_mock_token';
+                    mockMCPHTTPServerStatus = {
+                        running: true,
+                        addr,
+                        path,
+                        url: `http://${addr}${path}`,
+                        schemaOnly: true,
+                        token,
+                        authorizationHeader: `Bearer ${token}`,
+                        startedAt: Date.now(),
+                        message: 'GoNavi MCP HTTP 服务已启动',
+                    };
+                    return cloneBrowserMockValue(mockMCPHTTPServerStatus);
+                },
+                AIStopMCPHTTPServer: async () => {
+                    mockMCPHTTPServerStatus = {
+                        ...mockMCPHTTPServerStatus,
+                        running: false,
+                        message: 'GoNavi MCP HTTP 服务已停止',
+                    };
+                    return cloneBrowserMockValue(mockMCPHTTPServerStatus);
+                },
+                AIGetMCPServers: async () => cloneBrowserMockValue(mockMCPServers),
+                AIInstallClaudeCodeMCP: async () => {
+                    mockMCPClientStatuses = mockMCPClientStatuses.map((item) => item.client === 'claude-code'
+                        ? {
+                            ...item,
+                            installed: true,
+                            matchesCurrent: true,
+                            message: '已写入 Claude Code 用户级 MCP 配置，重启 Claude CLI 后可在 /mcp 的 User MCPs 中看到 GoNavi。',
+                            command: 'C:/Program Files/GoNavi/GoNavi.exe',
+                            args: ['mcp-server'],
+                        }
+                        : item);
+                    return {
+                        success: true,
+                        client: 'claude-code',
+                        message: '已写入 Claude Code 用户级 MCP 配置，重启 Claude CLI 后可在 /mcp 的 User MCPs 中看到 GoNavi。',
+                        configPath: 'C:/Users/mock/.claude.json',
+                        command: 'C:/Program Files/GoNavi/GoNavi.exe',
+                        args: ['mcp-server'],
+                    };
+                },
+                AIInstallCodexMCP: async () => {
+                    mockMCPClientStatuses = mockMCPClientStatuses.map((item) => item.client === 'codex'
+                        ? {
+                            ...item,
+                            installed: true,
+                            matchesCurrent: true,
+                            message: '已写入 Codex 用户级 MCP 配置，重启 Codex CLI 或桌面端后可看到 GoNavi。',
+                            command: 'C:/Program Files/GoNavi/GoNavi.exe',
+                            args: ['mcp-server'],
+                        }
+                        : item);
+                    return {
+                        success: true,
+                        client: 'codex',
+                        message: '已写入 Codex 用户级 MCP 配置，重启 Codex CLI 或桌面端后可看到 GoNavi。',
+                        configPath: 'C:/Users/mock/.codex/config.toml',
+                        command: 'C:/Program Files/GoNavi/GoNavi.exe',
+                        args: ['mcp-server'],
+                    };
+                },
+                AISaveMCPServer: async (input: any) => {
+                    const next = {
+                        id: String(input?.id || `mcp-${Date.now()}`),
+                        name: String(input?.name || ''),
+                        transport: 'stdio',
+                        command: String(input?.command || ''),
+                        args: Array.isArray(input?.args) ? [...input.args] : [],
+                        env: { ...(input?.env || {}) },
+                        enabled: input?.enabled !== false,
+                        timeoutSeconds: Number(input?.timeoutSeconds) || 20,
+                    };
+                    const index = mockMCPServers.findIndex((item) => item.id === next.id);
+                    if (index >= 0) mockMCPServers[index] = next;
+                    else mockMCPServers.push(next);
+                    return null;
+                },
+                AIDeleteMCPServer: async (id: string) => {
+                    mockMCPServers = mockMCPServers.filter((item) => item.id !== id);
+                    return null;
+                },
+                AITestMCPServer: async (input: any) => ({
+                    success: String(input?.command || '').trim() !== '',
+                    message: String(input?.command || '').trim() !== '' ? 'MCP mock 测试成功' : 'MCP 命令不能为空',
+                    tools: [],
+                }),
+                AIListMCPTools: async () => [],
+                AICallMCPTool: async (_alias: string, _argumentsJSON: string) => ({
+                    alias: _alias,
+                    serverId: '',
+                    serverName: '',
+                    originalName: _alias,
+                    content: '浏览器 mock 未接入真实 MCP 服务',
+                    isError: true,
+                }),
+                AIGetSkills: async () => cloneBrowserMockValue(mockSkills),
+                AISaveSkill: async (input: any) => {
+                    const next = {
+                        id: String(input?.id || `skill-${Date.now()}`),
+                        name: String(input?.name || ''),
+                        description: String(input?.description || ''),
+                        systemPrompt: String(input?.systemPrompt || ''),
+                        enabled: input?.enabled !== false,
+                        scopes: Array.isArray(input?.scopes) ? [...input.scopes] : ['global'],
+                        requiredTools: Array.isArray(input?.requiredTools) ? [...input.requiredTools] : [],
+                    };
+                    const index = mockSkills.findIndex((item) => item.id === next.id);
+                    if (index >= 0) mockSkills[index] = next;
+                    else mockSkills.push(next);
+                    return null;
+                },
+                AIDeleteSkill: async (id: string) => {
+                    mockSkills = mockSkills.filter((item) => item.id !== id);
+                    return null;
+                },
                 AITestProvider: async (input: any) => ({
                     success: String(input?.apiKey || '').trim() !== '',
                     message: String(input?.apiKey || '').trim() !== '' ? '端点连通性测试成功！' : '连接测试失败: missing api key',
                 }),
-                AISetSafetyLevel: async () => null,
-                AISetContextLevel: async () => null,
+                AISetSafetyLevel: async (level: string) => {
+                    mockAISafetyLevel = String(level || 'readonly');
+                    return null;
+                },
+                AISetContextLevel: async (level: string) => {
+                    mockAIContextLevel = String(level || 'schema_only');
+                    return null;
+                },
                 AISetLanguage: async () => null,
             },
         }
     };
+    const existingGo = (window as any).go || {};
+    (window as any).go = {
+        ...mockGo,
+        ...existingGo,
+        app: {
+            ...mockGo.app,
+            ...(existingGo.app || {}),
+            App: {
+                ...mockGo.app.App,
+                ...(existingGo.app?.App || {}),
+            },
+        },
+        aiservice: {
+            ...mockGo.aiservice,
+            ...(existingGo.aiservice || {}),
+            Service: {
+                ...mockGo.aiservice.Service,
+                ...(existingGo.aiservice?.Service || {}),
+            },
+        },
+    };
 }
 const rootNode = document.getElementById('root')!;
 
 const devHarnessMode = import.meta.env.DEV ? resolveDevHarnessMode() : '';
-const rootComponent = devHarnessMode === 'datagrid-perf'
-    ? <PerfDataGridHarness />
-    : <App />;
 
 const readBrowserLanguages = (): string[] => {
     if (typeof navigator === 'undefined') return [];
@@ -318,7 +605,7 @@ const subscribeStoreHydration = (listener: () => void) => {
 
 const getStoreHydrationSnapshot = () => useStore.persist.hasHydrated();
 
-const Root = () => {
+const Root = ({ rootComponent }: { rootComponent: React.ReactNode }) => {
     const isStoreHydrated = useSyncExternalStore(
         subscribeStoreHydration,
         getStoreHydrationSnapshot,
@@ -346,9 +633,18 @@ const Root = () => {
     );
 };
 
-ReactDOM.createRoot(rootNode).render(
-  <React.StrictMode>
-    <Root />
-  </React.StrictMode>,
-)
+const renderRoot = async () => {
+    let rootComponent: React.ReactNode = <App />;
+    if (devHarnessMode === 'datagrid-perf') {
+        const { default: PerfDataGridHarness } = await import('./dev/PerfDataGridHarness');
+        rootComponent = <PerfDataGridHarness />;
+    }
 
+    ReactDOM.createRoot(rootNode).render(
+      <React.StrictMode>
+        <Root rootComponent={rootComponent} />
+      </React.StrictMode>,
+    );
+};
+
+void renderRoot();
diff --git a/frontend/src/store.test.ts b/frontend/src/store.test.ts
index f3ecee0..213aef1 100644
--- a/frontend/src/store.test.ts
+++ b/frontend/src/store.test.ts
@@ -69,6 +69,9 @@ describe('store appearance persistence', () => {
     expect(appearance.opacity).toBe(0.75);
     expect(appearance.blur).toBe(6);
     expect(appearance.useNativeMacWindowControls).toBe(true);
+    expect(appearance.v2SidebarSearchMode).toBe('command');
+    expect(appearance.v2CommandSearchPersistentFilterEnabled).toBe(false);
+    expect(appearance.v2SidebarPersistedFilter).toBe('');
     expect(appearance.showDataTableVerticalBorders).toBe(false);
     expect(appearance.dataTableDensity).toBe('comfortable');
     expect(appearance.dataTableFontSize).toBeNull();
@@ -77,6 +80,11 @@ describe('store appearance persistence', () => {
     expect(appearance.sidebarTreeFontSizeFollowGlobal).toBe(true);
     expect(appearance.customUIFontFamily).toBeNull();
     expect(appearance.customMonoFontFamily).toBeNull();
+    expect(appearance.tabDisplay).toEqual({
+      layout: 'single',
+      primaryElements: ['connection', 'kind', 'object'],
+      secondaryElements: [],
+    });
   });
 
   it('persists DataGrid appearance settings and restores them after reload', async () => {
@@ -160,6 +168,107 @@ describe('store appearance persistence', () => {
     expect(appearance.customMonoFontFamily).toBeNull();
   });
 
+  it('persists v2 sidebar search preferences and sanitizes filter text', async () => {
+    const { useStore } = await importStore();
+
+    useStore.getState().setAppearance({
+      v2SidebarSearchMode: 'filter',
+      v2CommandSearchPersistentFilterEnabled: true,
+      v2SidebarPersistedFilter: `  ${'orders'.repeat(40)}  `,
+    });
+
+    const persisted = JSON.parse(storage.getItem('lite-db-storage') || '{}');
+    expect(persisted.state.appearance.v2SidebarSearchMode).toBe('filter');
+    expect(persisted.state.appearance.v2CommandSearchPersistentFilterEnabled).toBe(true);
+    expect(persisted.state.appearance.v2SidebarPersistedFilter).toHaveLength(120);
+    expect(persisted.state.appearance.v2SidebarPersistedFilter.startsWith('orders')).toBe(true);
+
+    vi.resetModules();
+    const reloaded = await importStore();
+    const appearance = reloaded.useStore.getState().appearance;
+
+    expect(appearance.v2SidebarSearchMode).toBe('filter');
+    expect(appearance.v2CommandSearchPersistentFilterEnabled).toBe(true);
+    expect(appearance.v2SidebarPersistedFilter).toHaveLength(120);
+  });
+
+  it('persists tab display appearance settings and sanitizes invalid elements', async () => {
+    const { useStore } = await importStore();
+
+    useStore.getState().setAppearance({
+      tabDisplay: {
+        layout: 'double',
+        primaryElements: ['kind', 'object', 'invalid' as never, 'object'],
+        secondaryElements: ['connection', 'host', 'schema', 'kind'],
+      },
+    });
+
+    const persisted = JSON.parse(storage.getItem('lite-db-storage') || '{}');
+    expect(persisted.state.appearance.tabDisplay).toEqual({
+      layout: 'double',
+      primaryElements: ['kind', 'object'],
+      secondaryElements: ['connection', 'host', 'schema'],
+    });
+
+    vi.resetModules();
+    const reloaded = await importStore();
+    const appearance = reloaded.useStore.getState().appearance;
+
+    expect(appearance.tabDisplay).toEqual({
+      layout: 'double',
+      primaryElements: ['kind', 'object'],
+      secondaryElements: ['connection', 'host', 'schema'],
+    });
+  });
+
+  it('persists independent single-line and double-line tab display snapshots', async () => {
+    const { useStore } = await importStore();
+
+    useStore.getState().setAppearance({
+      tabDisplay: {
+        layout: 'double',
+        primaryElements: ['kind', 'object'],
+        secondaryElements: ['connection', 'database'],
+        single: {
+          primaryElements: ['object', 'host'],
+          secondaryElements: [],
+        },
+        double: {
+          primaryElements: ['kind', 'object'],
+          secondaryElements: ['connection', 'database'],
+        },
+      },
+    });
+
+    const persisted = JSON.parse(storage.getItem('lite-db-storage') || '{}');
+    expect(persisted.state.appearance.tabDisplay).toEqual({
+      layout: 'double',
+      primaryElements: ['kind', 'object'],
+      secondaryElements: ['connection', 'database'],
+      single: {
+        primaryElements: ['object', 'host'],
+        secondaryElements: [],
+      },
+      double: {
+        primaryElements: ['kind', 'object'],
+        secondaryElements: ['connection', 'database'],
+      },
+    });
+
+    vi.resetModules();
+    const reloaded = await importStore();
+    const appearance = reloaded.useStore.getState().appearance;
+
+    expect(appearance.tabDisplay.single).toEqual({
+      primaryElements: ['object', 'host'],
+      secondaryElements: [],
+    });
+    expect(appearance.tabDisplay.double).toEqual({
+      primaryElements: ['kind', 'object'],
+      secondaryElements: ['connection', 'database'],
+    });
+  });
+
   it('does not clear persisted legacy connections during hydration migration', async () => {
     storage.setItem('lite-db-storage', JSON.stringify({
       state: {
@@ -330,6 +439,30 @@ describe('store appearance persistence', () => {
     expect(config?.port).toBe(9030);
   });
 
+  it('preserves Redis database indexes above the default 16 databases', async () => {
+    const { useStore } = await importStore();
+
+    useStore.getState().replaceConnections([
+      {
+        id: 'redis-32',
+        name: 'Redis 32 DBs',
+        includeRedisDatabases: [0, 15, 16, 31, -1, 31],
+        config: {
+          id: 'redis-32',
+          type: 'redis',
+          host: 'redis.local',
+          port: 6379,
+          user: '',
+          redisDB: 31,
+        },
+      },
+    ]);
+
+    const saved = useStore.getState().connections[0];
+    expect(saved?.config.redisDB).toBe(31);
+    expect(saved?.includeRedisDatabases).toEqual([0, 15, 16, 31]);
+  });
+
   it('keeps InterSystems IRIS saved connections as independent datasource type', async () => {
     const { useStore } = await importStore();
 
@@ -729,8 +862,6 @@ describe('store appearance persistence', () => {
       id: 'ext-1',
       name: 'scripts',
       path: 'D:/sql/scripts',
-      connectionId: 'conn-1',
-      dbName: 'demo',
       createdAt: 1,
     });
 
@@ -740,8 +871,6 @@ describe('store appearance persistence', () => {
         id: 'ext-1',
         name: 'scripts',
         path: 'D:/sql/scripts',
-        connectionId: 'conn-1',
-        dbName: 'demo',
         createdAt: 1,
       },
     ]);
@@ -750,6 +879,14 @@ describe('store appearance persistence', () => {
       state: {
         externalSQLDirectories: [
           persisted.state.externalSQLDirectories[0],
+          {
+            id: 'legacy-ext-1',
+            name: 'legacy duplicate',
+            path: 'D:\\sql\\scripts',
+            connectionId: 'conn-1',
+            dbName: 'demo',
+            createdAt: 2,
+          },
           { path: '', name: 'broken' },
         ],
       },
@@ -763,8 +900,6 @@ describe('store appearance persistence', () => {
         id: 'ext-1',
         name: 'scripts',
         path: 'D:/sql/scripts',
-        connectionId: 'conn-1',
-        dbName: 'demo',
         createdAt: 1,
       },
     ]);
@@ -856,6 +991,10 @@ describe('store appearance persistence', () => {
       query: 'select * from orders where status = "paid";',
       connectionId: 'conn-2',
       dbName: 'reporting',
+      formatRestoreSnapshot: {
+        query: 'select * from orders where status="paid";',
+        createdAt: 123,
+      },
     });
 
     const persisted = JSON.parse(storage.getItem('lite-db-storage') || '{}');
@@ -867,6 +1006,10 @@ describe('store appearance persistence', () => {
         connectionId: 'conn-2',
         dbName: 'reporting',
         query: 'select * from orders where status = "paid";',
+        formatRestoreSnapshot: {
+          query: 'select * from orders where status="paid";',
+          createdAt: 123,
+        },
       }),
     ]);
     expect(persisted.state.activeTabId).toBe('query-tab-1');
@@ -880,9 +1023,19 @@ describe('store appearance persistence', () => {
         connectionId: 'conn-2',
         dbName: 'reporting',
         query: 'select * from orders where status = "paid";',
+        formatRestoreSnapshot: {
+          query: 'select * from orders where status="paid";',
+          createdAt: 123,
+        },
       }),
     ]);
     expect(reloaded.useStore.getState().activeTabId).toBe('query-tab-1');
+
+    reloaded.useStore.getState().updateQueryTabDraft('query-tab-1', {
+      formatRestoreSnapshot: undefined,
+    });
+
+    expect(reloaded.useStore.getState().tabs[0].formatRestoreSnapshot).toBeUndefined();
   });
 
   it('updates activeContext when switching between tabs with different host or database', async () => {
@@ -1063,6 +1216,19 @@ describe('store appearance persistence', () => {
     });
   });
 
+  it('persists startup fullscreen immediately so next launch does not miss maximize preference', async () => {
+    const { useStore } = await importStore();
+
+    useStore.getState().setStartupFullscreen(true);
+
+    const persisted = JSON.parse(storage.getItem('lite-db-storage') || '{}');
+    expect(persisted.state.startupFullscreen).toBe(true);
+
+    vi.resetModules();
+    const reloaded = await importStore();
+    expect(reloaded.useStore.getState().startupFullscreen).toBe(true);
+  });
+
   it('falls back to Enter when persisted AI chat send shortcut is invalid', async () => {
     storage.setItem('lite-db-storage', JSON.stringify({
       state: {
@@ -1159,4 +1325,41 @@ describe('store appearance persistence', () => {
       windows: { combo: 'Enter', enabled: true },
     });
   });
+
+  it('updates an existing custom SQL snippet by id and persists editable syntax help', async () => {
+    const { useStore } = await importStore();
+    const original = {
+      id: 'custom-merge',
+      prefix: 'mrg',
+      name: 'MERGE INTO',
+      description: 'Oracle merge 模板',
+      syntaxHelp: '旧说明',
+      body: 'MERGE INTO t USING s ON (t.id = s.id)$0',
+      isBuiltin: false,
+      createdAt: 1710000000000,
+    };
+
+    useStore.getState().saveSqlSnippet(original);
+    useStore.getState().saveSqlSnippet({
+      ...original,
+      name: 'MERGE INTO 更新',
+      syntaxHelp: '新说明：目标表、数据源、关联字段均可修改',
+      body: 'MERGE INTO ${1:目标表} t USING ${2:源表} s ON (${3:关联条件})$0',
+    });
+
+    const snippets = useStore.getState().sqlSnippets.filter((s) => s.id === original.id);
+    expect(snippets).toHaveLength(1);
+    expect(snippets[0]).toMatchObject({
+      prefix: 'mrg',
+      name: 'MERGE INTO 更新',
+      syntaxHelp: '新说明：目标表、数据源、关联字段均可修改',
+      body: 'MERGE INTO ${1:目标表} t USING ${2:源表} s ON (${3:关联条件})$0',
+      isBuiltin: false,
+    });
+
+    const persisted = JSON.parse(storage.getItem('lite-db-storage') || '{}');
+    const persistedSnippets = persisted.state.sqlSnippets.filter((s: { id: string }) => s.id === original.id);
+    expect(persistedSnippets).toHaveLength(1);
+    expect(persistedSnippets[0].syntaxHelp).toBe('新说明：目标表、数据源、关联字段均可修改');
+  });
 });
diff --git a/frontend/src/store.ts b/frontend/src/store.ts
index ec4f4b0..686e5bf 100644
--- a/frontend/src/store.ts
+++ b/frontend/src/store.ts
@@ -54,6 +54,18 @@ import {
   t as translate,
   type LanguagePreference,
 } from "./i18n";
+import {
+  DEFAULT_TAB_DISPLAY_SETTINGS,
+  sanitizeTabDisplaySettings,
+  type TabDisplaySettings,
+} from "./utils/tabDisplay";
+import {
+  captureLegacySavedQueriesSnapshot,
+  deleteSavedQueryFromBackend,
+  sanitizeSavedQueries,
+  saveSavedQueryToBackend,
+  type SavedQueryBackend,
+} from "./utils/savedQueryPersistence";
 
 export interface AppearanceSettings extends DataGridDisplaySettings {
   uiVersion: "legacy" | "v2";
@@ -61,8 +73,12 @@ export interface AppearanceSettings extends DataGridDisplaySettings {
   opacity: number;
   blur: number;
   useNativeMacWindowControls: boolean;
+  v2SidebarSearchMode: "command" | "filter";
+  v2CommandSearchPersistentFilterEnabled: boolean;
+  v2SidebarPersistedFilter: string;
   customUIFontFamily: string | null;
   customMonoFontFamily: string | null;
+  tabDisplay: TabDisplaySettings;
 }
 
 export const DEFAULT_APPEARANCE: AppearanceSettings = {
@@ -71,8 +87,12 @@ export const DEFAULT_APPEARANCE: AppearanceSettings = {
   opacity: 1.0,
   blur: 0,
   useNativeMacWindowControls: false,
+  v2SidebarSearchMode: "command",
+  v2CommandSearchPersistentFilterEnabled: false,
+  v2SidebarPersistedFilter: "",
   customUIFontFamily: null,
   customMonoFontFamily: null,
+  tabDisplay: DEFAULT_TAB_DISPLAY_SETTINGS,
   ...DEFAULT_DATA_GRID_DISPLAY_SETTINGS,
 };
 const DEFAULT_UI_SCALE = 1.0;
@@ -84,6 +104,20 @@ const MAX_FONT_SIZE = 20;
 const DEFAULT_STARTUP_FULLSCREEN = false;
 const LEGACY_DEFAULT_OPACITY = 0.95;
 const OPACITY_EPSILON = 1e-6;
+const MAX_SIDEBAR_PERSISTED_FILTER_LENGTH = 120;
+
+const sanitizeV2SidebarSearchMode = (
+  value: unknown,
+): AppearanceSettings["v2SidebarSearchMode"] => {
+  return value === "filter" ? "filter" : DEFAULT_APPEARANCE.v2SidebarSearchMode;
+};
+
+const sanitizeV2SidebarPersistedFilter = (value: unknown): string => {
+  if (typeof value !== "string") {
+    return DEFAULT_APPEARANCE.v2SidebarPersistedFilter;
+  }
+  return value.trim().slice(0, MAX_SIDEBAR_PERSISTED_FILTER_LENGTH);
+};
 const MAX_URI_LENGTH = 4096;
 const MAX_HOST_ENTRY_LENGTH = 512;
 const MAX_HOST_ENTRIES = 64;
@@ -91,7 +125,7 @@ const DEFAULT_TIMEOUT_SECONDS = 30;
 const MAX_TIMEOUT_SECONDS = 3600;
 const DEFAULT_DIAGNOSTIC_TIMEOUT_SECONDS = 15;
 const MAX_DIAGNOSTIC_TIMEOUT_SECONDS = 300;
-const PERSIST_VERSION = 10;
+const PERSIST_VERSION = 11;
 const PERSIST_STORAGE_KEY = "lite-db-storage";
 const PERSIST_WRITE_DEBOUNCE_MS = 160;
 const MAX_PERSISTED_QUERY_TABS = 20;
@@ -103,6 +137,7 @@ const MAX_PERSISTED_SQL_LOG_MESSAGE_LENGTH = 2 * 1024;
 const DEFAULT_CONNECTION_TYPE = "mysql";
 const DEFAULT_JVM_PORT = 9010;
 const DEFAULT_LANGUAGE_PREFERENCE: LanguagePreference = "system";
+const MAX_REDIS_DATABASE_INDEX = Number.MAX_SAFE_INTEGER;
 const DEFAULT_GLOBAL_PROXY: GlobalProxyConfig = {
   enabled: false,
   type: "socks5",
@@ -118,6 +153,13 @@ const isFrontendTestRuntime = (): boolean => {
   return env.MODE === "test" || env.VITEST === true || env.VITEST === "true";
 };
 
+const resolveSavedQueryBackend = (): SavedQueryBackend | undefined => {
+  if (typeof window === "undefined") {
+    return undefined;
+  }
+  return (window as unknown as { go?: { app?: { App?: SavedQueryBackend } } }).go?.app?.App;
+};
+
 const createDebouncedPersistStorage = <S>(
   getStorage: () => StateStorage,
   debounceMs = PERSIST_WRITE_DEBOUNCE_MS,
@@ -206,6 +248,36 @@ const createDebouncedPersistStorage = <S>(
   };
 };
 
+const writePersistedStatePatch = (
+  patch: Record<string, unknown>,
+): void => {
+  if (typeof localStorage === "undefined") {
+    return;
+  }
+  try {
+    const payload = localStorage.getItem(PERSIST_STORAGE_KEY);
+    const raw =
+      payload && payload.trim() !== ""
+        ? (JSON.parse(payload) as Record<string, unknown>)
+        : {};
+    const state = unwrapPersistedAppState(raw);
+    localStorage.setItem(
+      PERSIST_STORAGE_KEY,
+      JSON.stringify({
+        ...raw,
+        state: {
+          ...state,
+          ...patch,
+        },
+        version:
+          typeof raw.version === "number" ? raw.version : PERSIST_VERSION,
+      }),
+    );
+  } catch {
+    // ignore
+  }
+};
+
 const resolveOceanBaseProtocol = (
   raw: Record<string, unknown>,
   normalizedConnectionParams: string,
@@ -229,6 +301,7 @@ const resolveOceanBaseProtocol = (
 };
 const SUPPORTED_CONNECTION_TYPES = new Set([
   "mysql",
+  "goldendb",
   "mariadb",
   "oceanbase",
   "doris",
@@ -239,15 +312,19 @@ const SUPPORTED_CONNECTION_TYPES = new Set([
   "postgres",
   "redis",
   "tdengine",
+  "iotdb",
+  "kafka",
   "oracle",
   "dameng",
   "kingbase",
   "sqlserver",
   "iris",
   "mongodb",
+  "elasticsearch",
   "highgo",
   "vastbase",
   "opengauss",
+  "gaussdb",
   "jvm",
   "sqlite",
   "duckdb",
@@ -255,6 +332,7 @@ const SUPPORTED_CONNECTION_TYPES = new Set([
 ]);
 const SSL_SUPPORTED_CONNECTION_TYPES = new Set([
   "mysql",
+  "goldendb",
   "mariadb",
   "oceanbase",
   "diros",
@@ -269,9 +347,12 @@ const SSL_SUPPORTED_CONNECTION_TYPES = new Set([
   "highgo",
   "vastbase",
   "opengauss",
+  "gaussdb",
   "mongodb",
   "redis",
+  "elasticsearch",
   "tdengine",
+  "kafka",
 ]);
 
 const getDefaultPortByType = (type: string): number => {
@@ -281,6 +362,8 @@ const getDefaultPortByType = (type: string): number => {
     case "mysql":
     case "mariadb":
       return 3306;
+    case "goldendb":
+      return 1523;
     case "oceanbase":
       return 2881;
     case "doris":
@@ -296,11 +379,16 @@ const getDefaultPortByType = (type: string): number => {
     case "postgres":
     case "vastbase":
     case "opengauss":
+    case "gaussdb":
       return 5432;
     case "redis":
       return 6379;
     case "tdengine":
       return 6041;
+    case "iotdb":
+      return 6667;
+    case "kafka":
+      return 9092;
     case "oracle":
       return 1521;
     case "dameng":
@@ -313,6 +401,8 @@ const getDefaultPortByType = (type: string): number => {
       return 1972;
     case "mongodb":
       return 27017;
+    case "elasticsearch":
+      return 9200;
     case "highgo":
       return 5866;
     default:
@@ -462,6 +552,15 @@ const normalizeConnectionType = (value: unknown): string => {
   ) {
     return "opengauss";
   }
+  if (type === "gaussdb" || type === "gauss_db" || type === "gauss-db") {
+    return "gaussdb";
+  }
+  if (type === "goldendb" || type === "greatdb" || type === "gdb") {
+    return "goldendb";
+  }
+  if (type === "kafka" || type === "apache-kafka" || type === "apache_kafka") {
+    return "kafka";
+  }
   if (
     type === "inter-systems" ||
     type === "inter-systems-iris" ||
@@ -703,6 +802,8 @@ const sanitizeConnectionConfig = (value: unknown): ConnectionConfig => {
         ? "replica"
         : raw.topology === "cluster"
           ? "cluster"
+          : raw.topology === "sentinel"
+            ? "sentinel"
           : "single",
     mysqlReplicaUser: toTrimmedString(raw.mysqlReplicaUser),
     mysqlReplicaPassword: savePassword
@@ -726,7 +827,17 @@ const sanitizeConnectionConfig = (value: unknown): ConnectionConfig => {
   };
 
   if (type === "redis") {
-    safeConfig.redisDB = normalizeIntegerInRange(raw.redisDB, 0, 0, 15);
+    safeConfig.redisDB = normalizeIntegerInRange(
+      raw.redisDB,
+      0,
+      0,
+      MAX_REDIS_DATABASE_INDEX,
+    );
+    safeConfig.redisSentinelMaster = toTrimmedString(raw.redisSentinelMaster);
+    safeConfig.redisSentinelUser = toTrimmedString(raw.redisSentinelUser);
+    safeConfig.redisSentinelPassword = savePassword
+      ? toTrimmedString(raw.redisSentinelPassword)
+      : "";
   }
 
   if (type === "clickhouse") {
@@ -797,7 +908,7 @@ const sanitizeSavedConnection = (
   const includeRedisDatabases = sanitizeNumberArray(
     raw.includeRedisDatabases,
     0,
-    15,
+    MAX_REDIS_DATABASE_INDEX,
   );
 
   return {
@@ -811,6 +922,7 @@ const sanitizeSavedConnection = (
     hasHttpTunnelPassword: raw.hasHttpTunnelPassword === true,
     hasMySQLReplicaPassword: raw.hasMySQLReplicaPassword === true,
     hasMongoReplicaPassword: raw.hasMongoReplicaPassword === true,
+    hasRedisSentinelPassword: raw.hasRedisSentinelPassword === true,
     hasOpaqueURI: raw.hasOpaqueURI === true,
     hasOpaqueDSN: raw.hasOpaqueDSN === true,
     includeDatabases:
@@ -1058,6 +1170,27 @@ export interface QueryOptions {
   maxRows: number;
   showColumnComment: boolean;
   showColumnType: boolean;
+  showQueryResultsPanel: boolean;
+}
+
+export interface DataEditTransactionOptions {
+  commitMode: "manual" | "auto";
+  autoCommitDelayMs: number;
+}
+
+export interface SqlEditorTransactionOptions {
+  commitMode: "manual" | "auto";
+  autoCommitDelayMs: number;
+}
+
+export interface SqlEditorPendingTransactionState {
+  id: string;
+  tabId: string;
+  commitMode: "manual" | "auto";
+  autoCommitDelayMs: number;
+  createdAt: number;
+  autoCommitDueAt?: number | null;
+  statementCount?: number;
 }
 
 interface AppState {
@@ -1078,6 +1211,9 @@ interface AppState {
   globalProxy: GlobalProxyConfig;
   sqlFormatOptions: { keywordCase: "upper" | "lower" };
   queryOptions: QueryOptions;
+  dataEditTransactionOptions: DataEditTransactionOptions;
+  sqlEditorTransactionOptions: SqlEditorTransactionOptions;
+  sqlEditorPendingTransactions: Record<string, SqlEditorPendingTransactionState>;
   shortcutOptions: ShortcutOptions;
   sqlSnippets: SqlSnippet[];
   sqlLogs: SqlLog[];
@@ -1149,7 +1285,17 @@ interface AppState {
   addTab: (tab: TabData) => void;
   updateQueryTabDraft: (
     id: string,
-    draft: Partial<Pick<TabData, "query" | "connectionId" | "dbName" | "title">>,
+    draft: Partial<
+      Pick<
+        TabData,
+        | "query"
+        | "connectionId"
+        | "dbName"
+        | "title"
+        | "resultPanelVisible"
+        | "formatRestoreSnapshot"
+      >
+    >,
   ) => void;
   closeTab: (id: string) => void;
   closeOtherTabs: (id: string) => void;
@@ -1164,8 +1310,9 @@ interface AppState {
     context: { connectionId: string; dbName: string } | null,
   ) => void;
 
-  saveQuery: (query: SavedQuery) => void;
-  deleteQuery: (id: string) => void;
+  replaceSavedQueries: (queries: SavedQuery[]) => void;
+  saveQuery: (query: SavedQuery) => Promise<SavedQuery>;
+  deleteQuery: (id: string) => Promise<void>;
   saveExternalSQLDirectory: (directory: ExternalSQLDirectory) => void;
   deleteExternalSQLDirectory: (id: string) => void;
 
@@ -1179,6 +1326,16 @@ interface AppState {
   replaceGlobalProxy: (proxy: Partial<GlobalProxyConfig>) => void;
   setSqlFormatOptions: (options: { keywordCase: "upper" | "lower" }) => void;
   setQueryOptions: (options: Partial<QueryOptions>) => void;
+  setDataEditTransactionOptions: (
+    options: Partial<DataEditTransactionOptions>,
+  ) => void;
+  setSqlEditorTransactionOptions: (
+    options: Partial<SqlEditorTransactionOptions>,
+  ) => void;
+  setSqlEditorPendingTransaction: (
+    tabId: string,
+    transaction: Omit<SqlEditorPendingTransactionState, "tabId"> | null,
+  ) => void;
   updateShortcut: (
     action: ShortcutAction,
     binding: Partial<ShortcutPlatformBinding>,
@@ -1260,33 +1417,6 @@ interface AppState {
   setAIActiveSessionId: (sessionId: string | null) => void;
 }
 
-const sanitizeSavedQueries = (value: unknown): SavedQuery[] => {
-  if (!Array.isArray(value)) return [];
-  const result: SavedQuery[] = [];
-  value.forEach((entry, index) => {
-    if (!entry || typeof entry !== "object") return;
-    const raw = entry as Record<string, unknown>;
-    const id =
-      toTrimmedString(raw.id, `query-${index + 1}`) || `query-${index + 1}`;
-    const sql = toTrimmedString(raw.sql);
-    const connectionId = toTrimmedString(raw.connectionId);
-    const dbName = toTrimmedString(raw.dbName);
-    if (!sql || !connectionId || !dbName) return;
-    result.push({
-      id,
-      name:
-        toTrimmedString(raw.name, `查询-${index + 1}`) || `查询-${index + 1}`,
-      sql,
-      connectionId,
-      dbName,
-      createdAt: Number.isFinite(Number(raw.createdAt))
-        ? Number(raw.createdAt)
-        : Date.now(),
-    });
-  });
-  return result;
-};
-
 const sanitizeSqlSnippets = (value: unknown): SqlSnippet[] => {
   if (!Array.isArray(value)) return DEFAULT_SQL_SNIPPETS;
   const result: SqlSnippet[] = [];
@@ -1308,6 +1438,7 @@ const sanitizeSqlSnippets = (value: unknown): SqlSnippet[] => {
       prefix,
       name: toTrimmedString(raw.name, `片段-${index + 1}`) || `片段-${index + 1}`,
       description: toTrimmedString(raw.description) || undefined,
+      syntaxHelp: toTrimmedString(raw.syntaxHelp) || undefined,
       body,
       isBuiltin: raw.isBuiltin === true,
       createdAt: Number.isFinite(Number(raw.createdAt))
@@ -1330,13 +1461,17 @@ const sanitizeExternalSQLDirectories = (
 ): ExternalSQLDirectory[] => {
   if (!Array.isArray(value)) return [];
   const result: ExternalSQLDirectory[] = [];
+  const seenPaths = new Set<string>();
   value.forEach((entry) => {
     if (!entry || typeof entry !== "object") return;
     const raw = entry as Record<string, unknown>;
     const path = toTrimmedString(raw.path);
+    if (!path) return;
+    const normalizedPath = path.replace(/\\/g, "/").toLowerCase();
+    if (seenPaths.has(normalizedPath)) return;
+    seenPaths.add(normalizedPath);
     const connectionId = toTrimmedString(raw.connectionId);
     const dbName = toTrimmedString(raw.dbName);
-    if (!path || !connectionId || !dbName) return;
     result.push({
       id:
         toTrimmedString(
@@ -1345,8 +1480,8 @@ const sanitizeExternalSQLDirectories = (
         ) || buildExternalSQLDirectoryId(connectionId, dbName, path),
       name: resolveExternalSQLDirectoryName(raw.name, path),
       path,
-      connectionId,
-      dbName,
+      ...(connectionId ? { connectionId } : {}),
+      ...(dbName ? { dbName } : {}),
       createdAt: Number.isFinite(Number(raw.createdAt))
         ? Number(raw.createdAt)
         : Date.now(),
@@ -1368,6 +1503,15 @@ const sanitizeQueryTabs = (value: unknown): TabData[] => {
     const query = typeof raw.query === "string" ? raw.query.slice(0, MAX_PERSISTED_QUERY_LENGTH) : "";
     const filePath = toTrimmedString(raw.filePath);
     const savedQueryId = toTrimmedString(raw.savedQueryId);
+    const rawFormatRestoreSnapshot =
+      raw.formatRestoreSnapshot && typeof raw.formatRestoreSnapshot === "object"
+        ? (raw.formatRestoreSnapshot as Record<string, unknown>)
+        : null;
+    const formatRestoreQuery =
+      typeof rawFormatRestoreSnapshot?.query === "string"
+        ? rawFormatRestoreSnapshot.query.slice(0, MAX_PERSISTED_QUERY_LENGTH)
+        : "";
+    const formatRestoreCreatedAt = Number(rawFormatRestoreSnapshot?.createdAt);
     if (!query.trim() && !filePath && !savedQueryId) return;
 
     let id = toTrimmedString(raw.id, `query-${index + 1}`) || `query-${index + 1}`;
@@ -1383,9 +1527,21 @@ const sanitizeQueryTabs = (value: unknown): TabData[] => {
       connectionId: toTrimmedString(raw.connectionId),
       dbName: toTrimmedString(raw.dbName),
       query,
+      resultPanelVisible:
+        typeof raw.resultPanelVisible === "boolean"
+          ? raw.resultPanelVisible
+          : undefined,
       filePath: filePath || undefined,
       savedQueryId: savedQueryId || undefined,
       readOnly: raw.readOnly === true,
+      formatRestoreSnapshot: formatRestoreQuery
+        ? {
+            query: formatRestoreQuery,
+            createdAt: Number.isFinite(formatRestoreCreatedAt)
+              ? formatRestoreCreatedAt
+              : Date.now(),
+          }
+        : undefined,
     });
   });
 
@@ -1502,6 +1658,7 @@ const hasLegacyConnectionSecrets = (
       toTrimmedString(httpTunnel.password) !== "" ||
       toTrimmedString(config.mysqlReplicaPassword) !== "" ||
       toTrimmedString(config.mongoReplicaPassword) !== "" ||
+      toTrimmedString(config.redisSentinelPassword) !== "" ||
       toTrimmedString(config.uri) !== "" ||
       toTrimmedString(config.dsn) !== ""
     );
@@ -1547,13 +1704,51 @@ const sanitizeQueryOptions = (value: unknown): QueryOptions => {
     typeof raw.showColumnComment === "boolean" ? raw.showColumnComment : true;
   const showColumnType =
     typeof raw.showColumnType === "boolean" ? raw.showColumnType : true;
+  const showQueryResultsPanel =
+    typeof raw.showQueryResultsPanel === "boolean" ? raw.showQueryResultsPanel : false;
   if (!Number.isFinite(maxRows) || maxRows <= 0) {
-    return { maxRows: 5000, showColumnComment, showColumnType };
+    return { maxRows: 5000, showColumnComment, showColumnType, showQueryResultsPanel };
   }
   return {
     maxRows: Math.min(50000, Math.trunc(maxRows)),
     showColumnComment,
     showColumnType,
+    showQueryResultsPanel,
+  };
+};
+
+const DATA_EDIT_AUTO_COMMIT_DELAY_OPTIONS = new Set([3000, 5000, 10000, 30000]);
+const SQL_EDITOR_AUTO_COMMIT_DELAY_OPTIONS = new Set([0, 3000, 5000, 10000, 30000]);
+
+const sanitizeDataEditTransactionOptions = (
+  value: unknown,
+): DataEditTransactionOptions => {
+  const raw =
+    value && typeof value === "object"
+      ? (value as Record<string, unknown>)
+      : {};
+  const autoCommitDelayMs = Number(raw.autoCommitDelayMs);
+  return {
+    commitMode: raw.commitMode === "auto" ? "auto" : "manual",
+    autoCommitDelayMs: DATA_EDIT_AUTO_COMMIT_DELAY_OPTIONS.has(autoCommitDelayMs)
+      ? autoCommitDelayMs
+      : 5000,
+  };
+};
+
+const sanitizeSqlEditorTransactionOptions = (
+  value: unknown,
+): SqlEditorTransactionOptions => {
+  const raw =
+    value && typeof value === "object"
+      ? (value as Record<string, unknown>)
+      : {};
+  const autoCommitDelayMs = Number(raw.autoCommitDelayMs);
+  return {
+    commitMode: raw.commitMode === "auto" ? "auto" : "manual",
+    autoCommitDelayMs: SQL_EDITOR_AUTO_COMMIT_DELAY_OPTIONS.has(autoCommitDelayMs)
+      ? autoCommitDelayMs
+      : 0,
   };
 };
 
@@ -1657,8 +1852,19 @@ const sanitizeAppearance = (
       typeof appearance.useNativeMacWindowControls === "boolean"
         ? appearance.useNativeMacWindowControls
         : DEFAULT_APPEARANCE.useNativeMacWindowControls,
+    v2SidebarSearchMode: sanitizeV2SidebarSearchMode(
+      appearance.v2SidebarSearchMode,
+    ),
+    v2CommandSearchPersistentFilterEnabled:
+      typeof appearance.v2CommandSearchPersistentFilterEnabled === "boolean"
+        ? appearance.v2CommandSearchPersistentFilterEnabled
+        : DEFAULT_APPEARANCE.v2CommandSearchPersistentFilterEnabled,
+    v2SidebarPersistedFilter: sanitizeV2SidebarPersistedFilter(
+      appearance.v2SidebarPersistedFilter,
+    ),
     customUIFontFamily: sanitizeFontFamilyInput(appearance.customUIFontFamily),
     customMonoFontFamily: sanitizeFontFamilyInput(appearance.customMonoFontFamily),
+    tabDisplay: sanitizeTabDisplaySettings(appearance.tabDisplay),
     showDataTableVerticalBorders:
       dataGridDisplaySettings.showDataTableVerticalBorders,
     dataTableDensity: dataGridDisplaySettings.dataTableDensity,
@@ -1931,7 +2137,17 @@ export const useStore = create<AppState>()(
         maxRows: 5000,
         showColumnComment: true,
         showColumnType: true,
+        showQueryResultsPanel: false,
       },
+      dataEditTransactionOptions: {
+        commitMode: "manual",
+        autoCommitDelayMs: 5000,
+      },
+      sqlEditorTransactionOptions: {
+        commitMode: "manual",
+        autoCommitDelayMs: 0,
+      },
+      sqlEditorPendingTransactions: {},
       shortcutOptions: cloneShortcutOptions(DEFAULT_SHORTCUT_OPTIONS),
       sqlSnippets: DEFAULT_SQL_SNIPPETS,
       sqlLogs: [],
@@ -2259,41 +2475,48 @@ export const useStore = create<AppState>()(
 
       addTab: (tab) =>
         set((state) => {
-          const index = state.tabs.findIndex((t) => t.id === tab.id);
+          const incomingTab =
+            tab.type === "query" && tab.resultPanelVisible === undefined
+              ? {
+                  ...tab,
+                  resultPanelVisible: state.queryOptions.showQueryResultsPanel,
+                }
+              : tab;
+          const index = state.tabs.findIndex((t) => t.id === incomingTab.id);
           if (index !== -1) {
             // Update existing tab with new data (e.g. switch initialTab)
             const newTabs = [...state.tabs];
-            newTabs[index] = { ...newTabs[index], ...tab };
+            newTabs[index] = { ...newTabs[index], ...incomingTab };
             return {
               tabs: newTabs,
-              activeTabId: tab.id,
+              activeTabId: incomingTab.id,
               activeContext: resolveActiveContextForTabId(
                 newTabs,
-                tab.id,
+                incomingTab.id,
                 state.activeContext,
               ),
             };
           }
           // 语义去重：对 table/design 类型按 connectionId+dbName+tableName 匹配已有 Tab
           if (
-            (tab.type === "table" || tab.type === "design") &&
-            tab.tableName &&
-            tab.connectionId &&
-            tab.dbName
+            (incomingTab.type === "table" || incomingTab.type === "design") &&
+            incomingTab.tableName &&
+            incomingTab.connectionId &&
+            incomingTab.dbName
           ) {
             const semanticIndex = state.tabs.findIndex(
               (t) =>
-                t.type === tab.type &&
-                t.connectionId === tab.connectionId &&
-                t.dbName === tab.dbName &&
-                t.tableName === tab.tableName,
+                t.type === incomingTab.type &&
+                t.connectionId === incomingTab.connectionId &&
+                t.dbName === incomingTab.dbName &&
+                t.tableName === incomingTab.tableName,
             );
             if (semanticIndex !== -1) {
               const existingTab = state.tabs[semanticIndex];
               const newTabs = [...state.tabs];
               newTabs[semanticIndex] = {
                 ...existingTab,
-                ...tab,
+                ...incomingTab,
                 id: existingTab.id,
               };
               return {
@@ -2308,19 +2531,19 @@ export const useStore = create<AppState>()(
             }
           }
           // 语义去重：对 query 类型按 savedQueryId 匹配已有 Tab（避免保存后重复打开）
-          if (tab.type === "query" && tab.savedQueryId) {
+          if (incomingTab.type === "query" && incomingTab.savedQueryId) {
             const savedQueryIndex = state.tabs.findIndex(
               (t) =>
                 t.type === "query" &&
-                (t.savedQueryId === tab.savedQueryId ||
-                  t.id === tab.savedQueryId),
+                (t.savedQueryId === incomingTab.savedQueryId ||
+                  t.id === incomingTab.savedQueryId),
             );
             if (savedQueryIndex !== -1) {
               const existingTab = state.tabs[savedQueryIndex];
               const newTabs = [...state.tabs];
               newTabs[savedQueryIndex] = {
                 ...existingTab,
-                ...tab,
+                ...incomingTab,
                 id: existingTab.id,
               };
               return {
@@ -2334,13 +2557,13 @@ export const useStore = create<AppState>()(
               };
             }
           }
-          const nextTabs = [...state.tabs, tab];
+          const nextTabs = [...state.tabs, incomingTab];
           return {
             tabs: nextTabs,
-            activeTabId: tab.id,
+            activeTabId: incomingTab.id,
             activeContext: resolveActiveContextForTabId(
               nextTabs,
-              tab.id,
+              incomingTab.id,
               state.activeContext,
             ),
           };
@@ -2384,6 +2607,37 @@ export const useStore = create<AppState>()(
                 changed = true;
               }
             }
+            if (draft.resultPanelVisible !== undefined) {
+              const nextResultPanelVisible = draft.resultPanelVisible === true;
+              if (nextTab.resultPanelVisible !== nextResultPanelVisible) {
+                nextTab.resultPanelVisible = nextResultPanelVisible;
+                changed = true;
+              }
+            }
+            if (Object.prototype.hasOwnProperty.call(draft, "formatRestoreSnapshot")) {
+              const rawSnapshot = draft.formatRestoreSnapshot;
+              const nextSnapshot =
+                rawSnapshot && typeof rawSnapshot.query === "string"
+                  ? {
+                      query: rawSnapshot.query.slice(0, MAX_PERSISTED_QUERY_LENGTH),
+                      createdAt: Number.isFinite(Number(rawSnapshot.createdAt))
+                        ? Number(rawSnapshot.createdAt)
+                        : Date.now(),
+                    }
+                  : undefined;
+              const currentSnapshot = nextTab.formatRestoreSnapshot;
+              if (
+                currentSnapshot?.query !== nextSnapshot?.query ||
+                currentSnapshot?.createdAt !== nextSnapshot?.createdAt
+              ) {
+                if (nextSnapshot?.query) {
+                  nextTab.formatRestoreSnapshot = nextSnapshot;
+                } else {
+                  delete nextTab.formatRestoreSnapshot;
+                }
+                changed = true;
+              }
+            }
 
             return nextTab;
           });
@@ -2557,33 +2811,43 @@ export const useStore = create<AppState>()(
         })),
       setActiveContext: (context) => set({ activeContext: context }),
 
-      saveQuery: (query) =>
+      replaceSavedQueries: (queries) =>
+        set({ savedQueries: sanitizeSavedQueries(queries) }),
+
+      saveQuery: async (query) => {
+        const saved = await saveSavedQueryToBackend(
+          resolveSavedQueryBackend(),
+          query,
+        );
         set((state) => {
-          // If query with same ID exists, update it
-          const existing = state.savedQueries.find((q) => q.id === query.id);
+          const existing = state.savedQueries.find((q) => q.id === saved.id);
           if (existing) {
             return {
               savedQueries: state.savedQueries.map((q) =>
-                q.id === query.id ? query : q,
+                q.id === saved.id ? saved : q,
               ),
             };
           }
-          return { savedQueries: [...state.savedQueries, query] };
-        }),
+          return { savedQueries: [...state.savedQueries, saved] };
+        });
+        return saved;
+      },
 
-      deleteQuery: (id) =>
+      deleteQuery: async (id) => {
+        await deleteSavedQueryFromBackend(resolveSavedQueryBackend(), id);
         set((state) => ({
           savedQueries: state.savedQueries.filter((q) => q.id !== id),
-        })),
+        }));
+      },
 
       saveExternalSQLDirectory: (directory) =>
         set((state) => {
           const path = toTrimmedString(directory.path);
-          const connectionId = toTrimmedString(directory.connectionId);
-          const dbName = toTrimmedString(directory.dbName);
-          if (!path || !connectionId || !dbName) {
+          if (!path) {
             return state;
           }
+          const connectionId = toTrimmedString(directory.connectionId);
+          const dbName = toTrimmedString(directory.dbName);
           const nextDirectory: ExternalSQLDirectory = {
             id:
               toTrimmedString(
@@ -2592,18 +2856,17 @@ export const useStore = create<AppState>()(
               ) || buildExternalSQLDirectoryId(connectionId, dbName, path),
             name: resolveExternalSQLDirectoryName(directory.name, path),
             path,
-            connectionId,
-            dbName,
+            ...(connectionId ? { connectionId } : {}),
+            ...(dbName ? { dbName } : {}),
             createdAt: Number.isFinite(Number(directory.createdAt))
               ? Number(directory.createdAt)
               : Date.now(),
           };
+          const nextPathKey = path.replace(/\\/g, "/").toLowerCase();
           const existingIndex = state.externalSQLDirectories.findIndex(
             (item) =>
               item.id === nextDirectory.id ||
-              (item.connectionId === nextDirectory.connectionId &&
-                item.dbName === nextDirectory.dbName &&
-                item.path === nextDirectory.path),
+              item.path.replace(/\\/g, "/").toLowerCase() === nextPathKey,
           );
           if (existingIndex === -1) {
             return {
@@ -2641,7 +2904,11 @@ export const useStore = create<AppState>()(
         })),
       setUiScale: (scale) => set({ uiScale: sanitizeUiScale(scale) }),
       setFontSize: (size) => set({ fontSize: sanitizeFontSize(size) }),
-      setStartupFullscreen: (enabled) => set({ startupFullscreen: !!enabled }),
+      setStartupFullscreen: (enabled) => {
+        const nextValue = !!enabled;
+        set({ startupFullscreen: nextValue });
+        writePersistedStatePatch({ startupFullscreen: nextValue });
+      },
       setGlobalProxy: (proxy) =>
         set((state) => ({
           globalProxy: sanitizeGlobalProxy({ ...state.globalProxy, ...proxy }),
@@ -2659,6 +2926,37 @@ export const useStore = create<AppState>()(
         set((state) => ({
           queryOptions: { ...state.queryOptions, ...options },
         })),
+      setDataEditTransactionOptions: (options) =>
+        set((state) => ({
+          dataEditTransactionOptions: sanitizeDataEditTransactionOptions({
+            ...state.dataEditTransactionOptions,
+            ...options,
+          }),
+        })),
+      setSqlEditorTransactionOptions: (options) =>
+        set((state) => ({
+          sqlEditorTransactionOptions: sanitizeSqlEditorTransactionOptions({
+            ...state.sqlEditorTransactionOptions,
+            ...options,
+          }),
+        })),
+      setSqlEditorPendingTransaction: (tabId, transaction) =>
+        set((state) => {
+          const safeTabId = String(tabId || "").trim();
+          if (!safeTabId) {
+            return {};
+          }
+          const next = { ...state.sqlEditorPendingTransactions };
+          if (!transaction) {
+            delete next[safeTabId];
+            return { sqlEditorPendingTransactions: next };
+          }
+          next[safeTabId] = {
+            ...transaction,
+            tabId: safeTabId,
+          };
+          return { sqlEditorPendingTransactions: next };
+        }),
       updateShortcut: (action, binding, platform) => {
         runWithExplicitShortcutPersistence(() => {
           const targetPlatform = platform ?? getShortcutPlatform();
@@ -3030,6 +3328,7 @@ export const useStore = create<AppState>()(
         const state = unwrapPersistedAppState(
           persistedState,
         ) as Partial<AppState>;
+        captureLegacySavedQueriesSnapshot(state.savedQueries, state.connections);
         const nextState: Partial<AppState> = { ...state };
         nextState.connections = sanitizeConnections(state.connections);
         const safeTabs = sanitizeQueryTabs(state.tabs);
@@ -3049,7 +3348,7 @@ export const useStore = create<AppState>()(
           nextState.connectionTags,
           nextState.connections,
         );
-        nextState.savedQueries = sanitizeSavedQueries(state.savedQueries);
+        delete nextState.savedQueries;
         nextState.externalSQLDirectories = sanitizeExternalSQLDirectories(
           state.externalSQLDirectories,
         );
@@ -3068,6 +3367,10 @@ export const useStore = create<AppState>()(
           state.sqlFormatOptions,
         );
         nextState.queryOptions = sanitizeQueryOptions(state.queryOptions);
+        nextState.dataEditTransactionOptions =
+          sanitizeDataEditTransactionOptions(state.dataEditTransactionOptions);
+        nextState.sqlEditorTransactionOptions =
+          sanitizeSqlEditorTransactionOptions(state.sqlEditorTransactionOptions);
         nextState.shortcutOptions = sanitizeShortcutOptions(
           state.shortcutOptions,
         );
@@ -3117,6 +3420,7 @@ export const useStore = create<AppState>()(
         const state = unwrapPersistedAppState(
           persistedState,
         ) as Partial<AppState>;
+        captureLegacySavedQueriesSnapshot(state.savedQueries, state.connections);
         const safeTabs = sanitizeQueryTabs(state.tabs);
         const persistedConnections =
           state.connections === undefined
@@ -3142,7 +3446,7 @@ export const useStore = create<AppState>()(
           sidebarRootOrder: persistedSidebarRootOrder,
           tabs: safeTabs,
           activeTabId: sanitizeActiveTabId(state.activeTabId, safeTabs),
-          savedQueries: sanitizeSavedQueries(state.savedQueries),
+          savedQueries: currentState.savedQueries,
           externalSQLDirectories: sanitizeExternalSQLDirectories(
             state.externalSQLDirectories,
           ),
@@ -3173,6 +3477,12 @@ export const useStore = create<AppState>()(
 
           sqlFormatOptions: sanitizeSqlFormatOptions(state.sqlFormatOptions),
           queryOptions: sanitizeQueryOptions(state.queryOptions),
+          dataEditTransactionOptions: sanitizeDataEditTransactionOptions(
+            state.dataEditTransactionOptions,
+          ),
+          sqlEditorTransactionOptions: sanitizeSqlEditorTransactionOptions(
+            state.sqlEditorTransactionOptions,
+          ),
           shortcutOptions: sanitizeShortcutOptions(state.shortcutOptions),
           sqlLogs: sanitizeSqlLogs(state.sqlLogs),
           sqlSnippets: sanitizeSqlSnippets(state.sqlSnippets),
@@ -3190,7 +3500,6 @@ export const useStore = create<AppState>()(
           activeTabId: sanitizeActiveTabId(state.activeTabId, tabs),
           connectionTags: state.connectionTags,
           sidebarRootOrder: state.sidebarRootOrder,
-          savedQueries: state.savedQueries,
           externalSQLDirectories: state.externalSQLDirectories,
           theme: state.theme,
           languagePreference: state.languagePreference,
@@ -3204,6 +3513,8 @@ export const useStore = create<AppState>()(
               : toPersistedGlobalProxy(state.globalProxy),
           sqlFormatOptions: state.sqlFormatOptions,
           queryOptions: state.queryOptions,
+          dataEditTransactionOptions: state.dataEditTransactionOptions,
+          sqlEditorTransactionOptions: state.sqlEditorTransactionOptions,
           shortcutOptions: resolveShortcutOptionsForPersistence(state.shortcutOptions),
           sqlLogs: sanitizeSqlLogs(state.sqlLogs),
           sqlSnippets: state.sqlSnippets,
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index 38ccb05..88927f6 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -297,12 +297,15 @@ export interface ConnectionConfig {
   dsn?: string;
   connectionParams?: string;
   timeout?: number;
-  redisDB?: number; // Redis database index (0-15)
+  redisDB?: number; // Redis database index
   uri?: string; // Connection URI for copy/paste
   clickHouseProtocol?: "auto" | "http" | "native"; // ClickHouse connection protocol override
   oceanBaseProtocol?: "mysql" | "oracle"; // OceanBase tenant compatibility protocol
   hosts?: string[]; // Multi-host addresses: host:port
-  topology?: "single" | "replica" | "cluster";
+  topology?: "single" | "replica" | "cluster" | "sentinel";
+  redisSentinelMaster?: string;
+  redisSentinelUser?: string;
+  redisSentinelPassword?: string;
   mysqlReplicaUser?: string;
   mysqlReplicaPassword?: string;
   replicaSet?: string;
@@ -335,10 +338,11 @@ export interface SavedConnection {
   hasHttpTunnelPassword?: boolean;
   hasMySQLReplicaPassword?: boolean;
   hasMongoReplicaPassword?: boolean;
+  hasRedisSentinelPassword?: boolean;
   hasOpaqueURI?: boolean;
   hasOpaqueDSN?: boolean;
   includeDatabases?: string[];
-  includeRedisDatabases?: number[]; // Redis databases to show (0-15)
+  includeRedisDatabases?: number[]; // Redis databases to show
   iconType?: string; // 自定义图标类型（如 'mysql','postgres'），不填则取 config.type
   iconColor?: string; // 自定义图标颜色（十六进制），不填则取类型默认色
 }
@@ -412,6 +416,8 @@ export interface TabData {
   dbName?: string;
   tableName?: string;
   query?: string;
+  resultPanelVisible?: boolean;
+  queryMode?: "standard" | "object-edit";
   filePath?: string;
   initialTab?: string;
   readOnly?: boolean;
@@ -420,12 +426,20 @@ export interface TabData {
   resourceKind?: string;
   redisDB?: number; // Redis database index for redis tabs
   triggerName?: string; // Trigger name for trigger tabs
+  triggerTableName?: string; // Trigger target table for trigger tabs
   viewName?: string; // View name for view definition tabs
   viewKind?: "view" | "materialized";
   eventName?: string; // Event name for MySQL event definition tabs
   routineName?: string; // Routine name for function/procedure definition tabs
   routineType?: string; // 'FUNCTION' or 'PROCEDURE'
+  schemaName?: string; // Schema / owner name for schema-grouped objects
+  sidebarLocateKey?: string; // Precise sidebar tree key for locating an object node
   savedQueryId?: string; // Saved query identity for quick-save behavior
+  objectType?: 'table' | 'view' | 'materialized-view'; // Table-like object type for shared viewers
+  formatRestoreSnapshot?: {
+    query: string;
+    createdAt: number;
+  }; // Last SQL content before beautify, for cross-session restore
 }
 
 export interface JVMAIPlanContext {
@@ -456,6 +470,10 @@ export interface SavedQuery {
   connectionId: string;
   dbName: string;
   createdAt: number;
+  connectionFingerprint?: string;
+  fingerprintVersion?: string;
+  bindingStatus?: "active" | "rebound" | "orphan" | string;
+  originalConnectionId?: string;
 }
 
 export interface SqlSnippet {
@@ -463,6 +481,7 @@ export interface SqlSnippet {
   prefix: string;
   name: string;
   description?: string;
+  syntaxHelp?: string;
   body: string;
   isBuiltin: boolean;
   createdAt: number;
@@ -472,8 +491,8 @@ export interface ExternalSQLDirectory {
   id: string;
   name: string;
   path: string;
-  connectionId: string;
-  dbName: string;
+  connectionId?: string;
+  dbName?: string;
   createdAt: number;
 }
 
@@ -546,6 +565,86 @@ export interface AIProviderConfig {
   temperature: number;
 }
 
+export interface AIUserPromptSettings {
+  global: string;
+  database: string;
+  jvm: string;
+  jvmDiagnostic: string;
+}
+
+export type AIMCPTransport = "stdio";
+
+export interface AIMCPServerConfig {
+  id: string;
+  name: string;
+  transport: AIMCPTransport;
+  command: string;
+  args?: string[];
+  env?: Record<string, string>;
+  enabled: boolean;
+  timeoutSeconds: number;
+}
+
+export interface AIMCPToolDescriptor {
+  alias: string;
+  serverId: string;
+  serverName: string;
+  originalName: string;
+  title?: string;
+  description?: string;
+  inputSchema?: Record<string, any>;
+}
+
+export interface AIMCPToolCallResult {
+  alias: string;
+  serverId: string;
+  serverName: string;
+  originalName: string;
+  title?: string;
+  content: string;
+  structuredContent?: any;
+  isError: boolean;
+}
+
+export interface AIMCPClientInstallStatus {
+  client: string;
+  displayName: string;
+  installMode?: 'auto' | 'remote';
+  installed: boolean;
+  matchesCurrent: boolean;
+  clientDetected?: boolean;
+  clientCommand?: string;
+  clientPath?: string;
+  message: string;
+  configPath?: string;
+  command?: string;
+  args?: string[];
+}
+
+export interface AIMCPHTTPServerStatus {
+  running: boolean;
+  addr: string;
+  path: string;
+  url: string;
+  schemaOnly: boolean;
+  token?: string;
+  authorizationHeader?: string;
+  startedAt?: number;
+  message: string;
+}
+
+export type AISkillScope = "global" | "database" | "jvm" | "jvmDiagnostic";
+
+export interface AISkillConfig {
+  id: string;
+  name: string;
+  description?: string;
+  systemPrompt: string;
+  enabled: boolean;
+  scopes: AISkillScope[];
+  requiredTools?: string[];
+}
+
 export interface AIToolCall {
   id: string;
   type: string;
@@ -555,6 +654,20 @@ export interface AIToolCall {
   };
 }
 
+export type AIChatAttachmentKind = "image" | "markdown" | "text" | "pdf" | "word" | "excel" | "document";
+
+export interface AIChatAttachment {
+  id: string;
+  name: string;
+  mimeType: string;
+  size: number;
+  kind: AIChatAttachmentKind;
+  dataUrl?: string;
+  text?: string;
+  textTruncated?: boolean;
+  extractWarning?: string;
+}
+
 export type ChatPhase =
   | "idle"
   | "connecting"
@@ -572,6 +685,7 @@ export interface AIChatMessage {
   timestamp: number;
   loading?: boolean;
   images?: string[]; // base64 encoded images with data URI prefix
+  attachments?: AIChatAttachment[];
   tool_calls?: AIToolCall[];
   tool_call_id?: string;
   tool_name?: string; // used for UI display
diff --git a/frontend/src/utils/aiBuiltinDatabaseToolInfo.ts b/frontend/src/utils/aiBuiltinDatabaseToolInfo.ts
new file mode 100644
index 0000000..8636600
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinDatabaseToolInfo.ts
@@ -0,0 +1,319 @@
+import type { AIBuiltinToolInfo } from "./aiBuiltinToolInfo.types";
+
+export const BUILTIN_AI_DATABASE_TOOL_INFO: AIBuiltinToolInfo[] = [
+  {
+    name: "get_connections",
+    icon: "🔗",
+    desc: "获取所有可用的数据库连接",
+    detail:
+      "返回连接 ID、名称、类型 (MySQL/PostgreSQL 等) 和 Host 地址。AI 根据返回信息决定优先探索哪个连接。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "get_connections",
+        description:
+          "当需要查询、操作数据库但用户没有选择任何连接上下文时，获取当前软件中可用的所有数据库连接信息。返回的数据包含连接ID(id)和名称(name)。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "get_databases",
+    icon: "🗄️",
+    desc: "获取指定连接下的所有数据库",
+    detail: "传入 connectionId，返回该连接下的数据库/Schema 名称列表。",
+    params: "connectionId: 连接 ID",
+    tool: {
+      type: "function",
+      function: {
+        name: "get_databases",
+        description: "获取指定连接（connectionId）下的所有数据库(Database/Schema)名。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID (从 get_connections 获取)" },
+          },
+          required: ["connectionId"],
+        },
+      },
+    },
+  },
+  {
+    name: "get_tables",
+    icon: "📋",
+    desc: "获取指定数据库下的所有表名",
+    detail:
+      "传入 connectionId 和 dbName，返回表名列表。AI 用它来定位用户提到的目标表。",
+    params: "connectionId, dbName",
+    tool: {
+      type: "function",
+      function: {
+        name: "get_tables",
+        description:
+          "当已经确定了目标连接和数据库名后，如果用户询问或隐式提到了表但你不知道确切表名，调用此工具获取该数据库下的所有表名列表（只含表名，帮助你推断目标表）。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+          },
+          required: ["connectionId", "dbName"],
+        },
+      },
+    },
+  },
+  {
+    name: "get_all_columns",
+    icon: "🧱",
+    desc: "获取指定数据库下所有表的字段摘要",
+    detail:
+      "传入 connectionId 和 dbName，返回跨表字段列表（表名、字段名、类型、注释）。适合用户只知道业务字段、不知道具体在哪张表时快速定位目标表。",
+    params: "connectionId, dbName",
+    tool: {
+      type: "function",
+      function: {
+        name: "get_all_columns",
+        description:
+          "获取指定数据库下全部表的字段摘要，返回表名、字段名、类型和注释。适用于按字段反查表、跨表梳理相同字段、做数据地图探索。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+          },
+          required: ["connectionId", "dbName"],
+        },
+      },
+    },
+  },
+  {
+    name: "get_columns",
+    icon: "🔍",
+    desc: "获取指定表的字段结构",
+    detail:
+      "传入 connectionId、dbName 和 tableName，返回每个字段的名称、类型、是否可空、默认值和注释。AI 在生成 SQL 前必须调用此工具确认真实字段名。",
+    params: "connectionId, dbName, tableName",
+    tool: {
+      type: "function",
+      function: {
+        name: "get_columns",
+        description:
+          "获取指定表的字段列表（字段名、类型、是否可空、默认值、注释等）。在生成 SQL 之前必须先调用此工具确认真实字段名，禁止猜测字段名。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+            tableName: { type: "string", description: "表名" },
+          },
+          required: ["connectionId", "dbName", "tableName"],
+        },
+      },
+    },
+  },
+  {
+    name: "get_indexes",
+    icon: "🧭",
+    desc: "获取指定表的索引定义",
+    detail:
+      "传入 connectionId、dbName 和 tableName，返回索引名、索引列、唯一性和索引类型。AI 在做慢 SQL 分析、索引优化和执行计划推断时应优先调用。",
+    params: "connectionId, dbName, tableName",
+    tool: {
+      type: "function",
+      function: {
+        name: "get_indexes",
+        description:
+          "获取指定表的索引定义，包括索引名、字段顺序、唯一性和索引类型。适用于慢 SQL 分析、索引优化建议和确认现有索引覆盖情况。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+            tableName: { type: "string", description: "表名" },
+          },
+          required: ["connectionId", "dbName", "tableName"],
+        },
+      },
+    },
+  },
+  {
+    name: "get_foreign_keys",
+    icon: "🧬",
+    desc: "获取指定表的外键关系",
+    detail:
+      "传入 connectionId、dbName 和 tableName，返回当前表到其他表的外键映射。AI 在推断表关系、生成联表 SQL 和评审数据一致性时可直接使用。",
+    params: "connectionId, dbName, tableName",
+    tool: {
+      type: "function",
+      function: {
+        name: "get_foreign_keys",
+        description:
+          "获取指定表的外键关系，包括本表字段、引用表、引用字段和约束名。适用于联表路径分析、ER 关系梳理和约束检查。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+            tableName: { type: "string", description: "表名" },
+          },
+          required: ["connectionId", "dbName", "tableName"],
+        },
+      },
+    },
+  },
+  {
+    name: "get_triggers",
+    icon: "⏱️",
+    desc: "获取指定表的触发器定义",
+    detail:
+      "传入 connectionId、dbName 和 tableName，返回触发器名、触发时机、事件类型和语句体。AI 在分析隐式写入、副作用和审计逻辑时可直接查看。",
+    params: "connectionId, dbName, tableName",
+    tool: {
+      type: "function",
+      function: {
+        name: "get_triggers",
+        description:
+          "获取指定表的触发器定义，包括触发时机、事件和触发语句。适用于排查隐式数据变更、审计逻辑和表级副作用。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+            tableName: { type: "string", description: "表名" },
+          },
+          required: ["connectionId", "dbName", "tableName"],
+        },
+      },
+    },
+  },
+  {
+    name: "get_table_ddl",
+    icon: "📝",
+    desc: "获取表的建表语句 (DDL)",
+    detail:
+      "传入 connectionId、dbName 和 tableName，返回完整的 CREATE TABLE 语句，包含字段定义、索引、约束等信息。",
+    params: "connectionId, dbName, tableName",
+    tool: {
+      type: "function",
+      function: {
+        name: "get_table_ddl",
+        description: "获取指定表的完整建表语句（CREATE TABLE DDL），包含字段、索引、约束等完整结构信息。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+            tableName: { type: "string", description: "表名" },
+          },
+          required: ["connectionId", "dbName", "tableName"],
+        },
+      },
+    },
+  },
+  {
+    name: "preview_table_rows",
+    icon: "👀",
+    desc: "抽样预览指定表的前几行数据",
+    detail:
+      "传入 connectionId、dbName、tableName 和可选 limit，返回该表的前几行真实样例数据。适合先看数据形态、空值分布和枚举值，再决定怎么写 SQL。",
+    params: "connectionId, dbName, tableName, limit?",
+    tool: {
+      type: "function",
+      function: {
+        name: "preview_table_rows",
+        description:
+          "预览指定表的前几行样例数据。适用于快速理解字段取值形态、空值情况、时间格式和状态枚举，减少模型盲写 SQL。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+            tableName: { type: "string", description: "表名" },
+            limit: { type: "number", description: "可选，预览行数，默认 20，最大 100" },
+          },
+          required: ["connectionId", "dbName", "tableName"],
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_table_bundle",
+    icon: "🧰",
+    desc: "一次抓取指定表的结构快照",
+    detail:
+      "传入 connectionId、dbName 和 tableName，返回字段、索引、外键、触发器和 DDL；还可以附带前几行样例数据。适合在写 SQL、评审表设计或排查副作用前先做完整摸底。",
+    params: "connectionId, dbName, tableName, includeSampleRows?, sampleLimit?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_table_bundle",
+        description:
+          "一次性获取指定表的结构快照，返回字段、索引、外键、触发器、DDL，以及可选样例数据。适用于做完整表设计摸底、快速理解表关系和降低模型多次往返调用。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+            tableName: { type: "string", description: "表名" },
+            includeSampleRows: { type: "boolean", description: "可选，是否附带前几行样例数据" },
+            sampleLimit: { type: "number", description: "可选，样例行数，默认 10，最大 100" },
+          },
+          required: ["connectionId", "dbName", "tableName"],
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_database_bundle",
+    icon: "🗂️",
+    desc: "一次抓取指定数据库的结构总览",
+    detail:
+      "传入 connectionId 和 dbName，返回库内表清单、表数量、总字段数，以及按表聚合的字段摘要预览。适合刚接手陌生库时先做全局摸底，再决定深入哪张表。",
+    params: "connectionId, dbName, includeColumns?, tableLimit?, perTableColumnLimit?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_database_bundle",
+        description:
+          "一次性获取指定数据库的结构总览，返回表名列表、总字段数，以及按表聚合的字段摘要预览。适用于陌生数据库摸底、做数据地图和快速选择下一步要深入分析的表。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+            includeColumns: { type: "boolean", description: "可选，是否附带按表聚合的字段摘要，默认 true" },
+            tableLimit: { type: "number", description: "可选，最多返回多少张表，默认 80，最大 200" },
+            perTableColumnLimit: { type: "number", description: "可选，每张表最多返回多少个字段摘要，默认 8，最大 30" },
+          },
+          required: ["connectionId", "dbName"],
+        },
+      },
+    },
+  },
+  {
+    name: "execute_sql",
+    icon: "▶️",
+    desc: "执行 SQL 查询并返回结果",
+    detail:
+      "传入 connectionId、dbName 和 sql，在目标数据库上执行 SQL 并返回结果（最多 50 行）。受安全级别控制，只读模式下仅允许 SELECT/SHOW/DESCRIBE。",
+    params: "connectionId, dbName, sql",
+    tool: {
+      type: "function",
+      function: {
+        name: "execute_sql",
+        description:
+          "在指定连接和数据库上执行 SQL 查询并返回结果。受安全级别控制，只读模式下只能执行 SELECT/SHOW/DESCRIBE 等查询操作。结果最多返回 50 行。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "连接ID" },
+            dbName: { type: "string", description: "数据库名" },
+            sql: { type: "string", description: "要执行的 SQL 语句" },
+          },
+          required: ["connectionId", "dbName", "sql"],
+        },
+      },
+    },
+  },
+];
diff --git a/frontend/src/utils/aiBuiltinInspectionContextToolInfo.ts b/frontend/src/utils/aiBuiltinInspectionContextToolInfo.ts
new file mode 100644
index 0000000..7851d3d
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinInspectionContextToolInfo.ts
@@ -0,0 +1,226 @@
+import type { AIBuiltinToolInfo } from "./aiBuiltinToolInfo.types";
+
+export const BUILTIN_AI_INSPECTION_CONTEXT_TOOL_INFO: AIBuiltinToolInfo[] = [
+  {
+    name: "inspect_ai_guidance",
+    icon: "🧠",
+    desc: "查看当前 AI 提示词与 Skills 配置",
+    detail:
+      "返回当前用户自定义的全局/数据库/JVM 提示词，以及当前启用的 Skills、作用域、依赖工具和 skill prompt 内容。适合用户问“你现在到底带了哪些提示词”“为什么你会这样回答”“当前有哪些 Skills 在生效”时先读真实配置。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_guidance",
+        description:
+          "读取当前 AI 的提示与技能配置快照，包括用户自定义提示词、当前启用的 Skills、作用域、依赖工具和各自的 system prompt。适用于用户提到当前提示词、当前 Skill、为什么 AI 当前会这样回答、当前有哪些规则在生效时，先读取真实配置再解释。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_context",
+    icon: "🧷",
+    desc: "查看当前 AI 已关联的表结构上下文",
+    detail:
+      "返回当前对话已经挂载到 AI 上下文里的表清单、所属连接与数据库，以及每张表的 DDL 预览。适合用户说“看看我现在带了哪些表结构”“当前 AI 上下文是什么”时，先读取真实挂载状态再继续分析。",
+    params: "includeDDL?(默认 false), ddlLimit?(默认 4000)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_context",
+        description:
+          "读取当前对话已经关联到 AI 上下文里的表结构快照，包括连接、数据库、表名，以及可选的 DDL 内容。适用于用户提到当前 AI 上下文、当前关联表、当前挂载的表结构时，先读取真实状态，避免模型凭记忆复述。",
+        parameters: {
+          type: "object",
+          properties: {
+            includeDDL: { type: "boolean", description: "可选，是否附带每张表的 DDL 内容，默认 false" },
+            ddlLimit: { type: "number", description: "可选，DDL 截断长度，默认 4000，最大 12000" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_current_connection",
+    icon: "🛰️",
+    desc: "查看当前活动连接/数据源摘要",
+    detail:
+      "返回当前活动连接的类型、地址、端口、当前数据库、是否启用 SSH/代理/HTTP 隧道，以及当前活动页签绑定的表信息。适合用户问“我现在连的是哪个库”“这个连接走没走 SSH”“当前数据源是什么类型”时先读取真实连接状态。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_current_connection",
+        description:
+          "读取当前活动连接或当前页签对应数据源的真实摘要，包括连接类型、地址、端口、当前数据库、SSH/代理/HTTP 隧道状态，以及当前页签绑定的表上下文。适用于用户提到当前连接、当前数据源、当前库地址、是否走 SSH、当前连的是哪种数据库时，先读取真实界面上下文，避免模型猜测。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_connection_capabilities",
+    icon: "🧱",
+    desc: "查看当前连接支持哪些前端能力",
+    detail:
+      "返回当前或指定连接的数据源能力矩阵，包括是否支持查询编辑器、SQL 导出、复制 INSERT、新建/重命名/删除数据库、结果是否强制只读，以及是否倾向手动总数或近似计数。适合用户问“为什么这里不能建库/删库”“这个数据源为什么结果不能编辑”“这个类型支持哪些操作”时，先读取真实能力边界。",
+    params: "connectionId?(默认取当前活动连接)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_connection_capabilities",
+        description:
+          "读取当前活动连接或指定 saved connection 的前端能力矩阵，包括是否支持查询编辑器、SQL 导出、复制 INSERT、新建/重命名/删除数据库、结果是否强制只读，以及是否适合手动总数或近似计数。适用于用户提到当前连接为什么不能建库、为什么结果集不能编辑、某种数据库类型到底支持哪些前端动作时，先读取真实能力配置，避免模型凭经验猜测。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "可选，指定要查看的连接 ID；不传时默认读取当前活动连接" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_saved_connections",
+    icon: "🧭",
+    desc: "查看本地已保存连接清单",
+    detail:
+      "可按关键词或数据库类型过滤，返回本地保存的数据源列表、连接类型分布，以及每条连接的地址、当前库、SSH/代理/HTTP 隧道状态。适合用户问“我本地存了哪些连接”“帮我找 mysql / postgres 连接”“哪条连接配置了 SSH”时先读真实本地连接资产。",
+    params: "keyword?, type?, limit?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_saved_connections",
+        description:
+          "读取本地已保存连接清单，可按关键词和数据库类型过滤，并返回每条连接的类型、地址、当前库、SSH/代理/HTTP 隧道等摘要。适用于用户提到本地保存了哪些连接、要找哪条 mysql/postgres 连接、哪条连接启用了 SSH 或代理时，先读取真实本地连接资产再回答。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按连接名、ID、类型、主机、数据库名或 SSH/代理地址做关键词筛选" },
+            type: { type: "string", description: "可选，只看某种数据库类型，例如 mysql、postgres、redis、mongodb" },
+            limit: { type: "number", description: "可选，最多返回多少条连接，默认 20，最大 100" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_redis_topology",
+    icon: "🧰",
+    desc: "诊断 Redis 单机/哨兵/集群配置",
+    detail:
+      "读取本地 Redis 连接拓扑摘要，返回单机、Sentinel、Cluster 的节点、master、认证状态、DB 范围、脱敏 URI 示例、状态分级和下一步动作。适合用户问 Redis 哨兵/集群怎么配、为什么切库后失败、Cluster 多 DB 怎么处理时先读真实配置。",
+    params: "connectionId?, keyword?, limit?, includeRecommendations?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_redis_topology",
+        description:
+          "读取本地 Redis 连接的单机、Sentinel、Cluster 拓扑配置摘要，返回节点列表、Sentinel master、认证状态、DB 选择、TLS/SSH/代理状态、后端适配器、脱敏 URI 示例、状态分级、阻断原因、潜在配置风险和建议。适用于用户提到 Redis 哨兵、Redis Cluster、切换数据库失败、多节点地址、Sentinel master、Cluster 逻辑库或跨网络访问 Redis 时，先读取真实连接配置再回答；结果不会回显 Redis 密码或 Sentinel 密码。",
+        parameters: {
+          type: "object",
+          properties: {
+            connectionId: { type: "string", description: "可选，只诊断某个 Redis 连接 ID" },
+            keyword: { type: "string", description: "可选，按连接名、地址、拓扑、Sentinel master 或节点地址筛选" },
+            limit: { type: "number", description: "可选，最多返回多少条 Redis 连接，默认 20，最大 100" },
+            includeRecommendations: { type: "boolean", description: "可选，是否返回修复建议，默认 true" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_external_sql_directories",
+    icon: "🗂️",
+    desc: "查看本地外部 SQL 目录资产",
+    detail:
+      "可按关键词、连接或数据库过滤，返回本地配置的外部 SQL 目录、目录路径、绑定连接/数据库，以及当前是否已经打开这些目录里的 SQL 文件。适合用户提到“外部 SQL 目录”“某个脚本在哪个目录”“现在打开的 SQL 文件来自哪个外部目录”时，先读真实资产。",
+    params: "keyword?, connectionId?, dbName?, limit?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_external_sql_directories",
+        description:
+          "读取本地配置的外部 SQL 目录清单，可按关键词、连接和数据库过滤，并返回目录路径、绑定连接/数据库，以及当前打开的外部 SQL 文件页签摘要。适用于用户提到外部 SQL 目录、某个 SQL 文件放在哪、当前打开的脚本来自哪个目录时，先读取真实本地资产再回答。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按目录名、路径、连接名或数据库名做关键词筛选" },
+            connectionId: { type: "string", description: "可选，只看绑定到某个连接的外部 SQL 目录" },
+            dbName: { type: "string", description: "可选，只看绑定到某个数据库的外部 SQL 目录" },
+            limit: { type: "number", description: "可选，最多返回多少条目录，默认 20，最大 100" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_external_sql_file",
+    icon: "📄",
+    desc: "读取外部 SQL 文件内容",
+    detail:
+      "传入具体 filePath，读取已配置外部 SQL 目录中的 SQL 文件内容，并返回所属目录、绑定连接/数据库、是否已有打开页签，以及截断后的正文预览。适合用户提到“看一下这个目录里的某个脚本”“帮我解释 report.sql 在写什么”时，先读取真实文件内容再分析。",
+    params: "filePath, previewCharLimit?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_external_sql_file",
+        description:
+          "读取指定外部 SQL 文件的内容预览，仅用于已配置外部 SQL 目录中的 SQL 文件。返回文件路径、所属目录、绑定连接/数据库、是否已在工作区打开，以及截断后的正文内容。适用于用户提到某个目录中的具体 SQL 脚本、想让 AI 直接解释脚本逻辑、或想确认某个外部 SQL 文件内容时，先读真实文件再回答。",
+        parameters: {
+          type: "object",
+          properties: {
+            filePath: { type: "string", description: "必填，要读取的 SQL 文件绝对路径，通常先通过 inspect_external_sql_directories 找到" },
+            previewCharLimit: { type: "number", description: "可选，正文预览最多返回多少字符，默认 12000，最大 40000" },
+          },
+          required: ["filePath"],
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_active_tab",
+    icon: "📍",
+    desc: "查看当前活动页签上下文",
+    detail:
+      "返回当前活动页签的类型、连接、数据库、表名，以及当前 SQL / 命令页签里的草稿内容（超长会截断）。适合用户说“看我当前这条 SQL”“优化这个编辑器里的语句”时，先让 AI 直接读取当前工作区上下文。",
+    params: "includeContent?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_active_tab",
+        description:
+          "获取当前活动页签的上下文快照，包括页签类型、连接、数据库、表名，以及当前 SQL / 命令页签里的草稿内容。适用于用户提到当前页签、当前 SQL、当前编辑器、这条语句时，先读取真实界面上下文，避免让模型猜测。",
+        parameters: {
+          type: "object",
+          properties: {
+            includeContent: { type: "boolean", description: "可选，是否附带页签中的 SQL / 命令草稿内容，默认 true" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_workspace_tabs",
+    icon: "🗃️",
+    desc: "查看当前工作区打开的页签总览",
+    detail:
+      "返回当前工作区里打开的页签列表、哪个是活动页签，以及每个页签对应的连接、数据库、表名等上下文。适合用户说“我现在开了哪些 SQL”“看看我工作区里有哪些页签”“帮我对比这几个查询页签”时，先读取真实工作区布局再继续分析。",
+    params: "limit?(默认 12), includeContent?(默认 false)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_workspace_tabs",
+        description:
+          "获取当前工作区已打开页签的总览，包括活动页签、页签类型、连接、数据库、表名，以及可选的 SQL / 命令草稿内容。适用于用户提到当前工作区、打开了哪些页签、哪几个查询页签、想对比多个编辑器内容时，先读取真实界面状态，避免模型猜测。",
+        parameters: {
+          type: "object",
+          properties: {
+            limit: { type: "number", description: "可选，最多返回多少个页签，默认 12，最大 30" },
+            includeContent: { type: "boolean", description: "可选，是否附带页签中的 SQL / 命令草稿内容，默认 false" },
+          },
+        },
+      },
+    },
+  },
+];
diff --git a/frontend/src/utils/aiBuiltinInspectionCoreToolInfo.ts b/frontend/src/utils/aiBuiltinInspectionCoreToolInfo.ts
new file mode 100644
index 0000000..c172084
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinInspectionCoreToolInfo.ts
@@ -0,0 +1,206 @@
+import type { AIBuiltinToolInfo } from "./aiBuiltinToolInfo.types";
+
+export const BUILTIN_AI_INSPECTION_CORE_TOOL_INFO: AIBuiltinToolInfo[] = [
+  {
+    name: "inspect_app_health",
+    icon: "🧭",
+    desc: "一键查看 AI 应用健康总览",
+    detail:
+      "汇总 AI 配置、供应商发送前置、MCP 接入、应用日志 ERROR/WARN、最近连接失败/冷却、AI 回复气泡渲染异常和当前工作区页签，给出阻塞项、运行期异常信号和下一步探针建议。适合用户说“AI 不稳定”“整体帮我看看”“连接和 MCP 一起排查”时先做一次全局摸底。",
+    params: "keyword?, connectionKeyword?, lineLimit?(默认 120), includeLogLines?(默认 false)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_app_health",
+        description:
+          "读取 GoNavi AI 应用健康总览，汇总 AI 供应商与发送前置、MCP 接入、应用日志 ERROR/WARN、最近连接失败/冷却、AI 回复气泡渲染异常和当前工作区页签，并返回阻塞项、运行期异常信号与下一步探针建议。适用于用户提到 AI 不稳定、整体不成熟、连接/MCP/日志/回复气泡异常需要一起排查或要求先看全局状态时，优先调用该工具。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，读取应用日志时按关键词过滤，例如 ai、mcp、mysql、error；不传则读取最近日志窗口" },
+            connectionKeyword: { type: "string", description: "可选，分析连接失败日志时按连接类型、地址或错误关键词过滤；不传时复用 keyword" },
+            lineLimit: { type: "number", description: "可选，每次最多分析多少行日志，默认 120，最大 240" },
+            includeLogLines: { type: "boolean", description: "可选，是否在结果里附带日志原文行，默认 false；需要引用原文时再开启" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_support_bundle",
+    icon: "📦",
+    desc: "导出 AI 排障支持包",
+    detail:
+      "一次性汇总 AI 应用健康、供应商与 MCP 状态、应用日志摘要、连接失败摘要、消息流结构、上下文体量、远程 MCP 接入和工具目录索引。适合用户反馈“AI 不稳定”“MCP/连接/日志一起看”“要给开发排障材料”时先生成一份不含密钥和数据库密码的支持包。",
+    params: "keyword?, sessionId?, lineLimit?(默认 120), includeLogLines?(默认 false), includeMessageContent?(默认 false), publicUrl?, tokenConfigured?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_support_bundle",
+        description:
+          "生成 GoNavi AI 排障支持包，汇总 AI 应用健康、供应商和发送前置、MCP 配置和远程接入、应用日志摘要、数据库连接失败摘要、当前 AI 消息流、上下文体量风险和工具目录索引。默认不包含数据库密码、供应商密钥、MCP 环境变量值、日志原文或完整消息内容。适用于用户反馈 AI 不稳定、MCP/连接/日志问题交织、需要一次性导出排障证据或准备给开发定位时优先调用。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按关键词过滤日志和工具目录，例如 ai、mcp、mysql、error、openclaw" },
+            connectionKeyword: { type: "string", description: "可选，分析连接失败日志时使用的关键词；不传时复用 keyword" },
+            sessionId: { type: "string", description: "可选，指定要诊断的 AI 会话 ID；不传时使用当前活动会话" },
+            lineLimit: { type: "number", description: "可选，最多分析多少行应用日志，默认 120，最大 240" },
+            includeLogLines: { type: "boolean", description: "可选，是否附带日志原文行，默认 false；需要引用原文时再开启" },
+            includeMessageContent: { type: "boolean", description: "可选，是否附带消息内容预览，默认 false；排查气泡内容时再开启" },
+            includeDetails: { type: "boolean", description: "可选，是否附带上下文体量明细，默认 false" },
+            publicUrl: { type: "string", description: "可选，云端 Agent 访问 GoNavi MCP 的公网/隧道 URL，用于远程 MCP 支持包" },
+            localAddr: { type: "string", description: "可选，Windows 本机 HTTP MCP 监听地址，默认 127.0.0.1:8765" },
+            path: { type: "string", description: "可选，Streamable HTTP MCP 路径，默认 /mcp" },
+            exposeStrategy: {
+              type: "string",
+              enum: ["reverse_proxy", "ssh_reverse_tunnel", "cloudflare_tunnel", "tailscale", "custom"],
+              description: "可选，远程暴露方式，用于生成对应安全提醒",
+            },
+            tokenConfigured: { type: "boolean", description: "可选，是否已经准备随机 Bearer Token；传 false 会返回鉴权告警" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_setup_health",
+    icon: "🩺",
+    desc: "一键体检当前 AI 配置健康度",
+    detail:
+      "汇总当前 AI 供应商、聊天发送前置、MCP 服务与外部客户端接入、提示词与 Skills、上下文挂载情况，并给出阻塞项、告警项和下一步建议。适合用户说“AI 为什么不好用”“帮我看下 AI 整体有没有问题”“现在这套 AI 配置还缺什么”时先做一次总览诊断。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_setup_health",
+        description:
+          "体检当前 AI 配置健康度，返回供应商、模型、聊天发送前置、MCP 接入、提示词与 Skills、表结构上下文挂载等整体快照，并给出阻塞项、建议项和下一步动作。适用于用户提到 AI 为什么不好用、当前 AI 配置哪里还缺、是否已经能稳定工作时，优先读取这份总览诊断，不要拆成多次猜测。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_runtime",
+    icon: "🎛️",
+    desc: "查看当前 AI 自身运行状态",
+    detail:
+      "返回当前启用的模型供应商、模型名、安全级别、上下文级别、启用的 Skills，以及当前已暴露的内置工具和 MCP 工具。适合用户问“你现在能调用什么”“当前用的哪个模型”“为什么不能执行写操作”时，先读真实运行状态再回答。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_runtime",
+        description:
+          "读取当前 AI 运行时快照，包括当前供应商、模型、安全级别、上下文级别、启用的 Skills、当前可用的内置工具与 MCP 工具。适用于用户询问当前 AI 能力边界、当前使用哪个模型、为什么不能执行某些操作时，先读取真实运行状态，避免模型猜测。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_safety",
+    icon: "🛡️",
+    desc: "查看当前 AI 写入安全边界",
+    detail:
+      "返回当前 AI 安全级别对应的 SQL 允许范围、非只读语句是否仍需确认 / allowMutating，以及当前活动连接、页签或 JVM 诊断权限是否还叠加了只读限制。适合用户问“为什么现在不能写”“DDL 能不能执行”“allowMutating 要不要传”时先读真实边界。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_safety",
+        description:
+          "读取当前 AI 安全边界快照，包括当前安全级别允许的 SQL 范围、非查询语句的确认要求、MCP execute_sql 对 allowMutating 的要求，以及当前活动连接、结果页签或 JVM 诊断权限是否额外处于只读限制。适用于用户提到为什么现在不能写、当前是不是只读、DDL 能不能执行、allowMutating 是否必须传时，先读取真实边界再回答。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_providers",
+    icon: "🪪",
+    desc: "查看当前 AI 供应商与模型配置",
+    detail:
+      "返回当前配置了哪些 AI 供应商、哪个正在生效、各自的 baseUrl、已选模型、声明模型列表、密钥是否存在、自定义请求头 key，以及缺少密钥/模型/地址等待检查项。适合用户问“为什么没有模型”“API Key 有没有配”“当前到底配了哪些供应商”时先读真实配置。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_providers",
+        description:
+          "读取当前 AI 供应商配置快照，包括供应商列表、活动供应商、接口地址、已选模型、声明模型列表、是否存在密钥、自定义请求头 key，以及缺少密钥/模型/地址等待检查项。适用于用户提到当前供应商、模型列表为空、API Key 是否配置、为什么 AI 不能正常发起请求时，先读取真实配置再解释。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_chat_readiness",
+    icon: "🚦",
+    desc: "查看当前 AI 聊天是否具备发送条件",
+    detail:
+      "返回当前聊天输入区是否已经具备发送条件，包括有没有活动供应商、当前供应商是否缺密钥或接口地址、是否已选模型、当前连接/表结构上下文是否已挂载，以及下一步建议动作。适合用户问“为什么现在不能发送”“输入框到底缺什么配置”“当前 AI 聊天准备好了没有”时先读真实状态。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_chat_readiness",
+        description:
+          "读取当前 AI 聊天输入区的发送前置状态，包括活动供应商、密钥和接口地址是否完整、是否已选模型、当前连接上下文和已挂载表结构数量，以及建议的下一步动作。适用于用户提到为什么现在不能发送、为什么输入区还没准备好、当前到底缺什么配置时，先读取真实状态再回答。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_upstream_logs",
+    icon: "📡",
+    desc: "查看 AI 上游请求入参与状态",
+    detail:
+      "从 gonavi.log 读取最近的 AI 上游请求开始/完成/失败记录，按 provider、requestId 或关键词过滤，返回请求体 body 预览、payload 结构摘要、endpoint、状态码、耗时和错误摘要。适合用户想核对发给上游模型的真实入参、排查请求参数兼容、确认工具是否随请求下发或脱敏日志是否写入时先调用。",
+    params: "provider?, requestId?, keyword?, lineLimit?(默认 160), requestLimit?(默认 12), includeBody?(默认 true), includePayloadSummary?(默认 true), includeLines?(默认 false)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_upstream_logs",
+        description:
+          "读取 GoNavi 应用日志中的 AI 上游请求记录，返回 requestId、provider、method、endpoint、请求 body 预览、脱敏 payload 结构摘要、状态码、耗时和错误摘要。适用于用户提到 AI 请求入参、上游请求体、requestId、provider 请求参数、工具调用没有触发、模型接口报错、或需要核对刚才发给上游模型的真实 payload 时，先读取该工具，不要只凭界面响应推断。",
+        parameters: {
+          type: "object",
+          properties: {
+            provider: { type: "string", description: "可选，只看某个供应商，例如 openai、anthropic、gemini；大小写不敏感" },
+            requestId: { type: "string", description: "可选，按日志里的 requestId 精确过滤，适合从错误日志继续追踪同一次请求" },
+            keyword: { type: "string", description: "可选，在 requestId、provider、endpoint、bodyPreview 或 error 中继续过滤，例如模型名、接口路径、参数名" },
+            lineLimit: { type: "number", description: "可选，最多读取多少行日志尾部，默认 160，最大 300" },
+            requestLimit: { type: "number", description: "可选，最多返回多少个请求摘要，默认 12，最大 40" },
+            includeBody: { type: "boolean", description: "可选，是否返回已脱敏的请求 body 预览，默认 true；只看状态时可设为 false" },
+            includePayloadSummary: { type: "boolean", description: "可选，是否解析请求 body 并返回模型、消息角色分布、工具数量/名称、stream/tool_choice 等结构摘要，默认 true；不返回消息正文或密钥" },
+            includeLines: { type: "boolean", description: "可选，是否附带脱敏后的原始日志行，默认 false；需要引用原文时再开启" },
+            bodyPreviewLimit: { type: "number", description: "可选，单个 body 预览最大字符数，默认 6000，最大 12000" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_tool_catalog",
+    icon: "🧭",
+    desc: "查看 AI 内置工具目录和参数提示",
+    detail:
+      "按关键词或工具名返回 GoNavi AI 内置工具、推荐探针流程、参数说明和当前 MCP 工具摘要。适合用户问“你该用哪个工具”“这个工具参数怎么填”“有哪些内置工具”或 AI 需要先选择探针路线时调用。",
+    params: "keyword?, toolName?, includeMCPTools?(默认 true), limit?(默认 12)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_tool_catalog",
+        description:
+          "读取 GoNavi AI 工具目录快照，可按关键词或工具名筛选，返回推荐工具调用流程、内置工具说明、参数提示和当前已发现 MCP 工具摘要。适用于用户询问当前有哪些内置工具、某类问题该先调用哪个探针、工具 arguments 怎么填、或 AI 在处理复杂问题前需要先选择工具路线时优先调用。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按问题关键词过滤工具和流程，例如 mcp、连接失败、事务、快捷键、schema、日志" },
+            toolName: { type: "string", description: "可选，按内置工具名精确查询，例如 inspect_mcp_draft 或 inspect_sql_risk" },
+            includeMCPTools: { type: "boolean", description: "可选，是否同时返回当前已发现的 MCP 工具摘要，默认 true" },
+            limit: { type: "number", description: "可选，最多返回多少条流程、内置工具和 MCP 工具，默认 12，最大 40" },
+          },
+        },
+      },
+    },
+  },
+];
diff --git a/frontend/src/utils/aiBuiltinInspectionDiagnosticsToolInfo.ts b/frontend/src/utils/aiBuiltinInspectionDiagnosticsToolInfo.ts
new file mode 100644
index 0000000..eabac6f
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinInspectionDiagnosticsToolInfo.ts
@@ -0,0 +1,240 @@
+import type { AIBuiltinToolInfo } from "./aiBuiltinToolInfo.types";
+
+export const BUILTIN_AI_INSPECTION_DIAGNOSTICS_TOOL_INFO: AIBuiltinToolInfo[] = [
+  {
+    name: "inspect_app_logs",
+    icon: "🪵",
+    desc: "查看 GoNavi 应用日志尾部",
+    detail:
+      "可按关键词过滤，返回最近一段 GoNavi 应用日志里的 INFO/WARN/ERROR 行、级别分布、日志文件路径，以及当前是否发生了日志窗口截断。适合用户提到“gonavi.log”“启动报错”“MCP 拉不起来”“数据库连接为什么失败”时，先读真实日志尾部再继续定位。",
+    params: "keyword?, lineLimit?(默认 80)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_app_logs",
+        description:
+          "读取 GoNavi 应用日志尾部，可按关键词过滤，并返回最近日志行、级别分布、日志路径和截断状态。适用于用户提到 gonavi.log、应用启动异常、MCP 启动失败、数据库连接报错或要求“看一下最近日志”时，优先读取真实应用日志，不要只凭界面现象推测。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按日志内容关键词过滤，例如 mcp、mysql、timeout、error" },
+            lineLimit: { type: "number", description: "可选，最多返回多少行日志，默认 80，最大 200" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_recent_connection_failures",
+    icon: "🧯",
+    desc: "总结最近数据库连接失败与冷却原因",
+    detail:
+      "从最近一段 gonavi.log 里提取数据库连接失败、连接验证失败、SSH 隧道异常和连接冷却命中记录，自动归类主要问题类型、最新地址、最新根因和下一步建议。适合用户提到“为什么连接不上”“连接最近失败正在冷却”“验证失败”“SSH 隧道是不是有问题”时，先读这份结构化总结，而不是人工翻整段日志。",
+    params: "keyword?, lineLimit?(默认 120)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_recent_connection_failures",
+        description:
+          "汇总最近 GoNavi 应用日志中的数据库连接失败、连接验证失败、SSH 隧道失败和冷却命中记录，并返回主要异常类别、最新地址、最新根因与建议动作。适用于用户提到为什么连接不上、最近一直命中连接冷却、服务端验证失败、multiStatements 或参数兼容异常时，优先读取这份结构化连接失败总结，不要直接让模型肉眼翻整段日志。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按连接类型、地址或异常关键词过滤，例如 mysql、ssh、timeout、127.0.0.1" },
+            lineLimit: { type: "number", description: "可选，最多分析多少行日志，默认 120，最大 240" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_last_render_error",
+    icon: "🧯",
+    desc: "查看最近一次 AI 消息渲染异常记录",
+    detail:
+      "返回最近一次被前端隔离下来的 AI 消息渲染异常，包括是哪条消息、消息内容预览、错误摘要和组件栈摘要。适合用户提到“AI 某条回复空白了”“某个气泡渲染失败”“消息块报错但面板没全挂”时，先读这份真实前端异常快照。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_last_render_error",
+        description:
+          "读取最近一次 AI 消息渲染异常的本地快照，包括消息 ID、角色、内容预览、错误摘要、组件栈摘要和下一步排查建议。适用于用户提到 AI 消息空白、某条回复渲染失败、气泡局部报错但面板仍然存活时，先读取真实前端异常记录，不要只凭现象猜测。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_saved_queries",
+    icon: "💾",
+    desc: "查看本地已保存的 SQL 查询",
+    detail:
+      "可按关键词、连接或数据库过滤，返回保存查询的名称、所属连接、数据库和 SQL 预览。适合用户提到“我之前保存过的查询”“帮我找那条历史 SQL”时先从真实本地收藏里检索。",
+    params: "keyword?, connectionId?, dbName?, limit?, includeSql?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_saved_queries",
+        description:
+          "读取本地已保存的 SQL 查询列表，可按关键词、连接和数据库过滤，并返回每条查询的名称、所属连接、数据库与 SQL 预览。适用于用户想找历史查询、复用旧 SQL、核对保存脚本时，先读取真实本地记录。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按查询名称、SQL 文本、连接名或数据库名做关键词筛选" },
+            connectionId: { type: "string", description: "可选，只看某个连接下保存的查询" },
+            dbName: { type: "string", description: "可选，只看某个数据库下保存的查询" },
+            limit: { type: "number", description: "可选，最多返回多少条，默认 12，最大 50" },
+            includeSql: { type: "boolean", description: "可选，是否附带 SQL 预览，默认 true" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_sessions",
+    icon: "🗂️",
+    desc: "查看本地 AI 历史会话清单",
+    detail:
+      "可按关键词过滤，返回本地 AI 会话标题、更新时间、消息数量、是否是当前会话，以及首条用户提问和最近一条消息预览。适合用户提到“之前那条 AI 对话”“帮我找上次聊过的记录”“最近哪个会话讲过这个问题”时先读真实会话资产。",
+    params: "keyword?, limit?, includePreview?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_sessions",
+        description:
+          "读取本地 AI 历史会话清单，可按关键词过滤，并返回会话标题、更新时间、消息数量、是否是当前活动会话，以及首条用户问题和最近消息预览。适用于用户提到之前的 AI 对话、上次聊过的记录、最近哪个会话讲过某个问题时，先读取真实会话清单再继续定位。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按会话标题、会话 ID、首条用户问题或最近消息内容做关键词筛选" },
+            limit: { type: "number", description: "可选，最多返回多少条会话，默认 10，最大 50" },
+            includePreview: { type: "boolean", description: "可选，是否附带首条用户问题和最近消息预览，默认 true" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_message_flow",
+    icon: "🧬",
+    desc: "诊断当前 AI 会话消息流",
+    detail:
+      "读取当前或指定 AI 会话的最近消息流，统计用户/助手/tool 消息、工具调用是否都有结果、是否出现连续 assistant 气泡、空 assistant 占位或未清理 loading。适合用户反馈“AI 回复被拆成多个气泡”“工具调用后没继续回答”“消息流看着不对”时先看真实消息结构。",
+    params: "sessionId?(默认当前会话), limit?(默认 24), includeContent?(默认 true), previewLimit?(默认 180)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_message_flow",
+        description:
+          "读取当前或指定 AI 会话的最近消息流诊断，包括消息角色序列、assistant/tool 消息数量、工具调用与 tool 结果匹配情况、连续 assistant 消息、空 assistant 消息和 loading 残留。适用于用户提到 AI 回复被拆成多个气泡、流式追加异常、工具调用没有闭环、某轮回答没有继续生成时，先读取真实消息结构再定位。",
+        parameters: {
+          type: "object",
+          properties: {
+            sessionId: { type: "string", description: "可选，指定要诊断的 AI 会话 ID；不传时读取当前活动会话" },
+            limit: { type: "number", description: "可选，最多返回最近多少条消息，默认 24，最大 80" },
+            includeContent: { type: "boolean", description: "可选，是否附带消息内容预览，默认 true" },
+            previewLimit: { type: "number", description: "可选，每条消息预览字符数，默认 180，最大 1000" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_ai_context_budget",
+    icon: "📦",
+    desc: "诊断 AI 上下文体量与稳定性风险",
+    detail:
+      "统计当前或指定 AI 会话的最近消息、工具结果、已挂载表结构、MCP 工具 schema、用户提示词和 Skills 体量，返回 low/medium/high/critical 风险、主要膨胀来源和收窄建议。适合用户反馈 AI 变慢、乱答、上下文太大、工具结果过长或表结构挂太多时先做预算体检。",
+    params: "sessionId?(默认当前会话), messageLimit?(默认 40), includeDetails?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_ai_context_budget",
+        description:
+          "读取当前 AI 上下文体量与稳定性风险快照，包括最近消息窗口、tool 结果长度、已挂载表结构 DDL、MCP 工具 schema、用户提示词和启用 Skills 的估算体量，并返回风险级别、告警和收窄建议。适用于用户提到 AI 回复变慢、上下文过大、表结构带太多、工具结果过长、模型开始乱答或复杂任务前需要判断是否应拆小上下文时优先调用。",
+        parameters: {
+          type: "object",
+          properties: {
+            sessionId: { type: "string", description: "可选，指定要诊断的 AI 会话 ID；不传时读取当前活动会话" },
+            messageLimit: { type: "number", description: "可选，最多统计最近多少条消息，默认 40，最大 120" },
+            includeDetails: { type: "boolean", description: "可选，是否返回最大消息、最大 DDL 表和最大 MCP schema 明细，默认 true" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_codebase_hotspots",
+    icon: "🧱",
+    desc: "查看前端大文件和拆分热点",
+    detail:
+      "返回当前 GoNavi 前端代码中的大文件热点、行数、风险等级、拆分成熟度、安全边界、建议拆分切片和应该运行的回归测试。适合用户要求继续治理几千行大文件、评估下一步该拆哪个组件，或 AI 在修改前需要先判断改动风险时调用。",
+    params: "keyword?, minLines?(默认 1000), limit?(默认 8), includeRecommendations?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_codebase_hotspots",
+        description:
+          "读取 GoNavi 前端大文件和拆分热点快照，返回文件路径、行数、风险等级、拆分成熟度、首选切片、安全拆分边界、建议拆分切片、测试目标和验证计划。适用于用户提到几千行文件太臃肿、需要继续拆分组件、评估下一个重构切入点或在改 UI/AI/MCP 前需要先判断代码热点风险时优先调用。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按路径、模块、风险、拆分切片或测试目标过滤，例如 Sidebar、DataGrid、Redis、事务、连接" },
+            minLines: { type: "number", description: "可选，只返回不少于多少行的热点文件，默认 1000，最大 20000" },
+            limit: { type: "number", description: "可选，最多返回多少个热点，默认 8，最大 30" },
+            includeRecommendations: { type: "boolean", description: "可选，是否返回 suggestedSlices、testTargets 和 nextActions，默认 true" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_sql_snippets",
+    icon: "🧩",
+    desc: "查看 SQL 片段模板",
+    detail:
+      "返回本地 SQL 片段的 prefix、名称、说明和模板预览，可按关键词过滤。适合用户想找现成模板、补全片段、团队约定 SQL 模板时先读取真实片段库。",
+    params: "keyword?, limit?, includeBody?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_sql_snippets",
+        description:
+          "读取本地 SQL 片段模板列表，可按关键词过滤，并返回 prefix、名称、说明和模板预览。适用于用户想找 snippet、复用模板、核对 SQL 片段配置时，先读取真实本地片段库。",
+        parameters: {
+          type: "object",
+          properties: {
+            keyword: { type: "string", description: "可选，按 prefix、名称、描述或模板内容做关键词筛选" },
+            limit: { type: "number", description: "可选，最多返回多少条，默认 20，最大 80" },
+            includeBody: { type: "boolean", description: "可选，是否附带模板内容预览，默认 true" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_shortcuts",
+    icon: "⌨️",
+    desc: "查看当前快捷键配置与平台差异",
+    detail:
+      "返回当前快捷键动作、当前平台绑定、Win/Mac 双平台组合键、是否被用户改过，以及默认值对照。适合用户问“当前这个快捷键是什么”“Win 和 Mac 分别怎么按”“我是不是改过默认快捷键”时先读真实配置。",
+    params: "action?, keyword?, includeDisabled?(默认 true), includeAllPlatforms?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_shortcuts",
+        description:
+          "读取当前 GoNavi 快捷键配置快照，可按动作名或关键词过滤，并返回当前平台绑定、Win/Mac 双平台组合键、默认值和是否被用户改过。适用于用户提到快捷键、Win/Mac 键位差异、当前结果区/AI/查询相关快捷键是什么时，先读取真实配置，不要凭记忆回答默认值。",
+        parameters: {
+          type: "object",
+          properties: {
+            action: { type: "string", description: "可选，按动作 key 精确过滤，例如 toggleQueryResultsPanel、sendAIChatMessage、toggleAIPanel" },
+            keyword: { type: "string", description: "可选，按动作名、说明、作用域、组合键或默认值做关键词筛选" },
+            includeDisabled: { type: "boolean", description: "可选，是否包含当前被禁用的快捷键，默认 true" },
+            includeAllPlatforms: { type: "boolean", description: "可选，是否同时返回 Windows 和 macOS 两个平台绑定，默认 true" },
+          },
+        },
+      },
+    },
+  },
+];
diff --git a/frontend/src/utils/aiBuiltinInspectionMcpToolInfo.ts b/frontend/src/utils/aiBuiltinInspectionMcpToolInfo.ts
new file mode 100644
index 0000000..89ca237
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinInspectionMcpToolInfo.ts
@@ -0,0 +1,176 @@
+import type { AIBuiltinToolInfo } from "./aiBuiltinToolInfo.types";
+
+export const BUILTIN_AI_INSPECTION_MCP_TOOL_INFO: AIBuiltinToolInfo[] = [
+  {
+    name: "inspect_mcp_setup",
+    icon: "🪛",
+    desc: "查看当前 MCP 配置与外部接入状态",
+    detail:
+      "返回当前本地配置了哪些 MCP 服务、哪些已启用、每个服务声明了什么启动命令，以及 Claude Code / Codex 本机客户端写入状态、OpenClaw / Hermans 远程 Agent 接入边界与命令检测结果。适合用户问“我现在配了哪些 MCP”“为什么外部客户端还用不了”“MCP 到底写没写进去”时先读真实状态。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_mcp_setup",
+        description:
+          "读取当前本地 MCP 配置快照，包括 MCP 服务列表、启用状态、启动命令、环境变量 key、已发现工具，以及外部客户端的 GoNavi MCP 写入状态、本机 CLI 检测结果和远程 Agent 接入边界。适用于用户提到 MCP 服务配置、Claude/Codex/OpenClaw/Hermans 是否已接入、为什么外部客户端用不了、当前到底启用了哪些 MCP 时，先读取真实配置再回答。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_mcp_remote_access",
+    icon: "🌉",
+    desc: "查看 OpenClaw/Hermans 远程 MCP 接入方式",
+    detail:
+      "返回 GoNavi Streamable HTTP MCP 的本机启动命令、远程 URL/鉴权填写方式、OpenClaw/Hermans 云端 Agent 接入边界、可选桥接方案和安全提醒。适合用户说“OpenClaw 在云上怎么连 Windows GoNavi”“不要把数据库密码交给 Agent”“HTTP MCP 该怎么暴露”时先读这份远程接入快照。",
+    params: "publicUrl?, localAddr?, path?, exposeStrategy?, tokenConfigured?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_mcp_remote_access",
+        description:
+          "读取 GoNavi MCP 远程 Agent 接入快照，返回 Streamable HTTP 模式启动命令、/mcp URL、Bearer Token 鉴权要求、OpenClaw/Hermans 云端接入步骤、数据库密码留在 Windows 本机的安全边界，以及隧道/反向代理/Tailscale 等暴露方式的风险提示。适用于用户提到 OpenClaw、Hermans、云端 Linux Agent、远程 MCP、不要复制数据库密码、或本机 GoNavi 如何给外部 Agent 访问表结构时优先调用。",
+        parameters: {
+          type: "object",
+          properties: {
+            publicUrl: { type: "string", description: "可选，云端 Agent 最终能访问的 HTTPS 或私有网络 URL；如果没带 /mcp，工具会按 path 补上" },
+            localAddr: { type: "string", description: "可选，Windows 本机 HTTP MCP 监听地址，默认 127.0.0.1:8765；不建议直接绑定 0.0.0.0" },
+            path: { type: "string", description: "可选，Streamable HTTP MCP 路径，默认 /mcp" },
+            exposeStrategy: {
+              type: "string",
+              enum: ["reverse_proxy", "ssh_reverse_tunnel", "cloudflare_tunnel", "tailscale", "custom"],
+              description: "可选，计划使用的远程暴露方式，用于返回对应风险提醒",
+            },
+            tokenConfigured: { type: "boolean", description: "可选，是否已经准备随机 Bearer Token；传 false 会返回鉴权告警" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_mcp_runtime_failures",
+    icon: "🧯",
+    desc: "诊断 MCP 启动与调用失败",
+    detail:
+      "读取 gonavi.log 中最近的 MCP 启动、工具发现、工具调用和 HTTP MCP 子进程异常，结合当前已保存 MCP 服务与已发现工具，返回失败类型、疑似原因、涉及服务和下一步修复动作。适合用户反馈“新增 MCP 测试失败”“工具发现 0 个”“MCP 工具调用失败”“HTTP MCP 启动失败”时先调用。",
+    params: "serverName?, keyword?, lineLimit?(默认 160), includeLines?(默认 false)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_mcp_runtime_failures",
+        description:
+          "读取 GoNavi 应用日志中的 MCP 运行期失败信号，归类 MCP 服务启动失败、工具发现失败、工具调用失败和 HTTP MCP 子进程异常，并结合当前 MCP 服务配置与已发现工具数量返回疑似原因和 nextActions。适用于用户提到新增 MCP 测试失败、工具发现 0 个、MCP 工具调用失败、stdio 断开、命令找不到、Docker MCP 退出或 HTTP MCP 启动失败时，先读取该工具，不要只凭弹窗文案猜测。",
+        parameters: {
+          type: "object",
+          properties: {
+            serverName: { type: "string", description: "可选，只看某个 MCP 服务名或日志中的 server= 名称，例如 GitHub、Browser、DockerFetch" },
+            keyword: { type: "string", description: "可选，在 MCP 相关日志里继续按关键词过滤，例如 timeout、stdio、permission、401、docker" },
+            lineLimit: { type: "number", description: "可选，最多读取多少行日志尾部，默认 160，最大 200" },
+            includeLines: { type: "boolean", description: "可选，是否附带脱敏后的 MCP 日志原文行，默认 false；需要引用原文时再开启" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_mcp_authoring_guide",
+    icon: "🧭",
+    desc: "查看新增 MCP 的填写指引",
+    detail:
+      "返回新增 MCP 表单里各字段的作用、推荐填写顺序、完整命令自动拆分规则，以及 npx / Node / uvx / Python / Docker / EXE 模板样例。适合用户问“command/args/env 到底怎么填”“给我一个 npx / node / uvx / python / docker 示例”“为什么启动命令不能整行填”时，先读这份真实接入指引。",
+    params: "无参数",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_mcp_authoring_guide",
+        description:
+          "读取 GoNavi 当前内置的 MCP 新增指引，包括推荐填写顺序、字段作用、常见命令示例、完整命令自动拆分规则，以及 npx / Node / uvx / Python / Docker / EXE 模板样例。适用于用户提到新增 MCP 不知道 command、args、env、timeout 怎么填，或想要一个最接近的模板时，先读取这份真实前端接入指南，不要凭记忆口述。",
+        parameters: { type: "object", properties: {} },
+      },
+    },
+  },
+  {
+    name: "inspect_mcp_docker_setup",
+    icon: "🐳",
+    desc: "检查 Docker MCP 启动配置",
+    detail:
+      "读取当前已保存的 Docker MCP 服务，检查 command/args 是否正确拆成 docker、run、--rm、-i、镜像名和容器参数，并返回缺失参数、已发现工具数、超时建议和下一步修复动作。适合用户按 Docker README 新增 MCP 后工具发现失败、容器一启动就退出、或不确定 docker run 参数该怎么填时调用。",
+    params: "serverId?, includeDisabled?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_mcp_docker_setup",
+        description:
+          "检查当前已保存 Docker MCP 服务的启动参数，返回 Docker MCP 服务列表、docker run/-i/镜像名/--rm/env/timeout 状态、工具发现数量、配置告警和 nextActions。适用于用户提到 Docker MCP、docker run、容器化 MCP、工具发现 0 个、容器 stdio 断开、或 AI 准备指导用户修复 Docker MCP 配置时，先读取真实配置快照。",
+        parameters: {
+          type: "object",
+          properties: {
+            serverId: { type: "string", description: "可选，只检查某个 MCP serverId；不传则检查全部 Docker MCP" },
+            includeDisabled: { type: "boolean", description: "可选，是否包含已禁用 Docker MCP，默认 true" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_mcp_draft",
+    icon: "🧪",
+    desc: "校验 MCP 新增草稿",
+    detail:
+      "按完整启动命令或分字段草稿试算 GoNavi 的 MCP 新增配置，返回自动拆分结果、启动预览、可应用草稿、命令参数用途提示、环境变量用途提示、字段校验问题、推荐模板和下一步修复建议；命令参数里的敏感值会脱敏。适合用户贴出一整行 MCP 启动命令、问 command/args/env/timeout 该怎么拆，或保存前想确认配置有没有明显问题时使用。",
+    params: "fullCommand?, command?, args?, envText?, timeoutSeconds?, templateKey?, name?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_mcp_draft",
+        description:
+          "校验一份待新增的 MCP 服务草稿。支持传 fullCommand/rawCommand/commandLine 让 GoNavi 自动拆分，也支持传 command、args、envText、timeoutSeconds 和 templateKey 做分字段校验；返回解析后的字段、脱敏启动命令预览、suggestedServerSeed、命令参数用途提示、环境变量 key 的用途和风险提示、错误/告警、推荐模板和 nextActions。适用于用户贴出 MCP README 启动命令、问新增 MCP 参数怎么填、或 AI 准备指导用户保存前，先用真实校验器试算；结果不会回显 api-key/token/password 等敏感参数值。",
+        parameters: {
+          type: "object",
+          properties: {
+            fullCommand: { type: "string", description: "可选，README 或用户贴出的一整行 MCP 启动命令，例如 $env:GITHUB_TOKEN=...; uvx mcp-server-github --stdio" },
+            command: { type: "string", description: "可选，分字段草稿里的启动命令，只应是 npx、node、uvx、python 或 exe 路径本身" },
+            args: {
+              oneOf: [
+                { type: "array", items: { type: "string" } },
+                { type: "string" },
+              ],
+              description: "可选，分字段草稿里的命令参数；数组更准确，也可传逗号或换行分隔字符串",
+            },
+            envText: { type: "string", description: "可选，环境变量草稿，每行 KEY=VALUE；不要传 export、set 或 $env: 前缀" },
+            timeoutSeconds: { type: "number", description: "可选，单次工具发现或调用超时秒数；推荐 20，慢启动服务可用 45 或 60" },
+            templateKey: { type: "string", enum: ["npx", "uvx", "node", "python", "docker", "exe"], description: "可选，先套用一个内置模板再覆盖用户传入字段" },
+            name: { type: "string", description: "可选，MCP 服务名称，例如 GitHub、Filesystem、Browser" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_mcp_tool_schema",
+    icon: "🧩",
+    desc: "查看 MCP 工具参数怎么传",
+    detail:
+      "按 alias、serverId 或关键词查看当前已发现 MCP 工具的 inputSchema，返回必填参数、字段类型、枚举值、嵌套对象路径和调用前提示。适合新增 MCP 成功后，用户或 AI 不知道某个 MCP 工具到底该传哪些参数时先读真实 schema。",
+    params: "alias?, serverId?, keyword?, includeSchema?(默认 false), limit?(默认 8)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_mcp_tool_schema",
+        description:
+          "读取当前已发现 MCP 工具的参数 schema 摘要，可按 alias、serverId 或关键词过滤，并返回必填字段、类型、枚举值、嵌套参数路径和调用前提示。适用于用户问某个 MCP 工具参数怎么填、AI 准备调用外部 MCP 工具但不确定 arguments JSON 怎么写、或工具调用报参数错误时，先读取真实 inputSchema 再继续。",
+        parameters: {
+          type: "object",
+          properties: {
+            alias: { type: "string", description: "可选，按 MCP 工具 alias 精确查询，例如 github_create_issue；优先通过 inspect_mcp_setup 获取真实 alias" },
+            serverId: { type: "string", description: "可选，只看某个 MCP serverId 下发现的工具" },
+            keyword: { type: "string", description: "可选，按工具 alias、原始名称、标题、描述或服务名做关键词筛选" },
+            includeSchema: { type: "boolean", description: "可选，是否附带完整原始 inputSchema，默认 false；需要深查复杂嵌套 schema 时再开启" },
+            limit: { type: "number", description: "可选，最多返回多少个匹配工具，默认 8，最大 30" },
+          },
+        },
+      },
+    },
+  },
+];
diff --git a/frontend/src/utils/aiBuiltinInspectionSqlToolInfo.ts b/frontend/src/utils/aiBuiltinInspectionSqlToolInfo.ts
new file mode 100644
index 0000000..37f0b3d
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinInspectionSqlToolInfo.ts
@@ -0,0 +1,110 @@
+import type { AIBuiltinToolInfo } from "./aiBuiltinToolInfo.types";
+
+export const BUILTIN_AI_INSPECTION_SQL_TOOL_INFO: AIBuiltinToolInfo[] = [
+  {
+    name: "inspect_recent_sql_logs",
+    icon: "🧾",
+    desc: "查看最近 SQL 执行日志",
+    detail:
+      "传入可选 limit 和 status，返回最近 SQL 执行记录，包括数据库、耗时、成功/失败、报错、受影响行数和 SQL 文本。适合追查刚执行失败的语句、定位慢查询，并让 AI 基于真实执行历史给出解释或优化建议。",
+    params: "limit?, status?(all|success|error)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_recent_sql_logs",
+        description:
+          "获取最近 SQL 执行日志摘要，可按成功/失败过滤。适用于回看刚执行过的 SQL、排查失败原因、定位慢查询，以及让 AI 基于真实执行历史给出解释和优化建议。",
+        parameters: {
+          type: "object",
+          properties: {
+            limit: { type: "number", description: "可选，返回多少条日志，默认 20，最大 100" },
+            status: {
+              type: "string",
+              description: "可选，按执行状态过滤，支持 all、success、error，默认 all",
+              enum: ["all", "success", "error"],
+            },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_recent_sql_activity",
+    icon: "📊",
+    desc: "总结最近 SQL 活动分布",
+    detail:
+      "可按 status、activityKind、dbName 和 keyword 过滤，返回最近 SQL 活动的结构化总结，包括读写/DDL 比例、语句类型分布、数据库分布、最近报错、最近写操作和最慢语句。适合用户提到“最近都执行了什么”“是不是刚删过数据”“哪个库最近报错最多”“最近主要在跑查询还是写入”时先读真实执行画像。",
+    params: "limit?, status?(all|success|error), activityKind?(all|read|write|ddl|transaction|session|other), dbName?, keyword?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_recent_sql_activity",
+        description:
+          "汇总最近 SQL 活动的结构化画像，可按执行状态、活动类型、数据库名和关键词过滤。适用于排查最近主要在执行哪些读写操作、某个库近期错误是否集中、是否发生过删除或 DDL、以及让 AI 基于真实执行现场先做全局判断。",
+        parameters: {
+          type: "object",
+          properties: {
+            limit: { type: "number", description: "可选，最近活动样例最多返回多少条，默认 30，最大 100" },
+            status: {
+              type: "string",
+              description: "可选，按执行状态过滤，支持 all、success、error，默认 all",
+              enum: ["all", "success", "error"],
+            },
+            activityKind: {
+              type: "string",
+              description: "可选，按活动类型过滤，支持 all、read、write、ddl、transaction、session、other，默认 all",
+              enum: ["all", "read", "write", "ddl", "transaction", "session", "other"],
+            },
+            dbName: { type: "string", description: "可选，只看数据库名里包含该关键词的日志" },
+            keyword: { type: "string", description: "可选，按 SQL 文本、报错信息、语句类型或数据库名做关键词筛选" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_sql_editor_transaction",
+    icon: "🔁",
+    desc: "查看 SQL 编辑器事务提交状态",
+    detail:
+      "返回 SQL 编辑器 DML 托管事务语义、当前手动/自动提交设置、活动 SQL 页签是否会进入托管事务、待提交事务以及最近写入/事务执行记录。适合用户问“手动/自动提交到底是什么意思”“当前有没有事务没提交”“执行 update/insert/delete 会不会自动提交”时先读真实状态。",
+    params: "includeSqlPreview?(默认 true)",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_sql_editor_transaction",
+        description:
+          "读取 SQL 编辑器事务状态快照，包括 DML 始终进入托管事务的真实语义、当前提交模式、自动提交延迟、活动 SQL 页签是否会触发托管事务、待提交事务列表和最近写入/事务日志。适用于用户提到 SQL 编辑器手动提交、自动提交、未提交事务、DML 执行后是否提交或事务语义不清时，先读取真实状态再解释。",
+        parameters: {
+          type: "object",
+          properties: {
+            includeSqlPreview: { type: "boolean", description: "可选，是否返回活动 SQL 页签的 SQL 预览，默认 true" },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "inspect_sql_risk",
+    icon: "🛑",
+    desc: "检查当前或指定 SQL 的执行风险",
+    detail:
+      "读取传入 SQL 或当前活动查询页签内容，识别多语句、写入、DDL、DELETE/UPDATE 无 WHERE、DROP/TRUNCATE 等风险，并结合当前 AI 安全策略返回是否允许执行。适合用户让 AI 执行、解释风险、确认能不能跑某条 SQL 前先做一次安全体检。",
+    params: "sql?(默认读取当前活动查询页签), previewCharLimit?",
+    tool: {
+      type: "function",
+      function: {
+        name: "inspect_sql_risk",
+        description:
+          "检查传入 SQL 或当前活动查询页签 SQL 的执行风险，返回语句数量、活动类型、风险级别、危险点、是否需要用户确认，以及当前 AI 安全策略检查结果。适用于用户要求执行、删除、更新、DDL、批量 SQL、或询问某条 SQL 能不能跑时，先读取这份风险快照再回答或继续执行。",
+        parameters: {
+          type: "object",
+          properties: {
+            sql: { type: "string", description: "可选，要检查的 SQL；不传时默认读取当前活动查询页签的 SQL 草稿" },
+            previewCharLimit: { type: "number", description: "可选，SQL 预览最多返回多少字符，默认 12000，最大 40000" },
+          },
+        },
+      },
+    },
+  },
+];
diff --git a/frontend/src/utils/aiBuiltinInspectionToolInfo.ts b/frontend/src/utils/aiBuiltinInspectionToolInfo.ts
new file mode 100644
index 0000000..9e01ef3
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinInspectionToolInfo.ts
@@ -0,0 +1,14 @@
+import type { AIBuiltinToolInfo } from "./aiBuiltinToolInfo.types";
+import { BUILTIN_AI_INSPECTION_CONTEXT_TOOL_INFO } from "./aiBuiltinInspectionContextToolInfo";
+import { BUILTIN_AI_INSPECTION_CORE_TOOL_INFO } from "./aiBuiltinInspectionCoreToolInfo";
+import { BUILTIN_AI_INSPECTION_DIAGNOSTICS_TOOL_INFO } from "./aiBuiltinInspectionDiagnosticsToolInfo";
+import { BUILTIN_AI_INSPECTION_MCP_TOOL_INFO } from "./aiBuiltinInspectionMcpToolInfo";
+import { BUILTIN_AI_INSPECTION_SQL_TOOL_INFO } from "./aiBuiltinInspectionSqlToolInfo";
+
+export const BUILTIN_AI_INSPECTION_TOOL_INFO: AIBuiltinToolInfo[] = [
+  ...BUILTIN_AI_INSPECTION_CORE_TOOL_INFO,
+  ...BUILTIN_AI_INSPECTION_MCP_TOOL_INFO,
+  ...BUILTIN_AI_INSPECTION_CONTEXT_TOOL_INFO,
+  ...BUILTIN_AI_INSPECTION_SQL_TOOL_INFO,
+  ...BUILTIN_AI_INSPECTION_DIAGNOSTICS_TOOL_INFO,
+];
diff --git a/frontend/src/utils/aiBuiltinToolCatalog.test.ts b/frontend/src/utils/aiBuiltinToolCatalog.test.ts
new file mode 100644
index 0000000..d7e25ae
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinToolCatalog.test.ts
@@ -0,0 +1,97 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  BUILTIN_TOOL_FLOWS,
+  describeBuiltinToolParameters,
+  filterBuiltinToolFlows,
+  filterBuiltinTools,
+} from './aiBuiltinToolCatalog';
+import type { AIBuiltinToolInfo } from './aiBuiltinToolInfo.types';
+import { BUILTIN_AI_TOOL_INFO } from './aiToolRegistry';
+
+describe('describeBuiltinToolParameters', () => {
+  it('extracts type, required, enum, default, and example hints from builtin tool schemas', () => {
+    const tool: AIBuiltinToolInfo = {
+      name: 'inspect_demo',
+      icon: '🧪',
+      desc: '测试工具',
+      detail: '用于测试参数提示提取。',
+      params: 'lineLimit?, mode?, serverName?',
+      tool: {
+        type: 'function',
+        function: {
+          name: 'inspect_demo',
+          description: '测试工具',
+          parameters: {
+            type: 'object',
+            required: ['mode'],
+            properties: {
+              lineLimit: { type: 'number', description: '可选，最多读取多少行，默认 160，最大 200' },
+              mode: { type: 'string', enum: ['fast', 'safe'], default: 'safe', description: '运行模式' },
+              serverName: { type: 'string', description: '可选，例如 GitHub、Browser、DockerFetch' },
+              includeDisabled: { type: ['boolean', 'null'], description: '是否包含禁用项，默认 false' },
+            },
+          },
+        },
+      },
+    };
+
+    expect(describeBuiltinToolParameters(tool)).toEqual([
+      {
+        name: 'lineLimit',
+        required: false,
+        typeLabel: 'number',
+        description: '可选，最多读取多少行，默认 160，最大 200',
+        enumValues: [],
+        defaultValue: '160',
+        exampleValue: '',
+      },
+      {
+        name: 'mode',
+        required: true,
+        typeLabel: 'string',
+        description: '运行模式',
+        enumValues: ['fast', 'safe'],
+        defaultValue: 'safe',
+        exampleValue: '',
+      },
+      {
+        name: 'serverName',
+        required: false,
+        typeLabel: 'string',
+        description: '可选，例如 GitHub、Browser、DockerFetch',
+        enumValues: [],
+        defaultValue: '',
+        exampleValue: 'GitHub、Browser、DockerFetch',
+      },
+      {
+        name: 'includeDisabled',
+        required: false,
+        typeLabel: 'boolean | null',
+        description: '是否包含禁用项，默认 false',
+        enumValues: [],
+        defaultValue: 'false',
+        exampleValue: '',
+      },
+    ]);
+  });
+
+  it('filters flows and tools by parameter names and descriptions', () => {
+    const allowMutatingTools = filterBuiltinTools(BUILTIN_AI_TOOL_INFO, 'allowMutating')
+      .map((tool) => tool.name);
+    expect(allowMutatingTools).toContain('inspect_ai_safety');
+    expect(allowMutatingTools).not.toContain('inspect_mcp_runtime_failures');
+
+    const executeSqlTools = filterBuiltinTools(BUILTIN_AI_TOOL_INFO, '要执行的 SQL 语句')
+      .map((tool) => tool.name);
+    expect(executeSqlTools).toContain('execute_sql');
+
+    const mcpFlows = filterBuiltinToolFlows(BUILTIN_TOOL_FLOWS, '运行期失败日志')
+      .map((flow) => flow.title);
+    expect(mcpFlows).toContain('排查 MCP 接入状态');
+
+    const codebaseFlows = filterBuiltinToolFlows(BUILTIN_TOOL_FLOWS, '拆分热点')
+      .map((flow) => flow.title);
+    expect(codebaseFlows).toContain('治理前端大文件');
+  });
+});
diff --git a/frontend/src/utils/aiBuiltinToolCatalog.ts b/frontend/src/utils/aiBuiltinToolCatalog.ts
new file mode 100644
index 0000000..3ae1859
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinToolCatalog.ts
@@ -0,0 +1,349 @@
+import type { AIBuiltinToolInfo } from './aiBuiltinToolInfo.types';
+
+export interface AIBuiltinToolFlow {
+  title: string;
+  steps: string;
+  description: string;
+}
+
+export interface AIBuiltinToolParameterHint {
+  name: string;
+  required: boolean;
+  typeLabel: string;
+  description: string;
+  enumValues: string[];
+  defaultValue: string;
+  exampleValue: string;
+}
+
+export const BUILTIN_TOOL_FLOWS: AIBuiltinToolFlow[] = [
+  {
+    title: '定位表与字段',
+    steps: 'get_connections -> get_databases -> get_tables -> get_columns',
+    description: '适合先找连接、找库、找表，再确认真实字段名后生成 SQL。',
+  },
+  {
+    title: '字段反查表',
+    steps: 'get_databases -> get_all_columns',
+    description: '适合只知道字段名、业务含义或注释关键词，但还不确定具体落在哪张表。',
+  },
+  {
+    title: '结构深挖',
+    steps: 'get_columns -> get_indexes -> get_foreign_keys -> get_triggers -> get_table_ddl',
+    description: '适合做索引优化、关系梳理、隐式副作用排查和 DDL 审查。',
+  },
+  {
+    title: '一键结构快照',
+    steps: 'inspect_table_bundle',
+    description: '适合一次带回字段、索引、外键、触发器和 DDL；必要时还能附带样例行，减少来回调用。',
+  },
+  {
+    title: '全库快速摸底',
+    steps: 'inspect_database_bundle -> inspect_table_bundle',
+    description: '适合先看整库有哪些表、每张表大概有哪些字段，再对目标表继续做深挖快照。',
+  },
+  {
+    title: 'AI 应用健康总览',
+    steps: 'inspect_app_health -> inspect_ai_setup_health / inspect_app_logs / inspect_recent_connection_failures / inspect_ai_last_render_error / inspect_ai_message_flow',
+    description: '适合用户反馈 AI 不稳定、连接和 MCP 问题交织、回复气泡显示异常，或需要先看整体健康状态时，一次汇总配置、日志、连接失败、渲染异常、消息流和工作区现场。',
+  },
+  {
+    title: '导出 AI 排障支持包',
+    steps: 'inspect_ai_support_bundle -> inspect_app_health / inspect_ai_context_budget / inspect_ai_message_flow / inspect_mcp_remote_access',
+    description: '适合需要一次性带走排障证据，或用户反馈 AI 不成熟、不稳定、MCP/连接/日志/上下文都可能相关时，先生成不含密钥和数据库密码的支持包。',
+  },
+  {
+    title: '选择 AI 工具路线',
+    steps: 'inspect_ai_tool_catalog -> inspect_ai_runtime / inspect_mcp_setup',
+    description: '适合先按关键词确认该用哪些内置探针、每个工具 arguments 怎么填，以及当前有没有外部 MCP 工具可用。',
+  },
+  {
+    title: '一键体检 AI 配置',
+    steps: 'inspect_ai_setup_health -> inspect_ai_providers / inspect_mcp_setup / inspect_ai_guidance',
+    description: '适合先拿到一份 AI 配置健康快照，看清当前是供应商没配好、聊天发送前置没满足、MCP 没接入，还是提示词 / Skills / 上下文还不完整，再决定往哪条探针继续下钻。',
+  },
+  {
+    title: '查看 AI 当前能力',
+    steps: 'inspect_ai_runtime -> inspect_ai_context / inspect_current_connection',
+    description: '适合先确认当前模型、安全级别、上下文级别、Skills 和 MCP 工具，再决定让 AI 走哪条探针链路。',
+  },
+  {
+    title: '核对写入安全边界',
+    steps: 'inspect_ai_safety -> inspect_ai_runtime -> inspect_current_connection',
+    description: '适合先确认当前是不是只读、DDL/DML 到底允不允许、MCP 写操作是否还需要 allowMutating，再决定后续该走查询、改数据还是改结构。',
+  },
+  {
+    title: '排查供应商与模型',
+    steps: 'inspect_ai_providers -> inspect_ai_runtime',
+    description: '适合先确认当前到底配置了哪些供应商、哪个在生效、有没有缺密钥或没选模型，再解释为什么 AI 不能发送、为什么模型列表为空。',
+  },
+  {
+    title: '排查聊天发送状态',
+    steps: 'inspect_ai_chat_readiness -> inspect_ai_providers',
+    description: '适合先确认当前聊天输入区到底缺什么前置条件，例如没选活动供应商、缺密钥、缺接口地址、没选模型，避免只凭界面现象猜测。',
+  },
+  {
+    title: '追踪 AI 上游请求',
+    steps: 'inspect_ai_upstream_logs -> inspect_ai_providers / inspect_ai_message_flow',
+    description: '适合用户想看发给上游模型的真实入参、requestId、状态码、耗时或请求体预览时，先读脱敏后的 gonavi.log 请求记录，再结合供应商配置和当前消息流继续排查。',
+  },
+  {
+    title: '排查 MCP 接入状态',
+    steps: 'inspect_mcp_setup -> inspect_mcp_runtime_failures -> inspect_ai_runtime',
+    description: '适合先确认当前配置了哪些 MCP 服务、哪些已启用、外部客户端有没有写入当前 GoNavi 路径，再结合 MCP 运行期失败日志判断为什么某个工具没暴露出来。',
+  },
+  {
+    title: '远程 Agent 接入 GoNavi MCP',
+    steps: 'inspect_mcp_remote_access -> inspect_mcp_setup -> inspect_ai_safety',
+    description: '适合 OpenClaw/Hermans 部署在云端 Linux，但数据库连接和密码只在 Windows GoNavi 本机时，先生成 HTTP MCP、Bearer Token、隧道和安全边界指引。',
+  },
+  {
+    title: '新增 MCP 填写指引',
+    steps: 'inspect_mcp_authoring_guide -> inspect_mcp_draft -> inspect_mcp_setup',
+    description: '适合先读真实字段说明、模板样例和整行命令拆分规则，再把用户贴出的命令或草稿交给真实校验器试算，最后结合当前 MCP 配置现状判断应该新增哪种启动方式。',
+  },
+  {
+    title: '排查 Docker MCP 启动',
+    steps: 'inspect_mcp_runtime_failures -> inspect_mcp_docker_setup -> inspect_mcp_draft',
+    description: '适合用户按 Docker README 新增 MCP 后发现 0 个工具、容器一启动就退出，或不确定 docker run 参数是否拆对时，先看运行期失败原因，再检查 run、-i、镜像名和超时设置。',
+  },
+  {
+    title: '查看 MCP 工具参数',
+    steps: 'inspect_mcp_setup -> inspect_mcp_tool_schema',
+    description: '适合先找到当前真实发现到的 MCP 工具 alias，再读取对应 inputSchema、必填字段、枚举和嵌套参数路径，避免调用外部 MCP 工具时乱填 arguments。',
+  },
+  {
+    title: '查看当前提示与 Skills',
+    steps: 'inspect_ai_guidance -> inspect_ai_runtime',
+    description: '适合先确认当前自定义提示词、启用的 Skills、依赖工具和生效范围，再解释为什么 AI 当前会这样回答或为什么某个规则没有触发。',
+  },
+  {
+    title: '查看当前 AI 上下文',
+    steps: 'inspect_ai_context -> inspect_table_bundle / get_columns',
+    description: '适合先确认这轮对话当前到底挂了哪些表结构，再继续做字段核对、表设计评审或 SQL 生成。',
+  },
+  {
+    title: '查看当前连接',
+    steps: 'inspect_current_connection -> get_databases / get_tables',
+    description: '适合先确认当前活动数据源的类型、地址、当前库和 SSH/代理状态，再继续做库表探索或连接问题排查。',
+  },
+  {
+    title: '核对数据源能力边界',
+    steps: 'inspect_connection_capabilities -> inspect_current_connection',
+    description: '适合先确认当前连接到底支不支持建库、删库、结果编辑、SQL 导出或近似计数，再解释为什么某些按钮没出现或某类操作只能只读。',
+  },
+  {
+    title: '盘点本地连接资产',
+    steps: 'inspect_saved_connections -> inspect_current_connection / get_databases',
+    description: '适合先按关键词或类型筛出本地保存的数据源，再挑目标连接继续看当前状态或库表结构。',
+  },
+  {
+    title: '诊断 Redis 拓扑',
+    steps: 'inspect_redis_topology -> inspect_current_connection / inspect_app_logs',
+    description: '适合用户问 Redis 哨兵、Cluster、多节点、切库失败或 SSH 隧道不可用时，先拿到状态分级、脱敏 URI、后端适配器、DB 语义和下一步动作。',
+  },
+  {
+    title: '盘点外部 SQL 目录',
+    steps: 'inspect_external_sql_directories -> inspect_workspace_tabs / inspect_active_tab',
+    description: '适合先确认本地配置了哪些外部 SQL 目录、目录绑定到哪个连接/库，以及当前打开的 SQL 文件来自哪里，再继续分析脚本内容。',
+  },
+  {
+    title: '读取外部 SQL 文件',
+    steps: 'inspect_external_sql_directories -> inspect_external_sql_file -> inspect_active_tab',
+    description: '适合先定位具体脚本路径，再直接读取目录中的 SQL 文件内容；如果这个文件已经在编辑器里打开，再继续结合当前页签草稿一起分析。',
+  },
+  {
+    title: '读取当前页签',
+    steps: 'inspect_active_tab -> get_columns / get_indexes / execute_sql',
+    description: '适合先读取当前编辑器里的 SQL 草稿或当前表页签，再继续做字段核对、索引分析和只读验证。',
+  },
+  {
+    title: '盘点当前工作区',
+    steps: 'inspect_workspace_tabs -> inspect_active_tab -> get_columns / execute_sql',
+    description: '适合先看当前打开了哪些 SQL / 表 / 命令页签，再切到目标页签继续做字段核对、对比分析和只读验证。',
+  },
+  {
+    title: '查看当前快捷键配置',
+    steps: 'inspect_shortcuts -> inspect_active_tab / inspect_workspace_tabs',
+    description: '适合先确认当前 Win / Mac 快捷键、是否改过默认值，以及结果区、AI 面板、查询执行等动作到底该怎么按，再结合当前页签解释具体使用场景。',
+  },
+  {
+    title: '回看最近执行记录',
+    steps: 'inspect_recent_sql_logs -> get_columns / get_indexes / execute_sql',
+    description: '适合追查刚刚执行失败的 SQL、慢查询耗时，或基于真实执行历史继续让 AI 给解释和优化建议。',
+  },
+  {
+    title: '总结最近 SQL 活动',
+    steps: 'inspect_recent_sql_activity -> inspect_recent_sql_logs -> inspect_current_connection',
+    description: '适合先看最近到底以读还是写为主、有没有 DDL 或删除、哪个库最近报错最多，再决定继续下钻哪条日志或哪个连接。',
+  },
+  {
+    title: '核对 SQL 编辑器事务',
+    steps: 'inspect_sql_editor_transaction -> inspect_recent_sql_activity -> inspect_sql_risk',
+    description: '适合先确认 SQL 编辑器 DML 是否会进入托管事务、当前是手动还是自动提交、有没有待提交事务，再解释 update/insert/delete 执行后的提交语义。',
+  },
+  {
+    title: 'SQL 风险预检',
+    steps: 'inspect_sql_risk -> inspect_ai_safety -> execute_sql',
+    description: '适合用户要求执行、删除、更新、DDL 或批量 SQL 前，先检查语句数量、写入/DDL 风险、WHERE 条件和当前安全策略，再决定是否需要用户确认。',
+  },
+  {
+    title: '排查应用日志',
+    steps: 'inspect_app_logs -> inspect_mcp_setup / inspect_saved_connections / inspect_current_connection',
+    description: '适合先回看 gonavi.log 尾部的 ERROR/WARN，再结合 MCP、连接和当前数据源状态继续定位启动异常、连接失败或外部工具拉起问题。',
+  },
+  {
+    title: '排查连接失败与冷却',
+    steps: 'inspect_recent_connection_failures -> inspect_current_connection / inspect_saved_connections / inspect_app_logs',
+    description: '适合用户直接问“为什么连接不上”或已经看到冷却/验证失败提示时，先拿到结构化根因、最新地址和下一步建议，再决定回到连接配置还是看更长日志。',
+  },
+  {
+    title: '排查 AI 气泡渲染异常',
+    steps: 'inspect_ai_last_render_error -> inspect_active_tab / inspect_ai_runtime',
+    description: '适合用户反馈 AI 某条消息空白、气泡局部报错但整个面板没挂时，先拿到最近一次被隔离的渲染异常快照，再回到具体会话和运行时上下文继续缩小范围。',
+  },
+  {
+    title: '诊断 AI 消息流',
+    steps: 'inspect_ai_message_flow -> inspect_ai_last_render_error / inspect_app_logs',
+    description: '适合用户反馈回复被拆成多个气泡、工具调用后没继续回答、消息流状态不对时，先读取当前会话的真实消息结构和异常信号。',
+  },
+  {
+    title: '诊断 AI 上下文体量',
+    steps: 'inspect_ai_context_budget -> inspect_ai_context / inspect_ai_message_flow / inspect_ai_tool_catalog',
+    description: '适合用户反馈 AI 变慢、乱答、上下文太大、工具结果过长或表结构挂太多时，先看消息、DDL、MCP schema、提示词和 Skills 的体量来源，再决定收窄上下文或拆任务。',
+  },
+  {
+    title: '治理前端大文件',
+    steps: 'inspect_codebase_hotspots -> inspect_ai_tool_catalog',
+    description: '适合用户要求继续拆分几千行组件、评估下一步重构切入点，或 AI 修改 UI/AI/MCP 前先判断大文件拆分热点、风险和验证范围。',
+  },
+  {
+    title: '复用历史 SQL',
+    steps: 'inspect_saved_queries -> get_columns / execute_sql',
+    description: '适合先找本地保存过的查询脚本，再核对字段和只读验证，避免把之前写过的 SQL 重新手打一遍。',
+  },
+  {
+    title: '回看 AI 历史对话',
+    steps: 'inspect_ai_sessions -> inspect_active_tab / inspect_saved_queries',
+    description: '适合先定位之前聊过的 AI 会话、首条问题和最近回复，再继续复用当前页签或历史 SQL 上下文。',
+  },
+  {
+    title: '查找模板片段',
+    steps: 'inspect_sql_snippets',
+    description: '适合先找团队已有的 SQL 片段模板、补全前缀和常用骨架，再决定是否继续改写。',
+  },
+  {
+    title: '理解样例数据',
+    steps: 'get_columns -> preview_table_rows',
+    description: '适合先确认字段，再直接查看前几行真实样例数据和空值形态。',
+  },
+  {
+    title: '只读验证',
+    steps: 'get_columns -> preview_table_rows -> execute_sql',
+    description: '适合生成 SQL 后做小范围结果核对，仍会受 AI 安全级别控制。',
+  },
+];
+
+const stringifyHintValue = (value: unknown): string => {
+  if (value === undefined) return '';
+  if (value === null) return 'null';
+  if (typeof value === 'string') return value;
+  if (typeof value === 'number' || typeof value === 'boolean') return String(value);
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+};
+
+const readTypeLabel = (schema: Record<string, any>): string => {
+  if (Array.isArray(schema.type)) {
+    return schema.type.map((item) => String(item)).filter(Boolean).join(' | ') || 'any';
+  }
+  if (typeof schema.type === 'string' && schema.type.trim()) {
+    return schema.type.trim();
+  }
+  if (Array.isArray(schema.enum) && schema.enum.length > 0) {
+    return 'enum';
+  }
+  return 'any';
+};
+
+const readDefaultValue = (schema: Record<string, any>, description: string): string => {
+  if (Object.prototype.hasOwnProperty.call(schema, 'default')) {
+    return stringifyHintValue(schema.default);
+  }
+  const match = description.match(/默认\s*([^\s，,；;。)）]+)/u);
+  return match?.[1]?.trim() || '';
+};
+
+const readExampleValue = (description: string): string => {
+  const match = description.match(/(?:例如|示例值?[:：])\s*([^。；;\n]+)/u);
+  return match?.[1]?.trim() || '';
+};
+
+export const describeBuiltinToolParameters = (tool: AIBuiltinToolInfo): AIBuiltinToolParameterHint[] => {
+  const schema = tool.tool.function.parameters;
+  const properties = schema && typeof schema === 'object' && typeof schema.properties === 'object'
+    ? schema.properties
+    : {};
+  const required = new Set(
+    Array.isArray(schema?.required) ? schema.required.map((item) => String(item)) : [],
+  );
+
+  return Object.entries(properties).map(([name, config]) => {
+    const normalized = config && typeof config === 'object' ? config as Record<string, any> : {};
+    const description = typeof normalized.description === 'string' ? normalized.description : '';
+    return {
+      name,
+      required: required.has(name),
+      typeLabel: readTypeLabel(normalized),
+      description,
+      enumValues: Array.isArray(normalized.enum) ? normalized.enum.map((item) => String(item)) : [],
+      defaultValue: readDefaultValue(normalized, description),
+      exampleValue: readExampleValue(description),
+    };
+  });
+};
+
+export const normalizeBuiltinToolCatalogSearch = (value: string): string =>
+  value.trim().toLowerCase();
+
+const matchesCatalogSearch = (keyword: string, values: unknown[]): boolean =>
+  !keyword || values.some((value) => String(value || '').toLowerCase().includes(keyword));
+
+export const filterBuiltinToolFlows = (
+  flows: AIBuiltinToolFlow[],
+  searchText: string,
+): AIBuiltinToolFlow[] => {
+  const keyword = normalizeBuiltinToolCatalogSearch(searchText);
+  return flows.filter((flow) => matchesCatalogSearch(keyword, [
+    flow.title,
+    flow.steps,
+    flow.description,
+  ]));
+};
+
+export const filterBuiltinTools = (
+  tools: AIBuiltinToolInfo[],
+  searchText: string,
+): AIBuiltinToolInfo[] => {
+  const keyword = normalizeBuiltinToolCatalogSearch(searchText);
+  return tools.filter((tool) => {
+    const parameterDetails = describeBuiltinToolParameters(tool);
+    return matchesCatalogSearch(keyword, [
+      tool.name,
+      tool.desc,
+      tool.detail,
+      tool.params,
+      ...parameterDetails.flatMap((item) => [
+        item.name,
+        item.typeLabel,
+        item.description,
+        item.defaultValue,
+        item.exampleValue,
+        item.enumValues.join(' '),
+      ]),
+    ]);
+  });
+};
diff --git a/frontend/src/utils/aiBuiltinToolInfo.ts b/frontend/src/utils/aiBuiltinToolInfo.ts
new file mode 100644
index 0000000..44ea2c2
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinToolInfo.ts
@@ -0,0 +1,12 @@
+import { BUILTIN_AI_DATABASE_TOOL_INFO } from "./aiBuiltinDatabaseToolInfo";
+import { BUILTIN_AI_INSPECTION_TOOL_INFO } from "./aiBuiltinInspectionToolInfo";
+
+export type {
+  AIChatToolDefinition,
+  AIBuiltinToolInfo,
+} from "./aiBuiltinToolInfo.types";
+
+export const BUILTIN_AI_TOOL_INFO = [
+  ...BUILTIN_AI_DATABASE_TOOL_INFO,
+  ...BUILTIN_AI_INSPECTION_TOOL_INFO,
+];
diff --git a/frontend/src/utils/aiBuiltinToolInfo.types.ts b/frontend/src/utils/aiBuiltinToolInfo.types.ts
new file mode 100644
index 0000000..9c6034f
--- /dev/null
+++ b/frontend/src/utils/aiBuiltinToolInfo.types.ts
@@ -0,0 +1,17 @@
+export interface AIChatToolDefinition {
+  type: "function";
+  function: {
+    name: string;
+    description: string;
+    parameters: Record<string, any>;
+  };
+}
+
+export interface AIBuiltinToolInfo {
+  name: string;
+  icon: string;
+  desc: string;
+  detail: string;
+  params: string;
+  tool: AIChatToolDefinition;
+}
diff --git a/frontend/src/utils/aiChatRuntime.test.ts b/frontend/src/utils/aiChatRuntime.test.ts
new file mode 100644
index 0000000..ae9ea25
--- /dev/null
+++ b/frontend/src/utils/aiChatRuntime.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest';
+
+import { compressContextIfNeeded, getDynamicMaxContextChars, sanitizeErrorMsg } from './aiChatRuntime';
+
+describe('aiChatRuntime', () => {
+  it('maps modern model families to practical context windows', () => {
+    expect(getDynamicMaxContextChars('gemini-2.5-pro')).toBe(5000000);
+    expect(getDynamicMaxContextChars('gpt-5')).toBe(1000000);
+    expect(getDynamicMaxContextChars('claude-4-sonnet')).toBe(1000000);
+    expect(getDynamicMaxContextChars('gpt-4o')).toBe(128000);
+    expect(getDynamicMaxContextChars()).toBe(258000);
+  });
+
+  it('sanitizes html gateway errors and truncates oversized plain text errors', () => {
+    expect(sanitizeErrorMsg('<html><head><title>502 Bad Gateway</title></head></html>')).toBe('HTTP 502: 502 Bad Gateway');
+    expect(sanitizeErrorMsg('x'.repeat(320))).toBe(`${'x'.repeat(280)}...(已截断)`);
+    expect(sanitizeErrorMsg('permission denied')).toBe('permission denied');
+  });
+
+  it('skips compression when the payload is still within the configured limit', async () => {
+    const result = await compressContextIfNeeded('session-1', [
+      { role: 'user', content: 'short prompt' },
+      { role: 'assistant', content: 'short answer' },
+    ], 1000);
+
+    expect(result).toBeNull();
+  });
+});
diff --git a/frontend/src/utils/aiChatRuntime.ts b/frontend/src/utils/aiChatRuntime.ts
new file mode 100644
index 0000000..801e27c
--- /dev/null
+++ b/frontend/src/utils/aiChatRuntime.ts
@@ -0,0 +1,90 @@
+import { useStore } from '../store';
+
+const genCompressionMessageId = () => `msg-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
+
+export const getDynamicMaxContextChars = (modelName?: string) => {
+  if (!modelName) return 258000;
+  const lower = modelName.toLowerCase();
+
+  if (lower.includes('gemini-1.5-pro') || lower.includes('gemini-2') || lower.includes('gemini-3')) {
+    return 5000000;
+  }
+  if (lower.includes('glm-5') || lower.includes('claude-4') || lower.includes('claude-3.7') || lower.includes('gpt-5') || lower.includes('qwen3') || lower.includes('deepseek-v4')) {
+    return 1000000;
+  }
+  if (lower.includes('claude-3-opus') || lower.includes('claude-3.5') || lower.includes('glm-4-long') || lower.includes('qwen-long')) {
+    return 1000000;
+  }
+  if (lower.includes('claude') || lower.includes('deepseek') || lower.includes('gpt-4.5') || lower.includes('qwen2.5')) {
+    return 258000;
+  }
+  if (lower.includes('gpt-4') || lower.includes('gpt-4o') || lower.includes('glm') || lower.includes('z-ai')) {
+    return 128000;
+  }
+  if (lower.includes('qwen')) {
+    return 128000;
+  }
+  return 258000;
+};
+
+export const compressContextIfNeeded = async (sid: string, messagesPayload: any[], maxLimit: number) => {
+  try {
+    const chars = messagesPayload.reduce((sum, message) =>
+      sum + (message.content?.length || 0) + (message.reasoning_content?.length || 0) + JSON.stringify(message.tool_calls || []).length, 0);
+    if (chars < maxLimit) return null;
+
+    const Service = (window as any).go?.aiservice?.Service;
+    if (!Service?.AIChatSend) return null;
+
+    const connectingMsgId = genCompressionMessageId();
+    useStore.getState().addAIChatMessage(sid, {
+      id: connectingMsgId,
+      role: 'assistant',
+      phase: 'connecting',
+      content: '⚙️ 对话已超载，正在启动记忆压缩...',
+      timestamp: Date.now(),
+      loading: true,
+    });
+
+    const summaryPrompt = `这是一段超长对话的历史记录。为了释放上下文空间同时保留你的记忆核心，请你仔细阅读并以“技术事实、已探索出的数据结构状态、用户的中心诉求、当前进展”为准则，进行高度浓缩的结构化总结。
+注意：
+1. 客观准确，不能遗漏关键业务逻辑或探索出的表名/字段。
+2. 剔除无效执行过程、客套话、JSON返回值本身。
+3. 请控制在 1000-2000 字左右，输出纯干货 Markdown。
+4. 开头直接输出总结，不要带寒暄。`;
+
+    const result = await Service.AIChatSend([
+      { role: 'system', content: summaryPrompt },
+      ...messagesPayload,
+    ]);
+
+    if (result?.success && result.content) {
+      useStore.getState().deleteAIChatMessage(sid, connectingMsgId);
+      return result.content;
+    }
+
+    useStore.getState().updateAIChatMessage(sid, connectingMsgId, {
+      loading: false,
+      phase: 'idle',
+      content: '❌ 记忆压缩失败，将尝试原样接续...',
+    });
+  } catch (error) {
+    console.error('Compression exception:', error);
+  }
+  return null;
+};
+
+export const sanitizeErrorMsg = (raw: string): string => {
+  if (!raw || typeof raw !== 'string') return '未知错误';
+  if (raw.includes('<html') || raw.includes('<!DOCTYPE') || raw.includes('<head')) {
+    const titleMatch = raw.match(/<title[^>]*>([^<]+)<\/title>/i);
+    const codeMatch = raw.match(/\b(4\d{2}|5\d{2})\b/);
+    const title = titleMatch?.[1]?.trim();
+    const code = codeMatch?.[1];
+    if (title) return code ? `HTTP ${code}: ${title}` : title;
+    if (code) return `HTTP ${code} 服务端错误`;
+    return '服务端返回了异常 HTML 响应（可能是网关超时或服务不可用）';
+  }
+  if (raw.length > 300) return `${raw.substring(0, 280)}...(已截断)`;
+  return raw;
+};
diff --git a/frontend/src/utils/aiComposerNotice.test.ts b/frontend/src/utils/aiComposerNotice.test.ts
index 2b7b047..f22f774 100644
--- a/frontend/src/utils/aiComposerNotice.test.ts
+++ b/frontend/src/utils/aiComposerNotice.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest';
 
 import {
   buildAIComposerNotice,
+  buildIncompleteProviderNotice,
   buildModelFetchFailedNotice,
   buildMissingModelNotice,
   buildMissingProviderNotice,
@@ -13,19 +14,39 @@ const t = (key: string, params?: Record<string, unknown>) => {
 };
 
 describe('ai composer notice helpers', () => {
-  it('builds a translated compact notice for missing provider', () => {
+  it('builds a translated compact notice for missing provider with an action', () => {
     expect(buildMissingProviderNotice(t)).toEqual({
       tone: 'warning',
       title: 'ai_chat.composer_notice.missing_provider.title',
       description: 'ai_chat.composer_notice.missing_provider.description',
+      action: {
+        key: 'open-settings',
+        label: '打开 AI 设置',
+      },
     });
   });
 
-  it('builds a translated compact notice for missing model selection', () => {
+  it('builds a translated compact notice for missing model selection with an action', () => {
     expect(buildMissingModelNotice(t)).toEqual({
       tone: 'warning',
       title: 'ai_chat.composer_notice.missing_model.title',
       description: 'ai_chat.composer_notice.missing_model.description',
+      action: {
+        key: 'reload-models',
+        label: '重新加载模型',
+      },
+    });
+  });
+
+  it('builds a translated incomplete provider notice from readiness issues', () => {
+    expect(buildIncompleteProviderNotice(['missing_secret', 'missing_base_url'], t)).toEqual({
+      tone: 'error',
+      title: '当前供应商还缺少 密钥、接口地址',
+      description: '先补全供应商配置再发送，避免请求刚发起就失败。',
+      action: {
+        key: 'open-settings',
+        label: '修复供应商配置',
+      },
     });
   });
 
@@ -34,6 +55,10 @@ describe('ai composer notice helpers', () => {
       tone: 'error',
       title: 'ai_chat.composer_notice.model_fetch_failed.title',
       description: 'ai_chat.composer_notice.model_fetch_failed.detail_description:当前接口未返回可用模型',
+      action: {
+        key: 'reload-models',
+        label: '重新加载模型',
+      },
     });
   });
 
@@ -42,6 +67,22 @@ describe('ai composer notice helpers', () => {
       tone: 'error',
       title: 'ai_chat.composer_notice.model_fetch_failed.title',
       description: 'ai_chat.composer_notice.model_fetch_failed.default_description',
+      action: {
+        key: 'reload-models',
+        label: '重新加载模型',
+      },
+    });
+  });
+
+  it('keeps a non-translated compatibility path for direct notices', () => {
+    expect(buildModelFetchFailedNotice('当前接口未返回可用模型')).toEqual({
+      tone: 'error',
+      title: '模型列表加载失败',
+      description: '当前接口未返回可用模型',
+      action: {
+        key: 'reload-models',
+        label: '重新加载模型',
+      },
     });
   });
 
@@ -60,11 +101,19 @@ describe('ai composer notice helpers', () => {
       tone: 'error',
       title: 'zh:ai_chat.composer_notice.model_fetch_failed.title',
       description: 'zh:ai_chat.composer_notice.model_fetch_failed.detail_description:HTTP 401 原始错误',
+      action: {
+        key: 'reload-models',
+        label: 'zh:ai_chat.composer_notice.action.reload_models',
+      },
     });
     expect(relocalized).toEqual({
       tone: 'error',
       title: 'en:ai_chat.composer_notice.model_fetch_failed.title',
       description: 'en:ai_chat.composer_notice.model_fetch_failed.detail_description:HTTP 401 原始错误',
+      action: {
+        key: 'reload-models',
+        label: 'en:ai_chat.composer_notice.action.reload_models',
+      },
     });
   });
 
diff --git a/frontend/src/utils/aiComposerNotice.ts b/frontend/src/utils/aiComposerNotice.ts
index 44597f7..6dbb3b8 100644
--- a/frontend/src/utils/aiComposerNotice.ts
+++ b/frontend/src/utils/aiComposerNotice.ts
@@ -1,14 +1,23 @@
+import type { AIChatReadinessIssue } from '../components/ai/aiChatReadiness';
+import { formatAIChatProviderIssueLabels } from '../components/ai/aiChatReadiness';
+
 export type AIComposerNoticeTone = 'warning' | 'error';
+export type AIComposerNoticeAction = 'open-settings' | 'reload-models';
 
 export interface AIComposerNotice {
   tone: AIComposerNoticeTone;
   title: string;
   description: string;
+  action?: {
+    key: AIComposerNoticeAction;
+    label: string;
+  };
 }
 
 export type AIComposerNoticeDescriptor =
   | { kind: 'missing_provider' }
   | { kind: 'missing_model' }
+  | { kind: 'provider_incomplete'; issues?: AIChatReadinessIssue[] }
   | { kind: 'model_fetch_failed'; detail?: string | number | boolean | null | undefined };
 
 export type AIComposerNoticeTranslator = (
@@ -16,33 +25,141 @@ export type AIComposerNoticeTranslator = (
   params?: Record<string, string | number | boolean | null | undefined>
 ) => string;
 
-export const buildMissingProviderNotice = (t: AIComposerNoticeTranslator): AIComposerNotice => ({
-  tone: 'warning',
-  title: t('ai_chat.composer_notice.missing_provider.title'),
-  description: t('ai_chat.composer_notice.missing_provider.description'),
+const defaultCopy = {
+  missingProviderTitle: '还没有可用供应商',
+  missingProviderDescription: '先在 AI 设置里添加并启用一个模型供应商。',
+  missingModelTitle: '先选择一个模型',
+  missingModelDescription: '打开下方模型下拉并选择模型；如果列表为空，请检查供应商入口和 API Key。',
+  incompleteProviderTitle: '当前供应商配置还不完整',
+  incompleteProviderDescription: '先补全供应商配置再发送，避免请求刚发起就失败。',
+  modelFetchFailedTitle: '模型列表加载失败',
+  modelFetchFailedDescription: '请检查供应商入口、API Key 或账号权限，然后重新打开模型下拉。',
+  openSettingsAction: '打开 AI 设置',
+  fixProviderAction: '修复供应商配置',
+  reloadModelsAction: '重新加载模型',
+} as const;
+
+const translateWithFallback = (
+  t: AIComposerNoticeTranslator | undefined,
+  key: string,
+  fallback: string,
+  params?: Record<string, string | number | boolean | null | undefined>,
+): string => {
+  if (!t) {
+    return fallback;
+  }
+  const translated = t(key, params);
+  return translated && translated !== key ? translated : fallback;
+};
+
+const buildNoticeAction = (
+  key: AIComposerNoticeAction,
+  labelKey: string,
+  fallbackLabel: string,
+  t?: AIComposerNoticeTranslator,
+): AIComposerNotice['action'] => ({
+  key,
+  label: translateWithFallback(t, labelKey, fallbackLabel),
 });
 
-export const buildMissingModelNotice = (t: AIComposerNoticeTranslator): AIComposerNotice => ({
+export const buildMissingProviderNotice = (t?: AIComposerNoticeTranslator): AIComposerNotice => ({
   tone: 'warning',
-  title: t('ai_chat.composer_notice.missing_model.title'),
-  description: t('ai_chat.composer_notice.missing_model.description'),
+  title: t
+    ? t('ai_chat.composer_notice.missing_provider.title')
+    : defaultCopy.missingProviderTitle,
+  description: t
+    ? t('ai_chat.composer_notice.missing_provider.description')
+    : defaultCopy.missingProviderDescription,
+  action: buildNoticeAction(
+    'open-settings',
+    'ai_chat.composer_notice.action.open_settings',
+    defaultCopy.openSettingsAction,
+    t,
+  ),
 });
 
-export const buildModelFetchFailedNotice = (
-  t: AIComposerNoticeTranslator,
-  error?: string | number | boolean | null | undefined
+export const buildMissingModelNotice = (t?: AIComposerNoticeTranslator): AIComposerNotice => ({
+  tone: 'warning',
+  title: t
+    ? t('ai_chat.composer_notice.missing_model.title')
+    : defaultCopy.missingModelTitle,
+  description: t
+    ? t('ai_chat.composer_notice.missing_model.description')
+    : defaultCopy.missingModelDescription,
+  action: buildNoticeAction(
+    'reload-models',
+    'ai_chat.composer_notice.action.reload_models',
+    defaultCopy.reloadModelsAction,
+    t,
+  ),
+});
+
+export const buildIncompleteProviderNotice = (
+  issues: AIChatReadinessIssue[] = [],
+  t?: AIComposerNoticeTranslator,
 ): AIComposerNotice => {
-  const detail = String(error || '').trim();
+  const missingLabels = formatAIChatProviderIssueLabels(issues.filter((issue) => issue !== 'missing_selected_model'));
+  const fallbackTitle = missingLabels.length > 0
+    ? `当前供应商还缺少 ${missingLabels.join('、')}`
+    : defaultCopy.incompleteProviderTitle;
 
   return {
     tone: 'error',
-    title: t('ai_chat.composer_notice.model_fetch_failed.title'),
-    description: detail
-      ? t('ai_chat.composer_notice.model_fetch_failed.detail_description', { detail })
-      : t('ai_chat.composer_notice.model_fetch_failed.default_description'),
+    title: translateWithFallback(
+      t,
+      'ai_chat.composer_notice.provider_incomplete.title',
+      fallbackTitle,
+      { labels: missingLabels.join('、') },
+    ),
+    description: translateWithFallback(
+      t,
+      'ai_chat.composer_notice.provider_incomplete.description',
+      defaultCopy.incompleteProviderDescription,
+    ),
+    action: buildNoticeAction(
+      'open-settings',
+      'ai_chat.composer_notice.action.fix_provider',
+      defaultCopy.fixProviderAction,
+      t,
+    ),
   };
 };
 
+export function buildModelFetchFailedNotice(
+  t: AIComposerNoticeTranslator,
+  error?: string | number | boolean | null | undefined,
+): AIComposerNotice;
+export function buildModelFetchFailedNotice(
+  error?: string | number | boolean | null | undefined,
+): AIComposerNotice;
+export function buildModelFetchFailedNotice(
+  tOrError?: AIComposerNoticeTranslator | string | number | boolean | null,
+  error?: string | number | boolean | null | undefined,
+): AIComposerNotice {
+  const hasTranslator = typeof tOrError === 'function';
+  const t = hasTranslator ? tOrError : undefined;
+  const rawDetail = hasTranslator ? error : tOrError;
+  const detail = String(rawDetail ?? '').trim();
+
+  return {
+    tone: 'error',
+    title: t
+      ? t('ai_chat.composer_notice.model_fetch_failed.title')
+      : defaultCopy.modelFetchFailedTitle,
+    description: t
+      ? detail
+        ? t('ai_chat.composer_notice.model_fetch_failed.detail_description', { detail })
+        : t('ai_chat.composer_notice.model_fetch_failed.default_description')
+      : detail || defaultCopy.modelFetchFailedDescription,
+    action: buildNoticeAction(
+      'reload-models',
+      'ai_chat.composer_notice.action.reload_models',
+      defaultCopy.reloadModelsAction,
+      t,
+    ),
+  };
+}
+
 export const buildAIComposerNotice = (
   t: AIComposerNoticeTranslator,
   descriptor: AIComposerNoticeDescriptor | null
@@ -57,6 +174,9 @@ export const buildAIComposerNotice = (
   if (descriptor.kind === 'missing_model') {
     return buildMissingModelNotice(t);
   }
+  if (descriptor.kind === 'provider_incomplete') {
+    return buildIncompleteProviderNotice(descriptor.issues, t);
+  }
 
   return buildModelFetchFailedNotice(t, descriptor.detail);
 };
diff --git a/frontend/src/utils/aiMessagePayload.test.ts b/frontend/src/utils/aiMessagePayload.test.ts
index b49c598..c3dc7b0 100644
--- a/frontend/src/utils/aiMessagePayload.test.ts
+++ b/frontend/src/utils/aiMessagePayload.test.ts
@@ -75,4 +75,24 @@ describe('toAIRequestMessage', () => {
       images: ['data:image/png;base64,abc'],
     });
   });
+
+  it('appends extracted file attachment content to the user request payload', () => {
+    const payload = toAIRequestMessage(message({
+      role: 'user',
+      content: '帮我看附件',
+      attachments: [{
+        id: 'att-1',
+        name: 'report.md',
+        mimeType: 'text/markdown',
+        size: 24,
+        kind: 'markdown',
+        text: '# 周报\n收入下降',
+      }],
+    }));
+
+    expect(payload.content).toContain('帮我看附件');
+    expect(payload.content).toContain('<用户上传附件>');
+    expect(payload.content).toContain('report.md');
+    expect(payload.content).toContain('收入下降');
+  });
 });
diff --git a/frontend/src/utils/aiMessagePayload.ts b/frontend/src/utils/aiMessagePayload.ts
index 37528e3..a2ab4f6 100644
--- a/frontend/src/utils/aiMessagePayload.ts
+++ b/frontend/src/utils/aiMessagePayload.ts
@@ -1,4 +1,5 @@
 import type { AIChatMessage, AIToolCall } from '../types';
+import { appendAIChatAttachmentsToContent } from '../components/ai/aiChatAttachments';
 
 export interface AIRequestMessage {
   role: AIChatMessage['role'];
@@ -12,7 +13,7 @@ export interface AIRequestMessage {
 export const toAIRequestMessage = (message: AIChatMessage): AIRequestMessage => {
   const payload: AIRequestMessage = {
     role: message.role,
-    content: message.content,
+    content: appendAIChatAttachmentsToContent(message.content, message.attachments),
   };
 
   if (message.images && message.images.length > 0) {
diff --git a/frontend/src/utils/aiToolRegistry.test.ts b/frontend/src/utils/aiToolRegistry.test.ts
new file mode 100644
index 0000000..863e891
--- /dev/null
+++ b/frontend/src/utils/aiToolRegistry.test.ts
@@ -0,0 +1,310 @@
+import { describe, expect, it } from 'vitest';
+
+import { BUILTIN_AI_TOOL_INFO, buildAvailableAIChatTools } from './aiToolRegistry';
+
+describe('aiToolRegistry', () => {
+  it('registers the ai-runtime inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_runtime');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('AI 自身运行状态');
+    expect(info?.tool.function.description).toContain('当前供应商');
+  });
+
+  it('registers the ai-setup-health inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_setup_health');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('体检当前 AI 配置');
+    expect(info?.tool.function.description).toContain('聊天发送前置');
+  });
+
+  it('registers the ai-support-bundle inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_support_bundle');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('排障支持包');
+    expect(info?.tool.function.description).toContain('默认不包含数据库密码');
+    expect(info?.tool.function.parameters?.properties?.includeMessageContent?.description).toContain('默认 false');
+  });
+
+  it('registers the ai-safety inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_safety');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('写入安全边界');
+    expect(info?.tool.function.description).toContain('allowMutating');
+  });
+
+  it('registers the mcp-setup inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_mcp_setup');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('MCP 配置');
+    expect(info?.tool.function.description).toContain('外部客户端');
+  });
+
+  it('registers the mcp-remote-access inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_mcp_remote_access');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('OpenClaw/Hermans');
+    expect(info?.tool.function.description).toContain('Bearer Token');
+    expect(info?.tool.function.parameters?.properties?.exposeStrategy?.enum).toContain('cloudflare_tunnel');
+  });
+
+  it('registers the mcp-runtime-failure inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_mcp_runtime_failures');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('启动与调用失败');
+    expect(info?.tool.function.description).toContain('工具发现失败');
+    expect(info?.tool.function.parameters?.properties?.serverName?.description).toContain('MCP 服务名');
+  });
+
+  it('registers the mcp-authoring-guide inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_mcp_authoring_guide');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('新增 MCP');
+    expect(info?.tool.function.description).toContain('command、args、env、timeout');
+  });
+
+  it('registers the mcp-draft inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_mcp_draft');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('MCP 新增草稿');
+    expect(info?.tool.function.description).toContain('真实校验器试算');
+    expect(info?.tool.function.parameters?.properties?.fullCommand?.description).toContain('一整行 MCP 启动命令');
+    expect(info?.tool.function.parameters?.properties?.templateKey?.enum).toContain('docker');
+  });
+
+  it('registers the mcp-docker-setup inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_mcp_docker_setup');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('Docker MCP');
+    expect(info?.tool.function.description).toContain('docker run');
+    expect(info?.tool.function.parameters?.properties?.includeDisabled?.description).toContain('默认 true');
+  });
+
+  it('registers the mcp-tool-schema inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_mcp_tool_schema');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('MCP 工具参数');
+    expect(info?.tool.function.description).toContain('inputSchema');
+    expect(info?.tool.function.parameters?.properties?.alias?.description).toContain('真实 alias');
+  });
+
+  it('registers the ai-provider inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_providers');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('供应商与模型配置');
+    expect(info?.tool.function.description).toContain('模型列表为空');
+  });
+
+  it('registers the chat-readiness inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_chat_readiness');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('发送条件');
+    expect(info?.tool.function.description).toContain('当前 AI 聊天输入区');
+  });
+
+  it('registers the ai-upstream-log inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_upstream_logs');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('上游请求入参');
+    expect(info?.tool.function.description).toContain('请求 body 预览');
+    expect(info?.tool.function.parameters?.properties?.requestId?.description).toContain('requestId');
+    expect(info?.tool.function.parameters?.properties?.includePayloadSummary?.description).toContain('工具数量');
+  });
+
+  it('registers the ai-tool-catalog inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_tool_catalog');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('内置工具目录');
+    expect(info?.tool.function.description).toContain('推荐工具调用流程');
+    expect(info?.tool.function.parameters?.properties?.keyword?.description).toContain('连接失败');
+    expect(info?.tool.function.parameters?.properties?.includeMCPTools?.description).toContain('MCP 工具摘要');
+  });
+
+  it('registers the ai-guidance inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_guidance');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('提示词与 Skills');
+    expect(info?.tool.function.description).toContain('自定义提示词');
+  });
+
+  it('registers the current-connection inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_current_connection');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('当前活动连接');
+    expect(info?.tool.function.description).toContain('SSH/代理/HTTP 隧道状态');
+  });
+
+  it('registers the connection-capability inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_connection_capabilities');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('前端能力');
+    expect(info?.tool.function.description).toContain('结果是否强制只读');
+  });
+
+  it('registers the saved-connections inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_saved_connections');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('已保存连接');
+    expect(info?.tool.function.description).toContain('本地已保存连接清单');
+  });
+
+  it('registers the Redis topology inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_redis_topology');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('Redis 单机/哨兵/集群');
+    expect(info?.tool.function.description).toContain('Sentinel');
+    expect(info?.tool.function.description).toContain('不会回显 Redis 密码');
+    expect(info?.tool.function.parameters?.properties?.connectionId?.description).toContain('Redis 连接 ID');
+  });
+
+  it('registers the external-sql-directory inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_external_sql_directories');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('外部 SQL 目录');
+    expect(info?.tool.function.description).toContain('当前打开的外部 SQL 文件页签');
+  });
+
+  it('registers the external-sql-file inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_external_sql_file');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('外部 SQL 文件内容');
+    expect(info?.tool.function.description).toContain('目录中的具体 SQL 脚本');
+  });
+
+  it('registers the shortcut inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_shortcuts');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('快捷键配置');
+    expect(info?.tool.function.description).toContain('Win/Mac');
+  });
+
+  it('registers the app-log inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_app_logs');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('应用日志');
+    expect(info?.tool.function.description).toContain('gonavi.log');
+  });
+
+  it('registers the recent-connection-failure inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_recent_connection_failures');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('连接失败');
+    expect(info?.tool.function.description).toContain('multiStatements');
+  });
+
+  it('registers the ai-render-error inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_last_render_error');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('渲染异常');
+    expect(info?.tool.function.description).toContain('消息渲染异常');
+  });
+
+  it('registers the ai-message-flow inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_message_flow');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('消息流');
+    expect(info?.tool.function.description).toContain('连续 assistant 消息');
+  });
+
+  it('registers the ai-context-budget inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_context_budget');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('上下文体量');
+    expect(info?.tool.function.description).toContain('MCP 工具 schema');
+    expect(info?.tool.function.parameters?.properties?.messageLimit?.description).toContain('最大 120');
+  });
+
+  it('registers the codebase-hotspots inspector as a builtin tool', () => {
+    const info = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_codebase_hotspots');
+    expect(info).toBeTruthy();
+    expect(info?.desc).toContain('前端大文件');
+    expect(info?.tool.function.description).toContain('拆分热点快照');
+    expect(info?.tool.function.parameters?.properties?.minLines?.description).toContain('默认 1000');
+  });
+
+  it('registers the recent-sql-activity, saved-query, and sql-snippet inspectors as builtin tools', () => {
+    const recentActivityTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_recent_sql_activity');
+    const sqlEditorTransactionTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_sql_editor_transaction');
+    const sqlRiskTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_sql_risk');
+    const appLogTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_app_logs');
+    const connectionFailureTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_recent_connection_failures');
+    const renderErrorTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_last_render_error');
+    const messageFlowTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_message_flow');
+    const savedQueryTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_saved_queries');
+    const aiSessionsTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_ai_sessions');
+    const snippetTool = BUILTIN_AI_TOOL_INFO.find((item) => item.name === 'inspect_sql_snippets');
+
+    expect(recentActivityTool?.desc).toContain('最近 SQL 活动');
+    expect(recentActivityTool?.tool.function.description).toContain('最近 SQL 活动');
+    expect(sqlEditorTransactionTool?.desc).toContain('SQL 编辑器事务');
+    expect(sqlEditorTransactionTool?.tool.function.description).toContain('托管事务');
+    expect(sqlRiskTool?.desc).toContain('SQL 的执行风险');
+    expect(sqlRiskTool?.tool.function.description).toContain('危险点');
+    expect(appLogTool?.desc).toContain('GoNavi 应用日志');
+    expect(appLogTool?.tool.function.description).toContain('应用日志');
+    expect(connectionFailureTool?.desc).toContain('连接失败');
+    expect(connectionFailureTool?.tool.function.description).toContain('连接冷却');
+    expect(renderErrorTool?.desc).toContain('渲染异常记录');
+    expect(renderErrorTool?.tool.function.description).toContain('气泡局部报错');
+    expect(messageFlowTool?.desc).toContain('消息流');
+    expect(messageFlowTool?.tool.function.description).toContain('工具调用没有闭环');
+    expect(savedQueryTool?.desc).toContain('已保存的 SQL 查询');
+    expect(savedQueryTool?.tool.function.description).toContain('历史查询');
+    expect(aiSessionsTool?.desc).toContain('AI 历史会话');
+    expect(aiSessionsTool?.tool.function.description).toContain('之前的 AI 对话');
+    expect(snippetTool?.desc).toContain('SQL 片段模板');
+    expect(snippetTool?.tool.function.description).toContain('片段模板');
+  });
+
+  it('keeps builtin tools and MCP tools in the unified runtime tool chain', () => {
+    const tools = buildAvailableAIChatTools([{
+      alias: 'custom_probe',
+      originalName: 'custom_probe',
+      serverId: 'server-1',
+      serverName: 'demo',
+      title: '自定义探针',
+      description: '读取额外环境信息',
+      inputSchema: {
+        type: 'object',
+        properties: {
+          id: { type: 'string' },
+        },
+      },
+    }]);
+
+    expect(tools.some((item) => item.function.name === 'inspect_ai_runtime')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_setup_health')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_support_bundle')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_safety')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_providers')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_chat_readiness')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_upstream_logs')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_tool_catalog')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_mcp_setup')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_mcp_remote_access')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_mcp_runtime_failures')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_mcp_authoring_guide')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_mcp_draft')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_mcp_tool_schema')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_guidance')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_current_connection')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_connection_capabilities')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_saved_connections')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_redis_topology')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_external_sql_directories')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_external_sql_file')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_recent_sql_activity')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_sql_editor_transaction')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_sql_risk')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_app_logs')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_recent_connection_failures')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_last_render_error')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_message_flow')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_context_budget')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_codebase_hotspots')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_saved_queries')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_ai_sessions')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_sql_snippets')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'inspect_shortcuts')).toBe(true);
+    expect(tools.some((item) => item.function.name === 'custom_probe')).toBe(true);
+  });
+});
diff --git a/frontend/src/utils/aiToolRegistry.ts b/frontend/src/utils/aiToolRegistry.ts
new file mode 100644
index 0000000..8d12b9c
--- /dev/null
+++ b/frontend/src/utils/aiToolRegistry.ts
@@ -0,0 +1,39 @@
+import type { AIMCPToolDescriptor } from "../types";
+import {
+  BUILTIN_AI_TOOL_INFO,
+  type AIChatToolDefinition,
+  type AIBuiltinToolInfo,
+} from "./aiBuiltinToolInfo";
+
+export {
+  BUILTIN_AI_TOOL_INFO,
+  type AIChatToolDefinition,
+  type AIBuiltinToolInfo,
+} from "./aiBuiltinToolInfo";
+
+export const BUILTIN_AI_TOOLS: AIChatToolDefinition[] = BUILTIN_AI_TOOL_INFO.map((item) => item.tool);
+
+export const BUILTIN_AI_TOOL_NAME_SET = new Set<string>(
+  BUILTIN_AI_TOOL_INFO.map((item) => item.name),
+);
+
+export const buildMCPAIChatTools = (
+  tools: AIMCPToolDescriptor[],
+): AIChatToolDefinition[] =>
+  (tools || []).map((tool) => ({
+    type: "function",
+    function: {
+      name: tool.alias,
+      description:
+        tool.description ||
+        `${tool.serverName} 提供的 MCP 工具 ${tool.title || tool.originalName}`,
+      parameters:
+        tool.inputSchema && Object.keys(tool.inputSchema).length > 0
+          ? tool.inputSchema
+          : { type: "object", properties: {} },
+    },
+  }));
+
+export const buildAvailableAIChatTools = (
+  tools: AIMCPToolDescriptor[],
+): AIChatToolDefinition[] => [...BUILTIN_AI_TOOLS, ...buildMCPAIChatTools(tools)];
diff --git a/frontend/src/utils/columnDefinition.test.ts b/frontend/src/utils/columnDefinition.test.ts
index 41122f5..43fea31 100644
--- a/frontend/src/utils/columnDefinition.test.ts
+++ b/frontend/src/utils/columnDefinition.test.ts
@@ -28,4 +28,57 @@ describe('columnDefinition metadata normalization', () => {
       comment: '更新时间',
     });
   });
+
+  it('prefers complete column type aliases over base data type', () => {
+    const column = {
+      COLUMN_NAME: 'USER_NAME',
+      DATA_TYPE: 'varchar',
+      COLUMN_TYPE: 'varchar(64)',
+      IS_NULLABLE: 'NO',
+    };
+
+    expect(normalizeColumnDefinition(column)).toMatchObject({
+      name: 'USER_NAME',
+      type: 'varchar(64)',
+      nullable: 'NO',
+    });
+  });
+
+  it('builds display type from base type and length metadata', () => {
+    const column = {
+      column_name: 'amount',
+      data_type: 'decimal',
+      numeric_precision: 10,
+      numeric_scale: 2,
+      is_nullable: 'YES',
+    };
+
+    expect(normalizeColumnDefinition(column)).toMatchObject({
+      name: 'amount',
+      type: 'decimal(10,2)',
+      nullable: 'YES',
+    });
+  });
+
+  it('normalizes Dameng style data length and nullable flags', () => {
+    const column = {
+      COLUMN_NAME: 'USER_NAME',
+      DATA_TYPE: 'VARCHAR2',
+      DATA_LENGTH: 64,
+      NULLABLE: 'N',
+    };
+
+    expect(normalizeColumnDefinition(column)).toMatchObject({
+      name: 'USER_NAME',
+      type: 'VARCHAR2(64)',
+      nullable: 'NO',
+    });
+  });
+
+  it('maps boolean primary and unique metadata aliases to GoNavi keys', () => {
+    expect(getColumnDefinitionKey({ column_name: 'id', isPrimary: true })).toBe('PRI');
+    expect(getColumnDefinitionKey({ column_name: 'id', primary_key: 't' })).toBe('PRI');
+    expect(getColumnDefinitionKey({ column_name: 'email', is_unique: 'yes' })).toBe('UNI');
+    expect(getColumnDefinitionKey({ column_name: 'id', column_key: 'primary key' })).toBe('PRI');
+  });
 });
diff --git a/frontend/src/utils/columnDefinition.ts b/frontend/src/utils/columnDefinition.ts
index c9e85cb..b67e381 100644
--- a/frontend/src/utils/columnDefinition.ts
+++ b/frontend/src/utils/columnDefinition.ts
@@ -20,17 +20,134 @@ const readStringProperty = (value: unknown, keys: string[]): string => {
   return '';
 };
 
+const readProperty = (value: unknown, keys: string[]): unknown => {
+  const source = value as Record<string, unknown> | null | undefined;
+  if (!source || typeof source !== 'object') return undefined;
+
+  for (const key of keys) {
+    if (source[key] !== undefined && source[key] !== null) {
+      return source[key];
+    }
+  }
+
+  for (const [sourceKey, raw] of Object.entries(source)) {
+    if (keys.some((key) => sourceKey.toLowerCase() === key.toLowerCase())) {
+      return raw;
+    }
+  }
+
+  return undefined;
+};
+
+const readBooleanProperty = (value: unknown, keys: string[]): boolean => {
+  const raw = readProperty(value, keys);
+  if (raw === undefined || raw === null) return false;
+  if (typeof raw === 'boolean') return raw;
+  if (typeof raw === 'number') return raw !== 0;
+  const text = String(raw).trim().toLowerCase();
+  return text === '1' || text === 't' || text === 'true' || text === 'y' || text === 'yes' || text === 'pri' || text === 'primary';
+};
+
+const readNumberProperty = (value: unknown, keys: string[]): number => {
+  const raw = readProperty(value, keys);
+  if (raw === undefined || raw === null || raw === '') return 0;
+  const parsed = Number(raw);
+  return Number.isFinite(parsed) && parsed > 0 ? Math.trunc(parsed) : 0;
+};
+
+const normalizeNullable = (value: string): string => {
+  const normalized = String(value || '').trim();
+  if (!normalized) return '';
+  const upper = normalized.toUpperCase();
+  if (upper === 'N' || upper === 'NO' || upper === 'FALSE' || upper === '0' || upper === 'NOT NULL') {
+    return 'NO';
+  }
+  if (upper === 'Y' || upper === 'YES' || upper === 'TRUE' || upper === '1' || upper === 'NULL' || upper === 'NULLABLE') {
+    return 'YES';
+  }
+  return normalized;
+};
+
 export const getColumnDefinitionName = (column: unknown): string => (
   readStringProperty(column, ['name', 'Name', 'COLUMN_NAME', 'column_name', 'field', 'Field'])
 );
 
-export const getColumnDefinitionType = (column: unknown): string => (
-  readStringProperty(column, ['type', 'Type', 'DATA_TYPE', 'data_type'])
-);
+export const getColumnDefinitionType = (column: unknown): string => {
+  const fullType = readStringProperty(column, [
+    'COLUMN_TYPE',
+    'column_type',
+    'FULL_TYPE',
+    'full_type',
+    'FULL_DATA_TYPE',
+    'full_data_type',
+    'TYPE_NAME',
+    'type_name',
+    'Type',
+    'type',
+  ]);
+  if (fullType) return fullType;
 
-export const getColumnDefinitionKey = (column: unknown): string => (
-  readStringProperty(column, ['key', 'Key', 'COLUMN_KEY', 'column_key'])
-);
+  const dataType = readStringProperty(column, ['DATA_TYPE', 'data_type']);
+  if (!dataType || /\(.+\)/.test(dataType)) return dataType;
+
+  const upperType = dataType.toUpperCase();
+  const charLength = readNumberProperty(column, [
+    'CHARACTER_MAXIMUM_LENGTH',
+    'character_maximum_length',
+    'CHARACTER_MAX_LENGTH',
+    'character_max_length',
+    'CHAR_LENGTH',
+    'char_length',
+    'DATA_LENGTH',
+    'data_length',
+    'LENGTH',
+    'length',
+  ]);
+  if (charLength > 0 && /(CHAR|VARCHAR|BINARY|VARBINARY|NCHAR|NVARCHAR)/.test(upperType)) {
+    return `${dataType}(${charLength})`;
+  }
+
+  const precision = readNumberProperty(column, [
+    'NUMERIC_PRECISION',
+    'numeric_precision',
+    'DATA_PRECISION',
+    'data_precision',
+    'PRECISION',
+    'precision',
+  ]);
+  if (precision > 0 && /(DECIMAL|NUMERIC|NUMBER)/.test(upperType)) {
+    const scale = readNumberProperty(column, [
+      'NUMERIC_SCALE',
+      'numeric_scale',
+      'DATA_SCALE',
+      'data_scale',
+      'SCALE',
+      'scale',
+    ]);
+    return scale > 0 ? `${dataType}(${precision},${scale})` : `${dataType}(${precision})`;
+  }
+
+  return dataType;
+};
+
+export const getColumnDefinitionKey = (column: unknown): string => {
+  const key = readStringProperty(column, ['key', 'Key', 'COLUMN_KEY', 'column_key']);
+  if (key) {
+    const normalized = key.trim();
+    const lowered = normalized.toLowerCase();
+    if (lowered === 'pri' || lowered === 'primary' || lowered === 'primary key') return 'PRI';
+    if (lowered === 'uni' || lowered === 'unique') return 'UNI';
+    if (lowered === 'mul' || lowered === 'multiple') return 'MUL';
+    return normalized;
+  }
+  if (readBooleanProperty(column, ['primaryKey', 'primary_key', 'isPrimary', 'is_primary', 'IS_PRIMARY', 'pk', 'PK'])) {
+    return 'PRI';
+  }
+  if (readBooleanProperty(column, ['unique', 'isUnique', 'is_unique', 'UNIQUE', 'IS_UNIQUE'])) {
+    return 'UNI';
+  }
+  return '';
+};
 
 export const getColumnDefinitionExtra = (column: unknown): string => (
   readStringProperty(column, ['extra', 'Extra'])
@@ -46,7 +163,7 @@ export const normalizeColumnDefinition = (column: unknown): ColumnDefinition =>
     ...source,
     name: getColumnDefinitionName(column),
     type: getColumnDefinitionType(column),
-    nullable: readStringProperty(column, ['nullable', 'Nullable', 'NULLABLE', 'is_nullable']),
+    nullable: normalizeNullable(readStringProperty(column, ['nullable', 'Nullable', 'NULLABLE', 'is_nullable', 'IS_NULLABLE', 'Null', 'null'])),
     key: getColumnDefinitionKey(column),
     default: source.default,
     extra: getColumnDefinitionExtra(column),
diff --git a/frontend/src/utils/connectionDriverType.test.ts b/frontend/src/utils/connectionDriverType.test.ts
new file mode 100644
index 0000000..1fda875
--- /dev/null
+++ b/frontend/src/utils/connectionDriverType.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  isPostgresSchemaDialect,
+  normalizeDriverType,
+  resolveConnectionDriverType,
+  resolveSavedConnectionDriverType,
+} from './connectionDriverType';
+
+describe('connectionDriverType', () => {
+  it('normalizes built-in driver aliases shared by connection modal and sidebar', () => {
+    expect(normalizeDriverType('postgresql')).toBe('postgres');
+    expect(normalizeDriverType('pgx')).toBe('postgres');
+    expect(normalizeDriverType('elastic')).toBe('elasticsearch');
+    expect(normalizeDriverType('chromadb')).toBe('chroma');
+    expect(normalizeDriverType('chroma-db')).toBe('chroma');
+    expect(normalizeDriverType('qdrantdb')).toBe('qdrant');
+    expect(normalizeDriverType('qdrant-db')).toBe('qdrant');
+    expect(normalizeDriverType('apache-iotdb')).toBe('iotdb');
+    expect(normalizeDriverType('apache_iotdb')).toBe('iotdb');
+    expect(normalizeDriverType('apache-kafka')).toBe('kafka');
+    expect(normalizeDriverType('apache_kafka')).toBe('kafka');
+    expect(normalizeDriverType('doris')).toBe('diros');
+    expect(normalizeDriverType('open-gauss')).toBe('opengauss');
+    expect(normalizeDriverType('gauss-db')).toBe('gaussdb');
+    expect(normalizeDriverType('greatdb')).toBe('goldendb');
+    expect(normalizeDriverType('gdb')).toBe('goldendb');
+    expect(normalizeDriverType('InterSystemsIRIS')).toBe('iris');
+  });
+
+  it('resolves custom connection driver types from the selected driver field', () => {
+    expect(resolveConnectionDriverType('mysql', 'postgresql')).toBe('mysql');
+    expect(resolveConnectionDriverType('custom', 'postgresql')).toBe('postgres');
+    expect(resolveConnectionDriverType('custom', 'open_gauss')).toBe('opengauss');
+    expect(resolveConnectionDriverType('custom', 'gauss_db')).toBe('gaussdb');
+    expect(resolveConnectionDriverType('custom', 'goldendb')).toBe('goldendb');
+    expect(resolveConnectionDriverType('custom', '')).toBe('');
+  });
+
+  it('resolves saved custom connections using the same driver aliases', () => {
+    const conn = {
+      config: {
+        type: 'custom',
+        driver: 'pg',
+      },
+    } as any;
+    expect(resolveSavedConnectionDriverType(conn)).toBe('postgres');
+  });
+
+  it('detects postgres-compatible schema dialects', () => {
+    expect(isPostgresSchemaDialect('postgres')).toBe(true);
+    expect(isPostgresSchemaDialect('kingbase')).toBe(true);
+    expect(isPostgresSchemaDialect('open-gauss')).toBe(true);
+    expect(isPostgresSchemaDialect('gauss-db')).toBe(true);
+    expect(isPostgresSchemaDialect('mysql')).toBe(false);
+  });
+});
diff --git a/frontend/src/utils/connectionDriverType.ts b/frontend/src/utils/connectionDriverType.ts
new file mode 100644
index 0000000..1ca817c
--- /dev/null
+++ b/frontend/src/utils/connectionDriverType.ts
@@ -0,0 +1,64 @@
+import type { SavedConnection } from '../types';
+
+export type DriverStatusSnapshot = {
+  type: string;
+  name: string;
+  connectable: boolean;
+  expectedRevision?: string;
+  needsUpdate?: boolean;
+  updateReason?: string;
+  affectedConnections?: number;
+  message?: string;
+};
+
+export const normalizeDriverType = (value: string): string => {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (normalized === 'postgresql' || normalized === 'pg' || normalized === 'pq' || normalized === 'pgx') return 'postgres';
+  if (normalized === 'elastic') return 'elasticsearch';
+  if (normalized === 'chromadb' || normalized === 'chroma-db') return 'chroma';
+  if (normalized === 'qdrantdb' || normalized === 'qdrant-db') return 'qdrant';
+  if (normalized === 'rocket-mq' || normalized === 'rocket_mq' || normalized === 'apache-rocketmq' || normalized === 'apache_rocketmq' || normalized === 'rmq') return 'rocketmq';
+  if (normalized === 'apache-iotdb' || normalized === 'apache_iotdb') return 'iotdb';
+  if (normalized === 'mqtts') return 'mqtt';
+  if (normalized === 'apache-kafka' || normalized === 'apache_kafka') return 'kafka';
+  if (normalized === 'rabbit-mq' || normalized === 'rabbit_mq') return 'rabbitmq';
+  if (normalized === 'doris') return 'diros';
+  if (
+    normalized === 'open_gauss' ||
+    normalized === 'open-gauss' ||
+    normalized === 'opengauss'
+  ) return 'opengauss';
+  if (
+    normalized === 'gaussdb' ||
+    normalized === 'gauss_db' ||
+    normalized === 'gauss-db'
+  ) return 'gaussdb';
+  if (
+    normalized === 'goldendb' ||
+    normalized === 'greatdb' ||
+    normalized === 'gdb'
+  ) return 'goldendb';
+  if (
+    normalized === 'intersystems' ||
+    normalized === 'intersystemsiris' ||
+    normalized === 'inter-systems' ||
+    normalized === 'inter-systems-iris'
+  ) return 'iris';
+  return normalized;
+};
+
+export const resolveConnectionDriverType = (type: string, driver?: string): string => {
+  const normalizedType = normalizeDriverType(type);
+  if (normalizedType !== 'custom') {
+    return normalizedType;
+  }
+  return normalizeDriverType(driver || '');
+};
+
+export const resolveSavedConnectionDriverType = (conn: SavedConnection | undefined): string => {
+  return resolveConnectionDriverType(conn?.config?.type || '', conn?.config?.driver || '');
+};
+
+export const isPostgresSchemaDialect = (dialect: string): boolean => (
+  ['postgres', 'kingbase', 'highgo', 'vastbase', 'opengauss', 'gaussdb'].includes(normalizeDriverType(dialect))
+);
diff --git a/frontend/src/utils/connectionExport.test.ts b/frontend/src/utils/connectionExport.test.ts
index 8dac234..275a015 100644
--- a/frontend/src/utils/connectionExport.test.ts
+++ b/frontend/src/utils/connectionExport.test.ts
@@ -93,6 +93,13 @@ describe('connectionExport', () => {
     ]))).toBe('legacy-json');
   });
 
+  it('detects Navicat NCX xml exports', () => {
+    expect(detectConnectionImportKind(`<?xml version="1.0" encoding="UTF-8"?>
+<Connections>
+  <Connection ConnType="MYSQL" ConnectionName="Local MySQL" Host="127.0.0.1" Port="3306" UserName="root" Password="ABCD" SavePassword="true" />
+</Connections>`)).toBe('navicat-ncx');
+  });
+
   it('returns invalid for malformed or unsupported content', () => {
     expect(detectConnectionImportKind('{not-json}')).toBe('invalid');
     expect(detectConnectionImportKind(JSON.stringify({
diff --git a/frontend/src/utils/connectionExport.ts b/frontend/src/utils/connectionExport.ts
index 330a45d..2b7eeb0 100644
--- a/frontend/src/utils/connectionExport.ts
+++ b/frontend/src/utils/connectionExport.ts
@@ -1,7 +1,7 @@
 import type { ConnectionConfig, SavedConnection } from '../types';
 import { t } from '../i18n';
 
-export type ConnectionImportKind = 'app-managed-package' | 'encrypted-package' | 'legacy-json' | 'mysql-workbench-xml' | 'invalid';
+export type ConnectionImportKind = 'app-managed-package' | 'encrypted-package' | 'legacy-json' | 'mysql-workbench-xml' | 'navicat-ncx' | 'invalid';
 export type ConnectionPackageDialogSnapshot = {
   open: boolean;
   mode: 'export' | 'import';
@@ -110,10 +110,19 @@ const isMySQLWorkbenchXML = (raw: string): boolean => (
   raw.includes('<data') && raw.includes('grt_format') && raw.includes('db.mgmt.Connection')
 );
 
+const isNavicatNCX = (raw: string): boolean => (
+  raw.includes('<Connection')
+  && raw.includes('ConnType=')
+  && raw.includes('ConnectionName=')
+);
+
 export const detectConnectionImportKind = (raw: unknown): ConnectionImportKind => {
   if (typeof raw === 'string' && isMySQLWorkbenchXML(raw)) {
     return 'mysql-workbench-xml';
   }
+  if (typeof raw === 'string' && isNavicatNCX(raw)) {
+    return 'navicat-ncx';
+  }
 
   const parsed = parseConnectionImportRaw(raw);
 
diff --git a/frontend/src/utils/connectionModalPresentation.test.ts b/frontend/src/utils/connectionModalPresentation.test.ts
index 13e7c24..e43bf0f 100644
--- a/frontend/src/utils/connectionModalPresentation.test.ts
+++ b/frontend/src/utils/connectionModalPresentation.test.ts
@@ -103,6 +103,7 @@ describe('connectionModalPresentation', () => {
   it('assigns card-based configuration sections to every supported data source type', () => {
     const allTypes = [
       'mysql',
+      'goldendb',
       'mariadb',
       'oceanbase',
       'doris',
@@ -120,10 +121,16 @@ describe('connectionModalPresentation', () => {
       'highgo',
       'vastbase',
       'opengauss',
+      'gaussdb',
       'iris',
       'mongodb',
+      'elasticsearch',
+      'chroma',
+      'qdrant',
       'redis',
       'tdengine',
+      'iotdb',
+      'kafka',
       'custom',
       'jvm',
     ];
@@ -147,6 +154,15 @@ describe('connectionModalPresentation', () => {
       'credentials',
       'databaseScope',
     ]);
+    expect(resolveConnectionConfigLayout('goldendb').sections).toEqual([
+      'identity',
+      'uri',
+      'target',
+      'connectionMode',
+      'replica',
+      'credentials',
+      'databaseScope',
+    ]);
     expect(resolveConnectionConfigLayout('mongodb').sections).toEqual([
       'identity',
       'uri',
@@ -183,11 +199,63 @@ describe('connectionModalPresentation', () => {
       'credentials',
       'databaseScope',
     ]);
+    expect(resolveConnectionConfigLayout('elasticsearch').sections).toEqual([
+      'identity',
+      'uri',
+      'target',
+      'service',
+      'credentials',
+      'databaseScope',
+    ]);
+    expect(resolveConnectionConfigLayout('chroma').sections).toEqual([
+      'identity',
+      'uri',
+      'target',
+      'service',
+      'credentials',
+      'databaseScope',
+    ]);
+    expect(resolveConnectionConfigLayout('qdrant').sections).toEqual([
+      'identity',
+      'uri',
+      'target',
+      'service',
+      'credentials',
+      'databaseScope',
+    ]);
+    expect(resolveConnectionConfigLayout('iotdb').sections).toEqual([
+      'identity',
+      'uri',
+      'target',
+      'service',
+      'credentials',
+      'databaseScope',
+    ]);
+    expect(resolveConnectionConfigLayout('gaussdb').sections).toEqual([
+      'identity',
+      'uri',
+      'target',
+      'service',
+      'credentials',
+      'databaseScope',
+    ]);
+    expect(resolveConnectionConfigLayout('kafka').sections).toEqual([
+      'identity',
+      'uri',
+      'target',
+      'connectionMode',
+      'replica',
+      'service',
+      'credentials',
+    ]);
   });
 
   it('uses localized labels for layout kinds shown in the modal', () => {
     expect(getConnectionConfigLayoutKindLabel('mysql-compatible')).toBe('MySQL 兼容');
     expect(getConnectionConfigLayoutKindLabel('file')).toBe('文件型数据库');
+    expect(getConnectionConfigLayoutKindLabel('search')).toBe('搜索引擎');
+    expect(getConnectionConfigLayoutKindLabel('vector')).toBe('向量数据库');
+    expect(getConnectionConfigLayoutKindLabel('timeseries')).toBe('时序数据库');
   });
 
   it('switches section copy and failure feedback to English when the current language is en-US', () => {
diff --git a/frontend/src/utils/connectionModalPresentation.ts b/frontend/src/utils/connectionModalPresentation.ts
index 5cfc393..48be115 100644
--- a/frontend/src/utils/connectionModalPresentation.ts
+++ b/frontend/src/utils/connectionModalPresentation.ts
@@ -41,6 +41,9 @@ export type ConnectionConfigLayoutKind =
   | 'postgres-compatible'
   | 'oracle'
   | 'file'
+  | 'search'
+  | 'vector'
+  | 'timeseries'
   | 'custom'
   | 'jvm'
   | 'generic-sql';
@@ -57,6 +60,7 @@ type ConnectionConfigSectionCopy = {
 
 const mysqlCompatibleTypes = new Set([
   'mysql',
+  'goldendb',
   'mariadb',
   'oceanbase',
   'doris',
@@ -70,6 +74,7 @@ const postgresCompatibleTypes = new Set([
   'highgo',
   'vastbase',
   'opengauss',
+  'gaussdb',
 ]);
 const fileDatabaseTypes = new Set(['sqlite', 'duckdb']);
 
@@ -119,6 +124,12 @@ export const getConnectionConfigLayoutKindLabel = (
       return t('connection.modal.layoutKind.oracle');
     case 'file':
       return t('connection.modal.layoutKind.file');
+    case 'search':
+      return '搜索引擎';
+    case 'vector':
+      return '向量数据库';
+    case 'timeseries':
+      return '时序数据库';
     case 'custom':
       return t('connection.modal.layoutKind.custom');
     case 'jvm':
@@ -195,6 +206,100 @@ export const resolveConnectionConfigLayout = (
       ],
     };
   }
+  if (type === 'elasticsearch') {
+    return {
+      kind: 'search',
+      sections: [
+        'identity',
+        'uri',
+        'target',
+        'service',
+        'credentials',
+        'databaseScope',
+      ],
+    };
+  }
+  if (type === 'chroma' || type === 'qdrant') {
+    return {
+      kind: 'vector',
+      sections: [
+        'identity',
+        'uri',
+        'target',
+        'service',
+        'credentials',
+        'databaseScope',
+      ],
+    };
+  }
+  if (type === 'iotdb') {
+    return {
+      kind: 'timeseries',
+      sections: [
+        'identity',
+        'uri',
+        'target',
+        'service',
+        'credentials',
+        'databaseScope',
+      ],
+    };
+  }
+  if (type === 'mqtt') {
+    return {
+      kind: 'generic-sql',
+      sections: [
+        'identity',
+        'uri',
+        'target',
+        'connectionMode',
+        'replica',
+        'service',
+        'credentials',
+      ],
+    };
+  }
+  if (type === 'rocketmq') {
+    return {
+      kind: 'generic-sql',
+      sections: [
+        'identity',
+        'uri',
+        'target',
+        'connectionMode',
+        'replica',
+        'service',
+        'credentials',
+      ],
+    };
+  }
+  if (type === 'kafka') {
+    return {
+      kind: 'generic-sql',
+      sections: [
+        'identity',
+        'uri',
+        'target',
+        'connectionMode',
+        'replica',
+        'service',
+        'credentials',
+      ],
+    };
+  }
+  if (type === 'rabbitmq') {
+    return {
+      kind: 'generic-sql',
+      sections: [
+        'identity',
+        'uri',
+        'target',
+        'service',
+        'credentials',
+        'databaseScope',
+      ],
+    };
+  }
   if (postgresCompatibleTypes.has(type)) {
     return {
       kind: 'postgres-compatible',
diff --git a/frontend/src/utils/connectionRpcConfig.test.ts b/frontend/src/utils/connectionRpcConfig.test.ts
index bbf69ad..1da959e 100644
--- a/frontend/src/utils/connectionRpcConfig.test.ts
+++ b/frontend/src/utils/connectionRpcConfig.test.ts
@@ -199,6 +199,30 @@ describe('buildRpcConnectionConfig', () => {
     });
   });
 
+  it('preserves Redis cluster and Sentinel topology fields for RPC calls', () => {
+    const result = buildRpcConnectionConfig({
+      id: 'conn-redis-sentinel',
+      type: 'redis',
+      host: 'sentinel-a.local',
+      port: '26379' as unknown as number,
+      hosts: ['sentinel-b.local:26379', 'sentinel-c.local:26379'],
+      topology: 'sentinel',
+      user: 'default',
+      password: 'redis-secret',
+      redisSentinelMaster: 'mymaster',
+      redisSentinelUser: 'sentinel-user',
+      redisSentinelPassword: 'sentinel-secret',
+      redisDB: '3' as unknown as number,
+    } as any);
+
+    expect(result.topology).toBe('sentinel');
+    expect(result.hosts).toEqual(['sentinel-b.local:26379', 'sentinel-c.local:26379']);
+    expect(result.redisSentinelMaster).toBe('mymaster');
+    expect(result.redisSentinelUser).toBe('sentinel-user');
+    expect(result.redisSentinelPassword).toBe('sentinel-secret');
+    expect(result.redisDB).toBe(3);
+  });
+
   it('returns a Wails connection model instance for RPC compatibility', () => {
     const result = buildRpcConnectionConfig({
       id: 'conn-model',
diff --git a/frontend/src/utils/connectionTypeCapabilities.test.ts b/frontend/src/utils/connectionTypeCapabilities.test.ts
new file mode 100644
index 0000000..e60f39b
--- /dev/null
+++ b/frontend/src/utils/connectionTypeCapabilities.test.ts
@@ -0,0 +1,96 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  isFileDatabaseType,
+  isMySQLCompatibleType,
+  isPostgresCompatibleSSLType,
+  singleHostUriSchemesByType,
+  supportsConnectionParamsForType,
+  supportsSSLCAPathForType,
+  supportsSSLClientCertificateForType,
+  supportsSSLForType,
+} from './connectionTypeCapabilities';
+
+describe('connectionTypeCapabilities', () => {
+  it('keeps single-host URI scheme aliases for URI parsing', () => {
+    expect(singleHostUriSchemesByType.postgres).toEqual(['postgresql', 'postgres']);
+    expect(singleHostUriSchemesByType.opengauss).toContain('jdbc:opengauss');
+    expect(singleHostUriSchemesByType.gaussdb).toEqual(['gaussdb', 'postgresql', 'postgres']);
+    expect(singleHostUriSchemesByType.dameng).toEqual(['dameng', 'dm']);
+    expect(singleHostUriSchemesByType.elasticsearch).toEqual(['http', 'https']);
+    expect(singleHostUriSchemesByType.chroma).toEqual(['http', 'https', 'chroma']);
+    expect(singleHostUriSchemesByType.qdrant).toEqual(['http', 'https', 'qdrant']);
+    expect(singleHostUriSchemesByType.iotdb).toEqual(['iotdb']);
+    expect(singleHostUriSchemesByType.redis).toEqual(['redis']);
+  });
+
+  it('detects SSL-capable connection types with case-insensitive normalization', () => {
+    expect(supportsSSLForType('redis')).toBe(true);
+    expect(supportsSSLForType('MongoDB')).toBe(true);
+    expect(supportsSSLForType('elasticsearch')).toBe(true);
+    expect(supportsSSLForType('gaussdb')).toBe(true);
+    expect(supportsSSLForType('greatdb')).toBe(true);
+    expect(supportsSSLForType('chroma')).toBe(true);
+    expect(supportsSSLForType('qdrant')).toBe(true);
+    expect(supportsSSLForType('kafka')).toBe(true);
+    expect(supportsSSLForType('tdengine')).toBe(true);
+    expect(supportsSSLForType('iotdb')).toBe(false);
+    expect(supportsSSLForType('dameng')).toBe(true);
+    expect(supportsSSLForType('sqlite')).toBe(false);
+  });
+
+  it('keeps CA path and client certificate support distinct', () => {
+    expect(supportsSSLCAPathForType('dameng')).toBe(false);
+    expect(supportsSSLClientCertificateForType('dameng')).toBe(true);
+    expect(supportsSSLCAPathForType('gaussdb')).toBe(true);
+    expect(supportsSSLClientCertificateForType('gaussdb')).toBe(true);
+    expect(supportsSSLCAPathForType('sqlserver')).toBe(true);
+    expect(supportsSSLClientCertificateForType('sqlserver')).toBe(false);
+    expect(supportsSSLCAPathForType('redis')).toBe(true);
+    expect(supportsSSLClientCertificateForType('redis')).toBe(true);
+    expect(supportsSSLCAPathForType('chroma')).toBe(true);
+    expect(supportsSSLClientCertificateForType('chroma')).toBe(false);
+    expect(supportsSSLCAPathForType('qdrant')).toBe(true);
+    expect(supportsSSLClientCertificateForType('qdrant')).toBe(false);
+    expect(supportsSSLCAPathForType('kafka')).toBe(true);
+    expect(supportsSSLClientCertificateForType('kafka')).toBe(true);
+  });
+
+  it('detects postgres-compatible SSL parameter dialects', () => {
+    expect(isPostgresCompatibleSSLType('postgres')).toBe(true);
+    expect(isPostgresCompatibleSSLType('kingbase')).toBe(true);
+    expect(isPostgresCompatibleSSLType('gaussdb')).toBe(true);
+    expect(isPostgresCompatibleSSLType('HighGo')).toBe(true);
+    expect(isPostgresCompatibleSSLType('mysql')).toBe(false);
+  });
+
+  it('keeps file and MySQL-compatible database detection explicit', () => {
+    expect(isFileDatabaseType('sqlite')).toBe(true);
+    expect(isFileDatabaseType('duckdb')).toBe(true);
+    expect(isFileDatabaseType('DuckDB')).toBe(false);
+    expect(isMySQLCompatibleType('mysql')).toBe(true);
+    expect(isMySQLCompatibleType('goldendb')).toBe(true);
+    expect(isMySQLCompatibleType('oceanbase')).toBe(true);
+    expect(isMySQLCompatibleType('diros')).toBe(true);
+    expect(isMySQLCompatibleType('postgres')).toBe(false);
+  });
+
+  it('keeps advanced connection params enabled only for supported database types', () => {
+    expect(supportsConnectionParamsForType('mysql')).toBe(true);
+    expect(supportsConnectionParamsForType('gdb')).toBe(true);
+    expect(supportsConnectionParamsForType('postgres')).toBe(true);
+    expect(supportsConnectionParamsForType('gaussdb')).toBe(true);
+    expect(supportsConnectionParamsForType('oracle')).toBe(true);
+    expect(supportsConnectionParamsForType('mongodb')).toBe(true);
+    expect(supportsConnectionParamsForType('dameng')).toBe(true);
+    expect(supportsConnectionParamsForType('tdengine')).toBe(true);
+    expect(supportsConnectionParamsForType('iotdb')).toBe(true);
+    expect(supportsConnectionParamsForType('elasticsearch')).toBe(true);
+    expect(supportsConnectionParamsForType('chroma')).toBe(true);
+    expect(supportsConnectionParamsForType('qdrant')).toBe(true);
+    expect(supportsConnectionParamsForType('kafka')).toBe(true);
+    expect(supportsConnectionParamsForType('redis')).toBe(false);
+    expect(supportsConnectionParamsForType('sqlite')).toBe(false);
+    expect(supportsConnectionParamsForType('jvm')).toBe(false);
+  });
+});
diff --git a/frontend/src/utils/connectionTypeCapabilities.ts b/frontend/src/utils/connectionTypeCapabilities.ts
new file mode 100644
index 0000000..d001cd4
--- /dev/null
+++ b/frontend/src/utils/connectionTypeCapabilities.ts
@@ -0,0 +1,180 @@
+export const singleHostUriSchemesByType: Record<string, string[]> = {
+  postgres: ["postgresql", "postgres"],
+  opengauss: ["opengauss", "jdbc:opengauss", "postgresql", "postgres"],
+  gaussdb: ["gaussdb", "postgresql", "postgres"],
+  clickhouse: ["clickhouse"],
+  oracle: ["oracle"],
+  sqlserver: ["sqlserver"],
+  iris: ["iris", "intersystems"],
+  redis: ["redis"],
+  tdengine: ["tdengine"],
+  iotdb: ["iotdb"],
+  dameng: ["dameng", "dm"],
+  kingbase: ["kingbase"],
+  highgo: ["highgo"],
+  vastbase: ["vastbase"],
+  elasticsearch: ["http", "https"],
+  chroma: ["http", "https", "chroma"],
+  qdrant: ["http", "https", "qdrant"],
+  rocketmq: ["rocketmq", "rmq"],
+  mqtt: ["mqtt", "mqtts", "tcp", "ssl", "tls"],
+  rabbitmq: ["rabbitmq", "http", "https"],
+};
+
+const normalizeConnectionType = (type: string) =>
+  {
+    const normalized = String(type || "")
+      .trim()
+      .toLowerCase();
+    switch (normalized) {
+      case "goldendb":
+      case "greatdb":
+      case "gdb":
+        return "goldendb";
+      case "rocket-mq":
+      case "rocket_mq":
+      case "apache-rocketmq":
+      case "apache_rocketmq":
+      case "rmq":
+        return "rocketmq";
+      case "mqtts":
+        return "mqtt";
+      default:
+        return normalized;
+    }
+  };
+
+const sslSupportedTypes = new Set([
+  "mysql",
+  "goldendb",
+  "mariadb",
+  "oceanbase",
+  "doris",
+  "diros",
+  "starrocks",
+  "sphinx",
+  "dameng",
+  "clickhouse",
+  "postgres",
+  "sqlserver",
+  "oracle",
+  "kingbase",
+  "highgo",
+  "vastbase",
+  "opengauss",
+  "gaussdb",
+  "mongodb",
+  "redis",
+  "tdengine",
+  "elasticsearch",
+  "chroma",
+  "qdrant",
+  "mqtt",
+  "kafka",
+  "rabbitmq",
+]);
+
+export const supportsSSLForType = (type: string) =>
+  sslSupportedTypes.has(normalizeConnectionType(type));
+
+const sslCAPathSupportedTypes = new Set([
+  "mysql",
+  "goldendb",
+  "mariadb",
+  "oceanbase",
+  "diros",
+  "starrocks",
+  "sphinx",
+  "clickhouse",
+  "postgres",
+  "sqlserver",
+  "kingbase",
+  "highgo",
+  "vastbase",
+  "opengauss",
+  "gaussdb",
+  "mongodb",
+  "redis",
+  "elasticsearch",
+  "chroma",
+  "qdrant",
+  "mqtt",
+  "kafka",
+  "rabbitmq",
+]);
+
+const sslClientCertificateSupportedTypes = new Set([
+  "mysql",
+  "goldendb",
+  "mariadb",
+  "oceanbase",
+  "diros",
+  "starrocks",
+  "sphinx",
+  "dameng",
+  "clickhouse",
+  "postgres",
+  "kingbase",
+  "highgo",
+  "vastbase",
+  "opengauss",
+  "gaussdb",
+  "mongodb",
+  "redis",
+  "mqtt",
+  "kafka",
+  "rabbitmq",
+]);
+
+export const supportsSSLCAPathForType = (type: string) =>
+  sslCAPathSupportedTypes.has(normalizeConnectionType(type));
+
+export const supportsSSLClientCertificateForType = (type: string) =>
+  sslClientCertificateSupportedTypes.has(normalizeConnectionType(type));
+
+export const isPostgresCompatibleSSLType = (type: string) =>
+  [
+    "postgres",
+    "kingbase",
+    "highgo",
+    "vastbase",
+    "opengauss",
+    "gaussdb",
+  ].includes(normalizeConnectionType(type));
+
+export const isFileDatabaseType = (type: string) =>
+  type === "sqlite" || type === "duckdb";
+
+export const isMySQLCompatibleType = (type: string) =>
+  normalizeConnectionType(type) === "mysql" ||
+  normalizeConnectionType(type) === "goldendb" ||
+  normalizeConnectionType(type) === "mariadb" ||
+  normalizeConnectionType(type) === "oceanbase" ||
+  normalizeConnectionType(type) === "doris" ||
+  normalizeConnectionType(type) === "diros" ||
+  normalizeConnectionType(type) === "starrocks" ||
+  normalizeConnectionType(type) === "sphinx";
+
+export const supportsConnectionParamsForType = (type: string) =>
+  isMySQLCompatibleType(type) ||
+  type === "postgres" ||
+  type === "kingbase" ||
+  type === "highgo" ||
+  type === "vastbase" ||
+  type === "opengauss" ||
+  type === "gaussdb" ||
+  type === "oracle" ||
+  type === "sqlserver" ||
+  type === "iris" ||
+  type === "clickhouse" ||
+  type === "mongodb" ||
+  type === "dameng" ||
+  type === "tdengine" ||
+  type === "iotdb" ||
+  type === "elasticsearch" ||
+  type === "chroma" ||
+  type === "qdrant" ||
+  type === "rocketmq" ||
+  type === "mqtt" ||
+  type === "kafka" ||
+  type === "rabbitmq";
diff --git a/frontend/src/utils/connectionTypeCatalog.test.ts b/frontend/src/utils/connectionTypeCatalog.test.ts
new file mode 100644
index 0000000..3a85f9c
--- /dev/null
+++ b/frontend/src/utils/connectionTypeCatalog.test.ts
@@ -0,0 +1,72 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  CONNECTION_TYPE_GROUPS,
+  getAllConnectionTypeCatalogItems,
+  getConnectionTypeDefaultPort,
+  getConnectionTypeHint,
+} from './connectionTypeCatalog';
+
+describe('connectionTypeCatalog', () => {
+  it('keeps supported connection types grouped for the creation modal', () => {
+    expect(CONNECTION_TYPE_GROUPS.map((group) => group.label)).toEqual([
+      '关系型数据库',
+      '国产数据库',
+      'NoSQL',
+      '向量数据库',
+      '时序数据库',
+      '消息队列',
+      '其他',
+    ]);
+
+    const keys = getAllConnectionTypeCatalogItems().map((item) => item.key);
+    expect(keys).toContain('mysql');
+    expect(keys).toContain('oceanbase');
+    expect(keys).toContain('gaussdb');
+    expect(keys).toContain('goldendb');
+    expect(keys).toContain('mongodb');
+    expect(keys).toContain('redis');
+    expect(keys).toContain('elasticsearch');
+    expect(keys).toContain('chroma');
+    expect(keys).toContain('qdrant');
+    expect(keys).toContain('iotdb');
+    expect(keys).toContain('kafka');
+    expect(keys).toContain('jvm');
+    expect(keys).toContain('custom');
+    expect(new Set(keys).size).toBe(keys.length);
+  });
+
+  it('returns the existing default port mapping for supported connection types', () => {
+    expect(getConnectionTypeDefaultPort('mysql')).toBe(3306);
+    expect(getConnectionTypeDefaultPort('oceanbase')).toBe(2881);
+    expect(getConnectionTypeDefaultPort('goldendb')).toBe(1523);
+    expect(getConnectionTypeDefaultPort('diros')).toBe(9030);
+    expect(getConnectionTypeDefaultPort('postgres')).toBe(5432);
+    expect(getConnectionTypeDefaultPort('gaussdb')).toBe(5432);
+    expect(getConnectionTypeDefaultPort('redis')).toBe(6379);
+    expect(getConnectionTypeDefaultPort('oracle')).toBe(1521);
+    expect(getConnectionTypeDefaultPort('mongodb')).toBe(27017);
+    expect(getConnectionTypeDefaultPort('elasticsearch')).toBe(9200);
+    expect(getConnectionTypeDefaultPort('chroma')).toBe(8000);
+    expect(getConnectionTypeDefaultPort('qdrant')).toBe(6333);
+    expect(getConnectionTypeDefaultPort('iotdb')).toBe(6667);
+    expect(getConnectionTypeDefaultPort('kafka')).toBe(9092);
+    expect(getConnectionTypeDefaultPort('sqlite')).toBe(0);
+    expect(getConnectionTypeDefaultPort('duckdb')).toBe(0);
+    expect(getConnectionTypeDefaultPort('unknown')).toBe(3306);
+  });
+
+  it('keeps concise localized hints for special connection types', () => {
+    expect(getConnectionTypeHint('redis')).toBe('单机 / 哨兵 / 集群');
+    expect(getConnectionTypeHint('mongodb')).toBe('单机 / 副本集');
+    expect(getConnectionTypeHint('elasticsearch')).toContain('Mapping');
+    expect(getConnectionTypeHint('chroma')).toContain('向量');
+    expect(getConnectionTypeHint('qdrant')).toContain('Payload');
+    expect(getConnectionTypeHint('iotdb')).toContain('Timeseries');
+    expect(getConnectionTypeHint('kafka')).toContain('Consumer Group');
+    expect(getConnectionTypeHint('oceanbase')).toBe('MySQL / Oracle 租户');
+    expect(getConnectionTypeHint('goldendb')).toBe('MySQL 兼容 / 分布式事务');
+    expect(getConnectionTypeHint('duckdb')).toBe('本地文件连接');
+    expect(getConnectionTypeHint('mysql')).toBe('标准连接配置');
+  });
+});
diff --git a/frontend/src/utils/connectionTypeCatalog.ts b/frontend/src/utils/connectionTypeCatalog.ts
new file mode 100644
index 0000000..696f34b
--- /dev/null
+++ b/frontend/src/utils/connectionTypeCatalog.ts
@@ -0,0 +1,189 @@
+export type ConnectionTypeCatalogItem = {
+  key: string;
+  name: string;
+};
+
+export type ConnectionTypeCatalogGroup = {
+  label: string;
+  items: ConnectionTypeCatalogItem[];
+};
+
+export const CONNECTION_TYPE_GROUPS: ConnectionTypeCatalogGroup[] = [
+  {
+    label: '关系型数据库',
+    items: [
+      { key: 'mysql', name: 'MySQL' },
+      { key: 'mariadb', name: 'MariaDB' },
+      { key: 'diros', name: 'Doris' },
+      { key: 'starrocks', name: 'StarRocks' },
+      { key: 'sphinx', name: 'Sphinx' },
+      { key: 'clickhouse', name: 'ClickHouse' },
+      { key: 'postgres', name: 'PostgreSQL' },
+      { key: 'sqlserver', name: 'SQL Server' },
+      { key: 'iris', name: 'InterSystems IRIS' },
+      { key: 'sqlite', name: 'SQLite' },
+      { key: 'duckdb', name: 'DuckDB' },
+      { key: 'oracle', name: 'Oracle' },
+    ],
+  },
+  {
+    label: '国产数据库',
+    items: [
+      { key: 'oceanbase', name: 'OceanBase' },
+      { key: 'dameng', name: 'Dameng (达梦)' },
+      { key: 'kingbase', name: 'Kingbase (人大金仓)' },
+      { key: 'highgo', name: 'HighGo (瀚高)' },
+      { key: 'vastbase', name: 'Vastbase (海量)' },
+      { key: 'opengauss', name: 'OpenGauss' },
+      { key: 'gaussdb', name: 'GaussDB' },
+      { key: 'goldendb', name: 'GoldenDB' },
+    ],
+  },
+  {
+    label: 'NoSQL',
+    items: [
+      { key: 'mongodb', name: 'MongoDB' },
+      { key: 'redis', name: 'Redis' },
+      { key: 'elasticsearch', name: 'Elasticsearch' },
+    ],
+  },
+  {
+    label: '向量数据库',
+    items: [
+      { key: 'chroma', name: 'Chroma' },
+      { key: 'qdrant', name: 'Qdrant' },
+    ],
+  },
+  {
+    label: '时序数据库',
+    items: [
+      { key: 'tdengine', name: 'TDengine' },
+      { key: 'iotdb', name: 'Apache IoTDB' },
+    ],
+  },
+  {
+    label: '消息队列',
+    items: [
+      { key: 'rocketmq', name: 'RocketMQ' },
+      { key: 'mqtt', name: 'MQTT' },
+      { key: 'kafka', name: 'Kafka' },
+      { key: 'rabbitmq', name: 'RabbitMQ' },
+    ],
+  },
+  {
+    label: '其他',
+    items: [
+      { key: 'jvm', name: 'JVM Runtime' },
+      { key: 'custom', name: 'Custom (自定义)' },
+    ],
+  },
+];
+
+export const getConnectionTypeDefaultPort = (type: string): number => {
+  switch (String(type || '').trim().toLowerCase()) {
+    case 'jvm':
+      return 9010;
+    case 'mysql':
+      return 3306;
+    case 'oceanbase':
+      return 2881;
+    case 'goldendb':
+      return 1523;
+    case 'doris':
+    case 'diros':
+    case 'starrocks':
+      return 9030;
+    case 'sphinx':
+      return 9306;
+    case 'clickhouse':
+      return 9000;
+    case 'postgres':
+    case 'opengauss':
+    case 'gaussdb':
+      return 5432;
+    case 'redis':
+      return 6379;
+    case 'tdengine':
+      return 6041;
+    case 'iotdb':
+      return 6667;
+    case 'oracle':
+      return 1521;
+    case 'dameng':
+      return 5236;
+    case 'kingbase':
+      return 54321;
+    case 'sqlserver':
+      return 1433;
+    case 'iris':
+      return 1972;
+    case 'mongodb':
+      return 27017;
+    case 'elasticsearch':
+      return 9200;
+    case 'chroma':
+      return 8000;
+    case 'qdrant':
+      return 6333;
+    case 'rocketmq':
+      return 9876;
+    case 'mqtt':
+      return 1883;
+    case 'kafka':
+      return 9092;
+    case 'rabbitmq':
+      return 15672;
+    case 'highgo':
+      return 5866;
+    case 'mariadb':
+      return 3306;
+    case 'vastbase':
+      return 5432;
+    case 'sqlite':
+    case 'duckdb':
+      return 0;
+    default:
+      return 3306;
+  }
+};
+
+export const getConnectionTypeHint = (type: string): string => {
+  switch (String(type || '').trim().toLowerCase()) {
+    case 'jvm':
+      return 'JMX / Endpoint / Agent';
+    case 'custom':
+      return '自定义驱动与 DSN';
+    case 'redis':
+      return '单机 / 哨兵 / 集群';
+    case 'mongodb':
+      return '单机 / 副本集';
+    case 'elasticsearch':
+      return '支持索引浏览、Mapping 检查、JSON DSL 和 query_string 查询';
+    case 'chroma':
+      return 'Collection 浏览、向量检索和元数据过滤';
+    case 'qdrant':
+      return 'Collection 浏览、向量搜索和 Payload 过滤';
+    case 'iotdb':
+      return 'Storage Group / Device / Timeseries';
+    case 'rocketmq':
+      return 'NameServer / Topic / Consumer Group';
+    case 'mqtt':
+      return 'Broker / Topic Filter / QoS';
+    case 'kafka':
+      return 'Broker / Topic / Consumer Group';
+    case 'rabbitmq':
+      return 'Management API / Virtual Host / Queue';
+    case 'oceanbase':
+      return 'MySQL / Oracle 租户';
+    case 'goldendb':
+      return 'MySQL 兼容 / 分布式事务';
+    case 'sqlite':
+    case 'duckdb':
+      return '本地文件连接';
+    default:
+      return '标准连接配置';
+  }
+};
+
+export const getAllConnectionTypeCatalogItems = (): ConnectionTypeCatalogItem[] =>
+  CONNECTION_TYPE_GROUPS.flatMap((group) => group.items);
diff --git a/frontend/src/utils/dataSourceCapabilities.test.ts b/frontend/src/utils/dataSourceCapabilities.test.ts
index 0dcee63..2166f69 100644
--- a/frontend/src/utils/dataSourceCapabilities.test.ts
+++ b/frontend/src/utils/dataSourceCapabilities.test.ts
@@ -30,6 +30,24 @@ describe('dataSourceCapabilities', () => {
     });
   });
 
+  it('treats GoldenDB as an editable MySQL-family datasource with database-level DDL actions', () => {
+    expect(getDataSourceCapabilities({ type: 'goldendb' })).toMatchObject({
+      type: 'goldendb',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: true,
+      supportsCopyInsert: true,
+      supportsCreateDatabase: true,
+      supportsRenameDatabase: false,
+      supportsDropDatabase: true,
+      forceReadOnlyQueryResult: false,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'greatdb' })).toMatchObject({
+      type: 'goldendb',
+      supportsQueryEditor: true,
+      supportsCopyInsert: true,
+    });
+  });
+
   it('keeps StarRocks as an independent SQL datasource capability', () => {
     expect(getDataSourceCapabilities({ type: 'starrocks' })).toMatchObject({
       type: 'starrocks',
@@ -54,6 +72,181 @@ describe('dataSourceCapabilities', () => {
     });
   });
 
+  it('treats GaussDB as an editable PostgreSQL-family datasource with database-level DDL actions', () => {
+    expect(getDataSourceCapabilities({ type: 'gaussdb' })).toMatchObject({
+      type: 'gaussdb',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: true,
+      supportsCopyInsert: true,
+      supportsCreateDatabase: true,
+      supportsRenameDatabase: true,
+      supportsDropDatabase: true,
+      forceReadOnlyQueryResult: false,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'gauss-db' })).toMatchObject({
+      type: 'gaussdb',
+      supportsQueryEditor: true,
+      supportsCopyInsert: true,
+      supportsRenameDatabase: true,
+    });
+  });
+
+  it('treats Elasticsearch as a queryable read-only datasource', () => {
+    expect(getDataSourceCapabilities({ type: 'elasticsearch' })).toMatchObject({
+      type: 'elasticsearch',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: false,
+      supportsCopyInsert: false,
+      supportsCreateDatabase: false,
+      supportsRenameDatabase: false,
+      supportsDropDatabase: false,
+      forceReadOnlyQueryResult: false,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'elastic' })).toMatchObject({
+      type: 'elasticsearch',
+      supportsQueryEditor: true,
+      forceReadOnlyQueryResult: false,
+    });
+  });
+
+  it('treats Chroma as a queryable vector datasource without SQL export actions', () => {
+    expect(getDataSourceCapabilities({ type: 'chroma' })).toMatchObject({
+      type: 'chroma',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: false,
+      supportsCopyInsert: false,
+      supportsCreateDatabase: false,
+      supportsRenameDatabase: false,
+      supportsDropDatabase: false,
+      forceReadOnlyQueryResult: false,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'chromadb' })).toMatchObject({
+      type: 'chroma',
+      supportsQueryEditor: true,
+      supportsCopyInsert: false,
+    });
+  });
+
+  it('treats Qdrant as a queryable vector datasource without SQL export actions', () => {
+    expect(getDataSourceCapabilities({ type: 'qdrant' })).toMatchObject({
+      type: 'qdrant',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: false,
+      supportsCopyInsert: false,
+      supportsCreateDatabase: false,
+      supportsRenameDatabase: false,
+      supportsDropDatabase: false,
+      forceReadOnlyQueryResult: false,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'qdrantdb' })).toMatchObject({
+      type: 'qdrant',
+      supportsQueryEditor: true,
+      supportsCopyInsert: false,
+    });
+  });
+
+  it('treats Apache IoTDB as a queryable timeseries datasource with IoTDB-specific writes', () => {
+    expect(getDataSourceCapabilities({ type: 'iotdb' })).toMatchObject({
+      type: 'iotdb',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: false,
+      supportsCopyInsert: false,
+      supportsCreateDatabase: false,
+      supportsRenameDatabase: false,
+      supportsDropDatabase: false,
+      forceReadOnlyQueryResult: true,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'apache-iotdb' })).toMatchObject({
+      type: 'iotdb',
+      supportsQueryEditor: true,
+      supportsCopyInsert: false,
+      forceReadOnlyQueryResult: true,
+    });
+  });
+
+  it('treats RocketMQ as a queryable messaging datasource with manual total count and publish support', () => {
+    expect(getDataSourceCapabilities({ type: 'rocketmq' })).toMatchObject({
+      type: 'rocketmq',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: false,
+      supportsCopyInsert: false,
+      supportsCreateDatabase: false,
+      supportsRenameDatabase: false,
+      supportsDropDatabase: false,
+      supportsMessagePublish: true,
+      forceReadOnlyQueryResult: true,
+      preferManualTotalCount: true,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'rmq' })).toMatchObject({
+      type: 'rocketmq',
+      supportsQueryEditor: true,
+      supportsMessagePublish: true,
+      forceReadOnlyQueryResult: true,
+      preferManualTotalCount: true,
+    });
+  });
+
+  it('treats MQTT as a queryable messaging datasource with manual total count and publish support', () => {
+    expect(getDataSourceCapabilities({ type: 'mqtt' })).toMatchObject({
+      type: 'mqtt',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: false,
+      supportsCopyInsert: false,
+      supportsCreateDatabase: false,
+      supportsRenameDatabase: false,
+      supportsDropDatabase: false,
+      supportsMessagePublish: true,
+      forceReadOnlyQueryResult: true,
+      preferManualTotalCount: true,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'mqtts' })).toMatchObject({
+      type: 'mqtt',
+      supportsQueryEditor: true,
+      supportsMessagePublish: true,
+      preferManualTotalCount: true,
+    });
+  });
+
+  it('treats Kafka as a queryable read-only messaging datasource', () => {
+    expect(getDataSourceCapabilities({ type: 'kafka' })).toMatchObject({
+      type: 'kafka',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: false,
+      supportsCopyInsert: false,
+      supportsCreateDatabase: false,
+      supportsRenameDatabase: false,
+      supportsDropDatabase: false,
+      supportsMessagePublish: true,
+      forceReadOnlyQueryResult: true,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'apache-kafka' })).toMatchObject({
+      type: 'kafka',
+      supportsQueryEditor: true,
+      supportsMessagePublish: true,
+      forceReadOnlyQueryResult: true,
+    });
+  });
+
+  it('treats RabbitMQ as a queryable messaging datasource with publish support', () => {
+    expect(getDataSourceCapabilities({ type: 'rabbitmq' })).toMatchObject({
+      type: 'rabbitmq',
+      supportsQueryEditor: true,
+      supportsSqlQueryExport: false,
+      supportsCopyInsert: false,
+      supportsCreateDatabase: false,
+      supportsRenameDatabase: false,
+      supportsDropDatabase: false,
+      supportsMessagePublish: true,
+      forceReadOnlyQueryResult: true,
+    });
+    expect(getDataSourceCapabilities({ type: 'custom', driver: 'rabbit-mq' })).toMatchObject({
+      type: 'rabbitmq',
+      supportsQueryEditor: true,
+      supportsMessagePublish: true,
+      forceReadOnlyQueryResult: true,
+    });
+  });
+
   it('treats OceanBase Oracle protocol as Oracle capabilities', () => {
     expect(getDataSourceCapabilities({
       type: 'oceanbase',
diff --git a/frontend/src/utils/dataSourceCapabilities.ts b/frontend/src/utils/dataSourceCapabilities.ts
index a82a543..cbbc8d1 100644
--- a/frontend/src/utils/dataSourceCapabilities.ts
+++ b/frontend/src/utils/dataSourceCapabilities.ts
@@ -16,8 +16,46 @@ const normalizeDataSourceToken = (raw: string): string => {
     case 'open_gauss':
     case 'open-gauss':
       return 'opengauss';
+    case 'gaussdb':
+    case 'gauss_db':
+    case 'gauss-db':
+      return 'gaussdb';
+    case 'goldendb':
+    case 'greatdb':
+    case 'gdb':
+      return 'goldendb';
     case 'dm':
       return 'dameng';
+    case 'elastic':
+    case 'elasticsearch':
+      return 'elasticsearch';
+    case 'chromadb':
+    case 'chroma-db':
+      return 'chroma';
+    case 'qdrantdb':
+    case 'qdrant-db':
+      return 'qdrant';
+    case 'rocketmq':
+    case 'rocket-mq':
+    case 'rocket_mq':
+    case 'apache-rocketmq':
+    case 'apache_rocketmq':
+    case 'rmq':
+      return 'rocketmq';
+    case 'mqtt':
+    case 'mqtts':
+      return 'mqtt';
+    case 'apache-iotdb':
+    case 'apache_iotdb':
+      return 'iotdb';
+    case 'kafka':
+    case 'apache-kafka':
+    case 'apache_kafka':
+      return 'kafka';
+    case 'rabbitmq':
+    case 'rabbit-mq':
+    case 'rabbit_mq':
+      return 'rabbitmq';
     case 'intersystems':
     case 'intersystemsiris':
     case 'inter-systems':
@@ -46,6 +84,7 @@ export const resolveDataSourceType = (config: ConnectionLike): string => {
 
 const SQL_QUERY_EXPORT_TYPES = new Set([
   'mysql',
+  'goldendb',
   'mariadb',
   'oceanbase',
   'diros',
@@ -56,6 +95,7 @@ const SQL_QUERY_EXPORT_TYPES = new Set([
   'highgo',
   'vastbase',
   'opengauss',
+  'gaussdb',
   'sqlserver',
   'iris',
   'sqlite',
@@ -68,6 +108,7 @@ const SQL_QUERY_EXPORT_TYPES = new Set([
 
 const COPY_INSERT_TYPES = new Set([
   'mysql',
+  'goldendb',
   'mariadb',
   'oceanbase',
   'diros',
@@ -78,6 +119,7 @@ const COPY_INSERT_TYPES = new Set([
   'highgo',
   'vastbase',
   'opengauss',
+  'gaussdb',
   'sqlserver',
   'iris',
   'sqlite',
@@ -89,8 +131,9 @@ const COPY_INSERT_TYPES = new Set([
 ]);
 
 const QUERY_EDITOR_DISABLED_TYPES = new Set(['redis']);
-const FORCE_READ_ONLY_QUERY_TYPES = new Set(['tdengine', 'clickhouse']);
-const MANUAL_TOTAL_COUNT_TYPES = new Set(['duckdb', 'oracle']);
+const FORCE_READ_ONLY_QUERY_TYPES = new Set(['tdengine', 'iotdb', 'clickhouse', 'rocketmq', 'mqtt', 'kafka', 'rabbitmq']);
+const MESSAGE_PUBLISH_TYPES = new Set(['rocketmq', 'mqtt', 'kafka', 'rabbitmq']);
+const MANUAL_TOTAL_COUNT_TYPES = new Set(['duckdb', 'oracle', 'rocketmq', 'mqtt']);
 const APPROXIMATE_TABLE_COUNT_TYPES = new Set(['duckdb', 'oracle']);
 const APPROXIMATE_TOTAL_PAGE_TYPES = new Set(['duckdb']);
 
@@ -102,6 +145,7 @@ export type DataSourceCapabilities = {
   supportsCreateDatabase: boolean;
   supportsRenameDatabase: boolean;
   supportsDropDatabase: boolean;
+  supportsMessagePublish: boolean;
   forceReadOnlyQueryResult: boolean;
   preferManualTotalCount: boolean;
   supportsApproximateTableCount: boolean;
@@ -110,6 +154,7 @@ export type DataSourceCapabilities = {
 
 const CREATE_DATABASE_TYPES = new Set([
   'mysql',
+  'goldendb',
   'mariadb',
   'oceanbase',
   'diros',
@@ -119,6 +164,7 @@ const CREATE_DATABASE_TYPES = new Set([
   'highgo',
   'vastbase',
   'opengauss',
+  'gaussdb',
   'sqlserver',
   'tdengine',
   'clickhouse',
@@ -131,10 +177,12 @@ const RENAME_DATABASE_TYPES = new Set([
   'highgo',
   'vastbase',
   'opengauss',
+  'gaussdb',
 ]);
 
 const DROP_DATABASE_TYPES = new Set([
   'mysql',
+  'goldendb',
   'mariadb',
   'oceanbase',
   'diros',
@@ -144,6 +192,7 @@ const DROP_DATABASE_TYPES = new Set([
   'highgo',
   'vastbase',
   'opengauss',
+  'gaussdb',
   'tdengine',
   'clickhouse',
 ]);
@@ -158,6 +207,7 @@ export const getDataSourceCapabilities = (config: ConnectionLike): DataSourceCap
     supportsCreateDatabase: CREATE_DATABASE_TYPES.has(type),
     supportsRenameDatabase: RENAME_DATABASE_TYPES.has(type),
     supportsDropDatabase: DROP_DATABASE_TYPES.has(type),
+    supportsMessagePublish: MESSAGE_PUBLISH_TYPES.has(type),
     forceReadOnlyQueryResult: FORCE_READ_ONLY_QUERY_TYPES.has(type),
     preferManualTotalCount: MANUAL_TOTAL_COUNT_TYPES.has(type),
     supportsApproximateTableCount: APPROXIMATE_TABLE_COUNT_TYPES.has(type),
diff --git a/frontend/src/utils/ddlFormat.test.ts b/frontend/src/utils/ddlFormat.test.ts
new file mode 100644
index 0000000..cbbaea5
--- /dev/null
+++ b/frontend/src/utils/ddlFormat.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest';
+
+import { formatDdlForDisplay } from './ddlFormat';
+
+describe('formatDdlForDisplay', () => {
+  it('formats DuckDB create table SQL into multiline output', () => {
+    const raw = 'CREATE TABLE customers(customer_id BIGINT, customer_code VARCHAR, city VARCHAR, tier VARCHAR, signup_date DATE, lifetime_value DECIMAL(12,2), PRIMARY KEY(customer_id));';
+
+    const formatted = formatDdlForDisplay(raw, 'duckdb');
+
+    expect(formatted).toContain('CREATE TABLE customers (');
+    expect(formatted).toContain('customer_id BIGINT,');
+    expect(formatted).toContain('PRIMARY KEY (customer_id)');
+    expect(formatted).toContain('\n');
+  });
+
+  it('returns original text when formatter cannot parse the statement', () => {
+    const raw = 'not valid ddl(';
+
+    expect(formatDdlForDisplay(raw, 'duckdb')).toBe(raw);
+  });
+});
diff --git a/frontend/src/utils/ddlFormat.ts b/frontend/src/utils/ddlFormat.ts
new file mode 100644
index 0000000..0122818
--- /dev/null
+++ b/frontend/src/utils/ddlFormat.ts
@@ -0,0 +1,52 @@
+import { format, type SqlLanguage } from 'sql-formatter';
+
+const resolveDdlFormatterLanguage = (dbType: string): SqlLanguage => {
+  const normalized = String(dbType || '').trim().toLowerCase();
+  switch (normalized) {
+    case 'duckdb':
+      return 'duckdb';
+    case 'sqlite':
+      return 'sqlite';
+    case 'postgres':
+    case 'postgresql':
+    case 'kingbase':
+    case 'highgo':
+    case 'opengauss':
+    case 'gaussdb':
+    case 'vastbase':
+      return 'postgresql';
+    case 'mariadb':
+      return 'mariadb';
+    case 'mysql':
+    case 'goldendb':
+    case 'sphinx':
+      return 'mysql';
+    case 'sqlserver':
+      return 'transactsql';
+    case 'oracle':
+    case 'dameng':
+    case 'oceanbase':
+      return 'plsql';
+    case 'clickhouse':
+      return 'clickhouse';
+    default:
+      return 'sql';
+  }
+};
+
+export const formatDdlForDisplay = (ddlText: unknown, dbType: string): string => {
+  const raw = String(ddlText ?? '').trim();
+  if (!raw) {
+    return '';
+  }
+  const language = resolveDdlFormatterLanguage(dbType);
+  try {
+    return format(raw, {
+      language,
+      keywordCase: 'upper',
+      linesBetweenQueries: 1,
+    });
+  } catch {
+    return raw;
+  }
+};
diff --git a/frontend/src/utils/driverImportGuidance.ts b/frontend/src/utils/driverImportGuidance.ts
index 53e43de..14eaf20 100644
--- a/frontend/src/utils/driverImportGuidance.ts
+++ b/frontend/src/utils/driverImportGuidance.ts
@@ -9,5 +9,19 @@ export const getDriverLocalImportDirectoryHelp = (language?: SupportedLanguage |
 export const getDriverLocalImportSingleFileHelp = (language?: SupportedLanguage | string) =>
   t('driver_manager.import.single_file_help', undefined, language ?? getCurrentLanguage());
 
+const includeCustomDriverRawAliases = (helpText: string): string => {
+  let next = String(helpText || '');
+  if (!/\bgaussdb\b/i.test(next)) {
+    next = next.replace(/\bopengauss\b/i, (match) => `${match}, gaussdb`);
+  }
+  if (!/gauss_db\/gauss-db/i.test(next)) {
+    next = next.replace(/open_gauss\/open-gauss([、,])(\s*)/u, (_match, separator: string, spacing: string) => {
+      const gap = separator === ',' ? spacing || ' ' : '';
+      return `open_gauss/open-gauss${separator}${gap}gauss_db/gauss-db${separator}${spacing || ''}`;
+    });
+  }
+  return next;
+};
+
 export const getCustomConnectionDriverHelp = (language?: SupportedLanguage | string) =>
-  t('driver.guidance.customConnectionDriverHelp', undefined, language ?? getCurrentLanguage());
+  includeCustomDriverRawAliases(t('driver.guidance.customConnectionDriverHelp', undefined, language ?? getCurrentLanguage()));
diff --git a/frontend/src/utils/driverProgress.test.ts b/frontend/src/utils/driverProgress.test.ts
new file mode 100644
index 0000000..262f1f8
--- /dev/null
+++ b/frontend/src/utils/driverProgress.test.ts
@@ -0,0 +1,82 @@
+import { describe, expect, it } from 'vitest';
+
+import { normalizeDriverProgressUpdate, type DriverProgressState } from './driverProgress';
+
+describe('normalizeDriverProgressUpdate', () => {
+  it('keeps downloading progress monotonic within one install session', () => {
+    const previous: DriverProgressState = {
+      status: 'downloading',
+      message: '写入驱动元数据',
+      percent: 90,
+    };
+
+    const actual = normalizeDriverProgressUpdate(previous, {
+      status: 'downloading',
+      message: '下载驱动总包',
+      percent: 30,
+    });
+
+    expect(actual).toEqual({
+      status: 'downloading',
+      message: '下载驱动总包',
+      percent: 90,
+    });
+  });
+
+  it('allows start to reset progress for a new install session', () => {
+    const actual = normalizeDriverProgressUpdate({
+      status: 'error',
+      message: '安装失败',
+      percent: 90,
+    }, {
+      status: 'start',
+      message: '开始安装',
+      percent: 0,
+    });
+
+    expect(actual).toEqual({
+      status: 'start',
+      message: '开始安装',
+      percent: 0,
+    });
+  });
+
+  it('does not let stale downloading events overwrite terminal states', () => {
+    const done = normalizeDriverProgressUpdate({
+      status: 'downloading',
+      message: '写入驱动元数据',
+      percent: 95,
+    }, {
+      status: 'done',
+      message: '驱动代理安装完成',
+      percent: 100,
+    });
+
+    expect(normalizeDriverProgressUpdate(done, {
+      status: 'downloading',
+      message: '下载驱动总包',
+      percent: 40,
+    })).toBe(done);
+
+    const failed = normalizeDriverProgressUpdate({
+      status: 'downloading',
+      message: '写入驱动元数据',
+      percent: 95,
+    }, {
+      status: 'error',
+      message: '安装失败',
+      percent: 0,
+    });
+
+    expect(failed).toEqual({
+      status: 'error',
+      message: '安装失败',
+      percent: 95,
+    });
+    expect(normalizeDriverProgressUpdate(failed, {
+      status: 'downloading',
+      message: '下载驱动总包',
+      percent: 40,
+    })).toBe(failed);
+  });
+});
diff --git a/frontend/src/utils/driverProgress.ts b/frontend/src/utils/driverProgress.ts
new file mode 100644
index 0000000..86cdfd5
--- /dev/null
+++ b/frontend/src/utils/driverProgress.ts
@@ -0,0 +1,59 @@
+export type DriverProgressStatus = 'start' | 'downloading' | 'done' | 'error';
+
+export type DriverProgressState = {
+  status: DriverProgressStatus;
+  message: string;
+  percent: number;
+};
+
+const clampDriverProgressPercent = (value: number): number => {
+  if (!Number.isFinite(value)) {
+    return 0;
+  }
+  return Math.max(0, Math.min(100, value));
+};
+
+export const normalizeDriverProgressUpdate = (
+  previous: DriverProgressState | undefined,
+  incoming: DriverProgressState,
+): DriverProgressState => {
+  const next: DriverProgressState = {
+    status: incoming.status,
+    message: String(incoming.message || '').trim(),
+    percent: clampDriverProgressPercent(Number(incoming.percent || 0)),
+  };
+
+  if (next.status === 'start') {
+    return {
+      ...next,
+      percent: 0,
+    };
+  }
+
+  if (next.status === 'done') {
+    return {
+      ...next,
+      percent: 100,
+    };
+  }
+
+  if (next.status === 'error') {
+    return {
+      ...next,
+      percent: Math.max(clampDriverProgressPercent(previous?.percent || 0), next.percent),
+    };
+  }
+
+  if (previous?.status === 'done' || previous?.status === 'error') {
+    return previous;
+  }
+
+  if (previous?.status === 'start' || previous?.status === 'downloading') {
+    return {
+      ...next,
+      percent: Math.max(clampDriverProgressPercent(previous.percent || 0), next.percent),
+    };
+  }
+
+  return next;
+};
diff --git a/frontend/src/utils/externalSqlTree.test.ts b/frontend/src/utils/externalSqlTree.test.ts
index f25b3a6..2e9c458 100644
--- a/frontend/src/utils/externalSqlTree.test.ts
+++ b/frontend/src/utils/externalSqlTree.test.ts
@@ -10,8 +10,6 @@ describe('externalSqlTree helpers', () => {
         id: 'dir-1',
         name: 'scripts',
         path: 'D:/sql/scripts',
-        connectionId: 'conn-1',
-        dbName: 'demo',
         createdAt: 1,
       },
     ];
@@ -33,14 +31,12 @@ describe('externalSqlTree helpers', () => {
     };
 
     const node = buildExternalSQLRootNode({
-      dbNodeKey: 'conn-1-demo',
-      connectionId: 'conn-1',
-      dbName: 'demo',
       directories,
       directoryTrees: trees,
     });
 
     expect(node.type).toBe('external-sql-root');
+    expect(node.key).toBe('external-sql-root');
     expect(node.title).toBe('External SQL files (1)');
     expect(node.children).toHaveLength(1);
     expect(node.children?.[0]).toMatchObject({
@@ -113,4 +109,77 @@ describe('externalSqlTree helpers', () => {
     expect(first).toContain('demo');
     expect(first).not.toBe(second);
   });
+
+  it('filters non-sql file entries even when the backend returns them', () => {
+    const directories: ExternalSQLDirectory[] = [
+      {
+        id: 'dir-1',
+        name: 'scripts',
+        path: 'D:/sql/scripts',
+        createdAt: 1,
+      },
+    ];
+    const trees: Record<string, ExternalSQLTreeEntry[]> = {
+      'dir-1': [
+        {
+          name: 'readme.md',
+          path: 'D:/sql/scripts/readme.md',
+          isDir: false,
+        },
+        {
+          name: 'nested',
+          path: 'D:/sql/scripts/nested',
+          isDir: true,
+          children: [
+            {
+              name: 'notes.txt',
+              path: 'D:/sql/scripts/nested/notes.txt',
+              isDir: false,
+            },
+            {
+              name: 'report.SQL',
+              path: 'D:/sql/scripts/nested/report.SQL',
+              isDir: false,
+            },
+          ],
+        },
+        {
+          name: 'docs',
+          path: 'D:/sql/scripts/docs',
+          isDir: true,
+          children: [
+            {
+              name: 'manual.md',
+              path: 'D:/sql/scripts/docs/manual.md',
+              isDir: false,
+            },
+          ],
+        },
+      ],
+    };
+
+    const node = buildExternalSQLRootNode({
+      directories,
+      directoryTrees: trees,
+    });
+
+    const folderChildren = node.children?.[0].children || [];
+    const docsFolder = folderChildren.find((child) => child.title === 'docs');
+    const nestedFolder = folderChildren.find((child) => child.title === 'nested');
+    expect(folderChildren).toHaveLength(2);
+    expect(docsFolder).toMatchObject({
+      title: 'docs',
+      type: 'external-sql-folder',
+    });
+    expect(docsFolder?.children).toBeUndefined();
+    expect(nestedFolder).toMatchObject({
+      title: 'nested',
+      type: 'external-sql-folder',
+    });
+    expect(nestedFolder?.children).toHaveLength(1);
+    expect(nestedFolder?.children?.[0]).toMatchObject({
+      title: 'report.SQL',
+      type: 'external-sql-file',
+    });
+  });
 });
diff --git a/frontend/src/utils/externalSqlTree.ts b/frontend/src/utils/externalSqlTree.ts
index 4b68323..0e90c61 100644
--- a/frontend/src/utils/externalSqlTree.ts
+++ b/frontend/src/utils/externalSqlTree.ts
@@ -16,9 +16,9 @@ export interface ExternalSQLTreeNode {
 }
 
 type BuildExternalSQLRootNodeParams = {
-  dbNodeKey: string;
-  connectionId: string;
-  dbName: string;
+  dbNodeKey?: string;
+  connectionId?: string;
+  dbName?: string;
   directories: ExternalSQLDirectory[];
   directoryTrees: Record<string, ExternalSQLTreeEntry[]>;
   labels?: Partial<ExternalSQLTreeLabels>;
@@ -55,7 +55,7 @@ const resolveDirectoryDisplayName = (
 };
 
 export const buildExternalSQLDirectoryId = (connectionId: string, dbName: string, directoryPath: string): string =>
-  `external-sql-dir:${String(connectionId || '').trim()}:${String(dbName || '').trim()}:${normalizeExternalSQLPath(directoryPath)}`;
+  `external-sql-dir:${normalizeExternalSQLPath(directoryPath)}`;
 
 export const buildExternalSQLTabId = (connectionId: string, dbName: string, filePath: string): string =>
   `external-sql-tab:${String(connectionId || '').trim()}:${String(dbName || '').trim()}:${normalizeExternalSQLPath(filePath)}`;
@@ -63,14 +63,20 @@ export const buildExternalSQLTabId = (connectionId: string, dbName: string, file
 const buildExternalSQLNodeKey = (type: ExternalSQLNodeType, base: string): string =>
   `${type}:${normalizeExternalSQLPath(base)}`;
 
+const isExternalSQLFileEntry = (entry: ExternalSQLTreeEntry): boolean => {
+  const name = String(entry.name || '').trim();
+  const path = normalizeExternalSQLPath(entry.path);
+  return /\.sql$/i.test(name) || /\.sql$/i.test(path);
+};
+
 const mapExternalSQLTreeEntries = (
   entries: ExternalSQLTreeEntry[],
   context: { connectionId: string; dbName: string; dbNodeKey: string; directoryId: string },
-): ExternalSQLTreeNode[] => entries.map((entry) => {
+): ExternalSQLTreeNode[] => entries.flatMap((entry): ExternalSQLTreeNode[] => {
   const entryPath = normalizeExternalSQLPath(entry.path);
   if (entry.isDir) {
     const children = mapExternalSQLTreeEntries(entry.children || [], context);
-    return {
+    return [{
       title: entry.name,
       key: buildExternalSQLNodeKey('external-sql-folder', entryPath),
       type: 'external-sql-folder',
@@ -84,10 +90,14 @@ const mapExternalSQLTreeEntries = (
         path: entry.path,
         name: entry.name,
       },
-    };
+    }];
   }
 
-  return {
+  if (!isExternalSQLFileEntry(entry)) {
+    return [];
+  }
+
+  return [{
     title: entry.name,
     key: buildExternalSQLNodeKey('external-sql-file', entryPath),
     type: 'external-sql-file',
@@ -100,13 +110,13 @@ const mapExternalSQLTreeEntries = (
       path: entry.path,
       name: entry.name,
     },
-  };
+  }];
 });
 
 export const buildExternalSQLRootNode = ({
-  dbNodeKey,
-  connectionId,
-  dbName,
+  dbNodeKey = 'external-sql-root',
+  connectionId = '',
+  dbName = '',
   directories,
   directoryTrees,
   labels,
@@ -142,7 +152,7 @@ export const buildExternalSQLRootNode = ({
 
   return {
     title: children.length > 0 ? `${resolvedLabels.root} (${children.length})` : resolvedLabels.root,
-    key: `${dbNodeKey}-external-sql`,
+    key: dbNodeKey === 'external-sql-root' ? 'external-sql-root' : `${dbNodeKey}-external-sql`,
     type: 'external-sql-root',
     isLeaf: children.length === 0,
     children: children.length > 0 ? children : undefined,
diff --git a/frontend/src/utils/fontFamilies.test.ts b/frontend/src/utils/fontFamilies.test.ts
new file mode 100644
index 0000000..87fcfca
--- /dev/null
+++ b/frontend/src/utils/fontFamilies.test.ts
@@ -0,0 +1,33 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  getLinuxCJKFontInstallHint,
+  hasInstalledCJKFontFamily,
+} from './fontFamilies';
+
+describe('fontFamilies helpers', () => {
+  it('detects installed CJK font families on Linux', () => {
+    expect(hasInstalledCJKFontFamily([
+      { family: 'Ubuntu' },
+      { family: 'Noto Sans CJK SC' },
+    ])).toBe(true);
+    expect(hasInstalledCJKFontFamily([
+      { family: 'DejaVu Sans' },
+      { family: 'Liberation Sans' },
+    ])).toBe(false);
+  });
+
+  it('returns an Ubuntu CJK font install hint only when Linux lacks CJK fonts', () => {
+    expect(getLinuxCJKFontInstallHint('linux', [
+      { family: 'DejaVu Sans' },
+    ])).toBe('sudo apt install fonts-noto-cjk fonts-wqy-microhei && fc-cache -fv');
+
+    expect(getLinuxCJKFontInstallHint('linux', [
+      { family: 'Source Han Sans SC' },
+    ])).toBeNull();
+
+    expect(getLinuxCJKFontInstallHint('windows', [
+      { family: 'DejaVu Sans' },
+    ])).toBeNull();
+  });
+});
diff --git a/frontend/src/utils/fontFamilies.ts b/frontend/src/utils/fontFamilies.ts
index 997169b..7766352 100644
--- a/frontend/src/utils/fontFamilies.ts
+++ b/frontend/src/utils/fontFamilies.ts
@@ -1,9 +1,36 @@
 export const DEFAULT_UI_FONT_FAMILY =
-  '"Inter", "PingFang SC", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", sans-serif';
+  '"Inter", "PingFang SC", "Noto Sans CJK SC", "Noto Sans SC", "Source Han Sans SC", "WenQuanYi Micro Hei", "Microsoft YaHei", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Ubuntu", sans-serif';
 export const DEFAULT_MONO_FONT_FAMILY =
-  '"JetBrains Mono", ui-monospace, "SF Mono", Menlo, Consolas, monospace';
+  '"JetBrains Mono", "Noto Sans Mono CJK SC", "Noto Sans Mono", ui-monospace, "SF Mono", Menlo, Consolas, "DejaVu Sans Mono", monospace';
 
 const MAX_FONT_FAMILY_LENGTH = 512;
+const LINUX_CJK_FONT_INSTALL_COMMAND = 'sudo apt install fonts-noto-cjk fonts-wqy-microhei && fc-cache -fv';
+
+const CJK_FONT_KEYWORDS = [
+  'noto sans cjk',
+  'noto sans sc',
+  'noto serif cjk',
+  'noto serif sc',
+  'source han sans',
+  'source han serif',
+  '思源',
+  'wenquanyi',
+  '文泉驿',
+  'sarasa',
+  '更纱',
+  'lxgw',
+  '霞鹜',
+  'microsoft yahei',
+  '微软雅黑',
+  'simsun',
+  '宋体',
+  'simhei',
+  '黑体',
+  'pingfang',
+  '苹方',
+  'hiragino',
+  '冬青',
+];
 
 export type FontFamilyOption = {
   value: string;
@@ -17,9 +44,9 @@ export type InstalledFontFamily = {
 };
 
 const UI_FONT_FALLBACK_STACK =
-  '-apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "PingFang SC", sans-serif';
+  '-apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "PingFang SC", "Noto Sans CJK SC", "Noto Sans SC", "Source Han Sans SC", "WenQuanYi Micro Hei", "Microsoft YaHei", "Ubuntu", sans-serif';
 const MONO_FONT_FALLBACK_STACK =
-  'ui-monospace, "SF Mono", Menlo, Consolas, monospace';
+  'ui-monospace, "SF Mono", Menlo, Consolas, "Noto Sans Mono CJK SC", "Noto Sans Mono", "DejaVu Sans Mono", monospace';
 
 const MONO_FONT_PRIORITY_HINTS = [
   'mono',
@@ -46,6 +73,11 @@ const normalizeFontSearchToken = (value: string): string => String(value || '')
   .toLowerCase()
   .replace(/[^a-z0-9\u4e00-\u9fff]+/gi, '');
 
+const normalizeInstalledFontNameForCJK = (entry: string | InstalledFontFamily): string => {
+  const raw = typeof entry === 'string' ? entry : entry.family;
+  return String(raw || '').trim().toLowerCase();
+};
+
 const insertFontNameWordBreaks = (value: string): string => value
   .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
   .replace(/([a-z\d])([A-Z])/g, '$1 $2');
@@ -83,10 +115,12 @@ const MAC_MONO_FONTS: FontFamilyOption[] = [
 ];
 
 const LINUX_UI_FONTS: FontFamilyOption[] = [
-  { value: '"Noto Sans", "Noto Sans CJK SC", sans-serif', label: 'Noto Sans', keywords: ['linux', 'default'] },
-  { value: '"Ubuntu", "Noto Sans", sans-serif', label: 'Ubuntu', keywords: ['linux', 'ubuntu'] },
-  { value: '"DejaVu Sans", "Noto Sans", sans-serif', label: 'DejaVu Sans', keywords: ['linux'] },
-  { value: '"Liberation Sans", "Noto Sans", sans-serif', label: 'Liberation Sans', keywords: ['linux'] },
+  { value: '"Noto Sans", "Noto Sans CJK SC", "Noto Sans SC", sans-serif', label: 'Noto Sans', keywords: ['linux', 'default'] },
+  { value: '"Noto Sans CJK SC", "Noto Sans SC", "Source Han Sans SC", sans-serif', label: 'Noto Sans CJK SC', keywords: ['linux', 'cjk', '中文'] },
+  { value: '"Source Han Sans SC", "Noto Sans CJK SC", sans-serif', label: 'Source Han Sans SC', keywords: ['linux', 'cjk', '思源黑体'] },
+  { value: '"Ubuntu", "Noto Sans CJK SC", "Noto Sans", sans-serif', label: 'Ubuntu', keywords: ['linux', 'ubuntu'] },
+  { value: '"DejaVu Sans", "Noto Sans CJK SC", "Noto Sans", sans-serif', label: 'DejaVu Sans', keywords: ['linux'] },
+  { value: '"Liberation Sans", "Noto Sans CJK SC", "Noto Sans", sans-serif', label: 'Liberation Sans', keywords: ['linux'] },
   { value: '"WenQuanYi Micro Hei", "Noto Sans CJK SC", sans-serif', label: 'WenQuanYi Micro Hei', keywords: ['linux', '文泉驿'] },
 ];
 
@@ -103,6 +137,7 @@ const SHARED_UI_FONTS: FontFamilyOption[] = [
   { value: '"PingFang SC", sans-serif', label: 'PingFang SC', keywords: ['shared', '苹方'] },
   { value: '"Microsoft YaHei", sans-serif', label: 'Microsoft YaHei', keywords: ['shared', '雅黑'] },
   { value: '"Noto Sans CJK SC", sans-serif', label: 'Noto Sans CJK SC', keywords: ['shared', 'noto'] },
+  { value: '"Source Han Sans SC", sans-serif', label: 'Source Han Sans SC', keywords: ['shared', 'source han', '思源黑体'] },
 ];
 
 const SHARED_MONO_FONTS: FontFamilyOption[] = [
@@ -264,6 +299,32 @@ export const resolveMonoFontFamily = (customValue: unknown): string => {
   return sanitizeFontFamilyInput(customValue) ?? DEFAULT_MONO_FONT_FAMILY;
 };
 
+export const hasInstalledCJKFontFamily = (
+  installedFamilies: Array<string | InstalledFontFamily>,
+): boolean => {
+  return installedFamilies.some((entry) => {
+    const family = normalizeInstalledFontNameForCJK(entry);
+    if (!family) {
+      return false;
+    }
+    const compactFamily = normalizeFontSearchToken(family);
+    return CJK_FONT_KEYWORDS.some((keyword) => {
+      const normalizedKeyword = keyword.toLowerCase();
+      return family.includes(normalizedKeyword) || compactFamily.includes(normalizeFontSearchToken(normalizedKeyword));
+    });
+  });
+};
+
+export const getLinuxCJKFontInstallHint = (
+  platform: string,
+  installedFamilies: Array<string | InstalledFontFamily>,
+): string | null => {
+  if (String(platform || '').toLowerCase() !== 'linux') {
+    return null;
+  }
+  return hasInstalledCJKFontFamily(installedFamilies) ? null : LINUX_CJK_FONT_INSTALL_COMMAND;
+};
+
 export const getPlatformFontFamilyOptions = (
   platform: string,
   kind: "ui" | "mono",
diff --git a/frontend/src/utils/mcpArgumentDetailHints.ts b/frontend/src/utils/mcpArgumentDetailHints.ts
new file mode 100644
index 0000000..15e1b81
--- /dev/null
+++ b/frontend/src/utils/mcpArgumentDetailHints.ts
@@ -0,0 +1,281 @@
+import {
+  type BusinessArgumentHintTemplate,
+  type MCPBusinessArgumentHintCategory,
+  hasDockerImageArg,
+  hasPackageLikeArg,
+  normalizeFlagName,
+  resolveBusinessArgumentHintTemplate,
+  sanitizeFlagForDisplay,
+  toTrimmedString,
+} from './mcpArgumentHints';
+
+export interface MCPArgumentDetailHint {
+  key: string;
+  argument: string;
+  category: MCPBusinessArgumentHintCategory;
+  label: string;
+  detail: string;
+  valueHint: string;
+  sensitive: boolean;
+}
+
+const VALUE_ARG_FLAGS = new Set([
+  'api-key',
+  'token',
+  'access-token',
+  'password',
+  'secret',
+  'config',
+  'config-file',
+  'c',
+  'directory',
+  'dir',
+  'root',
+  'workspace',
+  'path',
+  'url',
+  'endpoint',
+  'base-url',
+  'host',
+  'port',
+  'transport',
+  'mode',
+  'profile',
+  'tenant',
+  'project',
+  'account',
+  'executable-path',
+  'repo',
+  'e',
+  'env',
+  'name',
+  'network',
+  'v',
+  'volume',
+  'p',
+  'publish',
+  'entrypoint',
+  'w',
+  'workdir',
+  'u',
+  'user',
+  'platform',
+  'h',
+  'hostname',
+]);
+
+const flagExpectsValue = (flag: string): boolean => VALUE_ARG_FLAGS.has(flag);
+
+const fallbackArgumentHint = (flag: string): BusinessArgumentHintTemplate => ({
+  category: 'generic',
+  label: '未识别参数',
+  detail: `GoNavi 不能从参数名 --${flag} 准确判断业务含义，但会按当前顺序原样传给 MCP 进程。`,
+  valueHint: '请对照 MCP README 确认这个参数是否需要值；需要值时把值作为下一个参数标签，或使用 --name=value。',
+  sensitive: false,
+});
+
+const sanitizeArgumentValueForDisplay = (value: string, sensitive = false): string => {
+  const text = toTrimmedString(value);
+  if (!text) return '';
+  if (sensitive) return '<已隐藏>';
+  if (/^(.{0,24})=(.*)$/u.test(text) && /(token|api[-_]?key|secret|password|credential)/iu.test(text.split('=')[0])) {
+    return `${text.split('=')[0]}=<已隐藏>`;
+  }
+  if (/(sk-[a-z0-9_-]{8,}|ghp_[a-z0-9_]{8,}|xox[baprs]-[a-z0-9-]{8,})/iu.test(text)) {
+    return '<疑似密钥，已隐藏>';
+  }
+  return text;
+};
+
+const buildArgumentDetail = (
+  key: string,
+  argument: string,
+  template: BusinessArgumentHintTemplate,
+): MCPArgumentDetailHint => ({
+  key,
+  argument,
+  category: template.category,
+  label: template.label,
+  detail: template.detail,
+  valueHint: template.valueHint,
+  sensitive: template.sensitive,
+});
+
+const runtimeArgumentTemplate = (
+  commandName: string,
+  args: string[],
+  arg: string,
+  index: number,
+): BusinessArgumentHintTemplate | null => {
+  const text = toTrimmedString(arg);
+  const lower = text.toLowerCase();
+
+  if (lower === '--stdio' || lower === 'stdio') {
+    return {
+      category: 'mode',
+      label: 'stdio 通信模式',
+      detail: '让 MCP Server 通过标准输入输出和 GoNavi 保持通信。',
+      valueHint: '这是开关参数，一般不需要额外值。',
+      sensitive: false,
+    };
+  }
+  if (lower === '-y' && ['npx', 'npm', 'pnpm', 'yarn'].includes(commandName)) {
+    return {
+      category: 'runtime',
+      label: '跳过安装确认',
+      detail: '避免 npx 首次启动包时等待交互确认，适合后台工具发现。',
+      valueHint: '这是开关参数，不需要额外值。',
+      sensitive: false,
+    };
+  }
+  if (lower === '-m' && ['python', 'python3', 'py'].includes(commandName)) {
+    return {
+      category: 'runtime',
+      label: 'Python 模块启动',
+      detail: '表示后一个参数是 Python 模块名，而不是脚本文件路径。',
+      valueHint: '后面补模块名，例如 your_mcp_server。',
+      sensitive: false,
+    };
+  }
+  if (commandName === 'docker') {
+    if (lower === 'run') {
+      return {
+        category: 'runtime',
+        label: 'Docker 运行子命令',
+        detail: '表示启动一个容器来运行 MCP Server。',
+        valueHint: '通常放在 docker 后面的第一个参数。',
+        sensitive: false,
+      };
+    }
+    if (lower === '-i' || lower === '--interactive') {
+      return {
+        category: 'runtime',
+        label: '保持标准输入',
+        detail: 'MCP stdio 需要容器 stdin 持续打开，否则工具发现可能启动后立刻断开。',
+        valueHint: '这是 Docker MCP 的关键参数。',
+        sensitive: false,
+      };
+    }
+    if (lower === '--rm') {
+      return {
+        category: 'runtime',
+        label: '退出后清理容器',
+        detail: '测试和日常使用后自动删除临时容器，避免残留。',
+        valueHint: '这是开关参数，不需要额外值。',
+        sensitive: false,
+      };
+    }
+    if (!text.startsWith('-') && hasDockerImageArg(args.slice(0, index + 1))) {
+      return {
+        category: 'runtime',
+        label: 'Docker 镜像或容器参数',
+        detail: '这是 docker run 中的镜像名或传给容器内 MCP 服务的位置参数。',
+        valueHint: '镜像名应来自 MCP README；镜像后的参数会传给容器入口程序。',
+        sensitive: false,
+      };
+    }
+  }
+
+  if (!text.startsWith('-')) {
+    if (['npx', 'npm', 'pnpm', 'yarn'].includes(commandName) && hasPackageLikeArg([text])) {
+      return {
+        category: 'runtime',
+        label: 'MCP 包名或位置参数',
+        detail: '通常是 README 里的 npm 包名，也可能是包自己的业务参数。',
+        valueHint: '包名一般放在 -y 后、--stdio 前；业务参数以 README 为准。',
+        sensitive: false,
+      };
+    }
+    if (commandName === 'uvx' || commandName === 'uv') {
+      return {
+        category: 'runtime',
+        label: 'Python MCP 包名或位置参数',
+        detail: 'uvx 后面通常跟 MCP 包名；后续位置参数会传给该 MCP 服务。',
+        valueHint: '第一个位置参数应是 README 里的包名。',
+        sensitive: false,
+      };
+    }
+    if (['node', 'bun', 'deno'].includes(commandName)) {
+      return {
+        category: /\.(c?m?[jt]s)$/iu.test(text) || /[\\/]/u.test(text) ? 'path' : 'runtime',
+        label: '脚本或位置参数',
+        detail: '通常是本地 MCP Server 的入口脚本；脚本后的值会作为业务参数传入。',
+        valueHint: '入口脚本建议使用本机可访问的相对或绝对路径。',
+        sensitive: false,
+      };
+    }
+    if (['python', 'python3', 'py'].includes(commandName)) {
+      return {
+        category: args[index - 1] === '-m' ? 'runtime' : 'path',
+        label: args[index - 1] === '-m' ? 'Python 模块名' : 'Python 脚本或位置参数',
+        detail: args[index - 1] === '-m'
+          ? '这是 -m 后面的模块名，不要带 .py 后缀。'
+          : '通常是本地 Python MCP 脚本路径，或传给脚本的位置参数。',
+        valueHint: '以 README 的启动示例为准。',
+        sensitive: false,
+      };
+    }
+  }
+
+  return null;
+};
+
+export const buildMCPArgumentDetailHints = (commandName: string, args: string[]): MCPArgumentDetailHint[] => {
+  const result: MCPArgumentDetailHint[] = [];
+  for (let index = 0; index < args.length; index += 1) {
+    const text = toTrimmedString(args[index]);
+    if (!text) continue;
+
+    const previousFlag = index > 0 ? normalizeFlagName(args[index - 1]) : '';
+    const previousHasInlineValue = index > 0 && toTrimmedString(args[index - 1]).includes('=');
+    if (previousFlag && !previousHasInlineValue && flagExpectsValue(previousFlag) && !text.startsWith('-')) {
+      const template = resolveBusinessArgumentHintTemplate(previousFlag, true) || fallbackArgumentHint(previousFlag);
+      result.push(buildArgumentDetail(
+        `value-${index}-${previousFlag}`,
+        sanitizeArgumentValueForDisplay(text, template.sensitive),
+        {
+          ...template,
+          label: `${template.label}的值`,
+          detail: template.sensitive
+            ? `这是前一个 ${sanitizeFlagForDisplay(args[index - 1])} 的敏感值，提示中已脱敏。`
+            : `这是前一个 ${sanitizeFlagForDisplay(args[index - 1])} 参数的值。`,
+        },
+      ));
+      continue;
+    }
+
+    const runtimeTemplate = runtimeArgumentTemplate(commandName, args, text, index);
+    if (runtimeTemplate) {
+      result.push(buildArgumentDetail(
+        `runtime-${index}-${text}`,
+        sanitizeArgumentValueForDisplay(text, runtimeTemplate.sensitive),
+        runtimeTemplate,
+      ));
+      continue;
+    }
+
+    const flag = normalizeFlagName(text);
+    if (flag) {
+      const template = resolveBusinessArgumentHintTemplate(flag, true) || fallbackArgumentHint(flag);
+      result.push(buildArgumentDetail(
+        `flag-${index}-${flag}`,
+        sanitizeFlagForDisplay(text),
+        template,
+      ));
+      continue;
+    }
+
+    result.push(buildArgumentDetail(
+      `positional-${index}`,
+      sanitizeArgumentValueForDisplay(text),
+      {
+        category: 'generic',
+        label: '位置参数',
+        detail: '这是没有参数名的位置参数，GoNavi 会按当前顺序原样传入 MCP 进程。',
+        valueHint: '请对照 README 判断它是包名、路径、镜像名还是业务参数。',
+        sensitive: false,
+      },
+    ));
+  }
+  return result;
+};
diff --git a/frontend/src/utils/mcpArgumentHints.test.ts b/frontend/src/utils/mcpArgumentHints.test.ts
new file mode 100644
index 0000000..a0d4b3a
--- /dev/null
+++ b/frontend/src/utils/mcpArgumentHints.test.ts
@@ -0,0 +1,166 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildMCPArgumentDetailHints } from './mcpArgumentDetailHints';
+import { buildMCPArgumentHintProfile } from './mcpArgumentHints';
+
+describe('mcpArgumentHints', () => {
+  it('guides npx users to split package and stdio arguments', () => {
+    const profile = buildMCPArgumentHintProfile('npx', ['-y']);
+
+    expect(profile?.title).toContain('npx');
+    expect(profile?.orderHint).toContain('-y -> 包名 -> --stdio');
+    expect(profile?.nextActions).toContain('补充 MCP 包名，示例：@modelcontextprotocol/server-filesystem');
+    expect(profile?.nextActions).toContain('补充 stdio 参数，示例：--stdio');
+  });
+
+  it('recognizes a complete node script launch', () => {
+    const profile = buildMCPArgumentHintProfile('node', ['server.js', '--stdio']);
+
+    expect(profile?.title).toContain('Node');
+    expect(profile?.steps.find((item) => item.key === 'script')?.satisfied).toBe(true);
+    expect(profile?.nextActions).toEqual([]);
+  });
+
+  it('explains python module launches as independent args', () => {
+    const profile = buildMCPArgumentHintProfile('C:\\Python312\\python.exe', ['-m']);
+
+    expect(profile?.commandName).toBe('python');
+    expect(profile?.orderHint).toContain('-m -> 模块名 -> --stdio');
+    expect(profile?.nextActions).toContain('补充 模块名，示例：your_mcp_server');
+  });
+
+  it('guides docker users to keep stdin and provide an image', () => {
+    const profile = buildMCPArgumentHintProfile('docker', ['run', '--rm']);
+
+    expect(profile?.title).toContain('Docker');
+    expect(profile?.orderHint).toContain('run -> --rm -> -i');
+    expect(profile?.nextActions).toContain('补充 保持标准输入，示例：-i');
+    expect(profile?.nextActions).toContain('补充 镜像名，示例：mcp/server-fetch:latest');
+  });
+
+  it('detects full command lines pasted into the command field', () => {
+    const profile = buildMCPArgumentHintProfile('docker run --rm mcp/server-fetch:latest', []);
+
+    expect(profile?.normalizedCommand).toBe('docker');
+    expect(profile?.inlineArgs).toEqual(['run', '--rm', 'mcp/server-fetch:latest']);
+    expect(profile?.commandFieldWarning).toContain('启动命令字段里还包含 3 个参数');
+    expect(profile?.steps.find((item) => item.key === 'run')?.satisfied).toBe(true);
+    expect(profile?.steps.find((item) => item.key === 'image')?.satisfied).toBe(true);
+    expect(profile?.nextActions).toContain('补充 保持标准输入，示例：-i');
+  });
+
+  it('falls back to executable guidance for custom binaries', () => {
+    const profile = buildMCPArgumentHintProfile('D:\\tools\\acme-mcp-server.exe', []);
+
+    expect(profile?.title).toContain('本机可执行文件');
+    expect(profile?.summary).toContain('GoNavi 会原样按标签顺序传入');
+  });
+
+  it('explains common business arguments beyond startup order', () => {
+    const profile = buildMCPArgumentHintProfile('npx', [
+      '-y',
+      '@modelcontextprotocol/server-filesystem',
+      '--stdio',
+      '--directory',
+      'D:\\Work',
+      '--transport',
+      'stdio',
+      '--port=8080',
+    ]);
+
+    expect(profile?.businessHints).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        key: 'directory',
+        label: '授权目录',
+        category: 'path',
+      }),
+      expect.objectContaining({
+        key: 'transport',
+        label: '传输模式',
+        category: 'mode',
+      }),
+      expect.objectContaining({
+        key: 'port',
+        label: '端口',
+        category: 'network',
+      }),
+    ]));
+  });
+
+  it('builds per-argument explanations for unknown flags and positional values', () => {
+    const hints = buildMCPArgumentDetailHints('acme-mcp-server', [
+      '--tenant',
+      'prod',
+      '--workspace',
+      'D:\\Work',
+      'extra-target',
+    ]);
+
+    expect(hints).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        argument: '--tenant',
+        label: '未识别参数',
+        category: 'generic',
+      }),
+      expect.objectContaining({
+        argument: 'prod',
+        label: '未识别参数的值',
+      }),
+      expect.objectContaining({
+        argument: '--workspace',
+        label: '工作区目录',
+        category: 'path',
+      }),
+      expect.objectContaining({
+        argument: 'D:\\Work',
+        label: '工作区目录的值',
+      }),
+      expect.objectContaining({
+        argument: 'extra-target',
+        label: '位置参数',
+      }),
+    ]));
+  });
+
+  it('sanitizes sensitive inline argument values in hints', () => {
+    const args = [
+      'mcp-server-demo',
+      '--api-key=sk-real-secret',
+      '--token',
+      'ghp_real-secret-token',
+      '--endpoint',
+      'https://api.example.com',
+    ];
+    const profile = buildMCPArgumentHintProfile('uvx', [
+      ...args,
+    ]);
+    const argumentHints = buildMCPArgumentDetailHints('uvx', args);
+
+    expect(profile?.businessHints).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        key: 'api-key',
+        argument: '--api-key',
+        category: 'secret',
+        sensitive: true,
+      }),
+      expect.objectContaining({
+        key: 'endpoint',
+        category: 'endpoint',
+      }),
+    ]));
+    expect(JSON.stringify(profile?.businessHints)).not.toContain('sk-real-secret');
+    expect(argumentHints).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        argument: '--api-key',
+        sensitive: true,
+      }),
+      expect.objectContaining({
+        argument: '<已隐藏>',
+        label: 'Token的值',
+        sensitive: true,
+      }),
+    ]));
+    expect(JSON.stringify(argumentHints)).not.toContain('sk-real-secret');
+    expect(JSON.stringify(argumentHints)).not.toContain('ghp_real-secret-token');
+  });
+});
diff --git a/frontend/src/utils/mcpArgumentHints.ts b/frontend/src/utils/mcpArgumentHints.ts
new file mode 100644
index 0000000..42def4d
--- /dev/null
+++ b/frontend/src/utils/mcpArgumentHints.ts
@@ -0,0 +1,555 @@
+import { splitShellLikeCommand } from './mcpCommandDraft';
+
+export interface MCPArgumentHintStep {
+  key: string;
+  label: string;
+  example: string;
+  detail: string;
+  required: boolean;
+  satisfied: boolean;
+}
+
+export type MCPBusinessArgumentHintCategory = 'secret' | 'path' | 'endpoint' | 'network' | 'mode' | 'runtime' | 'generic';
+
+export interface MCPBusinessArgumentHint {
+  key: string;
+  argument: string;
+  category: MCPBusinessArgumentHintCategory;
+  label: string;
+  detail: string;
+  valueHint: string;
+  sensitive: boolean;
+}
+
+export interface MCPArgumentHintProfile {
+  commandName: string;
+  normalizedCommand: string;
+  inlineArgs: string[];
+  commandFieldWarning?: string;
+  title: string;
+  summary: string;
+  orderHint: string;
+  steps: MCPArgumentHintStep[];
+  businessHints: MCPBusinessArgumentHint[];
+  nextActions: string[];
+}
+
+export const toTrimmedString = (value: unknown): string => String(value ?? '').trim();
+
+const parseCommandField = (command: string): { normalizedCommand: string; commandName: string; inlineArgs: string[] } => {
+  const { tokens } = splitShellLikeCommand(command);
+  const raw = toTrimmedString(tokens[0] || command);
+  const lastPathPart = raw.split(/[\\/]/u).pop() || raw;
+  const commandName = lastPathPart
+    .replace(/\.(exe|cmd|bat|ps1)$/iu, '')
+    .toLowerCase();
+  const inlineArgs = tokens.length > 1 && isInlineArgHintCommand(commandName)
+    ? tokens.slice(1).map(toTrimmedString).filter(Boolean)
+    : [];
+  return {
+    normalizedCommand: raw,
+    commandName,
+    inlineArgs,
+  };
+};
+
+const isInlineArgHintCommand = (commandName: string): boolean =>
+  ['npx', 'npm', 'pnpm', 'yarn', 'node', 'bun', 'deno', 'python', 'python3', 'py', 'uvx', 'uv', 'docker'].includes(commandName);
+
+const normalizeArgs = (args?: string[]): string[] =>
+  (Array.isArray(args) ? args : []).map(toTrimmedString).filter(Boolean);
+
+const hasArg = (args: string[], expected: string): boolean =>
+  args.some((arg) => arg.toLowerCase() === expected.toLowerCase());
+
+const hasStdioArg = (args: string[]): boolean =>
+  hasArg(args, '--stdio') || hasArg(args, 'stdio');
+
+export const hasPackageLikeArg = (args: string[]): boolean =>
+  args.some((arg) => {
+    const text = arg.trim();
+    if (!text || text.startsWith('-')) return false;
+    return !['stdio'].includes(text.toLowerCase());
+  });
+
+const hasScriptLikeArg = (args: string[]): boolean =>
+  args.some((arg) => /\.(c?m?[jt]s|py)$/iu.test(arg) || /[\\/]/u.test(arg));
+
+const hasPythonModuleArg = (args: string[]): boolean => {
+  const moduleFlagIndex = args.findIndex((arg) => arg === '-m');
+  return moduleFlagIndex >= 0 && Boolean(args[moduleFlagIndex + 1]);
+};
+
+const hasDockerRunArg = (args: string[]): boolean =>
+  args.some((arg) => arg.toLowerCase() === 'run');
+
+const hasDockerInteractiveArg = (args: string[]): boolean =>
+  hasArg(args, '-i') || hasArg(args, '--interactive');
+
+export const hasDockerImageArg = (args: string[]): boolean => {
+  const runIndex = args.findIndex((arg) => arg.toLowerCase() === 'run');
+  const candidates = runIndex >= 0 ? args.slice(runIndex + 1) : args;
+  for (let index = 0; index < candidates.length; index += 1) {
+    const arg = candidates[index];
+    if (!arg || arg.startsWith('-')) {
+      const lower = arg.toLowerCase();
+      if ([
+        '-e',
+        '--env',
+        '--name',
+        '--network',
+        '-v',
+        '--volume',
+        '-p',
+        '--publish',
+        '--entrypoint',
+        '-w',
+        '--workdir',
+        '-u',
+        '--user',
+        '--platform',
+        '-h',
+        '--hostname',
+      ].includes(lower)) {
+        index += 1;
+      }
+      continue;
+    }
+    if (arg.includes('=') || arg.includes(':') || arg.includes('/')) {
+      return true;
+    }
+  }
+  return false;
+};
+
+const buildStep = (
+  key: string,
+  label: string,
+  example: string,
+  detail: string,
+  required: boolean,
+  satisfied: boolean,
+): MCPArgumentHintStep => ({
+  key,
+  label,
+  example,
+  detail,
+  required,
+  satisfied,
+});
+
+const buildNextActions = (steps: MCPArgumentHintStep[]): string[] =>
+  steps
+    .filter((step) => step.required && !step.satisfied)
+    .map((step) => `补充 ${step.label}，示例：${step.example}`);
+
+export type BusinessArgumentHintTemplate = Omit<MCPBusinessArgumentHint, 'key' | 'argument'>;
+
+const BUSINESS_ARGUMENT_HINTS: Record<string, BusinessArgumentHintTemplate> = {
+  'api-key': {
+    category: 'secret',
+    label: 'API Key',
+    detail: '用于把外部 API 密钥传给 MCP 服务。除非 README 明确要求命令参数，否则更建议放到环境变量里。',
+    valueHint: '填真实 key；不要截图或粘贴到聊天里。',
+    sensitive: true,
+  },
+  token: {
+    category: 'secret',
+    label: 'Token',
+    detail: '用于鉴权外部平台或远程 MCP 服务。命令行参数可能被进程列表或日志看到。',
+    valueHint: '优先改用环境变量，例如 GITHUB_TOKEN、API_TOKEN。',
+    sensitive: true,
+  },
+  'access-token': {
+    category: 'secret',
+    label: 'Access Token',
+    detail: '用于访问第三方 API 或私有资源。',
+    valueHint: '按最小权限创建 token，并优先放环境变量。',
+    sensitive: true,
+  },
+  password: {
+    category: 'secret',
+    label: '密码',
+    detail: '密码类参数会进入启动参数列表，风险高于环境变量。',
+    valueHint: '确认 MCP README 没有环境变量替代方案后再使用。',
+    sensitive: true,
+  },
+  secret: {
+    category: 'secret',
+    label: '密钥',
+    detail: '密钥类参数用于鉴权或签名。',
+    valueHint: '优先使用环境变量或配置文件，避免明文出现在启动参数里。',
+    sensitive: true,
+  },
+  config: {
+    category: 'path',
+    label: '配置文件',
+    detail: '指向 MCP 服务自己的配置文件。',
+    valueHint: '填写本机 MCP 进程能访问的绝对路径。',
+    sensitive: false,
+  },
+  'config-file': {
+    category: 'path',
+    label: '配置文件',
+    detail: '指向 MCP 服务自己的配置文件。',
+    valueHint: 'Windows 建议填写带盘符的绝对路径。',
+    sensitive: false,
+  },
+  c: {
+    category: 'path',
+    label: '配置文件',
+    detail: '短参数通常表示 config；以 README 为准。',
+    valueHint: '填写配置文件路径，或按 README 确认 -c 的含义。',
+    sensitive: false,
+  },
+  directory: {
+    category: 'path',
+    label: '授权目录',
+    detail: '限制文件系统类 MCP 可访问的目录范围。',
+    valueHint: '填写要授权给 MCP 的工作目录，不要直接授权整个磁盘。',
+    sensitive: false,
+  },
+  dir: {
+    category: 'path',
+    label: '目录',
+    detail: '通常表示文件或项目根目录。',
+    valueHint: '填写本机绝对路径，确认该 MCP 进程有读取权限。',
+    sensitive: false,
+  },
+  root: {
+    category: 'path',
+    label: '根目录',
+    detail: '通常表示 MCP 服务允许访问或扫描的根目录。',
+    valueHint: '选择最小必要目录，避免范围过大。',
+    sensitive: false,
+  },
+  workspace: {
+    category: 'path',
+    label: '工作区目录',
+    detail: '通常表示项目或文件系统服务的工作区。',
+    valueHint: '填写项目目录或业务数据目录。',
+    sensitive: false,
+  },
+  path: {
+    category: 'path',
+    label: '路径',
+    detail: '通常表示文件、目录或可执行程序路径。',
+    valueHint: '填写本机 MCP 进程可访问的路径。',
+    sensitive: false,
+  },
+  url: {
+    category: 'endpoint',
+    label: '服务 URL',
+    detail: 'MCP 服务要访问的 HTTP/HTTPS 地址。',
+    valueHint: '填写完整 URL，例如 https://api.example.com。',
+    sensitive: false,
+  },
+  endpoint: {
+    category: 'endpoint',
+    label: 'Endpoint',
+    detail: '远程服务或 API 的访问入口。',
+    valueHint: '按 README 填写 endpoint，不要混入 token。',
+    sensitive: false,
+  },
+  'base-url': {
+    category: 'endpoint',
+    label: 'Base URL',
+    detail: '第三方 API 或自建服务的基础地址。',
+    valueHint: '填写协议、域名和可选端口，不要附带密钥。',
+    sensitive: false,
+  },
+  host: {
+    category: 'network',
+    label: '主机地址',
+    detail: '目标服务主机或本地监听地址。',
+    valueHint: '本机服务常用 127.0.0.1；远程服务填写域名或 IP。',
+    sensitive: false,
+  },
+  port: {
+    category: 'network',
+    label: '端口',
+    detail: '目标服务端口或 MCP 服务监听端口。',
+    valueHint: '填写 1-65535 的端口号。',
+    sensitive: false,
+  },
+  transport: {
+    category: 'mode',
+    label: '传输模式',
+    detail: '控制 MCP 服务使用 stdio、sse 或 http 等通信方式。',
+    valueHint: 'GoNavi 当前本机 MCP 配置使用 stdio；除非 README 特别要求，否则填 stdio。',
+    sensitive: false,
+  },
+  mode: {
+    category: 'mode',
+    label: '运行模式',
+    detail: '控制 MCP 服务的业务模式或兼容模式。',
+    valueHint: '按 README 的枚举值填写。',
+    sensitive: false,
+  },
+  profile: {
+    category: 'mode',
+    label: '配置档',
+    detail: '选择 MCP 服务使用哪套配置或账号档案。',
+    valueHint: '填写 README 或本机配置中定义的 profile 名称。',
+    sensitive: false,
+  },
+  'read-only': {
+    category: 'mode',
+    label: '只读模式',
+    detail: '限制 MCP 服务只读访问，降低误写风险。',
+    valueHint: '通常是开关参数，不需要额外值。',
+    sensitive: false,
+  },
+  readonly: {
+    category: 'mode',
+    label: '只读模式',
+    detail: '限制 MCP 服务只读访问，降低误写风险。',
+    valueHint: '通常是开关参数，不需要额外值。',
+    sensitive: false,
+  },
+  headless: {
+    category: 'runtime',
+    label: '无头模式',
+    detail: '浏览器类 MCP 是否使用无界面浏览器。',
+    valueHint: '需要真实窗口调试时关闭；自动化运行通常开启。',
+    sensitive: false,
+  },
+  'executable-path': {
+    category: 'path',
+    label: '浏览器或程序路径',
+    detail: '指定 MCP 服务要启动的浏览器或外部程序。',
+    valueHint: '填写本机绝对路径。',
+    sensitive: false,
+  },
+  repo: {
+    category: 'path',
+    label: '仓库路径',
+    detail: '限制 Git/GitHub 相关 MCP 操作的本地仓库。',
+    valueHint: '填写目标仓库目录。',
+    sensitive: false,
+  },
+};
+
+export const normalizeFlagName = (arg: string): string => {
+  const text = toTrimmedString(arg);
+  if (!text.startsWith('-') || text === '-' || text === '--') {
+    return '';
+  }
+  const withoutValue = text.split('=')[0];
+  return withoutValue.replace(/^-+/u, '').trim().toLowerCase();
+};
+
+export const sanitizeFlagForDisplay = (arg: string): string => {
+  const text = toTrimmedString(arg);
+  const withoutValue = text.split('=')[0];
+  return withoutValue || text;
+};
+
+const inferBusinessArgumentHint = (flag: string): BusinessArgumentHintTemplate | null => {
+  if (!flag) return null;
+  if (/(token|api-?key|secret|password|pass|credential)/iu.test(flag)) {
+    return BUSINESS_ARGUMENT_HINTS.token;
+  }
+  if (/(config|file|path|dir|root|workspace|repo|repository)/iu.test(flag)) {
+    return {
+      category: 'path',
+      label: '路径 / 配置',
+      detail: '参数名看起来像路径、目录或配置文件。',
+      valueHint: '填写 MCP 进程能访问的本机路径，并尽量限制到最小范围。',
+      sensitive: false,
+    };
+  }
+  if (/(url|uri|endpoint|base-url|host|addr|address)/iu.test(flag)) {
+    return {
+      category: 'endpoint',
+      label: '地址 / Endpoint',
+      detail: '参数名看起来像远程服务地址或监听地址。',
+      valueHint: '填写完整地址或 host，密钥不要拼进 URL。',
+      sensitive: false,
+    };
+  }
+  if (/(port|listen)/iu.test(flag)) {
+    return BUSINESS_ARGUMENT_HINTS.port;
+  }
+  if (/(mode|profile|transport|readonly|read-only|headless)/iu.test(flag)) {
+    return {
+      category: 'mode',
+      label: '模式参数',
+      detail: '参数名看起来像运行模式、传输模式或开关。',
+      valueHint: '按 README 的枚举值或开关语义填写。',
+      sensitive: false,
+    };
+  }
+  return null;
+};
+
+const buildGenericArgumentHint = (flag: string): BusinessArgumentHintTemplate => ({
+  category: 'generic',
+  label: '未识别参数',
+  detail: `GoNavi 不能从参数名 --${flag} 准确判断业务含义，但会按当前顺序原样传给 MCP 进程。`,
+  valueHint: '请对照 MCP README 确认这个参数是否需要值；需要值时把值作为下一个参数标签，或使用 --name=value。',
+  sensitive: false,
+});
+
+export const resolveBusinessArgumentHintTemplate = (flag: string, fallbackGeneric = false): BusinessArgumentHintTemplate | null =>
+  BUSINESS_ARGUMENT_HINTS[flag] || inferBusinessArgumentHint(flag) || (fallbackGeneric && flag ? buildGenericArgumentHint(flag) : null);
+
+const buildBusinessArgumentHints = (args: string[]): MCPBusinessArgumentHint[] => {
+  const result: MCPBusinessArgumentHint[] = [];
+  const seen = new Set<string>();
+  for (const arg of args) {
+    const flag = normalizeFlagName(arg);
+    if (!flag || flag === 'stdio') {
+      continue;
+    }
+    const template = resolveBusinessArgumentHintTemplate(flag);
+    if (!template) {
+      continue;
+    }
+    const key = flag;
+    if (seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    result.push({
+      key,
+      argument: sanitizeFlagForDisplay(arg),
+      ...template,
+    });
+  }
+  return result;
+};
+
+export const buildMCPArgumentHintProfile = (
+  command: string,
+  args?: string[],
+): MCPArgumentHintProfile | null => {
+  const { normalizedCommand, commandName, inlineArgs } = parseCommandField(command);
+  if (!commandName) {
+    return null;
+  }
+  const normalizedArgs = [...inlineArgs, ...normalizeArgs(args)];
+  const commandFieldWarning = inlineArgs.length > 0
+    ? `检测到启动命令字段里还包含 ${inlineArgs.length} 个参数：${inlineArgs.join(' / ')}。建议 command 只保留 ${normalizedCommand}，其余移到命令参数。`
+    : undefined;
+
+  if (commandName === 'npx' || commandName === 'npm' || commandName === 'pnpm' || commandName === 'yarn') {
+    const steps = [
+      buildStep('yes', '跳过安装确认', '-y', '避免首次启动时等待交互确认。pnpm/yarn 场景可按 README 调整。', commandName === 'npx', hasArg(normalizedArgs, '-y')),
+      buildStep('package', 'MCP 包名', '@modelcontextprotocol/server-filesystem', 'README 里的 npm 包名或本地包入口。', true, hasPackageLikeArg(normalizedArgs)),
+      buildStep('stdio', 'stdio 参数', '--stdio', '让服务通过标准输入输出和 GoNavi 通信。', true, hasStdioArg(normalizedArgs)),
+      buildStep('scope', '授权目录或业务参数', 'C:\\Users\\me\\workspace', '文件系统、浏览器、数据库代理等服务可能还需要目录、端口或模式参数。', false, normalizedArgs.length > 3),
+    ];
+    return {
+      commandName,
+      normalizedCommand,
+      inlineArgs,
+      commandFieldWarning,
+      title: 'npx / npm 参数顺序建议',
+      summary: 'npm 生态 MCP 通常要把安装确认、包名和 --stdio 拆成独立参数标签。',
+      orderHint: '推荐顺序：-y -> 包名 -> --stdio -> 服务自己的业务参数',
+      steps,
+      businessHints: buildBusinessArgumentHints(normalizedArgs),
+      nextActions: buildNextActions(steps),
+    };
+  }
+
+  if (commandName === 'node' || commandName === 'bun' || commandName === 'deno') {
+    const steps = [
+      buildStep('script', '脚本路径', 'server.js', '本地 MCP Server 的 js/mjs/ts 入口文件或包内启动脚本。', true, hasScriptLikeArg(normalizedArgs) || hasPackageLikeArg(normalizedArgs)),
+      buildStep('stdio', 'stdio 参数', '--stdio', '如果 README 要求 stdio 模式，请单独填一个 --stdio 或 stdio。', false, hasStdioArg(normalizedArgs)),
+      buildStep('business', '业务参数', '--port 8811', '只有 README 明确要求时再补，例如工作区路径、端口或模式。', false, normalizedArgs.length > 2),
+    ];
+    return {
+      commandName,
+      normalizedCommand,
+      inlineArgs,
+      commandFieldWarning,
+      title: 'Node 脚本参数顺序建议',
+      summary: 'Node 类启动器的命令只填 node/bun/deno，脚本路径和 --stdio 放到参数里。',
+      orderHint: '推荐顺序：脚本路径 -> --stdio -> 服务自己的业务参数',
+      steps,
+      businessHints: buildBusinessArgumentHints(normalizedArgs),
+      nextActions: buildNextActions(steps),
+    };
+  }
+
+  if (commandName === 'python' || commandName === 'python3' || commandName === 'py') {
+    const steps = [
+      buildStep('module-flag', '模块启动标记或脚本', '-m', '模块方式用 -m；脚本方式直接填 server.py。二选一即可。', true, hasArg(normalizedArgs, '-m') || hasScriptLikeArg(normalizedArgs)),
+      buildStep('module-name', '模块名', 'your_mcp_server', '使用 -m 时这里填模块名，不要带 .py 后缀。', true, hasPythonModuleArg(normalizedArgs) || hasScriptLikeArg(normalizedArgs)),
+      buildStep('stdio', 'stdio 参数', '--stdio', '如果服务支持 stdio，按 README 要求补 --stdio。', false, hasStdioArg(normalizedArgs)),
+    ];
+    return {
+      commandName,
+      normalizedCommand,
+      inlineArgs,
+      commandFieldWarning,
+      title: 'Python 参数顺序建议',
+      summary: 'Python MCP 常见形式是 python -m 模块名，-m 和模块名都要作为独立参数。',
+      orderHint: '推荐顺序：-m -> 模块名 -> --stdio',
+      steps,
+      businessHints: buildBusinessArgumentHints(normalizedArgs),
+      nextActions: buildNextActions(steps),
+    };
+  }
+
+  if (commandName === 'uvx' || commandName === 'uv') {
+    const steps = [
+      buildStep('package', 'Python MCP 包名', 'mcp-server-fetch', 'uvx 后面通常直接跟已发布的 MCP 包名。', true, hasPackageLikeArg(normalizedArgs)),
+      buildStep('stdio', 'stdio 参数', '--stdio', '如果 README 要求 stdio，单独补 --stdio。', false, hasStdioArg(normalizedArgs)),
+      buildStep('business', '业务参数', '--config ./config.json', '服务自己的配置文件、模式或地址参数。', false, normalizedArgs.length > 2),
+    ];
+    return {
+      commandName,
+      normalizedCommand,
+      inlineArgs,
+      commandFieldWarning,
+      title: 'uvx 参数顺序建议',
+      summary: 'uvx 类 MCP 通常把包名作为第一个参数，再按 README 补 stdio 或配置参数。',
+      orderHint: '推荐顺序：包名 -> --stdio -> 服务自己的业务参数',
+      steps,
+      businessHints: buildBusinessArgumentHints(normalizedArgs),
+      nextActions: buildNextActions(steps),
+    };
+  }
+
+  if (commandName === 'docker') {
+    const steps = [
+      buildStep('run', '运行子命令', 'run', 'Docker MCP 通常要以 docker run 启动容器。', true, hasDockerRunArg(normalizedArgs)),
+      buildStep('interactive', '保持标准输入', '-i', 'MCP 需要 stdio 持续连接，Docker 容器必须保留 stdin。', true, hasDockerInteractiveArg(normalizedArgs)),
+      buildStep('cleanup', '退出后清理容器', '--rm', '测试和日常使用建议自动删除临时容器，避免残留。', false, hasArg(normalizedArgs, '--rm')),
+      buildStep('image', '镜像名', 'mcp/server-fetch:latest', 'README 里的 Docker 镜像名，放在 docker run 选项之后。', true, hasDockerImageArg(normalizedArgs)),
+      buildStep('container-env', '容器环境变量', '-e API_KEY=...', '容器内应用需要的 token 通常要用 -e/--env 传给容器。', false, normalizedArgs.some((arg) => arg === '-e' || arg === '--env' || arg.startsWith('-e='))),
+    ];
+    return {
+      commandName,
+      normalizedCommand,
+      inlineArgs,
+      commandFieldWarning,
+      title: 'Docker MCP 参数顺序建议',
+      summary: 'Docker 场景 command 只填 docker，run、-i、--rm、镜像名和容器参数都放到 args 里。',
+      orderHint: '推荐顺序：run -> --rm -> -i -> -e KEY=VALUE -> 镜像名 -> 服务自己的业务参数',
+      steps,
+      businessHints: buildBusinessArgumentHints(normalizedArgs),
+      nextActions: buildNextActions(steps),
+    };
+  }
+
+  const steps = [
+    buildStep('stdio', 'stdio 模式参数', 'stdio 或 --stdio', '多数本机 MCP 二进制需要显式 stdio 参数；以 README 为准。', false, hasStdioArg(normalizedArgs)),
+    buildStep('business', '业务参数', '--config ./config.json', '二进制自己的配置文件、工作目录、端口或模式参数。', false, normalizedArgs.length > 0),
+  ];
+  return {
+    commandName,
+    normalizedCommand,
+    inlineArgs,
+    commandFieldWarning,
+    title: '本机可执行文件参数建议',
+    summary: '自研或已编译 MCP Server 的参数以 README 为准；GoNavi 会原样按标签顺序传入。',
+    orderHint: '常见顺序：stdio/--stdio -> 配置文件或业务参数',
+    steps,
+    businessHints: buildBusinessArgumentHints(normalizedArgs),
+    nextActions: buildNextActions(steps),
+  };
+};
diff --git a/frontend/src/utils/mcpClientInstallStatus.test.ts b/frontend/src/utils/mcpClientInstallStatus.test.ts
new file mode 100644
index 0000000..4bdd51f
--- /dev/null
+++ b/frontend/src/utils/mcpClientInstallStatus.test.ts
@@ -0,0 +1,163 @@
+import { describe, expect, it } from 'vitest';
+
+import type { AIMCPClientInstallStatus } from '../types';
+import {
+  buildRemoteMCPClientGuide,
+  buildRemoteMCPClientQuickStart,
+  EMPTY_MCP_CLIENT_STATUSES,
+  formatMCPLaunchCommand,
+  isRemoteMCPClientStatus,
+  normalizeMCPClientStatuses,
+  pickPreferredMCPClient,
+} from './mcpClientInstallStatus';
+
+describe('mcpClientInstallStatus helpers', () => {
+  it('fills missing clients with default placeholder statuses', () => {
+    const statuses = normalizeMCPClientStatuses([
+      {
+        client: 'codex',
+        displayName: 'Codex',
+        installed: true,
+        matchesCurrent: true,
+        message: '已检测到 Codex 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+      },
+    ]);
+
+    expect(statuses).toEqual([
+      EMPTY_MCP_CLIENT_STATUSES[0],
+      {
+        client: 'codex',
+        displayName: 'Codex',
+        installMode: 'auto',
+        installed: true,
+        matchesCurrent: true,
+        clientDetected: false,
+        clientCommand: 'codex',
+        clientPath: '',
+        message: '已检测到 Codex 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+        args: [],
+      },
+      EMPTY_MCP_CLIENT_STATUSES[2],
+      EMPTY_MCP_CLIENT_STATUSES[3],
+    ]);
+  });
+
+  it('prefers an already-installed but outdated client over a completely uninstalled one', () => {
+    const statuses: AIMCPClientInstallStatus[] = [
+      {
+        client: 'claude-code',
+        displayName: 'Claude Code',
+        installed: false,
+        matchesCurrent: false,
+        message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+      },
+      {
+        client: 'codex',
+        displayName: 'Codex',
+        installed: true,
+        matchesCurrent: false,
+        message: '已检测到 Codex 中的 GoNavi MCP 记录，但与当前 GoNavi 安装路径不一致，建议更新',
+      },
+    ];
+
+    expect(pickPreferredMCPClient(statuses)).toBe('codex');
+  });
+
+  it('prefers a locally detected client command when neither client has existing GoNavi MCP config', () => {
+    const statuses: AIMCPClientInstallStatus[] = [
+      {
+        client: 'claude-code',
+        displayName: 'Claude Code',
+        installed: false,
+        matchesCurrent: false,
+        clientDetected: false,
+        clientCommand: 'claude',
+        message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+      },
+      {
+        client: 'codex',
+        displayName: 'Codex',
+        installed: false,
+        matchesCurrent: false,
+        clientDetected: true,
+        clientCommand: 'codex',
+        clientPath: 'C:/Users/mock/AppData/Roaming/npm/codex.cmd',
+        message: '未检测到 Codex 用户级 GoNavi MCP 配置',
+      },
+    ];
+
+    expect(pickPreferredMCPClient(statuses)).toBe('codex');
+  });
+
+  it('prefers a client that already matches current GoNavi over another client with a stale config', () => {
+    const statuses: AIMCPClientInstallStatus[] = [
+      {
+        client: 'claude-code',
+        displayName: 'Claude Code',
+        installed: true,
+        matchesCurrent: true,
+        clientDetected: true,
+        clientCommand: 'claude',
+        message: '已检测到 Claude Code 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致',
+      },
+      {
+        client: 'codex',
+        displayName: 'Codex',
+        installed: true,
+        matchesCurrent: false,
+        clientDetected: true,
+        clientCommand: 'codex',
+        message: '已检测到 Codex 中的 GoNavi MCP 记录，但与当前 GoNavi 安装路径不一致，建议更新',
+      },
+    ];
+
+    expect(pickPreferredMCPClient(statuses)).toBe('claude-code');
+  });
+
+  it('keeps the user-selected client when it is still present in the latest status list', () => {
+    expect(pickPreferredMCPClient(EMPTY_MCP_CLIENT_STATUSES, 'codex')).toBe('codex');
+    expect(pickPreferredMCPClient(EMPTY_MCP_CLIENT_STATUSES, 'openclaw')).toBe('openclaw');
+  });
+
+  it('formats quoted launch commands for display and clipboard use', () => {
+    expect(formatMCPLaunchCommand({
+      command: 'C:/Program Files/GoNavi/GoNavi.exe',
+      args: ['mcp-server', '--stdio'],
+    })).toBe('"C:/Program Files/GoNavi/GoNavi.exe" mcp-server --stdio');
+  });
+
+  it('marks OpenClaw and Hermans as remote bridge clients and builds a safe guide', () => {
+    const openClaw = EMPTY_MCP_CLIENT_STATUSES.find((item) => item.client === 'openclaw');
+
+    expect(isRemoteMCPClientStatus(openClaw)).toBe(true);
+    const guide = buildRemoteMCPClientGuide(openClaw);
+    expect(guide).toContain('GoNavi MCP 远程接入说明 - OpenClaw');
+    expect(guide).toContain('云端 Agent 不需要保存数据库密码');
+    expect(guide).toContain('默认使用 schema-only 模式，不注册 execute_sql');
+    expect(guide).toContain('不能直接使用 Windows 本地 stdio 命令');
+    expect(guide).toContain('allowMutating=true');
+    expect(guide).toContain('"type": "streamable-http"');
+    expect(guide).toContain('"Authorization": "Bearer <随机token>"');
+    expect(guide).toContain('GoNavi.exe mcp-server remote-config --client openclaw --url https://<你的域名或隧道地址>/mcp --token <随机token> --schema-only');
+    expect(guide).toContain('GoNavi.exe mcp-server http --addr 127.0.0.1:8765 --path /mcp --token <随机token> --schema-only');
+  });
+
+  it('builds remote quick-start snippets for cloud agents without database secrets', () => {
+    const quickStart = buildRemoteMCPClientQuickStart({
+      client: 'hermans',
+      displayName: 'OpenClaw',
+    });
+
+    expect(quickStart.displayName).toBe('OpenClaw');
+    expect(quickStart.configJson).toContain('"type": "streamable-http"');
+    expect(quickStart.configJson).toContain('"url": "https://<你的域名或隧道地址>/mcp"');
+    expect(quickStart.configJson).toContain('"Authorization": "Bearer <随机token>"');
+    expect(quickStart.configJson).not.toContain('password');
+    expect(quickStart.configCommand).toBe('GoNavi.exe mcp-server remote-config --client hermans --url https://<你的域名或隧道地址>/mcp --token <随机token> --schema-only');
+    expect(quickStart.launchCommand).toBe('GoNavi.exe mcp-server http --addr 127.0.0.1:8765 --path /mcp --token <随机token> --schema-only');
+    expect(quickStart.standaloneCommand).toBe('gonavi-mcp-server http --addr 127.0.0.1:8765 --path /mcp --token <随机token> --schema-only');
+    expect(quickStart.verificationSteps.join('\n')).toContain('get_connections');
+    expect(quickStart.securityNotes.join('\n')).toContain('默认 --schema-only 不注册 execute_sql');
+    expect(quickStart.securityNotes.join('\n')).toContain('allowMutating=true');
+  });
+});
diff --git a/frontend/src/utils/mcpClientInstallStatus.ts b/frontend/src/utils/mcpClientInstallStatus.ts
new file mode 100644
index 0000000..7fa13a6
--- /dev/null
+++ b/frontend/src/utils/mcpClientInstallStatus.ts
@@ -0,0 +1,300 @@
+import type { AIMCPClientInstallStatus } from '../types';
+
+export type MCPClientKey = 'claude-code' | 'codex' | 'openclaw' | 'hermans';
+
+const AUTO_MCP_CLIENTS = new Set<MCPClientKey>(['claude-code', 'codex']);
+const REMOTE_MCP_CLIENTS = new Set<MCPClientKey>(['openclaw', 'hermans']);
+const DEFAULT_REMOTE_MCP_PUBLIC_URL = 'https://<你的域名或隧道地址>/mcp';
+const DEFAULT_REMOTE_MCP_LOCAL_ADDR = '127.0.0.1:8765';
+const DEFAULT_REMOTE_MCP_PATH = '/mcp';
+
+export interface RemoteMCPClientQuickStart {
+  displayName: string;
+  configJson: string;
+  configCommand: string;
+  launchCommand: string;
+  standaloneCommand: string;
+  verificationSteps: string[];
+  securityNotes: string[];
+}
+
+export interface RemoteMCPParameterGuide {
+  key: string;
+  title: string;
+  required: boolean;
+  fill: string;
+  example: string;
+  avoid: string;
+}
+
+export const REMOTE_MCP_PARAMETER_GUIDES: RemoteMCPParameterGuide[] = [
+  {
+    key: 'publicUrl',
+    title: '公网/隧道 URL',
+    required: true,
+    fill: '填云端 Agent 能访问到的 Streamable HTTP MCP 地址，通常以 /mcp 结尾。',
+    example: 'https://agent-gateway.example.com/mcp',
+    avoid: '不要填 Windows 本机的 127.0.0.1；云端 Linux 访问不到这个地址。',
+  },
+  {
+    key: 'bearerToken',
+    title: 'Bearer Token',
+    required: true,
+    fill: '填一段随机长 token，Windows 启动命令和云端 Agent 配置必须一致。',
+    example: 'Authorization: Bearer gnv_xxx',
+    avoid: '不要使用空 token、短 token，也不要把数据库密码当 token 填进去。',
+  },
+  {
+    key: 'localAddr',
+    title: '本机监听地址',
+    required: true,
+    fill: 'Windows GoNavi HTTP MCP 默认监听 127.0.0.1:8765，再交给隧道或反向代理转发。',
+    example: DEFAULT_REMOTE_MCP_LOCAL_ADDR,
+    avoid: '没有网关隔离时不要直接绑定 0.0.0.0 暴露到公网。',
+  },
+  {
+    key: 'path',
+    title: 'MCP 路径',
+    required: true,
+    fill: '本机启动命令、隧道 URL 和云端 Agent 配置里的路径要保持一致。',
+    example: DEFAULT_REMOTE_MCP_PATH,
+    avoid: '不要一边用 /mcp，另一边配置 /api/mcp，路径不一致会 404。',
+  },
+  {
+    key: 'serverId',
+    title: '服务 ID',
+    required: false,
+    fill: '给云端 Agent 识别这条 MCP 服务的名称，默认 gonavi 即可。',
+    example: 'gonavi',
+    avoid: '不要频繁改名，否则 Agent 里已有的工具引用可能失效。',
+  },
+];
+
+export const EMPTY_MCP_CLIENT_STATUSES: AIMCPClientInstallStatus[] = [
+  {
+    client: 'claude-code',
+    displayName: 'Claude Code',
+    installMode: 'auto',
+    installed: false,
+    matchesCurrent: false,
+    clientDetected: false,
+    clientCommand: 'claude',
+    message: '未检测到 Claude Code 用户级 GoNavi MCP 配置',
+  },
+  {
+    client: 'codex',
+    displayName: 'Codex',
+    installMode: 'auto',
+    installed: false,
+    matchesCurrent: false,
+    clientDetected: false,
+    clientCommand: 'codex',
+    message: '未检测到 Codex 用户级 GoNavi MCP 配置',
+  },
+  {
+    client: 'openclaw',
+    displayName: 'OpenClaw',
+    installMode: 'remote',
+    installed: false,
+    matchesCurrent: false,
+    clientDetected: false,
+    clientCommand: 'openclaw',
+    message: 'OpenClaw 通常部署在云端 Linux；请通过远程 MCP 桥接接入 Windows GoNavi，不要复制数据库密码。',
+  },
+  {
+    client: 'hermans',
+    displayName: 'Hermans',
+    installMode: 'remote',
+    installed: false,
+    matchesCurrent: false,
+    clientDetected: false,
+    clientCommand: 'hermans',
+    message: 'Hermans 这类远程 Agent 请通过远程 MCP 桥接接入 Windows GoNavi，不要复制数据库密码。',
+  },
+];
+
+const MCP_CLIENT_ORDER: MCPClientKey[] = ['claude-code', 'codex', 'openclaw', 'hermans'];
+
+const quoteMCPCommandPart = (value: string): string => {
+  const text = String(value || '').trim();
+  if (!text) {
+    return '';
+  }
+  return /[\s"]/u.test(text) ? `"${text.replace(/"/g, '\\"')}"` : text;
+};
+
+export const isMCPClientKey = (client: string): client is MCPClientKey =>
+  client === 'claude-code' || client === 'codex' || client === 'openclaw' || client === 'hermans';
+
+export const isRemoteMCPClientStatus = (status?: Pick<AIMCPClientInstallStatus, 'client' | 'installMode'> | null): boolean => {
+  const client = String(status?.client || '').trim();
+  return status?.installMode === 'remote' || (isMCPClientKey(client) && REMOTE_MCP_CLIENTS.has(client));
+};
+
+export const supportsAutoMCPClientInstall = (status?: Pick<AIMCPClientInstallStatus, 'client' | 'installMode'> | null): boolean => {
+  const client = String(status?.client || '').trim();
+  return status?.installMode === 'auto' || (isMCPClientKey(client) && AUTO_MCP_CLIENTS.has(client));
+};
+
+const hasStatusError = (status: AIMCPClientInstallStatus): boolean =>
+  /失败|异常|错误|校验失败/u.test(String(status.message || ''));
+
+const getMCPClientPriority = (status: AIMCPClientInstallStatus): number => {
+  if (status.matchesCurrent) {
+    return 0;
+  }
+  if (status.installed && !status.matchesCurrent) {
+    return 1;
+  }
+  if (status.clientDetected) {
+    return 2;
+  }
+  if (hasStatusError(status)) {
+    return 3;
+  }
+  return 4;
+};
+
+export const normalizeMCPClientStatuses = (items?: AIMCPClientInstallStatus[]): AIMCPClientInstallStatus[] => {
+  const baseMap = new Map<string, AIMCPClientInstallStatus>(
+    EMPTY_MCP_CLIENT_STATUSES.map((item) => [item.client, { ...item }]),
+  );
+  (Array.isArray(items) ? items : []).forEach((item) => {
+    if (!item || !item.client) {
+      return;
+    }
+    const base = baseMap.get(item.client) || {
+      client: item.client,
+      displayName: item.client,
+      installed: false,
+      matchesCurrent: false,
+      message: '',
+    };
+    baseMap.set(item.client, {
+      ...base,
+      ...item,
+      displayName: item.displayName || base.displayName,
+      installMode: item.installMode || base.installMode || 'auto',
+      clientDetected: item.clientDetected ?? base.clientDetected ?? false,
+      clientCommand: item.clientCommand || base.clientCommand,
+      clientPath: item.clientPath || '',
+      message: item.message || base.message,
+      args: Array.isArray(item.args) ? item.args : (base.args || []),
+    });
+  });
+  return MCP_CLIENT_ORDER
+    .map((client) => baseMap.get(client))
+    .filter((item): item is AIMCPClientInstallStatus => Boolean(item));
+};
+
+export const pickPreferredMCPClient = (
+  items: AIMCPClientInstallStatus[],
+  current?: MCPClientKey,
+): MCPClientKey => {
+  if (current && items.some((item) => item.client === current)) {
+    return current;
+  }
+
+  const ranked = items
+    .filter((item): item is AIMCPClientInstallStatus & { client: MCPClientKey } => isMCPClientKey(item.client))
+    .slice()
+    .sort((left, right) => {
+      const priorityDiff = getMCPClientPriority(left) - getMCPClientPriority(right);
+      if (priorityDiff !== 0) {
+        return priorityDiff;
+      }
+      return MCP_CLIENT_ORDER.indexOf(left.client) - MCP_CLIENT_ORDER.indexOf(right.client);
+    });
+
+  return ranked[0]?.client || 'claude-code';
+};
+
+export const formatMCPLaunchCommand = (
+  input?: Pick<AIMCPClientInstallStatus, 'command' | 'args'> | { command?: string; args?: string[] } | null,
+): string => {
+  const command = String(input?.command || '').trim();
+  if (!command) {
+    return '';
+  }
+  const args = Array.isArray(input?.args)
+    ? input.args.map((item) => String(item || '').trim()).filter(Boolean)
+    : [];
+  return [command, ...args].map(quoteMCPCommandPart).filter(Boolean).join(' ');
+};
+
+export const buildRemoteMCPClientGuide = (
+  status?: Partial<Pick<AIMCPClientInstallStatus, 'client' | 'displayName' | 'message'>> | null,
+): string => {
+  const quickStart = buildRemoteMCPClientQuickStart(status);
+  return [
+    `GoNavi MCP 远程接入说明 - ${quickStart.displayName}`,
+    '',
+    '目标：',
+    '- 数据库连接、账号和密码继续保存在 Windows 上的 GoNavi。云端 Agent 不需要保存数据库密码。',
+    '- 云端 Agent 只通过 MCP tools 读取 get_connections/get_databases/get_tables/get_columns/get_table_ddl 等结果。',
+    '- 远程接入默认使用 schema-only 模式，不注册 execute_sql，适合只给 OpenClaw/Hermans 读取库表结构。',
+    '',
+    '当前边界：',
+    '- GoNavi 内置 MCP 本机入口是 stdio，适合 Claude Code / Codex 这类和 GoNavi 在同一台机器上的客户端。',
+    '- 如果 OpenClaw/Hermans 部署在云端 Linux，不能直接使用 Windows 本地 stdio 命令；可在 Windows 上启动 GoNavi Streamable HTTP 模式，再通过隧道或反向代理给云端 Agent 调用。',
+    '',
+    '建议接入方式：',
+    '1. Windows 本机保持 GoNavi 可访问，由 GoNavi 读取保存连接和系统凭据。',
+    `2. 在 Windows 或可信内网侧运行：${quickStart.launchCommand}。`,
+    `3. 在 ${quickStart.displayName} 中添加远程 MCP Server，transport 选择 Streamable HTTP，URL 填隧道/反向代理后的 /mcp 地址，并设置 Authorization: Bearer <随机token>。`,
+    '4. 先调用 get_connections 获取 connectionId，再调用表结构工具；不要把数据库 host/user/password 写进云端 Agent 配置。',
+    '',
+    '可复制配置片段（适用于支持 mcpServers JSON 的 Agent）：',
+    ...quickStart.configJson.split('\n'),
+    '',
+    '无 GUI / CLI 生成配置命令：',
+    quickStart.configCommand,
+    '',
+    'CLI / 服务启动命令：',
+    quickStart.launchCommand,
+    `或设置环境变量：GONAVI_MCP_HTTP_TOKEN=<随机token> 后运行 ${quickStart.standaloneCommand.replace(' --token <随机token>', '')}`,
+    '如果明确需要远程执行 SQL，可去掉 --schema-only；此时 execute_sql 仍受 GoNavi AI 安全控制约束，写操作必须显式传 allowMutating=true。',
+    '',
+    status?.message ? `当前提示：${status.message}` : '',
+  ].filter((line, index, lines) => line || index < lines.length - 1).join('\n');
+};
+
+export const buildRemoteMCPClientQuickStart = (
+  status?: Partial<Pick<AIMCPClientInstallStatus, 'client' | 'displayName'>> | null,
+): RemoteMCPClientQuickStart => {
+  const displayName = String(status?.displayName || '远程 Agent').trim();
+  const client = isMCPClientKey(String(status?.client || '')) ? String(status?.client || '').trim() : 'openclaw';
+  const launchCommand = `GoNavi.exe mcp-server http --addr ${DEFAULT_REMOTE_MCP_LOCAL_ADDR} --path ${DEFAULT_REMOTE_MCP_PATH} --token <随机token> --schema-only`;
+  const standaloneCommand = `gonavi-mcp-server http --addr ${DEFAULT_REMOTE_MCP_LOCAL_ADDR} --path ${DEFAULT_REMOTE_MCP_PATH} --token <随机token> --schema-only`;
+  const configCommand = `GoNavi.exe mcp-server remote-config --client ${client} --url ${DEFAULT_REMOTE_MCP_PUBLIC_URL} --token <随机token> --schema-only`;
+  const configJson = JSON.stringify({
+    mcpServers: {
+      gonavi: {
+        type: 'streamable-http',
+        url: DEFAULT_REMOTE_MCP_PUBLIC_URL,
+        headers: {
+          Authorization: 'Bearer <随机token>',
+        },
+      },
+    },
+  }, null, 2);
+
+  return {
+    displayName,
+    configJson,
+    configCommand,
+    launchCommand,
+    standaloneCommand,
+    verificationSteps: [
+      'Windows 本机先访问 http://127.0.0.1:8765/healthz，确认 GoNavi MCP HTTP 服务已启动。',
+      `${displayName} 里配置 Streamable HTTP MCP，URL 指向隧道或反向代理后的 /mcp 地址。`,
+      '先调用 get_connections 获取 connectionId，再读取 get_databases / get_tables / get_columns。',
+    ],
+    securityNotes: [
+      '数据库账号和密码仍保存在 Windows GoNavi，本段配置不要写数据库密码。',
+      '默认 --schema-only 不注册 execute_sql，远程 Agent 只能走库表结构类工具。',
+      'HTTP MCP 必须使用随机 Bearer Token，并放在 HTTPS、私有网络或受控隧道后面。',
+      '如去掉 --schema-only 开放 execute_sql，仍受 GoNavi AI 安全控制约束，写操作仍必须显式传 allowMutating=true。',
+    ],
+  };
+};
diff --git a/frontend/src/utils/mcpCommandDraft.test.ts b/frontend/src/utils/mcpCommandDraft.test.ts
new file mode 100644
index 0000000..1ceb00d
--- /dev/null
+++ b/frontend/src/utils/mcpCommandDraft.test.ts
@@ -0,0 +1,90 @@
+import { describe, expect, it } from 'vitest';
+
+import { parseMCPCommandDraft, splitShellLikeCommand } from './mcpCommandDraft';
+
+describe('mcpCommandDraft helpers', () => {
+  it('splits quoted command lines and leading env assignments into dedicated fields', () => {
+    const result = parseMCPCommandDraft('OPENAI_API_KEY="abc 123" "C:\\Program Files\\GoNavi\\gonavi-mcp-server.exe" stdio --port 8811');
+
+    expect(result).toEqual({
+      ok: true,
+      draft: {
+        command: 'C:\\Program Files\\GoNavi\\gonavi-mcp-server.exe',
+        args: ['stdio', '--port', '8811'],
+        env: {
+          OPENAI_API_KEY: 'abc 123',
+        },
+      },
+    });
+  });
+
+  it('keeps python module style launches as command plus independent args', () => {
+    const result = parseMCPCommandDraft('PYTHONPATH=./tools python -m my_mcp_server --stdio');
+
+    expect(result.ok).toBe(true);
+    expect(result.draft).toEqual({
+      command: 'python',
+      args: ['-m', 'my_mcp_server', '--stdio'],
+      env: {
+        PYTHONPATH: './tools',
+      },
+    });
+  });
+
+  it('parses PowerShell env prefixes before the MCP command', () => {
+    const result = parseMCPCommandDraft('$env:GITHUB_TOKEN="ghp test"; uvx mcp-server-github --stdio');
+
+    expect(result.ok).toBe(true);
+    expect(result.draft).toEqual({
+      command: 'uvx',
+      args: ['mcp-server-github', '--stdio'],
+      env: {
+        GITHUB_TOKEN: 'ghp test',
+      },
+    });
+  });
+
+  it('parses Windows cmd set prefixes before the MCP command', () => {
+    const result = parseMCPCommandDraft('set GITHUB_TOKEN=ghp_test && node server.js --stdio');
+
+    expect(result.ok).toBe(true);
+    expect(result.draft).toEqual({
+      command: 'node',
+      args: ['server.js', '--stdio'],
+      env: {
+        GITHUB_TOKEN: 'ghp_test',
+      },
+    });
+  });
+
+  it('parses env launcher style prefixes before the MCP command', () => {
+    const result = parseMCPCommandDraft('env OPENAI_API_KEY=sk-test uvx mcp-server-fetch --stdio');
+
+    expect(result.ok).toBe(true);
+    expect(result.draft).toEqual({
+      command: 'uvx',
+      args: ['mcp-server-fetch', '--stdio'],
+      env: {
+        OPENAI_API_KEY: 'sk-test',
+      },
+    });
+  });
+
+  it('keeps npx package launches as command plus split args', () => {
+    const result = parseMCPCommandDraft('npx -y @modelcontextprotocol/server-filesystem --stdio C:\\Users\\me\\workspace');
+
+    expect(result.ok).toBe(true);
+    expect(result.draft).toEqual({
+      command: 'npx',
+      args: ['-y', '@modelcontextprotocol/server-filesystem', '--stdio', 'C:\\Users\\me\\workspace'],
+      env: {},
+    });
+  });
+
+  it('reports unclosed quotes instead of producing a broken parse', () => {
+    expect(splitShellLikeCommand('uvx "broken command')).toEqual({
+      tokens: ['uvx'],
+      error: '命令中存在未闭合的引号，请检查后重试。',
+    });
+  });
+});
diff --git a/frontend/src/utils/mcpCommandDraft.ts b/frontend/src/utils/mcpCommandDraft.ts
new file mode 100644
index 0000000..c5205b8
--- /dev/null
+++ b/frontend/src/utils/mcpCommandDraft.ts
@@ -0,0 +1,182 @@
+export interface ParsedMCPCommandDraft {
+  command: string;
+  args: string[];
+  env: Record<string, string>;
+}
+
+export interface ParseMCPCommandDraftResult {
+  ok: boolean;
+  draft?: ParsedMCPCommandDraft;
+  error?: string;
+}
+
+const ENV_ASSIGNMENT_RE = /^[A-Za-z_][A-Za-z0-9_]*=.*/u;
+const POWERSHELL_ENV_ASSIGNMENT_RE = /^\$env:([A-Za-z_][A-Za-z0-9_]*)=(.*)$/iu;
+
+const pushToken = (tokens: string[], current: string) => {
+  if (current) {
+    tokens.push(current);
+  }
+};
+
+export const splitShellLikeCommand = (input: string): { tokens: string[]; error?: string } => {
+  const text = String(input || '').trim();
+  if (!text) {
+    return { tokens: [] };
+  }
+
+  const tokens: string[] = [];
+  let current = '';
+  let quoteMode: '"' | "'" | null = null;
+
+  for (let index = 0; index < text.length; index += 1) {
+    const char = text[index];
+
+    if (quoteMode) {
+      if (char === quoteMode) {
+        quoteMode = null;
+        continue;
+      }
+      if (char === '\\' && quoteMode === '"' && index + 1 < text.length) {
+        const nextChar = text[index + 1];
+        if (nextChar === '"' || nextChar === '\\') {
+          current += nextChar;
+          index += 1;
+          continue;
+        }
+      }
+      current += char;
+      continue;
+    }
+
+    if (char === '"' || char === "'") {
+      quoteMode = char;
+      continue;
+    }
+
+    if (char === ';') {
+      pushToken(tokens, current);
+      current = '';
+      continue;
+    }
+
+    if (char === '&' && text[index + 1] === '&') {
+      pushToken(tokens, current);
+      current = '';
+      index += 1;
+      continue;
+    }
+
+    if (/\s/u.test(char)) {
+      pushToken(tokens, current);
+      current = '';
+      continue;
+    }
+
+    if (char === '\\' && index + 1 < text.length) {
+      const nextChar = text[index + 1];
+      if (/\s/u.test(nextChar) || nextChar === '"' || nextChar === "'" || nextChar === '\\') {
+        current += nextChar;
+        index += 1;
+        continue;
+      }
+    }
+
+    current += char;
+  }
+
+  if (quoteMode) {
+    return {
+      tokens,
+      error: '命令中存在未闭合的引号，请检查后重试。',
+    };
+  }
+
+  pushToken(tokens, current);
+  return { tokens };
+};
+
+const consumeEnvAssignmentToken = (token: string, env: Record<string, string>): boolean => {
+  const text = String(token || '').trim();
+  if (!text) return false;
+
+  const powershellMatch = text.match(POWERSHELL_ENV_ASSIGNMENT_RE);
+  if (powershellMatch) {
+    env[powershellMatch[1]] = powershellMatch[2] || '';
+    return true;
+  }
+
+  if (!ENV_ASSIGNMENT_RE.test(text)) return false;
+  const separatorIndex = text.indexOf('=');
+  const key = text.slice(0, separatorIndex).trim();
+  if (!key) return false;
+  env[key] = text.slice(separatorIndex + 1);
+  return true;
+};
+
+const isEnvAssignmentToken = (token: string): boolean => {
+  const text = String(token || '').trim();
+  return Boolean(text.match(POWERSHELL_ENV_ASSIGNMENT_RE)) || ENV_ASSIGNMENT_RE.test(text);
+};
+
+const consumeLeadingEnvAssignments = (tokens: string[], env: Record<string, string>): number => {
+  let commandIndex = 0;
+
+  while (commandIndex < tokens.length) {
+    const token = tokens[commandIndex];
+    const normalizedToken = String(token || '').trim().toLowerCase();
+
+    if (normalizedToken === 'set' && tokens[commandIndex + 1] && isEnvAssignmentToken(tokens[commandIndex + 1])) {
+      consumeEnvAssignmentToken(tokens[commandIndex + 1], env);
+      commandIndex += 2;
+      continue;
+    }
+
+    if (normalizedToken === 'env' && tokens[commandIndex + 1] && isEnvAssignmentToken(tokens[commandIndex + 1])) {
+      commandIndex += 1;
+      while (commandIndex < tokens.length && consumeEnvAssignmentToken(tokens[commandIndex], env)) {
+        commandIndex += 1;
+      }
+      continue;
+    }
+
+    if (consumeEnvAssignmentToken(token, env)) {
+      commandIndex += 1;
+      continue;
+    }
+
+    break;
+  }
+
+  return commandIndex;
+};
+
+export const parseMCPCommandDraft = (input: string): ParseMCPCommandDraftResult => {
+  const { tokens, error } = splitShellLikeCommand(input);
+  if (error) {
+    return { ok: false, error };
+  }
+  if (tokens.length === 0) {
+    return { ok: false, error: '请先粘贴完整命令。' };
+  }
+
+  const env: Record<string, string> = {};
+  const commandIndex = consumeLeadingEnvAssignments(tokens, env);
+
+  const command = String(tokens[commandIndex] || '').trim();
+  if (!command) {
+    return {
+      ok: false,
+      error: '没有解析出启动命令，请至少提供可执行程序名。',
+    };
+  }
+
+  return {
+    ok: true,
+    draft: {
+      command,
+      args: tokens.slice(commandIndex + 1),
+      env,
+    },
+  };
+};
diff --git a/frontend/src/utils/mcpEnvDraft.test.ts b/frontend/src/utils/mcpEnvDraft.test.ts
new file mode 100644
index 0000000..8efac16
--- /dev/null
+++ b/frontend/src/utils/mcpEnvDraft.test.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it } from 'vitest';
+
+import { formatMCPEnvDraft, parseMCPEnvDraft } from './mcpEnvDraft';
+
+describe('mcpEnvDraft helpers', () => {
+  it('formats env objects into editable KEY=VALUE lines', () => {
+    expect(formatMCPEnvDraft({
+      OPENAI_API_KEY: 'abc',
+      BASE_URL: 'https://example.com',
+    })).toBe('OPENAI_API_KEY=abc\nBASE_URL=https://example.com');
+  });
+
+  it('parses valid env lines and preserves invalid ones for warning', () => {
+    const result = parseMCPEnvDraft([
+      'OPENAI_API_KEY=abc',
+      'BAD LINE',
+      'HAS SPACE =wrong',
+      'EMPTY_VALUE=',
+      'BASE_URL=https://example.com?a=1',
+    ].join('\n'));
+
+    expect(result.env).toEqual({
+      OPENAI_API_KEY: 'abc',
+      EMPTY_VALUE: '',
+      BASE_URL: 'https://example.com?a=1',
+    });
+    expect(result.validLines).toBe(3);
+    expect(result.invalidLines).toEqual(['BAD LINE', 'HAS SPACE =wrong']);
+    expect(result.totalLines).toBe(5);
+  });
+});
diff --git a/frontend/src/utils/mcpEnvDraft.ts b/frontend/src/utils/mcpEnvDraft.ts
new file mode 100644
index 0000000..ac79683
--- /dev/null
+++ b/frontend/src/utils/mcpEnvDraft.ts
@@ -0,0 +1,47 @@
+export interface ParsedMCPEnvDraft {
+  env: Record<string, string>;
+  invalidLines: string[];
+  totalLines: number;
+  validLines: number;
+}
+
+export const formatMCPEnvDraft = (env?: Record<string, string>): string =>
+  Object.entries(env || {})
+    .map(([key, value]) => `${key}=${value}`)
+    .join('\n');
+
+export const parseMCPEnvDraft = (input: string): ParsedMCPEnvDraft => {
+  const env: Record<string, string> = {};
+  const invalidLines: string[] = [];
+  let totalLines = 0;
+  let validLines = 0;
+
+  String(input || '')
+    .split(/\r?\n/u)
+    .map((line) => line.trim())
+    .forEach((line) => {
+      if (!line) {
+        return;
+      }
+      totalLines += 1;
+      const separatorIndex = line.indexOf('=');
+      if (separatorIndex <= 0) {
+        invalidLines.push(line);
+        return;
+      }
+      const key = line.slice(0, separatorIndex).trim();
+      if (!key || /\s/u.test(key)) {
+        invalidLines.push(line);
+        return;
+      }
+      env[key] = line.slice(separatorIndex + 1);
+      validLines += 1;
+    });
+
+  return {
+    env,
+    invalidLines,
+    totalLines,
+    validLines,
+  };
+};
diff --git a/frontend/src/utils/mcpEnvHints.test.ts b/frontend/src/utils/mcpEnvHints.test.ts
new file mode 100644
index 0000000..8aaad8b
--- /dev/null
+++ b/frontend/src/utils/mcpEnvHints.test.ts
@@ -0,0 +1,63 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildMCPEnvHintProfile } from './mcpEnvHints';
+
+describe('mcpEnvHints', () => {
+  it('explains common secret and proxy env vars without exposing values', () => {
+    const profile = buildMCPEnvHintProfile('uvx', ['mcp-server-github', '--stdio'], {
+      GITHUB_TOKEN: 'ghp_real_secret_value',
+      HTTPS_PROXY: 'http://127.0.0.1:7890',
+    });
+
+    expect(profile?.envVarCount).toBe(2);
+    expect(profile?.secretLikeCount).toBe(1);
+    expect(profile?.items.find((item) => item.key === 'GITHUB_TOKEN')).toMatchObject({
+      label: 'GitHub Token',
+      category: 'secret',
+      sensitive: true,
+      known: true,
+    });
+    expect(profile?.items.find((item) => item.key === 'HTTPS_PROXY')).toMatchObject({
+      label: 'HTTPS 代理',
+      category: 'proxy',
+      sensitive: false,
+      known: true,
+    });
+    expect(JSON.stringify(profile)).not.toContain('ghp_real_secret_value');
+    expect(JSON.stringify(profile)).not.toContain('127.0.0.1:7890');
+  });
+
+  it('warns when secret env vars still contain placeholders', () => {
+    const profile = buildMCPEnvHintProfile('npx', ['-y', '@modelcontextprotocol/server-github', '--stdio'], {
+      GITHUB_TOKEN: '...',
+      OPENAI_API_KEY: '',
+    });
+
+    expect(profile?.warnings).toContain('1 个环境变量值为空，测试前需要补齐或删除。');
+    expect(profile?.warnings).toContain('1 个环境变量看起来仍是示例占位值。');
+    expect(profile?.nextActions.join('\n')).toContain('GITHUB_TOKEN');
+    expect(profile?.nextActions.join('\n')).toContain('OPENAI_API_KEY');
+  });
+
+  it('explains docker env forwarding boundaries', () => {
+    const profile = buildMCPEnvHintProfile('docker', ['run', '--rm', '-i', 'mcp/server-fetch:latest'], {
+      API_KEY: 'secret',
+    });
+
+    expect(profile?.warnings).toContain('command=docker 时，这里的环境变量只传给 docker CLI，不会自动进入容器。');
+    expect(profile?.nextActions.join('\n')).toContain('-e KEY=VALUE');
+  });
+
+  it('does not warn about docker container env when args already forward env values', () => {
+    const profile = buildMCPEnvHintProfile('docker', ['run', '--rm', '-i', '-e', 'API_KEY=secret', 'mcp/server-fetch:latest'], {
+      DOCKER_HOST: 'npipe:////./pipe/docker_engine',
+    });
+
+    expect(profile?.items[0]).toMatchObject({
+      key: 'DOCKER_HOST',
+      label: 'Docker Daemon 地址',
+      category: 'runtime',
+    });
+    expect(profile?.warnings.join('\n')).not.toContain('不会自动进入容器');
+  });
+});
diff --git a/frontend/src/utils/mcpEnvHints.ts b/frontend/src/utils/mcpEnvHints.ts
new file mode 100644
index 0000000..f931779
--- /dev/null
+++ b/frontend/src/utils/mcpEnvHints.ts
@@ -0,0 +1,287 @@
+import { splitShellLikeCommand } from './mcpCommandDraft';
+
+export type MCPEnvHintCategory = 'secret' | 'endpoint' | 'proxy' | 'path' | 'runtime' | 'generic';
+
+export interface MCPEnvHintItem {
+  key: string;
+  category: MCPEnvHintCategory;
+  label: string;
+  detail: string;
+  valueHint: string;
+  sensitive: boolean;
+  known: boolean;
+  empty: boolean;
+  placeholder: boolean;
+}
+
+export interface MCPEnvHintProfile {
+  envVarCount: number;
+  secretLikeCount: number;
+  endpointLikeCount: number;
+  items: MCPEnvHintItem[];
+  warnings: string[];
+  nextActions: string[];
+}
+
+interface KnownEnvHint {
+  category: MCPEnvHintCategory;
+  label: string;
+  detail: string;
+  valueHint: string;
+  sensitive?: boolean;
+}
+
+const KNOWN_ENV_HINTS: Record<string, KnownEnvHint> = {
+  GITHUB_TOKEN: {
+    category: 'secret',
+    label: 'GitHub Token',
+    detail: '通常给 GitHub MCP 读取仓库、Issue、PR 或 Actions 使用。',
+    valueHint: '填 GitHub Personal Access Token，按 MCP README 要求授予最小权限。',
+    sensitive: true,
+  },
+  GITLAB_TOKEN: {
+    category: 'secret',
+    label: 'GitLab Token',
+    detail: '通常给 GitLab MCP 访问项目、Merge Request 或 CI 使用。',
+    valueHint: '填 GitLab Access Token，并限制到需要访问的项目范围。',
+    sensitive: true,
+  },
+  OPENAI_API_KEY: {
+    category: 'secret',
+    label: 'OpenAI API Key',
+    detail: '给依赖 OpenAI API 的 MCP 服务调用模型或 embedding 接口。',
+    valueHint: '填真实 API Key；不要写到 command、args 或聊天消息里。',
+    sensitive: true,
+  },
+  ANTHROPIC_API_KEY: {
+    category: 'secret',
+    label: 'Anthropic API Key',
+    detail: '给依赖 Anthropic Claude API 的 MCP 服务使用。',
+    valueHint: '填真实 API Key；确认服务确实需要该变量后再配置。',
+    sensitive: true,
+  },
+  GEMINI_API_KEY: {
+    category: 'secret',
+    label: 'Gemini API Key',
+    detail: '给依赖 Google Gemini API 的 MCP 服务使用。',
+    valueHint: '填真实 API Key；也有服务会要求 GOOGLE_API_KEY。',
+    sensitive: true,
+  },
+  GOOGLE_API_KEY: {
+    category: 'secret',
+    label: 'Google API Key',
+    detail: '给 Google/Gemini/Maps/Search 类 MCP 服务使用。',
+    valueHint: '填真实 API Key，并确认 README 要求的是 GOOGLE_API_KEY 还是 GEMINI_API_KEY。',
+    sensitive: true,
+  },
+  SLACK_BOT_TOKEN: {
+    category: 'secret',
+    label: 'Slack Bot Token',
+    detail: '给 Slack MCP 读取频道、消息或发送通知使用。',
+    valueHint: '填 xoxb- 开头的 Bot Token，并控制 workspace 权限。',
+    sensitive: true,
+  },
+  NOTION_API_KEY: {
+    category: 'secret',
+    label: 'Notion API Key',
+    detail: '给 Notion MCP 访问页面、数据库或 workspace 内容使用。',
+    valueHint: '填 Notion integration secret，并只授权需要的页面。',
+    sensitive: true,
+  },
+  DATABASE_URL: {
+    category: 'endpoint',
+    label: '数据库连接串',
+    detail: '给 MCP 服务自己连接数据库使用；这会把数据库连接信息交给该 MCP 进程。',
+    valueHint: '只在确实要让该 MCP 直连数据库时填写，优先考虑使用 GoNavi MCP 避免密码外泄。',
+    sensitive: true,
+  },
+  HTTP_PROXY: {
+    category: 'proxy',
+    label: 'HTTP 代理',
+    detail: '让 MCP 进程访问 HTTP 资源时走指定代理。',
+    valueHint: '填 http://host:port；如果代理带账号密码，按敏感变量处理。',
+  },
+  HTTPS_PROXY: {
+    category: 'proxy',
+    label: 'HTTPS 代理',
+    detail: '让 MCP 进程访问 HTTPS 资源时走指定代理。',
+    valueHint: '填 http://host:port 或 https://host:port。',
+  },
+  NO_PROXY: {
+    category: 'proxy',
+    label: '代理绕过列表',
+    detail: '指定哪些域名或地址不走代理。',
+    valueHint: '逗号分隔，例如 localhost,127.0.0.1,.corp.local。',
+  },
+  DOCKER_HOST: {
+    category: 'runtime',
+    label: 'Docker Daemon 地址',
+    detail: '给 docker CLI 指定连接哪个 Docker Engine。',
+    valueHint: 'Windows 常见为 npipe:////./pipe/docker_engine；远端 Docker 请确认安全边界。',
+  },
+  GONAVI_MCP_HTTP_TOKEN: {
+    category: 'secret',
+    label: 'GoNavi MCP HTTP Token',
+    detail: '给远程 MCP HTTP 服务开启 Bearer Token 鉴权时使用。',
+    valueHint: '填高熵随机 token；不要复用数据库密码或模型 API Key。',
+    sensitive: true,
+  },
+  NODE_ENV: {
+    category: 'runtime',
+    label: 'Node 运行环境',
+    detail: '影响部分 Node MCP 服务的日志、调试或生产模式。',
+    valueHint: '通常填 production、development 或 README 指定值。',
+  },
+  LOG_LEVEL: {
+    category: 'runtime',
+    label: '日志级别',
+    detail: '控制 MCP 服务输出多少日志。',
+    valueHint: '常见值为 debug、info、warn、error；排障时可临时调高。',
+  },
+};
+
+const SECRET_KEY_RE = /(TOKEN|API[_-]?KEY|SECRET|PASSWORD|PASS|PRIVATE[_-]?KEY|ACCESS[_-]?KEY|DATABASE_URL|DSN)/iu;
+const ENDPOINT_KEY_RE = /(URL|URI|ENDPOINT|BASE[_-]?URL|HOST|ADDR|ADDRESS)/iu;
+const PROXY_KEY_RE = /PROXY/iu;
+const PATH_KEY_RE = /(PATH|DIR|ROOT|HOME|FILE|CONFIG)/iu;
+const RUNTIME_KEY_RE = /^(NODE_ENV|LOG_LEVEL|DEBUG|ENV|TZ)$/iu;
+
+const PLACEHOLDER_VALUE_RE = /^(\*+|\.{3}|<[^>]+>|your[-_ ].*|change[_-]?me|replace[_-]?me|xxx+|todo|token|api[_-]?key)$/iu;
+
+const toTrimmedString = (value: unknown): string => String(value ?? '').trim();
+
+const normalizeEnvKey = (key: string): string => toTrimmedString(key).toUpperCase();
+
+const normalizeCommandName = (command: string): string => {
+  const { tokens } = splitShellLikeCommand(command);
+  const raw = toTrimmedString(tokens[0] || command);
+  return (raw.split(/[\\/]/u).pop() || raw)
+    .replace(/\.(exe|cmd|bat|ps1)$/iu, '')
+    .toLowerCase();
+};
+
+const inferEnvHint = (key: string): KnownEnvHint => {
+  if (SECRET_KEY_RE.test(key)) {
+    return {
+      category: 'secret',
+      label: '密钥 / Token',
+      detail: '变量名看起来像密钥、Token、密码或连接串。',
+      valueHint: '填真实值，但只保存在本机 MCP 配置里；不要放到 command、args 或聊天内容。',
+      sensitive: true,
+    };
+  }
+  if (PROXY_KEY_RE.test(key)) {
+    return {
+      category: 'proxy',
+      label: '代理配置',
+      detail: '变量名看起来像网络代理设置。',
+      valueHint: '按 README 或企业代理格式填写，例如 http://127.0.0.1:7890。',
+    };
+  }
+  if (ENDPOINT_KEY_RE.test(key)) {
+    return {
+      category: 'endpoint',
+      label: '服务地址',
+      detail: '变量名看起来像服务地址、接口地址或主机配置。',
+      valueHint: '填写 MCP Server 要访问的 URL、host 或 endpoint。',
+    };
+  }
+  if (PATH_KEY_RE.test(key)) {
+    return {
+      category: 'path',
+      label: '路径 / 配置文件',
+      detail: '变量名看起来像本地路径、目录或配置文件位置。',
+      valueHint: '填写本机 MCP 进程能访问的绝对路径；Windows 路径建议保留盘符。',
+    };
+  }
+  if (RUNTIME_KEY_RE.test(key)) {
+    return {
+      category: 'runtime',
+      label: '运行时开关',
+      detail: '变量名看起来像运行环境、日志或调试开关。',
+      valueHint: '按 README 指定的枚举值填写。',
+    };
+  }
+  return {
+    category: 'generic',
+    label: '自定义配置',
+    detail: '未命中内置变量库，按 MCP README 对应字段说明填写。',
+    valueHint: '确认变量名大小写和 README 完全一致。',
+  };
+};
+
+const isPlaceholderValue = (value: string): boolean => {
+  const text = toTrimmedString(value);
+  if (!text) {
+    return false;
+  }
+  return PLACEHOLDER_VALUE_RE.test(text) || text.includes('...');
+};
+
+const buildEnvHintItem = ([key, value]: [string, string]): MCPEnvHintItem => {
+  const normalizedKey = normalizeEnvKey(key);
+  const knownHint = KNOWN_ENV_HINTS[normalizedKey];
+  const hint = knownHint || inferEnvHint(normalizedKey);
+  return {
+    key: normalizedKey,
+    category: hint.category,
+    label: hint.label,
+    detail: hint.detail,
+    valueHint: hint.valueHint,
+    sensitive: hint.sensitive === true || SECRET_KEY_RE.test(normalizedKey),
+    known: Boolean(knownHint),
+    empty: toTrimmedString(value) === '',
+    placeholder: isPlaceholderValue(value),
+  };
+};
+
+export const buildMCPEnvHintProfile = (
+  command: string,
+  args: string[] | undefined,
+  env: Record<string, string> | undefined,
+): MCPEnvHintProfile | null => {
+  const items = Object.entries(env || {})
+    .sort(([left], [right]) => normalizeEnvKey(left).localeCompare(normalizeEnvKey(right)))
+    .map(buildEnvHintItem);
+
+  if (items.length === 0) {
+    return null;
+  }
+
+  const warnings: string[] = [];
+  const nextActions: string[] = [];
+  const secretLikeCount = items.filter((item) => item.sensitive).length;
+  const endpointLikeCount = items.filter((item) => item.category === 'endpoint').length;
+  const emptyItems = items.filter((item) => item.empty);
+  const placeholderItems = items.filter((item) => item.placeholder);
+  const dockerCommand = normalizeCommandName(command) === 'docker';
+  const dockerEnvForwarded = (args || []).some((arg) => ['-e', '--env'].includes(toTrimmedString(arg).toLowerCase()) || toTrimmedString(arg).startsWith('-e='));
+
+  if (emptyItems.length > 0) {
+    warnings.push(`${emptyItems.length} 个环境变量值为空，测试前需要补齐或删除。`);
+    nextActions.push(`补齐 ${emptyItems.map((item) => item.key).slice(0, 3).join('、')} 的值，或删除不需要的变量。`);
+  }
+  if (placeholderItems.length > 0) {
+    warnings.push(`${placeholderItems.length} 个环境变量看起来仍是示例占位值。`);
+    nextActions.push(`把 ${placeholderItems.map((item) => item.key).slice(0, 3).join('、')} 替换成真实值后再测试工具发现。`);
+  }
+  if (dockerCommand && items.length > 0 && !dockerEnvForwarded) {
+    warnings.push('command=docker 时，这里的环境变量只传给 docker CLI，不会自动进入容器。');
+    nextActions.push('如果容器内 MCP 需要这些变量，请在 args 里按 README 增加 -e KEY=VALUE 或 --env KEY=VALUE。');
+  }
+  if (secretLikeCount > 0) {
+    nextActions.push('密钥类变量只保存在本机配置；不要把真实值发到聊天、Issue 或截图里。');
+  }
+  if (nextActions.length === 0) {
+    nextActions.push('环境变量 key 已可识别；测试失败时优先核对 README 要求的变量名大小写。');
+  }
+
+  return {
+    envVarCount: items.length,
+    secretLikeCount,
+    endpointLikeCount,
+    items,
+    warnings,
+    nextActions,
+  };
+};
diff --git a/frontend/src/utils/mcpServerDraftSeed.test.ts b/frontend/src/utils/mcpServerDraftSeed.test.ts
new file mode 100644
index 0000000..aef1ffa
--- /dev/null
+++ b/frontend/src/utils/mcpServerDraftSeed.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest';
+
+import { parseMCPCommandDraft } from './mcpCommandDraft';
+import { buildMCPQuickAddServerSeed, buildMCPServerDraftSeed } from './mcpServerDraftSeed';
+
+describe('mcpServerDraftSeed', () => {
+  it('builds an editable draft seed from a parsed uvx command with env vars', () => {
+    const parsed = parseMCPCommandDraft('$env:GITHUB_TOKEN=***; uvx mcp-server-github --stdio');
+
+    expect(parsed.ok).toBe(true);
+    const seed = buildMCPQuickAddServerSeed(parsed.draft!);
+
+    expect(seed).toMatchObject({
+      name: 'mcp-server-github',
+      transport: 'stdio',
+      command: 'uvx',
+      args: ['mcp-server-github', '--stdio'],
+      env: { GITHUB_TOKEN: '***' },
+      enabled: true,
+      timeoutSeconds: 20,
+    });
+  });
+
+  it('uses a wider default timeout and image-based name for docker drafts', () => {
+    const parsed = parseMCPCommandDraft('docker run --rm -i -e API_KEY=*** mcp/server-fetch:latest');
+
+    expect(parsed.ok).toBe(true);
+    const seed = buildMCPQuickAddServerSeed(parsed.draft!);
+
+    expect(seed).toMatchObject({
+      name: 'server-fetch:latest',
+      command: 'docker',
+      args: ['run', '--rm', '-i', '-e', 'API_KEY=***', 'mcp/server-fetch:latest'],
+      timeoutSeconds: 45,
+    });
+  });
+
+  it('respects explicit draft names and timeouts for inspection snapshots', () => {
+    const seed = buildMCPServerDraftSeed({
+      name: 'GitHub MCP',
+      command: 'uvx',
+      args: ['mcp-server-github', '--stdio'],
+      timeoutSeconds: 60,
+      env: { GITHUB_TOKEN: '***' },
+    });
+
+    expect(seed).toMatchObject({
+      name: 'GitHub MCP',
+      command: 'uvx',
+      timeoutSeconds: 60,
+      env: { GITHUB_TOKEN: '***' },
+    });
+  });
+});
diff --git a/frontend/src/utils/mcpServerDraftSeed.ts b/frontend/src/utils/mcpServerDraftSeed.ts
new file mode 100644
index 0000000..9a840ff
--- /dev/null
+++ b/frontend/src/utils/mcpServerDraftSeed.ts
@@ -0,0 +1,111 @@
+import type { AIMCPServerConfig } from '../types';
+import type { ParsedMCPCommandDraft } from './mcpCommandDraft';
+
+export interface MCPServerDraftSeedInput {
+  args?: string[];
+  command: string;
+  enabled?: boolean;
+  env?: Record<string, string>;
+  name?: string;
+  timeoutSeconds?: number;
+}
+
+const stripCommandSuffix = (value: string): string =>
+  value.replace(/\.(exe|cmd|bat|ps1|c?m?[jt]s|py)$/iu, '');
+
+const toDisplayNamePart = (value: string): string => {
+  const text = String(value || '').trim();
+  if (!text) return '';
+  const lastPathPart = text.split(/[\\/]/u).filter(Boolean).pop() || text;
+  const packagePart = lastPathPart.includes('/') ? lastPathPart.split('/').filter(Boolean).pop() || lastPathPart : lastPathPart;
+  return stripCommandSuffix(packagePart).replace(/^@/u, '').trim();
+};
+
+const findDockerImageArg = (args: string[]): string => {
+  const runIndex = args.findIndex((arg) => arg.toLowerCase() === 'run');
+  const candidates = runIndex >= 0 ? args.slice(runIndex + 1) : args;
+  const optionsWithValue = new Set([
+    '-e',
+    '--env',
+    '--name',
+    '--network',
+    '-v',
+    '--volume',
+    '-p',
+    '--publish',
+    '--entrypoint',
+    '-w',
+    '--workdir',
+    '-u',
+    '--user',
+    '--platform',
+    '-h',
+    '--hostname',
+  ]);
+
+  for (let index = 0; index < candidates.length; index += 1) {
+    const arg = String(candidates[index] || '').trim();
+    if (!arg) continue;
+    if (arg.startsWith('-')) {
+      if (optionsWithValue.has(arg.toLowerCase())) {
+        index += 1;
+      }
+      continue;
+    }
+    if (arg.includes('=') || arg.toLowerCase() === 'run') {
+      continue;
+    }
+    return arg;
+  }
+  return '';
+};
+
+const pickDraftNameCandidate = (command: string, args: string[]): string => {
+  const commandName = toDisplayNamePart(command).toLowerCase();
+
+  if (['npx', 'npm', 'pnpm', 'yarn', 'uvx', 'uv'].includes(commandName)) {
+    return args.find((arg) => arg && !arg.startsWith('-') && arg.toLowerCase() !== 'stdio') || command;
+  }
+  if (['node', 'bun', 'deno'].includes(commandName)) {
+    return args.find((arg) => arg && !arg.startsWith('-') && arg.toLowerCase() !== 'stdio') || command;
+  }
+  if (['python', 'python3', 'py'].includes(commandName)) {
+    const moduleFlagIndex = args.findIndex((arg) => arg === '-m');
+    return (moduleFlagIndex >= 0 ? args[moduleFlagIndex + 1] : '') || args.find((arg) => arg && !arg.startsWith('-')) || command;
+  }
+  if (commandName === 'docker') {
+    return findDockerImageArg(args) || command;
+  }
+  return command;
+};
+
+export const buildMCPServerDraftSeed = ({
+  args = [],
+  command,
+  enabled = true,
+  env = {},
+  name,
+  timeoutSeconds,
+}: MCPServerDraftSeedInput): Partial<AIMCPServerConfig> => {
+  const normalizedArgs = args.map((arg) => String(arg || '').trim()).filter(Boolean);
+  const commandName = toDisplayNamePart(command).toLowerCase();
+  const namePart = toDisplayNamePart(name || pickDraftNameCandidate(command, normalizedArgs)) || 'MCP 服务';
+
+  return {
+    name: namePart,
+    transport: 'stdio',
+    command,
+    args: normalizedArgs,
+    env,
+    enabled,
+    timeoutSeconds: timeoutSeconds ?? (commandName === 'docker' ? 45 : 20),
+  };
+};
+
+export const buildMCPQuickAddServerSeed = (
+  draft: ParsedMCPCommandDraft,
+): Partial<AIMCPServerConfig> => buildMCPServerDraftSeed({
+  command: draft.command,
+  args: draft.args,
+  env: draft.env,
+});
diff --git a/frontend/src/utils/mcpServerGuidance.test.ts b/frontend/src/utils/mcpServerGuidance.test.ts
new file mode 100644
index 0000000..4c5e815
--- /dev/null
+++ b/frontend/src/utils/mcpServerGuidance.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  MCP_AUTHORING_NOTES,
+  MCP_TROUBLESHOOTING_GUIDES,
+} from './mcpServerGuidance';
+
+describe('mcpServerGuidance', () => {
+  it('keeps actionable troubleshooting hints for common MCP setup mistakes', () => {
+    const symptoms = MCP_TROUBLESHOOTING_GUIDES.map((item) => item.symptom);
+    const allGuidance = MCP_TROUBLESHOOTING_GUIDES
+      .flatMap((item) => [item.likelyCause, item.fix, item.example || ''])
+      .join('\n');
+
+    expect(symptoms).toContain('测试提示找不到命令');
+    expect(symptoms).toContain('认证失败、401 或 403');
+    expect(allGuidance).toContain('命令参数');
+    expect(allGuidance).toContain('command=npx');
+    expect(allGuidance).toContain('KEY=VALUE');
+    expect(allGuidance).toContain('当前只支持 stdio');
+  });
+
+  it('warns users to keep secrets in local env config instead of chat content', () => {
+    const notes = MCP_AUTHORING_NOTES.join('\n');
+
+    expect(notes).toContain('本机配置');
+    expect(notes).toContain('不要把密钥写进聊天内容');
+    expect(notes).toContain('command 填 npx');
+    expect(notes).toContain('PowerShell $env:KEY=VALUE;');
+    expect(notes).toContain('Windows set KEY=VALUE &&');
+  });
+});
diff --git a/frontend/src/utils/mcpServerGuidance.ts b/frontend/src/utils/mcpServerGuidance.ts
new file mode 100644
index 0000000..8549f48
--- /dev/null
+++ b/frontend/src/utils/mcpServerGuidance.ts
@@ -0,0 +1,172 @@
+export type MCPFieldState = 'required' | 'optional' | 'fixed';
+
+export interface MCPFieldGuide {
+  key: string;
+  title: string;
+  summary: string;
+  detail: string;
+  fill: string;
+  avoid: string;
+  fieldState: MCPFieldState;
+  example?: string;
+}
+
+export interface MCPFillStep {
+  step: string;
+  title: string;
+  detail: string;
+}
+
+export interface MCPTroubleshootingGuide {
+  key: string;
+  symptom: string;
+  likelyCause: string;
+  fix: string;
+  example?: string;
+}
+
+export const MCP_COMMAND_EXAMPLES = [
+  'npx -y @modelcontextprotocol/server-filesystem --stdio',
+  'uvx mcp-server-fetch',
+  'node server.js --stdio',
+  'python -m your_mcp_server',
+  'docker run --rm -i mcp/server-fetch:latest',
+];
+
+export const MCP_COMMAND_PARSE_EXAMPLE = '$env:GITHUB_TOKEN=...; uvx mcp-server-github --stdio';
+
+export const MCP_SERVER_FILL_STEPS: MCPFillStep[] = [
+  { step: '1', title: '模板 / 完整命令', detail: '优先选最接近的模板，或先粘一整行命令让 GoNavi 自动拆分。' },
+  { step: '2', title: '服务名称', detail: '命名成 Browser、GitHub、Filesystem 这类一眼能认出的用途名。' },
+  { step: '3', title: '启动命令', detail: '这里只填程序名或启动器本身，不要把整行命令塞进去。' },
+  { step: '4', title: '命令参数', detail: '把脚本名、模块名、Docker run 参数和 --stdio 这类参数拆开逐项填写。' },
+  { step: '5', title: '环境变量 / 超时', detail: '只有在服务确实需要额外配置时再补，不需要可以留空。' },
+];
+
+export const MCP_FIELD_GUIDES: MCPFieldGuide[] = [
+  {
+    key: 'name',
+    title: '服务名称',
+    summary: '保存后显示给你和 AI 看的名字。',
+    detail: '按用途命名，建议写成 Browser、GitHub、Filesystem 这类一眼能认出的名字。',
+    fill: '这个 MCP 的用途名，例如 GitHub 或 Filesystem。',
+    avoid: '不要写 server、test、mcp1 这类看不出用途的名字。',
+    fieldState: 'required',
+    example: 'Filesystem / Browser / GitHub',
+  },
+  {
+    key: 'enabled',
+    title: '启用状态',
+    summary: '控制这条配置现在要不要参与工具发现和调用。',
+    detail: '禁用只是不使用，不会删除下面填好的配置。',
+    fill: '临时不用选已禁用；确认要给 AI 用时选已启用。',
+    avoid: '不要用删除代替临时停用，避免重新配置 command、args、env。',
+    fieldState: 'optional',
+    example: '已启用 / 已禁用',
+  },
+  {
+    key: 'transport',
+    title: '传输方式',
+    summary: 'GoNavi 用什么方式和这个 MCP Server 通信。',
+    detail: '当前固定为 stdio，表示本机直接启动进程并通过标准输入输出交互。',
+    fill: '保持 stdio。',
+    avoid: '不要填写 HTTP、SSE、URL 或端口；当前新增入口不是远程 MCP URL 配置。',
+    fieldState: 'fixed',
+    example: 'stdio',
+  },
+  {
+    key: 'command',
+    title: '启动命令',
+    summary: '只填程序名或启动器本身。',
+    detail: '常见是 npx、node、uvx、python、docker；包名、脚本名、run、-i 和 --stdio 这类内容放到参数里。',
+    fill: '填 npx、node、uvx、python、docker，或某个 exe 的绝对路径。',
+    avoid: '不要填整行命令，例如不要填 npx -y pkg --stdio。',
+    fieldState: 'required',
+    example: 'npx / node / uvx / python / docker',
+  },
+  {
+    key: 'args',
+    title: '命令参数',
+    summary: '把脚本名、模块名、开关参数拆开逐项填写。',
+    detail: '例如 npx -y pkg --stdio，要拆成 -y、pkg 和 --stdio；docker run --rm -i image 要拆成 run、--rm、-i 和 image。',
+    fill: '逐项填 -y、包名、脚本名、-m、--stdio、run、--rm、-i、镜像名等参数。',
+    avoid: '不要再填 npx/node/uvx/python/docker，也不要把多个参数粘成一个长字符串。',
+    fieldState: 'optional',
+    example: '-y / @modelcontextprotocol/server-filesystem / --stdio / server.js / run / --rm / -i / image',
+  },
+  {
+    key: 'env',
+    title: '环境变量',
+    summary: '给 MCP Server 传入 KEY=VALUE 形式的配置。',
+    detail: '通常用来放 API Key、服务地址、工作目录等；每行一条，不要写 export。',
+    fill: '每行一条 KEY=VALUE，例如 GITHUB_TOKEN=...。',
+    avoid: '不要写 export、set 或 $env: 前缀；也不要把环境变量混进 command 或 args。',
+    fieldState: 'optional',
+    example: 'OPENAI_API_KEY=... / GITHUB_TOKEN=...',
+  },
+  {
+    key: 'timeout',
+    title: '超时(秒)',
+    summary: '单次工具发现或调用最多等待多久。',
+    detail: '本机常规工具一般 20 秒就够，启动慢或远端链路再适当调大。',
+    fill: '常规填 20；启动慢时填 45 或 60。',
+    avoid: '不要随意填过小，3 秒以下很容易让工具发现误判失败。',
+    fieldState: 'optional',
+    example: '20 / 45 / 60',
+  },
+];
+
+export const MCP_AUTHORING_NOTES = [
+  '启动命令只填程序本身，不要把脚本名、模块名和 --stdio 混进去。',
+  'README 给 npx 示例时，command 填 npx，args 逐项填 -y、包名和 --stdio；不要把整行 npx 命令放进 command。',
+  'README 给 Docker 示例时，command 填 docker，args 逐项填 run、--rm、-i、镜像名和容器参数；容器内 token 通常用 -e KEY=VALUE 传给容器。',
+  '如果 README 里只给了一整行命令，优先粘到完整命令框自动拆分；支持 KEY=VALUE、env KEY=VALUE、PowerShell $env:KEY=VALUE; 和 Windows set KEY=VALUE && 这几类前缀环境变量写法。',
+  '环境变量每行一条 KEY=VALUE，不要写 export，也不要和启动命令混成一行保存。',
+  '密钥类环境变量会保存到本机配置，并只在启动 MCP 进程时作为进程环境传入；不要把密钥写进聊天内容。',
+  '测试工具发现只会临时启动一次做探测，不会自动保存配置。',
+];
+
+export const MCP_TROUBLESHOOTING_GUIDES: MCPTroubleshootingGuide[] = [
+  {
+    key: 'command-not-found',
+    symptom: '测试提示找不到命令',
+    likelyCause: '启动命令填了整串命令、命令没加入 PATH，或 Windows 路径里有空格但没有用真实 exe 路径。',
+    fix: '启动命令只填可执行程序本身；脚本名和 --stdio 放到命令参数里。命令不在 PATH 时，直接填绝对路径。',
+    example: 'command=npx, args=-y / @modelcontextprotocol/server-filesystem / --stdio',
+  },
+  {
+    key: 'timeout-or-no-tools',
+    symptom: '测试超时或发现 0 个工具',
+    likelyCause: '服务启动慢、缺少 stdio 参数，Docker 容器缺少 -i，或填成了只支持 HTTP/SSE 的 MCP 服务。',
+    fix: '先确认这个服务支持 stdio，再补齐 --stdio 或 Docker -i 等参数；启动慢时把超时调到 45 或 60 秒。',
+    example: 'args=--stdio 或 docker run --rm -i image, timeout=45',
+  },
+  {
+    key: 'auth-failed',
+    symptom: '认证失败、401 或 403',
+    likelyCause: 'API Key、Token、服务地址等环境变量没有填，或 KEY=VALUE 格式无效。',
+    fix: '在环境变量里每行写一条 KEY=VALUE，不要写 export，也不要把环境变量和启动命令混到同一行保存。',
+    example: 'GITHUB_TOKEN=...',
+  },
+  {
+    key: 'stdio-only',
+    symptom: 'README 只给了 URL 或 SSE 配置',
+    likelyCause: '这类配置通常不是本机 stdio 进程，当前 GoNavi 新增 MCP 服务暂不直接支持。',
+    fix: '优先找该服务的 stdio 启动方式；如果只有 HTTP/SSE，请先用官方网关或本机包装器转成 stdio。',
+    example: '当前只支持 stdio',
+  },
+];
+
+const quoteCommandPart = (value: string): string => {
+  const text = String(value || '').trim();
+  if (!text) {
+    return '';
+  }
+  return /[\s"]/u.test(text) ? `"${text.replace(/"/g, '\\"')}"` : text;
+};
+
+export const buildMCPLaunchPreview = (command: string, args?: string[]): string =>
+  [command, ...(Array.isArray(args) ? args : [])]
+    .map((item) => quoteCommandPart(item))
+    .filter(Boolean)
+    .join(' ');
diff --git a/frontend/src/utils/mcpServerTemplates.ts b/frontend/src/utils/mcpServerTemplates.ts
new file mode 100644
index 0000000..e2dc29d
--- /dev/null
+++ b/frontend/src/utils/mcpServerTemplates.ts
@@ -0,0 +1,90 @@
+import type { AIMCPServerConfig } from '../types';
+
+export interface MCPServerDraftTemplate {
+  key: string;
+  title: string;
+  description: string;
+  detail: string;
+  seed: Partial<AIMCPServerConfig>;
+}
+
+export const MCP_SERVER_DRAFT_TEMPLATES: MCPServerDraftTemplate[] = [
+  {
+    key: 'npx',
+    title: 'npx 包',
+    description: '适合 README 里写着 `npx -y xxx --stdio` 的 npm MCP 包。',
+    detail: '示例会填成 `npx -y @modelcontextprotocol/server-filesystem --stdio`，把包名和路径参数改成实际值。',
+    seed: {
+      name: 'npx 包',
+      command: 'npx',
+      args: ['-y', '@modelcontextprotocol/server-filesystem', '--stdio'],
+      env: {},
+      timeoutSeconds: 20,
+    },
+  },
+  {
+    key: 'uvx',
+    title: 'uvx 工具',
+    description: '适合 Python/uv 生态里已经发布好的 MCP 包。',
+    detail: '示例会填成 `uvx some-mcp-server`，保存前把包名改成你自己的。',
+    seed: {
+      name: 'uvx 工具',
+      command: 'uvx',
+      args: ['some-mcp-server'],
+      env: {},
+      timeoutSeconds: 20,
+    },
+  },
+  {
+    key: 'node',
+    title: 'Node 脚本',
+    description: '适合本地 js/ts 脚本或 npm 安装后的 node 启动器。',
+    detail: '示例会填成 `node server.js --stdio`，脚本名和参数可以继续改。',
+    seed: {
+      name: 'Node 脚本',
+      command: 'node',
+      args: ['server.js', '--stdio'],
+      env: {},
+      timeoutSeconds: 20,
+    },
+  },
+  {
+    key: 'python',
+    title: 'Python 模块',
+    description: '适合 `python -m xxx` 这种按模块启动的服务。',
+    detail: '示例会填成 `python -m your_mcp_server`，模块名改成实际值即可。',
+    seed: {
+      name: 'Python 模块',
+      command: 'python',
+      args: ['-m', 'your_mcp_server'],
+      env: {},
+      timeoutSeconds: 20,
+    },
+  },
+  {
+    key: 'docker',
+    title: 'Docker 镜像',
+    description: '适合 README 里写着 `docker run -i --rm image` 的容器化 MCP。本机需要已安装 Docker。',
+    detail: '示例会填成 `docker run --rm -i mcp/server-fetch:latest`；容器内 token 通常用 -e KEY=VALUE 放到参数里。',
+    seed: {
+      name: 'Docker MCP',
+      command: 'docker',
+      args: ['run', '--rm', '-i', 'mcp/server-fetch:latest'],
+      env: {},
+      timeoutSeconds: 45,
+    },
+  },
+  {
+    key: 'exe',
+    title: '本机 EXE',
+    description: '适合已经编译好的本机二进制或公司内部工具。',
+    detail: '示例会填成 `your-mcp-server.exe stdio`，把 exe 路径换成真实值。',
+    seed: {
+      name: '本机 EXE',
+      command: 'your-mcp-server.exe',
+      args: ['stdio'],
+      env: {},
+      timeoutSeconds: 20,
+    },
+  },
+];
diff --git a/frontend/src/utils/mcpServerValidation.test.ts b/frontend/src/utils/mcpServerValidation.test.ts
new file mode 100644
index 0000000..b3b5442
--- /dev/null
+++ b/frontend/src/utils/mcpServerValidation.test.ts
@@ -0,0 +1,96 @@
+import { describe, expect, it } from 'vitest';
+
+import { validateMCPServerDraft } from './mcpServerValidation';
+
+describe('mcpServerValidation', () => {
+  it('blocks testing and saving when required MCP launch fields are invalid', () => {
+    const validation = validateMCPServerDraft({
+      name: 'GitHub',
+      transport: 'stdio',
+      command: '',
+      args: ['--stdio'],
+      timeoutSeconds: 20,
+    }, { invalidLines: [] });
+
+    expect(validation.canTest).toBe(false);
+    expect(validation.canSave).toBe(false);
+    expect(validation.errorCount).toBe(1);
+    expect(validation.issues.map((issue) => issue.key)).toContain('command-missing');
+  });
+
+  it('warns when users paste a whole command into the command field', () => {
+    const validation = validateMCPServerDraft({
+      name: 'Node',
+      transport: 'stdio',
+      command: 'node server.js --stdio',
+      args: [],
+      timeoutSeconds: 20,
+    }, { invalidLines: [] });
+
+    expect(validation.canTest).toBe(true);
+    expect(validation.warningCount).toBeGreaterThanOrEqual(1);
+    expect(validation.issues.map((issue) => issue.key)).toContain('command-whole-line');
+    expect(validation.issues.map((issue) => issue.key)).toContain('args-missing-for-launcher');
+  });
+
+  it('blocks save when env draft contains lines that would be silently dropped', () => {
+    const validation = validateMCPServerDraft({
+      name: 'GitHub',
+      transport: 'stdio',
+      command: 'uvx',
+      args: ['mcp-server-github', '--stdio'],
+      timeoutSeconds: 45,
+    }, { invalidLines: ['export GITHUB_TOKEN=abc'] });
+
+    expect(validation.canTest).toBe(false);
+    expect(validation.canSave).toBe(false);
+    expect(validation.errorCount).toBe(1);
+    expect(validation.issues.find((issue) => issue.key === 'env-invalid-lines')?.detail).toContain('export GITHUB_TOKEN=abc');
+  });
+
+  it('keeps valid drafts testable and saveable', () => {
+    const validation = validateMCPServerDraft({
+      name: 'Filesystem',
+      transport: 'stdio',
+      command: 'node',
+      args: ['server.js', '--stdio'],
+      timeoutSeconds: 20,
+    }, { invalidLines: [] });
+
+    expect(validation.canTest).toBe(true);
+    expect(validation.canSave).toBe(true);
+    expect(validation.errorCount).toBe(0);
+  });
+
+  it('warns when docker MCP launch args miss run, stdin, or image', () => {
+    const validation = validateMCPServerDraft({
+      name: 'Docker MCP',
+      transport: 'stdio',
+      command: 'docker',
+      args: ['--rm'],
+      timeoutSeconds: 45,
+    }, { invalidLines: [] });
+
+    expect(validation.canTest).toBe(true);
+    expect(validation.warningCount).toBeGreaterThanOrEqual(3);
+    expect(validation.issues.map((issue) => issue.key)).toContain('docker-run-missing');
+    expect(validation.issues.map((issue) => issue.key)).toContain('docker-interactive-missing');
+    expect(validation.issues.map((issue) => issue.key)).toContain('docker-image-missing');
+  });
+
+  it('accepts complete docker MCP launch args without docker-specific warnings', () => {
+    const validation = validateMCPServerDraft({
+      name: 'Docker MCP',
+      transport: 'stdio',
+      command: 'docker',
+      args: ['run', '--rm', '-i', '-e', 'API_KEY=...', 'mcp/server-fetch:latest'],
+      timeoutSeconds: 45,
+    }, { invalidLines: [] });
+
+    expect(validation.canTest).toBe(true);
+    expect(validation.canSave).toBe(true);
+    expect(validation.issues.map((issue) => issue.key)).not.toContain('docker-run-missing');
+    expect(validation.issues.map((issue) => issue.key)).not.toContain('docker-interactive-missing');
+    expect(validation.issues.map((issue) => issue.key)).not.toContain('docker-image-missing');
+  });
+});
diff --git a/frontend/src/utils/mcpServerValidation.ts b/frontend/src/utils/mcpServerValidation.ts
new file mode 100644
index 0000000..f1b0370
--- /dev/null
+++ b/frontend/src/utils/mcpServerValidation.ts
@@ -0,0 +1,243 @@
+import type { AIMCPServerConfig } from '../types';
+import type { ParsedMCPEnvDraft } from './mcpEnvDraft';
+import { splitShellLikeCommand } from './mcpCommandDraft';
+
+export type MCPServerDraftIssueSeverity = 'error' | 'warning' | 'info';
+
+export interface MCPServerDraftIssue {
+  key: string;
+  severity: MCPServerDraftIssueSeverity;
+  title: string;
+  detail: string;
+}
+
+export interface MCPServerDraftValidation {
+  issues: MCPServerDraftIssue[];
+  errorCount: number;
+  warningCount: number;
+  infoCount: number;
+  canTest: boolean;
+  canSave: boolean;
+}
+
+const KNOWN_LAUNCHER_COMMANDS = new Set([
+  'node',
+  'npm',
+  'npx',
+  'pnpm',
+  'yarn',
+  'bun',
+  'deno',
+  'python',
+  'python3',
+  'py',
+  'uv',
+  'uvx',
+  'docker',
+  'go',
+  'java',
+  'cmd',
+  'powershell',
+  'pwsh',
+]);
+
+const ENV_ASSIGNMENT_RE = /^(\$env:)?[A-Za-z_][A-Za-z0-9_]*=/u;
+
+const toTrimmedString = (value: unknown): string => String(value ?? '').trim();
+
+const countIssues = (issues: MCPServerDraftIssue[], severity: MCPServerDraftIssueSeverity): number =>
+  issues.filter((issue) => issue.severity === severity).length;
+
+const firstShellToken = (value: string): string => {
+  const { tokens } = splitShellLikeCommand(value);
+  return toTrimmedString(tokens[0]).toLowerCase();
+};
+
+const commandLooksLikeWholeLine = (command: string): boolean => {
+  const text = toTrimmedString(command);
+  if (!text) return false;
+  const { tokens } = splitShellLikeCommand(text);
+  if (tokens.length <= 1) return false;
+
+  const firstToken = toTrimmedString(tokens[0]).toLowerCase();
+  if (KNOWN_LAUNCHER_COMMANDS.has(firstToken)) return true;
+  if (ENV_ASSIGNMENT_RE.test(tokens[0])) return true;
+  return tokens.some((token, index) => index > 0 && String(token || '').startsWith('--'));
+};
+
+const argsContainEnvOrShellGlue = (args: string[]): boolean =>
+  args.some((arg) => {
+    const text = toTrimmedString(arg);
+    if (!text) return false;
+    const lower = text.toLowerCase();
+    return ENV_ASSIGNMENT_RE.test(text) || lower === 'env' || lower === 'set' || text === '&&' || text === ';';
+  });
+
+const launcherUsuallyNeedsArgs = (command: string): boolean => {
+  const firstToken = firstShellToken(command);
+  return ['node', 'python', 'python3', 'py', 'uvx', 'npx', 'bun', 'deno', 'docker', 'go', 'java'].includes(firstToken);
+};
+
+const isDockerCommand = (command: string): boolean =>
+  firstShellToken(command) === 'docker';
+
+const hasDockerRunArg = (args: string[]): boolean =>
+  args.some((arg) => arg.toLowerCase() === 'run');
+
+const hasDockerInteractiveArg = (args: string[]): boolean =>
+  args.some((arg) => arg.toLowerCase() === '-i' || arg.toLowerCase() === '--interactive');
+
+const hasDockerImageArg = (args: string[]): boolean => {
+  const runIndex = args.findIndex((arg) => arg.toLowerCase() === 'run');
+  const candidates = runIndex >= 0 ? args.slice(runIndex + 1) : args;
+  for (let index = 0; index < candidates.length; index += 1) {
+    const arg = candidates[index];
+    if (!arg || arg.startsWith('-')) {
+      const lower = arg.toLowerCase();
+      if ([
+        '-e',
+        '--env',
+        '--name',
+        '--network',
+        '-v',
+        '--volume',
+        '-p',
+        '--publish',
+        '--entrypoint',
+        '-w',
+        '--workdir',
+        '-u',
+        '--user',
+        '--platform',
+        '-h',
+        '--hostname',
+      ].includes(lower)) {
+        index += 1;
+      }
+      continue;
+    }
+    return true;
+  }
+  return false;
+};
+
+export const validateMCPServerDraft = (
+  server: Pick<AIMCPServerConfig, 'name' | 'transport' | 'command' | 'args' | 'timeoutSeconds'>,
+  parsedEnvDraft?: Pick<ParsedMCPEnvDraft, 'invalidLines'>,
+): MCPServerDraftValidation => {
+  const issues: MCPServerDraftIssue[] = [];
+  const command = toTrimmedString(server.command);
+  const args = Array.isArray(server.args) ? server.args.map(toTrimmedString).filter(Boolean) : [];
+  const timeoutSeconds = Number(server.timeoutSeconds);
+
+  if (!toTrimmedString(server.name)) {
+    issues.push({
+      key: 'name-missing',
+      severity: 'warning',
+      title: '服务名称为空',
+      detail: '建议写成 Browser、GitHub、Filesystem 这类用途名；否则保存后只能靠命令名识别。',
+    });
+  }
+
+  if (server.transport !== 'stdio') {
+    issues.push({
+      key: 'transport-unsupported',
+      severity: 'error',
+      title: '传输方式不支持',
+      detail: '当前 GoNavi 新增 MCP 服务只支持 stdio，请保持传输方式为 stdio。',
+    });
+  }
+
+  if (!command) {
+    issues.push({
+      key: 'command-missing',
+      severity: 'error',
+      title: '启动命令未填写',
+      detail: '至少填写 node、uvx、python 或本机 exe 路径；脚本名和 --stdio 放到命令参数里。',
+    });
+  } else if (commandLooksLikeWholeLine(command)) {
+    issues.push({
+      key: 'command-whole-line',
+      severity: 'warning',
+      title: '启动命令可能填成了整行命令',
+      detail: '启动命令只填可执行程序本身；把脚本名、模块名、--stdio 和环境变量拆到命令参数或环境变量里。',
+    });
+  }
+
+  if (command && launcherUsuallyNeedsArgs(command) && args.length === 0) {
+    issues.push({
+      key: 'args-missing-for-launcher',
+      severity: 'warning',
+      title: '命令参数可能缺少脚本或模块名',
+      detail: 'node、python、uvx、npx 这类启动器通常还需要 server.js、-m your_server 或包名作为参数。',
+    });
+  }
+
+  if (command && isDockerCommand(command)) {
+    if (!hasDockerRunArg(args)) {
+      issues.push({
+        key: 'docker-run-missing',
+        severity: 'warning',
+        title: 'Docker 参数缺少 run',
+        detail: 'Docker MCP 通常需要 command=docker，args 里单独填写 run、--rm、-i、镜像名和服务参数。',
+      });
+    }
+    if (!hasDockerInteractiveArg(args)) {
+      issues.push({
+        key: 'docker-interactive-missing',
+        severity: 'warning',
+        title: 'Docker 参数缺少 -i',
+        detail: 'MCP 需要持续读取标准输入；docker run 场景请加 -i 或 --interactive，否则工具发现可能立即断开。',
+      });
+    }
+    if (!hasDockerImageArg(args)) {
+      issues.push({
+        key: 'docker-image-missing',
+        severity: 'warning',
+        title: 'Docker 参数可能缺少镜像名',
+        detail: '请在 docker run 选项之后填写 README 提供的镜像名，例如 mcp/server-fetch:latest。',
+      });
+    }
+  }
+
+  if (argsContainEnvOrShellGlue(args)) {
+    issues.push({
+      key: 'args-contain-env-or-shell-glue',
+      severity: 'warning',
+      title: '命令参数里疑似混入环境变量或 Shell 连接符',
+      detail: 'KEY=VALUE、$env:KEY=VALUE、set、env、&& 这类内容应放到完整命令自动拆分或环境变量输入框里。',
+    });
+  }
+
+  if (!Number.isFinite(timeoutSeconds) || timeoutSeconds < 3 || timeoutSeconds > 120) {
+    issues.push({
+      key: 'timeout-out-of-range',
+      severity: 'warning',
+      title: '超时时间不在推荐范围内',
+      detail: 'GoNavi 最终会限制在 3 到 120 秒之间；本机常规服务建议 20 秒，慢启动服务建议 45 或 60 秒。',
+    });
+  }
+
+  const invalidEnvLines = parsedEnvDraft?.invalidLines || [];
+  if (invalidEnvLines.length > 0) {
+    issues.push({
+      key: 'env-invalid-lines',
+      severity: 'error',
+      title: '环境变量存在无效行',
+      detail: `每行必须是 KEY=VALUE，当前有 ${invalidEnvLines.length} 行不会保存：${invalidEnvLines.slice(0, 2).join(' / ')}`,
+    });
+  }
+
+  const errorCount = countIssues(issues, 'error');
+  const warningCount = countIssues(issues, 'warning');
+  const infoCount = countIssues(issues, 'info');
+
+  return {
+    issues,
+    errorCount,
+    warningCount,
+    infoCount,
+    canTest: errorCount === 0,
+    canSave: errorCount === 0,
+  };
+};
diff --git a/frontend/src/utils/messagePublish.test.ts b/frontend/src/utils/messagePublish.test.ts
new file mode 100644
index 0000000..92ee5f4
--- /dev/null
+++ b/frontend/src/utils/messagePublish.test.ts
@@ -0,0 +1,172 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  buildMessagePublishCommand,
+  createDefaultMessagePublishDraft,
+} from './messagePublish';
+
+describe('messagePublish', () => {
+  it('builds a Kafka publish JSON command from JSON payload inputs', () => {
+    const result = buildMessagePublishCommand(
+      { type: 'kafka' },
+      {
+        destination: 'orders.events',
+        keyMode: 'json',
+        key: '{"tenant":"a"}',
+        bodyMode: 'json',
+        body: '{"id":1,"event":"created"}',
+        headers: '{"x-env":"dev"}',
+      },
+    );
+
+    expect(result.transportLabel).toBe('Kafka Topic');
+    expect(result.destinationLabel).toBe('orders.events');
+    expect(result.commandText).toContain('"publish": "orders.events"');
+    expect(result.commandText).toContain('"tenant": "a"');
+    expect(result.commandText).toContain('"id": 1');
+    expect(result.commandText).toContain('"x-env": "dev"');
+  });
+
+  it('keeps Kafka text payloads as plain strings', () => {
+    const result = buildMessagePublishCommand(
+      { type: 'kafka' },
+      {
+        destination: 'logs.app',
+        keyMode: 'text',
+        key: 'tenant-a',
+        bodyMode: 'text',
+        body: 'hello gonavi',
+        headers: '',
+      },
+    );
+
+    expect(result.commandText).toContain('"key": "tenant-a"');
+    expect(result.commandText).toContain('"value": "hello gonavi"');
+  });
+
+  it('rejects non-object Kafka headers', () => {
+    expect(() => buildMessagePublishCommand(
+      { type: 'kafka' },
+      {
+        destination: 'logs.app',
+        bodyMode: 'json',
+        body: '{"ok":true}',
+        headers: '["bad"]',
+      },
+    )).toThrow('Headers 必须是 JSON 对象');
+  });
+
+  it('seeds Kafka default publish draft with a JSON body example', () => {
+    expect(createDefaultMessagePublishDraft({ type: 'kafka' }, 'orders.events')).toMatchObject({
+      destination: 'orders.events',
+      keyMode: 'text',
+      bodyMode: 'json',
+    });
+  });
+
+  it('builds an MQTT publish JSON command with qos and retain flags', () => {
+    const result = buildMessagePublishCommand(
+      { type: 'mqtt' },
+      {
+        destination: 'devices/device-001/telemetry',
+        qos: 1,
+        retain: true,
+        bodyMode: 'json',
+        body: '{"id":1,"event":"created"}',
+      },
+    );
+
+    expect(result.transportLabel).toBe('MQTT Topic');
+    expect(result.destinationLabel).toBe('devices/device-001/telemetry');
+    expect(result.commandText).toContain('"publish": "devices/device-001/telemetry"');
+    expect(result.commandText).toContain('"qos": 1');
+    expect(result.commandText).toContain('"retain": true');
+  });
+
+  it('seeds MQTT default publish draft with connection qos and retain defaults', () => {
+    expect(createDefaultMessagePublishDraft(
+      { type: 'mqtt', database: 'devices/+/telemetry', connectionParams: 'qos=1&retain=true' },
+      '',
+    )).toMatchObject({
+      destination: 'devices/+/telemetry',
+      qos: 1,
+      retain: true,
+      bodyMode: 'json',
+    });
+  });
+
+  it('builds a RabbitMQ publish JSON command with routing and properties', () => {
+    const result = buildMessagePublishCommand(
+      { type: 'rabbitmq', connectionParams: 'defaultQueue=orders.queue&exchange=events.topic' },
+      {
+        destination: 'orders.queue',
+        exchange: '',
+        routingKey: '',
+        bodyMode: 'json',
+        body: '{"id":1,"event":"created"}',
+        headers: '{"x-env":"dev"}',
+        properties: '{"content_type":"application/json"}',
+      },
+    );
+
+    expect(result.transportLabel).toBe('RabbitMQ Queue');
+    expect(result.destinationLabel).toBe('orders.queue');
+    expect(result.commandText).toContain('"publish": "orders.queue"');
+    expect(result.commandText).toContain('"exchange": "events.topic"');
+    expect(result.commandText).toContain('"routing_key": "orders.queue"');
+    expect(result.commandText).toContain('"content_type": "application/json"');
+  });
+
+  it('seeds RabbitMQ default publish draft with defaultQueue and exchange', () => {
+    expect(createDefaultMessagePublishDraft(
+      { type: 'rabbitmq', connectionParams: 'defaultQueue=orders.queue&exchange=events.topic' },
+      '',
+    )).toMatchObject({
+      destination: 'orders.queue',
+      exchange: 'events.topic',
+      routingKey: 'orders.queue',
+      bodyMode: 'json',
+    });
+  });
+
+  it('builds a RocketMQ publish JSON command with tag, keys and delay level', () => {
+    const result = buildMessagePublishCommand(
+      { type: 'rocketmq' },
+      {
+        destination: 'orders.events',
+        key: 'key-a,key-b',
+        tag: 'TagA',
+        delayLevel: 3,
+        bodyMode: 'json',
+        body: '{"id":1,"event":"created"}',
+        properties: '{"trace":"trace-1"}',
+      },
+    );
+
+    const command = JSON.parse(result.commandText);
+    expect(result.transportLabel).toBe('RocketMQ Topic');
+    expect(result.destinationLabel).toBe('orders.events');
+    expect(command).toMatchObject({
+      publish: 'orders.events',
+      tag: 'TagA',
+      delayLevel: 3,
+      properties: {
+        trace: 'trace-1',
+      },
+    });
+    expect(command.keys).toEqual(['key-a', 'key-b']);
+    expect(command.payload).toMatchObject({ id: 1, event: 'created' });
+  });
+
+  it('seeds RocketMQ default publish draft with connection tag and delay level defaults', () => {
+    expect(createDefaultMessagePublishDraft(
+      { type: 'rocketmq', database: 'orders.events', connectionParams: 'tag=TagA&delayLevel=5' },
+      '',
+    )).toMatchObject({
+      destination: 'orders.events',
+      tag: 'TagA',
+      delayLevel: 5,
+      bodyMode: 'json',
+    });
+  });
+});
diff --git a/frontend/src/utils/messagePublish.ts b/frontend/src/utils/messagePublish.ts
new file mode 100644
index 0000000..d1334ef
--- /dev/null
+++ b/frontend/src/utils/messagePublish.ts
@@ -0,0 +1,443 @@
+import { resolveDataSourceType } from './dataSourceCapabilities';
+
+type ConnectionLike = {
+  type?: string;
+  driver?: string;
+  oceanBaseProtocol?: string;
+  database?: string;
+  uri?: string;
+  connectionParams?: string;
+} | null | undefined;
+
+export type MessagePublishValueMode = 'text' | 'json';
+
+export type MessagePublishDraft = {
+  destination: string;
+  exchange?: string;
+  routingKey?: string;
+  qos?: number;
+  retain?: boolean;
+  tag?: string;
+  delayLevel?: number;
+  keyMode?: MessagePublishValueMode;
+  key?: string;
+  bodyMode?: MessagePublishValueMode;
+  body: string;
+  headers?: string;
+  properties?: string;
+};
+
+export type MessagePublishCommand = {
+  commandText: string;
+  destinationLabel: string;
+  transportLabel: string;
+};
+
+export type MessagePublishPresentation = {
+  transportLabel: string;
+  destinationLabel: string;
+  destinationPlaceholder: string;
+  destinationRequiredMessage: string;
+  alertMessage: string;
+  successHint: string;
+  showKey: boolean;
+  showKeyMode: boolean;
+  keyLabel: string;
+  keyPlaceholder: string;
+  showExchange: boolean;
+  showRoutingKey: boolean;
+  showHeaders: boolean;
+  showProperties: boolean;
+  showTag: boolean;
+  tagPlaceholder: string;
+  showDelayLevel: boolean;
+  showQos: boolean;
+  showRetain: boolean;
+};
+
+const normalizeMode = (value: unknown, fallback: MessagePublishValueMode): MessagePublishValueMode => {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (normalized === 'text') return 'text';
+  if (normalized === 'json') return 'json';
+  return fallback;
+};
+
+const parseRequiredPayload = (
+  rawValue: unknown,
+  mode: MessagePublishValueMode,
+  fieldLabel: string,
+): string | number | boolean | Record<string, any> | Array<any> => {
+  const text = String(rawValue ?? '');
+  if (!text.trim()) {
+    throw new Error(`请输入${fieldLabel}`);
+  }
+  if (mode === 'text') {
+    return text;
+  }
+  try {
+    return JSON.parse(text);
+  } catch (error: any) {
+    throw new Error(`${fieldLabel}不是合法 JSON：${error?.message || String(error)}`);
+  }
+};
+
+const parseOptionalPayload = (
+  rawValue: unknown,
+  mode: MessagePublishValueMode,
+  fieldLabel: string,
+): string | number | boolean | Record<string, any> | Array<any> | undefined => {
+  const text = String(rawValue ?? '');
+  if (!text.trim()) {
+    return undefined;
+  }
+  return parseRequiredPayload(text, mode, fieldLabel);
+};
+
+const parseOptionalJSONObject = (
+  rawValue: unknown,
+  fieldLabel: string,
+): Record<string, any> | undefined => {
+  const text = String(rawValue ?? '');
+  if (!text.trim()) {
+    return undefined;
+  }
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(text);
+  } catch (error: any) {
+    throw new Error(`${fieldLabel}不是合法 JSON：${error?.message || String(error)}`);
+  }
+  if (!parsed || Array.isArray(parsed) || typeof parsed !== 'object') {
+    throw new Error(`${fieldLabel} 必须是 JSON 对象`);
+  }
+  return parsed as Record<string, any>;
+};
+
+const mergeSearchParams = (target: URLSearchParams, sourceText: unknown) => {
+  const text = String(sourceText ?? '').trim();
+  if (!text) return;
+  const raw = text.includes('?') ? text.slice(text.indexOf('?') + 1) : text;
+  const params = new URLSearchParams(raw.replace(/^\?/, ''));
+  params.forEach((value, key) => {
+    if (String(key || '').trim()) {
+      target.set(key, value);
+    }
+  });
+};
+
+const resolveConnectionParams = (config: ConnectionLike): URLSearchParams => {
+  const params = new URLSearchParams();
+  if (!config) return params;
+  mergeSearchParams(params, config.uri);
+  mergeSearchParams(params, config.connectionParams);
+  return params;
+};
+
+const normalizeRabbitMQExchange = (value: unknown): string => {
+  const normalized = String(value ?? '').trim();
+  if (normalized === 'amq.default' || normalized === '(default)') {
+    return '';
+  }
+  return normalized;
+};
+
+const resolveDefaultDestination = (config: ConnectionLike, explicitDestination: string): string => {
+  const destination = String(explicitDestination || '').trim();
+  if (destination) return destination;
+
+  const resolvedType = resolveDataSourceType(config as any);
+  const params = resolveConnectionParams(config);
+
+  if (resolvedType === 'kafka') {
+    return String(config?.database || '').trim();
+  }
+  if (resolvedType === 'rocketmq') {
+    return String(config?.database || params.get('defaultTopic') || params.get('topic') || '').trim();
+  }
+  if (resolvedType === 'mqtt') {
+    return String(config?.database || params.get('defaultTopic') || params.get('topic') || '').trim();
+  }
+  if (resolvedType === 'rabbitmq') {
+    return String(params.get('defaultQueue') || params.get('queue') || '').trim();
+  }
+  return '';
+};
+
+export const getMessagePublishPresentation = (
+  config: ConnectionLike,
+): MessagePublishPresentation => {
+  const resolvedType = resolveDataSourceType(config as any);
+
+  if (resolvedType === 'rabbitmq') {
+    return {
+      transportLabel: 'RabbitMQ Queue',
+      destinationLabel: 'Queue',
+      destinationPlaceholder: '例如：orders.queue',
+      destinationRequiredMessage: '请输入 Queue',
+      alertMessage: '当前表单会自动拼装 RabbitMQ publish JSON 命令，并通过 Management API 执行测试发送。',
+      successHint: '留空 Exchange 时会使用默认交换机并按 Queue 名作为 routing key。',
+      showKey: false,
+      showKeyMode: false,
+      keyLabel: '消息 Key（可选）',
+      keyPlaceholder: '',
+      showExchange: true,
+      showRoutingKey: true,
+      showHeaders: true,
+      showProperties: true,
+      showTag: false,
+      tagPlaceholder: '',
+      showDelayLevel: false,
+      showQos: false,
+      showRetain: false,
+    };
+  }
+
+  if (resolvedType === 'rocketmq') {
+    return {
+      transportLabel: 'RocketMQ Topic',
+      destinationLabel: 'Topic',
+      destinationPlaceholder: '例如：orders.events',
+      destinationRequiredMessage: '请输入 Topic',
+      alertMessage: '当前表单会自动拼装 RocketMQ publish JSON 命令，并通过 NameServer/Broker 执行测试发送。',
+      successHint: 'Tag、Keys、Delay Level 与 Properties 会一并写入 RocketMQ 消息属性。',
+      showKey: true,
+      showKeyMode: false,
+      keyLabel: '消息 Keys（可选）',
+      keyPlaceholder: '可输入多个 Key，使用逗号分隔',
+      showExchange: false,
+      showRoutingKey: false,
+      showHeaders: false,
+      showProperties: true,
+      showTag: true,
+      tagPlaceholder: '例如：TagA',
+      showDelayLevel: true,
+      showQos: false,
+      showRetain: false,
+    };
+  }
+
+  if (resolvedType === 'mqtt') {
+    return {
+      transportLabel: 'MQTT Topic',
+      destinationLabel: 'Topic',
+      destinationPlaceholder: '例如：devices/device-001/telemetry',
+      destinationRequiredMessage: '请输入 Topic',
+      alertMessage: '当前表单会自动拼装 MQTT publish JSON 命令，并直接通过 broker 执行测试发送。',
+      successHint: 'QoS 与 retain 可单独指定；未填写时沿用当前连接中的默认参数。',
+      showKey: false,
+      showKeyMode: false,
+      keyLabel: '消息 Key（可选）',
+      keyPlaceholder: '',
+      showExchange: false,
+      showRoutingKey: false,
+      showHeaders: false,
+      showProperties: false,
+      showTag: false,
+      tagPlaceholder: '',
+      showDelayLevel: false,
+      showQos: true,
+      showRetain: true,
+    };
+  }
+
+  return {
+    transportLabel: 'Kafka Topic',
+    destinationLabel: 'Topic',
+    destinationPlaceholder: '例如：orders.events',
+    destinationRequiredMessage: '请输入 Topic',
+    alertMessage: '当前表单会自动拼装 Kafka publish JSON 命令，并直接调用后端执行测试发送。',
+    successHint: 'Headers 会作为 Kafka Record Headers 一并发送。',
+    showKey: true,
+    showKeyMode: true,
+    keyLabel: '消息 Key（可选）',
+    keyPlaceholder: '可留空；JSON 模式请输入一行合法 JSON',
+    showExchange: false,
+    showRoutingKey: false,
+    showHeaders: true,
+    showProperties: false,
+    showTag: false,
+    tagPlaceholder: '',
+    showDelayLevel: false,
+    showQos: false,
+    showRetain: false,
+  };
+};
+
+export const createDefaultMessagePublishDraft = (
+  config: ConnectionLike,
+  destination = '',
+): MessagePublishDraft => {
+  const resolvedType = resolveDataSourceType(config as any);
+  const resolvedDestination = resolveDefaultDestination(config, destination);
+  const params = resolveConnectionParams(config);
+
+  if (resolvedType === 'rabbitmq') {
+    return {
+      destination: resolvedDestination,
+      exchange: normalizeRabbitMQExchange(params.get('defaultExchange') || params.get('exchange') || ''),
+      routingKey: resolvedDestination,
+      bodyMode: 'json',
+      body: '{\n  "event": "test",\n  "source": "gonavi"\n}',
+      headers: '{\n  "x-source": "gonavi"\n}',
+      properties: '{\n  "content_type": "application/json"\n}',
+    };
+  }
+
+  if (resolvedType === 'rocketmq') {
+    const delayLevel = Number(params.get('delayLevel') || params.get('delay_level'));
+    return {
+      destination: resolvedDestination,
+      tag: String(params.get('tag') || params.get('tags') || '').trim(),
+      delayLevel: Number.isFinite(delayLevel) && delayLevel > 0 ? Math.trunc(delayLevel) : undefined,
+      key: '',
+      bodyMode: 'json',
+      body: '{\n  "event": "test",\n  "source": "gonavi"\n}',
+      headers: '',
+      properties: '{\n  "x-source": "gonavi"\n}',
+    };
+  }
+
+  if (resolvedType === 'mqtt') {
+    const qosValue = Number(params.get('qos'));
+    return {
+      destination: resolvedDestination,
+      qos: Number.isFinite(qosValue) ? Math.min(2, Math.max(0, Math.trunc(qosValue))) : 0,
+      retain: ['1', 'true', 'yes', 'on'].includes(String(params.get('retain') || '').trim().toLowerCase()),
+      bodyMode: 'json',
+      body: '{\n  "event": "test",\n  "source": "gonavi"\n}',
+      headers: '',
+    };
+  }
+
+  return {
+    destination: resolvedDestination,
+    keyMode: 'text',
+    key: '',
+    bodyMode: 'json',
+    body: '{\n  "event": "test",\n  "source": "gonavi"\n}',
+    headers: '{\n  "x-source": "gonavi"\n}',
+  };
+};
+
+export const buildMessagePublishCommand = (
+  config: ConnectionLike,
+  draft: MessagePublishDraft,
+): MessagePublishCommand => {
+  const resolvedType = resolveDataSourceType(config as any);
+  const destination = String(draft.destination || '').trim();
+  if (!destination) {
+    throw new Error('请输入目标 Topic / Queue');
+  }
+
+  if (resolvedType === 'mqtt') {
+    if (/[#+]/.test(destination)) {
+      throw new Error('MQTT 发送 Topic 不能包含 + 或 # 通配符');
+    }
+    const bodyMode = normalizeMode(draft.bodyMode, 'json');
+    const qosValue = Number(draft.qos);
+    const qos = Number.isFinite(qosValue) ? Math.min(2, Math.max(0, Math.trunc(qosValue))) : 0;
+    const command: Record<string, unknown> = {
+      publish: destination,
+      payload: parseRequiredPayload(draft.body, bodyMode, '消息体'),
+      qos,
+      retain: !!draft.retain,
+    };
+
+    return {
+      commandText: JSON.stringify(command, null, 2),
+      destinationLabel: destination,
+      transportLabel: 'MQTT Topic',
+    };
+  }
+
+  if (resolvedType === 'rocketmq') {
+    const bodyMode = normalizeMode(draft.bodyMode, 'json');
+    const command: Record<string, unknown> = {
+      publish: destination,
+      payload: parseRequiredPayload(draft.body, bodyMode, '消息体'),
+    };
+
+    const keys = String(draft.key || '')
+      .split(/[,;|\s，]+/g)
+      .map((item) => item.trim())
+      .filter(Boolean);
+    if (keys.length > 0) {
+      command.keys = keys;
+    }
+
+    const tag = String(draft.tag || '').trim();
+    if (tag) {
+      command.tag = tag;
+    }
+
+    const delayLevel = Number(draft.delayLevel);
+    if (Number.isFinite(delayLevel) && delayLevel > 0) {
+      command.delayLevel = Math.trunc(delayLevel);
+    }
+
+    const properties = parseOptionalJSONObject(draft.properties, 'Properties');
+    if (properties && Object.keys(properties).length > 0) {
+      command.properties = properties;
+    }
+
+    return {
+      commandText: JSON.stringify(command, null, 2),
+      destinationLabel: destination,
+      transportLabel: 'RocketMQ Topic',
+    };
+  }
+
+  if (resolvedType === 'rabbitmq') {
+    const params = resolveConnectionParams(config);
+    const bodyMode = normalizeMode(draft.bodyMode, 'json');
+    const command: Record<string, unknown> = {
+      publish: destination,
+      payload: parseRequiredPayload(draft.body, bodyMode, '消息体'),
+      exchange: normalizeRabbitMQExchange(draft.exchange || params.get('defaultExchange') || params.get('exchange') || ''),
+      routing_key: String(draft.routingKey || '').trim() || destination,
+    };
+
+    const headers = parseOptionalJSONObject(draft.headers, 'Headers');
+    if (headers && Object.keys(headers).length > 0) {
+      command.headers = headers;
+    }
+
+    const properties = parseOptionalJSONObject(draft.properties, 'Properties');
+    if (properties && Object.keys(properties).length > 0) {
+      command.properties = properties;
+    }
+
+    return {
+      commandText: JSON.stringify(command, null, 2),
+      destinationLabel: destination,
+      transportLabel: 'RabbitMQ Queue',
+    };
+  }
+
+  if (resolvedType === 'kafka') {
+    const keyMode = normalizeMode(draft.keyMode, 'text');
+    const bodyMode = normalizeMode(draft.bodyMode, 'json');
+    const command: Record<string, unknown> = {
+      publish: destination,
+      value: parseRequiredPayload(draft.body, bodyMode, '消息体'),
+    };
+
+    const keyPayload = parseOptionalPayload(draft.key, keyMode, '消息 Key');
+    if (keyPayload !== undefined) {
+      command.key = keyPayload;
+    }
+
+    const headers = parseOptionalJSONObject(draft.headers, 'Headers');
+    if (headers && Object.keys(headers).length > 0) {
+      command.headers = headers;
+    }
+
+    return {
+      commandText: JSON.stringify(command, null, 2),
+      destinationLabel: destination,
+      transportLabel: 'Kafka Topic',
+    };
+  }
+
+  throw new Error(`当前数据源暂不支持测试发送消息：${resolvedType || 'unknown'}`);
+};
diff --git a/frontend/src/utils/objectQueryTemplates.test.ts b/frontend/src/utils/objectQueryTemplates.test.ts
index 7dd8f35..bfcdeda 100644
--- a/frontend/src/utils/objectQueryTemplates.test.ts
+++ b/frontend/src/utils/objectQueryTemplates.test.ts
@@ -6,4 +6,20 @@ describe('buildTableSelectQuery', () => {
   it('quotes uppercase postgres table names in new query templates', () => {
     expect(buildTableSelectQuery('postgres', 'public.MyTable')).toBe('SELECT * FROM public."MyTable";');
   });
+
+  it('adds a preview limit for RocketMQ topic browsing', () => {
+    expect(buildTableSelectQuery('rocketmq', 'orders.events')).toBe('SELECT * FROM "orders.events" LIMIT 100;');
+  });
+
+  it('adds a preview limit for Kafka topic browsing', () => {
+    expect(buildTableSelectQuery('kafka', 'logs.app-1')).toBe('SELECT * FROM "logs.app-1" LIMIT 100;');
+  });
+
+  it('adds a preview limit for MQTT topic browsing', () => {
+    expect(buildTableSelectQuery('mqtt', 'devices/+/telemetry')).toBe('SELECT * FROM "devices/+/telemetry" LIMIT 100;');
+  });
+
+  it('adds a preview limit for RabbitMQ queue browsing', () => {
+    expect(buildTableSelectQuery('rabbitmq', 'orders.events.v1')).toBe('SELECT * FROM "orders.events.v1" LIMIT 100;');
+  });
 });
diff --git a/frontend/src/utils/objectQueryTemplates.ts b/frontend/src/utils/objectQueryTemplates.ts
index 7bf65c5..b4468f8 100644
--- a/frontend/src/utils/objectQueryTemplates.ts
+++ b/frontend/src/utils/objectQueryTemplates.ts
@@ -5,5 +5,8 @@ export const buildTableSelectQuery = (dbType: string, tableName: string): string
   if (!normalizedTableName) {
     return 'SELECT * FROM ';
   }
+  if (['rocketmq', 'mqtt', 'kafka', 'rabbitmq'].includes(String(dbType || '').trim().toLowerCase())) {
+    return `SELECT * FROM ${quoteQualifiedIdent(dbType, normalizedTableName)} LIMIT 100;`;
+  }
   return `SELECT * FROM ${quoteQualifiedIdent(dbType, normalizedTableName)};`;
 };
diff --git a/frontend/src/utils/qualifiedName.ts b/frontend/src/utils/qualifiedName.ts
new file mode 100644
index 0000000..11bb01f
--- /dev/null
+++ b/frontend/src/utils/qualifiedName.ts
@@ -0,0 +1,126 @@
+export type QualifiedNameParts = {
+  parentPath: string;
+  objectName: string;
+};
+
+const normalizeIdentifierEscapes = (raw: string): string => {
+  let value = String(raw || '').trim();
+  for (let i = 0; i < 4; i += 1) {
+    const next = String(value || '').trim()
+      .replace(/\\\\"/g, '\\"')
+      .replace(/\\"/g, '"');
+    if (next === value) break;
+    value = next;
+  }
+  return String(value || '').trim();
+};
+
+export const stripIdentifierQuotes = (part: string): string => {
+  const text = normalizeIdentifierEscapes(part);
+  if (!text) return '';
+  if (text.length >= 2) {
+    const first = text[0];
+    const last = text[text.length - 1];
+    if (first === '"' && last === '"') {
+      return text.slice(1, -1).replace(/""/g, '"').trim();
+    }
+    if (first === '`' && last === '`') {
+      return text.slice(1, -1).replace(/``/g, '`').trim();
+    }
+    if (first === '[' && last === ']') {
+      return text.slice(1, -1).replace(/]]/g, ']').trim();
+    }
+  }
+  return text;
+};
+
+export const splitQualifiedNameSegments = (qualifiedName: string): string[] => {
+  const text = normalizeIdentifierEscapes(qualifiedName);
+  if (!text) return [];
+
+  const segments: string[] = [];
+  let current = '';
+  let inDouble = false;
+  let inBacktick = false;
+  let inBracket = false;
+
+  const flush = () => {
+    const value = current.trim();
+    current = '';
+    if (!value) return;
+    segments.push(stripIdentifierQuotes(value));
+  };
+
+  for (let i = 0; i < text.length; i += 1) {
+    const ch = text[i];
+
+    if (inDouble) {
+      current += ch;
+      if (ch === '"' && text[i + 1] === '"') {
+        current += text[i + 1];
+        i += 1;
+        continue;
+      }
+      if (ch === '"') inDouble = false;
+      continue;
+    }
+
+    if (inBacktick) {
+      current += ch;
+      if (ch === '`' && text[i + 1] === '`') {
+        current += text[i + 1];
+        i += 1;
+        continue;
+      }
+      if (ch === '`') inBacktick = false;
+      continue;
+    }
+
+    if (inBracket) {
+      current += ch;
+      if (ch === ']' && text[i + 1] === ']') {
+        current += text[i + 1];
+        i += 1;
+        continue;
+      }
+      if (ch === ']') inBracket = false;
+      continue;
+    }
+
+    if (ch === '"') {
+      inDouble = true;
+      current += ch;
+      continue;
+    }
+    if (ch === '`') {
+      inBacktick = true;
+      current += ch;
+      continue;
+    }
+    if (ch === '[') {
+      inBracket = true;
+      current += ch;
+      continue;
+    }
+    if (ch === '.') {
+      flush();
+      continue;
+    }
+    current += ch;
+  }
+
+  flush();
+  return segments;
+};
+
+export const splitQualifiedName = (qualifiedName: string): QualifiedNameParts => {
+  const segments = splitQualifiedNameSegments(qualifiedName);
+  if (segments.length === 0) return { parentPath: '', objectName: '' };
+  if (segments.length === 1) return { parentPath: '', objectName: segments[0] };
+  return {
+    parentPath: segments.slice(0, -1).join('.'),
+    objectName: segments[segments.length - 1],
+  };
+};
+
+export const splitQualifiedNameLast = splitQualifiedName;
diff --git a/frontend/src/utils/queryAutoLimit.test.ts b/frontend/src/utils/queryAutoLimit.test.ts
index 5e05d63..dbaee51 100644
--- a/frontend/src/utils/queryAutoLimit.test.ts
+++ b/frontend/src/utils/queryAutoLimit.test.ts
@@ -5,6 +5,7 @@ import { applyQueryAutoLimit } from './queryAutoLimit';
 describe('applyQueryAutoLimit', () => {
   const limitDialects = [
     'mysql',
+    'goldendb',
     'mariadb',
     'oceanbase',
     'diros',
@@ -18,6 +19,7 @@ describe('applyQueryAutoLimit', () => {
     'highgo',
     'vastbase',
     'opengauss',
+    'gaussdb',
     'iris',
     'intersystemsiris',
     'sqlite',
@@ -25,6 +27,7 @@ describe('applyQueryAutoLimit', () => {
     'duckdb',
     'clickhouse',
     'tdengine',
+    'iotdb',
   ];
 
   it.each(limitDialects)('adds generic LIMIT for %s connections', (dbType) => {
@@ -62,6 +65,7 @@ describe('applyQueryAutoLimit', () => {
     ['dm8', 'SELECT * FROM (SELECT * FROM users) WHERE ROWNUM <= 500'],
     ['mssql', 'SELECT TOP 500 * FROM users'],
     ['postgresql', 'SELECT * FROM users LIMIT 500'],
+    ['gauss-db', 'SELECT * FROM users LIMIT 500'],
     ['doris', 'SELECT * FROM users LIMIT 500'],
     ['starrocks', 'SELECT * FROM users LIMIT 500'],
     ['sqlite3', 'SELECT * FROM users LIMIT 500'],
diff --git a/frontend/src/utils/queryAutoLimit.ts b/frontend/src/utils/queryAutoLimit.ts
index f2e0aa7..b0383c5 100644
--- a/frontend/src/utils/queryAutoLimit.ts
+++ b/frontend/src/utils/queryAutoLimit.ts
@@ -3,7 +3,7 @@ import { resolveSqlDialect } from './sqlDialect';
 const isWS = (ch: string) => ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r';
 const isWord = (ch: string) => /[A-Za-z0-9_]/.test(ch);
 
-const getLeadingKeyword = (sql: string): string => {
+export const getLeadingKeyword = (sql: string): string => {
   const text = (sql || '').replace(/\r\n/g, '\n');
   let inSingle = false;
   let inDouble = false;
@@ -94,7 +94,7 @@ const getLeadingKeyword = (sql: string): string => {
   return '';
 };
 
-const splitSqlTail = (sql: string): { main: string; tail: string } => {
+export const splitSqlTail = (sql: string): { main: string; tail: string } => {
   const text = (sql || '').replace(/\r\n/g, '\n');
   let inSingle = false;
   let inDouble = false;
@@ -181,7 +181,7 @@ const splitSqlTail = (sql: string): { main: string; tail: string } => {
   return { main: text.slice(0, mainEnd), tail: text.slice(mainEnd) };
 };
 
-const findTopLevelKeyword = (sql: string, keyword: string): number => {
+export const findTopLevelKeyword = (sql: string, keyword: string): number => {
   const text = sql;
   const kw = keyword.toLowerCase();
   let inSingle = false;
diff --git a/frontend/src/utils/queryResultPagination.test.ts b/frontend/src/utils/queryResultPagination.test.ts
new file mode 100644
index 0000000..e84c152
--- /dev/null
+++ b/frontend/src/utils/queryResultPagination.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  buildQueryResultPageSql,
+  createInitialQueryResultPagination,
+  resolveQueryResultPaginationTotal,
+} from './queryResultPagination';
+
+describe('queryResultPagination', () => {
+  it('treats MySQL LIMIT offset,count as editor pagination and exports the base query', () => {
+    const page = createInitialQueryResultPagination({
+      executedSql: 'SELECT id, name FROM users LIMIT 0,500',
+      exportSql: 'SELECT id, name FROM users LIMIT 0,500',
+      dbType: 'mysql',
+      returnedRowCount: 500,
+      fallbackPageSize: 5000,
+    });
+
+    expect(page).toMatchObject({
+      current: 1,
+      pageSize: 500,
+      total: 1000,
+      totalKnown: false,
+      baseSql: 'SELECT id, name FROM users',
+      exportAllSql: 'SELECT id, name FROM users',
+    });
+  });
+
+  it('builds the next page SQL with one lookahead row', () => {
+    expect(buildQueryResultPageSql({
+      baseSql: 'SELECT id FROM users',
+      dbType: 'mysql',
+      page: 2,
+      pageSize: 500,
+      lookahead: true,
+    })).toBe('SELECT * FROM (SELECT id FROM users) AS __gonavi_query_page__ LIMIT 501 OFFSET 500');
+  });
+
+  it('marks the last full lookahead page as an exact total', () => {
+    expect(resolveQueryResultPaginationTotal({
+      current: 2,
+      pageSize: 500,
+      rowCount: 500,
+      hasNext: false,
+    })).toEqual({ total: 1000, totalKnown: true });
+  });
+});
diff --git a/frontend/src/utils/queryResultPagination.ts b/frontend/src/utils/queryResultPagination.ts
new file mode 100644
index 0000000..69f574a
--- /dev/null
+++ b/frontend/src/utils/queryResultPagination.ts
@@ -0,0 +1,162 @@
+import { buildPaginatedSelectSQL } from './sql';
+import { findTopLevelKeyword, getLeadingKeyword, splitSqlTail } from './queryAutoLimit';
+import { resolveSqlDialect } from './sqlDialect';
+
+export type QueryResultPaginationState = {
+  current: number;
+  pageSize: number;
+  total: number;
+  totalKnown?: boolean;
+  baseSql: string;
+  exportAllSql?: string;
+};
+
+type LimitInfo = {
+  baseSql: string;
+  limit: number;
+  offset: number;
+};
+
+const normalizePositiveInteger = (value: unknown): number => {
+  const parsed = Math.floor(Number(value));
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
+};
+
+const parseTopLevelLimit = (sql: string): LimitInfo | null => {
+  const { main } = splitSqlTail(sql);
+  const limitPos = findTopLevelKeyword(main, 'limit');
+  if (limitPos < 0) return null;
+  const fromPos = findTopLevelKeyword(main, 'from');
+  if (fromPos >= 0 && limitPos < fromPos) return null;
+
+  const beforeLimit = main.slice(0, limitPos).trimEnd();
+  const limitClause = main.slice(limitPos).trim();
+  const mysqlOffsetLimit = limitClause.match(/^limit\s+(\d+)\s*,\s*(\d+)$/i);
+  if (mysqlOffsetLimit) {
+    const offset = normalizePositiveInteger(mysqlOffsetLimit[1]);
+    const limit = normalizePositiveInteger(mysqlOffsetLimit[2]);
+    return limit > 0 ? { baseSql: beforeLimit, limit, offset } : null;
+  }
+
+  const limitOffset = limitClause.match(/^limit\s+(\d+)\s+offset\s+(\d+)$/i);
+  if (limitOffset) {
+    const limit = normalizePositiveInteger(limitOffset[1]);
+    const offset = normalizePositiveInteger(limitOffset[2]);
+    return limit > 0 ? { baseSql: beforeLimit, limit, offset } : null;
+  }
+
+  const simpleLimit = limitClause.match(/^limit\s+(\d+)$/i);
+  if (simpleLimit) {
+    const limit = normalizePositiveInteger(simpleLimit[1]);
+    return limit > 0 ? { baseSql: beforeLimit, limit, offset: 0 } : null;
+  }
+
+  return null;
+};
+
+const stripExplicitLimitForExport = (sql: string): string => {
+  const parsed = parseTopLevelLimit(sql);
+  if (parsed?.baseSql) return parsed.baseSql;
+  return splitSqlTail(sql).main.trim();
+};
+
+const resolveWrappedBaseSql = (dbType: string, baseSql: string): string => {
+  const normalizedType = String(dbType || '').trim().toLowerCase();
+  const base = baseSql.trim();
+  if (normalizedType === 'oracle' || normalizedType === 'dameng') {
+    return `SELECT * FROM (${base}) "__gonavi_query_page__"`;
+  }
+  return `SELECT * FROM (${base}) AS __gonavi_query_page__`;
+};
+
+export const buildQueryResultPageSql = (params: {
+  baseSql: string;
+  dbType: string;
+  driver?: string;
+  page: number;
+  pageSize: number;
+  lookahead?: boolean;
+}): string => {
+  const pageSize = normalizePositiveInteger(params.pageSize);
+  if (pageSize <= 0) return String(params.baseSql || '').trim();
+  const page = Math.max(1, Math.floor(Number(params.page) || 1));
+  const limit = params.lookahead ? pageSize + 1 : pageSize;
+  const offset = (page - 1) * pageSize;
+  const dialect = resolveSqlDialect(params.dbType || 'mysql', params.driver || '');
+  return buildPaginatedSelectSQL(
+    dialect,
+    resolveWrappedBaseSql(dialect, params.baseSql),
+    '',
+    limit,
+    offset,
+  );
+};
+
+export const resolveQueryResultPaginationTotal = (params: {
+  current: number;
+  pageSize: number;
+  rowCount: number;
+  hasNext?: boolean;
+}): Pick<QueryResultPaginationState, 'total' | 'totalKnown'> => {
+  const current = Math.max(1, Math.floor(Number(params.current) || 1));
+  const pageSize = normalizePositiveInteger(params.pageSize);
+  const rowCount = Math.max(0, Math.floor(Number(params.rowCount) || 0));
+  if (pageSize <= 0) {
+    return { total: rowCount, totalKnown: true };
+  }
+  if (params.hasNext === true) {
+    return { total: (current + 1) * pageSize, totalKnown: false };
+  }
+  if (params.hasNext === false) {
+    return { total: Math.max(0, (current - 1) * pageSize + rowCount), totalKnown: true };
+  }
+  if (rowCount >= pageSize) {
+    return { total: (current + 1) * pageSize, totalKnown: false };
+  }
+  return { total: Math.max(0, (current - 1) * pageSize + rowCount), totalKnown: true };
+};
+
+export const createInitialQueryResultPagination = (params: {
+  executedSql: string;
+  exportSql?: string;
+  dbType: string;
+  driver?: string;
+  returnedRowCount: number;
+  fallbackPageSize?: number;
+}): QueryResultPaginationState | undefined => {
+  const executedSql = String(params.executedSql || '').trim();
+  if (!executedSql || getLeadingKeyword(executedSql) !== 'select') return undefined;
+
+  const explicitLimit = parseTopLevelLimit(executedSql);
+  const mainSql = splitSqlTail(executedSql).main.trim();
+  const fallbackPageSize = normalizePositiveInteger(params.fallbackPageSize);
+  const returnedRowCount = Math.max(0, Math.floor(Number(params.returnedRowCount) || 0));
+  const pageSize = explicitLimit?.limit || fallbackPageSize || returnedRowCount;
+  if (pageSize <= 0) return undefined;
+
+  const current = explicitLimit
+    ? Math.max(1, Math.floor(explicitLimit.offset / pageSize) + 1)
+    : 1;
+  if (current <= 1 && returnedRowCount < pageSize) return undefined;
+
+  const baseSql = explicitLimit?.baseSql || mainSql;
+  if (!baseSql) return undefined;
+
+  const exportSql = String(params.exportSql || '').trim();
+  const exportAllSql = exportSql && getLeadingKeyword(exportSql) === 'select'
+    ? stripExplicitLimitForExport(exportSql)
+    : stripExplicitLimitForExport(executedSql);
+  const totalState = resolveQueryResultPaginationTotal({
+    current,
+    pageSize,
+    rowCount: returnedRowCount,
+  });
+
+  return {
+    current,
+    pageSize,
+    ...totalState,
+    baseSql,
+    exportAllSql,
+  };
+};
diff --git a/frontend/src/utils/queryResultTable.test.ts b/frontend/src/utils/queryResultTable.test.ts
index 3660930..5726ff6 100644
--- a/frontend/src/utils/queryResultTable.test.ts
+++ b/frontend/src/utils/queryResultTable.test.ts
@@ -48,6 +48,15 @@ describe('extractQueryResultTableRef', () => {
       });
   });
 
+  it('keeps DuckDB schema-qualified table names for metadata lookups', () => {
+    expect(extractQueryResultTableRef('SELECT * FROM main.events LIMIT 500', 'duckdb', 'main'))
+      .toEqual({
+        tableName: 'main.events',
+        metadataDbName: 'main',
+        metadataTableName: 'main.events',
+      });
+  });
+
   it('does not mark join results as editable table refs', () => {
     expect(extractQueryResultTableRef('SELECT * FROM users u JOIN orders o ON u.id = o.user_id', 'oracle', 'APP'))
       .toBeUndefined();
diff --git a/frontend/src/utils/queryResultTable.ts b/frontend/src/utils/queryResultTable.ts
index 98c1b4f..0d5548f 100644
--- a/frontend/src/utils/queryResultTable.ts
+++ b/frontend/src/utils/queryResultTable.ts
@@ -21,6 +21,11 @@ const isOracleLikeDialect = (dialect: string): boolean => {
   return normalized === 'oracle' || normalized === 'dameng' || normalized === 'dm' || normalized === 'dm8';
 };
 
+const keepsQualifiedTableNameForMetadata = (dialect: string): boolean => {
+  const normalized = String(dialect || '').trim().toLowerCase();
+  return normalized === 'duckdb';
+};
+
 const isQuotedIdentifier = (part: string): boolean => {
   const text = String(part || '').trim();
   if (!text) return false;
@@ -73,13 +78,16 @@ export const extractQueryResultTableRef = (
 
   const owner = parts.length >= 2 ? parts[parts.length - 2] : '';
   const metadataDbName = owner || normalizeCurrentDbName(currentDb, dialect);
-  const tableName = isOracleLikeDialect(dialect) && owner
+  const tableName = (isOracleLikeDialect(dialect) || keepsQualifiedTableNameForMetadata(dialect)) && owner
+    ? `${owner}.${metadataTableName}`
+    : metadataTableName;
+  const resolvedMetadataTableName = keepsQualifiedTableNameForMetadata(dialect) && owner
     ? `${owner}.${metadataTableName}`
     : metadataTableName;
 
   return {
     tableName,
     metadataDbName,
-    metadataTableName,
+    metadataTableName: resolvedMetadataTableName,
   };
 };
diff --git a/frontend/src/utils/redisConnectionUri.test.ts b/frontend/src/utils/redisConnectionUri.test.ts
new file mode 100644
index 0000000..53e67d0
--- /dev/null
+++ b/frontend/src/utils/redisConnectionUri.test.ts
@@ -0,0 +1,85 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  buildRedisUriFromValues,
+  parseRedisUriToFormValues,
+  resolveRedisConfigDraft,
+} from './redisConnectionUri';
+
+describe('redisConnectionUri', () => {
+  it('parses Redis Sentinel URI into form values without dropping topology fields', () => {
+    const result = parseRedisUriToFormValues(
+      'rediss://default:redis%40secret@sentinel-a.local:26379,sentinel-b.local/3?topology=sentinel&master=mymaster&sentinel_user=ops&sentinel_password=s%40p&skip_verify=true&sslCAPath=C%3A%2Fcerts%2Fca.pem',
+    );
+
+    expect(result).toMatchObject({
+      host: 'sentinel-a.local',
+      port: 26379,
+      user: 'default',
+      password: 'redis@secret',
+      useSSL: true,
+      sslMode: 'skip-verify',
+      sslCAPath: 'C:/certs/ca.pem',
+      redisTopology: 'sentinel',
+      redisHosts: ['sentinel-b.local:26379'],
+      redisSentinelMaster: 'mymaster',
+      redisSentinelUser: 'ops',
+      redisSentinelPassword: 's@p',
+      redisDB: 3,
+    });
+  });
+
+  it('builds Redis Sentinel URI with Sentinel credentials separated from Redis auth', () => {
+    expect(buildRedisUriFromValues({
+      host: 'sentinel-a.local',
+      port: 26379,
+      redisHosts: ['sentinel-b.local', 'sentinel-b.local:26379'],
+      redisTopology: 'sentinel',
+      user: 'default',
+      password: 'redis secret',
+      redisSentinelMaster: 'mymaster',
+      redisSentinelUser: 'sentinel-user',
+      redisSentinelPassword: 'sentinel secret',
+      redisDB: 6,
+      useSSL: true,
+      sslMode: 'required',
+      sslCAPath: 'C:/certs/ca.pem',
+    })).toBe(
+      'rediss://default:redis%20secret@sentinel-a.local:26379,sentinel-b.local:26379/6?topology=sentinel&master=mymaster&sentinel_user=sentinel-user&sentinel_password=sentinel+secret&sslCAPath=C%3A%2Fcerts%2Fca.pem',
+    );
+  });
+
+  it('resolves Redis config draft for cluster and Sentinel save payloads', () => {
+    expect(resolveRedisConfigDraft({
+      redisTopology: 'cluster',
+      redisHosts: ['redis-b.local', 'redis-c.local:6380'],
+      redisDB: 2,
+    }, 'redis-a.local', 6379, 6379)).toEqual({
+      primaryPort: 6379,
+      hosts: ['redis-a.local:6379', 'redis-b.local:6379', 'redis-c.local:6380'],
+      topology: 'cluster',
+      redisSentinelMaster: '',
+      redisSentinelUser: '',
+      redisSentinelPassword: '',
+      redisDB: 2,
+    });
+
+    expect(resolveRedisConfigDraft({
+      redisTopology: 'sentinel',
+      port: 6379,
+      redisHosts: ['sentinel-b.local'],
+      redisSentinelMaster: 'mymaster',
+      redisSentinelUser: 'ops',
+      redisSentinelPassword: 'sentinel-pass',
+      redisDB: 99,
+    }, 'sentinel-a.local', 6379, 6379)).toEqual({
+      primaryPort: 26379,
+      hosts: ['sentinel-a.local:26379', 'sentinel-b.local:26379'],
+      topology: 'sentinel',
+      redisSentinelMaster: 'mymaster',
+      redisSentinelUser: 'ops',
+      redisSentinelPassword: 'sentinel-pass',
+      redisDB: 99,
+    });
+  });
+});
diff --git a/frontend/src/utils/redisConnectionUri.ts b/frontend/src/utils/redisConnectionUri.ts
new file mode 100644
index 0000000..ae40503
--- /dev/null
+++ b/frontend/src/utils/redisConnectionUri.ts
@@ -0,0 +1,451 @@
+import type { ConnectionConfig } from '../types';
+
+export type RedisTopology = Extract<
+  NonNullable<ConnectionConfig['topology']>,
+  'single' | 'cluster' | 'sentinel'
+>;
+
+export interface RedisUriFormValues {
+  host: string;
+  port: number;
+  user: string;
+  password: string;
+  useSSL: boolean;
+  sslMode: 'required' | 'skip-verify' | 'disable';
+  sslCAPath?: string;
+  sslCertPath?: string;
+  sslKeyPath?: string;
+  redisTopology: RedisTopology;
+  redisHosts: string[];
+  redisSentinelMaster: string;
+  redisSentinelUser: string;
+  redisSentinelPassword: string;
+  redisDB: number;
+}
+
+export interface RedisConfigDraft {
+  primaryPort: number;
+  hosts: string[];
+  topology: RedisTopology;
+  redisSentinelMaster: string;
+  redisSentinelUser: string;
+  redisSentinelPassword: string;
+  redisDB: number;
+}
+
+const REDIS_DEFAULT_PORT = 6379;
+const REDIS_SENTINEL_DEFAULT_PORT = 26379;
+const MAX_URI_HOSTS = 32;
+
+const parseHostPort = (
+  raw: string,
+  defaultPort: number,
+): { host: string; port: number } | null => {
+  const text = String(raw || '').trim();
+  if (!text) {
+    return null;
+  }
+  if (text.startsWith('[')) {
+    const closingBracket = text.indexOf(']');
+    if (closingBracket > 0) {
+      const host = text.slice(1, closingBracket).trim();
+      const portText = text
+        .slice(closingBracket + 1)
+        .trim()
+        .replace(/^:/, '');
+      const parsedPort = Number(portText);
+      return {
+        host: host || 'localhost',
+        port:
+          Number.isFinite(parsedPort) && parsedPort > 0 && parsedPort <= 65535
+            ? parsedPort
+            : defaultPort,
+      };
+    }
+  }
+
+  const colonCount = (text.match(/:/g) || []).length;
+  if (colonCount === 1) {
+    const splitIndex = text.lastIndexOf(':');
+    const host = text.slice(0, splitIndex).trim();
+    const portText = text.slice(splitIndex + 1).trim();
+    const parsedPort = Number(portText);
+    return {
+      host: host || 'localhost',
+      port:
+        Number.isFinite(parsedPort) && parsedPort > 0 && parsedPort <= 65535
+          ? parsedPort
+          : defaultPort,
+    };
+  }
+
+  return { host: text, port: defaultPort };
+};
+
+const toAddress = (host: string, port: number, defaultPort: number) => {
+  const safeHost = String(host || '').trim() || 'localhost';
+  const safePort =
+    Number.isFinite(Number(port)) && Number(port) > 0
+      ? Number(port)
+      : defaultPort;
+  return `${safeHost}:${safePort}`;
+};
+
+const normalizeAddressList = (
+  rawList: unknown,
+  defaultPort: number,
+): string[] => {
+  const list = Array.isArray(rawList) ? rawList : [];
+  const seen = new Set<string>();
+  const result: string[] = [];
+  list.forEach((entry) => {
+    const parsed = parseHostPort(String(entry || ''), defaultPort);
+    if (!parsed) {
+      return;
+    }
+    const normalized = toAddress(parsed.host, parsed.port, defaultPort);
+    if (seen.has(normalized)) {
+      return;
+    }
+    seen.add(normalized);
+    result.push(normalized);
+  });
+  return result;
+};
+
+const isValidUriHostEntry = (entry: string): boolean => {
+  const text = String(entry || '').trim();
+  if (!text) return false;
+  if (text.length > 255) return false;
+  return !/[()\\/\s]/.test(text);
+};
+
+const safeDecode = (text: string) => {
+  try {
+    return decodeURIComponent(text);
+  } catch {
+    return text;
+  }
+};
+
+const parseMultiHostUri = (uriText: string, expectedScheme: string) => {
+  const prefix = `${expectedScheme}://`;
+  if (!uriText.toLowerCase().startsWith(prefix)) {
+    return null;
+  }
+  let rest = uriText.slice(prefix.length);
+  const hashIndex = rest.indexOf('#');
+  if (hashIndex >= 0) {
+    rest = rest.slice(0, hashIndex);
+  }
+  let queryText = '';
+  const queryIndex = rest.indexOf('?');
+  if (queryIndex >= 0) {
+    queryText = rest.slice(queryIndex + 1);
+    rest = rest.slice(0, queryIndex);
+  }
+
+  let pathText = '';
+  const slashIndex = rest.indexOf('/');
+  if (slashIndex >= 0) {
+    pathText = rest.slice(slashIndex + 1);
+    rest = rest.slice(0, slashIndex);
+  }
+
+  let hostText = rest;
+  let username = '';
+  let password = '';
+  const atIndex = rest.lastIndexOf('@');
+  if (atIndex >= 0) {
+    const userInfo = rest.slice(0, atIndex);
+    hostText = rest.slice(atIndex + 1);
+    const colonIndex = userInfo.indexOf(':');
+    if (colonIndex >= 0) {
+      username = safeDecode(userInfo.slice(0, colonIndex));
+      password = safeDecode(userInfo.slice(colonIndex + 1));
+    } else {
+      username = safeDecode(userInfo);
+    }
+  }
+
+  const hosts = hostText
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+  return {
+    username,
+    password,
+    hosts,
+    database: safeDecode(pathText),
+    params: new URLSearchParams(queryText),
+  };
+};
+
+const firstConnectionParamValue = (
+  params: URLSearchParams,
+  names: string[],
+): string => {
+  for (const name of names) {
+    const value = String(params.get(name) || '').trim();
+    if (value) return value;
+  }
+  return '';
+};
+
+const extractRedisSSLPathValuesFromParams = (
+  params: URLSearchParams,
+): Pick<RedisUriFormValues, 'sslCAPath' | 'sslCertPath' | 'sslKeyPath'> => {
+  const caPath = firstConnectionParamValue(params, [
+    'sslCAPath',
+    'ssl_ca_path',
+    'sslrootcert',
+    'sslRootCert',
+    'tlsCAFile',
+    'caFile',
+    'certificate',
+    'servercertificate',
+    'serverCertificate',
+  ]);
+  const certPath = firstConnectionParamValue(params, [
+    'sslCertPath',
+    'ssl_cert_path',
+    'SSL_CERT_PATH',
+    'sslcert',
+    'sslCert',
+    'tlsCertificateFile',
+  ]);
+  const keyPath = firstConnectionParamValue(params, [
+    'sslKeyPath',
+    'ssl_key_path',
+    'SSL_KEY_PATH',
+    'sslkey',
+    'sslKey',
+    'tlsKeyFile',
+  ]);
+  return {
+    ...(caPath ? { sslCAPath: caPath } : {}),
+    ...(certPath ? { sslCertPath: certPath } : {}),
+    ...(keyPath ? { sslKeyPath: keyPath } : {}),
+  };
+};
+
+const appendRedisSSLPathParamsForUri = (
+  params: URLSearchParams,
+  values: Record<string, any>,
+) => {
+  const caPath = String(values.sslCAPath || '').trim();
+  const certPath = String(values.sslCertPath || '').trim();
+  const keyPath = String(values.sslKeyPath || '').trim();
+  if (caPath) {
+    params.set('sslCAPath', caPath);
+  }
+  if (certPath) {
+    params.set('sslCertPath', certPath);
+  }
+  if (keyPath) {
+    params.set('sslKeyPath', keyPath);
+  }
+};
+
+const normalizeRedisDB = (value: unknown): number => {
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed) || parsed < 0) return 0;
+  return Math.trunc(parsed);
+};
+
+const normalizeRedisTopology = (value: unknown): RedisTopology => {
+  const text = String(value || '').trim().toLowerCase();
+  if (text === 'cluster' || text === 'sentinel') {
+    return text;
+  }
+  return 'single';
+};
+
+export const parseRedisUriToFormValues = (
+  uriText: string,
+): RedisUriFormValues | null => {
+  const trimmedUri = String(uriText || '').trim();
+  const parsed =
+    parseMultiHostUri(trimmedUri, 'redis') ||
+    parseMultiHostUri(trimmedUri, 'rediss');
+  if (!parsed) {
+    return null;
+  }
+  if (!parsed.hosts.length || parsed.hosts.length > MAX_URI_HOSTS) {
+    return null;
+  }
+  if (parsed.hosts.some((entry) => !isValidUriHostEntry(entry))) {
+    return null;
+  }
+  const topologyParam = String(parsed.params.get('topology') || '').toLowerCase();
+  const isSentinelTopology = topologyParam === 'sentinel';
+  const redisNodeDefaultPort = isSentinelTopology
+    ? REDIS_SENTINEL_DEFAULT_PORT
+    : REDIS_DEFAULT_PORT;
+  const hostList = normalizeAddressList(parsed.hosts, redisNodeDefaultPort);
+  if (!hostList.length) {
+    return null;
+  }
+  const primary = parseHostPort(
+    hostList[0] || `localhost:${redisNodeDefaultPort}`,
+    redisNodeDefaultPort,
+  );
+  const dbText = String(parsed.database || '')
+    .trim()
+    .replace(/^\//, '');
+  const isRediss = trimmedUri.toLowerCase().startsWith('rediss://');
+  const skipVerifyText = String(parsed.params.get('skip_verify') || '')
+    .trim()
+    .toLowerCase();
+  const skipVerify =
+    skipVerifyText === '1' ||
+    skipVerifyText === 'true' ||
+    skipVerifyText === 'yes' ||
+    skipVerifyText === 'on';
+  return {
+    host: primary?.host || 'localhost',
+    port: primary?.port || redisNodeDefaultPort,
+    user: parsed.username || '',
+    password: parsed.password || '',
+    useSSL: isRediss,
+    sslMode: isRediss ? (skipVerify ? 'skip-verify' : 'required') : 'disable',
+    ...extractRedisSSLPathValuesFromParams(parsed.params),
+    redisTopology: isSentinelTopology
+      ? 'sentinel'
+      : hostList.length > 1 || topologyParam === 'cluster'
+        ? 'cluster'
+        : 'single',
+    redisHosts: hostList.slice(1),
+    redisSentinelMaster: isSentinelTopology
+      ? String(
+          parsed.params.get('master') ||
+            parsed.params.get('master_name') ||
+            parsed.params.get('sentinel_master') ||
+            '',
+        ).trim()
+      : '',
+    redisSentinelUser: isSentinelTopology
+      ? String(
+          parsed.params.get('sentinel_user') ||
+            parsed.params.get('sentinel_username') ||
+            '',
+        ).trim()
+      : '',
+    redisSentinelPassword: isSentinelTopology
+      ? String(parsed.params.get('sentinel_password') || '')
+      : '',
+    redisDB: normalizeRedisDB(dbText),
+  };
+};
+
+export const buildRedisUriFromValues = (values: Record<string, any>): string => {
+  const redisTopology = normalizeRedisTopology(values.redisTopology);
+  const redisNodeDefaultPort =
+    redisTopology === 'sentinel'
+      ? REDIS_SENTINEL_DEFAULT_PORT
+      : REDIS_DEFAULT_PORT;
+  const primary = toAddress(
+    String(values.host || '').trim() || 'localhost',
+    Number(values.port || redisNodeDefaultPort),
+    redisNodeDefaultPort,
+  );
+  const extraRedisHosts =
+    redisTopology === 'cluster' || redisTopology === 'sentinel'
+      ? normalizeAddressList(values.redisHosts, redisNodeDefaultPort)
+      : [];
+  const hosts = normalizeAddressList(
+    [primary, ...extraRedisHosts],
+    redisNodeDefaultPort,
+  );
+  const params = new URLSearchParams();
+  if (redisTopology === 'sentinel') {
+    params.set('topology', 'sentinel');
+    const sentinelMaster = String(values.redisSentinelMaster || '').trim();
+    if (sentinelMaster) {
+      params.set('master', sentinelMaster);
+    }
+    const sentinelUser = String(values.redisSentinelUser || '').trim();
+    if (sentinelUser) {
+      params.set('sentinel_user', sentinelUser);
+    }
+    const sentinelPassword = String(values.redisSentinelPassword || '');
+    if (sentinelPassword) {
+      params.set('sentinel_password', sentinelPassword);
+    }
+  } else if (hosts.length > 1 || redisTopology === 'cluster') {
+    params.set('topology', 'cluster');
+  }
+  const redisUser = String(values.user || '').trim();
+  const redisPassword = String(values.password || '');
+  let redisAuth = '';
+  if (redisUser || redisPassword) {
+    const encodedPassword = redisPassword
+      ? encodeURIComponent(redisPassword)
+      : '';
+    redisAuth = redisUser
+      ? `${encodeURIComponent(redisUser)}${redisPassword ? `:${encodedPassword}` : ''}@`
+      : `:${encodedPassword}@`;
+  }
+  const redisDB = normalizeRedisDB(values.redisDB);
+  if (values.useSSL) {
+    const mode = String(values.sslMode || 'preferred')
+      .trim()
+      .toLowerCase();
+    if (mode === 'skip-verify' || mode === 'preferred') {
+      params.set('skip_verify', 'true');
+    }
+  }
+  appendRedisSSLPathParamsForUri(params, values);
+  const query = params.toString();
+  const scheme = values.useSSL ? 'rediss' : 'redis';
+  return `${scheme}://${redisAuth}${hosts.join(',')}/${redisDB}${query ? `?${query}` : ''}`;
+};
+
+export const resolveRedisConfigDraft = (
+  values: Record<string, any>,
+  primaryHost: string,
+  primaryPort: number,
+  defaultPort: number,
+): RedisConfigDraft => {
+  const redisTopology = normalizeRedisTopology(values.redisTopology);
+  const redisNodeDefaultPort =
+    redisTopology === 'sentinel'
+      ? REDIS_SENTINEL_DEFAULT_PORT
+      : defaultPort;
+  const normalizedPrimaryPort =
+    redisTopology === 'sentinel' &&
+    (!Number(values.port) || Number(values.port) === defaultPort)
+      ? redisNodeDefaultPort
+      : primaryPort;
+  const extraRedisNodes =
+    redisTopology === 'cluster' || redisTopology === 'sentinel'
+      ? normalizeAddressList(values.redisHosts, redisNodeDefaultPort)
+      : [];
+  const allHosts = normalizeAddressList(
+    [`${primaryHost}:${normalizedPrimaryPort}`, ...extraRedisNodes],
+    redisNodeDefaultPort,
+  );
+
+  if (redisTopology === 'sentinel') {
+    return {
+      primaryPort: normalizedPrimaryPort,
+      hosts: allHosts,
+      topology: 'sentinel',
+      redisSentinelMaster: String(values.redisSentinelMaster || '').trim(),
+      redisSentinelUser: String(values.redisSentinelUser || '').trim(),
+      redisSentinelPassword: String(values.redisSentinelPassword || ''),
+      redisDB: normalizeRedisDB(values.redisDB),
+    };
+  }
+
+  return {
+    primaryPort: normalizedPrimaryPort,
+    hosts: redisTopology === 'cluster' || allHosts.length > 1 ? allHosts : [],
+    topology: redisTopology === 'cluster' || allHosts.length > 1 ? 'cluster' : 'single',
+    redisSentinelMaster: '',
+    redisSentinelUser: '',
+    redisSentinelPassword: '',
+    redisDB: normalizeRedisDB(values.redisDB),
+  };
+};
diff --git a/frontend/src/utils/rowLocator.test.ts b/frontend/src/utils/rowLocator.test.ts
index 0b4d231..3848dc2 100644
--- a/frontend/src/utils/rowLocator.test.ts
+++ b/frontend/src/utils/rowLocator.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 
 import {
+  DUCKDB_ROWID_LOCATOR_COLUMN,
   ORACLE_ROWID_LOCATOR_COLUMN,
   filterHiddenLocatorColumns,
   resolveEditRowLocator,
@@ -103,6 +104,20 @@ describe('resolveEditRowLocator', () => {
       readOnly: false,
     });
   });
+
+  it('uses DuckDB rowid when no primary or unique key is available', () => {
+    expect(resolveEditRowLocator({
+      dbType: 'duckdb',
+      resultColumns: ['name', DUCKDB_ROWID_LOCATOR_COLUMN],
+      allowDuckDBRowID: true,
+    })).toEqual({
+      strategy: 'duckdb-rowid',
+      columns: ['rowid'],
+      valueColumns: [DUCKDB_ROWID_LOCATOR_COLUMN],
+      hiddenColumns: [DUCKDB_ROWID_LOCATOR_COLUMN],
+      readOnly: false,
+    });
+  });
 });
 
 describe('resolveRowLocatorValues', () => {
@@ -142,6 +157,19 @@ describe('resolveRowLocatorValues', () => {
       error: 'No safe row locator is available for this result set.',
     });
   });
+
+  it('extracts DuckDB rowid locator values from the original row', () => {
+    const locator = resolveEditRowLocator({
+      dbType: 'duckdb',
+      resultColumns: ['name', DUCKDB_ROWID_LOCATOR_COLUMN],
+      allowDuckDBRowID: true,
+    });
+
+    expect(resolveRowLocatorValues(locator, { name: 'launch', [DUCKDB_ROWID_LOCATOR_COLUMN]: 17 })).toEqual({
+      ok: true,
+      values: { rowid: 17 },
+    });
+  });
 });
 
 describe('filterHiddenLocatorColumns', () => {
@@ -154,4 +182,14 @@ describe('filterHiddenLocatorColumns', () => {
 
     expect(filterHiddenLocatorColumns(['NAME', ORACLE_ROWID_LOCATOR_COLUMN], locator)).toEqual(['NAME']);
   });
+
+  it('removes hidden DuckDB rowid columns from displayed columns', () => {
+    const locator = resolveEditRowLocator({
+      dbType: 'duckdb',
+      resultColumns: ['name', DUCKDB_ROWID_LOCATOR_COLUMN],
+      allowDuckDBRowID: true,
+    });
+
+    expect(filterHiddenLocatorColumns(['name', DUCKDB_ROWID_LOCATOR_COLUMN], locator)).toEqual(['name']);
+  });
 });
diff --git a/frontend/src/utils/rowLocator.ts b/frontend/src/utils/rowLocator.ts
index 59a9248..fb475f0 100644
--- a/frontend/src/utils/rowLocator.ts
+++ b/frontend/src/utils/rowLocator.ts
@@ -3,8 +3,9 @@ import { resolveUniqueKeyGroupsFromIndexes } from '../components/dataGridCopyIns
 import { isOracleLikeDialect } from './sqlDialect';
 
 export const ORACLE_ROWID_LOCATOR_COLUMN = '__gonavi_oracle_rowid__';
+export const DUCKDB_ROWID_LOCATOR_COLUMN = '__gonavi_duckdb_rowid__';
 
-export type RowLocatorStrategy = 'primary-key' | 'unique-key' | 'oracle-rowid' | 'none';
+export type RowLocatorStrategy = 'primary-key' | 'unique-key' | 'oracle-rowid' | 'duckdb-rowid' | 'none';
 
 export type EditRowLocator = {
   strategy: RowLocatorStrategy;
@@ -22,6 +23,7 @@ export type ResolveEditRowLocatorParams = {
   primaryKeys?: string[];
   indexes?: IndexDefinition[];
   allowOracleRowID?: boolean;
+  allowDuckDBRowID?: boolean;
 };
 
 export type ResolveRowLocatorValuesResult =
@@ -59,6 +61,7 @@ export const resolveEditRowLocator = ({
   primaryKeys = [],
   indexes,
   allowOracleRowID = false,
+  allowDuckDBRowID = false,
 }: ResolveEditRowLocatorParams): EditRowLocator => {
   const columns = (resultColumns || []).map(normalizeColumnName).filter(Boolean);
   const primaryKeyColumns = (primaryKeys || []).map(normalizeColumnName).filter(Boolean);
@@ -98,10 +101,25 @@ export const resolveEditRowLocator = ({
     };
   }
 
+  if (allowDuckDBRowID && String(dbType || '').trim().toLowerCase() === 'duckdb' && hasColumn(columns, DUCKDB_ROWID_LOCATOR_COLUMN)) {
+    const rowIDColumn = findColumn(columns, DUCKDB_ROWID_LOCATOR_COLUMN);
+    return {
+      strategy: 'duckdb-rowid',
+      columns: ['rowid'],
+      valueColumns: [rowIDColumn],
+      hiddenColumns: [rowIDColumn],
+      readOnly: false,
+    };
+  }
+
   if (allowOracleRowID && isOracleLikeDialect(dbType)) {
     return buildReadOnlyLocator('未检测到主键或可用唯一索引，且结果中缺少 Oracle ROWID，无法安全提交修改。');
   }
 
+  if (allowDuckDBRowID && String(dbType || '').trim().toLowerCase() === 'duckdb') {
+    return buildReadOnlyLocator('未检测到主键、可用唯一索引或 DuckDB rowid，无法安全提交修改。');
+  }
+
   return buildReadOnlyLocator('未检测到主键或可用唯一索引，无法安全提交修改。');
 };
 
diff --git a/frontend/src/utils/savedQueryPersistence.test.ts b/frontend/src/utils/savedQueryPersistence.test.ts
new file mode 100644
index 0000000..98140df
--- /dev/null
+++ b/frontend/src/utils/savedQueryPersistence.test.ts
@@ -0,0 +1,134 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { SavedQuery } from '../types';
+import { LEGACY_PERSIST_KEY } from './legacyConnectionStorage';
+import {
+  bootstrapSavedQueries,
+  readLegacySavedQueriesFromPayload,
+  stripLegacySavedQueries,
+} from './savedQueryPersistence';
+
+const createMemoryStorage = () => {
+  const data = new Map<string, string>();
+  return {
+    getItem: (key: string) => data.get(key) ?? null,
+    setItem: (key: string, value: string) => {
+      data.set(key, value);
+    },
+  };
+};
+
+describe('saved query persistence', () => {
+  it('imports legacy localStorage queries into backend and clears the legacy field', async () => {
+    const storage = createMemoryStorage();
+    storage.setItem(LEGACY_PERSIST_KEY, JSON.stringify({
+      state: {
+        connections: [
+          {
+            id: 'conn-1',
+            name: 'Primary',
+            config: {
+              id: 'conn-1',
+              type: 'postgres',
+              host: 'db.local',
+              port: 5432,
+              user: 'app',
+              password: 'secret',
+            },
+          },
+        ],
+        theme: 'dark',
+        savedQueries: [
+          {
+            id: 'saved-1',
+            name: 'Orders',
+            sql: '  select * from orders;\n',
+            connectionId: 'conn-1',
+            dbName: 'app',
+            createdAt: 100,
+          },
+        ],
+      },
+      version: 10,
+    }));
+
+    let backendQueries: SavedQuery[] = [];
+    const ImportSavedQueries = vi.fn(async (payload: { queries: SavedQuery[] }) => {
+      backendQueries = payload.queries;
+      return backendQueries;
+    });
+    const GetSavedQueries = vi.fn(async () => backendQueries);
+    const replaceSavedQueries = vi.fn();
+
+    const result = await bootstrapSavedQueries({
+      storage,
+      replaceSavedQueries,
+      backend: {
+        ImportSavedQueries,
+        GetSavedQueries,
+      },
+    });
+
+    expect(result).toEqual({ importedLegacyCount: 1, loadedCount: 1 });
+    expect(ImportSavedQueries).toHaveBeenCalledWith(expect.objectContaining({
+      queries: [
+        expect.objectContaining({
+          id: 'saved-1',
+          sql: '  select * from orders;\n',
+        }),
+      ],
+      legacyConnections: [
+        expect.objectContaining({
+          id: 'conn-1',
+          config: expect.objectContaining({
+            host: 'db.local',
+          }),
+        }),
+      ],
+    }));
+    expect(replaceSavedQueries).toHaveBeenCalledWith([
+      expect.objectContaining({
+        id: 'saved-1',
+        sql: '  select * from orders;\n',
+      }),
+    ]);
+
+    const cleanedPayload = JSON.parse(storage.getItem(LEGACY_PERSIST_KEY) || '{}');
+    expect(cleanedPayload.state.theme).toBe('dark');
+    expect(cleanedPayload.state.savedQueries).toBeUndefined();
+  });
+
+  it('reads and strips legacy saved queries without altering other persisted state', () => {
+    const payload = JSON.stringify({
+      state: {
+        savedQueries: [
+          {
+            id: 'saved-1',
+            name: 'Analytics',
+            sql: '\nselect 1;',
+            connectionId: 'conn-1',
+            dbName: 'warehouse',
+            createdAt: 200,
+          },
+          {
+            id: 'invalid',
+            name: 'Missing context',
+            sql: 'select 2;',
+          },
+        ],
+        sidebarWidth: 320,
+      },
+    });
+
+    expect(readLegacySavedQueriesFromPayload(payload)).toEqual([
+      expect.objectContaining({
+        id: 'saved-1',
+        sql: '\nselect 1;',
+      }),
+    ]);
+
+    const stripped = JSON.parse(stripLegacySavedQueries(payload));
+    expect(stripped.state.savedQueries).toBeUndefined();
+    expect(stripped.state.sidebarWidth).toBe(320);
+  });
+});
diff --git a/frontend/src/utils/savedQueryPersistence.ts b/frontend/src/utils/savedQueryPersistence.ts
new file mode 100644
index 0000000..d202ce8
--- /dev/null
+++ b/frontend/src/utils/savedQueryPersistence.ts
@@ -0,0 +1,283 @@
+import type { SavedConnection, SavedQuery } from '../types';
+import { LEGACY_PERSIST_KEY } from './legacyConnectionStorage';
+
+type StorageLike = Pick<Storage, 'getItem' | 'setItem'>;
+
+export interface SavedQueryImportPayload {
+  queries: SavedQuery[];
+  legacyConnections?: SavedConnection[];
+}
+
+export interface SavedQueryBackend {
+  GetSavedQueries?: () => Promise<SavedQuery[]>;
+  SaveQuery?: (query: SavedQuery) => Promise<SavedQuery | null | undefined>;
+  ImportSavedQueries?: (payload: SavedQueryImportPayload) => Promise<SavedQuery[]>;
+  DeleteQuery?: (id: string) => Promise<void>;
+  RebindSavedQuery?: (id: string, connectionId: string) => Promise<SavedQuery>;
+}
+
+export interface SavedQueryBootstrapArgs {
+  backend?: SavedQueryBackend;
+  replaceSavedQueries: (queries: SavedQuery[]) => void;
+  storage?: StorageLike;
+}
+
+export interface SavedQueryBootstrapResult {
+  importedLegacyCount: number;
+  loadedCount: number;
+}
+
+let capturedLegacySavedQuerySource: SavedQueryImportPayload = { queries: [] };
+
+const toTrimmedString = (value: unknown, fallback = ''): string => {
+  if (typeof value === 'string') {
+    return value.trim();
+  }
+  if (typeof value === 'number' || typeof value === 'boolean') {
+    return String(value).trim();
+  }
+  return fallback;
+};
+
+const unwrapPersistedAppState = (payload: unknown): Record<string, unknown> => {
+  if (!payload || typeof payload !== 'object') {
+    return {};
+  }
+  const raw = payload as Record<string, unknown>;
+  if (raw.state && typeof raw.state === 'object') {
+    return raw.state as Record<string, unknown>;
+  }
+  return raw;
+};
+
+const sanitizeSavedQuery = (value: unknown, index: number): SavedQuery | null => {
+  if (!value || typeof value !== 'object') {
+    return null;
+  }
+  const raw = value as Record<string, unknown>;
+  const id = toTrimmedString(raw.id, `query-${index + 1}`) || `query-${index + 1}`;
+  const sql = typeof raw.sql === 'string' ? raw.sql : toTrimmedString(raw.sql);
+  const connectionId = toTrimmedString(raw.connectionId);
+  const dbName = toTrimmedString(raw.dbName);
+  if (!sql.trim() || !connectionId || !dbName) {
+    return null;
+  }
+  const query: SavedQuery = {
+    id,
+    name: toTrimmedString(raw.name, `查询-${index + 1}`) || `查询-${index + 1}`,
+    sql,
+    connectionId,
+    dbName,
+    createdAt: Number.isFinite(Number(raw.createdAt)) ? Number(raw.createdAt) : Date.now(),
+  };
+  const connectionFingerprint = toTrimmedString(raw.connectionFingerprint);
+  const fingerprintVersion = toTrimmedString(raw.fingerprintVersion);
+  const bindingStatus = toTrimmedString(raw.bindingStatus);
+  const originalConnectionId = toTrimmedString(raw.originalConnectionId);
+  if (connectionFingerprint) query.connectionFingerprint = connectionFingerprint;
+  if (fingerprintVersion) query.fingerprintVersion = fingerprintVersion;
+  if (bindingStatus) query.bindingStatus = bindingStatus;
+  if (originalConnectionId) query.originalConnectionId = originalConnectionId;
+  return query;
+};
+
+export const sanitizeSavedQueries = (value: unknown): SavedQuery[] => {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+  const result: SavedQuery[] = [];
+  const seen = new Set<string>();
+  value.forEach((item, index) => {
+    const query = sanitizeSavedQuery(item, index);
+    if (!query || seen.has(query.id)) {
+      return;
+    }
+    seen.add(query.id);
+    result.push(query);
+  });
+  return result;
+};
+
+const mergeSavedQueriesById = (...groups: SavedQuery[][]): SavedQuery[] => {
+  const result: SavedQuery[] = [];
+  const indexById = new Map<string, number>();
+  groups.flat().forEach((query) => {
+    if (!query.id) {
+      return;
+    }
+    const existingIndex = indexById.get(query.id);
+    if (existingIndex === undefined) {
+      indexById.set(query.id, result.length);
+      result.push(query);
+      return;
+    }
+    result[existingIndex] = query;
+  });
+  return result;
+};
+
+const sanitizeLegacyConnections = (value: unknown): SavedConnection[] => {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+  return value.filter((item): item is SavedConnection => !!item && typeof item === 'object');
+};
+
+const mergeLegacyConnectionsById = (...groups: SavedConnection[][]): SavedConnection[] => {
+  const result: SavedConnection[] = [];
+  const indexById = new Map<string, number>();
+  groups.flat().forEach((connection) => {
+    const id = toTrimmedString((connection as { id?: unknown }).id);
+    if (!id) {
+      return;
+    }
+    const existingIndex = indexById.get(id);
+    if (existingIndex === undefined) {
+      indexById.set(id, result.length);
+      result.push(connection);
+      return;
+    }
+    result[existingIndex] = connection;
+  });
+  return result;
+};
+
+const mergeSavedQueryImportSources = (...sources: SavedQueryImportPayload[]): SavedQueryImportPayload => {
+  return {
+    queries: mergeSavedQueriesById(...sources.map((source) => source.queries || [])),
+    legacyConnections: mergeLegacyConnectionsById(...sources.map((source) => source.legacyConnections || [])),
+  };
+};
+
+export const captureLegacySavedQueriesSnapshot = (value: unknown, legacyConnections?: unknown): void => {
+  const nextQueries = sanitizeSavedQueries(value);
+  if (nextQueries.length === 0) {
+    return;
+  }
+  capturedLegacySavedQuerySource = mergeSavedQueryImportSources(capturedLegacySavedQuerySource, {
+    queries: nextQueries,
+    legacyConnections: sanitizeLegacyConnections(legacyConnections),
+  });
+};
+
+export const readLegacySavedQuerySourceFromPayload = (payload: string | null | undefined): SavedQueryImportPayload => {
+  if (!payload || typeof payload !== 'string') {
+    return { queries: [] };
+  }
+  try {
+    const parsed = JSON.parse(payload) as Record<string, unknown>;
+    const state = unwrapPersistedAppState(parsed);
+    return {
+      queries: sanitizeSavedQueries(state.savedQueries),
+      legacyConnections: sanitizeLegacyConnections(state.connections),
+    };
+  } catch {
+    return { queries: [] };
+  }
+};
+
+export const readLegacySavedQueriesFromPayload = (payload: string | null | undefined): SavedQuery[] => (
+  readLegacySavedQuerySourceFromPayload(payload).queries
+);
+
+export const stripLegacySavedQueries = (payload: string | null | undefined): string => {
+  if (!payload || typeof payload !== 'string') {
+    return '';
+  }
+  try {
+    const parsed = JSON.parse(payload) as Record<string, unknown>;
+    const state = unwrapPersistedAppState(parsed);
+    if (state.savedQueries === undefined) {
+      return payload;
+    }
+    delete state.savedQueries;
+    return JSON.stringify(parsed);
+  } catch {
+    return payload;
+  }
+};
+
+const resolveStorage = (storage?: StorageLike): StorageLike | undefined => {
+  if (storage) {
+    return storage;
+  }
+  if (typeof window === 'undefined') {
+    return undefined;
+  }
+  return window.localStorage;
+};
+
+const readLegacySavedQuerySourceFromStorage = (storage?: StorageLike): SavedQueryImportPayload => {
+  const rawPayload = storage?.getItem(LEGACY_PERSIST_KEY) ?? null;
+  return readLegacySavedQuerySourceFromPayload(rawPayload);
+};
+
+const cleanupLegacySavedQueriesFromStorage = (storage?: StorageLike): void => {
+  const rawPayload = storage?.getItem(LEGACY_PERSIST_KEY) ?? null;
+  const sanitizedPayload = stripLegacySavedQueries(rawPayload);
+  if (sanitizedPayload && sanitizedPayload !== rawPayload) {
+    storage?.setItem(LEGACY_PERSIST_KEY, sanitizedPayload);
+  }
+};
+
+export const saveSavedQueryToBackend = async (
+  backend: SavedQueryBackend | undefined,
+  query: SavedQuery,
+): Promise<SavedQuery> => {
+  const sanitized = sanitizeSavedQuery(query, 0);
+  if (!sanitized) {
+    throw new Error('保存查询缺少 SQL、连接或数据库上下文');
+  }
+  if (typeof backend?.SaveQuery !== 'function') {
+    return sanitized;
+  }
+  const saved = await backend.SaveQuery(sanitized);
+  return sanitizeSavedQuery(saved || sanitized, 0) || sanitized;
+};
+
+export const deleteSavedQueryFromBackend = async (
+  backend: SavedQueryBackend | undefined,
+  id: string,
+): Promise<void> => {
+  if (typeof backend?.DeleteQuery === 'function') {
+    await backend.DeleteQuery(id);
+  }
+};
+
+export async function bootstrapSavedQueries(args: SavedQueryBootstrapArgs): Promise<SavedQueryBootstrapResult> {
+  const storage = resolveStorage(args.storage);
+  const storageLegacySource = readLegacySavedQuerySourceFromStorage(storage);
+  const legacySource = mergeSavedQueryImportSources(capturedLegacySavedQuerySource, storageLegacySource);
+  const legacyQueries = legacySource.queries;
+  let importedLegacyCount = 0;
+
+  if (legacyQueries.length > 0) {
+    if (typeof args.backend?.ImportSavedQueries === 'function') {
+      await args.backend.ImportSavedQueries(legacySource);
+      importedLegacyCount = legacyQueries.length;
+      capturedLegacySavedQuerySource = { queries: [] };
+      cleanupLegacySavedQueriesFromStorage(storage);
+    } else if (typeof args.backend?.SaveQuery === 'function') {
+      for (const query of legacyQueries) {
+        await args.backend.SaveQuery(query);
+      }
+      importedLegacyCount = legacyQueries.length;
+      capturedLegacySavedQuerySource = { queries: [] };
+      cleanupLegacySavedQueriesFromStorage(storage);
+    }
+  }
+
+  let loadedQueries: SavedQuery[] = [];
+  if (typeof args.backend?.GetSavedQueries === 'function') {
+    loadedQueries = sanitizeSavedQueries(await args.backend.GetSavedQueries());
+  }
+  if (loadedQueries.length === 0 && importedLegacyCount === 0 && legacyQueries.length > 0) {
+    loadedQueries = legacyQueries;
+  }
+  args.replaceSavedQueries(loadedQueries);
+
+  return {
+    importedLegacyCount,
+    loadedCount: loadedQueries.length,
+  };
+}
diff --git a/frontend/src/utils/secureConfigBootstrap.test.ts b/frontend/src/utils/secureConfigBootstrap.test.ts
index 7f7b0cd..65ac6d2 100644
--- a/frontend/src/utils/secureConfigBootstrap.test.ts
+++ b/frontend/src/utils/secureConfigBootstrap.test.ts
@@ -8,6 +8,7 @@ import {
   startSecurityUpdateFromBootstrap,
 } from './secureConfigBootstrap';
 import { stripLegacyPersistedConnectionById } from './legacyConnectionStorage';
+import { stripLegacySavedQueries } from './savedQueryPersistence';
 
 const legacyPayload = JSON.stringify({
   state: {
@@ -536,6 +537,69 @@ describe('secureConfigBootstrap', () => {
     );
   });
 
+  it('does not restore legacy saved queries when security cleanup runs after saved-query cleanup', async () => {
+    const args = createBaseArgs();
+    args.storage.setItem(LEGACY_PERSIST_KEY, JSON.stringify({
+      state: {
+        connections: [
+          {
+            id: 'legacy-1',
+            name: 'Legacy',
+            config: {
+              id: 'legacy-1',
+              type: 'postgres',
+              host: 'db.local',
+              port: 5432,
+              user: 'postgres',
+              password: 'secret',
+            },
+          },
+        ],
+        globalProxy: {
+          enabled: true,
+          type: 'http',
+          host: '127.0.0.1',
+          port: 8080,
+          user: 'ops',
+          password: 'proxy-secret',
+        },
+        savedQueries: [
+          {
+            id: 'saved-1',
+            name: 'Orders',
+            sql: 'select * from orders',
+            connectionId: 'legacy-1',
+            dbName: 'app',
+            createdAt: 100,
+          },
+        ],
+      },
+    }));
+
+    await startSecurityUpdateFromBootstrap({
+      ...args,
+      backend: {
+        StartSecurityUpdate: vi.fn().mockImplementation(async () => {
+          args.storage.setItem(
+            LEGACY_PERSIST_KEY,
+            stripLegacySavedQueries(args.storage.getItem(LEGACY_PERSIST_KEY)),
+          );
+          return {
+            overallStatus: 'completed',
+            summary: { total: 3, updated: 3, pending: 0, skipped: 0, failed: 0 },
+            issues: [],
+          };
+        }),
+        GetSavedConnections: vi.fn().mockResolvedValue([]),
+      },
+    });
+
+    const cleaned = JSON.parse(args.storage.getItem(LEGACY_PERSIST_KEY) || '{}');
+    expect(cleaned.state.savedQueries).toBeUndefined();
+    expect(cleaned.state.connections).toEqual([]);
+    expect(cleaned.state.globalProxy).toBeUndefined();
+  });
+
   it('refreshes backend config and strips source-side secrets when a later round finishes as completed', async () => {
     const args = createBaseArgs();
 
diff --git a/frontend/src/utils/secureConfigBootstrap.ts b/frontend/src/utils/secureConfigBootstrap.ts
index cd26ef2..5a66d67 100644
--- a/frontend/src/utils/secureConfigBootstrap.ts
+++ b/frontend/src/utils/secureConfigBootstrap.ts
@@ -12,6 +12,7 @@ import {
   readLegacyPersistedSecrets,
   stripLegacyPersistedSecrets,
 } from './legacyConnectionStorage';
+import { stripLegacySavedQueries } from './savedQueryPersistence';
 
 type StorageLike = Pick<Storage, 'getItem' | 'setItem' | 'removeItem'>;
 
@@ -312,8 +313,9 @@ const cleanupLegacySourceIfCompleted = (
   if (!storage || !rawPayload || status.overallStatus !== 'completed') {
     return;
   }
-  const sanitizedPayload = stripLegacyPersistedSecrets(rawPayload);
-  if (sanitizedPayload && sanitizedPayload !== rawPayload) {
+  const currentPayload = storage.getItem(LEGACY_PERSIST_KEY) ?? rawPayload;
+  const sanitizedPayload = stripLegacySavedQueries(stripLegacyPersistedSecrets(currentPayload));
+  if (sanitizedPayload && sanitizedPayload !== currentPayload) {
     storage.setItem(LEGACY_PERSIST_KEY, sanitizedPayload);
   }
 };
diff --git a/frontend/src/utils/shortcuts.test.ts b/frontend/src/utils/shortcuts.test.ts
index ec76fd4..ce01509 100644
--- a/frontend/src/utils/shortcuts.test.ts
+++ b/frontend/src/utils/shortcuts.test.ts
@@ -190,6 +190,18 @@ describe('shortcut defaults', () => {
     });
   });
 
+  it('registers query results panel toggle as a query editor shortcut', () => {
+    expect(DEFAULT_SHORTCUT_OPTIONS.toggleQueryResultsPanel).toEqual({
+      mac: { combo: 'Meta+Shift+M', enabled: true },
+      windows: { combo: 'Ctrl+Shift+M', enabled: true },
+    });
+    expect(SHORTCUT_ACTION_META.toggleQueryResultsPanel).toMatchObject({
+      label: '切换结果区',
+      scope: 'queryEditor',
+      allowInEditable: true,
+    });
+  });
+
   // Windows 任务栏恢复后字体异常变大的兜底入口（方案 3）。
   // 自动 fix 路径（9848b8b2）刻意不再 toggle 以避免可见动画，由该快捷键给用户主动触发的修复入口。
   it('registers reset window zoom shortcut with default Ctrl+Shift+0', () => {
diff --git a/frontend/src/utils/shortcuts.ts b/frontend/src/utils/shortcuts.ts
index fbfa17e..ed2555a 100644
--- a/frontend/src/utils/shortcuts.ts
+++ b/frontend/src/utils/shortcuts.ts
@@ -6,6 +6,7 @@ export type ShortcutAction =
   | 'runQuery'
   | 'selectCurrentStatement'
   | 'saveQuery'
+  | 'toggleQueryResultsPanel'
   | 'sendAIChatMessage'
   | 'focusSidebarSearch'
   | 'newQueryTab'
@@ -42,8 +43,10 @@ export interface ShortcutActionMeta {
 }
 
 interface ShortcutActionMetaDefinition extends Omit<ShortcutActionMeta, 'label' | 'description'> {
-  labelKey: string;
-  descriptionKey: string;
+  label?: string;
+  description?: string;
+  labelKey?: string;
+  descriptionKey?: string;
 }
 
 const MODIFIER_ORDER = ['Ctrl', 'Meta', 'Alt', 'Shift'] as const;
@@ -98,6 +101,7 @@ export const SHORTCUT_ACTION_ORDER: ShortcutAction[] = [
   'runQuery',
   'selectCurrentStatement',
   'saveQuery',
+  'toggleQueryResultsPanel',
   'sendAIChatMessage',
   'focusSidebarSearch',
   'newQueryTab',
@@ -118,10 +122,10 @@ const createShortcutActionMeta = (
   definition: ShortcutActionMetaDefinition,
 ): ShortcutActionMeta => ({
   get label() {
-    return localizeShortcut(definition.labelKey);
+    return definition.label ?? localizeShortcut(definition.labelKey || '');
   },
   get description() {
-    return localizeShortcut(definition.descriptionKey);
+    return definition.description ?? localizeShortcut(definition.descriptionKey || '');
   },
   allowInEditable: definition.allowInEditable,
   allowWithoutModifier: definition.allowWithoutModifier,
@@ -147,6 +151,12 @@ const SHORTCUT_ACTION_META_DEFINITIONS: Record<ShortcutAction, ShortcutActionMet
     scope: 'queryEditor',
     allowInEditable: true,
   },
+  toggleQueryResultsPanel: {
+    label: '切换结果区',
+    description: '在查询编辑器中显示或隐藏下方结果区域',
+    scope: 'queryEditor',
+    allowInEditable: true,
+  },
   sendAIChatMessage: {
     labelKey: 'app.shortcuts.action.sendAIChatMessage.label',
     descriptionKey: 'app.shortcuts.action.sendAIChatMessage.description',
@@ -229,6 +239,10 @@ export const DEFAULT_SHORTCUT_OPTIONS: ShortcutOptions = {
     mac: { combo: 'Meta+S', enabled: true },
     windows: { combo: 'Ctrl+S', enabled: true },
   },
+  toggleQueryResultsPanel: {
+    mac: { combo: 'Meta+Shift+M', enabled: true },
+    windows: { combo: 'Ctrl+Shift+M', enabled: true },
+  },
   sendAIChatMessage: {
     mac: { combo: 'Enter', enabled: true },
     windows: { combo: 'Enter', enabled: true },
diff --git a/frontend/src/utils/sidebarLocate.test.ts b/frontend/src/utils/sidebarLocate.test.ts
index 8b73688..515c074 100644
--- a/frontend/src/utils/sidebarLocate.test.ts
+++ b/frontend/src/utils/sidebarLocate.test.ts
@@ -96,6 +96,21 @@ describe('sidebarLocate', () => {
     })).toBeNull();
   });
 
+  it('keeps table-style view tabs on the views branch', () => {
+    expect(normalizeSidebarLocateObjectRequestFromTab({
+      id: 'legacy-view-tab-id',
+      type: 'table',
+      connectionId: 'conn-1',
+      dbName: 'GDB_APP',
+      tableName: 'V_ACCOUNT',
+      objectType: 'view',
+    })).toMatchObject({
+      tabId: 'legacy-view-tab-id',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    });
+  });
+
   it('builds locate requests from trigger and routine tabs', () => {
     expect(normalizeSidebarLocateObjectRequestFromTab({
       id: 'trigger-conn-1-main-audit.users_bi',
@@ -122,6 +137,29 @@ describe('sidebarLocate', () => {
     });
   });
 
+  it('builds and resolves locate requests from external SQL file query tabs', () => {
+    const request = normalizeSidebarLocateObjectRequestFromTab({
+      id: 'external-sql-tab:conn-1:main:/Users/me/sql/report.sql',
+      type: 'query',
+      connectionId: 'conn-1',
+      dbName: 'main',
+      filePath: '/Users/me/sql/report.sql',
+    });
+
+    expect(request).toMatchObject({
+      connectionId: 'conn-1',
+      dbName: 'main',
+      filePath: '/Users/me/sql/report.sql',
+      objectGroup: 'externalSqlFiles',
+    });
+
+    expect(resolveSidebarLocateTarget(request!, { groupBySchema: false })).toMatchObject({
+      objectGroupKey: 'external-sql-root',
+      expectedAncestorKeys: ['external-sql-root'],
+      filePath: '/Users/me/sql/report.sql',
+    });
+  });
+
   it('keeps StarRocks materialized view tabs on the materialized views branch', () => {
     const request = normalizeSidebarLocateObjectRequestFromTab({
       id: 'view-def-conn-1-main-sales.mv_daily',
@@ -285,4 +323,875 @@ describe('sidebarLocate', () => {
       'conn-1-main-routine-reporting.refresh_stats',
     ]);
   });
+
+  it('finds schema objects when tree nodes use unqualified names or different case', () => {
+    const viewTarget = resolveSidebarLocateTarget({
+      tabId: 'conn-1-main-view-reporting.active_users',
+      connectionId: 'conn-1',
+      dbName: 'main',
+      tableName: 'reporting.active_users',
+      schemaName: 'reporting',
+      objectGroup: 'views',
+    }, { groupBySchema: true });
+
+    const routineTarget = resolveSidebarLocateTarget({
+      tabId: 'conn-1-main-routine-reporting.refresh_stats',
+      connectionId: 'conn-1',
+      dbName: 'main',
+      tableName: 'reporting.refresh_stats',
+      schemaName: 'reporting',
+      objectGroup: 'routines',
+    }, { groupBySchema: true });
+
+    const triggerTarget = resolveSidebarLocateTarget({
+      tabId: 'conn-1-main-trigger-audit.users_bi-audit.users',
+      connectionId: 'conn-1',
+      dbName: 'main',
+      tableName: 'audit.users_bi',
+      schemaName: 'audit',
+      objectGroup: 'triggers',
+    }, { groupBySchema: true });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-main',
+            dataRef: { id: 'conn-1', dbName: 'main' },
+            children: [
+              {
+                key: 'conn-1-main-schema-REPORTING',
+                children: [
+                  {
+                    key: 'conn-1-main-schema-REPORTING-views',
+                    children: [
+                      {
+                        key: 'conn-1-main-view-ACTIVE_USERS',
+                        type: 'view',
+                        dataRef: { id: 'conn-1', dbName: 'main', viewName: 'ACTIVE_USERS', schemaName: 'REPORTING' },
+                      },
+                    ],
+                  },
+                  {
+                    key: 'conn-1-main-schema-REPORTING-routines',
+                    children: [
+                      {
+                        key: 'conn-1-main-routine-REFRESH_STATS',
+                        type: 'routine',
+                        dataRef: { id: 'conn-1', dbName: 'main', routineName: 'REFRESH_STATS', schemaName: 'REPORTING' },
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                key: 'conn-1-main-schema-AUDIT',
+                children: [
+                  {
+                    key: 'conn-1-main-schema-AUDIT-triggers',
+                    children: [
+                      {
+                        key: 'conn-1-main-trigger-USERS_BI-AUDIT.USERS',
+                        type: 'db-trigger',
+                        dataRef: { id: 'conn-1', dbName: 'main', triggerName: 'USERS_BI', tableName: 'AUDIT.USERS', schemaName: 'AUDIT' },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, viewTarget)).toEqual([
+      'conn-1',
+      'conn-1-main',
+      'conn-1-main-schema-REPORTING',
+      'conn-1-main-schema-REPORTING-views',
+      'conn-1-main-view-ACTIVE_USERS',
+    ]);
+    expect(findSidebarNodePathForLocate(tree, routineTarget)).toEqual([
+      'conn-1',
+      'conn-1-main',
+      'conn-1-main-schema-REPORTING',
+      'conn-1-main-schema-REPORTING-routines',
+      'conn-1-main-routine-REFRESH_STATS',
+    ]);
+    expect(findSidebarNodePathForLocate(tree, triggerTarget)).toEqual([
+      'conn-1',
+      'conn-1-main',
+      'conn-1-main-schema-AUDIT',
+      'conn-1-main-schema-AUDIT-triggers',
+      'conn-1-main-trigger-USERS_BI-AUDIT.USERS',
+    ]);
+  });
+
+  it('finds a unique schema-qualified view when the locate request only has the view name', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'conn-1-SYSDBA-view-V_ACCOUNT',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    }, { groupBySchema: true });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-schema-SYSDBA',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-schema-SYSDBA-views',
+                    children: [
+                      {
+                        key: 'conn-1-SYSDBA-view-SYSDBA.V_ACCOUNT',
+                        type: 'view',
+                        dataRef: {
+                          id: 'conn-1',
+                          dbName: 'SYSDBA',
+                          viewName: 'SYSDBA.V_ACCOUNT',
+                          schemaName: 'SYSDBA',
+                        },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-schema-SYSDBA',
+      'conn-1-SYSDBA-schema-SYSDBA-views',
+      'conn-1-SYSDBA-view-SYSDBA.V_ACCOUNT',
+    ]);
+  });
+
+  it('finds a unique bare view node when metadata supplies schema separately', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      schemaName: 'SYSDBA',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-views',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-view-V_ACCOUNT',
+                    type: 'view',
+                    dataRef: {
+                      id: 'conn-1',
+                      dbName: 'SYSDBA',
+                      viewName: 'V_ACCOUNT',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-views',
+      'conn-1-SYSDBA-view-V_ACCOUNT',
+    ]);
+  });
+
+  it('finds a bare mysql-compatible view node when the locate request keeps a different schema name', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'GDB_APP',
+      tableName: 'V_ACCOUNT',
+      schemaName: 'SYSDBA',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-GDB_APP',
+            dataRef: { id: 'conn-1', dbName: 'GDB_APP' },
+            children: [
+              {
+                key: 'conn-1-GDB_APP-views',
+                children: [
+                  {
+                    key: 'conn-1-GDB_APP-view-V_ACCOUNT',
+                    type: 'view',
+                    dataRef: {
+                      id: 'conn-1',
+                      dbName: 'GDB_APP',
+                      viewName: 'V_ACCOUNT',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-GDB_APP',
+      'conn-1-GDB_APP-views',
+      'conn-1-GDB_APP-view-V_ACCOUNT',
+    ]);
+  });
+
+  it('finds a mysql-compatible view node when objectType carries the view identity', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'GDB_APP',
+      tableName: 'V_ACCOUNT',
+      schemaName: 'SYSDBA',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-GDB_APP',
+            dataRef: { id: 'conn-1', dbName: 'GDB_APP' },
+            children: [
+              {
+                key: 'conn-1-GDB_APP-views',
+                children: [
+                  {
+                    key: 'opaque-view-node',
+                    type: 'database-object',
+                    dataRef: {
+                      id: 'conn-1',
+                      dbName: 'GDB_APP',
+                      tableName: 'V_ACCOUNT',
+                      objectType: 'view',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-GDB_APP',
+      'conn-1-GDB_APP-views',
+      'opaque-view-node',
+    ]);
+  });
+
+  it('falls back to a table-like node when a view is only present in the tables branch', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-tables',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-V_ACCOUNT',
+                    type: 'table',
+                    dataRef: {
+                      id: 'conn-1',
+                      dbName: 'SYSDBA',
+                      tableName: 'V_ACCOUNT',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-tables',
+      'conn-1-SYSDBA-V_ACCOUNT',
+    ]);
+  });
+
+  it('falls back to a visual table-like node when view metadata is not present on the node', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-tables',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-V_ACCOUNT',
+                    title: 'V_ACCOUNT',
+                    type: 'table',
+                    dataRef: {},
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-tables',
+      'conn-1-SYSDBA-V_ACCOUNT',
+    ]);
+  });
+
+  it('falls back to a visual table-like node with a table-prefixed key for a view request', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-tables',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-table-V_ACCOUNT',
+                    type: 'table',
+                    dataRef: {},
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-tables',
+      'conn-1-SYSDBA-table-V_ACCOUNT',
+    ]);
+  });
+
+  it('finds a view node by title when the tree node is missing object metadata', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-views',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-view-generated-key',
+                    title: 'V_ACCOUNT',
+                    type: 'view',
+                    dataRef: {
+                      id: 'conn-1',
+                      dbName: 'SYSDBA',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-views',
+      'conn-1-SYSDBA-view-generated-key',
+    ]);
+  });
+
+  it('finds a view node by title under the views group when node type metadata is missing', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'GDB_APP',
+      tableName: 'V_ACCOUNT',
+      schemaName: 'SYSDBA',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-GDB_APP',
+            dataRef: { id: 'conn-1', dbName: 'GDB_APP' },
+            children: [
+              {
+                key: 'conn-1-GDB_APP-views',
+                children: [
+                  {
+                    key: 'conn-1-GDB_APP-view-generated-key',
+                    title: 'V_ACCOUNT',
+                    dataRef: {},
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-GDB_APP',
+      'conn-1-GDB_APP-views',
+      'conn-1-GDB_APP-view-generated-key',
+    ]);
+  });
+
+  it('finds a schema-qualified view request by visual title when the node has no schema metadata', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'GDB_APP',
+      tableName: 'SYSDBA.V_ACCOUNT',
+      schemaName: 'SYSDBA',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-GDB_APP',
+            dataRef: { id: 'conn-1', dbName: 'GDB_APP' },
+            children: [
+              {
+                key: 'conn-1-GDB_APP-views',
+                children: [
+                  {
+                    key: 'conn-1-GDB_APP-view-generated-key',
+                    title: 'V_ACCOUNT',
+                    type: 'view',
+                    dataRef: {
+                      id: 'conn-1',
+                      dbName: 'GDB_APP',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-GDB_APP',
+      'conn-1-GDB_APP-views',
+      'conn-1-GDB_APP-view-generated-key',
+    ]);
+  });
+
+  it('falls back from a schema-qualified view request to a bare table-like node in the same database', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'SYSDBA.V_ACCOUNT',
+      schemaName: 'SYSDBA',
+      objectGroup: 'views',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-tables',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-V_ACCOUNT',
+                    type: 'table',
+                    dataRef: {
+                      id: 'conn-1',
+                      dbName: 'SYSDBA',
+                      tableName: 'V_ACCOUNT',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-tables',
+      'conn-1-SYSDBA-V_ACCOUNT',
+    ]);
+  });
+
+  it('falls back to a unique schema-qualified table-like node for an unqualified view request', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'stale-view-tab-id',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    }, { groupBySchema: true });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-schema-SYSDBA',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-schema-SYSDBA-tables',
+                    children: [
+                      {
+                        key: 'conn-1-SYSDBA-SYSDBA.V_ACCOUNT',
+                        type: 'table',
+                        dataRef: {
+                          id: 'conn-1',
+                          dbName: 'SYSDBA',
+                          tableName: 'SYSDBA.V_ACCOUNT',
+                          schemaName: 'SYSDBA',
+                        },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-schema-SYSDBA',
+      'conn-1-SYSDBA-schema-SYSDBA-tables',
+      'conn-1-SYSDBA-SYSDBA.V_ACCOUNT',
+    ]);
+  });
+
+  it('prefers the current database schema when an unqualified view request matches multiple schemas', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'conn-1-SYSDBA-view-V_ACCOUNT',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    }, { groupBySchema: true });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-schema-SYSDBA',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-schema-SYSDBA-views',
+                    children: [
+                      {
+                        key: 'conn-1-SYSDBA-view-SYSDBA.V_ACCOUNT',
+                        type: 'view',
+                        dataRef: { id: 'conn-1', dbName: 'SYSDBA', viewName: 'SYSDBA.V_ACCOUNT', schemaName: 'SYSDBA' },
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                key: 'conn-1-SYSDBA-schema-REPORT',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-schema-REPORT-views',
+                    children: [
+                      {
+                        key: 'conn-1-SYSDBA-view-REPORT.V_ACCOUNT',
+                        type: 'view',
+                        dataRef: { id: 'conn-1', dbName: 'SYSDBA', viewName: 'REPORT.V_ACCOUNT', schemaName: 'REPORT' },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-schema-SYSDBA',
+      'conn-1-SYSDBA-schema-SYSDBA-views',
+      'conn-1-SYSDBA-view-SYSDBA.V_ACCOUNT',
+    ]);
+  });
+
+  it('prefers the current database schema when bare view nodes keep schema metadata separately', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'conn-1-SYSDBA-view-V_ACCOUNT',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    }, { groupBySchema: true });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-schema-REPORT',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-schema-REPORT-views',
+                    children: [
+                      {
+                        key: 'conn-1-SYSDBA-view-REPORT.V_ACCOUNT',
+                        title: 'V_ACCOUNT',
+                        type: 'view',
+                        dataRef: { id: 'conn-1', dbName: 'SYSDBA', viewName: 'V_ACCOUNT', schemaName: 'REPORT' },
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                key: 'conn-1-SYSDBA-schema-SYSDBA',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-schema-SYSDBA-views',
+                    children: [
+                      {
+                        key: 'conn-1-SYSDBA-view-SYSDBA.V_ACCOUNT',
+                        title: 'V_ACCOUNT',
+                        type: 'view',
+                        dataRef: { id: 'conn-1', dbName: 'SYSDBA', viewName: 'V_ACCOUNT', schemaName: 'SYSDBA' },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'conn-1',
+      'conn-1-SYSDBA',
+      'conn-1-SYSDBA-schema-SYSDBA',
+      'conn-1-SYSDBA-schema-SYSDBA-views',
+      'conn-1-SYSDBA-view-SYSDBA.V_ACCOUNT',
+    ]);
+  });
+
+  it('does not guess a schema-qualified view when no current-schema preference resolves ambiguity', () => {
+    const target = resolveSidebarLocateTarget({
+      tabId: 'conn-1-SYSDBA-view-V_ACCOUNT',
+      connectionId: 'conn-1',
+      dbName: 'SYSDBA',
+      tableName: 'V_ACCOUNT',
+      objectGroup: 'views',
+    }, { groupBySchema: true });
+
+    const tree = [
+      {
+        key: 'conn-1',
+        children: [
+          {
+            key: 'conn-1-SYSDBA',
+            dataRef: { id: 'conn-1', dbName: 'SYSDBA' },
+            children: [
+              {
+                key: 'conn-1-SYSDBA-schema-APP',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-schema-APP-views',
+                    children: [
+                      {
+                        key: 'conn-1-SYSDBA-view-APP.V_ACCOUNT',
+                        type: 'view',
+                        dataRef: { id: 'conn-1', dbName: 'SYSDBA', viewName: 'APP.V_ACCOUNT', schemaName: 'APP' },
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                key: 'conn-1-SYSDBA-schema-REPORT',
+                children: [
+                  {
+                    key: 'conn-1-SYSDBA-schema-REPORT-views',
+                    children: [
+                      {
+                        key: 'conn-1-SYSDBA-view-REPORT.V_ACCOUNT',
+                        type: 'view',
+                        dataRef: { id: 'conn-1', dbName: 'SYSDBA', viewName: 'REPORT.V_ACCOUNT', schemaName: 'REPORT' },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toBeNull();
+  });
+
+  it('finds external SQL file paths from loaded tree data', () => {
+    const target = resolveSidebarLocateTarget({
+      filePath: 'C:\\Users\\me\\sql\\report.sql',
+      objectGroup: 'externalSqlFiles',
+    }, { groupBySchema: false });
+
+    const tree = [
+      {
+        key: 'external-sql-root',
+        type: 'external-sql-root',
+        children: [
+          {
+            key: 'external-sql-directory:C:/Users/me/sql',
+            type: 'external-sql-directory',
+            dataRef: { path: 'C:/Users/me/sql' },
+            children: [
+              {
+                key: 'external-sql-file:C:/Users/me/sql/report.sql',
+                type: 'external-sql-file',
+                dataRef: { path: 'C:/Users/me/sql/report.sql' },
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    expect(findSidebarNodePathForLocate(tree, target)).toEqual([
+      'external-sql-root',
+      'external-sql-directory:C:/Users/me/sql',
+      'external-sql-file:C:/Users/me/sql/report.sql',
+    ]);
+  });
 });
diff --git a/frontend/src/utils/sidebarLocate.ts b/frontend/src/utils/sidebarLocate.ts
index 88f8b89..c7661dd 100644
--- a/frontend/src/utils/sidebarLocate.ts
+++ b/frontend/src/utils/sidebarLocate.ts
@@ -1,14 +1,28 @@
-export type SidebarLocateObjectGroup = 'tables' | 'views' | 'materializedViews' | 'triggers' | 'routines';
+import { splitQualifiedNameLast } from './qualifiedName';
 
-export interface SidebarLocateObjectRequest {
+export type SidebarLocateObjectGroup = 'tables' | 'views' | 'materializedViews' | 'triggers' | 'routines' | 'externalSqlFiles';
+export type SidebarLocateDatabaseObjectGroup = Exclude<SidebarLocateObjectGroup, 'externalSqlFiles'>;
+
+export interface SidebarLocateDatabaseObjectRequest {
   tabId?: string;
   connectionId: string;
   dbName: string;
   tableName: string;
   schemaName?: string;
-  objectGroup: SidebarLocateObjectGroup;
+  objectGroup: SidebarLocateDatabaseObjectGroup;
 }
 
+export interface SidebarLocateExternalSQLFileRequest {
+  tabId?: string;
+  connectionId?: string;
+  dbName?: string;
+  filePath: string;
+  fileName?: string;
+  objectGroup: 'externalSqlFiles';
+}
+
+export type SidebarLocateObjectRequest = SidebarLocateDatabaseObjectRequest | SidebarLocateExternalSQLFileRequest;
+
 export interface SidebarLocateTarget {
   connectionKey: string;
   databaseKey: string;
@@ -21,10 +35,12 @@ export interface SidebarLocateTarget {
   dbName: string;
   tableName: string;
   schemaName: string;
+  filePath?: string;
 }
 
 export interface SidebarLocateTreeNodeLike {
   key: string | number;
+  title?: unknown;
   type?: string;
   dataRef?: Record<string, any>;
   children?: SidebarLocateTreeNodeLike[];
@@ -39,23 +55,30 @@ export interface SidebarLocateTabLike {
   viewName?: string;
   viewKind?: string;
   triggerName?: string;
+  triggerTableName?: string;
   routineName?: string;
+  schemaName?: string;
+  sidebarLocateKey?: string;
+  filePath?: string;
+  objectType?: string;
 }
 
 const toTrimmedString = (value: unknown): string => String(value ?? '').trim();
+const normalizeLocateName = (value: string): string => toTrimmedString(value).toLowerCase();
+
+const normalizeExternalSQLLocatePath = (value: unknown): string => toTrimmedString(value).replace(/\\/g, '/');
 
 export const splitSidebarQualifiedName = (qualifiedName: string): { schemaName: string; objectName: string } => {
   const raw = toTrimmedString(qualifiedName);
   if (!raw) return { schemaName: '', objectName: '' };
-  const idx = raw.lastIndexOf('.');
-  if (idx <= 0 || idx >= raw.length - 1) return { schemaName: '', objectName: raw };
+  const parsed = splitQualifiedNameLast(raw);
   return {
-    schemaName: raw.substring(0, idx).trim(),
-    objectName: raw.substring(idx + 1).trim(),
+    schemaName: parsed.parentPath,
+    objectName: parsed.objectName,
   };
 };
 
-const inferObjectGroup = (detail: Record<string, unknown>, connectionId: string, dbName: string): SidebarLocateObjectGroup => {
+const inferObjectGroup = (detail: Record<string, unknown>, connectionId: string, dbName: string): SidebarLocateDatabaseObjectGroup => {
   const explicitGroup = toTrimmedString(detail.objectGroup);
   if (explicitGroup === 'views' || explicitGroup === 'view') return 'views';
   if (explicitGroup === 'materializedViews' || explicitGroup === 'materialized-view') return 'materializedViews';
@@ -80,6 +103,18 @@ const inferObjectGroup = (detail: Record<string, unknown>, connectionId: string,
 
 export const normalizeSidebarLocateObjectRequest = (detail: unknown): SidebarLocateObjectRequest | null => {
   const raw = (detail || {}) as Record<string, unknown>;
+  const filePath = normalizeExternalSQLLocatePath(raw.filePath);
+  if (filePath) {
+    return {
+      tabId: toTrimmedString(raw.tabId) || undefined,
+      connectionId: toTrimmedString(raw.connectionId) || undefined,
+      dbName: toTrimmedString(raw.dbName) || undefined,
+      filePath,
+      fileName: toTrimmedString(raw.fileName || raw.title) || undefined,
+      objectGroup: 'externalSqlFiles',
+    };
+  }
+
   const connectionId = toTrimmedString(raw.connectionId);
   const dbName = toTrimmedString(raw.dbName);
   const tableName = toTrimmedString(raw.tableName || raw.objectName || raw.viewName || raw.triggerName || raw.routineName);
@@ -103,6 +138,17 @@ export const normalizeSidebarLocateObjectRequest = (detail: unknown): SidebarLoc
 
 export const normalizeSidebarLocateObjectRequestFromTab = (tab: SidebarLocateTabLike | null | undefined): SidebarLocateObjectRequest | null => {
   if (!tab) return null;
+  const filePath = normalizeExternalSQLLocatePath(tab.filePath);
+  if (tab.type === 'query' && filePath) {
+    return normalizeSidebarLocateObjectRequest({
+      tabId: tab.id,
+      connectionId: tab.connectionId,
+      dbName: tab.dbName,
+      filePath,
+      fileName: tab.id,
+    });
+  }
+
   const objectName = tab.type === 'view-def'
     ? toTrimmedString(tab.viewName || tab.tableName)
     : tab.type === 'trigger'
@@ -115,13 +161,18 @@ export const normalizeSidebarLocateObjectRequestFromTab = (tab: SidebarLocateTab
   }
 
   return normalizeSidebarLocateObjectRequest({
-    tabId: tab.id,
+    tabId: toTrimmedString(tab.sidebarLocateKey || tab.id) || undefined,
     connectionId: tab.connectionId,
     dbName: tab.dbName,
     tableName: objectName,
+    schemaName: tab.schemaName,
     objectGroup: tab.type === 'view-def'
       ? (tab.viewKind === 'materialized' ? 'materializedViews' : 'views')
-      : (tab.type === 'trigger' ? 'triggers' : (tab.type === 'routine-def' ? 'routines' : undefined)),
+      : (tab.type === 'trigger'
+        ? 'triggers'
+        : (tab.type === 'routine-def'
+          ? 'routines'
+          : (tab.objectType === 'materialized-view' ? 'materializedViews' : (tab.objectType === 'view' ? 'views' : undefined)))),
   });
 };
 
@@ -129,6 +180,23 @@ export const resolveSidebarLocateTarget = (
   request: SidebarLocateObjectRequest,
   options: { groupBySchema: boolean },
 ): SidebarLocateTarget => {
+  if (request.objectGroup === 'externalSqlFiles') {
+    const filePath = normalizeExternalSQLLocatePath(request.filePath);
+    return {
+      connectionKey: toTrimmedString(request.connectionId),
+      databaseKey: request.connectionId && request.dbName ? `${request.connectionId}-${request.dbName}` : '',
+      targetKey: request.tabId || filePath,
+      objectGroup: 'externalSqlFiles',
+      objectGroupKey: 'external-sql-root',
+      expectedAncestorKeys: ['external-sql-root'],
+      connectionId: toTrimmedString(request.connectionId),
+      dbName: toTrimmedString(request.dbName),
+      tableName: request.fileName || filePath.split('/').filter(Boolean).pop() || filePath,
+      schemaName: '',
+      filePath,
+    };
+  }
+
   const connectionKey = request.connectionId;
   const databaseKey = `${request.connectionId}-${request.dbName}`;
   const fallbackTargetKey = request.objectGroup === 'materializedViews'
@@ -188,23 +256,63 @@ export const findSidebarNodePathByKey = (
   return null;
 };
 
-const matchesLocateObjectName = (target: SidebarLocateTarget, nodeObjectName: string, nodeSchemaName: string): boolean => {
+const matchesLocateObjectName = (
+  target: SidebarLocateTarget,
+  nodeObjectName: string,
+  nodeSchemaName: string,
+  options: { allowUnqualifiedSchemaMatch?: boolean } = {},
+): boolean => {
   const normalizedNodeName = toTrimmedString(nodeObjectName);
   if (!normalizedNodeName) return false;
-  if (normalizedNodeName === target.tableName) return true;
-
-  if (!target.schemaName) return false;
 
   const nodeParsed = splitSidebarQualifiedName(normalizedNodeName);
   const targetParsed = splitSidebarQualifiedName(target.tableName);
   const nodeObject = nodeParsed.objectName || normalizedNodeName;
   const targetObject = targetParsed.objectName || target.tableName;
   const resolvedNodeSchema = toTrimmedString(nodeSchemaName) || nodeParsed.schemaName;
-  return resolvedNodeSchema === target.schemaName && nodeObject === targetObject;
+  const resolvedTargetSchema = toTrimmedString(target.schemaName) || targetParsed.schemaName;
+
+  if (
+    resolvedTargetSchema
+    && !resolvedNodeSchema
+    && normalizeLocateName(resolvedTargetSchema) === normalizeLocateName(target.dbName)
+    && normalizeLocateName(nodeObject) === normalizeLocateName(targetObject)
+  ) {
+    return true;
+  }
+
+  if (
+    options.allowUnqualifiedSchemaMatch
+    && !resolvedNodeSchema
+    && normalizeLocateName(nodeObject) === normalizeLocateName(targetObject)
+  ) {
+    return true;
+  }
+
+  if (!resolvedTargetSchema) {
+    if (options.allowUnqualifiedSchemaMatch) {
+      return normalizeLocateName(nodeObject) === normalizeLocateName(targetObject);
+    }
+    return !resolvedNodeSchema && normalizeLocateName(nodeObject) === normalizeLocateName(targetObject);
+  }
+
+  return normalizeLocateName(resolvedNodeSchema) === normalizeLocateName(resolvedTargetSchema)
+    && normalizeLocateName(nodeObject) === normalizeLocateName(targetObject);
 };
 
-const matchesLocateObjectNode = (node: SidebarLocateTreeNodeLike, target: SidebarLocateTarget): boolean => {
+const matchesLocateObjectNode = (
+  node: SidebarLocateTreeNodeLike,
+  target: SidebarLocateTarget,
+  options: { allowUnqualifiedSchemaMatch?: boolean } = {},
+): boolean => {
   const dataRef = node.dataRef || {};
+  const nodeObjectType = normalizeLocateName(toTrimmedString(dataRef.objectType || dataRef.objectKind));
+
+  if (target.objectGroup === 'externalSqlFiles') {
+    return node.type === 'external-sql-file'
+      && normalizeExternalSQLLocatePath(dataRef.path) === normalizeExternalSQLLocatePath(target.filePath);
+  }
+
   const nodeConnectionId = toTrimmedString(dataRef.id || dataRef.connectionId);
   const nodeDbName = toTrimmedString(dataRef.dbName);
 
@@ -213,27 +321,190 @@ const matchesLocateObjectNode = (node: SidebarLocateTreeNodeLike, target: Sideba
   }
 
   if (target.objectGroup === 'views') {
-    if (node.type !== 'view') return false;
-    return matchesLocateObjectName(target, toTrimmedString(dataRef.viewName || dataRef.tableName), toTrimmedString(dataRef.schemaName));
+    if (node.type !== 'view' && nodeObjectType !== 'view' && nodeObjectType !== 'views') return false;
+    return matchesLocateObjectName(target, toTrimmedString(dataRef.viewName || dataRef.tableName), toTrimmedString(dataRef.schemaName), options);
   }
 
   if (target.objectGroup === 'materializedViews') {
-    if (node.type !== 'materialized-view') return false;
-    return matchesLocateObjectName(target, toTrimmedString(dataRef.viewName || dataRef.tableName), toTrimmedString(dataRef.schemaName));
+    if (node.type !== 'materialized-view' && nodeObjectType !== 'materialized-view' && nodeObjectType !== 'materializedviews') return false;
+    return matchesLocateObjectName(target, toTrimmedString(dataRef.viewName || dataRef.tableName), toTrimmedString(dataRef.schemaName), options);
   }
 
   if (target.objectGroup === 'triggers') {
     if (node.type !== 'db-trigger') return false;
-    return matchesLocateObjectName(target, toTrimmedString(dataRef.triggerName || dataRef.tableName), toTrimmedString(dataRef.schemaName));
+    return matchesLocateObjectName(target, toTrimmedString(dataRef.triggerName || dataRef.tableName), toTrimmedString(dataRef.schemaName), options);
   }
 
   if (target.objectGroup === 'routines') {
     if (node.type !== 'routine') return false;
-    return matchesLocateObjectName(target, toTrimmedString(dataRef.routineName || dataRef.tableName), toTrimmedString(dataRef.schemaName));
+    return matchesLocateObjectName(target, toTrimmedString(dataRef.routineName || dataRef.tableName), toTrimmedString(dataRef.schemaName), options);
   }
 
   if (node.type !== 'table') return false;
-  return matchesLocateObjectName(target, toTrimmedString(dataRef.tableName), toTrimmedString(dataRef.schemaName));
+  return matchesLocateObjectName(target, toTrimmedString(dataRef.tableName), toTrimmedString(dataRef.schemaName), options);
+};
+
+const findSidebarNodePathForLocateByObject = (
+  nodes: SidebarLocateTreeNodeLike[],
+  target: SidebarLocateTarget,
+  options: { allowUnqualifiedSchemaMatch?: boolean } = {},
+): string[] | null => {
+  for (const node of nodes) {
+    const nodeKey = String(node.key);
+    if (matchesLocateObjectNode(node, target, options)) {
+      return [nodeKey];
+    }
+
+    if (node.children) {
+      const childPath = findSidebarNodePathForLocateByObject(node.children, target, options);
+      if (childPath) {
+        return [nodeKey, ...childPath];
+      }
+    }
+  }
+  return null;
+};
+
+const collectSidebarNodePathsForLocateByObject = (
+  nodes: SidebarLocateTreeNodeLike[],
+  target: SidebarLocateTarget,
+  options: { allowUnqualifiedSchemaMatch?: boolean } = {},
+  ancestorPath: string[] = [],
+): string[][] => {
+  const paths: string[][] = [];
+  for (const node of nodes) {
+    const nodeKey = String(node.key);
+    const path = [...ancestorPath, nodeKey];
+    if (matchesLocateObjectNode(node, target, options)) {
+      paths.push(path);
+    }
+    if (node.children) {
+      paths.push(...collectSidebarNodePathsForLocateByObject(node.children, target, options, path));
+    }
+  }
+  return paths;
+};
+
+const getVisualNodeObjectName = (
+  node: SidebarLocateTreeNodeLike,
+  target: SidebarLocateTarget,
+): string => {
+  const title = toTrimmedString(node.title);
+  if (title && title !== '[object Object]') return title;
+
+  const nodeKey = toTrimmedString(node.key);
+  const keyPrefixes = target.objectGroup === 'materializedViews'
+    ? [`${target.databaseKey}-materialized-view-`]
+    : target.objectGroup === 'views'
+      ? [`${target.databaseKey}-view-`]
+      : target.objectGroup === 'triggers'
+        ? [`${target.databaseKey}-trigger-`]
+        : target.objectGroup === 'routines'
+          ? [`${target.databaseKey}-routine-`]
+          : [`${target.databaseKey}-table-`, `${target.databaseKey}-`];
+
+  const matchedPrefix = keyPrefixes.find((prefix) => nodeKey.startsWith(prefix));
+  return matchedPrefix ? nodeKey.slice(matchedPrefix.length) : '';
+};
+
+const getLocateObjectGroupPathSuffix = (objectGroup: SidebarLocateObjectGroup): string => {
+  if (objectGroup === 'externalSqlFiles') return 'external-sql-root';
+  return objectGroup.toLowerCase();
+};
+
+const isPathInsideLocateObjectGroup = (
+  path: string[],
+  target: SidebarLocateTarget,
+): boolean => {
+  if (target.objectGroup === 'externalSqlFiles') return false;
+  const normalizedObjectGroupKey = normalizeLocateName(target.objectGroupKey);
+  const groupSuffix = getLocateObjectGroupPathSuffix(target.objectGroup);
+  return path.some((key) => {
+    const normalizedKey = normalizeLocateName(key);
+    return normalizedKey === normalizedObjectGroupKey || normalizedKey.endsWith(`-${groupSuffix}`);
+  });
+};
+
+const matchesLocateObjectNodeByVisualIdentity = (
+  node: SidebarLocateTreeNodeLike,
+  target: SidebarLocateTarget,
+  path: string[],
+): boolean => {
+  if (!path.includes(target.databaseKey)) return false;
+  const nodeObjectType = normalizeLocateName(toTrimmedString(node.dataRef?.objectType || node.dataRef?.objectKind));
+  const insideExpectedGroup = isPathInsideLocateObjectGroup(path, target);
+
+  if (target.objectGroup === 'views' && node.type !== 'view' && nodeObjectType !== 'view' && nodeObjectType !== 'views' && !insideExpectedGroup) return false;
+  if (target.objectGroup === 'materializedViews' && node.type !== 'materialized-view' && nodeObjectType !== 'materialized-view' && nodeObjectType !== 'materializedviews' && !insideExpectedGroup) return false;
+  if (target.objectGroup === 'triggers' && node.type !== 'db-trigger' && !insideExpectedGroup) return false;
+  if (target.objectGroup === 'routines' && node.type !== 'routine' && !insideExpectedGroup) return false;
+  if (target.objectGroup === 'tables' && node.type !== 'table' && !insideExpectedGroup) return false;
+  if (target.objectGroup === 'externalSqlFiles') return false;
+
+  const schemaName = toTrimmedString(node.dataRef?.schemaName);
+  return matchesLocateObjectName(target, getVisualNodeObjectName(node, target), schemaName, { allowUnqualifiedSchemaMatch: true });
+};
+
+const collectSidebarNodePathsForLocateByVisualIdentity = (
+  nodes: SidebarLocateTreeNodeLike[],
+  target: SidebarLocateTarget,
+  ancestorPath: string[] = [],
+): string[][] => {
+  const paths: string[][] = [];
+  for (const node of nodes) {
+    const nodeKey = String(node.key);
+    const path = [...ancestorPath, nodeKey];
+    if (matchesLocateObjectNodeByVisualIdentity(node, target, path)) {
+      paths.push(path);
+    }
+    if (node.children) {
+      paths.push(...collectSidebarNodePathsForLocateByVisualIdentity(node.children, target, path));
+    }
+  }
+  return paths;
+};
+
+const hasLocateTargetSchema = (target: SidebarLocateTarget): boolean => {
+  if (target.objectGroup === 'externalSqlFiles') return true;
+  return Boolean(toTrimmedString(target.schemaName) || splitSidebarQualifiedName(target.tableName).schemaName);
+};
+
+const shouldFallbackViewLocateToTableNode = (target: SidebarLocateTarget): boolean => (
+  target.objectGroup === 'views' || target.objectGroup === 'materializedViews'
+);
+
+const selectPreferredSidebarLocatePath = (
+  paths: string[][],
+  target: SidebarLocateTarget,
+): string[] | null => {
+  if (paths.length === 1) return paths[0];
+  if (paths.length === 0 || target.objectGroup === 'externalSqlFiles') return null;
+
+  const targetParsed = splitSidebarQualifiedName(target.tableName);
+  const targetObjectName = normalizeLocateName(targetParsed.objectName || target.tableName);
+  const schemaCandidates = [
+    toTrimmedString(target.schemaName),
+    targetParsed.schemaName,
+    target.dbName,
+  ].filter(Boolean);
+  const normalizedSchemas = Array.from(new Set(schemaCandidates.map(normalizeLocateName)));
+
+  for (const normalizedSchema of normalizedSchemas) {
+    const preferredSchemaKey = `${normalizeLocateName(target.databaseKey)}-schema-${normalizedSchema}`;
+    const bySchemaGroup = paths.filter((path) =>
+      path.some((key) => normalizeLocateName(key) === preferredSchemaKey),
+    );
+    if (bySchemaGroup.length === 1) return bySchemaGroup[0];
+
+    const qualifiedSuffix = `${normalizedSchema}.${targetObjectName}`;
+    const byQualifiedLeafKey = paths.filter((path) => {
+      const leafKey = normalizeLocateName(path[path.length - 1] || '');
+      return leafKey.endsWith(qualifiedSuffix);
+    });
+    if (byQualifiedLeafKey.length === 1) return byQualifiedLeafKey[0];
+  }
+
+  return null;
 };
 
 export const findSidebarNodePathForLocate = (
@@ -243,18 +514,41 @@ export const findSidebarNodePathForLocate = (
   const exactPath = findSidebarNodePathByKey(nodes, target.targetKey);
   if (exactPath) return exactPath;
 
-  for (const node of nodes) {
-    const nodeKey = String(node.key);
-    if (matchesLocateObjectNode(node, target)) {
-      return [nodeKey];
-    }
+  const strictPath = findSidebarNodePathForLocateByObject(nodes, target);
+  if (strictPath) return strictPath;
 
-    if (node.children) {
-      const childPath = findSidebarNodePathForLocate(node.children, target);
-      if (childPath) {
-        return [nodeKey, ...childPath];
-      }
+  const visualIdentityPaths = collectSidebarNodePathsForLocateByVisualIdentity(nodes, target);
+  const visualIdentityPath = selectPreferredSidebarLocatePath(visualIdentityPaths, target);
+  if (visualIdentityPath) return visualIdentityPath;
+
+  if (shouldFallbackViewLocateToTableNode(target)) {
+    const tableLikeTarget = { ...target, objectGroup: 'tables' as const };
+    const tableLikePaths = collectSidebarNodePathsForLocateByObject(nodes, tableLikeTarget);
+    const tableLikePath = selectPreferredSidebarLocatePath(tableLikePaths, target);
+    if (tableLikePath) return tableLikePath;
+    const visualTableLikePaths = collectSidebarNodePathsForLocateByVisualIdentity(nodes, tableLikeTarget);
+    const visualTableLikePath = selectPreferredSidebarLocatePath(visualTableLikePaths, target);
+    if (visualTableLikePath) return visualTableLikePath;
+    if (!hasLocateTargetSchema(target)) {
+      const relaxedTableLikePaths = collectSidebarNodePathsForLocateByObject(
+        nodes,
+        tableLikeTarget,
+        { allowUnqualifiedSchemaMatch: true },
+      );
+      const relaxedTableLikePath = selectPreferredSidebarLocatePath(relaxedTableLikePaths, target);
+      if (relaxedTableLikePath) return relaxedTableLikePath;
     }
   }
+
+  const relaxedPaths = collectSidebarNodePathsForLocateByObject(
+    nodes,
+    target,
+    { allowUnqualifiedSchemaMatch: true },
+  );
+  const relaxedPath = selectPreferredSidebarLocatePath(relaxedPaths, target);
+  if (relaxedPath) return relaxedPath;
+
+  if (hasLocateTargetSchema(target)) return null;
+
   return null;
 };
diff --git a/frontend/src/utils/sidebarMetadata.test.ts b/frontend/src/utils/sidebarMetadata.test.ts
new file mode 100644
index 0000000..b09107a
--- /dev/null
+++ b/frontend/src/utils/sidebarMetadata.test.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  buildMySQLCompatibleViewMetadataSqls,
+  isSidebarViewTableType,
+  normalizeSidebarViewMetadataEntry,
+  normalizeSidebarViewName,
+  resolveSidebarMetadataDialect,
+} from './sidebarMetadata';
+
+describe('sidebarMetadata', () => {
+  it('normalizes MySQL-compatible view names without schema prefixes', () => {
+    expect(normalizeSidebarViewName('mysql', 'SYSDBA', 'SYSDBA', 'SYSDBA.V_ACCOUNT')).toBe('V_ACCOUNT');
+  });
+
+  it('keeps MySQL-compatible view schema metadata after display-name normalization', () => {
+    expect(normalizeSidebarViewMetadataEntry('mysql', 'SYSDBA', 'SYSDBA', 'SYSDBA.V_ACCOUNT')).toEqual({
+      viewName: 'V_ACCOUNT',
+      schemaName: 'SYSDBA',
+    });
+    expect(normalizeSidebarViewMetadataEntry('mysql', 'GDB_APP', 'SYSDBA', 'V_ACCOUNT')).toEqual({
+      viewName: 'V_ACCOUNT',
+      schemaName: 'SYSDBA',
+    });
+  });
+
+  it('uses MySQL metadata queries for custom MySQL-compatible domestic drivers', () => {
+    expect(resolveSidebarMetadataDialect('goldendb')).toBe('mysql');
+    expect(resolveSidebarMetadataDialect('custom', 'gdb')).toBe('mysql');
+    expect(resolveSidebarMetadataDialect('custom', 'goldendb')).toBe('mysql');
+    expect(resolveSidebarMetadataDialect('custom', 'greatdb')).toBe('mysql');
+    expect(resolveSidebarMetadataDialect('custom', 'doris')).toBe('mysql');
+  });
+
+  it('accepts MySQL-compatible view type variants returned by domestic databases', () => {
+    expect(isSidebarViewTableType(undefined)).toBe(true);
+    expect(isSidebarViewTableType('VIEW')).toBe(true);
+    expect(isSidebarViewTableType('SYSTEM VIEW')).toBe(true);
+    expect(isSidebarViewTableType('BASE VIEW')).toBe(true);
+    expect(isSidebarViewTableType('BASE TABLE')).toBe(false);
+    expect(isSidebarViewTableType('MATERIALIZED VIEW')).toBe(false);
+  });
+
+  it('adds SHOW FULL TABLES view-only fallbacks for MySQL-compatible databases', () => {
+    expect(buildMySQLCompatibleViewMetadataSqls('GDB_APP')).toEqual(expect.arrayContaining([
+      "SHOW FULL TABLES FROM `GDB_APP` WHERE Table_type = 'VIEW'",
+      "SHOW FULL TABLES WHERE Table_type = 'VIEW'",
+    ]));
+  });
+});
diff --git a/frontend/src/utils/sidebarMetadata.ts b/frontend/src/utils/sidebarMetadata.ts
index 3bd5d8a..c971afe 100644
--- a/frontend/src/utils/sidebarMetadata.ts
+++ b/frontend/src/utils/sidebarMetadata.ts
@@ -1,17 +1,9 @@
 import { normalizeOceanBaseProtocol } from './oceanBaseProtocol';
+import { splitQualifiedNameLast } from './qualifiedName';
+import { resolveSqlDialect } from './sqlDialect';
 
-const splitQualifiedName = (qualifiedName: string): { schemaName: string; objectName: string } => {
-  const raw = String(qualifiedName || '').trim();
-  if (!raw) return { schemaName: '', objectName: '' };
-  const idx = raw.lastIndexOf('.');
-  if (idx <= 0 || idx >= raw.length - 1) {
-    return { schemaName: '', objectName: raw };
-  }
-  return {
-    schemaName: raw.substring(0, idx),
-    objectName: raw.substring(idx + 1),
-  };
-};
+const escapeSQLLiteral = (raw: string): string => String(raw || '').replace(/'/g, "''");
+const escapeBacktickIdentifier = (raw: string): string => String(raw || '').replace(/`/g, '``');
 
 const normalizeSidebarConnectionDialect = (type: string, driver: string, oceanBaseProtocol?: string): string => {
   const normalizedType = String(type || '').trim().toLowerCase();
@@ -19,6 +11,7 @@ const normalizeSidebarConnectionDialect = (type: string, driver: string, oceanBa
     const normalizedDriver = String(driver || '').trim().toLowerCase();
     if (normalizedDriver === 'postgresql' || normalizedDriver === 'postgres' || normalizedDriver === 'pg') return 'postgres';
     if (normalizedDriver === 'opengauss' || normalizedDriver === 'open_gauss' || normalizedDriver === 'open-gauss') return 'opengauss';
+    if (normalizedDriver === 'gaussdb' || normalizedDriver === 'gauss_db' || normalizedDriver === 'gauss-db') return 'gaussdb';
     if (normalizedDriver === 'dameng' || normalizedDriver === 'dm' || normalizedDriver === 'dm8') return 'dm';
     if (normalizedDriver === 'oceanbase') {
       return normalizeOceanBaseProtocol(oceanBaseProtocol) === 'oracle' ? 'oracle' : 'mysql';
@@ -30,10 +23,20 @@ const normalizeSidebarConnectionDialect = (type: string, driver: string, oceanBa
     return normalizeOceanBaseProtocol(oceanBaseProtocol) === 'oracle' ? 'oracle' : 'mysql';
   }
   if (normalizedType === 'open_gauss' || normalizedType === 'open-gauss') return 'opengauss';
+  if (normalizedType === 'gauss_db' || normalizedType === 'gauss-db') return 'gaussdb';
   if (normalizedType === 'dameng') return 'dm';
   return normalizedType;
 };
 
+export const resolveSidebarMetadataDialect = (type: string, driver = '', oceanBaseProtocol?: unknown): string => {
+  const dialect = String(resolveSqlDialect(type, driver, { oceanBaseProtocol })).trim().toLowerCase();
+  if (dialect === 'diros' || dialect === 'sphinx' || dialect === 'mariadb' || dialect === 'oceanbase') {
+    return 'mysql';
+  }
+  if (dialect === 'dameng') return 'dm';
+  return dialect;
+};
+
 export const normalizeSidebarViewName = (dialect: string, dbName: string, schemaName: string, viewName: string): string => {
   const normalizedDialect = String(dialect || '').trim().toLowerCase();
   const normalizedDbName = String(dbName || '').trim();
@@ -45,7 +48,7 @@ export const normalizeSidebarViewName = (dialect: string, dbName: string, schema
   }
 
   if (normalizedDialect === 'mysql') {
-    const parsed = splitQualifiedName(normalizedViewName);
+    const parsed = splitQualifiedNameLast(normalizedViewName);
     if (parsed.objectName) {
       return parsed.objectName;
     }
@@ -59,6 +62,51 @@ export const normalizeSidebarViewName = (dialect: string, dbName: string, schema
   return `${normalizedSchemaName}.${normalizedViewName}`;
 };
 
+export interface SidebarViewMetadataEntry {
+  viewName: string;
+  schemaName: string;
+}
+
+export const normalizeSidebarViewMetadataEntry = (
+  dialect: string,
+  dbName: string,
+  schemaName: string,
+  viewName: string,
+): SidebarViewMetadataEntry | null => {
+  const normalizedViewName = normalizeSidebarViewName(dialect, dbName, schemaName, viewName);
+  if (!normalizedViewName) return null;
+
+  const parsedViewName = splitQualifiedNameLast(viewName);
+  const parsedNormalizedViewName = splitQualifiedNameLast(normalizedViewName);
+  return {
+    viewName: normalizedViewName,
+    schemaName: String(schemaName || parsedNormalizedViewName.parentPath || parsedViewName.parentPath || '').trim(),
+  };
+};
+
+export const isSidebarViewTableType = (tableType: unknown): boolean => {
+  const normalizedType = String(tableType ?? '').trim().toUpperCase();
+  if (!normalizedType) return true;
+  return normalizedType.includes('VIEW') && !normalizedType.includes('MATERIALIZED');
+};
+
+export const buildMySQLCompatibleViewMetadataSqls = (dbName: string): string[] => {
+  const safeDbName = escapeSQLLiteral(dbName);
+  const dbIdent = escapeBacktickIdentifier(dbName).trim();
+  return [
+    safeDbName
+      ? `SELECT TABLE_NAME AS view_name, TABLE_SCHEMA AS schema_name FROM information_schema.views WHERE table_schema = '${safeDbName}' ORDER BY TABLE_NAME`
+      : '',
+    safeDbName
+      ? `SELECT TABLE_NAME AS view_name, TABLE_SCHEMA AS schema_name, TABLE_TYPE AS table_type FROM information_schema.tables WHERE table_schema = '${safeDbName}' AND UPPER(TABLE_TYPE) LIKE '%VIEW%' ORDER BY TABLE_NAME`
+      : '',
+    dbIdent ? `SHOW FULL TABLES FROM \`${dbIdent}\` WHERE Table_type = 'VIEW'` : '',
+    dbIdent ? `SHOW FULL TABLES FROM \`${dbIdent}\`` : '',
+    `SHOW FULL TABLES WHERE Table_type = 'VIEW'`,
+    `SHOW FULL TABLES`,
+  ].filter(Boolean);
+};
+
 export const resolveSidebarRuntimeDatabase = (
   type: string,
   driver: string,
diff --git a/frontend/src/utils/sidebarSqlDrag.ts b/frontend/src/utils/sidebarSqlDrag.ts
new file mode 100644
index 0000000..d9d6433
--- /dev/null
+++ b/frontend/src/utils/sidebarSqlDrag.ts
@@ -0,0 +1,39 @@
+export const SIDEBAR_SQL_EDITOR_DRAG_MIME = 'application/x-gonavi-sql-object';
+
+export interface SidebarSqlEditorDragPayload {
+  text: string;
+  nodeType?: string;
+  connectionId?: string;
+  dbName?: string;
+}
+
+export const encodeSidebarSqlEditorDragPayload = (payload: SidebarSqlEditorDragPayload): string =>
+  JSON.stringify({
+    text: String(payload.text || '').trim(),
+    nodeType: payload.nodeType ? String(payload.nodeType) : undefined,
+    connectionId: payload.connectionId ? String(payload.connectionId) : undefined,
+    dbName: payload.dbName ? String(payload.dbName) : undefined,
+  });
+
+export const hasSidebarSqlEditorDragPayload = (dataTransfer: Pick<DataTransfer, 'types'> | null | undefined): boolean => {
+  const rawTypes = dataTransfer?.types;
+  if (!rawTypes) return false;
+  const types = Array.from(rawTypes as any).map((type) => String(type || '').toLowerCase());
+  return types.includes(SIDEBAR_SQL_EDITOR_DRAG_MIME);
+};
+
+export const decodeSidebarSqlEditorDragPayload = (value: string): SidebarSqlEditorDragPayload | null => {
+  try {
+    const parsed = JSON.parse(String(value || '')) as SidebarSqlEditorDragPayload;
+    const text = String(parsed?.text || '').trim();
+    if (!text) return null;
+    return {
+      text,
+      nodeType: parsed?.nodeType ? String(parsed.nodeType) : undefined,
+      connectionId: parsed?.connectionId ? String(parsed.connectionId) : undefined,
+      dbName: parsed?.dbName ? String(parsed.dbName) : undefined,
+    };
+  } catch {
+    return null;
+  }
+};
diff --git a/frontend/src/utils/sql.test.ts b/frontend/src/utils/sql.test.ts
index 7f06dff..4368c96 100644
--- a/frontend/src/utils/sql.test.ts
+++ b/frontend/src/utils/sql.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { buildOrderBySQL, buildPaginatedSelectSQL, reverseOrderBySQL } from './sql';
+import { buildOrderBySQL, buildPaginatedSelectSQL, quoteQualifiedIdent, reverseOrderBySQL } from './sql';
 
 describe('buildOrderBySQL', () => {
   it('does not add fallback ORDER BY for DuckDB without explicit sort', () => {
@@ -52,3 +52,45 @@ describe('reverseOrderBySQL', () => {
       .toBe(' ORDER BY COALESCE([a], [b]) DESC, [id] ASC');
   });
 });
+
+describe('quoteQualifiedIdent', () => {
+  it('quotes Apache IoTDB device paths with backticks per path segment', () => {
+    expect(quoteQualifiedIdent('iotdb', 'root.sg.d1'))
+      .toBe('`root`.`sg`.`d1`');
+  });
+
+  it('keeps RocketMQ topic names as one quoted identifier', () => {
+    expect(quoteQualifiedIdent('rocketmq', 'orders.events.v1'))
+      .toBe('"orders.events.v1"');
+  });
+
+  it('keeps MQTT topic filters as one quoted identifier', () => {
+    expect(quoteQualifiedIdent('mqtt', 'devices/+/telemetry.v1'))
+      .toBe('"devices/+/telemetry.v1"');
+  });
+
+  it('keeps Kafka topic names as one quoted identifier', () => {
+    expect(quoteQualifiedIdent('kafka', 'logs.app-1'))
+      .toBe('"logs.app-1"');
+  });
+
+  it('keeps RabbitMQ queue names as one quoted identifier', () => {
+    expect(quoteQualifiedIdent('rabbitmq', 'orders.events.v1'))
+      .toBe('"orders.events.v1"');
+  });
+
+  it('quotes GoldenDB identifiers with MySQL-style backticks', () => {
+    expect(quoteQualifiedIdent('goldendb', 'ledger.entries'))
+      .toBe('`ledger`.`entries`');
+  });
+
+  it('does not split dots inside quoted DuckDB identifiers', () => {
+    expect(quoteQualifiedIdent('duckdb', '"daily.events"."2026.06"'))
+      .toBe('"daily.events"."2026.06"');
+  });
+
+  it('preserves three-part DuckDB names with quoted dots', () => {
+    expect(quoteQualifiedIdent('duckdb', '"analytics.catalog"."main.schema"."daily.events"'))
+      .toBe('"analytics.catalog"."main.schema"."daily.events"');
+  });
+});
diff --git a/frontend/src/utils/sql.ts b/frontend/src/utils/sql.ts
index d55f80d..6d9449c 100644
--- a/frontend/src/utils/sql.ts
+++ b/frontend/src/utils/sql.ts
@@ -1,3 +1,5 @@
+import { splitQualifiedNameSegments, stripIdentifierQuotes } from './qualifiedName';
+
 export type FilterCondition = {
   id?: number;
   enabled?: boolean;
@@ -8,17 +10,7 @@ export type FilterCondition = {
   value2?: string;
 };
 
-const normalizeIdentPart = (ident: string) => {
-  let raw = (ident || '').trim();
-  if (!raw) return raw;
-  const first = raw[0];
-  const last = raw[raw.length - 1];
-  if ((first === '"' && last === '"') || (first === '`' && last === '`')) {
-    raw = raw.slice(1, -1).trim();
-  }
-  raw = raw.replace(/["`]/g, '').trim();
-  return raw;
-};
+const normalizeIdentPart = (ident: string) => stripIdentifierQuotes(ident);
 
 // 检查标识符是否需要引号（包含特殊字符或是保留字）
 const needsQuote = (ident: string): boolean => {
@@ -37,12 +29,12 @@ export const quoteIdentPart = (dbType: string, ident: string) => {
   if (!raw) return raw;
   const dbTypeLower = (dbType || '').toLowerCase();
 
-  if (dbTypeLower === 'mysql' || dbTypeLower === 'mariadb' || dbTypeLower === 'oceanbase' || dbTypeLower === 'diros' || dbTypeLower === 'starrocks' || dbTypeLower === 'sphinx' || dbTypeLower === 'tdengine' || dbTypeLower === 'clickhouse') {
+  if (dbTypeLower === 'mysql' || dbTypeLower === 'goldendb' || dbTypeLower === 'mariadb' || dbTypeLower === 'oceanbase' || dbTypeLower === 'diros' || dbTypeLower === 'starrocks' || dbTypeLower === 'sphinx' || dbTypeLower === 'tdengine' || dbTypeLower === 'iotdb' || dbTypeLower === 'clickhouse') {
     return `\`${raw.replace(/`/g, '``')}\``;
   }
 
   // 对于 KingBase/PostgreSQL，只在必要时加引号
-  if (dbTypeLower === 'kingbase' || dbTypeLower === 'postgres' || dbTypeLower === 'opengauss') {
+  if (dbTypeLower === 'kingbase' || dbTypeLower === 'postgres' || dbTypeLower === 'opengauss' || dbTypeLower === 'gaussdb') {
     if (needsQuote(raw)) {
       return `"${raw.replace(/"/g, '""')}"`;
     }
@@ -62,9 +54,13 @@ export const quoteIdentPart = (dbType: string, ident: string) => {
 export const quoteQualifiedIdent = (dbType: string, ident: string) => {
   const raw = (ident || '').trim();
   if (!raw) return raw;
-  const parts = raw.split('.').map(normalizeIdentPart).filter(Boolean);
-  if (parts.length <= 1) return quoteIdentPart(dbType, raw);
-  return parts.map(p => quoteIdentPart(dbType, p)).join('.');
+  if (['rocketmq', 'mqtt', 'kafka', 'rabbitmq'].includes((dbType || '').trim().toLowerCase())) {
+    return quoteIdentPart(dbType, raw);
+  }
+  const parts = splitQualifiedNameSegments(raw).filter(Boolean);
+  if (parts.length === 0) return quoteIdentPart(dbType, raw);
+  if (parts.length === 1 && parts[0] === normalizeIdentPart(raw)) return quoteIdentPart(dbType, raw);
+  return parts.map((part) => quoteIdentPart(dbType, part)).join('.');
 };
 
 export const escapeLiteral = (val: string) => (val || '').replace(/'/g, "''");
@@ -153,7 +149,7 @@ export const buildOrderBySQL = (
   // 部分数据源在无显式排序需求时强制 ORDER BY（即使按主键）会显著放大大表预览成本：
   // MySQL/MariaDB 可能触发 filesort 和 sort memory 错误，DuckDB 大文件可能被排序拖到连接超时。
   // 因此仅在用户主动点击排序时下发 ORDER BY，默认分页查询不加兜底排序。
-  if (dbTypeLower === 'mysql' || dbTypeLower === 'mariadb' || dbTypeLower === 'oceanbase' || dbTypeLower === 'diros' || dbTypeLower === 'starrocks' || dbTypeLower === 'duckdb') {
+  if (dbTypeLower === 'mysql' || dbTypeLower === 'goldendb' || dbTypeLower === 'mariadb' || dbTypeLower === 'oceanbase' || dbTypeLower === 'diros' || dbTypeLower === 'starrocks' || dbTypeLower === 'duckdb') {
     return '';
   }
 
diff --git a/frontend/src/utils/sqlDialect.test.ts b/frontend/src/utils/sqlDialect.test.ts
index 9b7b81e..ebce9c2 100644
--- a/frontend/src/utils/sqlDialect.test.ts
+++ b/frontend/src/utils/sqlDialect.test.ts
@@ -19,6 +19,7 @@ describe('sqlDialect', () => {
   it('normalizes datasource aliases without collapsing all dialects to mysql', () => {
     expect(resolveSqlDialect('postgresql')).toBe('postgres');
     expect(resolveSqlDialect('OpenGauss')).toBe('opengauss');
+    expect(resolveSqlDialect('GaussDB')).toBe('gaussdb');
     expect(resolveSqlDialect('OceanBase')).toBe('oceanbase');
     expect(resolveSqlDialect('doris')).toBe('diros');
     expect(resolveSqlDialect('StarRocks')).toBe('starrocks');
@@ -28,7 +29,27 @@ describe('sqlDialect', () => {
     expect(resolveSqlDialect('custom', 'kingbase8')).toBe('kingbase');
     expect(resolveSqlDialect('custom', 'dm8')).toBe('dameng');
     expect(resolveSqlDialect('custom', 'mariadb')).toBe('mariadb');
+    expect(resolveSqlDialect('custom', 'gdb')).toBe('mysql');
+    expect(resolveSqlDialect('custom', 'goldendb')).toBe('mysql');
+    expect(resolveSqlDialect('custom', 'greatdb')).toBe('mysql');
     expect(resolveSqlDialect('custom', 'open_gauss')).toBe('opengauss');
+    expect(resolveSqlDialect('custom', 'gauss_db')).toBe('gaussdb');
+    expect(resolveSqlDialect('Elasticsearch')).toBe('elasticsearch');
+    expect(resolveSqlDialect('custom', 'elastic')).toBe('elasticsearch');
+    expect(resolveSqlDialect('ChromaDB')).toBe('chroma');
+    expect(resolveSqlDialect('custom', 'chroma-db')).toBe('chroma');
+    expect(resolveSqlDialect('QdrantDB')).toBe('qdrant');
+    expect(resolveSqlDialect('custom', 'qdrant-db')).toBe('qdrant');
+    expect(resolveSqlDialect('Apache-IoTDB')).toBe('iotdb');
+    expect(resolveSqlDialect('custom', 'apache_iotdb')).toBe('iotdb');
+    expect(resolveSqlDialect('Rocket-MQ')).toBe('rocketmq');
+    expect(resolveSqlDialect('custom', 'rmq')).toBe('rocketmq');
+    expect(resolveSqlDialect('MQTTS')).toBe('mqtt');
+    expect(resolveSqlDialect('custom', 'mqtts')).toBe('mqtt');
+    expect(resolveSqlDialect('Apache-Kafka')).toBe('kafka');
+    expect(resolveSqlDialect('custom', 'apache_kafka')).toBe('kafka');
+    expect(resolveSqlDialect('Rabbit-MQ')).toBe('rabbitmq');
+    expect(resolveSqlDialect('custom', 'rabbit_mq')).toBe('rabbitmq');
     expect(resolveSqlDialect('OceanBase', '', { oceanBaseProtocol: 'oracle' })).toBe('oracle');
     expect(resolveSqlDialect('custom', 'oceanbase', { oceanBaseProtocol: 'oracle' })).toBe('oracle');
     expect(isMysqlFamilyDialect('mariadb')).toBe(true);
@@ -43,6 +64,7 @@ describe('sqlDialect', () => {
     expect(values(resolveColumnTypeOptions('dameng'))).toContain('VARCHAR2(255)');
     expect(values(resolveColumnTypeOptions('kingbase'))).toContain('integer');
     expect(values(resolveColumnTypeOptions('opengauss'))).toContain('integer');
+    expect(values(resolveColumnTypeOptions('gaussdb'))).toContain('integer');
     expect(values(resolveColumnTypeOptions('oceanbase'))).toContain('varchar(255)');
     expect(values(resolveColumnTypeOptions('kingbase'))).not.toContain('tinyint(1)');
     expect(values(resolveColumnTypeOptions('diros'))).toContain('LARGEINT');
@@ -51,9 +73,42 @@ describe('sqlDialect', () => {
     expect(values(resolveColumnTypeOptions('clickhouse'))).toContain('DateTime64(3)');
     expect(values(resolveColumnTypeOptions('iris'))).toContain('varchar(255)');
     expect(values(resolveColumnTypeOptions('tdengine'))).toContain('TIMESTAMP');
+    expect(values(resolveColumnTypeOptions('iotdb'))).toContain('INT64');
     expect(values(resolveColumnTypeOptions('duckdb'))).toContain('STRUCT');
   });
 
+  it('resolves Apache IoTDB completion keywords and functions independently', () => {
+    expect(resolveSqlKeywords('iotdb')).toEqual(expect.arrayContaining(['ALIGN BY DEVICE', 'SHOW TIMESERIES', 'WITH DATATYPE']));
+    expect(names(resolveSqlFunctions('iotdb'))).toEqual(expect.arrayContaining(['DATE_BIN', 'DIFF', 'TOP_K']));
+    expect(resolveSqlKeywords('iotdb')).not.toEqual(expect.arrayContaining(['TAGS', 'USING']));
+  });
+
+  it('resolves RocketMQ completion keywords for topic discovery and consume syntax', () => {
+    expect(resolveSqlKeywords('rocketmq')).toEqual(expect.arrayContaining(['SHOW TOPICS', 'DESCRIBE TOPIC', 'CONSUME']));
+    expect(resolveSqlKeywords('rocketmq')).not.toEqual(expect.arrayContaining(['ALIGN BY DEVICE', 'AUTO_INCREMENT']));
+  });
+
+  it('resolves MQTT completion keywords for topic discovery and consume syntax', () => {
+    expect(resolveSqlKeywords('mqtt')).toEqual(expect.arrayContaining(['SHOW TOPICS', 'DESCRIBE TOPIC', 'CONSUME']));
+    expect(resolveSqlKeywords('mqtt')).not.toEqual(expect.arrayContaining(['ALIGN BY DEVICE', 'AUTO_INCREMENT']));
+  });
+
+  it('resolves Kafka completion keywords for topic discovery and consume syntax', () => {
+    expect(resolveSqlKeywords('kafka')).toEqual(expect.arrayContaining(['SHOW TOPICS', 'DESCRIBE TOPIC', 'CONSUME']));
+    expect(resolveSqlKeywords('kafka')).not.toEqual(expect.arrayContaining(['ALIGN BY DEVICE', 'AUTO_INCREMENT']));
+  });
+
+  it('resolves RabbitMQ completion keywords for queue and exchange discovery', () => {
+    expect(resolveSqlKeywords('rabbitmq')).toEqual(expect.arrayContaining(['SHOW VHOSTS', 'SHOW QUEUES', 'SHOW EXCHANGES', 'DESCRIBE QUEUE']));
+    expect(resolveSqlKeywords('rabbitmq')).not.toEqual(expect.arrayContaining(['ALIGN BY DEVICE', 'AUTO_INCREMENT']));
+  });
+
+  it('resolves GaussDB completion keywords and functions as a PostgreSQL-like dialect', () => {
+    expect(resolveSqlKeywords('gaussdb')).toEqual(expect.arrayContaining(['RETURNING', 'SERIAL', 'JSONB']));
+    expect(names(resolveSqlFunctions('gaussdb'))).toEqual(expect.arrayContaining(['STRING_AGG', 'TO_CHAR', 'CURRENT_DATABASE']));
+    expect(resolveSqlKeywords('gaussdb')).not.toEqual(expect.arrayContaining(['AUTO_INCREMENT', 'CHANGE']));
+  });
+
   it('resolves oracle completion keywords and functions without mysql-only suggestions', () => {
     expect(resolveSqlKeywords('oracle')).toEqual(expect.arrayContaining(['ROWNUM', 'FETCH', 'VARCHAR2', 'NUMBER']));
     expect(resolveSqlKeywords('oracle')).not.toEqual(expect.arrayContaining(['AUTO_INCREMENT', 'CHANGE', 'LIMIT']));
diff --git a/frontend/src/utils/sqlDialect.ts b/frontend/src/utils/sqlDialect.ts
index 771bef7..759f9de 100644
--- a/frontend/src/utils/sqlDialect.ts
+++ b/frontend/src/utils/sqlDialect.ts
@@ -20,6 +20,7 @@ export type SqlDialect =
   | 'highgo'
   | 'vastbase'
   | 'opengauss'
+  | 'gaussdb'
   | 'oracle'
   | 'dameng'
   | 'sqlserver'
@@ -28,8 +29,16 @@ export type SqlDialect =
   | 'duckdb'
   | 'clickhouse'
   | 'tdengine'
+  | 'iotdb'
+  | 'rocketmq'
+  | 'mqtt'
+  | 'kafka'
+  | 'rabbitmq'
   | 'mongodb'
   | 'redis'
+  | 'elasticsearch'
+  | 'chroma'
+  | 'qdrant'
   | 'unknown'
   | string;
 
@@ -66,6 +75,10 @@ export const resolveSqlDialect = (
     case 'open_gauss':
     case 'open-gauss':
       return 'opengauss';
+    case 'gaussdb':
+    case 'gauss_db':
+    case 'gauss-db':
+      return 'gaussdb';
     case 'mssql':
     case 'sql_server':
     case 'sql-server':
@@ -94,6 +107,10 @@ export const resolveSqlDialect = (
     case 'kingbasees':
     case 'kingbasev8':
       return 'kingbase';
+    case 'gdb':
+    case 'goldendb':
+    case 'greatdb':
+      return 'mysql';
     case 'mariadb':
     case 'oceanbase':
     case 'mysql':
@@ -105,17 +122,52 @@ export const resolveSqlDialect = (
     case 'duckdb':
     case 'clickhouse':
     case 'tdengine':
+    case 'iotdb':
     case 'mongodb':
     case 'redis':
+    case 'elasticsearch':
       return source;
+    case 'elastic':
+      return 'elasticsearch';
+    case 'chromadb':
+    case 'chroma-db':
+    case 'chroma':
+      return 'chroma';
+    case 'qdrantdb':
+    case 'qdrant-db':
+    case 'qdrant':
+      return 'qdrant';
+    case 'apache-iotdb':
+    case 'apache_iotdb':
+      return 'iotdb';
+    case 'rocketmq':
+    case 'rocket-mq':
+    case 'rocket_mq':
+    case 'apache-rocketmq':
+    case 'apache_rocketmq':
+    case 'rmq':
+      return 'rocketmq';
+    case 'mqtt':
+    case 'mqtts':
+      return 'mqtt';
+    case 'kafka':
+    case 'apache-kafka':
+    case 'apache_kafka':
+      return 'kafka';
+    case 'rabbitmq':
+    case 'rabbit-mq':
+    case 'rabbit_mq':
+      return 'rabbitmq';
     default:
       break;
   }
 
   if (source.includes('opengauss') || source.includes('open_gauss') || source.includes('open-gauss')) return 'opengauss';
+  if (source.includes('gaussdb') || source.includes('gauss_db') || source.includes('gauss-db')) return 'gaussdb';
   if (source.includes('postgres')) return 'postgres';
   if (source.includes('oceanbase')) return 'oceanbase';
   if (source.includes('mariadb')) return 'mariadb';
+  if (source.includes('goldendb') || source.includes('greatdb')) return 'mysql';
   if (source.includes('mysql')) return 'mysql';
   if (source.includes('doris') || source.includes('diros')) return 'diros';
   if (source.includes('starrocks')) return 'starrocks';
@@ -129,8 +181,16 @@ export const resolveSqlDialect = (
   if (source.includes('duckdb')) return 'duckdb';
   if (source.includes('clickhouse')) return 'clickhouse';
   if (source.includes('tdengine')) return 'tdengine';
+  if (source.includes('iotdb')) return 'iotdb';
+  if (source.includes('rocketmq') || source.includes('rocket-mq') || source.includes('rocket_mq') || source === 'rmq') return 'rocketmq';
+  if (source.includes('mqtt')) return 'mqtt';
+  if (source.includes('kafka')) return 'kafka';
+  if (source.includes('rabbitmq') || source.includes('rabbit-mq') || source.includes('rabbit_mq')) return 'rabbitmq';
   if (source.includes('sqlserver') || source.includes('mssql')) return 'sqlserver';
   if (source.includes('iris') || source.includes('intersystems')) return 'iris';
+  if (source.includes('elastic')) return 'elasticsearch';
+  if (source.includes('chroma')) return 'chroma';
+  if (source.includes('qdrant')) return 'qdrant';
 
   return source;
 };
@@ -140,7 +200,7 @@ export const isMysqlFamilyDialect = (dbType: string): boolean => (
 );
 
 export const isPgLikeDialect = (dbType: string): boolean => (
-  ['postgres', 'kingbase', 'highgo', 'vastbase', 'opengauss'].includes(resolveSqlDialect(dbType))
+  ['postgres', 'kingbase', 'highgo', 'vastbase', 'opengauss', 'gaussdb'].includes(resolveSqlDialect(dbType))
 );
 
 export const isOracleLikeDialect = (dbType: string): boolean => (
@@ -150,7 +210,7 @@ export const isOracleLikeDialect = (dbType: string): boolean => (
 export const isSqlServerDialect = (dbType: string): boolean => resolveSqlDialect(dbType) === 'sqlserver';
 
 export const isBacktickIdentifierDialect = (dbType: string): boolean => (
-  isMysqlFamilyDialect(dbType) || ['clickhouse', 'tdengine'].includes(resolveSqlDialect(dbType))
+  isMysqlFamilyDialect(dbType) || ['clickhouse', 'tdengine', 'iotdb'].includes(resolveSqlDialect(dbType))
 );
 
 const stripIdentifierQuotes = (part: string): string => {
@@ -449,6 +509,19 @@ const TDENGINE_TYPES = optionValues([
   'GEOMETRY',
 ]);
 
+const IOTDB_TYPES = optionValues([
+  'BOOLEAN',
+  'INT32',
+  'INT64',
+  'FLOAT',
+  'DOUBLE',
+  'TEXT',
+  'STRING',
+  'BLOB',
+  'TIMESTAMP',
+  'DATE',
+]);
+
 const DUCKDB_TYPES = optionValues([
   'BOOLEAN',
   'TINYINT',
@@ -493,6 +566,7 @@ export const resolveColumnTypeOptions = (dbType: string): ColumnTypeOption[] =>
   if (dialect === 'duckdb') return DUCKDB_TYPES;
   if (dialect === 'clickhouse') return CLICKHOUSE_TYPES;
   if (dialect === 'tdengine') return TDENGINE_TYPES;
+  if (dialect === 'iotdb') return IOTDB_TYPES;
   return COMMON_TYPES;
 };
 
@@ -544,6 +618,67 @@ const STARROCKS_KEYWORDS = [
 
 const TDENGINE_KEYWORDS = ['LIMIT', 'SLIMIT', 'SOFFSET', 'TAGS', 'USING', 'INTERVAL', 'FILL', 'PARTITION BY'];
 
+const IOTDB_KEYWORDS = [
+  'LIMIT',
+  'OFFSET',
+  'ALIGN BY DEVICE',
+  'DISABLE ALIGN',
+  'GROUP BY',
+  'LEVEL',
+  'FILL',
+  'SLIMIT',
+  'SOFFSET',
+  'CREATE TIMESERIES',
+  'SHOW TIMESERIES',
+  'SHOW DEVICES',
+  'SHOW DATABASES',
+  'STORAGE GROUP',
+  'WITH DATATYPE',
+  'ENCODING',
+  'COMPRESSION',
+];
+
+const ROCKETMQ_KEYWORDS = [
+  'SHOW TOPICS',
+  'DESCRIBE TOPIC',
+  'CONSUME',
+  'FROM',
+  'LIMIT',
+  'OFFSET',
+];
+
+const MQTT_KEYWORDS = [
+  'SHOW TOPICS',
+  'DESCRIBE TOPIC',
+  'CONSUME',
+  'FROM',
+  'LIMIT',
+  'OFFSET',
+];
+
+const KAFKA_KEYWORDS = [
+  'SHOW TOPICS',
+  'SHOW TOPIC',
+  'DESCRIBE TOPIC',
+  'CONSUME',
+  'GROUP',
+  'FROM',
+  'LIMIT',
+  'OFFSET',
+];
+
+const RABBITMQ_KEYWORDS = [
+  'SHOW VHOSTS',
+  'SHOW QUEUES',
+  'SHOW EXCHANGES',
+  'DESCRIBE QUEUE',
+  'DESCRIBE EXCHANGE',
+  'CONSUME',
+  'FROM',
+  'LIMIT',
+  'OFFSET',
+];
+
 export const resolveSqlKeywords = (dbType: string): string[] => {
   const dialect = resolveSqlDialect(dbType);
   if (dialect === 'starrocks') return unique([...COMMON_KEYWORDS, ...MYSQL_KEYWORDS, ...STARROCKS_KEYWORDS]);
@@ -555,6 +690,11 @@ export const resolveSqlKeywords = (dbType: string): string[] => {
   if (dialect === 'duckdb') return unique([...COMMON_KEYWORDS, ...DUCKDB_KEYWORDS]);
   if (dialect === 'clickhouse') return unique([...COMMON_KEYWORDS, ...CLICKHOUSE_KEYWORDS]);
   if (dialect === 'tdengine') return unique([...COMMON_KEYWORDS, ...TDENGINE_KEYWORDS]);
+  if (dialect === 'iotdb') return unique([...COMMON_KEYWORDS, ...IOTDB_KEYWORDS]);
+  if (dialect === 'rocketmq') return unique([...COMMON_KEYWORDS, ...ROCKETMQ_KEYWORDS]);
+  if (dialect === 'mqtt') return unique([...COMMON_KEYWORDS, ...MQTT_KEYWORDS]);
+  if (dialect === 'kafka') return unique([...COMMON_KEYWORDS, ...KAFKA_KEYWORDS]);
+  if (dialect === 'rabbitmq') return unique([...COMMON_KEYWORDS, ...RABBITMQ_KEYWORDS]);
   return COMMON_KEYWORDS;
 };
 
@@ -790,6 +930,19 @@ const TDENGINE_FUNCTIONS = [
   fn('IRATE', vendorDetail('TDengine', 'query_editor.completion.action.instant_rate_of_change')),
 ];
 
+const IOTDB_FUNCTIONS = [
+  fn('NOW', vendorDetail('IoTDB', 'query_editor.completion.action.current_time')),
+  fn('DATE_BIN', vendorDetail('IoTDB', 'query_editor.completion.action.date_truncation')),
+  fn('DIFF', vendorDetail('IoTDB', 'query_editor.completion.action.time_difference')),
+  fn('TIME_DIFFERENCE', vendorDetail('IoTDB', 'query_editor.completion.action.time_difference')),
+  fn('DERIVATIVE', vendorDetail('IoTDB', 'query_editor.completion.action.rate_of_change')),
+  fn('NON_NEGATIVE_DERIVATIVE', vendorDetail('IoTDB', 'query_editor.completion.action.rate_of_change')),
+  fn('TOP_K', vendorDetail('IoTDB', 'query_editor.completion.action.maximum')),
+  fn('BOTTOM_K', vendorDetail('IoTDB', 'query_editor.completion.action.minimum')),
+  fn('M4', vendorDetail('IoTDB', 'query_editor.completion.action.approximate_quantile')),
+  fn('EQUAL_SIZE_BUCKET_RANDOM_SAMPLE', vendorDetail('IoTDB', 'query_editor.completion.action.random_number')),
+];
+
 const mergeFunctions = (items: SqlFunctionDefinition[]): SqlFunctionCompletion[] => {
   const seen = new Set<string>();
   const result: SqlFunctionCompletion[] = [];
@@ -816,5 +969,6 @@ export const resolveSqlFunctions = (dbType: string): SqlFunctionCompletion[] =>
   if (dialect === 'duckdb') return mergeFunctions([...COMMON_FUNCTIONS, ...DUCKDB_FUNCTIONS]);
   if (dialect === 'clickhouse') return mergeFunctions([...COMMON_FUNCTIONS, ...CLICKHOUSE_FUNCTIONS]);
   if (dialect === 'tdengine') return mergeFunctions([...COMMON_FUNCTIONS, ...TDENGINE_FUNCTIONS]);
+  if (dialect === 'iotdb') return mergeFunctions([...COMMON_FUNCTIONS, ...IOTDB_FUNCTIONS]);
   return mergeFunctions(COMMON_FUNCTIONS);
 };
diff --git a/frontend/src/utils/sqlEditorTransaction.test.ts b/frontend/src/utils/sqlEditorTransaction.test.ts
new file mode 100644
index 0000000..efd76e5
--- /dev/null
+++ b/frontend/src/utils/sqlEditorTransaction.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  resolveSqlEditorOperationKeyword,
+  shouldUseSqlEditorManagedTransaction,
+} from './sqlEditorTransaction';
+
+describe('sqlEditorTransaction', () => {
+  it('keeps regular DML in a managed transaction', () => {
+    expect(shouldUseSqlEditorManagedTransaction(['UPDATE users SET name = "n" WHERE id = 1'])).toBe(true);
+    expect(shouldUseSqlEditorManagedTransaction(['INSERT INTO users(id) VALUES (1)'])).toBe(true);
+    expect(shouldUseSqlEditorManagedTransaction(['DELETE FROM users WHERE id = 1'])).toBe(true);
+  });
+
+  it('classifies WITH statements by their top-level operation', () => {
+    expect(resolveSqlEditorOperationKeyword('WITH target AS (SELECT id FROM users) SELECT * FROM target')).toBe('select');
+    expect(resolveSqlEditorOperationKeyword('WITH target AS (SELECT id FROM users) UPDATE users SET synced = 1')).toBe('update');
+    expect(resolveSqlEditorOperationKeyword('WITH target AS (SELECT id FROM users) DELETE FROM users WHERE id IN (SELECT id FROM target)')).toBe('delete');
+  });
+
+  it('uses managed transactions for WITH DML but not WITH SELECT', () => {
+    expect(shouldUseSqlEditorManagedTransaction([
+      'WITH target AS (SELECT id FROM users) UPDATE users SET synced = 1 WHERE id IN (SELECT id FROM target)',
+    ])).toBe(true);
+    expect(shouldUseSqlEditorManagedTransaction([
+      'WITH target AS (SELECT id FROM users) SELECT * FROM target',
+    ])).toBe(false);
+  });
+
+  it('uses managed transactions for data-changing CTEs even when the top-level operation is SELECT', () => {
+    const sql = 'WITH moved AS (DELETE FROM audit_logs WHERE created_at < NOW() RETURNING id) SELECT * FROM moved';
+    expect(resolveSqlEditorOperationKeyword(sql)).toBe('select');
+    expect(shouldUseSqlEditorManagedTransaction([sql])).toBe(true);
+  });
+
+  it('does not wrap user-authored explicit transactions', () => {
+    expect(shouldUseSqlEditorManagedTransaction([
+      'BEGIN',
+      'UPDATE users SET name = "n" WHERE id = 1',
+      'COMMIT',
+    ])).toBe(false);
+    expect(shouldUseSqlEditorManagedTransaction([
+      'START TRANSACTION',
+      'DELETE FROM users WHERE id = 1',
+    ])).toBe(false);
+  });
+});
diff --git a/frontend/src/utils/sqlEditorTransaction.ts b/frontend/src/utils/sqlEditorTransaction.ts
new file mode 100644
index 0000000..6cc505f
--- /dev/null
+++ b/frontend/src/utils/sqlEditorTransaction.ts
@@ -0,0 +1,267 @@
+const SQL_EDITOR_DML_KEYWORDS = new Set(['insert', 'update', 'delete', 'replace', 'merge', 'upsert']);
+const SQL_EDITOR_READ_KEYWORDS = new Set(['select', 'with', 'show', 'describe', 'desc', 'explain', 'pragma', 'values']);
+const SQL_EDITOR_TRANSACTION_CONTROL_KEYWORDS = new Set(['begin', 'commit', 'rollback', 'savepoint', 'release']);
+
+type SqlEditorWithAnalysis = {
+    keyword: string;
+    cteHasManagedWrite: boolean;
+};
+
+const isSqlEditorKeywordChar = (char: string | undefined): boolean => !!char && /[A-Za-z0-9_]/.test(char);
+
+const skipSqlEditorTrivia = (text: string, start: number): number => {
+    let pos = start;
+    while (pos < text.length) {
+        const char = text[pos];
+        if (/\s/.test(char || '')) {
+            pos++;
+            continue;
+        }
+        if (text.startsWith('--', pos) || text.startsWith('#', pos)) {
+            const nextLine = text.indexOf('\n', pos);
+            if (nextLine < 0) return text.length;
+            pos = nextLine + 1;
+            continue;
+        }
+        if (text.startsWith('/*', pos)) {
+            const blockEnd = text.indexOf('*/', pos + 2);
+            if (blockEnd < 0) return text.length;
+            pos = blockEnd + 2;
+            continue;
+        }
+        return pos;
+    }
+    return pos;
+};
+
+const readSqlEditorKeyword = (text: string, start: number): { keyword: string; end: number } => {
+    const pos = skipSqlEditorTrivia(text, start);
+    if (!isSqlEditorKeywordChar(text[pos])) {
+        return { keyword: '', end: pos };
+    }
+    let end = pos + 1;
+    while (isSqlEditorKeywordChar(text[end])) {
+        end++;
+    }
+    return { keyword: text.slice(pos, end).toLowerCase(), end };
+};
+
+const skipSqlEditorDelimited = (text: string, start: number, delimiter: string): number => {
+    let pos = start + 1;
+    while (pos < text.length) {
+        if (text[pos] === delimiter) {
+            if (text[pos + 1] === delimiter) {
+                pos += 2;
+                continue;
+            }
+            return pos + 1;
+        }
+        pos++;
+    }
+    return text.length;
+};
+
+const resolveSqlEditorDollarQuoteTag = (text: string, start: number): string => {
+    if (text[start] !== '$') return '';
+    let end = start + 1;
+    while (isSqlEditorKeywordChar(text[end])) {
+        end++;
+    }
+    return text[end] === '$' ? text.slice(start, end + 1) : '';
+};
+
+const skipSqlEditorQuotedOrComment = (text: string, start: number): number | null => {
+    if (text.startsWith('--', start) || text.startsWith('#', start)) {
+        const nextLine = text.indexOf('\n', start);
+        return nextLine < 0 ? text.length : nextLine + 1;
+    }
+    if (text.startsWith('/*', start)) {
+        const blockEnd = text.indexOf('*/', start + 2);
+        return blockEnd < 0 ? text.length : blockEnd + 2;
+    }
+    const char = text[start];
+    if (char === '\'' || char === '"' || char === '`') {
+        return skipSqlEditorDelimited(text, start, char);
+    }
+    if (char === '[') {
+        const bracketEnd = text.indexOf(']', start + 1);
+        return bracketEnd < 0 ? text.length : bracketEnd + 1;
+    }
+    const dollarTag = resolveSqlEditorDollarQuoteTag(text, start);
+    if (dollarTag) {
+        const dollarEnd = text.indexOf(dollarTag, start + dollarTag.length);
+        return dollarEnd < 0 ? text.length : dollarEnd + dollarTag.length;
+    }
+    return null;
+};
+
+const skipBalancedSqlEditorParens = (text: string, start: number): number => {
+    if (text[start] !== '(') return -1;
+    let depth = 0;
+    let pos = start;
+    while (pos < text.length) {
+        const skipped = skipSqlEditorQuotedOrComment(text, pos);
+        if (skipped !== null) {
+            pos = skipped;
+            continue;
+        }
+        if (text[pos] === '(') {
+            depth++;
+            pos++;
+            continue;
+        }
+        if (text[pos] === ')') {
+            depth--;
+            pos++;
+            if (depth === 0) return pos;
+            continue;
+        }
+        pos++;
+    }
+    return -1;
+};
+
+const skipSqlEditorIdentifierToken = (text: string, start: number): number => {
+    if (start >= text.length) return -1;
+    const char = text[start];
+    if (char === '"' || char === '`') return skipSqlEditorDelimited(text, start, char);
+    if (char === '[') {
+        const bracketEnd = text.indexOf(']', start + 1);
+        return bracketEnd < 0 ? text.length : bracketEnd + 1;
+    }
+    if (!isSqlEditorKeywordChar(char)) return -1;
+    let end = start + 1;
+    while (isSqlEditorKeywordChar(text[end])) {
+        end++;
+    }
+    return end;
+};
+
+const findTopLevelSqlEditorKeyword = (text: string, start: number, keyword: string): number => {
+    let depth = 0;
+    let pos = start;
+    while (pos < text.length) {
+        const skipped = skipSqlEditorQuotedOrComment(text, pos);
+        if (skipped !== null) {
+            pos = skipped;
+            continue;
+        }
+        if (text[pos] === '(') {
+            depth++;
+            pos++;
+            continue;
+        }
+        if (text[pos] === ')') {
+            if (depth > 0) depth--;
+            pos++;
+            continue;
+        }
+        if (depth === 0 && isSqlEditorKeywordChar(text[pos])) {
+            let end = pos + 1;
+            while (isSqlEditorKeywordChar(text[end])) {
+                end++;
+            }
+            if (text.slice(pos, end).toLowerCase() === keyword) {
+                return end;
+            }
+            pos = end;
+            continue;
+        }
+        pos++;
+    }
+    return -1;
+};
+
+const resolveSqlEditorWithAnalysis = (text: string, start: number): SqlEditorWithAnalysis => {
+    let pos = skipSqlEditorTrivia(text, start);
+    let cteHasManagedWrite = false;
+    const recursive = readSqlEditorKeyword(text, pos);
+    if (recursive.keyword === 'recursive') {
+        pos = recursive.end;
+    }
+
+    while (pos < text.length) {
+        pos = skipSqlEditorTrivia(text, pos);
+        const identifierEnd = skipSqlEditorIdentifierToken(text, pos);
+        if (identifierEnd < 0) return { keyword: '', cteHasManagedWrite };
+        pos = skipSqlEditorTrivia(text, identifierEnd);
+        if (text[pos] === '(') {
+            const columnsEnd = skipBalancedSqlEditorParens(text, pos);
+            if (columnsEnd < 0) return { keyword: '', cteHasManagedWrite };
+            pos = skipSqlEditorTrivia(text, columnsEnd);
+        }
+
+        const asEnd = findTopLevelSqlEditorKeyword(text, pos, 'as');
+        if (asEnd < 0) return { keyword: '', cteHasManagedWrite };
+        pos = skipSqlEditorTrivia(text, asEnd);
+        const materialized = readSqlEditorKeyword(text, pos);
+        if (materialized.keyword === 'not') {
+            const next = readSqlEditorKeyword(text, materialized.end);
+            if (next.keyword === 'materialized') {
+                pos = next.end;
+            }
+        } else if (materialized.keyword === 'materialized') {
+            pos = materialized.end;
+        }
+
+        pos = skipSqlEditorTrivia(text, pos);
+        if (text[pos] !== '(') return { keyword: '', cteHasManagedWrite };
+        const cteBodyStart = pos + 1;
+        const cteEnd = skipBalancedSqlEditorParens(text, pos);
+        if (cteEnd < 0) return { keyword: '', cteHasManagedWrite };
+        const cteBody = text.slice(cteBodyStart, Math.max(cteBodyStart, cteEnd - 1));
+        if (sqlEditorStatementHasManagedWrite(cteBody)) {
+            cteHasManagedWrite = true;
+        }
+        pos = skipSqlEditorTrivia(text, cteEnd);
+        if (text[pos] === ',') {
+            pos++;
+            continue;
+        }
+
+        return { keyword: readSqlEditorKeyword(text, pos).keyword, cteHasManagedWrite };
+    }
+    return { keyword: '', cteHasManagedWrite };
+};
+
+export const resolveSqlEditorOperationKeyword = (statement: string): string => {
+    const text = String(statement || '');
+    const leading = readSqlEditorKeyword(text, 0);
+    if (leading.keyword !== 'with') {
+        return leading.keyword;
+    }
+    return resolveSqlEditorWithAnalysis(text, leading.end).keyword || leading.keyword;
+};
+
+const sqlEditorStatementHasManagedWrite = (statement: string): boolean => {
+    const text = String(statement || '');
+    const leading = readSqlEditorKeyword(text, 0);
+    if (leading.keyword === 'with') {
+        const analysis = resolveSqlEditorWithAnalysis(text, leading.end);
+        return analysis.cteHasManagedWrite || SQL_EDITOR_DML_KEYWORDS.has(analysis.keyword);
+    }
+    return SQL_EDITOR_DML_KEYWORDS.has(leading.keyword);
+};
+
+const isSqlEditorTransactionControlStatement = (statement: string): boolean => {
+    const keyword = readSqlEditorKeyword(String(statement || ''), 0).keyword;
+    if (SQL_EDITOR_TRANSACTION_CONTROL_KEYWORDS.has(keyword)) return true;
+    return keyword === 'start' && /\btransaction\b/i.test(statement);
+};
+
+export const shouldUseSqlEditorManagedTransaction = (statements: string[]): boolean => {
+    let hasManagedWrite = false;
+    for (const statement of statements) {
+        const trimmed = String(statement || '').trim();
+        if (!trimmed) continue;
+        if (isSqlEditorTransactionControlStatement(trimmed)) return false;
+        if (sqlEditorStatementHasManagedWrite(trimmed)) {
+            hasManagedWrite = true;
+            continue;
+        }
+        const keyword = resolveSqlEditorOperationKeyword(trimmed);
+        if (SQL_EDITOR_READ_KEYWORDS.has(keyword)) continue;
+        return false;
+    }
+    return hasManagedWrite;
+};
diff --git a/frontend/src/utils/sqlErrorSemantics.test.ts b/frontend/src/utils/sqlErrorSemantics.test.ts
new file mode 100644
index 0000000..e5c753d
--- /dev/null
+++ b/frontend/src/utils/sqlErrorSemantics.test.ts
@@ -0,0 +1,46 @@
+import { describe, expect, it } from 'vitest';
+
+import { formatSqlExecutionError } from './sqlErrorSemantics';
+
+describe('formatSqlExecutionError', () => {
+  it('adds Chinese semantic explanation for SQL syntax errors and keeps raw text', () => {
+    const formatted = formatSqlExecutionError('pq: syntax error at or near "from"');
+
+    expect(formatted).toContain('中文语义：SQL 语法错误');
+    expect(formatted).toContain('处理建议：');
+    expect(formatted).toContain('原始错误：pq: syntax error at or near "from"');
+  });
+
+  it('recognizes missing table errors', () => {
+    const formatted = formatSqlExecutionError('ERROR: relation "orders" does not exist');
+
+    expect(formatted).toContain('中文语义：表或对象不存在');
+    expect(formatted).toContain('原始错误：ERROR: relation "orders" does not exist');
+  });
+
+  it('recognizes duplicate key errors with statement prefix', () => {
+    const formatted = formatSqlExecutionError('Duplicate entry "1" for key "PRIMARY"', {
+      prefix: '第 2 条语句执行失败：',
+    });
+
+    expect(formatted.startsWith('第 2 条语句执行失败：\n中文语义：唯一约束或主键冲突')).toBe(true);
+    expect(formatted).toContain('原始错误：Duplicate entry "1" for key "PRIMARY"');
+  });
+
+  it('falls back to a generic database execution error', () => {
+    const formatted = formatSqlExecutionError('driver returned unexpected status 123');
+
+    expect(formatted).toContain('中文语义：数据库执行错误');
+    expect(formatted).toContain('原始错误：driver returned unexpected status 123');
+  });
+
+  it('does not format an already formatted message again', () => {
+    const raw = [
+      '中文语义：SQL 语法错误。通常是关键字、逗号、括号、引号、语句顺序或当前数据库方言不匹配。',
+      '处理建议：检查报错位置附近的 SQL 片段，并确认当前连接的数据源类型与 SQL 方言一致。',
+      '原始错误：pq: syntax error at or near "from"',
+    ].join('\n');
+
+    expect(formatSqlExecutionError(raw)).toBe(raw);
+  });
+});
diff --git a/frontend/src/utils/sqlErrorSemantics.ts b/frontend/src/utils/sqlErrorSemantics.ts
new file mode 100644
index 0000000..5916108
--- /dev/null
+++ b/frontend/src/utils/sqlErrorSemantics.ts
@@ -0,0 +1,177 @@
+export type SqlExecutionErrorFormatOptions = {
+  prefix?: string;
+};
+
+type SqlErrorSemanticRule = {
+  label: string;
+  explanation: string;
+  suggestion: string;
+  patterns: RegExp[];
+};
+
+const SQL_ERROR_RULES: SqlErrorSemanticRule[] = [
+  {
+    label: 'SQL 语法错误',
+    explanation: '通常是关键字、逗号、括号、引号、语句顺序或当前数据库方言不匹配。',
+    suggestion: '检查报错位置附近的 SQL 片段，并确认当前连接的数据源类型与 SQL 方言一致。',
+    patterns: [
+      /syntax error/i,
+      /sql syntax/i,
+      /sqlstate\s*42601/i,
+      /near\s+["'`].+["'`]\s*:?\s*syntax error/i,
+      /ora-00933/i,
+      /ora-00936/i,
+      /you have an error in your sql syntax/i,
+    ],
+  },
+  {
+    label: '表或对象不存在',
+    explanation: 'SQL 引用了当前库或 schema 中找不到的表、视图、序列或其他数据库对象。',
+    suggestion: '确认对象名称、大小写、schema/database 前缀，以及当前查询所选数据库是否正确。',
+    patterns: [
+      /relation\s+["'`].+["'`]\s+does not exist/i,
+      /table\s+.+doesn'?t exist/i,
+      /no such table/i,
+      /invalid object name/i,
+      /ora-00942/i,
+      /object\s+.+does not exist/i,
+    ],
+  },
+  {
+    label: '字段不存在',
+    explanation: 'SQL 引用了结果集中不存在、拼写不一致或当前表没有的字段。',
+    suggestion: '检查字段名、别名、大小写、引用表别名，以及字段是否属于当前 FROM/JOIN 的对象。',
+    patterns: [
+      /column\s+["'`].+["'`]\s+does not exist/i,
+      /unknown column/i,
+      /invalid column name/i,
+      /ora-00904/i,
+      /no such column/i,
+    ],
+  },
+  {
+    label: '唯一约束或主键冲突',
+    explanation: '插入或更新的数据与唯一索引、主键或唯一约束中的已有数据重复。',
+    suggestion: '检查重复键值，必要时改为 UPDATE、UPSERT，或调整唯一键字段值。',
+    patterns: [
+      /duplicate key/i,
+      /duplicate entry/i,
+      /unique constraint failed/i,
+      /violates unique constraint/i,
+      /ora-00001/i,
+    ],
+  },
+  {
+    label: '权限不足',
+    explanation: '当前数据库账号没有执行该 SQL 或访问相关对象的权限。',
+    suggestion: '确认账号权限、schema 授权、只读连接限制，以及是否需要由管理员授权。',
+    patterns: [
+      /permission denied/i,
+      /access denied/i,
+      /not authorized/i,
+      /insufficient privileges/i,
+      /ora-01031/i,
+    ],
+  },
+  {
+    label: '数据类型或格式不匹配',
+    explanation: '写入、比较或转换的数据格式不符合目标字段或表达式要求。',
+    suggestion: '检查日期、数字、布尔值、枚举值、隐式转换和字段类型，必要时显式 CAST。',
+    patterns: [
+      /invalid input syntax/i,
+      /incorrect\s+.+\s+value/i,
+      /data truncated/i,
+      /truncated incorrect/i,
+      /conversion failed/i,
+      /invalid number/i,
+      /ora-01722/i,
+    ],
+  },
+  {
+    label: '约束校验失败',
+    explanation: '数据不满足外键、非空、检查约束或引用完整性规则。',
+    suggestion: '检查关联父表记录、必填字段、CHECK 条件，以及写入顺序是否正确。',
+    patterns: [
+      /foreign key constraint/i,
+      /violates foreign key constraint/i,
+      /cannot be null/i,
+      /not null constraint failed/i,
+      /check constraint/i,
+      /constraint failed/i,
+    ],
+  },
+  {
+    label: '查询超时或被取消',
+    explanation: 'SQL 执行时间超过超时限制，或执行过程被手动取消。',
+    suggestion: '检查 SQL 执行计划、过滤条件和索引，必要时缩小查询范围或调整超时时间。',
+    patterns: [
+      /context deadline exceeded/i,
+      /statement canceled/i,
+      /statement cancelled/i,
+      /context canceled/i,
+      /context cancelled/i,
+      /timeout/i,
+      /timed out/i,
+    ],
+  },
+  {
+    label: '数据库连接或认证失败',
+    explanation: '客户端无法连接数据库，或认证信息、网络、实例状态存在问题。',
+    suggestion: '检查主机、端口、账号密码、网络连通性、代理/SSH 隧道和数据库服务状态。',
+    patterns: [
+      /password authentication failed/i,
+      /connection refused/i,
+      /no route to host/i,
+      /server has gone away/i,
+      /too many connections/i,
+      /connection reset/i,
+      /connection timeout/i,
+    ],
+  },
+];
+
+const normalizeErrorText = (raw: unknown): string => {
+  if (raw instanceof Error) {
+    return raw.message || String(raw);
+  }
+  if (typeof raw === 'string') {
+    return raw;
+  }
+  if (raw == null) {
+    return '';
+  }
+  try {
+    return JSON.stringify(raw);
+  } catch {
+    return String(raw);
+  }
+};
+
+const findSqlErrorSemantic = (message: string): SqlErrorSemanticRule | null => {
+  const text = String(message || '');
+  return SQL_ERROR_RULES.find((rule) => rule.patterns.some((pattern) => pattern.test(text))) || null;
+};
+
+export const formatSqlExecutionError = (
+  raw: unknown,
+  options: SqlExecutionErrorFormatOptions = {},
+): string => {
+  const rawMessage = normalizeErrorText(raw).trim() || '未知错误';
+  if (/中文语义：/.test(rawMessage) && /原始错误：/.test(rawMessage)) {
+    return rawMessage;
+  }
+
+  const semantic = findSqlErrorSemantic(rawMessage) || {
+    label: '数据库执行错误',
+    explanation: '数据库返回了执行失败信息，当前未匹配到更具体的错误类型。',
+    suggestion: '结合原始错误、SQL 片段和当前数据库方言继续排查。',
+  };
+  const prefix = String(options.prefix || '').trim();
+
+  return [
+    prefix,
+    `中文语义：${semantic.label}。${semantic.explanation}`,
+    `处理建议：${semantic.suggestion}`,
+    `原始错误：${rawMessage}`,
+  ].filter(Boolean).join('\n');
+};
diff --git a/frontend/src/utils/sqlFileTabDirty.test.ts b/frontend/src/utils/sqlFileTabDirty.test.ts
new file mode 100644
index 0000000..bed3ac6
--- /dev/null
+++ b/frontend/src/utils/sqlFileTabDirty.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  getSQLFileTabPath,
+  hasSQLFileTabUnsavedChanges,
+  isSQLFileMissingErrorMessage,
+  isSQLFileMissingReadResult,
+  isSQLFileQueryTab,
+  normalizeSQLFileReadContent,
+} from './sqlFileTabDirty';
+
+describe('sqlFileTabDirty', () => {
+  it('only treats query tabs with filePath as SQL file tabs', () => {
+    expect(isSQLFileQueryTab({ type: 'query', filePath: '/tmp/a.sql' })).toBe(true);
+    expect(isSQLFileQueryTab({ type: 'query', filePath: '  ' })).toBe(false);
+    expect(isSQLFileQueryTab({ type: 'table', filePath: '/tmp/a.sql' } as any)).toBe(false);
+    expect(getSQLFileTabPath({ type: 'query', filePath: ' /tmp/a.sql ' })).toBe('/tmp/a.sql');
+  });
+
+  it('normalizes old and new SQL file read payloads', () => {
+    expect(normalizeSQLFileReadContent('select 1;')).toBe('select 1;');
+    expect(normalizeSQLFileReadContent({ content: 'select 2;', filePath: '/tmp/a.sql' })).toBe('select 2;');
+    expect(normalizeSQLFileReadContent({ isLargeFile: true, filePath: '/tmp/a.sql' })).toBe('');
+  });
+
+  it('detects unsaved changes by comparing tab query with disk content', () => {
+    expect(hasSQLFileTabUnsavedChanges({
+      type: 'query',
+      filePath: '/tmp/a.sql',
+      query: 'select 1;',
+    } as any, 'select 1;')).toBe(false);
+
+    expect(hasSQLFileTabUnsavedChanges({
+      type: 'query',
+      filePath: '/tmp/a.sql',
+      query: 'select 2;',
+    } as any, 'select 1;')).toBe(true);
+  });
+
+  it('detects missing SQL file read failures by structured error code', () => {
+    expect(isSQLFileMissingReadResult({
+      success: false,
+      message: '无法读取文件信息: stat /tmp/missing.sql: no such file or directory',
+      data: { errorCode: 'file_not_found', filePath: '/tmp/missing.sql' },
+    })).toBe(true);
+
+    expect(isSQLFileMissingReadResult({
+      success: false,
+      message: '无法读取文件信息: permission denied',
+      data: { filePath: '/tmp/report.sql' },
+    })).toBe(false);
+  });
+
+  it('keeps platform-specific missing file messages as a fallback', () => {
+    expect(isSQLFileMissingErrorMessage('GetFileAttributesEx C:\\Users\\me\\missing.sql: The system cannot find the file specified.')).toBe(true);
+    expect(isSQLFileMissingErrorMessage('stat /Users/me/missing.sql: no such file or directory')).toBe(true);
+    expect(isSQLFileMissingErrorMessage('无法读取文件信息: 权限不足')).toBe(false);
+  });
+});
diff --git a/frontend/src/utils/sqlFileTabDirty.ts b/frontend/src/utils/sqlFileTabDirty.ts
new file mode 100644
index 0000000..473f9fd
--- /dev/null
+++ b/frontend/src/utils/sqlFileTabDirty.ts
@@ -0,0 +1,64 @@
+import type { TabData } from '../types';
+
+const toTrimmedString = (value: unknown): string => String(value ?? '').trim();
+
+export const SQL_FILE_NOT_FOUND_ERROR_CODE = 'file_not_found';
+
+export const getSQLFileTabPath = (tab: Pick<TabData, 'type' | 'filePath'> | null | undefined): string => {
+  if (!tab || tab.type !== 'query') return '';
+  return toTrimmedString(tab.filePath);
+};
+
+export const isSQLFileQueryTab = (tab: Pick<TabData, 'type' | 'filePath'> | null | undefined): boolean =>
+  Boolean(getSQLFileTabPath(tab));
+
+export const normalizeSQLFileReadContent = (data: unknown): string => {
+  if (data && typeof data === 'object') {
+    const payload = data as Record<string, unknown>;
+    if ('content' in payload) {
+      return String(payload.content ?? '');
+    }
+    return '';
+  }
+  return String(data ?? '');
+};
+
+export const hasSQLFileTabUnsavedChanges = (
+  tab: Pick<TabData, 'type' | 'filePath' | 'query'>,
+  diskContent: string,
+): boolean => {
+  if (!isSQLFileQueryTab(tab)) return false;
+  return String(tab.query ?? '') !== diskContent;
+};
+
+const SQL_FILE_MISSING_MESSAGE_PATTERNS = [
+  'no such file or directory',
+  'cannot find the file specified',
+  'system cannot find the file specified',
+  'does not exist',
+  'not exist',
+  '系统找不到指定的文件',
+  '文件不存在',
+];
+
+export const isSQLFileMissingErrorMessage = (message: unknown): boolean => {
+  const normalizedMessage = toTrimmedString(message).toLowerCase();
+  if (!normalizedMessage) return false;
+  return SQL_FILE_MISSING_MESSAGE_PATTERNS.some((pattern) => normalizedMessage.includes(pattern));
+};
+
+export const isSQLFileMissingReadResult = (result: unknown): boolean => {
+  if (!result || typeof result !== 'object') return false;
+  const payload = result as Record<string, unknown>;
+  if (payload.success === true) return false;
+
+  const data = payload.data;
+  if (data && typeof data === 'object') {
+    const errorCode = toTrimmedString((data as Record<string, unknown>).errorCode).toLowerCase();
+    if (errorCode === SQL_FILE_NOT_FOUND_ERROR_CODE) {
+      return true;
+    }
+  }
+
+  return isSQLFileMissingErrorMessage(payload.message);
+};
diff --git a/frontend/src/utils/sqlFileTabDrafts.test.ts b/frontend/src/utils/sqlFileTabDrafts.test.ts
new file mode 100644
index 0000000..82e6829
--- /dev/null
+++ b/frontend/src/utils/sqlFileTabDrafts.test.ts
@@ -0,0 +1,46 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  clearQueryTabDraft,
+  clearSQLFileTabDraft,
+  getQueryTabDraft,
+  getSQLFileTabDraft,
+  hasQueryTabDraft,
+  hasSQLFileTabDraft,
+  setQueryTabDraft,
+  setSQLFileTabDraft,
+} from './sqlFileTabDrafts';
+
+describe('sqlFileTabDrafts', () => {
+  it('stores query editor drafts outside the persisted tab state', () => {
+    clearQueryTabDraft('query-tab-1');
+
+    expect(hasQueryTabDraft('query-tab-1')).toBe(false);
+    expect(getQueryTabDraft('query-tab-1', 'fallback')).toBe('fallback');
+
+    setQueryTabDraft('query-tab-1', 'select * from large_table;');
+
+    expect(hasQueryTabDraft('query-tab-1')).toBe(true);
+    expect(getQueryTabDraft('query-tab-1', 'fallback')).toBe('select * from large_table;');
+
+    clearQueryTabDraft('query-tab-1');
+
+    expect(hasQueryTabDraft('query-tab-1')).toBe(false);
+  });
+
+  it('stores external SQL file editor drafts outside the persisted tab state', () => {
+    clearSQLFileTabDraft('tab-1');
+
+    expect(hasSQLFileTabDraft('tab-1')).toBe(false);
+    expect(getSQLFileTabDraft('tab-1', 'fallback')).toBe('fallback');
+
+    setSQLFileTabDraft('tab-1', 'select 1;');
+
+    expect(hasSQLFileTabDraft('tab-1')).toBe(true);
+    expect(getSQLFileTabDraft('tab-1', 'fallback')).toBe('select 1;');
+
+    clearSQLFileTabDraft('tab-1');
+
+    expect(hasSQLFileTabDraft('tab-1')).toBe(false);
+  });
+});
diff --git a/frontend/src/utils/sqlFileTabDrafts.ts b/frontend/src/utils/sqlFileTabDrafts.ts
new file mode 100644
index 0000000..36397ae
--- /dev/null
+++ b/frontend/src/utils/sqlFileTabDrafts.ts
@@ -0,0 +1,44 @@
+const drafts = new Map<string, string>();
+
+const toTabId = (value: unknown): string => String(value ?? '').trim();
+
+export const setQueryTabDraft = (tabId: string, content: string): void => {
+  const id = toTabId(tabId);
+  if (!id) return;
+  drafts.set(id, String(content ?? ''));
+};
+
+export const getQueryTabDraft = (tabId: string, fallback = ''): string => {
+  const id = toTabId(tabId);
+  if (!id || !drafts.has(id)) {
+    return fallback;
+  }
+  return drafts.get(id) ?? fallback;
+};
+
+export const clearQueryTabDraft = (tabId: string): void => {
+  const id = toTabId(tabId);
+  if (!id) return;
+  drafts.delete(id);
+};
+
+export const hasQueryTabDraft = (tabId: string): boolean => {
+  const id = toTabId(tabId);
+  return Boolean(id && drafts.has(id));
+};
+
+export const setSQLFileTabDraft = (tabId: string, content: string): void => {
+  setQueryTabDraft(tabId, content);
+};
+
+export const getSQLFileTabDraft = (tabId: string, fallback = ''): string => {
+  return getQueryTabDraft(tabId, fallback);
+};
+
+export const clearSQLFileTabDraft = (tabId: string): void => {
+  clearQueryTabDraft(tabId);
+};
+
+export const hasSQLFileTabDraft = (tabId: string): boolean => {
+  return hasQueryTabDraft(tabId);
+};
diff --git a/frontend/src/utils/sqlServerObjectDefinition.test.ts b/frontend/src/utils/sqlServerObjectDefinition.test.ts
new file mode 100644
index 0000000..0c0c861
--- /dev/null
+++ b/frontend/src/utils/sqlServerObjectDefinition.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildSqlServerObjectDefinitionQueries } from './sqlServerObjectDefinition';
+
+describe('buildSqlServerObjectDefinitionQueries', () => {
+  it('builds schema-aware SQL Server routine definition queries', () => {
+    const queries = buildSqlServerObjectDefinitionQueries('routine', 'dbo.p_get_select', 'BizDB', 'routine_definition');
+
+    expect(queries).toHaveLength(2);
+    expect(queries[0]).toContain('FROM [BizDB].sys.all_sql_modules AS m');
+    expect(queries[0]).toContain('JOIN [BizDB].sys.all_objects AS o ON o.object_id = m.object_id');
+    expect(queries[0]).toContain("WHERE o.name = N'p_get_select'");
+    expect(queries[0]).toContain("AND s.name = N'dbo'");
+    expect(queries[0]).toContain("o.type IN ('P', 'PC', 'RF', 'FN', 'FS', 'FT', 'IF', 'TF')");
+    expect(queries[0]).not.toContain('OBJECT_DEFINITION');
+    expect(queries[1]).toBe("EXEC [BizDB].sys.sp_helptext @objname = N'[dbo].[p_get_select]'");
+  });
+
+  it('uses the database segment from a three-part SQL Server object name', () => {
+    const queries = buildSqlServerObjectDefinitionQueries('view', 'Archive.reporting.active_users', 'BizDB', 'view_definition');
+
+    expect(queries[0]).toContain('FROM [Archive].sys.all_sql_modules AS m');
+    expect(queries[0]).toContain("WHERE o.name = N'active_users'");
+    expect(queries[0]).toContain("AND s.name = N'reporting'");
+    expect(queries[0]).toContain("o.type IN ('V')");
+    expect(queries[1]).toBe("EXEC [Archive].sys.sp_helptext @objname = N'[reporting].[active_users]'");
+  });
+
+  it('falls back to all schemas when SQL Server object name is unqualified', () => {
+    const queries = buildSqlServerObjectDefinitionQueries('routine', 'sp_helptext', 'master', 'routine_definition');
+
+    expect(queries[0]).toContain('FROM [master].sys.all_sql_modules AS m');
+    expect(queries[0]).toContain("WHERE o.name = N'sp_helptext'");
+    expect(queries[0]).not.toContain('AND s.name = N');
+    expect(queries[0]).toContain("CASE WHEN s.name = N'dbo' THEN 0 WHEN s.name = N'sys' THEN 1 ELSE 2 END");
+    expect(queries[1]).toBe("EXEC [master].sys.sp_helptext @objname = N'sp_helptext'");
+  });
+
+  it('escapes SQL Server literals and bracket identifiers', () => {
+    const queries = buildSqlServerObjectDefinitionQueries('trigger', "audit]x.o'clock", 'Biz]DB', 'trigger_definition');
+
+    expect(queries[0]).toContain('FROM [Biz]]DB].sys.all_sql_modules AS m');
+    expect(queries[0]).toContain("WHERE o.name = N'o''clock'");
+    expect(queries[0]).toContain("AND s.name = N'audit]x'");
+    expect(queries[1]).toBe("EXEC [Biz]]DB].sys.sp_helptext @objname = N'[audit]]x].[o''clock]'");
+  });
+});
diff --git a/frontend/src/utils/sqlServerObjectDefinition.ts b/frontend/src/utils/sqlServerObjectDefinition.ts
new file mode 100644
index 0000000..6fb8103
--- /dev/null
+++ b/frontend/src/utils/sqlServerObjectDefinition.ts
@@ -0,0 +1,81 @@
+import { splitQualifiedNameSegments } from './qualifiedName';
+
+export type SqlServerObjectDefinitionKind = 'view' | 'routine' | 'trigger';
+
+const SQL_SERVER_OBJECT_TYPES: Record<SqlServerObjectDefinitionKind, string[]> = {
+  view: ['V'],
+  routine: ['P', 'PC', 'RF', 'FN', 'FS', 'FT', 'IF', 'TF'],
+  trigger: ['TR', 'TA'],
+};
+
+const escapeSqlServerLiteral = (raw: string): string => String(raw || '').replace(/'/g, "''");
+
+const quoteSqlServerIdentifier = (raw: string): string => `[${String(raw || '').replace(/]/g, ']]')}]`;
+
+const buildSqlServerObjectRef = (schemaName: string, objectName: string): string => {
+  const object = String(objectName || '').trim();
+  const schema = String(schemaName || '').trim();
+  if (!object) return '';
+  if (!schema) return object;
+  return `${quoteSqlServerIdentifier(schema)}.${quoteSqlServerIdentifier(object)}`;
+};
+
+const resolveSqlServerObjectTarget = (rawObjectName: string, fallbackDbName: string) => {
+  const segments = splitQualifiedNameSegments(rawObjectName).filter(Boolean);
+  const objectName = String(segments[segments.length - 1] || '').trim();
+  let schemaName = '';
+  let databaseName = String(fallbackDbName || '').trim();
+
+  if (segments.length >= 3) {
+    databaseName = String(segments[segments.length - 3] || databaseName).trim();
+    schemaName = String(segments[segments.length - 2] || '').trim();
+  } else if (segments.length === 2) {
+    schemaName = String(segments[0] || '').trim();
+  }
+
+  return { databaseName, schemaName, objectName };
+};
+
+export const buildSqlServerObjectDefinitionQueries = (
+  kind: SqlServerObjectDefinitionKind,
+  objectName: string,
+  dbName: string,
+  resultAlias: string,
+): string[] => {
+  const target = resolveSqlServerObjectTarget(objectName, dbName);
+  if (!target.objectName) return [];
+
+  const catalogPrefix = target.databaseName ? `${quoteSqlServerIdentifier(target.databaseName)}.` : '';
+  const safeObjectName = escapeSqlServerLiteral(target.objectName);
+  const safeSchemaName = escapeSqlServerLiteral(target.schemaName);
+  const objectTypes = SQL_SERVER_OBJECT_TYPES[kind] || [];
+  const typeFilter = objectTypes.length > 0
+    ? `  AND o.type IN (${objectTypes.map((type) => `'${type}'`).join(', ')})\n`
+    : '';
+  const schemaFilter = target.schemaName
+    ? `  AND s.name = N'${safeSchemaName}'\n`
+    : '';
+  const schemaOrder = target.schemaName
+    ? 's.name'
+    : "CASE WHEN s.name = N'dbo' THEN 0 WHEN s.name = N'sys' THEN 1 ELSE 2 END, s.name";
+
+  const moduleQuery = [
+    `SELECT TOP (1)`,
+    `    m.definition AS ${resultAlias}`,
+    `FROM ${catalogPrefix}sys.all_sql_modules AS m`,
+    `JOIN ${catalogPrefix}sys.all_objects AS o ON o.object_id = m.object_id`,
+    `JOIN ${catalogPrefix}sys.schemas AS s ON s.schema_id = o.schema_id`,
+    `WHERE o.name = N'${safeObjectName}'`,
+    typeFilter.trimEnd(),
+    schemaFilter.trimEnd(),
+    `  AND m.definition IS NOT NULL`,
+    `ORDER BY ${schemaOrder}, o.name`,
+  ].filter(Boolean).join('\n');
+
+  const objectRef = buildSqlServerObjectRef(target.schemaName, target.objectName);
+  const helpTextProcedure = target.databaseName
+    ? `EXEC ${quoteSqlServerIdentifier(target.databaseName)}.sys.sp_helptext @objname = N'${escapeSqlServerLiteral(objectRef)}'`
+    : `EXEC sys.sp_helptext @objname = N'${escapeSqlServerLiteral(objectRef)}'`;
+
+  return [moduleQuery, helpTextProcedure];
+};
diff --git a/frontend/src/utils/sqlStatementSelection.test.ts b/frontend/src/utils/sqlStatementSelection.test.ts
index 95a940e..fb7788a 100644
--- a/frontend/src/utils/sqlStatementSelection.test.ts
+++ b/frontend/src/utils/sqlStatementSelection.test.ts
@@ -28,6 +28,140 @@ describe('sqlStatementSelection', () => {
     ]);
   });
 
+  it('keeps Oracle anonymous PL/SQL blocks as one executable statement', () => {
+    const plsql = [
+      'BEGIN',
+      "  INSERT INTO tmp_disable_trigger (table_name) VALUES ('t_memcard_reg');",
+      "  UPDATE t_memcard_reg SET CARDLEVEL = 1 WHERE MEMCARDNO = '8032277312';",
+      "  DELETE FROM tmp_disable_trigger WHERE table_name = 't_memcard_reg';",
+      'END;',
+      'SELECT 1 FROM dual;',
+    ].join('\n');
+
+    const ranges = findSqlStatementRanges(plsql).map((range) => range.text);
+
+    expect(ranges).toEqual([
+      [
+        'BEGIN',
+        "  INSERT INTO tmp_disable_trigger (table_name) VALUES ('t_memcard_reg');",
+        "  UPDATE t_memcard_reg SET CARDLEVEL = 1 WHERE MEMCARDNO = '8032277312';",
+        "  DELETE FROM tmp_disable_trigger WHERE table_name = 't_memcard_reg';",
+        'END;',
+      ].join('\n'),
+      'SELECT 1 FROM dual',
+    ]);
+    expect(resolveExecutableSql(plsql, plsql.indexOf('UPDATE'))).toEqual({
+      sql: ranges[0],
+      source: 'statement',
+    });
+  });
+
+  it('keeps Oracle DECLARE blocks as one executable statement', () => {
+    const sql = [
+      'DECLARE',
+      '  v_count NUMBER;',
+      'BEGIN',
+      '  SELECT COUNT(*) INTO v_count FROM t_memcard_reg;',
+      "  UPDATE t_memcard_reg SET CARDLEVEL = v_count WHERE MEMCARDNO = '8032277312';",
+      'END;',
+      'SELECT 1 FROM dual;',
+    ].join('\n');
+
+    const ranges = findSqlStatementRanges(sql).map((range) => range.text);
+
+    expect(ranges).toEqual([
+      [
+        'DECLARE',
+        '  v_count NUMBER;',
+        'BEGIN',
+        '  SELECT COUNT(*) INTO v_count FROM t_memcard_reg;',
+        "  UPDATE t_memcard_reg SET CARDLEVEL = v_count WHERE MEMCARDNO = '8032277312';",
+        'END;',
+      ].join('\n'),
+      'SELECT 1 FROM dual',
+    ]);
+    expect(resolveExecutableSql(sql, sql.indexOf('UPDATE'))).toEqual({
+      sql: ranges[0],
+      source: 'statement',
+    });
+  });
+
+  it('keeps Oracle CREATE PROCEDURE definitions as one executable statement', () => {
+    const sql = [
+      'CREATE OR REPLACE PROCEDURE proc_tally2accept(',
+      '  p_tallyacceptno IN t_tally_accept_h.acceptno%TYPE,',
+      '  out_acceptno OUT t_accept_h.acceptno%TYPE',
+      ') IS',
+      '  v_busno t_tally_accept_h.busno%TYPE;',
+      '  v_count PLS_INTEGER;',
+      'BEGIN',
+      "  SELECT COUNT(*) INTO v_count FROM t_tally_accept_h WHERE acceptno = p_tallyacceptno;",
+      '  IF v_count > 0 THEN',
+      '    out_acceptno := p_tallyacceptno;',
+      '  END IF;',
+      'END;',
+      'SELECT 1 FROM dual;',
+    ].join('\n');
+
+    const ranges = findSqlStatementRanges(sql).map((range) => range.text);
+
+    expect(ranges).toEqual([
+      [
+        'CREATE OR REPLACE PROCEDURE proc_tally2accept(',
+        '  p_tallyacceptno IN t_tally_accept_h.acceptno%TYPE,',
+        '  out_acceptno OUT t_accept_h.acceptno%TYPE',
+        ') IS',
+        '  v_busno t_tally_accept_h.busno%TYPE;',
+        '  v_count PLS_INTEGER;',
+        'BEGIN',
+        "  SELECT COUNT(*) INTO v_count FROM t_tally_accept_h WHERE acceptno = p_tallyacceptno;",
+        '  IF v_count > 0 THEN',
+        '    out_acceptno := p_tallyacceptno;',
+        '  END IF;',
+        'END;',
+      ].join('\n'),
+      'SELECT 1 FROM dual',
+    ]);
+    expect(resolveExecutableSql(sql, sql.indexOf('v_busno'))).toEqual({
+      sql: ranges[0],
+      source: 'statement',
+    });
+  });
+
+  it('keeps PostgreSQL dollar-quoted CREATE FUNCTION definitions as one executable statement', () => {
+    const sql = [
+      'CREATE OR REPLACE FUNCTION refresh_stats() RETURNS void AS $$',
+      'BEGIN',
+      '  PERFORM refresh_now();',
+      'END;',
+      '$$ LANGUAGE plpgsql;',
+      'SELECT 2;',
+    ].join('\n');
+
+    const ranges = findSqlStatementRanges(sql).map((range) => range.text);
+
+    expect(ranges).toEqual([
+      [
+        'CREATE OR REPLACE FUNCTION refresh_stats() RETURNS void AS $$',
+        'BEGIN',
+        '  PERFORM refresh_now();',
+        'END;',
+        '$$ LANGUAGE plpgsql',
+      ].join('\n'),
+      'SELECT 2',
+    ]);
+  });
+
+  it('still splits transaction BEGIN statements', () => {
+    const sql = 'BEGIN; UPDATE accounts SET balance = balance - 1 WHERE id = 1; COMMIT;';
+
+    expect(findSqlStatementRanges(sql).map((range) => range.text)).toEqual([
+      'BEGIN',
+      'UPDATE accounts SET balance = balance - 1 WHERE id = 1',
+      'COMMIT',
+    ]);
+  });
+
   it('selects the next statement when the cursor is on whitespace before it', () => {
     const sql = 'select 1;\n\n  select 2;';
     const range = resolveCurrentSqlStatementRange(sql, sql.indexOf('  select 2'));
diff --git a/frontend/src/utils/sqlStatementSelection.ts b/frontend/src/utils/sqlStatementSelection.ts
index 181dc51..81a2d35 100644
--- a/frontend/src/utils/sqlStatementSelection.ts
+++ b/frontend/src/utils/sqlStatementSelection.ts
@@ -12,7 +12,106 @@ export interface SqlExecutionSelection {
 }
 
 const isWhitespace = (ch: string): boolean => (
-  ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r'
+  ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r' || ch === '\f'
+);
+
+const isSqlIdentifierStart = (ch: string): boolean => /^[A-Za-z_]$/.test(ch);
+
+const isSqlIdentifierPart = (ch: string): boolean => /^[A-Za-z0-9_$#]$/.test(ch);
+
+const skipSqlWhitespaceAndComments = (text: string, position: number): number => {
+  let index = position;
+  while (index < text.length) {
+    const ch = text[index];
+    const next = index + 1 < text.length ? text[index + 1] : '';
+    if (isWhitespace(ch)) {
+      index += 1;
+      continue;
+    }
+    if (ch === '-' && next === '-') {
+      index += 2;
+      while (index < text.length && text[index] !== '\n') index += 1;
+      continue;
+    }
+    if (ch === '/' && next === '*') {
+      index += 2;
+      while (index + 1 < text.length && !(text[index] === '*' && text[index + 1] === '/')) {
+        index += 1;
+      }
+      if (index + 1 < text.length) index += 2;
+      continue;
+    }
+    break;
+  }
+  return index;
+};
+
+const nextSqlSignificantToken = (text: string, position: number): string => {
+  const index = skipSqlWhitespaceAndComments(text, position);
+  if (index >= text.length || !isSqlIdentifierStart(text[index])) return '';
+  let end = index + 1;
+  while (end < text.length && isSqlIdentifierPart(text[end])) end += 1;
+  return text.slice(index, end).toLowerCase();
+};
+
+const nextSqlSignificantChar = (text: string, position: number): string => {
+  const index = skipSqlWhitespaceAndComments(text, position);
+  return index >= text.length ? '' : text[index];
+};
+
+const shouldEnterPlsqlBeginBlock = (text: string, tokenEnd: number): boolean => {
+  const nextChar = nextSqlSignificantChar(text, tokenEnd);
+  if (!nextChar || nextChar === ';') return false;
+  return !['transaction', 'work', 'isolation', 'read', 'write'].includes(nextSqlSignificantToken(text, tokenEnd));
+};
+
+const shouldEnterPlsqlDeclareBlock = (text: string, tokenEnd: number): boolean => Boolean(nextSqlSignificantToken(text, tokenEnd));
+
+const nextSqlSignificantTokenSpan = (text: string, position: number): { token: string; end: number } => {
+  const index = skipSqlWhitespaceAndComments(text, position);
+  if (index >= text.length || !isSqlIdentifierStart(text[index])) {
+    return { token: '', end: index };
+  }
+  let end = index + 1;
+  while (end < text.length && isSqlIdentifierPart(text[end])) end += 1;
+  return { token: text.slice(index, end).toLowerCase(), end };
+};
+
+const isCreateRoutineHeaderPrefix = (text: string): boolean => {
+  let current = nextSqlSignificantTokenSpan(text, 0);
+  if (current.token !== 'create') return false;
+
+  current = nextSqlSignificantTokenSpan(text, current.end);
+  if (current.token === 'or') {
+    current = nextSqlSignificantTokenSpan(text, current.end);
+    if (current.token !== 'replace') return false;
+    current = nextSqlSignificantTokenSpan(text, current.end);
+  }
+
+  while (['editionable', 'noneditionable'].includes(current.token)) {
+    current = nextSqlSignificantTokenSpan(text, current.end);
+  }
+
+  return current.token === 'procedure' || current.token === 'function';
+};
+
+const shouldEnterPlsqlCreateRoutineBlock = (
+  text: string,
+  statementStart: number,
+  token: string,
+  tokenEnd: number,
+): boolean => {
+  if (token !== 'is' && token !== 'as') return false;
+  const nextChar = nextSqlSignificantChar(text, tokenEnd);
+  if (!nextChar) return false;
+  if (token === 'as' && (nextChar === '$' || nextChar === "'" || nextChar === '"')) {
+    return false;
+  }
+  return isCreateRoutineHeaderPrefix(text.slice(statementStart, tokenEnd - token.length));
+};
+
+const isPlsqlControlEnd = (text: string, tokenEnd: number): boolean => (
+  ['if', 'loop', 'case'].includes(nextSqlSignificantToken(text, tokenEnd))
 );
 
 const trimStatementRange = (sql: string, start: number, end: number): SqlStatementRange | null => {
@@ -49,6 +148,9 @@ export const findSqlStatementRanges = (sql: string): SqlStatementRange[] => {
   let inLineComment = false;
   let inBlockComment = false;
   let dollarTag: string | null = null;
+  let plsqlDepth = 0;
+  let plsqlDeclareBeginSkips = 0;
+  let justClosedPLSQLBlock = false;
 
   const push = (end: number) => {
     const range = trimStatementRange(text, statementStart, end);
@@ -134,9 +236,45 @@ export const findSqlStatementRanges = (sql: string): SqlStatementRange[] => {
       continue;
     }
 
+    if (!inSingle && !inDouble && !inBacktick && !dollarTag && isSqlIdentifierStart(ch)) {
+      let tokenEnd = index + 1;
+      while (tokenEnd < text.length && isSqlIdentifierPart(text[tokenEnd])) {
+        tokenEnd++;
+      }
+      const token = text.slice(index, tokenEnd).toLowerCase();
+      if (token === 'begin' && plsqlDeclareBeginSkips > 0) {
+        plsqlDeclareBeginSkips--;
+        justClosedPLSQLBlock = false;
+      } else if (token === 'begin' && shouldEnterPlsqlBeginBlock(text, tokenEnd)) {
+        plsqlDepth++;
+        justClosedPLSQLBlock = false;
+      } else if (token === 'declare' && shouldEnterPlsqlDeclareBlock(text, tokenEnd)) {
+        plsqlDepth++;
+        plsqlDeclareBeginSkips++;
+        justClosedPLSQLBlock = false;
+      } else if (plsqlDepth === 0 && shouldEnterPlsqlCreateRoutineBlock(text, statementStart, token, tokenEnd)) {
+        plsqlDepth++;
+        plsqlDeclareBeginSkips++;
+        justClosedPLSQLBlock = false;
+      } else if (token === 'end' && plsqlDepth > 0 && !isPlsqlControlEnd(text, tokenEnd)) {
+        plsqlDepth--;
+        if (plsqlDeclareBeginSkips > plsqlDepth) {
+          plsqlDeclareBeginSkips = plsqlDepth;
+        }
+        justClosedPLSQLBlock = plsqlDepth === 0;
+      }
+      index = tokenEnd - 1;
+      continue;
+    }
+
     if (!inSingle && !inDouble && !inBacktick && (ch === ';' || ch === '；')) {
-      push(index);
+      if (plsqlDepth > 0) {
+        continue;
+      }
+      push(justClosedPLSQLBlock ? index + 1 : index);
       statementStart = index + 1;
+      justClosedPLSQLBlock = false;
+      continue;
     }
   }
 
diff --git a/frontend/src/utils/tabDisplay.test.ts b/frontend/src/utils/tabDisplay.test.ts
index 77e80c6..6be9956 100644
--- a/frontend/src/utils/tabDisplay.test.ts
+++ b/frontend/src/utils/tabDisplay.test.ts
@@ -1,7 +1,16 @@
 import { describe, expect, it } from 'vitest';
 
 import type { SavedConnection, TabData } from '../types';
-import { buildTabDisplayTitle, resolveConnectionHostSummary } from './tabDisplay';
+import {
+  applyTabDisplaySettingsPatch,
+  buildTabDisplayModel,
+  buildTabDisplayTitle,
+  resolveTabDisplayElementOrder,
+  resolveConnectionHostSummary,
+  sanitizeTabDisplaySettings,
+  switchTabDisplayLayout,
+  stripSchemaFromTabObjectLabel,
+} from './tabDisplay';
 
 const redisConnection: SavedConnection = {
   id: 'redis-1',
@@ -65,4 +74,283 @@ describe('tabDisplay', () => {
 
     expect(buildTabDisplayTitle(tableTab, redisConnection)).toBe('[订单缓存] orders');
   });
+
+  it('hides schema prefixes from schema-qualified table tab labels', () => {
+    const connection: SavedConnection = {
+      id: 'kingbase-1',
+      name: 'Kingbase DEV',
+      config: {
+        type: 'kingbase',
+        host: '127.0.0.1',
+        port: 54321,
+        user: 'SYSTEM',
+        database: 'appdb',
+      },
+    };
+    const tableTab: TabData = {
+      id: 'kingbase-1-appdb-table-ldf_server.andon_events',
+      title: 'ldf_server.andon_events',
+      type: 'table',
+      connectionId: 'kingbase-1',
+      dbName: 'appdb',
+      tableName: 'ldf_server.andon_events',
+    };
+
+    expect(buildTabDisplayTitle(tableTab, connection)).toBe('[DEV] andon_events');
+  });
+
+  it('hides schema prefixes from design and definition tab labels', () => {
+    const designTab: TabData = {
+      id: 'design-1',
+      title: '表结构 (public.orders)',
+      type: 'design',
+      connectionId: 'pg-1',
+      dbName: 'app',
+      tableName: 'public.orders',
+      readOnly: true,
+    };
+    const viewTab: TabData = {
+      id: 'view-1',
+      title: '视图: reporting.active_users',
+      type: 'view-def',
+      connectionId: 'pg-1',
+      dbName: 'app',
+      viewName: 'reporting.active_users',
+    };
+    const triggerTab: TabData = {
+      id: 'trigger-1',
+      title: '触发器: audit.users_bi',
+      type: 'trigger',
+      connectionId: 'pg-1',
+      dbName: 'app',
+      triggerName: 'audit.users_bi',
+    };
+    const routineTab: TabData = {
+      id: 'routine-1',
+      title: '存储过程: reporting.refresh_stats',
+      type: 'routine-def',
+      connectionId: 'pg-1',
+      dbName: 'app',
+      routineName: 'reporting.refresh_stats',
+      routineType: 'PROCEDURE',
+    };
+
+    expect(buildTabDisplayTitle(designTab)).toBe('表结构 (orders)');
+    expect(buildTabDisplayTitle(viewTab)).toBe('视图: active_users');
+    expect(buildTabDisplayTitle(triggerTab)).toBe('触发器: users_bi');
+    expect(buildTabDisplayTitle(routineTab)).toBe('存储过程: refresh_stats');
+  });
+
+  it('keeps quoted dots inside object names when hiding schema prefixes', () => {
+    expect(stripSchemaFromTabObjectLabel('"sales.schema"."order.items"')).toBe('order.items');
+    expect(stripSchemaFromTabObjectLabel('\\"ldf_server\\".\\"andon_events\\"')).toBe('andon_events');
+    expect(stripSchemaFromTabObjectLabel('[dbo].[order.items]')).toBe('order.items');
+  });
+
+  it('builds configurable single-line tab labels from ordered elements', () => {
+    const connection: SavedConnection = {
+      id: 'kingbase-1',
+      name: 'Kingbase DEV',
+      config: {
+        type: 'kingbase',
+        host: '192.168.10.8',
+        port: 54321,
+        user: 'SYSTEM',
+        database: 'appdb',
+      },
+    };
+    const tableTab: TabData = {
+      id: 'kingbase-1-appdb-table-ldf_server.andon_events',
+      title: 'ldf_server.andon_events',
+      type: 'table',
+      connectionId: 'kingbase-1',
+      dbName: 'appdb',
+      tableName: 'ldf_server.andon_events',
+    };
+
+    expect(buildTabDisplayTitle(tableTab, connection, {
+      layout: 'single',
+      primaryElements: ['object', 'schema', 'host'],
+      secondaryElements: [],
+    })).toBe('andon_events SCHEMA:ldf_server 192.168.10.8');
+  });
+
+  it('builds the default configurable model with connection, type and compact object name', () => {
+    const connection: SavedConnection = {
+      id: 'kingbase-1',
+      name: 'Kingbase DEV',
+      config: {
+        type: 'kingbase',
+        host: '192.168.10.8',
+        port: 54321,
+        user: 'SYSTEM',
+        database: 'appdb',
+      },
+    };
+    const tableTab: TabData = {
+      id: 'kingbase-1-appdb-table-ldf_server.andon_events',
+      title: 'ldf_server.andon_events',
+      type: 'table',
+      connectionId: 'kingbase-1',
+      dbName: 'appdb',
+      tableName: 'ldf_server.andon_events',
+    };
+
+    expect(buildTabDisplayModel(tableTab, connection).fullTitle).toBe('[DEV] TABLE andon_events');
+  });
+
+  it('keeps query tab labels compact when the title is raw SQL', () => {
+    const connection: SavedConnection = {
+      id: 'mysql-1',
+      name: '开发240',
+      config: {
+        type: 'mysql',
+        host: '192.168.1.240',
+        port: 3306,
+        user: 'root',
+        database: 'front_end_sys',
+      },
+    };
+    const queryTab: TabData = {
+      id: 'query-1',
+      title: 'select * from fs_org_auth_application where application_id is not null;',
+      type: 'query',
+      connectionId: 'mysql-1',
+      dbName: 'front_end_sys',
+      query: 'select * from fs_org_auth_application where application_id is not null;',
+    };
+
+    const model = buildTabDisplayModel(queryTab, connection);
+
+    expect(model.primaryText).toBe('[开发240] SQL 新建查询');
+    expect(model.fullTitle).not.toContain('fs_org_auth_application');
+    expect(model.fullTitle).not.toContain('select *');
+  });
+
+  it('uses SQL file names as compact query tab object labels', () => {
+    const queryTab: TabData = {
+      id: 'query-file-1',
+      title: 'select * from very_long_table_name;',
+      type: 'query',
+      connectionId: 'mysql-1',
+      filePath: '/Users/me/sql/monthly-report.sql',
+      query: 'select * from very_long_table_name;',
+    };
+
+    const model = buildTabDisplayModel(queryTab);
+
+    expect(model.primaryText).toBe('SQL monthly-report.sql');
+  });
+
+  it('builds configurable double-line tab display models', () => {
+    const connection: SavedConnection = {
+      id: 'pg-1',
+      name: 'Postgres PROD',
+      config: {
+        type: 'postgres',
+        host: '10.0.0.9',
+        port: 5432,
+        user: 'postgres',
+        database: 'analytics',
+      },
+    };
+    const tableTab: TabData = {
+      id: 'pg-1-analytics-table-reporting.events',
+      title: 'reporting.events',
+      type: 'table',
+      connectionId: 'pg-1',
+      dbName: 'analytics',
+      tableName: 'reporting.events',
+    };
+
+    const model = buildTabDisplayModel(tableTab, connection, {
+      layout: 'double',
+      primaryElements: ['kind', 'object'],
+      secondaryElements: ['connection', 'database', 'schema', 'host'],
+    });
+
+    expect(model.layout).toBe('double');
+    expect(model.primaryText).toBe('TABLE events');
+    expect(model.secondaryText).toBe('[PROD]·analytics·SCHEMA:reporting·10.0.0.9');
+    expect(model.fullTitle).toBe('TABLE events · [PROD]·analytics·SCHEMA:reporting·10.0.0.9');
+  });
+
+  it('sanitizes tab display settings with fallback defaults', () => {
+    expect(sanitizeTabDisplaySettings({
+      layout: 'invalid' as never,
+      primaryElements: ['schema', 'schema', 'bad' as never],
+      secondaryElements: ['object', 'schema', 'host'],
+    })).toEqual({
+      layout: 'single',
+      primaryElements: ['schema'],
+      secondaryElements: ['object', 'host'],
+    });
+
+    expect(sanitizeTabDisplaySettings({
+      layout: 'double',
+      primaryElements: ['bad' as never],
+      secondaryElements: [],
+    })).toEqual({
+      layout: 'double',
+      primaryElements: ['connection', 'kind', 'object'],
+      secondaryElements: [],
+    });
+
+    expect(sanitizeTabDisplaySettings({
+      layout: 'single',
+      primaryElements: ['object'],
+      secondaryElements: [],
+      single: {
+        primaryElements: ['object', 'object', 'host'],
+        secondaryElements: ['bad' as never],
+      },
+      double: {
+        primaryElements: ['kind', 'object'],
+        secondaryElements: ['connection', 'kind', 'schema'],
+      },
+    })).toEqual({
+      layout: 'single',
+      primaryElements: ['object'],
+      secondaryElements: [],
+      single: {
+        primaryElements: ['object', 'host'],
+        secondaryElements: [],
+      },
+      double: {
+        primaryElements: ['kind', 'object'],
+        secondaryElements: ['connection', 'schema'],
+      },
+    });
+  });
+
+  it('resolves visible tab display elements before hidden elements', () => {
+    expect(resolveTabDisplayElementOrder({
+      layout: 'double',
+      primaryElements: ['object', 'kind'],
+      secondaryElements: ['host'],
+    })).toEqual(['object', 'kind', 'host', 'connection', 'database', 'schema']);
+  });
+
+  it('keeps separate single-line and double-line settings when switching layouts', () => {
+    const doubleConfigured = sanitizeTabDisplaySettings({
+      layout: 'double',
+      primaryElements: ['kind', 'object'],
+      secondaryElements: ['connection', 'database'],
+    });
+
+    const singleLayout = switchTabDisplayLayout(doubleConfigured, 'single');
+    const singleConfigured = applyTabDisplaySettingsPatch(singleLayout, {
+      primaryElements: ['object', 'host'],
+      secondaryElements: [],
+    });
+    const restoredDouble = switchTabDisplayLayout(singleConfigured, 'double');
+    const restoredSingle = switchTabDisplayLayout(restoredDouble, 'single');
+
+    expect(restoredDouble.layout).toBe('double');
+    expect(restoredDouble.primaryElements).toEqual(['kind', 'object']);
+    expect(restoredDouble.secondaryElements).toEqual(['connection', 'database']);
+    expect(restoredSingle.layout).toBe('single');
+    expect(restoredSingle.primaryElements).toEqual(['object', 'host']);
+    expect(restoredSingle.secondaryElements).toEqual([]);
+  });
 });
diff --git a/frontend/src/utils/tabDisplay.ts b/frontend/src/utils/tabDisplay.ts
index b834a15..8b41b83 100644
--- a/frontend/src/utils/tabDisplay.ts
+++ b/frontend/src/utils/tabDisplay.ts
@@ -1,5 +1,175 @@
 import type { ConnectionConfig, SavedConnection, TabData } from '../types';
 
+export const TAB_DISPLAY_ELEMENT_KEYS = ['connection', 'kind', 'object', 'database', 'schema', 'host'] as const;
+
+export type TabDisplayElementKey = typeof TAB_DISPLAY_ELEMENT_KEYS[number];
+export type TabDisplayLayout = 'single' | 'double';
+
+export interface TabDisplayLayoutSnapshot {
+  primaryElements: TabDisplayElementKey[];
+  secondaryElements: TabDisplayElementKey[];
+}
+
+export interface TabDisplaySettings {
+  layout: TabDisplayLayout;
+  primaryElements: TabDisplayElementKey[];
+  secondaryElements: TabDisplayElementKey[];
+  single?: TabDisplayLayoutSnapshot;
+  double?: TabDisplayLayoutSnapshot;
+}
+
+export const TAB_DISPLAY_SECONDARY_DEFAULT_KEYS: TabDisplayElementKey[] = ['connection', 'database', 'schema', 'host'];
+
+export const TAB_DISPLAY_ELEMENT_META: Record<TabDisplayElementKey, { label: string; description: string }> = {
+  connection: { label: '连接名', description: '连接简称或环境名，例如 DEV' },
+  kind: { label: '对象类型', description: 'SQL / TABLE / VIEW 等类型标签' },
+  object: { label: '对象名', description: '表名、查询名、资源名等核心名称' },
+  database: { label: '数据库', description: '当前 DB / catalog 名称' },
+  schema: { label: 'Schema', description: 'schema / owner 前缀' },
+  host: { label: 'Host/IP', description: '连接目标地址摘要' },
+};
+
+export const DEFAULT_TAB_DISPLAY_SETTINGS: TabDisplaySettings = {
+  layout: 'single',
+  primaryElements: ['connection', 'kind', 'object'],
+  secondaryElements: [],
+};
+
+export const getCurrentTabDisplaySnapshot = (settings: TabDisplaySettings): TabDisplayLayoutSnapshot => ({
+  primaryElements: [...settings.primaryElements],
+  secondaryElements: [...settings.secondaryElements],
+});
+
+export const getDefaultTabDisplaySnapshot = (layout: TabDisplayLayout): TabDisplayLayoutSnapshot => {
+  if (layout === 'single') {
+    return {
+      primaryElements: [...DEFAULT_TAB_DISPLAY_SETTINGS.primaryElements],
+      secondaryElements: [],
+    };
+  }
+
+  return {
+    primaryElements: [...DEFAULT_TAB_DISPLAY_SETTINGS.primaryElements],
+    secondaryElements: TAB_DISPLAY_SECONDARY_DEFAULT_KEYS.filter((key) => !DEFAULT_TAB_DISPLAY_SETTINGS.primaryElements.includes(key)),
+  };
+};
+
+export const getSavedTabDisplaySnapshot = (
+  settings: TabDisplaySettings,
+  layout: TabDisplayLayout,
+): TabDisplayLayoutSnapshot => {
+  const saved = settings[layout];
+  if (saved) {
+    return {
+      primaryElements: [...saved.primaryElements],
+      secondaryElements: [...saved.secondaryElements],
+    };
+  }
+  if (settings.layout === layout) {
+    return getCurrentTabDisplaySnapshot(settings);
+  }
+  return getDefaultTabDisplaySnapshot(layout);
+};
+
+export const applyTabDisplaySettingsPatch = (
+  currentSettings: TabDisplaySettings,
+  patch: Partial<TabDisplaySettings>,
+): TabDisplaySettings => {
+  const nextSettings = sanitizeTabDisplaySettings({
+    ...currentSettings,
+    ...patch,
+  });
+  const nextSnapshot = getCurrentTabDisplaySnapshot(nextSettings);
+  return sanitizeTabDisplaySettings({
+    ...nextSettings,
+    [nextSettings.layout]: nextSnapshot,
+  });
+};
+
+export const switchTabDisplayLayout = (
+  currentSettings: TabDisplaySettings,
+  layout: TabDisplayLayout,
+): TabDisplaySettings => {
+  if (layout === currentSettings.layout) {
+    return sanitizeTabDisplaySettings(currentSettings);
+  }
+  const currentSnapshot = getCurrentTabDisplaySnapshot(currentSettings);
+  const targetSnapshot = getSavedTabDisplaySnapshot(currentSettings, layout);
+  return sanitizeTabDisplaySettings({
+    ...currentSettings,
+    [currentSettings.layout]: currentSnapshot,
+    layout,
+    primaryElements: targetSnapshot.primaryElements,
+    secondaryElements: targetSnapshot.secondaryElements,
+    [layout]: targetSnapshot,
+  });
+};
+
+const isTabDisplayElementKey = (value: unknown): value is TabDisplayElementKey => (
+  typeof value === 'string' && (TAB_DISPLAY_ELEMENT_KEYS as readonly string[]).includes(value)
+);
+
+const sanitizeTabDisplayElementList = (
+  value: unknown,
+  used: Set<TabDisplayElementKey>,
+): TabDisplayElementKey[] => {
+  if (!Array.isArray(value)) return [];
+  const result: TabDisplayElementKey[] = [];
+  value.forEach((entry) => {
+    if (!isTabDisplayElementKey(entry) || used.has(entry)) return;
+    used.add(entry);
+    result.push(entry);
+  });
+  return result;
+};
+
+const sanitizeTabDisplayLayoutSnapshot = (value: unknown): TabDisplayLayoutSnapshot | null => {
+  if (!value || typeof value !== 'object') {
+    return null;
+  }
+  const raw = value as Partial<TabDisplayLayoutSnapshot>;
+  const used = new Set<TabDisplayElementKey>();
+  const primaryElements = sanitizeTabDisplayElementList(raw.primaryElements, used);
+  const secondaryElements = sanitizeTabDisplayElementList(raw.secondaryElements, used);
+  return {
+    primaryElements: primaryElements.length > 0 ? primaryElements : [...DEFAULT_TAB_DISPLAY_SETTINGS.primaryElements],
+    secondaryElements,
+  };
+};
+
+export const sanitizeTabDisplaySettings = (value: unknown): TabDisplaySettings => {
+  if (!value || typeof value !== 'object') {
+    return { ...DEFAULT_TAB_DISPLAY_SETTINGS, primaryElements: [...DEFAULT_TAB_DISPLAY_SETTINGS.primaryElements], secondaryElements: [...DEFAULT_TAB_DISPLAY_SETTINGS.secondaryElements] };
+  }
+  const raw = value as Partial<TabDisplaySettings>;
+  const used = new Set<TabDisplayElementKey>();
+  const primaryElements = sanitizeTabDisplayElementList(raw.primaryElements, used);
+  const secondaryElements = sanitizeTabDisplayElementList(raw.secondaryElements, used);
+  const result: TabDisplaySettings = {
+    layout: raw.layout === 'double' ? 'double' : 'single',
+    primaryElements: primaryElements.length > 0 ? primaryElements : [...DEFAULT_TAB_DISPLAY_SETTINGS.primaryElements],
+    secondaryElements,
+  };
+  const single = sanitizeTabDisplayLayoutSnapshot(raw.single);
+  const double = sanitizeTabDisplayLayoutSnapshot(raw.double);
+  if (single) {
+    result.single = single;
+  }
+  if (double) {
+    result.double = double;
+  }
+  return result;
+};
+
+export const resolveTabDisplayElementOrder = (settings?: Partial<TabDisplaySettings> | null): TabDisplayElementKey[] => {
+  const sanitized = sanitizeTabDisplaySettings(settings);
+  const visible = [...sanitized.primaryElements, ...sanitized.secondaryElements];
+  return [
+    ...visible,
+    ...TAB_DISPLAY_ELEMENT_KEYS.filter((key) => !visible.includes(key)),
+  ];
+};
+
 export const detectConnectionEnvLabel = (connectionName: string): string | null => {
   const tokens = connectionName.toLowerCase().split(/[^a-z0-9]+/).filter(Boolean);
   if (tokens.includes('prod') || tokens.includes('production')) return 'PROD';
@@ -78,7 +248,321 @@ const buildRedisBaseTitle = (tab: TabData): string => {
   return dbLabel;
 };
 
-export const buildTabDisplayTitle = (tab: TabData, connection?: SavedConnection): string => {
+const splitQualifiedIdentifier = (value: unknown): string[] => {
+  const raw = String(value || '').trim();
+  if (!raw) return [];
+
+  const parts: string[] = [];
+  let current = '';
+  let quote: '"' | '`' | '[' | null = null;
+
+  for (let index = 0; index < raw.length; index += 1) {
+    const char = raw[index];
+    const next = raw[index + 1];
+
+    if (char === '\\' && next === '"') {
+      current += '"';
+      index += 1;
+      continue;
+    }
+
+    if (quote === '"') {
+      current += char;
+      if (char === '"' && next === '"') {
+        current += next;
+        index += 1;
+      } else if (char === '"') {
+        quote = null;
+      }
+      continue;
+    }
+
+    if (quote === '`') {
+      current += char;
+      if (char === '`' && next === '`') {
+        current += next;
+        index += 1;
+      } else if (char === '`') {
+        quote = null;
+      }
+      continue;
+    }
+
+    if (quote === '[') {
+      current += char;
+      if (char === ']') {
+        quote = null;
+      }
+      continue;
+    }
+
+    if (char === '"' || char === '`' || char === '[') {
+      quote = char;
+      current += char;
+      continue;
+    }
+
+    if (char === '.') {
+      parts.push(current.trim());
+      current = '';
+      continue;
+    }
+
+    current += char;
+  }
+
+  parts.push(current.trim());
+  return parts.filter(Boolean);
+};
+
+const unwrapIdentifierLabel = (value: string): string => {
+  let text = String(value || '').trim().replace(/\\"/g, '"');
+  if (!text) return '';
+
+  const first = text[0];
+  const last = text[text.length - 1];
+  if ((first === '"' && last === '"') || (first === '`' && last === '`')) {
+    text = text.slice(1, -1);
+  } else if (first === '[' && last === ']') {
+    text = text.slice(1, -1);
+  }
+
+  return text
+    .replace(/""/g, '"')
+    .replace(/``/g, '`')
+    .replace(/\]\]/g, ']')
+    .trim();
+};
+
+export const stripSchemaFromTabObjectLabel = (value: unknown): string => {
+  const raw = String(value || '').trim();
+  if (!raw) return '';
+
+  const parts = splitQualifiedIdentifier(raw);
+  const lastPart = parts[parts.length - 1] || raw;
+  return unwrapIdentifierLabel(lastPart) || raw;
+};
+
+const getSchemaFromTabObjectLabel = (value: unknown): string => {
+  const parts = splitQualifiedIdentifier(value);
+  if (parts.length <= 1) return '';
+  return parts.slice(0, -1).map((part) => unwrapIdentifierLabel(part)).filter(Boolean).join('.');
+};
+
+const replaceTitleObjectLabel = (title: string, objectName?: string): string => {
+  const rawTitle = String(title || '').trim();
+  if (!rawTitle) return rawTitle;
+
+  const rawObjectName = String(objectName || '').trim();
+  const displayObjectName = stripSchemaFromTabObjectLabel(rawObjectName);
+  if (rawObjectName && displayObjectName && displayObjectName !== rawObjectName) {
+    const lastIndex = rawTitle.lastIndexOf(rawObjectName);
+    if (lastIndex >= 0) {
+      return `${rawTitle.slice(0, lastIndex)}${displayObjectName}${rawTitle.slice(lastIndex + rawObjectName.length)}`;
+    }
+  }
+
+  const parenMatch = rawTitle.match(/^(.*\()([^()]*)\)(\s*)$/);
+  if (parenMatch) {
+    const objectLabel = stripSchemaFromTabObjectLabel(parenMatch[2]);
+    return `${parenMatch[1]}${objectLabel})${parenMatch[3]}`;
+  }
+
+  const colonMatch = rawTitle.match(/^([^:：]+[:：]\s*)(.+)$/);
+  if (colonMatch) {
+    return `${colonMatch[1]}${stripSchemaFromTabObjectLabel(colonMatch[2])}`;
+  }
+
+  return stripSchemaFromTabObjectLabel(rawTitle);
+};
+
+const stripSchemaFromTableOverviewTitle = (title: string): string => {
+  const rawTitle = String(title || '').trim();
+  return rawTitle.replace(/\s+\([^()]+\)\s*$/, '').trim() || rawTitle;
+};
+
+const QUERY_TAB_FALLBACK_TITLE = '新建查询';
+const QUERY_TAB_TITLE_MAX_LENGTH = 28;
+
+const getFileNameFromPath = (value: string): string => (
+  value.split(/[\\/]/).filter(Boolean).pop() || value
+);
+
+const isLikelyRawSqlTitle = (value: string): boolean => {
+  const text = value.trim();
+  if (!text) return false;
+  if (/[\r\n;]/.test(text)) return true;
+  return /^(select|with|insert|update|delete|merge|create|alter|drop|truncate|explain|show|desc|describe)\b/i.test(text);
+};
+
+const compactQueryTabTitle = (tab: TabData): string => {
+  const filePath = String(tab.filePath || '').trim();
+  if (filePath) {
+    return getFileNameFromPath(filePath);
+  }
+
+  const rawTitle = String(tab.title || '').trim();
+  const title = rawTitle && !isLikelyRawSqlTitle(rawTitle) ? rawTitle : QUERY_TAB_FALLBACK_TITLE;
+  if (title.length <= QUERY_TAB_TITLE_MAX_LENGTH) {
+    return title;
+  }
+  return `${title.slice(0, QUERY_TAB_TITLE_MAX_LENGTH - 3)}...`;
+};
+
+const buildCompactObjectTabTitle = (tab: TabData): string => {
+  if (tab.type === 'query') {
+    return compactQueryTabTitle(tab);
+  }
+  if (tab.type === 'table') {
+    return stripSchemaFromTabObjectLabel(tab.tableName || tab.title) || tab.title;
+  }
+  if (tab.type === 'design') {
+    return replaceTitleObjectLabel(tab.title, tab.tableName);
+  }
+  if (tab.type === 'table-overview') {
+    return stripSchemaFromTableOverviewTitle(tab.title);
+  }
+  if (tab.type === 'view-def') {
+    return replaceTitleObjectLabel(tab.title, tab.viewName);
+  }
+  if (tab.type === 'trigger') {
+    return replaceTitleObjectLabel(tab.title, tab.triggerName);
+  }
+  if (tab.type === 'event-def') {
+    return replaceTitleObjectLabel(tab.title, tab.eventName);
+  }
+  if (tab.type === 'routine-def') {
+    return replaceTitleObjectLabel(tab.title, tab.routineName);
+  }
+  return tab.title;
+};
+
+export const getTabDisplayKindLabel = (tab: TabData): string => {
+  if (tab.type === 'query') return 'SQL';
+  if (tab.type === 'table') return 'TABLE';
+  if (tab.type === 'design') return 'DESIGN';
+  if (tab.type === 'table-overview') return 'DB';
+  if (tab.type.startsWith('redis')) return 'REDIS';
+  if (tab.type.startsWith('jvm')) return 'JVM';
+  if (tab.type === 'trigger') return 'TRG';
+  if (tab.type === 'view-def') return tab.viewKind === 'materialized' ? 'MV' : 'VIEW';
+  if (tab.type === 'event-def') return 'EVT';
+  if (tab.type === 'routine-def') return 'FUNC';
+  return 'TAB';
+};
+
+const getTabRawObjectLabel = (tab: TabData): string => {
+  if (tab.type === 'query') return compactQueryTabTitle(tab);
+  if (tab.tableName) return tab.tableName;
+  if (tab.viewName) return tab.viewName;
+  if (tab.eventName) return tab.eventName;
+  if (tab.routineName) return tab.routineName;
+  if (tab.triggerName) return tab.triggerName;
+  if (tab.resourcePath) return tab.resourcePath;
+  if (tab.filePath) return getFileNameFromPath(tab.filePath);
+  if (tab.type.startsWith('redis')) return `db${tab.redisDB ?? 0}`;
+  return tab.title;
+};
+
+const getTabConnectionLabel = (connection?: SavedConnection): string => {
+  const connectionName = String(connection?.name || '').trim();
+  return detectConnectionEnvLabel(connectionName) || connectionName;
+};
+
+const getTabDisplayElementValue = (
+  key: TabDisplayElementKey,
+  tab: TabData,
+  connection?: SavedConnection,
+): string => {
+  const rawObjectLabel = getTabRawObjectLabel(tab);
+  switch (key) {
+    case 'connection':
+      return getTabConnectionLabel(connection);
+    case 'kind':
+      return getTabDisplayKindLabel(tab);
+    case 'object':
+      return buildCompactObjectTabTitle({
+        ...tab,
+        title: tab.type === 'table' || tab.type === 'query' ? rawObjectLabel : tab.title,
+      });
+    case 'database':
+      return String(tab.dbName || '').trim();
+    case 'schema':
+      return getSchemaFromTabObjectLabel(rawObjectLabel);
+    case 'host':
+      return resolveConnectionHostSummary(connection?.config);
+    default:
+      return '';
+  }
+};
+
+const formatTabDisplayPartValue = (key: TabDisplayElementKey, value: string): string => {
+  if (!value) return '';
+  if (key === 'connection') return `[${value}]`;
+  if (key === 'schema') return `SCHEMA:${value}`;
+  return value;
+};
+
+export interface TabDisplayPart {
+  key: TabDisplayElementKey;
+  value: string;
+  text: string;
+}
+
+export interface TabDisplayModel {
+  layout: TabDisplayLayout;
+  primaryParts: TabDisplayPart[];
+  secondaryParts: TabDisplayPart[];
+  primaryText: string;
+  secondaryText: string;
+  fullTitle: string;
+}
+
+const buildTabDisplayParts = (
+  keys: TabDisplayElementKey[],
+  tab: TabData,
+  connection?: SavedConnection,
+): TabDisplayPart[] => keys
+  .map((key) => {
+    const value = getTabDisplayElementValue(key, tab, connection);
+    return {
+      key,
+      value,
+      text: formatTabDisplayPartValue(key, value),
+    };
+  })
+  .filter((part) => part.text);
+
+export const buildTabDisplayModel = (
+  tab: TabData,
+  connection?: SavedConnection,
+  settings?: Partial<TabDisplaySettings> | null,
+): TabDisplayModel => {
+  const sanitized = sanitizeTabDisplaySettings(settings);
+  const primaryParts = buildTabDisplayParts(sanitized.primaryElements, tab, connection);
+  const secondaryParts = buildTabDisplayParts(sanitized.secondaryElements, tab, connection);
+  const primaryText = primaryParts.map((part) => part.text).join(' ').trim() || buildCompactObjectTabTitle(tab);
+  const secondaryText = secondaryParts.map((part) => part.text).join('·').trim();
+  const fullTitle = [primaryText, secondaryText].filter(Boolean).join(' · ');
+  return {
+    layout: sanitized.layout,
+    primaryParts,
+    secondaryParts,
+    primaryText,
+    secondaryText,
+    fullTitle,
+  };
+};
+
+export const buildTabDisplayTitle = (
+  tab: TabData,
+  connection?: SavedConnection,
+  settings?: Partial<TabDisplaySettings> | null,
+): string => {
+  if (settings) {
+    return buildTabDisplayModel(tab, connection, settings).fullTitle;
+  }
+
   const connectionName = String(connection?.name || '').trim();
 
   if (isRedisTab(tab)) {
@@ -87,13 +571,14 @@ export const buildTabDisplayTitle = (tab: TabData, connection?: SavedConnection)
     return identity ? `[${identity}] ${buildRedisBaseTitle(tab)}` : buildRedisBaseTitle(tab);
   }
 
+  const baseTitle = buildCompactObjectTabTitle(tab);
   if (tab.type !== 'table' && tab.type !== 'design' && tab.type !== 'table-overview') {
-    return tab.title;
+    return baseTitle;
   }
   if (!connectionName) {
-    return tab.title;
+    return baseTitle;
   }
 
   const prefix = detectConnectionEnvLabel(connectionName) || connectionName;
-  return `[${prefix}] ${tab.title}`;
+  return `[${prefix}] ${baseTitle}`;
 };
diff --git a/frontend/src/utils/triggerEditSql.test.ts b/frontend/src/utils/triggerEditSql.test.ts
new file mode 100644
index 0000000..19c09b0
--- /dev/null
+++ b/frontend/src/utils/triggerEditSql.test.ts
@@ -0,0 +1,19 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildEditableTriggerSql } from './triggerEditSql';
+
+describe('triggerEditSql', () => {
+  it('builds a replace-style trigger edit script with drop and create statements', () => {
+    const sql = buildEditableTriggerSql(
+      'bit_check',
+      'CREATE TRIGGER `bit_check`\nBEFORE INSERT ON `c_check`\nFOR EACH ROW\nBEGIN\n  SET NEW.flag = 1;\nEND',
+      { dropSql: 'DROP TRIGGER IF EXISTS `bit_check`' },
+    );
+
+    expect(sql).toContain('-- 修改触发器: bit_check');
+    expect(sql).toContain('表设计修改会先删除原触发器，再创建新触发器');
+    expect(sql).toContain('DROP TRIGGER IF EXISTS `bit_check`;');
+    expect(sql).toContain('CREATE TRIGGER `bit_check`');
+    expect(sql.trim().endsWith(';')).toBe(true);
+  });
+});
diff --git a/frontend/src/utils/triggerEditSql.ts b/frontend/src/utils/triggerEditSql.ts
new file mode 100644
index 0000000..1b8cfc2
--- /dev/null
+++ b/frontend/src/utils/triggerEditSql.ts
@@ -0,0 +1,53 @@
+export const ensureSqlStatementTerminator = (sql: string): string => {
+  const normalized = String(sql || '').trim();
+  if (!normalized) return '';
+  return /;\s*$/.test(normalized) ? normalized : `${normalized};`;
+};
+
+const buildTriggerEditHeader = (
+  triggerName: string,
+  options?: { dropSql?: string },
+): string => {
+  const normalizedName = String(triggerName || '').trim();
+  const hint = String(options?.dropSql || '').trim()
+    ? '表设计修改会先删除原触发器，再创建新触发器，请确认后执行'
+    : '请确认语法兼容当前数据库后执行';
+  return `-- 修改触发器: ${normalizedName}\n-- ${hint}\n`;
+};
+
+const normalizeEditableTriggerDefinition = (
+  triggerName: string,
+  triggerDefinition: string,
+): string => {
+  const normalizedName = String(triggerName || '').trim();
+  const normalizedDefinition = String(triggerDefinition || '').trim();
+  if (!normalizedDefinition) {
+    return '-- 当前触发器定义为空，请补全 CREATE TRIGGER 语句后执行';
+  }
+  if (/^\s*create\s+(?:or\s+replace\s+)?trigger\b/i.test(normalizedDefinition)) {
+    return ensureSqlStatementTerminator(normalizedDefinition);
+  }
+  if (/^\s*trigger\b/i.test(normalizedDefinition)) {
+    return ensureSqlStatementTerminator(
+      normalizedDefinition.replace(/^\s*trigger\b/i, 'CREATE OR REPLACE TRIGGER'),
+    );
+  }
+  if (/^\s*(?:before|after|instead\s+of)\b/i.test(normalizedDefinition)) {
+    return ensureSqlStatementTerminator(`CREATE OR REPLACE TRIGGER ${normalizedName}\n${normalizedDefinition}`);
+  }
+  return `-- 当前数据源仅返回触发器定义片段，请补全 CREATE TRIGGER 语句后执行\n${ensureSqlStatementTerminator(normalizedDefinition)}`;
+};
+
+export const buildEditableTriggerSql = (
+  triggerName: string,
+  triggerDefinition: string,
+  options?: { dropSql?: string },
+): string => {
+  const header = buildTriggerEditHeader(triggerName, options);
+  const dropSql = String(options?.dropSql || '').trim();
+  const createSql = normalizeEditableTriggerDefinition(triggerName, triggerDefinition);
+  if (!dropSql) {
+    return `${header}${createSql}`;
+  }
+  return `${header}${ensureSqlStatementTerminator(dropSql)}\n${createSql}`;
+};
diff --git a/frontend/src/utils/windowStateUi.test.ts b/frontend/src/utils/windowStateUi.test.ts
index 978855f..ee68062 100644
--- a/frontend/src/utils/windowStateUi.test.ts
+++ b/frontend/src/utils/windowStateUi.test.ts
@@ -18,18 +18,22 @@ describe('windowStateUi', () => {
     expect(shouldApplyWindowsScaleFix('ratio-change', true)).toBe(true);
   });
 
-  it('applies the Windows scale fix when a minimized taskbar window is restored with viewport drift', () => {
+  it('applies the Windows scale fix whenever a minimized taskbar window is restored', () => {
     expect(shouldApplyWindowsScaleFix('restore', true)).toBe(true);
-    expect(shouldApplyWindowsScaleFix('restore', false)).toBe(false);
+    // 外接显示器恢复后的 WebView2/DWM backing surface 可能被旧 DPI 缩放，
+    // 但不一定表现为 viewport ratio drift；restore 仍要触发 1px 轻量重绘。
+    expect(shouldApplyWindowsScaleFix('restore', false)).toBe(true);
     // 关键：restore 场景刻意不再触发 maximised 窗口的 toggle —— Unmaximise → Maximise 在
     // 任务栏恢复的真实交互里会被用户肉眼看见为"重复最大化"动画，比偶发字体变大更糟。
     // 这是 9848b8b2 已有的取舍，禁止再次被"修复"成 true。
     expect(shouldToggleMaximisedWindowForScaleFix('restore', true)).toBe(false);
   });
 
-  it('only calls the backend WebView2 zoom reset after a real restore drift', () => {
+  it('calls the backend WebView2 zoom reset whenever a minimized window is restored', () => {
     expect(shouldResetWebViewZoomForScaleFix('restore', true)).toBe(true);
-    expect(shouldResetWebViewZoomForScaleFix('restore', false)).toBe(false);
+    // 字体模糊/DirectWrite 度量缓存异常不一定表现为 viewport ratio drift，
+    // 因此任务栏恢复场景必须直接走零动画 WebView2 zoom reset。
+    expect(shouldResetWebViewZoomForScaleFix('restore', false)).toBe(true);
     expect(shouldResetWebViewZoomForScaleFix('activation', true)).toBe(false);
     expect(shouldResetWebViewZoomForScaleFix('ratio-change', true)).toBe(false);
   });
diff --git a/frontend/src/utils/windowStateUi.ts b/frontend/src/utils/windowStateUi.ts
index a8b88e9..c5a05f3 100644
--- a/frontend/src/utils/windowStateUi.ts
+++ b/frontend/src/utils/windowStateUi.ts
@@ -6,15 +6,15 @@ export type TitleBarToggleIconKey = 'maximize' | 'restore';
 export const shouldApplyWindowsScaleFix = (
   reason: WindowScaleFixReason,
   hasViewportScaleDrift: boolean,
-): boolean => (reason === 'ratio-change' || reason === 'restore') && hasViewportScaleDrift;
+): boolean => reason === 'restore' || (reason === 'ratio-change' && hasViewportScaleDrift);
 
 // 关于 restore 场景为何刻意不走 toggle（见 9848b8b2）：
 // maximised 窗口在 Windows 上无法通过 SetSize nudge 修复 viewport drift（OS 拒绝 resize），
 // 唯一能让 WebView2 重新计算缩放的办法是 Unmaximise → Maximise，但在任务栏图标点击恢复的
 // 真实场景下，用户会肉眼看到窗口"被弹两次"的重复最大化动画——比偶发字体变大更糟。
-// 取舍：restore 时只 dispatch resize 让 React 重算布局，宁可字体保持当前缩放，
-// 也不要可见的重复最大化抖动。ratio-change（DPR 变化，例如把窗口拖到另一块显示器）则
-// 允许 toggle，因为那种场景下用户预期会有视觉过渡。
+// 取舍：restore 时普通窗口走 1px SetSize nudge 迫使 WebView2/DWM 重新分配 backing surface；
+// maximised 窗口只做 WebView2 zoom reset + resize，避免可见的重复最大化抖动。
+// ratio-change（DPR 变化，例如把窗口拖到另一块显示器）则允许 toggle，因为那种场景下用户预期会有视觉过渡。
 export const shouldToggleMaximisedWindowForScaleFix = (
   reason: WindowScaleFixReason,
   hasViewportScaleDrift: boolean,
@@ -22,8 +22,8 @@ export const shouldToggleMaximisedWindowForScaleFix = (
 
 export const shouldResetWebViewZoomForScaleFix = (
   reason: WindowScaleFixReason,
-  hasViewportScaleDrift: boolean,
-): boolean => reason === 'restore' && hasViewportScaleDrift;
+  _hasViewportScaleDrift: boolean,
+): boolean => reason === 'restore';
 
 export const resolveWindowsScaleCheckDelayMs = (trigger: WindowsScaleCheckTrigger): number =>
   trigger === 'resize' ? 240 : 0;
diff --git a/frontend/src/v2-theme.css b/frontend/src/v2-theme.css
index f11cf06..4600679 100644
--- a/frontend/src/v2-theme.css
+++ b/frontend/src/v2-theme.css
@@ -21,8 +21,8 @@
 
 /* ─── Light tokens ─────────────────────────────────────── */
 body[data-ui-version="v2"][data-theme="light"] {
-  --gn-font-sans: "Inter", "PingFang SC", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", sans-serif;
-  --gn-font-mono: "JetBrains Mono", ui-monospace, "SF Mono", Menlo, Consolas, monospace;
+  --gn-font-sans: "Inter", "PingFang SC", "Noto Sans CJK SC", "Noto Sans SC", "Source Han Sans SC", "WenQuanYi Micro Hei", "Microsoft YaHei", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Ubuntu", sans-serif;
+  --gn-font-mono: "JetBrains Mono", "Noto Sans Mono CJK SC", "Noto Sans Mono", ui-monospace, "SF Mono", Menlo, Consolas, "DejaVu Sans Mono", monospace;
 
   --gn-bg-app:      #f6f6f4;
   --gn-bg-chrome:   #ececea;
@@ -63,8 +63,8 @@ body[data-ui-version="v2"][data-theme="light"] {
 
 /* ─── Dark tokens ──────────────────────────────────────── */
 body[data-ui-version="v2"][data-theme="dark"] {
-  --gn-font-sans: "Inter", "PingFang SC", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", sans-serif;
-  --gn-font-mono: "JetBrains Mono", ui-monospace, "SF Mono", Menlo, Consolas, monospace;
+  --gn-font-sans: "Inter", "PingFang SC", "Noto Sans CJK SC", "Noto Sans SC", "Source Han Sans SC", "WenQuanYi Micro Hei", "Microsoft YaHei", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", "Ubuntu", sans-serif;
+  --gn-font-mono: "JetBrains Mono", "Noto Sans Mono CJK SC", "Noto Sans Mono", ui-monospace, "SF Mono", Menlo, Consolas, "DejaVu Sans Mono", monospace;
 
   --gn-bg-app:      #0c0e12;
   --gn-bg-chrome:   #14171c;
@@ -1831,8 +1831,22 @@ body[data-ui-version="v2"] .gn-v2-explorer-search {
   border-bottom: none !important;
 }
 
+body[data-ui-version="v2"] .gn-v2-explorer-command-row,
+body[data-ui-version="v2"] .gn-v2-explorer-legacy-filter-row {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+}
+
+body[data-ui-version="v2"] .gn-v2-explorer-legacy-filter-row .ant-input-affix-wrapper {
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
 body[data-ui-version="v2"] .gn-v2-explorer-command-trigger {
-  width: 100%;
+  flex: 1 1 auto;
+  min-width: 0;
   height: 30px;
   display: flex;
   align-items: center;
@@ -1862,6 +1876,31 @@ body[data-ui-version="v2"] .gn-v2-explorer-command-trigger > span:nth-child(2) {
   white-space: nowrap;
 }
 
+body[data-ui-version="v2"] .gn-v2-explorer-filter-action {
+  width: 30px;
+  height: 30px;
+  flex: 0 0 30px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border: 0.5px solid var(--gn-br-2);
+  border-radius: 7px;
+  background: var(--gn-bg-input);
+  color: var(--gn-fg-4);
+  cursor: pointer;
+}
+
+body[data-ui-version="v2"] .gn-v2-explorer-filter-action:hover:not(:disabled) {
+  border-color: var(--gn-accent);
+  background: var(--gn-bg-hover);
+  color: var(--gn-fg-2);
+}
+
+body[data-ui-version="v2"] .gn-v2-explorer-filter-action:disabled {
+  opacity: 0.42;
+  cursor: not-allowed;
+}
+
 body[data-ui-version="v2"] .gn-v2-command-backdrop {
   position: fixed;
   inset: 0;
@@ -1918,6 +1957,38 @@ body[data-ui-version="v2"] .gn-v2-command-searchbar > .anticon {
   color: var(--gn-fg-4);
 }
 
+body[data-ui-version="v2"] .gn-v2-command-filter-switch {
+  height: 30px;
+  flex: 0 0 auto;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+body[data-ui-version="v2"] .gn-v2-command-searchbar .ant-switch {
+  flex: 0 0 auto;
+}
+
+body[data-ui-version="v2"] .gn-v2-command-searchbar .ant-btn {
+  width: 30px !important;
+  height: 30px !important;
+  flex: 0 0 30px;
+  display: inline-flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  border-radius: 8px !important;
+  color: var(--gn-fg-4) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-command-searchbar .ant-btn:hover:not(:disabled) {
+  background: var(--gn-bg-hover) !important;
+  color: var(--gn-fg-2) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-command-searchbar .ant-btn:disabled {
+  color: var(--gn-fg-5) !important;
+}
+
 body[data-ui-version="v2"] .gn-v2-command-searchbar > kbd,
 body[data-ui-version="v2"] .gn-v2-command-footer kbd,
 body[data-ui-version="v2"] .gn-v2-command-row kbd {
@@ -2151,21 +2222,67 @@ body[data-ui-version="v2"] .gn-v2-explorer-toolbar {
 }
 
 body[data-ui-version="v2"] .gn-v2-explorer-tree-shell {
+  --gn-v2-tree-horizontal-scroll-reserve: 32px;
   margin: 0;
   border: 0;
   border-radius: 0;
   background: transparent;
+  overflow: hidden !important;
 }
 
 body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .sidebar-tree-scroll-content {
-  padding: 4px 0 12px;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  height: 100%;
+  box-sizing: border-box;
+  padding: 4px 0 0;
 }
 
 body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree {
+  flex: 1 1 auto;
+  width: 100%;
+  min-width: 0;
+  min-height: 0;
+  height: 100%;
   font-size: var(--gn-sidebar-tree-font-size, var(--gn-font-size-sm, 12px));
   line-height: 1.2;
 }
 
+body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-list {
+  height: calc(100% - var(--gn-v2-tree-horizontal-scroll-reserve));
+  min-height: 0;
+  box-sizing: border-box;
+}
+
+body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-list-holder {
+  scrollbar-width: thin;
+}
+
+body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-list-scrollbar-horizontal {
+  height: 12px !important;
+  left: 8px !important;
+  right: 8px !important;
+  bottom: calc((var(--gn-v2-tree-horizontal-scroll-reserve) - 12px) * -1) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-list-scrollbar-horizontal .ant-tree-list-scrollbar-thumb {
+  height: 8px !important;
+  border-radius: 999px !important;
+  background: color-mix(in srgb, var(--gn-fg-4) 52%, transparent) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-list-scrollbar-horizontal .ant-tree-list-scrollbar-thumb:hover,
+body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-list-scrollbar-horizontal .ant-tree-list-scrollbar-thumb-moving {
+  background: color-mix(in srgb, var(--gn-fg-3) 72%, transparent) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-list-holder-inner {
+  width: 100%;
+  min-width: 100%;
+  box-sizing: border-box;
+}
+
 body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-treenode {
   min-height: 26px !important;
   padding: 0 6px !important;
@@ -2189,7 +2306,7 @@ body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-node-content-wra
   min-width: 0;
   min-height: 26px !important;
   padding: 0 6px !important;
-  display: inline-flex !important;
+  display: flex !important;
   align-items: center;
   border-radius: 6px !important;
   color: var(--gn-fg-3) !important;
@@ -2246,9 +2363,9 @@ body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .gn-v2-tree-folder-icon .a
 
 body[data-ui-version="v2"] .gn-v2-explorer-tree-shell .ant-tree-title {
   min-width: 0;
+  flex: 1 1 auto;
   display: inline-flex;
   align-items: center;
-  max-width: 100%;
   overflow: visible;
 }
 
@@ -2800,19 +2917,34 @@ body[data-ui-version="v2"] .gn-v2-main-tabs > .ant-tabs-nav {
   background: var(--gn-bg-panel-2);
 }
 
+body[data-ui-version="v2"] .gn-v2-main-tabs-double > .ant-tabs-nav {
+  height: 46px;
+  flex: 0 0 46px;
+}
+
 body[data-ui-version="v2"] .gn-v2-main-tabs .ant-tabs-nav-wrap,
 body[data-ui-version="v2"] .gn-v2-main-tabs .ant-tabs-nav-list {
   min-height: 36px;
 }
 
+body[data-ui-version="v2"] .gn-v2-main-tabs-double .ant-tabs-nav-wrap,
+body[data-ui-version="v2"] .gn-v2-main-tabs-double .ant-tabs-nav-list {
+  min-height: 46px;
+}
+
 body[data-ui-version="v2"] .gn-v2-main-tabs .ant-tabs-tab {
-  min-width: 140px;
+  width: 260px;
+  min-width: 260px;
   max-width: 260px;
   height: 36px;
   margin: 0 !important;
   padding: 0 !important;
 }
 
+body[data-ui-version="v2"] .gn-v2-main-tabs-double .ant-tabs-tab {
+  height: 46px;
+}
+
 body[data-ui-version="v2"] .gn-v2-main-tabs .ant-tabs-tab-btn {
   width: 100%;
   height: 100%;
@@ -2822,10 +2954,94 @@ body[data-ui-version="v2"] .gn-v2-tab-label {
   position: relative;
   width: 100%;
   height: 100%;
+  box-sizing: border-box;
   padding: 0 8px 0 10px;
   gap: 7px;
 }
 
+body[data-ui-version="v2"] .gn-v2-tab-label-content {
+  min-width: 0;
+  flex: 1 1 auto;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  overflow: hidden;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-label-double {
+  padding-top: 4px;
+  padding-bottom: 3px;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-label-double .gn-v2-tab-label-content {
+  align-items: stretch;
+  justify-content: flex-start;
+  flex-direction: column;
+  gap: 0;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-label-double .gn-v2-tab-label-main {
+  flex: 0 1 auto;
+  gap: 5px;
+  line-height: 17px;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-label-main {
+  min-width: 0;
+  flex: 1 1 auto;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--gn-fg-2);
+  font-weight: 700;
+  line-height: 16px;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-label-secondary {
+  min-width: 0;
+  display: block;
+  overflow: hidden;
+  color: var(--gn-fg-5);
+  font-family: var(--gn-font-mono);
+  font-size: 10px;
+  font-weight: 650;
+  line-height: 12px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-label-part {
+  min-width: 0;
+  flex: 0 0 auto;
+  overflow: hidden;
+  text-align: left;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-label-part-object {
+  flex: 1 1 auto;
+  color: var(--gn-fg-2);
+  font-weight: 700;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-label-part-connection {
+  flex: 0 1 92px;
+  color: var(--gn-fg-2);
+  font-family: var(--gn-font-mono);
+  font-weight: 700;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-label-part-host,
+body[data-ui-version="v2"] .gn-v2-tab-label-part-database,
+body[data-ui-version="v2"] .gn-v2-tab-label-part-schema {
+  flex: 0 2 auto;
+  max-width: 112px;
+}
+
 body[data-ui-version="v2"] .gn-v2-tab-kind-icon {
   display: inline-flex;
   color: var(--gn-accent);
@@ -2834,6 +3050,7 @@ body[data-ui-version="v2"] .gn-v2-tab-kind-icon {
 
 body[data-ui-version="v2"] .gn-v2-tab-kind {
   height: 17px;
+  flex: 0 0 auto;
   display: inline-flex;
   align-items: center;
   padding: 0 5px;
@@ -2858,7 +3075,6 @@ body[data-ui-version="v2"] .gn-v2-tab-conn {
 body[data-ui-version="v2"] .gn-v2-tab-close {
   width: 18px;
   height: 18px;
-  margin-left: auto;
   flex: 0 0 18px;
   border: none;
   border-radius: 4px;
@@ -2877,6 +3093,59 @@ body[data-ui-version="v2"] .gn-v2-tab-close:hover {
   color: var(--gn-fg-1);
 }
 
+body[data-ui-version="v2"] .gn-v2-tab-context-menu-popup .ant-dropdown-menu {
+  min-width: 188px;
+  padding: 6px !important;
+  border: 0.5px solid var(--gn-br-2) !important;
+  border-radius: 12px !important;
+  background: color-mix(in srgb, var(--gn-bg-panel) 94%, transparent) !important;
+  box-shadow: 0 18px 44px rgba(15, 23, 42, 0.18), 0 0 0 1px rgba(15, 23, 42, 0.04) !important;
+  backdrop-filter: blur(12px);
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-context-menu-popup .ant-dropdown-menu-item {
+  min-height: 34px !important;
+  padding: 7px 10px !important;
+  border-radius: 8px !important;
+  color: var(--gn-fg-2) !important;
+  font-size: 13px !important;
+  font-weight: 650 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-context-menu-popup .ant-dropdown-menu-item:hover {
+  background: var(--gn-bg-active) !important;
+  color: var(--gn-fg-1) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-context-menu-popup .ant-dropdown-menu-item-disabled {
+  color: var(--gn-fg-5) !important;
+  opacity: 0.5;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-context-menu-popup .ant-dropdown-menu-item-icon {
+  color: var(--gn-info);
+  font-size: 14px;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-context-menu-popup .ant-dropdown-menu-item-divider {
+  margin: 5px 4px !important;
+  background: var(--gn-br-1) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-context-menu-popup .ant-dropdown-menu-title-content {
+  display: inline-flex;
+  align-items: center;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-context-menu-popup .ant-dropdown-menu-item:first-child {
+  color: var(--gn-fg-1) !important;
+  background: color-mix(in srgb, var(--gn-info) 8%, transparent) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-tab-context-menu-popup .ant-dropdown-menu-item:first-child:hover {
+  background: color-mix(in srgb, var(--gn-info) 14%, transparent) !important;
+}
+
 /* ─── V2 DataGrid: toolbar, smart filters, table, statusbar ─ */
 body[data-ui-version="v2"] .gn-v2-data-viewer {
   background: var(--gn-bg-panel);
@@ -3008,6 +3277,18 @@ body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-ai-insight-button .gn-v2-tool
   color: var(--gn-info);
 }
 
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-query-result-toolbar-hide {
+  border-color: var(--gn-br-1) !important;
+  background: var(--gn-bg-panel) !important;
+  color: var(--gn-fg-2) !important;
+  font-weight: 650 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-query-result-toolbar-hide:hover {
+  background: var(--gn-bg-hover) !important;
+  color: var(--gn-fg-1) !important;
+}
+
 body[data-ui-version="v2"] .gn-v2-smart-filter-panel {
   background: var(--gn-bg-panel-2) !important;
   border-top: 0.5px solid var(--gn-br-1);
@@ -3070,6 +3351,30 @@ body[data-ui-version="v2"] .gn-v2-data-grid .ant-table-thead > tr > th {
   vertical-align: top !important;
 }
 
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-table-designer.is-embedded .ant-table-thead > tr > th {
+  height: var(--gn-v2-designer-header-height, 40px) !important;
+  min-height: var(--gn-v2-designer-header-height, 40px) !important;
+  padding: var(--gn-v2-designer-header-padding, 0 8px) !important;
+  color: var(--gn-fg-3) !important;
+  font-family: inherit !important;
+  font-size: var(--gn-v2-designer-content-font-size, 12px) !important;
+  font-weight: 600 !important;
+  vertical-align: middle !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-table-designer.is-embedded .ant-table-thead .ant-table-column-title {
+  min-height: var(--gn-v2-designer-header-height, 40px) !important;
+  color: inherit !important;
+  font-family: inherit !important;
+  font-size: inherit !important;
+  font-weight: 600 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-table-designer.is-embedded .ant-table-thead .ant-table-column-sorters {
+  min-height: var(--gn-v2-designer-header-height, 40px) !important;
+  align-items: center !important;
+}
+
 body[data-ui-version="v2"] .gn-v2-data-grid .ant-table-thead .ant-table-column-title {
   font-size: var(--gn-data-table-font-size, var(--gn-font-size-mono, 12px));
   font-weight: 400 !important;
@@ -3116,6 +3421,14 @@ body[data-ui-version="v2"] .gn-v2-data-grid .ant-table-selection-column {
   border-right: 0.5px solid var(--gn-br-1) !important;
 }
 
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-table-designer.is-embedded .ant-table-thead > tr > th:first-child,
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-table-designer.is-embedded .ant-table-thead > tr > th.ant-table-selection-column,
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-table-designer.is-embedded .ant-table-selection-column {
+  width: var(--gn-v2-designer-selection-column-width, 44px) !important;
+  min-width: var(--gn-v2-designer-selection-column-width, 44px) !important;
+  max-width: var(--gn-v2-designer-selection-column-width, 44px) !important;
+}
+
 body[data-ui-version="v2"] .gn-v2-data-grid .ant-table-thead > tr > th:first-child,
 body[data-ui-version="v2"] .gn-v2-data-grid .ant-table-thead > tr > th.ant-table-selection-column {
   vertical-align: middle !important;
@@ -3132,6 +3445,11 @@ body[data-ui-version="v2"] .gn-v2-data-grid .ant-table-thead > tr > th.ant-table
   justify-content: center;
 }
 
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-table-designer.is-embedded .ant-table-thead > tr > th:first-child .ant-table-selection,
+body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-table-designer.is-embedded .ant-table-thead > tr > th.ant-table-selection-column .ant-table-selection {
+  min-height: var(--gn-v2-designer-header-height, 40px) !important;
+}
+
 body[data-ui-version="v2"] .gn-v2-column-title {
   width: 100%;
   min-width: 0;
@@ -3293,8 +3611,8 @@ body[data-ui-version="v2"] .gn-v2-data-grid-statusbar {
   --gn-v2-statusbar-control-height: 26px;
   container-type: inline-size;
   container-name: gn-v2-data-grid-statusbar;
-  height: calc(36px * var(--gn-ui-scale, 1));
-  min-height: calc(36px * var(--gn-ui-scale, 1));
+  height: calc(40px * var(--gn-ui-scale, 1));
+  min-height: calc(40px * var(--gn-ui-scale, 1));
   display: flex;
   align-items: center;
   gap: calc(8px * var(--gn-ui-scale, 1));
@@ -3303,41 +3621,45 @@ body[data-ui-version="v2"] .gn-v2-data-grid-statusbar {
   border-top: 0.5px solid var(--gn-br-1);
   background: var(--gn-bg-panel-2);
   white-space: nowrap;
-  overflow: hidden;
+  overflow-x: auto;
+  overflow-y: hidden;
+  scrollbar-width: thin;
+  scrollbar-color: var(--gn-br-3) transparent;
   flex-shrink: 0;
   box-sizing: border-box;
 }
 
+body[data-ui-version="v2"] .gn-v2-data-grid-statusbar::-webkit-scrollbar {
+  height: 7px;
+}
+
+body[data-ui-version="v2"] .gn-v2-data-grid-statusbar::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+body[data-ui-version="v2"] .gn-v2-data-grid-statusbar::-webkit-scrollbar-thumb {
+  border-radius: 999px;
+  background: var(--gn-br-3);
+}
+
 body[data-ui-version="v2"] .gn-v2-data-grid-status-main {
   display: inline-flex;
   align-items: center;
   gap: calc(8px * var(--gn-ui-scale, 1));
-  min-width: 0;
-  flex: 1 1 auto;
-  overflow-x: auto;
-  overflow-y: hidden;
-  scrollbar-width: none;
-}
-
-body[data-ui-version="v2"] .gn-v2-data-grid-status-main::-webkit-scrollbar {
-  display: none;
+  min-width: max-content;
+  flex: 0 0 auto;
+  overflow: visible;
 }
 
 body[data-ui-version="v2"] .gn-v2-data-grid-status-right {
   display: inline-flex;
   align-items: center;
   justify-content: flex-end;
-  flex: 0 1 auto;
-  min-width: 0;
-  max-width: 100%;
+  flex: 0 0 auto;
+  min-width: max-content;
+  max-width: none;
   margin-left: auto;
-  overflow-x: auto;
-  overflow-y: hidden;
-  scrollbar-width: none;
-}
-
-body[data-ui-version="v2"] .gn-v2-data-grid-status-right::-webkit-scrollbar {
-  display: none;
+  overflow: visible;
 }
 
 @media (max-width: 1180px) {
@@ -3486,9 +3808,9 @@ body[data-ui-version="v2"] .gn-v2-data-grid-result-switcher .ant-segmented-item-
 body[data-ui-version="v2"] .gn-v2-data-grid-status-center {
   height: var(--gn-v2-statusbar-control-height);
   min-height: var(--gn-v2-statusbar-control-height);
-  gap: 6px;
+  gap: 4px;
   flex: 0 0 auto;
-  min-width: fit-content;
+  min-width: max-content;
   overflow: visible;
   color: var(--gn-fg-4);
   font-family: var(--gn-font-mono);
@@ -3511,7 +3833,7 @@ body[data-ui-version="v2"] .gn-v2-data-grid-status-center > span:not(:last-child
   display: inline-block;
   width: 1px;
   height: 10px;
-  margin-left: 8px;
+  margin-left: 6px;
   vertical-align: -1px;
   background: var(--gn-br-1);
 }
@@ -3704,18 +4026,6 @@ body[data-ui-version="v2"] .gn-v2-data-grid-column-quick-find .ant-select-focuse
   box-shadow: none !important;
 }
 
-@media (max-width: 1460px) {
-  body[data-ui-version="v2"] .gn-v2-data-grid-status-center > span:last-child {
-    display: none;
-  }
-}
-
-@media (max-width: 1360px) {
-  body[data-ui-version="v2"] .gn-v2-data-grid-status-center > span:nth-child(2) {
-    display: none;
-  }
-}
-
 body[data-ui-version="v2"] .gn-v2-data-grid-page-find .ant-btn {
   width: 26px !important;
   height: 26px !important;
@@ -4482,8 +4792,194 @@ body[data-ui-version="v2"] .gn-v2-designer-toolbar {
   border-radius: 0 !important;
 }
 
+body[data-ui-version="v2"] .gn-v2-query-toolbar {
+  min-height: 48px;
+  padding: 8px 12px !important;
+  gap: 6px 10px !important;
+  align-items: center !important;
+  flex-wrap: nowrap;
+  overflow-x: auto;
+  overflow-y: hidden;
+  background: var(--gn-bg-panel) !important;
+  border-bottom: 0.5px solid var(--gn-br-1) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-main {
+  display: inline-flex;
+  width: max-content;
+  min-width: 100%;
+  gap: 6px 10px !important;
+  align-items: center !important;
+  flex: 0 0 auto;
+  flex-wrap: nowrap;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-selects,
+body[data-ui-version="v2"] .gn-v2-query-toolbar-actions {
+  min-width: 0;
+  gap: 6px !important;
+  flex: 0 0 auto !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-selects {
+  flex-wrap: nowrap;
+  max-width: 760px;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-actions {
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-transaction-toolbar {
+  display: inline-flex;
+  max-width: 100%;
+  flex: 0 0 auto;
+  flex-wrap: nowrap;
+}
+
 body[data-ui-version="v2"] .gn-v2-query-toolbar .ant-select {
-  min-width: 132px;
+  min-width: 0;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-connection-select {
+  width: 140px !important;
+  flex: 0 1 140px !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-database-select {
+  width: 166px !important;
+  flex: 1 1 166px !important;
+  max-width: 220px;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-max-rows-select {
+  width: 132px !important;
+  flex: 0 0 132px !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-transaction-mode-select {
+  width: 74px !important;
+  flex: 0 0 74px !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-transaction-delay-select {
+  width: 62px !important;
+  flex: 0 0 62px !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar .ant-select-selector {
+  height: 32px !important;
+  padding: 0 10px !important;
+  border-radius: 9px !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar .ant-select-selection-item,
+body[data-ui-version="v2"] .gn-v2-query-toolbar .ant-select-selection-placeholder {
+  line-height: 30px !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar .ant-btn {
+  height: 32px !important;
+  padding: 0 11px !important;
+  border-radius: 9px !important;
+  font-size: 12.5px !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-action-group {
+  display: inline-flex !important;
+  align-items: center;
+  flex: 0 0 auto;
+  gap: 6px;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-action-pair {
+  display: inline-flex;
+  align-items: center;
+  flex: 0 0 auto;
+  gap: 8px;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-action-group > .ant-btn {
+  flex: 0 0 auto;
+  border-radius: 9px !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-action-group > .ant-btn:not(:first-child) {
+  margin-left: 0 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-action-group > .ant-btn::before {
+  display: none !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button {
+  display: inline-flex !important;
+  align-items: center;
+  gap: 6px;
+  border-color: transparent !important;
+  background: var(--gn-accent-soft) !important;
+  color: var(--gn-accent-2) !important;
+  font-weight: 750 !important;
+  transition: background-color 120ms ease, box-shadow 120ms ease, border-color 120ms ease !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:hover,
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:focus,
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:focus-visible,
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:active {
+  border-color: rgba(22, 163, 74, 0.18) !important;
+  background: color-mix(in srgb, var(--gn-accent-soft) 80%, rgba(22, 163, 74, 0.28)) !important;
+  color: var(--gn-accent-2) !important;
+  box-shadow: 0 0 0 1px rgba(22, 163, 74, 0.12), 0 6px 14px rgba(22, 163, 74, 0.12) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button .gn-v2-toolbar-kbd {
+  margin-left: 0;
+  min-width: 18px;
+  justify-content: center;
+  border: none;
+  background: rgba(22, 163, 74, 0.18);
+  color: var(--gn-accent-2);
+}
+
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:hover .gn-v2-toolbar-kbd,
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:focus .gn-v2-toolbar-kbd,
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:focus-visible .gn-v2-toolbar-kbd,
+body[data-ui-version="v2"] .gn-v2-query-transaction-commit-button:active .gn-v2-toolbar-kbd {
+  background: rgba(22, 163, 74, 0.24);
+  color: var(--gn-accent-2);
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-icon-action.ant-btn,
+body[data-ui-version="v2"] .gn-v2-query-toolbar .ant-btn-icon-only {
+  width: 34px !important;
+  padding: 0 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-run-action.ant-btn {
+  min-width: 64px;
+  padding: 0 13px !important;
+  font-weight: 650 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-toolbar-ai-action.ant-btn {
+  font-weight: 650 !important;
+}
+
+@media (max-width: 900px) {
+  body[data-ui-version="v2"] .gn-v2-query-toolbar-main {
+    width: max-content;
+    min-width: 100%;
+  }
+
+  body[data-ui-version="v2"] .gn-v2-query-toolbar-selects {
+    max-width: none;
+  }
+
+  body[data-ui-version="v2"] .gn-v2-query-toolbar-actions {
+    justify-content: flex-start;
+  }
 }
 
 body[data-ui-version="v2"] .gn-v2-query-monaco-shell {
@@ -4509,15 +5005,87 @@ body[data-ui-version="v2"] .gn-v2-query-results {
 
 body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav {
   background: var(--gn-bg-panel-2);
+  padding-left: 8px;
+  min-height: 38px;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav .ant-tabs-extra-content {
+  display: inline-flex;
+  align-items: center;
+  padding-right: 8px;
 }
 
 body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav .ant-tabs-tab {
-  min-height: 34px;
-  padding: 4px 10px !important;
+  width: auto !important;
+  min-width: 0 !important;
+  max-width: 148px !important;
+  height: 30px !important;
+  min-height: 30px;
+  margin: 4px 6px 4px 0 !important;
+  padding: 0 9px !important;
+  border: 0.5px solid var(--gn-br-1) !important;
+  border-radius: 999px !important;
+  background: color-mix(in srgb, var(--gn-bg-panel) 72%, transparent) !important;
+  color: var(--gn-fg-3) !important;
+  align-items: center !important;
+  justify-content: center !important;
+  font-size: 14px;
 }
 
 body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav .ant-tabs-nav-list {
-  align-items: stretch;
+  align-items: center;
+  width: auto;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav .ant-tabs-tab-btn {
+  width: auto !important;
+  height: 100%;
+  display: inline-flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  font-size: 14px !important;
+  line-height: 1 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-results .query-result-tab-label {
+  height: 100%;
+  line-height: 1;
+  user-select: none;
+  -webkit-user-select: none;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-results .query-result-tab-text {
+  font-size: 14px;
+  font-weight: 700;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav .ant-tabs-tab:hover {
+  background: var(--gn-bg-hover) !important;
+  color: var(--gn-fg-1) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav .ant-tabs-tab.ant-tabs-tab-active {
+  border-color: color-mix(in srgb, var(--gn-accent) 38%, var(--gn-br-1)) !important;
+  background: color-mix(in srgb, var(--gn-accent) 10%, var(--gn-bg-panel)) !important;
+  color: var(--gn-fg-1) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-results .query-result-tabs > .ant-tabs-nav .ant-tabs-tab.ant-tabs-tab-active::after {
+  display: none;
+}
+
+body[data-ui-version="v2"] .gn-v2-query-results .query-result-tab-count {
+  background: color-mix(in srgb, var(--gn-accent) 12%, var(--gn-bg-active));
+  color: var(--gn-fg-2);
+}
+
+body[data-ui-version="v2"] .gn-v2-query-result-panel-header {
+  background: var(--gn-bg-panel-2);
+  border-bottom-color: var(--gn-br-1);
+}
+
+body[data-ui-version="v2"] .gn-v2-query-result-panel-header .query-result-panel-header-title {
+  color: var(--gn-fg-3);
 }
 
 body[data-ui-version="v2"] .gn-v2-query-empty,
@@ -4561,24 +5129,12 @@ body[data-ui-version="v2"] .gn-v2-query-error .custom-scrollbar {
 body[data-ui-version="v2"] .gn-v2-table-designer {
   padding: 0 !important;
   background: var(--gn-bg-app);
-}
-
-body[data-ui-version="v2"] .gn-v2-designer-header {
-  min-height: 52px;
-  padding: 10px 14px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 16px;
-  border-bottom: 0.5px solid var(--gn-br-1);
-  background: var(--gn-bg-panel);
-}
-
-body[data-ui-version="v2"] .gn-v2-designer-title {
-  min-width: 0;
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
+  --gn-v2-designer-header-height: 40px;
+  --gn-v2-designer-header-padding: 0 8px;
+  --gn-v2-designer-cell-padding: 3px 8px;
+  --gn-v2-designer-selection-column-width: 44px;
+  --gn-v2-designer-row-selection-min-height: 14px;
+  --gn-v2-designer-content-font-size: 12px;
 }
 
 body[data-ui-version="v2"] .gn-v2-designer-tabs {
@@ -4593,10 +5149,180 @@ body[data-ui-version="v2"] .gn-v2-designer-tabs > .ant-tabs-nav {
   background: var(--gn-bg-panel-2);
 }
 
+body[data-ui-version="v2"] .gn-v2-table-designer .gn-v2-designer-tabs {
+  background: var(--gn-bg-panel) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .gn-v2-designer-tabs > .ant-tabs-nav {
+  padding: 0 12px !important;
+  min-height: 34px;
+  background: var(--gn-bg-panel) !important;
+  border-bottom: 0 !important;
+  box-shadow: none !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .gn-v2-designer-tabs > .ant-tabs-nav .ant-tabs-nav-list {
+  width: auto !important;
+  min-height: 34px;
+  gap: 0;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .gn-v2-designer-tabs > .ant-tabs-nav .ant-tabs-tab {
+  height: 34px;
+  min-height: 34px;
+  padding-inline: 12px !important;
+  border-right: 0 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .gn-v2-designer-tabs > .ant-tabs-nav::before {
+  display: none !important;
+}
+
 body[data-ui-version="v2"] .gn-v2-designer-tabs .ant-tabs-content-holder {
   padding: 10px;
 }
 
+body[data-ui-version="v2"] .gn-v2-table-designer .gn-v2-designer-tabs .ant-tabs-content-holder {
+  padding: 0 12px 12px !important;
+  border-top: 0 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded {
+  background: var(--gn-bg-panel) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-toolbar {
+  padding: 8px 12px 6px !important;
+  border-left: 0 !important;
+  border-right: 0 !important;
+  background: var(--gn-bg-panel) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-tabs {
+  background: var(--gn-bg-panel) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-tabs > .ant-tabs-nav {
+  padding: 0 12px !important;
+  min-height: 30px;
+  background: var(--gn-bg-panel) !important;
+  border-bottom: 0 !important;
+  box-shadow: none !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-tabs > .ant-tabs-nav .ant-tabs-nav-list {
+  width: auto !important;
+  min-height: 30px;
+  gap: 0;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-tabs > .ant-tabs-nav .ant-tabs-tab {
+  height: 30px;
+  min-height: 30px;
+  padding-inline: 10px !important;
+  border-right: 0 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-tabs > .ant-tabs-nav::before {
+  display: none !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-tabs .ant-tabs-content-holder {
+  padding: 0 12px 12px !important;
+  border-top: 0 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-table-shell,
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-tab-content,
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-ddl-shell {
+  border-top: 0 !important;
+  border-left: 0 !important;
+  border-right: 0 !important;
+  border-bottom: 0 !important;
+  border-radius: 0 !important;
+  background: transparent !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer.is-embedded .gn-v2-designer-actionbar {
+  padding-inline: 0 !important;
+  background: transparent !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-thead > tr > th,
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-tbody > tr > td {
+  padding: var(--gn-v2-designer-cell-padding) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-thead > tr > th {
+  text-align: left !important;
+  font-size: var(--gn-v2-designer-content-font-size);
+  line-height: 1.1;
+  height: var(--gn-v2-designer-header-height);
+  min-height: var(--gn-v2-designer-header-height);
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+  padding-left: 8px !important;
+  padding-right: 8px !important;
+  vertical-align: middle !important;
+  white-space: nowrap;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-thead > tr > th .ant-table-column-title {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  width: 100%;
+  min-height: var(--gn-v2-designer-header-height);
+  text-align: left !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-thead > tr > th .ant-table-column-sorters {
+  min-height: var(--gn-v2-designer-header-height) !important;
+  align-items: center !important;
+  justify-content: flex-start !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-thead > tr > th.ant-table-selection-column,
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-tbody > tr > td.ant-table-selection-column,
+body[data-ui-version="v2"] .gn-v2-table-designer .table-designer-select-column {
+  width: var(--gn-v2-designer-selection-column-width) !important;
+  min-width: var(--gn-v2-designer-selection-column-width) !important;
+  max-width: var(--gn-v2-designer-selection-column-width) !important;
+  padding-inline: 0 !important;
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-thead > tr > th.ant-table-selection-column .ant-table-selection,
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-tbody > tr > td.ant-table-selection-column .ant-table-selection,
+body[data-ui-version="v2"] .gn-v2-table-designer .table-designer-select-column .table-designer-select-check {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  min-height: var(--gn-v2-designer-row-selection-min-height);
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-thead > tr > th:first-child,
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-tbody > tr > td:first-child {
+  padding-inline: 0 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-tbody > tr > td {
+  vertical-align: middle !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .table-designer-cell-field .ant-input,
+body[data-ui-version="v2"] .gn-v2-table-designer .table-designer-cell-field .ant-select-selection-item,
+body[data-ui-version="v2"] .gn-v2-table-designer .table-designer-cell-field input {
+  font-size: var(--gn-v2-designer-content-font-size) !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-table-designer .table-designer-cell-check .ant-checkbox {
+  transform: scale(0.92);
+}
+
 body[data-ui-version="v2"] .gn-v2-designer-table-shell,
 body[data-ui-version="v2"] .gn-v2-designer-tab-content,
 body[data-ui-version="v2"] .gn-v2-designer-ddl-shell {
@@ -4621,6 +5347,13 @@ body[data-ui-version="v2"] .gn-v2-designer-section-note {
   font-size: 11.5px !important;
 }
 
+body[data-ui-version="v2"] .gn-v2-designer-index-table .ant-tag {
+  font-size: 12px !important;
+  font-weight: 700 !important;
+  line-height: 18px !important;
+  padding: 1px 7px !important;
+}
+
 body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-wrapper,
 body[data-ui-version="v2"] .gn-v2-table-designer .ant-table-container {
   border-radius: 0 !important;
@@ -5011,29 +5744,6 @@ body[data-ui-version="v2"] .gn-v2-ai-mode-tabs button.is-active {
   color: var(--gn-fg-1);
 }
 
-body[data-ui-version="v2"] .gn-v2-ai-session-row {
-  justify-content: flex-end;
-  gap: 8px;
-  width: 100%;
-  flex: 0 0 auto;
-  min-height: 22px;
-  padding: 0 10px 7px;
-}
-
-body[data-ui-version="v2"] .gn-v2-ai-export-button {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  height: 22px;
-  padding: 0 7px;
-  border: 0.5px solid var(--gn-br-1);
-  border-radius: 6px;
-  background: var(--gn-bg-panel);
-  color: var(--gn-fg-4);
-  font-size: 10.5px;
-  font-weight: 650;
-}
-
 body[data-ui-version="v2"] .gn-v2-ai-panel .ai-chat-messages {
   padding: 8px 14px 12px;
   gap: 10px;
@@ -5310,6 +6020,7 @@ body[data-ui-version="v2"] .gn-v2-ai-panel .ai-chat-input-wrapper {
   border: none !important;
   background: transparent !important;
   box-shadow: none !important;
+  gap: 4px !important;
 }
 
 body[data-ui-version="v2"] .gn-v2-ai-context-row {
@@ -5429,26 +6140,77 @@ body[data-ui-version="v2"] .gn-v2-ai-attachment-thumb button {
   font-size: 10px;
 }
 
+body[data-ui-version="v2"] .gn-v2-ai-attachment-file {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  max-width: min(100%, 280px);
+  min-height: 28px;
+  padding: 4px 8px;
+  border: 0.5px solid var(--gn-br-2);
+  border-radius: 8px;
+  background: var(--gn-bg-panel);
+  color: var(--gn-fg-1);
+  font-size: 11.5px;
+}
+
+body[data-ui-version="v2"] .gn-v2-ai-attachment-file.has-warning {
+  border-color: rgba(217, 119, 6, 0.45);
+  background: rgba(217, 119, 6, 0.08);
+}
+
+body[data-ui-version="v2"] .gn-v2-ai-attachment-file-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+body[data-ui-version="v2"] .gn-v2-ai-attachment-file-meta {
+  color: var(--gn-fg-3);
+  flex-shrink: 0;
+}
+
+body[data-ui-version="v2"] .gn-v2-ai-attachment-file button {
+  width: 16px;
+  height: 16px;
+  padding: 0;
+  border: none;
+  border-radius: 50%;
+  background: var(--gn-bg-subtle);
+  color: var(--gn-fg-3);
+  line-height: 1;
+}
+
 body[data-ui-version="v2"] .gn-v2-ai-input-box {
-  min-height: 72px;
+  min-height: 68px;
   padding: 0;
 }
 
 body[data-ui-version="v2"] .gn-v2-ai-input-surface {
   min-height: 68px;
   padding: 6px 6px 6px 10px;
-  border: 0.5px solid var(--gn-br-2);
-  border-radius: 10px;
-  background: var(--gn-bg-input);
-  box-shadow: var(--gn-shadow-sm);
+  border: 0.5px solid var(--gn-br-2) !important;
+  border-radius: 10px !important;
+  background: var(--gn-bg-input) !important;
+  box-shadow: none !important;
 }
 
 body[data-ui-version="v2"] .gn-v2-ai-input-box textarea {
   border: 0 !important;
+  border-radius: 0 !important;
   background: transparent !important;
   box-shadow: none !important;
   font-size: 12.5px !important;
   line-height: 1.55 !important;
+  padding: 0 !important;
+}
+
+body[data-ui-version="v2"] .gn-v2-ai-input-box textarea.ant-input:focus,
+body[data-ui-version="v2"] .gn-v2-ai-input-box textarea.ant-input:focus-visible {
+  border-color: transparent !important;
+  outline: none !important;
+  box-shadow: none !important;
 }
 
 body[data-ui-version="v2"] .gn-v2-ai-slash-menu {
@@ -5482,7 +6244,7 @@ body[data-ui-version="v2"] .gn-v2-ai-model-bar {
   align-items: center;
   gap: 6px;
   min-width: 0;
-  padding-top: 6px;
+  padding-top: 0;
   white-space: nowrap;
 }
 
diff --git a/frontend/src/vite-env.d.ts b/frontend/src/vite-env.d.ts
index a2ce25a..688f65a 100644
--- a/frontend/src/vite-env.d.ts
+++ b/frontend/src/vite-env.d.ts
@@ -1,6 +1,9 @@
 /// <reference types="vite/client" />
 
-declare module 'monaco-editor/esm/nls.messages.zh-cn';
+declare module 'monaco-editor/esm/nls.messages.zh-cn' {
+  const messages: Record<string, string>;
+  export default messages;
+}
 
 interface ImportMetaEnv {
   readonly VITE_GONAVI_ENABLE_MAC_WINDOW_DIAGNOSTICS?: string;
diff --git a/frontend/wailsjs/go/aiservice/Service.d.ts b/frontend/wailsjs/go/aiservice/Service.d.ts
index 2cb2ccb..9f85ebc 100755
--- a/frontend/wailsjs/go/aiservice/Service.d.ts
+++ b/frontend/wailsjs/go/aiservice/Service.d.ts
@@ -2,6 +2,8 @@
 // This file is automatically generated. DO NOT EDIT
 import {ai} from '../models';
 
+export function AICallMCPTool(arg1:string,arg2:string):Promise<ai.MCPToolCallResult>;
+
 export function AIChatCancel(arg1:string):Promise<void>;
 
 export function AIChatSend(arg1:Array<ai.Message>,arg2:Array<ai.Tool>):Promise<Record<string, any>>;
@@ -10,10 +12,14 @@ export function AIChatStream(arg1:string,arg2:Array<ai.Message>,arg3:Array<ai.To
 
 export function AICheckSQL(arg1:string):Promise<ai.SafetyResult>;
 
+export function AIDeleteMCPServer(arg1:string):Promise<void>;
+
 export function AIDeleteProvider(arg1:string):Promise<void>;
 
 export function AIDeleteSession(arg1:string):Promise<void>;
 
+export function AIDeleteSkill(arg1:string):Promise<void>;
+
 export function AIGetActiveProvider():Promise<string>;
 
 export function AIGetBuiltinPrompts():Promise<Record<string, string>>;
@@ -22,20 +28,42 @@ export function AIGetContextLevel():Promise<string>;
 
 export function AIGetEditableProvider(arg1:string):Promise<ai.ProviderConfig>;
 
+export function AIGetMCPClientInstallStatuses():Promise<Array<ai.MCPClientInstallStatus>>;
+
+export function AIGetMCPHTTPServerStatus():Promise<ai.MCPHTTPServerStatus>;
+
+export function AIGetMCPServers():Promise<Array<ai.MCPServerConfig>>;
+
 export function AIGetProviders():Promise<Array<ai.ProviderConfig>>;
 
 export function AIGetSafetyLevel():Promise<string>;
 
 export function AIGetSessions():Promise<Array<Record<string, any>>>;
 
+export function AIGetSkills():Promise<Array<ai.SkillConfig>>;
+
+export function AIGetUserPromptSettings():Promise<ai.UserPromptSettings>;
+
+export function AIInstallClaudeCodeMCP():Promise<ai.MCPClientInstallResult>;
+
+export function AIInstallCodexMCP():Promise<ai.MCPClientInstallResult>;
+
+export function AIListMCPTools():Promise<Array<ai.MCPToolDescriptor>>;
+
 export function AIListModels():Promise<Record<string, any>>;
 
 export function AILoadSession(arg1:string):Promise<Record<string, any>>;
 
+export function AISaveMCPServer(arg1:ai.MCPServerConfig):Promise<void>;
+
 export function AISaveProvider(arg1:ai.ProviderConfig):Promise<void>;
 
 export function AISaveSession(arg1:string,arg2:string,arg3:number,arg4:string):Promise<void>;
 
+export function AISaveSkill(arg1:ai.SkillConfig):Promise<void>;
+
+export function AISaveUserPromptSettings(arg1:ai.UserPromptSettings):Promise<void>;
+
 export function AISetActiveProvider(arg1:string):Promise<void>;
 
 export function AISetContextLevel(arg1:string):Promise<void>;
@@ -44,4 +72,12 @@ export function AISetLanguage(arg1:string):Promise<void>;
 
 export function AISetSafetyLevel(arg1:string):Promise<void>;
 
+export function AIStartMCPHTTPServer(arg1:ai.MCPHTTPServerOptions):Promise<ai.MCPHTTPServerStatus>;
+
+export function AIStopMCPHTTPServer():Promise<ai.MCPHTTPServerStatus>;
+
+export function AITestMCPServer(arg1:ai.MCPServerConfig):Promise<Record<string, any>>;
+
 export function AITestProvider(arg1:ai.ProviderConfig):Promise<Record<string, any>>;
+
+export function Shutdown():Promise<void>;
diff --git a/frontend/wailsjs/go/aiservice/Service.js b/frontend/wailsjs/go/aiservice/Service.js
index a67a1ef..0b44f60 100755
--- a/frontend/wailsjs/go/aiservice/Service.js
+++ b/frontend/wailsjs/go/aiservice/Service.js
@@ -2,6 +2,10 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+export function AICallMCPTool(arg1, arg2) {
+  return window['go']['aiservice']['Service']['AICallMCPTool'](arg1, arg2);
+}
+
 export function AIChatCancel(arg1) {
   return window['go']['aiservice']['Service']['AIChatCancel'](arg1);
 }
@@ -18,6 +22,10 @@ export function AICheckSQL(arg1) {
   return window['go']['aiservice']['Service']['AICheckSQL'](arg1);
 }
 
+export function AIDeleteMCPServer(arg1) {
+  return window['go']['aiservice']['Service']['AIDeleteMCPServer'](arg1);
+}
+
 export function AIDeleteProvider(arg1) {
   return window['go']['aiservice']['Service']['AIDeleteProvider'](arg1);
 }
@@ -26,6 +34,10 @@ export function AIDeleteSession(arg1) {
   return window['go']['aiservice']['Service']['AIDeleteSession'](arg1);
 }
 
+export function AIDeleteSkill(arg1) {
+  return window['go']['aiservice']['Service']['AIDeleteSkill'](arg1);
+}
+
 export function AIGetActiveProvider() {
   return window['go']['aiservice']['Service']['AIGetActiveProvider']();
 }
@@ -42,6 +54,18 @@ export function AIGetEditableProvider(arg1) {
   return window['go']['aiservice']['Service']['AIGetEditableProvider'](arg1);
 }
 
+export function AIGetMCPClientInstallStatuses() {
+  return window['go']['aiservice']['Service']['AIGetMCPClientInstallStatuses']();
+}
+
+export function AIGetMCPHTTPServerStatus() {
+  return window['go']['aiservice']['Service']['AIGetMCPHTTPServerStatus']();
+}
+
+export function AIGetMCPServers() {
+  return window['go']['aiservice']['Service']['AIGetMCPServers']();
+}
+
 export function AIGetProviders() {
   return window['go']['aiservice']['Service']['AIGetProviders']();
 }
@@ -54,6 +78,26 @@ export function AIGetSessions() {
   return window['go']['aiservice']['Service']['AIGetSessions']();
 }
 
+export function AIGetSkills() {
+  return window['go']['aiservice']['Service']['AIGetSkills']();
+}
+
+export function AIGetUserPromptSettings() {
+  return window['go']['aiservice']['Service']['AIGetUserPromptSettings']();
+}
+
+export function AIInstallClaudeCodeMCP() {
+  return window['go']['aiservice']['Service']['AIInstallClaudeCodeMCP']();
+}
+
+export function AIInstallCodexMCP() {
+  return window['go']['aiservice']['Service']['AIInstallCodexMCP']();
+}
+
+export function AIListMCPTools() {
+  return window['go']['aiservice']['Service']['AIListMCPTools']();
+}
+
 export function AIListModels() {
   return window['go']['aiservice']['Service']['AIListModels']();
 }
@@ -62,6 +106,10 @@ export function AILoadSession(arg1) {
   return window['go']['aiservice']['Service']['AILoadSession'](arg1);
 }
 
+export function AISaveMCPServer(arg1) {
+  return window['go']['aiservice']['Service']['AISaveMCPServer'](arg1);
+}
+
 export function AISaveProvider(arg1) {
   return window['go']['aiservice']['Service']['AISaveProvider'](arg1);
 }
@@ -70,6 +118,14 @@ export function AISaveSession(arg1, arg2, arg3, arg4) {
   return window['go']['aiservice']['Service']['AISaveSession'](arg1, arg2, arg3, arg4);
 }
 
+export function AISaveSkill(arg1) {
+  return window['go']['aiservice']['Service']['AISaveSkill'](arg1);
+}
+
+export function AISaveUserPromptSettings(arg1) {
+  return window['go']['aiservice']['Service']['AISaveUserPromptSettings'](arg1);
+}
+
 export function AISetActiveProvider(arg1) {
   return window['go']['aiservice']['Service']['AISetActiveProvider'](arg1);
 }
@@ -86,6 +142,22 @@ export function AISetSafetyLevel(arg1) {
   return window['go']['aiservice']['Service']['AISetSafetyLevel'](arg1);
 }
 
+export function AIStartMCPHTTPServer(arg1) {
+  return window['go']['aiservice']['Service']['AIStartMCPHTTPServer'](arg1);
+}
+
+export function AIStopMCPHTTPServer() {
+  return window['go']['aiservice']['Service']['AIStopMCPHTTPServer']();
+}
+
+export function AITestMCPServer(arg1) {
+  return window['go']['aiservice']['Service']['AITestMCPServer'](arg1);
+}
+
 export function AITestProvider(arg1) {
   return window['go']['aiservice']['Service']['AITestProvider'](arg1);
 }
+
+export function Shutdown() {
+  return window['go']['aiservice']['Service']['Shutdown']();
+}
diff --git a/frontend/wailsjs/go/app/App.d.ts b/frontend/wailsjs/go/app/App.d.ts
index 9f4cc8b..83767b2 100755
--- a/frontend/wailsjs/go/app/App.d.ts
+++ b/frontend/wailsjs/go/app/App.d.ts
@@ -28,8 +28,14 @@ export function ConfigureGlobalProxy(arg1:boolean,arg2:connection.ProxyConfig):P
 
 export function CreateDatabase(arg1:connection.ConnectionConfig,arg2:string):Promise<connection.QueryResult>;
 
+export function CreateSQLDirectory(arg1:string,arg2:string):Promise<connection.QueryResult>;
+
+export function CreateSQLFile(arg1:string,arg2:string):Promise<connection.QueryResult>;
+
 export function CreateSchema(arg1:connection.ConnectionConfig,arg2:string,arg3:string):Promise<connection.QueryResult>;
 
+export function DBCommitTransaction(arg1:string):Promise<connection.QueryResult>;
+
 export function DBConnect(arg1:connection.ConnectionConfig):Promise<connection.QueryResult>;
 
 export function DBGetAllColumns(arg1:connection.ConnectionConfig,arg2:string):Promise<connection.QueryResult>;
@@ -52,8 +58,14 @@ export function DBQueryIsolated(arg1:connection.ConnectionConfig,arg2:string,arg
 
 export function DBQueryMulti(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
 
+export function DBQueryMultiTransactional(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
+
 export function DBQueryWithCancel(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
 
+export function DBReleaseConnection(arg1:connection.ConnectionConfig):Promise<connection.QueryResult>;
+
+export function DBRollbackTransaction(arg1:string):Promise<connection.QueryResult>;
+
 export function DBShowCreateTable(arg1:connection.ConnectionConfig,arg2:string,arg3:string):Promise<connection.QueryResult>;
 
 export function DataSync(arg1:sync.SyncConfig):Promise<sync.SyncResult>;
@@ -64,6 +76,12 @@ export function DataSyncPreview(arg1:sync.SyncConfig,arg2:string,arg3:number):Pr
 
 export function DeleteConnection(arg1:string):Promise<void>;
 
+export function DeleteQuery(arg1:string):Promise<void>;
+
+export function DeleteSQLDirectory(arg1:string):Promise<connection.QueryResult>;
+
+export function DeleteSQLFile(arg1:string):Promise<connection.QueryResult>;
+
 export function DismissSecurityUpdateReminder():Promise<app.SecurityUpdateStatus>;
 
 export function DownloadDriverPackage(arg1:string,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
@@ -74,6 +92,8 @@ export function DropDatabase(arg1:connection.ConnectionConfig,arg2:string):Promi
 
 export function DropFunction(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
 
+export function DropSchema(arg1:connection.ConnectionConfig,arg2:string,arg3:string):Promise<connection.QueryResult>;
+
 export function DropTable(arg1:connection.ConnectionConfig,arg2:string,arg3:string):Promise<connection.QueryResult>;
 
 export function DropView(arg1:connection.ConnectionConfig,arg2:string,arg3:string):Promise<connection.QueryResult>;
@@ -92,6 +112,8 @@ export function ExportQuery(arg1:connection.ConnectionConfig,arg2:string,arg3:st
 
 export function ExportSQLFile(arg1:string,arg2:string):Promise<connection.QueryResult>;
 
+export function ExportSchemaSQL(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:boolean):Promise<connection.QueryResult>;
+
 export function ExportTable(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
 
 export function ExportTablesDataSQL(arg1:connection.ConnectionConfig,arg2:string,arg3:Array<string>):Promise<connection.QueryResult>;
@@ -116,8 +138,12 @@ export function GetGlobalProxyConfig():Promise<connection.QueryResult>;
 
 export function GetSavedConnections():Promise<Array<connection.SavedConnectionView>>;
 
+export function GetSavedQueries():Promise<Array<connection.SavedQuery>>;
+
 export function GetSecurityUpdateStatus():Promise<app.SecurityUpdateStatus>;
 
+export function GetUnboundSavedQueries():Promise<Array<connection.SavedQuery>>;
+
 export function ImportConfigFile():Promise<connection.QueryResult>;
 
 export function ImportConnectionsPayload(arg1:string,arg2:string):Promise<Array<connection.SavedConnectionView>>;
@@ -130,6 +156,8 @@ export function ImportLegacyConnections(arg1:Array<connection.SavedConnectionInp
 
 export function ImportLegacyGlobalProxy(arg1:connection.SaveGlobalProxyInput):Promise<connection.GlobalProxyView>;
 
+export function ImportSavedQueries(arg1:connection.SavedQueryImportPayload):Promise<Array<connection.SavedQuery>>;
+
 export function InstallLocalDriverPackage(arg1:string,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
 
 export function InstallUpdateAndRestart():Promise<connection.QueryResult>;
@@ -192,8 +220,12 @@ export function PreviewChanges(arg1:connection.ConnectionConfig,arg2:string,arg3
 
 export function PreviewImportFile(arg1:string):Promise<connection.QueryResult>;
 
+export function ReadAppLogTail(arg1:number,arg2:string):Promise<connection.QueryResult>;
+
 export function ReadSQLFile(arg1:string):Promise<connection.QueryResult>;
 
+export function RebindSavedQuery(arg1:string,arg2:string):Promise<connection.SavedQuery>;
+
 export function RedisConnect(arg1:connection.ConnectionConfig):Promise<connection.QueryResult>;
 
 export function RedisDeleteHashField(arg1:connection.ConnectionConfig,arg2:string,arg3:any):Promise<connection.QueryResult>;
@@ -246,6 +278,12 @@ export function RemoveDriverPackage(arg1:string,arg2:string):Promise<connection.
 
 export function RenameDatabase(arg1:connection.ConnectionConfig,arg2:string,arg3:string):Promise<connection.QueryResult>;
 
+export function RenameSQLDirectory(arg1:string,arg2:string):Promise<connection.QueryResult>;
+
+export function RenameSQLFile(arg1:string,arg2:string):Promise<connection.QueryResult>;
+
+export function RenameSchema(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
+
 export function RenameTable(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
 
 export function RenameView(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
@@ -266,6 +304,8 @@ export function SaveConnection(arg1:connection.SavedConnectionInput):Promise<con
 
 export function SaveGlobalProxy(arg1:connection.SaveGlobalProxyInput):Promise<connection.GlobalProxyView>;
 
+export function SaveQuery(arg1:connection.SavedQuery):Promise<connection.SavedQuery>;
+
 export function SelectCertificateFile(arg1:string,arg2:string):Promise<connection.QueryResult>;
 
 export function SelectDataRootDirectory(arg1:string):Promise<connection.QueryResult>;
@@ -288,6 +328,8 @@ export function SetMacNativeWindowControls(arg1:boolean):Promise<void>;
 
 export function SetWindowTranslucency(arg1:number,arg2:number):Promise<void>;
 
+export function Shutdown():Promise<void>;
+
 export function StartSecurityUpdate(arg1:app.StartSecurityUpdateRequest):Promise<app.SecurityUpdateStatus>;
 
 export function TestConnection(arg1:connection.ConnectionConfig):Promise<connection.QueryResult>;
diff --git a/frontend/wailsjs/go/app/App.js b/frontend/wailsjs/go/app/App.js
index bd3bb57..1b7d06b 100755
--- a/frontend/wailsjs/go/app/App.js
+++ b/frontend/wailsjs/go/app/App.js
@@ -46,10 +46,22 @@ export function CreateDatabase(arg1, arg2) {
   return window['go']['app']['App']['CreateDatabase'](arg1, arg2);
 }
 
+export function CreateSQLDirectory(arg1, arg2) {
+  return window['go']['app']['App']['CreateSQLDirectory'](arg1, arg2);
+}
+
+export function CreateSQLFile(arg1, arg2) {
+  return window['go']['app']['App']['CreateSQLFile'](arg1, arg2);
+}
+
 export function CreateSchema(arg1, arg2, arg3) {
   return window['go']['app']['App']['CreateSchema'](arg1, arg2, arg3);
 }
 
+export function DBCommitTransaction(arg1) {
+  return window['go']['app']['App']['DBCommitTransaction'](arg1);
+}
+
 export function DBConnect(arg1) {
   return window['go']['app']['App']['DBConnect'](arg1);
 }
@@ -94,10 +106,22 @@ export function DBQueryMulti(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['DBQueryMulti'](arg1, arg2, arg3, arg4);
 }
 
+export function DBQueryMultiTransactional(arg1, arg2, arg3, arg4) {
+  return window['go']['app']['App']['DBQueryMultiTransactional'](arg1, arg2, arg3, arg4);
+}
+
 export function DBQueryWithCancel(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['DBQueryWithCancel'](arg1, arg2, arg3, arg4);
 }
 
+export function DBReleaseConnection(arg1) {
+  return window['go']['app']['App']['DBReleaseConnection'](arg1);
+}
+
+export function DBRollbackTransaction(arg1) {
+  return window['go']['app']['App']['DBRollbackTransaction'](arg1);
+}
+
 export function DBShowCreateTable(arg1, arg2, arg3) {
   return window['go']['app']['App']['DBShowCreateTable'](arg1, arg2, arg3);
 }
@@ -118,6 +142,18 @@ export function DeleteConnection(arg1) {
   return window['go']['app']['App']['DeleteConnection'](arg1);
 }
 
+export function DeleteQuery(arg1) {
+  return window['go']['app']['App']['DeleteQuery'](arg1);
+}
+
+export function DeleteSQLDirectory(arg1) {
+  return window['go']['app']['App']['DeleteSQLDirectory'](arg1);
+}
+
+export function DeleteSQLFile(arg1) {
+  return window['go']['app']['App']['DeleteSQLFile'](arg1);
+}
+
 export function DismissSecurityUpdateReminder() {
   return window['go']['app']['App']['DismissSecurityUpdateReminder']();
 }
@@ -138,6 +174,10 @@ export function DropFunction(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['DropFunction'](arg1, arg2, arg3, arg4);
 }
 
+export function DropSchema(arg1, arg2, arg3) {
+  return window['go']['app']['App']['DropSchema'](arg1, arg2, arg3);
+}
+
 export function DropTable(arg1, arg2, arg3) {
   return window['go']['app']['App']['DropTable'](arg1, arg2, arg3);
 }
@@ -174,6 +214,10 @@ export function ExportSQLFile(arg1, arg2) {
   return window['go']['app']['App']['ExportSQLFile'](arg1, arg2);
 }
 
+export function ExportSchemaSQL(arg1, arg2, arg3, arg4) {
+  return window['go']['app']['App']['ExportSchemaSQL'](arg1, arg2, arg3, arg4);
+}
+
 export function ExportTable(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['ExportTable'](arg1, arg2, arg3, arg4);
 }
@@ -222,10 +266,18 @@ export function GetSavedConnections() {
   return window['go']['app']['App']['GetSavedConnections']();
 }
 
+export function GetSavedQueries() {
+  return window['go']['app']['App']['GetSavedQueries']();
+}
+
 export function GetSecurityUpdateStatus() {
   return window['go']['app']['App']['GetSecurityUpdateStatus']();
 }
 
+export function GetUnboundSavedQueries() {
+  return window['go']['app']['App']['GetUnboundSavedQueries']();
+}
+
 export function ImportConfigFile() {
   return window['go']['app']['App']['ImportConfigFile']();
 }
@@ -250,6 +302,10 @@ export function ImportLegacyGlobalProxy(arg1) {
   return window['go']['app']['App']['ImportLegacyGlobalProxy'](arg1);
 }
 
+export function ImportSavedQueries(arg1) {
+  return window['go']['app']['App']['ImportSavedQueries'](arg1);
+}
+
 export function InstallLocalDriverPackage(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['InstallLocalDriverPackage'](arg1, arg2, arg3, arg4);
 }
@@ -374,10 +430,18 @@ export function PreviewImportFile(arg1) {
   return window['go']['app']['App']['PreviewImportFile'](arg1);
 }
 
+export function ReadAppLogTail(arg1, arg2) {
+  return window['go']['app']['App']['ReadAppLogTail'](arg1, arg2);
+}
+
 export function ReadSQLFile(arg1) {
   return window['go']['app']['App']['ReadSQLFile'](arg1);
 }
 
+export function RebindSavedQuery(arg1, arg2) {
+  return window['go']['app']['App']['RebindSavedQuery'](arg1, arg2);
+}
+
 export function RedisConnect(arg1) {
   return window['go']['app']['App']['RedisConnect'](arg1);
 }
@@ -482,6 +546,18 @@ export function RenameDatabase(arg1, arg2, arg3) {
   return window['go']['app']['App']['RenameDatabase'](arg1, arg2, arg3);
 }
 
+export function RenameSQLDirectory(arg1, arg2) {
+  return window['go']['app']['App']['RenameSQLDirectory'](arg1, arg2);
+}
+
+export function RenameSQLFile(arg1, arg2) {
+  return window['go']['app']['App']['RenameSQLFile'](arg1, arg2);
+}
+
+export function RenameSchema(arg1, arg2, arg3, arg4) {
+  return window['go']['app']['App']['RenameSchema'](arg1, arg2, arg3, arg4);
+}
+
 export function RenameTable(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['RenameTable'](arg1, arg2, arg3, arg4);
 }
@@ -522,6 +598,10 @@ export function SaveGlobalProxy(arg1) {
   return window['go']['app']['App']['SaveGlobalProxy'](arg1);
 }
 
+export function SaveQuery(arg1) {
+  return window['go']['app']['App']['SaveQuery'](arg1);
+}
+
 export function SelectCertificateFile(arg1, arg2) {
   return window['go']['app']['App']['SelectCertificateFile'](arg1, arg2);
 }
@@ -566,6 +646,10 @@ export function SetWindowTranslucency(arg1, arg2) {
   return window['go']['app']['App']['SetWindowTranslucency'](arg1, arg2);
 }
 
+export function Shutdown() {
+  return window['go']['app']['App']['Shutdown']();
+}
+
 export function StartSecurityUpdate(arg1) {
   return window['go']['app']['App']['StartSecurityUpdate'](arg1);
 }
diff --git a/frontend/wailsjs/go/models.ts b/frontend/wailsjs/go/models.ts
index 32611bb..1db922e 100755
--- a/frontend/wailsjs/go/models.ts
+++ b/frontend/wailsjs/go/models.ts
@@ -1,5 +1,183 @@
 export namespace ai {
 	
+	export class MCPClientInstallResult {
+	    success: boolean;
+	    client?: string;
+	    message: string;
+	    configPath?: string;
+	    command?: string;
+	    args?: string[];
+	
+	    static createFrom(source: any = {}) {
+	        return new MCPClientInstallResult(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.success = source["success"];
+	        this.client = source["client"];
+	        this.message = source["message"];
+	        this.configPath = source["configPath"];
+	        this.command = source["command"];
+	        this.args = source["args"];
+	    }
+	}
+	export class MCPClientInstallStatus {
+	    client: string;
+	    displayName: string;
+	    installMode?: string;
+	    installed: boolean;
+	    matchesCurrent: boolean;
+	    clientDetected: boolean;
+	    clientCommand?: string;
+	    clientPath?: string;
+	    message: string;
+	    configPath?: string;
+	    command?: string;
+	    args?: string[];
+	
+	    static createFrom(source: any = {}) {
+	        return new MCPClientInstallStatus(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.client = source["client"];
+	        this.displayName = source["displayName"];
+	        this.installMode = source["installMode"];
+	        this.installed = source["installed"];
+	        this.matchesCurrent = source["matchesCurrent"];
+	        this.clientDetected = source["clientDetected"];
+	        this.clientCommand = source["clientCommand"];
+	        this.clientPath = source["clientPath"];
+	        this.message = source["message"];
+	        this.configPath = source["configPath"];
+	        this.command = source["command"];
+	        this.args = source["args"];
+	    }
+	}
+	export class MCPHTTPServerOptions {
+	    addr?: string;
+	    path?: string;
+	    token?: string;
+	    schemaOnly: boolean;
+	
+	    static createFrom(source: any = {}) {
+	        return new MCPHTTPServerOptions(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.addr = source["addr"];
+	        this.path = source["path"];
+	        this.token = source["token"];
+	        this.schemaOnly = source["schemaOnly"];
+	    }
+	}
+	export class MCPHTTPServerStatus {
+	    running: boolean;
+	    addr: string;
+	    path: string;
+	    url: string;
+	    schemaOnly: boolean;
+	    token?: string;
+	    authorizationHeader?: string;
+	    startedAt?: number;
+	    message: string;
+	
+	    static createFrom(source: any = {}) {
+	        return new MCPHTTPServerStatus(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.running = source["running"];
+	        this.addr = source["addr"];
+	        this.path = source["path"];
+	        this.url = source["url"];
+	        this.schemaOnly = source["schemaOnly"];
+	        this.token = source["token"];
+	        this.authorizationHeader = source["authorizationHeader"];
+	        this.startedAt = source["startedAt"];
+	        this.message = source["message"];
+	    }
+	}
+	export class MCPServerConfig {
+	    id: string;
+	    name: string;
+	    transport: string;
+	    command: string;
+	    args?: string[];
+	    env?: Record<string, string>;
+	    enabled: boolean;
+	    timeoutSeconds: number;
+	
+	    static createFrom(source: any = {}) {
+	        return new MCPServerConfig(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.id = source["id"];
+	        this.name = source["name"];
+	        this.transport = source["transport"];
+	        this.command = source["command"];
+	        this.args = source["args"];
+	        this.env = source["env"];
+	        this.enabled = source["enabled"];
+	        this.timeoutSeconds = source["timeoutSeconds"];
+	    }
+	}
+	export class MCPToolCallResult {
+	    alias: string;
+	    serverId: string;
+	    serverName: string;
+	    originalName: string;
+	    title?: string;
+	    content: string;
+	    structuredContent?: any;
+	    isError: boolean;
+	
+	    static createFrom(source: any = {}) {
+	        return new MCPToolCallResult(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.alias = source["alias"];
+	        this.serverId = source["serverId"];
+	        this.serverName = source["serverName"];
+	        this.originalName = source["originalName"];
+	        this.title = source["title"];
+	        this.content = source["content"];
+	        this.structuredContent = source["structuredContent"];
+	        this.isError = source["isError"];
+	    }
+	}
+	export class MCPToolDescriptor {
+	    alias: string;
+	    serverId: string;
+	    serverName: string;
+	    originalName: string;
+	    title?: string;
+	    description?: string;
+	    inputSchema?: Record<string, any>;
+	
+	    static createFrom(source: any = {}) {
+	        return new MCPToolDescriptor(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.alias = source["alias"];
+	        this.serverId = source["serverId"];
+	        this.serverName = source["serverName"];
+	        this.originalName = source["originalName"];
+	        this.title = source["title"];
+	        this.description = source["description"];
+	        this.inputSchema = source["inputSchema"];
+	    }
+	}
 	export class ToolCallFunction {
 	    name: string;
 	    arguments: string;
@@ -142,6 +320,30 @@ export namespace ai {
 	        this.warningMessage = source["warningMessage"];
 	    }
 	}
+	export class SkillConfig {
+	    id: string;
+	    name: string;
+	    description?: string;
+	    systemPrompt: string;
+	    enabled: boolean;
+	    scopes?: string[];
+	    requiredTools?: string[];
+	
+	    static createFrom(source: any = {}) {
+	        return new SkillConfig(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.id = source["id"];
+	        this.name = source["name"];
+	        this.description = source["description"];
+	        this.systemPrompt = source["systemPrompt"];
+	        this.enabled = source["enabled"];
+	        this.scopes = source["scopes"];
+	        this.requiredTools = source["requiredTools"];
+	    }
+	}
 	export class ToolFunction {
 	    name: string;
 	    description: string;
@@ -192,6 +394,25 @@ export namespace ai {
 	}
 	
 	
+	
+	export class UserPromptSettings {
+	    global: string;
+	    database: string;
+	    jvm: string;
+	    jvmDiagnostic: string;
+	
+	    static createFrom(source: any = {}) {
+	        return new UserPromptSettings(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.global = source["global"];
+	        this.database = source["database"];
+	        this.jvm = source["jvm"];
+	        this.jvmDiagnostic = source["jvmDiagnostic"];
+	    }
+	}
 
 }
 
@@ -687,6 +908,9 @@ export namespace connection {
 	    connectionParams?: string;
 	    timeout?: number;
 	    redisDB?: number;
+	    redisSentinelMaster?: string;
+	    redisSentinelUser?: string;
+	    redisSentinelPassword?: string;
 	    uri?: string;
 	    clickHouseProtocol?: string;
 	    oceanBaseProtocol?: string;
@@ -733,6 +957,9 @@ export namespace connection {
 	        this.connectionParams = source["connectionParams"];
 	        this.timeout = source["timeout"];
 	        this.redisDB = source["redisDB"];
+	        this.redisSentinelMaster = source["redisSentinelMaster"];
+	        this.redisSentinelUser = source["redisSentinelUser"];
+	        this.redisSentinelPassword = source["redisSentinelPassword"];
 	        this.uri = source["uri"];
 	        this.clickHouseProtocol = source["clickHouseProtocol"];
 	        this.oceanBaseProtocol = source["oceanBaseProtocol"];
@@ -806,7 +1033,10 @@ export namespace connection {
 	    message: string;
 	    data: any;
 	    fields?: string[];
+	    messages?: string[];
 	    queryId?: string;
+	    transactionId?: string;
+	    transactionPending?: boolean;
 	
 	    static createFrom(source: any = {}) {
 	        return new QueryResult(source);
@@ -818,7 +1048,10 @@ export namespace connection {
 	        this.message = source["message"];
 	        this.data = source["data"];
 	        this.fields = source["fields"];
+	        this.messages = source["messages"];
 	        this.queryId = source["queryId"];
+	        this.transactionId = source["transactionId"];
+	        this.transactionPending = source["transactionPending"];
 	    }
 	}
 	
@@ -858,6 +1091,7 @@ export namespace connection {
 	    clearHttpTunnelPassword?: boolean;
 	    clearMySQLReplicaPassword?: boolean;
 	    clearMongoReplicaPassword?: boolean;
+	    clearRedisSentinelPassword?: boolean;
 	    clearOpaqueURI?: boolean;
 	    clearOpaqueDSN?: boolean;
 	
@@ -880,6 +1114,7 @@ export namespace connection {
 	        this.clearHttpTunnelPassword = source["clearHttpTunnelPassword"];
 	        this.clearMySQLReplicaPassword = source["clearMySQLReplicaPassword"];
 	        this.clearMongoReplicaPassword = source["clearMongoReplicaPassword"];
+	        this.clearRedisSentinelPassword = source["clearRedisSentinelPassword"];
 	        this.clearOpaqueURI = source["clearOpaqueURI"];
 	        this.clearOpaqueDSN = source["clearOpaqueDSN"];
 	    }
@@ -917,6 +1152,7 @@ export namespace connection {
 	    hasHttpTunnelPassword?: boolean;
 	    hasMySQLReplicaPassword?: boolean;
 	    hasMongoReplicaPassword?: boolean;
+	    hasRedisSentinelPassword?: boolean;
 	    hasOpaqueURI?: boolean;
 	    hasOpaqueDSN?: boolean;
 	
@@ -940,6 +1176,7 @@ export namespace connection {
 	        this.hasHttpTunnelPassword = source["hasHttpTunnelPassword"];
 	        this.hasMySQLReplicaPassword = source["hasMySQLReplicaPassword"];
 	        this.hasMongoReplicaPassword = source["hasMongoReplicaPassword"];
+	        this.hasRedisSentinelPassword = source["hasRedisSentinelPassword"];
 	        this.hasOpaqueURI = source["hasOpaqueURI"];
 	        this.hasOpaqueDSN = source["hasOpaqueDSN"];
 	    }
@@ -962,6 +1199,68 @@ export namespace connection {
 		    return a;
 		}
 	}
+	export class SavedQuery {
+	    id: string;
+	    name: string;
+	    sql: string;
+	    connectionId: string;
+	    dbName: string;
+	    createdAt: number;
+	    connectionFingerprint?: string;
+	    fingerprintVersion?: string;
+	    bindingStatus?: string;
+	    originalConnectionId?: string;
+	
+	    static createFrom(source: any = {}) {
+	        return new SavedQuery(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.id = source["id"];
+	        this.name = source["name"];
+	        this.sql = source["sql"];
+	        this.connectionId = source["connectionId"];
+	        this.dbName = source["dbName"];
+	        this.createdAt = source["createdAt"];
+	        this.connectionFingerprint = source["connectionFingerprint"];
+	        this.fingerprintVersion = source["fingerprintVersion"];
+	        this.bindingStatus = source["bindingStatus"];
+	        this.originalConnectionId = source["originalConnectionId"];
+	    }
+	}
+	export class SavedQueryImportPayload {
+	    queries: SavedQuery[];
+	    legacyConnections?: SavedConnectionInput[];
+	
+	    static createFrom(source: any = {}) {
+	        return new SavedQueryImportPayload(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.queries = this.convertValues(source["queries"], SavedQuery);
+	        this.legacyConnections = this.convertValues(source["legacyConnections"], SavedConnectionInput);
+	    }
+	
+		convertValues(a: any, classs: any, asMap: boolean = false): any {
+		    if (!a) {
+		        return a;
+		    }
+		    if (a.slice && a.map) {
+		        return (a as any[]).map(elem => this.convertValues(elem, classs));
+		    } else if ("object" === typeof a) {
+		        if (asMap) {
+		            for (const key of Object.keys(a)) {
+		                a[key] = new classs(a[key]);
+		            }
+		            return a;
+		        }
+		        return new classs(a);
+		    }
+		    return a;
+		}
+	}
 
 }
 
@@ -1076,6 +1375,8 @@ export namespace sync {
 	export class SyncConfig {
 	    sourceConfig: connection.ConnectionConfig;
 	    targetConfig: connection.ConnectionConfig;
+	    sourceDatabase?: string;
+	    targetDatabase?: string;
 	    tables: string[];
 	    sourceQuery?: string;
 	    content?: string;
@@ -1095,6 +1396,8 @@ export namespace sync {
 	        if ('string' === typeof source) source = JSON.parse(source);
 	        this.sourceConfig = this.convertValues(source["sourceConfig"], connection.ConnectionConfig);
 	        this.targetConfig = this.convertValues(source["targetConfig"], connection.ConnectionConfig);
+	        this.sourceDatabase = source["sourceDatabase"];
+	        this.targetDatabase = source["targetDatabase"];
 	        this.tables = source["tables"];
 	        this.sourceQuery = source["sourceQuery"];
 	        this.content = source["content"];
diff --git a/go.mod b/go.mod
index daba08c..b49cb10 100644
--- a/go.mod
+++ b/go.mod
@@ -1,37 +1,67 @@
 module GoNavi-Wails
 
-go 1.24.3
+go 1.25.0
 
 require (
 	gitea.com/kingbase/gokb v0.0.0-20201021123113-29bd62a876c3
 	gitee.com/chunanyong/dm v1.8.22
 	github.com/ClickHouse/clickhouse-go/v2 v2.43.0
+	github.com/HuaweiCloudDeveloper/gaussdb-go v1.0.0-rc1
+	github.com/apache/iotdb-client-go v1.3.7
+	github.com/apache/rocketmq-client-go/v2 v2.1.2
 	github.com/caretdev/go-irisnative v0.2.1
 	github.com/duckdb/duckdb-go/v2 v2.5.5
+	github.com/eclipse/paho.mqtt.golang v1.5.1
+	github.com/elastic/go-elasticsearch/v8 v8.19.6
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/google/uuid v1.6.0
+	github.com/helingjun/obconnector-go v0.4.2
 	github.com/highgo/pq-sm3 v0.0.0
 	github.com/lib/pq v1.11.1
 	github.com/microsoft/go-mssqldb v1.9.6
+	github.com/modelcontextprotocol/go-sdk v1.6.1
 	github.com/redis/go-redis/v9 v9.17.3
+	github.com/segmentio/kafka-go v0.4.51
 	github.com/sijms/go-ora/v2 v2.9.0
 	github.com/taosdata/driver-go/v3 v3.7.8
 	github.com/wailsapp/wails/v2 v2.11.0
 	github.com/xuri/excelize/v2 v2.10.0
 	go.mongodb.org/mongo-driver v1.17.9
 	go.mongodb.org/mongo-driver/v2 v2.5.0
-	golang.org/x/crypto v0.47.0
+	golang.org/x/crypto v0.48.0
 	golang.org/x/image v0.25.0
-	golang.org/x/mod v0.32.0
-	golang.org/x/net v0.49.0
-	golang.org/x/text v0.33.0
+	golang.org/x/mod v0.33.0
+	golang.org/x/net v0.50.0
+	golang.org/x/text v0.34.0
 	modernc.org/sqlite v1.44.3
 )
 
 require (
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	github.com/apache/thrift v0.22.0 // indirect
+	github.com/elastic/elastic-transport-go/v8 v8.9.0 // indirect
+	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang/mock v1.5.0 // indirect
+	github.com/google/jsonschema-go v0.4.3 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/segmentio/encoding v0.5.4 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/tidwall/gjson v1.14.2 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
+	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/otel/metric v1.39.0 // indirect
+	go.uber.org/atomic v1.5.1 // indirect
+	golang.org/x/lint v0.0.0-20190930215403-16217165b5de // indirect
+	golang.org/x/oauth2 v0.35.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	stathat.com/c/consistent v1.0.0 // indirect
 )
 
 require (
@@ -61,7 +91,7 @@ require (
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
-	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/golang-sql/sqlexp v0.1.0
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/flatbuffers v25.12.19+incompatible // indirect
 	github.com/gorilla/websocket v1.5.3
@@ -113,10 +143,10 @@ require (
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
 	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/sys v0.40.0 // indirect
-	golang.org/x/telemetry v0.0.0-20260116145544-c6413dc483f5 // indirect
-	golang.org/x/term v0.39.0 // indirect
-	golang.org/x/tools v0.41.0 // indirect
+	golang.org/x/sys v0.41.0 // indirect
+	golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
+	golang.org/x/term v0.40.0 // indirect
+	golang.org/x/tools v0.42.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	modernc.org/libc v1.67.6 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
diff --git a/go.sum b/go.sum
index a93b158..b9ecdff 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,4 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 gitea.com/kingbase/gokb v0.0.0-20201021123113-29bd62a876c3 h1:QjslQNaH5Nuap5i4nijS0OYV6GMk5kqrAmgU90zBKd4=
@@ -20,14 +21,24 @@ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 h1:bFWuo
 github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1/go.mod h1:Vih/3yc6yac2JzU4hzpaDupBJP0Flaia9rXXrU8xyww=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
+github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/ClickHouse/ch-go v0.71.0 h1:bUdZ/EZj/LcVHsMqaRUP2holqygrPWQKeMjc6nZoyRM=
 github.com/ClickHouse/ch-go v0.71.0/go.mod h1:NwbNc+7jaqfY58dmdDUbG4Jl22vThgx1cYjBw0vtgXw=
 github.com/ClickHouse/clickhouse-go/v2 v2.43.0 h1:fUR05TrF1GyvLDa/mAQjkx7KbgwdLRffs2n9O3WobtE=
 github.com/ClickHouse/clickhouse-go/v2 v2.43.0/go.mod h1:o6jf7JM/zveWC/PP277BLxjHy5KjnGX/jfljhM4s34g=
+github.com/HuaweiCloudDeveloper/gaussdb-go v1.0.0-rc1 h1:OIZ83SgbK0ImF/vKFSfNoCAQWQySx5sYhj0RgsWbMbA=
+github.com/HuaweiCloudDeveloper/gaussdb-go v1.0.0-rc1/go.mod h1:Xf3AtRet+/ygewEMfzt0FbIFydPkv47Hx5Xz3w07+yo=
 github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
 github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
 github.com/apache/arrow-go/v18 v18.5.1 h1:yaQ6zxMGgf9YCYw4/oaeOU3AULySDlAYDOcnr4LdHdI=
 github.com/apache/arrow-go/v18 v18.5.1/go.mod h1:OCCJsmdq8AsRm8FkBSSmYTwL/s4zHW9CqxeBxEytkNE=
+github.com/apache/iotdb-client-go v1.3.7 h1:NHEW0yysGfxFQkkJpFHTlww1a/RHCINbOXBfv2/aIQ0=
+github.com/apache/iotdb-client-go v1.3.7/go.mod h1:3D6QYkqRmASS/4HsjU+U/3fscyc5M9xKRfywZsKuoZY=
+github.com/apache/rocketmq-client-go/v2 v2.1.2 h1:yt73olKe5N6894Dbm+ojRf/JPiP0cxfDNNffKwhpJVg=
+github.com/apache/rocketmq-client-go/v2 v2.1.2/go.mod h1:6I6vgxHR3hzrvn+6n/4mrhS+UTulzK/X9LB2Vk1U5gE=
+github.com/apache/thrift v0.15.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
 github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
 github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g=
 github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
@@ -36,9 +47,15 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
 github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -65,14 +82,35 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM=
 github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
+github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2ISgCl2W7nE=
+github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
+github.com/elastic/elastic-transport-go/v8 v8.9.0 h1:KeT/2P54F0xS0S8Y3Pf+tFDg4HmBgReQMB+BMz8dDAs=
+github.com/elastic/elastic-transport-go/v8 v8.9.0/go.mod h1:ssMTvNS2hwf7CaiGsRRsx4gQHFZ/jS/DkLcISxekWzc=
+github.com/elastic/go-elasticsearch/v8 v8.19.6 h1:4qa7ecJkr5rLsoHKIVGbaqcFt2o57CnOHQJi9Pts/rk=
+github.com/elastic/go-elasticsearch/v8 v8.19.6/go.mod h1:jeWebApE1oFEW/hKZqx/IRYmP/aa2+WMJkOfk+AduSI=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
+github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=
 github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw=
 github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg=
 github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
+github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
 github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
 github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
@@ -82,27 +120,52 @@ github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
-github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
+github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g=
+github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
 github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/flatbuffers v25.12.19+incompatible h1:haMV2JRRJCe1998HeW/p0X9UaMTK6SDo0ffLn2+DbLs=
 github.com/google/flatbuffers v25.12.19+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/jsonschema-go v0.4.3 h1:/DBOLZTfDow7pe2GmaJNhltueGTtDKICi8V8p+DQPd0=
+github.com/google/jsonschema-go v0.4.3/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -113,10 +176,22 @@ github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bP
 github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
+github.com/helingjun/obconnector-go v0.4.2 h1:TmN1jjFYJu1ZZ+X+uWr7lGmKW7MsJjdfsEb8A/Ox3+8=
+github.com/helingjun/obconnector-go v0.4.2/go.mod h1:zJL1M1xZvTm7OGKEDl04TPRDqi5MRXj7/hMb4CqTCDI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
+github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
 github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
@@ -126,6 +201,7 @@ github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+
 github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -166,6 +242,8 @@ github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpsp
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
+github.com/modelcontextprotocol/go-sdk v1.6.1 h1:0zOSupjKUxPKSocPT1Wtago+mUHU2/uZ4xSOY0FGReU=
+github.com/modelcontextprotocol/go-sdk v1.6.1/go.mod h1:kzm3kzFL1/+AziGOE0nUs3gvPoNxMCvkxokMkuFapXQ=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -179,6 +257,19 @@ github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ib
 github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
 github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/paulmach/orb v0.12.0 h1:z+zOwjmG3MyEEqzv92UN49Lg1JFYx0L9GpGKNVDKk1s=
 github.com/paulmach/orb v0.12.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU=
 github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
@@ -186,12 +277,13 @@ github.com/pierrec/lz4/v4 v4.1.25 h1:kocOqRffaIbU5djlIBr7Wh+cx82C0vtFb0fOurZHqD0
 github.com/pierrec/lz4/v4 v4.1.25/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/redis/go-redis/v9 v9.17.3 h1:fN29NdNrE17KttK5Ndf20buqfDZwGNgoUr9qjl1DQx4=
 github.com/redis/go-redis/v9 v9.17.3/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
@@ -204,23 +296,36 @@ github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTK
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
 github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
 github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=
 github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
+github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0=
+github.com/segmentio/encoding v0.5.4/go.mod h1:HS1ZKa3kSN32ZHVZ7ZLPLXWvOVIiZtyJnO1gPH1sKt0=
+github.com/segmentio/kafka-go v0.4.51 h1:JgDPPG75tC1rWIS2Me6MwcvXJ6f49UQ4HjAOef71Hno=
+github.com/segmentio/kafka-go v0.4.51/go.mod h1:Y1gn60kzLEEaW28YshXyk2+VCUKbJ3Qr6DrnT3i4+9E=
 github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
 github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/sijms/go-ora/v2 v2.9.0 h1:+iQbUeTeCOFMb5BsOMgUhV8KWyrv9yjKpcK4x7+MFrg=
 github.com/sijms/go-ora/v2 v2.9.0/go.mod h1:QgFInVi3ZWyqAiJwzBQA+nbKYKH77tdp1PYoCqhR2dU=
+github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -230,9 +335,18 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/taosdata/driver-go/v3 v3.7.8 h1:N2H6HLLZH2ve2ipcoFgG9BJS+yW0XksqNYwEdSmHaJk=
 github.com/taosdata/driver-go/v3 v3.7.8/go.mod h1:gSxBEPOueMg0rTmMO1Ug6aeD7AwGdDGvUtLrsDTTpYc=
+github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.14.2 h1:6BBkirS0rAHjumnjHF6qgy5d2YAJ1TLIaFE2lzfOLqo=
+github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tiendc/go-deepcopy v1.7.1 h1:LnubftI6nYaaMOcaz0LphzwraqN8jiWTwm416sitff4=
 github.com/tiendc/go-deepcopy v1.7.1/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ=
+github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho=
+github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE=
 github.com/tkrajina/go-reflector v0.5.8 h1:yPADHrwmUbMq4RGEyaOUpz2H90sRsETNVpjzo3DLVQQ=
 github.com/tkrajina/go-reflector v0.5.8/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@@ -261,6 +375,8 @@ github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBL
 github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
+github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
+github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
@@ -276,38 +392,67 @@ go.mongodb.org/mongo-driver v1.17.9 h1:IexDdCuuNJ3BHrELgBlyaH9p60JXAvdzWR128q+U5
 go.mongodb.org/mongo-driver v1.17.9/go.mod h1:LlOhpH5NUEfhxcAwG0UEkMqwYcc4JU18gtCdGudk/tQ=
 go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE=
 go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
 go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
+go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
+go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
+go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
 go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
 go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
+go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM=
+go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
-golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
+golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU=
 golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU=
 golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
 golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
-golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
+golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
+golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
-golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
+golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
+golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=
+golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -315,42 +460,61 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/telemetry v0.0.0-20260116145544-c6413dc483f5 h1:i0p03B68+xC1kD2QUO8JzDTPXCzhN56OLJ+IhHY8U3A=
-golang.org/x/telemetry v0.0.0-20260116145544-c6413dc483f5/go.mod h1:b7fPSJ0pKZ3ccUh8gnTONJxhn3c/PS6tyzQvyqw4iA8=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 h1:bTLqdHv7xrGlFbvf5/TXNxy/iUwwdkjhqQTJDjW7aj0=
+golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4/go.mod h1:g5NllXBEermZrmR51cJDQxmJUHUOfRAaNyWBM+R+548=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
-golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
+golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
+golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
-golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
+golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
+golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
-golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
+golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
+golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -359,16 +523,42 @@ golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhS
 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
 modernc.org/cc/v4 v4.27.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
 modernc.org/ccgo/v4 v4.30.1 h1:4r4U1J6Fhj98NKfSjnPUN7Ze2c6MnAdL0hWw6+LrJpc=
@@ -397,3 +587,5 @@ modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+stathat.com/c/consistent v1.0.0 h1:ezyc51EGcRPJUxfHGSgJjWzJdj3NiMU9pNfLNGiXV0c=
+stathat.com/c/consistent v1.0.0/go.mod h1:QkzMWzcbB+yQBL2AttO6sgsQS/JSTapcDISJalmCDS0=
diff --git a/internal/ai/provider/anthropic.go b/internal/ai/provider/anthropic.go
index 8f3c03d..1a7b238 100644
--- a/internal/ai/provider/anthropic.go
+++ b/internal/ai/provider/anthropic.go
@@ -469,9 +469,11 @@ func (p *AnthropicProvider) doRequest(ctx context.Context, body interface{}) (io
 	}
 
 	url := normalizeAnthropicMessagesURL(p.baseURL)
+	requestLog := logAIUpstreamRequestStart(p.Name(), http.MethodPost, url, body)
 
 	httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(jsonBody))
 	if err != nil {
+		logAIUpstreamRequestFinish(requestLog, 0, err)
 		return nil, fmt.Errorf("创建 HTTP 请求失败: %w", err)
 	}
 
@@ -497,15 +499,19 @@ func (p *AnthropicProvider) doRequest(ctx context.Context, body interface{}) (io
 
 	resp, err := p.client.Do(httpReq)
 	if err != nil {
+		logAIUpstreamRequestFinish(requestLog, 0, err)
 		return nil, fmt.Errorf("发送请求到 %s 失败: %w", url, err)
 	}
 
 	if resp.StatusCode != http.StatusOK {
 		defer resp.Body.Close()
 		bodyBytes, _ := io.ReadAll(resp.Body)
-		return nil, fmt.Errorf("Anthropic API 返回错误 (HTTP %d): %s", resp.StatusCode, string(bodyBytes))
+		statusErr := fmt.Errorf("Anthropic API 返回错误 (HTTP %d): %s", resp.StatusCode, string(bodyBytes))
+		logAIUpstreamRequestFinish(requestLog, resp.StatusCode, statusErr)
+		return nil, statusErr
 	}
 
+	logAIUpstreamRequestFinish(requestLog, resp.StatusCode, nil)
 	return resp.Body, nil
 }
 
diff --git a/internal/ai/provider/claude_cli.go b/internal/ai/provider/claude_cli.go
index f7fc00b..5ead8d0 100644
--- a/internal/ai/provider/claude_cli.go
+++ b/internal/ai/provider/claude_cli.go
@@ -14,6 +14,7 @@ import (
 	"time"
 
 	ai "GoNavi-Wails/internal/ai"
+	"GoNavi-Wails/internal/logger"
 )
 
 var claudeLookPath = exec.LookPath
@@ -66,15 +67,29 @@ func (p *ClaudeCLIProvider) Chat(ctx context.Context, req ai.ChatRequest) (*ai.C
 		return nil, err
 	}
 
+	requestLog := logAIUpstreamRequestStart(
+		p.Name(),
+		"CLI",
+		claudeCLIEndpointForLog(p.config),
+		buildClaudeCLIRequestLogBody("json", args, prompt, p.config, req),
+	)
+	var requestErr error
+	defer func() {
+		logAIUpstreamRequestFinish(requestLog, 0, requestErr)
+	}()
+
 	output, err := cmd.Output()
 	if err != nil {
 		if isClaudeCLITimeout(ctx, err) {
-			return nil, fmt.Errorf("claude CLI 执行超时（%s），当前 Base URL 或 API Key 可能没有返回有效响应", claudeCLIRequestTimeout)
+			requestErr = fmt.Errorf("claude CLI 执行超时（%s），当前 Base URL 或 API Key 可能没有返回有效响应", claudeCLIRequestTimeout)
+			return nil, requestErr
 		}
 		if exitErr, ok := err.(*exec.ExitError); ok {
-			return nil, fmt.Errorf("claude CLI 执行失败: %s", string(exitErr.Stderr))
+			requestErr = fmt.Errorf("claude CLI 执行失败: %s", string(exitErr.Stderr))
+			return nil, requestErr
 		}
-		return nil, fmt.Errorf("claude CLI 执行失败: %w", err)
+		requestErr = fmt.Errorf("claude CLI 执行失败: %w", err)
+		return nil, requestErr
 	}
 
 	// 解析 JSON 输出
@@ -84,7 +99,8 @@ func (p *ClaudeCLIProvider) Chat(ctx context.Context, req ai.ChatRequest) (*ai.C
 		return &ai.ChatResponse{Content: strings.TrimSpace(string(output))}, nil
 	}
 	if errMsg, hasError := extractClaudeCLIEventError(result); hasError {
-		return nil, fmt.Errorf("claude CLI 返回错误: %s", errMsg)
+		requestErr = fmt.Errorf("claude CLI 返回错误: %s", errMsg)
+		return nil, requestErr
 	}
 
 	return &ai.ChatResponse{Content: result.Result}, nil
@@ -105,19 +121,29 @@ func (p *ClaudeCLIProvider) ChatStream(ctx context.Context, req ai.ChatRequest,
 		args = append(args, "--model", p.config.Model)
 	}
 
-	fmt.Printf("[ClaudeCLI DEBUG] Running: claude %v\n", args)
-
 	cmd := claudeCommandContext(ctx, "claude", args...)
 	if err := p.setEnv(cmd); err != nil {
 		return err
 	}
 
+	requestLog := logAIUpstreamRequestStart(
+		p.Name(),
+		"CLI",
+		claudeCLIEndpointForLog(p.config),
+		buildClaudeCLIRequestLogBody("stream-json", args, prompt, p.config, req),
+	)
+	var requestErr error
+	defer func() {
+		logAIUpstreamRequestFinish(requestLog, 0, requestErr)
+	}()
+
 	// 关闭 stdin，防止 claude CLI 等待输入
 	cmd.Stdin = nil
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
-		return fmt.Errorf("创建 stdout 管道失败: %w", err)
+		requestErr = fmt.Errorf("创建 stdout 管道失败: %w", err)
+		return requestErr
 	}
 
 	// 捕获 stderr
@@ -125,10 +151,13 @@ func (p *ClaudeCLIProvider) ChatStream(ctx context.Context, req ai.ChatRequest,
 	cmd.Stderr = &stderrBuf
 
 	if err := cmd.Start(); err != nil {
-		return fmt.Errorf("启动 claude CLI 失败: %w", err)
+		requestErr = fmt.Errorf("启动 claude CLI 失败: %w", err)
+		return requestErr
 	}
 
-	fmt.Printf("[ClaudeCLI DEBUG] Process started, PID: %d\n", cmd.Process.Pid)
+	if cmd.Process != nil {
+		logger.Infof("ClaudeCLI 请求进程已启动：requestId=%s pid=%d", requestLog.id, cmd.Process.Pid)
+	}
 
 	// 前端已有 loading 动画，无需在 content 中注入"正在思考"
 
@@ -142,11 +171,9 @@ func (p *ClaudeCLIProvider) ChatStream(ctx context.Context, req ai.ChatRequest,
 			continue
 		}
 
-		fmt.Printf("[ClaudeCLI DEBUG] Line: %s\n", line[:min(len(line), 200)])
-
 		var event cliStreamEvent
 		if err := json.Unmarshal([]byte(line), &event); err != nil {
-			fmt.Printf("[ClaudeCLI DEBUG] Non-JSON line: %s\n", line)
+			logger.Warnf("ClaudeCLI 忽略非 JSON 输出：requestId=%s line=%s", requestLog.id, RedactAIUpstreamLogText(line))
 			continue
 		}
 
@@ -155,6 +182,7 @@ func (p *ClaudeCLIProvider) ChatStream(ctx context.Context, req ai.ChatRequest,
 			if isClaudeCLISystemRetryEvent(event) {
 				if errMsg, hasError := extractClaudeCLISystemRetryError(event); hasError {
 					callback(ai.StreamChunk{Error: errMsg, Done: true})
+					requestErr = fmt.Errorf("claude CLI 鉴权失败: %s", errMsg)
 					if cmd.Process != nil {
 						_ = cmd.Process.Kill()
 					}
@@ -165,6 +193,7 @@ func (p *ClaudeCLIProvider) ChatStream(ctx context.Context, req ai.ChatRequest,
 		case "assistant":
 			if errMsg, hasError := extractClaudeCLIEventError(event); hasError {
 				callback(ai.StreamChunk{Error: errMsg, Done: true})
+				requestErr = fmt.Errorf("claude CLI 返回错误: %s", errMsg)
 				_ = cmd.Wait()
 				return nil
 			}
@@ -188,6 +217,7 @@ func (p *ClaudeCLIProvider) ChatStream(ctx context.Context, req ai.ChatRequest,
 		case "result":
 			if errMsg, hasError := extractClaudeCLIEventError(event); hasError {
 				callback(ai.StreamChunk{Error: errMsg, Done: true})
+				requestErr = fmt.Errorf("claude CLI 返回错误: %s", errMsg)
 				_ = cmd.Wait()
 				return nil
 			}
@@ -198,6 +228,7 @@ func (p *ClaudeCLIProvider) ChatStream(ctx context.Context, req ai.ChatRequest,
 		case "error":
 			errMsg, _ := extractClaudeCLIEventError(event)
 			callback(ai.StreamChunk{Error: errMsg, Done: true})
+			requestErr = fmt.Errorf("claude CLI 返回错误: %s", errMsg)
 			_ = cmd.Wait()
 			return nil
 		}
@@ -205,11 +236,11 @@ func (p *ClaudeCLIProvider) ChatStream(ctx context.Context, req ai.ChatRequest,
 
 	waitErr := cmd.Wait()
 	stderrStr := strings.TrimSpace(stderrBuf.String())
-	fmt.Printf("[ClaudeCLI DEBUG] Process exited. stderr: %s\n", stderrStr)
 
 	if isClaudeCLITimeout(ctx, waitErr) {
+		requestErr = fmt.Errorf("claude CLI 执行超时（%s），当前 Base URL 或 API Key 可能没有返回有效响应", claudeCLIRequestTimeout)
 		callback(ai.StreamChunk{
-			Error: fmt.Sprintf("claude CLI 执行超时（%s），当前 Base URL 或 API Key 可能没有返回有效响应", claudeCLIRequestTimeout),
+			Error: requestErr.Error(),
 			Done:  true,
 		})
 		return nil
@@ -220,6 +251,7 @@ func (p *ClaudeCLIProvider) ChatStream(ctx context.Context, req ai.ChatRequest,
 		if stderrStr != "" {
 			errMsg = fmt.Sprintf("claude CLI 异常退出: %s", stderrStr)
 		}
+		requestErr = fmt.Errorf("%s", errMsg)
 		callback(ai.StreamChunk{Error: errMsg, Done: true})
 		return nil
 	}
@@ -242,6 +274,51 @@ func isClaudeCLITimeout(ctx context.Context, err error) bool {
 	return errors.Is(ctx.Err(), context.DeadlineExceeded) || errors.Is(err, context.DeadlineExceeded)
 }
 
+func claudeCLIEndpointForLog(config ai.ProviderConfig) string {
+	baseURL := strings.TrimRight(strings.TrimSpace(config.BaseURL), "/")
+	if baseURL != "" {
+		return sanitizeAIUpstreamURL(baseURL)
+	}
+	return "claude://cli"
+}
+
+func buildClaudeCLIRequestLogBody(outputFormat string, args []string, prompt string, config ai.ProviderConfig, req ai.ChatRequest) map[string]any {
+	return map[string]any{
+		"command":       "claude",
+		"args":          claudeCLIArgsForLog(args),
+		"prompt":        prompt,
+		"output_format": outputFormat,
+		"model":         strings.TrimSpace(config.Model),
+		"base_url":      claudeCLIEndpointForLog(config),
+		"has_api_key":   strings.TrimSpace(config.APIKey) != "",
+		"message_count": len(req.Messages),
+		"tool_count":    len(req.Tools),
+		"tool_names":    claudeCLIToolNamesForLog(req.Tools),
+	}
+}
+
+func claudeCLIArgsForLog(args []string) []string {
+	result := append([]string(nil), args...)
+	for i := 0; i < len(result)-1; i++ {
+		if result[i] == "-p" {
+			result[i+1] = "[prompt logged separately]"
+			i++
+		}
+	}
+	return result
+}
+
+func claudeCLIToolNamesForLog(tools []ai.Tool) []string {
+	names := make([]string, 0, len(tools))
+	for _, tool := range tools {
+		name := strings.TrimSpace(tool.Function.Name)
+		if name != "" {
+			names = append(names, name)
+		}
+	}
+	return names
+}
+
 // setEnv 设置 Claude CLI 的环境变量
 func (p *ClaudeCLIProvider) setEnv(cmd *exec.Cmd) error {
 	env, err := buildClaudeCLIEnv(p.config, cmd.Environ(), runtime.GOOS, claudeLookPath, fileExists)
diff --git a/internal/ai/provider/claude_cli_test.go b/internal/ai/provider/claude_cli_test.go
index 8929841..0e4dd25 100644
--- a/internal/ai/provider/claude_cli_test.go
+++ b/internal/ai/provider/claude_cli_test.go
@@ -38,6 +38,60 @@ func TestBuildClaudeCLIEnv_IncludesAnthropicProxyEnv(t *testing.T) {
 	}
 }
 
+func TestBuildClaudeCLIRequestLogBodyRedactsSecretsAndKeepsRequestShape(t *testing.T) {
+	prompt := "请分析订单表。临时凭证 Bearer abcdefghijklmnopqrstuvwxyz，另一个 key 是 sk-live-abcdefghijklmnopqrstuvwxyz"
+	args := []string{"-p", prompt, "--output-format", "stream-json", "--model", "claude-sonnet"}
+	originalPromptArg := args[1]
+
+	body := buildClaudeCLIRequestLogBody("stream-json", args, prompt, ai.ProviderConfig{
+		BaseURL: "https://proxy.example.com/api/anthropic?key=proxy-secret&alt=sse",
+		APIKey:  "sk-config-secret-1234567890",
+		Model:   "claude-sonnet",
+	}, ai.ChatRequest{
+		Messages: []ai.Message{{Role: "user", Content: prompt}},
+		Tools: []ai.Tool{{
+			Type: "function",
+			Function: ai.ToolFunction{
+				Name:        "inspect_ai_upstream_logs",
+				Description: "读取 AI 上游请求日志",
+			},
+		}},
+	})
+
+	got := formatAIUpstreamRequestLogBody(body)
+
+	for _, want := range []string{
+		`"command":"claude"`,
+		`"output_format":"stream-json"`,
+		`"model":"claude-sonnet"`,
+		`"has_api_key":true`,
+		`"message_count":1`,
+		`"tool_count":1`,
+		`"[prompt logged separately]"`,
+		`inspect_ai_upstream_logs`,
+		`key=%5BREDACTED%5D`,
+		`[REDACTED]`,
+	} {
+		if !strings.Contains(got, want) {
+			t.Fatalf("expected Claude CLI request log body to contain %q, got %s", want, got)
+		}
+	}
+
+	for _, leaked := range []string{
+		"proxy-secret",
+		"sk-config-secret",
+		"Bearer abcdefghijklmnopqrstuvwxyz",
+		"sk-live-abcdefghijklmnopqrstuvwxyz",
+	} {
+		if strings.Contains(got, leaked) {
+			t.Fatalf("Claude CLI request log body leaked %q: %s", leaked, got)
+		}
+	}
+	if args[1] != originalPromptArg {
+		t.Fatalf("expected original args to remain unchanged, got %q", args[1])
+	}
+}
+
 func TestBuildClaudeCLIEnv_UsesDetectedGitBashOnWindows(t *testing.T) {
 	env, err := buildClaudeCLIEnv(ai.ProviderConfig{}, []string{"ProgramFiles=C:\\Program Files"}, "windows", func(name string) (string, error) {
 		switch name {
diff --git a/internal/ai/provider/gemini.go b/internal/ai/provider/gemini.go
index ebadde9..4330bbf 100644
--- a/internal/ai/provider/gemini.go
+++ b/internal/ai/provider/gemini.go
@@ -71,9 +71,9 @@ func (p *GeminiProvider) Validate() error {
 }
 
 type geminiRequest struct {
-	Contents         []geminiContent  `json:"contents"`
+	Contents          []geminiContent `json:"contents"`
 	SystemInstruction *geminiContent  `json:"systemInstruction,omitempty"`
-	GenerationConfig geminiGenConfig  `json:"generationConfig,omitempty"`
+	GenerationConfig  geminiGenConfig `json:"generationConfig,omitempty"`
 }
 
 type geminiContent struct {
@@ -255,7 +255,7 @@ func (p *GeminiProvider) buildRequest(req ai.ChatRequest) geminiRequest {
 		Contents:          contents,
 		SystemInstruction: systemInstruction,
 		GenerationConfig: geminiGenConfig{
-			Temperature:     temperature,
+			Temperature: temperature,
 		},
 	}
 }
@@ -266,8 +266,10 @@ func (p *GeminiProvider) doRequest(ctx context.Context, url string, body interfa
 		return nil, fmt.Errorf("序列化请求失败: %w", err)
 	}
 
+	requestLog := logAIUpstreamRequestStart(p.Name(), http.MethodPost, url, body)
 	httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(jsonBody))
 	if err != nil {
+		logAIUpstreamRequestFinish(requestLog, 0, err)
 		return nil, fmt.Errorf("创建 HTTP 请求失败: %w", err)
 	}
 	httpReq.Header.Set("Content-Type", "application/json")
@@ -280,14 +282,18 @@ func (p *GeminiProvider) doRequest(ctx context.Context, url string, body interfa
 
 	resp, err := p.client.Do(httpReq)
 	if err != nil {
+		logAIUpstreamRequestFinish(requestLog, 0, err)
 		return nil, fmt.Errorf("发送请求到 Gemini 失败: %w", err)
 	}
 
 	if resp.StatusCode != http.StatusOK {
 		defer resp.Body.Close()
 		bodyBytes, _ := io.ReadAll(resp.Body)
-		return nil, fmt.Errorf("Gemini API 返回错误 (HTTP %d): %s", resp.StatusCode, string(bodyBytes))
+		statusErr := fmt.Errorf("Gemini API 返回错误 (HTTP %d): %s", resp.StatusCode, string(bodyBytes))
+		logAIUpstreamRequestFinish(requestLog, resp.StatusCode, statusErr)
+		return nil, statusErr
 	}
 
+	logAIUpstreamRequestFinish(requestLog, resp.StatusCode, nil)
 	return resp.Body, nil
 }
diff --git a/internal/ai/provider/openai.go b/internal/ai/provider/openai.go
index 83a82c5..8594ea4 100644
--- a/internal/ai/provider/openai.go
+++ b/internal/ai/provider/openai.go
@@ -19,6 +19,7 @@ const (
 	defaultOpenAIMaxTokens   = 4096
 	defaultOpenAITemperature = 0.7
 	openAIHTTPTimeout        = 120 * time.Second
+	omittedImageNotice       = "【图片已省略：当前模型或上游接口不支持图片输入，请切换支持视觉的模型后重新发送图片。】"
 )
 
 // OpenAIProvider 实现 OpenAI / OpenAI 兼容 API 的 Provider
@@ -205,7 +206,8 @@ func (p *OpenAIProvider) Chat(ctx context.Context, req ai.ChatRequest) (*ai.Chat
 		return nil, err
 	}
 
-	messages := buildOpenAIMessages(req.Messages, p.config.Model, p.baseURL)
+	requestMessages := prepareOpenAIRequestMessages(req.Messages, p.config.Model, p.baseURL)
+	messages := buildOpenAIMessages(requestMessages, p.config.Model, p.baseURL)
 
 	temperature := req.Temperature
 	if temperature <= 0 {
@@ -222,15 +224,8 @@ func (p *OpenAIProvider) Chat(ctx context.Context, req ai.ChatRequest) (*ai.Chat
 
 	respBody, err := p.doRequest(ctx, body)
 	if err != nil {
-		// 当带 tools 的请求返回 400 时，自动降级为不带 tools 的纯文本请求
-		if len(req.Tools) > 0 && isHTTP400Error(err) {
-			fmt.Println("[OpenAI] 模型不支持 Function Calling，自动降级为纯文本模式")
-			body.Tools = nil
-			respBody, err = p.doRequest(ctx, body)
-			if err != nil {
-				return nil, err
-			}
-		} else {
+		respBody, err = p.retryClientRejectedChatRequest(ctx, req, body, err)
+		if err != nil {
 			return nil, err
 		}
 	}
@@ -264,7 +259,8 @@ func (p *OpenAIProvider) ChatStream(ctx context.Context, req ai.ChatRequest, cal
 		return err
 	}
 
-	messages := buildOpenAIMessages(req.Messages, p.config.Model, p.baseURL)
+	requestMessages := prepareOpenAIRequestMessages(req.Messages, p.config.Model, p.baseURL)
+	messages := buildOpenAIMessages(requestMessages, p.config.Model, p.baseURL)
 
 	temperature := req.Temperature
 	if temperature <= 0 {
@@ -281,15 +277,8 @@ func (p *OpenAIProvider) ChatStream(ctx context.Context, req ai.ChatRequest, cal
 
 	respBody, err := p.doRequest(ctx, body)
 	if err != nil {
-		// 当带 tools 的请求返回 400 时，自动降级为不带 tools 的纯文本请求
-		if len(req.Tools) > 0 && isHTTP400Error(err) {
-			fmt.Println("[OpenAI] 模型不支持 Function Calling，自动降级为纯文本模式")
-			body.Tools = nil
-			respBody, err = p.doRequest(ctx, body)
-			if err != nil {
-				return err
-			}
-		} else {
+		respBody, err = p.retryClientRejectedChatRequest(ctx, req, body, err)
+		if err != nil {
 			return err
 		}
 	}
@@ -395,6 +384,113 @@ func (p *OpenAIProvider) ChatStream(ctx context.Context, req ai.ChatRequest, cal
 	return nil
 }
 
+func (p *OpenAIProvider) retryClientRejectedChatRequest(ctx context.Context, req ai.ChatRequest, body openAIChatRequest, err error) (io.ReadCloser, error) {
+	if !isHTTP400Error(err) {
+		return nil, err
+	}
+
+	if len(body.Tools) > 0 {
+		fmt.Println("[OpenAI] 模型不支持 Function Calling，自动降级为纯文本模式")
+		body.Tools = nil
+		respBody, retryErr := p.doRequest(ctx, body)
+		if retryErr == nil {
+			return respBody, nil
+		}
+		if !isHTTP400Error(retryErr) {
+			return nil, retryErr
+		}
+		err = retryErr
+	}
+
+	if requestMessagesContainImages(req.Messages) {
+		fmt.Println("[OpenAI] 模型不支持图片输入，自动移除图片后重试")
+		body.Messages = buildOpenAIMessages(stripImagesFromRequestMessages(req.Messages), p.config.Model, p.baseURL)
+		body.Tools = nil
+		respBody, retryErr := p.doRequest(ctx, body)
+		if retryErr == nil {
+			return respBody, nil
+		}
+		return nil, retryErr
+	}
+
+	return nil, err
+}
+
+func prepareOpenAIRequestMessages(messages []ai.Message, modelName string, baseURL string) []ai.Message {
+	if requestMessagesContainImages(messages) && shouldOmitImagesBeforeRequest(modelName, baseURL) {
+		fmt.Println("[OpenAI] 当前模型按文本模型处理，发送前移除图片输入")
+		return stripImagesFromRequestMessages(messages)
+	}
+	return messages
+}
+
+func shouldOmitImagesBeforeRequest(modelName string, baseURL string) bool {
+	model := strings.ToLower(strings.TrimSpace(modelName))
+	base := strings.ToLower(strings.TrimSpace(baseURL))
+	if model == "" {
+		return false
+	}
+
+	visionMarkers := []string{
+		"vision",
+		"vl",
+		"image",
+		"4v",
+		"omni",
+		"gpt-4o",
+		"gpt-4.1",
+		"gpt-5",
+		"glm-4v",
+	}
+	for _, marker := range visionMarkers {
+		if strings.Contains(model, marker) || strings.Contains(base, marker) {
+			return false
+		}
+	}
+
+	textOnlyMarkers := []string{
+		"minimax-m1",
+		"minimax-m2",
+		"kimi-k2",
+		"deepseek",
+		"moonshot-v1",
+	}
+	for _, marker := range textOnlyMarkers {
+		if strings.Contains(model, marker) {
+			return true
+		}
+	}
+	return false
+}
+
+func requestMessagesContainImages(messages []ai.Message) bool {
+	for _, message := range messages {
+		if len(message.Images) > 0 {
+			return true
+		}
+	}
+	return false
+}
+
+func stripImagesFromRequestMessages(messages []ai.Message) []ai.Message {
+	stripped := make([]ai.Message, len(messages))
+	for i, message := range messages {
+		stripped[i] = message
+		if len(message.Images) == 0 {
+			continue
+		}
+
+		stripped[i].Images = nil
+		content := strings.TrimSpace(stripped[i].Content)
+		if content == "" {
+			stripped[i].Content = omittedImageNotice
+			continue
+		}
+		stripped[i].Content = content + "\n\n" + omittedImageNotice
+	}
+	return stripped
+}
+
 func (p *OpenAIProvider) doRequest(ctx context.Context, body interface{}) (io.ReadCloser, error) {
 	jsonBody, err := json.Marshal(body)
 	if err != nil {
@@ -402,8 +498,10 @@ func (p *OpenAIProvider) doRequest(ctx context.Context, body interface{}) (io.Re
 	}
 
 	url := ResolveOpenAICompatibleEndpoint(p.baseURL, "chat/completions")
+	requestLog := logAIUpstreamRequestStart(p.Name(), http.MethodPost, url, body)
 	httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(jsonBody))
 	if err != nil {
+		logAIUpstreamRequestFinish(requestLog, 0, err)
 		return nil, fmt.Errorf("创建 HTTP 请求失败: %w", err)
 	}
 
@@ -424,15 +522,19 @@ func (p *OpenAIProvider) doRequest(ctx context.Context, body interface{}) (io.Re
 
 	resp, err := p.client.Do(httpReq)
 	if err != nil {
+		logAIUpstreamRequestFinish(requestLog, 0, err)
 		return nil, fmt.Errorf("发送请求到 %s 失败: %w", url, err)
 	}
 
 	if resp.StatusCode != http.StatusOK {
 		defer resp.Body.Close()
 		bodyBytes, _ := io.ReadAll(resp.Body)
-		return nil, fmt.Errorf("OpenAI API 返回错误 (HTTP %d): %s", resp.StatusCode, string(bodyBytes))
+		statusErr := fmt.Errorf("OpenAI API 返回错误 (HTTP %d): %s", resp.StatusCode, string(bodyBytes))
+		logAIUpstreamRequestFinish(requestLog, resp.StatusCode, statusErr)
+		return nil, statusErr
 	}
 
+	logAIUpstreamRequestFinish(requestLog, resp.StatusCode, nil)
 	return resp.Body, nil
 }
 
diff --git a/internal/ai/provider/openai_test.go b/internal/ai/provider/openai_test.go
index 43d3a22..8cbeb12 100644
--- a/internal/ai/provider/openai_test.go
+++ b/internal/ai/provider/openai_test.go
@@ -1,10 +1,15 @@
 package provider
 
 import (
-	"GoNavi-Wails/internal/ai"
+	"context"
 	"encoding/json"
+	"io"
+	"net/http"
+	"net/http/httptest"
 	"strings"
 	"testing"
+
+	"GoNavi-Wails/internal/ai"
 )
 
 func TestNormalizeOpenAICompatibleBaseURL(t *testing.T) {
@@ -168,6 +173,207 @@ func TestOpenAIProvider_DefaultMaxTokens(t *testing.T) {
 	}
 }
 
+func TestOpenAIProviderChatRetriesWithoutImagesOnHTTP400(t *testing.T) {
+	requestCount := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		requestCount++
+		body, err := io.ReadAll(r.Body)
+		if err != nil {
+			t.Fatalf("read request body failed: %v", err)
+		}
+		defer r.Body.Close()
+
+		if strings.Contains(string(body), `"image_url"`) {
+			http.Error(w, `{"error":{"message":"Model do not support image input"}}`, http.StatusBadRequest)
+			return
+		}
+		if !strings.Contains(string(body), omittedImageNotice) {
+			t.Fatalf("expected retry body to explain omitted image, got %s", body)
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"choices":[{"message":{"content":"pong"},"finish_reason":"stop"}],"usage":{"prompt_tokens":1,"completion_tokens":1,"total_tokens":2}}`))
+	}))
+	defer server.Close()
+
+	providerInstance, err := NewOpenAIProvider(ai.ProviderConfig{
+		Type:        "openai",
+		Name:        "test-openai",
+		APIKey:      "sk-test",
+		BaseURL:     server.URL,
+		Model:       "custom-text-model",
+		MaxTokens:   64,
+		Temperature: 0.1,
+	})
+	if err != nil {
+		t.Fatalf("create provider failed: %v", err)
+	}
+
+	resp, err := providerInstance.Chat(context.Background(), ai.ChatRequest{
+		Messages: []ai.Message{{
+			Role:    "user",
+			Content: "请描述这张图片",
+			Images:  []string{"data:image/png;base64,abc"},
+		}},
+	})
+	if err != nil {
+		t.Fatalf("expected chat image fallback to succeed, got %v", err)
+	}
+	if resp.Content != "pong" {
+		t.Fatalf("expected fallback content %q, got %q", "pong", resp.Content)
+	}
+	if requestCount != 2 {
+		t.Fatalf("expected 2 requests (with image then fallback), got %d", requestCount)
+	}
+}
+
+func TestOpenAIProviderChatOmitsImagesUpfrontForMiniMaxTextModel(t *testing.T) {
+	requestCount := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		requestCount++
+		body, err := io.ReadAll(r.Body)
+		if err != nil {
+			t.Fatalf("read request body failed: %v", err)
+		}
+		defer r.Body.Close()
+
+		bodyText := string(body)
+		if strings.Contains(bodyText, `"image_url"`) {
+			t.Fatalf("expected MiniMax text request to omit image_url, got %s", body)
+		}
+		if !strings.Contains(bodyText, omittedImageNotice) {
+			t.Fatalf("expected request body to explain omitted image, got %s", body)
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"choices":[{"message":{"content":"pong"},"finish_reason":"stop"}],"usage":{"prompt_tokens":1,"completion_tokens":1,"total_tokens":2}}`))
+	}))
+	defer server.Close()
+
+	providerInstance, err := NewOpenAIProvider(ai.ProviderConfig{
+		Type:        "openai",
+		Name:        "test-openai",
+		APIKey:      "sk-test",
+		BaseURL:     server.URL,
+		Model:       "MiniMax-M2.7-highspeed",
+		MaxTokens:   64,
+		Temperature: 0.1,
+	})
+	if err != nil {
+		t.Fatalf("create provider failed: %v", err)
+	}
+
+	resp, err := providerInstance.Chat(context.Background(), ai.ChatRequest{
+		Messages: []ai.Message{{
+			Role:    "user",
+			Content: "请描述这张图片",
+			Images:  []string{"data:image/png;base64,abc"},
+		}},
+	})
+	if err != nil {
+		t.Fatalf("expected chat to succeed without sending image, got %v", err)
+	}
+	if resp.Content != "pong" {
+		t.Fatalf("expected content %q, got %q", "pong", resp.Content)
+	}
+	if requestCount != 1 {
+		t.Fatalf("expected 1 request without image retry, got %d", requestCount)
+	}
+}
+
+func TestPrepareOpenAIRequestMessagesKeepsImagesForVisionModel(t *testing.T) {
+	got := prepareOpenAIRequestMessages([]ai.Message{{
+		Role:    "user",
+		Content: "请描述图片",
+		Images:  []string{"data:image/png;base64,abc"},
+	}}, "gpt-5.4", "https://sub.syngnat.top/v1")
+
+	if len(got) != 1 || len(got[0].Images) != 1 {
+		t.Fatalf("expected vision-capable model to keep images, got %#v", got)
+	}
+}
+
+func TestOpenAIProviderChatStreamRetriesWithoutToolsThenImagesOnHTTP400(t *testing.T) {
+	requestCount := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		requestCount++
+		body, err := io.ReadAll(r.Body)
+		if err != nil {
+			t.Fatalf("read request body failed: %v", err)
+		}
+		defer r.Body.Close()
+
+		bodyText := string(body)
+		if strings.Contains(bodyText, `"tools"`) {
+			http.Error(w, `{"error":{"message":"A parameter specified in the request is not valid"}}`, http.StatusBadRequest)
+			return
+		}
+		if strings.Contains(bodyText, `"image_url"`) {
+			http.Error(w, `{"error":{"message":"A parameter specified in the request is not valid"}}`, http.StatusBadRequest)
+			return
+		}
+		if !strings.Contains(bodyText, omittedImageNotice) {
+			t.Fatalf("expected retry body to explain omitted image, got %s", body)
+		}
+
+		w.Header().Set("Content-Type", "text/event-stream")
+		_, _ = w.Write([]byte(strings.Join([]string{
+			`data: {"choices":[{"delta":{"content":"pong"},"finish_reason":null}]}`,
+			``,
+			`data: [DONE]`,
+			``,
+		}, "\n")))
+	}))
+	defer server.Close()
+
+	providerInstance, err := NewOpenAIProvider(ai.ProviderConfig{
+		Type:        "openai",
+		Name:        "test-openai",
+		APIKey:      "sk-test",
+		BaseURL:     server.URL,
+		Model:       "custom-text-model",
+		MaxTokens:   64,
+		Temperature: 0.1,
+	})
+	if err != nil {
+		t.Fatalf("create provider failed: %v", err)
+	}
+
+	var chunks []ai.StreamChunk
+	err = providerInstance.ChatStream(context.Background(), ai.ChatRequest{
+		Messages: []ai.Message{{
+			Role:    "user",
+			Content: "请描述这张图片",
+			Images:  []string{"data:image/png;base64,abc"},
+		}},
+		Tools: []ai.Tool{{
+			Type: "function",
+			Function: ai.ToolFunction{
+				Name:        "inspect_ai_last_render_error",
+				Description: "test tool",
+				Parameters:  map[string]interface{}{"type": "object"},
+			},
+		}},
+	}, func(chunk ai.StreamChunk) {
+		chunks = append(chunks, chunk)
+	})
+	if err != nil {
+		t.Fatalf("expected stream fallback to succeed, got %v", err)
+	}
+	if requestCount != 3 {
+		t.Fatalf("expected 3 requests (with tools, without tools, without images), got %d", requestCount)
+	}
+	if len(chunks) < 2 {
+		t.Fatalf("expected content and done chunks, got %#v", chunks)
+	}
+	if chunks[0].Content != "pong" {
+		t.Fatalf("expected first chunk content %q, got %#v", "pong", chunks[0])
+	}
+	if !chunks[len(chunks)-1].Done {
+		t.Fatalf("expected final done chunk, got %#v", chunks[len(chunks)-1])
+	}
+}
+
 func TestBuildOpenAIMessages_ReplaysDeepSeekReasoningContentForToolCalls(t *testing.T) {
 	toolCall := testOpenAIToolCall()
 	got := buildOpenAIMessages([]ai.Message{
diff --git a/internal/ai/provider/request_log.go b/internal/ai/provider/request_log.go
new file mode 100644
index 0000000..dc4c3b1
--- /dev/null
+++ b/internal/ai/provider/request_log.go
@@ -0,0 +1,227 @@
+package provider
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/url"
+	"regexp"
+	"sort"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/logger"
+)
+
+const (
+	aiUpstreamStringPreviewLimit = 4096
+	aiUpstreamBodyPreviewLimit   = 24000
+)
+
+var (
+	secretLikeValuePatterns = []*regexp.Regexp{
+		regexp.MustCompile(`(?i)bearer\s+[a-z0-9._~+/=-]{8,}`),
+		regexp.MustCompile(`(?i)\bsk-[a-z0-9._-]{8,}`),
+		regexp.MustCompile(`(?i)\bgh[pousr]_[a-z0-9_]{8,}`),
+		regexp.MustCompile(`(?i)\b(xox[baprs]-[a-z0-9-]{8,})`),
+	}
+	dataURIValuePattern = regexp.MustCompile(`^data:([^;,]+);base64,`)
+)
+
+type aiUpstreamRequestLogHandle struct {
+	id       string
+	provider string
+	started  time.Time
+	endpoint string
+}
+
+func newAIUpstreamRequestLogID(providerName string) string {
+	normalized := strings.ToLower(strings.TrimSpace(providerName))
+	normalized = regexp.MustCompile(`[^a-z0-9]+`).ReplaceAllString(normalized, "-")
+	normalized = strings.Trim(normalized, "-")
+	if normalized == "" {
+		normalized = "provider"
+	}
+	return fmt.Sprintf("%s-%d", normalized, time.Now().UnixNano())
+}
+
+func logAIUpstreamRequestStart(providerName string, method string, endpoint string, body any) aiUpstreamRequestLogHandle {
+	handle := aiUpstreamRequestLogHandle{
+		id:       newAIUpstreamRequestLogID(providerName),
+		provider: strings.TrimSpace(providerName),
+		started:  time.Now(),
+		endpoint: sanitizeAIUpstreamURL(endpoint),
+	}
+	logger.Infof(
+		"AI 上游请求开始：requestId=%s provider=%s method=%s endpoint=%s body=%s",
+		handle.id,
+		handle.provider,
+		strings.TrimSpace(method),
+		handle.endpoint,
+		formatAIUpstreamRequestLogBody(body),
+	)
+	return handle
+}
+
+func logAIUpstreamRequestFinish(handle aiUpstreamRequestLogHandle, statusCode int, err error) {
+	duration := time.Since(handle.started).Round(time.Millisecond)
+	if err != nil {
+		logger.Warnf(
+			"AI 上游请求失败：requestId=%s provider=%s endpoint=%s duration=%s err=%v",
+			handle.id,
+			handle.provider,
+			handle.endpoint,
+			duration,
+			RedactAIUpstreamLogText(err.Error()),
+		)
+		return
+	}
+	if statusCode > 0 {
+		logger.Infof(
+			"AI 上游请求完成：requestId=%s provider=%s endpoint=%s status=%d duration=%s",
+			handle.id,
+			handle.provider,
+			handle.endpoint,
+			statusCode,
+			duration,
+		)
+		return
+	}
+	logger.Infof(
+		"AI 上游请求完成：requestId=%s provider=%s endpoint=%s duration=%s",
+		handle.id,
+		handle.provider,
+		handle.endpoint,
+		duration,
+	)
+}
+
+func formatAIUpstreamRequestLogBody(body any) string {
+	sanitized := sanitizeAIUpstreamLogValue(body)
+	bytes, err := json.Marshal(sanitized)
+	if err != nil {
+		return fmt.Sprintf(`{"marshalError":%q}`, err.Error())
+	}
+	text := string(bytes)
+	if len(text) <= aiUpstreamBodyPreviewLimit {
+		return text
+	}
+	return fmt.Sprintf("%s...[truncated %d chars]", text[:aiUpstreamBodyPreviewLimit], len(text)-aiUpstreamBodyPreviewLimit)
+}
+
+func RedactAIUpstreamLogText(value string) string {
+	return sanitizeAIUpstreamString(value)
+}
+
+func sanitizeAIUpstreamURL(rawURL string) string {
+	text := strings.TrimSpace(rawURL)
+	if text == "" {
+		return ""
+	}
+	parsed, err := url.Parse(text)
+	if err != nil {
+		return redactSecretLikeString(text)
+	}
+	query := parsed.Query()
+	for key := range query {
+		if isSensitiveFieldName(key) {
+			query.Set(key, "[REDACTED]")
+		}
+	}
+	parsed.RawQuery = query.Encode()
+	return redactSecretLikeString(parsed.String())
+}
+
+func sanitizeAIUpstreamLogValue(value any) any {
+	switch typed := value.(type) {
+	case nil:
+		return nil
+	case bool, float32, float64,
+		int, int8, int16, int32, int64,
+		uint, uint8, uint16, uint32, uint64:
+		return typed
+	case json.Number:
+		return typed
+	case json.RawMessage:
+		var decoded any
+		if err := json.Unmarshal(typed, &decoded); err == nil {
+			return sanitizeAIUpstreamLogValue(decoded)
+		}
+		return sanitizeAIUpstreamString(string(typed))
+	case []byte:
+		return sanitizeAIUpstreamString(string(typed))
+	case string:
+		return sanitizeAIUpstreamString(typed)
+	case map[string]any:
+		return sanitizeAIUpstreamMap(typed)
+	case []any:
+		result := make([]any, 0, len(typed))
+		for _, item := range typed {
+			result = append(result, sanitizeAIUpstreamLogValue(item))
+		}
+		return result
+	}
+
+	bytes, err := json.Marshal(value)
+	if err != nil {
+		return sanitizeAIUpstreamString(fmt.Sprint(value))
+	}
+	var decoded any
+	if err := json.Unmarshal(bytes, &decoded); err != nil {
+		return sanitizeAIUpstreamString(string(bytes))
+	}
+	return sanitizeAIUpstreamLogValue(decoded)
+}
+
+func sanitizeAIUpstreamMap(input map[string]any) map[string]any {
+	result := make(map[string]any, len(input))
+	keys := make([]string, 0, len(input))
+	for key := range input {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+	for _, key := range keys {
+		if isSensitiveFieldName(key) {
+			result[key] = "[REDACTED]"
+			continue
+		}
+		result[key] = sanitizeAIUpstreamLogValue(input[key])
+	}
+	return result
+}
+
+func isSensitiveFieldName(key string) bool {
+	normalized := strings.ToLower(strings.TrimSpace(key))
+	normalized = strings.NewReplacer("-", "", "_", "", ".", "").Replace(normalized)
+	if normalized == "" {
+		return false
+	}
+	if normalized == "key" || normalized == "apikey" || normalized == "xapikey" {
+		return true
+	}
+	return strings.Contains(normalized, "authorization") ||
+		strings.Contains(normalized, "token") ||
+		strings.Contains(normalized, "secret") ||
+		strings.Contains(normalized, "password") ||
+		strings.Contains(normalized, "passwd") ||
+		strings.Contains(normalized, "credential") ||
+		strings.Contains(normalized, "cookie")
+}
+
+func sanitizeAIUpstreamString(value string) string {
+	text := redactSecretLikeString(value)
+	if matches := dataURIValuePattern.FindStringSubmatch(text); len(matches) == 2 {
+		return fmt.Sprintf("data:%s;base64,[REDACTED %d chars]", matches[1], len(text))
+	}
+	if len(text) <= aiUpstreamStringPreviewLimit {
+		return text
+	}
+	return fmt.Sprintf("%s...[truncated %d chars]", text[:aiUpstreamStringPreviewLimit], len(text)-aiUpstreamStringPreviewLimit)
+}
+
+func redactSecretLikeString(value string) string {
+	result := value
+	for _, pattern := range secretLikeValuePatterns {
+		result = pattern.ReplaceAllString(result, "[REDACTED]")
+	}
+	return result
+}
diff --git a/internal/ai/provider/request_log_test.go b/internal/ai/provider/request_log_test.go
new file mode 100644
index 0000000..344273a
--- /dev/null
+++ b/internal/ai/provider/request_log_test.go
@@ -0,0 +1,96 @@
+package provider
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestFormatAIUpstreamRequestLogBodyRedactsSecretsAndKeepsUsefulRequestShape(t *testing.T) {
+	body := map[string]any{
+		"model":       "gpt-test",
+		"api_key":     "sk-body-secret-1234567890",
+		"password":    "plain-password",
+		"temperature": 0.2,
+		"messages": []any{
+			map[string]any{
+				"role":    "user",
+				"content": "请分析 orders 表，临时 token 是 Bearer abcdefghijklmnopqrstuvwxyz，另一个 key 是 sk-live-abcdefghijklmnopqrstuvwxyz",
+			},
+			map[string]any{
+				"role": "user",
+				"content": []any{
+					map[string]any{"type": "text", "text": "带图片的问题"},
+					map[string]any{
+						"type": "image_url",
+						"image_url": map[string]any{
+							"url": "data:image/png;base64," + strings.Repeat("a", 128),
+						},
+					},
+				},
+			},
+		},
+		"tools": []any{
+			map[string]any{
+				"type": "function",
+				"function": map[string]any{
+					"name":        "inspect_table_bundle",
+					"description": "读取表结构",
+				},
+			},
+		},
+	}
+
+	got := formatAIUpstreamRequestLogBody(body)
+
+	for _, want := range []string{
+		`"model":"gpt-test"`,
+		`"temperature":0.2`,
+		`"messages"`,
+		`orders`,
+		`"tools"`,
+		`inspect_table_bundle`,
+		`data:image/png;base64,[REDACTED`,
+		`"[REDACTED]"`,
+	} {
+		if !strings.Contains(got, want) {
+			t.Fatalf("expected sanitized log body to contain %q, got %s", want, got)
+		}
+	}
+
+	for _, leaked := range []string{
+		"sk-body-secret",
+		"plain-password",
+		"Bearer abcdefghijklmnopqrstuvwxyz",
+		"sk-live-abcdefghijklmnopqrstuvwxyz",
+		strings.Repeat("a", 64),
+	} {
+		if strings.Contains(got, leaked) {
+			t.Fatalf("sanitized log body leaked %q: %s", leaked, got)
+		}
+	}
+}
+
+func TestSanitizeAIUpstreamURLRedactsQuerySecrets(t *testing.T) {
+	got := sanitizeAIUpstreamURL("https://generativelanguage.googleapis.com/v1beta/models/gemini:generateContent?key=secret-key&token=secret-token&alt=sse")
+
+	if strings.Contains(got, "secret-key") || strings.Contains(got, "secret-token") {
+		t.Fatalf("expected URL secrets to be redacted, got %s", got)
+	}
+	if !strings.Contains(got, "alt=sse") {
+		t.Fatalf("expected non-sensitive query to remain, got %s", got)
+	}
+	if !strings.Contains(got, "key=%5BREDACTED%5D") || !strings.Contains(got, "token=%5BREDACTED%5D") {
+		t.Fatalf("expected redacted key and token placeholders, got %s", got)
+	}
+}
+
+func TestRedactAIUpstreamLogTextSanitizesErrorMessages(t *testing.T) {
+	got := RedactAIUpstreamLogText("upstream error: Authorization Bearer abcdefghijklmnopqrstuvwxyz and key sk-live-abcdefghijklmnopqrstuvwxyz")
+
+	if strings.Contains(got, "Bearer abcdefghijklmnopqrstuvwxyz") || strings.Contains(got, "sk-live-abcdefghijklmnopqrstuvwxyz") {
+		t.Fatalf("expected upstream error text to be redacted, got %s", got)
+	}
+	if !strings.Contains(got, "[REDACTED]") {
+		t.Fatalf("expected redacted placeholder, got %s", got)
+	}
+}
diff --git a/internal/ai/service/claude_code_mcp.go b/internal/ai/service/claude_code_mcp.go
new file mode 100644
index 0000000..dda796e
--- /dev/null
+++ b/internal/ai/service/claude_code_mcp.go
@@ -0,0 +1,722 @@
+package aiservice
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"reflect"
+	"strconv"
+	"strings"
+
+	"GoNavi-Wails/internal/ai"
+)
+
+const (
+	gonaviMCPServerID                   = "gonavi"
+	defaultCodexMCPStartupTimeoutSecond = 60
+	claudeCodeClientCommandName         = "claude"
+	codexClientCommandName              = "codex"
+)
+
+var claudeCodeConfigPathFunc = func() (string, error) {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return "", err
+	}
+	homeDir = strings.TrimSpace(homeDir)
+	if homeDir == "" {
+		return "", fmt.Errorf("无法确定用户目录")
+	}
+	return filepath.Join(homeDir, ".claude.json"), nil
+}
+
+var codexConfigPathFunc = func() (string, error) {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return "", err
+	}
+	homeDir = strings.TrimSpace(homeDir)
+	if homeDir == "" {
+		return "", fmt.Errorf("无法确定用户目录")
+	}
+	return filepath.Join(homeDir, ".codex", "config.toml"), nil
+}
+
+var localMCPExecutablePathFunc = os.Executable
+var localCLICommandPathFunc = exec.LookPath
+
+type claudeCodeMCPServerConfig struct {
+	Type    string            `json:"type"`
+	Command string            `json:"command"`
+	Args    []string          `json:"args,omitempty"`
+	Env     map[string]string `json:"env,omitempty"`
+}
+
+type codexMCPServerConfig struct {
+	Command           string
+	Args              []string
+	StartupTimeoutSec int
+}
+
+// AIGetMCPClientInstallStatuses 返回 GoNavi MCP 在常见外部客户端中的安装状态。
+func (s *Service) AIGetMCPClientInstallStatuses() []ai.MCPClientInstallStatus {
+	command, args, resolveErr := resolveCurrentLocalMCPCommand()
+	return []ai.MCPClientInstallStatus{
+		inspectClaudeCodeMCPInstallStatus(command, args, resolveErr),
+		inspectCodexMCPInstallStatus(command, args, resolveErr),
+		buildRemoteMCPClientInstallStatus("openclaw", "OpenClaw"),
+		buildRemoteMCPClientInstallStatus("hermans", "Hermans"),
+	}
+}
+
+// AIInstallClaudeCodeMCP 把 GoNavi 的 MCP server 写入 Claude Code 用户级 MCP 配置。
+func (s *Service) AIInstallClaudeCodeMCP() (ai.MCPClientInstallResult, error) {
+	configPath, err := claudeCodeConfigPathFunc()
+	if err != nil {
+		return ai.MCPClientInstallResult{}, fmt.Errorf("定位 Claude Code 配置失败: %w", err)
+	}
+
+	executablePath, err := localMCPExecutablePathFunc()
+	if err != nil {
+		return ai.MCPClientInstallResult{}, fmt.Errorf("定位当前 GoNavi 可执行文件失败: %w", err)
+	}
+
+	command, args, err := resolveLocalMCPCommand(executablePath)
+	if err != nil {
+		return ai.MCPClientInstallResult{}, err
+	}
+
+	serverConfig := claudeCodeMCPServerConfig{
+		Type:    "stdio",
+		Command: command,
+		Args:    append([]string(nil), args...),
+		Env:     map[string]string{},
+	}
+	if err := upsertClaudeCodeMCPServerConfig(configPath, gonaviMCPServerID, serverConfig); err != nil {
+		return ai.MCPClientInstallResult{}, err
+	}
+
+	return ai.MCPClientInstallResult{
+		Success:    true,
+		Client:     "claude-code",
+		Message:    "已写入 Claude Code 用户级 MCP 配置，重启 Claude CLI 后可在 /mcp 的 User MCPs 中看到 GoNavi。",
+		ConfigPath: configPath,
+		Command:    command,
+		Args:       append([]string(nil), args...),
+	}, nil
+}
+
+// AIInstallCodexMCP 把 GoNavi 的 MCP server 写入 Codex 用户级 MCP 配置。
+func (s *Service) AIInstallCodexMCP() (ai.MCPClientInstallResult, error) {
+	configPath, err := codexConfigPathFunc()
+	if err != nil {
+		return ai.MCPClientInstallResult{}, fmt.Errorf("定位 Codex 配置失败: %w", err)
+	}
+
+	executablePath, err := localMCPExecutablePathFunc()
+	if err != nil {
+		return ai.MCPClientInstallResult{}, fmt.Errorf("定位当前 GoNavi 可执行文件失败: %w", err)
+	}
+
+	command, args, err := resolveLocalMCPCommand(executablePath)
+	if err != nil {
+		return ai.MCPClientInstallResult{}, err
+	}
+
+	serverConfig := codexMCPServerConfig{
+		Command:           command,
+		Args:              append([]string(nil), args...),
+		StartupTimeoutSec: defaultCodexMCPStartupTimeoutSecond,
+	}
+	if err := upsertCodexMCPServerConfig(configPath, gonaviMCPServerID, serverConfig); err != nil {
+		return ai.MCPClientInstallResult{}, err
+	}
+
+	return ai.MCPClientInstallResult{
+		Success:    true,
+		Client:     "codex",
+		Message:    "已写入 Codex 用户级 MCP 配置，重启 Codex CLI 或桌面端后可看到 GoNavi。",
+		ConfigPath: configPath,
+		Command:    command,
+		Args:       append([]string(nil), args...),
+	}, nil
+}
+
+func resolveCurrentLocalMCPCommand() (string, []string, error) {
+	executablePath, err := localMCPExecutablePathFunc()
+	if err != nil {
+		return "", nil, fmt.Errorf("定位当前 GoNavi 可执行文件失败: %w", err)
+	}
+	command, args, err := resolveLocalMCPCommand(executablePath)
+	if err != nil {
+		return "", nil, err
+	}
+	return command, args, nil
+}
+
+func resolveLocalMCPCommand(executablePath string) (string, []string, error) {
+	executablePath = strings.TrimSpace(executablePath)
+	if executablePath == "" {
+		return "", nil, fmt.Errorf("当前 GoNavi 可执行文件路径为空")
+	}
+
+	cleaned := filepath.Clean(executablePath)
+	baseName := strings.ToLower(strings.TrimSpace(filepath.Base(cleaned)))
+	switch baseName {
+	case "gonavi-mcp-server", "gonavi-mcp-server.exe":
+		return cleaned, []string{}, nil
+	default:
+		return cleaned, []string{"mcp-server"}, nil
+	}
+}
+
+func detectLocalCLICommand(commandName string) (bool, string) {
+	commandName = strings.TrimSpace(commandName)
+	if commandName == "" {
+		return false, ""
+	}
+	resolvedPath, err := localCLICommandPathFunc(commandName)
+	if err != nil {
+		return false, ""
+	}
+	resolvedPath = strings.TrimSpace(resolvedPath)
+	if resolvedPath == "" {
+		return false, ""
+	}
+	return true, filepath.Clean(resolvedPath)
+}
+
+func inspectClaudeCodeMCPInstallStatus(expectedCommand string, expectedArgs []string, expectedErr error) ai.MCPClientInstallStatus {
+	configPath, pathErr := claudeCodeConfigPathFunc()
+	clientDetected, clientPath := detectLocalCLICommand(claudeCodeClientCommandName)
+	status := ai.MCPClientInstallStatus{
+		Client:         "claude-code",
+		DisplayName:    "Claude Code",
+		InstallMode:    "auto",
+		ClientDetected: clientDetected,
+		ClientCommand:  claudeCodeClientCommandName,
+		ClientPath:     clientPath,
+		ConfigPath:     strings.TrimSpace(configPath),
+		Message:        "未检测到 Claude Code 用户级 GoNavi MCP 配置",
+	}
+	if pathErr != nil {
+		status.Message = fmt.Sprintf("定位 Claude Code 配置失败: %v", pathErr)
+		return status
+	}
+
+	serverConfig, found, err := readClaudeCodeMCPServerConfig(configPath, gonaviMCPServerID)
+	if err != nil {
+		status.Installed = found
+		status.Message = err.Error()
+		if found {
+			status.Command = strings.TrimSpace(serverConfig.Command)
+			status.Args = append([]string(nil), serverConfig.Args...)
+		}
+		return status
+	}
+	if !found {
+		return status
+	}
+
+	status.Installed = true
+	status.Command = strings.TrimSpace(serverConfig.Command)
+	status.Args = append([]string(nil), serverConfig.Args...)
+	if expectedErr != nil {
+		status.Message = fmt.Sprintf("已检测到 Claude Code 中的 GoNavi MCP 记录，但当前 GoNavi 安装路径校验失败：%v", expectedErr)
+		return status
+	}
+
+	status.MatchesCurrent = strings.EqualFold(strings.TrimSpace(serverConfig.Type), "stdio") &&
+		sameMCPCommand(serverConfig.Command, serverConfig.Args, expectedCommand, expectedArgs)
+	if status.MatchesCurrent {
+		status.Message = "已检测到 Claude Code 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致"
+		return status
+	}
+
+	status.Message = "已检测到 Claude Code 中的 GoNavi MCP 记录，但与当前 GoNavi 安装路径不一致，建议更新"
+	return status
+}
+
+func inspectCodexMCPInstallStatus(expectedCommand string, expectedArgs []string, expectedErr error) ai.MCPClientInstallStatus {
+	configPath, pathErr := codexConfigPathFunc()
+	clientDetected, clientPath := detectLocalCLICommand(codexClientCommandName)
+	status := ai.MCPClientInstallStatus{
+		Client:         "codex",
+		DisplayName:    "Codex",
+		InstallMode:    "auto",
+		ClientDetected: clientDetected,
+		ClientCommand:  codexClientCommandName,
+		ClientPath:     clientPath,
+		ConfigPath:     strings.TrimSpace(configPath),
+		Message:        "未检测到 Codex 用户级 GoNavi MCP 配置",
+	}
+	if pathErr != nil {
+		status.Message = fmt.Sprintf("定位 Codex 配置失败: %v", pathErr)
+		return status
+	}
+
+	serverConfig, found, err := readCodexMCPServerConfig(configPath, gonaviMCPServerID)
+	if err != nil {
+		status.Installed = found
+		status.Message = err.Error()
+		if found {
+			status.Command = strings.TrimSpace(serverConfig.Command)
+			status.Args = append([]string(nil), serverConfig.Args...)
+		}
+		return status
+	}
+	if !found {
+		return status
+	}
+
+	status.Installed = true
+	status.Command = strings.TrimSpace(serverConfig.Command)
+	status.Args = append([]string(nil), serverConfig.Args...)
+	if expectedErr != nil {
+		status.Message = fmt.Sprintf("已检测到 Codex 中的 GoNavi MCP 记录，但当前 GoNavi 安装路径校验失败：%v", expectedErr)
+		return status
+	}
+
+	status.MatchesCurrent = sameMCPCommand(serverConfig.Command, serverConfig.Args, expectedCommand, expectedArgs) &&
+		(serverConfig.StartupTimeoutSec == 0 || serverConfig.StartupTimeoutSec == defaultCodexMCPStartupTimeoutSecond)
+	if status.MatchesCurrent {
+		status.Message = "已检测到 Codex 用户级 GoNavi MCP 配置，且与当前 GoNavi 安装路径一致"
+		return status
+	}
+
+	status.Message = "已检测到 Codex 中的 GoNavi MCP 记录，但与当前 GoNavi 安装路径不一致，建议更新"
+	return status
+}
+
+func buildRemoteMCPClientInstallStatus(client string, displayName string) ai.MCPClientInstallStatus {
+	return ai.MCPClientInstallStatus{
+		Client:         client,
+		DisplayName:    displayName,
+		InstallMode:    "remote",
+		ClientDetected: false,
+		Message:        fmt.Sprintf("%s 通常部署在云端或远端环境；请通过远程 MCP 桥接接入 Windows GoNavi，数据库密码仍保存在 GoNavi 本机。", displayName),
+	}
+}
+
+func readClaudeCodeMCPServerConfig(configPath string, serverID string) (claudeCodeMCPServerConfig, bool, error) {
+	root, err := readClaudeCodeConfig(configPath)
+	if err != nil {
+		return claudeCodeMCPServerConfig{}, false, err
+	}
+
+	rawServers, exists := root["mcpServers"]
+	if !exists || rawServers == nil {
+		return claudeCodeMCPServerConfig{}, false, nil
+	}
+	mcpServers, ok := rawServers.(map[string]any)
+	if !ok {
+		return claudeCodeMCPServerConfig{}, false, fmt.Errorf("Claude Code 配置格式异常：mcpServers 不是对象")
+	}
+
+	rawServer, exists := mcpServers[strings.TrimSpace(serverID)]
+	if !exists || rawServer == nil {
+		return claudeCodeMCPServerConfig{}, false, nil
+	}
+	serverMap, ok := rawServer.(map[string]any)
+	if !ok {
+		return claudeCodeMCPServerConfig{}, true, fmt.Errorf("Claude Code 配置格式异常：mcpServers.%s 不是对象", strings.TrimSpace(serverID))
+	}
+
+	args, err := decodeJSONLikeStringSlice(serverMap["args"])
+	if err != nil {
+		return claudeCodeMCPServerConfig{}, true, fmt.Errorf("Claude Code 配置格式异常：mcpServers.%s.args 不是字符串数组", strings.TrimSpace(serverID))
+	}
+	return claudeCodeMCPServerConfig{
+		Type:    strings.TrimSpace(anyString(serverMap["type"])),
+		Command: strings.TrimSpace(anyString(serverMap["command"])),
+		Args:    args,
+	}, true, nil
+}
+
+func upsertClaudeCodeMCPServerConfig(configPath string, serverID string, serverConfig claudeCodeMCPServerConfig) error {
+	root, err := readClaudeCodeConfig(configPath)
+	if err != nil {
+		return err
+	}
+
+	mcpServers, err := ensureJSONMap(root, "mcpServers")
+	if err != nil {
+		return err
+	}
+
+	mcpServers[strings.TrimSpace(serverID)] = map[string]any{
+		"type":    serverConfig.Type,
+		"command": serverConfig.Command,
+		"args":    append([]string(nil), serverConfig.Args...),
+		"env":     cloneStringMap(serverConfig.Env),
+	}
+	root["mcpServers"] = mcpServers
+
+	data, err := json.MarshalIndent(root, "", "  ")
+	if err != nil {
+		return fmt.Errorf("序列化 Claude Code 配置失败: %w", err)
+	}
+
+	if err := os.MkdirAll(filepath.Dir(configPath), 0o755); err != nil {
+		return fmt.Errorf("创建 Claude Code 配置目录失败: %w", err)
+	}
+	if err := os.WriteFile(configPath, append(data, '\n'), 0o644); err != nil {
+		return fmt.Errorf("写入 Claude Code 配置失败: %w", err)
+	}
+	return nil
+}
+
+func readClaudeCodeConfig(configPath string) (map[string]any, error) {
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return map[string]any{}, nil
+		}
+		return nil, fmt.Errorf("读取 Claude Code 配置失败: %w", err)
+	}
+
+	if strings.TrimSpace(string(data)) == "" {
+		return map[string]any{}, nil
+	}
+
+	var root map[string]any
+	if err := json.Unmarshal(data, &root); err != nil {
+		return nil, fmt.Errorf("解析 Claude Code 配置失败: %w", err)
+	}
+	if root == nil {
+		return map[string]any{}, nil
+	}
+	return root, nil
+}
+
+func ensureJSONMap(root map[string]any, key string) (map[string]any, error) {
+	if root == nil {
+		return nil, fmt.Errorf("JSON 根对象不能为空")
+	}
+
+	value, exists := root[key]
+	if !exists || value == nil {
+		result := map[string]any{}
+		root[key] = result
+		return result, nil
+	}
+
+	typed, ok := value.(map[string]any)
+	if !ok {
+		return nil, fmt.Errorf("Claude Code 配置格式异常：%s 不是对象", key)
+	}
+	return typed, nil
+}
+
+func readCodexMCPServerConfig(configPath string, serverID string) (codexMCPServerConfig, bool, error) {
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return codexMCPServerConfig{}, false, nil
+		}
+		return codexMCPServerConfig{}, false, fmt.Errorf("读取 Codex 配置失败: %w", err)
+	}
+	return parseCodexMCPServerConfig(string(data), serverID)
+}
+
+func upsertCodexMCPServerConfig(configPath string, serverID string, serverConfig codexMCPServerConfig) error {
+	data, err := os.ReadFile(configPath)
+	if err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("读取 Codex 配置失败: %w", err)
+	}
+
+	updated := replaceOrAppendCodexMCPServerBlock(string(data), strings.TrimSpace(serverID), renderCodexMCPServerBlock(serverID, serverConfig))
+	if err := os.MkdirAll(filepath.Dir(configPath), 0o755); err != nil {
+		return fmt.Errorf("创建 Codex 配置目录失败: %w", err)
+	}
+	if err := os.WriteFile(configPath, []byte(updated), 0o644); err != nil {
+		return fmt.Errorf("写入 Codex 配置失败: %w", err)
+	}
+	return nil
+}
+
+func renderCodexMCPServerBlock(serverID string, serverConfig codexMCPServerConfig) string {
+	trimmedID := strings.TrimSpace(serverID)
+	if trimmedID == "" {
+		trimmedID = gonaviMCPServerID
+	}
+
+	lines := []string{
+		fmt.Sprintf("[mcp_servers.%s]", trimmedID),
+		fmt.Sprintf("command = %s", tomlString(serverConfig.Command)),
+		fmt.Sprintf("args = [%s]", strings.Join(renderTomlStringArray(serverConfig.Args), ", ")),
+	}
+	if serverConfig.StartupTimeoutSec > 0 {
+		lines = append(lines, fmt.Sprintf("startup_timeout_sec = %d", serverConfig.StartupTimeoutSec))
+	}
+	return strings.Join(lines, "\n") + "\n"
+}
+
+func parseCodexMCPServerConfig(content string, serverID string) (codexMCPServerConfig, bool, error) {
+	lines := strings.Split(strings.ReplaceAll(content, "\r\n", "\n"), "\n")
+	mainHeader := fmt.Sprintf("[mcp_servers.%s]", strings.TrimSpace(serverID))
+	result := codexMCPServerConfig{}
+	found := false
+	inside := false
+
+	for _, line := range lines {
+		trimmed := strings.TrimSpace(line)
+		if !inside {
+			if trimmed == mainHeader {
+				inside = true
+				found = true
+			}
+			continue
+		}
+		if isTOMLHeaderLine(trimmed) {
+			break
+		}
+		if trimmed == "" || strings.HasPrefix(trimmed, "#") {
+			continue
+		}
+
+		key, value, ok := splitTOMLAssignment(trimmed)
+		if !ok {
+			continue
+		}
+		switch key {
+		case "command":
+			parsed, err := parseTOMLString(value)
+			if err != nil {
+				return result, true, fmt.Errorf("Codex 配置格式异常：mcp_servers.%s.command 解析失败", strings.TrimSpace(serverID))
+			}
+			result.Command = parsed
+		case "args":
+			parsed, err := parseTOMLStringArray(value)
+			if err != nil {
+				return result, true, fmt.Errorf("Codex 配置格式异常：mcp_servers.%s.args 解析失败", strings.TrimSpace(serverID))
+			}
+			result.Args = parsed
+		case "startup_timeout_sec":
+			parsed, err := strconv.Atoi(strings.TrimSpace(value))
+			if err != nil {
+				return result, true, fmt.Errorf("Codex 配置格式异常：mcp_servers.%s.startup_timeout_sec 解析失败", strings.TrimSpace(serverID))
+			}
+			result.StartupTimeoutSec = parsed
+		}
+	}
+
+	return result, found, nil
+}
+
+func replaceOrAppendCodexMCPServerBlock(content string, serverID string, block string) string {
+	lines := strings.Split(strings.ReplaceAll(content, "\r\n", "\n"), "\n")
+	mainHeader := fmt.Sprintf("[mcp_servers.%s]", serverID)
+	nestedPrefix := fmt.Sprintf("[mcp_servers.%s.", serverID)
+
+	start, end := -1, -1
+	for index, line := range lines {
+		trimmed := strings.TrimSpace(line)
+		if start == -1 {
+			if trimmed == mainHeader || strings.HasPrefix(trimmed, nestedPrefix) {
+				start = index
+			}
+			continue
+		}
+		if isTOMLHeaderLine(trimmed) && trimmed != mainHeader && !strings.HasPrefix(trimmed, nestedPrefix) {
+			end = index
+			break
+		}
+	}
+	if start != -1 && end == -1 {
+		end = len(lines)
+	}
+
+	rendered := strings.TrimRight(block, "\n")
+	if start == -1 {
+		base := strings.TrimSpace(strings.Join(lines, "\n"))
+		if base == "" {
+			return rendered + "\n"
+		}
+		return strings.TrimRight(strings.Join(lines, "\n"), "\n") + "\n\n" + rendered + "\n"
+	}
+
+	before := strings.TrimRight(strings.Join(lines[:start], "\n"), "\n")
+	after := strings.TrimLeft(strings.Join(lines[end:], "\n"), "\n")
+	switch {
+	case before == "" && after == "":
+		return rendered + "\n"
+	case before == "":
+		return rendered + "\n\n" + after
+	case after == "":
+		return before + "\n\n" + rendered + "\n"
+	default:
+		return before + "\n\n" + rendered + "\n\n" + after
+	}
+}
+
+func renderTomlStringArray(values []string) []string {
+	rendered := make([]string, 0, len(values))
+	for _, value := range values {
+		rendered = append(rendered, tomlString(value))
+	}
+	return rendered
+}
+
+func tomlString(value string) string {
+	if !strings.Contains(value, "'") && !strings.Contains(value, "\n") && !strings.Contains(value, "\r") {
+		return "'" + value + "'"
+	}
+	return strconv.Quote(value)
+}
+
+func splitTOMLAssignment(line string) (string, string, bool) {
+	index := strings.Index(line, "=")
+	if index <= 0 {
+		return "", "", false
+	}
+	key := strings.TrimSpace(line[:index])
+	value := strings.TrimSpace(line[index+1:])
+	if key == "" {
+		return "", "", false
+	}
+	return key, value, true
+}
+
+func parseTOMLString(value string) (string, error) {
+	value = strings.TrimSpace(value)
+	if len(value) < 2 {
+		return "", fmt.Errorf("字符串格式非法")
+	}
+	switch value[0] {
+	case '\'':
+		if value[len(value)-1] != '\'' {
+			return "", fmt.Errorf("单引号字符串未闭合")
+		}
+		return value[1 : len(value)-1], nil
+	case '"':
+		parsed, err := strconv.Unquote(value)
+		if err != nil {
+			return "", err
+		}
+		return parsed, nil
+	default:
+		return "", fmt.Errorf("不是字符串")
+	}
+}
+
+func parseTOMLStringArray(value string) ([]string, error) {
+	value = strings.TrimSpace(value)
+	if value == "" {
+		return []string{}, nil
+	}
+	if !strings.HasPrefix(value, "[") || !strings.HasSuffix(value, "]") {
+		return nil, fmt.Errorf("不是数组")
+	}
+
+	inner := strings.TrimSpace(value[1 : len(value)-1])
+	if inner == "" {
+		return []string{}, nil
+	}
+
+	result := make([]string, 0, 4)
+	for inner != "" {
+		item, rest, err := consumeTOMLQuotedString(inner)
+		if err != nil {
+			return nil, err
+		}
+		result = append(result, item)
+		inner = strings.TrimSpace(rest)
+		if inner == "" {
+			break
+		}
+		if !strings.HasPrefix(inner, ",") {
+			return nil, fmt.Errorf("数组分隔符非法")
+		}
+		inner = strings.TrimSpace(inner[1:])
+	}
+	return result, nil
+}
+
+func consumeTOMLQuotedString(value string) (string, string, error) {
+	value = strings.TrimLeft(value, " \t")
+	if value == "" {
+		return "", "", fmt.Errorf("字符串为空")
+	}
+	switch value[0] {
+	case '\'':
+		end := strings.IndexByte(value[1:], '\'')
+		if end < 0 {
+			return "", "", fmt.Errorf("单引号字符串未闭合")
+		}
+		end++
+		return value[1:end], value[end+1:], nil
+	case '"':
+		escaped := false
+		for index := 1; index < len(value); index++ {
+			ch := value[index]
+			if escaped {
+				escaped = false
+				continue
+			}
+			if ch == '\\' {
+				escaped = true
+				continue
+			}
+			if ch == '"' {
+				parsed, err := strconv.Unquote(value[:index+1])
+				if err != nil {
+					return "", "", err
+				}
+				return parsed, value[index+1:], nil
+			}
+		}
+		return "", "", fmt.Errorf("双引号字符串未闭合")
+	default:
+		return "", "", fmt.Errorf("不是字符串")
+	}
+}
+
+func decodeJSONLikeStringSlice(value any) ([]string, error) {
+	switch typed := value.(type) {
+	case nil:
+		return []string{}, nil
+	case []string:
+		return append([]string(nil), typed...), nil
+	case []any:
+		result := make([]string, 0, len(typed))
+		for _, item := range typed {
+			str, ok := item.(string)
+			if !ok {
+				return nil, fmt.Errorf("数组元素不是字符串")
+			}
+			result = append(result, str)
+		}
+		return result, nil
+	default:
+		return nil, fmt.Errorf("不是字符串数组")
+	}
+}
+
+func anyString(value any) string {
+	text, _ := value.(string)
+	return text
+}
+
+func sameMCPCommand(actualCommand string, actualArgs []string, expectedCommand string, expectedArgs []string) bool {
+	return strings.TrimSpace(actualCommand) == strings.TrimSpace(expectedCommand) &&
+		reflect.DeepEqual(normalizeStringSlice(actualArgs), normalizeStringSlice(expectedArgs))
+}
+
+func normalizeStringSlice(values []string) []string {
+	if len(values) == 0 {
+		return []string{}
+	}
+	result := make([]string, 0, len(values))
+	for _, value := range values {
+		result = append(result, strings.TrimSpace(value))
+	}
+	return result
+}
+
+func isTOMLHeaderLine(line string) bool {
+	line = strings.TrimSpace(line)
+	return strings.HasPrefix(line, "[") && strings.HasSuffix(line, "]")
+}
diff --git a/internal/ai/service/claude_code_mcp_test.go b/internal/ai/service/claude_code_mcp_test.go
new file mode 100644
index 0000000..be28b44
--- /dev/null
+++ b/internal/ai/service/claude_code_mcp_test.go
@@ -0,0 +1,345 @@
+package aiservice
+
+import (
+	"encoding/json"
+	"errors"
+	"os"
+	"path/filepath"
+	"reflect"
+	"strings"
+	"testing"
+)
+
+func TestResolveLocalMCPCommandUsesMainBinaryWithArgument(t *testing.T) {
+	command, args, err := resolveLocalMCPCommand(`C:\Program Files\GoNavi\GoNavi.exe`)
+	if err != nil {
+		t.Fatalf("resolveLocalMCPCommand returned error: %v", err)
+	}
+	if command != `C:\Program Files\GoNavi\GoNavi.exe` {
+		t.Fatalf("expected command to keep main binary path, got %q", command)
+	}
+	if !reflect.DeepEqual(args, []string{"mcp-server"}) {
+		t.Fatalf("expected main binary args %#v, got %#v", []string{"mcp-server"}, args)
+	}
+}
+
+func TestResolveLocalMCPCommandKeepsDedicatedServerBinary(t *testing.T) {
+	command, args, err := resolveLocalMCPCommand(`D:\Work\CodeRepos\GoNavi\bin\gonavi-mcp-server.exe`)
+	if err != nil {
+		t.Fatalf("resolveLocalMCPCommand returned error: %v", err)
+	}
+	if command != `D:\Work\CodeRepos\GoNavi\bin\gonavi-mcp-server.exe` {
+		t.Fatalf("expected dedicated server path to be reused, got %q", command)
+	}
+	if len(args) != 0 {
+		t.Fatalf("expected dedicated server args to be empty, got %#v", args)
+	}
+}
+
+func TestReadClaudeCodeMCPServerConfigReadsExistingInstall(t *testing.T) {
+	tempDir := t.TempDir()
+	configPath := filepath.Join(tempDir, ".claude.json")
+	initial := map[string]any{
+		"mcpServers": map[string]any{
+			gonaviMCPServerID: map[string]any{
+				"type":    "stdio",
+				"command": `C:\Program Files\GoNavi\GoNavi.exe`,
+				"args":    []string{"mcp-server"},
+			},
+		},
+	}
+	data, err := json.MarshalIndent(initial, "", "  ")
+	if err != nil {
+		t.Fatalf("MarshalIndent returned error: %v", err)
+	}
+	if err := os.WriteFile(configPath, append(data, '\n'), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	cfg, found, err := readClaudeCodeMCPServerConfig(configPath, gonaviMCPServerID)
+	if err != nil {
+		t.Fatalf("readClaudeCodeMCPServerConfig returned error: %v", err)
+	}
+	if !found {
+		t.Fatal("expected gonavi install to be detected")
+	}
+	if cfg.Command != `C:\Program Files\GoNavi\GoNavi.exe` {
+		t.Fatalf("unexpected command: %q", cfg.Command)
+	}
+	if !reflect.DeepEqual(cfg.Args, []string{"mcp-server"}) {
+		t.Fatalf("unexpected args: %#v", cfg.Args)
+	}
+}
+
+func TestUpsertClaudeCodeMCPServerConfigCreatesAndMergesUserConfig(t *testing.T) {
+	tempDir := t.TempDir()
+	configPath := filepath.Join(tempDir, ".claude.json")
+	initial := map[string]any{
+		"theme": "dark-daltonized",
+		"mcpServers": map[string]any{
+			"memory": map[string]any{
+				"type":    "stdio",
+				"command": "cmd",
+			},
+		},
+	}
+	data, err := json.MarshalIndent(initial, "", "  ")
+	if err != nil {
+		t.Fatalf("MarshalIndent returned error: %v", err)
+	}
+	if err := os.WriteFile(configPath, append(data, '\n'), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	err = upsertClaudeCodeMCPServerConfig(configPath, gonaviMCPServerID, claudeCodeMCPServerConfig{
+		Type:    "stdio",
+		Command: `C:\Program Files\GoNavi\GoNavi.exe`,
+		Args:    []string{"mcp-server"},
+		Env:     map[string]string{},
+	})
+	if err != nil {
+		t.Fatalf("upsertClaudeCodeMCPServerConfig returned error: %v", err)
+	}
+
+	updated, err := os.ReadFile(configPath)
+	if err != nil {
+		t.Fatalf("ReadFile returned error: %v", err)
+	}
+
+	var root map[string]any
+	if err := json.Unmarshal(updated, &root); err != nil {
+		t.Fatalf("Unmarshal returned error: %v", err)
+	}
+	if got := strings.TrimSpace(root["theme"].(string)); got != "dark-daltonized" {
+		t.Fatalf("expected theme to be preserved, got %q", got)
+	}
+
+	mcpServers, ok := root["mcpServers"].(map[string]any)
+	if !ok {
+		t.Fatalf("expected mcpServers object, got %#v", root["mcpServers"])
+	}
+	if _, ok := mcpServers["memory"]; !ok {
+		t.Fatalf("expected existing memory server to be preserved, got %#v", mcpServers)
+	}
+
+	gonavi, ok := mcpServers[gonaviMCPServerID].(map[string]any)
+	if !ok {
+		t.Fatalf("expected gonavi server object, got %#v", mcpServers[gonaviMCPServerID])
+	}
+	if got := strings.TrimSpace(gonavi["command"].(string)); got != `C:\Program Files\GoNavi\GoNavi.exe` {
+		t.Fatalf("expected gonavi command to be written, got %q", got)
+	}
+	args, ok := gonavi["args"].([]any)
+	if !ok || len(args) != 1 || strings.TrimSpace(args[0].(string)) != "mcp-server" {
+		t.Fatalf("expected gonavi args to contain mcp-server, got %#v", gonavi["args"])
+	}
+}
+
+func TestUpsertClaudeCodeMCPServerConfigRejectsInvalidMCPServersShape(t *testing.T) {
+	tempDir := t.TempDir()
+	configPath := filepath.Join(tempDir, ".claude.json")
+	if err := os.WriteFile(configPath, []byte("{\"mcpServers\":[]}"), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	err := upsertClaudeCodeMCPServerConfig(configPath, gonaviMCPServerID, claudeCodeMCPServerConfig{
+		Type:    "stdio",
+		Command: "GoNavi.exe",
+	})
+	if err == nil {
+		t.Fatal("expected invalid mcpServers shape to return error")
+	}
+	if !strings.Contains(err.Error(), "mcpServers 不是对象") {
+		t.Fatalf("expected invalid shape error, got %v", err)
+	}
+}
+
+func TestParseCodexMCPServerConfigDetectsExistingInstall(t *testing.T) {
+	content := strings.Join([]string{
+		`model = "gpt-5.4"`,
+		``,
+		`[mcp_servers.gonavi]`,
+		`command = 'C:\Program Files\GoNavi\GoNavi.exe'`,
+		`args = ['mcp-server']`,
+		`startup_timeout_sec = 60`,
+		``,
+		`[projects.'D:\Work\CodeRepos\GoNavi']`,
+		`trust_level = "trusted"`,
+		``,
+	}, "\n")
+
+	cfg, found, err := parseCodexMCPServerConfig(content, gonaviMCPServerID)
+	if err != nil {
+		t.Fatalf("parseCodexMCPServerConfig returned error: %v", err)
+	}
+	if !found {
+		t.Fatal("expected gonavi install to be detected")
+	}
+	if cfg.Command != `C:\Program Files\GoNavi\GoNavi.exe` {
+		t.Fatalf("unexpected command: %q", cfg.Command)
+	}
+	if !reflect.DeepEqual(cfg.Args, []string{"mcp-server"}) {
+		t.Fatalf("unexpected args: %#v", cfg.Args)
+	}
+	if cfg.StartupTimeoutSec != 60 {
+		t.Fatalf("unexpected startup timeout: %d", cfg.StartupTimeoutSec)
+	}
+}
+
+func TestUpsertCodexMCPServerConfigCreatesAndMergesConfig(t *testing.T) {
+	tempDir := t.TempDir()
+	configPath := filepath.Join(tempDir, "config.toml")
+	initial := strings.Join([]string{
+		`model = "gpt-5.4"`,
+		``,
+		`[mcp_servers.memory]`,
+		`command = "cmd"`,
+		`args = ["/c", "npx"]`,
+		``,
+	}, "\n")
+	if err := os.WriteFile(configPath, []byte(initial), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	err := upsertCodexMCPServerConfig(configPath, gonaviMCPServerID, codexMCPServerConfig{
+		Command:           `C:\Program Files\GoNavi\GoNavi.exe`,
+		Args:              []string{"mcp-server"},
+		StartupTimeoutSec: defaultCodexMCPStartupTimeoutSecond,
+	})
+	if err != nil {
+		t.Fatalf("upsertCodexMCPServerConfig returned error: %v", err)
+	}
+
+	updated, err := os.ReadFile(configPath)
+	if err != nil {
+		t.Fatalf("ReadFile returned error: %v", err)
+	}
+	text := string(updated)
+	if !strings.Contains(text, `[mcp_servers.memory]`) {
+		t.Fatalf("expected memory server to be preserved, got %s", text)
+	}
+	if !strings.Contains(text, `[mcp_servers.gonavi]`) {
+		t.Fatalf("expected gonavi section to be created, got %s", text)
+	}
+	if !strings.Contains(text, `command = 'C:\Program Files\GoNavi\GoNavi.exe'`) {
+		t.Fatalf("expected gonavi command to be written, got %s", text)
+	}
+	if !strings.Contains(text, `args = ['mcp-server']`) {
+		t.Fatalf("expected gonavi args to be written, got %s", text)
+	}
+	if !strings.Contains(text, `startup_timeout_sec = 60`) {
+		t.Fatalf("expected startup timeout to be written, got %s", text)
+	}
+}
+
+func TestUpsertCodexMCPServerConfigReplacesExistingBlockAndNestedSections(t *testing.T) {
+	tempDir := t.TempDir()
+	configPath := filepath.Join(tempDir, "config.toml")
+	initial := strings.Join([]string{
+		`model = "gpt-5.4"`,
+		``,
+		`[mcp_servers.gonavi]`,
+		`command = 'old.exe'`,
+		`args = ['old']`,
+		`startup_timeout_sec = 15`,
+		``,
+		`[mcp_servers.gonavi.env]`,
+		`FOO = "bar"`,
+		``,
+		`[projects.'D:\Work\CodeRepos\GoNavi']`,
+		`trust_level = "trusted"`,
+		``,
+	}, "\n")
+	if err := os.WriteFile(configPath, []byte(initial), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	err := upsertCodexMCPServerConfig(configPath, gonaviMCPServerID, codexMCPServerConfig{
+		Command:           `C:\Program Files\GoNavi\GoNavi.exe`,
+		Args:              []string{"mcp-server"},
+		StartupTimeoutSec: defaultCodexMCPStartupTimeoutSecond,
+	})
+	if err != nil {
+		t.Fatalf("upsertCodexMCPServerConfig returned error: %v", err)
+	}
+
+	updated, err := os.ReadFile(configPath)
+	if err != nil {
+		t.Fatalf("ReadFile returned error: %v", err)
+	}
+	text := string(updated)
+	if strings.Contains(text, `command = 'old.exe'`) || strings.Contains(text, `[mcp_servers.gonavi.env]`) {
+		t.Fatalf("expected old gonavi block to be replaced, got %s", text)
+	}
+	if !strings.Contains(text, `[projects.'D:\Work\CodeRepos\GoNavi']`) {
+		t.Fatalf("expected unrelated project config to be preserved, got %s", text)
+	}
+}
+
+func TestInspectClaudeCodeMCPInstallStatusIncludesLocalCLIAvailability(t *testing.T) {
+	originalConfigPathFunc := claudeCodeConfigPathFunc
+	originalCLIPathFunc := localCLICommandPathFunc
+	t.Cleanup(func() {
+		claudeCodeConfigPathFunc = originalConfigPathFunc
+		localCLICommandPathFunc = originalCLIPathFunc
+	})
+
+	tempDir := t.TempDir()
+	claudeCodeConfigPathFunc = func() (string, error) {
+		return filepath.Join(tempDir, ".claude.json"), nil
+	}
+	localCLICommandPathFunc = func(file string) (string, error) {
+		if file != claudeCodeClientCommandName {
+			t.Fatalf("expected lookup for %q, got %q", claudeCodeClientCommandName, file)
+		}
+		return `C:\Users\mock\AppData\Roaming\npm\claude.CMD`, nil
+	}
+
+	status := inspectClaudeCodeMCPInstallStatus(`C:\Program Files\GoNavi\GoNavi.exe`, []string{"mcp-server"}, nil)
+	if !status.ClientDetected {
+		t.Fatal("expected Claude Code command detection to be true")
+	}
+	if status.ClientCommand != claudeCodeClientCommandName {
+		t.Fatalf("expected client command %q, got %q", claudeCodeClientCommandName, status.ClientCommand)
+	}
+	if status.ClientPath != `C:\Users\mock\AppData\Roaming\npm\claude.CMD` {
+		t.Fatalf("unexpected client path: %q", status.ClientPath)
+	}
+	if status.Installed {
+		t.Fatal("expected MCP config to remain uninstalled when config file is absent")
+	}
+}
+
+func TestInspectCodexMCPInstallStatusKeepsMissingCLISignalSeparateFromConfigState(t *testing.T) {
+	originalConfigPathFunc := codexConfigPathFunc
+	originalCLIPathFunc := localCLICommandPathFunc
+	t.Cleanup(func() {
+		codexConfigPathFunc = originalConfigPathFunc
+		localCLICommandPathFunc = originalCLIPathFunc
+	})
+
+	tempDir := t.TempDir()
+	codexConfigPathFunc = func() (string, error) {
+		return filepath.Join(tempDir, "config.toml"), nil
+	}
+	localCLICommandPathFunc = func(file string) (string, error) {
+		if file != codexClientCommandName {
+			t.Fatalf("expected lookup for %q, got %q", codexClientCommandName, file)
+		}
+		return "", errors.New("not found")
+	}
+
+	status := inspectCodexMCPInstallStatus(`C:\Program Files\GoNavi\GoNavi.exe`, []string{"mcp-server"}, nil)
+	if status.ClientDetected {
+		t.Fatal("expected codex command detection to be false")
+	}
+	if status.ClientCommand != codexClientCommandName {
+		t.Fatalf("expected client command %q, got %q", codexClientCommandName, status.ClientCommand)
+	}
+	if status.ClientPath != "" {
+		t.Fatalf("expected missing codex command path to be empty, got %q", status.ClientPath)
+	}
+	if status.Message != "未检测到 Codex 用户级 GoNavi MCP 配置" {
+		t.Fatalf("unexpected config message: %q", status.Message)
+	}
+}
diff --git a/internal/ai/service/config_store.go b/internal/ai/service/config_store.go
index df11374..f0fa199 100644
--- a/internal/ai/service/config_store.go
+++ b/internal/ai/service/config_store.go
@@ -13,23 +13,29 @@ import (
 )
 
 const (
-	aiConfigSchemaVersion = 2
+	aiConfigSchemaVersion = 4
 	aiConfigFileName      = "ai_config.json"
 )
 
 type aiConfig struct {
-	SchemaVersion  int                 `json:"schemaVersion,omitempty"`
-	Providers      []ai.ProviderConfig `json:"providers"`
-	ActiveProvider string              `json:"activeProvider"`
-	SafetyLevel    string              `json:"safetyLevel"`
-	ContextLevel   string              `json:"contextLevel"`
+	SchemaVersion      int                   `json:"schemaVersion,omitempty"`
+	Providers          []ai.ProviderConfig   `json:"providers"`
+	ActiveProvider     string                `json:"activeProvider"`
+	SafetyLevel        string                `json:"safetyLevel"`
+	ContextLevel       string                `json:"contextLevel"`
+	UserPromptSettings ai.UserPromptSettings `json:"userPromptSettings,omitempty"`
+	MCPServers         []ai.MCPServerConfig  `json:"mcpServers,omitempty"`
+	Skills             []ai.SkillConfig      `json:"skills,omitempty"`
 }
 
 type ProviderConfigStoreSnapshot struct {
-	Providers      []ai.ProviderConfig
-	ActiveProvider string
-	SafetyLevel    ai.SQLPermissionLevel
-	ContextLevel   ai.ContextLevel
+	Providers          []ai.ProviderConfig
+	ActiveProvider     string
+	SafetyLevel        ai.SQLPermissionLevel
+	ContextLevel       ai.ContextLevel
+	UserPromptSettings ai.UserPromptSettings
+	MCPServers         []ai.MCPServerConfig
+	Skills             []ai.SkillConfig
 }
 
 type ProviderConfigStoreInspection struct {
@@ -157,11 +163,14 @@ func (s *ProviderConfigStore) Save(snapshot ProviderConfigStoreSnapshot) error {
 	}
 
 	cfg := aiConfig{
-		SchemaVersion:  aiConfigSchemaVersion,
-		Providers:      providers,
-		ActiveProvider: snapshot.ActiveProvider,
-		SafetyLevel:    string(snapshot.SafetyLevel),
-		ContextLevel:   string(snapshot.ContextLevel),
+		SchemaVersion:      aiConfigSchemaVersion,
+		Providers:          providers,
+		ActiveProvider:     snapshot.ActiveProvider,
+		SafetyLevel:        string(snapshot.SafetyLevel),
+		ContextLevel:       string(snapshot.ContextLevel),
+		UserPromptSettings: snapshot.UserPromptSettings,
+		MCPServers:         snapshot.MCPServers,
+		Skills:             snapshot.Skills,
 	}
 
 	data, err := json.MarshalIndent(cfg, "", "  ")
@@ -182,6 +191,8 @@ func (s *ProviderConfigStore) readStoredSnapshot() (aiConfig, ProviderConfigStor
 		Providers:    []ai.ProviderConfig{},
 		SafetyLevel:  ai.PermissionReadOnly,
 		ContextLevel: ai.ContextSchemaOnly,
+		MCPServers:   []ai.MCPServerConfig{},
+		Skills:       []ai.SkillConfig{},
 	}
 
 	data, err := os.ReadFile(s.configPath())
@@ -206,6 +217,9 @@ func (s *ProviderConfigStore) readStoredSnapshot() (aiConfig, ProviderConfigStor
 	case ai.ContextSchemaOnly, ai.ContextWithSamples, ai.ContextWithResults:
 		snapshot.ContextLevel = ai.ContextLevel(cfg.ContextLevel)
 	}
+	snapshot.UserPromptSettings = cfg.UserPromptSettings
+	snapshot.MCPServers = append([]ai.MCPServerConfig(nil), cfg.MCPServers...)
+	snapshot.Skills = append([]ai.SkillConfig(nil), cfg.Skills...)
 
 	providers := make([]ai.ProviderConfig, 0, len(cfg.Providers))
 	for _, providerConfig := range cfg.Providers {
diff --git a/internal/ai/service/config_store_test.go b/internal/ai/service/config_store_test.go
index df9b6a6..4ac9688 100644
--- a/internal/ai/service/config_store_test.go
+++ b/internal/ai/service/config_store_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 
@@ -197,3 +198,129 @@ func TestProviderConfigStoreSaveKeepsExistingSecretRef(t *testing.T) {
 		t.Fatalf("expected reload to restore existing sensitive header, got %#v", snapshot.Providers[0].Headers)
 	}
 }
+
+func TestProviderConfigStoreSaveAndLoadUserPromptSettings(t *testing.T) {
+	configStore := newProviderConfigStore(t.TempDir(), failOnUseSecretStore{})
+
+	expected := ai.UserPromptSettings{
+		Global:        "所有回答先给结论。",
+		Database:      "生成 SQL 前先确认字段名。",
+		JVM:           "优先输出资源级风险判断。",
+		JVMDiagnostic: "先给诊断计划，再给命令。",
+	}
+
+	err := configStore.Save(ProviderConfigStoreSnapshot{
+		Providers:          []ai.ProviderConfig{},
+		ActiveProvider:     "",
+		SafetyLevel:        ai.PermissionReadOnly,
+		ContextLevel:       ai.ContextSchemaOnly,
+		UserPromptSettings: expected,
+	})
+	if err != nil {
+		t.Fatalf("Save returned error: %v", err)
+	}
+
+	snapshot, err := configStore.Load()
+	if err != nil {
+		t.Fatalf("Load returned error: %v", err)
+	}
+	if snapshot.UserPromptSettings != expected {
+		t.Fatalf("expected user prompt settings %#v, got %#v", expected, snapshot.UserPromptSettings)
+	}
+
+	configData, err := os.ReadFile(filepath.Join(configStore.configDir, aiConfigFileName))
+	if err != nil {
+		t.Fatalf("ReadFile returned error: %v", err)
+	}
+	text := string(configData)
+	if !strings.Contains(text, `"userPromptSettings"`) {
+		t.Fatalf("expected config file to contain userPromptSettings, got %s", text)
+	}
+}
+
+func TestProviderConfigStoreSaveAndLoadMCPServers(t *testing.T) {
+	configStore := newProviderConfigStore(t.TempDir(), failOnUseSecretStore{})
+
+	expected := []ai.MCPServerConfig{
+		{
+			ID:             "mcp-local",
+			Name:           "本地文件助手",
+			Transport:      ai.MCPTransportStdio,
+			Command:        "node",
+			Args:           []string{"server.js", "--stdio"},
+			Env:            map[string]string{"API_KEY": "test"},
+			Enabled:        true,
+			TimeoutSeconds: 18,
+		},
+	}
+
+	err := configStore.Save(ProviderConfigStoreSnapshot{
+		Providers:      []ai.ProviderConfig{},
+		ActiveProvider: "",
+		SafetyLevel:    ai.PermissionReadOnly,
+		ContextLevel:   ai.ContextSchemaOnly,
+		MCPServers:     expected,
+	})
+	if err != nil {
+		t.Fatalf("Save returned error: %v", err)
+	}
+
+	snapshot, err := configStore.Load()
+	if err != nil {
+		t.Fatalf("Load returned error: %v", err)
+	}
+	if !reflect.DeepEqual(snapshot.MCPServers, expected) {
+		t.Fatalf("expected MCP servers %#v, got %#v", expected, snapshot.MCPServers)
+	}
+
+	configData, err := os.ReadFile(filepath.Join(configStore.configDir, aiConfigFileName))
+	if err != nil {
+		t.Fatalf("ReadFile returned error: %v", err)
+	}
+	if !strings.Contains(string(configData), `"mcpServers"`) {
+		t.Fatalf("expected config file to contain mcpServers, got %s", string(configData))
+	}
+}
+
+func TestProviderConfigStoreSaveAndLoadSkills(t *testing.T) {
+	configStore := newProviderConfigStore(t.TempDir(), failOnUseSecretStore{})
+
+	expected := []ai.SkillConfig{
+		{
+			ID:            "skill-sql-review",
+			Name:          "SQL 审查",
+			Description:   "生成 SQL 前先校验字段和风险",
+			SystemPrompt:  "先确认字段，再输出 SQL。",
+			Enabled:       true,
+			Scopes:        []string{string(ai.SkillScopeDatabase)},
+			RequiredTools: []string{"get_columns", "execute_sql"},
+		},
+	}
+
+	err := configStore.Save(ProviderConfigStoreSnapshot{
+		Providers:      []ai.ProviderConfig{},
+		ActiveProvider: "",
+		SafetyLevel:    ai.PermissionReadOnly,
+		ContextLevel:   ai.ContextSchemaOnly,
+		Skills:         expected,
+	})
+	if err != nil {
+		t.Fatalf("Save returned error: %v", err)
+	}
+
+	snapshot, err := configStore.Load()
+	if err != nil {
+		t.Fatalf("Load returned error: %v", err)
+	}
+	if !reflect.DeepEqual(snapshot.Skills, expected) {
+		t.Fatalf("expected skills %#v, got %#v", expected, snapshot.Skills)
+	}
+
+	configData, err := os.ReadFile(filepath.Join(configStore.configDir, aiConfigFileName))
+	if err != nil {
+		t.Fatalf("ReadFile returned error: %v", err)
+	}
+	if !strings.Contains(string(configData), `"skills"`) {
+		t.Fatalf("expected config file to contain skills, got %s", string(configData))
+	}
+}
diff --git a/internal/ai/service/extensions_service.go b/internal/ai/service/extensions_service.go
new file mode 100644
index 0000000..9e02264
--- /dev/null
+++ b/internal/ai/service/extensions_service.go
@@ -0,0 +1,599 @@
+package aiservice
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+	"slices"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/ai"
+	"GoNavi-Wails/internal/logger"
+
+	"github.com/google/uuid"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+const (
+	defaultMCPServerTimeoutSeconds = 20
+	minMCPServerTimeoutSeconds     = 3
+	maxMCPServerTimeoutSeconds     = 120
+	mcpToolAliasPrefix             = "mcp__"
+)
+
+// AIGetMCPServers 获取 MCP 服务配置
+func (s *Service) AIGetMCPServers() []ai.MCPServerConfig {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	return cloneMCPServerConfigs(s.mcpServers)
+}
+
+// AISaveMCPServer 保存/更新 MCP 服务配置
+func (s *Service) AISaveMCPServer(config ai.MCPServerConfig) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	normalized := normalizeMCPServerConfig(config)
+	if normalized.Enabled && strings.TrimSpace(normalized.Command) == "" {
+		return fmt.Errorf("MCP 服务命令不能为空")
+	}
+
+	for i := range s.mcpServers {
+		if s.mcpServers[i].ID == normalized.ID {
+			s.mcpServers[i] = normalized
+			return s.saveConfig()
+		}
+	}
+	s.mcpServers = append(s.mcpServers, normalized)
+	return s.saveConfig()
+}
+
+// AIDeleteMCPServer 删除 MCP 服务配置
+func (s *Service) AIDeleteMCPServer(id string) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	filtered := s.mcpServers[:0]
+	for _, serverConfig := range s.mcpServers {
+		if serverConfig.ID == id {
+			continue
+		}
+		filtered = append(filtered, serverConfig)
+	}
+	s.mcpServers = append([]ai.MCPServerConfig(nil), filtered...)
+	return s.saveConfig()
+}
+
+// AITestMCPServer 测试 MCP 服务连通性
+func (s *Service) AITestMCPServer(config ai.MCPServerConfig) map[string]any {
+	normalized := normalizeMCPServerConfig(config)
+	if strings.TrimSpace(normalized.Command) == "" {
+		return map[string]any{"success": false, "message": "MCP 服务命令不能为空", "tools": []ai.MCPToolDescriptor{}}
+	}
+
+	tools, err := s.listMCPToolsForServer(normalized)
+	if err != nil {
+		return map[string]any{"success": false, "message": err.Error(), "tools": []ai.MCPToolDescriptor{}}
+	}
+
+	return map[string]any{
+		"success":   true,
+		"message":   fmt.Sprintf("MCP 服务连接成功，发现 %d 个工具", len(tools)),
+		"toolCount": len(tools),
+		"tools":     tools,
+	}
+}
+
+// AIListMCPTools 聚合所有启用的 MCP 工具
+func (s *Service) AIListMCPTools() []ai.MCPToolDescriptor {
+	s.mu.RLock()
+	servers := cloneMCPServerConfigs(s.mcpServers)
+	s.mu.RUnlock()
+
+	descriptors := make([]ai.MCPToolDescriptor, 0)
+	for _, serverConfig := range servers {
+		if !serverConfig.Enabled {
+			continue
+		}
+		tools, err := s.listMCPToolsForServer(serverConfig)
+		if err != nil {
+			logger.Warnf("列出 MCP 工具失败(server=%s): %v", serverConfig.Name, err)
+			continue
+		}
+		descriptors = append(descriptors, tools...)
+	}
+	return descriptors
+}
+
+// AICallMCPTool 调用指定的 MCP 工具
+func (s *Service) AICallMCPTool(alias string, argumentsJSON string) (ai.MCPToolCallResult, error) {
+	serverID, originalName, err := parseMCPToolAlias(alias)
+	if err != nil {
+		return ai.MCPToolCallResult{}, err
+	}
+
+	s.mu.RLock()
+	serverConfig, ok := findMCPServerConfigByID(s.mcpServers, serverID)
+	s.mu.RUnlock()
+	if !ok {
+		return ai.MCPToolCallResult{}, fmt.Errorf("未找到 MCP 服务: %s", serverID)
+	}
+	if !serverConfig.Enabled {
+		return ai.MCPToolCallResult{}, fmt.Errorf("MCP 服务未启用: %s", serverConfig.Name)
+	}
+
+	var arguments any = map[string]any{}
+	trimmedArguments := strings.TrimSpace(argumentsJSON)
+	if trimmedArguments != "" {
+		if err := json.Unmarshal([]byte(trimmedArguments), &arguments); err != nil {
+			return ai.MCPToolCallResult{}, fmt.Errorf("解析 MCP 工具参数失败: %w", err)
+		}
+	}
+
+	var callResult *mcp.CallToolResult
+	err = s.withMCPClientSession(serverConfig, func(ctx context.Context, session *mcp.ClientSession) error {
+		result, callErr := session.CallTool(ctx, &mcp.CallToolParams{
+			Name:      originalName,
+			Arguments: arguments,
+		})
+		if callErr != nil {
+			return callErr
+		}
+		callResult = result
+		return nil
+	})
+	if err != nil {
+		return ai.MCPToolCallResult{}, fmt.Errorf("调用 MCP 工具失败: %w", err)
+	}
+
+	return ai.MCPToolCallResult{
+		Alias:             alias,
+		ServerID:          serverConfig.ID,
+		ServerName:        serverConfig.Name,
+		OriginalName:      originalName,
+		Title:             originalName,
+		Content:           formatMCPToolCallContent(callResult),
+		StructuredContent: callResult.StructuredContent,
+		IsError:           callResult.IsError,
+	}, nil
+}
+
+// AIGetSkills 获取 Skill 配置
+func (s *Service) AIGetSkills() []ai.SkillConfig {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	return cloneSkillConfigs(s.skills)
+}
+
+// AISaveSkill 保存/更新 Skill 配置
+func (s *Service) AISaveSkill(config ai.SkillConfig) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	normalized := normalizeSkillConfig(config)
+	for i := range s.skills {
+		if s.skills[i].ID == normalized.ID {
+			s.skills[i] = normalized
+			return s.saveConfig()
+		}
+	}
+	s.skills = append(s.skills, normalized)
+	return s.saveConfig()
+}
+
+// AIDeleteSkill 删除 Skill 配置
+func (s *Service) AIDeleteSkill(id string) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	filtered := s.skills[:0]
+	for _, skillConfig := range s.skills {
+		if skillConfig.ID == id {
+			continue
+		}
+		filtered = append(filtered, skillConfig)
+	}
+	s.skills = append([]ai.SkillConfig(nil), filtered...)
+	return s.saveConfig()
+}
+
+func (s *Service) listMCPToolsForServer(serverConfig ai.MCPServerConfig) ([]ai.MCPToolDescriptor, error) {
+	descriptors := make([]ai.MCPToolDescriptor, 0)
+	err := s.withMCPClientSession(serverConfig, func(ctx context.Context, session *mcp.ClientSession) error {
+		cursor := ""
+		for {
+			result, err := session.ListTools(ctx, &mcp.ListToolsParams{Cursor: cursor})
+			if err != nil {
+				return err
+			}
+			for _, tool := range result.Tools {
+				if tool == nil {
+					continue
+				}
+				descriptors = append(descriptors, ai.MCPToolDescriptor{
+					Alias:        buildMCPToolAlias(serverConfig.ID, tool.Name),
+					ServerID:     serverConfig.ID,
+					ServerName:   serverConfig.Name,
+					OriginalName: tool.Name,
+					Title:        firstNonEmpty(tool.Title, toolAnnotationsTitle(tool), tool.Name),
+					Description:  strings.TrimSpace(tool.Description),
+					InputSchema:  normalizeToolSchema(tool.InputSchema),
+				})
+			}
+			if strings.TrimSpace(result.NextCursor) == "" {
+				break
+			}
+			cursor = result.NextCursor
+		}
+		return nil
+	})
+	return descriptors, err
+}
+
+func (s *Service) withMCPClientSession(serverConfig ai.MCPServerConfig, fn func(context.Context, *mcp.ClientSession) error) error {
+	serverConfig = normalizeMCPServerConfig(serverConfig)
+	if serverConfig.Transport != ai.MCPTransportStdio {
+		return fmt.Errorf("暂不支持的 MCP transport: %s", serverConfig.Transport)
+	}
+	if strings.TrimSpace(serverConfig.Command) == "" {
+		return fmt.Errorf("MCP 服务命令不能为空")
+	}
+
+	timeout := time.Duration(serverConfig.TimeoutSeconds) * time.Second
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	command := exec.CommandContext(ctx, serverConfig.Command, serverConfig.Args...)
+	command.Env = append(os.Environ(), formatMCPEnv(serverConfig.Env)...)
+
+	client := mcp.NewClient(&mcp.Implementation{
+		Name:    "GoNavi",
+		Version: "dev",
+	}, nil)
+
+	session, err := client.Connect(ctx, &mcp.CommandTransport{Command: command}, nil)
+	if err != nil {
+		return err
+	}
+	defer session.Close()
+
+	return fn(ctx, session)
+}
+
+func normalizeMCPServerConfigs(configs []ai.MCPServerConfig) []ai.MCPServerConfig {
+	normalized := make([]ai.MCPServerConfig, 0, len(configs))
+	for _, config := range configs {
+		normalized = append(normalized, normalizeMCPServerConfig(config))
+	}
+	return normalized
+}
+
+func normalizeMCPServerConfig(config ai.MCPServerConfig) ai.MCPServerConfig {
+	id := sanitizeExtensionID(strings.TrimSpace(config.ID), "mcp")
+	if id == "" {
+		id = "mcp-" + uuid.New().String()[:8]
+	}
+
+	transport := config.Transport
+	if transport != ai.MCPTransportStdio {
+		transport = ai.MCPTransportStdio
+	}
+
+	args := make([]string, 0, len(config.Args))
+	for _, arg := range config.Args {
+		trimmed := strings.TrimSpace(arg)
+		if trimmed == "" {
+			continue
+		}
+		args = append(args, trimmed)
+	}
+
+	env := make(map[string]string, len(config.Env))
+	for key, value := range config.Env {
+		trimmedKey := strings.TrimSpace(key)
+		if trimmedKey == "" {
+			continue
+		}
+		env[trimmedKey] = value
+	}
+
+	timeout := config.TimeoutSeconds
+	if timeout <= 0 {
+		timeout = defaultMCPServerTimeoutSeconds
+	}
+	if timeout < minMCPServerTimeoutSeconds {
+		timeout = minMCPServerTimeoutSeconds
+	}
+	if timeout > maxMCPServerTimeoutSeconds {
+		timeout = maxMCPServerTimeoutSeconds
+	}
+
+	return ai.MCPServerConfig{
+		ID:             id,
+		Name:           firstNonEmpty(strings.TrimSpace(config.Name), strings.TrimSpace(config.Command), "MCP Server"),
+		Transport:      transport,
+		Command:        strings.TrimSpace(config.Command),
+		Args:           args,
+		Env:            env,
+		Enabled:        config.Enabled,
+		TimeoutSeconds: timeout,
+	}
+}
+
+func cloneMCPServerConfigs(configs []ai.MCPServerConfig) []ai.MCPServerConfig {
+	cloned := make([]ai.MCPServerConfig, 0, len(configs))
+	for _, config := range configs {
+		next := config
+		next.Args = append([]string(nil), config.Args...)
+		if len(config.Env) > 0 {
+			next.Env = make(map[string]string, len(config.Env))
+			for key, value := range config.Env {
+				next.Env[key] = value
+			}
+		} else {
+			next.Env = map[string]string{}
+		}
+		cloned = append(cloned, next)
+	}
+	return cloned
+}
+
+func buildMCPToolAlias(serverID string, originalName string) string {
+	return mcpToolAliasPrefix + sanitizeAliasPart(serverID) + "__" + sanitizeAliasPart(originalName)
+}
+
+func parseMCPToolAlias(alias string) (string, string, error) {
+	trimmed := strings.TrimSpace(alias)
+	if !strings.HasPrefix(trimmed, mcpToolAliasPrefix) {
+		return "", "", fmt.Errorf("无效的 MCP 工具别名: %s", alias)
+	}
+
+	parts := strings.SplitN(strings.TrimPrefix(trimmed, mcpToolAliasPrefix), "__", 2)
+	if len(parts) != 2 || strings.TrimSpace(parts[0]) == "" || strings.TrimSpace(parts[1]) == "" {
+		return "", "", fmt.Errorf("无效的 MCP 工具别名: %s", alias)
+	}
+	return parts[0], parts[1], nil
+}
+
+func formatMCPEnv(env map[string]string) []string {
+	if len(env) == 0 {
+		return nil
+	}
+
+	lines := make([]string, 0, len(env))
+	for key, value := range env {
+		lines = append(lines, key+"="+value)
+	}
+	slices.Sort(lines)
+	return lines
+}
+
+func normalizeToolSchema(schema any) map[string]any {
+	if schema == nil {
+		return map[string]any{
+			"type":       "object",
+			"properties": map[string]any{},
+		}
+	}
+
+	if typed, ok := schema.(map[string]any); ok {
+		return typed
+	}
+
+	data, err := json.Marshal(schema)
+	if err != nil {
+		return map[string]any{
+			"type":       "object",
+			"properties": map[string]any{},
+		}
+	}
+
+	var result map[string]any
+	if err := json.Unmarshal(data, &result); err != nil || result == nil {
+		return map[string]any{
+			"type":       "object",
+			"properties": map[string]any{},
+		}
+	}
+	return result
+}
+
+func formatMCPToolCallContent(result *mcp.CallToolResult) string {
+	if result == nil {
+		return ""
+	}
+
+	parts := make([]string, 0, len(result.Content))
+	for _, item := range result.Content {
+		switch typed := item.(type) {
+		case *mcp.TextContent:
+			if strings.TrimSpace(typed.Text) != "" {
+				parts = append(parts, typed.Text)
+			}
+		default:
+			data, err := json.Marshal(typed)
+			if err != nil {
+				continue
+			}
+			if strings.TrimSpace(string(data)) != "" {
+				parts = append(parts, string(data))
+			}
+		}
+	}
+
+	if len(parts) == 0 && result.StructuredContent != nil {
+		if data, err := json.Marshal(result.StructuredContent); err == nil {
+			parts = append(parts, string(data))
+		}
+	}
+
+	if len(parts) == 0 && result.IsError {
+		return "MCP 工具调用失败"
+	}
+	return strings.Join(parts, "\n\n")
+}
+
+func findMCPServerConfigByID(configs []ai.MCPServerConfig, id string) (ai.MCPServerConfig, bool) {
+	for _, config := range configs {
+		if config.ID == id {
+			return cloneMCPServerConfigs([]ai.MCPServerConfig{config})[0], true
+		}
+	}
+	return ai.MCPServerConfig{}, false
+}
+
+func normalizeSkillConfigs(configs []ai.SkillConfig) []ai.SkillConfig {
+	normalized := make([]ai.SkillConfig, 0, len(configs))
+	for _, config := range configs {
+		normalized = append(normalized, normalizeSkillConfig(config))
+	}
+	return normalized
+}
+
+func normalizeSkillConfig(config ai.SkillConfig) ai.SkillConfig {
+	id := sanitizeExtensionID(strings.TrimSpace(config.ID), "skill")
+	if id == "" {
+		id = "skill-" + uuid.New().String()[:8]
+	}
+
+	requiredTools := make([]string, 0, len(config.RequiredTools))
+	seenRequiredTools := make(map[string]struct{}, len(config.RequiredTools))
+	for _, toolName := range config.RequiredTools {
+		trimmed := strings.TrimSpace(toolName)
+		if trimmed == "" {
+			continue
+		}
+		if _, ok := seenRequiredTools[trimmed]; ok {
+			continue
+		}
+		seenRequiredTools[trimmed] = struct{}{}
+		requiredTools = append(requiredTools, trimmed)
+	}
+
+	return ai.SkillConfig{
+		ID:            id,
+		Name:          firstNonEmpty(strings.TrimSpace(config.Name), "未命名 Skill"),
+		Description:   strings.TrimSpace(config.Description),
+		SystemPrompt:  normalizeUserPromptText(config.SystemPrompt),
+		Enabled:       config.Enabled,
+		Scopes:        normalizeSkillScopes(config.Scopes),
+		RequiredTools: requiredTools,
+	}
+}
+
+func cloneSkillConfigs(configs []ai.SkillConfig) []ai.SkillConfig {
+	cloned := make([]ai.SkillConfig, 0, len(configs))
+	for _, config := range configs {
+		next := config
+		next.Scopes = append([]string(nil), config.Scopes...)
+		next.RequiredTools = append([]string(nil), config.RequiredTools...)
+		cloned = append(cloned, next)
+	}
+	return cloned
+}
+
+func normalizeSkillScopes(scopes []string) []string {
+	if len(scopes) == 0 {
+		return []string{string(ai.SkillScopeGlobal)}
+	}
+
+	allowed := map[string]struct{}{
+		string(ai.SkillScopeGlobal):        {},
+		string(ai.SkillScopeDatabase):      {},
+		string(ai.SkillScopeJVM):           {},
+		string(ai.SkillScopeJVMDiagnostic): {},
+	}
+	seen := make(map[string]struct{}, len(scopes))
+	normalized := make([]string, 0, len(scopes))
+	for _, scope := range scopes {
+		trimmed := strings.TrimSpace(scope)
+		if _, ok := allowed[trimmed]; !ok {
+			continue
+		}
+		if _, ok := seen[trimmed]; ok {
+			continue
+		}
+		seen[trimmed] = struct{}{}
+		normalized = append(normalized, trimmed)
+	}
+	if len(normalized) == 0 {
+		return []string{string(ai.SkillScopeGlobal)}
+	}
+	return normalized
+}
+
+func sanitizeExtensionID(raw string, prefix string) string {
+	if raw == "" {
+		return ""
+	}
+
+	var builder strings.Builder
+	builder.Grow(len(raw))
+	lastWasDash := false
+	for _, r := range strings.ToLower(raw) {
+		switch {
+		case r >= 'a' && r <= 'z':
+			builder.WriteRune(r)
+			lastWasDash = false
+		case r >= '0' && r <= '9':
+			builder.WriteRune(r)
+			lastWasDash = false
+		case r == '-' || r == '_':
+			if builder.Len() == 0 || lastWasDash {
+				continue
+			}
+			builder.WriteByte('-')
+			lastWasDash = true
+		default:
+			if builder.Len() == 0 || lastWasDash {
+				continue
+			}
+			builder.WriteByte('-')
+			lastWasDash = true
+		}
+	}
+
+	sanitized := strings.Trim(builder.String(), "-")
+	if sanitized == "" {
+		return ""
+	}
+	if prefix != "" && !strings.HasPrefix(sanitized, prefix+"-") && sanitized != prefix {
+		return prefix + "-" + sanitized
+	}
+	return sanitized
+}
+
+func sanitizeAliasPart(raw string) string {
+	var builder strings.Builder
+	builder.Grow(len(raw))
+	for _, r := range strings.TrimSpace(raw) {
+		switch {
+		case r >= 'a' && r <= 'z', r >= 'A' && r <= 'Z', r >= '0' && r <= '9':
+			builder.WriteRune(r)
+		case r == '_', r == '-', r == '.':
+			builder.WriteRune(r)
+		default:
+			builder.WriteByte('_')
+		}
+	}
+	return strings.Trim(builder.String(), "_")
+}
+
+func firstNonEmpty(values ...string) string {
+	for _, value := range values {
+		if strings.TrimSpace(value) != "" {
+			return strings.TrimSpace(value)
+		}
+	}
+	return ""
+}
+
+func toolAnnotationsTitle(tool *mcp.Tool) string {
+	if tool == nil || tool.Annotations == nil {
+		return ""
+	}
+	return strings.TrimSpace(tool.Annotations.Title)
+}
diff --git a/internal/ai/service/mcp_http_server.go b/internal/ai/service/mcp_http_server.go
new file mode 100644
index 0000000..edbc13a
--- /dev/null
+++ b/internal/ai/service/mcp_http_server.go
@@ -0,0 +1,418 @@
+package aiservice
+
+import (
+	"context"
+	"crypto/rand"
+	"encoding/base64"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"os"
+	"os/exec"
+	"strings"
+	"sync"
+	"time"
+
+	"GoNavi-Wails/internal/ai"
+	"GoNavi-Wails/internal/logger"
+)
+
+const (
+	defaultMCPHTTPAddr = "127.0.0.1:8765"
+	defaultMCPHTTPPath = "/mcp"
+)
+
+type mcpHTTPServerRuntime struct {
+	process  mcpHTTPProcess
+	status   ai.MCPHTTPServerStatus
+	stopping bool
+}
+
+type mcpHTTPProcessStartOptions struct {
+	Addr       string
+	Path       string
+	Token      string
+	SchemaOnly bool
+}
+
+type mcpHTTPProcess interface {
+	Done() <-chan struct{}
+	Stop(context.Context) error
+	Wait() error
+}
+
+var (
+	startMCPHTTPProcess = startMCPHTTPCommandProcess
+	waitMCPHTTPHealth   = waitMCPHTTPHealthEndpoint
+)
+
+// AIGetMCPHTTPServerStatus 返回客户端内置 HTTP MCP 服务状态。
+func (s *Service) AIGetMCPHTTPServerStatus() ai.MCPHTTPServerStatus {
+	s.mcpHTTPMu.Lock()
+	defer s.mcpHTTPMu.Unlock()
+
+	if s.mcpHTTP != nil {
+		status := s.mcpHTTP.status
+		status.Running = true
+		return status
+	}
+	if strings.TrimSpace(s.mcpHTTPLast.Addr) != "" {
+		return s.mcpHTTPLast
+	}
+	return defaultMCPHTTPServerStatus()
+}
+
+// AIStartMCPHTTPServer 从客户端内启动 GoNavi Streamable HTTP MCP 服务。
+func (s *Service) AIStartMCPHTTPServer(options ai.MCPHTTPServerOptions) (ai.MCPHTTPServerStatus, error) {
+	s.mcpHTTPMu.Lock()
+	if s.mcpHTTP != nil {
+		status := s.mcpHTTP.status
+		status.Running = true
+		s.mcpHTTPMu.Unlock()
+		return status, nil
+	}
+	s.mcpHTTPMu.Unlock()
+
+	startOptions, token, err := normalizeInAppMCPHTTPOptions(options)
+	if err != nil {
+		return defaultMCPHTTPServerStatus(), err
+	}
+
+	ctx := s.ctx
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	process, err := startMCPHTTPProcess(ctx, startOptions)
+	if err != nil {
+		status := stoppedMCPHTTPStatus(statusFromMCPHTTPOptions(startOptions, token), fmt.Sprintf("GoNavi MCP HTTP 服务启动失败：%v", err))
+		return status, err
+	}
+
+	status := statusFromMCPHTTPOptions(startOptions, token)
+	if err := waitForMCPHTTPReady(ctx, process, status); err != nil {
+		_ = process.Stop(context.Background())
+		stopped := stoppedMCPHTTPStatus(status, fmt.Sprintf("GoNavi MCP HTTP 服务启动失败：%v", err))
+		return stopped, err
+	}
+
+	runtime := &mcpHTTPServerRuntime{process: process, status: status}
+
+	s.mcpHTTPMu.Lock()
+	if s.mcpHTTP != nil {
+		existing := s.mcpHTTP.status
+		existing.Running = true
+		s.mcpHTTPMu.Unlock()
+		_ = process.Stop(context.Background())
+		return existing, nil
+	}
+	s.mcpHTTP = runtime
+	s.mcpHTTPLast = status
+	s.mcpHTTPMu.Unlock()
+
+	logger.Infof("客户端启动 GoNavi MCP HTTP 服务：addr=%s path=%s schemaOnly=%v", status.Addr, status.Path, status.SchemaOnly)
+	go s.watchMCPHTTPServer(runtime)
+	return status, nil
+}
+
+// AIStopMCPHTTPServer 停止客户端内启动的 GoNavi Streamable HTTP MCP 服务。
+func (s *Service) AIStopMCPHTTPServer() (ai.MCPHTTPServerStatus, error) {
+	return s.stopMCPHTTPServer(context.Background(), "GoNavi MCP HTTP 服务已停止")
+}
+
+func (s *Service) stopMCPHTTPServer(ctx context.Context, message string) (ai.MCPHTTPServerStatus, error) {
+	s.mcpHTTPMu.Lock()
+	runtime := s.mcpHTTP
+	if runtime == nil {
+		status := s.mcpHTTPLast
+		if strings.TrimSpace(status.Addr) == "" {
+			status = defaultMCPHTTPServerStatus()
+		}
+		status.Running = false
+		if strings.TrimSpace(status.Token) != "" {
+			status.AuthorizationHeader = "Bearer " + strings.TrimSpace(status.Token)
+		}
+		status.Message = "GoNavi MCP HTTP 服务未启动"
+		s.mcpHTTPLast = status
+		s.mcpHTTPMu.Unlock()
+		return status, nil
+	}
+	runtime.stopping = true
+	s.mcpHTTPMu.Unlock()
+
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	err := runtime.process.Stop(ctx)
+	status := stoppedMCPHTTPStatus(runtime.status, message)
+	if err != nil {
+		status.Message = fmt.Sprintf("GoNavi MCP HTTP 服务停止失败：%v", err)
+	}
+
+	s.mcpHTTPMu.Lock()
+	if s.mcpHTTP == runtime {
+		s.mcpHTTP = nil
+		s.mcpHTTPLast = status
+	}
+	s.mcpHTTPMu.Unlock()
+
+	if err == nil {
+		logger.Infof("客户端停止 GoNavi MCP HTTP 服务：addr=%s path=%s", status.Addr, status.Path)
+	}
+	return status, err
+}
+
+// Shutdown 释放 AI Service 中的运行时资源。
+func (s *Service) Shutdown() {
+	ctx := context.Background()
+	_, _ = s.stopMCPHTTPServer(ctx, "应用关闭，GoNavi MCP HTTP 服务已停止")
+}
+
+func (s *Service) watchMCPHTTPServer(runtime *mcpHTTPServerRuntime) {
+	err := runtime.process.Wait()
+
+	s.mcpHTTPMu.Lock()
+	defer s.mcpHTTPMu.Unlock()
+	if s.mcpHTTP != runtime {
+		return
+	}
+
+	message := "GoNavi MCP HTTP 服务已停止"
+	if err != nil && !runtime.stopping {
+		message = fmt.Sprintf("GoNavi MCP HTTP 服务异常退出：%v", err)
+		logger.Error(err, "GoNavi MCP HTTP 服务异常退出：addr=%s path=%s", runtime.status.Addr, runtime.status.Path)
+	}
+	s.mcpHTTP = nil
+	s.mcpHTTPLast = stoppedMCPHTTPStatus(runtime.status, message)
+}
+
+func normalizeInAppMCPHTTPOptions(options ai.MCPHTTPServerOptions) (mcpHTTPProcessStartOptions, string, error) {
+	addr := strings.TrimSpace(options.Addr)
+	if addr == "" {
+		addr = defaultMCPHTTPAddr
+	}
+	path := strings.TrimSpace(options.Path)
+	if path == "" {
+		path = defaultMCPHTTPPath
+	}
+	if !strings.HasPrefix(path, "/") {
+		path = "/" + path
+	}
+	token := strings.TrimSpace(options.Token)
+	if token == "" {
+		generated, err := generateMCPHTTPToken()
+		if err != nil {
+			return mcpHTTPProcessStartOptions{}, "", err
+		}
+		token = generated
+	}
+
+	return mcpHTTPProcessStartOptions{
+		Addr:       addr,
+		Path:       path,
+		Token:      token,
+		SchemaOnly: true,
+	}, token, nil
+}
+
+func startMCPHTTPCommandProcess(ctx context.Context, options mcpHTTPProcessStartOptions) (mcpHTTPProcess, error) {
+	executable, err := os.Executable()
+	if err != nil {
+		return nil, fmt.Errorf("定位当前 GoNavi 可执行文件失败: %w", err)
+	}
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	processCtx, cancel := context.WithCancel(ctx)
+	args := []string{"mcp-server", "http", "--addr", options.Addr, "--path", options.Path}
+	if options.SchemaOnly {
+		args = append(args, "--schema-only")
+	}
+	cmd := exec.CommandContext(processCtx, executable, args...)
+	cmd.Env = append(os.Environ(), "GONAVI_MCP_HTTP_TOKEN="+options.Token)
+	cmd.Stdout = io.Discard
+	cmd.Stderr = io.Discard
+	if err := cmd.Start(); err != nil {
+		cancel()
+		return nil, err
+	}
+
+	process := &mcpHTTPCommandProcess{
+		cancel: cancel,
+		cmd:    cmd,
+		done:   make(chan struct{}),
+	}
+	go process.wait()
+	return process, nil
+}
+
+type mcpHTTPCommandProcess struct {
+	cancel context.CancelFunc
+	cmd    *exec.Cmd
+	done   chan struct{}
+	mu     sync.Mutex
+	err    error
+}
+
+func (p *mcpHTTPCommandProcess) Done() <-chan struct{} {
+	return p.done
+}
+
+func (p *mcpHTTPCommandProcess) Stop(ctx context.Context) error {
+	if p == nil {
+		return nil
+	}
+	select {
+	case <-p.done:
+		return p.waitErr()
+	default:
+	}
+	if p.cancel != nil {
+		p.cancel()
+	}
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	select {
+	case <-p.done:
+		return nil
+	case <-ctx.Done():
+		return ctx.Err()
+	}
+}
+
+func (p *mcpHTTPCommandProcess) Wait() error {
+	if p == nil {
+		return nil
+	}
+	<-p.done
+	return p.waitErr()
+}
+
+func (p *mcpHTTPCommandProcess) wait() {
+	err := p.cmd.Wait()
+	p.mu.Lock()
+	p.err = err
+	p.mu.Unlock()
+	close(p.done)
+}
+
+func (p *mcpHTTPCommandProcess) waitErr() error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	return p.err
+}
+
+func waitForMCPHTTPReady(ctx context.Context, process mcpHTTPProcess, status ai.MCPHTTPServerStatus) error {
+	readyCtx, cancel := context.WithTimeout(ctx, 3*time.Second)
+	defer cancel()
+
+	healthErrCh := make(chan error, 1)
+	go func() {
+		healthErrCh <- waitMCPHTTPHealth(readyCtx, buildMCPHTTPURL(status.Addr, "/healthz"))
+	}()
+
+	select {
+	case err := <-healthErrCh:
+		return err
+	case <-process.Done():
+		if err := process.Wait(); err != nil {
+			return err
+		}
+		return fmt.Errorf("MCP HTTP 子进程已退出")
+	case <-readyCtx.Done():
+		return readyCtx.Err()
+	}
+}
+
+func waitMCPHTTPHealthEndpoint(ctx context.Context, healthURL string) error {
+	client := http.Client{Timeout: 300 * time.Millisecond}
+	var lastErr error
+	for {
+		req, err := http.NewRequestWithContext(ctx, http.MethodGet, healthURL, nil)
+		if err != nil {
+			return err
+		}
+		resp, err := client.Do(req)
+		if err == nil {
+			_ = resp.Body.Close()
+			if resp.StatusCode == http.StatusOK {
+				return nil
+			}
+			lastErr = fmt.Errorf("healthz 返回 HTTP %d", resp.StatusCode)
+		} else {
+			lastErr = err
+		}
+
+		select {
+		case <-ctx.Done():
+			if lastErr != nil {
+				return lastErr
+			}
+			return ctx.Err()
+		case <-time.After(120 * time.Millisecond):
+		}
+	}
+}
+
+func statusFromMCPHTTPOptions(options mcpHTTPProcessStartOptions, token string) ai.MCPHTTPServerStatus {
+	return ai.MCPHTTPServerStatus{
+		Running:             true,
+		Addr:                options.Addr,
+		Path:                options.Path,
+		URL:                 buildMCPHTTPURL(options.Addr, options.Path),
+		SchemaOnly:          true,
+		Token:               token,
+		AuthorizationHeader: "Bearer " + token,
+		StartedAt:           time.Now().UnixMilli(),
+		Message:             "GoNavi MCP HTTP 服务已启动",
+	}
+}
+
+func generateMCPHTTPToken() (string, error) {
+	var bytes [24]byte
+	if _, err := rand.Read(bytes[:]); err != nil {
+		return "", fmt.Errorf("生成 MCP HTTP Token 失败: %w", err)
+	}
+	return "gnv_" + base64.RawURLEncoding.EncodeToString(bytes[:]), nil
+}
+
+func defaultMCPHTTPServerStatus() ai.MCPHTTPServerStatus {
+	return ai.MCPHTTPServerStatus{
+		Running:    false,
+		Addr:       defaultMCPHTTPAddr,
+		Path:       defaultMCPHTTPPath,
+		URL:        buildMCPHTTPURL(defaultMCPHTTPAddr, defaultMCPHTTPPath),
+		SchemaOnly: true,
+		Message:    "GoNavi MCP HTTP 服务未启动",
+	}
+}
+
+func stoppedMCPHTTPStatus(status ai.MCPHTTPServerStatus, message string) ai.MCPHTTPServerStatus {
+	status.Running = false
+	if strings.TrimSpace(status.Token) != "" {
+		status.AuthorizationHeader = "Bearer " + strings.TrimSpace(status.Token)
+	}
+	status.Message = message
+	return status
+}
+
+func buildMCPHTTPURL(addr string, path string) string {
+	path = strings.TrimSpace(path)
+	if path == "" {
+		path = defaultMCPHTTPPath
+	}
+	if !strings.HasPrefix(path, "/") {
+		path = "/" + path
+	}
+
+	host, port, err := net.SplitHostPort(strings.TrimSpace(addr))
+	if err != nil {
+		return "http://" + strings.TrimSpace(addr) + path
+	}
+	host = strings.Trim(host, "[]")
+	if host == "" || host == "::" || host == "0.0.0.0" {
+		host = "127.0.0.1"
+	}
+	return "http://" + net.JoinHostPort(host, port) + path
+}
diff --git a/internal/ai/service/mcp_http_server_test.go b/internal/ai/service/mcp_http_server_test.go
new file mode 100644
index 0000000..f62ae74
--- /dev/null
+++ b/internal/ai/service/mcp_http_server_test.go
@@ -0,0 +1,180 @@
+package aiservice
+
+import (
+	"context"
+	"os"
+	"os/exec"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+
+	"GoNavi-Wails/internal/ai"
+	"GoNavi-Wails/internal/secretstore"
+)
+
+type fakeMCPHTTPProcess struct {
+	done chan struct{}
+	once sync.Once
+}
+
+func newFakeMCPHTTPProcess() *fakeMCPHTTPProcess {
+	return &fakeMCPHTTPProcess{done: make(chan struct{})}
+}
+
+func (p *fakeMCPHTTPProcess) Done() <-chan struct{} {
+	return p.done
+}
+
+func (p *fakeMCPHTTPProcess) Stop(context.Context) error {
+	p.once.Do(func() {
+		close(p.done)
+	})
+	return nil
+}
+
+func (p *fakeMCPHTTPProcess) Wait() error {
+	<-p.done
+	return nil
+}
+
+func TestMCPHTTPServerLifecycleFromAIService(t *testing.T) {
+	originalStarter := startMCPHTTPProcess
+	originalHealth := waitMCPHTTPHealth
+	t.Cleanup(func() {
+		startMCPHTTPProcess = originalStarter
+		waitMCPHTTPHealth = originalHealth
+	})
+	var capturedOptions mcpHTTPProcessStartOptions
+	startMCPHTTPProcess = func(_ context.Context, options mcpHTTPProcessStartOptions) (mcpHTTPProcess, error) {
+		capturedOptions = options
+		return newFakeMCPHTTPProcess(), nil
+	}
+	waitMCPHTTPHealth = func(_ context.Context, _ string) error {
+		return nil
+	}
+
+	service := NewServiceWithSecretStore(secretstore.NewUnavailableStore("test"))
+	InitializeLifecycle(service, context.Background())
+	t.Cleanup(func() {
+		service.Shutdown()
+	})
+
+	initial := service.AIGetMCPHTTPServerStatus()
+	if initial.Running {
+		t.Fatal("expected MCP HTTP server to be stopped initially")
+	}
+
+	started, err := service.AIStartMCPHTTPServer(ai.MCPHTTPServerOptions{
+		Addr: "127.0.0.1:0",
+		Path: "mcp",
+	})
+	if err != nil {
+		t.Fatalf("AIStartMCPHTTPServer returned error: %v", err)
+	}
+	if !started.Running {
+		t.Fatalf("expected running status, got %#v", started)
+	}
+	if started.Path != "/mcp" {
+		t.Fatalf("expected normalized path /mcp, got %q", started.Path)
+	}
+	if !started.SchemaOnly {
+		t.Fatal("expected in-app MCP HTTP server to default to schema-only mode")
+	}
+	if !capturedOptions.SchemaOnly || capturedOptions.Token != started.Token {
+		t.Fatalf("expected process to receive schema-only and generated token, got %#v", capturedOptions)
+	}
+	if !strings.HasPrefix(started.Token, "gnv_") || started.AuthorizationHeader != "Bearer "+started.Token {
+		t.Fatalf("expected generated bearer token in status, got token=%q header=%q", started.Token, started.AuthorizationHeader)
+	}
+	if !strings.Contains(started.URL, "/mcp") {
+		t.Fatalf("expected MCP URL to include /mcp, got %q", started.URL)
+	}
+
+	stopped, err := service.AIStopMCPHTTPServer()
+	if err != nil {
+		t.Fatalf("AIStopMCPHTTPServer returned error: %v", err)
+	}
+	if stopped.Running {
+		t.Fatalf("expected stopped status, got %#v", stopped)
+	}
+	if stopped.Token != started.Token || stopped.AuthorizationHeader != "Bearer "+started.Token {
+		t.Fatalf("expected stopped status to keep token fields, got token=%q header=%q", stopped.Token, stopped.AuthorizationHeader)
+	}
+}
+
+func TestMCPHTTPServerStartUsesCustomAddrAndToken(t *testing.T) {
+	originalStarter := startMCPHTTPProcess
+	originalHealth := waitMCPHTTPHealth
+	t.Cleanup(func() {
+		startMCPHTTPProcess = originalStarter
+		waitMCPHTTPHealth = originalHealth
+	})
+
+	var capturedOptions mcpHTTPProcessStartOptions
+	startMCPHTTPProcess = func(_ context.Context, options mcpHTTPProcessStartOptions) (mcpHTTPProcess, error) {
+		capturedOptions = options
+		return newFakeMCPHTTPProcess(), nil
+	}
+	waitMCPHTTPHealth = func(_ context.Context, _ string) error {
+		return nil
+	}
+
+	service := NewServiceWithSecretStore(secretstore.NewUnavailableStore("test"))
+	InitializeLifecycle(service, context.Background())
+	t.Cleanup(func() {
+		service.Shutdown()
+	})
+
+	started, err := service.AIStartMCPHTTPServer(ai.MCPHTTPServerOptions{
+		Addr:  "127.0.0.1:9123",
+		Path:  "mcp",
+		Token: "gnv_custom_token",
+	})
+	if err != nil {
+		t.Fatalf("AIStartMCPHTTPServer returned error: %v", err)
+	}
+
+	if capturedOptions.Addr != "127.0.0.1:9123" || capturedOptions.Token != "gnv_custom_token" {
+		t.Fatalf("expected custom addr/token, got %#v", capturedOptions)
+	}
+	if started.URL != "http://127.0.0.1:9123/mcp" {
+		t.Fatalf("expected custom MCP URL, got %q", started.URL)
+	}
+	if started.Token != "gnv_custom_token" || started.AuthorizationHeader != "Bearer gnv_custom_token" {
+		t.Fatalf("expected custom bearer token in status, got token=%q header=%q", started.Token, started.AuthorizationHeader)
+	}
+	if !started.SchemaOnly || !capturedOptions.SchemaOnly {
+		t.Fatal("expected custom in-app MCP HTTP server to remain schema-only")
+	}
+}
+
+func TestMCPHTTPCommandProcessStopTreatsRequestedCancelAsSuccess(t *testing.T) {
+	cmdCtx, cancel := context.WithCancel(context.Background())
+	cmd := exec.CommandContext(cmdCtx, os.Args[0], "-test.run=TestMCPHTTPCommandProcessStopHelper")
+	cmd.Env = append(os.Environ(), "GONAVI_MCP_HTTP_STOP_HELPER=1")
+	if err := cmd.Start(); err != nil {
+		cancel()
+		t.Fatalf("start helper process: %v", err)
+	}
+
+	process := &mcpHTTPCommandProcess{
+		cancel: cancel,
+		cmd:    cmd,
+		done:   make(chan struct{}),
+	}
+	go process.wait()
+
+	stopCtx, stopCancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer stopCancel()
+	if err := process.Stop(stopCtx); err != nil {
+		t.Fatalf("expected requested stop to ignore process kill error, got %v", err)
+	}
+}
+
+func TestMCPHTTPCommandProcessStopHelper(t *testing.T) {
+	if os.Getenv("GONAVI_MCP_HTTP_STOP_HELPER") != "1" {
+		return
+	}
+	select {}
+}
diff --git a/internal/ai/service/service.go b/internal/ai/service/service.go
index 52121d6..c36a423 100644
--- a/internal/ai/service/service.go
+++ b/internal/ai/service/service.go
@@ -28,27 +28,29 @@ import (
 
 // Service AI 服务，作为 Wails Binding 暴露给前端
 type Service struct {
-	ctx            context.Context
-	mu             sync.RWMutex
-	providers      []ai.ProviderConfig
-	activeProvider string // active provider ID
-	safetyLevel    ai.SQLPermissionLevel
-	contextLevel   ai.ContextLevel
-	guard          *safety.Guard
-	configDir      string // 配置存储目录
-	secretStore    secretstore.SecretStore
-	localizer      *i18n.Localizer
-	cancelFuncs    map[string]context.CancelFunc // 记录每个 session 的 context 取消函数
+	ctx                context.Context
+	mu                 sync.RWMutex
+	providers          []ai.ProviderConfig
+	activeProvider     string // active provider ID
+	safetyLevel        ai.SQLPermissionLevel
+	contextLevel       ai.ContextLevel
+	userPromptSettings ai.UserPromptSettings
+	mcpServers         []ai.MCPServerConfig
+	skills             []ai.SkillConfig
+	guard              *safety.Guard
+	configDir          string // 配置存储目录
+	secretStore        secretstore.SecretStore
+	localizer          *i18n.Localizer
+	cancelFuncs        map[string]context.CancelFunc // 记录每个 session 的 context 取消函数
+	mcpHTTPMu          sync.Mutex
+	mcpHTTP            *mcpHTTPServerRuntime
+	mcpHTTPLast        ai.MCPHTTPServerStatus
 }
 
 var miniMaxAnthropicModels = []string{
+	"MiniMax-M3",
 	"MiniMax-M2.7",
 	"MiniMax-M2.7-highspeed",
-	"MiniMax-M2.5",
-	"MiniMax-M2.5-highspeed",
-	"MiniMax-M2.1",
-	"MiniMax-M2.1-highspeed",
-	"MiniMax-M2",
 }
 
 var dashScopeCodingPlanModels = []string{
@@ -113,6 +115,8 @@ func NewServiceWithSecretStore(store secretstore.SecretStore) *Service {
 		providers:    make([]ai.ProviderConfig, 0),
 		safetyLevel:  ai.PermissionReadOnly,
 		contextLevel: ai.ContextSchemaOnly,
+		mcpServers:   make([]ai.MCPServerConfig, 0),
+		skills:       make([]ai.SkillConfig, 0),
 		guard:        safety.NewGuard(ai.PermissionReadOnly),
 		secretStore:  store,
 		localizer:    newServiceLocalizer(),
@@ -823,6 +827,22 @@ func (s *Service) AIGetBuiltinPrompts() map[string]string {
 	return aicontext.GetBuiltinPrompts()
 }
 
+// AIGetUserPromptSettings 获取用户级自定义提示词配置
+func (s *Service) AIGetUserPromptSettings() ai.UserPromptSettings {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	return s.userPromptSettings
+}
+
+// AISaveUserPromptSettings 保存用户级自定义提示词配置
+func (s *Service) AISaveUserPromptSettings(settings ai.UserPromptSettings) error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	s.userPromptSettings = normalizeUserPromptSettings(settings)
+	return s.saveConfig()
+}
+
 // AIListModels 获取当前活跃 Provider 的可用模型列表
 func (s *Service) AIListModels() map[string]interface{} {
 	s.mu.RLock()
@@ -1052,13 +1072,29 @@ func (s *Service) AISetContextLevel(level string) {
 func (s *Service) AIChatSend(messages []ai.Message, tools []ai.Tool) map[string]interface{} {
 	p, err := s.getActiveProvider()
 	if err != nil {
+		logger.Error(err, "AIChatSend 获取 Provider 失败：messages=%d tools=%d", len(messages), len(tools))
 		return map[string]interface{}{"success": false, "error": err.Error()}
 	}
 
+	started := time.Now()
+	providerName := p.Name()
+	logger.Infof("AIChatSend 开始：provider=%s messages=%d tools=%d", providerName, len(messages), len(tools))
 	resp, err := p.Chat(context.Background(), ai.ChatRequest{Messages: messages, Tools: tools})
 	if err != nil {
+		logger.Warnf("AIChatSend 失败：provider=%s messages=%d tools=%d duration=%s err=%s", providerName, len(messages), len(tools), time.Since(started).Round(time.Millisecond), provider.RedactAIUpstreamLogText(err.Error()))
 		return map[string]interface{}{"success": false, "error": err.Error()}
 	}
+	logger.Infof(
+		"AIChatSend 完成：provider=%s messages=%d tools=%d toolCalls=%d promptTokens=%d completionTokens=%d totalTokens=%d duration=%s",
+		providerName,
+		len(messages),
+		len(tools),
+		len(resp.ToolCalls),
+		resp.TokensUsed.PromptTokens,
+		resp.TokensUsed.CompletionTokens,
+		resp.TokensUsed.TotalTokens,
+		time.Since(started).Round(time.Millisecond),
+	)
 
 	return map[string]interface{}{
 		"success":           true,
@@ -1090,6 +1126,7 @@ func (s *Service) AIChatStream(sessionID string, messages []ai.Message, tools []
 
 		p, err := s.getActiveProvider()
 		if err != nil {
+			logger.Error(err, "AIChatStream 获取 Provider 失败：sessionID=%s messages=%d tools=%d", sessionID, len(messages), len(tools))
 			wailsRuntime.EventsEmit(s.ctx, "ai:stream:"+sessionID, map[string]interface{}{
 				"error": err.Error(),
 				"done":  true,
@@ -1097,7 +1134,26 @@ func (s *Service) AIChatStream(sessionID string, messages []ai.Message, tools []
 			return
 		}
 
+		started := time.Now()
+		providerName := p.Name()
+		contentChunks := 0
+		thinkingChunks := 0
+		toolCallChunks := 0
+		errorChunks := 0
+		logger.Infof("AIChatStream 开始：sessionID=%s provider=%s messages=%d tools=%d", sessionID, providerName, len(messages), len(tools))
 		err = p.ChatStream(streamCtx, ai.ChatRequest{Messages: messages, Tools: tools}, func(chunk ai.StreamChunk) {
+			if chunk.Content != "" {
+				contentChunks++
+			}
+			if chunk.Thinking != "" || chunk.ReasoningContent != "" {
+				thinkingChunks++
+			}
+			if len(chunk.ToolCalls) > 0 {
+				toolCallChunks++
+			}
+			if chunk.Error != "" {
+				errorChunks++
+			}
 			wailsRuntime.EventsEmit(s.ctx, "ai:stream:"+sessionID, map[string]interface{}{
 				"content":           chunk.Content,
 				"thinking":          chunk.Thinking,
@@ -1110,11 +1166,29 @@ func (s *Service) AIChatStream(sessionID string, messages []ai.Message, tools []
 
 		// 当 context 被主动 cancel 的时候，不把这个视为向外抛的 error
 		if err != nil && err != context.Canceled {
+			logger.Warnf("AIChatStream 失败：sessionID=%s provider=%s messages=%d tools=%d duration=%s err=%s", sessionID, providerName, len(messages), len(tools), time.Since(started).Round(time.Millisecond), provider.RedactAIUpstreamLogText(err.Error()))
 			wailsRuntime.EventsEmit(s.ctx, "ai:stream:"+sessionID, map[string]interface{}{
 				"error": err.Error(),
 				"done":  true,
 			})
+			return
 		}
+		if err == context.Canceled {
+			logger.Infof("AIChatStream 已取消：sessionID=%s provider=%s duration=%s", sessionID, providerName, time.Since(started).Round(time.Millisecond))
+			return
+		}
+		logger.Infof(
+			"AIChatStream 完成：sessionID=%s provider=%s messages=%d tools=%d contentChunks=%d thinkingChunks=%d toolCallChunks=%d errorChunks=%d duration=%s",
+			sessionID,
+			providerName,
+			len(messages),
+			len(tools),
+			contentChunks,
+			thinkingChunks,
+			toolCallChunks,
+			errorChunks,
+			time.Since(started).Round(time.Millisecond),
+		)
 	}()
 }
 
@@ -1168,17 +1242,43 @@ func (s *Service) loadConfig() {
 	s.safetyLevel = snapshot.SafetyLevel
 	s.guard.SetPermissionLevel(s.safetyLevel)
 	s.contextLevel = snapshot.ContextLevel
+	s.userPromptSettings = snapshot.UserPromptSettings
+	s.mcpServers = normalizeMCPServerConfigs(snapshot.MCPServers)
+	s.skills = normalizeSkillConfigs(snapshot.Skills)
 }
 
 func (s *Service) saveConfig() error {
 	return NewProviderConfigStoreWithLanguage(s.configDir, s.secretStore, s.serviceLanguageLocked()).Save(ProviderConfigStoreSnapshot{
-		Providers:      s.providers,
-		ActiveProvider: s.activeProvider,
-		SafetyLevel:    s.safetyLevel,
-		ContextLevel:   s.contextLevel,
+		Providers:          s.providers,
+		ActiveProvider:     s.activeProvider,
+		SafetyLevel:        s.safetyLevel,
+		ContextLevel:       s.contextLevel,
+		UserPromptSettings: s.userPromptSettings,
+		MCPServers:         s.mcpServers,
+		Skills:             s.skills,
 	})
 }
 
+const maxUserPromptChars = 16000
+
+func normalizeUserPromptSettings(settings ai.UserPromptSettings) ai.UserPromptSettings {
+	return ai.UserPromptSettings{
+		Global:        normalizeUserPromptText(settings.Global),
+		Database:      normalizeUserPromptText(settings.Database),
+		JVM:           normalizeUserPromptText(settings.JVM),
+		JVMDiagnostic: normalizeUserPromptText(settings.JVMDiagnostic),
+	}
+}
+
+func normalizeUserPromptText(value string) string {
+	normalized := strings.ReplaceAll(value, "\r\n", "\n")
+	normalized = strings.TrimSpace(normalized)
+	if len(normalized) > maxUserPromptChars {
+		return normalized[:maxUserPromptChars]
+	}
+	return normalized
+}
+
 // --- 会话文件持久化 ---
 
 // sessionFileData 会话文件的 JSON 结构
diff --git a/internal/ai/service/service_test.go b/internal/ai/service/service_test.go
index 0bb6159..0d3be50 100644
--- a/internal/ai/service/service_test.go
+++ b/internal/ai/service/service_test.go
@@ -80,13 +80,9 @@ func TestDefaultStaticModelsForProvider_ReturnsMiniMaxAnthropicModels(t *testing
 		BaseURL: "https://api.minimaxi.com/anthropic",
 	})
 	expected := []string{
+		"MiniMax-M3",
 		"MiniMax-M2.7",
 		"MiniMax-M2.7-highspeed",
-		"MiniMax-M2.5",
-		"MiniMax-M2.5-highspeed",
-		"MiniMax-M2.1",
-		"MiniMax-M2.1-highspeed",
-		"MiniMax-M2",
 	}
 	if !reflect.DeepEqual(models, expected) {
 		t.Fatalf("expected MiniMax static models %v, got %v", expected, models)
diff --git a/internal/ai/types.go b/internal/ai/types.go
index 9a58684..c296e50 100644
--- a/internal/ai/types.go
+++ b/internal/ai/types.go
@@ -86,6 +86,127 @@ type ProviderConfig struct {
 	Temperature float64           `json:"temperature"`
 }
 
+// UserPromptSettings 表示用户级自定义提示词配置
+type UserPromptSettings struct {
+	Global        string `json:"global"`
+	Database      string `json:"database"`
+	JVM           string `json:"jvm"`
+	JVMDiagnostic string `json:"jvmDiagnostic"`
+}
+
+// MCPTransport 表示 MCP 服务的传输方式
+type MCPTransport string
+
+const (
+	MCPTransportStdio MCPTransport = "stdio"
+)
+
+// MCPServerConfig 表示一个可配置的 MCP 服务
+type MCPServerConfig struct {
+	ID             string            `json:"id"`
+	Name           string            `json:"name"`
+	Transport      MCPTransport      `json:"transport"`
+	Command        string            `json:"command"`
+	Args           []string          `json:"args,omitempty"`
+	Env            map[string]string `json:"env,omitempty"`
+	Enabled        bool              `json:"enabled"`
+	TimeoutSeconds int               `json:"timeoutSeconds"`
+}
+
+// MCPToolDescriptor 表示暴露给模型和前端的 MCP 工具描述
+type MCPToolDescriptor struct {
+	Alias        string         `json:"alias"`
+	ServerID     string         `json:"serverId"`
+	ServerName   string         `json:"serverName"`
+	OriginalName string         `json:"originalName"`
+	Title        string         `json:"title,omitempty"`
+	Description  string         `json:"description,omitempty"`
+	InputSchema  map[string]any `json:"inputSchema,omitempty"`
+}
+
+// MCPToolCallResult 表示一次 MCP 工具调用的结果
+type MCPToolCallResult struct {
+	Alias             string `json:"alias"`
+	ServerID          string `json:"serverId"`
+	ServerName        string `json:"serverName"`
+	OriginalName      string `json:"originalName"`
+	Title             string `json:"title,omitempty"`
+	Content           string `json:"content"`
+	StructuredContent any    `json:"structuredContent,omitempty"`
+	IsError           bool   `json:"isError"`
+}
+
+// MCPClientInstallResult 表示安装 GoNavi 到外部 MCP 客户端配置文件的结果。
+type MCPClientInstallResult struct {
+	Success    bool     `json:"success"`
+	Client     string   `json:"client,omitempty"`
+	Message    string   `json:"message"`
+	ConfigPath string   `json:"configPath,omitempty"`
+	Command    string   `json:"command,omitempty"`
+	Args       []string `json:"args,omitempty"`
+}
+
+// MCPClientInstallStatus 表示 GoNavi MCP 在外部客户端中的当前安装状态。
+type MCPClientInstallStatus struct {
+	Client         string   `json:"client"`
+	DisplayName    string   `json:"displayName"`
+	InstallMode    string   `json:"installMode,omitempty"`
+	Installed      bool     `json:"installed"`
+	MatchesCurrent bool     `json:"matchesCurrent"`
+	ClientDetected bool     `json:"clientDetected"`
+	ClientCommand  string   `json:"clientCommand,omitempty"`
+	ClientPath     string   `json:"clientPath,omitempty"`
+	Message        string   `json:"message"`
+	ConfigPath     string   `json:"configPath,omitempty"`
+	Command        string   `json:"command,omitempty"`
+	Args           []string `json:"args,omitempty"`
+}
+
+// MCPHTTPServerOptions 表示从客户端启动 GoNavi Streamable HTTP MCP 的参数。
+type MCPHTTPServerOptions struct {
+	Addr       string `json:"addr,omitempty"`
+	Path       string `json:"path,omitempty"`
+	Token      string `json:"token,omitempty"`
+	SchemaOnly bool   `json:"schemaOnly"`
+}
+
+// MCPHTTPServerStatus 表示客户端内置 HTTP MCP 服务运行状态。
+type MCPHTTPServerStatus struct {
+	Running             bool   `json:"running"`
+	Addr                string `json:"addr"`
+	Path                string `json:"path"`
+	URL                 string `json:"url"`
+	SchemaOnly          bool   `json:"schemaOnly"`
+	Token               string `json:"token,omitempty"`
+	AuthorizationHeader string `json:"authorizationHeader,omitempty"`
+	StartedAt           int64  `json:"startedAt,omitempty"`
+	Message             string `json:"message"`
+}
+
+// ClaudeCodeMCPInstallResult 兼容旧命名，便于平滑迁移到通用结果类型。
+type ClaudeCodeMCPInstallResult = MCPClientInstallResult
+
+// SkillScope 表示 Skill 的适用场景
+type SkillScope string
+
+const (
+	SkillScopeGlobal        SkillScope = "global"
+	SkillScopeDatabase      SkillScope = "database"
+	SkillScopeJVM           SkillScope = "jvm"
+	SkillScopeJVMDiagnostic SkillScope = "jvmDiagnostic"
+)
+
+// SkillConfig 表示一个可配置的 Skill
+type SkillConfig struct {
+	ID            string   `json:"id"`
+	Name          string   `json:"name"`
+	Description   string   `json:"description,omitempty"`
+	SystemPrompt  string   `json:"systemPrompt"`
+	Enabled       bool     `json:"enabled"`
+	Scopes        []string `json:"scopes,omitempty"`
+	RequiredTools []string `json:"requiredTools,omitempty"`
+}
+
 // SQLPermissionLevel AI SQL 执行权限级别
 type SQLPermissionLevel string
 
diff --git a/internal/app/app.go b/internal/app/app.go
index 1899a8b..57603b4 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -37,11 +37,14 @@ const (
 var (
 	newDatabaseFunc                = db.NewDatabase
 	resolveDialConfigWithProxyFunc = resolveDialConfigWithProxy
+	driverRuntimeSupportStatusFunc = db.DriverRuntimeSupportStatus
+	verifyDriverAgentRevisionFunc  = verifyRuntimeOptionalDriverAgentRevision
 )
 
 type cachedDatabase struct {
 	inst     db.Database
 	lastPing time.Time
+	config   connection.ConnectionConfig
 }
 
 type cachedConnectFailure struct {
@@ -54,6 +57,17 @@ type queryContext struct {
 	started time.Time
 }
 
+type managedSQLTransaction struct {
+	id          string
+	execer      db.StatementExecer
+	transactor  db.TransactionExecer
+	cancel      context.CancelFunc
+	dbType      string
+	commitSQL   string
+	rollbackSQL string
+	createdAt   time.Time
+}
+
 // App struct
 type App struct {
 	ctx                context.Context
@@ -69,6 +83,8 @@ type App struct {
 	configDir          string
 	secretStore        secretstore.SecretStore
 	runningQueries     map[string]queryContext // queryID -> cancelFunc and start time
+	sqlTransactionMu   sync.Mutex
+	sqlTransactions    map[string]*managedSQLTransaction
 	jvmPreviewTokenMu  sync.Mutex
 	jvmPreviewTokens   map[string]jvmPreviewConfirmationToken
 	jvmPreviewTokenTTL time.Duration
@@ -87,6 +103,7 @@ func NewAppWithSecretStore(store secretstore.SecretStore) *App {
 		dbCache:            make(map[string]cachedDatabase),
 		connectFailures:    make(map[string]cachedConnectFailure),
 		runningQueries:     make(map[string]queryContext),
+		sqlTransactions:    make(map[string]*managedSQLTransaction),
 		configDir:          resolveAppConfigDir(),
 		secretStore:        store,
 		localizer:          newAppLocalizer(),
@@ -213,9 +230,10 @@ func (a *App) LogWindowDiagnostic(stage string, payload string) {
 	logger.Warnf("窗口诊断：stage=%s payload=%s", stage, payload)
 }
 
-// Shutdown is called when the app terminates
-func (a *App) Shutdown(ctx context.Context) {
+// Shutdown is called when the app terminates.
+func (a *App) Shutdown() {
 	logger.Infof("应用开始关闭，准备释放资源")
+	a.rollbackPendingSQLTransactionsOnShutdown()
 	a.mu.Lock()
 	defer a.mu.Unlock()
 	for _, dbInst := range a.dbCache {
@@ -223,6 +241,7 @@ func (a *App) Shutdown(ctx context.Context) {
 			logger.Error(err, "关闭数据库连接失败")
 		}
 	}
+	a.dbCache = make(map[string]cachedDatabase)
 	proxytunnel.CloseAllForwarders()
 	// Close all Redis connections
 	CloseAllRedisClients()
@@ -287,6 +306,9 @@ func normalizeCacheKeyConfig(config connection.ConnectionConfig) connection.Conn
 		normalized.ConnectionParams = ""
 		normalized.Hosts = nil
 		normalized.Topology = ""
+		normalized.RedisSentinelMaster = ""
+		normalized.RedisSentinelUser = ""
+		normalized.RedisSentinelPassword = ""
 		normalized.MySQLReplicaUser = ""
 		normalized.MySQLReplicaPassword = ""
 		normalized.ReplicaSet = ""
@@ -322,6 +344,20 @@ func getCacheKey(config connection.ConnectionConfig) string {
 	return hex.EncodeToString(sum[:])
 }
 
+func normalizeConnectionReleaseMatchConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
+	normalized := normalizeCacheKeyConfig(config)
+	normalized.Database = ""
+	normalized.RedisDB = 0
+	return normalized
+}
+
+func getConnectionReleaseMatchKey(config connection.ConnectionConfig) string {
+	normalized := normalizeConnectionReleaseMatchConfig(config)
+	b, _ := json.Marshal(normalized)
+	sum := sha256.Sum256(b)
+	return hex.EncodeToString(sum[:])
+}
+
 func shortCacheKey(cacheKey string) string {
 	shortKey := cacheKey
 	if len(shortKey) > 12 {
@@ -607,13 +643,13 @@ func (a *App) openDatabaseIsolated(config connection.ConnectionConfig) (db.Datab
 		return nil, wrapConnectError(config, err)
 	}
 	effectiveConfig := applyGlobalProxyToConnection(resolvedConfig)
-	if supported, reason := db.DriverRuntimeSupportStatus(effectiveConfig.Type); !supported {
+	if supported, reason := driverRuntimeSupportStatusFunc(effectiveConfig.Type); !supported {
 		if strings.TrimSpace(reason) == "" {
 			reason = fmt.Sprintf("%s 驱动未启用，请先在驱动管理中安装启用", strings.TrimSpace(effectiveConfig.Type))
 		}
 		return nil, withLogHint{err: fmt.Errorf("%s", reason), logPath: logger.Path()}
 	}
-	if revisionErr := verifyRuntimeOptionalDriverAgentRevision(effectiveConfig); revisionErr != nil {
+	if revisionErr := verifyDriverAgentRevisionFunc(effectiveConfig); revisionErr != nil {
 		return nil, withLogHint{err: revisionErr, logPath: logger.Path()}
 	}
 
@@ -651,7 +687,7 @@ func (a *App) getDatabaseWithPing(config connection.ConnectionConfig, forcePing
 			strings.TrimSpace(effectiveConfig.Type), rawDSN, normalizedDSN, effectiveConfig.Timeout, forcePing, shortKey)
 	}
 
-	if supported, reason := db.DriverRuntimeSupportStatus(effectiveConfig.Type); !supported {
+	if supported, reason := driverRuntimeSupportStatusFunc(effectiveConfig.Type); !supported {
 		if strings.TrimSpace(reason) == "" {
 			reason = fmt.Sprintf("%s 驱动未启用，请先在驱动管理中安装启用", strings.TrimSpace(effectiveConfig.Type))
 		}
@@ -728,7 +764,7 @@ func (a *App) getDatabaseWithPing(config connection.ConnectionConfig, forcePing
 			formatConnSummary(effectiveConfig), shortKey, formatConnectFailureCooldown(remaining), normalizeErrorMessage(failure.err))
 		return nil, withLogHint{err: fmt.Errorf("%s", message), logPath: logger.Path()}
 	}
-	if revisionErr := verifyRuntimeOptionalDriverAgentRevision(effectiveConfig); revisionErr != nil {
+	if revisionErr := verifyDriverAgentRevisionFunc(effectiveConfig); revisionErr != nil {
 		return nil, withLogHint{err: revisionErr, logPath: logger.Path()}
 	}
 
@@ -757,7 +793,7 @@ func (a *App) getDatabaseWithPing(config connection.ConnectionConfig, forcePing
 		}
 		return existing.inst, nil
 	}
-	a.dbCache[key] = cachedDatabase{inst: dbInst, lastPing: now}
+	a.dbCache[key] = cachedDatabase{inst: dbInst, lastPing: now, config: normalizeCacheKeyConfig(effectiveConfig)}
 	a.mu.Unlock()
 
 	logger.Infof("数据库连接成功并写入缓存：%s 缓存Key=%s", formatConnSummary(effectiveConfig), shortKey)
@@ -834,15 +870,31 @@ func verifyRuntimeOptionalDriverAgentRevision(config connection.ConnectionConfig
 	if packageMetaExists {
 		selectedVersion = strings.TrimSpace(pkg.Version)
 	}
-	agentRevision, err := verifyInstalledOptionalDriverAgentRevision(driverType, executablePath, selectedVersion)
+	if !shouldVerifyOptionalDriverAgentRevision(driverType, selectedVersion) {
+		return nil
+	}
+	expectedRevision := strings.TrimSpace(db.OptionalDriverAgentRevision(driverType))
+	if expectedRevision == "" {
+		return nil
+	}
+	displayName := resolveDriverDisplayName(driverDefinition{Type: driverType})
+	agentRevision, current, err := optionalDriverAgentRevisionCurrent(driverType, executablePath)
 	if err != nil {
-		return err
+		logger.Warnf("%s driver-agent revision 元数据不可用，继续使用已安装代理：version=%s path=%s err=%v；建议在驱动管理中重装",
+			displayName, selectedVersion, executablePath, err)
+		return nil
 	}
-	if expectedRevision := strings.TrimSpace(db.OptionalDriverAgentRevision(driverType)); expectedRevision != "" {
-		displayName := resolveDriverDisplayName(driverDefinition{Type: driverType})
-		logger.Infof("%s driver-agent revision 校验通过：已安装=%s 当前需要=%s version=%s path=%s",
-			displayName, strings.TrimSpace(agentRevision), expectedRevision, selectedVersion, executablePath)
+	if !current {
+		actualLabel := strings.TrimSpace(agentRevision)
+		if actualLabel == "" {
+			actualLabel = "空"
+		}
+		logger.Warnf("%s driver-agent revision 不匹配，继续使用已安装代理：已安装=%s 当前需要=%s version=%s path=%s；建议在驱动管理中重装",
+			displayName, actualLabel, expectedRevision, selectedVersion, executablePath)
+		return nil
 	}
+	logger.Infof("%s driver-agent revision 校验通过：已安装=%s 当前需要=%s version=%s path=%s",
+		displayName, strings.TrimSpace(agentRevision), expectedRevision, selectedVersion, executablePath)
 	return nil
 }
 
diff --git a/internal/app/connection_package_appkey.go b/internal/app/connection_package_appkey.go
index eb9e45f..0ba467d 100644
--- a/internal/app/connection_package_appkey.go
+++ b/internal/app/connection_package_appkey.go
@@ -143,6 +143,10 @@ func encryptSecretBundle(appKey []byte, bundle connectionSecretBundle, connectio
 	if err != nil {
 		return connectionSecretBundle{}, err
 	}
+	encrypted.RedisSentinelPassword, err = encryptSecretField(appKey, bundle.RedisSentinelPassword, connectionID)
+	if err != nil {
+		return connectionSecretBundle{}, err
+	}
 	encrypted.OpaqueURI, err = encryptSecretField(appKey, bundle.OpaqueURI, connectionID)
 	if err != nil {
 		return connectionSecretBundle{}, err
@@ -183,6 +187,10 @@ func decryptSecretBundle(appKey []byte, bundle connectionSecretBundle, connectio
 	if err != nil {
 		return connectionSecretBundle{}, err
 	}
+	decrypted.RedisSentinelPassword, err = decryptSecretField(appKey, bundle.RedisSentinelPassword, connectionID)
+	if err != nil {
+		return connectionSecretBundle{}, err
+	}
 	decrypted.OpaqueURI, err = decryptSecretField(appKey, bundle.OpaqueURI, connectionID)
 	if err != nil {
 		return connectionSecretBundle{}, err
diff --git a/internal/app/connection_package_appkey_test.go b/internal/app/connection_package_appkey_test.go
index 619bb84..77f668d 100644
--- a/internal/app/connection_package_appkey_test.go
+++ b/internal/app/connection_package_appkey_test.go
@@ -89,14 +89,15 @@ func TestDecryptSecretFieldRejectsAADMismatch(t *testing.T) {
 func TestEncryptSecretBundleRoundTripAndAADBinding(t *testing.T) {
 	appKey := []byte("0123456789abcdef0123456789abcdef")
 	plain := connectionSecretBundle{
-		Password:             "primary-secret",
-		SSHPassword:          "ssh-secret",
-		ProxyPassword:        "proxy-secret",
-		HTTPTunnelPassword:   "http-secret",
-		MySQLReplicaPassword: "mysql-secret",
-		MongoReplicaPassword: "mongo-secret",
-		OpaqueURI:            "postgres://user:pass@db.local/app",
-		OpaqueDSN:            "server=db.local;password=secret",
+		Password:              "primary-secret",
+		SSHPassword:           "ssh-secret",
+		ProxyPassword:         "proxy-secret",
+		HTTPTunnelPassword:    "http-secret",
+		MySQLReplicaPassword:  "mysql-secret",
+		MongoReplicaPassword:  "mongo-secret",
+		RedisSentinelPassword: "sentinel-secret",
+		OpaqueURI:             "postgres://user:pass@db.local/app",
+		OpaqueDSN:             "server=db.local;password=secret",
 	}
 
 	encrypted, err := encryptSecretBundle(appKey, plain, "conn-1")
@@ -105,14 +106,15 @@ func TestEncryptSecretBundleRoundTripAndAADBinding(t *testing.T) {
 	}
 
 	for name, value := range map[string]string{
-		"password":             encrypted.Password,
-		"sshPassword":          encrypted.SSHPassword,
-		"proxyPassword":        encrypted.ProxyPassword,
-		"httpTunnelPassword":   encrypted.HTTPTunnelPassword,
-		"mysqlReplicaPassword": encrypted.MySQLReplicaPassword,
-		"mongoReplicaPassword": encrypted.MongoReplicaPassword,
-		"opaqueURI":            encrypted.OpaqueURI,
-		"opaqueDSN":            encrypted.OpaqueDSN,
+		"password":              encrypted.Password,
+		"sshPassword":           encrypted.SSHPassword,
+		"proxyPassword":         encrypted.ProxyPassword,
+		"httpTunnelPassword":    encrypted.HTTPTunnelPassword,
+		"mysqlReplicaPassword":  encrypted.MySQLReplicaPassword,
+		"mongoReplicaPassword":  encrypted.MongoReplicaPassword,
+		"redisSentinelPassword": encrypted.RedisSentinelPassword,
+		"opaqueURI":             encrypted.OpaqueURI,
+		"opaqueDSN":             encrypted.OpaqueDSN,
 	} {
 		if value == "" {
 			t.Fatalf("expected encrypted %s field to be populated", name)
@@ -122,6 +124,7 @@ func TestEncryptSecretBundleRoundTripAndAADBinding(t *testing.T) {
 		}
 		if value == plain.Password || value == plain.SSHPassword || value == plain.ProxyPassword ||
 			value == plain.HTTPTunnelPassword || value == plain.MySQLReplicaPassword || value == plain.MongoReplicaPassword ||
+			value == plain.RedisSentinelPassword ||
 			value == plain.OpaqueURI || value == plain.OpaqueDSN {
 			t.Fatalf("expected encrypted %s field to differ from plaintext", name)
 		}
diff --git a/internal/app/connection_package_crypto_test.go b/internal/app/connection_package_crypto_test.go
index 57d3748..3bfee32 100644
--- a/internal/app/connection_package_crypto_test.go
+++ b/internal/app/connection_package_crypto_test.go
@@ -150,14 +150,15 @@ func TestConnectionPackageV2ProtectedRoundTrip(t *testing.T) {
 					Database: "app",
 				},
 				Secrets: connectionSecretBundle{
-					Password:             "primary-secret",
-					SSHPassword:          "ssh-secret",
-					ProxyPassword:        "proxy-secret",
-					HTTPTunnelPassword:   "http-secret",
-					MySQLReplicaPassword: "mysql-secret",
-					MongoReplicaPassword: "mongo-secret",
-					OpaqueURI:            "mysql://root:primary-secret@tcp(db.local:3306)/app",
-					OpaqueDSN:            "root:primary-secret@tcp(db.local:3306)/app",
+					Password:              "primary-secret",
+					SSHPassword:           "ssh-secret",
+					ProxyPassword:         "proxy-secret",
+					HTTPTunnelPassword:    "http-secret",
+					MySQLReplicaPassword:  "mysql-secret",
+					MongoReplicaPassword:  "mongo-secret",
+					RedisSentinelPassword: "sentinel-secret",
+					OpaqueURI:             "mysql://root:primary-secret@tcp(db.local:3306)/app",
+					OpaqueDSN:             "root:primary-secret@tcp(db.local:3306)/app",
 				},
 			},
 		},
diff --git a/internal/app/connection_package_transfer.go b/internal/app/connection_package_transfer.go
index 18a07d0..767116b 100644
--- a/internal/app/connection_package_transfer.go
+++ b/internal/app/connection_package_transfer.go
@@ -95,6 +95,7 @@ func newSavedConnectionInputFromPackageItem(item connectionPackageItem) connecti
 	config.HTTPTunnel.Password = secrets.HTTPTunnelPassword
 	config.MySQLReplicaPassword = secrets.MySQLReplicaPassword
 	config.MongoReplicaPassword = secrets.MongoReplicaPassword
+	config.RedisSentinelPassword = secrets.RedisSentinelPassword
 	config.URI = secrets.OpaqueURI
 	config.DSN = secrets.OpaqueDSN
 
@@ -107,14 +108,15 @@ func newSavedConnectionInputFromPackageItem(item connectionPackageItem) connecti
 		IconType:              item.IconType,
 		IconColor:             item.IconColor,
 		// 连接恢复包以最新导入文件为准；载荷中缺失的密文字段需要显式清空旧值。
-		ClearPrimaryPassword:      strings.TrimSpace(secrets.Password) == "",
-		ClearSSHPassword:          strings.TrimSpace(secrets.SSHPassword) == "",
-		ClearProxyPassword:        strings.TrimSpace(secrets.ProxyPassword) == "",
-		ClearHTTPTunnelPassword:   strings.TrimSpace(secrets.HTTPTunnelPassword) == "",
-		ClearMySQLReplicaPassword: strings.TrimSpace(secrets.MySQLReplicaPassword) == "",
-		ClearMongoReplicaPassword: strings.TrimSpace(secrets.MongoReplicaPassword) == "",
-		ClearOpaqueURI:            strings.TrimSpace(secrets.OpaqueURI) == "",
-		ClearOpaqueDSN:            strings.TrimSpace(secrets.OpaqueDSN) == "",
+		ClearPrimaryPassword:       strings.TrimSpace(secrets.Password) == "",
+		ClearSSHPassword:           strings.TrimSpace(secrets.SSHPassword) == "",
+		ClearProxyPassword:         strings.TrimSpace(secrets.ProxyPassword) == "",
+		ClearHTTPTunnelPassword:    strings.TrimSpace(secrets.HTTPTunnelPassword) == "",
+		ClearMySQLReplicaPassword:  strings.TrimSpace(secrets.MySQLReplicaPassword) == "",
+		ClearMongoReplicaPassword:  strings.TrimSpace(secrets.MongoReplicaPassword) == "",
+		ClearRedisSentinelPassword: strings.TrimSpace(secrets.RedisSentinelPassword) == "",
+		ClearOpaqueURI:             strings.TrimSpace(secrets.OpaqueURI) == "",
+		ClearOpaqueDSN:             strings.TrimSpace(secrets.OpaqueDSN) == "",
 	}
 }
 
@@ -285,6 +287,21 @@ func (a *App) ImportConnectionsPayload(raw string, password string) ([]connectio
 		return sanitizeSavedConnectionViews(views), nil
 	}
 
+	if isNavicatNCX(trimmed) {
+		inputs, err := parseNavicatNCX(trimmed)
+		if err != nil {
+			return nil, fmt.Errorf("解析 Navicat NCX 失败: %w", err)
+		}
+		if len(inputs) == 0 {
+			return nil, fmt.Errorf("未在 Navicat NCX 中找到 GoNavi 支持的有效连接配置")
+		}
+		views, err := a.importSavedConnectionsAtomically(inputs)
+		if err != nil {
+			return nil, err
+		}
+		return sanitizeSavedConnectionViews(views), nil
+	}
+
 	var legacy []connection.LegacySavedConnection
 	if err := json.Unmarshal([]byte(trimmed), &legacy); err != nil {
 		return nil, errConnectionPackageUnsupported
diff --git a/internal/app/connection_secret_resolution.go b/internal/app/connection_secret_resolution.go
index b923f11..e00f41f 100644
--- a/internal/app/connection_secret_resolution.go
+++ b/internal/app/connection_secret_resolution.go
@@ -59,6 +59,7 @@ func connectionConfigCarriesInlineSecrets(config connection.ConnectionConfig) bo
 		strings.TrimSpace(config.HTTPTunnel.Password) != "" ||
 		strings.TrimSpace(config.MySQLReplicaPassword) != "" ||
 		strings.TrimSpace(config.MongoReplicaPassword) != "" ||
+		strings.TrimSpace(config.RedisSentinelPassword) != "" ||
 		strings.TrimSpace(config.URI) != "" ||
 		strings.TrimSpace(config.DSN) != ""
 }
@@ -83,6 +84,9 @@ func mergeInlineConnectionSecrets(base connection.ConnectionConfig, inline conne
 	if strings.TrimSpace(inline.MongoReplicaPassword) != "" {
 		merged.MongoReplicaPassword = inline.MongoReplicaPassword
 	}
+	if strings.TrimSpace(inline.RedisSentinelPassword) != "" {
+		merged.RedisSentinelPassword = inline.RedisSentinelPassword
+	}
 	if strings.TrimSpace(inline.URI) != "" {
 		merged.URI = inline.URI
 	}
@@ -144,6 +148,9 @@ func mergeConnectionSecretBundleIntoConfig(config connection.ConnectionConfig, b
 	if strings.TrimSpace(merged.MongoReplicaPassword) == "" {
 		merged.MongoReplicaPassword = bundle.MongoReplicaPassword
 	}
+	if strings.TrimSpace(merged.RedisSentinelPassword) == "" {
+		merged.RedisSentinelPassword = bundle.RedisSentinelPassword
+	}
 	if strings.TrimSpace(merged.URI) == "" {
 		merged.URI = bundle.OpaqueURI
 	}
diff --git a/internal/app/connection_secret_resolution_test.go b/internal/app/connection_secret_resolution_test.go
index 0569722..d6ecaac 100644
--- a/internal/app/connection_secret_resolution_test.go
+++ b/internal/app/connection_secret_resolution_test.go
@@ -42,6 +42,44 @@ func TestResolveConnectionConfigByIDLoadsSecretsFromStore(t *testing.T) {
 	}
 }
 
+func TestResolveConnectionConfigByIDLoadsRedisSentinelPasswordFromStore(t *testing.T) {
+	store := newFakeAppSecretStore()
+	app := NewAppWithSecretStore(store)
+	app.configDir = t.TempDir()
+
+	view, err := app.SaveConnection(connection.SavedConnectionInput{
+		ID:   "redis-sentinel",
+		Name: "Redis Sentinel",
+		Config: connection.ConnectionConfig{
+			ID:                    "redis-sentinel",
+			Type:                  "redis",
+			Host:                  "sentinel.local",
+			Port:                  26379,
+			Topology:              "sentinel",
+			RedisSentinelMaster:   "mymaster",
+			RedisSentinelUser:     "sentinel-user",
+			RedisSentinelPassword: "sentinel-secret",
+		},
+	})
+	if err != nil {
+		t.Fatalf("SaveConnection returned error: %v", err)
+	}
+	if view.Config.RedisSentinelPassword != "" {
+		t.Fatal("saved metadata must not expose Redis Sentinel password")
+	}
+	if !view.HasRedisSentinelPassword {
+		t.Fatal("expected saved view to report Redis Sentinel password")
+	}
+
+	resolved, err := app.resolveConnectionSecrets(view.Config)
+	if err != nil {
+		t.Fatalf("resolveConnectionSecrets returned error: %v", err)
+	}
+	if resolved.RedisSentinelPassword != "sentinel-secret" {
+		t.Fatalf("expected restored Redis Sentinel password, got %q", resolved.RedisSentinelPassword)
+	}
+}
+
 func TestResolveConnectionSecretsOnDarwinUsesInlineSavedSecrets(t *testing.T) {
 	app := NewAppWithSecretStore(failOnUseSecretStore{})
 	app.configDir = t.TempDir()
diff --git a/internal/app/daily_secret_persistence.go b/internal/app/daily_secret_persistence.go
index ffcbb8a..dfb362e 100644
--- a/internal/app/daily_secret_persistence.go
+++ b/internal/app/daily_secret_persistence.go
@@ -13,40 +13,43 @@ var runtimeGOOS = func() string {
 
 func extractConnectionSecretBundle(config connection.ConnectionConfig) connectionSecretBundle {
 	return connectionSecretBundle{
-		Password:             config.Password,
-		SSHPassword:          config.SSH.Password,
-		ProxyPassword:        config.Proxy.Password,
-		HTTPTunnelPassword:   config.HTTPTunnel.Password,
-		MySQLReplicaPassword: config.MySQLReplicaPassword,
-		MongoReplicaPassword: config.MongoReplicaPassword,
-		OpaqueURI:            config.URI,
-		OpaqueDSN:            config.DSN,
+		Password:              config.Password,
+		SSHPassword:           config.SSH.Password,
+		ProxyPassword:         config.Proxy.Password,
+		HTTPTunnelPassword:    config.HTTPTunnel.Password,
+		MySQLReplicaPassword:  config.MySQLReplicaPassword,
+		MongoReplicaPassword:  config.MongoReplicaPassword,
+		RedisSentinelPassword: config.RedisSentinelPassword,
+		OpaqueURI:             config.URI,
+		OpaqueDSN:             config.DSN,
 	}
 }
 
 func toDailyConnectionBundle(bundle connectionSecretBundle) dailysecret.ConnectionBundle {
 	return dailysecret.ConnectionBundle{
-		Password:             bundle.Password,
-		SSHPassword:          bundle.SSHPassword,
-		ProxyPassword:        bundle.ProxyPassword,
-		HTTPTunnelPassword:   bundle.HTTPTunnelPassword,
-		MySQLReplicaPassword: bundle.MySQLReplicaPassword,
-		MongoReplicaPassword: bundle.MongoReplicaPassword,
-		OpaqueURI:            bundle.OpaqueURI,
-		OpaqueDSN:            bundle.OpaqueDSN,
+		Password:              bundle.Password,
+		SSHPassword:           bundle.SSHPassword,
+		ProxyPassword:         bundle.ProxyPassword,
+		HTTPTunnelPassword:    bundle.HTTPTunnelPassword,
+		MySQLReplicaPassword:  bundle.MySQLReplicaPassword,
+		MongoReplicaPassword:  bundle.MongoReplicaPassword,
+		RedisSentinelPassword: bundle.RedisSentinelPassword,
+		OpaqueURI:             bundle.OpaqueURI,
+		OpaqueDSN:             bundle.OpaqueDSN,
 	}
 }
 
 func fromDailyConnectionBundle(bundle dailysecret.ConnectionBundle) connectionSecretBundle {
 	return connectionSecretBundle{
-		Password:             bundle.Password,
-		SSHPassword:          bundle.SSHPassword,
-		ProxyPassword:        bundle.ProxyPassword,
-		HTTPTunnelPassword:   bundle.HTTPTunnelPassword,
-		MySQLReplicaPassword: bundle.MySQLReplicaPassword,
-		MongoReplicaPassword: bundle.MongoReplicaPassword,
-		OpaqueURI:            bundle.OpaqueURI,
-		OpaqueDSN:            bundle.OpaqueDSN,
+		Password:              bundle.Password,
+		SSHPassword:           bundle.SSHPassword,
+		ProxyPassword:         bundle.ProxyPassword,
+		HTTPTunnelPassword:    bundle.HTTPTunnelPassword,
+		MySQLReplicaPassword:  bundle.MySQLReplicaPassword,
+		MongoReplicaPassword:  bundle.MongoReplicaPassword,
+		RedisSentinelPassword: bundle.RedisSentinelPassword,
+		OpaqueURI:             bundle.OpaqueURI,
+		OpaqueDSN:             bundle.OpaqueDSN,
 	}
 }
 
@@ -58,6 +61,7 @@ func stripConnectionSecretFields(config connection.ConnectionConfig) connection.
 	stripped.HTTPTunnel.Password = ""
 	stripped.MySQLReplicaPassword = ""
 	stripped.MongoReplicaPassword = ""
+	stripped.RedisSentinelPassword = ""
 	stripped.URI = ""
 	stripped.DSN = ""
 	return stripped
diff --git a/internal/app/db_context.go b/internal/app/db_context.go
index 3303e34..3930394 100644
--- a/internal/app/db_context.go
+++ b/internal/app/db_context.go
@@ -16,11 +16,17 @@ func normalizeRunConfig(config connection.ConnectionConfig, dbName string) conne
 	}
 
 	switch strings.ToLower(strings.TrimSpace(config.Type)) {
+	case "rocketmq", "rocket-mq", "rocket_mq", "apache-rocketmq", "apache_rocketmq", "rmq":
+		// RocketMQ 的 Database 字段表示默认 Topic，不能被树上的 synthetic database(topics) 覆盖。
+	case "mqtt", "mqtts":
+		// MQTT 的 Database 字段表示默认 Topic，不能被树上的 synthetic database(topics) 覆盖。
+	case "kafka", "apache-kafka", "apache_kafka":
+		// Kafka 的 Database 字段表示默认 Topic，不能被树上的 synthetic database(topics) 覆盖。
 	case "oceanbase":
 		if !isOceanBaseOracleProtocol(config) {
 			runConfig.Database = name
 		}
-	case "mysql", "mariadb", "diros", "starrocks", "sphinx", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "sqlserver", "iris", "intersystems", "intersystemsiris", "inter-systems", "inter-systems-iris", "mongodb", "tdengine", "clickhouse":
+	case "mysql", "mariadb", "goldendb", "greatdb", "gdb", "diros", "starrocks", "sphinx", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver", "iris", "intersystems", "intersystemsiris", "inter-systems", "inter-systems-iris", "mongodb", "tdengine", "iotdb", "clickhouse", "rabbitmq", "rabbit-mq", "rabbit_mq":
 		// 这些类型的 dbName 表示"数据库"，需要写入连接配置以选择目标库。
 		runConfig.Database = name
 	case "dameng":
@@ -28,7 +34,7 @@ func normalizeRunConfig(config connection.ConnectionConfig, dbName string) conne
 		runConfig.Database = name
 	case "redis":
 		runConfig.Database = name
-		if idx, err := strconv.Atoi(name); err == nil && idx >= 0 && idx <= 15 {
+		if idx, err := strconv.Atoi(name); err == nil && idx >= 0 {
 			runConfig.RedisDB = idx
 		}
 	default:
@@ -48,6 +54,13 @@ func normalizeSchemaAndTable(config connection.ConnectionConfig, dbName string,
 	}
 
 	dbType := resolveDDLDBType(config)
+
+	// Elasticsearch：索引名可能含多个点（如 iot_pro_biz_operate_log.index.20240626），
+	// 不能按点分割，直接返回原始数据库名和完整表名。
+	if dbType == "elasticsearch" || dbType == "iotdb" || dbType == "rocketmq" || dbType == "mqtt" || dbType == "kafka" || dbType == "rabbitmq" {
+		return rawDB, rawTable
+	}
+
 	if dbType == "sqlserver" {
 		// SQL Server 的 DB 接口约定：第一个参数是数据库名，schema 由 tableName(如 dbo.users) 自行解析。
 		// 不能把 schema(dbo) 传到第一个参数，否则会拼出 dbo.sys.columns 等无效对象名。
@@ -58,13 +71,17 @@ func normalizeSchemaAndTable(config connection.ConnectionConfig, dbName string,
 		return targetDB, rawTable
 	}
 
+	if dbType == "duckdb" {
+		return rawDB, rawTable
+	}
+
 	if dbType == "kingbase" {
 		schema, table := db.SplitKingbaseQualifiedName(rawTable)
 		if schema != "" && table != "" {
 			return schema, table
 		}
 		if table != "" {
-			return "public", table
+			return "", table
 		}
 	}
 
@@ -87,11 +104,37 @@ func normalizeSchemaAndTable(config connection.ConnectionConfig, dbName string,
 	}
 
 	switch dbType {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
-		// PG/金仓/瀚高/海量：dbName 在 UI 里是"数据库"，schema 需从 tableName 或使用默认 public。
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
+		// PG/金仓/瀚高/海量：dbName 在 UI 里是"数据库"，未限定 schema 的普通导出/DDL 路径沿用 public。
 		return "public", rawTable
 	default:
 		// MySQL：dbName 表示数据库；Oracle/达梦：dbName 表示 schema/owner。
 		return rawDB, rawTable
 	}
 }
+
+func normalizeMetadataSchemaAndTable(config connection.ConnectionConfig, dbName string, tableName string) (string, string) {
+	schema, table := normalizeSchemaAndTable(config, dbName, tableName)
+	switch resolveDDLDBType(config) {
+	case "rocketmq", "mqtt", "kafka", "rabbitmq":
+		return schema, table
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
+		rawTable := strings.TrimSpace(tableName)
+		if rawTable == "" {
+			return schema, table
+		}
+		parsedSchema, parsedTable := db.SplitSQLQualifiedName(rawTable)
+		if parsedTable != "" {
+			if parsedSchema != "" {
+				return parsedSchema, parsedTable
+			}
+			return "", parsedTable
+		}
+		if strings.Contains(rawTable, ".") {
+			return schema, table
+		}
+		return "", table
+	default:
+		return schema, table
+	}
+}
diff --git a/internal/app/db_context_test.go b/internal/app/db_context_test.go
index ee02ea7..31a11cd 100644
--- a/internal/app/db_context_test.go
+++ b/internal/app/db_context_test.go
@@ -62,6 +62,132 @@ func TestNormalizeSchemaAndTable_KingbaseNormalizesEscapedQualifiedName(t *testi
 	}
 }
 
+func TestNormalizeSchemaAndTable_KingbasePureTableUsesCurrentSearchPath(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeSchemaAndTable(connection.ConnectionConfig{
+		Type: "kingbase",
+	}, "demo_db", "users")
+
+	if schema != "" || table != "users" {
+		t.Fatalf("expected kingbase pure table to use current search_path, got %q.%q", schema, table)
+	}
+}
+
+func TestNormalizeSchemaAndTable_PGLikePureTableKeepsPublicFallback(t *testing.T) {
+	t.Parallel()
+
+	for _, dbType := range []string{"postgres", "highgo", "vastbase", "opengauss", "gaussdb"} {
+		t.Run(dbType, func(t *testing.T) {
+			t.Parallel()
+
+			schema, table := normalizeSchemaAndTable(connection.ConnectionConfig{
+				Type: dbType,
+			}, "demo_db", "users")
+
+			if schema != "public" || table != "users" {
+				t.Fatalf("expected %s pure table to keep public fallback, got %q.%q", dbType, schema, table)
+			}
+		})
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_PGLikePureTableUsesSearchPath(t *testing.T) {
+	t.Parallel()
+
+	for _, dbType := range []string{"postgres", "highgo", "vastbase", "opengauss", "gaussdb", "kingbase"} {
+		t.Run(dbType, func(t *testing.T) {
+			t.Parallel()
+
+			schema, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+				Type: dbType,
+			}, "demo_db", "users")
+
+			if schema != "" || table != "users" {
+				t.Fatalf("expected %s metadata pure table to use search_path, got %q.%q", dbType, schema, table)
+			}
+		})
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_PGLikeQualifiedTableKeepsSchema(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+		Type: "postgres",
+	}, "demo_db", `"audit.schema"."order.items"`)
+
+	if schema != "audit.schema" || table != "order.items" {
+		t.Fatalf("expected metadata qualified table to keep schema/table, got %q.%q", schema, table)
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_PGLikeDottedUnquotedTableKeepsFallback(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+		Type: "postgres",
+	}, "demo_db", "audit.users")
+
+	if schema != "audit" || table != "users" {
+		t.Fatalf("expected metadata dotted table to keep explicit schema, got %q.%q", schema, table)
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_PGLikeQuotedDottedTableUsesSearchPath(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+		Type: "postgres",
+	}, "demo_db", `"order.items"`)
+
+	if schema != "" || table != "order.items" {
+		t.Fatalf("expected quoted dotted metadata table to use search_path, got %q.%q", schema, table)
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_NonPGLikeKeepsNormalBehavior(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+		Type: "mysql",
+	}, "demo_db", "users")
+
+	if schema != "demo_db" || table != "users" {
+		t.Fatalf("expected mysql metadata to keep db/table behavior, got %q.%q", schema, table)
+	}
+}
+
+func TestNormalizeSchemaAndTable_PGLikePureTableStillSplitsKingbaseSearchPathOnlyInMetadata(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeSchemaAndTable(connection.ConnectionConfig{
+		Type: "kingbase",
+	}, "demo_db", "users")
+
+	if schema != "" || table != "users" {
+		t.Fatalf("expected kingbase normal path to keep existing search_path behavior, got %q.%q", schema, table)
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_PGLikePreservesNormalFallbackForQuotedQualifiedTable(t *testing.T) {
+	t.Parallel()
+
+	for _, dbType := range []string{"highgo", "vastbase", "opengauss", "gaussdb"} {
+		t.Run(dbType, func(t *testing.T) {
+			t.Parallel()
+
+			schema, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+				Type: dbType,
+			}, "demo_db", `"audit"."users"`)
+
+			if schema != "audit" || table != "users" {
+				t.Fatalf("expected %s metadata qualified table to keep schema, got %q.%q", dbType, schema, table)
+			}
+		})
+	}
+}
+
 func TestNormalizeRunConfig_OceanBaseOracleKeepsServiceName(t *testing.T) {
 	t.Parallel()
 
@@ -90,6 +216,19 @@ func TestNormalizeRunConfig_StarRocksUsesDatabaseFromTree(t *testing.T) {
 	}
 }
 
+func TestNormalizeRunConfig_GoldenDBUsesDatabaseFromTree(t *testing.T) {
+	t.Parallel()
+
+	runConfig := normalizeRunConfig(connection.ConnectionConfig{
+		Type:     "goldendb",
+		Database: "legacy_default",
+	}, "finance_core")
+
+	if runConfig.Database != "finance_core" {
+		t.Fatalf("expected GoldenDB database from tree, got %q", runConfig.Database)
+	}
+}
+
 func TestNormalizeRunConfig_IRISUsesNamespaceFromTree(t *testing.T) {
 	t.Parallel()
 
@@ -103,6 +242,32 @@ func TestNormalizeRunConfig_IRISUsesNamespaceFromTree(t *testing.T) {
 	}
 }
 
+func TestNormalizeRunConfig_RedisAllowsDatabaseIndexAboveDefault(t *testing.T) {
+	t.Parallel()
+
+	runConfig := normalizeRunConfig(connection.ConnectionConfig{
+		Type:    "redis",
+		RedisDB: 0,
+	}, "31")
+
+	if runConfig.Database != "31" || runConfig.RedisDB != 31 {
+		t.Fatalf("expected Redis db31 from tree, got database=%q redisDB=%d", runConfig.Database, runConfig.RedisDB)
+	}
+}
+
+func TestNormalizeRunConfig_KafkaKeepsDefaultTopic(t *testing.T) {
+	t.Parallel()
+
+	runConfig := normalizeRunConfig(connection.ConnectionConfig{
+		Type:     "kafka",
+		Database: "orders.events",
+	}, "topics")
+
+	if runConfig.Database != "orders.events" {
+		t.Fatalf("expected Kafka default topic to stay orders.events, got %q", runConfig.Database)
+	}
+}
+
 func TestNormalizeSchemaAndTable_IRISDoesNotTreatNamespaceAsSchema(t *testing.T) {
 	t.Parallel()
 
@@ -140,6 +305,117 @@ func TestNormalizeSchemaAndTable_OceanBaseOracleUsesSchemaFromDatabaseTree(t *te
 	}
 }
 
+func TestNormalizeSchemaAndTable_DuckDBPreservesQuotedQualifiedName(t *testing.T) {
+	t.Parallel()
+
+	schemaOrDb, table := normalizeSchemaAndTable(connection.ConnectionConfig{
+		Type: "duckdb",
+	}, `"analytics.catalog"."main.schema"`, `"daily.events"."2026.06"`)
+
+	if schemaOrDb != `"analytics.catalog"."main.schema"` {
+		t.Fatalf("expected duckdb dbName/catalog path preserved, got %q", schemaOrDb)
+	}
+	if table != `"daily.events"."2026.06"` {
+		t.Fatalf("expected duckdb qualified table preserved, got %q", table)
+	}
+}
+
+func TestNormalizeSchemaAndTable_KafkaPreservesDottedTopicName(t *testing.T) {
+	t.Parallel()
+
+	schemaOrDb, table := normalizeSchemaAndTable(connection.ConnectionConfig{
+		Type: "kafka",
+	}, "topics", "orders.events.v1")
+
+	if schemaOrDb != "topics" || table != "orders.events.v1" {
+		t.Fatalf("expected kafka topic to stay intact, got %q.%q", schemaOrDb, table)
+	}
+}
+
+func TestNormalizeSchemaAndTable_MQTTPreservesTopicFilter(t *testing.T) {
+	t.Parallel()
+
+	schemaOrDb, table := normalizeSchemaAndTable(connection.ConnectionConfig{
+		Type: "mqtt",
+	}, "topics", "devices/floor1.sensor.v1")
+
+	if schemaOrDb != "topics" || table != "devices/floor1.sensor.v1" {
+		t.Fatalf("expected mqtt topic filter to stay intact, got %q.%q", schemaOrDb, table)
+	}
+}
+
+func TestNormalizeSchemaAndTable_RocketMQPreservesTopicName(t *testing.T) {
+	t.Parallel()
+
+	schemaOrDb, table := normalizeSchemaAndTable(connection.ConnectionConfig{
+		Type: "rocketmq",
+	}, "topics", "orders.events.v1")
+
+	if schemaOrDb != "topics" || table != "orders.events.v1" {
+		t.Fatalf("expected rocketmq topic name to stay intact, got %q.%q", schemaOrDb, table)
+	}
+}
+
+func TestNormalizeSchemaAndTable_RabbitMQPreservesDottedQueueName(t *testing.T) {
+	t.Parallel()
+
+	schemaOrDb, table := normalizeSchemaAndTable(connection.ConnectionConfig{
+		Type: "rabbitmq",
+	}, "/", "orders.events.v1")
+
+	if schemaOrDb != "/" || table != "orders.events.v1" {
+		t.Fatalf("expected rabbitmq queue to stay intact, got %q.%q", schemaOrDb, table)
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_KafkaPreservesDottedTopicName(t *testing.T) {
+	t.Parallel()
+
+	schemaOrDb, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+		Type: "kafka",
+	}, "topics", "logs.app-1")
+
+	if schemaOrDb != "topics" || table != "logs.app-1" {
+		t.Fatalf("expected kafka metadata topic to stay intact, got %q.%q", schemaOrDb, table)
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_MQTTPreservesTopicFilter(t *testing.T) {
+	t.Parallel()
+
+	schemaOrDb, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+		Type: "mqtt",
+	}, "topics", "devices/floor1.sensor.v1")
+
+	if schemaOrDb != "topics" || table != "devices/floor1.sensor.v1" {
+		t.Fatalf("expected mqtt metadata topic filter to stay intact, got %q.%q", schemaOrDb, table)
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_RocketMQPreservesTopicName(t *testing.T) {
+	t.Parallel()
+
+	schemaOrDb, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+		Type: "rocketmq",
+	}, "topics", "orders.events.v1")
+
+	if schemaOrDb != "topics" || table != "orders.events.v1" {
+		t.Fatalf("expected rocketmq metadata topic name to stay intact, got %q.%q", schemaOrDb, table)
+	}
+}
+
+func TestNormalizeMetadataSchemaAndTable_RabbitMQPreservesDottedQueueName(t *testing.T) {
+	t.Parallel()
+
+	schemaOrDb, table := normalizeMetadataSchemaAndTable(connection.ConnectionConfig{
+		Type: "rabbitmq",
+	}, "/", "logs.app-1")
+
+	if schemaOrDb != "/" || table != "logs.app-1" {
+		t.Fatalf("expected rabbitmq metadata queue to stay intact, got %q.%q", schemaOrDb, table)
+	}
+}
+
 func TestQuoteTableIdentByType_KingbaseNormalizesQuotedQualifiedTable(t *testing.T) {
 	t.Parallel()
 
diff --git a/internal/app/db_proxy.go b/internal/app/db_proxy.go
index a5e847b..fd07e80 100644
--- a/internal/app/db_proxy.go
+++ b/internal/app/db_proxy.go
@@ -203,6 +203,8 @@ func defaultPortByType(driverType string) int {
 	switch strings.ToLower(strings.TrimSpace(driverType)) {
 	case "mysql", "mariadb":
 		return 3306
+	case "goldendb", "greatdb", "gdb":
+		return 1523
 	case "oceanbase":
 		return 2881
 	case "diros":
@@ -211,12 +213,14 @@ func defaultPortByType(driverType string) int {
 		return 9030
 	case "sphinx":
 		return 9306
-	case "postgres", "vastbase", "opengauss":
+	case "postgres", "vastbase", "opengauss", "gaussdb":
 		return 5432
 	case "redis":
 		return 6379
 	case "tdengine":
 		return 6041
+	case "iotdb":
+		return 6667
 	case "oracle":
 		return 1521
 	case "dameng":
@@ -233,6 +237,12 @@ func defaultPortByType(driverType string) int {
 		return 5866
 	case "iris":
 		return 1972
+	case "chroma":
+		return 8000
+	case "qdrant":
+		return 6333
+	case "kafka":
+		return 9092
 	default:
 		return 0
 	}
diff --git a/internal/app/methods_data_root.go b/internal/app/methods_data_root.go
index c68a1d4..5e46f81 100644
--- a/internal/app/methods_data_root.go
+++ b/internal/app/methods_data_root.go
@@ -1,6 +1,7 @@
 package app
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
 	"os"
@@ -17,12 +18,8 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/runtime"
 )
 
-var migratableDataRootEntries = []string{
-	"connections.json",
-	"global_proxy.json",
-	"ai_config.json",
-	"sessions",
-	"drivers",
+var dataRootMigrationExcludedEntries = map[string]struct{}{
+	"storage_root.json": {},
 }
 
 func (a *App) GetDataRootDirectoryInfo() connection.QueryResult {
@@ -122,22 +119,43 @@ func migrateDataRootContents(sourceRoot string, targetRoot string) error {
 	if sourceRoot == "" || targetRoot == "" {
 		return fmt.Errorf("数据目录不能为空")
 	}
-	if filepath.Clean(sourceRoot) == filepath.Clean(targetRoot) {
+	sourceAbs, err := filepath.Abs(sourceRoot)
+	if err != nil {
+		return fmt.Errorf("解析源数据目录失败：%w", err)
+	}
+	targetAbs, err := filepath.Abs(targetRoot)
+	if err != nil {
+		return fmt.Errorf("解析目标数据目录失败：%w", err)
+	}
+	if filepath.Clean(sourceAbs) == filepath.Clean(targetAbs) {
 		return nil
 	}
+	if rel, err := filepath.Rel(sourceAbs, targetAbs); err == nil && rel != "." && rel != "" && !strings.HasPrefix(rel, "..") && !filepath.IsAbs(rel) {
+		return fmt.Errorf("目标数据目录不能位于源目录内部")
+	}
+	sourceRoot = sourceAbs
+	targetRoot = targetAbs
 	if err := os.MkdirAll(targetRoot, 0o755); err != nil {
 		return fmt.Errorf("创建目标数据目录失败：%w", err)
 	}
-	for _, name := range migratableDataRootEntries {
+	entries, err := os.ReadDir(sourceRoot)
+	if err != nil {
+		return fmt.Errorf("读取源数据目录失败：%w", err)
+	}
+	for _, entry := range entries {
+		name := strings.TrimSpace(entry.Name())
+		if name == "" {
+			continue
+		}
+		if _, excluded := dataRootMigrationExcludedEntries[name]; excluded {
+			continue
+		}
 		sourcePath := filepath.Join(sourceRoot, name)
-		info, err := os.Stat(sourcePath)
+		targetPath := filepath.Join(targetRoot, name)
+		info, err := entry.Info()
 		if err != nil {
-			if os.IsNotExist(err) {
-				continue
-			}
 			return fmt.Errorf("读取源数据失败（%s）：%w", name, err)
 		}
-		targetPath := filepath.Join(targetRoot, name)
 		if info.IsDir() {
 			if err := copyDir(sourcePath, targetPath); err != nil {
 				return fmt.Errorf("迁移目录失败（%s）：%w", name, err)
@@ -148,6 +166,75 @@ func migrateDataRootContents(sourceRoot string, targetRoot string) error {
 			return fmt.Errorf("迁移文件失败（%s）：%w", name, err)
 		}
 	}
+	if err := rewriteMigratedDataRootState(targetRoot); err != nil {
+		return err
+	}
+	return nil
+}
+
+func rewriteMigratedDataRootState(targetRoot string) error {
+	if err := rewriteSecurityUpdateBackupPaths(targetRoot); err != nil {
+		return err
+	}
+	return nil
+}
+
+func rewriteSecurityUpdateBackupPaths(targetRoot string) error {
+	repo := newSecurityUpdateStateRepository(targetRoot)
+	marker, err := repo.readMarker()
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
+		return fmt.Errorf("读取迁移后的安全更新状态失败：%w", err)
+	}
+
+	migrationID := strings.TrimSpace(marker.MigrationID)
+	if migrationID == "" {
+		return nil
+	}
+
+	targetBackupPath := repo.backupPath(migrationID)
+	marker.BackupPath = targetBackupPath
+	if err := repo.writeMarker(marker); err != nil {
+		return fmt.Errorf("写入迁移后的安全更新状态失败：%w", err)
+	}
+
+	manifestPath := repo.manifestPath(migrationID)
+	manifestData, err := os.ReadFile(manifestPath)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return fmt.Errorf("读取迁移后的安全更新备份清单失败：%w", err)
+		}
+	} else {
+		var manifest securityUpdateBackupManifest
+		if err := json.Unmarshal(manifestData, &manifest); err != nil {
+			return fmt.Errorf("解析迁移后的安全更新备份清单失败：%w", err)
+		}
+		manifest.BackupPath = targetBackupPath
+		if err := securityUpdateWriteJSONFile(manifestPath, manifest); err != nil {
+			return fmt.Errorf("写入迁移后的安全更新备份清单失败：%w", err)
+		}
+	}
+
+	resultPath := repo.resultPath(migrationID)
+	resultData, err := os.ReadFile(resultPath)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return fmt.Errorf("读取迁移后的安全更新结果失败：%w", err)
+		}
+	} else {
+		var result SecurityUpdateStatus
+		if err := json.Unmarshal(resultData, &result); err != nil {
+			return fmt.Errorf("解析迁移后的安全更新结果失败：%w", err)
+		}
+		result.BackupPath = targetBackupPath
+		result.BackupAvailable = strings.TrimSpace(targetBackupPath) != ""
+		if err := securityUpdateWriteJSONFile(resultPath, result); err != nil {
+			return fmt.Errorf("写入迁移后的安全更新结果失败：%w", err)
+		}
+	}
+
 	return nil
 }
 
diff --git a/internal/app/methods_data_root_test.go b/internal/app/methods_data_root_test.go
index 75ce8be..34dacac 100644
--- a/internal/app/methods_data_root_test.go
+++ b/internal/app/methods_data_root_test.go
@@ -105,6 +105,36 @@ func TestMigrateDataRootContentsCopiesSecurityUpdateStateAndRewritesBackupPaths(
 	}
 }
 
+func TestMigrateDataRootContentsToleratesMissingSecurityUpdateArtifacts(t *testing.T) {
+	sourceRoot := t.TempDir()
+	targetRoot := filepath.Join(t.TempDir(), "gonavi-data")
+	sourceRepo := newSecurityUpdateStateRepository(sourceRoot)
+	started, err := sourceRepo.StartRound(StartSecurityUpdateRequest{SourceType: SecurityUpdateSourceTypeCurrentAppSavedConfig})
+	if err != nil {
+		t.Fatalf("start security update round failed: %v", err)
+	}
+	if err := os.Remove(sourceRepo.manifestPath(started.MigrationID)); err != nil {
+		t.Fatalf("remove source manifest failed: %v", err)
+	}
+	if err := os.Remove(sourceRepo.resultPath(started.MigrationID)); err != nil {
+		t.Fatalf("remove source result failed: %v", err)
+	}
+
+	if err := migrateDataRootContents(sourceRoot, targetRoot); err != nil {
+		t.Fatalf("migrateDataRootContents should tolerate missing security update artifacts, got: %v", err)
+	}
+
+	targetRepo := newSecurityUpdateStateRepository(targetRoot)
+	targetStatus, err := targetRepo.LoadMarker()
+	if err != nil {
+		t.Fatalf("load migrated marker failed: %v", err)
+	}
+	expectedBackupPath := filepath.Join(targetRoot, securityUpdateBackupRootDirName, started.MigrationID)
+	if targetStatus.BackupPath != expectedBackupPath {
+		t.Fatalf("expected migrated marker backupPath %q, got %q", expectedBackupPath, targetStatus.BackupPath)
+	}
+}
+
 func TestMigrateDataRootContentsCopiesDailySecretsForSavedConnections(t *testing.T) {
 	sourceRoot := t.TempDir()
 	targetRoot := filepath.Join(t.TempDir(), "gonavi-data")
diff --git a/internal/app/methods_db.go b/internal/app/methods_db.go
index 2519d9c..e2035ca 100644
--- a/internal/app/methods_db.go
+++ b/internal/app/methods_db.go
@@ -23,6 +23,17 @@ func normalizeTestConnectionConfig(config connection.ConnectionConfig) connectio
 	return normalized
 }
 
+func newQueryExecutionContext(config connection.ConnectionConfig) (context.Context, context.CancelFunc) {
+	if strings.EqualFold(strings.TrimSpace(config.Type), "duckdb") {
+		return context.WithCancel(context.Background())
+	}
+	timeoutSeconds := config.Timeout
+	if timeoutSeconds <= 0 {
+		timeoutSeconds = 30
+	}
+	return utils.ContextWithTimeout(time.Duration(timeoutSeconds) * time.Second)
+}
+
 func validateTestConnectionInput(config connection.ConnectionConfig) error {
 	dbType := strings.ToLower(strings.TrimSpace(config.Type))
 	if dbType == "" {
@@ -52,6 +63,50 @@ func (a *App) DBConnect(config connection.ConnectionConfig) connection.QueryResu
 	return connection.QueryResult{Success: true, Message: "连接成功"}
 }
 
+func (a *App) DBReleaseConnection(config connection.ConnectionConfig) connection.QueryResult {
+	dbType := strings.ToLower(strings.TrimSpace(config.Type))
+	if dbType == "redis" {
+		closed, err := a.releaseRedisClientsForConfig(config)
+		if err != nil {
+			logger.Error(err, "DBReleaseConnection 释放 Redis 连接失败：%s", formatConnSummary(config))
+			return connection.QueryResult{Success: false, Message: err.Error()}
+		}
+		logger.Infof("DBReleaseConnection 已释放 Redis 连接：%s 数量=%d", formatConnSummary(config), closed)
+		return connection.QueryResult{Success: true, Message: "连接已释放", Data: map[string]int{"closed": closed}}
+	}
+
+	resolvedConfig, err := a.resolveConnectionSecrets(config)
+	if err != nil {
+		wrapped := wrapConnectError(config, err)
+		logger.Error(wrapped, "DBReleaseConnection 解析连接密文失败：%s", formatConnSummary(config))
+		return connection.QueryResult{Success: false, Message: wrapped.Error()}
+	}
+	targetKey := getConnectionReleaseMatchKey(applyGlobalProxyToConnection(resolvedConfig))
+	closed := 0
+
+	a.mu.Lock()
+	for key, entry := range a.dbCache {
+		entryConfig := entry.config
+		if strings.TrimSpace(entryConfig.Type) == "" {
+			continue
+		}
+		if getConnectionReleaseMatchKey(entryConfig) != targetKey {
+			continue
+		}
+		if entry.inst != nil {
+			if closeErr := entry.inst.Close(); closeErr != nil {
+				logger.Error(closeErr, "DBReleaseConnection 关闭缓存连接失败：缓存Key=%s", shortCacheKey(key))
+			}
+		}
+		delete(a.dbCache, key)
+		closed++
+	}
+	a.mu.Unlock()
+
+	logger.Infof("DBReleaseConnection 已释放数据库连接：%s 数量=%d", formatConnSummary(resolvedConfig), closed)
+	return connection.QueryResult{Success: true, Message: "连接已释放", Data: map[string]int{"closed": closed}}
+}
+
 func (a *App) TestConnection(config connection.ConnectionConfig) connection.QueryResult {
 	testConfig := normalizeTestConnectionConfig(config)
 	started := time.Now()
@@ -122,7 +177,7 @@ func (a *App) CreateDatabase(config connection.ConnectionConfig, dbName string)
 	escapedDbName := strings.ReplaceAll(dbName, "`", "``")
 	query := fmt.Sprintf("CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", escapedDbName)
 	dbType := resolveDDLDBType(runConfig)
-	if dbType == "postgres" || dbType == "kingbase" || dbType == "highgo" || dbType == "vastbase" || dbType == "opengauss" {
+	if dbType == "postgres" || dbType == "kingbase" || dbType == "highgo" || dbType == "vastbase" || dbType == "opengauss" || dbType == "gaussdb" {
 		escapedDbName = strings.ReplaceAll(dbName, `"`, `""`)
 		query = fmt.Sprintf("CREATE DATABASE \"%s\"", escapedDbName)
 	} else if dbType == "sqlserver" {
@@ -151,13 +206,52 @@ func (a *App) CreateDatabase(config connection.ConnectionConfig, dbName string)
 
 func isPostgresSchemaDDLDBType(dbType string) bool {
 	switch resolveDDLDBType(connection.ConnectionConfig{Type: dbType}) {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
 		return true
 	default:
 		return false
 	}
 }
 
+func resolvePGLikeDatabaseDDLCandidates(dbType string, user string) []string {
+	switch resolveDDLDBType(connection.ConnectionConfig{Type: dbType}) {
+	case "kingbase":
+		return []string{"test", "template1", strings.TrimSpace(user)}
+	case "vastbase":
+		return []string{"vastbase", "postgres", "template1", strings.TrimSpace(user)}
+	default:
+		return []string{"postgres", "template1", strings.TrimSpace(user)}
+	}
+}
+
+func resolvePGLikeDatabaseDDLRunConfig(config connection.ConnectionConfig, dbType string, targetDatabase string) connection.ConnectionConfig {
+	runConfig := config
+	target := strings.TrimSpace(targetDatabase)
+	current := strings.TrimSpace(runConfig.Database)
+	if current != "" && !strings.EqualFold(current, target) {
+		return runConfig
+	}
+
+	candidates := resolvePGLikeDatabaseDDLCandidates(dbType, runConfig.User)
+	seen := make(map[string]struct{}, len(candidates))
+	for _, candidate := range candidates {
+		name := strings.TrimSpace(candidate)
+		if name == "" || strings.EqualFold(name, target) {
+			continue
+		}
+		normalized := strings.ToLower(name)
+		if _, ok := seen[normalized]; ok {
+			continue
+		}
+		seen[normalized] = struct{}{}
+		runConfig.Database = name
+		return runConfig
+	}
+
+	runConfig.Database = ""
+	return runConfig
+}
+
 func buildCreateSchemaSQL(dbType string, schemaName string) (string, error) {
 	schemaName = strings.TrimSpace(schemaName)
 	if schemaName == "" {
@@ -171,14 +265,52 @@ func buildCreateSchemaSQL(dbType string, schemaName string) (string, error) {
 	return fmt.Sprintf("CREATE SCHEMA %s", quoteIdentByType(dbType, schemaName)), nil
 }
 
-func (a *App) CreateSchema(config connection.ConnectionConfig, dbName string, schemaName string) connection.QueryResult {
-	dbType := resolveDDLDBType(config)
+func buildRenameSchemaSQL(dbType string, oldSchemaName string, newSchemaName string) (string, error) {
+	oldSchemaName = strings.TrimSpace(oldSchemaName)
+	newSchemaName = strings.TrimSpace(newSchemaName)
+	if oldSchemaName == "" || newSchemaName == "" {
+		return "", fmt.Errorf("模式名称不能为空")
+	}
+	if strings.EqualFold(oldSchemaName, newSchemaName) {
+		return "", fmt.Errorf("新旧模式名称不能相同")
+	}
+	if !isPostgresSchemaDDLDBType(dbType) {
+		return "", fmt.Errorf("当前数据源（%s）暂不支持通过此入口编辑模式", dbType)
+	}
+	return fmt.Sprintf(
+		"ALTER SCHEMA %s RENAME TO %s",
+		quoteIdentByType(dbType, oldSchemaName),
+		quoteIdentByType(dbType, newSchemaName),
+	), nil
+}
+
+func buildDropSchemaSQL(dbType string, schemaName string) (string, error) {
+	schemaName = strings.TrimSpace(schemaName)
+	if schemaName == "" {
+		return "", fmt.Errorf("模式名称不能为空")
+	}
+	if !isPostgresSchemaDDLDBType(dbType) {
+		return "", fmt.Errorf("当前数据源（%s）暂不支持通过此入口删除模式", dbType)
+	}
+	return fmt.Sprintf("DROP SCHEMA %s CASCADE", quoteIdentByType(dbType, schemaName)), nil
+}
+
+func resolveSchemaDDLTargetDatabase(config connection.ConnectionConfig, dbName string) (string, error) {
 	targetDbName := strings.TrimSpace(dbName)
 	if targetDbName == "" {
 		targetDbName = strings.TrimSpace(config.Database)
 	}
 	if targetDbName == "" {
-		return connection.QueryResult{Success: false, Message: "目标数据库不能为空"}
+		return "", fmt.Errorf("目标数据库不能为空")
+	}
+	return targetDbName, nil
+}
+
+func (a *App) CreateSchema(config connection.ConnectionConfig, dbName string, schemaName string) connection.QueryResult {
+	dbType := resolveDDLDBType(config)
+	targetDbName, err := resolveSchemaDDLTargetDatabase(config, dbName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
 	query, err := buildCreateSchemaSQL(dbType, schemaName)
@@ -199,6 +331,52 @@ func (a *App) CreateSchema(config connection.ConnectionConfig, dbName string, sc
 	return connection.QueryResult{Success: true, Message: "模式创建成功"}
 }
 
+func (a *App) RenameSchema(config connection.ConnectionConfig, dbName string, oldSchemaName string, newSchemaName string) connection.QueryResult {
+	dbType := resolveDDLDBType(config)
+	targetDbName, err := resolveSchemaDDLTargetDatabase(config, dbName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+
+	query, err := buildRenameSchemaSQL(dbType, oldSchemaName, newSchemaName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+
+	runConfig := buildRunConfigForDDL(config, dbType, targetDbName)
+	dbInst, err := a.getDatabase(runConfig)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	if _, err := dbInst.Exec(query); err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	return connection.QueryResult{Success: true, Message: "模式重命名成功"}
+}
+
+func (a *App) DropSchema(config connection.ConnectionConfig, dbName string, schemaName string) connection.QueryResult {
+	dbType := resolveDDLDBType(config)
+	targetDbName, err := resolveSchemaDDLTargetDatabase(config, dbName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+
+	query, err := buildDropSchemaSQL(dbType, schemaName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+
+	runConfig := buildRunConfigForDDL(config, dbType, targetDbName)
+	dbInst, err := a.getDatabase(runConfig)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	if _, err := dbInst.Exec(query); err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	return connection.QueryResult{Success: true, Message: "模式删除成功"}
+}
+
 func resolveDDLDBType(config connection.ConnectionConfig) string {
 	dbType := strings.ToLower(strings.TrimSpace(config.Type))
 	if dbType == "doris" {
@@ -210,6 +388,12 @@ func resolveDDLDBType(config connection.ConnectionConfig) string {
 	if dbType == "postgresql" {
 		return "postgres"
 	}
+	if dbType == "gauss_db" || dbType == "gauss-db" {
+		return "gaussdb"
+	}
+	if dbType == "goldendb" || dbType == "greatdb" || dbType == "gdb" {
+		return "mysql"
+	}
 	if dbType == "kingbase8" || dbType == "kingbasees" || dbType == "kingbasev8" {
 		return "kingbase"
 	}
@@ -229,6 +413,10 @@ func resolveDDLDBType(config connection.ConnectionConfig) string {
 		return "postgres"
 	case "opengauss", "open_gauss", "open-gauss":
 		return "opengauss"
+	case "gaussdb", "gauss_db", "gauss-db":
+		return "gaussdb"
+	case "goldendb", "greatdb", "gdb":
+		return "mysql"
 	case "dm", "dameng", "dm8":
 		return "dameng"
 	case "sqlite3", "sqlite":
@@ -256,6 +444,10 @@ func resolveDDLDBType(config connection.ConnectionConfig) string {
 	switch {
 	case strings.Contains(driver, "opengauss"), strings.Contains(driver, "open_gauss"), strings.Contains(driver, "open-gauss"):
 		return "opengauss"
+	case strings.Contains(driver, "gaussdb"), strings.Contains(driver, "gauss_db"), strings.Contains(driver, "gauss-db"):
+		return "gaussdb"
+	case strings.Contains(driver, "goldendb"), strings.Contains(driver, "greatdb"):
+		return "mysql"
 	case strings.Contains(driver, "postgres"):
 		return "postgres"
 	case strings.Contains(driver, "kingbase"):
@@ -290,6 +482,11 @@ func normalizeSchemaAndTableByType(dbType string, dbName string, tableName strin
 		return rawDB, rawTable
 	}
 
+	// Elasticsearch / RocketMQ / MQTT / RabbitMQ / Kafka：对象名可能含多个点或路径，不能按点分割
+	if dbType == "elasticsearch" || dbType == "rocketmq" || dbType == "mqtt" || dbType == "kafka" || dbType == "rabbitmq" {
+		return rawDB, rawTable
+	}
+
 	if dbType == "kingbase" {
 		schema, table := db.SplitKingbaseQualifiedName(rawTable)
 		if schema != "" && table != "" {
@@ -300,7 +497,7 @@ func normalizeSchemaAndTableByType(dbType string, dbName string, tableName strin
 		}
 	}
 
-	if dbType == "postgres" || dbType == "highgo" || dbType == "vastbase" || dbType == "opengauss" {
+	if dbType == "postgres" || dbType == "highgo" || dbType == "vastbase" || dbType == "opengauss" || dbType == "gaussdb" {
 		schema, table := db.SplitSQLQualifiedName(rawTable)
 		if schema != "" && table != "" {
 			return schema, table
@@ -320,6 +517,10 @@ func normalizeSchemaAndTableByType(dbType string, dbName string, tableName strin
 		}
 	}
 
+	if dbType == "duckdb" {
+		return rawDB, rawTable
+	}
+
 	if parts := strings.SplitN(rawTable, ".", 2); len(parts) == 2 {
 		schema := strings.TrimSpace(parts[0])
 		table := strings.TrimSpace(parts[1])
@@ -329,7 +530,7 @@ func normalizeSchemaAndTableByType(dbType string, dbName string, tableName strin
 	}
 
 	switch dbType {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
 		return "public", rawTable
 	default:
 		return rawDB, rawTable
@@ -371,7 +572,7 @@ func buildRunConfigForDDL(config connection.ConnectionConfig, dbType string, dbN
 	if strings.EqualFold(strings.TrimSpace(config.Type), "custom") {
 		// custom 连接的 dbName 语义依赖 driver，尽量在常见驱动上对齐内置类型行为。
 		switch dbType {
-		case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "dameng", "sqlserver", "clickhouse":
+		case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "dameng", "sqlserver", "clickhouse":
 			if strings.TrimSpace(dbName) != "" {
 				runConfig.Database = strings.TrimSpace(dbName)
 			}
@@ -408,11 +609,8 @@ func (a *App) RenameDatabase(config connection.ConnectionConfig, oldName string,
 		return connection.QueryResult{Success: true, Message: "数据库重命名成功"}
 	case "mysql", "mariadb", "oceanbase", "starrocks", "sphinx":
 		return connection.QueryResult{Success: false, Message: "MySQL/MariaDB/OceanBase/StarRocks/Sphinx 不支持直接重命名数据库，请新建库后迁移数据"}
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
-		if strings.EqualFold(strings.TrimSpace(config.Database), oldName) {
-			return connection.QueryResult{Success: false, Message: "当前连接正在使用目标数据库，请先连接到其他数据库后再重命名"}
-		}
-		runConfig := config
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
+		runConfig := resolvePGLikeDatabaseDDLRunConfig(config, dbType, oldName)
 		dbInst, err := a.getDatabase(runConfig)
 		if err != nil {
 			return connection.QueryResult{Success: false, Message: err.Error()}
@@ -443,11 +641,8 @@ func (a *App) DropDatabase(config connection.ConnectionConfig, dbName string) co
 		runConfig = config
 		runConfig.Database = ""
 		sql = fmt.Sprintf("DROP DATABASE %s", quoteIdentByType(dbType, dbName))
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
-		if strings.EqualFold(strings.TrimSpace(config.Database), dbName) {
-			return connection.QueryResult{Success: false, Message: "当前连接正在使用目标数据库，请先连接到其他数据库后再删除"}
-		}
-		runConfig = config
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
+		runConfig = resolvePGLikeDatabaseDDLRunConfig(config, dbType, dbName)
 		sql = fmt.Sprintf("DROP DATABASE %s", quoteIdentByType(dbType, dbName))
 	default:
 		return connection.QueryResult{Success: false, Message: fmt.Sprintf("当前数据源(%s)暂不支持删除数据库", dbType)}
@@ -478,7 +673,7 @@ func (a *App) RenameTable(config connection.ConnectionConfig, dbName string, old
 
 	dbType := resolveDDLDBType(config)
 	switch dbType {
-	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "sqlite", "duckdb", "oracle", "dameng", "highgo", "vastbase", "opengauss", "sqlserver", "clickhouse":
+	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "sqlite", "duckdb", "oracle", "dameng", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver", "clickhouse":
 	default:
 		return connection.QueryResult{Success: false, Message: fmt.Sprintf("当前数据源(%s)暂不支持重命名表", dbType)}
 	}
@@ -524,7 +719,7 @@ func (a *App) DropTable(config connection.ConnectionConfig, dbName string, table
 
 	dbType := resolveDDLDBType(config)
 	switch dbType {
-	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "sqlite", "duckdb", "oracle", "dameng", "highgo", "vastbase", "opengauss", "sqlserver", "tdengine", "clickhouse":
+	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "sqlite", "duckdb", "oracle", "dameng", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver", "tdengine", "clickhouse":
 	default:
 		return connection.QueryResult{Success: false, Message: fmt.Sprintf("当前数据源(%s)暂不支持删除表", dbType)}
 	}
@@ -591,11 +786,7 @@ func (a *App) DBQueryWithCancel(config connection.ConnectionConfig, dbName strin
 	}
 
 	query = sanitizeSQLForPgLike(resolveDDLDBType(config), query)
-	timeoutSeconds := runConfig.Timeout
-	if timeoutSeconds <= 0 {
-		timeoutSeconds = 30
-	}
-	ctx, cancel := utils.ContextWithTimeout(time.Duration(timeoutSeconds) * time.Second)
+	ctx, cancel := newQueryExecutionContext(runConfig)
 	defer cancel()
 
 	// Store cancel function for potential manual cancellation
@@ -614,6 +805,7 @@ func (a *App) DBQueryWithCancel(config connection.ConnectionConfig, dbName strin
 	}()
 
 	isReadQuery := isReadOnlySQLQuery(runConfig.Type, query)
+	tryQueryFirst := shouldTryQueryResultFirst(runConfig.Type, query)
 
 	runReadQuery := func(inst db.Database) ([]map[string]interface{}, []string, error) {
 		if q, ok := inst.(interface {
@@ -624,6 +816,14 @@ func (a *App) DBQueryWithCancel(config connection.ConnectionConfig, dbName strin
 		return inst.Query(query)
 	}
 
+	runReadQueryWithMessages := func(inst db.Database) ([]map[string]interface{}, []string, []string, error) {
+		if q, ok := inst.(db.QueryMessageExecer); ok {
+			return q.QueryContextWithMessages(ctx, query)
+		}
+		data, columns, err := runReadQuery(inst)
+		return data, columns, nil, err
+	}
+
 	runExecQuery := func(inst db.Database) (int64, error) {
 		if e, ok := inst.(interface {
 			ExecContext(context.Context, string) (int64, error)
@@ -633,8 +833,8 @@ func (a *App) DBQueryWithCancel(config connection.ConnectionConfig, dbName strin
 		return inst.Exec(query)
 	}
 
-	if isReadQuery {
-		data, columns, err := runReadQuery(dbInst)
+	if isReadQuery || tryQueryFirst {
+		data, columns, messages, err := runReadQueryWithMessages(dbInst)
 		if err != nil && shouldRefreshCachedConnection(err) {
 			if a.invalidateCachedDatabase(runConfig, err) {
 				retryInst, retryErr := a.getDatabaseForcePing(runConfig)
@@ -642,32 +842,34 @@ func (a *App) DBQueryWithCancel(config connection.ConnectionConfig, dbName strin
 					logger.Error(retryErr, "DBQuery 重建连接失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
 					return connection.QueryResult{Success: false, Message: retryErr.Error()}
 				}
-				data, columns, err = runReadQuery(retryInst)
+				data, columns, messages, err = runReadQueryWithMessages(retryInst)
 			}
 		}
-		if err != nil {
+		if err == nil {
+			return connection.QueryResult{Success: true, Data: data, Fields: columns, Messages: messages, QueryID: queryID}
+		}
+		if isReadQuery {
 			logger.Error(err, "DBQuery 查询失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
 			return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
 		}
-		return connection.QueryResult{Success: true, Data: data, Fields: columns, QueryID: queryID}
-	} else {
-		affected, err := runExecQuery(dbInst)
-		if err != nil && shouldRefreshCachedConnection(err) {
-			if a.invalidateCachedDatabase(runConfig, err) {
-				retryInst, retryErr := a.getDatabaseForcePing(runConfig)
-				if retryErr != nil {
-					logger.Error(retryErr, "DBQuery 重建连接失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
-					return connection.QueryResult{Success: false, Message: retryErr.Error()}
-				}
-				affected, err = runExecQuery(retryInst)
-			}
-		}
-		if err != nil {
-			logger.Error(err, "DBQuery 执行失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
-			return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
-		}
-		return connection.QueryResult{Success: true, Data: map[string]int64{"affectedRows": affected}, QueryID: queryID}
 	}
+
+	affected, err := runExecQuery(dbInst)
+	if err != nil && shouldRefreshCachedConnection(err) {
+		if a.invalidateCachedDatabase(runConfig, err) {
+			retryInst, retryErr := a.getDatabaseForcePing(runConfig)
+			if retryErr != nil {
+				logger.Error(retryErr, "DBQuery 重建连接失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
+				return connection.QueryResult{Success: false, Message: retryErr.Error()}
+			}
+			affected, err = runExecQuery(retryInst)
+		}
+	}
+	if err != nil {
+		logger.Error(err, "DBQuery 执行失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
+		return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+	}
+	return connection.QueryResult{Success: true, Data: map[string]int64{"affectedRows": affected}, QueryID: queryID}
 }
 
 // DBQueryMulti 执行可能包含多条 SQL 语句的查询，返回多个结果集。
@@ -687,11 +889,7 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
 	}
 
 	query = sanitizeSQLForPgLike(resolveDDLDBType(config), query)
-	timeoutSeconds := runConfig.Timeout
-	if timeoutSeconds <= 0 {
-		timeoutSeconds = 30
-	}
-	ctx, cancel := utils.ContextWithTimeout(time.Duration(timeoutSeconds) * time.Second)
+	ctx, cancel := newQueryExecutionContext(runConfig)
 	defer cancel()
 
 	a.queryMu.Lock()
@@ -710,28 +908,35 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
 	// 注意：原生 conn.Query() 执行写操作（UPDATE/INSERT/DELETE）时，
 	// sql.Rows 不暴露 RowsAffected，导致影响行数丢失。
 	// 因此仅在全部语句皆为读操作时才使用原生路径。
+	statements := splitSQLStatements(query)
 	allReadOnly := true
-	for _, stmt := range splitSQLStatements(query) {
+	for _, stmt := range statements {
 		if strings.TrimSpace(stmt) != "" && !isReadOnlySQLQuery(runConfig.Type, stmt) {
 			allReadOnly = false
 			break
 		}
 	}
+	useNativeMultiResult := shouldUseNativeMultiResultBatch(runConfig.Type, statements, allReadOnly)
 
-	runMultiQuery := func(inst db.Database) ([]connection.ResultSetData, error) {
-		if !allReadOnly {
-			return nil, nil // 包含写操作，走逐条执行路径
+	runMultiQuery := func(inst db.Database) ([]connection.ResultSetData, []string, error) {
+		if !useNativeMultiResult {
+			return nil, nil, nil // 包含写操作，走逐条执行路径
+		}
+		if q, ok := inst.(db.MultiResultQueryMessageExecer); ok {
+			return q.QueryMultiContextWithMessages(ctx, query)
 		}
 		if q, ok := inst.(db.MultiResultQuerierContext); ok {
-			return q.QueryMultiContext(ctx, query)
+			results, err := q.QueryMultiContext(ctx, query)
+			return results, nil, err
 		}
 		if q, ok := inst.(db.MultiResultQuerier); ok {
-			return q.QueryMulti(query)
+			results, err := q.QueryMulti(query)
+			return results, nil, err
 		}
-		return nil, nil // 返回 nil 表示不支持
+		return nil, nil, nil // 返回 nil 表示不支持
 	}
 
-	results, err := runMultiQuery(dbInst)
+	results, resultMessages, err := runMultiQuery(dbInst)
 	if err != nil && shouldRefreshCachedConnection(err) {
 		if a.invalidateCachedDatabase(runConfig, err) {
 			retryInst, retryErr := a.getDatabaseForcePing(runConfig)
@@ -739,7 +944,7 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
 				logger.Error(retryErr, "DBQueryMulti 重建连接失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
 				return connection.QueryResult{Success: false, Message: retryErr.Error(), QueryID: queryID}
 			}
-			results, err = runMultiQuery(retryInst)
+			results, resultMessages, err = runMultiQuery(retryInst)
 		}
 	}
 	if err != nil {
@@ -749,11 +954,10 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
 
 	// 驱动支持多结果集，直接返回
 	if results != nil {
-		return connection.QueryResult{Success: true, Data: results, QueryID: queryID}
+		return connection.QueryResult{Success: true, Data: results, Messages: resultMessages, QueryID: queryID}
 	}
 
 	// 驱动不支持多结果集，回退到逐条执行
-	statements := splitSQLStatements(query)
 	if len(statements) == 0 {
 		return connection.QueryResult{
 			Success: true,
@@ -762,18 +966,73 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
 		}
 	}
 
-	// 全部为写操作且驱动支持批量 Exec → 一次性发送，大幅减少网络往返
-	// 适用于 MySQL/MariaDB/Doris/PostgreSQL/SQLite/DuckDB 等支持多语句 Exec 的驱动
-	if !allReadOnly {
-		allWrite := true
-		for _, stmt := range statements {
-			if strings.TrimSpace(stmt) != "" && isReadOnlySQLQuery(runConfig.Type, stmt) {
-				allWrite = false
-				break
+	var sessionQueryTarget db.StatementQueryExecer
+	var sessionQueryMessageTarget db.StatementQueryMessageExecer
+	var sessionMultiQueryTarget db.StatementMultiResultQueryExecer
+	var sessionMultiQueryMessageTarget db.StatementMultiResultQueryMessageExecer
+	var sessionExecTarget db.StatementExecer
+	var sessionBatchTarget db.BatchWriteExecer
+	closeExecTarget := func() {}
+	if provider, ok := dbInst.(db.SessionExecerProvider); ok {
+		sessionExecer, sessionErr := provider.OpenSessionExecer(ctx)
+		if sessionErr != nil {
+			logger.Warnf("DBQueryMulti 打开会话级执行器失败，将回退共享连接：%s SQL片段=%q err=%v", formatConnSummary(runConfig), sqlSnippet(query), sessionErr)
+		} else {
+			if statementQueryExecer, ok := sessionExecer.(db.StatementQueryExecer); ok {
+				sessionQueryTarget = statementQueryExecer
+			}
+			if statementQueryMessageExecer, ok := sessionExecer.(db.StatementQueryMessageExecer); ok {
+				sessionQueryMessageTarget = statementQueryMessageExecer
+			}
+			if statementMultiResultQueryExecer, ok := sessionExecer.(db.StatementMultiResultQueryExecer); ok {
+				sessionMultiQueryTarget = statementMultiResultQueryExecer
+			}
+			if statementMultiResultQueryMessageExecer, ok := sessionExecer.(db.StatementMultiResultQueryMessageExecer); ok {
+				sessionMultiQueryMessageTarget = statementMultiResultQueryMessageExecer
+			}
+			sessionExecTarget = sessionExecer
+			if batcher, ok := sessionExecer.(db.BatchWriteExecer); ok {
+				sessionBatchTarget = batcher
+			}
+			closeExecTarget = func() {
+				if err := sessionExecer.Close(); err != nil {
+					logger.Warnf("DBQueryMulti 关闭会话级执行器失败：%v", err)
+				}
 			}
 		}
-		if allWrite {
-			if batcher, ok := dbInst.(db.BatchWriteExecer); ok {
+	}
+	defer closeExecTarget()
+
+	// 单条写语句且驱动支持批量 Exec 时，可复用批量路径。
+	// 多条写语句必须逐条返回结果；部分驱动对多语句 Exec 仅暴露最后一条 RowsAffected，
+	// 会导致前面语句已成功执行但结果页只剩一个写入结果。
+	if !allReadOnly {
+		allWrite := true
+		containsPLSQLBlock := false
+		containsQueryFirstWrite := false
+		for _, stmt := range statements {
+			stmt = strings.TrimSpace(stmt)
+			if stmt == "" {
+				continue
+			}
+			if !isBatchableWriteSQLStatement(runConfig.Type, stmt) {
+				allWrite = false
+			}
+			if shouldTryQueryResultFirst(runConfig.Type, stmt) {
+				containsQueryFirstWrite = true
+			}
+			if isPLSQLBlockStatement(stmt) {
+				containsPLSQLBlock = true
+			}
+		}
+		if allWrite && !containsPLSQLBlock && !containsQueryFirstWrite && len(statements) == 1 {
+			batcher := sessionBatchTarget
+			if batcher == nil {
+				if fallbackBatcher, ok := dbInst.(db.BatchWriteExecer); ok {
+					batcher = fallbackBatcher
+				}
+			}
+			if batcher != nil {
 				affected, batchErr := batcher.ExecBatchContext(ctx, query)
 				if batchErr != nil && shouldRefreshCachedConnection(batchErr) {
 					if a.invalidateCachedDatabase(runConfig, batchErr) {
@@ -811,17 +1070,80 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
 			continue
 		}
 
-		if isReadOnlySQLQuery(runConfig.Type, stmt) {
-			var data []map[string]interface{}
-			var columns []string
-			if q, ok := dbInst.(interface {
+		isReadStmt := isReadOnlySQLQuery(runConfig.Type, stmt)
+		tryQueryStmtFirst := shouldTryQueryResultFirst(runConfig.Type, stmt)
+		if isReadStmt || tryQueryStmtFirst {
+			var (
+				data             []map[string]interface{}
+				columns          []string
+				messages         []string
+				statementResults []connection.ResultSetData
+				usedMultiResult  bool
+			)
+			if sessionMultiQueryMessageTarget != nil {
+				statementResults, messages, err = sessionMultiQueryMessageTarget.QueryMultiContextWithMessages(ctx, stmt)
+				usedMultiResult = true
+			} else if sessionMultiQueryTarget != nil {
+				statementResults, err = sessionMultiQueryTarget.QueryMultiContext(ctx, stmt)
+				usedMultiResult = true
+			} else if q, ok := dbInst.(db.MultiResultQueryMessageExecer); ok {
+				statementResults, messages, err = q.QueryMultiContextWithMessages(ctx, stmt)
+				usedMultiResult = true
+			} else if q, ok := dbInst.(db.MultiResultQuerierContext); ok {
+				statementResults, err = q.QueryMultiContext(ctx, stmt)
+				usedMultiResult = true
+			} else if q, ok := dbInst.(db.MultiResultQuerier); ok {
+				statementResults, err = q.QueryMulti(stmt)
+				usedMultiResult = true
+			} else if sessionQueryMessageTarget != nil {
+				data, columns, messages, err = sessionQueryMessageTarget.QueryContextWithMessages(ctx, stmt)
+			} else if sessionQueryTarget != nil {
+				data, columns, err = sessionQueryTarget.QueryContext(ctx, stmt)
+			} else if q, ok := dbInst.(db.QueryMessageExecer); ok {
+				data, columns, messages, err = q.QueryContextWithMessages(ctx, stmt)
+			} else if q, ok := dbInst.(interface {
 				QueryContext(context.Context, string) ([]map[string]interface{}, []string, error)
 			}); ok {
 				data, columns, err = q.QueryContext(ctx, stmt)
 			} else {
 				data, columns, err = dbInst.Query(stmt)
 			}
-			if err != nil {
+			if err == nil {
+				if usedMultiResult {
+					if len(statementResults) == 0 && len(messages) > 0 {
+						statementResults = []connection.ResultSetData{{
+							Rows:     []map[string]interface{}{},
+							Columns:  []string{},
+							Messages: append([]string(nil), messages...),
+						}}
+					}
+					for _, statementResult := range statementResults {
+						if statementResult.Rows == nil {
+							statementResult.Rows = []map[string]interface{}{}
+						}
+						if statementResult.Columns == nil {
+							statementResult.Columns = []string{}
+						}
+						statementResult.StatementIndex = idx + 1
+						resultSets = append(resultSets, statementResult)
+					}
+					continue
+				}
+				if data == nil {
+					data = make([]map[string]interface{}, 0)
+				}
+				if columns == nil {
+					columns = []string{}
+				}
+				resultSets = append(resultSets, connection.ResultSetData{
+					Rows:           data,
+					Columns:        columns,
+					Messages:       messages,
+					StatementIndex: idx + 1,
+				})
+				continue
+			}
+			if isReadStmt {
 				logger.Error(err, "DBQueryMulti 逐条查询失败（第 %d/%d 条）：%s SQL片段=%q", idx+1, len(statements), formatConnSummary(runConfig), sqlSnippet(stmt))
 				errMsg := fmt.Sprintf("第 %d 条语句执行失败: %v", idx+1, err)
 				if len(resultSets) > 0 {
@@ -829,35 +1151,31 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
 				}
 				return connection.QueryResult{Success: false, Message: errMsg, QueryID: queryID}
 			}
-			if data == nil {
-				data = make([]map[string]interface{}, 0)
-			}
-			if columns == nil {
-				columns = []string{}
-			}
-			resultSets = append(resultSets, connection.ResultSetData{Rows: data, Columns: columns})
-		} else {
-			var affected int64
-			if e, ok := dbInst.(interface {
-				ExecContext(context.Context, string) (int64, error)
-			}); ok {
-				affected, err = e.ExecContext(ctx, stmt)
-			} else {
-				affected, err = dbInst.Exec(stmt)
-			}
-			if err != nil {
-				logger.Error(err, "DBQueryMulti 逐条执行失败（第 %d/%d 条）：%s SQL片段=%q", idx+1, len(statements), formatConnSummary(runConfig), sqlSnippet(stmt))
-				errMsg := fmt.Sprintf("第 %d 条语句执行失败: %v", idx+1, err)
-				if len(resultSets) > 0 {
-					errMsg += fmt.Sprintf("（前 %d 条已执行成功）", len(resultSets))
-				}
-				return connection.QueryResult{Success: false, Message: errMsg, QueryID: queryID}
-			}
-			resultSets = append(resultSets, connection.ResultSetData{
-				Rows:    []map[string]interface{}{{"affectedRows": affected}},
-				Columns: []string{"affectedRows"},
-			})
 		}
+
+		var affected int64
+		if sessionExecTarget != nil {
+			affected, err = sessionExecTarget.ExecContext(ctx, stmt)
+		} else if e, ok := dbInst.(interface {
+			ExecContext(context.Context, string) (int64, error)
+		}); ok {
+			affected, err = e.ExecContext(ctx, stmt)
+		} else {
+			affected, err = dbInst.Exec(stmt)
+		}
+		if err != nil {
+			logger.Error(err, "DBQueryMulti 逐条执行失败（第 %d/%d 条）：%s SQL片段=%q", idx+1, len(statements), formatConnSummary(runConfig), sqlSnippet(stmt))
+			errMsg := fmt.Sprintf("第 %d 条语句执行失败: %v", idx+1, err)
+			if len(resultSets) > 0 {
+				errMsg += fmt.Sprintf("（前 %d 条已执行成功）", len(resultSets))
+			}
+			return connection.QueryResult{Success: false, Message: errMsg, QueryID: queryID}
+		}
+		resultSets = append(resultSets, connection.ResultSetData{
+			Rows:           []map[string]interface{}{{"affectedRows": affected}},
+			Columns:        []string{"affectedRows"},
+			StatementIndex: idx + 1,
+		})
 	}
 
 	if resultSets == nil {
@@ -871,6 +1189,99 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
 	return connection.QueryResult{Success: true, Data: resultSets, QueryID: queryID, Message: fallbackMsg}
 }
 
+func shouldUseNativeMultiResultBatch(dbType string, statements []string, allReadOnly bool) bool {
+	if allReadOnly {
+		return true
+	}
+	if !strings.EqualFold(strings.TrimSpace(dbType), "sqlserver") {
+		return false
+	}
+	for _, stmt := range statements {
+		stmt = strings.TrimSpace(stmt)
+		if stmt == "" {
+			continue
+		}
+		if isReadOnlySQLQuery(dbType, stmt) || shouldTryQueryResultFirst(dbType, stmt) {
+			continue
+		}
+		return false
+	}
+	return true
+}
+
+func shouldTryQueryResultFirst(dbType string, query string) bool {
+	isSQLServer := isSQLServerDBType(dbType)
+	if sqlWriteStatementReturnsRows(dbType, query) {
+		return true
+	}
+	keyword := leadingSQLKeyword(query)
+	switch keyword {
+	case "exec", "execute", "call":
+		return true
+	case "set", "print":
+		return isSQLServer
+	case "dbcc":
+		return isSQLServer
+	case "do":
+		return isPostgresNoticeCapableDBType(dbType) && strings.Contains(strings.ToLower(query), "raise")
+	default:
+		if isSQLServer {
+			if strings.HasPrefix(keyword, "sp_") || strings.HasPrefix(keyword, "xp_") {
+				return true
+			}
+			if sqlServerControlFlowMayReturnMessages(query) {
+				return true
+			}
+			return looksLikeSQLServerProcedureInvocation(query)
+		}
+		return false
+	}
+}
+
+func looksLikeSQLServerProcedureInvocation(query string) bool {
+	switch leadingSQLKeyword(query) {
+	case "select", "with", "insert", "update", "delete", "merge", "replace", "upsert",
+		"if", "begin", "declare", "while", "create", "alter", "drop", "truncate", "grant", "revoke",
+		"use", "set", "print", "dbcc", "commit", "rollback", "save", "return", "throw", "raiserror",
+		"waitfor", "open", "fetch", "close", "deallocate":
+		return false
+	}
+
+	pos := skipSQLTrivia(query, 0)
+	if pos >= len(query) {
+		return false
+	}
+
+	next, ok := skipSQLIdentifierToken(query, pos)
+	if !ok || next <= pos {
+		return false
+	}
+	pos = skipSQLTrivia(query, next)
+	for pos < len(query) && query[pos] == '.' {
+		pos = skipSQLTrivia(query, pos+1)
+		next, ok = skipSQLIdentifierToken(query, pos)
+		if !ok || next <= pos {
+			return false
+		}
+		pos = skipSQLTrivia(query, next)
+	}
+
+	if pos >= len(query) {
+		return true
+	}
+	switch ch := query[pos]; {
+	case ch == ';' || ch == ',' || ch == '@' || ch == '\'' || ch == '"' || ch == '[' || ch == '(':
+		return true
+	case ch == '+' || ch == '-':
+		return true
+	case ch >= '0' && ch <= '9':
+		return true
+	default:
+		keyword, _ := nextSQLKeyword(query, pos)
+		return keyword != ""
+	}
+}
+
 func (a *App) DBQueryIsolated(config connection.ConnectionConfig, dbName string, query string) connection.QueryResult {
 	runConfig := normalizeRunConfig(config, dbName)
 
@@ -886,30 +1297,34 @@ func (a *App) DBQueryIsolated(config connection.ConnectionConfig, dbName string,
 	}()
 
 	query = sanitizeSQLForPgLike(resolveDDLDBType(config), query)
-	timeoutSeconds := runConfig.Timeout
-	if timeoutSeconds <= 0 {
-		timeoutSeconds = 30
-	}
-	ctx, cancel := utils.ContextWithTimeout(time.Duration(timeoutSeconds) * time.Second)
+	ctx, cancel := newQueryExecutionContext(runConfig)
 	defer cancel()
 
 	isReadQuery := isReadOnlySQLQuery(runConfig.Type, query)
+	tryQueryFirst := shouldTryQueryResultFirst(runConfig.Type, query)
 
-	if isReadQuery {
-		var data []map[string]interface{}
-		var columns []string
-		if q, ok := dbInst.(interface {
+	if isReadQuery || tryQueryFirst {
+		var (
+			data     []map[string]interface{}
+			columns  []string
+			messages []string
+		)
+		if q, ok := dbInst.(db.QueryMessageExecer); ok {
+			data, columns, messages, err = q.QueryContextWithMessages(ctx, query)
+		} else if q, ok := dbInst.(interface {
 			QueryContext(context.Context, string) ([]map[string]interface{}, []string, error)
 		}); ok {
 			data, columns, err = q.QueryContext(ctx, query)
 		} else {
 			data, columns, err = dbInst.Query(query)
 		}
-		if err != nil {
+		if err == nil {
+			return connection.QueryResult{Success: true, Data: data, Fields: columns, Messages: messages}
+		}
+		if isReadQuery {
 			logger.Error(err, "DBQueryIsolated 查询失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
 			return connection.QueryResult{Success: false, Message: err.Error()}
 		}
-		return connection.QueryResult{Success: true, Data: data, Fields: columns}
 	}
 
 	var affected int64
@@ -1132,7 +1547,7 @@ func resolveCreateStatementWithFallback(dbInst db.Database, config connection.Co
 
 func supportsCreateStatementFallback(dbType string) bool {
 	switch dbType {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "sqlserver":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver":
 		return true
 	default:
 		return false
@@ -1141,7 +1556,7 @@ func supportsCreateStatementFallback(dbType string) bool {
 
 func supportsViewCreateStatementLookup(dbType string) bool {
 	switch dbType {
-	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "sqlserver", "oracle", "dameng", "sqlite", "duckdb", "clickhouse":
+	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver", "oracle", "dameng", "sqlite", "duckdb", "clickhouse":
 		return true
 	default:
 		return false
@@ -1289,7 +1704,7 @@ func (a *App) DBGetColumns(config connection.ConnectionConfig, dbName string, ta
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
-	schemaName, pureTableName := normalizeSchemaAndTable(config, dbName, tableName)
+	schemaName, pureTableName := normalizeMetadataSchemaAndTable(config, dbName, tableName)
 	columns, err := dbInst.GetColumns(schemaName, pureTableName)
 	if err != nil && shouldRefreshCachedConnection(err) {
 		if a.invalidateCachedDatabase(runConfig, err) {
@@ -1318,7 +1733,7 @@ func (a *App) DBGetIndexes(config connection.ConnectionConfig, dbName string, ta
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
-	schemaName, pureTableName := normalizeSchemaAndTable(config, dbName, tableName)
+	schemaName, pureTableName := normalizeMetadataSchemaAndTable(config, dbName, tableName)
 	indexes, err := dbInst.GetIndexes(schemaName, pureTableName)
 	if err != nil && shouldRefreshCachedConnection(err) {
 		if a.invalidateCachedDatabase(runConfig, err) {
@@ -1380,7 +1795,7 @@ func (a *App) DropView(config connection.ConnectionConfig, dbName string, viewNa
 
 	dbType := resolveDDLDBType(config)
 	switch dbType {
-	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "sqlite", "duckdb", "oracle", "dameng", "highgo", "vastbase", "opengauss", "sqlserver", "clickhouse":
+	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "sqlite", "duckdb", "oracle", "dameng", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver", "clickhouse":
 	default:
 		return connection.QueryResult{Success: false, Message: fmt.Sprintf("当前数据源(%s)暂不支持删除视图", dbType)}
 	}
@@ -1415,7 +1830,7 @@ func (a *App) DropFunction(config connection.ConnectionConfig, dbName string, ro
 
 	dbType := resolveDDLDBType(config)
 	switch dbType {
-	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "oracle", "dameng", "highgo", "vastbase", "opengauss", "sqlserver", "duckdb":
+	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "postgres", "kingbase", "oracle", "dameng", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver", "duckdb":
 	default:
 		return connection.QueryResult{Success: false, Message: fmt.Sprintf("当前数据源(%s)暂不支持删除函数/存储过程", dbType)}
 	}
@@ -1472,7 +1887,7 @@ func (a *App) RenameView(config connection.ConnectionConfig, dbName string, oldN
 	case "mysql", "mariadb", "oceanbase", "diros", "starrocks", "sphinx", "clickhouse":
 		newQualified := quoteTableIdentByType(dbType, schemaName, newName)
 		sql = fmt.Sprintf("RENAME TABLE %s TO %s", oldQualified, newQualified)
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
 		sql = fmt.Sprintf("ALTER VIEW %s RENAME TO %s", oldQualified, newQuoted)
 	case "sqlserver":
 		oldFullName := schemaName + "." + pureOldName
diff --git a/internal/app/methods_db_cancel_test.go b/internal/app/methods_db_cancel_test.go
index 36ffe39..c41fadf 100644
--- a/internal/app/methods_db_cancel_test.go
+++ b/internal/app/methods_db_cancel_test.go
@@ -147,3 +147,26 @@ func TestDBQueryWithCancel_QueryIDPropagation(t *testing.T) {
 		t.Fatalf("Expected QueryID 'test-query-id' in result, got: %s", result.QueryID)
 	}
 }
+
+func TestNewQueryExecutionContext_UsesTimeoutForNetworkDatabases(t *testing.T) {
+	ctx, cancel := newQueryExecutionContext(connection.ConnectionConfig{Type: "mysql", Timeout: 7})
+	defer cancel()
+
+	deadline, ok := ctx.Deadline()
+	if !ok {
+		t.Fatal("expected network database query context to carry a deadline")
+	}
+	remaining := time.Until(deadline)
+	if remaining <= 0 || remaining > 8*time.Second {
+		t.Fatalf("expected deadline around 7s, got remaining=%s", remaining)
+	}
+}
+
+func TestNewQueryExecutionContext_DoesNotApplyConnectTimeoutToDuckDBQueries(t *testing.T) {
+	ctx, cancel := newQueryExecutionContext(connection.ConnectionConfig{Type: "duckdb", Timeout: 1})
+	defer cancel()
+
+	if _, ok := ctx.Deadline(); ok {
+		t.Fatal("expected DuckDB query context to avoid connection-timeout deadline")
+	}
+}
diff --git a/internal/app/methods_db_conn_test.go b/internal/app/methods_db_conn_test.go
index ec99d06..c6ab499 100644
--- a/internal/app/methods_db_conn_test.go
+++ b/internal/app/methods_db_conn_test.go
@@ -7,6 +7,41 @@ import (
 	"GoNavi-Wails/internal/connection"
 )
 
+type releaseRecordingDB struct {
+	closed int
+}
+
+func (f *releaseRecordingDB) Connect(config connection.ConnectionConfig) error { return nil }
+func (f *releaseRecordingDB) Close() error {
+	f.closed++
+	return nil
+}
+func (f *releaseRecordingDB) Ping() error { return nil }
+func (f *releaseRecordingDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	return nil, nil, nil
+}
+func (f *releaseRecordingDB) Exec(query string) (int64, error)          { return 0, nil }
+func (f *releaseRecordingDB) GetDatabases() ([]string, error)           { return nil, nil }
+func (f *releaseRecordingDB) GetTables(dbName string) ([]string, error) { return nil, nil }
+func (f *releaseRecordingDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	return "", nil
+}
+func (f *releaseRecordingDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	return nil, nil
+}
+func (f *releaseRecordingDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	return nil, nil
+}
+func (f *releaseRecordingDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	return nil, nil
+}
+func (f *releaseRecordingDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return nil, nil
+}
+func (f *releaseRecordingDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return nil, nil
+}
+
 func TestNormalizeTestConnectionConfig_CapsTimeout(t *testing.T) {
 	cfg := connection.ConnectionConfig{Timeout: 60}
 	got := normalizeTestConnectionConfig(cfg)
@@ -130,3 +165,44 @@ func TestFormatConnSummary_DefaultTimeout(t *testing.T) {
 		t.Fatalf("formatConnSummary 默认超时应为30s, got=%q", got)
 	}
 }
+
+func TestDBReleaseConnectionClosesAllDatabaseCacheEntriesForSameInstance(t *testing.T) {
+	app := NewApp()
+	mainConfig := connection.ConnectionConfig{Type: "mysql", Host: "127.0.0.1", Port: 3306, User: "root", Database: "main"}
+	analyticsConfig := mainConfig
+	analyticsConfig.Database = "analytics"
+	otherConfig := mainConfig
+	otherConfig.Port = 3307
+	otherConfig.Database = "main"
+
+	mainDB := &releaseRecordingDB{}
+	analyticsDB := &releaseRecordingDB{}
+	otherDB := &releaseRecordingDB{}
+
+	app.dbCache[getCacheKey(mainConfig)] = cachedDatabase{
+		inst:   mainDB,
+		config: normalizeCacheKeyConfig(mainConfig),
+	}
+	app.dbCache[getCacheKey(analyticsConfig)] = cachedDatabase{
+		inst:   analyticsDB,
+		config: normalizeCacheKeyConfig(analyticsConfig),
+	}
+	app.dbCache[getCacheKey(otherConfig)] = cachedDatabase{
+		inst:   otherDB,
+		config: normalizeCacheKeyConfig(otherConfig),
+	}
+
+	result := app.DBReleaseConnection(connection.ConnectionConfig{Type: "mysql", Host: "127.0.0.1", Port: 3306, User: "root"})
+	if !result.Success {
+		t.Fatalf("expected release success, got %s", result.Message)
+	}
+	if mainDB.closed != 1 || analyticsDB.closed != 1 {
+		t.Fatalf("expected both same-instance cached connections closed, got main=%d analytics=%d", mainDB.closed, analyticsDB.closed)
+	}
+	if otherDB.closed != 0 {
+		t.Fatalf("expected other instance cache to remain open, got closed=%d", otherDB.closed)
+	}
+	if len(app.dbCache) != 1 {
+		t.Fatalf("expected only unrelated cache entry to remain, got %d", len(app.dbCache))
+	}
+}
diff --git a/internal/app/methods_db_create_statement_test.go b/internal/app/methods_db_create_statement_test.go
index 662561f..9faac18 100644
--- a/internal/app/methods_db_create_statement_test.go
+++ b/internal/app/methods_db_create_statement_test.go
@@ -115,6 +115,20 @@ func TestResolveDDLDBType_IRISTypeAlias(t *testing.T) {
 	}
 }
 
+func TestResolveDDLDBType_GoldenDBUsesMySQLDialect(t *testing.T) {
+	t.Parallel()
+
+	if got := resolveDDLDBType(connection.ConnectionConfig{Type: "goldendb"}); got != "mysql" {
+		t.Fatalf("expected goldendb type to resolve to mysql, got %q", got)
+	}
+	if got := resolveDDLDBType(connection.ConnectionConfig{Type: "custom", Driver: "greatdb"}); got != "mysql" {
+		t.Fatalf("expected greatdb custom driver to resolve to mysql, got %q", got)
+	}
+	if got := resolveDDLDBType(connection.ConnectionConfig{Type: "custom", Driver: "gdb"}); got != "mysql" {
+		t.Fatalf("expected gdb custom driver to resolve to mysql, got %q", got)
+	}
+}
+
 func TestNormalizeSchemaAndTableByType_PGLikeQuotedQualifiedName(t *testing.T) {
 	t.Parallel()
 
@@ -143,6 +157,42 @@ func TestNormalizeSchemaAndTableByType_PGLikeQuotedQualifiedName(t *testing.T) {
 	}
 }
 
+func TestNormalizeSchemaAndTableByType_KafkaPreservesDottedTopicName(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeSchemaAndTableByType("kafka", "topics", "orders.events.v1")
+	if schema != "topics" || table != "orders.events.v1" {
+		t.Fatalf("expected kafka topic to stay intact, got %q.%q", schema, table)
+	}
+}
+
+func TestNormalizeSchemaAndTableByType_MQTTPreservesTopicFilter(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeSchemaAndTableByType("mqtt", "topics", "devices/floor1.sensor.v1")
+	if schema != "topics" || table != "devices/floor1.sensor.v1" {
+		t.Fatalf("expected mqtt topic filter to stay intact, got %q.%q", schema, table)
+	}
+}
+
+func TestNormalizeSchemaAndTableByType_RocketMQPreservesTopicName(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeSchemaAndTableByType("rocketmq", "topics", "orders.events.v1")
+	if schema != "topics" || table != "orders.events.v1" {
+		t.Fatalf("expected rocketmq topic name to stay intact, got %q.%q", schema, table)
+	}
+}
+
+func TestNormalizeSchemaAndTableByType_RabbitMQPreservesDottedQueueName(t *testing.T) {
+	t.Parallel()
+
+	schema, table := normalizeSchemaAndTableByType("rabbitmq", "/", "orders.events.v1")
+	if schema != "/" || table != "orders.events.v1" {
+		t.Fatalf("expected rabbitmq queue to stay intact, got %q.%q", schema, table)
+	}
+}
+
 func TestBuildRunConfigForDDL_CustomHighGoUsesDatabase(t *testing.T) {
 	t.Parallel()
 
diff --git a/internal/app/methods_db_metadata_retry_test.go b/internal/app/methods_db_metadata_retry_test.go
index 19b1183..305916d 100644
--- a/internal/app/methods_db_metadata_retry_test.go
+++ b/internal/app/methods_db_metadata_retry_test.go
@@ -2,6 +2,9 @@ package app
 
 import (
 	"errors"
+	"fmt"
+	"path/filepath"
+	"strings"
 	"testing"
 
 	"GoNavi-Wails/internal/connection"
@@ -9,13 +12,28 @@ import (
 	"GoNavi-Wails/internal/secretstore"
 )
 
+func requireDuckDBOptionalDriverRuntime(t *testing.T) {
+	t.Helper()
+
+	if !db.IsOptionalGoDriverBuildIncluded("duckdb") {
+		t.Skip("当前构建未包含 DuckDB 可选驱动")
+	}
+	if ready, reason := db.DriverRuntimeSupportStatus("duckdb"); !ready {
+		t.Skipf("DuckDB runtime 未就绪，跳过集成测试: %s", reason)
+	}
+}
+
 type fakeMetadataRetryDB struct {
-	columns     []connection.ColumnDefinition
-	indexes     []connection.IndexDefinition
-	columnsErr  error
-	indexesErr  error
-	columnCalls int
-	indexCalls  int
+	columns      []connection.ColumnDefinition
+	indexes      []connection.IndexDefinition
+	columnsErr   error
+	indexesErr   error
+	columnCalls  int
+	indexCalls   int
+	columnSchema string
+	columnTable  string
+	indexSchema  string
+	indexTable   string
 }
 
 func (f *fakeMetadataRetryDB) Connect(config connection.ConnectionConfig) error { return nil }
@@ -34,6 +52,8 @@ func (f *fakeMetadataRetryDB) GetCreateStatement(dbName, tableName string) (stri
 }
 func (f *fakeMetadataRetryDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
 	f.columnCalls++
+	f.columnSchema = dbName
+	f.columnTable = tableName
 	if f.columnsErr != nil {
 		return nil, f.columnsErr
 	}
@@ -44,6 +64,8 @@ func (f *fakeMetadataRetryDB) GetAllColumns(dbName string) ([]connection.ColumnD
 }
 func (f *fakeMetadataRetryDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
 	f.indexCalls++
+	f.indexSchema = dbName
+	f.indexTable = tableName
 	if f.indexesErr != nil {
 		return nil, f.indexesErr
 	}
@@ -112,6 +134,152 @@ func TestDBGetColumnsRetriesAfterCachedConnectionRefresh(t *testing.T) {
 	}
 }
 
+func TestDBGetColumnsUsesSearchPathForPostgresPureTableMetadata(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+
+	dbInst := &fakeMetadataRetryDB{
+		columns: []connection.ColumnDefinition{{Name: "id", Key: "PRI"}},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return dbInst, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.DBGetColumns(connection.ConnectionConfig{
+		Type:     "postgres",
+		Host:     "127.0.0.1",
+		Port:     5432,
+		User:     "postgres",
+		Database: "demo_db",
+	}, "demo_db", "users")
+
+	if !result.Success {
+		t.Fatalf("expected DBGetColumns success, got failure: %s", result.Message)
+	}
+	if dbInst.columnSchema != "" || dbInst.columnTable != "users" {
+		t.Fatalf("expected postgres pure table metadata to pass empty schema/users, got %q.%q", dbInst.columnSchema, dbInst.columnTable)
+	}
+}
+
+func TestDBGetIndexesUsesSearchPathForPostgresPureTableMetadata(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+
+	dbInst := &fakeMetadataRetryDB{
+		indexes: []connection.IndexDefinition{{Name: "users_email_key", ColumnName: "email", NonUnique: 0}},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return dbInst, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.DBGetIndexes(connection.ConnectionConfig{
+		Type:     "postgres",
+		Host:     "127.0.0.1",
+		Port:     5432,
+		User:     "postgres",
+		Database: "demo_db",
+	}, "demo_db", "users")
+
+	if !result.Success {
+		t.Fatalf("expected DBGetIndexes success, got failure: %s", result.Message)
+	}
+	if dbInst.indexSchema != "" || dbInst.indexTable != "users" {
+		t.Fatalf("expected postgres pure table index metadata to pass empty schema/users, got %q.%q", dbInst.indexSchema, dbInst.indexTable)
+	}
+}
+
+func TestDBGetColumnsKeepsDatabaseForMySQLMetadata(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+
+	dbInst := &fakeMetadataRetryDB{
+		columns: []connection.ColumnDefinition{{Name: "id", Key: "PRI"}},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return dbInst, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.DBGetColumns(connection.ConnectionConfig{
+		Type: "mysql",
+		Host: "127.0.0.1",
+		Port: 3306,
+		User: "root",
+	}, "demo_db", "users")
+
+	if !result.Success {
+		t.Fatalf("expected DBGetColumns success, got failure: %s", result.Message)
+	}
+	if dbInst.columnSchema != "demo_db" || dbInst.columnTable != "users" {
+		t.Fatalf("expected mysql metadata to pass database/table, got %q.%q", dbInst.columnSchema, dbInst.columnTable)
+	}
+}
+
+func TestDBGetColumnsKeepsDuckDBQualifiedTableMetadata(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	originalDriverRuntimeSupportStatusFunc := driverRuntimeSupportStatusFunc
+	originalVerifyDriverAgentRevisionFunc := verifyDriverAgentRevisionFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+		driverRuntimeSupportStatusFunc = originalDriverRuntimeSupportStatusFunc
+		verifyDriverAgentRevisionFunc = originalVerifyDriverAgentRevisionFunc
+	})
+
+	dbInst := &fakeMetadataRetryDB{
+		columns: []connection.ColumnDefinition{{Name: "id", Key: "PRI"}},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return dbInst, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+	driverRuntimeSupportStatusFunc = func(driverType string) (bool, string) {
+		return true, ""
+	}
+	verifyDriverAgentRevisionFunc = func(config connection.ConnectionConfig) error {
+		return nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.DBGetColumns(connection.ConnectionConfig{
+		Type: "duckdb",
+		Host: "D:/tmp/demo.duckdb",
+	}, "main", "main.events")
+
+	if !result.Success {
+		t.Fatalf("expected DBGetColumns success, got failure: %s", result.Message)
+	}
+	if dbInst.columnSchema != "main" || dbInst.columnTable != "main.events" {
+		t.Fatalf("expected duckdb metadata to preserve main/main.events, got %q.%q", dbInst.columnSchema, dbInst.columnTable)
+	}
+}
+
 func TestDBGetIndexesRetriesAfterCachedConnectionRefresh(t *testing.T) {
 	originalNewDatabaseFunc := newDatabaseFunc
 	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
@@ -164,3 +332,260 @@ func TestDBGetIndexesRetriesAfterCachedConnectionRefresh(t *testing.T) {
 		t.Fatalf("unexpected indexes after retry: %#v", indexes)
 	}
 }
+
+func TestDBGetIndexesKeepsDuckDBQualifiedTableMetadata(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	originalDriverRuntimeSupportStatusFunc := driverRuntimeSupportStatusFunc
+	originalVerifyDriverAgentRevisionFunc := verifyDriverAgentRevisionFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+		driverRuntimeSupportStatusFunc = originalDriverRuntimeSupportStatusFunc
+		verifyDriverAgentRevisionFunc = originalVerifyDriverAgentRevisionFunc
+	})
+
+	dbInst := &fakeMetadataRetryDB{
+		indexes: []connection.IndexDefinition{{Name: "events_id_pkey", ColumnName: "id", NonUnique: 0}},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return dbInst, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+	driverRuntimeSupportStatusFunc = func(driverType string) (bool, string) {
+		return true, ""
+	}
+	verifyDriverAgentRevisionFunc = func(config connection.ConnectionConfig) error {
+		return nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.DBGetIndexes(connection.ConnectionConfig{
+		Type: "duckdb",
+		Host: "D:/tmp/demo.duckdb",
+	}, "main", "main.events")
+
+	if !result.Success {
+		t.Fatalf("expected DBGetIndexes success, got failure: %s", result.Message)
+	}
+	if dbInst.indexSchema != "main" || dbInst.indexTable != "main.events" {
+		t.Fatalf("expected duckdb index metadata to preserve main/main.events, got %q.%q", dbInst.indexSchema, dbInst.indexTable)
+	}
+}
+
+func TestDuckDBMetadataEndpointsReturnPrimaryKeyForQualifiedTableName(t *testing.T) {
+	requireDuckDBOptionalDriverRuntime(t)
+
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	dbPath := filepath.Join(t.TempDir(), "duckdb-primary-key.duckdb")
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{
+		Type: "duckdb",
+		Host: dbPath,
+	}
+	t.Cleanup(func() {
+		app.invalidateCachedDatabase(config, nil)
+	})
+
+	createResult := app.DBQuery(config, "main", `
+CREATE TABLE main.events (
+	id BIGINT PRIMARY KEY,
+	name VARCHAR
+);
+CREATE UNIQUE INDEX idx_events_name ON main.events(name);
+`)
+	if !createResult.Success {
+		t.Fatalf("expected DuckDB setup success, got failure: %s", createResult.Message)
+	}
+
+	columnResult := app.DBGetColumns(config, "main", "main.events")
+	if !columnResult.Success {
+		t.Fatalf("expected DBGetColumns success, got failure: %s", columnResult.Message)
+	}
+	columns, ok := columnResult.Data.([]connection.ColumnDefinition)
+	if !ok {
+		t.Fatalf("expected []connection.ColumnDefinition, got %T", columnResult.Data)
+	}
+	if len(columns) == 0 {
+		t.Fatalf("expected DuckDB columns, got %#v", columns)
+	}
+	if columns[0].Name != "id" || columns[0].Key != "PRI" {
+		t.Fatalf("expected primary key metadata on first column, got %#v", columns)
+	}
+
+	indexResult := app.DBGetIndexes(config, "main", "main.events")
+	if !indexResult.Success {
+		t.Fatalf("expected DBGetIndexes success, got failure: %s", indexResult.Message)
+	}
+	indexes, ok := indexResult.Data.([]connection.IndexDefinition)
+	if !ok {
+		t.Fatalf("expected []connection.IndexDefinition, got %T", indexResult.Data)
+	}
+	if len(indexes) == 0 {
+		t.Fatalf("expected DuckDB indexes, got %#v", indexes)
+	}
+	foundPrimary := false
+	for _, index := range indexes {
+		if index.ColumnName == "id" && index.NonUnique == 0 {
+			foundPrimary = true
+			break
+		}
+	}
+	if !foundPrimary {
+		t.Fatalf("expected DuckDB primary key index metadata, got %#v", indexes)
+	}
+}
+
+func TestDuckDBDefinitionQueriesReloadLatestDDLForObjectEditFlow(t *testing.T) {
+	requireDuckDBOptionalDriverRuntime(t)
+
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	dbPath := filepath.Join(t.TempDir(), "duckdb-definition-reload.duckdb")
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{
+		Type: "duckdb",
+		Host: dbPath,
+	}
+	t.Cleanup(func() {
+		app.invalidateCachedDatabase(config, nil)
+	})
+
+	createResult := app.DBQuery(config, "main", `
+CREATE VIEW main.active_users AS
+SELECT id FROM (VALUES (1), (2)) AS users(id);
+
+CREATE OR REPLACE MACRO main.add_one(x) AS x + 1;
+`)
+	if !createResult.Success {
+		t.Fatalf("expected DuckDB setup success, got failure: %s", createResult.Message)
+	}
+
+	viewDefinitionBefore := app.DBQuery(config, "main", `
+SELECT view_definition
+FROM information_schema.views
+WHERE table_schema = 'main' AND table_name = 'active_users'
+LIMIT 1`)
+	if !viewDefinitionBefore.Success {
+		t.Fatalf("expected initial view definition query success, got failure: %s", viewDefinitionBefore.Message)
+	}
+	viewRowsBefore, ok := viewDefinitionBefore.Data.([]map[string]interface{})
+	if !ok || len(viewRowsBefore) != 1 {
+		t.Fatalf("expected one initial view definition row, got %#v", viewDefinitionBefore.Data)
+	}
+	viewTextBefore := strings.TrimSpace(stringValueIgnoreCase(viewRowsBefore[0], "view_definition"))
+	if !strings.Contains(viewTextBefore, "SELECT id FROM") || !strings.Contains(viewTextBefore, "VALUES (1), (2)") {
+		t.Fatalf("unexpected initial view definition: %q", viewTextBefore)
+	}
+
+	routineDefinitionBefore := app.DBQuery(config, "main", `
+SELECT schema_name, function_name, parameters, macro_definition
+FROM duckdb_functions()
+WHERE internal = false
+  AND lower(function_type) = 'macro'
+  AND schema_name = 'main'
+  AND function_name = 'add_one'
+LIMIT 1`)
+	if !routineDefinitionBefore.Success {
+		t.Fatalf("expected initial routine definition query success, got failure: %s", routineDefinitionBefore.Message)
+	}
+	routineRowsBefore, ok := routineDefinitionBefore.Data.([]map[string]interface{})
+	if !ok || len(routineRowsBefore) != 1 {
+		t.Fatalf("expected one initial routine definition row, got %#v", routineDefinitionBefore.Data)
+	}
+	routineTextBefore := strings.TrimSpace(stringValueIgnoreCase(routineRowsBefore[0], "macro_definition"))
+	if !strings.Contains(routineTextBefore, "x + 1") {
+		t.Fatalf("unexpected initial routine definition: %q", routineTextBefore)
+	}
+
+	replaceResult := app.DBQuery(config, "main", `
+CREATE OR REPLACE VIEW main.active_users AS
+SELECT id, id * 10 AS score FROM (VALUES (1), (2)) AS users(id);
+
+CREATE OR REPLACE MACRO main.add_one(x) AS x + 2;
+`)
+	if !replaceResult.Success {
+		t.Fatalf("expected DuckDB replace success, got failure: %s", replaceResult.Message)
+	}
+
+	viewDefinitionAfter := app.DBQuery(config, "main", `
+SELECT view_definition
+FROM information_schema.views
+WHERE table_schema = 'main' AND table_name = 'active_users'
+LIMIT 1`)
+	if !viewDefinitionAfter.Success {
+		t.Fatalf("expected latest view definition query success, got failure: %s", viewDefinitionAfter.Message)
+	}
+	viewRowsAfter, ok := viewDefinitionAfter.Data.([]map[string]interface{})
+	if !ok || len(viewRowsAfter) != 1 {
+		t.Fatalf("expected one latest view definition row, got %#v", viewDefinitionAfter.Data)
+	}
+	viewTextAfter := strings.TrimSpace(stringValueIgnoreCase(viewRowsAfter[0], "view_definition"))
+	if !strings.Contains(viewTextAfter, "score") || !strings.Contains(viewTextAfter, "10") {
+		t.Fatalf("expected latest view definition, got %q", viewTextAfter)
+	}
+	if viewTextAfter == viewTextBefore {
+		t.Fatalf("expected latest view definition to differ from initial definition, got %q", viewTextAfter)
+	}
+
+	routineDefinitionAfter := app.DBQuery(config, "main", `
+SELECT schema_name, function_name, parameters, macro_definition
+FROM duckdb_functions()
+WHERE internal = false
+  AND lower(function_type) = 'macro'
+  AND schema_name = 'main'
+  AND function_name = 'add_one'
+LIMIT 1`)
+	if !routineDefinitionAfter.Success {
+		t.Fatalf("expected latest routine definition query success, got failure: %s", routineDefinitionAfter.Message)
+	}
+	routineRowsAfter, ok := routineDefinitionAfter.Data.([]map[string]interface{})
+	if !ok || len(routineRowsAfter) != 1 {
+		t.Fatalf("expected one latest routine definition row, got %#v", routineDefinitionAfter.Data)
+	}
+	routineTextAfter := strings.TrimSpace(stringValueIgnoreCase(routineRowsAfter[0], "macro_definition"))
+	if !strings.Contains(routineTextAfter, "x + 2") {
+		t.Fatalf("expected latest routine definition, got %q", routineTextAfter)
+	}
+	if routineTextAfter == routineTextBefore {
+		t.Fatalf("expected latest routine definition to differ from initial definition, got %q", routineTextAfter)
+	}
+}
+
+func stringValueIgnoreCase(row map[string]interface{}, key string) string {
+	for candidate, value := range row {
+		if strings.EqualFold(strings.TrimSpace(candidate), strings.TrimSpace(key)) {
+			return toStringValue(value)
+		}
+	}
+	return ""
+}
+
+func toStringValue(value interface{}) string {
+	switch typed := value.(type) {
+	case string:
+		return typed
+	case []byte:
+		return string(typed)
+	default:
+		if value == nil {
+			return ""
+		}
+		return fmt.Sprint(value)
+	}
+}
diff --git a/internal/app/methods_db_multi_test.go b/internal/app/methods_db_multi_test.go
index 1f0af6d..7bc13a5 100644
--- a/internal/app/methods_db_multi_test.go
+++ b/internal/app/methods_db_multi_test.go
@@ -2,6 +2,9 @@ package app
 
 import (
 	"context"
+	"database/sql"
+	"errors"
+	"strings"
 	"testing"
 
 	"GoNavi-Wails/internal/connection"
@@ -10,9 +13,58 @@ import (
 )
 
 type fakeBatchWriteDB struct {
-	batchCalls int
-	execCalls  int
-	lastQuery  string
+	batchCalls   int
+	execCalls    int
+	execQueries  []string
+	lastQuery    string
+	lastCtx      context.Context
+	queryCalls   int
+	queryMap     map[string][]map[string]interface{}
+	fieldMap     map[string][]string
+	messageMap   map[string][]string
+	multiResult  map[string][]connection.ResultSetData
+	queryErr     map[string]error
+	execErr      map[string]error
+	execAffected map[string]int64
+	session      *fakeBatchWriteSession
+}
+
+type fakeNativeMultiResultDB struct {
+	*fakeBatchWriteDB
+	multiCalls int
+}
+
+func (f *fakeNativeMultiResultDB) QueryMulti(query string) ([]connection.ResultSetData, error) {
+	results, _, err := f.QueryMultiWithMessages(query)
+	return results, err
+}
+
+func (f *fakeNativeMultiResultDB) QueryMultiWithMessages(query string) ([]connection.ResultSetData, []string, error) {
+	return f.QueryMultiContextWithMessages(context.Background(), query)
+}
+
+func (f *fakeNativeMultiResultDB) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
+	results, _, err := f.QueryMultiContextWithMessages(ctx, query)
+	return results, err
+}
+
+func (f *fakeNativeMultiResultDB) QueryMultiContextWithMessages(ctx context.Context, query string) ([]connection.ResultSetData, []string, error) {
+	f.multiCalls++
+	if err := f.queryErr[query]; err != nil {
+		return nil, nil, err
+	}
+	if multi := f.multiResult[query]; len(multi) > 0 {
+		return cloneResultSets(multi), append([]string(nil), f.messageMap[query]...), nil
+	}
+	rows, columns, messages, err := f.QueryContextWithMessages(ctx, query)
+	if err != nil {
+		return nil, nil, err
+	}
+	return []connection.ResultSetData{{
+		Rows:     rows,
+		Columns:  columns,
+		Messages: append([]string(nil), messages...),
+	}}, append([]string(nil), messages...), nil
 }
 
 func (f *fakeBatchWriteDB) Connect(config connection.ConnectionConfig) error {
@@ -28,11 +80,27 @@ func (f *fakeBatchWriteDB) Ping() error {
 }
 
 func (f *fakeBatchWriteDB) Query(query string) ([]map[string]interface{}, []string, error) {
-	return nil, nil, nil
+	f.queryCalls++
+	if err := f.queryErr[query]; err != nil {
+		return nil, nil, err
+	}
+	return f.queryMap[query], f.fieldMap[query], nil
+}
+
+func (f *fakeBatchWriteDB) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	rows, fields, err := f.Query(query)
+	return rows, fields, f.messageMap[query], err
 }
 
 func (f *fakeBatchWriteDB) Exec(query string) (int64, error) {
 	f.execCalls++
+	f.execQueries = append(f.execQueries, query)
+	if err := f.execErr[query]; err != nil {
+		return 0, err
+	}
+	if affected, ok := f.execAffected[query]; ok {
+		return affected, nil
+	}
 	return 1, nil
 }
 
@@ -69,19 +137,193 @@ func (f *fakeBatchWriteDB) GetTriggers(dbName, tableName string) ([]connection.T
 }
 
 func (f *fakeBatchWriteDB) ExecContext(ctx context.Context, query string) (int64, error) {
+	f.lastCtx = ctx
 	f.execCalls++
+	f.execQueries = append(f.execQueries, query)
+	if err := f.execErr[query]; err != nil {
+		return 0, err
+	}
+	if affected, ok := f.execAffected[query]; ok {
+		return affected, nil
+	}
 	return 1, nil
 }
 
+func (f *fakeBatchWriteDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	f.lastCtx = ctx
+	f.queryCalls++
+	if err := f.queryErr[query]; err != nil {
+		return nil, nil, err
+	}
+	return f.queryMap[query], f.fieldMap[query], nil
+}
+
+func (f *fakeBatchWriteDB) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
+	rows, fields, err := f.QueryContext(ctx, query)
+	return rows, fields, f.messageMap[query], err
+}
+
 func (f *fakeBatchWriteDB) ExecBatchContext(ctx context.Context, query string) (int64, error) {
 	f.batchCalls++
 	f.lastQuery = query
 	return 500, nil
 }
 
-var _ db.BatchWriteExecer = (*fakeBatchWriteDB)(nil)
+func (f *fakeBatchWriteDB) OpenSessionExecer(ctx context.Context) (db.StatementExecer, error) {
+	f.session = &fakeBatchWriteSession{parent: f}
+	return f.session, nil
+}
 
-func TestDBQueryMultiUsesBatchWriteExecerForAllWriteStatements(t *testing.T) {
+type fakeBatchWriteSession struct {
+	parent     *fakeBatchWriteDB
+	queryCalls int
+	execCalls  int
+	batchCalls int
+	closed     bool
+}
+
+func (s *fakeBatchWriteSession) Query(query string) ([]map[string]interface{}, []string, error) {
+	return s.QueryContext(context.Background(), query)
+}
+
+func (s *fakeBatchWriteSession) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	s.queryCalls++
+	return s.parent.QueryContext(ctx, query)
+}
+
+func (s *fakeBatchWriteSession) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	return s.QueryContextWithMessages(context.Background(), query)
+}
+
+func (s *fakeBatchWriteSession) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
+	s.queryCalls++
+	return s.parent.QueryContextWithMessages(ctx, query)
+}
+
+func (s *fakeBatchWriteSession) QueryMulti(query string) ([]connection.ResultSetData, error) {
+	return s.QueryMultiContext(context.Background(), query)
+}
+
+func (s *fakeBatchWriteSession) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
+	if multi := s.parent.multiResult[query]; len(multi) > 0 {
+		s.queryCalls++
+		return cloneResultSets(multi), nil
+	}
+	rows, columns, err := s.QueryContext(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+	return []connection.ResultSetData{{Rows: rows, Columns: columns}}, nil
+}
+
+func (s *fakeBatchWriteSession) QueryMultiWithMessages(query string) ([]connection.ResultSetData, []string, error) {
+	return s.QueryMultiContextWithMessages(context.Background(), query)
+}
+
+func (s *fakeBatchWriteSession) QueryMultiContextWithMessages(ctx context.Context, query string) ([]connection.ResultSetData, []string, error) {
+	if err := s.parent.queryErr[query]; err != nil {
+		s.queryCalls++
+		return nil, nil, err
+	}
+	if multi := s.parent.multiResult[query]; len(multi) > 0 {
+		s.queryCalls++
+		return cloneResultSets(multi), append([]string(nil), s.parent.messageMap[query]...), nil
+	}
+	rows, columns, messages, err := s.QueryContextWithMessages(ctx, query)
+	if err != nil {
+		return nil, nil, err
+	}
+	return []connection.ResultSetData{{
+		Rows:     rows,
+		Columns:  columns,
+		Messages: append([]string(nil), messages...),
+	}}, append([]string(nil), messages...), nil
+}
+
+func (s *fakeBatchWriteSession) Exec(query string) (int64, error) {
+	return s.ExecContext(context.Background(), query)
+}
+
+func (s *fakeBatchWriteSession) ExecContext(ctx context.Context, query string) (int64, error) {
+	s.execCalls++
+	return s.parent.ExecContext(ctx, query)
+}
+
+func (s *fakeBatchWriteSession) ExecBatchContext(ctx context.Context, query string) (int64, error) {
+	s.batchCalls++
+	return s.parent.ExecBatchContext(ctx, query)
+}
+
+func (s *fakeBatchWriteSession) Close() error {
+	s.closed = true
+	return nil
+}
+
+type fakeTransactionalDB struct {
+	fakeBatchWriteDB
+	txSession *fakeTransactionSession
+}
+
+func (f *fakeTransactionalDB) OpenTransactionExecer(ctx context.Context) (db.TransactionExecer, error) {
+	f.txSession = &fakeTransactionSession{
+		fakeBatchWriteSession: fakeBatchWriteSession{parent: &f.fakeBatchWriteDB},
+		beginCtx:              ctx,
+	}
+	return f.txSession, nil
+}
+
+type fakeTransactionSession struct {
+	fakeBatchWriteSession
+	beginCtx      context.Context
+	commitCalls   int
+	rollbackCalls int
+}
+
+func (s *fakeTransactionSession) Commit() error {
+	if s.beginCtx != nil && s.beginCtx.Err() != nil {
+		return sql.ErrTxDone
+	}
+	s.commitCalls++
+	return nil
+}
+
+func (s *fakeTransactionSession) Rollback() error {
+	if s.beginCtx != nil && s.beginCtx.Err() != nil {
+		return sql.ErrTxDone
+	}
+	s.rollbackCalls++
+	return nil
+}
+
+func cloneResultSets(input []connection.ResultSetData) []connection.ResultSetData {
+	if len(input) == 0 {
+		return nil
+	}
+	cloned := make([]connection.ResultSetData, 0, len(input))
+	for _, item := range input {
+		rows := make([]map[string]interface{}, 0, len(item.Rows))
+		for _, row := range item.Rows {
+			if row == nil {
+				rows = append(rows, nil)
+				continue
+			}
+			rowCopy := make(map[string]interface{}, len(row))
+			for key, value := range row {
+				rowCopy[key] = value
+			}
+			rows = append(rows, rowCopy)
+		}
+		cloned = append(cloned, connection.ResultSetData{
+			Rows:           rows,
+			Columns:        append([]string(nil), item.Columns...),
+			Messages:       append([]string(nil), item.Messages...),
+			StatementIndex: item.StatementIndex,
+		})
+	}
+	return cloned
+}
+
+func TestDBQueryMultiKeepsOracleAnonymousBlockAsSingleStatement(t *testing.T) {
 	originalNewDatabaseFunc := newDatabaseFunc
 	t.Cleanup(func() {
 		newDatabaseFunc = originalNewDatabaseFunc
@@ -92,6 +334,221 @@ func TestDBQueryMultiUsesBatchWriteExecerForAllWriteStatements(t *testing.T) {
 		return fakeDB, nil
 	}
 
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{
+		Type: "oracle",
+		Host: "127.0.0.1",
+		Port: 1521,
+		User: "app",
+	}
+	query := `BEGIN
+    INSERT INTO tmp_disable_trigger (table_name) VALUES ('t_memcard_reg');
+    UPDATE t_memcard_reg SET CARDLEVEL = 1 WHERE MEMCARDNO = '8032277312';
+    DELETE FROM tmp_disable_trigger WHERE table_name = 't_memcard_reg';
+END;`
+
+	result := app.DBQueryMulti(config, "ORCLPDB1", query, "oracle-plsql-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	if fakeDB.batchCalls != 0 {
+		t.Fatalf("expected PL/SQL block to skip batch path, got batchCalls=%d", fakeDB.batchCalls)
+	}
+	if fakeDB.execCalls != 1 || len(fakeDB.execQueries) != 1 {
+		t.Fatalf("expected one sequential exec call, got execCalls=%d queries=%#v", fakeDB.execCalls, fakeDB.execQueries)
+	}
+	if fakeDB.execQueries[0] != query {
+		t.Fatalf("expected PL/SQL block to stay intact, got %q", fakeDB.execQueries[0])
+	}
+}
+
+func TestDBQueryMultiKeepsOracleCreateProcedureAsSingleStatement(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	fakeDB := &fakeBatchWriteDB{}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{
+		Type: "oracle",
+		Host: "127.0.0.1",
+		Port: 1521,
+		User: "app",
+	}
+	query := `CREATE OR REPLACE PROCEDURE proc_tally2accept(
+    p_tallyacceptno IN t_tally_accept_h.acceptno%TYPE,
+    out_acceptno OUT t_accept_h.acceptno%TYPE
+) IS
+    v_busno t_tally_accept_h.busno%TYPE;
+    v_count PLS_INTEGER;
+BEGIN
+    SELECT COUNT(*) INTO v_count FROM t_tally_accept_h WHERE acceptno = p_tallyacceptno;
+    IF v_count > 0 THEN
+        out_acceptno := p_tallyacceptno;
+    END IF;
+END;`
+
+	result := app.DBQueryMulti(config, "ORCLPDB1", query, "oracle-create-procedure-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	if fakeDB.batchCalls != 0 {
+		t.Fatalf("expected CREATE PROCEDURE to skip batch path, got batchCalls=%d", fakeDB.batchCalls)
+	}
+	if fakeDB.execCalls != 1 || len(fakeDB.execQueries) != 1 {
+		t.Fatalf("expected one sequential exec call, got execCalls=%d queries=%#v", fakeDB.execCalls, fakeDB.execQueries)
+	}
+	if fakeDB.execQueries[0] != query {
+		t.Fatalf("expected CREATE PROCEDURE to stay intact, got %q", fakeDB.execQueries[0])
+	}
+}
+
+var _ db.BatchWriteExecer = (*fakeBatchWriteDB)(nil)
+var _ db.SessionExecerProvider = (*fakeBatchWriteDB)(nil)
+var _ db.QueryMessageExecer = (*fakeBatchWriteDB)(nil)
+var _ db.StatementQueryMessageExecer = (*fakeBatchWriteSession)(nil)
+
+func TestDBQueryWithCancelReturnsResultSetForExecStoredProcedure(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := "EXEC sp_who2"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			query: {
+				{"SPID": 52, "STATUS": "RUNNABLE"},
+			},
+		},
+		fieldMap: map[string][]string{
+			query: {"SPID", "STATUS"},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}
+
+	result := app.DBQueryWithCancel(config, "master", query, "sp-who2-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryWithCancel success, got failure: %s", result.Message)
+	}
+	rows, ok := result.Data.([]map[string]interface{})
+	if !ok {
+		t.Fatalf("expected []map[string]interface{}, got %T", result.Data)
+	}
+	if len(rows) != 1 || rows[0]["SPID"] != 52 {
+		t.Fatalf("unexpected rows: %#v", rows)
+	}
+	if fakeDB.execCalls != 0 {
+		t.Fatalf("expected exec path to be skipped, got execCalls=%d", fakeDB.execCalls)
+	}
+}
+
+func TestDBQueryWithCancelReturnsMessagesForSQLServerQuery(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := "SET STATISTICS IO ON"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			query: {},
+		},
+		fieldMap: map[string][]string{
+			query: {},
+		},
+		messageMap: map[string][]string{
+			query: {"Table 'users'. Scan count 1, logical reads 3."},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}
+
+	result := app.DBQueryWithCancel(config, "master", query, "statistics-io-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryWithCancel success, got failure: %s", result.Message)
+	}
+	if len(result.Messages) != 1 || result.Messages[0] == "" {
+		t.Fatalf("expected SQL Server messages to be returned, got %#v", result.Messages)
+	}
+}
+
+func TestDBQueryWithCancel_DuckDBQueriesDoNotInheritConnectTimeout(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalVerifyDriverAgentRevisionFunc := verifyDriverAgentRevisionFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		verifyDriverAgentRevisionFunc = originalVerifyDriverAgentRevisionFunc
+	})
+
+	query := "SELECT 1"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			query: {
+				{"value": 1},
+			},
+		},
+		fieldMap: map[string][]string{
+			query: {"value"},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+	verifyDriverAgentRevisionFunc = func(config connection.ConnectionConfig) error {
+		return nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "duckdb", Host: ":memory:", Timeout: 1}
+
+	result := app.DBQueryWithCancel(config, "main", query, "duckdb-no-deadline-test")
+	if !result.Success {
+		t.Fatalf("expected DuckDB DBQueryWithCancel success, got failure: %s", result.Message)
+	}
+	if fakeDB.lastCtx == nil {
+		t.Fatal("expected DuckDB query path to receive a context")
+	}
+	if _, ok := fakeDB.lastCtx.Deadline(); ok {
+		t.Fatal("expected DuckDB query context to avoid connection-timeout deadline")
+	}
+}
+
+func TestDBQueryMultiPreservesPerStatementResultsForMultipleWriteStatements(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	firstStmt := "DELETE FROM assets_asset"
+	secondStmt := "DELETE FROM assets_assetcategory"
+	fakeDB := &fakeBatchWriteDB{
+		execAffected: map[string]int64{
+			firstStmt:  5,
+			secondStmt: 10,
+		},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
 	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
 	config := connection.ConnectionConfig{
 		Type: "mysql",
@@ -99,30 +556,1121 @@ func TestDBQueryMultiUsesBatchWriteExecerForAllWriteStatements(t *testing.T) {
 		Port: 1433,
 		User: "sa",
 	}
-	query := "INSERT INTO demo(id) VALUES (1);\nINSERT INTO demo(id) VALUES (2);"
+	query := firstStmt + ";\n" + secondStmt + ";"
 
 	result := app.DBQueryMulti(config, "testdb", query, "batch-write-test")
 	if !result.Success {
 		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
 	}
-	if fakeDB.batchCalls != 1 {
-		t.Fatalf("expected batch path to run once, got %d", fakeDB.batchCalls)
+	if fakeDB.batchCalls != 0 {
+		t.Fatalf("expected multiple write statements to skip batch path so each result can be preserved, got %d", fakeDB.batchCalls)
 	}
-	if fakeDB.execCalls != 0 {
-		t.Fatalf("expected sequential exec path to be skipped, got execCalls=%d", fakeDB.execCalls)
+	if fakeDB.execCalls != 2 {
+		t.Fatalf("expected sequential exec path to run twice, got execCalls=%d", fakeDB.execCalls)
 	}
-	if fakeDB.lastQuery != query {
-		t.Fatalf("expected batch query to stay intact, got %q", fakeDB.lastQuery)
+	if len(fakeDB.execQueries) != 2 || fakeDB.execQueries[0] != firstStmt || fakeDB.execQueries[1] != secondStmt {
+		t.Fatalf("expected sequential execs to preserve statement order, got %#v", fakeDB.execQueries)
 	}
 
 	resultSets, ok := result.Data.([]connection.ResultSetData)
 	if !ok {
 		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
 	}
-	if len(resultSets) != 1 || len(resultSets[0].Rows) != 1 {
-		t.Fatalf("expected one affectedRows result set, got %#v", resultSets)
+	if len(resultSets) != 2 {
+		t.Fatalf("expected one affectedRows result set per statement, got %#v", resultSets)
 	}
-	if got := resultSets[0].Rows[0]["affectedRows"]; got != int64(500) {
-		t.Fatalf("expected affectedRows=500, got %#v", got)
+	if len(resultSets[0].Rows) != 1 || len(resultSets[1].Rows) != 1 {
+		t.Fatalf("expected both result sets to contain a single affectedRows row, got %#v", resultSets)
+	}
+	if got := resultSets[0].Rows[0]["affectedRows"]; got != int64(5) {
+		t.Fatalf("expected first affectedRows=5, got %#v", got)
+	}
+	if got := resultSets[1].Rows[0]["affectedRows"]; got != int64(10) {
+		t.Fatalf("expected second affectedRows=10, got %#v", got)
+	}
+}
+
+func TestDBQueryMultiTransactionalKeepsDMLTransactionOpenUntilCommit(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	firstStmt := "UPDATE users SET name = 'new' WHERE id = 1"
+	secondStmt := "DELETE FROM audit_logs WHERE user_id = 1"
+	fakeDB := &fakeBatchWriteDB{
+		execAffected: map[string]int64{
+			firstStmt:  1,
+			secondStmt: 3,
+		},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "mysql", Host: "127.0.0.1", Port: 3306, User: "root"}
+
+	result := app.DBQueryMultiTransactional(config, "main", firstStmt+";\n"+secondStmt+";", "tx-query")
+	if !result.Success {
+		t.Fatalf("expected transactional query success, got failure: %s", result.Message)
+	}
+	if result.TransactionID == "" || !result.TransactionPending {
+		t.Fatalf("expected pending transaction metadata, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if fakeDB.session == nil {
+		t.Fatal("expected transactional query to open a pinned session")
+	}
+	if fakeDB.session.closed {
+		t.Fatal("expected transaction session to stay open before commit")
+	}
+	wantExecs := []string{"START TRANSACTION", firstStmt, secondStmt}
+	if len(fakeDB.execQueries) != len(wantExecs) {
+		t.Fatalf("expected exec queries %#v, got %#v", wantExecs, fakeDB.execQueries)
+	}
+	for i, want := range wantExecs {
+		if fakeDB.execQueries[i] != want {
+			t.Fatalf("expected exec query %d = %q, got %q", i, want, fakeDB.execQueries[i])
+		}
+	}
+
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 2 {
+		t.Fatalf("expected one affectedRows result per DML statement, got %#v", resultSets)
+	}
+	if got := resultSets[0].Rows[0]["affectedRows"]; got != int64(1) {
+		t.Fatalf("expected first affectedRows=1, got %#v", got)
+	}
+	if got := resultSets[1].Rows[0]["affectedRows"]; got != int64(3) {
+		t.Fatalf("expected second affectedRows=3, got %#v", got)
+	}
+
+	commitResult := app.DBCommitTransaction(result.TransactionID)
+	if !commitResult.Success {
+		t.Fatalf("expected commit success, got failure: %s", commitResult.Message)
+	}
+	if !fakeDB.session.closed {
+		t.Fatal("expected transaction session to close after commit")
+	}
+	if got := fakeDB.execQueries[len(fakeDB.execQueries)-1]; got != "COMMIT" {
+		t.Fatalf("expected final exec to be COMMIT, got %q", got)
+	}
+}
+
+func TestDBQueryMultiTransactionalUsesImplicitSessionTransactionForOracle(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	firstStmt := "UPDATE users SET name = 'new' WHERE id = 1"
+	secondStmt := "DELETE FROM audit_logs WHERE user_id = 1"
+	fakeDB := &fakeBatchWriteDB{
+		execAffected: map[string]int64{
+			firstStmt:  1,
+			secondStmt: 3,
+		},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "oracle", Host: "127.0.0.1", Port: 1521, User: "app"}
+
+	result := app.DBQueryMultiTransactional(config, "ORCLPDB1", firstStmt+";\n"+secondStmt+";", "oracle-tx-query")
+	if !result.Success {
+		t.Fatalf("expected Oracle transactional query success, got failure: %s", result.Message)
+	}
+	if result.TransactionID == "" || !result.TransactionPending {
+		t.Fatalf("expected pending transaction metadata, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if fakeDB.session == nil {
+		t.Fatal("expected Oracle transactional query to open a pinned session")
+	}
+	if fakeDB.session.closed {
+		t.Fatal("expected Oracle transaction session to stay open before commit")
+	}
+	wantExecs := []string{firstStmt, secondStmt}
+	if len(fakeDB.execQueries) != len(wantExecs) {
+		t.Fatalf("expected implicit transaction exec queries %#v, got %#v", wantExecs, fakeDB.execQueries)
+	}
+	for i, want := range wantExecs {
+		if fakeDB.execQueries[i] != want {
+			t.Fatalf("expected exec query %d = %q, got %q", i, want, fakeDB.execQueries[i])
+		}
+	}
+
+	commitResult := app.DBCommitTransaction(result.TransactionID)
+	if !commitResult.Success {
+		t.Fatalf("expected Oracle commit success, got failure: %s", commitResult.Message)
+	}
+	if !fakeDB.session.closed {
+		t.Fatal("expected Oracle transaction session to close after commit")
+	}
+	wantExecs = append(wantExecs, "COMMIT")
+	if len(fakeDB.execQueries) != len(wantExecs) {
+		t.Fatalf("expected Oracle implicit transaction COMMIT on pinned session, got %#v", fakeDB.execQueries)
+	}
+	for i, want := range wantExecs {
+		if fakeDB.execQueries[i] != want {
+			t.Fatalf("expected exec query %d = %q, got %q", i, want, fakeDB.execQueries[i])
+		}
+	}
+}
+
+func TestDBQueryMultiTransactionalOraclePrefersTransactionProviderForFinish(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	for _, tt := range []struct {
+		name              string
+		finish            func(*App, string) connection.QueryResult
+		wantCommitCalls   int
+		wantRollbackCalls int
+	}{
+		{
+			name: "commit",
+			finish: func(app *App, transactionID string) connection.QueryResult {
+				return app.DBCommitTransaction(transactionID)
+			},
+			wantCommitCalls: 1,
+		},
+		{
+			name: "rollback",
+			finish: func(app *App, transactionID string) connection.QueryResult {
+				return app.DBRollbackTransaction(transactionID)
+			},
+			wantRollbackCalls: 1,
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			stmt := "UPDATE users SET name = 'new' WHERE id = 1"
+			fakeDB := &fakeTransactionalDB{
+				fakeBatchWriteDB: fakeBatchWriteDB{
+					execAffected: map[string]int64{
+						stmt: 1,
+					},
+					execErr: map[string]error{
+						"COMMIT":   errors.New("oracle commit rows affected unavailable"),
+						"ROLLBACK": errors.New("oracle rollback rows affected unavailable"),
+					},
+				},
+			}
+			newDatabaseFunc = func(dbType string) (db.Database, error) {
+				return fakeDB, nil
+			}
+
+			app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+			config := connection.ConnectionConfig{Type: "oracle", Host: "127.0.0.1", Port: 1521, User: "app"}
+
+			result := app.DBQueryMultiTransactional(config, "ORCLPDB1", stmt, "oracle-provider-finish-"+tt.name)
+			if !result.Success {
+				t.Fatalf("expected Oracle transactional query success, got failure: %s", result.Message)
+			}
+			if result.TransactionID == "" || !result.TransactionPending {
+				t.Fatalf("expected pending transaction metadata, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+			}
+			if fakeDB.session != nil {
+				t.Fatal("expected Oracle to use transaction provider instead of plain session provider")
+			}
+			if fakeDB.txSession == nil {
+				t.Fatal("expected Oracle to open a transaction provider session")
+			}
+
+			finishResult := tt.finish(app, result.TransactionID)
+			if !finishResult.Success {
+				t.Fatalf("expected Oracle transaction %s success through transaction provider, got failure: %s", tt.name, finishResult.Message)
+			}
+			if fakeDB.txSession.commitCalls != tt.wantCommitCalls {
+				t.Fatalf("expected commitCalls=%d, got %d", tt.wantCommitCalls, fakeDB.txSession.commitCalls)
+			}
+			if fakeDB.txSession.rollbackCalls != tt.wantRollbackCalls {
+				t.Fatalf("expected rollbackCalls=%d, got %d", tt.wantRollbackCalls, fakeDB.txSession.rollbackCalls)
+			}
+			if !fakeDB.txSession.closed {
+				t.Fatal("expected transaction provider session to close after finish")
+			}
+			for _, query := range fakeDB.execQueries {
+				if query == "COMMIT" || query == "ROLLBACK" {
+					t.Fatalf("expected finish to avoid plain ExecContext(%q), got exec queries %#v", query, fakeDB.execQueries)
+				}
+			}
+		})
+	}
+}
+
+func TestDBQueryMultiTransactionalUsesOracleImplicitSessionForOceanBaseOracleProtocol(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalVerifyDriverAgentRevisionFunc := verifyDriverAgentRevisionFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		verifyDriverAgentRevisionFunc = originalVerifyDriverAgentRevisionFunc
+	})
+
+	stmt := "UPDATE USERS SET NAME = 'new' WHERE ID = 1"
+	fakeDB := &fakeBatchWriteDB{
+		execAffected: map[string]int64{
+			stmt: 1,
+		},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+	verifyDriverAgentRevisionFunc = func(config connection.ConnectionConfig) error {
+		return nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{
+		Type:              "oceanbase",
+		Host:              "127.0.0.1",
+		Port:              2881,
+		User:              "app",
+		OceanBaseProtocol: "oracle",
+	}
+
+	result := app.DBQueryMultiTransactional(config, "APP", stmt, "ob-oracle-tx-query")
+	if !result.Success {
+		t.Fatalf("expected OceanBase Oracle transactional query success, got failure: %s", result.Message)
+	}
+	if result.TransactionID == "" || !result.TransactionPending {
+		t.Fatalf("expected pending transaction metadata, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if fakeDB.session == nil {
+		t.Fatal("expected OceanBase Oracle transactional query to open a pinned Oracle-style session")
+	}
+	if fakeDB.session.closed {
+		t.Fatal("expected OceanBase Oracle transaction session to stay open before commit")
+	}
+	if len(fakeDB.execQueries) != 1 || fakeDB.execQueries[0] != stmt {
+		t.Fatalf("expected OceanBase Oracle to skip START TRANSACTION and execute only DML before commit, got %#v", fakeDB.execQueries)
+	}
+
+	commitResult := app.DBCommitTransaction(result.TransactionID)
+	if !commitResult.Success {
+		t.Fatalf("expected OceanBase Oracle commit success, got failure: %s", commitResult.Message)
+	}
+	wantExecs := []string{stmt, "COMMIT"}
+	if len(fakeDB.execQueries) != len(wantExecs) {
+		t.Fatalf("expected OceanBase Oracle implicit transaction COMMIT on pinned session, got %#v", fakeDB.execQueries)
+	}
+	for i, want := range wantExecs {
+		if fakeDB.execQueries[i] != want {
+			t.Fatalf("expected exec query %d = %q, got %q", i, want, fakeDB.execQueries[i])
+		}
+	}
+}
+
+func TestDBQueryMultiTransactionalOracleImplicitSessionOutlivesAppContextCancellation(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	for _, tt := range []struct {
+		name         string
+		finish       func(*App, string) connection.QueryResult
+		wantFinalSQL string
+	}{
+		{
+			name: "commit",
+			finish: func(app *App, transactionID string) connection.QueryResult {
+				return app.DBCommitTransaction(transactionID)
+			},
+			wantFinalSQL: "COMMIT",
+		},
+		{
+			name: "rollback",
+			finish: func(app *App, transactionID string) connection.QueryResult {
+				return app.DBRollbackTransaction(transactionID)
+			},
+			wantFinalSQL: "ROLLBACK",
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			stmt := "UPDATE users SET name = 'new' WHERE id = 1"
+			fakeDB := &fakeBatchWriteDB{
+				execAffected: map[string]int64{
+					stmt: 1,
+				},
+			}
+			newDatabaseFunc = func(dbType string) (db.Database, error) {
+				return fakeDB, nil
+			}
+
+			appCtx, cancelAppCtx := context.WithCancel(context.Background())
+			app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+			app.ctx = appCtx
+			config := connection.ConnectionConfig{Type: "oracle", Host: "127.0.0.1", Port: 1521, User: "app"}
+
+			result := app.DBQueryMultiTransactional(config, "ORCLPDB1", stmt, "oracle-tx-context-"+tt.name)
+			if !result.Success {
+				t.Fatalf("expected Oracle transactional query success, got failure: %s", result.Message)
+			}
+			if result.TransactionID == "" || !result.TransactionPending {
+				t.Fatalf("expected pending transaction metadata, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+			}
+
+			cancelAppCtx()
+			finishResult := tt.finish(app, result.TransactionID)
+			if !finishResult.Success {
+				t.Fatalf("expected Oracle transaction %s success after app context cancellation, got failure: %s", tt.name, finishResult.Message)
+			}
+			if fakeDB.session == nil || !fakeDB.session.closed {
+				t.Fatal("expected Oracle transaction session to close after finish")
+			}
+			if len(fakeDB.execQueries) != 2 || fakeDB.execQueries[0] != stmt || fakeDB.execQueries[1] != tt.wantFinalSQL {
+				t.Fatalf("expected Oracle implicit transaction to finish with %s, got %#v", tt.wantFinalSQL, fakeDB.execQueries)
+			}
+		})
+	}
+}
+
+func TestDBQueryMultiTransactionalRollsBackOracleImplicitSessionOnDMLFailure(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	firstStmt := "UPDATE users SET name = 'new' WHERE id = 1"
+	secondStmt := "DELETE FROM audit_logs WHERE user_id = 1"
+	fakeDB := &fakeBatchWriteDB{
+		execErr: map[string]error{
+			secondStmt: errors.New("delete failed"),
+		},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "oracle", Host: "127.0.0.1", Port: 1521, User: "app"}
+
+	result := app.DBQueryMultiTransactional(config, "ORCLPDB1", firstStmt+";\n"+secondStmt+";", "oracle-tx-failure")
+	if result.Success {
+		t.Fatal("expected Oracle transactional query failure")
+	}
+	if result.TransactionID != "" || result.TransactionPending {
+		t.Fatalf("expected failed transaction not to be exposed, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if fakeDB.session == nil {
+		t.Fatal("expected Oracle transactional query to open a pinned session")
+	}
+	if !fakeDB.session.closed {
+		t.Fatal("expected failed Oracle transaction session to close")
+	}
+	wantExecs := []string{firstStmt, secondStmt, "ROLLBACK"}
+	if len(fakeDB.execQueries) != len(wantExecs) {
+		t.Fatalf("expected Oracle implicit transaction rollback, got %#v", fakeDB.execQueries)
+	}
+	for i, want := range wantExecs {
+		if fakeDB.execQueries[i] != want {
+			t.Fatalf("expected exec query %d = %q, got %q", i, want, fakeDB.execQueries[i])
+		}
+	}
+}
+
+func TestDBQueryMultiTransactionalTreatsWithDMLAsManagedWrite(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	stmt := "WITH target AS (SELECT id FROM users WHERE active = 1) UPDATE users SET synced = 1 WHERE id IN (SELECT id FROM target)"
+	fakeDB := &fakeBatchWriteDB{
+		execAffected: map[string]int64{
+			stmt: 2,
+		},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "postgres", Host: "127.0.0.1", Port: 5432, User: "postgres"}
+
+	result := app.DBQueryMultiTransactional(config, "main", stmt, "with-dml-query")
+	if !result.Success {
+		t.Fatalf("expected transactional WITH DML success, got failure: %s", result.Message)
+	}
+	if result.TransactionID == "" || !result.TransactionPending {
+		t.Fatalf("expected pending transaction metadata, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if fakeDB.session == nil || fakeDB.session.closed {
+		t.Fatal("expected WITH DML transaction session to stay open")
+	}
+	wantExecs := []string{"BEGIN", stmt}
+	if len(fakeDB.execQueries) != len(wantExecs) {
+		t.Fatalf("expected exec queries %#v, got %#v", wantExecs, fakeDB.execQueries)
+	}
+	for i, want := range wantExecs {
+		if fakeDB.execQueries[i] != want {
+			t.Fatalf("expected exec query %d = %q, got %q", i, want, fakeDB.execQueries[i])
+		}
+	}
+}
+
+func TestDBQueryMultiTransactionalTreatsDataChangingCTEAsManagedWrite(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	stmt := "WITH moved AS (DELETE FROM audit_logs WHERE created_at < NOW() RETURNING id) SELECT * FROM moved"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			stmt: {{"id": 41}, {"id": 42}},
+		},
+		fieldMap: map[string][]string{
+			stmt: {"id"},
+		},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "postgres", Host: "127.0.0.1", Port: 5432, User: "postgres"}
+
+	result := app.DBQueryMultiTransactional(config, "main", stmt, "cte-write-query")
+	if !result.Success {
+		t.Fatalf("expected transactional data-changing CTE success, got failure: %s", result.Message)
+	}
+	if result.TransactionID == "" || !result.TransactionPending {
+		t.Fatalf("expected pending transaction metadata, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if fakeDB.session == nil || fakeDB.session.closed {
+		t.Fatal("expected data-changing CTE transaction session to stay open")
+	}
+	wantExecs := []string{"BEGIN"}
+	if len(fakeDB.execQueries) != len(wantExecs) {
+		t.Fatalf("expected exec queries %#v, got %#v", wantExecs, fakeDB.execQueries)
+	}
+	for i, want := range wantExecs {
+		if fakeDB.execQueries[i] != want {
+			t.Fatalf("expected exec query %d = %q, got %q", i, want, fakeDB.execQueries[i])
+		}
+	}
+	if fakeDB.session.queryCalls == 0 {
+		t.Fatal("expected data-changing CTE SELECT to query returned rows inside the transaction")
+	}
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 1 || len(resultSets[0].Rows) != 2 {
+		t.Fatalf("expected returned rows from data-changing CTE, got %#v", resultSets)
+	}
+}
+
+func TestDBQueryMultiTransactionalRollsBackAndClosesOnDMLFailure(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	firstStmt := "UPDATE users SET name = 'new' WHERE id = 1"
+	secondStmt := "DELETE FROM audit_logs WHERE user_id = 1"
+	fakeDB := &fakeBatchWriteDB{
+		execErr: map[string]error{
+			secondStmt: errors.New("delete failed"),
+		},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "mysql", Host: "127.0.0.1", Port: 3306, User: "root"}
+
+	result := app.DBQueryMultiTransactional(config, "main", firstStmt+";\n"+secondStmt+";", "tx-query")
+	if result.Success {
+		t.Fatal("expected transactional query failure")
+	}
+	if result.TransactionID != "" || result.TransactionPending {
+		t.Fatalf("expected failed transaction not to be exposed, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if fakeDB.session == nil || !fakeDB.session.closed {
+		t.Fatal("expected failed transaction session to close")
+	}
+	wantExecs := []string{"START TRANSACTION", firstStmt, secondStmt, "ROLLBACK"}
+	if len(fakeDB.execQueries) != len(wantExecs) {
+		t.Fatalf("expected exec queries %#v, got %#v", wantExecs, fakeDB.execQueries)
+	}
+	for i, want := range wantExecs {
+		if fakeDB.execQueries[i] != want {
+			t.Fatalf("expected exec query %d = %q, got %q", i, want, fakeDB.execQueries[i])
+		}
+	}
+}
+
+func TestDBQueryMultiTransactionalSkipsManagedTransactionForReadOnlySQL(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := "SELECT 1 AS value"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			query: {{"value": 1}},
+		},
+		fieldMap: map[string][]string{
+			query: {"value"},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "mysql", Host: "127.0.0.1", Port: 3306, User: "root"}
+
+	result := app.DBQueryMultiTransactional(config, "main", query, "read-query")
+	if !result.Success {
+		t.Fatalf("expected read-only query success, got failure: %s", result.Message)
+	}
+	if result.TransactionID != "" || result.TransactionPending {
+		t.Fatalf("expected read-only query not to start managed transaction, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if len(fakeDB.execQueries) != 0 {
+		t.Fatalf("expected no transaction wrapper execs for read-only query, got %#v", fakeDB.execQueries)
+	}
+}
+
+func TestDBQueryMultiTransactionalSkipsManagedTransactionForExplicitTransactionSQL(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	stmt := "UPDATE users SET name = 'new' WHERE id = 1"
+	fakeDB := &fakeBatchWriteDB{}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "mysql", Host: "127.0.0.1", Port: 3306, User: "root"}
+
+	result := app.DBQueryMultiTransactional(config, "main", "BEGIN;\n"+stmt+";\nCOMMIT;", "explicit-tx-query")
+	if !result.Success {
+		t.Fatalf("expected explicit transaction SQL success, got failure: %s", result.Message)
+	}
+	if result.TransactionID != "" || result.TransactionPending {
+		t.Fatalf("expected explicit transaction SQL not to be managed, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if len(fakeDB.execQueries) != 3 {
+		t.Fatalf("expected explicit transaction statements only, got %#v", fakeDB.execQueries)
+	}
+	if fakeDB.execQueries[0] != "BEGIN" || fakeDB.execQueries[1] != stmt || fakeDB.execQueries[2] != "COMMIT" {
+		t.Fatalf("expected explicit transaction statements unchanged, got %#v", fakeDB.execQueries)
+	}
+	if fakeDB.session == nil || !fakeDB.session.closed {
+		t.Fatal("expected normal DBQueryMulti session to close after explicit transaction SQL")
+	}
+}
+
+func TestDBQueryMultiPrefersResultSetForExecStoredProcedure(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := "EXEC sp_who2"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			query: {
+				{"SPID": 77, "STATUS": "SUSPENDED"},
+			},
+		},
+		fieldMap: map[string][]string{
+			query: {"SPID", "STATUS"},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}
+
+	result := app.DBQueryMulti(config, "master", query, "sp-who2-multi-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 1 || len(resultSets[0].Rows) != 1 {
+		t.Fatalf("unexpected result sets: %#v", resultSets)
+	}
+	if got := resultSets[0].Rows[0]["SPID"]; got != 77 {
+		t.Fatalf("expected SPID=77, got %#v", got)
+	}
+	if fakeDB.execCalls != 0 {
+		t.Fatalf("expected exec path to be skipped, got execCalls=%d", fakeDB.execCalls)
+	}
+}
+
+func TestDBQueryMultiDoesNotBatchExecStoredProcedureAsWriteStatement(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := "EXEC sp_who2"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			query: {
+				{"SPID": 88, "STATUS": "RUNNING"},
+			},
+		},
+		fieldMap: map[string][]string{
+			query: {"SPID", "STATUS"},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}
+
+	result := app.DBQueryMulti(config, "master", query, "sp-who2-batch-guard-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	if fakeDB.batchCalls != 0 {
+		t.Fatalf("expected stored procedure to skip batch write path, got batchCalls=%d", fakeDB.batchCalls)
+	}
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 1 || len(resultSets[0].Rows) != 1 {
+		t.Fatalf("unexpected result sets: %#v", resultSets)
+	}
+	if got := resultSets[0].Rows[0]["SPID"]; got != 88 {
+		t.Fatalf("expected SPID=88, got %#v", got)
+	}
+}
+
+func TestDBQueryMultiRunsSQLServerStatisticsBatchNatively(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := "SET STATISTICS IO, TIME ON;\nSELECT 1 AS value;"
+	baseDB := &fakeBatchWriteDB{
+		multiResult: map[string][]connection.ResultSetData{
+			query: {
+				{
+					Rows:     []map[string]interface{}{},
+					Columns:  []string{},
+					Messages: []string{"SQL Server parse and compile time: CPU time = 0 ms."},
+				},
+				{
+					Rows:     []map[string]interface{}{{"value": 1}},
+					Columns:  []string{"value"},
+					Messages: []string{"Table 'users'. Scan count 1, logical reads 3."},
+				},
+			},
+		},
+		messageMap: map[string][]string{
+			query: {"Table 'users'. Scan count 1, logical reads 3."},
+		},
+		queryErr: map[string]error{},
+	}
+	fakeDB := &fakeNativeMultiResultDB{fakeBatchWriteDB: baseDB}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}
+
+	result := app.DBQueryMulti(config, "master", query, "sqlserver-statistics-native-batch-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	if strings.Contains(result.Message, "不支持原生多语句执行") {
+		t.Fatalf("expected SQL Server statistics batch to avoid sequential fallback warning, got %q", result.Message)
+	}
+	if fakeDB.multiCalls != 1 {
+		t.Fatalf("expected one native multi-result batch call, got %d", fakeDB.multiCalls)
+	}
+	if baseDB.session != nil {
+		t.Fatal("expected native SQL Server batch to avoid sequential session fallback")
+	}
+	if baseDB.queryCalls != 0 || baseDB.execCalls != 0 {
+		t.Fatalf("expected native batch to avoid per-statement query/exec calls, queryCalls=%d execCalls=%d", baseDB.queryCalls, baseDB.execCalls)
+	}
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 2 {
+		t.Fatalf("expected two native result sets, got %#v", resultSets)
+	}
+	if got := resultSets[1].Rows[0]["value"]; got != 1 {
+		t.Fatalf("expected SELECT result value=1, got %#v", got)
+	}
+	if len(result.Messages) != 1 || !strings.Contains(result.Messages[0], "logical reads") {
+		t.Fatalf("expected SQL Server statistics message to be returned, got %#v", result.Messages)
+	}
+}
+
+func TestDBQueryMultiUsesPinnedSessionForSequentialFallback(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			"SELECT 1 AS value": {
+				{"value": 1},
+			},
+		},
+		fieldMap: map[string][]string{
+			"SELECT 1 AS value": {"value"},
+		},
+		messageMap: map[string][]string{
+			"SET NOCOUNT ON": {"NOCOUNT 已开启"},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}
+
+	result := app.DBQueryMulti(config, "master", "SET NOCOUNT ON;\nSELECT 1 AS value;", "session-fallback-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	if fakeDB.session == nil {
+		t.Fatal("expected DBQueryMulti to open a pinned session for sequential fallback")
+	}
+	if !fakeDB.session.closed {
+		t.Fatal("expected DBQueryMulti to close the pinned session")
+	}
+	if fakeDB.session.execCalls != 0 {
+		t.Fatalf("expected SQL Server SET statement to avoid exec-only path, got execCalls=%d", fakeDB.session.execCalls)
+	}
+	if fakeDB.session.queryCalls != 2 {
+		t.Fatalf("expected both statements to query through pinned session, got queryCalls=%d", fakeDB.session.queryCalls)
+	}
+	if fakeDB.queryCalls != 2 {
+		t.Fatalf("expected exactly two underlying query calls, got %d", fakeDB.queryCalls)
+	}
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 2 {
+		t.Fatalf("expected two result sets, got %#v", resultSets)
+	}
+	if len(resultSets[0].Messages) != 1 || resultSets[0].Messages[0] != "NOCOUNT 已开启" {
+		t.Fatalf("expected first result set to keep session message, got %#v", resultSets[0].Messages)
+	}
+	if got := resultSets[1].Rows[0]["value"]; got != 1 {
+		t.Fatalf("expected second result set value=1, got %#v", got)
+	}
+}
+
+func TestDBQueryMultiKeepsAllResultSetsFromSingleSQLServerStatement(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := "EXEC sp_helpdb"
+	fakeDB := &fakeBatchWriteDB{
+		multiResult: map[string][]connection.ResultSetData{
+			query: {
+				{
+					Rows:    []map[string]interface{}{{"name": "master"}},
+					Columns: []string{"name"},
+				},
+				{
+					Rows:    []map[string]interface{}{{"owner": "sa"}},
+					Columns: []string{"owner"},
+				},
+			},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}
+
+	result := app.DBQueryMulti(config, "master", query, "sp-helpdb-multi-result-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 2 {
+		t.Fatalf("expected two result sets, got %#v", resultSets)
+	}
+	if got := resultSets[0].Rows[0]["name"]; got != "master" {
+		t.Fatalf("expected first result set to keep master row, got %#v", got)
+	}
+	if got := resultSets[1].Rows[0]["owner"]; got != "sa" {
+		t.Fatalf("expected second result set to keep owner row, got %#v", got)
+	}
+	if resultSets[0].StatementIndex != 1 || resultSets[1].StatementIndex != 1 {
+		t.Fatalf("expected both result sets to map to the first statement, got %#v", resultSets)
+	}
+	if fakeDB.execCalls != 0 {
+		t.Fatalf("expected exec path to be skipped, got execCalls=%d", fakeDB.execCalls)
+	}
+}
+
+func TestDBQueryMultiTreatsBareSQLServerProcedureCallAsQueryFirst(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := `p_get_select c_dyscript,'projectid = 1',1`
+	fakeDB := &fakeBatchWriteDB{
+		messageMap: map[string][]string{
+			query: {`INSERT c_dyscript(id,name) values (1,"demo")`},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}
+
+	result := app.DBQueryMulti(config, "master", query, "sqlserver-bare-proc-query-first-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	if fakeDB.session == nil {
+		t.Fatal("expected bare SQL Server procedure call to use a pinned query session")
+	}
+	if fakeDB.session.queryCalls != 1 {
+		t.Fatalf("expected one session query call, got %d", fakeDB.session.queryCalls)
+	}
+	if fakeDB.session.execCalls != 0 {
+		t.Fatalf("expected exec path to be skipped, got execCalls=%d", fakeDB.session.execCalls)
+	}
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 1 {
+		t.Fatalf("expected one result set, got %#v", resultSets)
+	}
+	if len(resultSets[0].Rows) != 0 || len(resultSets[0].Columns) != 0 {
+		t.Fatalf("expected message-only result set, got %#v", resultSets[0])
+	}
+	if len(resultSets[0].Messages) != 1 || !strings.Contains(resultSets[0].Messages[0], "INSERT c_dyscript") {
+		t.Fatalf("expected procedure output message to be preserved, got %#v", resultSets[0].Messages)
+	}
+}
+
+func TestDBQueryMultiTreatsReturningWriteAsQueryFirst(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := "INSERT INTO audit_logs(id) VALUES (1) RETURNING id"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			query: {
+				{"id": 1},
+			},
+		},
+		fieldMap: map[string][]string{
+			query: {"id"},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "postgres", Host: "127.0.0.1", Port: 5432, User: "postgres"}
+
+	result := app.DBQueryMulti(config, "main", query, "postgres-returning-query-first-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	if fakeDB.batchCalls != 0 {
+		t.Fatalf("expected RETURNING write to skip batch exec path, got batchCalls=%d", fakeDB.batchCalls)
+	}
+	if fakeDB.session == nil || fakeDB.session.queryCalls != 1 {
+		t.Fatalf("expected RETURNING write to query through pinned session, got session=%#v", fakeDB.session)
+	}
+	if fakeDB.session.execCalls != 0 {
+		t.Fatalf("expected exec path to be skipped, got execCalls=%d", fakeDB.session.execCalls)
+	}
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 1 || len(resultSets[0].Rows) != 1 || resultSets[0].Rows[0]["id"] != 1 {
+		t.Fatalf("expected RETURNING rows to be preserved, got %#v", resultSets)
+	}
+}
+
+func TestDBQueryMultiTreatsSQLServerOutputWriteAsQueryFirst(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	query := "UPDATE users SET name = 'next' OUTPUT inserted.id WHERE id = 1"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			query: {
+				{"id": 1},
+			},
+		},
+		fieldMap: map[string][]string{
+			query: {"id"},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}
+
+	result := app.DBQueryMulti(config, "master", query, "sqlserver-output-query-first-test")
+	if !result.Success {
+		t.Fatalf("expected DBQueryMulti success, got failure: %s", result.Message)
+	}
+	if fakeDB.batchCalls != 0 {
+		t.Fatalf("expected OUTPUT write to skip batch exec path, got batchCalls=%d", fakeDB.batchCalls)
+	}
+	if fakeDB.session == nil || fakeDB.session.queryCalls != 1 {
+		t.Fatalf("expected OUTPUT write to query through pinned session, got session=%#v", fakeDB.session)
+	}
+	if fakeDB.session.execCalls != 0 {
+		t.Fatalf("expected exec path to be skipped, got execCalls=%d", fakeDB.session.execCalls)
+	}
+	resultSets, ok := result.Data.([]connection.ResultSetData)
+	if !ok {
+		t.Fatalf("expected []connection.ResultSetData, got %T", result.Data)
+	}
+	if len(resultSets) != 1 || len(resultSets[0].Rows) != 1 || resultSets[0].Rows[0]["id"] != 1 {
+		t.Fatalf("expected OUTPUT rows to be preserved, got %#v", resultSets)
+	}
+}
+
+func TestDBQueryMultiTreatsWrappedMessageBlocksAsQueryFirst(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	sqlServerQuery := "IF 1 = 1 PRINT 'done'"
+	postgresQuery := "DO $$ BEGIN RAISE NOTICE 'done'; END $$"
+	fakeDB := &fakeBatchWriteDB{
+		queryMap: map[string][]map[string]interface{}{
+			sqlServerQuery: {},
+			postgresQuery:  {},
+		},
+		fieldMap: map[string][]string{
+			sqlServerQuery: {},
+			postgresQuery:  {},
+		},
+		messageMap: map[string][]string{
+			sqlServerQuery: {"done"},
+			postgresQuery:  {"done"},
+		},
+		queryErr: map[string]error{},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+
+	sqlServerResult := app.DBQueryMulti(connection.ConnectionConfig{Type: "sqlserver", Host: "127.0.0.1", Port: 1433, User: "sa"}, "master", sqlServerQuery, "sqlserver-print-block-test")
+	if !sqlServerResult.Success {
+		t.Fatalf("expected SQL Server block success, got failure: %s", sqlServerResult.Message)
+	}
+
+	postgresResult := app.DBQueryMulti(connection.ConnectionConfig{Type: "postgres", Host: "127.0.0.1", Port: 5432, User: "postgres"}, "main", postgresQuery, "postgres-notice-block-test")
+	if !postgresResult.Success {
+		t.Fatalf("expected PostgreSQL notice block success, got failure: %s", postgresResult.Message)
+	}
+	if fakeDB.batchCalls != 0 {
+		t.Fatalf("expected message blocks to skip batch exec path, got batchCalls=%d", fakeDB.batchCalls)
+	}
+	if fakeDB.execCalls != 0 {
+		t.Fatalf("expected message blocks to avoid shared exec path, got execCalls=%d", fakeDB.execCalls)
+	}
+}
+
+func TestDBQueryMultiTransactionalTreatsSelectIntoAsManagedWrite(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+	})
+
+	stmt := "SELECT * INTO archived_users FROM users"
+	fakeDB := &fakeBatchWriteDB{
+		execAffected: map[string]int64{
+			stmt: 12,
+		},
+	}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	config := connection.ConnectionConfig{Type: "postgres", Host: "127.0.0.1", Port: 5432, User: "postgres"}
+
+	result := app.DBQueryMultiTransactional(config, "main", stmt, "select-into-managed-tx-test")
+	if !result.Success {
+		t.Fatalf("expected managed SELECT INTO success, got failure: %s", result.Message)
+	}
+	if result.TransactionID == "" || !result.TransactionPending {
+		t.Fatalf("expected pending transaction metadata, got id=%q pending=%v", result.TransactionID, result.TransactionPending)
+	}
+	if fakeDB.session == nil || fakeDB.session.closed {
+		t.Fatal("expected managed SELECT INTO transaction session to stay open")
+	}
+	wantExecs := []string{"BEGIN", stmt}
+	if len(fakeDB.execQueries) != len(wantExecs) {
+		t.Fatalf("expected exec queries %#v, got %#v", wantExecs, fakeDB.execQueries)
+	}
+	for i, want := range wantExecs {
+		if fakeDB.execQueries[i] != want {
+			t.Fatalf("expected exec query %d = %q, got %q", i, want, fakeDB.execQueries[i])
+		}
 	}
 }
diff --git a/internal/app/methods_db_rename_test.go b/internal/app/methods_db_rename_test.go
index 952ebf8..91db6b9 100644
--- a/internal/app/methods_db_rename_test.go
+++ b/internal/app/methods_db_rename_test.go
@@ -91,3 +91,136 @@ func TestRenameDatabase_DorisUsesNativeRenameSQL(t *testing.T) {
 		t.Fatalf("unexpected Doris rename SQL, want %q got %q", want, fakeDB.execQueries[0])
 	}
 }
+
+func TestResolvePGLikeDatabaseDDLRunConfig_UsesCompatibleMaintenanceDatabase(t *testing.T) {
+	kingbase := resolvePGLikeDatabaseDDLRunConfig(connection.ConnectionConfig{
+		Type:     "kingbase",
+		User:     "system",
+		Database: "test",
+	}, "kingbase", "test")
+	if kingbase.Database != "template1" {
+		t.Fatalf("expected Kingbase target test to use template1 maintenance database, got %q", kingbase.Database)
+	}
+
+	vastbase := resolvePGLikeDatabaseDDLRunConfig(connection.ConnectionConfig{
+		Type:     "vastbase",
+		User:     "vastbase",
+		Database: "tenant_db",
+	}, "vastbase", "tenant_db")
+	if vastbase.Database != "vastbase" {
+		t.Fatalf("expected Vastbase target tenant_db to use vastbase maintenance database, got %q", vastbase.Database)
+	}
+}
+
+func TestDropDatabase_PostgresUsesMaintenanceDatabaseWhenConfigTargetsDroppedDB(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+
+	fakeDB := &fakeRenameDatabaseDB{}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.DropDatabase(connection.ConnectionConfig{
+		Type:     "postgres",
+		Host:     "127.0.0.1",
+		Port:     5432,
+		User:     "postgres",
+		Database: "test",
+	}, "test")
+
+	if !result.Success {
+		t.Fatalf("expected PostgreSQL drop database success, got failure: %s", result.Message)
+	}
+	if fakeDB.connectConfig.Database != "postgres" {
+		t.Fatalf("expected PostgreSQL drop database to connect to maintenance database postgres, got %q", fakeDB.connectConfig.Database)
+	}
+	if len(fakeDB.execQueries) != 1 {
+		t.Fatalf("expected one drop statement, got %d: %#v", len(fakeDB.execQueries), fakeDB.execQueries)
+	}
+	const want = `DROP DATABASE "test"`
+	if fakeDB.execQueries[0] != want {
+		t.Fatalf("unexpected PostgreSQL drop SQL, want %q got %q", want, fakeDB.execQueries[0])
+	}
+}
+
+func TestDropDatabase_PostgresUsesTemplateWhenDroppingPostgresDatabase(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+
+	fakeDB := &fakeRenameDatabaseDB{}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.DropDatabase(connection.ConnectionConfig{
+		Type:     "postgres",
+		Host:     "127.0.0.1",
+		Port:     5432,
+		User:     "postgres",
+		Database: "postgres",
+	}, "postgres")
+
+	if !result.Success {
+		t.Fatalf("expected PostgreSQL drop database success, got failure: %s", result.Message)
+	}
+	if fakeDB.connectConfig.Database != "template1" {
+		t.Fatalf("expected PostgreSQL drop postgres database to connect to template1, got %q", fakeDB.connectConfig.Database)
+	}
+}
+
+func TestRenameDatabase_PostgresUsesMaintenanceDatabaseWhenConfigTargetsRenamedDB(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+
+	fakeDB := &fakeRenameDatabaseDB{}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.RenameDatabase(connection.ConnectionConfig{
+		Type:     "postgres",
+		Host:     "127.0.0.1",
+		Port:     5432,
+		User:     "postgres",
+		Database: "test",
+	}, "test", "test_new")
+
+	if !result.Success {
+		t.Fatalf("expected PostgreSQL rename database success, got failure: %s", result.Message)
+	}
+	if fakeDB.connectConfig.Database != "postgres" {
+		t.Fatalf("expected PostgreSQL rename database to connect to maintenance database postgres, got %q", fakeDB.connectConfig.Database)
+	}
+	if len(fakeDB.execQueries) != 1 {
+		t.Fatalf("expected one rename statement, got %d: %#v", len(fakeDB.execQueries), fakeDB.execQueries)
+	}
+	const want = `ALTER DATABASE "test" RENAME TO "test_new"`
+	if fakeDB.execQueries[0] != want {
+		t.Fatalf("unexpected PostgreSQL rename SQL, want %q got %q", want, fakeDB.execQueries[0])
+	}
+}
diff --git a/internal/app/methods_db_schema_test.go b/internal/app/methods_db_schema_test.go
new file mode 100644
index 0000000..0ede71c
--- /dev/null
+++ b/internal/app/methods_db_schema_test.go
@@ -0,0 +1,150 @@
+package app
+
+import (
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/db"
+	"GoNavi-Wails/internal/secretstore"
+)
+
+type fakeSchemaDDLDB struct {
+	connectConfig connection.ConnectionConfig
+	execQueries   []string
+}
+
+func (f *fakeSchemaDDLDB) Connect(config connection.ConnectionConfig) error {
+	f.connectConfig = config
+	return nil
+}
+func (f *fakeSchemaDDLDB) Close() error { return nil }
+func (f *fakeSchemaDDLDB) Ping() error  { return nil }
+func (f *fakeSchemaDDLDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	return nil, nil, nil
+}
+func (f *fakeSchemaDDLDB) Exec(query string) (int64, error) {
+	f.execQueries = append(f.execQueries, query)
+	return 0, nil
+}
+func (f *fakeSchemaDDLDB) GetDatabases() ([]string, error) { return nil, nil }
+func (f *fakeSchemaDDLDB) GetTables(dbName string) ([]string, error) {
+	return nil, nil
+}
+func (f *fakeSchemaDDLDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	return "", nil
+}
+func (f *fakeSchemaDDLDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	return nil, nil
+}
+func (f *fakeSchemaDDLDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	return nil, nil
+}
+func (f *fakeSchemaDDLDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	return nil, nil
+}
+func (f *fakeSchemaDDLDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return nil, nil
+}
+func (f *fakeSchemaDDLDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return nil, nil
+}
+
+var _ db.Database = (*fakeSchemaDDLDB)(nil)
+
+func TestBuildRenameSchemaSQL_PostgresQuotesIdentifiers(t *testing.T) {
+	got, err := buildRenameSchemaSQL("postgresql", `sales"old`, `sales"new`)
+	if err != nil {
+		t.Fatalf("expected postgres rename schema SQL, got error: %v", err)
+	}
+	const want = `ALTER SCHEMA "sales""old" RENAME TO "sales""new"`
+	if got != want {
+		t.Fatalf("unexpected rename schema SQL, want %q got %q", want, got)
+	}
+}
+
+func TestBuildDropSchemaSQL_PostgresUsesCascade(t *testing.T) {
+	got, err := buildDropSchemaSQL("postgresql", `sales"ops`)
+	if err != nil {
+		t.Fatalf("expected postgres drop schema SQL, got error: %v", err)
+	}
+	const want = `DROP SCHEMA "sales""ops" CASCADE`
+	if got != want {
+		t.Fatalf("unexpected drop schema SQL, want %q got %q", want, got)
+	}
+}
+
+func TestRenameSchema_CustomPostgresUsesSelectedDatabase(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+
+	fakeDB := &fakeSchemaDDLDB{}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.RenameSchema(connection.ConnectionConfig{
+		Type:     "custom",
+		Driver:   "pgx",
+		Database: "postgres",
+	}, "tenant_db", "sales", `sales"2026`)
+
+	if !result.Success {
+		t.Fatalf("expected rename schema success, got failure: %s", result.Message)
+	}
+	if fakeDB.connectConfig.Database != "tenant_db" {
+		t.Fatalf("expected rename schema connection to use selected database tenant_db, got %q", fakeDB.connectConfig.Database)
+	}
+	if len(fakeDB.execQueries) != 1 {
+		t.Fatalf("expected one rename schema statement, got %d: %#v", len(fakeDB.execQueries), fakeDB.execQueries)
+	}
+	const want = `ALTER SCHEMA "sales" RENAME TO "sales""2026"`
+	if fakeDB.execQueries[0] != want {
+		t.Fatalf("unexpected rename schema SQL, want %q got %q", want, fakeDB.execQueries[0])
+	}
+}
+
+func TestDropSchema_CustomPostgresUsesCascade(t *testing.T) {
+	originalNewDatabaseFunc := newDatabaseFunc
+	originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
+	t.Cleanup(func() {
+		newDatabaseFunc = originalNewDatabaseFunc
+		resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
+	})
+
+	fakeDB := &fakeSchemaDDLDB{}
+	newDatabaseFunc = func(dbType string) (db.Database, error) {
+		return fakeDB, nil
+	}
+	resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
+		return raw, nil
+	}
+
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	result := app.DropSchema(connection.ConnectionConfig{
+		Type:     "custom",
+		Driver:   "pgx",
+		Database: "postgres",
+	}, "tenant_db", `sales"ops`)
+
+	if !result.Success {
+		t.Fatalf("expected drop schema success, got failure: %s", result.Message)
+	}
+	if fakeDB.connectConfig.Database != "tenant_db" {
+		t.Fatalf("expected drop schema connection to use selected database tenant_db, got %q", fakeDB.connectConfig.Database)
+	}
+	if len(fakeDB.execQueries) != 1 {
+		t.Fatalf("expected one drop schema statement, got %d: %#v", len(fakeDB.execQueries), fakeDB.execQueries)
+	}
+	const want = `DROP SCHEMA "sales""ops" CASCADE`
+	if fakeDB.execQueries[0] != want {
+		t.Fatalf("unexpected drop schema SQL, want %q got %q", want, fakeDB.execQueries[0])
+	}
+}
diff --git a/internal/app/methods_db_transaction.go b/internal/app/methods_db_transaction.go
new file mode 100644
index 0000000..a3c39ef
--- /dev/null
+++ b/internal/app/methods_db_transaction.go
@@ -0,0 +1,421 @@
+package app
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/db"
+	"GoNavi-Wails/internal/logger"
+	"github.com/google/uuid"
+)
+
+const sqlEditorTransactionFinishTimeout = 30 * time.Second
+
+// DBQueryMultiTransactional executes SQL editor DML in a managed transaction.
+// The transaction stays open until DBCommitTransaction or DBRollbackTransaction
+// is called by the SQL editor UI.
+func (a *App) DBQueryMultiTransactional(config connection.ConnectionConfig, dbName string, query string, queryID string) connection.QueryResult {
+	runConfig := normalizeRunConfig(config, dbName)
+	transactionDBType := resolveDDLDBType(runConfig)
+	transactionConfig := runConfig
+	transactionConfig.Type = transactionDBType
+
+	if queryID == "" {
+		queryID = generateQueryID()
+	}
+
+	query = sanitizeSQLForPgLike(transactionDBType, query)
+	if !shouldUseManagedSQLTransaction(transactionDBType, query) {
+		return a.DBQueryMulti(config, dbName, query, queryID)
+	}
+
+	beginSQL, commitSQL, rollbackSQL, hasTextTransaction := sqlFileBatchTransactionSQL(transactionDBType)
+	implicitTextTransaction := false
+	if implicitCommitSQL, implicitRollbackSQL, ok := sqlEditorImplicitTransactionSQL(transactionDBType); ok {
+		commitSQL = implicitCommitSQL
+		rollbackSQL = implicitRollbackSQL
+		hasTextTransaction = true
+		implicitTextTransaction = true
+	}
+
+	dbInst, err := a.getDatabase(runConfig)
+	if err != nil {
+		logger.Error(err, "DBQueryMultiTransactional 获取连接失败：%s", formatConnSummary(runConfig))
+		return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+	}
+
+	ctx, cancel := newQueryExecutionContext(runConfig)
+	defer cancel()
+
+	a.queryMu.Lock()
+	a.runningQueries[queryID] = queryContext{
+		cancel:  cancel,
+		started: time.Now(),
+	}
+	a.queryMu.Unlock()
+	defer func() {
+		a.queryMu.Lock()
+		delete(a.runningQueries, queryID)
+		a.queryMu.Unlock()
+	}()
+
+	var (
+		sessionExecer        db.StatementExecer
+		transactor           db.TransactionExecer
+		transactionCancel    context.CancelFunc
+		startTextTransaction bool
+	)
+	if provider, ok := dbInst.(db.TransactionExecerProvider); ok {
+		// database/sql rolls back a BeginTx transaction when its context is cancelled.
+		// SQL editor transactions must outlive the execution RPC and be ended only by
+		// explicit commit, rollback, or shutdown cleanup.
+		transactionContext := context.Background()
+		transactionContext, transactionCancel = context.WithCancel(transactionContext)
+		transactionExecer, err := provider.OpenTransactionExecer(transactionContext)
+		if err != nil {
+			transactionCancel()
+			logger.Error(err, "DBQueryMultiTransactional 打开驱动事务失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
+			return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+		}
+		sessionExecer = transactionExecer
+		transactor = transactionExecer
+	} else if implicitTextTransaction {
+		provider, ok := dbInst.(db.SessionExecerProvider)
+		if !ok {
+			return connection.QueryResult{
+				Success: false,
+				Message: fmt.Sprintf("当前数据源（%s）不支持 SQL 编辑器托管事务", transactionDBType),
+				QueryID: queryID,
+			}
+		}
+		sessionExecer, err = provider.OpenSessionExecer(ctx)
+		if err != nil {
+			logger.Error(err, "DBQueryMultiTransactional 打开隐式事务会话失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
+			return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+		}
+	} else {
+		if !hasTextTransaction {
+			return connection.QueryResult{
+				Success: false,
+				Message: fmt.Sprintf("当前数据源（%s）不支持 SQL 编辑器托管事务", transactionDBType),
+				QueryID: queryID,
+			}
+		}
+		provider, ok := dbInst.(db.SessionExecerProvider)
+		if !ok {
+			return connection.QueryResult{
+				Success: false,
+				Message: fmt.Sprintf("当前数据源（%s）不支持 SQL 编辑器托管事务", transactionDBType),
+				QueryID: queryID,
+			}
+		}
+		sessionExecer, err = provider.OpenSessionExecer(ctx)
+		if err != nil {
+			logger.Error(err, "DBQueryMultiTransactional 打开事务会话失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
+			return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+		}
+		startTextTransaction = true
+	}
+
+	closeSession := true
+	defer func() {
+		if closeSession {
+			if err := sessionExecer.Close(); err != nil {
+				logger.Warnf("DBQueryMultiTransactional 关闭事务会话失败：%v", err)
+			}
+			if transactionCancel != nil {
+				transactionCancel()
+			}
+		}
+	}()
+
+	if startTextTransaction {
+		if _, err := sessionExecer.ExecContext(ctx, beginSQL); err != nil {
+			logger.Error(err, "DBQueryMultiTransactional 开启事务失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
+			return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+		}
+	}
+
+	statements := splitSQLStatements(query)
+	resultSets, err := executeManagedSQLTransactionStatements(ctx, sessionExecer, transactionConfig, statements)
+	if err != nil {
+		var rollbackErr error
+		if transactor != nil {
+			rollbackErr = transactor.Rollback()
+		} else if strings.TrimSpace(rollbackSQL) != "" {
+			_, rollbackErr = sessionExecer.ExecContext(context.Background(), rollbackSQL)
+		}
+		if rollbackErr != nil {
+			logger.Error(rollbackErr, "DBQueryMultiTransactional 执行失败后回滚失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
+			err = fmt.Errorf("%v；回滚失败: %w", err, rollbackErr)
+		}
+		logger.Error(err, "DBQueryMultiTransactional 执行失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
+		return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+	}
+
+	transactionID := "sql-editor-" + uuid.NewString()
+	a.sqlTransactionMu.Lock()
+	if a.sqlTransactions == nil {
+		a.sqlTransactions = make(map[string]*managedSQLTransaction)
+	}
+	a.sqlTransactions[transactionID] = &managedSQLTransaction{
+		id:          transactionID,
+		execer:      sessionExecer,
+		transactor:  transactor,
+		cancel:      transactionCancel,
+		dbType:      transactionDBType,
+		commitSQL:   commitSQL,
+		rollbackSQL: rollbackSQL,
+		createdAt:   time.Now(),
+	}
+	a.sqlTransactionMu.Unlock()
+
+	closeSession = false
+	return connection.QueryResult{
+		Success:            true,
+		Data:               resultSets,
+		QueryID:            queryID,
+		TransactionID:      transactionID,
+		TransactionPending: true,
+	}
+}
+
+func executeManagedSQLTransactionStatements(ctx context.Context, session db.StatementExecer, runConfig connection.ConnectionConfig, statements []string) ([]connection.ResultSetData, error) {
+	var resultSets []connection.ResultSetData
+	sessionQueryTarget, _ := session.(db.StatementQueryExecer)
+	sessionQueryMessageTarget, _ := session.(db.StatementQueryMessageExecer)
+	sessionMultiQueryTarget, _ := session.(db.StatementMultiResultQueryExecer)
+	sessionMultiQueryMessageTarget, _ := session.(db.StatementMultiResultQueryMessageExecer)
+
+	for idx, stmt := range statements {
+		stmt = strings.TrimSpace(stmt)
+		if stmt == "" {
+			continue
+		}
+
+		isReadStmt := isReadOnlySQLQuery(runConfig.Type, stmt)
+		tryQueryStmtFirst := shouldTryQueryResultFirst(runConfig.Type, stmt)
+		if isReadStmt || tryQueryStmtFirst {
+			var (
+				data             []map[string]interface{}
+				columns          []string
+				messages         []string
+				statementResults []connection.ResultSetData
+				usedMultiResult  bool
+				err              error
+			)
+			if sessionMultiQueryMessageTarget != nil {
+				statementResults, messages, err = sessionMultiQueryMessageTarget.QueryMultiContextWithMessages(ctx, stmt)
+				usedMultiResult = true
+			} else if sessionMultiQueryTarget != nil {
+				statementResults, err = sessionMultiQueryTarget.QueryMultiContext(ctx, stmt)
+				usedMultiResult = true
+			} else if sessionQueryMessageTarget != nil {
+				data, columns, messages, err = sessionQueryMessageTarget.QueryContextWithMessages(ctx, stmt)
+			} else if sessionQueryTarget != nil {
+				data, columns, err = sessionQueryTarget.QueryContext(ctx, stmt)
+			} else {
+				err = fmt.Errorf("当前事务会话不支持查询语句")
+			}
+			if err == nil {
+				if usedMultiResult {
+					if len(statementResults) == 0 && len(messages) > 0 {
+						statementResults = []connection.ResultSetData{{
+							Rows:     []map[string]interface{}{},
+							Columns:  []string{},
+							Messages: append([]string(nil), messages...),
+						}}
+					}
+					for _, statementResult := range statementResults {
+						if statementResult.Rows == nil {
+							statementResult.Rows = []map[string]interface{}{}
+						}
+						if statementResult.Columns == nil {
+							statementResult.Columns = []string{}
+						}
+						statementResult.StatementIndex = idx + 1
+						resultSets = append(resultSets, statementResult)
+					}
+					continue
+				}
+				if data == nil {
+					data = make([]map[string]interface{}, 0)
+				}
+				if columns == nil {
+					columns = []string{}
+				}
+				resultSets = append(resultSets, connection.ResultSetData{
+					Rows:           data,
+					Columns:        columns,
+					Messages:       messages,
+					StatementIndex: idx + 1,
+				})
+				continue
+			}
+			if isReadStmt {
+				return nil, fmt.Errorf("第 %d 条语句执行失败: %w", idx+1, err)
+			}
+		}
+
+		affected, err := session.ExecContext(ctx, stmt)
+		if err != nil {
+			return nil, fmt.Errorf("第 %d 条语句执行失败: %w", idx+1, err)
+		}
+		resultSets = append(resultSets, connection.ResultSetData{
+			Rows:           []map[string]interface{}{{"affectedRows": affected}},
+			Columns:        []string{"affectedRows"},
+			StatementIndex: idx + 1,
+		})
+	}
+
+	if resultSets == nil {
+		resultSets = []connection.ResultSetData{}
+	}
+	return resultSets, nil
+}
+
+func shouldUseManagedSQLTransaction(dbType string, query string) bool {
+	statements := splitSQLStatements(query)
+	hasManagedWrite := false
+	for _, stmt := range statements {
+		stmt = strings.TrimSpace(stmt)
+		if stmt == "" {
+			continue
+		}
+		if isSQLTransactionControlStatement(stmt) {
+			return false
+		}
+		if isReadOnlySQLQuery(dbType, stmt) {
+			continue
+		}
+		if isBatchableWriteSQLStatement(dbType, stmt) {
+			hasManagedWrite = true
+			continue
+		}
+		return false
+	}
+	return hasManagedWrite
+}
+
+func sqlEditorImplicitTransactionSQL(dbType string) (commitSQL string, rollbackSQL string, ok bool) {
+	switch strings.ToLower(strings.TrimSpace(dbType)) {
+	case "oracle":
+		// Oracle starts a transaction implicitly on the first DML statement.
+		// Keeping SQL editor DML on one physical connection avoids database/sql
+		// Tx context lifecycle ending the transaction before the UI commits it.
+		return "COMMIT", "ROLLBACK", true
+	default:
+		return "", "", false
+	}
+}
+
+func isSQLTransactionControlStatement(stmt string) bool {
+	switch leadingSQLKeyword(stmt) {
+	case "begin", "commit", "rollback", "savepoint", "release":
+		return true
+	case "start":
+		return strings.Contains(strings.ToLower(stmt), "transaction")
+	default:
+		return false
+	}
+}
+
+func (a *App) DBCommitTransaction(transactionID string) connection.QueryResult {
+	return a.finishManagedSQLTransaction(transactionID, true)
+}
+
+func (a *App) DBRollbackTransaction(transactionID string) connection.QueryResult {
+	return a.finishManagedSQLTransaction(transactionID, false)
+}
+
+func (a *App) finishManagedSQLTransaction(transactionID string, commit bool) connection.QueryResult {
+	transactionID = strings.TrimSpace(transactionID)
+	if transactionID == "" {
+		return connection.QueryResult{Success: false, Message: "事务 ID 不能为空"}
+	}
+
+	a.sqlTransactionMu.Lock()
+	tx, ok := a.sqlTransactions[transactionID]
+	if ok {
+		delete(a.sqlTransactions, transactionID)
+	}
+	a.sqlTransactionMu.Unlock()
+	if !ok || tx == nil || tx.execer == nil {
+		return connection.QueryResult{Success: false, Message: "事务不存在或已结束"}
+	}
+	if tx.cancel != nil {
+		defer tx.cancel()
+	}
+
+	action := "回滚"
+	sqlText := tx.rollbackSQL
+	if commit {
+		action = "提交"
+		sqlText = tx.commitSQL
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), sqlEditorTransactionFinishTimeout)
+	defer cancel()
+
+	var execErr error
+	if tx.transactor != nil {
+		if commit {
+			execErr = tx.transactor.Commit()
+		} else {
+			execErr = tx.transactor.Rollback()
+		}
+	} else if strings.TrimSpace(sqlText) != "" {
+		_, execErr = tx.execer.ExecContext(ctx, sqlText)
+	}
+	closeErr := tx.execer.Close()
+	if execErr != nil {
+		logger.Error(execErr, "SQL 编辑器事务%s失败：id=%s dbType=%s", action, transactionID, tx.dbType)
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("事务%s失败: %v", action, execErr)}
+	}
+	if closeErr != nil {
+		logger.Error(closeErr, "SQL 编辑器事务%s后关闭会话失败：id=%s dbType=%s", action, transactionID, tx.dbType)
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("事务%s成功，但关闭会话失败: %v", action, closeErr)}
+	}
+
+	if commit {
+		return connection.QueryResult{Success: true, Message: "事务已提交"}
+	}
+	return connection.QueryResult{Success: true, Message: "事务已回滚"}
+}
+
+func (a *App) rollbackPendingSQLTransactionsOnShutdown() {
+	a.sqlTransactionMu.Lock()
+	pending := make([]*managedSQLTransaction, 0, len(a.sqlTransactions))
+	for id, tx := range a.sqlTransactions {
+		if tx != nil {
+			pending = append(pending, tx)
+		}
+		delete(a.sqlTransactions, id)
+	}
+	a.sqlTransactionMu.Unlock()
+
+	for _, tx := range pending {
+		ctx, cancel := context.WithTimeout(context.Background(), sqlEditorTransactionFinishTimeout)
+		if tx.transactor != nil {
+			if err := tx.transactor.Rollback(); err != nil {
+				logger.Warnf("关闭应用时回滚 SQL 编辑器事务失败：id=%s dbType=%s err=%v", tx.id, tx.dbType, err)
+			}
+		} else if strings.TrimSpace(tx.rollbackSQL) != "" && tx.execer != nil {
+			if _, err := tx.execer.ExecContext(ctx, tx.rollbackSQL); err != nil {
+				logger.Warnf("关闭应用时回滚 SQL 编辑器事务失败：id=%s dbType=%s err=%v", tx.id, tx.dbType, err)
+			}
+		}
+		cancel()
+		if tx.cancel != nil {
+			tx.cancel()
+		}
+		if tx.execer != nil {
+			if err := tx.execer.Close(); err != nil {
+				logger.Warnf("关闭应用时关闭 SQL 编辑器事务会话失败：id=%s dbType=%s err=%v", tx.id, tx.dbType, err)
+			}
+		}
+	}
+}
diff --git a/internal/app/methods_driver.go b/internal/app/methods_driver.go
index 72d8d23..f2106d6 100644
--- a/internal/app/methods_driver.go
+++ b/internal/app/methods_driver.go
@@ -3,6 +3,7 @@ package app
 import (
 	"archive/zip"
 	"bytes"
+	"context"
 	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
@@ -15,13 +16,16 @@ import (
 	"net/url"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
+	"regexp"
 	stdRuntime "runtime"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
+	"GoNavi-Wails/internal/buildutil"
 	"GoNavi-Wails/internal/connection"
 	"GoNavi-Wails/internal/db"
 	"GoNavi-Wails/internal/logger"
@@ -334,8 +338,9 @@ const (
 	driverReleaseLatestAPIURL           = "https://api.github.com/repos/" + driverReleaseRepo + "/releases/latest"
 	driverReleaseDevTag                 = "dev-latest"
 	optionalDriverBundleAssetName       = "GoNavi-DriverAgents.zip"
+	duckDBWindowsDriverZipAssetName     = "duckdb-driver.zip"
 	optionalDriverBundleIndexAssetName  = "GoNavi-DriverAgents-Index.json"
-	optionalDriverBundleDownloadTimeout = 45 * time.Minute
+	optionalDriverBundleDownloadTimeout = 15 * time.Minute
 	optionalDriverBundleCacheMaxAge     = 7 * 24 * time.Hour
 	optionalDriverBundleCacheMaxFiles   = 4
 	driverManifestCacheTTL              = 5 * time.Minute
@@ -370,6 +375,7 @@ const builtinDriverManifestJSON = `{
   "engine": "go",
   "drivers": {
     "mysql":     { "engine": "go", "version": "1.9.3", "checksumPolicy": "off" },
+    "goldendb":  { "engine": "go", "version": "1.9.3", "checksumPolicy": "off" },
     "mariadb":   { "engine": "go", "version": "1.9.3", "checksumPolicy": "off", "downloadUrl": "builtin://activate/mariadb" },
     "oceanbase": { "engine": "go", "version": "1.9.3", "checksumPolicy": "off", "downloadUrl": "builtin://activate/oceanbase" },
     "doris":     { "engine": "go", "version": "1.9.3", "checksumPolicy": "off", "downloadUrl": "builtin://activate/doris" },
@@ -383,10 +389,13 @@ const builtinDriverManifestJSON = `{
     "highgo":    { "engine": "go", "version": "0.0.0-local", "checksumPolicy": "off", "downloadUrl": "builtin://activate/highgo" },
     "vastbase":  { "engine": "go", "version": "1.11.1", "checksumPolicy": "off", "downloadUrl": "builtin://activate/vastbase" },
     "opengauss": { "engine": "go", "version": "1.11.1", "checksumPolicy": "off", "downloadUrl": "builtin://activate/opengauss" },
+    "gaussdb":   { "engine": "go", "version": "v1.0.0-rc1", "checksumPolicy": "off", "downloadUrl": "builtin://activate/gaussdb" },
     "iris":      { "engine": "go", "version": "0.2.1", "checksumPolicy": "off", "downloadUrl": "builtin://activate/iris" },
-    "mongodb":   { "engine": "go", "version": "2.5.0", "checksumPolicy": "off", "downloadUrl": "builtin://activate/mongodb" },
+    "mongodb":   { "engine": "go", "version": "1.17.9", "checksumPolicy": "off", "downloadUrl": "builtin://activate/mongodb" },
     "tdengine":  { "engine": "go", "version": "3.7.8", "checksumPolicy": "off", "downloadUrl": "builtin://activate/tdengine" },
-    "clickhouse": { "engine": "go", "version": "2.43.1", "checksumPolicy": "off", "downloadUrl": "builtin://activate/clickhouse" }
+    "iotdb":     { "engine": "go", "version": "1.3.7", "checksumPolicy": "off", "downloadUrl": "builtin://activate/iotdb" },
+    "clickhouse": { "engine": "go", "version": "2.43.1", "checksumPolicy": "off", "downloadUrl": "builtin://activate/clickhouse" },
+    "elasticsearch": { "engine": "go", "version": "8.19.6", "checksumPolicy": "off", "downloadUrl": "builtin://activate/elasticsearch" }
   }
 }`
 
@@ -406,6 +415,10 @@ var (
 	errLocalDriverDirScanLimit = errors.New("local_driver_directory_scan_limit_exceeded")
 )
 
+var optionalDriverSourceBuildTimeout = 8 * time.Minute
+
+var validateOptionalDriverAgentExecutableFunc = db.ValidateOptionalDriverAgentExecutable
+
 type driverVersionWarmupState struct {
 	Running     bool
 	LastStarted time.Time
@@ -426,47 +439,55 @@ var pinnedDriverPackageMap = map[string]pinnedDriverPackage{
 }
 
 var latestDriverVersionMap = map[string]string{
-	"mysql":      "1.9.3",
-	"mariadb":    "1.9.3",
-	"oceanbase":  "1.9.3",
-	"diros":      "1.9.3",
-	"starrocks":  "1.9.3",
-	"sphinx":     "1.9.3",
-	"sqlserver":  "1.9.6",
-	"sqlite":     "1.46.1",
-	"duckdb":     "2.5.6",
-	"dameng":     "1.8.22",
-	"kingbase":   "0.0.0-20201021123113-29bd62a876c3",
-	"highgo":     "0.0.0-local",
-	"vastbase":   "1.11.2",
-	"opengauss":  "1.11.1",
-	"iris":       "0.2.1",
-	"mongodb":    "2.5.0",
-	"tdengine":   "3.7.8",
-	"clickhouse": "2.43.1",
-	"oracle":     "2.9.0",
-	"postgres":   "1.11.2",
-	"redis":      "9.17.3",
+	"mysql":         "1.9.3",
+	"goldendb":      "1.9.3",
+	"mariadb":       "1.9.3",
+	"oceanbase":     "1.9.3",
+	"diros":         "1.9.3",
+	"starrocks":     "1.9.3",
+	"sphinx":        "1.9.3",
+	"sqlserver":     "1.9.6",
+	"sqlite":        "1.46.1",
+	"duckdb":        "2.5.6",
+	"dameng":        "1.8.22",
+	"kingbase":      "0.0.0-20201021123113-29bd62a876c3",
+	"highgo":        "0.0.0-local",
+	"vastbase":      "1.11.2",
+	"opengauss":     "1.11.1",
+	"gaussdb":       "v1.0.0-rc1",
+	"iris":          "0.2.1",
+	"mongodb":       "2.5.0",
+	"tdengine":      "3.7.8",
+	"iotdb":         "1.3.7",
+	"clickhouse":    "2.43.1",
+	"elasticsearch": "8.19.6",
+	"oracle":        "2.9.0",
+	"postgres":      "1.11.2",
+	"redis":         "9.17.3",
 }
 
 var driverGoModulePathMap = map[string]string{
-	"mariadb":    "github.com/go-sql-driver/mysql",
-	"oceanbase":  "github.com/go-sql-driver/mysql",
-	"diros":      "github.com/go-sql-driver/mysql",
-	"starrocks":  "github.com/go-sql-driver/mysql",
-	"sphinx":     "github.com/go-sql-driver/mysql",
-	"sqlserver":  "github.com/microsoft/go-mssqldb",
-	"sqlite":     "modernc.org/sqlite",
-	"duckdb":     "github.com/duckdb/duckdb-go/v2",
-	"dameng":     "gitee.com/chunanyong/dm",
-	"kingbase":   "gitea.com/kingbase/gokb",
-	"highgo":     "github.com/highgo/pq-sm3",
-	"vastbase":   "github.com/lib/pq",
-	"opengauss":  "github.com/lib/pq",
-	"iris":       "github.com/caretdev/go-irisnative",
-	"mongodb":    "go.mongodb.org/mongo-driver/v2",
-	"tdengine":   "github.com/taosdata/driver-go/v3",
-	"clickhouse": "github.com/ClickHouse/clickhouse-go/v2",
+	"goldendb":      "github.com/go-sql-driver/mysql",
+	"mariadb":       "github.com/go-sql-driver/mysql",
+	"oceanbase":     "github.com/go-sql-driver/mysql",
+	"diros":         "github.com/go-sql-driver/mysql",
+	"starrocks":     "github.com/go-sql-driver/mysql",
+	"sphinx":        "github.com/go-sql-driver/mysql",
+	"sqlserver":     "github.com/microsoft/go-mssqldb",
+	"sqlite":        "modernc.org/sqlite",
+	"duckdb":        "github.com/duckdb/duckdb-go/v2",
+	"dameng":        "gitee.com/chunanyong/dm",
+	"kingbase":      "gitea.com/kingbase/gokb",
+	"highgo":        "github.com/highgo/pq-sm3",
+	"vastbase":      "github.com/lib/pq",
+	"opengauss":     "github.com/lib/pq",
+	"gaussdb":       "github.com/HuaweiCloudDeveloper/gaussdb-go",
+	"iris":          "github.com/caretdev/go-irisnative",
+	"mongodb":       "go.mongodb.org/mongo-driver/v2",
+	"tdengine":      "github.com/taosdata/driver-go/v3",
+	"iotdb":         "github.com/apache/iotdb-client-go",
+	"clickhouse":    "github.com/ClickHouse/clickhouse-go/v2",
+	"elasticsearch": "github.com/elastic/go-elasticsearch/v8",
 }
 
 var driverGoModuleAliasPathMap = map[string][]string{
@@ -1002,7 +1023,7 @@ func (a *App) GetDriverStatusList(downloadDir string, manifestURL string) connec
 		engine := effectiveDriverEngine(definition)
 		runtimeAvailable, runtimeReason := db.DriverRuntimeSupportStatus(definition.Type)
 		pkg, packageMetaExists := readInstalledDriverPackage(resolvedDir, definition.Type)
-		needsUpdate, updateReason, expectedRevision := optionalDriverAgentRevisionStatus(definition.Type, pkg, packageMetaExists)
+		needsUpdate, updateReason, expectedRevision := optionalDriverPackageUpdateStatus(definition, pkg, packageMetaExists)
 		packageInstalled := definition.BuiltIn || packageMetaExists
 		if runtimeAvailable && db.IsOptionalGoDriver(definition.Type) {
 			packageInstalled = true
@@ -1616,6 +1637,18 @@ func normalizeDriverType(driverType string) string {
 		return "postgres"
 	case "opengauss", "open_gauss", "open-gauss":
 		return "opengauss"
+	case "gaussdb", "gauss_db", "gauss-db":
+		return "gaussdb"
+	case "goldendb", "greatdb", "gdb":
+		return "goldendb"
+	case "rocketmq", "rocket-mq", "rocket_mq", "apache-rocketmq", "apache_rocketmq", "rmq":
+		return "rocketmq"
+	case "mqtt", "mqtts":
+		return "mqtt"
+	case "kafka", "apache-kafka", "apache_kafka":
+		return "kafka"
+	case "rabbitmq", "rabbit-mq", "rabbit_mq":
+		return "rabbitmq"
 	case "intersystems", "intersystemsiris", "inter-systems-iris", "inter-systems":
 		return "iris"
 	default:
@@ -1681,9 +1714,14 @@ func resolveDriverDefinitionWithPackages(driverType string, packages map[string]
 func allDriverDefinitionsWithPackages(packages map[string]pinnedDriverPackage) []driverDefinition {
 	return []driverDefinition{
 		{Type: "mysql", Name: "MySQL", Engine: driverEngineGo, BuiltIn: true},
+		{Type: "goldendb", Name: "GoldenDB", Engine: driverEngineGo, BuiltIn: true},
 		{Type: "oracle", Name: "Oracle", Engine: driverEngineGo, BuiltIn: true},
 		{Type: "redis", Name: "Redis", Engine: driverEngineGo, BuiltIn: true},
 		{Type: "postgres", Name: "PostgreSQL", Engine: driverEngineGo, BuiltIn: true},
+		{Type: "rocketmq", Name: "RocketMQ", Engine: driverEngineGo, BuiltIn: true},
+		{Type: "mqtt", Name: "MQTT", Engine: driverEngineGo, BuiltIn: true},
+		{Type: "kafka", Name: "Kafka", Engine: driverEngineGo, BuiltIn: true},
+		{Type: "rabbitmq", Name: "RabbitMQ", Engine: driverEngineGo, BuiltIn: true},
 
 		// 其他数据源需要先在驱动管理中“安装启用”。
 		buildOptionalGoDriverDefinition("mariadb", "MariaDB", packages),
@@ -1699,10 +1737,13 @@ func allDriverDefinitionsWithPackages(packages map[string]pinnedDriverPackage) [
 		buildOptionalGoDriverDefinition("highgo", "HighGo", packages),
 		buildOptionalGoDriverDefinition("vastbase", "Vastbase", packages),
 		buildOptionalGoDriverDefinition("opengauss", "OpenGauss", packages),
+		buildOptionalGoDriverDefinition("gaussdb", "GaussDB", packages),
 		buildOptionalGoDriverDefinition("iris", "InterSystems IRIS", packages),
 		buildOptionalGoDriverDefinition("mongodb", "MongoDB", packages),
 		buildOptionalGoDriverDefinition("tdengine", "TDengine", packages),
+		buildOptionalGoDriverDefinition("iotdb", "Apache IoTDB", packages),
 		buildOptionalGoDriverDefinition("clickhouse", "ClickHouse", packages),
+		buildOptionalGoDriverDefinition("elasticsearch", "Elasticsearch", packages),
 	}
 }
 
@@ -2121,6 +2162,27 @@ func resolvePublishedDriverDownloadURLForTag(definition driverDefinition, select
 }
 
 func resolvePublishedDriverReleaseAssetName(driverType string, version string, tag string) (string, bool) {
+	if shouldUseDuckDBWindowsDynamicLibrary(driverType) {
+		cacheKey := "tag:" + strings.TrimSpace(tag)
+		if sizeByAsset, publishedAssets, ok := readReleaseAssetSizesFromCache(cacheKey); ok {
+			if publishedAssets[duckDBWindowsDriverZipAssetName] && sizeByAsset[duckDBWindowsDriverZipAssetName] > 0 {
+				return duckDBWindowsDriverZipAssetName, true
+			}
+			return "", false
+		}
+
+		sizeByAsset, publishedAssets, err := loadReleaseAssetSizesCached(cacheKey, func() (*githubRelease, error) {
+			return fetchReleaseByTag(tag)
+		})
+		if err != nil {
+			return "", false
+		}
+		if publishedAssets[duckDBWindowsDriverZipAssetName] && sizeByAsset[duckDBWindowsDriverZipAssetName] > 0 {
+			return duckDBWindowsDriverZipAssetName, true
+		}
+		return "", false
+	}
+
 	assetNames := optionalDriverReleaseAssetNamesForVersion(driverType, version)
 	if len(assetNames) == 0 {
 		return "", false
@@ -2990,7 +3052,7 @@ func readInstalledDriverPackage(downloadDir string, driverType string) (installe
 
 func optionalDriverAgentRevisionStatus(driverType string, pkg installedDriverPackage, packageMetaExists bool) (bool, string, string) {
 	expected := db.OptionalDriverAgentRevision(driverType)
-	if strings.TrimSpace(expected) == "" || !packageMetaExists || !db.IsOptionalGoDriver(driverType) {
+	if strings.TrimSpace(expected) == "" || !packageMetaExists || !db.IsOptionalGoDriver(driverType) || !shouldVerifyOptionalDriverAgentRevision(driverType, pkg.Version) {
 		return false, "", expected
 	}
 	actual := strings.TrimSpace(pkg.AgentRevision)
@@ -3006,6 +3068,31 @@ func optionalDriverAgentRevisionStatus(driverType string, pkg installedDriverPac
 	return true, fmt.Sprintf("原因：%s。影响：%s（已安装标记：%s，当前需要：%s）", updateReason, impact, actual, expected), expected
 }
 
+func optionalDriverPackageUpdateStatus(definition driverDefinition, pkg installedDriverPackage, packageMetaExists bool) (bool, string, string) {
+	needsUpdate, reason, expected := optionalDriverAgentRevisionStatus(definition.Type, pkg, packageMetaExists)
+	if needsUpdate {
+		return true, reason, expected
+	}
+	if mongoDriverNeedsLegacyCompatibilityUpdate(definition, pkg, packageMetaExists) {
+		pinned := strings.TrimSpace(definition.PinnedVersion)
+		installed := strings.TrimSpace(pkg.Version)
+		return true, fmt.Sprintf("原因：当前推荐 MongoDB 兼容驱动版本为 %s，已安装版本为 %s。影响：MongoDB 2.x driver-agent 使用官方 v2 驱动，要求服务端 MongoDB 4.2+；连接 MongoDB 4.0 会出现 wire version 7 不兼容。强烈建议重装对应驱动代理", pinned, installed), expected
+	}
+	return false, "", expected
+}
+
+func mongoDriverNeedsLegacyCompatibilityUpdate(definition driverDefinition, pkg installedDriverPackage, packageMetaExists bool) bool {
+	if normalizeDriverType(definition.Type) != "mongodb" || !packageMetaExists {
+		return false
+	}
+	pinned := normalizeVersion(strings.TrimSpace(definition.PinnedVersion))
+	installed := normalizeVersion(strings.TrimSpace(pkg.Version))
+	if pinned == "" || installed == "" {
+		return false
+	}
+	return resolveMongoDriverMajorFromVersion(installed) == 2 && resolveMongoDriverMajorFromVersion(pinned) == 1
+}
+
 func optionalDriverAgentRevisionCurrent(driverType string, executablePath string) (string, bool, error) {
 	expected := strings.TrimSpace(db.OptionalDriverAgentRevision(driverType))
 	if expected == "" {
@@ -3046,6 +3133,33 @@ func verifyInstalledOptionalDriverAgentRevision(driverType string, executablePat
 	return actual, nil
 }
 
+func observeInstalledOptionalDriverAgentRevision(driverType string, executablePath string, selectedVersion string) string {
+	if !shouldVerifyOptionalDriverAgentRevision(driverType, selectedVersion) {
+		return ""
+	}
+	expected := strings.TrimSpace(db.OptionalDriverAgentRevision(driverType))
+	actual, current, err := optionalDriverAgentRevisionCurrent(driverType, executablePath)
+	if expected == "" {
+		return strings.TrimSpace(actual)
+	}
+	displayName := resolveDriverDisplayName(driverDefinition{Type: driverType})
+	if err != nil {
+		logger.Warnf("%s 驱动代理版本元数据不可用，已保留安装：path=%s version=%s err=%v；建议在驱动管理中重装",
+			displayName, executablePath, normalizeVersion(selectedVersion), err)
+		return ""
+	}
+	actual = strings.TrimSpace(actual)
+	if !current {
+		actualLabel := actual
+		if actualLabel == "" {
+			actualLabel = "空"
+		}
+		logger.Warnf("%s 驱动代理 revision 不匹配，已保留安装：已安装=%s 当前需要=%s path=%s version=%s；建议在驱动管理中重装",
+			displayName, actualLabel, expected, executablePath, normalizeVersion(selectedVersion))
+	}
+	return actual
+}
+
 func shouldVerifyOptionalDriverAgentRevision(driverType string, selectedVersion string) bool {
 	switch normalizeDriverType(driverType) {
 	case "mongodb":
@@ -3141,10 +3255,7 @@ func installOptionalDriverAgentPackage(a *App, definition driverDefinition, sele
 	if strings.TrimSpace(downloadSource) == "" {
 		downloadSource = strings.TrimSpace(downloadURL)
 	}
-	agentRevision, revisionErr := verifyInstalledOptionalDriverAgentRevision(driverType, runtimePath, selectedVersion)
-	if revisionErr != nil {
-		return installedDriverPackage{}, revisionErr
-	}
+	agentRevision := observeInstalledOptionalDriverAgentRevision(driverType, runtimePath, selectedVersion)
 	return installedDriverPackage{
 		DriverType:     driverType,
 		Version:        strings.TrimSpace(selectedVersion),
@@ -3213,14 +3324,11 @@ func installOptionalDriverAgentFromLocalPath(definition driverDefinition, filePa
 			return installedDriverPackage{}, fmt.Errorf("导入本地驱动代理运行时依赖失败：%w", supportErr)
 		}
 	}
-	if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
+	if validateErr := validateOptionalDriverAgentExecutableFunc(driverType, executablePath); validateErr != nil {
 		return installedDriverPackage{}, validateErr
 	}
 
-	agentRevision, revisionErr := verifyInstalledOptionalDriverAgentRevision(driverType, executablePath, selectedVersion)
-	if revisionErr != nil {
-		return installedDriverPackage{}, revisionErr
-	}
+	agentRevision := observeInstalledOptionalDriverAgentRevision(driverType, executablePath, selectedVersion)
 	hash, hashErr := hashFileSHA256(executablePath)
 	if hashErr != nil {
 		return installedDriverPackage{}, fmt.Errorf("计算 %s 驱动代理摘要失败：%w", displayName, hashErr)
@@ -3553,7 +3661,7 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut
 	bundleURLs := []string{}
 	if !forceSourceBuild {
 		downloadURLs = resolveOptionalDriverAgentDownloadURLs(definition, downloadURL, selectedVersion)
-		if !restrictToExplicitArtifact {
+		if shouldUseOptionalDriverBundleFallback(driverType, restrictToExplicitArtifact, len(downloadURLs)) {
 			bundleURLs = resolveOptionalDriverBundleDownloadURLs()
 		}
 	}
@@ -3562,7 +3670,7 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut
 
 	info, err := os.Stat(executablePath)
 	if err == nil && !info.IsDir() {
-		if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
+		if validateErr := validateOptionalDriverAgentExecutableFunc(driverType, executablePath); validateErr != nil {
 			_ = os.Remove(executablePath)
 		} else {
 			// 用户点击“安装/重装”时应强制刷新驱动代理，避免沿用旧二进制导致修复不生效。
@@ -3581,12 +3689,15 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut
 	if a != nil {
 		a.emitDriverDownloadProgress(driverType, "downloading", 10, 100, planMessage)
 	}
+	observeInstalledCandidateRevision := func() {
+		observeInstalledOptionalDriverAgentRevision(driverType, executablePath, selectedVersion)
+	}
 	if !skipReuseCandidate {
 		if sourcePath, ok := findExistingOptionalDriverAgentCandidate(definition, executablePath); ok {
 			if copyErr := copyAgentBinary(sourcePath, executablePath); copyErr != nil {
 				return "", "", fmt.Errorf("复制预置 %s 驱动代理失败：%w", displayName, copyErr)
 			}
-			if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
+			if validateErr := validateOptionalDriverAgentExecutableFunc(driverType, executablePath); validateErr != nil {
 				_ = os.Remove(executablePath)
 				return "", "", validateErr
 			}
@@ -3594,6 +3705,7 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut
 			if hashErr != nil {
 				return "", "", fmt.Errorf("计算预置 %s 驱动代理摘要失败：%w", displayName, hashErr)
 			}
+			observeInstalledCandidateRevision()
 			return "file://" + sourcePath, hash, nil
 		}
 	}
@@ -3628,10 +3740,11 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut
 				}
 				hash, dlErr := downloadOptionalDriverAgentBinary(a, definition, candidateURL, executablePath)
 				if dlErr == nil {
+					observeInstalledCandidateRevision()
 					return candidateURL, hash, nil
 				}
 				logger.Warnf("下载预编译 %s 驱动代理失败，url=%s err=%v", displayName, candidateURL, dlErr)
-				downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", candidateURL, strings.TrimSpace(dlErr.Error())))
+				downloadErrs = appendOptionalDriverAttemptError(downloadErrs, candidateURL, dlErr)
 			}
 		}
 		if len(bundleURLs) > 0 {
@@ -3646,10 +3759,11 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut
 				}
 				source, hash, bundleErr := downloadOptionalDriverAgentFromBundle(a, definition, bundleURL, executablePath)
 				if bundleErr == nil {
+					observeInstalledCandidateRevision()
 					return source, hash, nil
 				}
 				logger.Warnf("从驱动总包提取 %s 驱动代理失败，url=%s err=%v", displayName, bundleURL, bundleErr)
-				downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", bundleURL, strings.TrimSpace(bundleErr.Error())))
+				downloadErrs = appendOptionalDriverAttemptError(downloadErrs, bundleURL, bundleErr)
 			}
 		} else if len(downloadURLs) > 0 || restrictToExplicitArtifact {
 			fallbackMessage := buildOptionalDriverFallbackProgressMessage(displayName, len(downloadURLs), 0, restrictToExplicitArtifact)
@@ -3682,6 +3796,65 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut
 	return "", "", errors.New(strings.Join(parts, "；"))
 }
 
+func appendOptionalDriverAttemptError(entries []string, source string, err error) []string {
+	text := formatOptionalDriverAttemptError(source, err)
+	if text == "" {
+		return entries
+	}
+	for _, existing := range entries {
+		if existing == text {
+			return entries
+		}
+	}
+	return append(entries, text)
+}
+
+func formatOptionalDriverAttemptError(source string, err error) string {
+	message := errorMessage(err)
+	if message == "" {
+		return ""
+	}
+	source = strings.TrimSpace(source)
+	if source == "" {
+		return message
+	}
+	duplicatedPrefix := source + ":"
+	if strings.HasPrefix(message, duplicatedPrefix) {
+		message = strings.TrimSpace(strings.TrimPrefix(message, duplicatedPrefix))
+	}
+	if message == "" {
+		return source
+	}
+	return source + ": " + message
+}
+
+func shouldUseOptionalDriverBundleFallback(driverType string, restrictToExplicitArtifact bool, directURLCount int) bool {
+	if restrictToExplicitArtifact {
+		return false
+	}
+	if shouldSkipDirectOptionalDriverDownloads(driverType) {
+		return true
+	}
+	return directURLCount == 0
+}
+
+func isOptionalDriverDownloadZipURL(urlText string) bool {
+	trimmedURL := strings.TrimSpace(urlText)
+	if trimmedURL == "" {
+		return false
+	}
+	if parsed, err := url.Parse(trimmedURL); err == nil {
+		if strings.TrimSpace(parsed.Path) != "" && strings.EqualFold(path.Ext(parsed.Path), ".zip") {
+			return true
+		}
+		if strings.TrimSpace(parsed.Fragment) != "" && strings.EqualFold(path.Ext(parsed.Fragment), ".zip") {
+			return true
+		}
+		return false
+	}
+	return strings.EqualFold(filepath.Ext(trimmedURL), ".zip")
+}
+
 func downloadOptionalDriverAgentBinary(a *App, definition driverDefinition, urlText string, executablePath string) (string, error) {
 	driverType := normalizeDriverType(definition.Type)
 	displayName := resolveDriverDisplayName(definition)
@@ -3689,8 +3862,46 @@ func downloadOptionalDriverAgentBinary(a *App, definition driverDefinition, urlT
 	if trimmedURL == "" {
 		return "", fmt.Errorf("下载地址为空")
 	}
+	if isOptionalDriverDownloadZipURL(trimmedURL) {
+		tempPath := executablePath + ".download.zip"
+		_ = os.Remove(tempPath)
+
+		if _, err := downloadFileWithHash(trimmedURL, tempPath, func(downloaded, total int64) {
+			if a == nil {
+				return
+			}
+			scaledDownloaded, scaledTotal := scaleProgress(downloaded, total, 20, 90)
+			a.emitDriverDownloadProgress(driverType, "downloading", scaledDownloaded, scaledTotal, fmt.Sprintf("下载预编译 %s 驱动包", displayName))
+		}); err != nil {
+			_ = os.Remove(tempPath)
+			return "", fmt.Errorf("下载失败：%w", err)
+		}
+
+		if _, err := installOptionalDriverAgentFromLocalZip(tempPath, definition, executablePath, ""); err != nil {
+			_ = os.Remove(tempPath)
+			_ = os.Remove(executablePath)
+			for _, supportName := range optionalDriverSupportFileNames(driverType) {
+				_ = os.Remove(filepath.Join(filepath.Dir(executablePath), supportName))
+			}
+			return "", fmt.Errorf("安装预编译驱动包失败：%w", err)
+		}
+		_ = os.Remove(tempPath)
+
+		if validateErr := validateOptionalDriverAgentExecutableFunc(driverType, executablePath); validateErr != nil {
+			_ = os.Remove(executablePath)
+			for _, supportName := range optionalDriverSupportFileNames(driverType) {
+				_ = os.Remove(filepath.Join(filepath.Dir(executablePath), supportName))
+			}
+			return "", validateErr
+		}
+		hash, hashErr := hashFileSHA256(executablePath)
+		if hashErr != nil {
+			return "", fmt.Errorf("计算驱动代理摘要失败：%w", hashErr)
+		}
+		return hash, nil
+	}
 	if len(optionalDriverSupportFileNames(driverType)) > 0 {
-		return "", fmt.Errorf("%s 当前平台需要随包提供运行时依赖（%s），不能安装单文件代理；请使用驱动总包或本地源码构建", displayName, strings.Join(optionalDriverSupportFileNames(driverType), ", "))
+		return "", fmt.Errorf("%s 当前平台需要随包提供运行时依赖（%s），不能安装单文件代理；请使用驱动总包、驱动专属 zip 或本地源码构建", displayName, strings.Join(optionalDriverSupportFileNames(driverType), ", "))
 	}
 	tempPath := executablePath + ".tmp"
 	_ = os.Remove(tempPath)
@@ -3718,7 +3929,7 @@ func downloadOptionalDriverAgentBinary(a *App, definition driverDefinition, urlT
 	if chmodErr := os.Chmod(executablePath, 0o755); chmodErr != nil && stdRuntime.GOOS != "windows" {
 		return "", fmt.Errorf("设置代理权限失败：%w", chmodErr)
 	}
-	if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
+	if validateErr := validateOptionalDriverAgentExecutableFunc(driverType, executablePath); validateErr != nil {
 		_ = os.Remove(executablePath)
 		return "", validateErr
 	}
@@ -3835,7 +4046,7 @@ func downloadOptionalDriverAgentFromBundle(a *App, definition driverDefinition,
 		_ = os.Remove(executablePath)
 		return "", "", supportErr
 	}
-	if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
+	if validateErr := validateOptionalDriverAgentExecutableFunc(driverType, executablePath); validateErr != nil {
 		_ = os.Remove(executablePath)
 		return "", "", validateErr
 	}
@@ -3864,6 +4075,15 @@ func buildOptionalDriverAgentFromSource(definition driverDefinition, executableP
 	if rootErr != nil {
 		return "", rootErr
 	}
+	buildArgs := []string{"build", "-tags", tagName, "-trimpath", "-ldflags", "-s -w"}
+	cleanupModOverride := func() {}
+	if modOverride, modErr := prepareOptionalDriverBuildModOverride(projectRoot, driverType, selectedVersion); modErr != nil {
+		return "", modErr
+	} else if modOverride != nil {
+		buildArgs = append(buildArgs, "-modfile", modOverride.modFile)
+		cleanupModOverride = modOverride.cleanup
+	}
+	defer cleanupModOverride()
 	env := append([]string{}, os.Environ()...)
 	env = withEnvValue(env, "GOTOOLCHAIN", "auto")
 	var duckDBLibDir string
@@ -3884,13 +4104,19 @@ func buildOptionalDriverAgentFromSource(definition driverDefinition, executableP
 		duckDBLibDir = libDir
 		cleanupDuckDBLib = cleanup
 		defer cleanupDuckDBLib()
-		env = withEnvValue(env, "CGO_LDFLAGS", fmt.Sprintf("-L\"%s\" -lduckdb", filepath.ToSlash(duckDBLibDir)))
+		env = withEnvValue(env, "CGO_LDFLAGS", duckDBWindowsDynamicLibraryCGOLDFlags(duckDBLibDir))
 		env = prependPathEnv(env, duckDBLibDir)
 	}
-	cmd := exec.Command(goPath, "build", "-tags", tagName, "-trimpath", "-ldflags", "-s -w", "-o", executablePath, "./cmd/optional-driver-agent")
+	buildArgs = append(buildArgs, "-o", executablePath, "./cmd/optional-driver-agent")
+	ctx, cancel := context.WithTimeout(context.Background(), optionalDriverSourceBuildTimeout)
+	defer cancel()
+	cmd := exec.CommandContext(ctx, goPath, buildArgs...)
 	cmd.Dir = projectRoot
 	cmd.Env = env
 	output, buildErr := cmd.CombinedOutput()
+	if ctx.Err() == context.DeadlineExceeded {
+		return "", fmt.Errorf("构建 %s 驱动代理超时（超过 %s），请优先使用预编译驱动包或本地驱动包导入", displayName, optionalDriverSourceBuildTimeout)
+	}
 	if buildErr != nil {
 		return "", fmt.Errorf("构建 %s 驱动代理失败：%v，输出：%s", displayName, buildErr, strings.TrimSpace(string(output)))
 	}
@@ -3909,6 +4135,94 @@ func buildOptionalDriverAgentFromSource(definition driverDefinition, executableP
 	return hash, nil
 }
 
+type optionalDriverBuildModOverride struct {
+	modFile string
+	cleanup func()
+}
+
+func prepareOptionalDriverBuildModOverride(projectRoot string, driverType string, selectedVersion string) (*optionalDriverBuildModOverride, error) {
+	modulePath := strings.TrimSpace(driverGoModulePathMap[normalizeDriverType(driverType)])
+	versionText := normalizeVersion(strings.TrimSpace(selectedVersion))
+	if strings.EqualFold(normalizeDriverType(driverType), "tdengine") && modulePath != "" && versionText != "" {
+		return buildVersionedDriverModOverride(projectRoot, modulePath, versionText)
+	}
+	return nil, nil
+}
+
+func buildVersionedDriverModOverride(projectRoot string, modulePath string, version string) (*optionalDriverBuildModOverride, error) {
+	goModPath := filepath.Join(projectRoot, "go.mod")
+	goSumPath := filepath.Join(projectRoot, "go.sum")
+	modBytes, err := os.ReadFile(goModPath)
+	if err != nil {
+		return nil, fmt.Errorf("读取 go.mod 失败：%w", err)
+	}
+
+	replaced, changed, err := rewriteRequiredModuleVersion(modBytes, modulePath, version)
+	if err != nil {
+		return nil, err
+	}
+	if !changed {
+		return nil, fmt.Errorf("未在 go.mod 中找到驱动依赖：%s", modulePath)
+	}
+
+	workDir, err := os.MkdirTemp("", "gonavi-driver-mod-*")
+	if err != nil {
+		return nil, fmt.Errorf("创建驱动构建临时目录失败：%w", err)
+	}
+	cleanup := func() {
+		_ = os.RemoveAll(workDir)
+	}
+
+	modFile := filepath.Join(workDir, "go.mod")
+	sumFile := filepath.Join(workDir, "go.sum")
+	if err := os.WriteFile(modFile, replaced, 0o644); err != nil {
+		cleanup()
+		return nil, fmt.Errorf("写入临时 go.mod 失败：%w", err)
+	}
+	if sumBytes, readErr := os.ReadFile(goSumPath); readErr == nil {
+		if writeErr := os.WriteFile(sumFile, sumBytes, 0o644); writeErr != nil {
+			cleanup()
+			return nil, fmt.Errorf("写入临时 go.sum 失败：%w", writeErr)
+		}
+	}
+
+	return &optionalDriverBuildModOverride{
+		modFile: modFile,
+		cleanup: cleanup,
+	}, nil
+}
+
+func rewriteRequiredModuleVersion(goMod []byte, modulePath string, version string) ([]byte, bool, error) {
+	trimmedModule := strings.TrimSpace(modulePath)
+	trimmedVersion := normalizeVersion(strings.TrimSpace(version))
+	if trimmedModule == "" || trimmedVersion == "" {
+		return nil, false, fmt.Errorf("驱动模块或版本为空")
+	}
+
+	pattern := fmt.Sprintf(`(?m)^(?P<prefix>\s*%s\s+)v[^\s]+(?P<suffix>\s*(//.*)?)$`, regexp.QuoteMeta(trimmedModule))
+	re := regexp.MustCompile(pattern)
+	changed := false
+	replaced := re.ReplaceAllFunc(goMod, func(line []byte) []byte {
+		match := re.FindSubmatch(line)
+		if len(match) == 0 {
+			return line
+		}
+		changed = true
+		text := string(line)
+		submatches := re.FindStringSubmatch(text)
+		if len(submatches) == 0 {
+			return line
+		}
+		prefix := submatches[1]
+		suffix := ""
+		if len(submatches) > 2 {
+			suffix = submatches[2]
+		}
+		return []byte(prefix + "v" + trimmedVersion + suffix)
+	})
+	return replaced, changed, nil
+}
+
 func resolveMongoDriverMajorFromVersion(version string) int {
 	trimmed := strings.TrimSpace(version)
 	trimmed = strings.TrimPrefix(trimmed, "v")
@@ -3918,28 +4232,8 @@ func resolveMongoDriverMajorFromVersion(version string) int {
 	return 2
 }
 
-func shouldForceSourceBuildForVersion(driverType string, selectedVersion string) bool {
-	if normalizeDriverType(driverType) != "mongodb" {
-		return false
-	}
-	return resolveMongoDriverMajorFromVersion(selectedVersion) == 1
-}
-
-func shouldForceSourceBuildForResolvedDownload(driverType string, selectedVersion string, downloadURL string) bool {
-	if !shouldForceSourceBuildForVersion(driverType, selectedVersion) {
-		return false
-	}
-
-	parsed, err := url.Parse(strings.TrimSpace(downloadURL))
-	if err != nil || parsed == nil {
-		return true
-	}
-	switch strings.ToLower(strings.TrimSpace(parsed.Scheme)) {
-	case "http", "https":
-		return false
-	default:
-		return true
-	}
+func shouldForceSourceBuildForResolvedDownload(_ string, _ string, _ string) bool {
+	return false
 }
 
 func shouldPreferSourceBuildBeforeDownload(driverType string, selectedVersion string) bool {
@@ -3948,23 +4242,15 @@ func shouldPreferSourceBuildBeforeDownload(driverType string, selectedVersion st
 
 func shouldPreferSourceBuildBeforeDownloadForBuildType(buildType string, driverType string, selectedVersion string) bool {
 	_ = selectedVersion
-	if shouldPreferDevelopmentDriverAgentSourceBuild(buildType, driverType) {
-		return true
-	}
+	_ = buildType
 	return shouldUseDuckDBWindowsDynamicLibrary(driverType)
 }
 
 func shouldRequireSourceBuildBeforeDownloadForBuildType(buildType string, driverType string, selectedVersion string) bool {
 	_ = selectedVersion
-	return shouldPreferDevelopmentDriverAgentSourceBuild(buildType, driverType)
-}
-
-func shouldPreferDevelopmentDriverAgentSourceBuild(buildType string, driverType string) bool {
-	normalizedBuildType := strings.ToLower(strings.TrimSpace(buildType))
-	if normalizedBuildType != "dev" && normalizedBuildType != "development" {
-		return false
-	}
-	return db.IsOptionalGoDriver(driverType)
+	_ = buildType
+	_ = driverType
+	return false
 }
 
 func shouldSkipReusableAgentCandidate(driverType string, selectedVersion string) bool {
@@ -3981,6 +4267,10 @@ func shouldUseDuckDBWindowsDynamicLibrary(driverType string) bool {
 	return normalizeDriverType(driverType) == "duckdb" && stdRuntime.GOOS == "windows" && stdRuntime.GOARCH == "amd64"
 }
 
+func shouldPreferPublishedOptionalDriverDownloads(driverType string) bool {
+	return shouldUseDuckDBWindowsDynamicLibrary(driverType)
+}
+
 func shouldSkipDirectOptionalDriverDownloads(driverType string) bool {
 	return shouldUseDuckDBWindowsDynamicLibrary(driverType)
 }
@@ -4022,6 +4312,8 @@ func optionalDriverBuildTag(driverType string, selectedVersion string) (string,
 		return "gonavi_vastbase_driver", nil
 	case "opengauss":
 		return "gonavi_opengauss_driver", nil
+	case "gaussdb":
+		return "gonavi_gaussdb_driver", nil
 	case "iris":
 		return "gonavi_iris_driver", nil
 	case "mongodb":
@@ -4031,8 +4323,12 @@ func optionalDriverBuildTag(driverType string, selectedVersion string) (string,
 		return "gonavi_mongodb_driver", nil
 	case "tdengine":
 		return "gonavi_tdengine_driver", nil
+	case "iotdb":
+		return "gonavi_iotdb_driver", nil
 	case "clickhouse":
 		return "gonavi_clickhouse_driver", nil
+	case "elasticsearch":
+		return "gonavi_elasticsearch_driver", nil
 	default:
 		return "", fmt.Errorf("未配置驱动构建标签：%s", driverType)
 	}
@@ -4086,6 +4382,21 @@ func withEnvValue(env []string, key string, value string) []string {
 	return append(env, entry)
 }
 
+func duckDBWindowsDynamicLibraryCGOLDFlags(libDir string) string {
+	normalizedDir := strings.ReplaceAll(filepath.ToSlash(strings.TrimSpace(libDir)), `\`, `/`)
+	parts := []string{
+		// cgo 会把每个 CGO_LDFLAGS 片段转成 //go:cgo_ldflag，带引号的 -L 在 windows/amd64 上会被当成非法参数。
+		fmt.Sprintf("-L%s", normalizedDir),
+		"-lduckdb",
+		"-lstdc++",
+		"-lm",
+		"-lws2_32",
+		"-lwsock32",
+		"-lrstrtmgr",
+	}
+	return strings.Join(parts, " ")
+}
+
 func envValue(env []string, key string) string {
 	normalizedKey := strings.ToUpper(strings.TrimSpace(key))
 	for _, item := range env {
@@ -4145,7 +4456,7 @@ func resolveDuckDBWindowsCGOToolchainBinFromCandidates(candidates []string) (str
 		}
 	}
 
-	installHint := `请先安装 MSYS2 UCRT64 工具链：winget install --id MSYS2.MSYS2 -e；然后执行 C:\msys64\usr\bin\bash.exe -lc "pacman -S --needed --noconfirm mingw-w64-ucrt-x86_64-gcc"`
+	installHint := `请先安装 MSYS2 UCRT64 工具链：winget install --id MSYS2.MSYS2 -e；然后执行 C:\msys64\usr\bin\bash.exe -lc "pacman -S --needed --noconfirm mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-binutils"`
 	if len(checked) == 0 {
 		return "", fmt.Errorf("未找到可用的 gcc.exe/g++.exe；%s", installHint)
 	}
@@ -4224,7 +4535,6 @@ func prepareDuckDBWindowsDynamicLibraryForBuild() (string, func(), error) {
 
 	required := map[string]bool{
 		"duckdb.dll": false,
-		"duckdb.lib": false,
 	}
 	for _, file := range reader.File {
 		baseName := strings.ToLower(filepath.Base(filepath.ToSlash(file.Name)))
@@ -4249,13 +4559,24 @@ func prepareDuckDBWindowsDynamicLibraryForBuild() (string, func(), error) {
 		return "", nil, fmt.Errorf("DuckDB 官方动态库包缺少文件：%s", strings.Join(missing, ", "))
 	}
 
-	importLibPath := filepath.Join(workDir, "duckdb.lib")
-	for _, alias := range []string{"libduckdb.dll.a", "libduckdb.a"} {
-		aliasPath := filepath.Join(workDir, alias)
-		if err := copyOptionalDriverSupportFile(importLibPath, aliasPath); err != nil {
-			cleanup()
-			return "", nil, err
-		}
+	toolchainBin, err := resolveDuckDBWindowsCGOToolchainBin()
+	if err != nil {
+		cleanup()
+		return "", nil, fmt.Errorf("定位 DuckDB Windows dlltool 失败：%w", err)
+	}
+	dllPath := filepath.Join(workDir, "duckdb.dll")
+	importLibPath := filepath.Join(workDir, "libduckdb.dll.a")
+	if err := buildutil.GenerateWindowsImportLibraryFromDLL(
+		dllPath,
+		filepath.Join(toolchainBin, "dlltool.exe"),
+		importLibPath,
+	); err != nil {
+		cleanup()
+		return "", nil, err
+	}
+	if err := copyOptionalDriverSupportFile(importLibPath, filepath.Join(workDir, "libduckdb.a")); err != nil {
+		cleanup()
+		return "", nil, err
 	}
 
 	return workDir, cleanup, nil
@@ -4314,10 +4635,9 @@ func optionalDriverNameStemCandidates(driverType string, selectedVersion string)
 		switch resolveMongoDriverMajorFromVersion(selectedVersion) {
 		case 1:
 			appendStem(base + "-v1")
-			appendStem(base)
 		case 2:
-			appendStem(base)
 			appendStem(base + "-v2")
+			appendStem(base)
 		default:
 			appendStem(base)
 		}
@@ -4417,12 +4737,28 @@ func currentDriverReleaseTag() string {
 	if currentVersion == "" || currentVersion == "0.0.0" {
 		return ""
 	}
-	if strings.HasPrefix(strings.ToLower(currentVersion), "dev-") {
+	if isDevelopmentDriverReleaseVersion(currentVersion) {
 		return driverReleaseDevTag
 	}
 	return "v" + currentVersion
 }
 
+func isDevelopmentDriverReleaseVersion(version string) bool {
+	normalized := strings.ToLower(strings.TrimSpace(normalizeVersion(version)))
+	if normalized == "" || normalized == "0.0.0" {
+		return false
+	}
+	if strings.HasPrefix(normalized, "dev-") {
+		return true
+	}
+	for _, marker := range []string{"-dev", "-test", "-local", "-snapshot"} {
+		if strings.Contains(normalized, marker) {
+			return true
+		}
+	}
+	return false
+}
+
 func driverReleaseDownloadURL(tag string, assetName string) string {
 	tagName := strings.TrimSpace(tag)
 	asset := strings.TrimSpace(assetName)
@@ -4440,6 +4776,45 @@ func driverReleaseLatestDownloadURL(assetName string) string {
 	return fmt.Sprintf("https://github.com/%s/releases/latest/download/%s", driverReleaseRepo, url.PathEscape(asset))
 }
 
+func findReleaseAssetByName(release *githubRelease, assetNames []string) (githubAsset, bool) {
+	if release == nil || len(release.Assets) == 0 || len(assetNames) == 0 {
+		return githubAsset{}, false
+	}
+	for _, expected := range assetNames {
+		trimmed := strings.TrimSpace(expected)
+		if trimmed == "" {
+			continue
+		}
+		for _, asset := range release.Assets {
+			if strings.EqualFold(strings.TrimSpace(asset.Name), trimmed) {
+				return asset, true
+			}
+		}
+	}
+	return githubAsset{}, false
+}
+
+func driverReleaseAssetAPIURL(asset githubAsset) string {
+	urlText := strings.TrimSpace(asset.URL)
+	if urlText != "" {
+		name := strings.TrimSpace(asset.Name)
+		if name == "" {
+			return urlText
+		}
+		parsed, err := url.Parse(urlText)
+		if err != nil {
+			return urlText
+		}
+		parsed.Fragment = name
+		return parsed.String()
+	}
+	urlText = strings.TrimSpace(asset.BrowserDownloadURL)
+	if urlText == "" {
+		return ""
+	}
+	return urlText
+}
+
 func optionalDriverBundlePlatformDir(goos string) string {
 	switch strings.ToLower(strings.TrimSpace(goos)) {
 	case "windows":
@@ -4527,8 +4902,18 @@ func resolveOptionalDriverBundleDownloadURLs() []string {
 	}
 
 	if tag := currentDriverReleaseTag(); tag != "" {
+		if release, err := fetchReleaseByTag(tag); err == nil {
+			if asset, ok := findReleaseAssetByName(release, []string{optionalDriverBundleAssetName}); ok {
+				appendURL(driverReleaseAssetAPIURL(asset))
+			}
+		}
 		appendURL(driverReleaseDownloadURL(tag, optionalDriverBundleAssetName))
 	}
+	if release, err := fetchLatestReleaseForDriverAssets(); err == nil {
+		if asset, ok := findReleaseAssetByName(release, []string{optionalDriverBundleAssetName}); ok {
+			appendURL(driverReleaseAssetAPIURL(asset))
+		}
+	}
 	appendURL(driverReleaseLatestDownloadURL(optionalDriverBundleAssetName))
 	return candidates
 }
@@ -4721,6 +5106,7 @@ func acquireOptionalDriverBundlePath(bundleURL string, onProgress func(downloade
 func resolveOptionalDriverAgentDownloadURLs(definition driverDefinition, rawURL string, selectedVersion string) []string {
 	candidates := make([]string, 0, 3)
 	seen := make(map[string]struct{}, 3)
+	driverType := normalizeDriverType(definition.Type)
 	appendURL := func(value string) {
 		trimmed := strings.TrimSpace(value)
 		if trimmed == "" {
@@ -4733,8 +5119,20 @@ func resolveOptionalDriverAgentDownloadURLs(definition driverDefinition, rawURL
 		candidates = append(candidates, trimmed)
 	}
 
-	if shouldSkipDirectOptionalDriverDownloads(definition.Type) {
-		return candidates
+	restrictToExplicitArtifact := shouldRestrictToExplicitVersionArtifact(definition, selectedVersion)
+	appendPublishedURLs := func() {
+		if tag := currentDriverReleaseTag(); tag != "" {
+			if publishedURL, ok := resolvePublishedDriverDownloadURLForTag(definition, selectedVersion, tag); ok {
+				appendURL(publishedURL)
+			}
+		}
+		if publishedURL, ok := resolveLatestPublishedDriverDownloadURLForVersion(definition, selectedVersion); ok {
+			appendURL(publishedURL)
+		}
+	}
+
+	if !restrictToExplicitArtifact && shouldPreferPublishedOptionalDriverDownloads(driverType) {
+		appendPublishedURLs()
 	}
 
 	if parsed, err := url.Parse(strings.TrimSpace(rawURL)); err == nil {
@@ -4743,17 +5141,12 @@ func resolveOptionalDriverAgentDownloadURLs(definition driverDefinition, rawURL
 			appendURL(parsed.String())
 		}
 	}
-	if shouldRestrictToExplicitVersionArtifact(definition, selectedVersion) {
+	if restrictToExplicitArtifact {
 		return candidates
 	}
 
-	if tag := currentDriverReleaseTag(); tag != "" {
-		if publishedURL, ok := resolvePublishedDriverDownloadURLForTag(definition, selectedVersion, tag); ok {
-			appendURL(publishedURL)
-		}
-	}
-	if publishedURL, ok := resolveLatestPublishedDriverDownloadURL(definition); ok {
-		appendURL(publishedURL)
+	if !shouldPreferPublishedOptionalDriverDownloads(driverType) {
+		appendPublishedURLs()
 	}
 	return candidates
 }
@@ -4778,10 +5171,10 @@ func findExistingOptionalDriverAgentCandidate(definition driverDefinition, targe
 		if statErr != nil || info.IsDir() {
 			continue
 		}
-		if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, absPath); validateErr != nil {
+		if validateErr := validateOptionalDriverAgentExecutableFunc(driverType, absPath); validateErr != nil {
 			continue
 		}
-		if !isReusableOptionalDriverAgentRevisionCurrent(driverType, absPath) {
+		if !isReusableOptionalDriverAgentCandidateRevisionAcceptable(driverType, absPath) {
 			continue
 		}
 		return absPath, true
@@ -4789,7 +5182,7 @@ func findExistingOptionalDriverAgentCandidate(definition driverDefinition, targe
 	return "", false
 }
 
-func isReusableOptionalDriverAgentRevisionCurrent(driverType string, executablePath string) bool {
+func isReusableOptionalDriverAgentCandidateRevisionAcceptable(driverType string, executablePath string) bool {
 	expected := strings.TrimSpace(db.OptionalDriverAgentRevision(driverType))
 	if expected == "" {
 		return true
@@ -4797,12 +5190,16 @@ func isReusableOptionalDriverAgentRevisionCurrent(driverType string, executableP
 	actual, current, err := optionalDriverAgentRevisionCurrent(driverType, executablePath)
 	displayName := resolveDriverDisplayName(driverDefinition{Type: driverType})
 	if err != nil {
-		logger.Warnf("跳过可复用 %s 驱动代理候选：版本元数据不可用 path=%s err=%v", displayName, executablePath, err)
-		return false
+		logger.Warnf("可复用 %s 驱动代理候选版本元数据不可用，仍允许安装：path=%s err=%v；建议在驱动管理中重装", displayName, executablePath, err)
+		return true
 	}
 	if !current {
-		logger.Warnf("跳过可复用 %s 驱动代理候选：revision 不匹配 path=%s actual=%s expected=%s", displayName, executablePath, strings.TrimSpace(actual), expected)
-		return false
+		actualLabel := strings.TrimSpace(actual)
+		if actualLabel == "" {
+			actualLabel = "空"
+		}
+		logger.Warnf("可复用 %s 驱动代理候选 revision 不匹配，仍允许安装：path=%s actual=%s expected=%s；建议在驱动管理中重装", displayName, executablePath, actualLabel, expected)
+		return true
 	}
 	return true
 }
@@ -5361,11 +5758,43 @@ func fetchLatestReleaseForDriverAssets() (*githubRelease, error) {
 }
 
 func resolveLatestPublishedDriverDownloadURL(definition driverDefinition) (string, bool) {
+	return resolveLatestPublishedDriverDownloadURLForVersion(definition, "")
+}
+
+func resolveLatestPublishedDriverDownloadURLForVersion(definition driverDefinition, selectedVersion string) (string, bool) {
 	driverType := normalizeDriverType(definition.Type)
 	if driverType == "" {
 		return "", false
 	}
-	assetNames := optionalDriverReleaseAssetNames(driverType)
+	if shouldUseDuckDBWindowsDynamicLibrary(driverType) {
+		if sizeByAsset, publishedAssets, ok := readReleaseAssetSizesFromCache("latest"); ok {
+			if publishedAssets[duckDBWindowsDriverZipAssetName] && sizeByAsset[duckDBWindowsDriverZipAssetName] > 0 {
+				if release, err := fetchLatestReleaseForDriverAssets(); err == nil {
+					if asset, found := findReleaseAssetByName(release, []string{duckDBWindowsDriverZipAssetName}); found {
+						return driverReleaseAssetAPIURL(asset), true
+					}
+				}
+				return driverReleaseLatestDownloadURL(duckDBWindowsDriverZipAssetName), true
+			}
+			return "", false
+		}
+
+		sizeByAsset, publishedAssets, err := loadReleaseAssetSizesCached("latest", fetchLatestReleaseForDriverAssets)
+		if err != nil {
+			return "", false
+		}
+		if publishedAssets[duckDBWindowsDriverZipAssetName] && sizeByAsset[duckDBWindowsDriverZipAssetName] > 0 {
+			if release, relErr := fetchLatestReleaseForDriverAssets(); relErr == nil {
+				if asset, found := findReleaseAssetByName(release, []string{duckDBWindowsDriverZipAssetName}); found {
+					return driverReleaseAssetAPIURL(asset), true
+				}
+			}
+			return driverReleaseLatestDownloadURL(duckDBWindowsDriverZipAssetName), true
+		}
+		return "", false
+	}
+
+	assetNames := optionalDriverReleaseAssetNamesForVersion(driverType, selectedVersion)
 	if len(assetNames) == 0 {
 		return "", false
 	}
@@ -5373,6 +5802,11 @@ func resolveLatestPublishedDriverDownloadURL(definition driverDefinition) (strin
 	if sizeByAsset, publishedAssets, ok := readReleaseAssetSizesFromCache("latest"); ok {
 		for _, assetName := range assetNames {
 			if publishedAssets[assetName] && sizeByAsset[assetName] > 0 {
+				if release, err := fetchLatestReleaseForDriverAssets(); err == nil {
+					if asset, found := findReleaseAssetByName(release, []string{assetName}); found {
+						return driverReleaseAssetAPIURL(asset), true
+					}
+				}
 				return driverReleaseLatestDownloadURL(assetName), true
 			}
 		}
@@ -5385,6 +5819,11 @@ func resolveLatestPublishedDriverDownloadURL(definition driverDefinition) (strin
 	}
 	for _, assetName := range assetNames {
 		if publishedAssets[assetName] && sizeByAsset[assetName] > 0 {
+			if release, relErr := fetchLatestReleaseForDriverAssets(); relErr == nil {
+				if asset, found := findReleaseAssetByName(release, []string{assetName}); found {
+					return driverReleaseAssetAPIURL(asset), true
+				}
+			}
 			return driverReleaseLatestDownloadURL(assetName), true
 		}
 	}
diff --git a/internal/app/methods_driver_agent_revision_test.go b/internal/app/methods_driver_agent_revision_test.go
index 0a09c9c..be16c7b 100644
--- a/internal/app/methods_driver_agent_revision_test.go
+++ b/internal/app/methods_driver_agent_revision_test.go
@@ -33,6 +33,41 @@ func TestOptionalDriverAgentRevisionStatusDetectsStaleClickHouseAgent(t *testing
 	}
 }
 
+func TestOptionalDriverPackageUpdateStatusDetectsMongoV2WhenLegacyDefault(t *testing.T) {
+	definition, ok := resolveDriverDefinition("mongodb")
+	if !ok {
+		t.Fatal("expected mongodb driver definition")
+	}
+	meta := installedDriverPackage{
+		Version:       "2.5.0",
+		AgentRevision: db.OptionalDriverAgentRevision("mongodb"),
+	}
+
+	needsUpdate, reason, _ := optionalDriverPackageUpdateStatus(definition, meta, true)
+	if !needsUpdate {
+		t.Fatal("expected installed MongoDB v2 driver to require reinstall when v1 is the compatibility default")
+	}
+	if !strings.Contains(reason, "MongoDB 4.0") || !strings.Contains(reason, "wire version 7") {
+		t.Fatalf("expected reason to explain MongoDB 4.0 compatibility, got %q", reason)
+	}
+}
+
+func TestOptionalDriverPackageUpdateStatusAcceptsMongoV1WithoutRevision(t *testing.T) {
+	definition, ok := resolveDriverDefinition("mongodb")
+	if !ok {
+		t.Fatal("expected mongodb driver definition")
+	}
+	meta := installedDriverPackage{
+		Version:       "1.17.9",
+		AgentRevision: "",
+	}
+
+	needsUpdate, reason, _ := optionalDriverPackageUpdateStatus(definition, meta, true)
+	if needsUpdate {
+		t.Fatalf("expected MongoDB v1 driver to skip revision mismatch prompts, reason=%q", reason)
+	}
+}
+
 func TestOptionalDriverAgentRevisionCurrentRejectsStaleMetadata(t *testing.T) {
 	originalProbe := optionalDriverAgentMetadataProbe
 	t.Cleanup(func() {
@@ -79,7 +114,7 @@ func TestVerifyInstalledOptionalDriverAgentRevisionRejectsProbeFailure(t *testin
 	}
 }
 
-func TestVerifyRuntimeOptionalDriverAgentRevisionRejectsStaleOceanBaseAgent(t *testing.T) {
+func TestVerifyRuntimeOptionalDriverAgentRevisionAllowsStaleOceanBaseMySQLAgent(t *testing.T) {
 	originalProbe := optionalDriverAgentMetadataProbe
 	t.Cleanup(func() {
 		optionalDriverAgentMetadataProbe = originalProbe
@@ -92,11 +127,62 @@ func TestVerifyRuntimeOptionalDriverAgentRevisionRejectsStaleOceanBaseAgent(t *t
 	}
 
 	err := verifyRuntimeOptionalDriverAgentRevision(connection.ConnectionConfig{Type: "oceanbase"})
-	if err == nil {
-		t.Fatal("expected stale OceanBase agent revision to be rejected")
+	if err != nil {
+		t.Fatalf("runtime revision mismatch should warn and continue, got %v", err)
 	}
-	if !strings.Contains(err.Error(), "revision 不匹配") {
-		t.Fatalf("expected revision mismatch error, got %v", err)
+}
+
+func TestVerifyRuntimeOptionalDriverAgentRevisionAllowsStaleOceanBaseOracleAgent(t *testing.T) {
+	originalProbe := optionalDriverAgentMetadataProbe
+	t.Cleanup(func() {
+		optionalDriverAgentMetadataProbe = originalProbe
+	})
+	optionalDriverAgentMetadataProbe = func(driverType string, executablePath string) (db.OptionalDriverAgentMetadata, error) {
+		return db.OptionalDriverAgentMetadata{
+			DriverType:    driverType,
+			AgentRevision: "src-stale-agent",
+		}, nil
+	}
+
+	err := verifyRuntimeOptionalDriverAgentRevision(connection.ConnectionConfig{
+		Type:             "oceanbase",
+		ConnectionParams: "protocol=oracle",
+	})
+	if err != nil {
+		t.Fatalf("runtime revision mismatch should stay in driver manager only, got %v", err)
+	}
+}
+
+func TestVerifyRuntimeOptionalDriverAgentRevisionAllowsUnknownOceanBaseOracleAgent(t *testing.T) {
+	originalProbe := optionalDriverAgentMetadataProbe
+	t.Cleanup(func() {
+		optionalDriverAgentMetadataProbe = originalProbe
+	})
+	optionalDriverAgentMetadataProbe = func(driverType string, executablePath string) (db.OptionalDriverAgentMetadata, error) {
+		return db.OptionalDriverAgentMetadata{}, errOptionalDriverAgentMetadataUnavailable
+	}
+
+	err := verifyRuntimeOptionalDriverAgentRevision(connection.ConnectionConfig{
+		Type:              "oceanbase",
+		OceanBaseProtocol: "oracle",
+	})
+	if err != nil {
+		t.Fatalf("runtime metadata probe failure should stay in driver manager only, got %v", err)
+	}
+}
+
+func TestVerifyRuntimeOptionalDriverAgentRevisionAllowsMetadataProbeFailure(t *testing.T) {
+	originalProbe := optionalDriverAgentMetadataProbe
+	t.Cleanup(func() {
+		optionalDriverAgentMetadataProbe = originalProbe
+	})
+	optionalDriverAgentMetadataProbe = func(driverType string, executablePath string) (db.OptionalDriverAgentMetadata, error) {
+		return db.OptionalDriverAgentMetadata{}, errOptionalDriverAgentMetadataUnavailable
+	}
+
+	err := verifyRuntimeOptionalDriverAgentRevision(connection.ConnectionConfig{Type: "sqlserver"})
+	if err != nil {
+		t.Fatalf("runtime metadata probe failure should warn and continue, got %v", err)
 	}
 }
 
@@ -138,10 +224,13 @@ func optionalDriverAgentRevisionTestDrivers(t *testing.T) []string {
 		"highgo",
 		"vastbase",
 		"opengauss",
+		"gaussdb",
 		"iris",
 		"mongodb",
 		"tdengine",
+		"iotdb",
 		"clickhouse",
+		"elasticsearch",
 	}
 	for _, driverType := range drivers {
 		if db.OptionalDriverAgentRevision(driverType) == "" {
diff --git a/internal/app/methods_driver_tdengine_build_test.go b/internal/app/methods_driver_tdengine_build_test.go
new file mode 100644
index 0000000..917bd9d
--- /dev/null
+++ b/internal/app/methods_driver_tdengine_build_test.go
@@ -0,0 +1,75 @@
+package app
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+func TestRewriteRequiredModuleVersionUpdatesTDengineDriver(t *testing.T) {
+	input := []byte(`module example
+
+go 1.24.3
+
+require (
+	github.com/taosdata/driver-go/v3 v3.7.8
+	github.com/go-sql-driver/mysql v1.9.3
+)
+`)
+
+	got, changed, err := rewriteRequiredModuleVersion(input, "github.com/taosdata/driver-go/v3", "3.3.1")
+	if err != nil {
+		t.Fatalf("rewriteRequiredModuleVersion returned error: %v", err)
+	}
+	if !changed {
+		t.Fatal("expected TDengine module version to be rewritten")
+	}
+	text := string(got)
+	if !strings.Contains(text, "github.com/taosdata/driver-go/v3 v3.3.1") {
+		t.Fatalf("expected rewritten go.mod to contain TDengine 3.3.1, got:\n%s", text)
+	}
+	if !strings.Contains(text, "github.com/go-sql-driver/mysql v1.9.3") {
+		t.Fatalf("expected unrelated dependencies to remain unchanged, got:\n%s", text)
+	}
+}
+
+func TestPrepareOptionalDriverBuildModOverrideCreatesVersionedModFileForTDengine(t *testing.T) {
+	projectRoot := t.TempDir()
+	goMod := `module example
+
+go 1.24.3
+
+require (
+	github.com/taosdata/driver-go/v3 v3.7.8
+)
+`
+	if err := os.WriteFile(filepath.Join(projectRoot, "go.mod"), []byte(goMod), 0o644); err != nil {
+		t.Fatalf("write go.mod: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(projectRoot, "go.sum"), []byte("placeholder"), 0o644); err != nil {
+		t.Fatalf("write go.sum: %v", err)
+	}
+
+	override, err := prepareOptionalDriverBuildModOverride(projectRoot, "tdengine", "3.3.1")
+	if err != nil {
+		t.Fatalf("prepareOptionalDriverBuildModOverride returned error: %v", err)
+	}
+	if override == nil {
+		t.Fatal("expected TDengine versioned build to create a mod override")
+	}
+
+	modBytes, err := os.ReadFile(override.modFile)
+	if err != nil {
+		t.Fatalf("read override mod file: %v", err)
+	}
+	if !strings.Contains(string(modBytes), "github.com/taosdata/driver-go/v3 v3.3.1") {
+		t.Fatalf("override mod file did not pin TDengine 3.3.1:\n%s", string(modBytes))
+	}
+
+	overrideDir := filepath.Dir(override.modFile)
+	override.cleanup()
+	if _, statErr := os.Stat(overrideDir); !os.IsNotExist(statErr) {
+		t.Fatalf("expected cleanup to remove override dir, statErr=%v", statErr)
+	}
+}
diff --git a/internal/app/methods_driver_version_test.go b/internal/app/methods_driver_version_test.go
index dd36a9a..8e29651 100644
--- a/internal/app/methods_driver_version_test.go
+++ b/internal/app/methods_driver_version_test.go
@@ -14,6 +14,8 @@ import (
 	"sync/atomic"
 	"testing"
 	"time"
+
+	"GoNavi-Wails/internal/db"
 )
 
 func TestDriverStatusItemJSONIncludesStableReasonCode(t *testing.T) {
@@ -77,6 +79,20 @@ func TestResolveVersionedDriverOptionUsesPublishedMongoV1Release(t *testing.T) {
 	}
 }
 
+func TestMongoDBDefaultDriverVersionUsesLegacyCompatibleLine(t *testing.T) {
+	definition, ok := resolveDriverDefinition("mongodb")
+	if !ok {
+		t.Fatal("expected mongodb driver definition")
+	}
+
+	if definition.PinnedVersion != "1.17.9" {
+		t.Fatalf("expected MongoDB default driver version 1.17.9, got %q", definition.PinnedVersion)
+	}
+	if got := resolveDriverInstallVersion("", definition.DefaultDownloadURL, definition); got != "1.17.9" {
+		t.Fatalf("expected builtin MongoDB install to resolve version 1.17.9, got %q", got)
+	}
+}
+
 func TestCurrentDriverReleaseTagUsesDevLatestForDevBuild(t *testing.T) {
 	originalVersion := AppVersion
 	AppVersion = "dev-abc1234"
@@ -89,6 +105,32 @@ func TestCurrentDriverReleaseTagUsesDevLatestForDevBuild(t *testing.T) {
 	}
 }
 
+func TestCurrentDriverReleaseTagUsesDevLatestForLocalTestBuild(t *testing.T) {
+	originalVersion := AppVersion
+	t.Cleanup(func() {
+		AppVersion = originalVersion
+	})
+
+	for _, version := range []string{"0.0.1-test", "0.7.9-dev", "0.7.9-local", "0.7.9-SNAPSHOT"} {
+		AppVersion = version
+		if got := currentDriverReleaseTag(); got != driverReleaseDevTag {
+			t.Fatalf("expected %s to use dev driver release tag %q, got %q", version, driverReleaseDevTag, got)
+		}
+	}
+}
+
+func TestCurrentDriverReleaseTagUsesVersionedReleaseForStableBuild(t *testing.T) {
+	originalVersion := AppVersion
+	AppVersion = "0.7.9"
+	t.Cleanup(func() {
+		AppVersion = originalVersion
+	})
+
+	if got := currentDriverReleaseTag(); got != "v0.7.9" {
+		t.Fatalf("expected stable driver release tag v0.7.9, got %q", got)
+	}
+}
+
 func TestResolveOptionalDriverBundleDownloadURLsUsesDriverReleaseRepo(t *testing.T) {
 	originalVersion := AppVersion
 	AppVersion = "0.7.4"
@@ -99,11 +141,40 @@ func TestResolveOptionalDriverBundleDownloadURLsUsesDriverReleaseRepo(t *testing
 	urls := resolveOptionalDriverBundleDownloadURLs()
 	wantTagged := driverReleaseDownloadURL("v0.7.4", optionalDriverBundleAssetName)
 	wantLatest := driverReleaseLatestDownloadURL(optionalDriverBundleAssetName)
-	if len(urls) != 2 {
-		t.Fatalf("expected tagged and latest bundle URLs, got %v", urls)
+	if len(urls) < 2 {
+		t.Fatalf("expected at least tagged and latest bundle URLs, got %v", urls)
 	}
-	if urls[0] != wantTagged || urls[1] != wantLatest {
-		t.Fatalf("unexpected driver bundle URLs: got %v want [%q %q]", urls, wantTagged, wantLatest)
+	foundTagged := false
+	foundLatest := false
+	for _, candidate := range urls {
+		if candidate == wantTagged {
+			foundTagged = true
+		}
+		if candidate == wantLatest {
+			foundLatest = true
+		}
+	}
+	if !foundTagged || !foundLatest {
+		t.Fatalf("expected bundle URLs to include tagged=%q and latest=%q, got %v", wantTagged, wantLatest, urls)
+	}
+}
+
+func TestDriverReleaseAssetAPIURLUsesReleaseAssetEndpoint(t *testing.T) {
+	asset := githubAsset{
+		Name:               "kingbase-driver-agent-darwin-arm64",
+		BrowserDownloadURL: "https://github.com/Syngnat/GoNavi-DriverAgents/releases/download/dev-latest/kingbase-driver-agent-darwin-arm64",
+		URL:                "https://api.github.com/repos/Syngnat/GoNavi-DriverAgents/releases/assets/123456",
+		Size:               18 << 20,
+	}
+	if got := driverReleaseAssetAPIURL(asset); got != "https://api.github.com/repos/Syngnat/GoNavi-DriverAgents/releases/assets/123456#kingbase-driver-agent-darwin-arm64" {
+		t.Fatalf("expected release asset API URL, got %q", got)
+	}
+}
+
+func TestOptionalDriverDownloadZipURLAcceptsAssetAPIFragment(t *testing.T) {
+	urlText := "https://api.github.com/repos/Syngnat/GoNavi-DriverAgents/releases/assets/123456#duckdb-driver.zip"
+	if !isOptionalDriverDownloadZipURL(urlText) {
+		t.Fatalf("expected asset API URL with zip fragment to be treated as zip download: %q", urlText)
 	}
 }
 
@@ -198,6 +269,90 @@ func TestResolveOptionalDriverAgentDownloadURLsDoesNotFallbackForHistoricalVersi
 	}
 }
 
+func TestResolveOptionalDriverAgentDownloadURLsUsesMongoV1AssetForCompatibleDefault(t *testing.T) {
+	definition, ok := resolveDriverDefinition("mongodb")
+	if !ok {
+		t.Fatal("expected mongodb driver definition")
+	}
+
+	originalVersion := AppVersion
+	AppVersion = "0.7.9"
+	t.Cleanup(func() {
+		AppVersion = originalVersion
+	})
+
+	assetName := mongoVersionedReleaseAssetName(1)
+	seedReleaseAssetSizeCache(t, "tag:v0.7.9", map[string]int64{
+		assetName: 24 << 20,
+	})
+	seedReleaseAssetSizeCache(t, "latest", map[string]int64{})
+
+	urls := resolveOptionalDriverAgentDownloadURLs(
+		definition,
+		"builtin://activate/mongodb",
+		"1.17.9",
+	)
+	want := driverReleaseDownloadURL("v0.7.9", assetName)
+	for _, got := range urls {
+		if got == want {
+			return
+		}
+	}
+	t.Fatalf("expected MongoDB v1 release asset %q in candidates, got %v", want, urls)
+}
+
+func TestResolveOptionalDriverAgentDownloadURLsDoesNotUseMongoV2BaseForCompatibleDefault(t *testing.T) {
+	definition, ok := resolveDriverDefinition("mongodb")
+	if !ok {
+		t.Fatal("expected mongodb driver definition")
+	}
+
+	originalVersion := AppVersion
+	AppVersion = "0.7.9"
+	t.Cleanup(func() {
+		AppVersion = originalVersion
+	})
+
+	baseAssetName := optionalDriverReleaseAssetNameForType("mongodb", runtime.GOOS, runtime.GOARCH)
+	seedReleaseAssetSizeCache(t, "tag:v0.7.9", map[string]int64{
+		baseAssetName: 24 << 20,
+	})
+	seedReleaseAssetSizeCache(t, "latest", map[string]int64{
+		baseAssetName: 24 << 20,
+	})
+
+	urls := resolveOptionalDriverAgentDownloadURLs(
+		definition,
+		"builtin://activate/mongodb",
+		"1.17.9",
+	)
+	for _, got := range urls {
+		if strings.Contains(got, baseAssetName) {
+			t.Fatalf("expected MongoDB v1 install not to use ambiguous base asset %q, got %v", baseAssetName, urls)
+		}
+	}
+}
+
+func TestMongoDBVersionedAssetNamesDoNotFallbackToBaseForV1(t *testing.T) {
+	v1AssetName := mongoVersionedReleaseAssetName(1)
+	baseAssetName := optionalDriverReleaseAssetNameForType("mongodb", runtime.GOOS, runtime.GOARCH)
+
+	v1Names := optionalDriverReleaseAssetNamesForVersion("mongodb", "1.17.9")
+	if len(v1Names) != 1 || v1Names[0] != v1AssetName {
+		t.Fatalf("expected MongoDB v1 to use only %q, got %v", v1AssetName, v1Names)
+	}
+	for _, name := range v1Names {
+		if name == baseAssetName {
+			t.Fatalf("MongoDB v1 must not fallback to ambiguous base asset %q", baseAssetName)
+		}
+	}
+
+	v2Names := optionalDriverReleaseAssetNamesForVersion("mongodb", "2.5.0")
+	if len(v2Names) < 2 || v2Names[0] != mongoVersionedReleaseAssetName(2) || v2Names[1] != baseAssetName {
+		t.Fatalf("expected MongoDB v2 to prefer versioned asset then base compatibility asset, got %v", v2Names)
+	}
+}
+
 func TestResolveOptionalDriverAgentDownloadURLsSkipsBundleOnlyDamengAsset(t *testing.T) {
 	definition, ok := resolveDriverDefinition("dameng")
 	if !ok {
@@ -219,6 +374,45 @@ func TestResolveOptionalDriverAgentDownloadURLsSkipsBundleOnlyDamengAsset(t *tes
 	}
 }
 
+func TestShouldUseOptionalDriverBundleFallbackSkipsWhenDirectAssetExists(t *testing.T) {
+	if shouldUseOptionalDriverBundleFallback("sqlserver", false, 1) {
+		t.Fatal("expected published single-file driver asset to avoid 497MB bundle fallback")
+	}
+}
+
+func TestShouldUseOptionalDriverBundleFallbackKeepsBundleWhenDirectAssetMissing(t *testing.T) {
+	if !shouldUseOptionalDriverBundleFallback("dameng", false, 0) {
+		t.Fatal("expected missing single-file driver asset to keep bundle fallback")
+	}
+	if shouldUseOptionalDriverBundleFallback("dameng", true, 0) {
+		t.Fatal("expected explicit version artifact installs to skip bundle fallback")
+	}
+}
+
+func TestFormatOptionalDriverAttemptErrorRemovesDuplicatedSourcePrefix(t *testing.T) {
+	source := "https://github.com/Syngnat/GoNavi-DriverAgents/releases/download/dev-latest/kingbase-driver-agent-darwin-arm64"
+	err := fmt.Errorf("%s: kingbase 驱动代理 revision 不匹配（已安装：src-old，当前需要：src-new），请安装当前版本对应的 driver-agent", source)
+
+	got := formatOptionalDriverAttemptError(source, err)
+	if strings.Count(got, source) != 1 {
+		t.Fatalf("expected source to appear once, got %q", got)
+	}
+	if !strings.Contains(got, "kingbase 驱动代理 revision 不匹配") {
+		t.Fatalf("expected revision mismatch detail, got %q", got)
+	}
+}
+
+func TestAppendOptionalDriverAttemptErrorDeduplicatesIdenticalEntries(t *testing.T) {
+	source := "https://github.com/Syngnat/GoNavi-DriverAgents/releases/latest/download/GoNavi-DriverAgents.zip#MacOS/kingbase-driver-agent-darwin-arm64"
+	err := fmt.Errorf("kingbase 驱动代理 revision 不匹配（已安装：src-old，当前需要：src-new），请安装当前版本对应的 driver-agent")
+
+	entries := appendOptionalDriverAttemptError(nil, source, err)
+	entries = appendOptionalDriverAttemptError(entries, source, err)
+	if len(entries) != 1 {
+		t.Fatalf("expected duplicate driver attempt error to be collapsed, got %d entries: %v", len(entries), entries)
+	}
+}
+
 func TestResolveDriverInstallVersionUsesPinnedVersionForBuiltinActivateURL(t *testing.T) {
 	definition, ok := resolveDriverDefinition("sqlserver")
 	if !ok {
@@ -277,6 +471,191 @@ func TestIRISDriverDefinitionUsesOptionalAgent(t *testing.T) {
 	}
 }
 
+func TestElasticsearchDriverDefinitionUsesOptionalAgent(t *testing.T) {
+	definition, ok := resolveDriverDefinition("elasticsearch")
+	if !ok {
+		t.Fatal("expected elasticsearch driver definition")
+	}
+	if definition.Name != "Elasticsearch" {
+		t.Fatalf("unexpected elasticsearch driver name: %q", definition.Name)
+	}
+	if definition.BuiltIn {
+		t.Fatal("expected elasticsearch to be an optional driver agent")
+	}
+	if driverGoModulePathMap["elasticsearch"] != "github.com/elastic/go-elasticsearch/v8" {
+		t.Fatalf("unexpected elasticsearch go module path: %q", driverGoModulePathMap["elasticsearch"])
+	}
+	if definition.PinnedVersion != "8.19.6" {
+		t.Fatalf("unexpected elasticsearch definition pinned version: %q", definition.PinnedVersion)
+	}
+	if definition.DefaultDownloadURL != "builtin://activate/elasticsearch" {
+		t.Fatalf("unexpected elasticsearch default download URL: %q", definition.DefaultDownloadURL)
+	}
+	if latestDriverVersionMap["elasticsearch"] != "8.19.6" {
+		t.Fatalf("unexpected elasticsearch pinned version: %q", latestDriverVersionMap["elasticsearch"])
+	}
+
+	tags, err := optionalDriverBuildTags("elasticsearch", "")
+	if err != nil {
+		t.Fatalf("resolve elasticsearch build tags failed: %v", err)
+	}
+	if tags != "gonavi_elasticsearch_driver" {
+		t.Fatalf("unexpected elasticsearch build tag: %q", tags)
+	}
+}
+
+func TestIoTDBDriverDefinitionUsesOptionalAgent(t *testing.T) {
+	definition, ok := resolveDriverDefinition("iotdb")
+	if !ok {
+		t.Fatal("expected iotdb driver definition")
+	}
+	if definition.Name != "Apache IoTDB" {
+		t.Fatalf("unexpected iotdb driver name: %q", definition.Name)
+	}
+	if definition.BuiltIn {
+		t.Fatal("expected iotdb to be an optional driver agent")
+	}
+	if driverGoModulePathMap["iotdb"] != "github.com/apache/iotdb-client-go" {
+		t.Fatalf("unexpected iotdb go module path: %q", driverGoModulePathMap["iotdb"])
+	}
+	if definition.PinnedVersion != "1.3.7" {
+		t.Fatalf("unexpected iotdb definition pinned version: %q", definition.PinnedVersion)
+	}
+	if definition.DefaultDownloadURL != "builtin://activate/iotdb" {
+		t.Fatalf("unexpected iotdb default download URL: %q", definition.DefaultDownloadURL)
+	}
+	if latestDriverVersionMap["iotdb"] != "1.3.7" {
+		t.Fatalf("unexpected iotdb pinned version: %q", latestDriverVersionMap["iotdb"])
+	}
+
+	tags, err := optionalDriverBuildTags("iotdb", "")
+	if err != nil {
+		t.Fatalf("resolve iotdb build tags failed: %v", err)
+	}
+	if tags != "gonavi_iotdb_driver" {
+		t.Fatalf("unexpected iotdb build tag: %q", tags)
+	}
+}
+
+func TestKafkaDriverDefinitionIsBuiltIn(t *testing.T) {
+	definition, ok := resolveDriverDefinition("apache-kafka")
+	if !ok {
+		t.Fatal("expected kafka driver definition")
+	}
+	if definition.Name != "Kafka" {
+		t.Fatalf("unexpected kafka driver name: %q", definition.Name)
+	}
+	if !definition.BuiltIn {
+		t.Fatal("expected kafka to be a built-in driver")
+	}
+	if definition.PinnedVersion != "" || definition.DefaultDownloadURL != "" {
+		t.Fatalf("expected kafka builtin definition to omit optional-agent metadata: %#v", definition)
+	}
+}
+
+func TestMQTTDriverDefinitionIsBuiltIn(t *testing.T) {
+	definition, ok := resolveDriverDefinition("mqtts")
+	if !ok {
+		t.Fatal("expected mqtt driver definition")
+	}
+	if definition.Name != "MQTT" {
+		t.Fatalf("unexpected mqtt driver name: %q", definition.Name)
+	}
+	if !definition.BuiltIn {
+		t.Fatal("expected mqtt to be a built-in driver")
+	}
+	if definition.PinnedVersion != "" || definition.DefaultDownloadURL != "" {
+		t.Fatalf("expected mqtt builtin definition to omit optional-agent metadata: %#v", definition)
+	}
+}
+
+func TestRocketMQDriverDefinitionIsBuiltIn(t *testing.T) {
+	definition, ok := resolveDriverDefinition("rmq")
+	if !ok {
+		t.Fatal("expected rocketmq driver definition")
+	}
+	if definition.Name != "RocketMQ" {
+		t.Fatalf("unexpected rocketmq driver name: %q", definition.Name)
+	}
+	if !definition.BuiltIn {
+		t.Fatal("expected rocketmq to be a built-in driver")
+	}
+	if definition.PinnedVersion != "" || definition.DefaultDownloadURL != "" {
+		t.Fatalf("expected rocketmq builtin definition to omit optional-agent metadata: %#v", definition)
+	}
+}
+
+func TestRabbitMQDriverDefinitionIsBuiltIn(t *testing.T) {
+	definition, ok := resolveDriverDefinition("rabbit-mq")
+	if !ok {
+		t.Fatal("expected rabbitmq driver definition")
+	}
+	if definition.Name != "RabbitMQ" {
+		t.Fatalf("unexpected rabbitmq driver name: %q", definition.Name)
+	}
+	if !definition.BuiltIn {
+		t.Fatal("expected rabbitmq to be a built-in driver")
+	}
+	if definition.PinnedVersion != "" || definition.DefaultDownloadURL != "" {
+		t.Fatalf("expected rabbitmq builtin definition to omit optional-agent metadata: %#v", definition)
+	}
+}
+
+func TestGoldenDBDriverDefinitionIsBuiltIn(t *testing.T) {
+	definition, ok := resolveDriverDefinition("greatdb")
+	if !ok {
+		t.Fatal("expected goldendb driver definition")
+	}
+	if definition.Name != "GoldenDB" {
+		t.Fatalf("unexpected goldendb driver name: %q", definition.Name)
+	}
+	if !definition.BuiltIn {
+		t.Fatal("expected goldendb to be a built-in driver")
+	}
+	if definition.PinnedVersion != "" || definition.DefaultDownloadURL != "" {
+		t.Fatalf("expected goldendb builtin definition to omit optional metadata: %#v", definition)
+	}
+	if latestDriverVersionMap["goldendb"] != "1.9.3" {
+		t.Fatalf("unexpected goldendb pinned version: %q", latestDriverVersionMap["goldendb"])
+	}
+	if driverGoModulePathMap["goldendb"] != "github.com/go-sql-driver/mysql" {
+		t.Fatalf("unexpected goldendb go module path: %q", driverGoModulePathMap["goldendb"])
+	}
+}
+
+func TestGaussDBDriverDefinitionUsesOptionalAgent(t *testing.T) {
+	definition, ok := resolveDriverDefinition("gaussdb")
+	if !ok {
+		t.Fatal("expected gaussdb driver definition")
+	}
+	if definition.Name != "GaussDB" {
+		t.Fatalf("unexpected gaussdb driver name: %q", definition.Name)
+	}
+	if definition.BuiltIn {
+		t.Fatal("expected gaussdb to be an optional driver agent")
+	}
+	if driverGoModulePathMap["gaussdb"] != "github.com/HuaweiCloudDeveloper/gaussdb-go" {
+		t.Fatalf("unexpected gaussdb go module path: %q", driverGoModulePathMap["gaussdb"])
+	}
+	if definition.PinnedVersion != "v1.0.0-rc1" {
+		t.Fatalf("unexpected gaussdb definition pinned version: %q", definition.PinnedVersion)
+	}
+	if definition.DefaultDownloadURL != "builtin://activate/gaussdb" {
+		t.Fatalf("unexpected gaussdb default download URL: %q", definition.DefaultDownloadURL)
+	}
+	if latestDriverVersionMap["gaussdb"] != "v1.0.0-rc1" {
+		t.Fatalf("unexpected gaussdb pinned version: %q", latestDriverVersionMap["gaussdb"])
+	}
+
+	tags, err := optionalDriverBuildTags("gaussdb", "")
+	if err != nil {
+		t.Fatalf("resolve gaussdb build tags failed: %v", err)
+	}
+	if tags != "gonavi_gaussdb_driver" {
+		t.Fatalf("unexpected gaussdb build tag: %q", tags)
+	}
+}
+
 func TestBuildOptionalDriverInstallPlanMessagePrefersDirectThenBundle(t *testing.T) {
 	message := buildOptionalDriverInstallPlanMessage("SQL Server", "1.9.6", false, false, false, false, 1, 2)
 	if !strings.Contains(message, "先尝试 1 个预编译直链") {
@@ -315,9 +694,38 @@ func TestDuckDBWindowsBuildUsesDynamicLibraryTag(t *testing.T) {
 	if !shouldSkipReusableAgentCandidate("duckdb", "") {
 		t.Fatal("expected DuckDB Windows install to skip reusable static agent candidates")
 	}
-	urls := resolveOptionalDriverAgentDownloadURLs(driverDefinition{Type: "duckdb"}, "https://example.com/duckdb-driver-agent-windows-amd64.exe", "")
-	if len(urls) != 0 {
-		t.Fatalf("expected DuckDB Windows install to skip single-file direct downloads, got %v", urls)
+	seedReleaseAssetCacheEntry(t, "latest", map[string]int64{
+		duckDBWindowsDriverZipAssetName: 19 << 20,
+	}, map[string]int64{
+		duckDBWindowsDriverZipAssetName: 19 << 20,
+	})
+	legacyDirectURL := "https://example.com/duckdb-driver-agent-windows-amd64.exe"
+	urls := resolveOptionalDriverAgentDownloadURLs(driverDefinition{Type: "duckdb"}, legacyDirectURL, "")
+	if len(urls) < 2 {
+		t.Fatalf("expected DuckDB Windows install to keep dedicated zip ahead of legacy direct candidate, got %v", urls)
+	}
+	if urls[0] != driverReleaseLatestDownloadURL(duckDBWindowsDriverZipAssetName) {
+		t.Fatalf("expected DuckDB Windows dedicated zip candidate first, got %v", urls)
+	}
+	if urls[1] != legacyDirectURL {
+		t.Fatalf("expected DuckDB Windows to keep legacy direct candidate after dedicated zip, got %v", urls)
+	}
+}
+
+func TestDuckDBWindowsDynamicLibraryCGOLDFlagsIncludeSupportLibraries(t *testing.T) {
+	flags := duckDBWindowsDynamicLibraryCGOLDFlags(`C:\tmp\duckdb lib`)
+	for _, expected := range []string{
+		`-LC:/tmp/duckdb lib`,
+		"-lduckdb",
+		"-lstdc++",
+		"-lm",
+		"-lws2_32",
+		"-lwsock32",
+		"-lrstrtmgr",
+	} {
+		if !strings.Contains(flags, expected) {
+			t.Fatalf("expected flags %q to contain %q", flags, expected)
+		}
 	}
 }
 
@@ -372,6 +780,90 @@ func TestInstallOptionalDriverAgentFromLocalZipExtractsDuckDBDLL(t *testing.T) {
 	}
 }
 
+func TestDownloadOptionalDriverAgentBinaryInstallsDuckDBDedicatedZip(t *testing.T) {
+	if runtime.GOOS != "windows" || runtime.GOARCH != "amd64" {
+		t.Skip("DuckDB dedicated zip flow only applies on windows/amd64")
+	}
+
+	originalValidateFunc := validateOptionalDriverAgentExecutableFunc
+	validateOptionalDriverAgentExecutableFunc = func(driverType string, executablePath string) error {
+		return nil
+	}
+	t.Cleanup(func() {
+		validateOptionalDriverAgentExecutableFunc = originalValidateFunc
+	})
+
+	tmpDir := t.TempDir()
+	zipPath := filepath.Join(tmpDir, duckDBWindowsDriverZipAssetName)
+	zipFile, err := os.Create(zipPath)
+	if err != nil {
+		t.Fatalf("create zip failed: %v", err)
+	}
+	zw := zip.NewWriter(zipFile)
+	for name, content := range map[string]string{
+		"Windows/duckdb-driver-agent-windows-amd64.exe": "agent",
+		"Windows/duckdb.dll":                            "dll",
+	} {
+		w, err := zw.Create(name)
+		if err != nil {
+			t.Fatalf("create zip entry %s failed: %v", name, err)
+		}
+		if _, err := w.Write([]byte(content)); err != nil {
+			t.Fatalf("write zip entry %s failed: %v", name, err)
+		}
+	}
+	if err := zw.Close(); err != nil {
+		t.Fatalf("close zip writer failed: %v", err)
+	}
+	if err := zipFile.Close(); err != nil {
+		t.Fatalf("close zip file failed: %v", err)
+	}
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, zipPath)
+	}))
+	defer server.Close()
+	proxySnapshot := currentGlobalProxyConfig()
+	if _, err := setGlobalProxyConfig(false, proxySnapshot.Proxy); err != nil {
+		t.Fatalf("disable global proxy failed: %v", err)
+	}
+	t.Cleanup(func() {
+		_, _ = setGlobalProxyConfig(proxySnapshot.Enabled, proxySnapshot.Proxy)
+	})
+
+	target := filepath.Join(tmpDir, "install", "duckdb-driver-agent.exe")
+	if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
+		t.Fatalf("create install dir failed: %v", err)
+	}
+
+	hash, err := downloadOptionalDriverAgentBinary(nil, driverDefinition{Type: "duckdb", Name: "DuckDB"}, server.URL+"/"+duckDBWindowsDriverZipAssetName+"?source=release", target)
+	if err != nil {
+		t.Fatalf("download dedicated zip failed: %v", err)
+	}
+	if strings.TrimSpace(hash) == "" {
+		t.Fatal("expected hash for installed duckdb agent")
+	}
+	if _, err := os.Stat(target); err != nil {
+		t.Fatalf("expected duckdb agent to be installed: %v", err)
+	}
+	dllBytes, err := os.ReadFile(filepath.Join(filepath.Dir(target), "duckdb.dll"))
+	if err != nil {
+		t.Fatalf("expected duckdb.dll to be installed: %v", err)
+	}
+	if string(dllBytes) != "dll" {
+		t.Fatalf("unexpected duckdb.dll content: %q", string(dllBytes))
+	}
+}
+
+func TestOptionalDriverDownloadZipURLAcceptsQueryString(t *testing.T) {
+	if !isOptionalDriverDownloadZipURL("https://example.com/duckdb-driver.zip?token=abc") {
+		t.Fatal("expected signed zip URL to be treated as zip download")
+	}
+	if isOptionalDriverDownloadZipURL("https://example.com/duckdb-driver-agent.exe?token=abc") {
+		t.Fatal("expected exe URL with query to remain non-zip download")
+	}
+}
+
 func TestDownloadDriverPackageRejectsUnsupportedMongoVersion(t *testing.T) {
 	app := NewApp()
 	app.SetLanguage("en-US")
@@ -511,8 +1003,8 @@ func TestResolveRecentDriverVersionMetasFallsBackToHistoricalTDengineMatrix(t *t
 }
 
 func TestShouldForceSourceBuildForResolvedDownload(t *testing.T) {
-	if !shouldForceSourceBuildForResolvedDownload("mongodb", "1.17.4", "builtin://activate/mongodb?channel=history&version=1.17.4") {
-		t.Fatal("expected mongodb v1 builtin install to keep source build mode")
+	if shouldForceSourceBuildForResolvedDownload("mongodb", "1.17.4", "builtin://activate/mongodb?channel=history&version=1.17.4") {
+		t.Fatal("expected mongodb v1 builtin install to try published assets before source build")
 	}
 
 	explicitURL := driverReleaseDownloadURL("v1.17.4", mongoVersionedReleaseAssetName(1))
@@ -532,11 +1024,11 @@ func TestShouldPreferSourceBuildBeforeDownloadDoesNotPreferKingbase(t *testing.T
 }
 
 func TestShouldPreferSourceBuildBeforeDownloadForDevelopmentBuild(t *testing.T) {
-	if !shouldPreferSourceBuildBeforeDownloadForBuildType("dev", "mariadb", "1.9.3") {
-		t.Fatal("expected development build to prefer local driver-agent source build")
+	if shouldPreferSourceBuildBeforeDownloadForBuildType("dev", "mariadb", "1.9.3") {
+		t.Fatal("expected development release build to prefer published MariaDB driver-agent before source fallback")
 	}
-	if !shouldPreferSourceBuildBeforeDownloadForBuildType("development", "clickhouse", "2.43.1") {
-		t.Fatal("expected development build alias to prefer local driver-agent source build")
+	if shouldPreferSourceBuildBeforeDownloadForBuildType("development", "clickhouse", "2.43.1") && !shouldUseDuckDBWindowsDynamicLibrary("clickhouse") {
+		t.Fatal("expected development build alias not to prefer source build for ClickHouse")
 	}
 	if shouldPreferSourceBuildBeforeDownloadForBuildType("production", "mariadb", "1.9.3") {
 		t.Fatal("expected production build not to prefer source build for MariaDB")
@@ -547,11 +1039,18 @@ func TestShouldPreferSourceBuildBeforeDownloadForDevelopmentBuild(t *testing.T)
 }
 
 func TestShouldRequireSourceBuildBeforeDownloadForDevelopmentBuild(t *testing.T) {
-	if !shouldRequireSourceBuildBeforeDownloadForBuildType("dev", "duckdb", "2.5.6") {
-		t.Fatal("expected development build to require local DuckDB driver-agent source build")
+	if shouldRequireSourceBuildBeforeDownloadForBuildType("dev", "duckdb", "2.5.6") {
+		t.Fatal("expected development build to allow DuckDB release bundle fallback after local build failure")
 	}
-	if !shouldRequireSourceBuildBeforeDownloadForBuildType("development", "mariadb", "1.9.3") {
-		t.Fatal("expected development build alias to require local driver-agent source build")
+	if shouldUseDuckDBWindowsDynamicLibrary("duckdb") {
+		if !shouldPreferSourceBuildBeforeDownloadForBuildType("dev", "duckdb", "2.5.6") {
+			t.Fatal("expected DuckDB Windows dynamic-library install to prefer local source build before bundle fallback")
+		}
+	} else if shouldPreferSourceBuildBeforeDownloadForBuildType("dev", "duckdb", "2.5.6") {
+		t.Fatal("expected development build not to prefer DuckDB source build on non-Windows dynamic-library platforms")
+	}
+	if shouldRequireSourceBuildBeforeDownloadForBuildType("development", "mariadb", "1.9.3") {
+		t.Fatal("expected development build alias to allow published MariaDB driver-agent fallback")
 	}
 	if shouldRequireSourceBuildBeforeDownloadForBuildType("production", "duckdb", "2.5.6") {
 		t.Fatal("expected production build to allow DuckDB release bundle fallback")
@@ -561,6 +1060,15 @@ func TestShouldRequireSourceBuildBeforeDownloadForDevelopmentBuild(t *testing.T)
 	}
 }
 
+func TestOptionalDriverInstallTimeoutsStayBounded(t *testing.T) {
+	if optionalDriverBundleDownloadTimeout > 15*time.Minute {
+		t.Fatalf("driver bundle download timeout should stay bounded, got %s", optionalDriverBundleDownloadTimeout)
+	}
+	if optionalDriverSourceBuildTimeout > 8*time.Minute {
+		t.Fatalf("driver source build timeout should stay bounded, got %s", optionalDriverSourceBuildTimeout)
+	}
+}
+
 func TestResolveDuckDBWindowsCGOToolchainBinFromCandidates(t *testing.T) {
 	binDir := t.TempDir()
 	writeSelfExecutable(t, filepath.Join(binDir, "gcc.exe"))
@@ -756,6 +1264,66 @@ func TestDownloadOptionalDriverAgentFromBundleSharesConcurrentDownload(t *testin
 	}
 }
 
+func TestInstallOptionalDriverAgentPackageAcceptsStaleDownloadRevision(t *testing.T) {
+	originalProbe := optionalDriverAgentMetadataProbe
+	t.Cleanup(func() {
+		optionalDriverAgentMetadataProbe = originalProbe
+	})
+
+	tmpDir := t.TempDir()
+	staleAgent := filepath.Join(tmpDir, "stale-driver-agent")
+	if runtime.GOOS == "windows" {
+		staleAgent += ".exe"
+	}
+	writeSelfExecutable(t, staleAgent)
+
+	staleServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, staleAgent)
+	}))
+	defer staleServer.Close()
+	proxySnapshot := currentGlobalProxyConfig()
+	if _, err := setGlobalProxyConfig(false, proxySnapshot.Proxy); err != nil {
+		t.Fatalf("disable global proxy failed: %v", err)
+	}
+	t.Cleanup(func() {
+		_, _ = setGlobalProxyConfig(proxySnapshot.Enabled, proxySnapshot.Proxy)
+	})
+
+	optionalDriverAgentMetadataProbe = func(driverType string, executablePath string) (db.OptionalDriverAgentMetadata, error) {
+		return db.OptionalDriverAgentMetadata{
+			DriverType:    driverType,
+			AgentRevision: "src-stale-agent",
+		}, nil
+	}
+
+	meta, err := installOptionalDriverAgentPackage(
+		nil,
+		driverDefinition{Type: "sqlserver", Name: "SQL Server"},
+		"1.9.6",
+		filepath.Join(tmpDir, "drivers"),
+		staleServer.URL,
+	)
+	if err != nil {
+		t.Fatalf("expected stale direct download to be installed with an update hint, got %v", err)
+	}
+	if meta.DownloadURL != staleServer.URL {
+		t.Fatalf("expected direct download source to be preserved, got %q", meta.DownloadURL)
+	}
+	if meta.AgentRevision != "src-stale-agent" {
+		t.Fatalf("expected stale agent revision to be recorded, got %q", meta.AgentRevision)
+	}
+	if _, err := os.Stat(meta.ExecutablePath); err != nil {
+		t.Fatalf("expected runtime executable to stay installed, got %v", err)
+	}
+	needsUpdate, reason, expectedRevision := optionalDriverAgentRevisionStatus("sqlserver", meta, true)
+	if !needsUpdate {
+		t.Fatalf("expected stale installed revision to be surfaced as needsUpdate; expected=%q", expectedRevision)
+	}
+	if !strings.Contains(reason, "强烈建议重装") {
+		t.Fatalf("expected advisory reinstall reason, got %q", reason)
+	}
+}
+
 func seedReleaseAssetSizeCache(t *testing.T, cacheKey string, sizeByKey map[string]int64) {
 	t.Helper()
 
diff --git a/internal/app/methods_file.go b/internal/app/methods_file.go
index 35acb44..c8390ef 100644
--- a/internal/app/methods_file.go
+++ b/internal/app/methods_file.go
@@ -30,10 +30,15 @@ import (
 const minExportQueryTimeout = 5 * time.Minute
 const minClickHouseExportQueryTimeout = 2 * time.Hour
 const maxSQLFileSizeBytes int64 = 50 * 1024 * 1024
+
+const sqlFileErrorCodeNotFound = "file_not_found"
 const sqlFileBatchMaxStatements = 1000
 const sqlFileBatchMaxBytes = 4 * 1024 * 1024
 const sqlFileProgressStatementInterval = 100
 const sqlFileProgressTimeInterval = time.Second
+const defaultAppLogTailLineLimit = 80
+const maxAppLogTailLineLimit = 200
+const appLogTailReadWindowBytes int64 = 256 * 1024
 
 var mysqlCreateViewPrefixPattern = regexp.MustCompile(`(?is)^\s*create\s+(?:algorithm\s*=\s*\w+\s+)?(?:definer\s*=\s*(?:` + "`[^`]+`" + `|\S+)\s*@\s*(?:` + "`[^`]+`" + `|\S+)\s+)?(?:sql\s+security\s+(?:definer|invoker)\s+)?view\s+`)
 
@@ -84,6 +89,211 @@ type SQLDirectoryEntry struct {
 	Children []SQLDirectoryEntry `json:"children,omitempty"`
 }
 
+type appLogTailSnapshot struct {
+	LogPath               string         `json:"logPath"`
+	Keyword               string         `json:"keyword,omitempty"`
+	RequestedLineLimit    int            `json:"requestedLineLimit"`
+	ReturnedLineCount     int            `json:"returnedLineCount"`
+	FileWindowTruncated   bool           `json:"fileWindowTruncated"`
+	MatchedLinesTruncated bool           `json:"matchedLinesTruncated"`
+	LevelBreakdown        map[string]int `json:"levelBreakdown"`
+	Lines                 []string       `json:"lines"`
+}
+
+func normalizeSQLFileName(rawName string) (string, error) {
+	name := strings.TrimSpace(rawName)
+	if name == "" {
+		return "", fmt.Errorf("SQL 文件名不能为空")
+	}
+	if strings.ContainsAny(name, `/\`) || name == "." || name == ".." {
+		return "", fmt.Errorf("SQL 文件名不能包含路径分隔符")
+	}
+	if !strings.EqualFold(filepath.Ext(name), ".sql") {
+		name += ".sql"
+	}
+	return name, nil
+}
+
+func normalizeSQLDirectoryName(rawName string) (string, error) {
+	name := strings.TrimSpace(rawName)
+	if name == "" {
+		return "", fmt.Errorf("目录名不能为空")
+	}
+	if strings.ContainsAny(name, `/\`) || name == "." || name == ".." {
+		return "", fmt.Errorf("目录名不能包含路径分隔符")
+	}
+	return name, nil
+}
+
+func normalizeSQLDirectoryPath(directoryPath string) (string, error) {
+	target := strings.TrimSpace(directoryPath)
+	if target == "" {
+		return "", fmt.Errorf("目录路径不能为空")
+	}
+	if abs, err := filepath.Abs(target); err == nil {
+		target = abs
+	}
+	info, err := os.Stat(target)
+	if err != nil {
+		return "", fmt.Errorf("无法读取目录信息: %w", err)
+	}
+	if !info.IsDir() {
+		return "", fmt.Errorf("所选路径不是目录")
+	}
+	return target, nil
+}
+
+func normalizeExistingSQLDirectoryPath(directoryPath string) (string, os.FileInfo, error) {
+	target := strings.TrimSpace(directoryPath)
+	if target == "" {
+		return "", nil, fmt.Errorf("目录路径不能为空")
+	}
+	if abs, err := filepath.Abs(target); err == nil {
+		target = abs
+	}
+	info, err := os.Stat(target)
+	if err != nil {
+		return "", nil, fmt.Errorf("无法读取目录信息: %w", err)
+	}
+	if !info.IsDir() {
+		return "", nil, fmt.Errorf("所选路径不是目录")
+	}
+	return target, info, nil
+}
+
+func normalizeExistingSQLFilePath(filePath string) (string, os.FileInfo, error) {
+	target := strings.TrimSpace(filePath)
+	if target == "" {
+		return "", nil, fmt.Errorf("文件路径不能为空")
+	}
+	if abs, err := filepath.Abs(target); err == nil {
+		target = abs
+	}
+	info, err := os.Stat(target)
+	if err != nil {
+		return "", nil, fmt.Errorf("无法读取文件信息: %w", err)
+	}
+	if info.IsDir() {
+		return "", nil, fmt.Errorf("所选路径不是 SQL 文件")
+	}
+	if !strings.EqualFold(filepath.Ext(target), ".sql") {
+		return "", nil, fmt.Errorf("仅支持 SQL 文件")
+	}
+	return target, info, nil
+}
+
+func createSQLFileInDirectory(directoryPath string, rawName string) connection.QueryResult {
+	directory, err := normalizeSQLDirectoryPath(directoryPath)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	name, err := normalizeSQLFileName(rawName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	target := filepath.Join(directory, name)
+	if _, err := os.Stat(target); err == nil {
+		return connection.QueryResult{Success: false, Message: "SQL 文件已存在"}
+	} else if !os.IsNotExist(err) {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法读取文件信息: %v", err)}
+	}
+	if err := os.WriteFile(target, []byte(""), 0o644); err != nil {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法创建 SQL 文件: %v", err)}
+	}
+	return connection.QueryResult{Success: true, Data: map[string]interface{}{"filePath": target, "name": filepath.Base(target)}}
+}
+
+func createSQLDirectoryInDirectory(parentPath string, rawName string) connection.QueryResult {
+	parent, err := normalizeSQLDirectoryPath(parentPath)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	name, err := normalizeSQLDirectoryName(rawName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	target := filepath.Join(parent, name)
+	if _, err := os.Stat(target); err == nil {
+		return connection.QueryResult{Success: false, Message: "目录已存在"}
+	} else if !os.IsNotExist(err) {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法读取目录信息: %v", err)}
+	}
+	if err := os.Mkdir(target, 0o755); err != nil {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法创建目录: %v", err)}
+	}
+	return connection.QueryResult{Success: true, Data: map[string]interface{}{"directoryPath": target, "name": filepath.Base(target)}}
+}
+
+func deleteSQLFileByPath(filePath string) connection.QueryResult {
+	target, _, err := normalizeExistingSQLFilePath(filePath)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	if err := os.Remove(target); err != nil {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法删除 SQL 文件: %v", err)}
+	}
+	return connection.QueryResult{Success: true, Data: map[string]interface{}{"filePath": target}}
+}
+
+func deleteSQLDirectoryByPath(directoryPath string) connection.QueryResult {
+	target, _, err := normalizeExistingSQLDirectoryPath(directoryPath)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	if err := os.Remove(target); err != nil {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法删除目录: %v（仅支持删除空目录）", err)}
+	}
+	return connection.QueryResult{Success: true, Data: map[string]interface{}{"directoryPath": target}}
+}
+
+func renameSQLFileByPath(filePath string, rawName string) connection.QueryResult {
+	source, _, err := normalizeExistingSQLFilePath(filePath)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	name, err := normalizeSQLFileName(rawName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	target := filepath.Join(filepath.Dir(source), name)
+	if source == target {
+		return connection.QueryResult{Success: true, Data: map[string]interface{}{"filePath": target, "name": filepath.Base(target)}}
+	}
+	if _, err := os.Stat(target); err == nil {
+		return connection.QueryResult{Success: false, Message: "目标 SQL 文件已存在"}
+	} else if !os.IsNotExist(err) {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法读取目标文件信息: %v", err)}
+	}
+	if err := os.Rename(source, target); err != nil {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法重命名 SQL 文件: %v", err)}
+	}
+	return connection.QueryResult{Success: true, Data: map[string]interface{}{"filePath": target, "name": filepath.Base(target)}}
+}
+
+func renameSQLDirectoryByPath(directoryPath string, rawName string) connection.QueryResult {
+	source, _, err := normalizeExistingSQLDirectoryPath(directoryPath)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	name, err := normalizeSQLDirectoryName(rawName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	target := filepath.Join(filepath.Dir(source), name)
+	if source == target {
+		return connection.QueryResult{Success: true, Data: map[string]interface{}{"directoryPath": target, "name": filepath.Base(target)}}
+	}
+	if _, err := os.Stat(target); err == nil {
+		return connection.QueryResult{Success: false, Message: "目标目录已存在"}
+	} else if !os.IsNotExist(err) {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法读取目标目录信息: %v", err)}
+	}
+	if err := os.Rename(source, target); err != nil {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法重命名目录: %v", err)}
+	}
+	return connection.QueryResult{Success: true, Data: map[string]interface{}{"directoryPath": target, "name": filepath.Base(target)}}
+}
+
 func normalizeDirectoryDialogPath(currentDir string) string {
 	defaultDir := strings.TrimSpace(currentDir)
 	if defaultDir == "" {
@@ -113,7 +323,11 @@ func readSQLFileByPath(filePath string) connection.QueryResult {
 
 	fi, err := os.Stat(selection)
 	if err != nil {
-		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法读取文件信息: %v", err)}
+		data := map[string]interface{}{"filePath": selection}
+		if os.IsNotExist(err) {
+			data["errorCode"] = sqlFileErrorCodeNotFound
+		}
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("无法读取文件信息: %v", err), Data: data}
 	}
 	if fi.IsDir() {
 		return connection.QueryResult{Success: false, Message: "所选路径不是 SQL 文件"}
@@ -140,6 +354,28 @@ func readSQLFileByPath(filePath string) connection.QueryResult {
 	return connection.QueryResult{Success: true, Data: string(content)}
 }
 
+func readSQLFileWithMetadataByPath(filePath string) connection.QueryResult {
+	result := readSQLFileByPath(filePath)
+	if !result.Success {
+		return result
+	}
+	if data, ok := result.Data.(map[string]interface{}); ok {
+		return connection.QueryResult{Success: true, Data: data}
+	}
+	selection := strings.TrimSpace(filePath)
+	if abs, err := filepath.Abs(selection); err == nil {
+		selection = abs
+	}
+	return connection.QueryResult{
+		Success: true,
+		Data: map[string]interface{}{
+			"content":  result.Data,
+			"filePath": selection,
+			"name":     filepath.Base(selection),
+		},
+	}
+}
+
 func writeSQLFileByPath(filePath string, content string) connection.QueryResult {
 	target := strings.TrimSpace(filePath)
 	if target == "" {
@@ -238,9 +474,6 @@ func buildSQLDirectoryEntries(directory string) ([]SQLDirectoryEntry, error) {
 			if childErr != nil {
 				return nil, childErr
 			}
-			if len(children) == 0 {
-				continue
-			}
 			result = append(result, SQLDirectoryEntry{
 				Name:     entry.Name(),
 				Path:     entryPath,
@@ -291,7 +524,7 @@ func (a *App) OpenSQLFile() connection.QueryResult {
 		return connection.QueryResult{Success: false, Message: "已取消"}
 	}
 
-	return readSQLFileByPath(selection)
+	return readSQLFileWithMetadataByPath(selection)
 }
 
 func (a *App) SelectSQLDirectory(currentDir string) connection.QueryResult {
@@ -343,10 +576,161 @@ func (a *App) ReadSQLFile(filePath string) connection.QueryResult {
 	return readSQLFileByPath(filePath)
 }
 
+func (a *App) ReadAppLogTail(lineLimit int, keyword string) connection.QueryResult {
+	return readAppLogTailByPath(logger.Path(), lineLimit, keyword)
+}
+
 func (a *App) WriteSQLFile(filePath string, content string) connection.QueryResult {
 	return writeSQLFileByPath(filePath, content)
 }
 
+func normalizeAppLogTailLineLimit(input int) int {
+	if input <= 0 {
+		return defaultAppLogTailLineLimit
+	}
+	if input > maxAppLogTailLineLimit {
+		return maxAppLogTailLineLimit
+	}
+	return input
+}
+
+func readAppLogTailWindow(filePath string, maxBytes int64) ([]byte, bool, error) {
+	f, err := os.Open(filePath)
+	if err != nil {
+		return nil, false, err
+	}
+	defer f.Close()
+
+	fi, err := f.Stat()
+	if err != nil {
+		return nil, false, err
+	}
+	size := fi.Size()
+	if size <= 0 {
+		return []byte{}, false, nil
+	}
+
+	offset := int64(0)
+	truncated := false
+	if maxBytes > 0 && size > maxBytes {
+		offset = size - maxBytes
+		truncated = true
+	}
+
+	buf := make([]byte, size-offset)
+	if _, err := f.ReadAt(buf, offset); err != nil && err != io.EOF {
+		return nil, false, err
+	}
+	if !truncated {
+		return buf, false, nil
+	}
+
+	text := string(buf)
+	if idx := strings.IndexByte(text, '\n'); idx >= 0 && idx+1 < len(text) {
+		return []byte(text[idx+1:]), true, nil
+	}
+	return []byte{}, true, nil
+}
+
+func buildAppLogLevelBreakdown(lines []string) map[string]int {
+	breakdown := map[string]int{
+		"INFO":  0,
+		"WARN":  0,
+		"ERROR": 0,
+		"OTHER": 0,
+	}
+	for _, line := range lines {
+		switch {
+		case strings.Contains(line, "[INFO]"):
+			breakdown["INFO"]++
+		case strings.Contains(line, "[WARN]"):
+			breakdown["WARN"]++
+		case strings.Contains(line, "[ERROR]"):
+			breakdown["ERROR"]++
+		default:
+			breakdown["OTHER"]++
+		}
+	}
+	return breakdown
+}
+
+func readAppLogTailByPath(filePath string, lineLimit int, keyword string) connection.QueryResult {
+	target := strings.TrimSpace(filePath)
+	if target == "" {
+		return connection.QueryResult{Success: false, Message: "当前未找到 GoNavi 日志文件"}
+	}
+
+	if _, err := os.Stat(target); err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+
+	windowBytes, fileWindowTruncated, err := readAppLogTailWindow(target, appLogTailReadWindowBytes)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+
+	normalizedKeyword := strings.ToLower(strings.TrimSpace(keyword))
+	normalizedLineLimit := normalizeAppLogTailLineLimit(lineLimit)
+	rawLines := strings.Split(strings.ReplaceAll(string(windowBytes), "\r\n", "\n"), "\n")
+	lines := make([]string, 0, len(rawLines))
+	for _, rawLine := range rawLines {
+		line := strings.TrimSpace(rawLine)
+		if line == "" {
+			continue
+		}
+		lines = append(lines, line)
+	}
+
+	filteredLines := make([]string, 0, len(lines))
+	for _, line := range lines {
+		if normalizedKeyword != "" && !strings.Contains(strings.ToLower(line), normalizedKeyword) {
+			continue
+		}
+		filteredLines = append(filteredLines, line)
+	}
+
+	matchedLinesTruncated := len(filteredLines) > normalizedLineLimit
+	if matchedLinesTruncated {
+		filteredLines = filteredLines[len(filteredLines)-normalizedLineLimit:]
+	}
+
+	snapshot := appLogTailSnapshot{
+		LogPath:               target,
+		Keyword:               strings.TrimSpace(keyword),
+		RequestedLineLimit:    normalizedLineLimit,
+		ReturnedLineCount:     len(filteredLines),
+		FileWindowTruncated:   fileWindowTruncated,
+		MatchedLinesTruncated: matchedLinesTruncated,
+		LevelBreakdown:        buildAppLogLevelBreakdown(filteredLines),
+		Lines:                 filteredLines,
+	}
+	return connection.QueryResult{Success: true, Data: snapshot}
+}
+
+func (a *App) CreateSQLFile(directoryPath string, name string) connection.QueryResult {
+	return createSQLFileInDirectory(directoryPath, name)
+}
+
+func (a *App) CreateSQLDirectory(directoryPath string, name string) connection.QueryResult {
+	return createSQLDirectoryInDirectory(directoryPath, name)
+}
+
+func (a *App) DeleteSQLFile(filePath string) connection.QueryResult {
+	return deleteSQLFileByPath(filePath)
+}
+
+func (a *App) DeleteSQLDirectory(directoryPath string) connection.QueryResult {
+	return deleteSQLDirectoryByPath(directoryPath)
+}
+
+func (a *App) RenameSQLFile(filePath string, name string) connection.QueryResult {
+	return renameSQLFileByPath(filePath, name)
+}
+
+func (a *App) RenameSQLDirectory(directoryPath string, name string) connection.QueryResult {
+	return renameSQLDirectoryByPath(directoryPath, name)
+}
+
 func (a *App) ExportSQLFile(defaultName string, content string) connection.QueryResult {
 	filename, err := runtime.SaveFileDialog(a.ctx, runtime.SaveDialogOptions{
 		Title:           "导出 SQL 文件",
@@ -425,12 +809,13 @@ func isSQLFileBatchableWriteStatement(dbType string, stmt string) bool {
 	if isReadOnlySQLQuery(dbType, stmt) {
 		return false
 	}
-	switch leadingSQLKeyword(stmt) {
-	case "insert", "update", "delete", "replace", "merge", "upsert":
-		return true
-	default:
+	if isPLSQLBlockStatement(stmt) {
 		return false
 	}
+	if shouldTryQueryResultFirst(dbType, stmt) {
+		return false
+	}
+	return isBatchableWriteSQLStatement(dbType, stmt)
 }
 
 func sqlFileBatchTransactionSQL(dbType string) (beginSQL string, commitSQL string, rollbackSQL string, ok bool) {
@@ -439,7 +824,7 @@ func sqlFileBatchTransactionSQL(dbType string) (beginSQL string, commitSQL strin
 		return "START TRANSACTION", "COMMIT", "ROLLBACK", true
 	case "sqlserver":
 		return "BEGIN TRANSACTION", "COMMIT TRANSACTION", "ROLLBACK TRANSACTION", true
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "sqlite", "duckdb", "iris":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "sqlite", "duckdb", "iris":
 		return "BEGIN", "COMMIT", "ROLLBACK", true
 	default:
 		return "", "", "", false
@@ -1379,7 +1764,7 @@ func normalizeImportTemporalValue(dbType, columnType, raw string) string {
 
 func isPgLikeBooleanDBType(dbType string) bool {
 	switch strings.ToLower(strings.TrimSpace(dbType)) {
-	case "postgres", "postgresql", "pg", "pq", "pgx", "kingbase", "kingbase8", "kingbasees", "kingbasev8", "highgo", "vastbase", "opengauss", "open_gauss", "open-gauss":
+	case "postgres", "postgresql", "pg", "pq", "pgx", "kingbase", "kingbase8", "kingbasees", "kingbasev8", "highgo", "vastbase", "opengauss", "open_gauss", "open-gauss", "gaussdb", "gauss_db", "gauss-db":
 		return true
 	default:
 		return false
@@ -1832,6 +2217,74 @@ func (a *App) ExportDatabaseSQL(config connection.ConnectionConfig, dbName strin
 	return connection.QueryResult{Success: true, Message: "导出完成"}
 }
 
+func (a *App) ExportSchemaSQL(config connection.ConnectionConfig, dbName string, schemaName string, includeData bool) connection.QueryResult {
+	safeDbName := strings.TrimSpace(dbName)
+	safeSchemaName := strings.TrimSpace(schemaName)
+	if safeDbName == "" {
+		return connection.QueryResult{Success: false, Message: "数据库名称不能为空"}
+	}
+	if safeSchemaName == "" {
+		return connection.QueryResult{Success: false, Message: "模式名称不能为空"}
+	}
+
+	suffix := "schema"
+	if includeData {
+		suffix = "backup"
+	}
+
+	filename, err := runtime.SaveFileDialog(a.ctx, runtime.SaveDialogOptions{
+		Title:           fmt.Sprintf("Export %s.%s (SQL)", safeDbName, safeSchemaName),
+		DefaultFilename: fmt.Sprintf("%s_%s_%s.sql", safeDbName, safeSchemaName, suffix),
+	})
+	if err != nil || filename == "" {
+		return connection.QueryResult{Success: false, Message: "已取消"}
+	}
+
+	runConfig := normalizeRunConfig(config, dbName)
+	dbInst, err := a.getDatabase(runConfig)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+
+	tables, err := dbInst.GetTables(dbName)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	viewLookup := listViewNameLookup(dbInst, runConfig, dbName)
+	filteredTables := filterExportObjectsBySchema(runConfig, dbName, tables, safeSchemaName)
+	filteredViews := filterExportViewLookupBySchema(runConfig, dbName, viewLookup, safeSchemaName)
+	objects := buildExportObjectOrder(runConfig, dbName, filteredTables, filteredViews, true)
+	if len(objects) == 0 {
+		return connection.QueryResult{Success: false, Message: fmt.Sprintf("未在模式 %s 下获取到可导出的表或视图", safeSchemaName)}
+	}
+
+	f, err := os.Create(filename)
+	if err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	defer f.Close()
+
+	w := bufio.NewWriterSize(f, 1024*1024)
+	defer w.Flush()
+
+	if err := writeSQLHeader(w, runConfig, dbName); err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	if _, err := w.WriteString(fmt.Sprintf("-- Schema: %s\n\n", safeSchemaName)); err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+	for _, objectName := range objects {
+		if err := dumpTableSQL(w, dbInst, runConfig, dbName, objectName, true, includeData, filteredViews); err != nil {
+			return connection.QueryResult{Success: false, Message: err.Error()}
+		}
+	}
+	if err := writeSQLFooter(w, runConfig); err != nil {
+		return connection.QueryResult{Success: false, Message: err.Error()}
+	}
+
+	return connection.QueryResult{Success: true, Message: "导出完成"}
+}
+
 type tableDataClearMode string
 
 const (
@@ -1841,7 +2294,7 @@ const (
 
 func supportsTruncateTableForDBType(dbType string) bool {
 	switch strings.ToLower(strings.TrimSpace(dbType)) {
-	case "mysql", "mariadb", "oceanbase", "starrocks", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "sqlserver", "iris", "oracle", "dameng", "clickhouse", "duckdb":
+	case "mysql", "mariadb", "oceanbase", "starrocks", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver", "iris", "oracle", "dameng", "clickhouse", "duckdb":
 		return true
 	default:
 		return false
@@ -2129,6 +2582,56 @@ func buildExportObjectOrder(
 	return append(tables, views...)
 }
 
+func filterExportObjectsBySchema(
+	config connection.ConnectionConfig,
+	dbName string,
+	rawObjects []string,
+	schemaName string,
+) []string {
+	safeSchemaName := strings.TrimSpace(schemaName)
+	if safeSchemaName == "" {
+		return append([]string(nil), rawObjects...)
+	}
+
+	filtered := make([]string, 0, len(rawObjects))
+	for _, rawName := range rawObjects {
+		objectName := strings.TrimSpace(rawName)
+		if objectName == "" {
+			continue
+		}
+		objectSchemaName, _ := normalizeSchemaAndTable(config, dbName, objectName)
+		if strings.EqualFold(strings.TrimSpace(objectSchemaName), safeSchemaName) {
+			filtered = append(filtered, objectName)
+		}
+	}
+	return filtered
+}
+
+func filterExportViewLookupBySchema(
+	config connection.ConnectionConfig,
+	dbName string,
+	viewLookup map[string]string,
+	schemaName string,
+) map[string]string {
+	safeSchemaName := strings.TrimSpace(schemaName)
+	if safeSchemaName == "" {
+		cloned := make(map[string]string, len(viewLookup))
+		for key, value := range viewLookup {
+			cloned[key] = value
+		}
+		return cloned
+	}
+
+	filtered := make(map[string]string, len(viewLookup))
+	for key, objectName := range viewLookup {
+		objectSchemaName, _ := normalizeSchemaAndTable(config, dbName, objectName)
+		if strings.EqualFold(strings.TrimSpace(objectSchemaName), safeSchemaName) {
+			filtered[key] = objectName
+		}
+	}
+	return filtered
+}
+
 func mapValuesSorted(values map[string]string) []string {
 	if len(values) == 0 {
 		return nil
@@ -2206,7 +2709,7 @@ func buildListViewQueries(config connection.ConnectionConfig, dbName string) []s
 			queries = append(queries, fmt.Sprintf("SHOW FULL TABLES FROM %s WHERE Table_type = 'VIEW'", quoteIdentByType("mysql", dbName)))
 		}
 		return queries
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
 		return []string{
 			`SELECT table_schema AS schema_name, table_name AS object_name FROM information_schema.views WHERE table_schema NOT IN ('pg_catalog', 'information_schema') ORDER BY table_schema, table_name`,
 		}
@@ -2313,7 +2816,7 @@ func buildViewCreateQueries(config connection.ConnectionConfig, dbName, schemaNa
 		return []string{
 			fmt.Sprintf("SHOW CREATE VIEW %s", quoteIdentByType("mysql", safeView)),
 		}
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
 		if safeSchema == "" {
 			safeSchema = "public"
 		}
diff --git a/internal/app/methods_file_app_log_test.go b/internal/app/methods_file_app_log_test.go
new file mode 100644
index 0000000..e06c216
--- /dev/null
+++ b/internal/app/methods_file_app_log_test.go
@@ -0,0 +1,75 @@
+package app
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestReadAppLogTailByPathReturnsLatestLinesAndLevelBreakdown(t *testing.T) {
+	dir := t.TempDir()
+	logPath := filepath.Join(dir, "gonavi.log")
+	content := "" +
+		"2026/06/09 10:00:00.000000 [INFO] boot ok\n" +
+		"2026/06/09 10:00:01.000000 [WARN] slow mcp start\n" +
+		"2026/06/09 10:00:02.000000 [ERROR] mysql dial failed\n"
+	if err := os.WriteFile(logPath, []byte(content), 0o644); err != nil {
+		t.Fatalf("write log failed: %v", err)
+	}
+
+	result := readAppLogTailByPath(logPath, 2, "")
+	if !result.Success {
+		t.Fatalf("expected success, got failure: %s", result.Message)
+	}
+
+	snapshot, ok := result.Data.(appLogTailSnapshot)
+	if !ok {
+		t.Fatalf("expected appLogTailSnapshot, got %T", result.Data)
+	}
+	if snapshot.ReturnedLineCount != 2 {
+		t.Fatalf("expected 2 returned lines, got %d", snapshot.ReturnedLineCount)
+	}
+	if !snapshot.MatchedLinesTruncated {
+		t.Fatal("expected matched lines to be truncated when requesting fewer lines than available")
+	}
+	if snapshot.LevelBreakdown["WARN"] != 1 || snapshot.LevelBreakdown["ERROR"] != 1 {
+		t.Fatalf("unexpected level breakdown: %#v", snapshot.LevelBreakdown)
+	}
+	if snapshot.Lines[0] != "2026/06/09 10:00:01.000000 [WARN] slow mcp start" {
+		t.Fatalf("unexpected first returned line: %s", snapshot.Lines[0])
+	}
+	if snapshot.Lines[1] != "2026/06/09 10:00:02.000000 [ERROR] mysql dial failed" {
+		t.Fatalf("unexpected second returned line: %s", snapshot.Lines[1])
+	}
+}
+
+func TestReadAppLogTailByPathFiltersByKeywordCaseInsensitively(t *testing.T) {
+	dir := t.TempDir()
+	logPath := filepath.Join(dir, "gonavi.log")
+	content := "" +
+		"2026/06/09 10:00:00.000000 [INFO] bootstrap ok\n" +
+		"2026/06/09 10:00:01.000000 [ERROR] MCP start failed\n" +
+		"2026/06/09 10:00:02.000000 [WARN] retry mcp connection\n"
+	if err := os.WriteFile(logPath, []byte(content), 0o644); err != nil {
+		t.Fatalf("write log failed: %v", err)
+	}
+
+	result := readAppLogTailByPath(logPath, 10, "mCp")
+	if !result.Success {
+		t.Fatalf("expected success, got failure: %s", result.Message)
+	}
+
+	snapshot, ok := result.Data.(appLogTailSnapshot)
+	if !ok {
+		t.Fatalf("expected appLogTailSnapshot, got %T", result.Data)
+	}
+	if snapshot.ReturnedLineCount != 2 {
+		t.Fatalf("expected 2 matched lines, got %d", snapshot.ReturnedLineCount)
+	}
+	if snapshot.Keyword != "mCp" {
+		t.Fatalf("expected original keyword to be preserved, got %q", snapshot.Keyword)
+	}
+	if snapshot.LevelBreakdown["ERROR"] != 1 || snapshot.LevelBreakdown["WARN"] != 1 {
+		t.Fatalf("unexpected level breakdown after keyword filter: %#v", snapshot.LevelBreakdown)
+	}
+}
diff --git a/internal/app/methods_file_export_test.go b/internal/app/methods_file_export_test.go
index 0d9e709..7aa5176 100644
--- a/internal/app/methods_file_export_test.go
+++ b/internal/app/methods_file_export_test.go
@@ -431,3 +431,48 @@ func TestDumpTableSQL_PostgresBooleanBackupUsesBooleanLiterals(t *testing.T) {
 		t.Fatalf("PostgreSQL bool 备份不应输出数字布尔值，content=%s", content)
 	}
 }
+
+func TestFilterExportObjectsBySchema_PostgresQualifiedObjectsOnly(t *testing.T) {
+	got := filterExportObjectsBySchema(
+		connection.ConnectionConfig{Type: "postgres"},
+		"app_db",
+		[]string{"public.users", "sales.orders", "sales.v_orders", "analytics.events"},
+		"sales",
+	)
+
+	want := []string{"sales.orders", "sales.v_orders"}
+	if len(got) != len(want) {
+		t.Fatalf("filtered objects length mismatch, want=%d got=%d (%v)", len(want), len(got), got)
+	}
+	for i := range want {
+		if got[i] != want[i] {
+			t.Fatalf("filtered objects mismatch at %d, want=%q got=%q", i, want[i], got[i])
+		}
+	}
+}
+
+func TestFilterExportViewLookupBySchema_PostgresQualifiedViewsOnly(t *testing.T) {
+	got := filterExportViewLookupBySchema(
+		connection.ConnectionConfig{Type: "postgres"},
+		"app_db",
+		map[string]string{
+			"public.v_users":  "public.v_users",
+			"sales.v_orders":  "sales.v_orders",
+			"sales.v_summary": "sales.v_summary",
+		},
+		"sales",
+	)
+
+	if len(got) != 2 {
+		t.Fatalf("filtered views length mismatch, want=2 got=%d (%v)", len(got), got)
+	}
+	if got["sales.v_orders"] != "sales.v_orders" {
+		t.Fatalf("expected sales.v_orders to be retained, got=%q", got["sales.v_orders"])
+	}
+	if got["sales.v_summary"] != "sales.v_summary" {
+		t.Fatalf("expected sales.v_summary to be retained, got=%q", got["sales.v_summary"])
+	}
+	if _, ok := got["public.v_users"]; ok {
+		t.Fatalf("expected public.v_users to be filtered out, got=%v", got)
+	}
+}
diff --git a/internal/app/methods_file_sql_directory_test.go b/internal/app/methods_file_sql_directory_test.go
index 49d28e9..397b6e5 100644
--- a/internal/app/methods_file_sql_directory_test.go
+++ b/internal/app/methods_file_sql_directory_test.go
@@ -9,9 +9,13 @@ import (
 func TestBuildSQLDirectoryEntriesKeepsOnlySQLFilesAndNestedFolders(t *testing.T) {
 	root := t.TempDir()
 	nestedDir := filepath.Join(root, "nested")
+	emptyDir := filepath.Join(root, "empty")
 	if err := os.MkdirAll(nestedDir, 0o755); err != nil {
 		t.Fatalf("MkdirAll returned error: %v", err)
 	}
+	if err := os.MkdirAll(emptyDir, 0o755); err != nil {
+		t.Fatalf("MkdirAll empty returned error: %v", err)
+	}
 	if err := os.WriteFile(filepath.Join(root, "z-last.sql"), []byte("select 1;"), 0o644); err != nil {
 		t.Fatalf("WriteFile sql returned error: %v", err)
 	}
@@ -27,17 +31,20 @@ func TestBuildSQLDirectoryEntriesKeepsOnlySQLFilesAndNestedFolders(t *testing.T)
 		t.Fatalf("buildSQLDirectoryEntries returned error: %v", err)
 	}
 
-	if len(entries) != 2 {
-		t.Fatalf("expected one folder and one sql file, got %d entries", len(entries))
+	if len(entries) != 3 {
+		t.Fatalf("expected two folders and one sql file, got %d entries", len(entries))
 	}
-	if !entries[0].IsDir || entries[0].Name != "nested" {
-		t.Fatalf("expected nested directory first, got %#v", entries[0])
+	if !entries[0].IsDir || entries[0].Name != "empty" || len(entries[0].Children) != 0 {
+		t.Fatalf("expected empty directory first, got %#v", entries[0])
 	}
-	if len(entries[0].Children) != 1 || entries[0].Children[0].Name != "inner.SQL" {
-		t.Fatalf("expected nested sql child, got %#v", entries[0].Children)
+	if !entries[1].IsDir || entries[1].Name != "nested" {
+		t.Fatalf("expected nested directory second, got %#v", entries[1])
 	}
-	if entries[1].IsDir || entries[1].Name != "z-last.sql" {
-		t.Fatalf("expected top-level sql file second, got %#v", entries[1])
+	if len(entries[1].Children) != 1 || entries[1].Children[0].Name != "inner.SQL" {
+		t.Fatalf("expected nested sql child, got %#v", entries[1].Children)
+	}
+	if entries[2].IsDir || entries[2].Name != "z-last.sql" {
+		t.Fatalf("expected top-level sql file third, got %#v", entries[2])
 	}
 }
 
@@ -75,6 +82,156 @@ func TestWriteSQLFileByPathRejectsEmptyPath(t *testing.T) {
 	}
 }
 
+func TestCreateSQLFileInDirectoryCreatesEmptySQLFile(t *testing.T) {
+	root := t.TempDir()
+
+	result := createSQLFileInDirectory(root, "draft")
+	if !result.Success {
+		t.Fatalf("expected sql file create to succeed, got %#v", result)
+	}
+
+	filePath := filepath.Join(root, "draft.sql")
+	data, err := os.ReadFile(filePath)
+	if err != nil {
+		t.Fatalf("ReadFile returned error: %v", err)
+	}
+	if string(data) != "" {
+		t.Fatalf("expected empty sql file, got %q", string(data))
+	}
+}
+
+func TestCreateSQLFileInDirectoryRejectsPathTraversalName(t *testing.T) {
+	result := createSQLFileInDirectory(t.TempDir(), "../escape.sql")
+	if result.Success {
+		t.Fatalf("expected path traversal name to fail, got %#v", result)
+	}
+}
+
+func TestCreateSQLDirectoryInDirectoryCreatesEmptyDirectory(t *testing.T) {
+	root := t.TempDir()
+
+	result := createSQLDirectoryInDirectory(root, "reports")
+	if !result.Success {
+		t.Fatalf("expected sql directory create to succeed, got %#v", result)
+	}
+
+	target := filepath.Join(root, "reports")
+	info, err := os.Stat(target)
+	if err != nil {
+		t.Fatalf("Stat returned error: %v", err)
+	}
+	if !info.IsDir() {
+		t.Fatalf("expected target to be a directory")
+	}
+}
+
+func TestCreateSQLDirectoryInDirectoryRejectsPathTraversalName(t *testing.T) {
+	result := createSQLDirectoryInDirectory(t.TempDir(), "../escape")
+	if result.Success {
+		t.Fatalf("expected path traversal directory name to fail, got %#v", result)
+	}
+}
+
+func TestDeleteSQLFileByPathRemovesExistingSQLFile(t *testing.T) {
+	filePath := filepath.Join(t.TempDir(), "old.sql")
+	if err := os.WriteFile(filePath, []byte("select 1;"), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	result := deleteSQLFileByPath(filePath)
+	if !result.Success {
+		t.Fatalf("expected sql file delete to succeed, got %#v", result)
+	}
+	if _, err := os.Stat(filePath); !os.IsNotExist(err) {
+		t.Fatalf("expected deleted sql file to be gone, stat err=%v", err)
+	}
+}
+
+func TestDeleteSQLFileByPathRejectsNonSQLFile(t *testing.T) {
+	filePath := filepath.Join(t.TempDir(), "notes.txt")
+	if err := os.WriteFile(filePath, []byte("skip"), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	result := deleteSQLFileByPath(filePath)
+	if result.Success {
+		t.Fatalf("expected non sql file delete to fail, got %#v", result)
+	}
+}
+
+func TestDeleteSQLDirectoryByPathRemovesEmptyDirectory(t *testing.T) {
+	directoryPath := filepath.Join(t.TempDir(), "old")
+	if err := os.Mkdir(directoryPath, 0o755); err != nil {
+		t.Fatalf("Mkdir returned error: %v", err)
+	}
+
+	result := deleteSQLDirectoryByPath(directoryPath)
+	if !result.Success {
+		t.Fatalf("expected sql directory delete to succeed, got %#v", result)
+	}
+	if _, err := os.Stat(directoryPath); !os.IsNotExist(err) {
+		t.Fatalf("expected deleted sql directory to be gone, stat err=%v", err)
+	}
+}
+
+func TestDeleteSQLDirectoryByPathRejectsNonEmptyDirectory(t *testing.T) {
+	directoryPath := filepath.Join(t.TempDir(), "non-empty")
+	if err := os.Mkdir(directoryPath, 0o755); err != nil {
+		t.Fatalf("Mkdir returned error: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(directoryPath, "query.sql"), []byte("select 1;"), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	result := deleteSQLDirectoryByPath(directoryPath)
+	if result.Success {
+		t.Fatalf("expected non-empty sql directory delete to fail, got %#v", result)
+	}
+	if _, err := os.Stat(directoryPath); err != nil {
+		t.Fatalf("expected non-empty sql directory to remain, stat err=%v", err)
+	}
+}
+
+func TestRenameSQLFileByPathRenamesWithinSameDirectory(t *testing.T) {
+	root := t.TempDir()
+	source := filepath.Join(root, "old.sql")
+	if err := os.WriteFile(source, []byte("select 1;"), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	result := renameSQLFileByPath(source, "new-name")
+	if !result.Success {
+		t.Fatalf("expected sql file rename to succeed, got %#v", result)
+	}
+	target := filepath.Join(root, "new-name.sql")
+	if _, err := os.Stat(target); err != nil {
+		t.Fatalf("expected target sql file, got err=%v", err)
+	}
+	if _, err := os.Stat(source); !os.IsNotExist(err) {
+		t.Fatalf("expected source sql file to be gone, stat err=%v", err)
+	}
+}
+
+func TestRenameSQLDirectoryByPathRenamesWithinSameParent(t *testing.T) {
+	root := t.TempDir()
+	source := filepath.Join(root, "old")
+	if err := os.Mkdir(source, 0o755); err != nil {
+		t.Fatalf("Mkdir returned error: %v", err)
+	}
+
+	result := renameSQLDirectoryByPath(source, "new-name")
+	if !result.Success {
+		t.Fatalf("expected sql directory rename to succeed, got %#v", result)
+	}
+	target := filepath.Join(root, "new-name")
+	if info, err := os.Stat(target); err != nil || !info.IsDir() {
+		t.Fatalf("expected target sql directory, got info=%#v err=%v", info, err)
+	}
+	if _, err := os.Stat(source); !os.IsNotExist(err) {
+		t.Fatalf("expected source sql directory to be gone, stat err=%v", err)
+	}
+}
+
 func TestNormalizeSQLExportDefaultFilename(t *testing.T) {
 	tests := []struct {
 		name string
@@ -144,3 +301,49 @@ func TestReadSQLFileByPathReturnsLargeFileMetadata(t *testing.T) {
 		t.Fatalf("expected filePath %q, got %#v", filePath, data["filePath"])
 	}
 }
+
+func TestReadSQLFileByPathMarksMissingFile(t *testing.T) {
+	filePath := filepath.Join(t.TempDir(), "missing.sql")
+
+	result := readSQLFileByPath(filePath)
+	if result.Success {
+		t.Fatalf("expected missing sql file read to fail, got %#v", result)
+	}
+
+	data, ok := result.Data.(map[string]interface{})
+	if !ok {
+		t.Fatalf("expected error metadata map, got %#v", result.Data)
+	}
+	if data["errorCode"] != sqlFileErrorCodeNotFound {
+		t.Fatalf("expected file_not_found error code, got %#v", data["errorCode"])
+	}
+	if data["filePath"] != filePath {
+		t.Fatalf("expected filePath %q, got %#v", filePath, data["filePath"])
+	}
+}
+
+func TestReadSQLFileWithMetadataByPathReturnsSmallFileContentAndPath(t *testing.T) {
+	filePath := filepath.Join(t.TempDir(), "report.sql")
+	if err := os.WriteFile(filePath, []byte("select 1;"), 0o644); err != nil {
+		t.Fatalf("WriteFile returned error: %v", err)
+	}
+
+	result := readSQLFileWithMetadataByPath(filePath)
+	if !result.Success {
+		t.Fatalf("expected sql file read to succeed, got %#v", result)
+	}
+
+	data, ok := result.Data.(map[string]interface{})
+	if !ok {
+		t.Fatalf("expected metadata map, got %#v", result.Data)
+	}
+	if data["content"] != "select 1;" {
+		t.Fatalf("expected content, got %#v", data["content"])
+	}
+	if data["filePath"] != filePath {
+		t.Fatalf("expected filePath %q, got %#v", filePath, data["filePath"])
+	}
+	if data["name"] != "report.sql" {
+		t.Fatalf("expected name report.sql, got %#v", data["name"])
+	}
+}
diff --git a/internal/app/methods_file_sql_execution_test.go b/internal/app/methods_file_sql_execution_test.go
index 928010f..73eb206 100644
--- a/internal/app/methods_file_sql_execution_test.go
+++ b/internal/app/methods_file_sql_execution_test.go
@@ -322,3 +322,87 @@ func TestStreamSQLFileHandlesSplitTokenBoundaries(t *testing.T) {
 		t.Fatalf("unexpected full-width semicolon statement: %q", statements[2])
 	}
 }
+
+func TestStreamSQLFileKeepsOracleAnonymousBlockTogether(t *testing.T) {
+	input := strings.Join([]string{
+		"BEGIN",
+		"  INSERT INTO tmp_disable_trigger (table_name) VALUES ('t_memcard_reg');",
+		"  UPDATE t_memcard_reg SET CARDLEVEL = 1 WHERE MEMCARDNO = '8032277312';",
+		"  DELETE FROM tmp_disable_trigger WHERE table_name = 't_memcard_reg';",
+		"END;",
+		"SELECT 1 FROM dual;",
+	}, "\n")
+	var statements []string
+
+	count, err := streamSQLFile(&chunkedReader{data: []byte(input), step: 3}, func(index int, stmt string) error {
+		statements = append(statements, stmt)
+		return nil
+	})
+	if err != nil {
+		t.Fatalf("streamSQLFile returned error: %v", err)
+	}
+	if count != 2 || len(statements) != 2 {
+		t.Fatalf("expected 2 statements, got count=%d statements=%#v", count, statements)
+	}
+	if statements[0] != strings.Join([]string{
+		"BEGIN",
+		"  INSERT INTO tmp_disable_trigger (table_name) VALUES ('t_memcard_reg');",
+		"  UPDATE t_memcard_reg SET CARDLEVEL = 1 WHERE MEMCARDNO = '8032277312';",
+		"  DELETE FROM tmp_disable_trigger WHERE table_name = 't_memcard_reg';",
+		"END;",
+	}, "\n") {
+		t.Fatalf("unexpected anonymous block statement: %q", statements[0])
+	}
+	if statements[1] != "SELECT 1 FROM dual" {
+		t.Fatalf("unexpected second statement: %q", statements[1])
+	}
+}
+
+func TestStreamSQLFileKeepsOracleCreateProcedureTogether(t *testing.T) {
+	input := strings.Join([]string{
+		"CREATE OR REPLACE PROCEDURE proc_tally2accept(",
+		"  p_tallyacceptno IN t_tally_accept_h.acceptno%TYPE,",
+		"  out_acceptno OUT t_accept_h.acceptno%TYPE",
+		") IS",
+		"  v_busno t_tally_accept_h.busno%TYPE;",
+		"  v_count PLS_INTEGER;",
+		"BEGIN",
+		"  SELECT COUNT(*) INTO v_count FROM t_tally_accept_h WHERE acceptno = p_tallyacceptno;",
+		"  IF v_count > 0 THEN",
+		"    out_acceptno := p_tallyacceptno;",
+		"  END IF;",
+		"END;",
+		"SELECT 1 FROM dual;",
+	}, "\n")
+	var statements []string
+
+	count, err := streamSQLFile(&chunkedReader{data: []byte(input), step: 5}, func(index int, stmt string) error {
+		statements = append(statements, stmt)
+		return nil
+	})
+	if err != nil {
+		t.Fatalf("streamSQLFile returned error: %v", err)
+	}
+	if count != 2 || len(statements) != 2 {
+		t.Fatalf("expected 2 statements, got count=%d statements=%#v", count, statements)
+	}
+	if statements[0] != strings.Join([]string{
+		"CREATE OR REPLACE PROCEDURE proc_tally2accept(",
+		"  p_tallyacceptno IN t_tally_accept_h.acceptno%TYPE,",
+		"  out_acceptno OUT t_accept_h.acceptno%TYPE",
+		") IS",
+		"  v_busno t_tally_accept_h.busno%TYPE;",
+		"  v_count PLS_INTEGER;",
+		"BEGIN",
+		"  SELECT COUNT(*) INTO v_count FROM t_tally_accept_h WHERE acceptno = p_tallyacceptno;",
+		"  IF v_count > 0 THEN",
+		"    out_acceptno := p_tallyacceptno;",
+		"  END IF;",
+		"END;",
+	}, "\n") {
+		t.Fatalf("unexpected create procedure statement: %q", statements[0])
+	}
+	if statements[1] != "SELECT 1 FROM dual" {
+		t.Fatalf("unexpected second statement: %q", statements[1])
+	}
+}
diff --git a/internal/app/methods_redis.go b/internal/app/methods_redis.go
index 8ac2136..f15e03b 100644
--- a/internal/app/methods_redis.go
+++ b/internal/app/methods_redis.go
@@ -19,6 +19,7 @@ import (
 // Redis client cache
 var (
 	redisCache         = make(map[string]redis.RedisClient)
+	redisCacheConfigs  = make(map[string]connection.ConnectionConfig)
 	redisCacheMu       sync.Mutex
 	newRedisClientFunc = redis.NewRedisClient
 )
@@ -60,6 +61,7 @@ func (a *App) getRedisClient(config connection.ConnectionConfig) (redis.RedisCli
 		}
 		client.Close()
 		delete(redisCache, key)
+		delete(redisCacheConfigs, key)
 	}
 
 	logger.Infof("创建 Redis 客户端实例：缓存Key=%s", shortKey)
@@ -71,6 +73,7 @@ func (a *App) getRedisClient(config connection.ConnectionConfig) (redis.RedisCli
 	}
 
 	redisCache[key] = client
+	redisCacheConfigs[key] = normalizeCacheKeyConfig(connectedConfig)
 	logger.Infof("Redis 连接成功并写入缓存：%s 缓存Key=%s", formatRedisConnSummary(connectedConfig), shortKey)
 	return client, nil
 }
@@ -142,6 +145,35 @@ func getRedisClientCacheKey(config connection.ConnectionConfig) string {
 	return hex.EncodeToString(sum[:])
 }
 
+func (a *App) releaseRedisClientsForConfig(config connection.ConnectionConfig) (int, error) {
+	resolvedConfig, err := a.resolveConnectionSecrets(config)
+	if err != nil {
+		return 0, wrapConnectError(config, err)
+	}
+	targetKey := getConnectionReleaseMatchKey(applyGlobalProxyToConnection(resolvedConfig))
+	closed := 0
+
+	redisCacheMu.Lock()
+	defer redisCacheMu.Unlock()
+
+	for key, client := range redisCache {
+		entryConfig := redisCacheConfigs[key]
+		if strings.TrimSpace(entryConfig.Type) == "" {
+			continue
+		}
+		if getConnectionReleaseMatchKey(entryConfig) != targetKey {
+			continue
+		}
+		if client != nil {
+			client.Close()
+		}
+		delete(redisCache, key)
+		delete(redisCacheConfigs, key)
+		closed++
+	}
+	return closed, nil
+}
+
 func formatRedisConnSummary(config connection.ConnectionConfig) string {
 	var b strings.Builder
 	b.WriteString("类型=redis 地址=")
@@ -759,4 +791,5 @@ func CloseAllRedisClients() {
 		}
 	}
 	redisCache = make(map[string]redis.RedisClient)
+	redisCacheConfigs = make(map[string]connection.ConnectionConfig)
 }
diff --git a/internal/app/methods_saved_connections.go b/internal/app/methods_saved_connections.go
index 0e31ed4..2473de4 100644
--- a/internal/app/methods_saved_connections.go
+++ b/internal/app/methods_saved_connections.go
@@ -61,6 +61,7 @@ func (a *App) ImportLegacyConnections(items []connection.LegacySavedConnection)
 		input.ClearHTTPTunnelPassword = strings.TrimSpace(item.Config.HTTPTunnel.Password) == ""
 		input.ClearMySQLReplicaPassword = strings.TrimSpace(item.Config.MySQLReplicaPassword) == ""
 		input.ClearMongoReplicaPassword = strings.TrimSpace(item.Config.MongoReplicaPassword) == ""
+		input.ClearRedisSentinelPassword = strings.TrimSpace(item.Config.RedisSentinelPassword) == ""
 		input.ClearOpaqueURI = strings.TrimSpace(item.Config.URI) == ""
 		input.ClearOpaqueDSN = strings.TrimSpace(item.Config.DSN) == ""
 		inputs = append(inputs, input)
diff --git a/internal/app/methods_saved_queries.go b/internal/app/methods_saved_queries.go
new file mode 100644
index 0000000..839308a
--- /dev/null
+++ b/internal/app/methods_saved_queries.go
@@ -0,0 +1,64 @@
+package app
+
+import "GoNavi-Wails/internal/connection"
+
+func (a *App) savedQueryRepository() *savedQueryRepository {
+	return newSavedQueryRepository(a.configDir)
+}
+
+func (a *App) GetSavedQueries() ([]connection.SavedQuery, error) {
+	savedQueriesMu.Lock()
+	defer savedQueriesMu.Unlock()
+
+	queries, err := a.savedQueryRepository().load()
+	if err != nil {
+		return nil, err
+	}
+	currentConnections, err := a.savedConnectionRepository().List()
+	if err != nil {
+		return queries, nil
+	}
+	return resolveSavedQueryBindings(queries, currentConnections, nil), nil
+}
+
+func (a *App) SaveQuery(input connection.SavedQuery) (connection.SavedQuery, error) {
+	currentConnections, err := a.savedConnectionRepository().List()
+	if err == nil {
+		input = resolveSavedQueryBindings([]connection.SavedQuery{input}, currentConnections, nil)[0]
+	}
+	return a.savedQueryRepository().Save(input)
+}
+
+func (a *App) ImportSavedQueries(payload connection.SavedQueryImportPayload) ([]connection.SavedQuery, error) {
+	currentConnections, err := a.savedConnectionRepository().List()
+	if err != nil {
+		currentConnections = nil
+	}
+	return a.savedQueryRepository().Import(payload, currentConnections)
+}
+
+func (a *App) DeleteQuery(id string) error {
+	return a.savedQueryRepository().Delete(id)
+}
+
+func (a *App) RebindSavedQuery(id string, connectionID string) (connection.SavedQuery, error) {
+	target, err := a.savedConnectionRepository().Find(connectionID)
+	if err != nil {
+		return connection.SavedQuery{}, err
+	}
+	return a.savedQueryRepository().Rebind(id, target)
+}
+
+func (a *App) GetUnboundSavedQueries() ([]connection.SavedQuery, error) {
+	queries, err := a.GetSavedQueries()
+	if err != nil {
+		return nil, err
+	}
+	result := make([]connection.SavedQuery, 0)
+	for _, query := range queries {
+		if query.BindingStatus == savedQueryBindingOrphan {
+			result = append(result, query)
+		}
+	}
+	return result, nil
+}
diff --git a/internal/app/methods_sync.go b/internal/app/methods_sync.go
index e98a9fe..a6c388e 100644
--- a/internal/app/methods_sync.go
+++ b/internal/app/methods_sync.go
@@ -13,19 +13,51 @@ import (
 
 func (a *App) resolveDataSyncConfigSecrets(config sync.SyncConfig) (sync.SyncConfig, error) {
 	resolved := config
-	sourceConfig, err := a.resolveConnectionSecrets(config.SourceConfig)
+	sourceConfig, sourceDatabase, err := a.resolveDataSyncEndpointConfig(config.SourceConfig, config.SourceDatabase)
 	if err != nil {
 		return resolved, fmt.Errorf("恢复源数据库连接密文失败: %w", err)
 	}
-	targetConfig, err := a.resolveConnectionSecrets(config.TargetConfig)
+	targetConfig, targetDatabase, err := a.resolveDataSyncEndpointConfig(config.TargetConfig, config.TargetDatabase)
 	if err != nil {
 		return resolved, fmt.Errorf("恢复目标数据库连接密文失败: %w", err)
 	}
 	resolved.SourceConfig = sourceConfig
 	resolved.TargetConfig = targetConfig
+	resolved.SourceDatabase = sourceDatabase
+	resolved.TargetDatabase = targetDatabase
 	return resolved, nil
 }
 
+func (a *App) resolveDataSyncEndpointConfig(raw connection.ConnectionConfig, selectedDatabase string) (connection.ConnectionConfig, string, error) {
+	resolved, err := a.resolveConnectionSecrets(raw)
+	if err != nil {
+		return resolved, selectedDatabase, err
+	}
+
+	if !strings.EqualFold(strings.TrimSpace(raw.Type), "oracle") || strings.TrimSpace(raw.ID) == "" {
+		return resolved, strings.TrimSpace(selectedDatabase), nil
+	}
+
+	repo := newSavedConnectionRepository(a.configDir, a.secretStore)
+	view, findErr := repo.Find(raw.ID)
+	if findErr != nil {
+		return resolved, strings.TrimSpace(selectedDatabase), nil
+	}
+
+	savedServiceName := strings.TrimSpace(view.Config.Database)
+	if savedServiceName == "" {
+		return resolved, strings.TrimSpace(selectedDatabase), nil
+	}
+
+	selected := strings.TrimSpace(selectedDatabase)
+	incomingDatabase := strings.TrimSpace(raw.Database)
+	if selected == "" && incomingDatabase != "" && !strings.EqualFold(incomingDatabase, savedServiceName) {
+		selected = incomingDatabase
+	}
+	resolved.Database = savedServiceName
+	return resolved, selected, nil
+}
+
 // DataSync executes a data synchronization task
 func (a *App) DataSync(config sync.SyncConfig) sync.SyncResult {
 	jobID := strings.TrimSpace(config.JobID)
diff --git a/internal/app/methods_sync_test.go b/internal/app/methods_sync_test.go
index 6257d75..8eed281 100644
--- a/internal/app/methods_sync_test.go
+++ b/internal/app/methods_sync_test.go
@@ -76,3 +76,73 @@ func TestResolveDataSyncConfigSecretsRestoresSavedSourceAndTargetPasswords(t *te
 		t.Fatalf("expected selected databases to be preserved, got source=%q target=%q", resolved.SourceConfig.Database, resolved.TargetConfig.Database)
 	}
 }
+
+func TestResolveDataSyncConfigSecretsRestoresOracleServiceNameFromSavedConnection(t *testing.T) {
+	app := NewAppWithSecretStore(newFakeAppSecretStore())
+	app.configDir = t.TempDir()
+
+	_, err := app.SaveConnection(connection.SavedConnectionInput{
+		ID:   "source-oracle",
+		Name: "Source Oracle",
+		Config: connection.ConnectionConfig{
+			ID:       "source-oracle",
+			Type:     "oracle",
+			Host:     "oracle.local",
+			Port:     1521,
+			User:     "scott",
+			Password: "source-secret",
+			Database: "ORCLPDB1",
+		},
+	})
+	if err != nil {
+		t.Fatalf("SaveConnection source returned error: %v", err)
+	}
+	_, err = app.SaveConnection(connection.SavedConnectionInput{
+		ID:   "target-mysql",
+		Name: "Target MySQL",
+		Config: connection.ConnectionConfig{
+			ID:       "target-mysql",
+			Type:     "mysql",
+			Host:     "mysql.local",
+			Port:     3306,
+			User:     "root",
+			Password: "target-secret",
+			Database: "warehouse",
+		},
+	})
+	if err != nil {
+		t.Fatalf("SaveConnection target returned error: %v", err)
+	}
+
+	resolved, err := app.resolveDataSyncConfigSecrets(datasync.SyncConfig{
+		SourceConfig: connection.ConnectionConfig{
+			ID:       "source-oracle",
+			Type:     "oracle",
+			Host:     "oracle.local",
+			Port:     1521,
+			User:     "scott",
+			Database: "APP_SCHEMA",
+		},
+		TargetConfig: connection.ConnectionConfig{
+			ID:       "target-mysql",
+			Type:     "mysql",
+			Host:     "mysql.local",
+			Port:     3306,
+			User:     "root",
+			Database: "warehouse",
+		},
+		Tables: []string{"APP_SCHEMA.ORDERS"},
+	})
+	if err != nil {
+		t.Fatalf("resolveDataSyncConfigSecrets returned error: %v", err)
+	}
+	if resolved.SourceConfig.Database != "ORCLPDB1" {
+		t.Fatalf("expected Oracle service name to be restored, got %q", resolved.SourceConfig.Database)
+	}
+	if resolved.SourceDatabase != "APP_SCHEMA" {
+		t.Fatalf("expected legacy selected schema to move into SourceDatabase, got %q", resolved.SourceDatabase)
+	}
+	if resolved.SourceConfig.Password != "source-secret" || resolved.TargetConfig.Password != "target-secret" {
+		t.Fatalf("expected source and target passwords to be restored")
+	}
+}
diff --git a/internal/app/methods_update.go b/internal/app/methods_update.go
index c914356..7b6e909 100644
--- a/internal/app/methods_update.go
+++ b/internal/app/methods_update.go
@@ -9,6 +9,7 @@ import (
 	"io"
 	"math"
 	"net/http"
+	urlpkg "net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -102,6 +103,8 @@ type githubRelease struct {
 type githubAsset struct {
 	Name               string `json:"name"`
 	BrowserDownloadURL string `json:"browser_download_url"`
+	URL                string `json:"url"`
+	Digest             string `json:"digest"`
 	Size               int64  `json:"size"`
 }
 
@@ -695,6 +698,9 @@ func downloadFileWithHashWithTimeout(url, filePath string, onProgress func(downl
 		return "", err
 	}
 	req.Header.Set("User-Agent", "GoNavi-Updater")
+	if isGitHubReleaseAssetAPIURL(url) {
+		req.Header.Set("Accept", "application/octet-stream")
+	}
 
 	resp, err := client.Do(req)
 	if err != nil {
@@ -759,6 +765,17 @@ func downloadFileWithHashWithTimeout(url, filePath string, onProgress func(downl
 	return hex.EncodeToString(hasher.Sum(nil)), nil
 }
 
+func isGitHubReleaseAssetAPIURL(urlText string) bool {
+	parsed, err := urlpkg.Parse(strings.TrimSpace(urlText))
+	if err != nil {
+		return false
+	}
+	if !strings.EqualFold(parsed.Host, "api.github.com") {
+		return false
+	}
+	return strings.Contains(strings.ToLower(strings.TrimSpace(parsed.Path)), "/releases/assets/")
+}
+
 func buildUpdateDownloadResult(info UpdateInfo, staged *stagedUpdate) updateDownloadResult {
 	result := updateDownloadResult{
 		Info:          info,
diff --git a/internal/app/navicat_ncx_import.go b/internal/app/navicat_ncx_import.go
new file mode 100644
index 0000000..7935eb5
--- /dev/null
+++ b/internal/app/navicat_ncx_import.go
@@ -0,0 +1,470 @@
+package app
+
+import (
+	"crypto/aes"
+	"crypto/sha1"
+	"encoding/hex"
+	"encoding/xml"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"GoNavi-Wails/internal/connection"
+
+	"github.com/google/uuid"
+	"golang.org/x/crypto/blowfish"
+)
+
+var errNavicatSecretDecryptFailed = errors.New("解密 Navicat 密码失败")
+
+type navicatNCXDocument struct {
+	Connections []navicatNCXConnection `xml:"Connection"`
+}
+
+type navicatNCXConnection struct {
+	ConnType                string `xml:"ConnType,attr"`
+	ConnectionName          string `xml:"ConnectionName,attr"`
+	Host                    string `xml:"Host,attr"`
+	Port                    string `xml:"Port,attr"`
+	Database                string `xml:"Database,attr"`
+	DatabaseFileName        string `xml:"DatabaseFileName,attr"`
+	UserName                string `xml:"UserName,attr"`
+	Password                string `xml:"Password,attr"`
+	SavePassword            string `xml:"SavePassword,attr"`
+	OraServiceNameType      string `xml:"OraServiceNameType,attr"`
+	TNS                     string `xml:"TNS,attr"`
+	SSL                     string `xml:"SSL,attr"`
+	SSLPGSSLMode            string `xml:"SSL_PGSSLMode,attr"`
+	SSLClientKey            string `xml:"SSL_ClientKey,attr"`
+	SSLClientCert           string `xml:"SSL_ClientCert,attr"`
+	SSLCACert               string `xml:"SSL_CACert,attr"`
+	SSLWeakCertValidation   string `xml:"SSL_WeakCertValidation,attr"`
+	SSLAllowInvalidHostName string `xml:"SSL_AllowInvalidHostName,attr"`
+	SSH                     string `xml:"SSH,attr"`
+	SSHHost                 string `xml:"SSH_Host,attr"`
+	SSHPort                 string `xml:"SSH_Port,attr"`
+	SSHUserName             string `xml:"SSH_UserName,attr"`
+	SSHAuthenMethod         string `xml:"SSH_AuthenMethod,attr"`
+	SSHPassword             string `xml:"SSH_Password,attr"`
+	SSHSavePassword         string `xml:"SSH_SavePassword,attr"`
+	SSHPrivateKey           string `xml:"SSH_PrivateKey,attr"`
+	HTTPProxy               string `xml:"HTTP_Proxy,attr"`
+	HTTPProxyHost           string `xml:"HTTP_Proxy_Host,attr"`
+	HTTPProxyPort           string `xml:"HTTP_Proxy_Port,attr"`
+	HTTPProxyUserName       string `xml:"HTTP_Proxy_UserName,attr"`
+	HTTPProxyPassword       string `xml:"HTTP_Proxy_Password,attr"`
+	HTTPProxySavePassword   string `xml:"HTTP_Proxy_SavePassword,attr"`
+}
+
+type navicatCryptoV1 struct {
+	block         *blowfish.Cipher
+	initialVector []byte
+}
+
+func isNavicatNCX(content string) bool {
+	text := strings.TrimSpace(content)
+	return strings.Contains(text, "<Connection") &&
+		strings.Contains(text, "ConnType=") &&
+		strings.Contains(text, "ConnectionName=")
+}
+
+func parseNavicatNCX(content string) ([]connection.SavedConnectionInput, error) {
+	var doc navicatNCXDocument
+	if err := xml.Unmarshal([]byte(content), &doc); err != nil {
+		return nil, err
+	}
+
+	inputs := make([]connection.SavedConnectionInput, 0, len(doc.Connections))
+	for _, item := range doc.Connections {
+		input, ok, err := parseNavicatNCXConnection(item)
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			inputs = append(inputs, input)
+		}
+	}
+	return inputs, nil
+}
+
+func parseNavicatNCXConnection(item navicatNCXConnection) (connection.SavedConnectionInput, bool, error) {
+	configType, defaultPort, supported := resolveNavicatConnectionType(item.ConnType)
+	if !supported {
+		return connection.SavedConnectionInput{}, false, nil
+	}
+
+	connectionID := "conn-" + uuid.New().String()[:8]
+	config := connection.ConnectionConfig{
+		ID:   connectionID,
+		Type: configType,
+		Port: parseNavicatInt(item.Port, defaultPort),
+		User: strings.TrimSpace(item.UserName),
+	}
+
+	if configType == "sqlite" {
+		filePath := firstNonEmpty(item.DatabaseFileName, item.Database)
+		filePath = strings.TrimSpace(filePath)
+		if filePath == "" {
+			return connection.SavedConnectionInput{}, false, nil
+		}
+		config.Host = filePath
+		config.Database = filePath
+	} else {
+		config.Host = strings.TrimSpace(item.Host)
+		config.Database = strings.TrimSpace(item.Database)
+		if configType == "oracle" && strings.TrimSpace(config.Database) == "" {
+			config.Database = strings.TrimSpace(item.TNS)
+		}
+		if configType == "oracle" && strings.EqualFold(strings.TrimSpace(item.OraServiceNameType), "SID") && strings.TrimSpace(config.Database) != "" {
+			config.ConnectionParams = "SID=" + strings.TrimSpace(config.Database)
+		}
+	}
+
+	if configType == "redis" {
+		if dbIndex, ok := parseNavicatRedisDatabase(item.Database); ok {
+			config.RedisDB = dbIndex
+		}
+		config.Database = ""
+	}
+
+	password, err := decodeNavicatSecret(item.Password)
+	if err != nil {
+		return connection.SavedConnectionInput{}, false, fmt.Errorf("连接 %s 的密码解析失败: %w", resolveNavicatConnectionName(item, config), err)
+	}
+	config.Password = password
+
+	applyNavicatSSLConfig(&config, item)
+
+	sshPassword, err := decodeNavicatSecret(item.SSHPassword)
+	if err != nil {
+		return connection.SavedConnectionInput{}, false, fmt.Errorf("连接 %s 的 SSH 密码解析失败: %w", resolveNavicatConnectionName(item, config), err)
+	}
+	applyNavicatSSHConfig(&config, item, sshPassword)
+
+	proxyPassword, err := decodeNavicatSecret(item.HTTPProxyPassword)
+	if err != nil {
+		return connection.SavedConnectionInput{}, false, fmt.Errorf("连接 %s 的代理密码解析失败: %w", resolveNavicatConnectionName(item, config), err)
+	}
+	applyNavicatHTTPProxyConfig(&config, item, proxyPassword)
+
+	name := resolveNavicatConnectionName(item, config)
+	return connection.SavedConnectionInput{
+		ID:     connectionID,
+		Name:   name,
+		Config: config,
+	}, true, nil
+}
+
+func resolveNavicatConnectionType(raw string) (string, int, bool) {
+	switch strings.ToUpper(strings.TrimSpace(raw)) {
+	case "MYSQL":
+		return "mysql", 3306, true
+	case "MARIADB":
+		return "mariadb", 3306, true
+	case "POSTGRES", "POSTGRESQL":
+		return "postgres", 5432, true
+	case "SQLSERVER", "MSSQL":
+		return "sqlserver", 1433, true
+	case "SQLITE", "SQLITE3":
+		return "sqlite", 0, true
+	case "ORACLE":
+		return "oracle", 1521, true
+	case "REDIS":
+		return "redis", 6379, true
+	case "MONGODB", "MONGO":
+		return "mongodb", 27017, true
+	case "CLICKHOUSE":
+		return "clickhouse", 9000, true
+	case "DAMENG", "DM":
+		return "dameng", 5236, true
+	default:
+		return "", 0, false
+	}
+}
+
+func resolveNavicatConnectionName(item navicatNCXConnection, config connection.ConnectionConfig) string {
+	name := strings.TrimSpace(item.ConnectionName)
+	if name != "" {
+		return name
+	}
+	if config.Type == "sqlite" {
+		return strings.TrimSpace(config.Database)
+	}
+	if strings.TrimSpace(config.User) != "" && strings.TrimSpace(config.Host) != "" {
+		return fmt.Sprintf("%s@%s:%d", strings.TrimSpace(config.User), strings.TrimSpace(config.Host), config.Port)
+	}
+	return strings.TrimSpace(config.Host)
+}
+
+func parseNavicatInt(raw string, fallback int) int {
+	value, err := strconv.Atoi(strings.TrimSpace(raw))
+	if err != nil || value <= 0 {
+		return fallback
+	}
+	return value
+}
+
+func parseNavicatBool(raw string) bool {
+	switch strings.ToLower(strings.TrimSpace(raw)) {
+	case "1", "true", "yes", "on":
+		return true
+	default:
+		return false
+	}
+}
+
+func parseNavicatRedisDatabase(raw string) (int, bool) {
+	value, err := strconv.Atoi(strings.TrimSpace(raw))
+	if err != nil || value < 0 {
+		return 0, false
+	}
+	return value, true
+}
+
+func applyNavicatSSLConfig(config *connection.ConnectionConfig, item navicatNCXConnection) {
+	useSSL := parseNavicatBool(item.SSL)
+	if !useSSL {
+		return
+	}
+	config.UseSSL = true
+	config.SSLCAPath = strings.TrimSpace(item.SSLCACert)
+	config.SSLCertPath = strings.TrimSpace(item.SSLClientCert)
+	config.SSLKeyPath = strings.TrimSpace(item.SSLClientKey)
+
+	if parseNavicatBool(item.SSLWeakCertValidation) || parseNavicatBool(item.SSLAllowInvalidHostName) {
+		config.SSLMode = "skip-verify"
+		return
+	}
+
+	if config.Type == "postgres" {
+		config.SSLMode = resolveNavicatPostgresSSLMode(item.SSLPGSSLMode)
+		if strings.TrimSpace(config.SSLMode) == "" {
+			config.SSLMode = "required"
+		}
+		return
+	}
+
+	config.SSLMode = "required"
+}
+
+func resolveNavicatPostgresSSLMode(raw string) string {
+	switch strings.ToUpper(strings.TrimSpace(raw)) {
+	case "ALLOW", "PREFER":
+		return "preferred"
+	case "REQUIRE", "VERIFY-CA", "VERIFY_CA", "VERIFY-FULL", "VERIFY_FULL":
+		return "required"
+	case "DISABLE":
+		return "disable"
+	default:
+		return ""
+	}
+}
+
+func applyNavicatSSHConfig(config *connection.ConnectionConfig, item navicatNCXConnection, password string) {
+	if !parseNavicatBool(item.SSH) {
+		return
+	}
+	config.UseSSH = true
+	config.SSH = connection.SSHConfig{
+		Host:     strings.TrimSpace(item.SSHHost),
+		Port:     parseNavicatInt(item.SSHPort, 22),
+		User:     strings.TrimSpace(item.SSHUserName),
+		Password: password,
+		KeyPath:  strings.TrimSpace(item.SSHPrivateKey),
+	}
+}
+
+func applyNavicatHTTPProxyConfig(config *connection.ConnectionConfig, item navicatNCXConnection, password string) {
+	if !parseNavicatBool(item.HTTPProxy) {
+		return
+	}
+	config.UseProxy = true
+	config.Proxy = connection.ProxyConfig{
+		Type:     "http",
+		Host:     strings.TrimSpace(item.HTTPProxyHost),
+		Port:     parseNavicatInt(item.HTTPProxyPort, 8080),
+		User:     strings.TrimSpace(item.HTTPProxyUserName),
+		Password: password,
+	}
+}
+
+func decodeNavicatSecret(raw string) (string, error) {
+	text := strings.TrimSpace(raw)
+	if text == "" {
+		return "", nil
+	}
+	if !looksLikeNavicatHex(text) {
+		return text, nil
+	}
+
+	plain, err := decryptNavicatHexSecret(text)
+	if err != nil {
+		return "", err
+	}
+	return plain, nil
+}
+
+func looksLikeNavicatHex(raw string) bool {
+	text := strings.TrimSpace(raw)
+	if text == "" || len(text)%2 != 0 {
+		return false
+	}
+	for _, ch := range text {
+		if (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F') {
+			continue
+		}
+		return false
+	}
+	return true
+}
+
+func decryptNavicatHexSecret(raw string) (string, error) {
+	ciphertext, err := hex.DecodeString(strings.TrimSpace(raw))
+	if err != nil {
+		return "", err
+	}
+
+	if plaintext, err := decryptNavicatHexSecretV1(ciphertext); err == nil {
+		return plaintext, nil
+	}
+	if plaintext, err := decryptNavicatHexSecretV2(ciphertext); err == nil {
+		return plaintext, nil
+	}
+	return "", errNavicatSecretDecryptFailed
+}
+
+func newNavicatCryptoV1() (*navicatCryptoV1, error) {
+	sum := sha1.Sum([]byte("3DC5CA39"))
+	block, err := blowfish.NewCipher(sum[:])
+	if err != nil {
+		return nil, err
+	}
+	initialVector := bytesRepeat(0xFF, block.BlockSize())
+	block.Encrypt(initialVector, initialVector)
+	return &navicatCryptoV1{
+		block:         block,
+		initialVector: initialVector,
+	}, nil
+}
+
+func decryptNavicatHexSecretV1(ciphertext []byte) (string, error) {
+	cryptoV1, err := newNavicatCryptoV1()
+	if err != nil {
+		return "", err
+	}
+	return cryptoV1.decrypt(ciphertext)
+}
+
+func (c *navicatCryptoV1) decrypt(ciphertext []byte) (string, error) {
+	blockSize := c.block.BlockSize()
+	currentVector := append([]byte(nil), c.initialVector...)
+	roundBytes := len(ciphertext) / blockSize * blockSize
+	plaintext := make([]byte, 0, len(ciphertext))
+	decryptedBlock := make([]byte, blockSize)
+
+	for offset := 0; offset < roundBytes; offset += blockSize {
+		c.block.Decrypt(decryptedBlock, ciphertext[offset:offset+blockSize])
+		plaintext = append(plaintext, xorBytes(decryptedBlock, currentVector)...)
+		currentVector = xorBytes(currentVector, ciphertext[offset:offset+blockSize])
+	}
+
+	if leftover := len(ciphertext) - roundBytes; leftover > 0 {
+		stream := make([]byte, blockSize)
+		c.block.Encrypt(stream, currentVector)
+		plaintext = append(plaintext, xorBytes(ciphertext[roundBytes:], stream[:leftover])...)
+	}
+
+	if !isLikelyNavicatPlaintext(plaintext) {
+		return "", errNavicatSecretDecryptFailed
+	}
+	return string(plaintext), nil
+}
+
+func decryptNavicatHexSecretV2(ciphertext []byte) (string, error) {
+	block, err := aes.NewCipher([]byte("libcckeylibcckey"))
+	if err != nil {
+		return "", err
+	}
+	if len(ciphertext) == 0 || len(ciphertext)%block.BlockSize() != 0 {
+		return "", errNavicatSecretDecryptFailed
+	}
+
+	plaintext := make([]byte, len(ciphertext))
+	currentVector := []byte("libcciv libcciv ")
+	for offset := 0; offset < len(ciphertext); offset += block.BlockSize() {
+		block.Decrypt(plaintext[offset:offset+block.BlockSize()], ciphertext[offset:offset+block.BlockSize()])
+		for i := 0; i < block.BlockSize(); i++ {
+			plaintext[offset+i] ^= currentVector[i]
+		}
+		currentVector = ciphertext[offset : offset+block.BlockSize()]
+	}
+
+	plaintext, err = stripPKCS7Padding(plaintext, block.BlockSize())
+	if err != nil || !isLikelyNavicatPlaintext(plaintext) {
+		return "", errNavicatSecretDecryptFailed
+	}
+	return string(plaintext), nil
+}
+
+func stripPKCS7Padding(data []byte, blockSize int) ([]byte, error) {
+	if len(data) == 0 || len(data)%blockSize != 0 {
+		return nil, errNavicatSecretDecryptFailed
+	}
+	paddingLength := int(data[len(data)-1])
+	if paddingLength <= 0 || paddingLength > blockSize || paddingLength > len(data) {
+		return nil, errNavicatSecretDecryptFailed
+	}
+	for _, value := range data[len(data)-paddingLength:] {
+		if int(value) != paddingLength {
+			return nil, errNavicatSecretDecryptFailed
+		}
+	}
+	return data[:len(data)-paddingLength], nil
+}
+
+func isLikelyNavicatPlaintext(data []byte) bool {
+	if len(data) == 0 {
+		return true
+	}
+	if !utf8.Valid(data) {
+		return false
+	}
+	for _, r := range string(data) {
+		if unicode.IsControl(r) && r != '\n' && r != '\r' && r != '\t' {
+			return false
+		}
+	}
+	return true
+}
+
+func xorBytes(left, right []byte) []byte {
+	limit := len(left)
+	if len(right) < limit {
+		limit = len(right)
+	}
+	result := make([]byte, limit)
+	for index := 0; index < limit; index++ {
+		result[index] = left[index] ^ right[index]
+	}
+	return result
+}
+
+func bytesRepeat(value byte, count int) []byte {
+	data := make([]byte, count)
+	for index := range data {
+		data[index] = value
+	}
+	return data
+}
+
+func firstNonEmpty(values ...string) string {
+	for _, value := range values {
+		if strings.TrimSpace(value) != "" {
+			return value
+		}
+	}
+	return ""
+}
diff --git a/internal/app/navicat_ncx_import_test.go b/internal/app/navicat_ncx_import_test.go
new file mode 100644
index 0000000..eddea35
--- /dev/null
+++ b/internal/app/navicat_ncx_import_test.go
@@ -0,0 +1,219 @@
+package app
+
+import (
+	"crypto/aes"
+	"encoding/hex"
+	"fmt"
+	"strings"
+	"testing"
+)
+
+func TestImportConnectionsPayloadNavicatNCXImportsConfigsAndSecrets(t *testing.T) {
+	app := NewAppWithSecretStore(newFakeAppSecretStore())
+	app.configDir = t.TempDir()
+
+	mysqlPassword := mustEncryptNavicatV1(t, "mysql-secret")
+	postgresPassword := mustEncryptNavicatV2(t, "pg-secret")
+	sshPassword := mustEncryptNavicatV1(t, "ssh-secret")
+	proxyPassword := mustEncryptNavicatV2(t, "proxy-secret")
+
+	raw := fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?>
+<Connections>
+  <Connection ConnType="MYSQL" ConnectionName="Primary MySQL" Host="127.0.0.1" Port="3307" Database="demo" UserName="root" Password="%s" SavePassword="true" />
+  <Connection ConnType="POSTGRESQL" ConnectionName="Reporting PG" Host="pg.local" Port="5433" Database="reporting" UserName="analyst" Password="%s" SavePassword="true" SSL="true" SSL_PGSSLMode="REQUIRE" SSL_CACert="/etc/ssl/ca.pem" SSH="true" SSH_Host="jump.local" SSH_Port="2222" SSH_UserName="ops" SSH_Password="%s" SSH_SavePassword="true" HTTP_Proxy="true" HTTP_Proxy_Host="proxy.local" HTTP_Proxy_Port="8088" HTTP_Proxy_UserName="proxy-user" HTTP_Proxy_Password="%s" HTTP_Proxy_SavePassword="true" />
+  <Connection ConnType="SQLITE" ConnectionName="History DB" DatabaseFileName="C:\navicat\history.db" />
+</Connections>`, mysqlPassword, postgresPassword, sshPassword, proxyPassword)
+
+	imported, err := app.ImportConnectionsPayload(raw, "")
+	if err != nil {
+		t.Fatalf("ImportConnectionsPayload returned error: %v", err)
+	}
+	if len(imported) != 3 {
+		t.Fatalf("expected 3 imported connections, got %d", len(imported))
+	}
+
+	mysqlConn := imported[0]
+	if mysqlConn.Name != "Primary MySQL" {
+		t.Fatalf("expected mysql connection name, got %q", mysqlConn.Name)
+	}
+	if mysqlConn.Config.Type != "mysql" {
+		t.Fatalf("expected mysql config type, got %q", mysqlConn.Config.Type)
+	}
+	if !mysqlConn.HasPrimaryPassword {
+		t.Fatal("expected mysql connection password flag")
+	}
+	resolvedMySQL, err := app.resolveConnectionSecrets(mysqlConn.Config)
+	if err != nil {
+		t.Fatalf("resolveConnectionSecrets for mysql returned error: %v", err)
+	}
+	if resolvedMySQL.Password != "mysql-secret" {
+		t.Fatalf("expected mysql password, got %q", resolvedMySQL.Password)
+	}
+	if resolvedMySQL.Host != "127.0.0.1" || resolvedMySQL.Port != 3307 || resolvedMySQL.Database != "demo" {
+		t.Fatalf("expected mysql host/port/database to survive import, got %#v", resolvedMySQL)
+	}
+
+	postgresConn := imported[1]
+	if postgresConn.Config.Type != "postgres" {
+		t.Fatalf("expected postgres config type, got %q", postgresConn.Config.Type)
+	}
+	if !postgresConn.HasPrimaryPassword || !postgresConn.HasSSHPassword || !postgresConn.HasProxyPassword {
+		t.Fatalf("expected postgres connection to keep primary/ssh/proxy secrets, got %#v", postgresConn)
+	}
+	if !postgresConn.Config.UseSSL || postgresConn.Config.SSLMode != "required" || postgresConn.Config.SSLCAPath != "/etc/ssl/ca.pem" {
+		t.Fatalf("expected postgres SSL settings to survive import, got %#v", postgresConn.Config)
+	}
+	if !postgresConn.Config.UseSSH || postgresConn.Config.SSH.Host != "jump.local" || postgresConn.Config.SSH.Port != 2222 || postgresConn.Config.SSH.User != "ops" {
+		t.Fatalf("expected postgres SSH settings to survive import, got %#v", postgresConn.Config.SSH)
+	}
+	if !postgresConn.Config.UseProxy || postgresConn.Config.Proxy.Type != "http" || postgresConn.Config.Proxy.Host != "proxy.local" || postgresConn.Config.Proxy.Port != 8088 || postgresConn.Config.Proxy.User != "proxy-user" {
+		t.Fatalf("expected postgres proxy settings to survive import, got %#v", postgresConn.Config.Proxy)
+	}
+	resolvedPostgres, err := app.resolveConnectionSecrets(postgresConn.Config)
+	if err != nil {
+		t.Fatalf("resolveConnectionSecrets for postgres returned error: %v", err)
+	}
+	if resolvedPostgres.Password != "pg-secret" {
+		t.Fatalf("expected postgres password, got %q", resolvedPostgres.Password)
+	}
+	if resolvedPostgres.SSH.Password != "ssh-secret" {
+		t.Fatalf("expected ssh password, got %q", resolvedPostgres.SSH.Password)
+	}
+	if resolvedPostgres.Proxy.Password != "proxy-secret" {
+		t.Fatalf("expected proxy password, got %q", resolvedPostgres.Proxy.Password)
+	}
+
+	sqliteConn := imported[2]
+	if sqliteConn.Config.Type != "sqlite" {
+		t.Fatalf("expected sqlite config type, got %q", sqliteConn.Config.Type)
+	}
+	if sqliteConn.Config.Host != `C:\navicat\history.db` || sqliteConn.Config.Database != `C:\navicat\history.db` {
+		t.Fatalf("expected sqlite file path to survive import, got %#v", sqliteConn.Config)
+	}
+}
+
+func TestImportConnectionsPayloadNavicatNCXRejectsUndecryptableSavedPassword(t *testing.T) {
+	app := NewAppWithSecretStore(newFakeAppSecretStore())
+	app.configDir = t.TempDir()
+
+	raw := `<?xml version="1.0" encoding="UTF-8"?>
+<Connections>
+  <Connection ConnType="MYSQL" ConnectionName="Broken" Host="127.0.0.1" Port="3306" UserName="root" Password="FFFF" SavePassword="true" />
+</Connections>`
+
+	_, err := app.ImportConnectionsPayload(raw, "")
+	if err == nil {
+		t.Fatal("expected invalid Navicat password import to fail")
+	}
+	if got := err.Error(); got == "" || !strings.Contains(got, "Navicat") && !strings.Contains(got, "密码") {
+		t.Fatalf("expected navicat password error, got %v", err)
+	}
+}
+
+func TestImportConnectionsPayloadNavicatNCXMapsOracleSIDAndRedisDB(t *testing.T) {
+	app := NewAppWithSecretStore(newFakeAppSecretStore())
+	app.configDir = t.TempDir()
+
+	oraclePassword := mustEncryptNavicatV2(t, "oracle-secret")
+	redisPassword := mustEncryptNavicatV1(t, "redis-secret")
+
+	raw := fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?>
+<Connections>
+  <Connection ConnType="ORACLE" ConnectionName="Oracle SID" Host="oracle.local" Port="1521" Database="ORCL" OraServiceNameType="SID" UserName="system" Password="%s" SavePassword="true" />
+  <Connection ConnType="REDIS" ConnectionName="Redis Cache" Host="redis.local" Port="6379" Database="5" UserName="default" Password="%s" SavePassword="true" />
+</Connections>`, oraclePassword, redisPassword)
+
+	imported, err := app.ImportConnectionsPayload(raw, "")
+	if err != nil {
+		t.Fatalf("ImportConnectionsPayload returned error: %v", err)
+	}
+	if len(imported) != 2 {
+		t.Fatalf("expected 2 imported connections, got %d", len(imported))
+	}
+
+	oracleConn := imported[0]
+	if oracleConn.Config.Type != "oracle" || oracleConn.Config.ConnectionParams != "SID=ORCL" {
+		t.Fatalf("expected oracle SID connection params, got %#v", oracleConn.Config)
+	}
+	resolvedOracle, err := app.resolveConnectionSecrets(oracleConn.Config)
+	if err != nil {
+		t.Fatalf("resolveConnectionSecrets for oracle returned error: %v", err)
+	}
+	if resolvedOracle.Password != "oracle-secret" {
+		t.Fatalf("expected oracle password, got %q", resolvedOracle.Password)
+	}
+
+	redisConn := imported[1]
+	if redisConn.Config.Type != "redis" || redisConn.Config.RedisDB != 5 {
+		t.Fatalf("expected redis db index to survive import, got %#v", redisConn.Config)
+	}
+	resolvedRedis, err := app.resolveConnectionSecrets(redisConn.Config)
+	if err != nil {
+		t.Fatalf("resolveConnectionSecrets for redis returned error: %v", err)
+	}
+	if resolvedRedis.Password != "redis-secret" {
+		t.Fatalf("expected redis password, got %q", resolvedRedis.Password)
+	}
+}
+
+func mustEncryptNavicatV1(t *testing.T, value string) string {
+	t.Helper()
+	cryptoV1, err := newNavicatCryptoV1()
+	if err != nil {
+		t.Fatalf("newNavicatCryptoV1 returned error: %v", err)
+	}
+	return cryptoV1.encrypt([]byte(value))
+}
+
+func mustEncryptNavicatV2(t *testing.T, value string) string {
+	t.Helper()
+	block, err := aes.NewCipher([]byte("libcckeylibcckey"))
+	if err != nil {
+		t.Fatalf("aes.NewCipher returned error: %v", err)
+	}
+	plaintext := applyPKCS7Padding([]byte(value), block.BlockSize())
+	currentVector := []byte("libcciv libcciv ")
+	ciphertext := make([]byte, len(plaintext))
+	for offset := 0; offset < len(plaintext); offset += block.BlockSize() {
+		blockInput := xorBytes(plaintext[offset:offset+block.BlockSize()], currentVector)
+		block.Encrypt(ciphertext[offset:offset+block.BlockSize()], blockInput)
+		currentVector = ciphertext[offset : offset+block.BlockSize()]
+	}
+	return strings.ToUpper(hex.EncodeToString(ciphertext))
+}
+
+func (c *navicatCryptoV1) encrypt(plaintext []byte) string {
+	blockSize := c.block.BlockSize()
+	currentVector := append([]byte(nil), c.initialVector...)
+	roundBytes := len(plaintext) / blockSize * blockSize
+	ciphertext := make([]byte, 0, len(plaintext))
+	encryptedBlock := make([]byte, blockSize)
+
+	for offset := 0; offset < roundBytes; offset += blockSize {
+		blockInput := xorBytes(plaintext[offset:offset+blockSize], currentVector)
+		c.block.Encrypt(encryptedBlock, blockInput)
+		ciphertext = append(ciphertext, encryptedBlock...)
+		currentVector = xorBytes(currentVector, encryptedBlock)
+	}
+
+	if leftover := len(plaintext) - roundBytes; leftover > 0 {
+		stream := make([]byte, blockSize)
+		c.block.Encrypt(stream, currentVector)
+		ciphertext = append(ciphertext, xorBytes(plaintext[roundBytes:], stream[:leftover])...)
+	}
+
+	return strings.ToUpper(hex.EncodeToString(ciphertext))
+}
+
+func applyPKCS7Padding(data []byte, blockSize int) []byte {
+	paddingLength := blockSize - (len(data) % blockSize)
+	if paddingLength == 0 {
+		paddingLength = blockSize
+	}
+	padded := make([]byte, 0, len(data)+paddingLength)
+	padded = append(padded, data...)
+	for i := 0; i < paddingLength; i++ {
+		padded = append(padded, byte(paddingLength))
+	}
+	return padded
+}
diff --git a/internal/app/saved_connections.go b/internal/app/saved_connections.go
index 7b89159..eaeaeb7 100644
--- a/internal/app/saved_connections.go
+++ b/internal/app/saved_connections.go
@@ -20,14 +20,15 @@ const (
 )
 
 type connectionSecretBundle struct {
-	Password             string `json:"password,omitempty"`
-	SSHPassword          string `json:"sshPassword,omitempty"`
-	ProxyPassword        string `json:"proxyPassword,omitempty"`
-	HTTPTunnelPassword   string `json:"httpTunnelPassword,omitempty"`
-	MySQLReplicaPassword string `json:"mysqlReplicaPassword,omitempty"`
-	MongoReplicaPassword string `json:"mongoReplicaPassword,omitempty"`
-	OpaqueURI            string `json:"opaqueURI,omitempty"`
-	OpaqueDSN            string `json:"opaqueDSN,omitempty"`
+	Password              string `json:"password,omitempty"`
+	SSHPassword           string `json:"sshPassword,omitempty"`
+	ProxyPassword         string `json:"proxyPassword,omitempty"`
+	HTTPTunnelPassword    string `json:"httpTunnelPassword,omitempty"`
+	MySQLReplicaPassword  string `json:"mysqlReplicaPassword,omitempty"`
+	MongoReplicaPassword  string `json:"mongoReplicaPassword,omitempty"`
+	RedisSentinelPassword string `json:"redisSentinelPassword,omitempty"`
+	OpaqueURI             string `json:"opaqueURI,omitempty"`
+	OpaqueDSN             string `json:"opaqueDSN,omitempty"`
 }
 
 type savedConnectionsFile struct {
@@ -60,6 +61,7 @@ func (b connectionSecretBundle) hasAny() bool {
 		strings.TrimSpace(b.HTTPTunnelPassword) != "" ||
 		strings.TrimSpace(b.MySQLReplicaPassword) != "" ||
 		strings.TrimSpace(b.MongoReplicaPassword) != "" ||
+		strings.TrimSpace(b.RedisSentinelPassword) != "" ||
 		strings.TrimSpace(b.OpaqueURI) != "" ||
 		strings.TrimSpace(b.OpaqueDSN) != ""
 }
@@ -84,6 +86,9 @@ func mergeConnectionSecretBundles(base, overlay connectionSecretBundle) connecti
 	if strings.TrimSpace(overlay.MongoReplicaPassword) != "" {
 		merged.MongoReplicaPassword = overlay.MongoReplicaPassword
 	}
+	if strings.TrimSpace(overlay.RedisSentinelPassword) != "" {
+		merged.RedisSentinelPassword = overlay.RedisSentinelPassword
+	}
 	if strings.TrimSpace(overlay.OpaqueURI) != "" {
 		merged.OpaqueURI = overlay.OpaqueURI
 	}
@@ -113,6 +118,9 @@ func applyConnectionSecretClears(bundle connectionSecretBundle, input connection
 	if input.ClearMongoReplicaPassword {
 		cleared.MongoReplicaPassword = ""
 	}
+	if input.ClearRedisSentinelPassword {
+		cleared.RedisSentinelPassword = ""
+	}
 	if input.ClearOpaqueURI {
 		cleared.OpaqueURI = ""
 	}
@@ -154,21 +162,22 @@ func splitConnectionSecrets(input connection.SavedConnectionInput) (connection.S
 	meta = stripConnectionSecretFields(meta)
 
 	view := connection.SavedConnectionView{
-		ID:                      id,
-		Name:                    strings.TrimSpace(input.Name),
-		Config:                  meta,
-		IncludeDatabases:        cloneStringSlice(input.IncludeDatabases),
-		IncludeRedisDatabases:   cloneIntSlice(input.IncludeRedisDatabases),
-		IconType:                strings.TrimSpace(input.IconType),
-		IconColor:               strings.TrimSpace(input.IconColor),
-		HasPrimaryPassword:      strings.TrimSpace(bundle.Password) != "",
-		HasSSHPassword:          strings.TrimSpace(bundle.SSHPassword) != "",
-		HasProxyPassword:        strings.TrimSpace(bundle.ProxyPassword) != "",
-		HasHTTPTunnelPassword:   strings.TrimSpace(bundle.HTTPTunnelPassword) != "",
-		HasMySQLReplicaPassword: strings.TrimSpace(bundle.MySQLReplicaPassword) != "",
-		HasMongoReplicaPassword: strings.TrimSpace(bundle.MongoReplicaPassword) != "",
-		HasOpaqueURI:            strings.TrimSpace(bundle.OpaqueURI) != "",
-		HasOpaqueDSN:            strings.TrimSpace(bundle.OpaqueDSN) != "",
+		ID:                       id,
+		Name:                     strings.TrimSpace(input.Name),
+		Config:                   meta,
+		IncludeDatabases:         cloneStringSlice(input.IncludeDatabases),
+		IncludeRedisDatabases:    cloneIntSlice(input.IncludeRedisDatabases),
+		IconType:                 strings.TrimSpace(input.IconType),
+		IconColor:                strings.TrimSpace(input.IconColor),
+		HasPrimaryPassword:       strings.TrimSpace(bundle.Password) != "",
+		HasSSHPassword:           strings.TrimSpace(bundle.SSHPassword) != "",
+		HasProxyPassword:         strings.TrimSpace(bundle.ProxyPassword) != "",
+		HasHTTPTunnelPassword:    strings.TrimSpace(bundle.HTTPTunnelPassword) != "",
+		HasMySQLReplicaPassword:  strings.TrimSpace(bundle.MySQLReplicaPassword) != "",
+		HasMongoReplicaPassword:  strings.TrimSpace(bundle.MongoReplicaPassword) != "",
+		HasRedisSentinelPassword: strings.TrimSpace(bundle.RedisSentinelPassword) != "",
+		HasOpaqueURI:             strings.TrimSpace(bundle.OpaqueURI) != "",
+		HasOpaqueDSN:             strings.TrimSpace(bundle.OpaqueDSN) != "",
 	}
 	return view, bundle
 }
@@ -358,7 +367,7 @@ func (r *savedConnectionRepository) loadSecretBundleFromStore(view connection.Sa
 
 func savedConnectionViewHasSecrets(view connection.SavedConnectionView) bool {
 	return view.HasPrimaryPassword || view.HasSSHPassword || view.HasProxyPassword || view.HasHTTPTunnelPassword ||
-		view.HasMySQLReplicaPassword || view.HasMongoReplicaPassword || view.HasOpaqueURI || view.HasOpaqueDSN
+		view.HasMySQLReplicaPassword || view.HasMongoReplicaPassword || view.HasRedisSentinelPassword || view.HasOpaqueURI || view.HasOpaqueDSN
 }
 
 func applyConnectionBundleFlags(view *connection.SavedConnectionView, bundle connectionSecretBundle) {
@@ -368,6 +377,7 @@ func applyConnectionBundleFlags(view *connection.SavedConnectionView, bundle con
 	view.HasHTTPTunnelPassword = strings.TrimSpace(bundle.HTTPTunnelPassword) != ""
 	view.HasMySQLReplicaPassword = strings.TrimSpace(bundle.MySQLReplicaPassword) != ""
 	view.HasMongoReplicaPassword = strings.TrimSpace(bundle.MongoReplicaPassword) != ""
+	view.HasRedisSentinelPassword = strings.TrimSpace(bundle.RedisSentinelPassword) != ""
 	view.HasOpaqueURI = strings.TrimSpace(bundle.OpaqueURI) != ""
 	view.HasOpaqueDSN = strings.TrimSpace(bundle.OpaqueDSN) != ""
 }
diff --git a/internal/app/saved_connections_test.go b/internal/app/saved_connections_test.go
index 72fc153..35d812f 100644
--- a/internal/app/saved_connections_test.go
+++ b/internal/app/saved_connections_test.go
@@ -42,6 +42,36 @@ func TestSplitConnectionSecretsStripsPasswordsAndOpaqueDSN(t *testing.T) {
 	}
 }
 
+func TestSplitConnectionSecretsStripsRedisSentinelPassword(t *testing.T) {
+	withTestGOOS(t, "linux")
+
+	input := connection.SavedConnectionInput{
+		ID:   "redis-sentinel",
+		Name: "Redis Sentinel",
+		Config: connection.ConnectionConfig{
+			ID:                    "redis-sentinel",
+			Type:                  "redis",
+			Host:                  "sentinel.local",
+			Port:                  26379,
+			Topology:              "sentinel",
+			RedisSentinelMaster:   "mymaster",
+			RedisSentinelUser:     "sentinel-user",
+			RedisSentinelPassword: "sentinel-secret",
+		},
+	}
+
+	view, bundle := splitConnectionSecrets(input)
+	if view.Config.RedisSentinelPassword != "" {
+		t.Fatal("metadata must not keep Redis Sentinel password")
+	}
+	if bundle.RedisSentinelPassword != "sentinel-secret" {
+		t.Fatalf("bundle should keep Redis Sentinel password, got %q", bundle.RedisSentinelPassword)
+	}
+	if !view.HasRedisSentinelPassword {
+		t.Fatal("expected view to report Redis Sentinel password")
+	}
+}
+
 type fakeAppSecretStore struct {
 	items map[string][]byte
 }
diff --git a/internal/app/saved_queries.go b/internal/app/saved_queries.go
new file mode 100644
index 0000000..ca4a714
--- /dev/null
+++ b/internal/app/saved_queries.go
@@ -0,0 +1,287 @@
+package app
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"github.com/google/uuid"
+)
+
+const savedQueriesFileName = "saved_queries.json"
+
+var savedQueriesMu sync.Mutex
+
+type savedQueriesFile struct {
+	Queries []connection.SavedQuery `json:"queries"`
+}
+
+type savedQueryRepository struct {
+	configDir string
+}
+
+func newSavedQueryRepository(configDir string) *savedQueryRepository {
+	if strings.TrimSpace(configDir) == "" {
+		configDir = resolveAppConfigDir()
+	}
+	return &savedQueryRepository{configDir: configDir}
+}
+
+func (r *savedQueryRepository) queriesPath() string {
+	return filepath.Join(r.configDir, savedQueriesFileName)
+}
+
+func (r *savedQueryRepository) load() ([]connection.SavedQuery, error) {
+	data, err := os.ReadFile(r.queriesPath())
+	if err != nil {
+		if os.IsNotExist(err) {
+			return []connection.SavedQuery{}, nil
+		}
+		return nil, err
+	}
+
+	var file savedQueriesFile
+	if err := json.Unmarshal(data, &file); err != nil {
+		return nil, err
+	}
+	if file.Queries == nil {
+		return []connection.SavedQuery{}, nil
+	}
+	return sanitizeSavedQueries(file.Queries), nil
+}
+
+func (r *savedQueryRepository) saveAll(queries []connection.SavedQuery) error {
+	if err := os.MkdirAll(r.configDir, 0o755); err != nil {
+		return err
+	}
+	payload, err := json.MarshalIndent(savedQueriesFile{Queries: sanitizeSavedQueries(queries)}, "", "  ")
+	if err != nil {
+		return err
+	}
+	return writeSavedQueriesFileAtomic(r.queriesPath(), payload)
+}
+
+func writeSavedQueriesFileAtomic(targetPath string, payload []byte) error {
+	dir := filepath.Dir(targetPath)
+	temp, err := os.CreateTemp(dir, ".saved_queries_*.tmp")
+	if err != nil {
+		return err
+	}
+	tempPath := temp.Name()
+	cleanup := true
+	defer func() {
+		if cleanup {
+			_ = os.Remove(tempPath)
+		}
+	}()
+
+	if _, err := temp.Write(payload); err != nil {
+		_ = temp.Close()
+		return err
+	}
+	if err := temp.Sync(); err != nil {
+		_ = temp.Close()
+		return err
+	}
+	if err := temp.Close(); err != nil {
+		return err
+	}
+	if err := os.Chmod(tempPath, 0o644); err != nil {
+		return err
+	}
+	if err := os.Rename(tempPath, targetPath); err != nil {
+		if removeErr := os.Remove(targetPath); removeErr != nil && !os.IsNotExist(removeErr) {
+			return err
+		}
+		if retryErr := os.Rename(tempPath, targetPath); retryErr != nil {
+			return retryErr
+		}
+	}
+	cleanup = false
+	return nil
+}
+
+func (r *savedQueryRepository) Save(input connection.SavedQuery) (connection.SavedQuery, error) {
+	savedQueriesMu.Lock()
+	defer savedQueriesMu.Unlock()
+
+	query, ok := sanitizeSavedQuery(input, 0, true)
+	if !ok {
+		return connection.SavedQuery{}, fmt.Errorf("saved query requires sql, connectionId and dbName")
+	}
+
+	queries, err := r.load()
+	if err != nil {
+		return connection.SavedQuery{}, err
+	}
+
+	replaced := false
+	for index, item := range queries {
+		if item.ID == query.ID {
+			queries[index] = query
+			replaced = true
+			break
+		}
+	}
+	if !replaced {
+		queries = append(queries, query)
+	}
+	if err := r.saveAll(queries); err != nil {
+		return connection.SavedQuery{}, err
+	}
+	return query, nil
+}
+
+func (r *savedQueryRepository) Import(payload connection.SavedQueryImportPayload, currentConnections []connection.SavedConnectionView) ([]connection.SavedQuery, error) {
+	savedQueriesMu.Lock()
+	defer savedQueriesMu.Unlock()
+
+	existing, err := r.load()
+	if err != nil {
+		return nil, err
+	}
+
+	byID := make(map[string]int, len(existing)+len(payload.Queries))
+	for index, item := range existing {
+		byID[item.ID] = index
+	}
+
+	imported := resolveSavedQueryBindings(payload.Queries, currentConnections, payload.LegacyConnections)
+	for index, item := range imported {
+		query, ok := sanitizeSavedQuery(item, index, true)
+		if !ok {
+			continue
+		}
+		if existingIndex, found := byID[query.ID]; found {
+			existing[existingIndex] = query
+			continue
+		}
+		byID[query.ID] = len(existing)
+		existing = append(existing, query)
+	}
+
+	if err := r.saveAll(existing); err != nil {
+		return nil, err
+	}
+	return existing, nil
+}
+
+func (r *savedQueryRepository) Rebind(id string, target connection.SavedConnectionView) (connection.SavedQuery, error) {
+	savedQueriesMu.Lock()
+	defer savedQueriesMu.Unlock()
+
+	targetID := strings.TrimSpace(id)
+	if targetID == "" || strings.TrimSpace(target.ID) == "" {
+		return connection.SavedQuery{}, fmt.Errorf("saved query and target connection are required")
+	}
+
+	queries, err := r.load()
+	if err != nil {
+		return connection.SavedQuery{}, err
+	}
+
+	for index, item := range queries {
+		if item.ID != targetID {
+			continue
+		}
+		if strings.TrimSpace(item.OriginalConnectionID) == "" && strings.TrimSpace(item.ConnectionID) != strings.TrimSpace(target.ID) {
+			item.OriginalConnectionID = item.ConnectionID
+		}
+		item.ConnectionID = target.ID
+		item = applySavedQueryActiveBinding(item, target)
+		query, ok := sanitizeSavedQuery(item, index, false)
+		if !ok {
+			return connection.SavedQuery{}, fmt.Errorf("saved query is invalid: %s", targetID)
+		}
+		queries[index] = query
+		if err := r.saveAll(queries); err != nil {
+			return connection.SavedQuery{}, err
+		}
+		return query, nil
+	}
+
+	return connection.SavedQuery{}, fmt.Errorf("saved query not found: %s", targetID)
+}
+
+func (r *savedQueryRepository) Delete(id string) error {
+	savedQueriesMu.Lock()
+	defer savedQueriesMu.Unlock()
+
+	targetID := strings.TrimSpace(id)
+	if targetID == "" {
+		return nil
+	}
+
+	queries, err := r.load()
+	if err != nil {
+		return err
+	}
+	filtered := queries[:0]
+	for _, item := range queries {
+		if item.ID != targetID {
+			filtered = append(filtered, item)
+		}
+	}
+	return r.saveAll(filtered)
+}
+
+func sanitizeSavedQueries(items []connection.SavedQuery) []connection.SavedQuery {
+	result := make([]connection.SavedQuery, 0, len(items))
+	seen := make(map[string]struct{}, len(items))
+	for index, item := range items {
+		query, ok := sanitizeSavedQuery(item, index, false)
+		if !ok {
+			continue
+		}
+		if _, exists := seen[query.ID]; exists {
+			continue
+		}
+		seen[query.ID] = struct{}{}
+		result = append(result, query)
+	}
+	return result
+}
+
+func sanitizeSavedQuery(input connection.SavedQuery, index int, allowGeneratedID bool) (connection.SavedQuery, bool) {
+	id := strings.TrimSpace(input.ID)
+	if id == "" && allowGeneratedID {
+		id = "saved-" + uuid.NewString()
+	}
+	if id == "" {
+		return connection.SavedQuery{}, false
+	}
+
+	sqlText := input.SQL
+	connectionID := strings.TrimSpace(input.ConnectionID)
+	dbName := strings.TrimSpace(input.DBName)
+	if strings.TrimSpace(sqlText) == "" || connectionID == "" || dbName == "" {
+		return connection.SavedQuery{}, false
+	}
+
+	name := strings.TrimSpace(input.Name)
+	if name == "" {
+		name = fmt.Sprintf("查询-%d", index+1)
+	}
+	createdAt := input.CreatedAt
+	if createdAt <= 0 {
+		createdAt = time.Now().UnixMilli()
+	}
+
+	return connection.SavedQuery{
+		ID:                    id,
+		Name:                  name,
+		SQL:                   sqlText,
+		ConnectionID:          connectionID,
+		DBName:                dbName,
+		CreatedAt:             createdAt,
+		ConnectionFingerprint: strings.TrimSpace(input.ConnectionFingerprint),
+		FingerprintVersion:    strings.TrimSpace(input.FingerprintVersion),
+		BindingStatus:         strings.TrimSpace(input.BindingStatus),
+		OriginalConnectionID:  strings.TrimSpace(input.OriginalConnectionID),
+	}, true
+}
diff --git a/internal/app/saved_queries_test.go b/internal/app/saved_queries_test.go
new file mode 100644
index 0000000..d9d0ed8
--- /dev/null
+++ b/internal/app/saved_queries_test.go
@@ -0,0 +1,416 @@
+package app
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"sync"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/secretstore"
+)
+
+func TestSavedQueryRepositorySaveUpdateAndDelete(t *testing.T) {
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	app.configDir = t.TempDir()
+
+	query := connection.SavedQuery{
+		ID:           "saved-1",
+		Name:         "Orders",
+		SQL:          "select * from orders",
+		ConnectionID: "conn-1",
+		DBName:       "app",
+		CreatedAt:    100,
+	}
+	if _, err := app.SaveQuery(query); err != nil {
+		t.Fatalf("SaveQuery returned error: %v", err)
+	}
+
+	saved, err := app.GetSavedQueries()
+	if err != nil {
+		t.Fatalf("GetSavedQueries returned error: %v", err)
+	}
+	if len(saved) != 1 || saved[0].Name != "Orders" {
+		t.Fatalf("expected saved query to be persisted, got %#v", saved)
+	}
+
+	query.Name = "Orders Updated"
+	query.SQL = "select id from orders"
+	if _, err := app.SaveQuery(query); err != nil {
+		t.Fatalf("SaveQuery update returned error: %v", err)
+	}
+	saved, err = app.GetSavedQueries()
+	if err != nil {
+		t.Fatalf("GetSavedQueries after update returned error: %v", err)
+	}
+	if len(saved) != 1 || saved[0].Name != "Orders Updated" || saved[0].SQL != "select id from orders" {
+		t.Fatalf("expected saved query to be updated in place, got %#v", saved)
+	}
+
+	if err := app.DeleteQuery("saved-1"); err != nil {
+		t.Fatalf("DeleteQuery returned error: %v", err)
+	}
+	saved, err = app.GetSavedQueries()
+	if err != nil {
+		t.Fatalf("GetSavedQueries after delete returned error: %v", err)
+	}
+	if len(saved) != 0 {
+		t.Fatalf("expected saved query to be deleted, got %#v", saved)
+	}
+	if _, err := os.Stat(filepath.Join(app.configDir, savedQueriesFileName)); err != nil {
+		t.Fatalf("expected saved query file to remain readable after delete: %v", err)
+	}
+}
+
+func TestImportSavedQueriesUpsertsAndSkipsInvalidItems(t *testing.T) {
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	app.configDir = t.TempDir()
+
+	if _, err := app.SaveQuery(connection.SavedQuery{
+		ID:           "saved-1",
+		Name:         "Old",
+		SQL:          "select 1",
+		ConnectionID: "conn-1",
+		DBName:       "app",
+		CreatedAt:    100,
+	}); err != nil {
+		t.Fatalf("seed SaveQuery returned error: %v", err)
+	}
+
+	imported, err := app.ImportSavedQueries(connection.SavedQueryImportPayload{
+		Queries: []connection.SavedQuery{
+			{
+				ID:           "saved-1",
+				Name:         "New",
+				SQL:          "select 2",
+				ConnectionID: "conn-1",
+				DBName:       "app",
+				CreatedAt:    100,
+			},
+			{
+				ID:           "saved-2",
+				Name:         "Second",
+				SQL:          "select 3",
+				ConnectionID: "conn-2",
+				DBName:       "analytics",
+				CreatedAt:    200,
+			},
+			{
+				ID:           "invalid",
+				Name:         "Missing SQL",
+				ConnectionID: "conn-3",
+				DBName:       "app",
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("ImportSavedQueries returned error: %v", err)
+	}
+	if len(imported) != 2 {
+		t.Fatalf("expected 2 valid saved queries after import, got %#v", imported)
+	}
+	if imported[0].Name != "New" || imported[0].SQL != "select 2" {
+		t.Fatalf("expected import to upsert saved-1, got %#v", imported[0])
+	}
+	if imported[1].ID != "saved-2" {
+		t.Fatalf("expected import to append saved-2, got %#v", imported[1])
+	}
+}
+
+func TestSavedQueryRepositoryPreservesSQLWhitespace(t *testing.T) {
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	app.configDir = t.TempDir()
+
+	query := connection.SavedQuery{
+		ID:           "saved-whitespace",
+		Name:         "Formatted",
+		SQL:          "\n  select * from orders;\n",
+		ConnectionID: "conn-1",
+		DBName:       "app",
+		CreatedAt:    100,
+	}
+	persisted, err := app.SaveQuery(query)
+	if err != nil {
+		t.Fatalf("SaveQuery returned error: %v", err)
+	}
+	if persisted.SQL != query.SQL {
+		t.Fatalf("expected saved SQL whitespace to be preserved, got %q", persisted.SQL)
+	}
+}
+
+func TestSavedQueryRepositorySerializesConcurrentWrites(t *testing.T) {
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	app.configDir = t.TempDir()
+
+	const count = 24
+	var wg sync.WaitGroup
+	errCh := make(chan error, count)
+	for index := 0; index < count; index++ {
+		index := index
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			_, err := app.SaveQuery(connection.SavedQuery{
+				ID:           fmt.Sprintf("saved-%02d", index),
+				Name:         fmt.Sprintf("Query %02d", index),
+				SQL:          fmt.Sprintf("select %d", index),
+				ConnectionID: "conn-1",
+				DBName:       "app",
+				CreatedAt:    int64(index + 1),
+			})
+			if err != nil {
+				errCh <- err
+			}
+		}()
+	}
+	wg.Wait()
+	close(errCh)
+
+	for err := range errCh {
+		t.Fatalf("SaveQuery returned error during concurrent write: %v", err)
+	}
+
+	saved, err := app.GetSavedQueries()
+	if err != nil {
+		t.Fatalf("GetSavedQueries returned error: %v", err)
+	}
+	if len(saved) != count {
+		t.Fatalf("expected %d saved queries after concurrent writes, got %d: %#v", count, len(saved), saved)
+	}
+}
+
+func TestImportSavedQueriesRebindsLegacyConnectionByUniqueFingerprint(t *testing.T) {
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	app.configDir = t.TempDir()
+
+	current, err := app.SaveConnection(connection.SavedConnectionInput{
+		ID:   "conn-current",
+		Name: "Current",
+		Config: connection.ConnectionConfig{
+			ID:       "conn-current",
+			Type:     "postgres",
+			Host:     "db.local",
+			Port:     5432,
+			User:     "app",
+			Database: "app",
+			Password: "new-secret",
+		},
+	})
+	if err != nil {
+		t.Fatalf("SaveConnection returned error: %v", err)
+	}
+
+	imported, err := app.ImportSavedQueries(connection.SavedQueryImportPayload{
+		Queries: []connection.SavedQuery{
+			{
+				ID:           "saved-legacy",
+				Name:         "Legacy",
+				SQL:          "select 1",
+				ConnectionID: "conn-old",
+				DBName:       "app",
+				CreatedAt:    100,
+			},
+		},
+		LegacyConnections: []connection.SavedConnectionInput{
+			{
+				ID:   "conn-old",
+				Name: "Old",
+				Config: connection.ConnectionConfig{
+					ID:       "conn-old",
+					Type:     "postgres",
+					Host:     "DB.LOCAL",
+					Port:     5432,
+					User:     "app",
+					Database: "app",
+					Password: "old-secret",
+				},
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("ImportSavedQueries returned error: %v", err)
+	}
+	if len(imported) != 1 {
+		t.Fatalf("expected 1 imported query, got %#v", imported)
+	}
+	query := imported[0]
+	if query.ConnectionID != current.ID {
+		t.Fatalf("expected query to rebind to %s, got %#v", current.ID, query)
+	}
+	if query.OriginalConnectionID != "conn-old" {
+		t.Fatalf("expected original connection id to be preserved, got %#v", query)
+	}
+	if query.BindingStatus != savedQueryBindingRebound {
+		t.Fatalf("expected rebound binding status, got %#v", query)
+	}
+	if query.ConnectionFingerprint == "" || query.FingerprintVersion != savedQueryFingerprintVersion {
+		t.Fatalf("expected fingerprint metadata, got %#v", query)
+	}
+}
+
+func TestImportSavedQueriesDoesNotRebindAmbiguousFingerprint(t *testing.T) {
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	app.configDir = t.TempDir()
+
+	for _, id := range []string{"conn-a", "conn-b"} {
+		if _, err := app.SaveConnection(connection.SavedConnectionInput{
+			ID:   id,
+			Name: id,
+			Config: connection.ConnectionConfig{
+				ID:       id,
+				Type:     "mysql",
+				Host:     "db.local",
+				Port:     3306,
+				User:     "app",
+				Database: "app",
+			},
+		}); err != nil {
+			t.Fatalf("SaveConnection %s returned error: %v", id, err)
+		}
+	}
+
+	imported, err := app.ImportSavedQueries(connection.SavedQueryImportPayload{
+		Queries: []connection.SavedQuery{
+			{
+				ID:           "saved-ambiguous",
+				Name:         "Ambiguous",
+				SQL:          "select 1",
+				ConnectionID: "conn-old",
+				DBName:       "app",
+				CreatedAt:    100,
+			},
+		},
+		LegacyConnections: []connection.SavedConnectionInput{
+			{
+				ID:   "conn-old",
+				Name: "Old",
+				Config: connection.ConnectionConfig{
+					ID:       "conn-old",
+					Type:     "mysql",
+					Host:     "db.local",
+					Port:     3306,
+					User:     "app",
+					Database: "app",
+				},
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("ImportSavedQueries returned error: %v", err)
+	}
+	if len(imported) != 1 {
+		t.Fatalf("expected 1 imported query, got %#v", imported)
+	}
+	query := imported[0]
+	if query.ConnectionID != "conn-old" {
+		t.Fatalf("expected ambiguous query to keep old connection id, got %#v", query)
+	}
+	if query.BindingStatus != savedQueryBindingOrphan {
+		t.Fatalf("expected orphan binding status, got %#v", query)
+	}
+}
+
+func TestGetSavedQueriesRebindsStoredFingerprint(t *testing.T) {
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	app.configDir = t.TempDir()
+
+	current, err := app.SaveConnection(connection.SavedConnectionInput{
+		ID:   "conn-current",
+		Name: "Current",
+		Config: connection.ConnectionConfig{
+			ID:       "conn-current",
+			Type:     "postgres",
+			Host:     "db.local",
+			Port:     5432,
+			User:     "app",
+			Database: "app",
+		},
+	})
+	if err != nil {
+		t.Fatalf("SaveConnection returned error: %v", err)
+	}
+	fingerprint, ok := buildSavedConnectionFingerprint(current)
+	if !ok {
+		t.Fatal("expected current connection fingerprint to be available")
+	}
+	if err := app.savedQueryRepository().saveAll([]connection.SavedQuery{
+		{
+			ID:                    "saved-stored-fingerprint",
+			Name:                  "Stored Fingerprint",
+			SQL:                   "select 1",
+			ConnectionID:          "conn-old",
+			DBName:                "app",
+			CreatedAt:             100,
+			ConnectionFingerprint: fingerprint,
+			FingerprintVersion:    savedQueryFingerprintVersion,
+		},
+	}); err != nil {
+		t.Fatalf("saveAll returned error: %v", err)
+	}
+
+	queries, err := app.GetSavedQueries()
+	if err != nil {
+		t.Fatalf("GetSavedQueries returned error: %v", err)
+	}
+	if len(queries) != 1 {
+		t.Fatalf("expected 1 query, got %#v", queries)
+	}
+	if queries[0].ConnectionID != current.ID {
+		t.Fatalf("expected query to rebind to %s, got %#v", current.ID, queries[0])
+	}
+	if queries[0].OriginalConnectionID != "conn-old" {
+		t.Fatalf("expected original connection id to be preserved, got %#v", queries[0])
+	}
+	if queries[0].BindingStatus != savedQueryBindingRebound {
+		t.Fatalf("expected rebound binding status, got %#v", queries[0])
+	}
+}
+
+func TestRebindSavedQueryUpdatesConnectionAndFingerprint(t *testing.T) {
+	app := NewAppWithSecretStore(secretstore.NewUnavailableStore("test"))
+	app.configDir = t.TempDir()
+
+	target, err := app.SaveConnection(connection.SavedConnectionInput{
+		ID:   "conn-target",
+		Name: "Target",
+		Config: connection.ConnectionConfig{
+			ID:       "conn-target",
+			Type:     "postgres",
+			Host:     "db.local",
+			Port:     5432,
+			User:     "app",
+			Database: "app",
+		},
+	})
+	if err != nil {
+		t.Fatalf("SaveConnection returned error: %v", err)
+	}
+	if _, err := app.SaveQuery(connection.SavedQuery{
+		ID:           "saved-orphan",
+		Name:         "Orphan",
+		SQL:          "select 1",
+		ConnectionID: "conn-old",
+		DBName:       "app",
+		CreatedAt:    100,
+	}); err != nil {
+		t.Fatalf("SaveQuery returned error: %v", err)
+	}
+
+	rebound, err := app.RebindSavedQuery("saved-orphan", target.ID)
+	if err != nil {
+		t.Fatalf("RebindSavedQuery returned error: %v", err)
+	}
+	if rebound.ConnectionID != target.ID {
+		t.Fatalf("expected query to bind to target connection, got %#v", rebound)
+	}
+	if rebound.OriginalConnectionID != "conn-old" {
+		t.Fatalf("expected original connection id to be retained, got %#v", rebound)
+	}
+	if rebound.BindingStatus != savedQueryBindingActive {
+		t.Fatalf("expected active binding status, got %#v", rebound)
+	}
+	if rebound.ConnectionFingerprint == "" {
+		t.Fatalf("expected fingerprint to be stored, got %#v", rebound)
+	}
+}
diff --git a/internal/app/saved_query_fingerprint.go b/internal/app/saved_query_fingerprint.go
new file mode 100644
index 0000000..59f0cde
--- /dev/null
+++ b/internal/app/saved_query_fingerprint.go
@@ -0,0 +1,271 @@
+package app
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"encoding/json"
+	"sort"
+	"strings"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+const (
+	savedQueryFingerprintVersion = "connection-v1"
+	savedQueryBindingActive      = "active"
+	savedQueryBindingRebound     = "rebound"
+	savedQueryBindingOrphan      = "orphan"
+)
+
+type savedQueryConnectionFingerprintPayload struct {
+	Version            string   `json:"version"`
+	Type               string   `json:"type"`
+	Driver             string   `json:"driver,omitempty"`
+	Host               string   `json:"host,omitempty"`
+	Port               int      `json:"port,omitempty"`
+	Hosts              []string `json:"hosts,omitempty"`
+	User               string   `json:"user,omitempty"`
+	Database           string   `json:"database,omitempty"`
+	UseSSL             bool     `json:"useSSL,omitempty"`
+	SSLMode            string   `json:"sslMode,omitempty"`
+	UseSSH             bool     `json:"useSSH,omitempty"`
+	SSHHost            string   `json:"sshHost,omitempty"`
+	SSHPort            int      `json:"sshPort,omitempty"`
+	SSHUser            string   `json:"sshUser,omitempty"`
+	UseHTTPTunnel      bool     `json:"useHttpTunnel,omitempty"`
+	HTTPTunnelHost     string   `json:"httpTunnelHost,omitempty"`
+	HTTPTunnelPort     int      `json:"httpTunnelPort,omitempty"`
+	HTTPTunnelUser     string   `json:"httpTunnelUser,omitempty"`
+	ClickHouseProtocol string   `json:"clickHouseProtocol,omitempty"`
+	OceanBaseProtocol  string   `json:"oceanBaseProtocol,omitempty"`
+	Topology           string   `json:"topology,omitempty"`
+	ReplicaSet         string   `json:"replicaSet,omitempty"`
+	AuthSource         string   `json:"authSource,omitempty"`
+	ReadPreference     string   `json:"readPreference,omitempty"`
+	MongoSRV           bool     `json:"mongoSrv,omitempty"`
+	MongoAuthMechanism string   `json:"mongoAuthMechanism,omitempty"`
+	RedisMaster        string   `json:"redisMaster,omitempty"`
+	RedisUser          string   `json:"redisUser,omitempty"`
+	MySQLReplicaUser   string   `json:"mysqlReplicaUser,omitempty"`
+	MongoReplicaUser   string   `json:"mongoReplicaUser,omitempty"`
+}
+
+func normalizeFingerprintText(value string) string {
+	return strings.TrimSpace(value)
+}
+
+func normalizeFingerprintLower(value string) string {
+	return strings.ToLower(normalizeFingerprintText(value))
+}
+
+func normalizeFingerprintHosts(values []string) []string {
+	result := make([]string, 0, len(values))
+	seen := make(map[string]struct{}, len(values))
+	for _, value := range values {
+		host := normalizeFingerprintLower(value)
+		if host == "" {
+			continue
+		}
+		if _, exists := seen[host]; exists {
+			continue
+		}
+		seen[host] = struct{}{}
+		result = append(result, host)
+	}
+	sort.Strings(result)
+	return result
+}
+
+func buildConnectionFingerprint(config connection.ConnectionConfig) (string, bool) {
+	payload := savedQueryConnectionFingerprintPayload{
+		Version:            savedQueryFingerprintVersion,
+		Type:               normalizeFingerprintLower(config.Type),
+		Driver:             normalizeFingerprintLower(config.Driver),
+		Host:               normalizeFingerprintLower(config.Host),
+		Port:               config.Port,
+		Hosts:              normalizeFingerprintHosts(config.Hosts),
+		User:               normalizeFingerprintText(config.User),
+		Database:           normalizeFingerprintText(config.Database),
+		UseSSL:             config.UseSSL,
+		SSLMode:            normalizeFingerprintLower(config.SSLMode),
+		UseSSH:             config.UseSSH,
+		SSHHost:            normalizeFingerprintLower(config.SSH.Host),
+		SSHPort:            config.SSH.Port,
+		SSHUser:            normalizeFingerprintText(config.SSH.User),
+		UseHTTPTunnel:      config.UseHTTPTunnel,
+		HTTPTunnelHost:     normalizeFingerprintLower(config.HTTPTunnel.Host),
+		HTTPTunnelPort:     config.HTTPTunnel.Port,
+		HTTPTunnelUser:     normalizeFingerprintText(config.HTTPTunnel.User),
+		ClickHouseProtocol: normalizeFingerprintLower(config.ClickHouseProtocol),
+		OceanBaseProtocol:  normalizeFingerprintLower(config.OceanBaseProtocol),
+		Topology:           normalizeFingerprintLower(config.Topology),
+		ReplicaSet:         normalizeFingerprintText(config.ReplicaSet),
+		AuthSource:         normalizeFingerprintText(config.AuthSource),
+		ReadPreference:     normalizeFingerprintLower(config.ReadPreference),
+		MongoSRV:           config.MongoSRV,
+		MongoAuthMechanism: normalizeFingerprintLower(config.MongoAuthMechanism),
+		RedisMaster:        normalizeFingerprintText(config.RedisSentinelMaster),
+		RedisUser:          normalizeFingerprintText(config.RedisSentinelUser),
+		MySQLReplicaUser:   normalizeFingerprintText(config.MySQLReplicaUser),
+		MongoReplicaUser:   normalizeFingerprintText(config.MongoReplicaUser),
+	}
+	if payload.Type == "" {
+		return "", false
+	}
+	if payload.Host == "" && len(payload.Hosts) == 0 && payload.Database == "" {
+		return "", false
+	}
+
+	data, err := json.Marshal(payload)
+	if err != nil {
+		return "", false
+	}
+	sum := sha256.Sum256(data)
+	return savedQueryFingerprintVersion + ":" + hex.EncodeToString(sum[:]), true
+}
+
+func buildSavedConnectionFingerprint(view connection.SavedConnectionView) (string, bool) {
+	return buildConnectionFingerprint(view.Config)
+}
+
+func buildLegacyConnectionFingerprint(input connection.SavedConnectionInput) (string, bool) {
+	config := input.Config
+	if strings.TrimSpace(config.ID) == "" {
+		config.ID = strings.TrimSpace(input.ID)
+	}
+	return buildConnectionFingerprint(config)
+}
+
+func indexSavedConnectionsByID(connections []connection.SavedConnectionView) map[string]connection.SavedConnectionView {
+	result := make(map[string]connection.SavedConnectionView, len(connections))
+	for _, item := range connections {
+		id := strings.TrimSpace(item.ID)
+		if id == "" {
+			continue
+		}
+		result[id] = item
+	}
+	return result
+}
+
+func indexLegacyConnectionsByID(connections []connection.SavedConnectionInput) map[string]connection.SavedConnectionInput {
+	result := make(map[string]connection.SavedConnectionInput, len(connections))
+	for _, item := range connections {
+		id := strings.TrimSpace(item.ID)
+		if id == "" {
+			id = strings.TrimSpace(item.Config.ID)
+		}
+		if id == "" {
+			continue
+		}
+		result[id] = item
+	}
+	return result
+}
+
+func indexSavedConnectionsByFingerprint(connections []connection.SavedConnectionView) map[string][]connection.SavedConnectionView {
+	result := make(map[string][]connection.SavedConnectionView)
+	for _, item := range connections {
+		fingerprint, ok := buildSavedConnectionFingerprint(item)
+		if !ok {
+			continue
+		}
+		result[fingerprint] = append(result[fingerprint], item)
+	}
+	return result
+}
+
+func applySavedQueryActiveBinding(query connection.SavedQuery, current connection.SavedConnectionView) connection.SavedQuery {
+	if fingerprint, ok := buildSavedConnectionFingerprint(current); ok {
+		query.ConnectionFingerprint = fingerprint
+		query.FingerprintVersion = savedQueryFingerprintVersion
+	}
+	query.BindingStatus = savedQueryBindingActive
+	if strings.TrimSpace(query.OriginalConnectionID) == strings.TrimSpace(query.ConnectionID) {
+		query.OriginalConnectionID = ""
+	}
+	return query
+}
+
+func applySavedQueryOrphanBinding(query connection.SavedQuery, originalConnectionID string, fingerprint string) connection.SavedQuery {
+	if strings.TrimSpace(query.OriginalConnectionID) == "" {
+		query.OriginalConnectionID = strings.TrimSpace(originalConnectionID)
+	}
+	if strings.TrimSpace(fingerprint) != "" {
+		query.ConnectionFingerprint = fingerprint
+		query.FingerprintVersion = savedQueryFingerprintVersion
+	}
+	query.BindingStatus = savedQueryBindingOrphan
+	return query
+}
+
+func rebindSavedQueryByFingerprint(
+	query connection.SavedQuery,
+	connectionID string,
+	fingerprint string,
+	currentByFingerprint map[string][]connection.SavedConnectionView,
+) (connection.SavedQuery, bool) {
+	fingerprint = strings.TrimSpace(fingerprint)
+	if fingerprint == "" {
+		return query, false
+	}
+
+	matches := currentByFingerprint[fingerprint]
+	if len(matches) != 1 {
+		return applySavedQueryOrphanBinding(query, connectionID, fingerprint), true
+	}
+
+	if strings.TrimSpace(query.OriginalConnectionID) == "" {
+		query.OriginalConnectionID = connectionID
+	}
+	query.ConnectionID = matches[0].ID
+	query.ConnectionFingerprint = fingerprint
+	query.FingerprintVersion = savedQueryFingerprintVersion
+	query.BindingStatus = savedQueryBindingRebound
+	return query, true
+}
+
+func resolveSavedQueryBinding(
+	query connection.SavedQuery,
+	currentByID map[string]connection.SavedConnectionView,
+	currentByFingerprint map[string][]connection.SavedConnectionView,
+	legacyByID map[string]connection.SavedConnectionInput,
+) connection.SavedQuery {
+	connectionID := strings.TrimSpace(query.ConnectionID)
+	if current, found := currentByID[connectionID]; found {
+		return applySavedQueryActiveBinding(query, current)
+	}
+
+	if rebound, resolved := rebindSavedQueryByFingerprint(query, connectionID, query.ConnectionFingerprint, currentByFingerprint); resolved {
+		return rebound
+	}
+
+	legacy, found := legacyByID[connectionID]
+	if !found {
+		return applySavedQueryOrphanBinding(query, connectionID, query.ConnectionFingerprint)
+	}
+
+	fingerprint, ok := buildLegacyConnectionFingerprint(legacy)
+	if !ok {
+		return applySavedQueryOrphanBinding(query, connectionID, query.ConnectionFingerprint)
+	}
+
+	rebound, _ := rebindSavedQueryByFingerprint(query, connectionID, fingerprint, currentByFingerprint)
+	return rebound
+}
+
+func resolveSavedQueryBindings(
+	queries []connection.SavedQuery,
+	currentConnections []connection.SavedConnectionView,
+	legacyConnections []connection.SavedConnectionInput,
+) []connection.SavedQuery {
+	currentByID := indexSavedConnectionsByID(currentConnections)
+	currentByFingerprint := indexSavedConnectionsByFingerprint(currentConnections)
+	legacyByID := indexLegacyConnectionsByID(legacyConnections)
+
+	result := make([]connection.SavedQuery, 0, len(queries))
+	for _, query := range queries {
+		result = append(result, resolveSavedQueryBinding(query, currentByID, currentByFingerprint, legacyByID))
+	}
+	return result
+}
diff --git a/internal/app/sql_inspect.go b/internal/app/sql_inspect.go
new file mode 100644
index 0000000..11c3848
--- /dev/null
+++ b/internal/app/sql_inspect.go
@@ -0,0 +1,48 @@
+package app
+
+import "strings"
+
+// SQLStatementInspection 描述一条拆分后的 SQL 语句的基础特征。
+type SQLStatementInspection struct {
+	Index    int    `json:"index"`
+	Keyword  string `json:"keyword,omitempty"`
+	ReadOnly bool   `json:"readOnly"`
+}
+
+// SQLInspection 描述一段 SQL 文本的整体执行特征。
+type SQLInspection struct {
+	StatementCount int                      `json:"statementCount"`
+	ReadOnly       bool                     `json:"readOnly"`
+	Statements     []SQLStatementInspection `json:"statements"`
+}
+
+// InspectSQL 基于现有 SQL 拆分与只读判定逻辑，为外部调用方提供安全边界判断。
+func InspectSQL(dbType string, sql string) SQLInspection {
+	statements := splitSQLStatements(sql)
+	result := SQLInspection{
+		ReadOnly:   true,
+		Statements: make([]SQLStatementInspection, 0, len(statements)),
+	}
+
+	for _, stmt := range statements {
+		trimmed := strings.TrimSpace(stmt)
+		if trimmed == "" {
+			continue
+		}
+		item := SQLStatementInspection{
+			Index:    len(result.Statements) + 1,
+			Keyword:  leadingSQLKeyword(trimmed),
+			ReadOnly: isReadOnlySQLQuery(dbType, trimmed),
+		}
+		if !item.ReadOnly {
+			result.ReadOnly = false
+		}
+		result.Statements = append(result.Statements, item)
+	}
+
+	result.StatementCount = len(result.Statements)
+	if result.StatementCount == 0 {
+		result.ReadOnly = true
+	}
+	return result
+}
diff --git a/internal/app/sql_sanitize.go b/internal/app/sql_sanitize.go
index 00066de..b2dfe5d 100644
--- a/internal/app/sql_sanitize.go
+++ b/internal/app/sql_sanitize.go
@@ -52,13 +52,427 @@ func leadingSQLKeyword(query string) string {
 	return strings.ToLower(text)
 }
 
+func sqlDataOperationKeyword(query string) string {
+	keyword, _ := sqlDataOperationInfo(query)
+	return keyword
+}
+
+func sqlDataOperationInfo(query string) (keyword string, withHasWrite bool) {
+	keyword, keywordEnd := nextSQLKeyword(query, 0)
+	if keyword != "with" {
+		return keyword, false
+	}
+	if withKeyword, hasWrite, ok := sqlKeywordAfterLeadingWith(query, keywordEnd); ok {
+		return withKeyword, hasWrite
+	}
+	return keyword, false
+}
+
+func nextSQLKeyword(text string, start int) (string, int) {
+	pos := skipSQLTrivia(text, start)
+	if pos >= len(text) || !isSQLKeywordByte(text[pos]) {
+		return "", pos
+	}
+	end := pos + 1
+	for end < len(text) && isSQLKeywordByte(text[end]) {
+		end++
+	}
+	return strings.ToLower(text[pos:end]), end
+}
+
+func skipSQLTrivia(text string, start int) int {
+	pos := start
+	for pos < len(text) {
+		switch {
+		case text[pos] == ' ' || text[pos] == '\t' || text[pos] == '\r' || text[pos] == '\n' || text[pos] == '\f':
+			pos++
+		case strings.HasPrefix(text[pos:], "--"):
+			next := strings.IndexByte(text[pos:], '\n')
+			if next < 0 {
+				return len(text)
+			}
+			pos += next + 1
+		case strings.HasPrefix(text[pos:], "#"):
+			next := strings.IndexByte(text[pos:], '\n')
+			if next < 0 {
+				return len(text)
+			}
+			pos += next + 1
+		case strings.HasPrefix(text[pos:], "/*"):
+			end := strings.Index(text[pos+2:], "*/")
+			if end < 0 {
+				return len(text)
+			}
+			pos += end + 4
+		default:
+			return pos
+		}
+	}
+	return pos
+}
+
+func sqlKeywordAfterLeadingWith(text string, start int) (string, bool, bool) {
+	pos := skipSQLTrivia(text, start)
+	hasWriteCTE := false
+	if keyword, end := nextSQLKeyword(text, pos); keyword == "recursive" {
+		pos = end
+	}
+
+	for {
+		pos = skipSQLTrivia(text, pos)
+		next, ok := skipSQLIdentifierToken(text, pos)
+		if !ok {
+			return "", hasWriteCTE, false
+		}
+		pos = skipSQLTrivia(text, next)
+		if pos < len(text) && text[pos] == '(' {
+			next = skipBalancedSQLParens(text, pos)
+			if next < 0 {
+				return "", hasWriteCTE, false
+			}
+			pos = skipSQLTrivia(text, next)
+		}
+
+		asEnd := findTopLevelSQLKeyword(text, pos, "as")
+		if asEnd < 0 {
+			return "", hasWriteCTE, false
+		}
+		pos = skipSQLTrivia(text, asEnd)
+		if keyword, end := nextSQLKeyword(text, pos); keyword == "not" {
+			if nextKeyword, nextEnd := nextSQLKeyword(text, end); nextKeyword == "materialized" {
+				pos = nextEnd
+			}
+		} else if keyword == "materialized" {
+			pos = end
+		}
+
+		pos = skipSQLTrivia(text, pos)
+		if pos >= len(text) || text[pos] != '(' {
+			return "", hasWriteCTE, false
+		}
+		cteBodyStart := pos + 1
+		next = skipBalancedSQLParens(text, pos)
+		if next < 0 {
+			return "", hasWriteCTE, false
+		}
+		cteBodyEnd := next - 1
+		if cteBodyEnd >= cteBodyStart {
+			bodyKeyword, bodyHasWrite := sqlDataOperationInfo(text[cteBodyStart:cteBodyEnd])
+			if bodyHasWrite || isSQLDataWriteKeyword(bodyKeyword) {
+				hasWriteCTE = true
+			}
+		}
+		pos = skipSQLTrivia(text, next)
+		if pos < len(text) && text[pos] == ',' {
+			pos++
+			continue
+		}
+
+		keyword, _ := nextSQLKeyword(text, pos)
+		return keyword, hasWriteCTE, keyword != ""
+	}
+}
+
+func findTopLevelSQLKeyword(text string, start int, want string) int {
+	depth := 0
+	for pos := start; pos < len(text); {
+		if next, ok := skipSQLQuotedOrComment(text, pos); ok {
+			pos = next
+			continue
+		}
+		switch text[pos] {
+		case '(':
+			depth++
+			pos++
+		case ')':
+			if depth > 0 {
+				depth--
+			}
+			pos++
+		default:
+			if depth == 0 && isSQLKeywordByte(text[pos]) {
+				end := pos + 1
+				for end < len(text) && isSQLKeywordByte(text[end]) {
+					end++
+				}
+				if strings.EqualFold(text[pos:end], want) {
+					return end
+				}
+				pos = end
+				continue
+			}
+			pos++
+		}
+	}
+	return -1
+}
+
+func skipSQLIdentifierToken(text string, start int) (int, bool) {
+	if start >= len(text) {
+		return start, false
+	}
+	switch text[start] {
+	case '"', '`':
+		next := skipSQLDelimited(text, start, text[start])
+		return next, next > start
+	case '[':
+		next := strings.IndexByte(text[start+1:], ']')
+		if next < 0 {
+			return len(text), true
+		}
+		return start + next + 2, true
+	default:
+		if !isSQLKeywordByte(text[start]) {
+			return start, false
+		}
+		end := start + 1
+		for end < len(text) && isSQLKeywordByte(text[end]) {
+			end++
+		}
+		return end, true
+	}
+}
+
+func skipBalancedSQLParens(text string, start int) int {
+	if start >= len(text) || text[start] != '(' {
+		return -1
+	}
+	depth := 0
+	for pos := start; pos < len(text); {
+		if next, ok := skipSQLQuotedOrComment(text, pos); ok {
+			pos = next
+			continue
+		}
+		switch text[pos] {
+		case '(':
+			depth++
+			pos++
+		case ')':
+			depth--
+			pos++
+			if depth == 0 {
+				return pos
+			}
+		default:
+			pos++
+		}
+	}
+	return -1
+}
+
+func skipSQLQuotedOrComment(text string, start int) (int, bool) {
+	if start >= len(text) {
+		return start, false
+	}
+	switch {
+	case strings.HasPrefix(text[start:], "--"):
+		next := strings.IndexByte(text[start:], '\n')
+		if next < 0 {
+			return len(text), true
+		}
+		return start + next + 1, true
+	case strings.HasPrefix(text[start:], "#"):
+		next := strings.IndexByte(text[start:], '\n')
+		if next < 0 {
+			return len(text), true
+		}
+		return start + next + 1, true
+	case strings.HasPrefix(text[start:], "/*"):
+		end := strings.Index(text[start+2:], "*/")
+		if end < 0 {
+			return len(text), true
+		}
+		return start + end + 4, true
+	case text[start] == '\'' || text[start] == '"' || text[start] == '`':
+		return skipSQLDelimited(text, start, text[start]), true
+	case text[start] == '[':
+		next := strings.IndexByte(text[start+1:], ']')
+		if next < 0 {
+			return len(text), true
+		}
+		return start + next + 2, true
+	default:
+		if tag, ok := sqlDollarQuoteTag(text, start); ok {
+			end := strings.Index(text[start+len(tag):], tag)
+			if end < 0 {
+				return len(text), true
+			}
+			return start + len(tag) + end + len(tag), true
+		}
+		return start, false
+	}
+}
+
+func skipSQLDelimited(text string, start int, delimiter byte) int {
+	pos := start + 1
+	for pos < len(text) {
+		if text[pos] == delimiter {
+			if pos+1 < len(text) && text[pos+1] == delimiter {
+				pos += 2
+				continue
+			}
+			return pos + 1
+		}
+		pos++
+	}
+	return len(text)
+}
+
+func sqlDollarQuoteTag(text string, start int) (string, bool) {
+	if start >= len(text) || text[start] != '$' {
+		return "", false
+	}
+	end := start + 1
+	for end < len(text) && (isSQLKeywordByte(text[end]) || text[end] == '-') {
+		end++
+	}
+	if end < len(text) && text[end] == '$' {
+		return text[start : end+1], true
+	}
+	return "", false
+}
+
+func isSQLKeywordByte(ch byte) bool {
+	return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || ch == '_'
+}
+
+func normalizeSQLClassifierDBType(dbType string) string {
+	normalized := strings.ToLower(strings.TrimSpace(dbType))
+	switch normalized {
+	case "postgresql":
+		return "postgres"
+	case "mssql", "sql_server", "sql-server":
+		return "sqlserver"
+	case "open_gauss", "open-gauss":
+		return "opengauss"
+	case "gauss_db", "gauss-db":
+		return "gaussdb"
+	case "kingbase8", "kingbasees", "kingbasev8":
+		return "kingbase"
+	default:
+		return normalized
+	}
+}
+
+func isSQLServerDBType(dbType string) bool {
+	return normalizeSQLClassifierDBType(dbType) == "sqlserver"
+}
+
+func isOracleLikeDBType(dbType string) bool {
+	switch normalizeSQLClassifierDBType(dbType) {
+	case "oracle", "dameng":
+		return true
+	default:
+		return false
+	}
+}
+
+func isPostgresNoticeCapableDBType(dbType string) bool {
+	switch normalizeSQLClassifierDBType(dbType) {
+	case "postgres", "opengauss":
+		return true
+	default:
+		return false
+	}
+}
+
+func isSQLSelectIntoStatement(query string) bool {
+	keyword, _ := sqlDataOperationInfo(query)
+	return keyword == "select" && findTopLevelSQLKeyword(query, 0, "into") >= 0
+}
+
+func sqlContainsKeyword(text string, want string) bool {
+	for pos := 0; pos < len(text); {
+		if next, ok := skipSQLQuotedOrComment(text, pos); ok {
+			pos = next
+			continue
+		}
+		if isSQLKeywordByte(text[pos]) {
+			end := pos + 1
+			for end < len(text) && isSQLKeywordByte(text[end]) {
+				end++
+			}
+			if strings.EqualFold(text[pos:end], want) {
+				return true
+			}
+			pos = end
+			continue
+		}
+		pos++
+	}
+	return false
+}
+
+func sqlWriteStatementReturnsRows(dbType string, query string) bool {
+	keyword, withHasWrite := sqlDataOperationInfo(query)
+	if withHasWrite && keyword == "select" {
+		return true
+	}
+	if !isSQLDataWriteKeyword(keyword) {
+		return false
+	}
+	if !isOracleLikeDBType(dbType) && findTopLevelSQLKeyword(query, 0, "returning") >= 0 {
+		return true
+	}
+	if isSQLServerDBType(dbType) && findTopLevelSQLKeyword(query, 0, "output") >= 0 {
+		return true
+	}
+	return false
+}
+
+func sqlServerControlFlowMayReturnMessages(query string) bool {
+	switch leadingSQLKeyword(query) {
+	case "if", "begin", "while", "declare", "try", "catch":
+		return sqlContainsKeyword(query, "exec") ||
+			sqlContainsKeyword(query, "execute") ||
+			sqlContainsKeyword(query, "print") ||
+			sqlContainsKeyword(query, "raiserror") ||
+			sqlContainsKeyword(query, "throw") ||
+			sqlContainsKeyword(query, "dbcc") ||
+			sqlContainsKeyword(query, "set")
+	default:
+		return false
+	}
+}
+
 func isReadOnlySQLQuery(dbType string, query string) bool {
 	if strings.ToLower(strings.TrimSpace(dbType)) == "mongodb" && strings.HasPrefix(strings.TrimSpace(query), "{") {
 		return true
 	}
 
-	switch leadingSQLKeyword(query) {
-	case "select", "with", "show", "describe", "desc", "explain", "pragma", "values":
+	keyword, withHasWrite := sqlDataOperationInfo(query)
+	if withHasWrite {
+		return false
+	}
+	if keyword == "select" && isSQLSelectIntoStatement(query) {
+		return false
+	}
+	switch keyword {
+	case "select", "with", "show", "describe", "desc", "explain", "pragma", "values", "consume":
+		return true
+	default:
+		return false
+	}
+}
+
+func isBatchableWriteSQLStatement(dbType string, query string) bool {
+	if isReadOnlySQLQuery(dbType, query) {
+		return false
+	}
+
+	keyword, withHasWrite := sqlDataOperationInfo(query)
+	if withHasWrite {
+		return true
+	}
+	if keyword == "select" && isSQLSelectIntoStatement(query) {
+		return true
+	}
+	return isSQLDataWriteKeyword(keyword)
+}
+
+func isSQLDataWriteKeyword(keyword string) bool {
+	switch keyword {
+	case "insert", "update", "delete", "replace", "merge", "upsert":
 		return true
 	default:
 		return false
@@ -72,10 +486,12 @@ func sanitizeSQLForPgLike(dbType string, query string) string {
 		normalizedType = "postgres"
 	case "kingbase8", "kingbasees", "kingbasev8":
 		normalizedType = "kingbase"
+	case "gauss_db", "gauss-db":
+		normalizedType = "gaussdb"
 	}
 
 	switch normalizedType {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
 		// 有些情况下会出现多层重复引用（例如 """"schema"""" 或 ""schema"""），单次修复不一定收敛。
 		// 这里做有限次数的迭代，直到输出不再变化。
 		out := query
diff --git a/internal/app/sql_sanitize_test.go b/internal/app/sql_sanitize_test.go
index 85d2d24..870f08a 100644
--- a/internal/app/sql_sanitize_test.go
+++ b/internal/app/sql_sanitize_test.go
@@ -62,3 +62,127 @@ func TestSanitizeSQLForPgLike_DoesNotModifyOtherDBTypes(t *testing.T) {
 		t.Fatalf("non-PG-like db should not be sanitized:\nIN:  %s\nOUT: %s", in, out)
 	}
 }
+
+func TestIsReadOnlySQLQuery_DoesNotTreatExecAsReadOnly(t *testing.T) {
+	if isReadOnlySQLQuery("sqlserver", "EXEC sp_who2") {
+		t.Fatal("EXEC should not be treated as read-only SQL")
+	}
+}
+
+func TestIsReadOnlySQLQuery_ClassifiesWithByTopLevelOperation(t *testing.T) {
+	readQuery := "WITH target AS (SELECT id FROM users WHERE active = 1) SELECT * FROM target"
+	if !isReadOnlySQLQuery("postgres", readQuery) {
+		t.Fatal("WITH ... SELECT should stay read-only")
+	}
+
+	writeQuery := "WITH target AS (SELECT id FROM users WHERE active = 1) UPDATE users SET synced = 1 WHERE id IN (SELECT id FROM target)"
+	if isReadOnlySQLQuery("postgres", writeQuery) {
+		t.Fatal("WITH ... UPDATE should not be treated as read-only")
+	}
+
+	writeCTEQuery := "WITH moved AS (DELETE FROM audit_logs WHERE created_at < NOW() RETURNING id) SELECT * FROM moved"
+	if isReadOnlySQLQuery("postgres", writeCTEQuery) {
+		t.Fatal("data-changing CTE should not be treated as read-only")
+	}
+}
+
+func TestIsReadOnlySQLQuery_TreatsSelectIntoAsWrite(t *testing.T) {
+	query := "SELECT * INTO archived_users FROM users"
+	if isReadOnlySQLQuery("postgres", query) {
+		t.Fatal("SELECT INTO should not be treated as read-only")
+	}
+}
+
+func TestIsReadOnlySQLQuery_TreatsKafkaConsumeAsReadOnly(t *testing.T) {
+	if !isReadOnlySQLQuery("kafka", `CONSUME GROUP "analytics" FROM "orders.events" LIMIT 20`) {
+		t.Fatal("Kafka CONSUME should be treated as read-only")
+	}
+}
+
+func TestIsBatchableWriteSQLStatement_OnlyMatchesRealWriteStatements(t *testing.T) {
+	if !isBatchableWriteSQLStatement("mysql", "INSERT INTO demo(id) VALUES (1)") {
+		t.Fatal("expected INSERT to be treated as batchable write")
+	}
+	if !isBatchableWriteSQLStatement("postgres", "WITH target AS (SELECT id FROM users) DELETE FROM users WHERE id IN (SELECT id FROM target)") {
+		t.Fatal("expected WITH ... DELETE to be treated as batchable write")
+	}
+	if !isBatchableWriteSQLStatement("postgres", "WITH moved AS (DELETE FROM audit_logs WHERE created_at < NOW() RETURNING id) SELECT * FROM moved") {
+		t.Fatal("expected data-changing CTE to be treated as batchable write")
+	}
+	if !isBatchableWriteSQLStatement("postgres", "SELECT * INTO archived_users FROM users") {
+		t.Fatal("expected SELECT INTO to be treated as batchable write")
+	}
+	if isBatchableWriteSQLStatement("sqlserver", "EXEC sp_who2") {
+		t.Fatal("EXEC should not be treated as batchable write")
+	}
+	if isBatchableWriteSQLStatement("sqlserver", "SET STATISTICS IO ON") {
+		t.Fatal("SET STATISTICS should not be treated as batchable write")
+	}
+}
+
+func TestShouldTryQueryResultFirst_TreatsSQLServerSetAsQueryFirst(t *testing.T) {
+	if !shouldTryQueryResultFirst("sqlserver", "SET STATISTICS IO ON") {
+		t.Fatal("expected SQL Server SET STATISTICS to try query-first for notice capture")
+	}
+	if shouldTryQueryResultFirst("mysql", "SET sql_mode = ''") {
+		t.Fatal("non-SQLServer SET should not force query-first")
+	}
+}
+
+func TestShouldTryQueryResultFirst_TreatsSQLServerSystemCommandsAsQueryFirst(t *testing.T) {
+	if !shouldTryQueryResultFirst("sqlserver", "sp_who2") {
+		t.Fatal("expected bare SQL Server system procedure to try query-first")
+	}
+	if !shouldTryQueryResultFirst("sqlserver", "DBCC INPUTBUFFER(52)") {
+		t.Fatal("expected SQL Server DBCC command to try query-first")
+	}
+	if shouldTryQueryResultFirst("mysql", "sp_who2") {
+		t.Fatal("non-SQLServer system procedure name should not force query-first")
+	}
+}
+
+func TestShouldTryQueryResultFirst_TreatsSQLServerBareProcedureCallsAsQueryFirst(t *testing.T) {
+	if !shouldTryQueryResultFirst("sqlserver", `p_get_select c_dyscript,'projectid = 1',1`) {
+		t.Fatal("expected bare SQL Server procedure call to try query-first")
+	}
+	if !shouldTryQueryResultFirst("sqlserver", `dbo.p_get_select c_dyscript,'projectid = 1',1`) {
+		t.Fatal("expected schema-qualified SQL Server procedure call to try query-first")
+	}
+	if !shouldTryQueryResultFirst("sqlserver", `[dbo].[p_get_select] c_dyscript,'projectid = 1',1`) {
+		t.Fatal("expected bracket-qualified SQL Server procedure call to try query-first")
+	}
+}
+
+func TestShouldTryQueryResultFirst_TreatsReturningAndOutputWritesAsQueryFirst(t *testing.T) {
+	if !shouldTryQueryResultFirst("postgres", "INSERT INTO audit_logs(id) VALUES (1) RETURNING id") {
+		t.Fatal("expected INSERT ... RETURNING to try query-first")
+	}
+	if !shouldTryQueryResultFirst("sqlserver", "UPDATE users SET name = 'next' OUTPUT inserted.id WHERE id = 1") {
+		t.Fatal("expected SQL Server OUTPUT DML to try query-first")
+	}
+}
+
+func TestShouldTryQueryResultFirst_TreatsWrappedMessageBlocksAsQueryFirst(t *testing.T) {
+	if !shouldTryQueryResultFirst("sqlserver", "IF 1 = 1 EXEC dbo.p_get_select @name = 'demo'") {
+		t.Fatal("expected control-flow wrapped SQL Server procedure call to try query-first")
+	}
+	if !shouldTryQueryResultFirst("sqlserver", "BEGIN PRINT 'done'; END") {
+		t.Fatal("expected SQL Server BEGIN/PRINT block to try query-first")
+	}
+	if !shouldTryQueryResultFirst("postgres", "DO $$ BEGIN RAISE NOTICE 'done'; END $$") {
+		t.Fatal("expected PostgreSQL DO/RAISE NOTICE block to try query-first")
+	}
+}
+
+func TestShouldTryQueryResultFirst_DoesNotMisclassifyPlainSQLServerDML(t *testing.T) {
+	if shouldTryQueryResultFirst("sqlserver", "UPDATE users SET name = 'next' WHERE id = 1") {
+		t.Fatal("plain SQL Server UPDATE should not try query-first")
+	}
+}
+
+func TestShouldTryQueryResultFirst_TreatsDataChangingCTESelectAsQueryFirst(t *testing.T) {
+	query := "WITH moved AS (DELETE FROM audit_logs WHERE created_at < NOW() RETURNING id) SELECT * FROM moved"
+	if !shouldTryQueryResultFirst("postgres", query) {
+		t.Fatal("data-changing CTE ending in SELECT should try query-first to preserve returned rows")
+	}
+}
diff --git a/internal/app/sql_split.go b/internal/app/sql_split.go
index f73cebd..3287af8 100644
--- a/internal/app/sql_split.go
+++ b/internal/app/sql_split.go
@@ -3,9 +3,10 @@ package app
 import "strings"
 
 // splitSQLStatements 按分号拆分 SQL 文本为独立语句。
-// 正确处理单引号/双引号/反引号字符串、行注释（-- / #）、块注释（/* */）和
-// PostgreSQL/Kingbase 的 $$...$$ dollar-quoting，避免在这些上下文中错误拆分。
-// 同时支持 SQL 标准的转义单引号（两个连续单引号 '' 表示字面量引号）。
+// 正确处理单引号/双引号/反引号字符串、行注释（-- / #）、块注释（/* */）、
+// PostgreSQL/Kingbase 的 $$...$$ dollar-quoting，以及 Oracle PL/SQL 匿名块，
+// 避免在这些上下文中错误拆分。
+// 同时支持 SQL 标准的转义单引号（两个连续单引号 ” 表示字面量引号）。
 func splitSQLStatements(sql string) []string {
 	text := strings.ReplaceAll(sql, "\r\n", "\n")
 	var statements []string
@@ -18,6 +19,9 @@ func splitSQLStatements(sql string) []string {
 	inLineComment := false
 	inBlockComment := false
 	var dollarTag string // postgres/kingbase: $$...$$ or $tag$...$tag$
+	plsqlDepth := 0
+	plsqlDeclareBeginSkips := 0
+	justClosedPLSQLBlock := false
 
 	push := func() {
 		s := strings.TrimSpace(cur.String())
@@ -108,6 +112,39 @@ func splitSQLStatements(sql string) []string {
 			continue
 		}
 
+		if isSQLIdentifierStart(ch) {
+			tokenStart := i
+			tokenEnd := i + 1
+			for tokenEnd < len(text) && isSQLIdentifierPart(text[tokenEnd]) {
+				tokenEnd++
+			}
+			token := strings.ToLower(text[tokenStart:tokenEnd])
+			if token == "begin" && plsqlDeclareBeginSkips > 0 {
+				plsqlDeclareBeginSkips--
+				justClosedPLSQLBlock = false
+			} else if token == "begin" && shouldEnterPLSQLBlock(text, tokenEnd) {
+				plsqlDepth++
+				justClosedPLSQLBlock = false
+			} else if token == "declare" && shouldEnterPLSQLDeclareBlock(text, tokenEnd) {
+				plsqlDepth++
+				plsqlDeclareBeginSkips++
+				justClosedPLSQLBlock = false
+			} else if plsqlDepth == 0 && shouldEnterPLSQLCreateRoutineBlock(text, cur.String(), token, tokenEnd) {
+				plsqlDepth++
+				plsqlDeclareBeginSkips++
+				justClosedPLSQLBlock = false
+			} else if token == "end" && plsqlDepth > 0 && !isPLSQLControlEnd(text, tokenEnd) {
+				plsqlDepth--
+				if plsqlDeclareBeginSkips > plsqlDepth {
+					plsqlDeclareBeginSkips = plsqlDepth
+				}
+				justClosedPLSQLBlock = plsqlDepth == 0
+			}
+			cur.WriteString(text[tokenStart:tokenEnd])
+			i = tokenEnd - 1
+			continue
+		}
+
 		// 行注释开始
 		if ch == '-' && next == '-' {
 			inLineComment = true
@@ -140,11 +177,33 @@ func splitSQLStatements(sql string) []string {
 
 		// 分号分隔（支持全角分号"；"）
 		if ch == ';' {
+			if plsqlDepth > 0 {
+				cur.WriteByte(ch)
+				continue
+			}
+			if justClosedPLSQLBlock {
+				cur.WriteByte(ch)
+				push()
+				justClosedPLSQLBlock = false
+				continue
+			}
 			push()
 			continue
 		}
 		// 全角分号 UTF-8 序列: 0xEF 0xBC 0x9B
 		if ch == 0xEF && i+2 < len(text) && text[i+1] == 0xBC && text[i+2] == 0x9B {
+			if plsqlDepth > 0 {
+				cur.WriteString("；")
+				i += 2
+				continue
+			}
+			if justClosedPLSQLBlock {
+				cur.WriteString("；")
+				push()
+				justClosedPLSQLBlock = false
+				i += 2
+				continue
+			}
 			push()
 			i += 2
 			continue
@@ -157,6 +216,158 @@ func splitSQLStatements(sql string) []string {
 	return statements
 }
 
+func isSQLIdentifierStart(ch byte) bool {
+	return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_'
+}
+
+func isSQLIdentifierPart(ch byte) bool {
+	return isSQLIdentifierStart(ch) || (ch >= '0' && ch <= '9') || ch == '$' || ch == '#'
+}
+
+func skipSQLWhitespaceAndComments(text string, pos int) int {
+	i := pos
+	for i < len(text) {
+		switch text[i] {
+		case ' ', '\t', '\n', '\r', '\f':
+			i++
+			continue
+		case '-':
+			if i+1 < len(text) && text[i+1] == '-' {
+				i += 2
+				for i < len(text) && text[i] != '\n' {
+					i++
+				}
+				continue
+			}
+		case '/':
+			if i+1 < len(text) && text[i+1] == '*' {
+				i += 2
+				for i+1 < len(text) && !(text[i] == '*' && text[i+1] == '/') {
+					i++
+				}
+				if i+1 < len(text) {
+					i += 2
+				}
+				continue
+			}
+		}
+		break
+	}
+	return i
+}
+
+func nextSQLSignificantToken(text string, pos int) string {
+	i := skipSQLWhitespaceAndComments(text, pos)
+	if i >= len(text) || !isSQLIdentifierStart(text[i]) {
+		return ""
+	}
+	end := i + 1
+	for end < len(text) && isSQLIdentifierPart(text[end]) {
+		end++
+	}
+	return strings.ToLower(text[i:end])
+}
+
+func nextSQLSignificantByte(text string, pos int) byte {
+	i := skipSQLWhitespaceAndComments(text, pos)
+	if i >= len(text) {
+		return 0
+	}
+	return text[i]
+}
+
+func shouldEnterPLSQLBlock(text string, tokenEnd int) bool {
+	switch nextSQLSignificantByte(text, tokenEnd) {
+	case 0, ';':
+		return false
+	}
+	switch nextSQLSignificantToken(text, tokenEnd) {
+	case "transaction", "work", "isolation", "read", "write":
+		return false
+	default:
+		return true
+	}
+}
+
+func isPLSQLBlockStatement(stmt string) bool {
+	text := strings.TrimSpace(stmt)
+	if text == "" {
+		return false
+	}
+	if strings.HasSuffix(text, "/") {
+		text = strings.TrimSpace(strings.TrimSuffix(text, "/"))
+	}
+	token := nextSQLSignificantToken(text, 0)
+	if token == "declare" {
+		return shouldEnterPLSQLDeclareBlock(text, len("declare"))
+	}
+	if token == "begin" {
+		return shouldEnterPLSQLBlock(text, len("begin"))
+	}
+	return isCreateRoutineHeaderPrefix(text)
+}
+
+func shouldEnterPLSQLDeclareBlock(text string, tokenEnd int) bool {
+	return nextSQLSignificantToken(text, tokenEnd) != ""
+}
+
+func isPLSQLControlEnd(text string, tokenEnd int) bool {
+	switch nextSQLSignificantToken(text, tokenEnd) {
+	case "if", "loop", "case":
+		return true
+	default:
+		return false
+	}
+}
+
+func isCreateRoutineHeaderPrefix(text string) bool {
+	currentToken, currentEnd := nextSQLSignificantTokenSpan(text, 0)
+	if currentToken != "create" {
+		return false
+	}
+
+	currentToken, currentEnd = nextSQLSignificantTokenSpan(text, currentEnd)
+	if currentToken == "or" {
+		currentToken, currentEnd = nextSQLSignificantTokenSpan(text, currentEnd)
+		if currentToken != "replace" {
+			return false
+		}
+		currentToken, currentEnd = nextSQLSignificantTokenSpan(text, currentEnd)
+	}
+
+	for currentToken == "editionable" || currentToken == "noneditionable" {
+		currentToken, currentEnd = nextSQLSignificantTokenSpan(text, currentEnd)
+	}
+
+	return currentToken == "procedure" || currentToken == "function"
+}
+
+func nextSQLSignificantTokenSpan(text string, pos int) (string, int) {
+	i := skipSQLWhitespaceAndComments(text, pos)
+	if i >= len(text) || !isSQLIdentifierStart(text[i]) {
+		return "", i
+	}
+	end := i + 1
+	for end < len(text) && isSQLIdentifierPart(text[end]) {
+		end++
+	}
+	return strings.ToLower(text[i:end]), end
+}
+
+func shouldEnterPLSQLCreateRoutineBlock(text string, currentStatementPrefix string, token string, tokenEnd int) bool {
+	if token != "is" && token != "as" {
+		return false
+	}
+	nextChar := nextSQLSignificantByte(text, tokenEnd)
+	if nextChar == 0 {
+		return false
+	}
+	if token == "as" && (nextChar == '$' || nextChar == '\'' || nextChar == '"') {
+		return false
+	}
+	return isCreateRoutineHeaderPrefix(currentStatementPrefix)
+}
+
 // parseSQLDollarTag 解析 PostgreSQL/Kingbase 的 dollar-quoting 标签。
 func parseSQLDollarTag(s string) string {
 	if len(s) < 2 || s[0] != '$' {
diff --git a/internal/app/sql_split_stream.go b/internal/app/sql_split_stream.go
index 7368494..95c3d01 100644
--- a/internal/app/sql_split_stream.go
+++ b/internal/app/sql_split_stream.go
@@ -18,6 +18,9 @@ type sqlStreamSplitter struct {
 	inLineComment  bool
 	inBlockComment bool
 	dollarTag      string
+	plsqlDepth     int
+	declareSkips   int
+	closedPLSQL    bool
 }
 
 // Feed 将一个 chunk 喂入拆分器，返回在此 chunk 中完成的 SQL 语句列表。
@@ -118,6 +121,47 @@ func (s *sqlStreamSplitter) Feed(chunk []byte) []string {
 			continue
 		}
 
+		if isSQLIdentifierStart(ch) {
+			tokenStart := i
+			tokenEnd := i + 1
+			for tokenEnd < len(text) && isSQLIdentifierPart(text[tokenEnd]) {
+				tokenEnd++
+			}
+			token := strings.ToLower(text[tokenStart:tokenEnd])
+			if shouldDeferPLSQLKeywordPrefixInStream(text, tokenStart, tokenEnd, token) {
+				s.pending = text[tokenStart:]
+				break
+			}
+			if shouldDeferPLSQLKeywordInStream(text, tokenStart, tokenEnd, token) {
+				s.pending = text[tokenStart:]
+				break
+			}
+			if token == "begin" && s.declareSkips > 0 {
+				s.declareSkips--
+				s.closedPLSQL = false
+			} else if token == "begin" && shouldEnterPLSQLBlock(text, tokenEnd) {
+				s.plsqlDepth++
+				s.closedPLSQL = false
+			} else if token == "declare" && shouldEnterPLSQLDeclareBlock(text, tokenEnd) {
+				s.plsqlDepth++
+				s.declareSkips++
+				s.closedPLSQL = false
+			} else if s.plsqlDepth == 0 && shouldEnterPLSQLCreateRoutineBlock(text, s.cur.String(), token, tokenEnd) {
+				s.plsqlDepth++
+				s.declareSkips++
+				s.closedPLSQL = false
+			} else if token == "end" && s.plsqlDepth > 0 && !isPLSQLControlEnd(text, tokenEnd) {
+				s.plsqlDepth--
+				if s.declareSkips > s.plsqlDepth {
+					s.declareSkips = s.plsqlDepth
+				}
+				s.closedPLSQL = s.plsqlDepth == 0
+			}
+			s.cur.WriteString(text[tokenStart:tokenEnd])
+			i = tokenEnd - 1
+			continue
+		}
+
 		// 行注释开始
 		if ch == '-' && i+1 >= len(text) {
 			s.pending = text[i:]
@@ -162,6 +206,20 @@ func (s *sqlStreamSplitter) Feed(chunk []byte) []string {
 
 		// 分号分隔
 		if ch == ';' {
+			if s.plsqlDepth > 0 {
+				s.cur.WriteByte(ch)
+				continue
+			}
+			if s.closedPLSQL {
+				s.cur.WriteByte(ch)
+				stmt := strings.TrimSpace(s.cur.String())
+				if stmt != "" {
+					statements = append(statements, stmt)
+				}
+				s.cur.Reset()
+				s.closedPLSQL = false
+				continue
+			}
 			stmt := strings.TrimSpace(s.cur.String())
 			if stmt != "" {
 				statements = append(statements, stmt)
@@ -175,6 +233,22 @@ func (s *sqlStreamSplitter) Feed(chunk []byte) []string {
 			break
 		}
 		if ch == 0xEF && i+2 < len(text) && text[i+1] == 0xBC && text[i+2] == 0x9B {
+			if s.plsqlDepth > 0 {
+				s.cur.WriteString("；")
+				i += 2
+				continue
+			}
+			if s.closedPLSQL {
+				s.cur.WriteString("；")
+				stmt := strings.TrimSpace(s.cur.String())
+				if stmt != "" {
+					statements = append(statements, stmt)
+				}
+				s.cur.Reset()
+				s.closedPLSQL = false
+				i += 2
+				continue
+			}
 			stmt := strings.TrimSpace(s.cur.String())
 			if stmt != "" {
 				statements = append(statements, stmt)
@@ -217,6 +291,44 @@ func isIncompleteSQLDollarTag(s string) bool {
 	return true
 }
 
+func shouldDeferPLSQLKeywordInStream(text string, tokenStart int, tokenEnd int, token string) bool {
+	switch token {
+	case "begin", "declare", "end", "create", "or", "replace", "editionable", "noneditionable", "procedure", "function", "is", "as":
+	default:
+		return false
+	}
+	if tokenEnd >= len(text) {
+		return true
+	}
+	next := skipSQLWhitespaceAndComments(text, tokenEnd)
+	if next >= len(text) {
+		return true
+	}
+	if isSQLIdentifierStart(text[next]) {
+		nextEnd := next + 1
+		for nextEnd < len(text) && isSQLIdentifierPart(text[nextEnd]) {
+			nextEnd++
+		}
+		return nextEnd >= len(text)
+	}
+	return false
+}
+
+func shouldDeferPLSQLKeywordPrefixInStream(text string, tokenStart int, tokenEnd int, token string) bool {
+	if tokenEnd < len(text) {
+		return false
+	}
+	for _, keyword := range []string{"begin", "declare", "end", "create", "or", "replace", "editionable", "noneditionable", "procedure", "function", "is", "as"} {
+		if strings.HasPrefix(keyword, token) && token != keyword {
+			if tokenStart > 0 && isSQLIdentifierPart(text[tokenStart-1]) {
+				return false
+			}
+			return true
+		}
+	}
+	return false
+}
+
 // streamSQLFile 从 reader 中流式读取 SQL 并逐条回调。
 // onStatement 返回 error 时停止读取并返回该 error。
 // 返回总处理语句数和可能的错误。
diff --git a/internal/app/sql_split_test.go b/internal/app/sql_split_test.go
index 7c9c3d3..0503402 100644
--- a/internal/app/sql_split_test.go
+++ b/internal/app/sql_split_test.go
@@ -66,6 +66,27 @@ func TestSplitSQLStatements_DollarQuoting(t *testing.T) {
 	}
 }
 
+func TestSplitSQLStatements_PostgresCreateFunctionDollarQuoting(t *testing.T) {
+	input := `CREATE OR REPLACE FUNCTION refresh_stats() RETURNS void AS $$
+BEGIN
+    PERFORM refresh_now();
+END;
+$$ LANGUAGE plpgsql;
+SELECT 2;`
+	got := splitSQLStatements(input)
+	want := []string{
+		`CREATE OR REPLACE FUNCTION refresh_stats() RETURNS void AS $$
+BEGIN
+    PERFORM refresh_now();
+END;
+$$ LANGUAGE plpgsql`,
+		"SELECT 2",
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("splitSQLStatements(%q) = %#v, want %#v", input, got, want)
+	}
+}
+
 func TestSplitSQLStatements_FullWidthSemicolon(t *testing.T) {
 	input := "SELECT 1；SELECT 2"
 	got := splitSQLStatements(input)
@@ -111,3 +132,94 @@ func TestSplitSQLStatements_SQLEscapedQuoteMultiple(t *testing.T) {
 	}
 }
 
+func TestSplitSQLStatements_OracleAnonymousBlock(t *testing.T) {
+	input := `BEGIN
+    INSERT INTO tmp_disable_trigger (table_name) VALUES ('t_memcard_reg');
+    UPDATE t_memcard_reg SET CARDLEVEL = 1 WHERE MEMCARDNO = '8032277312';
+    DELETE FROM tmp_disable_trigger WHERE table_name = 't_memcard_reg';
+END;
+SELECT 1 FROM dual;`
+	got := splitSQLStatements(input)
+	want := []string{
+		`BEGIN
+    INSERT INTO tmp_disable_trigger (table_name) VALUES ('t_memcard_reg');
+    UPDATE t_memcard_reg SET CARDLEVEL = 1 WHERE MEMCARDNO = '8032277312';
+    DELETE FROM tmp_disable_trigger WHERE table_name = 't_memcard_reg';
+END;`,
+		"SELECT 1 FROM dual",
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("splitSQLStatements(%q) = %#v, want %#v", input, got, want)
+	}
+}
+
+func TestSplitSQLStatements_OracleDeclareBlock(t *testing.T) {
+	input := `DECLARE
+    v_count NUMBER;
+BEGIN
+    SELECT COUNT(*) INTO v_count FROM t_memcard_reg;
+    UPDATE t_memcard_reg SET CARDLEVEL = v_count WHERE MEMCARDNO = '8032277312';
+END;
+SELECT 1 FROM dual;`
+	got := splitSQLStatements(input)
+	want := []string{
+		`DECLARE
+    v_count NUMBER;
+BEGIN
+    SELECT COUNT(*) INTO v_count FROM t_memcard_reg;
+    UPDATE t_memcard_reg SET CARDLEVEL = v_count WHERE MEMCARDNO = '8032277312';
+END;`,
+		"SELECT 1 FROM dual",
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("splitSQLStatements(%q) = %#v, want %#v", input, got, want)
+	}
+}
+
+func TestSplitSQLStatements_OracleCreateProcedureBlock(t *testing.T) {
+	input := `CREATE OR REPLACE PROCEDURE proc_tally2accept(
+    p_tallyacceptno IN t_tally_accept_h.acceptno%TYPE,
+    out_acceptno OUT t_accept_h.acceptno%TYPE
+) IS
+    v_busno t_tally_accept_h.busno%TYPE;
+    v_count PLS_INTEGER;
+BEGIN
+    SELECT COUNT(*) INTO v_count FROM t_tally_accept_h WHERE acceptno = p_tallyacceptno;
+    IF v_count > 0 THEN
+        out_acceptno := p_tallyacceptno;
+    END IF;
+END;
+SELECT 1 FROM dual;`
+	got := splitSQLStatements(input)
+	want := []string{
+		`CREATE OR REPLACE PROCEDURE proc_tally2accept(
+    p_tallyacceptno IN t_tally_accept_h.acceptno%TYPE,
+    out_acceptno OUT t_accept_h.acceptno%TYPE
+) IS
+    v_busno t_tally_accept_h.busno%TYPE;
+    v_count PLS_INTEGER;
+BEGIN
+    SELECT COUNT(*) INTO v_count FROM t_tally_accept_h WHERE acceptno = p_tallyacceptno;
+    IF v_count > 0 THEN
+        out_acceptno := p_tallyacceptno;
+    END IF;
+END;`,
+		"SELECT 1 FROM dual",
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("splitSQLStatements(%q) = %#v, want %#v", input, got, want)
+	}
+}
+
+func TestSplitSQLStatements_TransactionBeginStillSplits(t *testing.T) {
+	input := "BEGIN; UPDATE accounts SET balance = balance - 1 WHERE id = 1; COMMIT;"
+	got := splitSQLStatements(input)
+	want := []string{
+		"BEGIN",
+		"UPDATE accounts SET balance = balance - 1 WHERE id = 1",
+		"COMMIT",
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("splitSQLStatements(%q) = %#v, want %#v", input, got, want)
+	}
+}
diff --git a/internal/app/window_zoom_windows_test.go b/internal/app/window_zoom_windows_test.go
index 83cb4b3..6f4abe1 100644
--- a/internal/app/window_zoom_windows_test.go
+++ b/internal/app/window_zoom_windows_test.go
@@ -45,7 +45,8 @@ func (p *panicChromium) PutZoomFactor(float64) {
 }
 
 type panicFrontend struct {
-	chromium *panicChromium
+	chromium   *panicChromium
+	mainWindow *fakeWindow
 }
 
 // 测试必须用 wails 一致的 string key "frontend" 作为 context.WithValue 的 key，
@@ -122,7 +123,10 @@ func TestResetWebViewZoomFactorErrorsWhenFrontendMissing(t *testing.T) {
 }
 
 func TestResetWebViewZoomFactorRecoversFromPutZoomFactorPanic(t *testing.T) {
-	ctx := context.WithValue(context.Background(), stringContextKey("frontend"), &panicFrontend{chromium: &panicChromium{}})
+	ctx := context.WithValue(context.Background(), stringContextKey("frontend"), &panicFrontend{
+		chromium:   &panicChromium{},
+		mainWindow: &fakeWindow{},
+	})
 
 	err := resetWebViewZoomFactor(ctx, 1.0)
 	if err == nil {
diff --git a/internal/buildutil/windows_import_lib.go b/internal/buildutil/windows_import_lib.go
new file mode 100644
index 0000000..a693eed
--- /dev/null
+++ b/internal/buildutil/windows_import_lib.go
@@ -0,0 +1,229 @@
+package buildutil
+
+import (
+	"bytes"
+	"debug/pe"
+	"encoding/binary"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"slices"
+	"strings"
+)
+
+const peExportDirectoryIndex = 0
+
+type imageExportDirectory struct {
+	Characteristics       uint32
+	TimeDateStamp         uint32
+	MajorVersion          uint16
+	MinorVersion          uint16
+	Name                  uint32
+	Base                  uint32
+	NumberOfFunctions     uint32
+	NumberOfNames         uint32
+	AddressOfFunctions    uint32
+	AddressOfNames        uint32
+	AddressOfNameOrdinals uint32
+}
+
+func GenerateWindowsImportLibraryFromDLL(dllPath string, dlltoolPath string, outputLibPath string) error {
+	trimmedDLLPath := strings.TrimSpace(dllPath)
+	if trimmedDLLPath == "" {
+		return fmt.Errorf("dll path is empty")
+	}
+	trimmedOutput := strings.TrimSpace(outputLibPath)
+	if trimmedOutput == "" {
+		return fmt.Errorf("output import library path is empty")
+	}
+	if strings.TrimSpace(dlltoolPath) == "" {
+		resolved, err := exec.LookPath("dlltool")
+		if err != nil {
+			return fmt.Errorf("locate dlltool failed: %w", err)
+		}
+		dlltoolPath = resolved
+	}
+
+	exportNames, err := readPEExportNames(trimmedDLLPath)
+	if err != nil {
+		return err
+	}
+	if len(exportNames) == 0 {
+		return fmt.Errorf("no export symbols found in %s", trimmedDLLPath)
+	}
+
+	if err := os.MkdirAll(filepath.Dir(trimmedOutput), 0o755); err != nil {
+		return fmt.Errorf("create output dir failed: %w", err)
+	}
+
+	defPath := strings.TrimSuffix(trimmedOutput, filepath.Ext(trimmedOutput)) + ".def"
+	defContent := buildModuleDefinition(filepath.Base(trimmedDLLPath), exportNames)
+	if err := os.WriteFile(defPath, []byte(defContent), 0o644); err != nil {
+		return fmt.Errorf("write module definition failed: %w", err)
+	}
+
+	cmd := exec.Command(
+		dlltoolPath,
+		"--input-def", defPath,
+		"--dllname", filepath.Base(trimmedDLLPath),
+		"--output-lib", trimmedOutput,
+	)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("generate import library failed: %w; output=%s", err, strings.TrimSpace(string(output)))
+	}
+	return nil
+}
+
+func buildModuleDefinition(dllName string, exportNames []string) string {
+	seen := make(map[string]struct{}, len(exportNames))
+	normalized := make([]string, 0, len(exportNames))
+	for _, name := range exportNames {
+		trimmed := strings.TrimSpace(name)
+		if trimmed == "" {
+			continue
+		}
+		if _, ok := seen[trimmed]; ok {
+			continue
+		}
+		seen[trimmed] = struct{}{}
+		normalized = append(normalized, trimmed)
+	}
+	slices.Sort(normalized)
+
+	var builder strings.Builder
+	builder.WriteString("LIBRARY ")
+	builder.WriteString(dllName)
+	builder.WriteString("\nEXPORTS\n")
+	for _, name := range normalized {
+		builder.WriteString("    ")
+		builder.WriteString(name)
+		builder.WriteString("\n")
+	}
+	return builder.String()
+}
+
+func readPEExportNames(dllPath string) ([]string, error) {
+	file, err := pe.Open(dllPath)
+	if err != nil {
+		return nil, fmt.Errorf("open dll failed: %w", err)
+	}
+	defer file.Close()
+
+	exportDirectoryRVA, err := resolveExportDirectoryRVA(file)
+	if err != nil {
+		return nil, err
+	}
+	if exportDirectoryRVA == 0 {
+		return nil, fmt.Errorf("dll has no export directory: %s", dllPath)
+	}
+
+	payload, err := readBytesAtRVA(file, exportDirectoryRVA, binary.Size(imageExportDirectory{}))
+	if err != nil {
+		return nil, fmt.Errorf("read export directory failed: %w", err)
+	}
+	var directory imageExportDirectory
+	if err := binary.Read(bytes.NewReader(payload), binary.LittleEndian, &directory); err != nil {
+		return nil, fmt.Errorf("decode export directory failed: %w", err)
+	}
+	if directory.NumberOfNames == 0 {
+		return nil, nil
+	}
+
+	nameTable, err := readBytesAtRVA(file, directory.AddressOfNames, int(directory.NumberOfNames)*4)
+	if err != nil {
+		return nil, fmt.Errorf("read export name table failed: %w", err)
+	}
+
+	names := make([]string, 0, directory.NumberOfNames)
+	for index := uint32(0); index < directory.NumberOfNames; index++ {
+		offset := index * 4
+		nameRVA := binary.LittleEndian.Uint32(nameTable[offset : offset+4])
+		name, err := readCStringAtRVA(file, nameRVA)
+		if err != nil {
+			return nil, fmt.Errorf("read export name failed: %w", err)
+		}
+		names = append(names, name)
+	}
+	return names, nil
+}
+
+func resolveExportDirectoryRVA(file *pe.File) (uint32, error) {
+	switch header := file.OptionalHeader.(type) {
+	case *pe.OptionalHeader32:
+		if len(header.DataDirectory) <= peExportDirectoryIndex {
+			return 0, fmt.Errorf("optional header has no export directory")
+		}
+		return header.DataDirectory[peExportDirectoryIndex].VirtualAddress, nil
+	case *pe.OptionalHeader64:
+		if len(header.DataDirectory) <= peExportDirectoryIndex {
+			return 0, fmt.Errorf("optional header has no export directory")
+		}
+		return header.DataDirectory[peExportDirectoryIndex].VirtualAddress, nil
+	default:
+		return 0, fmt.Errorf("unsupported optional header type %T", file.OptionalHeader)
+	}
+}
+
+func readBytesAtRVA(file *pe.File, rva uint32, size int) ([]byte, error) {
+	if size < 0 {
+		return nil, fmt.Errorf("invalid size %d", size)
+	}
+	for _, section := range file.Sections {
+		start := section.VirtualAddress
+		length := maxUint32(section.VirtualSize, section.Size)
+		end := start + length
+		if rva < start || rva >= end {
+			continue
+		}
+		offset := int(rva - start)
+		data, err := section.Data()
+		if err != nil {
+			return nil, err
+		}
+		if offset > len(data) {
+			return nil, fmt.Errorf("rva %d out of section bounds", rva)
+		}
+		if size == 0 {
+			return []byte{}, nil
+		}
+		if offset+size > len(data) {
+			return nil, fmt.Errorf("rva %d with size %d exceeds section size", rva, size)
+		}
+		return data[offset : offset+size], nil
+	}
+	return nil, fmt.Errorf("rva %d not found in any section", rva)
+}
+
+func readCStringAtRVA(file *pe.File, rva uint32) (string, error) {
+	for _, section := range file.Sections {
+		start := section.VirtualAddress
+		length := maxUint32(section.VirtualSize, section.Size)
+		end := start + length
+		if rva < start || rva >= end {
+			continue
+		}
+		offset := int(rva - start)
+		data, err := section.Data()
+		if err != nil {
+			return "", err
+		}
+		if offset >= len(data) {
+			return "", fmt.Errorf("string rva %d out of section bounds", rva)
+		}
+		endIndex := offset
+		for endIndex < len(data) && data[endIndex] != 0 {
+			endIndex++
+		}
+		return string(data[offset:endIndex]), nil
+	}
+	return "", fmt.Errorf("string rva %d not found in any section", rva)
+}
+
+func maxUint32(left uint32, right uint32) uint32 {
+	if left > right {
+		return left
+	}
+	return right
+}
diff --git a/internal/buildutil/windows_import_lib_test.go b/internal/buildutil/windows_import_lib_test.go
new file mode 100644
index 0000000..5ed70e7
--- /dev/null
+++ b/internal/buildutil/windows_import_lib_test.go
@@ -0,0 +1,20 @@
+package buildutil
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestBuildModuleDefinition(t *testing.T) {
+	content := buildModuleDefinition("duckdb.dll", []string{"duckdb_close", "duckdb_open", "duckdb_open", ""})
+
+	if !strings.Contains(content, "LIBRARY duckdb.dll") {
+		t.Fatalf("expected dll header, got %q", content)
+	}
+	if strings.Count(content, "duckdb_open") != 1 {
+		t.Fatalf("expected duplicate exports to be collapsed: %q", content)
+	}
+	if !strings.Contains(content, "EXPORTS\n    duckdb_close\n    duckdb_open\n") {
+		t.Fatalf("expected sorted export list, got %q", content)
+	}
+}
diff --git a/internal/connection/saved_query.go b/internal/connection/saved_query.go
new file mode 100644
index 0000000..24e245b
--- /dev/null
+++ b/internal/connection/saved_query.go
@@ -0,0 +1,19 @@
+package connection
+
+type SavedQuery struct {
+	ID                    string `json:"id"`
+	Name                  string `json:"name"`
+	SQL                   string `json:"sql"`
+	ConnectionID          string `json:"connectionId"`
+	DBName                string `json:"dbName"`
+	CreatedAt             int64  `json:"createdAt"`
+	ConnectionFingerprint string `json:"connectionFingerprint,omitempty"`
+	FingerprintVersion    string `json:"fingerprintVersion,omitempty"`
+	BindingStatus         string `json:"bindingStatus,omitempty"`
+	OriginalConnectionID  string `json:"originalConnectionId,omitempty"`
+}
+
+type SavedQueryImportPayload struct {
+	Queries           []SavedQuery           `json:"queries"`
+	LegacyConnections []SavedConnectionInput `json:"legacyConnections,omitempty"`
+}
diff --git a/internal/connection/saved_types.go b/internal/connection/saved_types.go
index c99bf1a..2a5f875 100644
--- a/internal/connection/saved_types.go
+++ b/internal/connection/saved_types.go
@@ -1,40 +1,42 @@
 package connection
 
 type SavedConnectionInput struct {
-	ID                        string           `json:"id,omitempty"`
-	Name                      string           `json:"name"`
-	Config                    ConnectionConfig `json:"config"`
-	IncludeDatabases          []string         `json:"includeDatabases,omitempty"`
-	IncludeRedisDatabases     []int            `json:"includeRedisDatabases,omitempty"`
-	IconType                  string           `json:"iconType,omitempty"`
-	IconColor                 string           `json:"iconColor,omitempty"`
-	ClearPrimaryPassword      bool             `json:"clearPrimaryPassword,omitempty"`
-	ClearSSHPassword          bool             `json:"clearSSHPassword,omitempty"`
-	ClearProxyPassword        bool             `json:"clearProxyPassword,omitempty"`
-	ClearHTTPTunnelPassword   bool             `json:"clearHttpTunnelPassword,omitempty"`
-	ClearMySQLReplicaPassword bool             `json:"clearMySQLReplicaPassword,omitempty"`
-	ClearMongoReplicaPassword bool             `json:"clearMongoReplicaPassword,omitempty"`
-	ClearOpaqueURI            bool             `json:"clearOpaqueURI,omitempty"`
-	ClearOpaqueDSN            bool             `json:"clearOpaqueDSN,omitempty"`
+	ID                         string           `json:"id,omitempty"`
+	Name                       string           `json:"name"`
+	Config                     ConnectionConfig `json:"config"`
+	IncludeDatabases           []string         `json:"includeDatabases,omitempty"`
+	IncludeRedisDatabases      []int            `json:"includeRedisDatabases,omitempty"`
+	IconType                   string           `json:"iconType,omitempty"`
+	IconColor                  string           `json:"iconColor,omitempty"`
+	ClearPrimaryPassword       bool             `json:"clearPrimaryPassword,omitempty"`
+	ClearSSHPassword           bool             `json:"clearSSHPassword,omitempty"`
+	ClearProxyPassword         bool             `json:"clearProxyPassword,omitempty"`
+	ClearHTTPTunnelPassword    bool             `json:"clearHttpTunnelPassword,omitempty"`
+	ClearMySQLReplicaPassword  bool             `json:"clearMySQLReplicaPassword,omitempty"`
+	ClearMongoReplicaPassword  bool             `json:"clearMongoReplicaPassword,omitempty"`
+	ClearRedisSentinelPassword bool             `json:"clearRedisSentinelPassword,omitempty"`
+	ClearOpaqueURI             bool             `json:"clearOpaqueURI,omitempty"`
+	ClearOpaqueDSN             bool             `json:"clearOpaqueDSN,omitempty"`
 }
 
 type SavedConnectionView struct {
-	ID                      string           `json:"id"`
-	Name                    string           `json:"name"`
-	Config                  ConnectionConfig `json:"config"`
-	IncludeDatabases        []string         `json:"includeDatabases,omitempty"`
-	IncludeRedisDatabases   []int            `json:"includeRedisDatabases,omitempty"`
-	IconType                string           `json:"iconType,omitempty"`
-	IconColor               string           `json:"iconColor,omitempty"`
-	SecretRef               string           `json:"secretRef,omitempty"`
-	HasPrimaryPassword      bool             `json:"hasPrimaryPassword,omitempty"`
-	HasSSHPassword          bool             `json:"hasSSHPassword,omitempty"`
-	HasProxyPassword        bool             `json:"hasProxyPassword,omitempty"`
-	HasHTTPTunnelPassword   bool             `json:"hasHttpTunnelPassword,omitempty"`
-	HasMySQLReplicaPassword bool             `json:"hasMySQLReplicaPassword,omitempty"`
-	HasMongoReplicaPassword bool             `json:"hasMongoReplicaPassword,omitempty"`
-	HasOpaqueURI            bool             `json:"hasOpaqueURI,omitempty"`
-	HasOpaqueDSN            bool             `json:"hasOpaqueDSN,omitempty"`
+	ID                       string           `json:"id"`
+	Name                     string           `json:"name"`
+	Config                   ConnectionConfig `json:"config"`
+	IncludeDatabases         []string         `json:"includeDatabases,omitempty"`
+	IncludeRedisDatabases    []int            `json:"includeRedisDatabases,omitempty"`
+	IconType                 string           `json:"iconType,omitempty"`
+	IconColor                string           `json:"iconColor,omitempty"`
+	SecretRef                string           `json:"secretRef,omitempty"`
+	HasPrimaryPassword       bool             `json:"hasPrimaryPassword,omitempty"`
+	HasSSHPassword           bool             `json:"hasSSHPassword,omitempty"`
+	HasProxyPassword         bool             `json:"hasProxyPassword,omitempty"`
+	HasHTTPTunnelPassword    bool             `json:"hasHttpTunnelPassword,omitempty"`
+	HasMySQLReplicaPassword  bool             `json:"hasMySQLReplicaPassword,omitempty"`
+	HasMongoReplicaPassword  bool             `json:"hasMongoReplicaPassword,omitempty"`
+	HasRedisSentinelPassword bool             `json:"hasRedisSentinelPassword,omitempty"`
+	HasOpaqueURI             bool             `json:"hasOpaqueURI,omitempty"`
+	HasOpaqueDSN             bool             `json:"hasOpaqueDSN,omitempty"`
 }
 
 type LegacySavedConnection = SavedConnectionInput
diff --git a/internal/connection/types.go b/internal/connection/types.go
index 8ecc96f..5968f0b 100644
--- a/internal/connection/types.go
+++ b/internal/connection/types.go
@@ -79,60 +79,68 @@ type JVMConfig struct {
 
 // ConnectionConfig 存储数据库连接的完整配置，包括 SSH、代理、SSL 等网络层设置。
 type ConnectionConfig struct {
-	ID                   string           `json:"id,omitempty"`
-	Type                 string           `json:"type"`
-	Host                 string           `json:"host"`
-	Port                 int              `json:"port"`
-	User                 string           `json:"user"`
-	Password             string           `json:"password"`
-	SavePassword         bool             `json:"savePassword,omitempty"` // Persist password in saved connection
-	Database             string           `json:"database"`
-	UseSSL               bool             `json:"useSSL,omitempty"`      // MySQL-like SSL/TLS switch
-	SSLMode              string           `json:"sslMode,omitempty"`     // preferred | required | skip-verify | disable
-	SSLCAPath            string           `json:"sslCAPath,omitempty"`   // TLS root CA / server certificate path
-	SSLCertPath          string           `json:"sslCertPath,omitempty"` // TLS client certificate path (e.g., Dameng)
-	SSLKeyPath           string           `json:"sslKeyPath,omitempty"`  // TLS client private key path (e.g., Dameng)
-	UseSSH               bool             `json:"useSSH"`
-	SSH                  SSHConfig        `json:"ssh"`
-	UseProxy             bool             `json:"useProxy,omitempty"`
-	Proxy                ProxyConfig      `json:"proxy,omitempty"`
-	UseHTTPTunnel        bool             `json:"useHttpTunnel,omitempty"`
-	HTTPTunnel           HTTPTunnelConfig `json:"httpTunnel,omitempty"`
-	Driver               string           `json:"driver,omitempty"`               // For custom connection
-	DSN                  string           `json:"dsn,omitempty"`                  // For custom connection
-	ConnectionParams     string           `json:"connectionParams,omitempty"`     // Extra URI query parameters for built-in drivers
-	Timeout              int              `json:"timeout,omitempty"`              // Connection timeout in seconds (default: 30)
-	RedisDB              int              `json:"redisDB,omitempty"`              // Redis database index (0-15)
-	URI                  string           `json:"uri,omitempty"`                  // Connection URI for copy/paste
-	ClickHouseProtocol   string           `json:"clickHouseProtocol,omitempty"`   // auto | http | native
-	OceanBaseProtocol    string           `json:"oceanBaseProtocol,omitempty"`    // OceanBase tenant compatibility protocol: mysql | oracle
-	Hosts                []string         `json:"hosts,omitempty"`                // Multi-host addresses: host:port
-	Topology             string           `json:"topology,omitempty"`             // single | replica | cluster
-	MySQLReplicaUser     string           `json:"mysqlReplicaUser,omitempty"`     // MySQL replica auth user
-	MySQLReplicaPassword string           `json:"mysqlReplicaPassword,omitempty"` // MySQL replica auth password
-	ReplicaSet           string           `json:"replicaSet,omitempty"`           // MongoDB replica set name
-	AuthSource           string           `json:"authSource,omitempty"`           // MongoDB authSource
-	ReadPreference       string           `json:"readPreference,omitempty"`       // MongoDB readPreference
-	MongoSRV             bool             `json:"mongoSrv,omitempty"`             // MongoDB use mongodb+srv URI scheme
-	MongoAuthMechanism   string           `json:"mongoAuthMechanism,omitempty"`   // MongoDB authMechanism
-	MongoReplicaUser     string           `json:"mongoReplicaUser,omitempty"`     // MongoDB replica auth user
-	MongoReplicaPassword string           `json:"mongoReplicaPassword,omitempty"` // MongoDB replica auth password
-	JVM                  JVMConfig        `json:"jvm,omitempty"`                  // JVM connector config
+	ID                    string           `json:"id,omitempty"`
+	Type                  string           `json:"type"`
+	Host                  string           `json:"host"`
+	Port                  int              `json:"port"`
+	User                  string           `json:"user"`
+	Password              string           `json:"password"`
+	SavePassword          bool             `json:"savePassword,omitempty"` // Persist password in saved connection
+	Database              string           `json:"database"`
+	UseSSL                bool             `json:"useSSL,omitempty"`      // MySQL-like SSL/TLS switch
+	SSLMode               string           `json:"sslMode,omitempty"`     // preferred | required | skip-verify | disable
+	SSLCAPath             string           `json:"sslCAPath,omitempty"`   // TLS root CA / server certificate path
+	SSLCertPath           string           `json:"sslCertPath,omitempty"` // TLS client certificate path (e.g., Dameng)
+	SSLKeyPath            string           `json:"sslKeyPath,omitempty"`  // TLS client private key path (e.g., Dameng)
+	UseSSH                bool             `json:"useSSH"`
+	SSH                   SSHConfig        `json:"ssh"`
+	UseProxy              bool             `json:"useProxy,omitempty"`
+	Proxy                 ProxyConfig      `json:"proxy,omitempty"`
+	UseHTTPTunnel         bool             `json:"useHttpTunnel,omitempty"`
+	HTTPTunnel            HTTPTunnelConfig `json:"httpTunnel,omitempty"`
+	Driver                string           `json:"driver,omitempty"`                // For custom connection
+	DSN                   string           `json:"dsn,omitempty"`                   // For custom connection
+	ConnectionParams      string           `json:"connectionParams,omitempty"`      // Extra URI query parameters for built-in drivers
+	Timeout               int              `json:"timeout,omitempty"`               // Connection timeout in seconds (default: 30)
+	RedisDB               int              `json:"redisDB,omitempty"`               // Redis database index (0-15)
+	RedisSentinelMaster   string           `json:"redisSentinelMaster,omitempty"`   // Redis Sentinel master name
+	RedisSentinelUser     string           `json:"redisSentinelUser,omitempty"`     // Redis Sentinel auth user
+	RedisSentinelPassword string           `json:"redisSentinelPassword,omitempty"` // Redis Sentinel auth password
+	URI                   string           `json:"uri,omitempty"`                   // Connection URI for copy/paste
+	ClickHouseProtocol    string           `json:"clickHouseProtocol,omitempty"`    // auto | http | native
+	OceanBaseProtocol     string           `json:"oceanBaseProtocol,omitempty"`     // OceanBase tenant compatibility protocol: mysql | oracle
+	Hosts                 []string         `json:"hosts,omitempty"`                 // Multi-host addresses: host:port
+	Topology              string           `json:"topology,omitempty"`              // single | replica | cluster | sentinel
+	MySQLReplicaUser      string           `json:"mysqlReplicaUser,omitempty"`      // MySQL replica auth user
+	MySQLReplicaPassword  string           `json:"mysqlReplicaPassword,omitempty"`  // MySQL replica auth password
+	ReplicaSet            string           `json:"replicaSet,omitempty"`            // MongoDB replica set name
+	AuthSource            string           `json:"authSource,omitempty"`            // MongoDB authSource
+	ReadPreference        string           `json:"readPreference,omitempty"`        // MongoDB readPreference
+	MongoSRV              bool             `json:"mongoSrv,omitempty"`              // MongoDB use mongodb+srv URI scheme
+	MongoAuthMechanism    string           `json:"mongoAuthMechanism,omitempty"`    // MongoDB authMechanism
+	MongoReplicaUser      string           `json:"mongoReplicaUser,omitempty"`      // MongoDB replica auth user
+	MongoReplicaPassword  string           `json:"mongoReplicaPassword,omitempty"`  // MongoDB replica auth password
+	JVM                   JVMConfig        `json:"jvm,omitempty"`                   // JVM connector config
 }
 
 // ResultSetData 表示一个查询结果集（行 + 列名），用于多结果集场景。
 type ResultSetData struct {
-	Rows    []map[string]interface{} `json:"rows"`
-	Columns []string                 `json:"columns"`
+	Rows           []map[string]interface{} `json:"rows"`
+	Columns        []string                 `json:"columns"`
+	Messages       []string                 `json:"messages,omitempty"`
+	StatementIndex int                      `json:"statementIndex,omitempty"`
 }
 
 // QueryResult 是 Wails 绑定方法的统一响应格式，前端通过此结构体接收后端结果。
 type QueryResult struct {
-	Success bool        `json:"success"`
-	Message string      `json:"message"`
-	Data    interface{} `json:"data"`
-	Fields  []string    `json:"fields,omitempty"`
-	QueryID string      `json:"queryId,omitempty"` // Unique ID for query cancellation
+	Success            bool        `json:"success"`
+	Message            string      `json:"message"`
+	Data               interface{} `json:"data"`
+	Fields             []string    `json:"fields,omitempty"`
+	Messages           []string    `json:"messages,omitempty"`
+	QueryID            string      `json:"queryId,omitempty"` // Unique ID for query cancellation
+	TransactionID      string      `json:"transactionId,omitempty"`
+	TransactionPending bool        `json:"transactionPending,omitempty"`
 }
 
 // ColumnDefinition 描述表的一个列定义。
diff --git a/internal/dailysecret/store.go b/internal/dailysecret/store.go
index efb4037..8a8c47a 100644
--- a/internal/dailysecret/store.go
+++ b/internal/dailysecret/store.go
@@ -13,14 +13,15 @@ const (
 )
 
 type ConnectionBundle struct {
-	Password             string `json:"password,omitempty"`
-	SSHPassword          string `json:"sshPassword,omitempty"`
-	ProxyPassword        string `json:"proxyPassword,omitempty"`
-	HTTPTunnelPassword   string `json:"httpTunnelPassword,omitempty"`
-	MySQLReplicaPassword string `json:"mysqlReplicaPassword,omitempty"`
-	MongoReplicaPassword string `json:"mongoReplicaPassword,omitempty"`
-	OpaqueURI            string `json:"opaqueURI,omitempty"`
-	OpaqueDSN            string `json:"opaqueDSN,omitempty"`
+	Password              string `json:"password,omitempty"`
+	SSHPassword           string `json:"sshPassword,omitempty"`
+	ProxyPassword         string `json:"proxyPassword,omitempty"`
+	HTTPTunnelPassword    string `json:"httpTunnelPassword,omitempty"`
+	MySQLReplicaPassword  string `json:"mysqlReplicaPassword,omitempty"`
+	MongoReplicaPassword  string `json:"mongoReplicaPassword,omitempty"`
+	RedisSentinelPassword string `json:"redisSentinelPassword,omitempty"`
+	OpaqueURI             string `json:"opaqueURI,omitempty"`
+	OpaqueDSN             string `json:"opaqueDSN,omitempty"`
 }
 
 func (b ConnectionBundle) HasAny() bool {
@@ -30,6 +31,7 @@ func (b ConnectionBundle) HasAny() bool {
 		strings.TrimSpace(b.HTTPTunnelPassword) != "" ||
 		strings.TrimSpace(b.MySQLReplicaPassword) != "" ||
 		strings.TrimSpace(b.MongoReplicaPassword) != "" ||
+		strings.TrimSpace(b.RedisSentinelPassword) != "" ||
 		strings.TrimSpace(b.OpaqueURI) != "" ||
 		strings.TrimSpace(b.OpaqueDSN) != ""
 }
diff --git a/internal/db/batch_write_interface_gaussdb_test.go b/internal/db/batch_write_interface_gaussdb_test.go
new file mode 100644
index 0000000..9abf499
--- /dev/null
+++ b/internal/db/batch_write_interface_gaussdb_test.go
@@ -0,0 +1,12 @@
+//go:build gonavi_gaussdb_driver
+
+package db
+
+import "testing"
+
+func TestBatchWriteDriverCoverageGaussDB(t *testing.T) {
+	var driver BatchWriteExecer = (*GaussDB)(nil)
+	if driver == nil {
+		t.Fatal("expected GaussDB to implement BatchWriteExecer")
+	}
+}
diff --git a/internal/db/batch_write_interface_highgo_test.go b/internal/db/batch_write_interface_highgo_test.go
new file mode 100644
index 0000000..23b3243
--- /dev/null
+++ b/internal/db/batch_write_interface_highgo_test.go
@@ -0,0 +1,12 @@
+//go:build gonavi_highgo_driver
+
+package db
+
+import "testing"
+
+func TestBatchWriteDriverCoverageHighGo(t *testing.T) {
+	var driver BatchWriteExecer = (*HighGoDB)(nil)
+	if driver == nil {
+		t.Fatal("expected HighGoDB to implement BatchWriteExecer")
+	}
+}
diff --git a/internal/db/batch_write_interface_kingbase_test.go b/internal/db/batch_write_interface_kingbase_test.go
new file mode 100644
index 0000000..19666cf
--- /dev/null
+++ b/internal/db/batch_write_interface_kingbase_test.go
@@ -0,0 +1,12 @@
+//go:build gonavi_kingbase_driver
+
+package db
+
+import "testing"
+
+func TestBatchWriteDriverCoverageKingbase(t *testing.T) {
+	var driver BatchWriteExecer = (*KingbaseDB)(nil)
+	if driver == nil {
+		t.Fatal("expected KingbaseDB to implement BatchWriteExecer")
+	}
+}
diff --git a/internal/db/batch_write_interface_sqlserver_test.go b/internal/db/batch_write_interface_sqlserver_test.go
new file mode 100644
index 0000000..f9aaef9
--- /dev/null
+++ b/internal/db/batch_write_interface_sqlserver_test.go
@@ -0,0 +1,12 @@
+//go:build gonavi_sqlserver_driver
+
+package db
+
+import "testing"
+
+func TestBatchWriteDriverCoverageSQLServer(t *testing.T) {
+	var driver BatchWriteExecer = (*SqlServerDB)(nil)
+	if driver == nil {
+		t.Fatal("expected SqlServerDB to implement BatchWriteExecer")
+	}
+}
diff --git a/internal/db/batch_write_interface_test.go b/internal/db/batch_write_interface_test.go
index 1ec3ccf..15d8a26 100644
--- a/internal/db/batch_write_interface_test.go
+++ b/internal/db/batch_write_interface_test.go
@@ -1,4 +1,4 @@
-//go:build gonavi_full_drivers || gonavi_sqlserver_driver || gonavi_kingbase_driver || gonavi_highgo_driver || gonavi_vastbase_driver
+//go:build gonavi_full_drivers
 
 package db
 
@@ -32,4 +32,11 @@ func TestBatchWriteDriverCoverage(t *testing.T) {
 			t.Fatal("expected VastbaseDB to implement BatchWriteExecer")
 		}
 	})
+
+	t.Run("gaussdb", func(t *testing.T) {
+		var driver BatchWriteExecer = (*GaussDB)(nil)
+		if driver == nil {
+			t.Fatal("expected GaussDB to implement BatchWriteExecer")
+		}
+	})
 }
diff --git a/internal/db/batch_write_interface_vastbase_test.go b/internal/db/batch_write_interface_vastbase_test.go
new file mode 100644
index 0000000..c991d32
--- /dev/null
+++ b/internal/db/batch_write_interface_vastbase_test.go
@@ -0,0 +1,12 @@
+//go:build gonavi_vastbase_driver
+
+package db
+
+import "testing"
+
+func TestBatchWriteDriverCoverageVastbase(t *testing.T) {
+	var driver BatchWriteExecer = (*VastbaseDB)(nil)
+	if driver == nil {
+		t.Fatal("expected VastbaseDB to implement BatchWriteExecer")
+	}
+}
diff --git a/internal/db/chroma_impl.go b/internal/db/chroma_impl.go
new file mode 100644
index 0000000..9e7fd7f
--- /dev/null
+++ b/internal/db/chroma_impl.go
@@ -0,0 +1,1196 @@
+package db
+
+import (
+	"bytes"
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+	proxytunnel "GoNavi-Wails/internal/proxy"
+	"GoNavi-Wails/internal/ssh"
+)
+
+const (
+	defaultChromaPort         = 8000
+	defaultChromaTenant       = "default_tenant"
+	defaultChromaDatabase     = "default_database"
+	defaultChromaQueryTimeout = 30 * time.Second
+)
+
+type ChromaDB struct {
+	client      *http.Client
+	baseURL     string
+	tenant      string
+	database    string
+	apiVersion  int
+	authHeaders map[string]string
+	forwarder   *ssh.LocalForwarder
+}
+
+type chromaCollection struct {
+	ID        string                 `json:"id"`
+	Name      string                 `json:"name"`
+	Metadata  map[string]interface{} `json:"metadata"`
+	Dimension int                    `json:"dimension"`
+	Tenant    string                 `json:"tenant"`
+	Database  string                 `json:"database"`
+}
+
+type chromaGetResponse struct {
+	IDs        []string                 `json:"ids"`
+	Documents  []interface{}            `json:"documents"`
+	Metadatas  []map[string]interface{} `json:"metadatas"`
+	Embeddings []interface{}            `json:"embeddings"`
+	Included   []string                 `json:"included"`
+}
+
+func (c *ChromaDB) Connect(config connection.ConnectionConfig) error {
+	if c.forwarder != nil {
+		_ = c.forwarder.Close()
+		c.forwarder = nil
+	}
+	c.client = nil
+
+	runConfig := normalizeChromaConfig(config)
+	if runConfig.UseSSH {
+		forwarder, err := ssh.GetOrCreateLocalForwarder(runConfig.SSH, runConfig.Host, runConfig.Port)
+		if err != nil {
+			return fmt.Errorf("创建 SSH 隧道失败：%w", err)
+		}
+		c.forwarder = forwarder
+
+		host, portText, err := net.SplitHostPort(forwarder.LocalAddr)
+		if err != nil {
+			return fmt.Errorf("解析本地转发地址失败：%w", err)
+		}
+		port, err := strconv.Atoi(portText)
+		if err != nil {
+			return fmt.Errorf("解析本地端口失败：%w", err)
+		}
+		runConfig.Host = host
+		runConfig.Port = port
+		runConfig.UseSSH = false
+		logger.Infof("Chroma 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	}
+
+	c.tenant = chromaTenantFromConfig(runConfig)
+	c.database = chromaDatabaseFromConfig(runConfig)
+	c.baseURL = buildChromaBaseURL(runConfig)
+	c.authHeaders = chromaAuthHeaders(runConfig)
+	c.client = buildChromaHTTPClient(runConfig)
+
+	if err := c.Ping(); err != nil {
+		_ = c.Close()
+		return err
+	}
+	return nil
+}
+
+func (c *ChromaDB) Close() error {
+	if c.forwarder != nil {
+		if err := c.forwarder.Close(); err != nil {
+			logger.Warnf("关闭 Chroma SSH 端口转发失败：%v", err)
+		}
+		c.forwarder = nil
+	}
+	c.client = nil
+	return nil
+}
+
+func (c *ChromaDB) Ping() error {
+	if c.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	if err := c.detectVersion(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (c *ChromaDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultChromaQueryTimeout)
+	defer cancel()
+	return c.QueryContext(ctx, query)
+}
+
+func (c *ChromaDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if c.client == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+	text := strings.TrimSpace(query)
+	if text == "" {
+		return nil, nil, fmt.Errorf("查询语句不能为空")
+	}
+
+	if strings.HasPrefix(text, "{") {
+		return c.queryJSON(ctx, text)
+	}
+
+	if parsed, ok := parseChromaSQL(text); ok {
+		if parsed.Count {
+			total, err := c.countCollection(ctx, parsed.Collection, parsed.Where)
+			if err != nil {
+				return nil, nil, err
+			}
+			return []map[string]interface{}{{"total": total}}, []string{"total"}, nil
+		}
+		include := []string{"documents", "metadatas"}
+		if parsed.IncludeEmbeddings {
+			include = append(include, "embeddings")
+		}
+		return c.getCollectionRows(ctx, parsed.Collection, parsed.Limit, parsed.Offset, parsed.Where, include)
+	}
+
+	return nil, nil, fmt.Errorf("Chroma 查询仅支持 JSON 命令或简单 SELECT 预览")
+}
+
+func (c *ChromaDB) Exec(query string) (int64, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultChromaQueryTimeout)
+	defer cancel()
+	return c.ExecContext(ctx, query)
+}
+
+func (c *ChromaDB) ExecContext(ctx context.Context, query string) (int64, error) {
+	if c.client == nil {
+		return 0, fmt.Errorf("连接未打开")
+	}
+	var cmd map[string]interface{}
+	if err := decodeJSONWithUseNumber([]byte(strings.TrimSpace(query)), &cmd); err != nil {
+		return 0, fmt.Errorf("Chroma 写入命令必须是 JSON：%w", err)
+	}
+	if name := firstStringValue(cmd, "create_collection", "createCollection", "collection"); name != "" && hasAnyKey(cmd, "create_collection", "createCollection") {
+		body := map[string]interface{}{"name": name}
+		if metadata, ok := cmd["metadata"]; ok {
+			body["metadata"] = metadata
+		}
+		if getOrBool(cmd, "get_or_create", "getOrCreate") {
+			body["get_or_create"] = true
+		}
+		return 1, c.createCollection(ctx, body)
+	}
+	if name := firstStringValue(cmd, "delete_collection", "deleteCollection"); name != "" {
+		return 1, c.deleteCollection(ctx, name)
+	}
+	if name := firstStringValue(cmd, "upsert", "collection"); name != "" && hasAnyKey(cmd, "upsert") {
+		return c.upsertCommand(ctx, name, cmd)
+	}
+	if name := firstStringValue(cmd, "delete", "collection"); name != "" && hasAnyKey(cmd, "delete") {
+		return c.deleteCommand(ctx, name, cmd)
+	}
+	return 0, fmt.Errorf("Chroma JSON 写入命令仅支持 create_collection/delete_collection/upsert/delete")
+}
+
+func (c *ChromaDB) GetDatabases() ([]string, error) {
+	if c.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	if err := c.ensureVersion(ctx); err != nil {
+		return nil, err
+	}
+	if c.apiVersion != 2 {
+		return []string{c.database}, nil
+	}
+
+	var raw []map[string]interface{}
+	err := c.doJSON(ctx, http.MethodGet, fmt.Sprintf("/api/v2/tenants/%s/databases", url.PathEscape(c.tenant)), nil, &raw)
+	if err != nil {
+		return []string{c.database}, nil
+	}
+	names := make([]string, 0, len(raw))
+	for _, item := range raw {
+		if name := mapString(item, "name"); name != "" {
+			names = append(names, name)
+		}
+	}
+	if len(names) == 0 {
+		names = append(names, c.database)
+	}
+	sort.Strings(names)
+	return names, nil
+}
+
+func (c *ChromaDB) GetTables(dbName string) ([]string, error) {
+	collections, err := c.listCollections(context.Background(), dbName)
+	if err != nil {
+		return nil, err
+	}
+	names := make([]string, 0, len(collections))
+	for _, item := range collections {
+		if strings.TrimSpace(item.Name) != "" {
+			names = append(names, item.Name)
+		}
+	}
+	sort.Strings(names)
+	return names, nil
+}
+
+func (c *ChromaDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	coll, err := c.resolveCollection(context.Background(), dbName, tableName)
+	if err != nil {
+		return "", err
+	}
+	payload, _ := json.MarshalIndent(coll, "", "  ")
+	return fmt.Sprintf("// Chroma collection: %s\n%s", coll.Name, string(payload)), nil
+}
+
+func (c *ChromaDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	rows, _, err := c.getCollectionRows(context.Background(), tableNameOrDB(dbName, tableName), 20, 0, nil, []string{"documents", "metadatas", "embeddings"})
+	if err != nil {
+		return nil, err
+	}
+	cols := []connection.ColumnDefinition{
+		{Name: "id", Type: "string", Nullable: "NO", Key: "PRI", Comment: "Chroma document id"},
+		{Name: "document", Type: "text", Nullable: "YES", Comment: "Document text"},
+		{Name: "metadata", Type: "json", Nullable: "YES", Comment: "Full metadata object"},
+		{Name: "embedding", Type: "vector<float>", Nullable: "YES", Comment: "Embedding vector"},
+	}
+	seen := map[string]struct{}{"id": {}, "document": {}, "metadata": {}, "embedding": {}}
+	for _, row := range rows {
+		for key, value := range row {
+			if _, exists := seen[key]; exists || !strings.HasPrefix(key, "metadata.") {
+				continue
+			}
+			seen[key] = struct{}{}
+			cols = append(cols, connection.ColumnDefinition{
+				Name:     key,
+				Type:     inferChromaValueType(value),
+				Nullable: "YES",
+				Comment:  "Metadata field",
+			})
+		}
+	}
+	return cols, nil
+}
+
+func (c *ChromaDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	tables, err := c.GetTables(dbName)
+	if err != nil {
+		return nil, err
+	}
+	var result []connection.ColumnDefinitionWithTable
+	for _, table := range tables {
+		cols, err := c.GetColumns(dbName, table)
+		if err != nil {
+			continue
+		}
+		for _, col := range cols {
+			result = append(result, connection.ColumnDefinitionWithTable{
+				TableName: table,
+				Name:      col.Name,
+				Type:      col.Type,
+				Comment:   col.Comment,
+			})
+		}
+	}
+	return result, nil
+}
+
+func (c *ChromaDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	return []connection.IndexDefinition{
+		{Name: "PRIMARY", ColumnName: "id", NonUnique: 0, SeqInIndex: 1, IndexType: "PRIMARY"},
+		{Name: "HNSW", ColumnName: "embedding", NonUnique: 1, SeqInIndex: 1, IndexType: "VECTOR"},
+	}, nil
+}
+
+func (c *ChromaDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return []connection.ForeignKeyDefinition{}, nil
+}
+
+func (c *ChromaDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return []connection.TriggerDefinition{}, nil
+}
+
+func (c *ChromaDB) ApplyChanges(tableName string, changes connection.ChangeSet) error {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultChromaQueryTimeout)
+	defer cancel()
+
+	if len(changes.Deletes) > 0 {
+		ids := make([]string, 0, len(changes.Deletes))
+		for _, row := range changes.Deletes {
+			if id := chromaRowID(row); id != "" {
+				ids = append(ids, id)
+			}
+		}
+		if len(ids) > 0 {
+			if _, err := c.deleteCommand(ctx, tableName, map[string]interface{}{"ids": ids}); err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(changes.Updates) > 0 {
+		rows := make([]map[string]interface{}, 0, len(changes.Updates))
+		for _, update := range changes.Updates {
+			row := make(map[string]interface{}, len(update.Keys)+len(update.Values))
+			for k, v := range update.Keys {
+				row[k] = v
+			}
+			for k, v := range update.Values {
+				row[k] = v
+			}
+			rows = append(rows, row)
+		}
+		if err := c.upsertRows(ctx, tableName, rows); err != nil {
+			return err
+		}
+	}
+	if len(changes.Inserts) > 0 {
+		if err := c.upsertRows(ctx, tableName, changes.Inserts); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func normalizeChromaConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
+	runConfig := applyChromaURI(config)
+	if strings.TrimSpace(runConfig.Host) == "" {
+		runConfig.Host = "localhost"
+	}
+	if runConfig.Port <= 0 {
+		runConfig.Port = defaultChromaPort
+	}
+	if strings.TrimSpace(runConfig.SSLMode) == "" && runConfig.UseSSL {
+		runConfig.SSLMode = "required"
+	}
+	return runConfig
+}
+
+func applyChromaURI(config connection.ConnectionConfig) connection.ConnectionConfig {
+	uriText := strings.TrimSpace(config.URI)
+	if uriText == "" {
+		return config
+	}
+	parsed, err := url.Parse(uriText)
+	if err != nil {
+		return config
+	}
+	scheme := strings.ToLower(strings.TrimSpace(parsed.Scheme))
+	if scheme != "http" && scheme != "https" && scheme != "chroma" {
+		return config
+	}
+	if parsed.User != nil {
+		if strings.TrimSpace(config.User) == "" {
+			config.User = parsed.User.Username()
+		}
+		if pass, ok := parsed.User.Password(); ok && config.Password == "" {
+			config.Password = pass
+		}
+	}
+	if scheme == "https" {
+		config.UseSSL = true
+	}
+	if host := strings.TrimSpace(parsed.Host); host != "" {
+		if h, port, ok := parseHostPortWithDefault(host, defaultChromaPort); ok {
+			config.Host = h
+			config.Port = port
+		}
+	}
+	if dbName := strings.Trim(strings.TrimSpace(parsed.Path), "/"); dbName != "" && !strings.HasPrefix(dbName, "api/") && strings.TrimSpace(config.Database) == "" {
+		config.Database = dbName
+	}
+	return config
+}
+
+func buildChromaBaseURL(config connection.ConnectionConfig) string {
+	scheme := "http"
+	if config.UseSSL {
+		scheme = "https"
+	}
+	return fmt.Sprintf("%s://%s:%d", scheme, strings.TrimSpace(config.Host), config.Port)
+}
+
+func chromaTenantFromConfig(config connection.ConnectionConfig) string {
+	params := chromaConnectionParams(config)
+	if tenant := strings.TrimSpace(params.Get("tenant")); tenant != "" {
+		return tenant
+	}
+	return defaultChromaTenant
+}
+
+func chromaDatabaseFromConfig(config connection.ConnectionConfig) string {
+	if dbName := strings.TrimSpace(config.Database); dbName != "" {
+		return dbName
+	}
+	params := chromaConnectionParams(config)
+	if dbName := strings.TrimSpace(params.Get("database")); dbName != "" {
+		return dbName
+	}
+	return defaultChromaDatabase
+}
+
+func chromaConnectionParams(config connection.ConnectionConfig) url.Values {
+	params := url.Values{}
+	mergeConnectionParamValues(params, connectionParamsFromURI(config.URI, "http", "https", "chroma"))
+	mergeConnectionParamValues(params, connectionParamsFromText(config.ConnectionParams))
+	return params
+}
+
+func chromaAuthHeaders(config connection.ConnectionConfig) map[string]string {
+	headers := make(map[string]string)
+	params := chromaConnectionParams(config)
+	token := firstNonEmpty(params.Get("apiKey"), params.Get("apikey"), params.Get("token"), params.Get("authToken"))
+	if token == "" && strings.TrimSpace(config.User) == "" {
+		token = strings.TrimSpace(config.Password)
+	}
+	if token != "" {
+		headers["Authorization"] = "Bearer " + token
+	} else if user := strings.TrimSpace(config.User); user != "" {
+		raw := user + ":" + config.Password
+		headers["Authorization"] = "Basic " + base64.StdEncoding.EncodeToString([]byte(raw))
+	}
+	if headerName := strings.TrimSpace(params.Get("authHeader")); headerName != "" {
+		if headerValue := strings.TrimSpace(params.Get("authHeaderValue")); headerValue != "" && isSafeConnectionParamKey(headerName) {
+			headers[headerName] = headerValue
+		}
+	}
+	return headers
+}
+
+func buildChromaHTTPClient(config connection.ConnectionConfig) *http.Client {
+	transport := http.DefaultTransport.(*http.Transport).Clone()
+	if tlsConfig, err := resolveGenericTLSConfig(config); err == nil && tlsConfig != nil {
+		transport.TLSClientConfig = tlsConfig
+	}
+	if config.UseProxy {
+		proxyCfg := config.Proxy
+		transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+			return proxytunnel.DialContext(ctx, proxyCfg, network, addr)
+		}
+	}
+	return &http.Client{Transport: transport, Timeout: getConnectTimeout(config)}
+}
+
+func (c *ChromaDB) detectVersion(ctx context.Context) error {
+	if c.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	if err := c.doJSON(ctx, http.MethodGet, "/api/v2/heartbeat", nil, nil); err == nil {
+		c.apiVersion = 2
+		return nil
+	}
+	if err := c.doJSON(ctx, http.MethodGet, "/api/v1/heartbeat", nil, nil); err == nil {
+		c.apiVersion = 1
+		return nil
+	}
+	return fmt.Errorf("Chroma 连接失败：无法访问 /api/v2/heartbeat 或 /api/v1/heartbeat")
+}
+
+func (c *ChromaDB) ensureVersion(ctx context.Context) error {
+	if c.apiVersion == 1 || c.apiVersion == 2 {
+		return nil
+	}
+	return c.detectVersion(ctx)
+}
+
+func (c *ChromaDB) doJSON(ctx context.Context, method, path string, body interface{}, out interface{}) error {
+	if c.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	var reader io.Reader
+	if body != nil {
+		payload, err := json.Marshal(body)
+		if err != nil {
+			return err
+		}
+		reader = bytes.NewReader(payload)
+	}
+	req, err := http.NewRequestWithContext(ctx, method, strings.TrimRight(c.baseURL, "/")+path, reader)
+	if err != nil {
+		return err
+	}
+	if body != nil {
+		req.Header.Set("Content-Type", "application/json")
+	}
+	req.Header.Set("Accept", "application/json")
+	if strings.TrimSpace(c.authHeaders["Authorization"]) == "" && strings.TrimSpace(req.Header.Get("Authorization")) == "" {
+		// Basic Auth remains useful for gateways even when Chroma itself uses token auth.
+	}
+	for key, value := range c.authHeaders {
+		if strings.TrimSpace(key) != "" && strings.TrimSpace(value) != "" {
+			req.Header.Set(key, value)
+		}
+	}
+	res, err := c.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	resBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		return err
+	}
+	if res.StatusCode < 200 || res.StatusCode >= 300 {
+		message := strings.TrimSpace(string(resBody))
+		if message == "" {
+			message = res.Status
+		}
+		return fmt.Errorf("Chroma API %s %s 失败：%s", method, path, message)
+	}
+	if out == nil || len(bytes.TrimSpace(resBody)) == 0 {
+		return nil
+	}
+	if err := decodeJSONWithUseNumber(resBody, out); err != nil {
+		return fmt.Errorf("解析 Chroma 响应失败：%w", err)
+	}
+	return nil
+}
+
+func (c *ChromaDB) v2Path(dbName string, suffix string) string {
+	database := strings.TrimSpace(dbName)
+	if database == "" {
+		database = c.database
+	}
+	base := fmt.Sprintf("/api/v2/tenants/%s/databases/%s", url.PathEscape(c.tenant), url.PathEscape(database))
+	if suffix == "" {
+		return base
+	}
+	return base + suffix
+}
+
+func (c *ChromaDB) listCollections(ctx context.Context, dbName string) ([]chromaCollection, error) {
+	if c.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	if err := c.ensureVersion(ctx); err != nil {
+		return nil, err
+	}
+	var collections []chromaCollection
+	path := "/api/v1/collections"
+	if c.apiVersion == 2 {
+		path = c.v2Path(dbName, "/collections")
+	}
+	if err := c.doJSON(ctx, http.MethodGet, path, nil, &collections); err != nil {
+		return nil, err
+	}
+	return collections, nil
+}
+
+func (c *ChromaDB) resolveCollection(ctx context.Context, dbName, tableName string) (chromaCollection, error) {
+	name := tableNameOrDB(dbName, tableName)
+	if name == "" {
+		return chromaCollection{}, fmt.Errorf("collection 名称不能为空")
+	}
+	collections, err := c.listCollections(ctx, dbName)
+	if err != nil {
+		return chromaCollection{}, err
+	}
+	for _, item := range collections {
+		if strings.EqualFold(item.Name, name) || strings.EqualFold(item.ID, name) {
+			return item, nil
+		}
+	}
+	return chromaCollection{}, fmt.Errorf("未找到 Chroma collection：%s", name)
+}
+
+func (c *ChromaDB) collectionActionPath(ctx context.Context, collectionName, action string) (string, error) {
+	if err := c.ensureVersion(ctx); err != nil {
+		return "", err
+	}
+	coll, err := c.resolveCollection(ctx, "", collectionName)
+	if err != nil {
+		return "", err
+	}
+	ident := coll.ID
+	if strings.TrimSpace(ident) == "" {
+		ident = coll.Name
+	}
+	if ident == "" {
+		return "", fmt.Errorf("collection 标识为空")
+	}
+	if c.apiVersion == 2 {
+		return c.v2Path(coll.Database, fmt.Sprintf("/collections/%s/%s", url.PathEscape(ident), action)), nil
+	}
+	return fmt.Sprintf("/api/v1/collections/%s/%s", url.PathEscape(ident), action), nil
+}
+
+func (c *ChromaDB) getCollectionRows(ctx context.Context, collection string, limit int, offset int, where interface{}, include []string) ([]map[string]interface{}, []string, error) {
+	if limit <= 0 {
+		limit = 200
+	}
+	path, err := c.collectionActionPath(ctx, collection, "get")
+	if err != nil {
+		return nil, nil, err
+	}
+	body := map[string]interface{}{
+		"limit":   limit,
+		"offset":  offset,
+		"include": include,
+	}
+	if where != nil {
+		body["where"] = where
+	}
+	var resp chromaGetResponse
+	if err := c.doJSON(ctx, http.MethodPost, path, body, &resp); err != nil {
+		return nil, nil, err
+	}
+	rows, columns := chromaGetResponseRows(resp)
+	return rows, columns, nil
+}
+
+func (c *ChromaDB) countCollection(ctx context.Context, collection string, where interface{}) (int64, error) {
+	path, err := c.collectionActionPath(ctx, collection, "count")
+	if err != nil {
+		return 0, err
+	}
+	if where == nil {
+		var raw interface{}
+		if err := c.doJSON(ctx, http.MethodGet, path, nil, &raw); err == nil {
+			return chromaCountValue(raw), nil
+		}
+	}
+	rows, _, err := c.getCollectionRows(ctx, collection, 1_000_000, 0, where, []string{"documents"})
+	if err != nil {
+		return 0, err
+	}
+	return int64(len(rows)), nil
+}
+
+func (c *ChromaDB) queryJSON(ctx context.Context, text string) ([]map[string]interface{}, []string, error) {
+	var cmd map[string]interface{}
+	if err := decodeJSONWithUseNumber([]byte(text), &cmd); err != nil {
+		return nil, nil, fmt.Errorf("Chroma JSON 命令解析失败：%w", err)
+	}
+	if hasAnyKey(cmd, "list_collections", "listCollections") {
+		cols, err := c.listCollections(ctx, "")
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := make([]map[string]interface{}, 0, len(cols))
+		for _, col := range cols {
+			rows = append(rows, chromaStructRow(col))
+		}
+		return rows, collectColumns(rows), nil
+	}
+	if name := firstStringValue(cmd, "get", "collection"); name != "" && (hasAnyKey(cmd, "get") || !hasAnyKey(cmd, "query", "query_embeddings", "query_texts")) {
+		limit := intFromAny(cmd["limit"], 200)
+		offset := intFromAny(cmd["offset"], 0)
+		include := stringSliceFromAny(cmd["include"], []string{"documents", "metadatas"})
+		return c.getCollectionRows(ctx, name, limit, offset, cmd["where"], include)
+	}
+	if name := firstStringValue(cmd, "query", "collection"); name != "" {
+		return c.queryCollection(ctx, name, cmd)
+	}
+	return nil, nil, fmt.Errorf("Chroma JSON 查询命令仅支持 list_collections/get/query")
+}
+
+func (c *ChromaDB) queryCollection(ctx context.Context, collection string, cmd map[string]interface{}) ([]map[string]interface{}, []string, error) {
+	path, err := c.collectionActionPath(ctx, collection, "query")
+	if err != nil {
+		return nil, nil, err
+	}
+	body := make(map[string]interface{})
+	for _, key := range []string{"query_embeddings", "query_texts", "where", "where_document", "include"} {
+		if value, ok := cmd[key]; ok {
+			body[key] = value
+		}
+	}
+	body["n_results"] = intFromAny(firstExisting(cmd, "n_results", "limit"), 10)
+	if _, ok := body["include"]; !ok {
+		body["include"] = []string{"documents", "metadatas", "distances"}
+	}
+	var raw map[string]interface{}
+	if err := c.doJSON(ctx, http.MethodPost, path, body, &raw); err != nil {
+		return nil, nil, err
+	}
+	rows := chromaQueryResponseRows(raw)
+	return rows, collectColumns(rows), nil
+}
+
+func (c *ChromaDB) createCollection(ctx context.Context, body map[string]interface{}) error {
+	if err := c.ensureVersion(ctx); err != nil {
+		return err
+	}
+	path := "/api/v1/collections"
+	if c.apiVersion == 2 {
+		path = c.v2Path("", "/collections")
+	}
+	return c.doJSON(ctx, http.MethodPost, path, body, nil)
+}
+
+func (c *ChromaDB) deleteCollection(ctx context.Context, name string) error {
+	if err := c.ensureVersion(ctx); err != nil {
+		return err
+	}
+	path := fmt.Sprintf("/api/v1/collections/%s", url.PathEscape(name))
+	if c.apiVersion == 2 {
+		coll, err := c.resolveCollection(ctx, "", name)
+		if err != nil {
+			return err
+		}
+		ident := coll.ID
+		if ident == "" {
+			ident = coll.Name
+		}
+		path = c.v2Path(coll.Database, fmt.Sprintf("/collections/%s", url.PathEscape(ident)))
+	}
+	return c.doJSON(ctx, http.MethodDelete, path, nil, nil)
+}
+
+func (c *ChromaDB) upsertCommand(ctx context.Context, collection string, cmd map[string]interface{}) (int64, error) {
+	if rowsValue, ok := cmd["rows"].([]interface{}); ok {
+		rows := make([]map[string]interface{}, 0, len(rowsValue))
+		for _, raw := range rowsValue {
+			if row, ok := raw.(map[string]interface{}); ok {
+				rows = append(rows, row)
+			}
+		}
+		return int64(len(rows)), c.upsertRows(ctx, collection, rows)
+	}
+	body := make(map[string]interface{})
+	for _, key := range []string{"ids", "documents", "metadatas", "embeddings", "uris"} {
+		if value, ok := cmd[key]; ok {
+			body[key] = value
+		}
+	}
+	if _, ok := body["ids"]; !ok {
+		return 0, fmt.Errorf("Chroma upsert 命令缺少 ids")
+	}
+	path, err := c.collectionActionPath(ctx, collection, "upsert")
+	if err != nil {
+		return 0, err
+	}
+	return int64(len(anySlice(body["ids"]))), c.doJSON(ctx, http.MethodPost, path, body, nil)
+}
+
+func (c *ChromaDB) deleteCommand(ctx context.Context, collection string, cmd map[string]interface{}) (int64, error) {
+	body := make(map[string]interface{})
+	for _, key := range []string{"ids", "where", "where_document"} {
+		if value, ok := cmd[key]; ok {
+			body[key] = value
+		}
+	}
+	if len(body) == 0 {
+		return 0, fmt.Errorf("Chroma delete 命令缺少 ids/where/where_document")
+	}
+	path, err := c.collectionActionPath(ctx, collection, "delete")
+	if err != nil {
+		return 0, err
+	}
+	return int64(len(anySlice(body["ids"]))), c.doJSON(ctx, http.MethodPost, path, body, nil)
+}
+
+func (c *ChromaDB) upsertRows(ctx context.Context, collection string, rows []map[string]interface{}) error {
+	if len(rows) == 0 {
+		return nil
+	}
+	ids := make([]string, 0, len(rows))
+	docs := make([]interface{}, 0, len(rows))
+	metadatas := make([]map[string]interface{}, 0, len(rows))
+	embeddings := make([]interface{}, 0, len(rows))
+	hasEmbedding := false
+	for _, row := range rows {
+		id := chromaRowID(row)
+		if id == "" {
+			return fmt.Errorf("Chroma 写入行缺少 id")
+		}
+		ids = append(ids, id)
+		docs = append(docs, firstExisting(row, "document", "_document", "documents"))
+		meta := make(map[string]interface{})
+		if raw, ok := row["metadata"].(map[string]interface{}); ok {
+			for k, v := range raw {
+				meta[k] = v
+			}
+		}
+		for k, v := range row {
+			if isChromaReservedRowField(k) {
+				continue
+			}
+			if strings.HasPrefix(k, "metadata.") {
+				meta[strings.TrimPrefix(k, "metadata.")] = v
+				continue
+			}
+			meta[k] = v
+		}
+		metadatas = append(metadatas, meta)
+		if embedding := firstExisting(row, "embedding", "_embedding", "embeddings"); embedding != nil {
+			embeddings = append(embeddings, normalizeChromaEmbedding(embedding))
+			hasEmbedding = true
+		}
+	}
+	body := map[string]interface{}{
+		"ids":       ids,
+		"documents": docs,
+		"metadatas": metadatas,
+	}
+	if hasEmbedding {
+		body["embeddings"] = embeddings
+	}
+	path, err := c.collectionActionPath(ctx, collection, "upsert")
+	if err != nil {
+		return err
+	}
+	return c.doJSON(ctx, http.MethodPost, path, body, nil)
+}
+
+type chromaParsedSQL struct {
+	Collection        string
+	Limit             int
+	Offset            int
+	Where             interface{}
+	Count             bool
+	IncludeEmbeddings bool
+}
+
+var chromaSQLFromRE = regexp.MustCompile(`(?i)\bFROM\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([a-zA-Z0-9_.\-]+))`)
+var chromaSQLLimitRE = regexp.MustCompile(`(?i)\bLIMIT\s+(\d+)`)
+var chromaSQLOffsetRE = regexp.MustCompile(`(?i)\bOFFSET\s+(\d+)`)
+
+func parseChromaSQL(sqlText string) (chromaParsedSQL, bool) {
+	text := strings.TrimSpace(sqlText)
+	if !strings.HasPrefix(strings.ToLower(text), "select") {
+		return chromaParsedSQL{}, false
+	}
+	matches := chromaSQLFromRE.FindStringSubmatch(text)
+	if len(matches) == 0 {
+		return chromaParsedSQL{}, false
+	}
+	table := firstNonEmpty(matches[1], matches[2], matches[3])
+	if table == "" {
+		return chromaParsedSQL{}, false
+	}
+	parsed := chromaParsedSQL{Collection: table, Limit: 200}
+	lower := strings.ToLower(text)
+	parsed.Count = strings.Contains(lower, "count(")
+	parsed.IncludeEmbeddings = strings.Contains(lower, "embedding")
+	if m := chromaSQLLimitRE.FindStringSubmatch(text); len(m) > 1 {
+		parsed.Limit, _ = strconv.Atoi(m[1])
+	}
+	if m := chromaSQLOffsetRE.FindStringSubmatch(text); len(m) > 1 {
+		parsed.Offset, _ = strconv.Atoi(m[1])
+	}
+	return parsed, true
+}
+
+func chromaGetResponseRows(resp chromaGetResponse) ([]map[string]interface{}, []string) {
+	rows := make([]map[string]interface{}, 0, len(resp.IDs))
+	for index, id := range resp.IDs {
+		row := map[string]interface{}{"id": id}
+		if value := sliceValue(resp.Documents, index); value != nil {
+			row["document"] = value
+		}
+		if meta := sliceValueMap(resp.Metadatas, index); meta != nil {
+			row["metadata"] = meta
+			for k, v := range meta {
+				row["metadata."+k] = v
+			}
+		}
+		if value := sliceValue(resp.Embeddings, index); value != nil {
+			row["embedding"] = normalizeJSONLikeValue(value)
+		}
+		rows = append(rows, row)
+	}
+	return rows, collectColumns(rows)
+}
+
+func chromaQueryResponseRows(raw map[string]interface{}) []map[string]interface{} {
+	idGroups := nestedAnySlice(raw["ids"])
+	docGroups := nestedAnySlice(raw["documents"])
+	metaGroups := nestedAnySlice(raw["metadatas"])
+	distanceGroups := nestedAnySlice(raw["distances"])
+	var rows []map[string]interface{}
+	for groupIndex, group := range idGroups {
+		for itemIndex, id := range group {
+			row := map[string]interface{}{
+				"query_index": groupIndex,
+				"id":          fmt.Sprintf("%v", id),
+			}
+			if doc := nestedValue(docGroups, groupIndex, itemIndex); doc != nil {
+				row["document"] = doc
+			}
+			if dist := nestedValue(distanceGroups, groupIndex, itemIndex); dist != nil {
+				row["distance"] = dist
+			}
+			if meta, ok := nestedValue(metaGroups, groupIndex, itemIndex).(map[string]interface{}); ok {
+				row["metadata"] = meta
+				for k, v := range meta {
+					row["metadata."+k] = v
+				}
+			}
+			rows = append(rows, row)
+		}
+	}
+	return rows
+}
+
+func collectColumns(rows []map[string]interface{}) []string {
+	set := make(map[string]struct{})
+	for _, row := range rows {
+		for key := range row {
+			set[key] = struct{}{}
+		}
+	}
+	cols := make([]string, 0, len(set))
+	for key := range set {
+		cols = append(cols, key)
+	}
+	sort.Strings(cols)
+	for _, priority := range []string{"id", "query_index", "document", "distance", "metadata", "embedding"} {
+		for i, col := range cols {
+			if col == priority && i > 0 {
+				cols = append(cols[:i], cols[i+1:]...)
+				cols = append([]string{priority}, cols...)
+				break
+			}
+		}
+	}
+	return cols
+}
+
+func tableNameOrDB(dbName, tableName string) string {
+	if name := strings.TrimSpace(tableName); name != "" {
+		return name
+	}
+	return strings.TrimSpace(dbName)
+}
+
+func chromaStructRow(col chromaCollection) map[string]interface{} {
+	row := map[string]interface{}{
+		"id":       col.ID,
+		"name":     col.Name,
+		"tenant":   col.Tenant,
+		"database": col.Database,
+	}
+	if col.Dimension > 0 {
+		row["dimension"] = col.Dimension
+	}
+	if len(col.Metadata) > 0 {
+		row["metadata"] = col.Metadata
+	}
+	return row
+}
+
+func chromaCountValue(raw interface{}) int64 {
+	switch v := raw.(type) {
+	case json.Number:
+		n, _ := v.Int64()
+		return n
+	case float64:
+		return int64(v)
+	case int:
+		return int64(v)
+	case int64:
+		return v
+	case map[string]interface{}:
+		return chromaCountValue(firstExisting(v, "count", "total", "value"))
+	default:
+		return 0
+	}
+}
+
+func chromaRowID(row map[string]interface{}) string {
+	return strings.TrimSpace(fmt.Sprintf("%v", firstExisting(row, "id", "_id")))
+}
+
+func isChromaReservedRowField(key string) bool {
+	switch key {
+	case "id", "_id", "document", "_document", "documents", "metadata", "embedding", "_embedding", "embeddings":
+		return true
+	default:
+		return false
+	}
+}
+
+func normalizeChromaEmbedding(value interface{}) interface{} {
+	if text, ok := value.(string); ok {
+		var parsed interface{}
+		if err := decodeJSONWithUseNumber([]byte(text), &parsed); err == nil {
+			return parsed
+		}
+	}
+	return value
+}
+
+func inferChromaValueType(value interface{}) string {
+	switch value.(type) {
+	case bool:
+		return "bool"
+	case json.Number, float64, float32, int, int64:
+		return "number"
+	case map[string]interface{}:
+		return "json"
+	case []interface{}:
+		return "array"
+	default:
+		return "string"
+	}
+}
+
+func firstStringValue(m map[string]interface{}, keys ...string) string {
+	for _, key := range keys {
+		if value, ok := m[key]; ok {
+			text := strings.TrimSpace(fmt.Sprintf("%v", value))
+			if text != "" && text != "<nil>" {
+				return text
+			}
+		}
+	}
+	return ""
+}
+
+func firstExisting(m map[string]interface{}, keys ...string) interface{} {
+	for _, key := range keys {
+		if value, ok := m[key]; ok {
+			return value
+		}
+	}
+	return nil
+}
+
+func firstNonEmpty(values ...string) string {
+	for _, value := range values {
+		if text := strings.TrimSpace(value); text != "" {
+			return text
+		}
+	}
+	return ""
+}
+
+func hasAnyKey(m map[string]interface{}, keys ...string) bool {
+	for _, key := range keys {
+		if _, ok := m[key]; ok {
+			return true
+		}
+	}
+	return false
+}
+
+func getOrBool(m map[string]interface{}, keys ...string) bool {
+	for _, key := range keys {
+		switch v := m[key].(type) {
+		case bool:
+			return v
+		case string:
+			return strings.EqualFold(strings.TrimSpace(v), "true")
+		}
+	}
+	return false
+}
+
+func intFromAny(value interface{}, fallback int) int {
+	switch v := value.(type) {
+	case json.Number:
+		n, err := v.Int64()
+		if err == nil {
+			return int(n)
+		}
+	case float64:
+		return int(v)
+	case int:
+		return v
+	case int64:
+		return int(v)
+	case string:
+		n, err := strconv.Atoi(strings.TrimSpace(v))
+		if err == nil {
+			return n
+		}
+	}
+	return fallback
+}
+
+func mapString(m map[string]interface{}, key string) string {
+	return strings.TrimSpace(fmt.Sprintf("%v", m[key]))
+}
+
+func stringSliceFromAny(value interface{}, fallback []string) []string {
+	if value == nil {
+		return fallback
+	}
+	switch v := value.(type) {
+	case []string:
+		return v
+	case []interface{}:
+		result := make([]string, 0, len(v))
+		for _, item := range v {
+			if text := strings.TrimSpace(fmt.Sprintf("%v", item)); text != "" {
+				result = append(result, text)
+			}
+		}
+		if len(result) > 0 {
+			return result
+		}
+	}
+	return fallback
+}
+
+func anySlice(value interface{}) []interface{} {
+	switch v := value.(type) {
+	case []interface{}:
+		return v
+	case []string:
+		result := make([]interface{}, len(v))
+		for i, item := range v {
+			result[i] = item
+		}
+		return result
+	default:
+		return nil
+	}
+}
+
+func nestedAnySlice(value interface{}) [][]interface{} {
+	switch v := value.(type) {
+	case []interface{}:
+		result := make([][]interface{}, 0, len(v))
+		for _, group := range v {
+			result = append(result, anySlice(group))
+		}
+		return result
+	default:
+		return nil
+	}
+}
+
+func nestedValue(groups [][]interface{}, groupIndex, itemIndex int) interface{} {
+	if groupIndex < 0 || groupIndex >= len(groups) {
+		return nil
+	}
+	group := groups[groupIndex]
+	if itemIndex < 0 || itemIndex >= len(group) {
+		return nil
+	}
+	return group[itemIndex]
+}
+
+func sliceValue(items []interface{}, index int) interface{} {
+	if index < 0 || index >= len(items) {
+		return nil
+	}
+	return normalizeJSONLikeValue(items[index])
+}
+
+func sliceValueMap(items []map[string]interface{}, index int) map[string]interface{} {
+	if index < 0 || index >= len(items) {
+		return nil
+	}
+	return items[index]
+}
+
+func normalizeJSONLikeValue(value interface{}) interface{} {
+	switch value.(type) {
+	case map[string]interface{}, []interface{}:
+		payload, err := json.Marshal(value)
+		if err == nil {
+			return string(payload)
+		}
+	}
+	return value
+}
diff --git a/internal/db/chroma_impl_test.go b/internal/db/chroma_impl_test.go
new file mode 100644
index 0000000..94f71ce
--- /dev/null
+++ b/internal/db/chroma_impl_test.go
@@ -0,0 +1,292 @@
+package db
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"strings"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+func newMockChromaServer(t *testing.T, handler http.HandlerFunc) *httptest.Server {
+	t.Helper()
+	server := httptest.NewServer(handler)
+	t.Cleanup(server.Close)
+	return server
+}
+
+func newTestChromaDB(t *testing.T, serverURL string) *ChromaDB {
+	t.Helper()
+	parsed, err := url.Parse(serverURL)
+	if err != nil {
+		t.Fatalf("parse server URL: %v", err)
+	}
+	host, port, ok := parseHostPortWithDefault(parsed.Host, defaultChromaPort)
+	if !ok {
+		t.Fatalf("parse host port failed: %s", parsed.Host)
+	}
+	db := &ChromaDB{}
+	if err := db.Connect(connection.ConnectionConfig{
+		Type: "chroma",
+		Host: host,
+		Port: port,
+	}); err != nil {
+		t.Fatalf("connect chroma: %v", err)
+	}
+	t.Cleanup(func() { _ = db.Close() })
+	return db
+}
+
+func writeChromaJSON(w http.ResponseWriter, value interface{}) {
+	w.Header().Set("Content-Type", "application/json")
+	_ = json.NewEncoder(w).Encode(value)
+}
+
+func TestChromaConnectDetectsV2(t *testing.T) {
+	server := newMockChromaServer(t, func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == http.MethodGet && r.URL.Path == "/api/v2/heartbeat" {
+			writeChromaJSON(w, map[string]interface{}{"nanosecond heartbeat": 1})
+			return
+		}
+		w.WriteHeader(http.StatusNotFound)
+	})
+
+	db := newTestChromaDB(t, server.URL)
+	if db.apiVersion != 2 {
+		t.Fatalf("apiVersion = %d, want 2", db.apiVersion)
+	}
+}
+
+func TestChromaConnectFallsBackToV1(t *testing.T) {
+	server := newMockChromaServer(t, func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/api/v2/heartbeat" {
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+		if r.Method == http.MethodGet && r.URL.Path == "/api/v1/heartbeat" {
+			writeChromaJSON(w, map[string]interface{}{"nanosecond heartbeat": 1})
+			return
+		}
+		w.WriteHeader(http.StatusNotFound)
+	})
+
+	db := newTestChromaDB(t, server.URL)
+	if db.apiVersion != 1 {
+		t.Fatalf("apiVersion = %d, want 1", db.apiVersion)
+	}
+}
+
+func TestChromaGetDatabasesAndTablesV2(t *testing.T) {
+	server := newMockChromaServer(t, func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/api/v2/heartbeat":
+			writeChromaJSON(w, map[string]interface{}{"ok": true})
+		case "/api/v2/tenants/default_tenant/databases":
+			writeChromaJSON(w, []map[string]interface{}{
+				{"name": "analytics"},
+				{"name": "default_database"},
+			})
+		case "/api/v2/tenants/default_tenant/databases/default_database/collections":
+			writeChromaJSON(w, []chromaCollection{
+				{ID: "col-products", Name: "products", Database: "default_database", Tenant: "default_tenant"},
+				{ID: "col-logs", Name: "logs", Database: "default_database", Tenant: "default_tenant"},
+			})
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	db := newTestChromaDB(t, server.URL)
+	dbs, err := db.GetDatabases()
+	if err != nil {
+		t.Fatalf("GetDatabases failed: %v", err)
+	}
+	if strings.Join(dbs, ",") != "analytics,default_database" {
+		t.Fatalf("databases = %v", dbs)
+	}
+	tables, err := db.GetTables("")
+	if err != nil {
+		t.Fatalf("GetTables failed: %v", err)
+	}
+	if strings.Join(tables, ",") != "logs,products" {
+		t.Fatalf("tables = %v", tables)
+	}
+}
+
+func TestChromaSelectConvertsToGetRows(t *testing.T) {
+	var capturedPath string
+	var capturedBody map[string]interface{}
+	server := newMockChromaServer(t, func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.URL.Path == "/api/v2/heartbeat":
+			writeChromaJSON(w, map[string]interface{}{"ok": true})
+		case r.URL.Path == "/api/v2/tenants/default_tenant/databases/default_database/collections":
+			writeChromaJSON(w, []chromaCollection{{ID: "col-products", Name: "products", Database: "default_database"}})
+		case r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/collections/col-products/get"):
+			capturedPath = r.URL.Path
+			_ = json.NewDecoder(r.Body).Decode(&capturedBody)
+			writeChromaJSON(w, chromaGetResponse{
+				IDs:       []string{"p1"},
+				Documents: []interface{}{"first product"},
+				Metadatas: []map[string]interface{}{{"category": "book", "price": json.Number("19.5")}},
+			})
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	db := newTestChromaDB(t, server.URL)
+	rows, columns, err := db.Query(`SELECT * FROM "products" LIMIT 10 OFFSET 5`)
+	if err != nil {
+		t.Fatalf("Query failed: %v", err)
+	}
+	if capturedPath == "" {
+		t.Fatal("expected get endpoint to be called")
+	}
+	if intFromAny(capturedBody["limit"], 0) != 10 || intFromAny(capturedBody["offset"], -1) != 5 {
+		t.Fatalf("captured body = %#v", capturedBody)
+	}
+	if len(rows) != 1 || rows[0]["id"] != "p1" || rows[0]["metadata.category"] != "book" {
+		t.Fatalf("rows = %#v", rows)
+	}
+	if !containsString(columns, "metadata.category") {
+		t.Fatalf("columns missing metadata.category: %v", columns)
+	}
+}
+
+func TestChromaJSONQueryFlattensResults(t *testing.T) {
+	server := newMockChromaServer(t, func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.URL.Path == "/api/v2/heartbeat":
+			writeChromaJSON(w, map[string]interface{}{"ok": true})
+		case r.URL.Path == "/api/v2/tenants/default_tenant/databases/default_database/collections":
+			writeChromaJSON(w, []chromaCollection{{ID: "col-products", Name: "products", Database: "default_database"}})
+		case r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/collections/col-products/query"):
+			writeChromaJSON(w, map[string]interface{}{
+				"ids":       [][]string{{"p1", "p2"}},
+				"documents": [][]string{{"first", "second"}},
+				"distances": [][]float64{{0.1, 0.2}},
+				"metadatas": [][]map[string]interface{}{{{"category": "book"}, {"category": "tool"}}},
+			})
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	db := newTestChromaDB(t, server.URL)
+	rows, columns, err := db.Query(`{"query":"products","query_embeddings":[[0.1,0.2]],"n_results":2}`)
+	if err != nil {
+		t.Fatalf("Query failed: %v", err)
+	}
+	if len(rows) != 2 || rows[1]["id"] != "p2" || rows[1]["distance"] == nil {
+		t.Fatalf("rows = %#v", rows)
+	}
+	if !containsString(columns, "distance") || !containsString(columns, "metadata.category") {
+		t.Fatalf("columns = %v", columns)
+	}
+}
+
+func TestChromaApplyChangesUpsertAndDelete(t *testing.T) {
+	var upsertBody map[string]interface{}
+	var deleteBody map[string]interface{}
+	server := newMockChromaServer(t, func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.URL.Path == "/api/v2/heartbeat":
+			writeChromaJSON(w, map[string]interface{}{"ok": true})
+		case r.URL.Path == "/api/v2/tenants/default_tenant/databases/default_database/collections":
+			writeChromaJSON(w, []chromaCollection{{ID: "col-products", Name: "products", Database: "default_database"}})
+		case r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/collections/col-products/upsert"):
+			_ = json.NewDecoder(r.Body).Decode(&upsertBody)
+			writeChromaJSON(w, map[string]interface{}{"ok": true})
+		case r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/collections/col-products/delete"):
+			_ = json.NewDecoder(r.Body).Decode(&deleteBody)
+			writeChromaJSON(w, map[string]interface{}{"ok": true})
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	db := newTestChromaDB(t, server.URL)
+	err := db.ApplyChanges("products", connection.ChangeSet{
+		Deletes: []map[string]interface{}{{"id": "old"}},
+		Inserts: []map[string]interface{}{
+			{"id": "new", "document": "hello", "metadata.kind": "demo", "score": 9},
+		},
+	})
+	if err != nil {
+		t.Fatalf("ApplyChanges failed: %v", err)
+	}
+	if ids := anySlice(deleteBody["ids"]); len(ids) != 1 || ids[0] != "old" {
+		t.Fatalf("delete body = %#v", deleteBody)
+	}
+	if ids := anySlice(upsertBody["ids"]); len(ids) != 1 || ids[0] != "new" {
+		t.Fatalf("upsert body = %#v", upsertBody)
+	}
+	metas := anySlice(upsertBody["metadatas"])
+	if len(metas) != 1 {
+		t.Fatalf("metadatas = %#v", upsertBody["metadatas"])
+	}
+	meta, _ := metas[0].(map[string]interface{})
+	if meta["kind"] != "demo" || meta["score"] == nil {
+		t.Fatalf("metadata = %#v", meta)
+	}
+}
+
+func TestChromaLiveSmoke(t *testing.T) {
+	serverURL := strings.TrimSpace(os.Getenv("GONAVI_CHROMA_TEST_URL"))
+	if serverURL == "" {
+		t.Skip("set GONAVI_CHROMA_TEST_URL to run live Chroma smoke test")
+	}
+
+	db := newTestChromaDB(t, serverURL)
+	collection := "gonavi_smoke_live"
+	_, _ = db.Exec(fmt.Sprintf(`{"delete_collection":%q}`, collection))
+	if _, err := db.Exec(fmt.Sprintf(`{"create_collection":%q,"get_or_create":true}`, collection)); err != nil {
+		t.Fatalf("create live collection: %v", err)
+	}
+	t.Cleanup(func() { _, _ = db.Exec(fmt.Sprintf(`{"delete_collection":%q}`, collection)) })
+
+	if err := db.ApplyChanges(collection, connection.ChangeSet{
+		Inserts: []map[string]interface{}{{
+			"id":            "doc-1",
+			"document":      "GoNavi Chroma live smoke",
+			"metadata.kind": "smoke",
+			"embedding":     []float64{0.1, 0.2, 0.3},
+		}},
+	}); err != nil {
+		t.Fatalf("upsert live row: %v", err)
+	}
+
+	rows, columns, err := db.Query(fmt.Sprintf(`SELECT * FROM "%s" LIMIT 5`, collection))
+	if err != nil {
+		t.Fatalf("select live rows: %v", err)
+	}
+	if len(rows) == 0 || rows[0]["id"] != "doc-1" || rows[0]["metadata.kind"] != "smoke" {
+		t.Fatalf("live rows = %#v", rows)
+	}
+	if !containsString(columns, "metadata.kind") {
+		t.Fatalf("live columns missing metadata.kind: %v", columns)
+	}
+
+	queryRows, queryColumns, err := db.Query(fmt.Sprintf(`{"query":%q,"query_embeddings":[[0.1,0.2,0.3]],"n_results":1}`, collection))
+	if err != nil {
+		t.Fatalf("query live rows: %v", err)
+	}
+	if len(queryRows) == 0 || queryRows[0]["id"] != "doc-1" || !containsString(queryColumns, "distance") {
+		t.Fatalf("live query rows = %#v columns = %v", queryRows, queryColumns)
+	}
+}
+
+func containsString(items []string, target string) bool {
+	for _, item := range items {
+		if item == target {
+			return true
+		}
+	}
+	return false
+}
diff --git a/internal/db/custom_impl.go b/internal/db/custom_impl.go
index 20b2eed..0ad1ba8 100644
--- a/internal/db/custom_impl.go
+++ b/internal/db/custom_impl.go
@@ -95,7 +95,7 @@ func (c *CustomDB) QueryContext(ctx context.Context, query string) ([]map[string
 	}
 	defer rows.Close()
 
-	return scanRows(rows)
+	return scanRowsForDialect(rows, c.scanDialect())
 }
 
 func (c *CustomDB) Query(query string) ([]map[string]interface{}, []string, error) {
@@ -108,7 +108,14 @@ func (c *CustomDB) Query(query string) ([]map[string]interface{}, []string, erro
 		return nil, nil, err
 	}
 	defer rows.Close()
-	return scanRows(rows)
+	return scanRowsForDialect(rows, c.scanDialect())
+}
+
+func (c *CustomDB) scanDialect() string {
+	if strings.EqualFold(strings.TrimSpace(c.driver), "mysql") {
+		return "mysql"
+	}
+	return ""
 }
 
 func (c *CustomDB) ExecContext(ctx context.Context, query string) (int64, error) {
@@ -251,8 +258,8 @@ func (c *CustomDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefi
 		schema = dbName
 	}
 
-	query := fmt.Sprintf(`SELECT column_name, data_type, is_nullable, column_default 
-		FROM information_schema.columns 
+	query := fmt.Sprintf(`SELECT column_name, data_type, character_maximum_length, numeric_precision, numeric_scale, is_nullable, column_default
+		FROM information_schema.columns
 		WHERE table_name = '%s'`, tableName)
 
 	// Adjust for schema if likely supported
@@ -272,30 +279,97 @@ func (c *CustomDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefi
 
 	var columns []connection.ColumnDefinition
 	for _, row := range data {
-		col := connection.ColumnDefinition{}
-		// flexible mapping
-		for k, v := range row {
-			kl := strings.ToLower(k)
-			val := fmt.Sprintf("%v", v)
-			if strings.Contains(kl, "field") || strings.Contains(kl, "column_name") {
-				col.Name = val
-			} else if strings.Contains(kl, "type") {
-				col.Type = val
-			} else if strings.Contains(kl, "null") || strings.Contains(kl, "nullable") {
-				col.Nullable = val
-			} else if strings.Contains(kl, "default") {
-				col.Default = &val
-			} else if strings.Contains(kl, "key") {
-				col.Key = val
-			} else if strings.Contains(kl, "comment") {
-				col.Comment = val
-			}
-		}
-		columns = append(columns, col)
+		columns = append(columns, buildCustomColumnDefinition(row))
 	}
 	return columns, nil
 }
 
+func buildCustomColumnDefinition(row map[string]interface{}) connection.ColumnDefinition {
+	col := connection.ColumnDefinition{
+		Name:     customMetadataString(row, "Field", "field", "COLUMN_NAME", "column_name", "NAME", "name"),
+		Type:     buildCustomColumnType(row),
+		Nullable: normalizeCustomNullable(customMetadataString(row, "Null", "null", "IS_NULLABLE", "is_nullable", "NULLABLE", "nullable")),
+		Key:      customMetadataString(row, "Key", "key", "COLUMN_KEY", "column_key", "PRIMARY_KEY", "primary_key"),
+		Extra:    customMetadataString(row, "Extra", "extra", "EXTRA"),
+		Comment:  customMetadataString(row, "Comment", "comment", "COMMENTS", "comments", "COLUMN_COMMENT", "column_comment"),
+	}
+	if defaultValue, ok := customMetadataStringOK(row, "Default", "default", "COLUMN_DEFAULT", "column_default", "DATA_DEFAULT", "data_default"); ok {
+		col.Default = &defaultValue
+	}
+	return col
+}
+
+func buildCustomColumnType(row map[string]interface{}) string {
+	rawType := customMetadataString(
+		row,
+		"COLUMN_TYPE",
+		"column_type",
+		"FULL_TYPE",
+		"full_type",
+		"FULL_DATA_TYPE",
+		"full_data_type",
+		"TYPE_NAME",
+		"type_name",
+		"Type",
+		"type",
+		"DATA_TYPE",
+		"data_type",
+	)
+	if rawType == "" || strings.Contains(rawType, "(") {
+		return rawType
+	}
+
+	upperType := strings.ToUpper(rawType)
+	charLength := customMetadataInt(row, "CHARACTER_MAXIMUM_LENGTH", "character_maximum_length", "CHARACTER_MAX_LENGTH", "character_max_length", "CHAR_LENGTH", "char_length", "LENGTH", "length")
+	if charLength > 0 && strings.Contains(upperType, "CHAR") {
+		return fmt.Sprintf("%s(%d)", rawType, charLength)
+	}
+
+	precision := customMetadataInt(row, "NUMERIC_PRECISION", "numeric_precision", "DATA_PRECISION", "data_precision", "PRECISION", "precision")
+	if precision > 0 && (strings.Contains(upperType, "DECIMAL") || strings.Contains(upperType, "NUMERIC") || strings.Contains(upperType, "NUMBER")) {
+		scale := customMetadataInt(row, "NUMERIC_SCALE", "numeric_scale", "DATA_SCALE", "data_scale", "SCALE", "scale")
+		if scale > 0 {
+			return fmt.Sprintf("%s(%d,%d)", rawType, precision, scale)
+		}
+		return fmt.Sprintf("%s(%d)", rawType, precision)
+	}
+
+	return rawType
+}
+
+func customMetadataString(row map[string]interface{}, keys ...string) string {
+	value, _ := customMetadataStringOK(row, keys...)
+	return value
+}
+
+func customMetadataStringOK(row map[string]interface{}, keys ...string) (string, bool) {
+	for _, key := range keys {
+		for rowKey, raw := range row {
+			if !strings.EqualFold(rowKey, key) || raw == nil {
+				continue
+			}
+			return strings.TrimSpace(fmt.Sprintf("%v", raw)), true
+		}
+	}
+	return "", false
+}
+
+func customMetadataInt(row map[string]interface{}, keys ...string) int {
+	return parseMetadataInt(customMetadataString(row, keys...))
+}
+
+func normalizeCustomNullable(value string) string {
+	trimmed := strings.TrimSpace(value)
+	switch strings.ToLower(trimmed) {
+	case "n", "no", "false", "0":
+		return "NO"
+	case "y", "yes", "true", "1":
+		return "YES"
+	default:
+		return trimmed
+	}
+}
+
 func (c *CustomDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
 	return nil, fmt.Errorf("not implemented for custom")
 }
diff --git a/internal/db/custom_impl_test.go b/internal/db/custom_impl_test.go
index 00e6559..a43d923 100644
--- a/internal/db/custom_impl_test.go
+++ b/internal/db/custom_impl_test.go
@@ -111,6 +111,18 @@ func TestNormalizeMySQLRawDSNCompatibilityParamsPreservesExplicitMultiStatements
 	}
 }
 
+func TestNormalizeMySQLRawDSNCompatibilityParamsPreservesCharsetFallbackComma(t *testing.T) {
+	got := normalizeMySQLRawDSNCompatibilityParams(
+		"root:pass@tcp(127.0.0.1:3306)/app?charset=utf8mb4,utf8&allowMultiQueries=true",
+	)
+	if strings.Contains(got, "%2C") || strings.Contains(got, "%2c") {
+		t.Fatalf("charset fallback comma should stay unescaped for mysql driver, got %q", got)
+	}
+	if !strings.Contains(got, "charset=utf8mb4,utf8") {
+		t.Fatalf("charset fallback list should be preserved, got %q", got)
+	}
+}
+
 func TestCustomDBOnlyNormalizesBuiltInMySQLDriverDSN(t *testing.T) {
 	customMySQLDSNRecordingLastDSN = ""
 	rawDSN := "root:pass@tcp(127.0.0.1:3306)/app?allowMultiQueries=true"
@@ -130,3 +142,44 @@ func TestCustomDBOnlyNormalizesBuiltInMySQLDriverDSN(t *testing.T) {
 		t.Fatalf("non-mysql custom driver DSN should stay untouched, got %q", customMySQLDSNRecordingLastDSN)
 	}
 }
+
+func TestBuildCustomColumnDefinitionPrefersCompleteColumnType(t *testing.T) {
+	col := buildCustomColumnDefinition(map[string]interface{}{
+		"COLUMN_NAME": "USER_NAME",
+		"DATA_TYPE":   "varchar",
+		"COLUMN_TYPE": "varchar(64)",
+		"IS_NULLABLE": "NO",
+	})
+
+	if col.Name != "USER_NAME" {
+		t.Fatalf("expected name USER_NAME, got %q", col.Name)
+	}
+	if col.Type != "varchar(64)" {
+		t.Fatalf("expected complete type varchar(64), got %q", col.Type)
+	}
+	if col.Nullable != "NO" {
+		t.Fatalf("expected nullable NO, got %q", col.Nullable)
+	}
+}
+
+func TestBuildCustomColumnDefinitionBuildsTypeFromLengthAndPrecision(t *testing.T) {
+	nameCol := buildCustomColumnDefinition(map[string]interface{}{
+		"column_name":              "display_name",
+		"data_type":                "varchar",
+		"character_maximum_length": int64(128),
+		"is_nullable":              "YES",
+	})
+	if nameCol.Type != "varchar(128)" {
+		t.Fatalf("expected varchar(128), got %q", nameCol.Type)
+	}
+
+	amountCol := buildCustomColumnDefinition(map[string]interface{}{
+		"column_name":       "amount",
+		"data_type":         "decimal",
+		"numeric_precision": float64(10),
+		"numeric_scale":     float64(2),
+	})
+	if amountCol.Type != "decimal(10,2)" {
+		t.Fatalf("expected decimal(10,2), got %q", amountCol.Type)
+	}
+}
diff --git a/internal/db/dameng_columns_test.go b/internal/db/dameng_columns_test.go
index e1ad3c6..104ac6b 100644
--- a/internal/db/dameng_columns_test.go
+++ b/internal/db/dameng_columns_test.go
@@ -15,6 +15,11 @@ func TestBuildDamengColumnsQuery_IncludesPrimaryKeyMetadata(t *testing.T) {
 	if !strings.Contains(ownerQuery, "AS column_key") {
 		t.Fatalf("owner query 应返回 column_key, got=%s", ownerQuery)
 	}
+	for _, want := range []string{"c.data_length", "c.char_length", "c.data_precision", "c.data_scale"} {
+		if !strings.Contains(ownerQuery, want) {
+			t.Fatalf("owner query 应返回字段类型长度信息 %q, got=%s", want, ownerQuery)
+		}
+	}
 	if !strings.Contains(ownerQuery, "WHERE c.owner = 'BIZ' AND c.table_name = 'ORDERS'") {
 		t.Fatalf("owner query 应按 owner/table 过滤, got=%s", ownerQuery)
 	}
@@ -42,22 +47,36 @@ func TestBuildDamengColumnDefinitions_MarksPrimaryKeyColumns(t *testing.T) {
 		{
 			"COLUMN_NAME":  "NAME",
 			"DATA_TYPE":    "VARCHAR2",
+			"DATA_LENGTH":  128,
+			"CHAR_LENGTH":  64,
 			"NULLABLE":     "Y",
 			"DATA_DEFAULT": "guest",
 			"COLUMN_KEY":   "",
 		},
+		{
+			"COLUMN_NAME":    "AMOUNT",
+			"DATA_TYPE":      "NUMBER",
+			"DATA_PRECISION": 10,
+			"DATA_SCALE":     2,
+			"NULLABLE":       "N",
+			"DATA_DEFAULT":   nil,
+			"COLUMN_KEY":     "",
+		},
 	})
 
-	if len(columns) != 2 {
+	if len(columns) != 3 {
 		t.Fatalf("unexpected column count: %d", len(columns))
 	}
-	if columns[0].Name != "ID" || columns[0].Key != "PRI" {
+	if columns[0].Name != "ID" || columns[0].Key != "PRI" || columns[0].Nullable != "NO" {
 		t.Fatalf("主键列未正确标记: %+v", columns[0])
 	}
-	if columns[1].Name != "NAME" || columns[1].Key != "" {
+	if columns[1].Name != "NAME" || columns[1].Type != "VARCHAR2(64)" || columns[1].Nullable != "YES" || columns[1].Key != "" {
 		t.Fatalf("非主键列标记异常: %+v", columns[1])
 	}
 	if columns[1].Default == nil || *columns[1].Default != "guest" {
 		t.Fatalf("默认值未保留: %+v", columns[1])
 	}
+	if columns[2].Name != "AMOUNT" || columns[2].Type != "NUMBER(10,2)" || columns[2].Nullable != "NO" {
+		t.Fatalf("数值字段定义异常: %+v", columns[2])
+	}
 }
diff --git a/internal/db/dameng_metadata.go b/internal/db/dameng_metadata.go
index 2492a85..f06ab45 100644
--- a/internal/db/dameng_metadata.go
+++ b/internal/db/dameng_metadata.go
@@ -110,7 +110,7 @@ func buildDamengColumnsQuery(dbName, tableName string) string {
 	upperDBName := strings.ToUpper(strings.TrimSpace(dbName))
 
 	if upperDBName == "" {
-		return fmt.Sprintf(`SELECT c.column_name, c.data_type, c.nullable, c.data_default,
+		return fmt.Sprintf(`SELECT c.column_name, c.data_type, c.data_length, c.char_length, c.data_precision, c.data_scale, c.nullable, c.data_default,
 		CASE WHEN pk.column_name IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
 		FROM user_tab_columns c
 		LEFT JOIN (
@@ -123,7 +123,7 @@ func buildDamengColumnsQuery(dbName, tableName string) string {
 		ORDER BY c.column_id`, upperTableName)
 	}
 
-	return fmt.Sprintf(`SELECT c.column_name, c.data_type, c.nullable, c.data_default,
+	return fmt.Sprintf(`SELECT c.column_name, c.data_type, c.data_length, c.char_length, c.data_precision, c.data_scale, c.nullable, c.data_default,
 		CASE WHEN pk.column_name IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
 		FROM all_tab_columns c
 		LEFT JOIN (
@@ -137,13 +137,77 @@ func buildDamengColumnsQuery(dbName, tableName string) string {
 		ORDER BY c.column_id`, upperDBName, upperTableName)
 }
 
+func getDamengRowInt(row map[string]interface{}, keys ...string) (int, bool) {
+	for _, key := range keys {
+		raw := getDamengRowString(row, key)
+		if raw == "" {
+			continue
+		}
+		var parsed int
+		if _, err := fmt.Sscanf(raw, "%d", &parsed); err == nil {
+			return parsed, true
+		}
+	}
+	return 0, false
+}
+
+func normalizeDamengNullable(value string) string {
+	switch strings.ToUpper(strings.TrimSpace(value)) {
+	case "N", "NO", "FALSE", "0", "NOT NULL":
+		return "NO"
+	case "Y", "YES", "TRUE", "1", "NULL", "NULLABLE":
+		return "YES"
+	default:
+		return strings.TrimSpace(value)
+	}
+}
+
+func isDamengLengthQualifiedType(upperType string) bool {
+	switch strings.TrimSpace(upperType) {
+	case "CHAR", "NCHAR", "VARCHAR", "VARCHAR2", "NVARCHAR", "NVARCHAR2", "RAW", "BINARY", "VARBINARY":
+		return true
+	default:
+		return strings.Contains(upperType, "CHARACTER")
+	}
+}
+
+func formatDamengColumnType(row map[string]interface{}) string {
+	dataType := getDamengRowString(row, "DATA_TYPE")
+	if dataType == "" || strings.Contains(dataType, "(") {
+		return dataType
+	}
+
+	upperType := strings.ToUpper(dataType)
+	if isDamengLengthQualifiedType(upperType) {
+		if charLength, ok := getDamengRowInt(row, "CHAR_LENGTH", "CHAR_COL_DECL_LENGTH"); ok && charLength > 0 {
+			return fmt.Sprintf("%s(%d)", dataType, charLength)
+		}
+		if dataLength, ok := getDamengRowInt(row, "DATA_LENGTH"); ok && dataLength > 0 {
+			return fmt.Sprintf("%s(%d)", dataType, dataLength)
+		}
+	}
+
+	if strings.Contains(upperType, "NUMBER") || strings.Contains(upperType, "DECIMAL") || strings.Contains(upperType, "NUMERIC") {
+		precision, hasPrecision := getDamengRowInt(row, "DATA_PRECISION", "NUMERIC_PRECISION")
+		if hasPrecision && precision > 0 {
+			scale, hasScale := getDamengRowInt(row, "DATA_SCALE", "NUMERIC_SCALE")
+			if hasScale && scale > 0 {
+				return fmt.Sprintf("%s(%d,%d)", dataType, precision, scale)
+			}
+			return fmt.Sprintf("%s(%d)", dataType, precision)
+		}
+	}
+
+	return dataType
+}
+
 func buildDamengColumnDefinitions(data []map[string]interface{}) []connection.ColumnDefinition {
 	columns := make([]connection.ColumnDefinition, 0, len(data))
 	for _, row := range data {
 		col := connection.ColumnDefinition{
 			Name:     getDamengRowString(row, "COLUMN_NAME"),
-			Type:     getDamengRowString(row, "DATA_TYPE"),
-			Nullable: getDamengRowString(row, "NULLABLE"),
+			Type:     formatDamengColumnType(row),
+			Nullable: normalizeDamengNullable(getDamengRowString(row, "NULLABLE")),
 			Key:      getDamengRowString(row, "COLUMN_KEY"),
 		}
 
diff --git a/internal/db/database.go b/internal/db/database.go
index 7472e69..513fda9 100644
--- a/internal/db/database.go
+++ b/internal/db/database.go
@@ -6,6 +6,7 @@ import (
 	"database/sql"
 	"fmt"
 	"strings"
+	"sync"
 )
 
 // Database 定义了统一的数据源访问接口。
@@ -67,12 +68,72 @@ type StatementExecer interface {
 	Close() error
 }
 
+// StatementQueryExecer can run queries on a pinned session/connection.
+// Drivers that return sqlConnStatementExecer automatically satisfy it.
+type StatementQueryExecer interface {
+	StatementExecer
+	Query(query string) ([]map[string]interface{}, []string, error)
+	QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error)
+}
+
+// StatementQueryMessageExecer can run queries on a pinned session and return
+// extra server messages/notices alongside rows.
+type StatementQueryMessageExecer interface {
+	StatementQueryExecer
+	QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error)
+	QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error)
+}
+
+// StatementMultiResultQueryExecer can run multi-result queries on a pinned session/connection.
+type StatementMultiResultQueryExecer interface {
+	StatementExecer
+	QueryMulti(query string) ([]connection.ResultSetData, error)
+	QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error)
+}
+
+// StatementMultiResultQueryMessageExecer can run multi-result queries on a
+// pinned session/connection and return server messages/notices.
+type StatementMultiResultQueryMessageExecer interface {
+	StatementMultiResultQueryExecer
+	QueryMultiWithMessages(query string) ([]connection.ResultSetData, []string, error)
+	QueryMultiContextWithMessages(ctx context.Context, query string) ([]connection.ResultSetData, []string, error)
+}
+
+// QueryMessageExecer is an optional database-level interface for returning
+// informational server messages alongside one result set.
+type QueryMessageExecer interface {
+	QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error)
+	QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error)
+}
+
+// MultiResultQueryMessageExecer is an optional database-level interface for
+// returning informational server messages alongside multi-result queries.
+type MultiResultQueryMessageExecer interface {
+	QueryMultiWithMessages(query string) ([]connection.ResultSetData, []string, error)
+	QueryMultiContextWithMessages(ctx context.Context, query string) ([]connection.ResultSetData, []string, error)
+}
+
 // SessionExecerProvider is implemented by database/sql based drivers that can
 // pin a long-running job to one physical connection.
 type SessionExecerProvider interface {
 	OpenSessionExecer(ctx context.Context) (StatementExecer, error)
 }
 
+// TransactionExecer is a single transaction handle backed by the database
+// driver. It is required for dialects where textual BEGIN/COMMIT is not a
+// valid transaction-control statement, such as Oracle.
+type TransactionExecer interface {
+	StatementExecer
+	Commit() error
+	Rollback() error
+}
+
+// TransactionExecerProvider is implemented by drivers that can expose a
+// long-running SQL editor managed transaction.
+type TransactionExecerProvider interface {
+	OpenTransactionExecer(ctx context.Context) (TransactionExecer, error)
+}
+
 type sqlConnStatementExecer struct {
 	conn *sql.Conn
 }
@@ -96,6 +157,38 @@ func (e *sqlConnStatementExecer) Exec(query string) (int64, error) {
 	return e.ExecContext(context.Background(), query)
 }
 
+func (e *sqlConnStatementExecer) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if e == nil || e.conn == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+	rows, err := e.conn.QueryContext(ctx, query)
+	if err != nil {
+		return nil, nil, err
+	}
+	defer rows.Close()
+	return scanRows(rows)
+}
+
+func (e *sqlConnStatementExecer) Query(query string) ([]map[string]interface{}, []string, error) {
+	return e.QueryContext(context.Background(), query)
+}
+
+func (e *sqlConnStatementExecer) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
+	if e == nil || e.conn == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	rows, err := e.conn.QueryContext(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	return scanMultiRows(rows)
+}
+
+func (e *sqlConnStatementExecer) QueryMulti(query string) ([]connection.ResultSetData, error) {
+	return e.QueryMultiContext(context.Background(), query)
+}
+
 func (e *sqlConnStatementExecer) ExecBatchContext(ctx context.Context, query string) (int64, error) {
 	return e.ExecContext(ctx, query)
 }
@@ -107,6 +200,244 @@ func (e *sqlConnStatementExecer) Close() error {
 	return e.conn.Close()
 }
 
+type sqlConnTransactionExecer struct {
+	mu          sync.Mutex
+	conn        *sql.Conn
+	done        bool
+	commitSQL   string
+	rollbackSQL string
+}
+
+func NewSQLConnTransactionExecer(conn *sql.Conn, commitSQL string, rollbackSQL string) TransactionExecer {
+	return &sqlConnTransactionExecer{
+		conn:        conn,
+		commitSQL:   strings.TrimSpace(commitSQL),
+		rollbackSQL: strings.TrimSpace(rollbackSQL),
+	}
+}
+
+func (e *sqlConnTransactionExecer) activeConn() (*sql.Conn, error) {
+	if e == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	e.mu.Lock()
+	defer e.mu.Unlock()
+	if e.conn == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	if e.done {
+		return nil, fmt.Errorf("事务已结束")
+	}
+	return e.conn, nil
+}
+
+func (e *sqlConnTransactionExecer) ExecContext(ctx context.Context, query string) (int64, error) {
+	conn, err := e.activeConn()
+	if err != nil {
+		return 0, err
+	}
+	res, err := conn.ExecContext(ctx, query)
+	if err != nil {
+		return 0, err
+	}
+	return res.RowsAffected()
+}
+
+func (e *sqlConnTransactionExecer) Exec(query string) (int64, error) {
+	return e.ExecContext(context.Background(), query)
+}
+
+func (e *sqlConnTransactionExecer) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	conn, err := e.activeConn()
+	if err != nil {
+		return nil, nil, err
+	}
+	rows, err := conn.QueryContext(ctx, query)
+	if err != nil {
+		return nil, nil, err
+	}
+	defer rows.Close()
+	return scanRows(rows)
+}
+
+func (e *sqlConnTransactionExecer) Query(query string) ([]map[string]interface{}, []string, error) {
+	return e.QueryContext(context.Background(), query)
+}
+
+func (e *sqlConnTransactionExecer) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
+	conn, err := e.activeConn()
+	if err != nil {
+		return nil, err
+	}
+	rows, err := conn.QueryContext(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	return scanMultiRows(rows)
+}
+
+func (e *sqlConnTransactionExecer) QueryMulti(query string) ([]connection.ResultSetData, error) {
+	return e.QueryMultiContext(context.Background(), query)
+}
+
+func (e *sqlConnTransactionExecer) finish(sqlText string) error {
+	if e == nil {
+		return nil
+	}
+	e.mu.Lock()
+	if e.conn == nil || e.done {
+		e.mu.Unlock()
+		return nil
+	}
+	conn := e.conn
+	e.done = true
+	e.mu.Unlock()
+	if strings.TrimSpace(sqlText) == "" {
+		return nil
+	}
+	_, err := conn.ExecContext(context.Background(), sqlText)
+	return err
+}
+
+func (e *sqlConnTransactionExecer) Commit() error {
+	return e.finish(e.commitSQL)
+}
+
+func (e *sqlConnTransactionExecer) Rollback() error {
+	return e.finish(e.rollbackSQL)
+}
+
+func (e *sqlConnTransactionExecer) Close() error {
+	if e == nil {
+		return nil
+	}
+	e.mu.Lock()
+	if e.conn == nil {
+		e.mu.Unlock()
+		return nil
+	}
+	conn := e.conn
+	shouldRollback := !e.done && e.rollbackSQL != ""
+	rollbackSQL := e.rollbackSQL
+	e.conn = nil
+	e.done = true
+	e.mu.Unlock()
+
+	var rollbackErr error
+	if shouldRollback {
+		_, rollbackErr = conn.ExecContext(context.Background(), rollbackSQL)
+	}
+	closeErr := conn.Close()
+	if rollbackErr != nil {
+		return rollbackErr
+	}
+	return closeErr
+}
+
+type sqlTxStatementExecer struct {
+	mu   sync.Mutex
+	tx   *sql.Tx
+	done bool
+}
+
+func NewSQLTxStatementExecer(tx *sql.Tx) TransactionExecer {
+	return &sqlTxStatementExecer{tx: tx}
+}
+
+func (e *sqlTxStatementExecer) activeTx() (*sql.Tx, error) {
+	if e == nil || e.tx == nil {
+		return nil, fmt.Errorf("事务未打开")
+	}
+	e.mu.Lock()
+	defer e.mu.Unlock()
+	if e.done {
+		return nil, fmt.Errorf("事务已结束")
+	}
+	return e.tx, nil
+}
+
+func (e *sqlTxStatementExecer) ExecContext(ctx context.Context, query string) (int64, error) {
+	tx, err := e.activeTx()
+	if err != nil {
+		return 0, err
+	}
+	res, err := tx.ExecContext(ctx, query)
+	if err != nil {
+		return 0, err
+	}
+	return res.RowsAffected()
+}
+
+func (e *sqlTxStatementExecer) Exec(query string) (int64, error) {
+	return e.ExecContext(context.Background(), query)
+}
+
+func (e *sqlTxStatementExecer) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	tx, err := e.activeTx()
+	if err != nil {
+		return nil, nil, err
+	}
+	rows, err := tx.QueryContext(ctx, query)
+	if err != nil {
+		return nil, nil, err
+	}
+	defer rows.Close()
+	return scanRows(rows)
+}
+
+func (e *sqlTxStatementExecer) Query(query string) ([]map[string]interface{}, []string, error) {
+	return e.QueryContext(context.Background(), query)
+}
+
+func (e *sqlTxStatementExecer) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
+	tx, err := e.activeTx()
+	if err != nil {
+		return nil, err
+	}
+	rows, err := tx.QueryContext(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	return scanMultiRows(rows)
+}
+
+func (e *sqlTxStatementExecer) QueryMulti(query string) ([]connection.ResultSetData, error) {
+	return e.QueryMultiContext(context.Background(), query)
+}
+
+func (e *sqlTxStatementExecer) finish(action func(*sql.Tx) error) error {
+	if e == nil || e.tx == nil {
+		return nil
+	}
+	e.mu.Lock()
+	if e.done {
+		e.mu.Unlock()
+		return nil
+	}
+	tx := e.tx
+	e.done = true
+	e.mu.Unlock()
+	return action(tx)
+}
+
+func (e *sqlTxStatementExecer) Commit() error {
+	return e.finish(func(tx *sql.Tx) error {
+		return tx.Commit()
+	})
+}
+
+func (e *sqlTxStatementExecer) Rollback() error {
+	return e.finish(func(tx *sql.Tx) error {
+		return tx.Rollback()
+	})
+}
+
+func (e *sqlTxStatementExecer) Close() error {
+	return e.Rollback()
+}
+
 // BatchApplier 定义了批量变更提交接口。
 // 支持批量编辑的驱动实现此接口，用于一次性提交前端 DataGrid 中的增删改操作。
 type BatchApplier interface {
@@ -140,6 +471,9 @@ var databaseFactories = map[string]databaseFactory{
 	"mysql": func() Database {
 		return &MySQLDB{}
 	},
+	"goldendb": func() Database {
+		return &MySQLDB{}
+	},
 	"postgres": func() Database {
 		return &PostgresDB{}
 	},
@@ -149,6 +483,24 @@ var databaseFactories = map[string]databaseFactory{
 	"custom": func() Database {
 		return &CustomDB{}
 	},
+	"chroma": func() Database {
+		return &ChromaDB{}
+	},
+	"qdrant": func() Database {
+		return &QdrantDB{}
+	},
+	"rocketmq": func() Database {
+		return &RocketMQDB{}
+	},
+	"mqtt": func() Database {
+		return &MQTTDB{}
+	},
+	"kafka": func() Database {
+		return &KafkaDB{}
+	},
+	"rabbitmq": func() Database {
+		return &RabbitMQDB{}
+	},
 }
 
 func init() {
@@ -179,8 +531,24 @@ func normalizeDatabaseType(dbType string) string {
 		return "kingbase"
 	case "opengauss", "open_gauss", "open-gauss":
 		return "opengauss"
+	case "gaussdb", "gauss_db", "gauss-db":
+		return "gaussdb"
+	case "goldendb", "greatdb", "gdb":
+		return "goldendb"
 	case "intersystems", "intersystemsiris", "inter-systems-iris", "inter-systems":
 		return "iris"
+	case "chromadb", "chroma-db":
+		return "chroma"
+	case "qdrantdb", "qdrant-db":
+		return "qdrant"
+	case "rocketmq", "rocket-mq", "rocket_mq", "apache-rocketmq", "apache_rocketmq", "rmq":
+		return "rocketmq"
+	case "mqtt", "mqtts":
+		return "mqtt"
+	case "kafka", "apache-kafka", "apache_kafka":
+		return "kafka"
+	case "rabbitmq", "rabbit-mq", "rabbit_mq":
+		return "rabbitmq"
 	default:
 		return normalized
 	}
diff --git a/internal/db/database_optional_factories_full.go b/internal/db/database_optional_factories_full.go
index 3147992..bc90d16 100644
--- a/internal/db/database_optional_factories_full.go
+++ b/internal/db/database_optional_factories_full.go
@@ -16,8 +16,11 @@ func registerOptionalDatabaseFactories() {
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("highgo"), "highgo")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("vastbase"), "vastbase")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("opengauss"), "opengauss", "open_gauss", "open-gauss")
+	registerDatabaseFactory(newOptionalDriverAgentDatabase("gaussdb"), "gaussdb", "gauss_db", "gauss-db")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("iris"), "iris", "intersystems")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("mongodb"), "mongodb")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("tdengine"), "tdengine")
+	registerDatabaseFactory(newOptionalDriverAgentDatabase("iotdb"), "iotdb", "apache-iotdb", "apache_iotdb")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("clickhouse"), "clickhouse")
+	registerDatabaseFactory(newOptionalDriverAgentDatabase("elasticsearch"), "elasticsearch", "elastic")
 }
diff --git a/internal/db/database_optional_factories_lite.go b/internal/db/database_optional_factories_lite.go
index d726c0f..29bd12f 100644
--- a/internal/db/database_optional_factories_lite.go
+++ b/internal/db/database_optional_factories_lite.go
@@ -16,8 +16,11 @@ func registerOptionalDatabaseFactories() {
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("highgo"), "highgo")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("vastbase"), "vastbase")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("opengauss"), "opengauss", "open_gauss", "open-gauss")
+	registerDatabaseFactory(newOptionalDriverAgentDatabase("gaussdb"), "gaussdb", "gauss_db", "gauss-db")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("iris"), "iris", "intersystems")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("mongodb"), "mongodb")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("tdengine"), "tdengine")
+	registerDatabaseFactory(newOptionalDriverAgentDatabase("iotdb"), "iotdb", "apache-iotdb", "apache_iotdb")
 	registerDatabaseFactory(newOptionalDriverAgentDatabase("clickhouse"), "clickhouse")
+	registerDatabaseFactory(newOptionalDriverAgentDatabase("elasticsearch"), "elasticsearch", "elastic")
 }
diff --git a/internal/db/driver_agent_revisions_gen.go b/internal/db/driver_agent_revisions_gen.go
index 264e525..e8e25e6 100644
--- a/internal/db/driver_agent_revisions_gen.go
+++ b/internal/db/driver_agent_revisions_gen.go
@@ -4,22 +4,25 @@ package db
 
 func init() {
 	optionalDriverAgentRevisions = map[string]string{
-		"mariadb":    "src-0a4176f4b5743323",
-		"oceanbase":  "src-e996325fd6d52648",
-		"diros":      "src-cc11b882e28fa5d4",
-		"starrocks":  "src-83a6d81c91c7f5c8",
-		"sphinx":     "src-a70c2cd4d223dac2",
-		"sqlserver":  "src-84553484c72e7253",
-		"sqlite":     "src-762863d48f653b89",
-		"duckdb":     "src-3e551d777ae96d8d",
-		"dameng":     "src-596bebeaa016fc74",
-		"kingbase":   "src-2e5a1337b0405c57",
-		"highgo":     "src-5a29a1d3685eb6b4",
-		"vastbase":   "src-e3cfef65512feb23",
-		"opengauss":  "src-58227ba3bc1ec894",
-		"iris":       "src-1b072c57af08bec4",
-		"mongodb":    "src-57fdd8bfebdcd46e",
-		"tdengine":   "src-939715f94df1ec9c",
-		"clickhouse": "src-482d62ed565b3e69",
+		"mariadb":       "src-0a4176f4b5743323",
+		"oceanbase":     "src-7cb0f2c4dc0510a5",
+		"diros":         "src-cc11b882e28fa5d4",
+		"starrocks":     "src-83a6d81c91c7f5c8",
+		"sphinx":        "src-a70c2cd4d223dac2",
+		"sqlserver":     "src-6d5cf334034bce41",
+		"sqlite":        "src-762863d48f653b89",
+		"duckdb":        "src-df5d60ebb175bbbc",
+		"dameng":        "src-596bebeaa016fc74",
+		"kingbase":      "src-2e5a1337b0405c57",
+		"highgo":        "src-5a29a1d3685eb6b4",
+		"vastbase":      "src-e3cfef65512feb23",
+		"opengauss":     "src-58227ba3bc1ec894",
+		"gaussdb":       "src-1458564993a9d455",
+		"iris":          "src-1b072c57af08bec4",
+		"mongodb":       "src-57fdd8bfebdcd46e",
+		"tdengine":      "src-939715f94df1ec9c",
+		"iotdb":         "src-473c39891f926db2",
+		"clickhouse":    "src-482d62ed565b3e69",
+		"elasticsearch": "src-2fb00b94d7067c56",
 	}
 }
diff --git a/internal/db/driver_support.go b/internal/db/driver_support.go
index 05f942e..664fd19 100644
--- a/internal/db/driver_support.go
+++ b/internal/db/driver_support.go
@@ -13,31 +13,41 @@ import (
 // coreBuiltinDrivers 是始终内置可用的核心驱动，无需额外安装即可使用。
 var coreBuiltinDrivers = map[string]struct{}{
 	"mysql":    {},
+	"goldendb": {},
 	"redis":    {},
 	"oracle":   {},
 	"postgres": {},
+	"chroma":   {},
+	"qdrant":   {},
+	"rocketmq": {},
+	"mqtt":     {},
+	"kafka":    {},
+	"rabbitmq": {},
 }
 
 // optionalGoDrivers 表示需要用户“安装启用”后才能使用的纯 Go 驱动。
 // 注意：这是一种运行时门控（installed.json 标记），并不减少主二进制体积。
 var optionalGoDrivers = map[string]struct{}{
-	"mariadb":    {},
-	"oceanbase":  {},
-	"diros":      {},
-	"starrocks":  {},
-	"sphinx":     {},
-	"sqlserver":  {},
-	"sqlite":     {},
-	"duckdb":     {},
-	"dameng":     {},
-	"kingbase":   {},
-	"highgo":     {},
-	"vastbase":   {},
-	"opengauss":  {},
-	"iris":       {},
-	"mongodb":    {},
-	"tdengine":   {},
-	"clickhouse": {},
+	"mariadb":       {},
+	"oceanbase":     {},
+	"diros":         {},
+	"starrocks":     {},
+	"sphinx":        {},
+	"sqlserver":     {},
+	"sqlite":        {},
+	"duckdb":        {},
+	"dameng":        {},
+	"kingbase":      {},
+	"highgo":        {},
+	"vastbase":      {},
+	"opengauss":     {},
+	"gaussdb":       {},
+	"iris":          {},
+	"mongodb":       {},
+	"tdengine":      {},
+	"iotdb":         {},
+	"clickhouse":    {},
+	"elasticsearch": {},
 }
 
 // optionalDriverAgentRevisions 记录 GoNavi 对各可选 driver-agent 包装逻辑的兼容版本。
@@ -61,8 +71,28 @@ func normalizeRuntimeDriverType(driverType string) string {
 		return "kingbase"
 	case "opengauss", "open_gauss", "open-gauss":
 		return "opengauss"
+	case "gaussdb", "gauss_db", "gauss-db":
+		return "gaussdb"
+	case "goldendb", "greatdb", "gdb":
+		return "goldendb"
 	case "intersystems", "intersystemsiris", "inter-systems-iris", "inter-systems":
 		return "iris"
+	case "elastic":
+		return "elasticsearch"
+	case "chromadb", "chroma-db":
+		return "chroma"
+	case "qdrantdb", "qdrant-db":
+		return "qdrant"
+	case "rocketmq", "rocket-mq", "rocket_mq", "apache-rocketmq", "apache_rocketmq", "rmq":
+		return "rocketmq"
+	case "mqtt", "mqtts":
+		return "mqtt"
+	case "apache-iotdb", "apache_iotdb", "iotdb":
+		return "iotdb"
+	case "kafka", "apache-kafka", "apache_kafka":
+		return "kafka"
+	case "rabbitmq", "rabbit-mq", "rabbit_mq":
+		return "rabbitmq"
 	default:
 		return normalized
 	}
@@ -72,6 +102,8 @@ func driverDisplayName(driverType string) string {
 	switch normalizeRuntimeDriverType(driverType) {
 	case "mysql":
 		return "MySQL"
+	case "goldendb":
+		return "GoldenDB"
 	case "oracle":
 		return "Oracle"
 	case "redis":
@@ -104,14 +136,32 @@ func driverDisplayName(driverType string) string {
 		return "Vastbase"
 	case "opengauss":
 		return "OpenGauss"
+	case "gaussdb":
+		return "GaussDB"
 	case "iris":
 		return "InterSystems IRIS"
 	case "mongodb":
 		return "MongoDB"
 	case "tdengine":
 		return "TDengine"
+	case "iotdb":
+		return "Apache IoTDB"
 	case "clickhouse":
 		return "ClickHouse"
+	case "elasticsearch":
+		return "Elasticsearch"
+	case "chroma":
+		return "Chroma"
+	case "qdrant":
+		return "Qdrant"
+	case "rocketmq":
+		return "RocketMQ"
+	case "mqtt":
+		return "MQTT"
+	case "kafka":
+		return "Kafka"
+	case "rabbitmq":
+		return "RabbitMQ"
 	default:
 		return strings.ToUpper(strings.TrimSpace(driverType))
 	}
diff --git a/internal/db/driver_support_test.go b/internal/db/driver_support_test.go
index bcdedb0..ff32e4b 100644
--- a/internal/db/driver_support_test.go
+++ b/internal/db/driver_support_test.go
@@ -29,13 +29,27 @@ func TestBuiltinLikeDriversRemainAvailable(t *testing.T) {
 	if !supported {
 		t.Fatalf("redis 应始终可用，reason=%s", reason)
 	}
+
+	supported, reason = DriverRuntimeSupportStatus("kafka")
+	if !supported {
+		t.Fatalf("kafka 应始终可用，reason=%s", reason)
+	}
+
+	supported, reason = DriverRuntimeSupportStatus("goldendb")
+	if !supported {
+		t.Fatalf("goldendb 应始终可用，reason=%s", reason)
+	}
 }
 
 func TestOptionalDriverAgentRevisionsGeneratedForOptionalDrivers(t *testing.T) {
 	for driverType := range optionalGoDrivers {
-		if revision := OptionalDriverAgentRevision(driverType); revision == "" {
+		revision := OptionalDriverAgentRevision(driverType)
+		if revision == "" {
 			t.Fatalf("%s 缺少自动生成的 driver-agent revision", driverType)
 		}
+		if revision == "src-local" {
+			t.Fatalf("%s driver-agent revision 仍是本地占位值", driverType)
+		}
 	}
 	if OptionalDriverAgentRevision("doris") != OptionalDriverAgentRevision("diros") {
 		t.Fatalf("doris/diros revision 应归一一致")
@@ -49,6 +63,12 @@ func TestKingbaseRuntimeAliasesNormalizeToKingbase(t *testing.T) {
 	if got := normalizeDatabaseType("kingbasees"); got != "kingbase" {
 		t.Fatalf("expected kingbasees database alias to normalize to kingbase, got %q", got)
 	}
+	if got := normalizeRuntimeDriverType("greatdb"); got != "goldendb" {
+		t.Fatalf("expected greatdb runtime alias to normalize to goldendb, got %q", got)
+	}
+	if got := normalizeDatabaseType("gdb"); got != "goldendb" {
+		t.Fatalf("expected gdb database alias to normalize to goldendb, got %q", got)
+	}
 }
 
 func TestManagedDriverRequiresInstallMarker(t *testing.T) {
@@ -113,7 +133,7 @@ func TestNewCompatibleDriversAreOptionalAgentDrivers(t *testing.T) {
 	tmpDir := t.TempDir()
 	SetExternalDriverDownloadDirectory(tmpDir)
 
-	for _, driverType := range []string{"oceanbase", "opengauss", "open_gauss", "starrocks", "iris", "intersystems"} {
+	for _, driverType := range []string{"oceanbase", "opengauss", "open_gauss", "gaussdb", "gauss_db", "starrocks", "iris", "intersystems"} {
 		if IsBuiltinDriver(driverType) {
 			t.Fatalf("%s 不应是免安装内置驱动", driverType)
 		}
@@ -136,3 +156,13 @@ func TestMySQLBuiltinRuntimeSupportAvailable(t *testing.T) {
 		t.Fatalf("mysql 属于免安装内置驱动，应可用，reason=%s", reason)
 	}
 }
+
+func TestGoldenDBBuiltinDatabaseFactoryUsesMySQLImplementation(t *testing.T) {
+	dbInst, err := NewDatabase("goldendb")
+	if err != nil {
+		t.Fatalf("expected goldendb database factory, got err=%v", err)
+	}
+	if _, ok := dbInst.(*MySQLDB); !ok {
+		t.Fatalf("expected goldendb to reuse MySQLDB implementation, got %T", dbInst)
+	}
+}
diff --git a/internal/db/duckdb_applychanges_test.go b/internal/db/duckdb_applychanges_test.go
new file mode 100644
index 0000000..65a8d67
--- /dev/null
+++ b/internal/db/duckdb_applychanges_test.go
@@ -0,0 +1,160 @@
+//go:build gonavi_full_drivers || gonavi_duckdb_driver
+
+package db
+
+import (
+	"context"
+	"database/sql"
+	"database/sql/driver"
+	"fmt"
+	"sync"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+const duckdbRecordingDriverName = "gonavi_duckdb_recording"
+
+var (
+	registerDuckDBRecordingDriverOnce sync.Once
+	duckdbRecordingDriverMu           sync.Mutex
+	duckdbRecordingDriverSeq          int
+	duckdbRecordingDriverStates       = map[string]*duckdbRecordingState{}
+)
+
+type duckdbRecordingState struct {
+	mu          sync.Mutex
+	execQueries []string
+	execArgs    [][]driver.NamedValue
+}
+
+func (s *duckdbRecordingState) snapshotExecQueries() []string {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return append([]string(nil), s.execQueries...)
+}
+
+func (s *duckdbRecordingState) snapshotExecArgs() [][]driver.NamedValue {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	result := make([][]driver.NamedValue, len(s.execArgs))
+	for i, args := range s.execArgs {
+		result[i] = append([]driver.NamedValue(nil), args...)
+	}
+	return result
+}
+
+type duckdbRecordingDriver struct{}
+
+func (duckdbRecordingDriver) Open(name string) (driver.Conn, error) {
+	duckdbRecordingDriverMu.Lock()
+	state := duckdbRecordingDriverStates[name]
+	duckdbRecordingDriverMu.Unlock()
+	if state == nil {
+		return nil, fmt.Errorf("recording state not found: %s", name)
+	}
+	return &duckdbRecordingConn{state: state}, nil
+}
+
+type duckdbRecordingConn struct {
+	state *duckdbRecordingState
+}
+
+func (c *duckdbRecordingConn) Prepare(query string) (driver.Stmt, error) {
+	return nil, fmt.Errorf("prepare not supported in duckdb recording driver: %s", query)
+}
+
+func (c *duckdbRecordingConn) Close() error { return nil }
+
+func (c *duckdbRecordingConn) Begin() (driver.Tx, error) { return duckdbRecordingTx{}, nil }
+
+func (c *duckdbRecordingConn) ExecContext(_ context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
+	c.state.mu.Lock()
+	defer c.state.mu.Unlock()
+	c.state.execQueries = append(c.state.execQueries, query)
+	c.state.execArgs = append(c.state.execArgs, append([]driver.NamedValue(nil), args...))
+	return driver.RowsAffected(1), nil
+}
+
+var _ driver.ExecerContext = (*duckdbRecordingConn)(nil)
+
+type duckdbRecordingTx struct{}
+
+func (duckdbRecordingTx) Commit() error   { return nil }
+func (duckdbRecordingTx) Rollback() error { return nil }
+
+func openDuckDBRecordingDB(t *testing.T) (*sql.DB, *duckdbRecordingState) {
+	t.Helper()
+	registerDuckDBRecordingDriverOnce.Do(func() {
+		sql.Register(duckdbRecordingDriverName, duckdbRecordingDriver{})
+	})
+
+	duckdbRecordingDriverMu.Lock()
+	duckdbRecordingDriverSeq++
+	dsn := fmt.Sprintf("duckdb-recording-%d", duckdbRecordingDriverSeq)
+	state := &duckdbRecordingState{}
+	duckdbRecordingDriverStates[dsn] = state
+	duckdbRecordingDriverMu.Unlock()
+
+	dbConn, err := sql.Open(duckdbRecordingDriverName, dsn)
+	if err != nil {
+		t.Fatalf("打开 duckdb recording db 失败: %v", err)
+	}
+
+	t.Cleanup(func() {
+		_ = dbConn.Close()
+		duckdbRecordingDriverMu.Lock()
+		delete(duckdbRecordingDriverStates, dsn)
+		duckdbRecordingDriverMu.Unlock()
+	})
+
+	return dbConn, state
+}
+
+func TestDuckDBApplyChangesUsesUnquotedRowIDLocator(t *testing.T) {
+	t.Parallel()
+
+	dbConn, state := openDuckDBRecordingDB(t)
+	duckdb := &DuckDB{conn: dbConn}
+
+	changes := connection.ChangeSet{
+		Updates: []connection.UpdateRow{{
+			Keys: map[string]interface{}{
+				"rowid": 17,
+			},
+			Values: map[string]interface{}{
+				"name": "renamed",
+			},
+		}},
+		Deletes: []map[string]interface{}{
+			{"rowid": 21},
+		},
+		LocatorStrategy: "duckdb-rowid",
+	}
+
+	if err := duckdb.ApplyChanges("main.events", changes); err != nil {
+		t.Fatalf("ApplyChanges 返回错误: %v", err)
+	}
+
+	queries := state.snapshotExecQueries()
+	if len(queries) != 2 {
+		t.Fatalf("期望执行 2 条 SQL，实际=%d %#v", len(queries), queries)
+	}
+	if queries[0] != `DELETE FROM "main"."events" WHERE rowid = ?` {
+		t.Fatalf("删除 SQL 不符合预期: %s", queries[0])
+	}
+	if queries[1] != `UPDATE "main"."events" SET "name" = ? WHERE rowid = ?` {
+		t.Fatalf("更新 SQL 不符合预期: %s", queries[1])
+	}
+
+	args := state.snapshotExecArgs()
+	if len(args) != 2 || len(args[0]) != 1 || len(args[1]) != 2 {
+		t.Fatalf("执行参数数量不符合预期: %#v", args)
+	}
+	if args[0][0].Value != 21 {
+		t.Fatalf("删除 rowid 参数错误: %#v", args[0])
+	}
+	if args[1][0].Value != "renamed" || args[1][1].Value != 17 {
+		t.Fatalf("更新参数错误: %#v", args[1])
+	}
+}
diff --git a/internal/db/duckdb_impl.go b/internal/db/duckdb_impl.go
index e0e36b9..008e8bd 100644
--- a/internal/db/duckdb_impl.go
+++ b/internal/db/duckdb_impl.go
@@ -160,12 +160,22 @@ func (d *DuckDB) GetDatabases() ([]string, error) {
 }
 
 func (d *DuckDB) GetTables(dbName string) ([]string, error) {
+	path := normalizeDuckDBObjectPath(dbName, "")
 	query := `
-SELECT table_schema, table_name
+SELECT table_catalog, table_schema, table_name
 FROM information_schema.tables
 WHERE table_type = 'BASE TABLE'
   AND table_schema NOT IN ('information_schema', 'pg_catalog')
-ORDER BY table_schema, table_name`
+ORDER BY table_catalog, table_schema, table_name`
+	if path.Catalog != "" {
+		query = fmt.Sprintf(`
+SELECT table_catalog, table_schema, table_name
+FROM information_schema.tables
+WHERE table_type = 'BASE TABLE'
+  AND table_schema NOT IN ('information_schema', 'pg_catalog')
+  AND table_catalog = '%s'
+ORDER BY table_catalog, table_schema, table_name`, escapeDuckDBLiteral(path.Catalog))
+	}
 
 	data, _, err := d.Query(query)
 	if err != nil {
@@ -175,15 +185,19 @@ ORDER BY table_schema, table_name`
 	seen := map[string]struct{}{}
 	var tables []string
 	for _, row := range data {
+		catalog := strings.TrimSpace(duckDBRowString(row, "table_catalog", "database_name"))
 		schema := strings.TrimSpace(duckDBRowString(row, "table_schema"))
 		name := strings.TrimSpace(duckDBRowString(row, "table_name"))
 		if name == "" {
 			continue
 		}
 		qualified := name
-		if schema != "" && !strings.EqualFold(schema, "main") {
+		if schema != "" {
 			qualified = schema + "." + name
 		}
+		if catalog != "" && !strings.EqualFold(catalog, "memory") && !strings.EqualFold(catalog, "main") {
+			qualified = catalog + "." + qualified
+		}
 		if _, exists := seen[qualified]; exists {
 			continue
 		}
@@ -194,18 +208,29 @@ ORDER BY table_schema, table_name`
 }
 
 func (d *DuckDB) GetCreateStatement(dbName, tableName string) (string, error) {
-	schema, pureTable := normalizeDuckDBSchemaAndTable(dbName, tableName)
-	if pureTable == "" {
+	path := normalizeDuckDBObjectPath(dbName, tableName)
+	if path.Object == "" {
 		return "", fmt.Errorf("表名不能为空")
 	}
 
-	escapedTable := escapeDuckDBLiteral(pureTable)
-	escapedSchema := escapeDuckDBLiteral(schema)
+	escapedTable := escapeDuckDBLiteral(path.Object)
+	escapedSchema := escapeDuckDBLiteral(path.Schema)
+	escapedCatalog := escapeDuckDBLiteral(path.Catalog)
 
-	queryCandidates := []string{
+	queryCandidates := make([]string, 0, 4)
+	if path.Catalog != "" {
+		queryCandidates = append(queryCandidates, fmt.Sprintf("SELECT sql FROM duckdb_tables() WHERE table_name = '%s' AND schema_name = '%s' AND database_name = '%s' LIMIT 1", escapedTable, escapedSchema, escapedCatalog))
+	}
+	queryCandidates = append(queryCandidates,
 		fmt.Sprintf("SELECT sql FROM duckdb_tables() WHERE table_name = '%s' AND schema_name = '%s' LIMIT 1", escapedTable, escapedSchema),
 		fmt.Sprintf("SELECT sql FROM duckdb_tables() WHERE table_name = '%s' LIMIT 1", escapedTable),
-		fmt.Sprintf("SHOW CREATE TABLE %s", quoteDuckDBQualifiedTable(schema, pureTable)),
+		fmt.Sprintf("SHOW CREATE TABLE %s", quoteDuckDBQualifiedTable(path.Schema, path.Object)),
+	)
+
+	if path.Catalog != "" {
+		queryCandidates = append([]string{
+			fmt.Sprintf("SHOW CREATE TABLE %s.%s", quoteDuckDBIdentifier(path.Catalog), quoteDuckDBQualifiedTable(path.Schema, path.Object)),
+		}, queryCandidates...)
 	}
 
 	for _, query := range queryCandidates {
@@ -230,8 +255,8 @@ func (d *DuckDB) GetCreateStatement(dbName, tableName string) (string, error) {
 }
 
 func (d *DuckDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
-	schema, pureTable := normalizeDuckDBSchemaAndTable(dbName, tableName)
-	if pureTable == "" {
+	path := normalizeDuckDBObjectPath(dbName, tableName)
+	if path.Object == "" {
 		return nil, fmt.Errorf("表名不能为空")
 	}
 
@@ -239,52 +264,62 @@ func (d *DuckDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefini
 SELECT column_name, data_type, is_nullable, column_default
 FROM information_schema.columns
 WHERE table_name = '%s' AND table_schema = '%s'
-ORDER BY ordinal_position`, escapeDuckDBLiteral(pureTable), escapeDuckDBLiteral(schema))
+ORDER BY ordinal_position`, escapeDuckDBLiteral(path.Object), escapeDuckDBLiteral(path.Schema))
+	if path.Catalog != "" {
+		query = fmt.Sprintf(`
+SELECT column_name, data_type, is_nullable, column_default
+FROM information_schema.columns
+WHERE table_name = '%s' AND table_schema = '%s' AND table_catalog = '%s'
+ORDER BY ordinal_position`, escapeDuckDBLiteral(path.Object), escapeDuckDBLiteral(path.Schema), escapeDuckDBLiteral(path.Catalog))
+	}
 
 	data, _, err := d.Query(query)
 	if err != nil {
 		return nil, err
 	}
-	if len(data) == 0 && schema != "main" {
+	if len(data) == 0 && path.Schema != "main" {
 		fallbackQuery := fmt.Sprintf(`
 SELECT column_name, data_type, is_nullable, column_default
 FROM information_schema.columns
 WHERE table_name = '%s'
-ORDER BY ordinal_position`, escapeDuckDBLiteral(pureTable))
+ORDER BY ordinal_position`, escapeDuckDBLiteral(path.Object))
 		data, _, err = d.Query(fallbackQuery)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	var columns []connection.ColumnDefinition
-	for _, row := range data {
-		column := connection.ColumnDefinition{
-			Name:     duckDBRowString(row, "column_name"),
-			Type:     duckDBRowString(row, "data_type"),
-			Nullable: strings.ToUpper(strings.TrimSpace(duckDBRowString(row, "is_nullable"))),
-			Key:      "",
-			Extra:    "",
-			Comment:  "",
-		}
-		if column.Nullable == "" {
-			column.Nullable = "YES"
-		}
-		if defaultVal := strings.TrimSpace(duckDBRowString(row, "column_default")); defaultVal != "" && defaultVal != "<nil>" {
-			def := defaultVal
-			column.Default = &def
-		}
-		columns = append(columns, column)
+	constraintQuery := buildDuckDBConstraintMetadataQuery(path, true)
+	constraintRows, _, constraintErr := d.Query(constraintQuery)
+	if constraintErr != nil {
+		return nil, constraintErr
 	}
-	return columns, nil
+	if len(constraintRows) == 0 && path.Schema != "main" {
+		fallbackConstraintQuery := buildDuckDBConstraintMetadataQuery(path, false)
+		constraintRows, _, constraintErr = d.Query(fallbackConstraintQuery)
+		if constraintErr != nil {
+			return nil, constraintErr
+		}
+	}
+
+	return buildDuckDBColumnDefinitions(data, constraintRows), nil
 }
 
 func (d *DuckDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	path := normalizeDuckDBObjectPath(dbName, "")
 	query := `
-SELECT table_schema, table_name, column_name, data_type
+SELECT table_catalog, table_schema, table_name, column_name, data_type
 FROM information_schema.columns
 WHERE table_schema NOT IN ('information_schema', 'pg_catalog')
-ORDER BY table_schema, table_name, ordinal_position`
+ORDER BY table_catalog, table_schema, table_name, ordinal_position`
+	if path.Catalog != "" {
+		query = fmt.Sprintf(`
+SELECT table_catalog, table_schema, table_name, column_name, data_type
+FROM information_schema.columns
+WHERE table_schema NOT IN ('information_schema', 'pg_catalog')
+  AND table_catalog = '%s'
+ORDER BY table_catalog, table_schema, table_name, ordinal_position`, escapeDuckDBLiteral(path.Catalog))
+	}
 
 	data, _, err := d.Query(query)
 	if err != nil {
@@ -293,14 +328,18 @@ ORDER BY table_schema, table_name, ordinal_position`
 
 	columns := make([]connection.ColumnDefinitionWithTable, 0, len(data))
 	for _, row := range data {
+		catalog := strings.TrimSpace(duckDBRowString(row, "table_catalog", "database_name"))
 		schema := strings.TrimSpace(duckDBRowString(row, "table_schema"))
 		tableName := strings.TrimSpace(duckDBRowString(row, "table_name"))
 		if tableName == "" {
 			continue
 		}
-		if schema != "" && !strings.EqualFold(schema, "main") {
+		if schema != "" {
 			tableName = schema + "." + tableName
 		}
+		if catalog != "" && !strings.EqualFold(catalog, "memory") && !strings.EqualFold(catalog, "main") {
+			tableName = catalog + "." + tableName
+		}
 
 		columns = append(columns, connection.ColumnDefinitionWithTable{
 			TableName: tableName,
@@ -312,7 +351,38 @@ ORDER BY table_schema, table_name, ordinal_position`
 }
 
 func (d *DuckDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
-	return []connection.IndexDefinition{}, nil
+	path := normalizeDuckDBObjectPath(dbName, tableName)
+	if path.Object == "" {
+		return nil, fmt.Errorf("表名不能为空")
+	}
+
+	constraintQuery := buildDuckDBConstraintMetadataQuery(path, true)
+	constraintRows, _, err := d.Query(constraintQuery)
+	if err != nil {
+		return nil, err
+	}
+	if len(constraintRows) == 0 && path.Schema != "main" {
+		fallbackQuery := buildDuckDBConstraintMetadataQuery(path, false)
+		constraintRows, _, err = d.Query(fallbackQuery)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	indexQuery := buildDuckDBIndexMetadataQuery(path, true)
+	indexRows, _, indexErr := d.Query(indexQuery)
+	if indexErr != nil {
+		return nil, indexErr
+	}
+	if len(indexRows) == 0 && path.Schema != "main" {
+		fallbackIndexQuery := buildDuckDBIndexMetadataQuery(path, false)
+		indexRows, _, indexErr = d.Query(fallbackIndexQuery)
+		if indexErr != nil {
+			return nil, indexErr
+		}
+	}
+
+	return buildDuckDBIndexDefinitions(constraintRows, indexRows), nil
 }
 
 func (d *DuckDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
@@ -344,25 +414,33 @@ func (d *DuckDB) ApplyChanges(tableName string, changes connection.ChangeSet) er
 		return `"` + n + `"`
 	}
 
-	schema := ""
-	table := strings.TrimSpace(tableName)
-	if parts := strings.SplitN(table, ".", 2); len(parts) == 2 {
-		schema = strings.TrimSpace(parts[0])
-		table = strings.TrimSpace(parts[1])
-	}
+	path := normalizeDuckDBObjectPath("", tableName)
+	schema := path.Schema
+	table := path.Object
 
 	qualifiedTable := quoteIdent(table)
 	if schema != "" {
 		qualifiedTable = fmt.Sprintf("%s.%s", quoteIdent(schema), quoteIdent(table))
 	}
 
-	for _, pk := range changes.Deletes {
+	isDuckDBRowIDLocator := strings.EqualFold(strings.TrimSpace(changes.LocatorStrategy), "duckdb-rowid")
+	buildWhere := func(keys map[string]interface{}) ([]string, []interface{}) {
 		var wheres []string
 		var args []interface{}
-		for k, v := range pk {
+		for k, v := range keys {
+			if isDuckDBRowIDLocator && strings.EqualFold(strings.TrimSpace(k), "rowid") {
+				wheres = append(wheres, "rowid = ?")
+				args = append(args, v)
+				continue
+			}
 			wheres = append(wheres, fmt.Sprintf("%s = ?", quoteIdent(k)))
 			args = append(args, v)
 		}
+		return wheres, args
+	}
+
+	for _, pk := range changes.Deletes {
+		wheres, args := buildWhere(pk)
 		if len(wheres) == 0 {
 			continue
 		}
@@ -383,11 +461,8 @@ func (d *DuckDB) ApplyChanges(tableName string, changes connection.ChangeSet) er
 			continue
 		}
 
-		var wheres []string
-		for k, v := range update.Keys {
-			wheres = append(wheres, fmt.Sprintf("%s = ?", quoteIdent(k)))
-			args = append(args, v)
-		}
+		wheres, whereArgs := buildWhere(update.Keys)
+		args = append(args, whereArgs...)
 		if len(wheres) == 0 {
 			return fmt.Errorf("更新操作需要主键条件")
 		}
@@ -413,69 +488,3 @@ func (d *DuckDB) ApplyChanges(tableName string, changes connection.ChangeSet) er
 
 	return tx.Commit()
 }
-
-func normalizeDuckDBSchemaAndTable(dbName string, tableName string) (string, string) {
-	schema := strings.TrimSpace(dbName)
-	table := strings.TrimSpace(tableName)
-	if table == "" {
-		if schema == "" {
-			schema = "main"
-		}
-		return schema, table
-	}
-
-	if parts := strings.SplitN(table, ".", 2); len(parts) == 2 {
-		left := strings.TrimSpace(parts[0])
-		right := strings.TrimSpace(parts[1])
-		if left != "" && right != "" {
-			return normalizeDuckDBIdentifier(left), normalizeDuckDBIdentifier(right)
-		}
-	}
-
-	if schema == "" {
-		schema = "main"
-	}
-	return normalizeDuckDBIdentifier(schema), normalizeDuckDBIdentifier(table)
-}
-
-func normalizeDuckDBIdentifier(raw string) string {
-	text := strings.TrimSpace(raw)
-	if len(text) >= 2 {
-		first := text[0]
-		last := text[len(text)-1]
-		if (first == '"' && last == '"') || (first == '`' && last == '`') {
-			text = strings.TrimSpace(text[1 : len(text)-1])
-		}
-	}
-	return text
-}
-
-func quoteDuckDBIdentifier(raw string) string {
-	text := normalizeDuckDBIdentifier(raw)
-	return `"` + strings.ReplaceAll(text, `"`, `""`) + `"`
-}
-
-func quoteDuckDBQualifiedTable(schema string, table string) string {
-	s := strings.TrimSpace(schema)
-	t := strings.TrimSpace(table)
-	if s == "" {
-		return quoteDuckDBIdentifier(t)
-	}
-	return quoteDuckDBIdentifier(s) + "." + quoteDuckDBIdentifier(t)
-}
-
-func duckDBRowString(row map[string]interface{}, keys ...string) string {
-	for _, key := range keys {
-		for rowKey, value := range row {
-			if !strings.EqualFold(rowKey, key) || value == nil {
-				continue
-			}
-			return fmt.Sprintf("%v", value)
-		}
-	}
-	return ""
-}
-
-func escapeDuckDBLiteral(raw string) string {
-	return strings.ReplaceAll(raw, "'", "''")
-}
diff --git a/internal/db/duckdb_metadata.go b/internal/db/duckdb_metadata.go
new file mode 100644
index 0000000..3903385
--- /dev/null
+++ b/internal/db/duckdb_metadata.go
@@ -0,0 +1,611 @@
+package db
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+type duckDBObjectPath struct {
+	Catalog string
+	Schema  string
+	Object  string
+}
+
+func buildDuckDBConstraintMetadataQuery(path duckDBObjectPath, exact bool) string {
+	base := `
+SELECT
+  database_name,
+  schema_name,
+  table_name,
+  constraint_name,
+  constraint_type,
+  constraint_column_names
+FROM duckdb_constraints()
+WHERE table_name = '%s'
+  AND constraint_type IN ('PRIMARY KEY', 'UNIQUE')`
+	args := []any{escapeDuckDBLiteral(path.Object)}
+	if exact && path.Schema != "" {
+		base += "\n  AND schema_name = '%s'"
+		args = append(args, escapeDuckDBLiteral(path.Schema))
+	}
+	if exact && path.Catalog != "" {
+		base += "\n  AND database_name = '%s'"
+		args = append(args, escapeDuckDBLiteral(path.Catalog))
+	}
+	base += "\nORDER BY database_name, schema_name, table_name, constraint_type, constraint_name"
+	return fmt.Sprintf(base, args...)
+}
+
+func buildDuckDBIndexMetadataQuery(path duckDBObjectPath, exact bool) string {
+	base := `
+SELECT
+  database_name,
+  schema_name,
+  table_name,
+  index_name,
+  is_unique,
+  expressions
+FROM duckdb_indexes()
+WHERE table_name = '%s'`
+	args := []any{escapeDuckDBLiteral(path.Object)}
+	if exact && path.Schema != "" {
+		base += "\n  AND schema_name = '%s'"
+		args = append(args, escapeDuckDBLiteral(path.Schema))
+	}
+	if exact && path.Catalog != "" {
+		base += "\n  AND database_name = '%s'"
+		args = append(args, escapeDuckDBLiteral(path.Catalog))
+	}
+	base += "\nORDER BY database_name, schema_name, table_name, index_name"
+	return fmt.Sprintf(base, args...)
+}
+
+func buildDuckDBColumnDefinitions(rows []map[string]interface{}, constraintRows []map[string]interface{}) []connection.ColumnDefinition {
+	primaryKeyColumns := make(map[string]struct{})
+	uniqueColumns := make(map[string]struct{})
+
+	for _, row := range constraintRows {
+		columnNames := duckDBRowIdentifierList(row, "constraint_column_names")
+		switch strings.ToUpper(strings.TrimSpace(duckDBRowString(row, "constraint_type"))) {
+		case "PRIMARY KEY":
+			for _, columnName := range columnNames {
+				primaryKeyColumns[strings.ToLower(columnName)] = struct{}{}
+			}
+		case "UNIQUE":
+			for _, columnName := range columnNames {
+				uniqueColumns[strings.ToLower(columnName)] = struct{}{}
+			}
+		}
+	}
+
+	columns := make([]connection.ColumnDefinition, 0, len(rows))
+	for _, row := range rows {
+		columnName := strings.TrimSpace(duckDBRowString(row, "column_name"))
+		column := connection.ColumnDefinition{
+			Name:     columnName,
+			Type:     duckDBRowString(row, "data_type"),
+			Nullable: strings.ToUpper(strings.TrimSpace(duckDBRowString(row, "is_nullable"))),
+			Key:      "",
+			Extra:    "",
+			Comment:  "",
+		}
+		if column.Nullable == "" {
+			column.Nullable = "YES"
+		}
+		if _, ok := primaryKeyColumns[strings.ToLower(columnName)]; ok {
+			column.Key = "PRI"
+		} else if _, ok := uniqueColumns[strings.ToLower(columnName)]; ok {
+			column.Key = "UNI"
+		}
+		if defaultVal := strings.TrimSpace(duckDBRowString(row, "column_default")); defaultVal != "" && defaultVal != "<nil>" {
+			def := defaultVal
+			column.Default = &def
+		}
+		columns = append(columns, column)
+	}
+
+	return columns
+}
+
+func buildDuckDBIndexDefinitions(constraintRows []map[string]interface{}, indexRows []map[string]interface{}) []connection.IndexDefinition {
+	indexes := make([]connection.IndexDefinition, 0, len(constraintRows)+len(indexRows))
+
+	for _, row := range constraintRows {
+		name := strings.TrimSpace(duckDBRowString(row, "constraint_name"))
+		constraintType := strings.ToUpper(strings.TrimSpace(duckDBRowString(row, "constraint_type")))
+		columnNames := duckDBRowIdentifierList(row, "constraint_column_names")
+		if name == "" || len(columnNames) == 0 {
+			continue
+		}
+		for idx, columnName := range columnNames {
+			indexes = append(indexes, connection.IndexDefinition{
+				Name:       name,
+				ColumnName: columnName,
+				NonUnique:  0,
+				SeqInIndex: idx + 1,
+				IndexType:  constraintType,
+			})
+		}
+	}
+
+	for _, row := range indexRows {
+		name := strings.TrimSpace(duckDBRowString(row, "index_name"))
+		columnNames := duckDBRowExpressionList(row, "expressions")
+		if name == "" || len(columnNames) == 0 {
+			continue
+		}
+		nonUnique := 1
+		if duckDBRowBool(row, "is_unique") {
+			nonUnique = 0
+		}
+		for idx, columnName := range columnNames {
+			indexes = append(indexes, connection.IndexDefinition{
+				Name:       name,
+				ColumnName: columnName,
+				NonUnique:  nonUnique,
+				SeqInIndex: idx + 1,
+				IndexType:  "INDEX",
+			})
+		}
+	}
+
+	return indexes
+}
+
+func normalizeDuckDBObjectPath(dbName string, tableName string) duckDBObjectPath {
+	rawDB := strings.TrimSpace(dbName)
+	rawTable := strings.TrimSpace(tableName)
+	if rawTable == "" {
+		if rawDB == "" {
+			return duckDBObjectPath{Schema: "main"}
+		}
+		dbParts := splitDuckDBQualifiedName(rawDB)
+		switch len(dbParts) {
+		case 0:
+			return duckDBObjectPath{Schema: "main"}
+		case 1:
+			return duckDBObjectPath{Catalog: normalizeDuckDBIdentifier(dbParts[0])}
+		default:
+			return duckDBObjectPath{
+				Catalog: normalizeDuckDBIdentifier(dbParts[0]),
+				Schema:  normalizeDuckDBIdentifier(dbParts[len(dbParts)-1]),
+			}
+		}
+	}
+
+	parts := splitDuckDBQualifiedName(rawTable)
+	switch len(parts) {
+	case 0:
+		return duckDBObjectPath{Schema: "main"}
+	case 1:
+		schema := "main"
+		if rawDB != "" {
+			dbParts := splitDuckDBQualifiedName(rawDB)
+			if len(dbParts) >= 2 {
+				return duckDBObjectPath{
+					Catalog: normalizeDuckDBIdentifier(dbParts[0]),
+					Schema:  normalizeDuckDBIdentifier(dbParts[len(dbParts)-1]),
+					Object:  normalizeDuckDBIdentifier(parts[0]),
+				}
+			}
+			schema = normalizeDuckDBIdentifier(rawDB)
+		}
+		return duckDBObjectPath{
+			Schema: schema,
+			Object: normalizeDuckDBIdentifier(parts[0]),
+		}
+	case 2:
+		if rawDB != "" {
+			dbParts := splitDuckDBQualifiedName(rawDB)
+			if len(dbParts) == 1 && (strings.EqualFold(dbParts[0], "main") || strings.EqualFold(dbParts[0], "memory")) {
+				return duckDBObjectPath{
+					Schema: normalizeDuckDBIdentifier(parts[0]),
+					Object: normalizeDuckDBIdentifier(parts[1]),
+				}
+			}
+			if len(dbParts) == 1 {
+				return duckDBObjectPath{
+					Catalog: normalizeDuckDBIdentifier(dbParts[0]),
+					Schema:  normalizeDuckDBIdentifier(parts[0]),
+					Object:  normalizeDuckDBIdentifier(parts[1]),
+				}
+			}
+			if len(dbParts) >= 2 {
+				return duckDBObjectPath{
+					Catalog: normalizeDuckDBIdentifier(dbParts[0]),
+					Schema:  normalizeDuckDBIdentifier(parts[0]),
+					Object:  normalizeDuckDBIdentifier(parts[1]),
+				}
+			}
+		}
+		return duckDBObjectPath{
+			Schema: normalizeDuckDBIdentifier(parts[0]),
+			Object: normalizeDuckDBIdentifier(parts[1]),
+		}
+	default:
+		return duckDBObjectPath{
+			Catalog: normalizeDuckDBIdentifier(parts[len(parts)-3]),
+			Schema:  normalizeDuckDBIdentifier(parts[len(parts)-2]),
+			Object:  normalizeDuckDBIdentifier(parts[len(parts)-1]),
+		}
+	}
+}
+
+func normalizeDuckDBSchemaAndTable(dbName string, tableName string) (string, string) {
+	path := normalizeDuckDBObjectPath(dbName, tableName)
+	schema := path.Schema
+	if schema == "" {
+		schema = "main"
+	}
+	return schema, path.Object
+}
+
+func normalizeDuckDBIdentifier(raw string) string {
+	text := strings.TrimSpace(normalizeSQLIdentifierEscapes(raw))
+	if len(text) >= 2 {
+		first := text[0]
+		last := text[len(text)-1]
+		if (first == '"' && last == '"') || (first == '`' && last == '`') {
+			text = strings.TrimSpace(text[1 : len(text)-1])
+		}
+	}
+	return text
+}
+
+func quoteDuckDBIdentifier(raw string) string {
+	text := normalizeDuckDBIdentifier(raw)
+	return `"` + strings.ReplaceAll(text, `"`, `""`) + `"`
+}
+
+func quoteDuckDBQualifiedTable(schema string, table string) string {
+	s := strings.TrimSpace(schema)
+	t := strings.TrimSpace(table)
+	if s == "" {
+		return quoteDuckDBIdentifier(t)
+	}
+	return quoteDuckDBIdentifier(s) + "." + quoteDuckDBIdentifier(t)
+}
+
+func duckDBRowString(row map[string]interface{}, keys ...string) string {
+	for _, key := range keys {
+		for rowKey, value := range row {
+			if !strings.EqualFold(rowKey, key) || value == nil {
+				continue
+			}
+			return fmt.Sprintf("%v", value)
+		}
+	}
+	return ""
+}
+
+func duckDBRowValue(row map[string]interface{}, keys ...string) interface{} {
+	for _, key := range keys {
+		for rowKey, value := range row {
+			if !strings.EqualFold(rowKey, key) {
+				continue
+			}
+			return value
+		}
+	}
+	return nil
+}
+
+func duckDBRowBool(row map[string]interface{}, keys ...string) bool {
+	value := strings.TrimSpace(strings.ToLower(duckDBRowString(row, keys...)))
+	return value == "true" || value == "1" || value == "yes"
+}
+
+func duckDBRowInt(row map[string]interface{}, keys ...string) int {
+	raw := strings.TrimSpace(duckDBRowString(row, keys...))
+	if raw == "" {
+		return 0
+	}
+	var value int
+	_, _ = fmt.Sscanf(raw, "%d", &value)
+	return value
+}
+
+func duckDBRowIdentifierList(row map[string]interface{}, keys ...string) []string {
+	return parseDuckDBListValue(duckDBRowValue(row, keys...), true)
+}
+
+func duckDBRowExpressionList(row map[string]interface{}, keys ...string) []string {
+	return parseDuckDBListValue(duckDBRowValue(row, keys...), false)
+}
+
+func parseDuckDBIdentifierList(raw string) []string {
+	return parseDuckDBList(raw, true)
+}
+
+func parseDuckDBExpressionList(raw string) []string {
+	values := parseDuckDBList(raw, false)
+	return normalizeDuckDBExpressionList(values)
+}
+
+func parseDuckDBListValue(raw interface{}, normalize bool) []string {
+	if raw == nil {
+		return nil
+	}
+
+	switch typed := raw.(type) {
+	case []string:
+		values := append([]string(nil), typed...)
+		if normalize {
+			return normalizeDuckDBIdentifierEntries(values)
+		}
+		return normalizeDuckDBExpressionList(values)
+	case []interface{}:
+		values := make([]string, 0, len(typed))
+		for _, item := range typed {
+			values = append(values, strings.TrimSpace(fmt.Sprintf("%v", item)))
+		}
+		if normalize {
+			return normalizeDuckDBIdentifierEntries(values)
+		}
+		return normalizeDuckDBExpressionList(values)
+	}
+
+	rv := reflect.ValueOf(raw)
+	if rv.IsValid() && rv.Kind() != reflect.String && rv.Kind() != reflect.Slice && rv.Kind() != reflect.Array {
+		values := parseDuckDBList(strings.TrimSpace(fmt.Sprintf("%v", raw)), normalize)
+		if !normalize {
+			return normalizeDuckDBExpressionList(values)
+		}
+		return values
+	}
+	if rv.IsValid() && (rv.Kind() == reflect.Slice || rv.Kind() == reflect.Array) {
+		if rv.Kind() == reflect.Slice && rv.Type().Elem().Kind() == reflect.Uint8 {
+			values := parseDuckDBList(strings.TrimSpace(fmt.Sprintf("%v", raw)), normalize)
+			if !normalize {
+				return normalizeDuckDBExpressionList(values)
+			}
+			return values
+		}
+		values := make([]string, 0, rv.Len())
+		for i := 0; i < rv.Len(); i++ {
+			values = append(values, strings.TrimSpace(fmt.Sprintf("%v", rv.Index(i).Interface())))
+		}
+		if normalize {
+			return normalizeDuckDBIdentifierEntries(values)
+		}
+		return normalizeDuckDBExpressionList(values)
+	}
+
+	values := parseDuckDBList(strings.TrimSpace(fmt.Sprintf("%v", raw)), normalize)
+	if !normalize {
+		return normalizeDuckDBExpressionList(values)
+	}
+	return values
+}
+
+func normalizeDuckDBIdentifierEntries(values []string) []string {
+	normalized := make([]string, 0, len(values))
+	for _, value := range values {
+		trimmed := strings.TrimSpace(value)
+		if trimmed == "" {
+			continue
+		}
+		normalized = append(normalized, normalizeDuckDBIdentifier(trimmed))
+	}
+	return normalized
+}
+
+func normalizeDuckDBExpressionList(values []string) []string {
+	if len(values) == 0 {
+		return values
+	}
+	normalized := make([]string, 0, len(values))
+	for _, value := range values {
+		trimmed := strings.TrimSpace(value)
+		trimmed = normalizeDuckDBExpressionIdentifierLiteral(trimmed)
+		switch {
+		case trimmed == "":
+			continue
+		case isDuckDBSimpleIdentifierExpression(trimmed):
+			normalized = append(normalized, normalizeDuckDBIdentifier(trimmed))
+		default:
+			normalized = append(normalized, trimmed)
+		}
+	}
+	return normalized
+}
+
+func normalizeDuckDBExpressionIdentifierLiteral(raw string) string {
+	text := strings.TrimSpace(raw)
+	if len(text) < 2 || text[0] != '\'' || text[len(text)-1] != '\'' {
+		return text
+	}
+
+	inner := strings.TrimSpace(text[1 : len(text)-1])
+	inner = strings.ReplaceAll(inner, `''`, `'`)
+	inner = normalizeSQLIdentifierEscapes(inner)
+	if inner == "" {
+		return text
+	}
+	if strings.ContainsAny(inner, "() +-/*%") {
+		return text
+	}
+	if len(inner) >= 2 {
+		first := inner[0]
+		last := inner[len(inner)-1]
+		if (first == '"' && last == '"') || (first == '`' && last == '`') {
+			return inner
+		}
+	}
+	if strings.ContainsAny(inner, `"'`) {
+		return text
+	}
+	return inner
+}
+
+func parseDuckDBList(raw string, normalize bool) []string {
+	text := strings.TrimSpace(normalizeSQLIdentifierEscapes(raw))
+	if text == "" {
+		return nil
+	}
+	if strings.HasPrefix(text, "[") && strings.HasSuffix(text, "]") {
+		text = text[1 : len(text)-1]
+	}
+	values := make([]string, 0)
+	var current strings.Builder
+	inDouble := false
+	inBacktick := false
+	depth := 0
+
+	flush := func() {
+		value := strings.TrimSpace(current.String())
+		current.Reset()
+		if value == "" {
+			return
+		}
+		if normalize {
+			value = normalizeDuckDBIdentifier(value)
+		}
+		values = append(values, value)
+	}
+
+	for i := 0; i < len(text); i++ {
+		ch := text[i]
+		switch ch {
+		case '"':
+			current.WriteByte(ch)
+			if inDouble && i+1 < len(text) && text[i+1] == '"' {
+				current.WriteByte(text[i+1])
+				i++
+				continue
+			}
+			if !inBacktick {
+				inDouble = !inDouble
+			}
+		case '`':
+			current.WriteByte(ch)
+			if inBacktick && i+1 < len(text) && text[i+1] == '`' {
+				current.WriteByte(text[i+1])
+				i++
+				continue
+			}
+			if !inDouble {
+				inBacktick = !inBacktick
+			}
+		case '(':
+			current.WriteByte(ch)
+			if !inDouble && !inBacktick {
+				depth++
+			}
+		case ')':
+			current.WriteByte(ch)
+			if !inDouble && !inBacktick && depth > 0 {
+				depth--
+			}
+		case ',':
+			if !inDouble && !inBacktick && depth == 0 {
+				flush()
+				continue
+			}
+			current.WriteByte(ch)
+		default:
+			current.WriteByte(ch)
+		}
+	}
+	flush()
+
+	return values
+}
+
+func splitDuckDBQualifiedName(raw string) []string {
+	text := strings.TrimSpace(normalizeSQLIdentifierEscapes(raw))
+	if text == "" {
+		return nil
+	}
+	parts := make([]string, 0, 3)
+	var current strings.Builder
+	inDouble := false
+	inBacktick := false
+	inBracket := false
+
+	flush := func() {
+		value := strings.TrimSpace(current.String())
+		current.Reset()
+		if value == "" {
+			return
+		}
+		parts = append(parts, value)
+	}
+
+	for i := 0; i < len(text); i++ {
+		ch := text[i]
+		if inDouble {
+			current.WriteByte(ch)
+			if ch == '"' && i+1 < len(text) && text[i+1] == '"' {
+				current.WriteByte(text[i+1])
+				i++
+				continue
+			}
+			if ch == '"' {
+				inDouble = false
+			}
+			continue
+		}
+		if inBacktick {
+			current.WriteByte(ch)
+			if ch == '`' && i+1 < len(text) && text[i+1] == '`' {
+				current.WriteByte(text[i+1])
+				i++
+				continue
+			}
+			if ch == '`' {
+				inBacktick = false
+			}
+			continue
+		}
+		if inBracket {
+			current.WriteByte(ch)
+			if ch == ']' && i+1 < len(text) && text[i+1] == ']' {
+				current.WriteByte(text[i+1])
+				i++
+				continue
+			}
+			if ch == ']' {
+				inBracket = false
+			}
+			continue
+		}
+
+		switch ch {
+		case '"':
+			inDouble = true
+			current.WriteByte(ch)
+		case '`':
+			inBacktick = true
+			current.WriteByte(ch)
+		case '[':
+			inBracket = true
+			current.WriteByte(ch)
+		case '.':
+			flush()
+		default:
+			current.WriteByte(ch)
+		}
+	}
+	flush()
+
+	return parts
+}
+
+func isDuckDBSimpleIdentifierExpression(raw string) bool {
+	text := strings.TrimSpace(raw)
+	if text == "" {
+		return false
+	}
+	if strings.ContainsAny(text, "() +-/*%") {
+		return false
+	}
+	return true
+}
+
+func escapeDuckDBLiteral(raw string) string {
+	return strings.ReplaceAll(raw, "'", "''")
+}
diff --git a/internal/db/duckdb_metadata_integration_test.go b/internal/db/duckdb_metadata_integration_test.go
new file mode 100644
index 0000000..828b5fc
--- /dev/null
+++ b/internal/db/duckdb_metadata_integration_test.go
@@ -0,0 +1,152 @@
+//go:build gonavi_duckdb_driver
+
+package db
+
+import (
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+func TestDuckDBMetadataDetectsPrimaryAndUniqueIndexes(t *testing.T) {
+	t.Parallel()
+
+	dbPath := filepath.Join(t.TempDir(), "metadata.duckdb")
+	client := &DuckDB{}
+	if err := client.Connect(connection.ConnectionConfig{Type: "duckdb", Host: dbPath}); err != nil {
+		t.Fatalf("Connect failed: %v", err)
+	}
+	t.Cleanup(func() {
+		_ = client.Close()
+	})
+
+	if _, err := client.Exec(`
+CREATE TABLE events (
+	id BIGINT PRIMARY KEY,
+	email VARCHAR UNIQUE,
+	name VARCHAR
+);
+CREATE UNIQUE INDEX idx_events_name ON events(name);
+`); err != nil {
+		t.Fatalf("create test table failed: %v", err)
+	}
+
+	columns, err := client.GetColumns("main", "main.events")
+	if err != nil {
+		t.Fatalf("GetColumns failed: %v", err)
+	}
+	if len(columns) != 3 {
+		t.Fatalf("unexpected column count: %d, columns=%+v", len(columns), columns)
+	}
+
+	keysByName := map[string]string{}
+	for _, column := range columns {
+		keysByName[column.Name] = column.Key
+	}
+	if keysByName["id"] != "PRI" {
+		t.Fatalf("primary key metadata missing: columns=%+v", columns)
+	}
+	if keysByName["email"] != "UNI" {
+		t.Fatalf("unique constraint metadata missing: columns=%+v", columns)
+	}
+
+	indexes, err := client.GetIndexes("main", "main.events")
+	if err != nil {
+		t.Fatalf("GetIndexes failed: %v", err)
+	}
+	if !duckDBTestHasUniqueIndexColumn(indexes, "id") {
+		t.Fatalf("primary key index metadata missing: indexes=%+v", indexes)
+	}
+	if !duckDBTestHasUniqueIndexColumn(indexes, "email") {
+		t.Fatalf("unique constraint index metadata missing: indexes=%+v", indexes)
+	}
+	if !duckDBTestHasUniqueIndexColumn(indexes, "name") {
+		t.Fatalf("unique index metadata missing: indexes=%+v", indexes)
+	}
+}
+
+func TestDuckDBDefinitionReloadReflectsLatestDDL(t *testing.T) {
+	t.Parallel()
+
+	dbPath := filepath.Join(t.TempDir(), "definition-reload.duckdb")
+	client := &DuckDB{}
+	if err := client.Connect(connection.ConnectionConfig{Type: "duckdb", Host: dbPath}); err != nil {
+		t.Fatalf("Connect failed: %v", err)
+	}
+	t.Cleanup(func() {
+		_ = client.Close()
+	})
+
+	if _, err := client.Exec(`
+CREATE VIEW active_users AS
+SELECT id FROM (VALUES (1), (2)) AS users(id);
+
+CREATE OR REPLACE MACRO add_one(x) AS x + 1;
+`); err != nil {
+		t.Fatalf("create initial objects failed: %v", err)
+	}
+
+	viewDefinitionBefore, _, err := client.Query(`SELECT view_definition FROM information_schema.views WHERE table_schema = 'main' AND table_name = 'active_users' LIMIT 1`)
+	if err != nil {
+		t.Fatalf("query initial view definition failed: %v", err)
+	}
+	if len(viewDefinitionBefore) != 1 {
+		t.Fatalf("expected one initial view definition row, got %+v", viewDefinitionBefore)
+	}
+	if got := duckDBRowString(viewDefinitionBefore[0], "view_definition"); !strings.Contains(got, "SELECT id FROM") || !strings.Contains(got, "VALUES (1), (2)") {
+		t.Fatalf("unexpected initial view definition: %q", got)
+	}
+
+	routineDefinitionBefore, _, err := client.Query(`SELECT macro_definition FROM duckdb_functions() WHERE internal = false AND lower(function_type) = 'macro' AND schema_name = 'main' AND function_name = 'add_one' LIMIT 1`)
+	if err != nil {
+		t.Fatalf("query initial macro definition failed: %v", err)
+	}
+	if len(routineDefinitionBefore) != 1 {
+		t.Fatalf("expected one initial macro definition row, got %+v", routineDefinitionBefore)
+	}
+	if got := duckDBRowString(routineDefinitionBefore[0], "macro_definition"); !strings.Contains(got, "x + 1") {
+		t.Fatalf("unexpected initial macro definition: %q", got)
+	}
+
+	if _, err := client.Exec(`
+CREATE OR REPLACE VIEW active_users AS
+SELECT id, id * 10 AS score FROM (VALUES (1), (2)) AS users(id);
+
+CREATE OR REPLACE MACRO add_one(x) AS x + 2;
+`); err != nil {
+		t.Fatalf("replace latest objects failed: %v", err)
+	}
+
+	viewDefinitionAfter, _, err := client.Query(`SELECT view_definition FROM information_schema.views WHERE table_schema = 'main' AND table_name = 'active_users' LIMIT 1`)
+	if err != nil {
+		t.Fatalf("query latest view definition failed: %v", err)
+	}
+	if len(viewDefinitionAfter) != 1 {
+		t.Fatalf("expected one latest view definition row, got %+v", viewDefinitionAfter)
+	}
+	if got := duckDBRowString(viewDefinitionAfter[0], "view_definition"); !strings.Contains(got, "SELECT id") || !strings.Contains(got, "score") || !strings.Contains(got, "10") {
+		t.Fatalf("expected latest view definition, got %q", got)
+	}
+
+	routineDefinitionAfter, _, err := client.Query(`SELECT macro_definition FROM duckdb_functions() WHERE internal = false AND lower(function_type) = 'macro' AND schema_name = 'main' AND function_name = 'add_one' LIMIT 1`)
+	if err != nil {
+		t.Fatalf("query latest macro definition failed: %v", err)
+	}
+	if len(routineDefinitionAfter) != 1 {
+		t.Fatalf("expected one latest macro definition row, got %+v", routineDefinitionAfter)
+	}
+	if got := duckDBRowString(routineDefinitionAfter[0], "macro_definition"); !strings.Contains(got, "x + 2") {
+		t.Fatalf("expected latest macro definition, got %q", got)
+	}
+}
+
+func duckDBTestHasUniqueIndexColumn(indexes []connection.IndexDefinition, columnName string) bool {
+	for _, index := range indexes {
+		if index.ColumnName == columnName && index.NonUnique == 0 {
+			return true
+		}
+	}
+	return false
+}
diff --git a/internal/db/duckdb_metadata_test.go b/internal/db/duckdb_metadata_test.go
new file mode 100644
index 0000000..2e3cb6e
--- /dev/null
+++ b/internal/db/duckdb_metadata_test.go
@@ -0,0 +1,273 @@
+package db
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestBuildDuckDBConstraintMetadataQuery_UsesDuckDBConstraints(t *testing.T) {
+	t.Parallel()
+
+	query := buildDuckDBConstraintMetadataQuery(duckDBObjectPath{
+		Catalog: "analytics",
+		Schema:  "main",
+		Object:  "events",
+	}, true)
+
+	if !containsAll(query,
+		"FROM duckdb_constraints()",
+		"constraint_type IN ('PRIMARY KEY', 'UNIQUE')",
+		"database_name = 'analytics'",
+		"schema_name = 'main'",
+		"table_name = 'events'",
+	) {
+		t.Fatalf("DuckDB 约束查询未正确包含 catalog/schema/table 过滤: %s", query)
+	}
+}
+
+func TestBuildDuckDBIndexMetadataQuery_UsesDuckDBIndexes(t *testing.T) {
+	t.Parallel()
+
+	query := buildDuckDBIndexMetadataQuery(duckDBObjectPath{
+		Catalog: "analytics",
+		Schema:  "main",
+		Object:  "events",
+	}, true)
+
+	if !containsAll(query,
+		"FROM duckdb_indexes()",
+		"database_name = 'analytics'",
+		"schema_name = 'main'",
+		"table_name = 'events'",
+	) {
+		t.Fatalf("DuckDB 索引查询未正确包含 catalog/schema/table 过滤: %s", query)
+	}
+}
+
+func TestBuildDuckDBColumnDefinitions_MarksPrimaryAndUniqueColumns(t *testing.T) {
+	t.Parallel()
+
+	columns := buildDuckDBColumnDefinitions(
+		[]map[string]interface{}{
+			{
+				"column_name":    "id",
+				"data_type":      "BIGINT",
+				"is_nullable":    "NO",
+				"column_default": nil,
+			},
+			{
+				"column_name":    "email",
+				"data_type":      "VARCHAR",
+				"is_nullable":    "YES",
+				"column_default": "'guest@example.com'",
+			},
+		},
+		[]map[string]interface{}{
+			{
+				"constraint_name":         "events_pkey",
+				"constraint_type":         "PRIMARY KEY",
+				"constraint_column_names": "[id]",
+			},
+			{
+				"constraint_name":         "events_email_key",
+				"constraint_type":         "UNIQUE",
+				"constraint_column_names": "[email]",
+			},
+		},
+	)
+
+	if len(columns) != 2 {
+		t.Fatalf("unexpected column count: %d", len(columns))
+	}
+	if columns[0].Name != "id" || columns[0].Key != "PRI" {
+		t.Fatalf("主键列未正确标记: %+v", columns[0])
+	}
+	if columns[1].Name != "email" || columns[1].Key != "UNI" {
+		t.Fatalf("唯一键列未正确标记: %+v", columns[1])
+	}
+	if columns[1].Default == nil || *columns[1].Default != "'guest@example.com'" {
+		t.Fatalf("默认值未保留: %+v", columns[1])
+	}
+}
+
+func TestBuildDuckDBColumnDefinitions_SupportsArrayConstraintColumns(t *testing.T) {
+	t.Parallel()
+
+	columns := buildDuckDBColumnDefinitions(
+		[]map[string]interface{}{
+			{
+				"column_name": "id",
+				"data_type":   "BIGINT",
+				"is_nullable": "NO",
+			},
+			{
+				"column_name": "tenant_id",
+				"data_type":   "BIGINT",
+				"is_nullable": "NO",
+			},
+			{
+				"column_name": "slug",
+				"data_type":   "VARCHAR",
+				"is_nullable": "NO",
+			},
+		},
+		[]map[string]interface{}{
+			{
+				"constraint_name":         "events_pkey",
+				"constraint_type":         "PRIMARY KEY",
+				"constraint_column_names": []interface{}{"id", "tenant_id"},
+			},
+			{
+				"constraint_name":         "events_slug_key",
+				"constraint_type":         "UNIQUE",
+				"constraint_column_names": []string{"slug"},
+			},
+		},
+	)
+
+	if len(columns) != 3 {
+		t.Fatalf("unexpected column count: %d", len(columns))
+	}
+	if columns[0].Key != "PRI" || columns[1].Key != "PRI" {
+		t.Fatalf("复合主键列未正确标记: %+v", columns)
+	}
+	if columns[2].Key != "UNI" {
+		t.Fatalf("唯一键列未正确标记: %+v", columns[2])
+	}
+}
+
+func TestBuildDuckDBIndexDefinitions_MergesConstraintsAndUniqueIndexes(t *testing.T) {
+	t.Parallel()
+
+	indexes := buildDuckDBIndexDefinitions(
+		[]map[string]interface{}{
+			{
+				"constraint_name":         "events_pkey",
+				"constraint_type":         "PRIMARY KEY",
+				"constraint_column_names": "[id]",
+			},
+			{
+				"constraint_name":         "events_business_key",
+				"constraint_type":         "UNIQUE",
+				"constraint_column_names": "[email, region]",
+			},
+		},
+		[]map[string]interface{}{
+			{
+				"index_name":  "idx_events_slug",
+				"is_unique":   true,
+				"expressions": "[slug]",
+			},
+		},
+	)
+
+	if len(indexes) != 4 {
+		t.Fatalf("unexpected index row count: %d", len(indexes))
+	}
+	if indexes[0].Name != "events_pkey" || indexes[0].ColumnName != "id" || indexes[0].NonUnique != 0 {
+		t.Fatalf("主键索引映射异常: %+v", indexes[0])
+	}
+	if indexes[1].Name != "events_business_key" || indexes[1].ColumnName != "email" || indexes[1].SeqInIndex != 1 {
+		t.Fatalf("约束唯一索引首列映射异常: %+v", indexes[1])
+	}
+	if indexes[2].Name != "events_business_key" || indexes[2].ColumnName != "region" || indexes[2].SeqInIndex != 2 {
+		t.Fatalf("约束唯一索引次列映射异常: %+v", indexes[2])
+	}
+	if indexes[3].Name != "idx_events_slug" || indexes[3].ColumnName != "slug" || indexes[3].NonUnique != 0 || indexes[3].IndexType != "INDEX" {
+		t.Fatalf("显式唯一索引映射异常: %+v", indexes[3])
+	}
+}
+
+func TestBuildDuckDBIndexDefinitions_SupportsArrayMetadataRows(t *testing.T) {
+	t.Parallel()
+
+	indexes := buildDuckDBIndexDefinitions(
+		[]map[string]interface{}{
+			{
+				"constraint_name":         "events_business_key",
+				"constraint_type":         "UNIQUE",
+				"constraint_column_names": []interface{}{"tenant_id", "slug"},
+			},
+		},
+		[]map[string]interface{}{
+			{
+				"index_name":  "idx_events_expr",
+				"is_unique":   true,
+				"expressions": []string{`lower("slug")`},
+			},
+		},
+	)
+
+	if len(indexes) != 3 {
+		t.Fatalf("unexpected index row count: %d", len(indexes))
+	}
+	if indexes[0].Name != "events_business_key" || indexes[0].ColumnName != "tenant_id" || indexes[0].SeqInIndex != 1 {
+		t.Fatalf("约束唯一索引首列映射异常: %+v", indexes[0])
+	}
+	if indexes[1].Name != "events_business_key" || indexes[1].ColumnName != "slug" || indexes[1].SeqInIndex != 2 {
+		t.Fatalf("约束唯一索引次列映射异常: %+v", indexes[1])
+	}
+	if indexes[2].Name != "idx_events_expr" || indexes[2].ColumnName != `lower("slug")` || indexes[2].NonUnique != 0 {
+		t.Fatalf("表达式唯一索引映射异常: %+v", indexes[2])
+	}
+}
+
+func TestNormalizeDuckDBObjectPath_PreservesCatalogSchemaAndQuotedDots(t *testing.T) {
+	t.Parallel()
+
+	path := normalizeDuckDBObjectPath(`"analytics.catalog"."main.schema"`, `"daily.events"."2026.06"`)
+	if path.Catalog != "analytics.catalog" || path.Schema != "daily.events" || path.Object != "2026.06" {
+		t.Fatalf("unexpected duckdb path: %+v", path)
+	}
+
+	qualified := normalizeDuckDBObjectPath(`analytics`, `"main.schema"."daily.events"`)
+	if qualified.Catalog != "analytics" || qualified.Schema != "main.schema" || qualified.Object != "daily.events" {
+		t.Fatalf("unexpected duckdb qualified path without catalog: %+v", qualified)
+	}
+}
+
+func TestNormalizeDuckDBObjectPath_DoesNotTreatMainDatabaseAsExternalCatalog(t *testing.T) {
+	t.Parallel()
+
+	path := normalizeDuckDBObjectPath("main", "main.events")
+	if path.Catalog != "" || path.Schema != "main" || path.Object != "events" {
+		t.Fatalf("unexpected duckdb main path: %+v", path)
+	}
+
+	memoryPath := normalizeDuckDBObjectPath("memory", "main.events")
+	if memoryPath.Catalog != "" || memoryPath.Schema != "main" || memoryPath.Object != "events" {
+		t.Fatalf("unexpected duckdb memory path: %+v", memoryPath)
+	}
+}
+
+func TestParseDuckDBExpressionList_KeepsQuotedExpressionsIntact(t *testing.T) {
+	t.Parallel()
+
+	parts := parseDuckDBExpressionList(`["slug", lower("name.with.dot")]`)
+	if len(parts) != 2 || parts[0] != `slug` || parts[1] != `lower("name.with.dot")` {
+		t.Fatalf("unexpected expression list: %#v", parts)
+	}
+}
+
+func TestParseDuckDBExpressionList_UnwrapsIdentifierLiterals(t *testing.T) {
+	t.Parallel()
+
+	parts := parseDuckDBExpressionList(`['"name"', '"tenant.id"', 'slug']`)
+	if len(parts) != 3 || parts[0] != "name" || parts[1] != "tenant.id" || parts[2] != "slug" {
+		t.Fatalf("unexpected expression list: %#v", parts)
+	}
+
+	exprParts := parseDuckDBExpressionList(`['lower("name")']`)
+	if len(exprParts) != 1 || exprParts[0] != `'lower("name")'` {
+		t.Fatalf("expression literal should be preserved: %#v", exprParts)
+	}
+}
+
+func containsAll(source string, needles ...string) bool {
+	for _, needle := range needles {
+		if !strings.Contains(source, needle) {
+			return false
+		}
+	}
+	return true
+}
diff --git a/internal/db/elasticsearch_helpers.go b/internal/db/elasticsearch_helpers.go
new file mode 100644
index 0000000..8237eff
--- /dev/null
+++ b/internal/db/elasticsearch_helpers.go
@@ -0,0 +1,1348 @@
+//go:build gonavi_full_drivers || gonavi_elasticsearch_driver
+
+package db
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+	proxytunnel "GoNavi-Wails/internal/proxy"
+
+	"github.com/elastic/go-elasticsearch/v8"
+	"github.com/elastic/go-elasticsearch/v8/esapi"
+)
+
+const defaultEsPort = 9200
+
+// ---- 配置规范化工具 ----
+
+// normalizeElasticsearchConfig 规范化 Elasticsearch 连接配置。
+func normalizeElasticsearchConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
+	runConfig := applyElasticsearchURI(config)
+	if strings.TrimSpace(runConfig.Host) == "" {
+		runConfig.Host = "localhost"
+	}
+	if runConfig.Port <= 0 {
+		runConfig.Port = defaultEsPort
+	}
+	return runConfig
+}
+
+// applyElasticsearchURI 从 URI 中解析并回填连接参数。
+func applyElasticsearchURI(config connection.ConnectionConfig) connection.ConnectionConfig {
+	uriText := strings.TrimSpace(config.URI)
+	if uriText == "" {
+		return config
+	}
+	parsed, err := url.Parse(uriText)
+	if err != nil {
+		return config
+	}
+	scheme := strings.ToLower(strings.TrimSpace(parsed.Scheme))
+	if scheme != "http" && scheme != "https" {
+		return config
+	}
+
+	if parsed.User != nil {
+		if strings.TrimSpace(config.User) == "" {
+			config.User = parsed.User.Username()
+		}
+		if pass, ok := parsed.User.Password(); ok && config.Password == "" {
+			config.Password = pass
+		}
+	}
+
+	if scheme == "https" {
+		config.UseSSL = true
+		if strings.TrimSpace(config.SSLMode) == "" {
+			config.SSLMode = "required"
+		}
+	}
+
+	if host := strings.TrimSpace(parsed.Host); host != "" {
+		if strings.TrimSpace(config.Host) == "" || config.Host == "localhost" {
+			h, port, ok := parseHostPortWithDefault(host, defaultEsPort)
+			if ok {
+				config.Host = h
+				config.Port = port
+			}
+		}
+	}
+
+	// 从 URI path 中解析默认索引（如 http://host:9200/my-index）
+	if dbName := strings.TrimPrefix(strings.TrimSpace(parsed.Path), "/"); dbName != "" && strings.TrimSpace(config.Database) == "" {
+		config.Database = dbName
+	}
+
+	return config
+}
+
+// ---- 通用判断工具 ----
+
+// isJSONDSL 判断输入是否为 JSON DSL 格式。
+func isJSONDSL(query string) bool {
+	return strings.HasPrefix(strings.TrimSpace(query), "{")
+}
+
+// isESMetadataQuery 检测是否为关系型数据库元数据查询（information_schema / pg_catalog）。
+// 前端为视图、函数、触发器等功能自动生成这些 SQL，ES 不支持，应返回空结果。
+func isESMetadataQuery(query string) bool {
+	lower := strings.ToLower(query)
+	return strings.Contains(lower, "information_schema") ||
+		strings.Contains(lower, "pg_catalog") ||
+		strings.Contains(lower, "pg_class") ||
+		strings.Contains(lower, "pg_namespace")
+}
+
+// esConsoleRequest 解析 Kibana DevTools 风格查询。
+type esConsoleRequest struct {
+	Method string // GET / POST
+	Path   string // /index/_search
+	Body   string // JSON body（可选）
+}
+
+// parseESConsoleRequest 尝试解析 DevTools 风格输入。
+// 支持格式：
+//
+//	GET /logs-*/_search
+//	{ "query": { "match_all": {} } }
+//
+// 返回 (request, true) 表示成功解析。
+func parseESConsoleRequest(input string) (esConsoleRequest, bool) {
+	lines := strings.SplitN(input, "\n", 2)
+	firstLine := strings.TrimSpace(lines[0])
+	if firstLine == "" {
+		return esConsoleRequest{}, false
+	}
+
+	// 第一行格式：METHOD /path
+	parts := strings.SplitN(firstLine, " ", 2)
+	if len(parts) != 2 {
+		return esConsoleRequest{}, false
+	}
+
+	method := strings.ToUpper(strings.TrimSpace(parts[0]))
+	if method != "GET" && method != "POST" {
+		return esConsoleRequest{}, false
+	}
+
+	path := strings.TrimSpace(parts[1])
+	if !strings.HasPrefix(path, "/") {
+		return esConsoleRequest{}, false
+	}
+
+	req := esConsoleRequest{Method: method, Path: path}
+
+	// 空行之后是 JSON body（可选）
+	if len(lines) > 1 {
+		body := strings.TrimSpace(lines[1])
+		if body != "" {
+			req.Body = body
+		}
+	}
+
+	return req, true
+}
+
+// resolveEsIndexName 从 dbName / tableName / 默认值中确定索引名。
+func resolveEsIndexName(dbName, tableName, defaultDB string) string {
+	if name := strings.TrimSpace(tableName); name != "" {
+		return name
+	}
+	if name := strings.TrimSpace(dbName); name != "" {
+		return name
+	}
+	return strings.TrimSpace(defaultDB)
+}
+
+// reESSQLFrom 匹配 SELECT ... FROM "schema"."table" 或 FROM index（含多段点分标识符）。
+// 支持三种格式：
+//   - "a"."b"."c"  → a.b.c（引号包裹的多段标识符）
+//   - "a.b.c"      → a.b.c（单引号包裹的完整名称）
+//   - my_index      → my_index（无引号）
+var reESSQLFrom = regexp.MustCompile(`(?i)\bFROM\s+(?:"([^"]+)"(?:\."([^"]+)")*|([a-zA-Z0-9_*][a-zA-Z0-9_.\-*]*))\s`)
+
+// extractESSQLFromTable 从 SQL 语句中提取 FROM 后的索引名。
+// 支持多段引号格式（如 "schema"."table"."partition"）和单段格式。
+// 返回提取的索引名（可能含 . 或 *），提取失败返回空串。
+func extractESSQLFromTable(sql string) string {
+	// 补尾部空格以确保正则匹配末尾无空格的输入
+	matches := reESSQLFrom.FindStringSubmatch(sql + " ")
+	if len(matches) < 2 {
+		return ""
+	}
+
+	// matches[1] = 第一段引号内容, matches[2] = 最后一段引号内容（可能多次匹配只保留最后），
+	// matches[3] = 无引号标识符
+	if matches[3] != "" {
+		return strings.TrimSpace(matches[3])
+	}
+
+	// 多段引号：从原匹配中提取所有引号段并用 . 拼接
+	fullMatch := matches[0]
+	fromIdx := strings.Index(strings.ToUpper(fullMatch), "FROM")
+	if fromIdx < 0 {
+		return ""
+	}
+	rest := fullMatch[fromIdx+4:]
+	rest = strings.TrimSpace(rest)
+
+	var parts []string
+	for _, seg := range strings.Split(rest, ".") {
+		s := strings.TrimSpace(seg)
+		s = strings.Trim(s, `"`)
+		if s != "" {
+			parts = append(parts, s)
+		}
+	}
+	if len(parts) == 0 {
+		return ""
+	}
+	return strings.Join(parts, ".")
+}
+
+// ---- SQL → ES _search 转换层 ----
+
+// esParsedSQL 解析后的 SQL 各组成部分。
+type esParsedSQL struct {
+	Table   string // FROM 后的索引名
+	Columns string // SELECT 列（* 或具体列名）
+	Where   string // WHERE 条件原文
+	OrderBy string // ORDER BY 子句
+	Limit   int    // LIMIT 值，0 表示未指定
+	Offset  int    // OFFSET 值，0 表示未指定
+}
+
+// reSQLLimit 匹配 LIMIT n（可选 OFFSET m）。
+var reSQLLimit = regexp.MustCompile(`(?i)\bLIMIT\s+(\d+)(?:\s+OFFSET\s+(\d+))?`)
+
+// reSQLOffset 匹配独立的 OFFSET n。
+var reSQLOffset = regexp.MustCompile(`(?i)\bOFFSET\s+(\d+)`)
+
+// reSQLOrderBy 匹配 ORDER BY 子句。
+var reSQLOrderBy = regexp.MustCompile(`(?i)\bORDER\s+BY\s+(.+?)(?:\bLIMIT\b|\bOFFSET\b|$)`)
+
+// parseESSQL 解析简单 SELECT SQL 为结构化组成部分。
+func parseESSQL(sql string) (esParsedSQL, bool) {
+	upper := strings.ToUpper(strings.TrimSpace(sql))
+	if !strings.HasPrefix(upper, "SELECT") {
+		return esParsedSQL{}, false
+	}
+
+	parsed := esParsedSQL{}
+
+	// 提取表名
+	parsed.Table = extractESSQLFromTable(sql)
+	if parsed.Table == "" {
+		return esParsedSQL{}, false
+	}
+
+	// 提取 SELECT 列列表
+	selectEnd := strings.Index(upper, " FROM ")
+	if selectEnd > 6 {
+		parsed.Columns = strings.TrimSpace(sql[6:selectEnd])
+	} else {
+		parsed.Columns = "*"
+	}
+
+	// 提取 WHERE 子句
+	whereMatch := regexp.MustCompile(`(?i)\bWHERE\s+(.+?)(?:\bORDER\b|\bLIMIT\b|\bOFFSET\b|$)`).FindStringSubmatch(sql)
+	if len(whereMatch) >= 2 {
+		parsed.Where = strings.TrimSpace(whereMatch[1])
+	}
+
+	// 提取 ORDER BY
+	orderMatch := reSQLOrderBy.FindStringSubmatch(sql)
+	if len(orderMatch) >= 2 {
+		parsed.OrderBy = strings.TrimSpace(orderMatch[1])
+	}
+
+	// 提取 LIMIT
+	limitMatch := reSQLLimit.FindStringSubmatch(sql)
+	if len(limitMatch) >= 2 {
+		if n, err := strconv.Atoi(limitMatch[1]); err == nil {
+			parsed.Limit = n
+		}
+		if len(limitMatch) >= 3 && limitMatch[2] != "" {
+			if n, err := strconv.Atoi(limitMatch[2]); err == nil {
+				parsed.Offset = n
+			}
+		}
+	}
+
+	// 独立 OFFSET（未被 LIMIT 正则捕获时）
+	if parsed.Offset == 0 {
+		offsetMatch := reSQLOffset.FindStringSubmatch(sql)
+		if len(offsetMatch) >= 2 {
+			if n, err := strconv.Atoi(offsetMatch[1]); err == nil {
+				parsed.Offset = n
+			}
+		}
+	}
+
+	return parsed, true
+}
+
+// convertSQLWhereToESQuery 将简单 SQL WHERE 条件转换为 ES query DSL map。
+// 支持的运算符：=, !=, <>, >, <, >=, <=, LIKE, IS NULL, IS NOT NULL。
+// 支持 AND / OR 组合和括号分组。
+// 对于无法转换的复杂条件，返回 match_all。
+func convertSQLWhereToESQuery(where string) map[string]interface{} {
+	where = strings.TrimSpace(where)
+	if where == "" {
+		return nil
+	}
+
+	// 去掉最外层括号
+	for len(where) >= 2 && where[0] == '(' && where[len(where)-1] == ')' {
+		inner := where[1 : len(where)-1]
+		if balancedParens(inner) {
+			where = inner
+		} else {
+			break
+		}
+	}
+	where = strings.TrimSpace(where)
+	if where == "" {
+		return nil
+	}
+
+	// 尝试拆分顶层 AND
+	if parts := splitTopLevel(where, "AND"); len(parts) > 1 {
+		var clauses []map[string]interface{}
+		for _, p := range parts {
+			if q := convertSQLWhereToESQuery(p); q != nil {
+				clauses = append(clauses, q)
+			}
+		}
+		if len(clauses) == 1 {
+			return clauses[0]
+		}
+		if len(clauses) > 1 {
+			return map[string]interface{}{"bool": map[string]interface{}{"must": clauses}}
+		}
+		return nil
+	}
+
+	// 尝试拆分顶层 OR
+	if parts := splitTopLevel(where, "OR"); len(parts) > 1 {
+		var clauses []map[string]interface{}
+		for _, p := range parts {
+			if q := convertSQLWhereToESQuery(p); q != nil {
+				clauses = append(clauses, q)
+			}
+		}
+		if len(clauses) == 1 {
+			return clauses[0]
+		}
+		if len(clauses) > 1 {
+			return map[string]interface{}{"bool": map[string]interface{}{"should": clauses}}
+		}
+		return nil
+	}
+
+	// 解析单个条件：field op value
+	return parseSingleCondition(where)
+}
+
+// parseSingleCondition 解析单个 SQL 条件为 ES query。
+func parseSingleCondition(cond string) map[string]interface{} {
+	cond = strings.TrimSpace(cond)
+	cond = strings.Trim(cond, "()")
+	cond = strings.TrimSpace(cond)
+	if cond == "" {
+		return nil
+	}
+
+	// IS NOT NULL
+	if re := regexp.MustCompile(`(?i)^"?(.+?)"?\s+IS\s+NOT\s+NULL$`); re.MatchString(cond) {
+		m := re.FindStringSubmatch(cond)
+		return map[string]interface{}{
+			"exists": map[string]interface{}{"field": cleanIdentifier(m[1])},
+		}
+	}
+
+	// IS NULL
+	if re := regexp.MustCompile(`(?i)^"?(.+?)"?\s+IS\s+NULL$`); re.MatchString(cond) {
+		m := re.FindStringSubmatch(cond)
+		return map[string]interface{}{
+			"bool": map[string]interface{}{
+				"must_not": []map[string]interface{}{
+					{"exists": map[string]interface{}{"field": cleanIdentifier(m[1])}},
+				},
+			},
+		}
+	}
+
+	// NOT LIKE
+	if re := regexp.MustCompile(`(?i)^"?(.+?)"?\s+NOT\s+LIKE\s+'(.+)'$`); re.MatchString(cond) {
+		m := re.FindStringSubmatch(cond)
+		pattern := strings.ReplaceAll(m[2], "%", "*")
+		pattern = strings.ReplaceAll(pattern, "_", "?")
+		return map[string]interface{}{
+			"bool": map[string]interface{}{
+				"must_not": []map[string]interface{}{
+					{"wildcard": map[string]interface{}{cleanIdentifier(m[1]): pattern}},
+				},
+			},
+		}
+	}
+
+	// LIKE
+	if re := regexp.MustCompile(`(?i)^"?(.+?)"?\s+LIKE\s+'(.+)'$`); re.MatchString(cond) {
+		m := re.FindStringSubmatch(cond)
+		pattern := strings.ReplaceAll(m[2], "%", "*")
+		pattern = strings.ReplaceAll(pattern, "_", "?")
+		return map[string]interface{}{
+			"wildcard": map[string]interface{}{cleanIdentifier(m[1]): pattern},
+		}
+	}
+
+	// != 或 <>
+	if idx := findOperator(cond, "!=", "<>"); idx >= 0 {
+		field, value := splitAtOperator(cond, idx, 2)
+		if field != "" {
+			return map[string]interface{}{
+				"bool": map[string]interface{}{
+					"must_not": []map[string]interface{}{
+						{"term": map[string]interface{}{cleanIdentifier(field): parseSQLValue(value)}},
+					},
+				},
+			}
+		}
+	}
+
+	// >=
+	if idx := findOperator(cond, ">="); idx >= 0 {
+		field, value := splitAtOperator(cond, idx, 2)
+		if field != "" {
+			return map[string]interface{}{
+				"range": map[string]interface{}{cleanIdentifier(field): map[string]interface{}{"gte": parseSQLValue(value)}},
+			}
+		}
+	}
+
+	// <=
+	if idx := findOperator(cond, "<="); idx >= 0 {
+		field, value := splitAtOperator(cond, idx, 2)
+		if field != "" {
+			return map[string]interface{}{
+				"range": map[string]interface{}{cleanIdentifier(field): map[string]interface{}{"lte": parseSQLValue(value)}},
+			}
+		}
+	}
+
+	// >
+	if idx := findOperator(cond, ">"); idx >= 0 {
+		field, value := splitAtOperator(cond, idx, 1)
+		if field != "" {
+			return map[string]interface{}{
+				"range": map[string]interface{}{cleanIdentifier(field): map[string]interface{}{"gt": parseSQLValue(value)}},
+			}
+		}
+	}
+
+	// <
+	if idx := findOperator(cond, "<"); idx >= 0 {
+		field, value := splitAtOperator(cond, idx, 1)
+		if field != "" {
+			return map[string]interface{}{
+				"range": map[string]interface{}{cleanIdentifier(field): map[string]interface{}{"lt": parseSQLValue(value)}},
+			}
+		}
+	}
+
+	// =（放在最后，避免匹配 >= <= !=）
+	if idx := findOperator(cond, "="); idx >= 0 {
+		field, value := splitAtOperator(cond, idx, 1)
+		if field != "" {
+			return map[string]interface{}{
+				"term": map[string]interface{}{cleanIdentifier(field): parseSQLValue(value)},
+			}
+		}
+	}
+
+	// 无法识别的条件，降级为 query_string
+	return map[string]interface{}{
+		"query_string": map[string]interface{}{"query": cond},
+	}
+}
+
+// cleanIdentifier 去掉标识符两端的引号。
+func cleanIdentifier(s string) string {
+	s = strings.TrimSpace(s)
+	s = strings.Trim(s, `"'`)
+	return s
+}
+
+// parseSQLValue 将 SQL 字面量转为 Go 值。
+func parseSQLValue(s string) interface{} {
+	s = strings.TrimSpace(s)
+	s = strings.Trim(s, `"'`)
+	// 尝试数值转换
+	if n, err := strconv.ParseFloat(s, 64); err == nil {
+		return n
+	}
+	if s == "true" || s == "TRUE" {
+		return true
+	}
+	if s == "false" || s == "FALSE" {
+		return false
+	}
+	return s
+}
+
+// findOperator 在条件字符串中查找顶层运算符位置。
+func findOperator(cond string, ops ...string) int {
+	inQuote := byte(0)
+	depth := 0
+	for i := 0; i < len(cond); i++ {
+		ch := cond[i]
+		if ch == '\'' || ch == '"' {
+			if inQuote == 0 {
+				inQuote = ch
+			} else if inQuote == ch {
+				inQuote = 0
+			}
+			continue
+		}
+		if inQuote != 0 {
+			continue
+		}
+		if ch == '(' {
+			depth++
+			continue
+		}
+		if ch == ')' {
+			depth--
+			continue
+		}
+		if depth != 0 {
+			continue
+		}
+		for _, op := range ops {
+			if i+len(op) <= len(cond) && cond[i:i+len(op)] == op {
+				// 确保不是 >= <= <> 的一部分
+				if op == ">" && i+1 < len(cond) && (cond[i+1] == '=' || cond[i+1] == '>') {
+					continue
+				}
+				if op == "<" && i+1 < len(cond) && (cond[i+1] == '=' || cond[i+1] == '>') {
+					continue
+				}
+				if op == "!" && i+1 < len(cond) && cond[i+1] != '=' {
+					continue
+				}
+				return i
+			}
+		}
+	}
+	return -1
+}
+
+// splitAtOperator 在运算符位置拆分 field 和 value。
+func splitAtOperator(cond string, idx, opLen int) (string, string) {
+	field := strings.TrimSpace(cond[:idx])
+	value := strings.TrimSpace(cond[idx+opLen:])
+	return field, value
+}
+
+// splitTopLevel 在顶层按关键词拆分（忽略括号和引号内的关键词）。
+func splitTopLevel(s string, keyword string) []string {
+	upper := strings.ToUpper(s)
+	kwLen := len(keyword)
+	inQuote := byte(0)
+	depth := 0
+	var parts []string
+	last := 0
+
+	for i := 0; i < len(s); i++ {
+		ch := s[i]
+		if ch == '\'' || ch == '"' {
+			if inQuote == 0 {
+				inQuote = ch
+			} else if inQuote == ch {
+				inQuote = 0
+			}
+			continue
+		}
+		if inQuote != 0 {
+			continue
+		}
+		if ch == '(' {
+			depth++
+			continue
+		}
+		if ch == ')' {
+			depth--
+			continue
+		}
+		if depth != 0 {
+			continue
+		}
+		if i+kwLen <= len(upper) && upper[i:i+kwLen] == keyword {
+			// 确保是完整单词（前后是空格或括号）
+			beforeOK := i == 0 || s[i-1] == ' ' || s[i-1] == '(' || s[i-1] == ')'
+			afterIdx := i + kwLen
+			afterOK := afterIdx >= len(s) || s[afterIdx] == ' ' || s[afterIdx] == '(' || s[afterIdx] == ')'
+			if beforeOK && afterOK {
+				parts = append(parts, strings.TrimSpace(s[last:i]))
+				last = afterIdx
+			}
+		}
+	}
+	parts = append(parts, strings.TrimSpace(s[last:]))
+	return parts
+}
+
+// balancedParens 检查字符串中的括号是否完全配对。
+func balancedParens(s string) bool {
+	depth := 0
+	inQuote := byte(0)
+	for i := 0; i < len(s); i++ {
+		ch := s[i]
+		if ch == '\'' || ch == '"' {
+			if inQuote == 0 {
+				inQuote = ch
+			} else if inQuote == ch {
+				inQuote = 0
+			}
+			continue
+		}
+		if inQuote != 0 {
+			continue
+		}
+		if ch == '(' {
+			depth++
+		} else if ch == ')' {
+			depth--
+			if depth < 0 {
+				return false
+			}
+		}
+	}
+	return depth == 0
+}
+
+// convertSQLOrderByToES 将 SQL ORDER BY 转换为 ES sort 数组。
+// 支持 "field" ASC/DESC 和 _score DESC。
+func convertSQLOrderByToES(orderBy string) []map[string]interface{} {
+	orderBy = strings.TrimSpace(orderBy)
+	if orderBy == "" {
+		return nil
+	}
+	var sorts []map[string]interface{}
+	for _, part := range strings.Split(orderBy, ",") {
+		part = strings.TrimSpace(part)
+		if part == "" {
+			continue
+		}
+		fields := strings.Fields(part)
+		field := cleanIdentifier(fields[0])
+		order := "asc"
+		if len(fields) >= 2 {
+			dir := strings.ToUpper(fields[1])
+			if dir == "DESC" {
+				order = "desc"
+			}
+		}
+		sorts = append(sorts, map[string]interface{}{field: order})
+	}
+	return sorts
+}
+
+// esProductCheckBypassTransport 包装 http.RoundTripper，
+// 为 ES 6.x / 7.x 早期版本注入 X-Elastic-Product 响应头。
+// go-elasticsearch/v8 在首次成功响应时强制校验此头部，
+// 但 ES < 7.14 不返回该头，导致 "unknown product" 错误。
+type esProductCheckBypassTransport struct {
+	inner http.RoundTripper
+}
+
+func (t *esProductCheckBypassTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	resp, err := t.inner.RoundTrip(req)
+	if err != nil {
+		return resp, err
+	}
+	// 仅在缺失时注入，避免覆盖 ES 7.14+ 已有的合法头部
+	if resp.Header.Get("X-Elastic-Product") == "" {
+		resp.Header.Set("X-Elastic-Product", "Elasticsearch")
+	}
+	return resp, nil
+}
+
+// ---- ES 客户端配置 ----
+
+// esSSLAttemptLabel 返回连接尝试的模式标签。
+func esSSLAttemptLabel(config connection.ConnectionConfig, fallback bool) string {
+	if fallback {
+		return "明文回退"
+	}
+	if config.UseSSL {
+		return "SSL"
+	}
+	return "明文"
+}
+
+// buildESClientConfig 从连接配置构建 ES 客户端配置。
+func buildESClientConfig(config connection.ConnectionConfig) elasticsearch.Config {
+	scheme := "http"
+	if config.UseSSL {
+		scheme = "https"
+	}
+
+	address := fmt.Sprintf("%s://%s:%d", scheme, config.Host, config.Port)
+
+	cfg := elasticsearch.Config{
+		Addresses:  []string{address},
+		Username:   strings.TrimSpace(config.User),
+		Password:   config.Password,
+		MaxRetries: 1,
+	}
+
+	// 从 ConnectionParams 中提取 API Key（优先级高于 Basic Auth）
+	if params := connectionParamsFromText(config.ConnectionParams); len(params) > 0 {
+		apiKey := strings.TrimSpace(params.Get("apiKey"))
+		if apiKey != "" {
+			cfg.APIKey = apiKey
+			// API Key 认证时清除 Basic Auth
+			cfg.Username = ""
+			cfg.Password = ""
+		}
+		// 移除认证参数，不拼入 address URL
+		params.Del("apiKey")
+		// 重新构建 address（不含认证参数）
+		if len(params) > 0 {
+			address = fmt.Sprintf("%s://%s:%d?%s", scheme, config.Host, config.Port, params.Encode())
+		} else {
+			address = fmt.Sprintf("%s://%s:%d", scheme, config.Host, config.Port)
+		}
+		cfg.Addresses = []string{address}
+	}
+
+	// TLS 配置
+	tlsConfig, _ := resolveGenericTLSConfig(config)
+	if tlsConfig != nil {
+		cfg.Transport = &http.Transport{
+			TLSClientConfig: tlsConfig,
+		}
+	}
+
+	// 代理支持
+	if config.UseProxy {
+		transport, ok := cfg.Transport.(*http.Transport)
+		if !ok {
+			transport = http.DefaultTransport.(*http.Transport).Clone()
+		}
+		proxyCfg := config.Proxy
+		transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+			return proxytunnel.DialContext(ctx, proxyCfg, network, addr)
+		}
+		cfg.Transport = transport
+	}
+
+	// 超时设置
+	timeout := getConnectTimeout(config)
+	if cfg.Transport == nil {
+		cfg.Transport = http.DefaultTransport.(*http.Transport).Clone()
+	}
+	if transport, ok := cfg.Transport.(*http.Transport); ok {
+		transport.ResponseHeaderTimeout = timeout
+	}
+
+	// 包装 transport：注入 X-Elastic-Product 头以兼容 ES 6.x / 7.x 早期版本。
+	// go-elasticsearch/v8 要求响应中包含此头部，但 ES < 7.14 不返回。
+	if cfg.Transport == nil {
+		cfg.Transport = http.DefaultTransport.(*http.Transport).Clone()
+	}
+	cfg.Transport = &esProductCheckBypassTransport{inner: cfg.Transport}
+
+	return cfg
+}
+
+// ---- 查询响应解析 ----
+
+// esReservedColumns ES 查询结果中的保留列名，业务字段不应覆盖。
+var esReservedColumns = map[string]struct{}{
+	"_index":        {},
+	"_id":           {},
+	"_score":        {},
+	"_source":       {},
+	"_aggregations": {},
+}
+
+// setESSourceField 安全地将 _source 字段写入结果行。
+// 如果字段名与保留列冲突，则加 "source." 前缀避免覆盖。
+func setESSourceField(row map[string]interface{}, key string, value interface{}) {
+	if _, reserved := esReservedColumns[key]; reserved {
+		row["source."+key] = value
+		return
+	}
+	if _, exists := row[key]; exists {
+		row["source."+key] = value
+		return
+	}
+	row[key] = value
+}
+
+// flattenESSource 递归展开 _source 中的嵌套对象。
+// 嵌套字段用点分路径表示（如 user.name），数组序列化为 JSON 字符串。
+func flattenESSource(prefix string, value interface{}, row map[string]interface{}) {
+	switch v := value.(type) {
+	case map[string]interface{}:
+		for k, child := range v {
+			next := k
+			if prefix != "" {
+				next = prefix + "." + k
+			}
+			flattenESSource(next, child, row)
+		}
+	case []interface{}:
+		b, _ := json.Marshal(v)
+		setESSourceField(row, prefix, string(b))
+	default:
+		setESSourceField(row, prefix, v)
+	}
+}
+
+// normalizeESFieldValue 将 ES fields 数组值转为单值或 JSON 字符串。
+func normalizeESFieldValue(value interface{}) interface{} {
+	arr, ok := value.([]interface{})
+	if !ok {
+		return value
+	}
+	if len(arr) == 1 {
+		return arr[0]
+	}
+	b, err := json.Marshal(arr)
+	if err != nil {
+		return fmt.Sprint(arr)
+	}
+	return string(b)
+}
+
+// esQueryWithDSL 使用 JSON DSL 执行 _search 查询。
+func (e *ElasticsearchDB) esQueryWithDSL(ctx context.Context, dsl string) ([]map[string]interface{}, []string, error) {
+	indexName := e.database
+	if indexName == "" {
+		indexName = "*"
+	}
+
+	// 尝试从 DSL 的 index 字段中提取索引名
+	var dslIndex struct {
+		Index string `json:"index"`
+	}
+	if err := json.Unmarshal([]byte(dsl), &dslIndex); err == nil && strings.TrimSpace(dslIndex.Index) != "" {
+		indexName = strings.TrimSpace(dslIndex.Index)
+	}
+
+	res, err := e.client.Search(
+		e.client.Search.WithContext(ctx),
+		e.client.Search.WithIndex(indexName),
+		e.client.Search.WithBody(strings.NewReader(dsl)),
+	)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Elasticsearch DSL 查询失败：%w", err)
+	}
+	defer res.Body.Close()
+
+	return e.parseSearchResponse(res)
+}
+
+// esQueryWithString 解析 SQL 并转换为 ES _search API 调用。
+// 从 SQL 中提取表名、WHERE 条件、LIMIT/OFFSET、ORDER BY，
+// 转换为 ES query DSL 实现正确分页和筛选。
+func (e *ElasticsearchDB) esQueryWithString(ctx context.Context, queryStr string) ([]map[string]interface{}, []string, error) {
+	parsed, ok := parseESSQL(queryStr)
+	if !ok {
+		return e.esQueryStringFallback(ctx, queryStr)
+	}
+
+	// 检测 COUNT(*) 查询：使用 size=0 获取精确总数
+	if isESCountQuery(parsed.Columns) {
+		return e.esCountQuery(ctx, parsed.Table, parsed.Where)
+	}
+
+	// 构建 ES DSL
+	dsl := make(map[string]interface{})
+
+	// WHERE → query
+	if parsed.Where != "" {
+		if q := convertSQLWhereToESQuery(parsed.Where); q != nil {
+			dsl["query"] = q
+		}
+	}
+	if _, hasQuery := dsl["query"]; !hasQuery {
+		dsl["query"] = map[string]interface{}{"match_all": map[string]interface{}{}}
+	}
+
+	// LIMIT → size, OFFSET → from
+	if parsed.Limit > 0 {
+		dsl["size"] = parsed.Limit
+	} else {
+		dsl["size"] = 200 // 默认返回 200 条
+	}
+	if parsed.Offset > 0 {
+		dsl["from"] = parsed.Offset
+	}
+
+	// ORDER BY → sort
+	if sorts := convertSQLOrderByToES(parsed.OrderBy); len(sorts) > 0 {
+		dsl["sort"] = sorts
+	}
+
+	body, err := json.Marshal(dsl)
+	if err != nil {
+		return nil, nil, fmt.Errorf("构造 ES 查询失败：%w", err)
+	}
+
+	res, err := e.client.Search(
+		e.client.Search.WithContext(ctx),
+		e.client.Search.WithIndex(parsed.Table),
+		e.client.Search.WithBody(bytes.NewReader(body)),
+	)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Elasticsearch 查询失败：%w", err)
+	}
+	defer res.Body.Close()
+
+	return e.parseSearchResponse(res)
+}
+
+// isESCountQuery 检测 SQL 列列表是否为 COUNT(*) 聚合查询。
+func isESCountQuery(columns string) bool {
+	upper := strings.ToUpper(strings.TrimSpace(columns))
+	return strings.Contains(upper, "COUNT(")
+}
+
+// esCountQuery 使用 ES _search size=0 获取精确文档总数。
+// 返回格式匹配前端 parseTotalFromCountRow 期望的 [{total: N}], ["total"]。
+func (e *ElasticsearchDB) esCountQuery(ctx context.Context, indexName string, where string) ([]map[string]interface{}, []string, error) {
+	dsl := map[string]interface{}{
+		"size": 0,
+	}
+	if where != "" {
+		if q := convertSQLWhereToESQuery(where); q != nil {
+			dsl["query"] = q
+		}
+	}
+	if _, ok := dsl["query"]; !ok {
+		dsl["query"] = map[string]interface{}{"match_all": map[string]interface{}{}}
+	}
+
+	body, err := json.Marshal(dsl)
+	if err != nil {
+		return nil, nil, fmt.Errorf("构造 ES COUNT 查询失败：%w", err)
+	}
+
+	res, err := e.client.Search(
+		e.client.Search.WithContext(ctx),
+		e.client.Search.WithIndex(indexName),
+		e.client.Search.WithBody(bytes.NewReader(body)),
+	)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Elasticsearch COUNT 查询失败：%w", err)
+	}
+	defer res.Body.Close()
+
+	if res.IsError() {
+		respBody, _ := io.ReadAll(res.Body)
+		return nil, nil, fmt.Errorf("Elasticsearch COUNT 查询错误：%s", string(respBody))
+	}
+
+	respBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, nil, fmt.Errorf("读取 COUNT 响应失败：%w", err)
+	}
+
+	var parsed map[string]interface{}
+	if err := json.Unmarshal(respBody, &parsed); err != nil {
+		return nil, nil, fmt.Errorf("解析 COUNT 响应失败：%w", err)
+	}
+
+	// 提取 hits.total：ES 6.x 为数字，ES 7.x+ 为 {value, relation} 对象
+	var total int64
+	if hits, ok := parsed["hits"].(map[string]interface{}); ok {
+		switch v := hits["total"].(type) {
+		case float64:
+			total = int64(v)
+		case int64:
+			total = v
+		case map[string]interface{}:
+			if val, ok := v["value"].(float64); ok {
+				total = int64(val)
+			}
+		}
+	}
+
+	logger.Infof("ES COUNT 查询结果：索引=%s total=%d", indexName, total)
+	return []map[string]interface{}{{"total": total}}, []string{"total"}, nil
+}
+func (e *ElasticsearchDB) esQueryStringFallback(ctx context.Context, queryStr string) ([]map[string]interface{}, []string, error) {
+	indexName := e.database
+	if indexName == "" {
+		indexName = "*"
+	}
+
+	payload := map[string]interface{}{
+		"query": map[string]interface{}{
+			"query_string": map[string]interface{}{
+				"query": queryStr,
+			},
+		},
+		"size": 200,
+	}
+	body, err := json.Marshal(payload)
+	if err != nil {
+		return nil, nil, fmt.Errorf("构造查询 DSL 失败：%w", err)
+	}
+
+	res, err := e.client.Search(
+		e.client.Search.WithContext(ctx),
+		e.client.Search.WithIndex(indexName),
+		e.client.Search.WithBody(bytes.NewReader(body)),
+	)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Elasticsearch 查询失败：%w", err)
+	}
+	defer res.Body.Close()
+
+	return e.parseSearchResponse(res)
+}
+
+// parseSearchResponse 解析 ES 响应为标准行格式。
+// 使用原始 JSON 解析，兼容 ES 6.x（hits.total 为数字）和 ES 7.x+（hits.total 为对象）。
+func (e *ElasticsearchDB) parseSearchResponse(res *esapi.Response) ([]map[string]interface{}, []string, error) {
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, nil, fmt.Errorf("读取查询结果失败：%w", err)
+	}
+
+	if res.IsError() {
+		return nil, nil, fmt.Errorf("Elasticsearch 查询错误：%s", string(body))
+	}
+
+	return parseSearchResponseJSON(body)
+}
+
+// parseSearchResponseJSON 从原始 JSON 字节解析 ES _search 响应。
+// 兼容 ES 6.x 和 7.x+ 的 hits.total 格式差异。
+func parseSearchResponseJSON(body []byte) ([]map[string]interface{}, []string, error) {
+	var fullResp map[string]interface{}
+	if err := json.Unmarshal(body, &fullResp); err != nil {
+		return nil, nil, fmt.Errorf("解析查询结果失败：%w", err)
+	}
+
+	columnSet := make(map[string]bool)
+	var data []map[string]interface{}
+
+	// 解析 hits
+	if hits, ok := fullResp["hits"].(map[string]interface{}); ok {
+		if hitsList, ok := hits["hits"].([]interface{}); ok {
+			data = make([]map[string]interface{}, 0, len(hitsList))
+			for _, h := range hitsList {
+				hit, ok := h.(map[string]interface{})
+				if !ok {
+					continue
+				}
+				row := make(map[string]interface{})
+				row["_index"] = hit["_index"]
+				row["_id"] = hit["_id"]
+				if score, ok := hit["_score"]; ok && score != nil {
+					row["_score"] = score
+				}
+
+				// 展开 _source
+				if source, ok := hit["_source"].(map[string]interface{}); ok {
+					flattenESSource("", source, row)
+					sourceJSON, _ := json.Marshal(source)
+					row["_source"] = string(sourceJSON)
+				}
+
+				// 合并 fields（ES 7.x+ 的 runtime fields / stored fields）
+				if fields, ok := hit["fields"].(map[string]interface{}); ok {
+					for key, value := range fields {
+						setESSourceField(row, key, normalizeESFieldValue(value))
+					}
+				}
+
+				for k := range row {
+					columnSet[k] = true
+				}
+				data = append(data, row)
+			}
+		}
+	}
+
+	// 解析 aggregations
+	if aggs, ok := fullResp["aggregations"].(map[string]interface{}); ok && len(aggs) > 0 {
+		aggJSON, _ := json.MarshalIndent(aggs, "", "  ")
+		if len(data) == 0 {
+			// hits 为空但有 aggregation 结果
+			data = append(data, map[string]interface{}{
+				"_aggregations": string(aggJSON),
+			})
+		} else {
+			// hits 有数据时，只在第一行附加 aggregation（避免每行重复）
+			data[0]["_aggregations"] = string(aggJSON)
+		}
+		columnSet["_aggregations"] = true
+	}
+
+	if data == nil {
+		data = make([]map[string]interface{}, 0)
+	}
+
+	// 收集并排序列名
+	columns := make([]string, 0, len(columnSet))
+	for k := range columnSet {
+		columns = append(columns, k)
+	}
+	sort.Strings(columns)
+
+	// 将元字段置首，与 ES 文档元数据惯例一致
+	metaFields := []string{"_index", "_id", "_score", "_aggregations"}
+	for _, meta := range metaFields {
+		for i, col := range columns {
+			if col == meta && i > 0 {
+				columns = append(columns[:i], columns[i+1:]...)
+				columns = append([]string{meta}, columns...)
+				break
+			}
+		}
+	}
+
+	return data, columns, nil
+}
+
+// ---- 元数据获取辅助 ----
+
+// esFetchIndexAliases 获取指定索引关联的所有别名。
+func (e *ElasticsearchDB) esFetchIndexAliases(indexName string) []string {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	res, err := e.client.Indices.GetAlias(
+		e.client.Indices.GetAlias.WithContext(ctx),
+		e.client.Indices.GetAlias.WithIndex(indexName),
+	)
+	if err != nil {
+		logger.Warnf("Elasticsearch 获取索引别名失败：%v", err)
+		return nil
+	}
+	defer res.Body.Close()
+
+	if res.IsError() {
+		logger.Warnf("Elasticsearch 获取索引别名失败：%s", res.Status())
+		return nil
+	}
+
+	// 响应格式：{ "index_name": { "aliases": { "alias_name": {} } } }
+	var aliasMap map[string]interface{}
+	if err := json.NewDecoder(res.Body).Decode(&aliasMap); err != nil {
+		logger.Warnf("Elasticsearch 解析索引别名失败：%v", err)
+		return nil
+	}
+
+	var result []string
+	for _, indexData := range aliasMap {
+		data, ok := indexData.(map[string]interface{})
+		if !ok {
+			continue
+		}
+		aliases, ok := data["aliases"].(map[string]interface{})
+		if !ok {
+			continue
+		}
+		for aliasName := range aliases {
+			if name := strings.TrimSpace(aliasName); name != "" {
+				result = append(result, name)
+			}
+		}
+	}
+	return result
+}
+
+// esFetchIndexMapping 获取索引的 mapping 定义。
+func (e *ElasticsearchDB) esFetchIndexMapping(indexName string) (map[string]interface{}, error) {
+	if e.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	res, err := e.client.Indices.GetMapping(
+		e.client.Indices.GetMapping.WithContext(ctx),
+		e.client.Indices.GetMapping.WithIndex(indexName),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("获取索引 mapping 失败：%w", err)
+	}
+	defer res.Body.Close()
+
+	if res.IsError() {
+		return nil, fmt.Errorf("获取索引 mapping 失败：%s", res.Status())
+	}
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, fmt.Errorf("读取 mapping 响应失败：%w", err)
+	}
+
+	var mappingResult map[string]interface{}
+	if err := json.Unmarshal(body, &mappingResult); err != nil {
+		return nil, fmt.Errorf("解析 mapping 失败：%w", err)
+	}
+
+	return mappingResult, nil
+}
+
+// ---- Mapping 字段提取 ----
+
+// extractColumnsFromMapping 从 mapping JSON 中提取字段定义。
+// 递归处理嵌套对象（user.name）和多字段（title.keyword）。
+// 兼容 ES 6.x（mappings.{type}.properties）和 ES 7.x+（mappings.properties）。
+func extractColumnsFromMapping(indexName string, mapping map[string]interface{}) []connection.ColumnDefinition {
+	indexData, ok := mapping[indexName].(map[string]interface{})
+	if !ok {
+		// 响应可能直接包含 index 数据（无外层索引名包裹），尝试自动查找
+		for _, v := range mapping {
+			if data, ok := v.(map[string]interface{}); ok {
+				indexData = data
+				break
+			}
+		}
+	}
+	if indexData == nil {
+		return []connection.ColumnDefinition{}
+	}
+
+	mappings, ok := indexData["mappings"].(map[string]interface{})
+	if !ok {
+		return []connection.ColumnDefinition{}
+	}
+
+	properties, _ := mappings["properties"].(map[string]interface{})
+
+	// ES 6.x：properties 在 type 层下面（如 mappings.doc.properties）
+	if properties == nil {
+		for _, v := range mappings {
+			if typeMap, ok := v.(map[string]interface{}); ok {
+				if props, ok := typeMap["properties"].(map[string]interface{}); ok {
+					properties = props
+					break
+				}
+			}
+		}
+	}
+
+	if properties == nil {
+		return []connection.ColumnDefinition{}
+	}
+
+	var columns []connection.ColumnDefinition
+	expandESProperties(properties, "", &columns)
+
+	// _id 是 ES 文档的唯一标识，等效于关系型数据库的主键。
+	// 始终放在列首，使前端 editLocator 能识别主键并启用行编辑。
+	idCol := connection.ColumnDefinition{
+		Name:    "_id",
+		Type:    "keyword",
+		Key:     "PRI",
+		Comment: "ES 文档唯一标识",
+	}
+	columns = append([]connection.ColumnDefinition{idCol}, columns...)
+
+	return columns
+}
+
+// expandESProperties 递归展开 ES mapping properties。
+// prefix 用于构建嵌套字段的点分路径（如 user.name）。
+func expandESProperties(properties map[string]interface{}, prefix string, columns *[]connection.ColumnDefinition) {
+	for name, prop := range properties {
+		fullName := name
+		if prefix != "" {
+			fullName = prefix + "." + name
+		}
+
+		propMap, _ := prop.(map[string]interface{})
+		colType := extractEsFieldType(prop)
+
+		// 从 mapping 属性中提取注释
+		comment := ""
+		if propMap != nil {
+			if desc, ok := propMap["description"].(string); ok {
+				comment = desc
+			}
+		}
+
+		col := connection.ColumnDefinition{
+			Name:     fullName,
+			Type:     colType,
+			Nullable: "YES",
+			Comment:  comment,
+		}
+
+		// 提取默认值（ES 7.x+ 的 null_value 作为参考）
+		if propMap != nil {
+			if nullVal, ok := propMap["null_value"]; ok {
+				defaultStr := fmt.Sprintf("%v", nullVal)
+				col.Default = &defaultStr
+			}
+		}
+
+		*columns = append(*columns, col)
+
+		// 递归处理嵌套对象的子字段
+		if propMap != nil {
+			if nested, ok := propMap["properties"].(map[string]interface{}); ok {
+				expandESProperties(nested, fullName, columns)
+			}
+		}
+
+		// 展开多字段（fields），如 title.keyword
+		if propMap != nil {
+			if fields, ok := propMap["fields"].(map[string]interface{}); ok {
+				for fieldName, fieldDef := range fields {
+					fieldType := extractEsFieldType(fieldDef)
+					multiFieldName := fullName + "." + fieldName
+					*columns = append(*columns, connection.ColumnDefinition{
+						Name:     multiFieldName,
+						Type:     fieldType,
+						Nullable: "YES",
+						Comment:  "multi-field",
+					})
+				}
+			}
+		}
+	}
+}
+
+// extractEsFieldType 从字段属性中提取类型描述。
+func extractEsFieldType(prop interface{}) string {
+	propMap, ok := prop.(map[string]interface{})
+	if !ok {
+		return "unknown"
+	}
+	fieldType, _ := propMap["type"].(string)
+	if fieldType == "" {
+		if _, ok := propMap["properties"]; ok {
+			return "object"
+		}
+		return "unknown"
+	}
+	return fieldType
+}
diff --git a/internal/db/elasticsearch_impl.go b/internal/db/elasticsearch_impl.go
new file mode 100644
index 0000000..40632fe
--- /dev/null
+++ b/internal/db/elasticsearch_impl.go
@@ -0,0 +1,769 @@
+//go:build gonavi_full_drivers || gonavi_elasticsearch_driver
+
+package db
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+	"GoNavi-Wails/internal/ssh"
+
+	"github.com/elastic/go-elasticsearch/v8"
+)
+
+const (
+	defaultEsPingTimeout  = 5 * time.Second
+	defaultEsQueryTimeout = 30 * time.Second
+)
+
+// ElasticsearchDB 实现 Database 接口，提供 Elasticsearch 数据源连接能力。
+type ElasticsearchDB struct {
+	client      *elasticsearch.Client
+	database    string // 默认索引名
+	pingTimeout time.Duration
+	forwarder   *ssh.LocalForwarder
+}
+
+// Connect 建立到 Elasticsearch 集群的连接。
+func (e *ElasticsearchDB) Connect(config connection.ConnectionConfig) error {
+	// 清理旧连接
+	if e.forwarder != nil {
+		_ = e.forwarder.Close()
+		e.forwarder = nil
+	}
+	e.client = nil
+
+	runConfig := normalizeElasticsearchConfig(config)
+	e.pingTimeout = getConnectTimeout(runConfig)
+	e.database = strings.TrimSpace(runConfig.Database)
+
+	logger.Infof("Elasticsearch 连接准备：地址=%s:%d 用户=%s SSL=%t SSH=%t 超时=%s",
+		runConfig.Host, runConfig.Port, runConfig.User, runConfig.UseSSL, runConfig.UseSSH, e.pingTimeout)
+
+	// SSH 隧道支持
+	if runConfig.UseSSH {
+		logger.Infof("Elasticsearch 使用 SSH 连接：地址=%s:%d", runConfig.Host, runConfig.Port)
+		forwarder, err := ssh.GetOrCreateLocalForwarder(runConfig.SSH, runConfig.Host, runConfig.Port)
+		if err != nil {
+			return fmt.Errorf("创建 SSH 隧道失败：%w", err)
+		}
+		e.forwarder = forwarder
+
+		host, portStr, err := net.SplitHostPort(forwarder.LocalAddr)
+		if err != nil {
+			return fmt.Errorf("解析本地转发地址失败：%w", err)
+		}
+		port, err := strconv.Atoi(portStr)
+		if err != nil {
+			return fmt.Errorf("解析本地端口失败：%w", err)
+		}
+
+		runConfig.Host = host
+		runConfig.Port = port
+		runConfig.UseSSH = false
+		logger.Infof("Elasticsearch 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	}
+
+	// SSL 回退尝试
+	attempts := []connection.ConnectionConfig{runConfig}
+	if shouldTrySSLPreferredFallback(runConfig) {
+		attempts = append(attempts, withSSLDisabled(runConfig))
+	}
+
+	var lastErr error
+	for idx, attempt := range attempts {
+		sslLabel := esSSLAttemptLabel(attempt, idx > 0)
+		logger.Infof("Elasticsearch 连接尝试：%d/%d 模式=%s 地址=%s:%d",
+			idx+1, len(attempts), sslLabel, attempt.Host, attempt.Port)
+
+		esCfg := buildESClientConfig(attempt)
+		client, err := elasticsearch.NewClient(esCfg)
+		if err != nil {
+			logger.Warnf("Elasticsearch 创建客户端失败：%d/%d 模式=%s 错误=%v", idx+1, len(attempts), sslLabel, err)
+			lastErr = err
+			continue
+		}
+
+		e.client = client
+		if err := e.Ping(); err != nil {
+			e.client = nil
+			logger.Warnf("Elasticsearch 连接验证失败：%d/%d 模式=%s 错误=%v", idx+1, len(attempts), sslLabel, err)
+			lastErr = err
+			continue
+		}
+
+		logger.Infof("Elasticsearch 连接成功：%d/%d 模式=%s", idx+1, len(attempts), sslLabel)
+		if idx > 0 {
+			logger.Warnf("Elasticsearch SSL 优先连接失败，已回退至明文连接")
+		}
+		return nil
+	}
+
+	if lastErr != nil {
+		return fmt.Errorf("Elasticsearch 连接失败：%w", lastErr)
+	}
+	return fmt.Errorf("Elasticsearch 连接失败：无可用连接方案")
+}
+
+// Close 关闭 Elasticsearch 连接并释放底层资源。
+func (e *ElasticsearchDB) Close() error {
+	if e.forwarder != nil {
+		if err := e.forwarder.Close(); err != nil {
+			logger.Warnf("关闭 Elasticsearch SSH 端口转发失败：%v", err)
+		}
+		e.forwarder = nil
+	}
+	if e.client != nil {
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		if err := e.client.Close(ctx); err != nil {
+			logger.Warnf("关闭 Elasticsearch 客户端失败：%v", err)
+		}
+		e.client = nil
+	}
+	return nil
+}
+
+// Ping 检测 Elasticsearch 连通性。
+func (e *ElasticsearchDB) Ping() error {
+	if e.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	timeout := e.pingTimeout
+	if timeout <= 0 {
+		timeout = defaultEsPingTimeout
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	res, err := e.client.Ping(e.client.Ping.WithContext(ctx))
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+
+	if res.IsError() {
+		return fmt.Errorf("Elasticsearch Ping 失败：%s", res.Status())
+	}
+	return nil
+}
+
+// Query 执行 Elasticsearch 查询，支持 JSON DSL 和 query_string 两种模式。
+func (e *ElasticsearchDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultEsQueryTimeout)
+	defer cancel()
+	return e.queryWithContext(ctx, query)
+}
+
+// QueryContext 带上下文执行 Elasticsearch 查询，支持外部超时控制。
+func (e *ElasticsearchDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	return e.queryWithContext(ctx, query)
+}
+
+// queryWithContext 查询的核心实现，被 Query 和 QueryContext 共用。
+func (e *ElasticsearchDB) queryWithContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if e.client == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+
+	query = strings.TrimSpace(query)
+	if query == "" {
+		return nil, nil, fmt.Errorf("查询语句不能为空")
+	}
+
+	// Elasticsearch 不支持 information_schema / pg_catalog 等关系型元数据查询。
+	// 前端会为视图、函数、触发器等功能自动生成这些查询，直接返回空结果避免报错。
+	if isESMetadataQuery(query) {
+		return []map[string]interface{}{}, []string{}, nil
+	}
+
+	// 优先尝试 DevTools 风格解析
+	if req, ok := parseESConsoleRequest(query); ok {
+		return e.esQueryConsole(ctx, req)
+	}
+
+	// JSON DSL（以 { 开头）
+	if isJSONDSL(query) {
+		return e.esQueryWithDSL(ctx, query)
+	}
+
+	// query_string
+	return e.esQueryWithString(ctx, query)
+}
+
+// validateESConsolePath 校验 DevTools 风格请求的路径和方法是否安全。
+// 使用规范化路径匹配，而非子字符串匹配。
+func validateESConsolePath(method, rawPath string) error {
+	method = strings.ToUpper(strings.TrimSpace(method))
+	cleanPath := "/" + strings.TrimPrefix(strings.TrimSpace(rawPath), "/")
+
+	// 拒绝写入端点
+	for _, blocked := range []string{"/_bulk", "/_delete_by_query", "/_update_by_query"} {
+		if cleanPath == blocked || strings.HasSuffix(cleanPath, blocked) {
+			return fmt.Errorf("Elasticsearch DevTools 查询拒绝：不支持的写入端点 %s", rawPath)
+		}
+	}
+
+	switch {
+	// _search: GET / POST
+	case cleanPath == "/_search" || strings.HasSuffix(cleanPath, "/_search"):
+		if method != "GET" && method != "POST" {
+			return fmt.Errorf("Elasticsearch _search 端点仅支持 GET/POST")
+		}
+		return nil
+
+	// _mapping / _settings: 仅 GET
+	case cleanPath == "/_mapping" || strings.HasSuffix(cleanPath, "/_mapping"):
+		return requireESMethod(method, "GET")
+	case cleanPath == "/_settings" || strings.HasSuffix(cleanPath, "/_settings"):
+		return requireESMethod(method, "GET")
+
+	// _cluster/health: 仅 GET
+	case cleanPath == "/_cluster/health":
+		return requireESMethod(method, "GET")
+
+	// _resolve/index: 仅 GET（支持 /_resolve/index 和 /_resolve/index/*）
+	case cleanPath == "/_resolve/index" || strings.HasPrefix(cleanPath, "/_resolve/index/"):
+		return requireESMethod(method, "GET")
+
+	default:
+		return fmt.Errorf("Elasticsearch DevTools 查询拒绝：不支持的端点 %s（仅允许 _search/_mapping/_settings/_cluster/health/_resolve/index）", rawPath)
+	}
+}
+
+// requireESMethod 检查方法是否在允许列表中。
+func requireESMethod(method string, allowed ...string) error {
+	for _, a := range allowed {
+		if method == a {
+			return nil
+		}
+	}
+	return fmt.Errorf("Elasticsearch 端点不支持 %s 方法，仅允许 %s", method, strings.Join(allowed, "/"))
+}
+
+// esQueryConsole 执行 Kibana DevTools 风格查询。
+// 使用低层 Perform 方法发送原始 HTTP 请求。
+func (e *ElasticsearchDB) esQueryConsole(ctx context.Context, req esConsoleRequest) ([]map[string]interface{}, []string, error) {
+	if err := validateESConsolePath(req.Method, req.Path); err != nil {
+		return nil, nil, err
+	}
+
+	// 构建 HTTP 请求
+	var bodyReader *bytes.Reader
+	if req.Body != "" {
+		bodyReader = bytes.NewReader([]byte(req.Body))
+	} else {
+		bodyReader = bytes.NewReader([]byte{})
+	}
+
+	httpReq, err := http.NewRequestWithContext(ctx, req.Method, req.Path, bodyReader)
+	if err != nil {
+		return nil, nil, fmt.Errorf("构造 DevTools 请求失败：%w", err)
+	}
+	if req.Body != "" {
+		httpReq.Header.Set("Content-Type", "application/json")
+	}
+
+	// 发送请求
+	httpRes, err := e.client.Perform(httpReq)
+	if err != nil {
+		return nil, nil, fmt.Errorf("Elasticsearch DevTools 请求失败：%w", err)
+	}
+	defer httpRes.Body.Close()
+
+	// 读取响应
+	body, err := io.ReadAll(httpRes.Body)
+	if err != nil {
+		return nil, nil, fmt.Errorf("读取 DevTools 响应失败：%w", err)
+	}
+
+	if httpRes.StatusCode >= 400 {
+		return nil, nil, fmt.Errorf("Elasticsearch DevTools 查询错误：%s", string(body))
+	}
+
+	// _search 端点使用标准响应解析
+	if strings.Contains(req.Path, "/_search") {
+		return e.parseConsoleSearchResponse(body)
+	}
+
+	// 其他端点返回原始 JSON 作为单行结果
+	var pretty map[string]interface{}
+	if err := json.Unmarshal(body, &pretty); err != nil {
+		// 非 JSON 响应，返回纯文本
+		return []map[string]interface{}{{"result": string(body)}}, []string{"result"}, nil
+	}
+	formatted, _ := json.MarshalIndent(pretty, "", "  ")
+	return []map[string]interface{}{{"result": string(formatted)}}, []string{"result"}, nil
+}
+
+// parseConsoleSearchResponse 解析 DevTools _search 响应。
+func (e *ElasticsearchDB) parseConsoleSearchResponse(body []byte) ([]map[string]interface{}, []string, error) {
+	return parseSearchResponseJSON(body)
+}
+
+// Exec 不支持 Elasticsearch 非查询语句执行。
+func (e *ElasticsearchDB) Exec(query string) (int64, error) {
+	return 0, fmt.Errorf("Elasticsearch 不支持执行非查询语句")
+}
+
+// ExecContext 带上下文的 Exec，ES 不支持非查询语句执行。
+func (e *ElasticsearchDB) ExecContext(_ context.Context, _ string) (int64, error) {
+	return 0, fmt.Errorf("Elasticsearch 不支持执行非查询语句")
+}
+
+// GetDatabases 列出所有 Elasticsearch 索引。
+func (e *ElasticsearchDB) GetDatabases() ([]string, error) {
+	if e.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	res, err := e.client.Indices.Get(
+		[]string{"*"},
+		e.client.Indices.Get.WithContext(ctx),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("获取索引列表失败：%w", err)
+	}
+	defer res.Body.Close()
+
+	if res.IsError() {
+		return nil, fmt.Errorf("获取索引列表失败：%s", res.Status())
+	}
+
+	var indexMap map[string]interface{}
+	if err := json.NewDecoder(res.Body).Decode(&indexMap); err != nil {
+		return nil, fmt.Errorf("解析索引列表失败：%w", err)
+	}
+
+	result := make([]string, 0, len(indexMap))
+	for name := range indexMap {
+		if name := strings.TrimSpace(name); name != "" {
+			result = append(result, name)
+		}
+	}
+	return result, nil
+}
+
+// GetTables 对 ES 而言索引即表，返回索引自身名称及别名。
+func (e *ElasticsearchDB) GetTables(dbName string) ([]string, error) {
+	if e.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+
+	target := strings.TrimSpace(dbName)
+	if target == "" {
+		target = e.database
+	}
+	if target == "" {
+		return nil, fmt.Errorf("未指定索引名")
+	}
+
+	tables := []string{target}
+	aliases := e.esFetchIndexAliases(target)
+	tables = append(tables, aliases...)
+	return tables, nil
+}
+
+// GetCreateStatement 返回索引的 settings + mappings 组合 JSON。
+func (e *ElasticsearchDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	if e.client == nil {
+		return "", fmt.Errorf("连接未打开")
+	}
+
+	indexName := resolveEsIndexName(dbName, tableName, e.database)
+	if indexName == "" {
+		return "", fmt.Errorf("未指定索引名")
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	res, err := e.client.Indices.Get(
+		[]string{indexName},
+		e.client.Indices.Get.WithContext(ctx),
+	)
+	if err != nil {
+		return "", fmt.Errorf("获取索引定义失败：%w", err)
+	}
+	defer res.Body.Close()
+
+	if res.IsError() {
+		return "", fmt.Errorf("获取索引定义失败：%s", res.Status())
+	}
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return "", fmt.Errorf("读取索引定义失败：%w", err)
+	}
+
+	var pretty map[string]interface{}
+	if err := json.Unmarshal(body, &pretty); err != nil {
+		return string(body), nil
+	}
+	formatted, _ := json.MarshalIndent(pretty, "", "  ")
+	return fmt.Sprintf("// Elasticsearch index: %s\n%s", indexName, string(formatted)), nil
+}
+
+// GetColumns 返回索引的 mapping 字段定义。
+func (e *ElasticsearchDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	if e.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+
+	indexName := resolveEsIndexName(dbName, tableName, e.database)
+	if indexName == "" {
+		return nil, fmt.Errorf("未指定索引名")
+	}
+
+	mapping, err := e.esFetchIndexMapping(indexName)
+	if err != nil {
+		return nil, err
+	}
+	return extractColumnsFromMapping(indexName, mapping), nil
+}
+
+// GetAllColumns 返回索引的全部字段定义（带表名标识）。
+func (e *ElasticsearchDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	if e.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+
+	target := strings.TrimSpace(dbName)
+	if target == "" {
+		target = e.database
+	}
+	if target == "" {
+		return nil, fmt.Errorf("未指定索引名")
+	}
+
+	mapping, err := e.esFetchIndexMapping(target)
+	if err != nil {
+		return nil, err
+	}
+
+	columns := extractColumnsFromMapping(target, mapping)
+	result := make([]connection.ColumnDefinitionWithTable, 0, len(columns))
+	for _, col := range columns {
+		result = append(result, connection.ColumnDefinitionWithTable{
+			TableName: target,
+			Name:      col.Name,
+			Type:      col.Type,
+			Comment:   col.Comment,
+		})
+	}
+	return result, nil
+}
+
+// GetIndexes 返回索引的 settings 中定义的分片与副本信息。
+func (e *ElasticsearchDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	if e.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+
+	indexName := resolveEsIndexName(dbName, tableName, e.database)
+	if indexName == "" {
+		return nil, fmt.Errorf("未指定索引名")
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	res, err := e.client.Indices.GetSettings(
+		e.client.Indices.GetSettings.WithContext(ctx),
+		e.client.Indices.GetSettings.WithIndex(indexName),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("获取索引设置失败：%w", err)
+	}
+	defer res.Body.Close()
+
+	if res.IsError() {
+		return nil, fmt.Errorf("获取索引设置失败：%s", res.Status())
+	}
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, fmt.Errorf("读取索引设置失败：%w", err)
+	}
+
+	var settings map[string]map[string]interface{}
+	if err := json.Unmarshal(body, &settings); err != nil {
+		return nil, fmt.Errorf("解析索引设置失败：%w", err)
+	}
+
+	var indexes []connection.IndexDefinition
+
+	// ES 无传统主键概念，_id 字段是每条文档的唯一标识，等效于主键。
+	// 返回 _id 作为 "PRIMARY" 索引，使前端识别到唯一标识并解除只读模式。
+	indexes = append(indexes, connection.IndexDefinition{
+		Name:       "PRIMARY",
+		ColumnName: "_id",
+		NonUnique:  0,
+		SeqInIndex: 1,
+		IndexType:  "PRIMARY",
+	})
+
+	for name, data := range settings {
+		idxSettings, _ := data["settings"].(map[string]interface{})
+		indexSection, _ := idxSettings["index"].(map[string]interface{})
+
+		shards := "1"
+		replicas := "1"
+		if s, ok := indexSection["number_of_shards"].(string); ok {
+			shards = s
+		}
+		if r, ok := indexSection["number_of_replicas"].(string); ok {
+			replicas = r
+		}
+
+		indexes = append(indexes, connection.IndexDefinition{
+			Name:       name,
+			ColumnName: fmt.Sprintf("shards=%s replicas=%s", shards, replicas),
+			NonUnique:  0,
+			SeqInIndex: 1,
+			IndexType:  "INDEX",
+		})
+	}
+	return indexes, nil
+}
+
+// GetForeignKeys ES 不支持外键，返回空列表。
+func (e *ElasticsearchDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return []connection.ForeignKeyDefinition{}, nil
+}
+
+// GetTriggers ES 不支持触发器，返回空列表。
+func (e *ElasticsearchDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return []connection.TriggerDefinition{}, nil
+}
+
+// esBulkActionMeta 构建 ES _bulk API 的 action 行元数据。
+// ES 6.x 需要 _type 字段，ES 7.x+ 已废弃。
+func (e *ElasticsearchDB) esBulkActionMeta(action, indexName string, docID string) map[string]interface{} {
+	meta := map[string]interface{}{
+		"_index": indexName,
+		"_type":  "_doc",
+	}
+	if docID != "" {
+		meta["_id"] = docID
+	}
+	return map[string]interface{}{action: meta}
+}
+
+// resolveWriteIndex 解析别名对应的实际可写索引名。
+// 如果 indexOrAlias 是直接索引名，原样返回。
+// 如果是别名，返回该别名下最新的索引名（按名称倒序）。
+func (e *ElasticsearchDB) resolveWriteIndex(indexOrAlias string) (string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	res, err := e.client.Indices.GetAlias(
+		e.client.Indices.GetAlias.WithContext(ctx),
+		e.client.Indices.GetAlias.WithIndex(indexOrAlias),
+	)
+	if err != nil {
+		return indexOrAlias, nil // 网络错误时回退到原名
+	}
+	defer res.Body.Close()
+
+	if res.IsError() {
+		// 404 表示不是别名而是直接索引名
+		return indexOrAlias, nil
+	}
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return indexOrAlias, nil
+	}
+
+	var aliasMap map[string]interface{}
+	if err := json.Unmarshal(body, &aliasMap); err != nil {
+		return indexOrAlias, nil
+	}
+
+	// aliasMap 的 key 是实际索引名，如果没有 key 或只有一个，直接用
+	var indices []string
+	for name := range aliasMap {
+		indices = append(indices, name)
+	}
+
+	if len(indices) == 0 {
+		return indexOrAlias, nil
+	}
+	if len(indices) == 1 {
+		return indices[0], nil
+	}
+
+	// 多个索引对应同一别名时，取名称最新的（ES 通常用日期后缀，倒序取第一个）
+	sort.Sort(sort.Reverse(sort.StringSlice(indices)))
+	return indices[0], nil
+}
+
+// isESMetaField 判断字段名是否为 ES 元字段（不应写入文档 _source）。
+func isESMetaField(name string) bool {
+	switch strings.TrimSpace(name) {
+	case "_id", "_index", "_type", "_score", "_source", "_routing", "_version", "_seq_no", "_primary_term", "_aggregations":
+		return true
+	}
+	return false
+}
+
+// ApplyChanges 实现 BatchApplier 接口，通过 ES _bulk API 批量提交增删改。
+func (e *ElasticsearchDB) ApplyChanges(tableName string, changes connection.ChangeSet) error {
+	if e.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+
+	indexName := resolveEsIndexName(tableName, "", e.database)
+	if indexName == "" {
+		return fmt.Errorf("未指定索引名")
+	}
+
+	var bulkBody bytes.Buffer
+
+	// 如果目标是别名（非直接索引），解析出实际的可写索引名。
+	writeIndexName := indexName
+	if resolved, err := e.resolveWriteIndex(indexName); err == nil && resolved != "" {
+		writeIndexName = resolved
+	}
+
+	// resolveWriteIndex 确定写操作的目标索引。
+	// 如果文档数据中包含 _index（来自查询结果），使用实际索引名而非别名。
+	resolveWriteIndex := func(vals map[string]interface{}) string {
+		if idx, ok := vals["_index"]; ok {
+			if idxStr := strings.TrimSpace(fmt.Sprintf("%v", idx)); idxStr != "" {
+				return idxStr
+			}
+		}
+		return writeIndexName
+	}
+
+	// 删除操作
+	for _, pk := range changes.Deletes {
+		idVal, ok := pk["_id"]
+		if !ok {
+			return fmt.Errorf("删除操作缺少 _id")
+		}
+		writeIdx := resolveWriteIndex(pk)
+		actionJSON, _ := json.Marshal(e.esBulkActionMeta("delete", writeIdx, fmt.Sprintf("%v", idVal)))
+		bulkBody.Write(actionJSON)
+		bulkBody.WriteByte('\n')
+	}
+
+	// 更新操作
+	for _, update := range changes.Updates {
+		idVal, ok := update.Keys["_id"]
+		if !ok {
+			return fmt.Errorf("更新操作缺少 _id")
+		}
+		writeIdx := resolveWriteIndex(update.Values)
+		actionJSON, _ := json.Marshal(e.esBulkActionMeta("update", writeIdx, fmt.Sprintf("%v", idVal)))
+		bulkBody.Write(actionJSON)
+		bulkBody.WriteByte('\n')
+
+		// 过滤 ES 元字段，只保留实际文档字段
+		doc := make(map[string]interface{}, len(update.Values))
+		for k, v := range update.Values {
+			if !isESMetaField(k) {
+				doc[k] = v
+			}
+		}
+		wrapper := map[string]interface{}{"doc": doc}
+		docJSON, _ := json.Marshal(wrapper)
+		bulkBody.Write(docJSON)
+		bulkBody.WriteByte('\n')
+	}
+
+	// 新增操作
+	for _, insert := range changes.Inserts {
+		var docID string
+		if id, ok := insert["_id"]; ok {
+			docID = fmt.Sprintf("%v", id)
+		}
+
+		// 从文档中移除 _id 和其他 ES 元字段
+		doc := make(map[string]interface{}, len(insert))
+		for k, v := range insert {
+			if !isESMetaField(k) {
+				doc[k] = v
+			}
+		}
+
+		writeIdx := resolveWriteIndex(insert)
+		actionJSON, _ := json.Marshal(e.esBulkActionMeta("index", writeIdx, docID))
+		bulkBody.Write(actionJSON)
+		bulkBody.WriteByte('\n')
+		docJSON, _ := json.Marshal(doc)
+		bulkBody.Write(docJSON)
+		bulkBody.WriteByte('\n')
+	}
+
+	if bulkBody.Len() == 0 {
+		return nil
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	res, err := e.client.Bulk(
+		bytes.NewReader(bulkBody.Bytes()),
+		e.client.Bulk.WithContext(ctx),
+	)
+	if err != nil {
+		return fmt.Errorf("ES 批量操作失败：%w", err)
+	}
+	defer res.Body.Close()
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return fmt.Errorf("读取 ES 批量操作响应失败：%w", err)
+	}
+
+	if res.IsError() {
+		return fmt.Errorf("ES 批量操作错误：%s", string(body))
+	}
+
+	// 检查是否有单条操作失败
+	var result map[string]interface{}
+	if err := json.Unmarshal(body, &result); err == nil {
+		if hasErrors, ok := result["errors"].(bool); ok && hasErrors {
+			if items, ok := result["items"].([]interface{}); ok {
+				for _, item := range items {
+					itemMap, ok := item.(map[string]interface{})
+					if !ok {
+						continue
+					}
+					for _, op := range itemMap {
+						opMap, ok := op.(map[string]interface{})
+						if !ok {
+							continue
+						}
+						if errMap, ok := opMap["error"].(map[string]interface{}); ok {
+							reason, _ := errMap["reason"].(string)
+							return fmt.Errorf("ES 批量操作部分失败：%s", reason)
+						}
+					}
+				}
+			}
+			return fmt.Errorf("ES 批量操作部分失败")
+		}
+	}
+
+	logger.Infof("ES 批量操作完成：索引=%s 删除=%d 更新=%d 新增=%d",
+		indexName, len(changes.Deletes), len(changes.Updates), len(changes.Inserts))
+	return nil
+}
diff --git a/internal/db/elasticsearch_impl_test.go b/internal/db/elasticsearch_impl_test.go
new file mode 100644
index 0000000..245b224
--- /dev/null
+++ b/internal/db/elasticsearch_impl_test.go
@@ -0,0 +1,1651 @@
+//go:build gonavi_full_drivers || gonavi_elasticsearch_driver
+
+package db
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"slices"
+	"strings"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+
+	"github.com/elastic/go-elasticsearch/v8"
+)
+
+// ---- 测试辅助函数 ----
+
+// newMockESServer 创建模拟 Elasticsearch REST API 的 HTTP 测试服务器。
+// 自动为所有响应添加 go-elasticsearch v8 客户端要求的 X-Elastic-Product 头。
+func newMockESServer(t *testing.T, handler http.HandlerFunc) *httptest.Server {
+	t.Helper()
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("X-Elastic-Product", "Elasticsearch")
+		handler(w, r)
+	}))
+	t.Cleanup(server.Close)
+	return server
+}
+
+// newTestESDB 创建连接到测试服务器的 ElasticsearchDB 实例。
+func newTestESDB(t *testing.T, serverURL, defaultIndex string) *ElasticsearchDB {
+	t.Helper()
+	cfg := elasticsearch.Config{
+		Addresses: []string{serverURL},
+		Transport: &esProductCheckBypassTransport{inner: http.DefaultTransport},
+	}
+	client, err := elasticsearch.NewClient(cfg)
+	if err != nil {
+		t.Fatalf("创建测试 ES 客户端失败: %v", err)
+	}
+	return &ElasticsearchDB{
+		client:   client,
+		database: defaultIndex,
+	}
+}
+
+// buildMockESMappingResponse 构造模拟的 mapping 响应 JSON。
+func buildMockESMappingResponse(indexName string, fields map[string]string) map[string]interface{} {
+	properties := make(map[string]interface{})
+	for name, fieldType := range fields {
+		properties[name] = map[string]interface{}{"type": fieldType}
+	}
+	return map[string]interface{}{
+		indexName: map[string]interface{}{
+			"mappings": map[string]interface{}{
+				"properties": properties,
+			},
+		},
+	}
+}
+
+// writeJSON 将数据以 JSON 格式写入 HTTP 响应。
+func writeJSON(w http.ResponseWriter, data interface{}) {
+	w.Header().Set("Content-Type", "application/json")
+	_ = json.NewEncoder(w).Encode(data)
+}
+
+// ---- 核心功能测试 ----
+
+// TestElasticsearchPing 测试 Ping 成功和失败路径。
+func TestElasticsearchPing(t *testing.T) {
+	t.Run("ping 成功", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			// Ping 使用 HEAD / 方法
+			if r.Method == http.MethodHead && r.URL.Path == "/" {
+				w.WriteHeader(http.StatusOK)
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		})
+
+		db := newTestESDB(t, server.URL, "")
+		if err := db.Ping(); err != nil {
+			t.Fatalf("Ping 应成功，但返回错误：%v", err)
+		}
+	})
+
+	t.Run("ping 服务端返回错误", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusInternalServerError)
+		})
+
+		db := newTestESDB(t, server.URL, "")
+		err := db.Ping()
+		if err == nil {
+			t.Fatal("Ping 服务端 500 时应返回错误")
+		}
+		if !strings.Contains(err.Error(), "500") {
+			t.Fatalf("错误信息应包含状态码，实际：%v", err)
+		}
+	})
+}
+
+// TestElasticsearchGetDatabases 测试获取索引列表。
+func TestElasticsearchGetDatabases(t *testing.T) {
+	t.Run("正常获取全部索引", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			if r.Method == http.MethodGet && (r.URL.Path == "/" || r.URL.Path == "/*") && !strings.Contains(r.URL.Path, "_") {
+				writeJSON(w, map[string]interface{}{
+					"logs-2024":  map[string]interface{}{},
+					"users":      map[string]interface{}{},
+					".security":  map[string]interface{}{},
+					".kibana_1":  map[string]interface{}{},
+					"products":   map[string]interface{}{},
+				})
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		})
+
+		db := newTestESDB(t, server.URL, "")
+		databases, err := db.GetDatabases()
+		if err != nil {
+			t.Fatalf("GetDatabases 失败：%v", err)
+		}
+
+		slices.Sort(databases)
+		expected := []string{".kibana_1", ".security", "logs-2024", "products", "users"}
+		if len(databases) != len(expected) {
+			t.Fatalf("期望 %d 个索引，实际 %d：%v", len(expected), len(databases), databases)
+		}
+		for i, name := range expected {
+			if databases[i] != name {
+				t.Fatalf("索引 [%d] 期望 %q，实际 %q", i, name, databases[i])
+			}
+		}
+	})
+
+	t.Run("连接未打开时返回错误", func(t *testing.T) {
+		db := &ElasticsearchDB{}
+		_, err := db.GetDatabases()
+		if err == nil || !strings.Contains(err.Error(), "连接未打开") {
+			t.Fatalf("期望 '连接未打开' 错误，实际：%v", err)
+		}
+	})
+}
+
+// TestElasticsearchGetTables 测试 GetTables 返回索引名及别名。
+func TestElasticsearchGetTables(t *testing.T) {
+	t.Run("指定索引名并返回别名", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			if strings.Contains(r.URL.Path, "/_alias") {
+				writeJSON(w, map[string]interface{}{
+					"my-index": map[string]interface{}{
+						"aliases": map[string]interface{}{
+							"my-alias": map[string]interface{}{},
+						},
+					},
+				})
+				return
+			}
+			w.WriteHeader(http.StatusOK)
+		})
+
+		db := newTestESDB(t, server.URL, "default-index")
+		tables, err := db.GetTables("my-index")
+		if err != nil {
+			t.Fatalf("GetTables 失败：%v", err)
+		}
+		if len(tables) < 1 || tables[0] != "my-index" {
+			t.Fatalf("期望第一个为 my-index，实际：%v", tables)
+		}
+		// 应包含别名
+		found := false
+		for _, tbl := range tables {
+			if tbl == "my-alias" {
+				found = true
+			}
+		}
+		if !found {
+			t.Fatalf("期望包含别名 my-alias，实际：%v", tables)
+		}
+	})
+
+	t.Run("回退到默认索引", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			if strings.Contains(r.URL.Path, "/_alias") {
+				writeJSON(w, map[string]interface{}{})
+				return
+			}
+			w.WriteHeader(http.StatusOK)
+		})
+
+		db := newTestESDB(t, server.URL, "default-index")
+		tables, err := db.GetTables("")
+		if err != nil {
+			t.Fatalf("GetTables 失败：%v", err)
+		}
+		if len(tables) != 1 || tables[0] != "default-index" {
+			t.Fatalf("期望 [default-index]，实际：%v", tables)
+		}
+	})
+
+	t.Run("无索引名时报错", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusOK)
+		})
+		db := newTestESDB(t, server.URL, "")
+		_, err := db.GetTables("")
+		if err == nil || !strings.Contains(err.Error(), "未指定索引名") {
+			t.Fatalf("期望 '未指定索引名' 错误，实际：%v", err)
+		}
+	})
+
+	t.Run("连接未打开时返回错误", func(t *testing.T) {
+		db := &ElasticsearchDB{database: "test"}
+		_, err := db.GetTables("test")
+		if err == nil || !strings.Contains(err.Error(), "连接未打开") {
+			t.Fatalf("期望 '连接未打开' 错误，实际：%v", err)
+		}
+	})
+}
+
+// TestElasticsearchGetColumns 测试从 mapping 中提取字段定义。
+func TestElasticsearchGetColumns(t *testing.T) {
+	t.Run("正常提取字段", func(t *testing.T) {
+		fields := map[string]string{
+			"title":    "text",
+			"status":   "keyword",
+			"price":    "float",
+			"quantity": "integer",
+		}
+		mapping := buildMockESMappingResponse("test-index", fields)
+
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			if strings.HasSuffix(r.URL.Path, "/_mapping") && r.Method == http.MethodGet {
+				writeJSON(w, mapping)
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		})
+
+		db := newTestESDB(t, server.URL, "test-index")
+		columns, err := db.GetColumns("test-index", "")
+		if err != nil {
+			t.Fatalf("GetColumns 失败：%v", err)
+		}
+		if len(columns) != 4 {
+			t.Fatalf("期望 4 个字段，实际 %d", len(columns))
+		}
+
+		// 验证字段类型映射
+		typeMap := make(map[string]string)
+		for _, col := range columns {
+			typeMap[col.Name] = col.Type
+		}
+		for name, expectedType := range fields {
+			if typeMap[name] != expectedType {
+				t.Fatalf("字段 %q 类型期望 %q，实际 %q", name, expectedType, typeMap[name])
+			}
+		}
+
+		// 验证所有字段标记为可空
+		for _, col := range columns {
+			if col.Nullable != "YES" {
+				t.Fatalf("字段 %q Nullable 期望 YES，实际 %q", col.Name, col.Nullable)
+			}
+		}
+	})
+
+	t.Run("服务端返回错误", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusNotFound)
+			_, _ = w.Write([]byte(`{"error":"index_not_found"}`))
+		})
+
+		db := newTestESDB(t, server.URL, "test-index")
+		_, err := db.GetColumns("test-index", "")
+		if err == nil {
+			t.Fatal("GetColumns 服务端 404 时应返回错误")
+		}
+	})
+
+	t.Run("连接未打开时返回错误", func(t *testing.T) {
+		db := &ElasticsearchDB{}
+		_, err := db.GetColumns("test-index", "")
+		if err == nil || !strings.Contains(err.Error(), "连接未打开") {
+			t.Fatalf("期望 '连接未打开' 错误，实际：%v", err)
+		}
+	})
+}
+
+// TestElasticsearchGetAllColumns 测试获取全部字段。
+func TestElasticsearchGetAllColumns(t *testing.T) {
+	fields := map[string]string{
+		"name":  "text",
+		"email": "keyword",
+	}
+	mapping := buildMockESMappingResponse("users", fields)
+
+	server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+		if strings.HasSuffix(r.URL.Path, "/_mapping") {
+			writeJSON(w, mapping)
+			return
+		}
+		w.WriteHeader(http.StatusNotFound)
+	})
+
+	db := newTestESDB(t, server.URL, "users")
+	columns, err := db.GetAllColumns("")
+	if err != nil {
+		t.Fatalf("GetAllColumns 失败：%v", err)
+	}
+	if len(columns) != 2 {
+		t.Fatalf("期望 2 个字段，实际 %d", len(columns))
+	}
+
+	// 验证每个字段都带有表名标识
+	for _, col := range columns {
+		if col.TableName != "users" {
+			t.Fatalf("字段 %q 的 TableName 期望 users，实际 %s", col.Name, col.TableName)
+		}
+	}
+}
+
+// TestElasticsearchQueryDSL 测试 JSON DSL 查询模式。
+func TestElasticsearchQueryDSL(t *testing.T) {
+	t.Run("指定索引的 DSL 查询", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			if r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/_search") {
+				w.Header().Set("Content-Type", "application/json")
+				_, _ = w.Write([]byte(`{
+					"hits": {
+						"total": {"value": 1},
+						"hits": [
+							{"_index": "test-index", "_id": "1", "_source": {"title": "测试文档", "status": "active"}}
+						]
+					}
+				}`))
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		})
+
+		db := newTestESDB(t, server.URL, "test-index")
+		dsl := `{"query":{"match_all":{}}}`
+		rows, columns, err := db.Query(dsl)
+		if err != nil {
+			t.Fatalf("DSL 查询失败：%v", err)
+		}
+		if len(rows) != 1 {
+			t.Fatalf("期望 1 条结果，实际 %d", len(rows))
+		}
+
+		// 验证包含 _index 和 _id 元数据列
+		colSet := make(map[string]bool)
+		for _, col := range columns {
+			colSet[col] = true
+		}
+		if !colSet["_index"] || !colSet["_id"] {
+			t.Fatalf("结果列应包含 _index 和 _id，实际：%v", columns)
+		}
+
+		// 验证数据内容
+		if rows[0]["title"] != "测试文档" {
+			t.Fatalf("期望 title=测试文档，实际：%v", rows[0]["title"])
+		}
+		if rows[0]["_index"] != "test-index" {
+			t.Fatalf("期望 _index=test-index，实际：%v", rows[0]["_index"])
+		}
+	})
+
+	t.Run("无默认索引时使用通配符", func(t *testing.T) {
+		var capturedPath string
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			if r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/_search") {
+				capturedPath = r.URL.Path
+				w.Header().Set("Content-Type", "application/json")
+				_, _ = w.Write([]byte(`{"hits":{"total":{"value":0},"hits":[]}}`))
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		})
+
+		db := newTestESDB(t, server.URL, "")
+		_, _, err := db.Query(`{"query":{"match_all":{}}}`)
+		if err != nil {
+			t.Fatalf("DSL 查询失败：%v", err)
+		}
+		if !strings.HasPrefix(capturedPath, "/*/_search") {
+			t.Fatalf("无默认索引时应使用 * 通配符查询，实际路径：%s", capturedPath)
+		}
+	})
+
+	t.Run("查询服务端返回错误", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusBadRequest)
+			_, _ = w.Write([]byte(`{"error":"parsing_exception"}`))
+		})
+
+		db := newTestESDB(t, server.URL, "test-index")
+		_, _, err := db.Query(`{"query":{"invalid":{}}}`)
+		if err == nil {
+			t.Fatal("DSL 查询服务端错误时应返回错误")
+		}
+	})
+}
+
+// TestElasticsearchQueryString 测试 query_string 查询模式。
+func TestElasticsearchQueryString(t *testing.T) {
+	t.Run("简单字符串查询", func(t *testing.T) {
+		var capturedBody string
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			if r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/_search") {
+				buf := make([]byte, r.ContentLength)
+				_, _ = r.Body.Read(buf)
+				capturedBody = string(buf)
+				w.Header().Set("Content-Type", "application/json")
+				_, _ = w.Write([]byte(`{
+					"hits": {
+						"total": {"value": 2},
+						"hits": [
+							{"_index": "test", "_id": "1", "_source": {"title": "匹配结果1"}},
+							{"_index": "test", "_id": "2", "_source": {"title": "匹配结果2"}}
+						]
+					}
+				}`))
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		})
+
+		db := newTestESDB(t, server.URL, "test")
+		rows, _, err := db.Query("hello world")
+		if err != nil {
+			t.Fatalf("query_string 查询失败：%v", err)
+		}
+		if len(rows) != 2 {
+			t.Fatalf("期望 2 条结果，实际 %d", len(rows))
+		}
+
+		// 验证请求体包含 query_string 包装
+		if !strings.Contains(capturedBody, "query_string") {
+			t.Fatalf("请求体应包含 query_string，实际：%s", capturedBody)
+		}
+		if !strings.Contains(capturedBody, "hello world") {
+			t.Fatalf("请求体应包含查询文本，实际：%s", capturedBody)
+		}
+	})
+
+	t.Run("查询语句为空时报错", func(t *testing.T) {
+		db := newTestESDB(t, "http://localhost:9200", "test")
+		_, _, err := db.Query("  ")
+		if err == nil || !strings.Contains(err.Error(), "查询语句不能为空") {
+			t.Fatalf("期望 '查询语句不能为空' 错误，实际：%v", err)
+		}
+	})
+
+	t.Run("连接未打开时返回错误", func(t *testing.T) {
+		db := &ElasticsearchDB{}
+		_, _, err := db.Query("test")
+		if err == nil || !strings.Contains(err.Error(), "连接未打开") {
+			t.Fatalf("期望 '连接未打开' 错误，实际：%v", err)
+		}
+	})
+}
+
+// TestElasticsearchExecNotSupported 测试 Exec 返回不支持错误。
+func TestElasticsearchExecNotSupported(t *testing.T) {
+	db := &ElasticsearchDB{}
+	rowsAffected, err := db.Exec("DELETE FROM test")
+	if err == nil || !strings.Contains(err.Error(), "不支持执行非查询语句") {
+		t.Fatalf("期望 '不支持执行非查询语句' 错误，实际：%v", err)
+	}
+	if rowsAffected != 0 {
+		t.Fatalf("Exec 应返回 0 受影响行数，实际：%d", rowsAffected)
+	}
+}
+
+// TestElasticsearchGetForeignKeys 测试返回空外键列表。
+func TestElasticsearchGetForeignKeys(t *testing.T) {
+	db := &ElasticsearchDB{}
+	fks, err := db.GetForeignKeys("test-index", "test-table")
+	if err != nil {
+		t.Fatalf("GetForeignKeys 不应返回错误：%v", err)
+	}
+	if len(fks) != 0 {
+		t.Fatalf("GetForeignKeys 应返回空列表，实际：%v", fks)
+	}
+}
+
+// TestElasticsearchGetTriggers 测试返回空触发器列表。
+func TestElasticsearchGetTriggers(t *testing.T) {
+	db := &ElasticsearchDB{}
+	triggers, err := db.GetTriggers("test-index", "test-table")
+	if err != nil {
+		t.Fatalf("GetTriggers 不应返回错误：%v", err)
+	}
+	if len(triggers) != 0 {
+		t.Fatalf("GetTriggers 应返回空列表，实际：%v", triggers)
+	}
+}
+
+// TestElasticsearchConnectNilClient 测试未连接时各操作返回错误。
+func TestElasticsearchConnectNilClient(t *testing.T) {
+	db := &ElasticsearchDB{}
+
+	// Ping
+	if err := db.Ping(); err == nil || !strings.Contains(err.Error(), "连接未打开") {
+		t.Fatalf("Ping: 期望 '连接未打开' 错误，实际：%v", err)
+	}
+
+	// GetDatabases
+	if _, err := db.GetDatabases(); err == nil || !strings.Contains(err.Error(), "连接未打开") {
+		t.Fatalf("GetDatabases: 期望 '连接未打开' 错误，实际：%v", err)
+	}
+
+	// GetColumns
+	if _, err := db.GetColumns("idx", ""); err == nil || !strings.Contains(err.Error(), "连接未打开") {
+		t.Fatalf("GetColumns: 期望 '连接未打开' 错误，实际：%v", err)
+	}
+
+	// GetAllColumns
+	if _, err := db.GetAllColumns("idx"); err == nil || !strings.Contains(err.Error(), "连接未打开") {
+		t.Fatalf("GetAllColumns: 期望 '连接未打开' 错误，实际：%v", err)
+	}
+
+	// GetIndexes
+	if _, err := db.GetIndexes("idx", "tbl"); err == nil || !strings.Contains(err.Error(), "连接未打开") {
+		t.Fatalf("GetIndexes: 期望 '连接未打开' 错误，实际：%v", err)
+	}
+
+	// GetCreateStatement（间接通过 esFetchIndexMapping）
+	if _, err := db.GetCreateStatement("idx", "tbl"); err == nil || !strings.Contains(err.Error(), "连接未打开") {
+		t.Fatalf("GetCreateStatement: 期望 '连接未打开' 错误，实际：%v", err)
+	}
+}
+
+// TestElasticsearchGetCreateStatement 测试获取索引 settings + mappings。
+func TestElasticsearchGetCreateStatement(t *testing.T) {
+	indexDef := map[string]interface{}{
+		"test-index": map[string]interface{}{
+			"settings": map[string]interface{}{
+				"index": map[string]interface{}{
+					"number_of_shards":   "1",
+					"number_of_replicas": "0",
+				},
+			},
+			"mappings": map[string]interface{}{
+				"properties": map[string]interface{}{
+					"title": map[string]interface{}{"type": "text"},
+				},
+			},
+		},
+	}
+
+	server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+		// GetCreateStatement 使用 Indices.Get 方法，路径为 /<index>
+		if r.Method == http.MethodGet && r.URL.Path == "/test-index" && !strings.Contains(r.URL.Path, "_") {
+			writeJSON(w, indexDef)
+			return
+		}
+		w.WriteHeader(http.StatusNotFound)
+	})
+
+	db := newTestESDB(t, server.URL, "test-index")
+	stmt, err := db.GetCreateStatement("test-index", "")
+	if err != nil {
+		t.Fatalf("GetCreateStatement 失败：%v", err)
+	}
+	if !strings.Contains(stmt, "test-index") {
+		t.Fatalf("CreateStatement 应包含索引名，实际：%s", stmt)
+	}
+	if !strings.Contains(stmt, "number_of_shards") {
+		t.Fatalf("CreateStatement 应包含 settings，实际：%s", stmt)
+	}
+	if !strings.Contains(stmt, "mappings") {
+		t.Fatalf("CreateStatement 应包含 mappings，实际：%s", stmt)
+	}
+}
+
+// TestElasticsearchGetIndexes 测试获取索引 settings 信息。
+func TestElasticsearchGetIndexes(t *testing.T) {
+	server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+		if strings.HasPrefix(r.URL.Path, "/test-index/_settings") && r.Method == http.MethodGet {
+			writeJSON(w, map[string]map[string]interface{}{
+				"test-index": {
+					"settings": map[string]interface{}{
+						"index": map[string]interface{}{
+							"number_of_shards":   "3",
+							"number_of_replicas": "1",
+						},
+					},
+				},
+			})
+			return
+		}
+		w.WriteHeader(http.StatusNotFound)
+	})
+
+	db := newTestESDB(t, server.URL, "test-index")
+	indexes, err := db.GetIndexes("test-index", "")
+	if err != nil {
+		t.Fatalf("GetIndexes 失败：%v", err)
+	}
+	if len(indexes) != 1 {
+		t.Fatalf("期望 1 个索引信息，实际 %d", len(indexes))
+	}
+
+	idx := indexes[0]
+	if idx.Name != "test-index" {
+		t.Fatalf("索引名期望 test-index，实际：%s", idx.Name)
+	}
+	if idx.IndexType != "INDEX" {
+		t.Fatalf("索引类型期望 INDEX，实际：%s", idx.IndexType)
+	}
+	if !strings.Contains(idx.ColumnName, "shards=3") {
+		t.Fatalf("索引信息应包含 shards=3，实际：%s", idx.ColumnName)
+	}
+	if !strings.Contains(idx.ColumnName, "replicas=1") {
+		t.Fatalf("索引信息应包含 replicas=1，实际：%s", idx.ColumnName)
+	}
+}
+
+// ---- 辅助函数测试 ----
+
+// TestNormalizeElasticsearchConfig 测试配置规范化。
+func TestNormalizeElasticsearchConfig(t *testing.T) {
+	t.Run("设置默认值", func(t *testing.T) {
+		config := normalizeElasticsearchConfig(connection.ConnectionConfig{
+			Type: "elasticsearch",
+		})
+		if config.Host != "localhost" {
+			t.Fatalf("默认 Host 期望 localhost，实际：%q", config.Host)
+		}
+		if config.Port != defaultEsPort {
+			t.Fatalf("默认 Port 期望 %d，实际：%d", defaultEsPort, config.Port)
+		}
+		if config.User != "" {
+			t.Fatalf("默认 User 期望空字符串，实际：%q", config.User)
+		}
+	})
+
+	t.Run("保留用户设置", func(t *testing.T) {
+		config := normalizeElasticsearchConfig(connection.ConnectionConfig{
+			Type:     "elasticsearch",
+			Host:     "es.example.com",
+			Port:     9201,
+			User:     "admin",
+			Password: "secret",
+		})
+		if config.Host != "es.example.com" {
+			t.Fatalf("Host 期望 es.example.com，实际：%q", config.Host)
+		}
+		if config.Port != 9201 {
+			t.Fatalf("Port 期望 9201，实际：%d", config.Port)
+		}
+		if config.User != "admin" {
+			t.Fatalf("User 期望 admin，实际：%q", config.User)
+		}
+	})
+
+	t.Run("从 URI 中提取配置", func(t *testing.T) {
+		config := normalizeElasticsearchConfig(connection.ConnectionConfig{
+			Type: "elasticsearch",
+			URI:  "http://uri-user:uri-pass@es-host:9202",
+		})
+		if config.User != "uri-user" {
+			t.Fatalf("User 期望从 URI 提取 uri-user，实际：%q", config.User)
+		}
+		if config.Password != "uri-pass" {
+			t.Fatalf("Password 期望从 URI 提取 uri-pass，实际：%q", config.Password)
+		}
+		if config.Host != "es-host" {
+			t.Fatalf("Host 期望从 URI 提取 es-host，实际：%q", config.Host)
+		}
+		if config.Port != 9202 {
+			t.Fatalf("Port 期望从 URI 提取 9202，实际：%d", config.Port)
+		}
+	})
+
+	t.Run("已有 Host 时不从 URI 覆盖", func(t *testing.T) {
+		config := normalizeElasticsearchConfig(connection.ConnectionConfig{
+			Type: "elasticsearch",
+			Host: "custom-host",
+			URI:  "http://uri-user:uri-pass@uri-host:9200",
+		})
+		if config.Host != "custom-host" {
+			t.Fatalf("已有 Host 时不应覆盖，期望 custom-host，实际：%q", config.Host)
+		}
+	})
+}
+
+// TestApplyElasticsearchURI 测试 URI 解析。
+func TestApplyElasticsearchURI(t *testing.T) {
+	t.Run("HTTPS URI 启用 SSL", func(t *testing.T) {
+		config := applyElasticsearchURI(connection.ConnectionConfig{
+			URI: "https://user:pass@es.example.com:9200",
+		})
+		if !config.UseSSL {
+			t.Fatal("HTTPS URI 应启用 SSL")
+		}
+		if config.SSLMode != "required" {
+			t.Fatalf("SSLMode 期望 required，实际：%q", config.SSLMode)
+		}
+		if config.Host != "es.example.com" {
+			t.Fatalf("Host 期望 es.example.com，实际：%q", config.Host)
+		}
+	})
+
+	t.Run("非 HTTP 协议忽略", func(t *testing.T) {
+		config := applyElasticsearchURI(connection.ConnectionConfig{
+			URI: "tcp://localhost:9200",
+		})
+		if config.Host != "" {
+			t.Fatalf("非 HTTP 协议不应设置 Host，实际：%q", config.Host)
+		}
+	})
+
+	t.Run("空 URI 不修改配置", func(t *testing.T) {
+		config := applyElasticsearchURI(connection.ConnectionConfig{
+			Host: "original-host",
+			Port: 9300,
+		})
+		if config.Host != "original-host" || config.Port != 9300 {
+			t.Fatal("空 URI 不应修改原有配置")
+		}
+	})
+
+	t.Run("已有用户凭证不被 URI 覆盖", func(t *testing.T) {
+		config := applyElasticsearchURI(connection.ConnectionConfig{
+			User:     "existing-user",
+			Password: "existing-pass",
+			URI:      "http://uri-user:uri-pass@localhost:9200",
+		})
+		if config.User != "existing-user" {
+			t.Fatalf("已有 User 不应覆盖，期望 existing-user，实际：%q", config.User)
+		}
+		if config.Password != "existing-pass" {
+			t.Fatalf("已有 Password 不应覆盖，期望 existing-pass，实际：%q", config.Password)
+		}
+	})
+}
+
+// TestExtractColumnsFromMapping 测试 mapping 字段提取。
+func TestExtractColumnsFromMapping(t *testing.T) {
+	t.Run("标准字段提取", func(t *testing.T) {
+		mapping := map[string]interface{}{
+			"test-index": map[string]interface{}{
+				"mappings": map[string]interface{}{
+					"properties": map[string]interface{}{
+						"title": map[string]interface{}{"type": "text"},
+						"count": map[string]interface{}{"type": "long"},
+						"tags":  map[string]interface{}{"type": "keyword"},
+					},
+				},
+			},
+		}
+
+		columns := extractColumnsFromMapping("test-index", mapping)
+		if len(columns) != 3 {
+			t.Fatalf("期望 3 个字段，实际 %d", len(columns))
+		}
+
+		typeMap := make(map[string]string)
+		for _, col := range columns {
+			typeMap[col.Name] = col.Type
+		}
+		expectedTypes := map[string]string{"title": "text", "count": "long", "tags": "keyword"}
+		for name, expectedType := range expectedTypes {
+			if typeMap[name] != expectedType {
+				t.Fatalf("字段 %q 类型期望 %q，实际 %q", name, expectedType, typeMap[name])
+			}
+		}
+	})
+
+	t.Run("含 description 的字段提取注释", func(t *testing.T) {
+		mapping := map[string]interface{}{
+			"idx": map[string]interface{}{
+				"mappings": map[string]interface{}{
+					"properties": map[string]interface{}{
+						"email": map[string]interface{}{
+							"type":        "keyword",
+							"description": "用户邮箱地址",
+						},
+					},
+				},
+			},
+		}
+
+		columns := extractColumnsFromMapping("idx", mapping)
+		if len(columns) != 1 {
+			t.Fatalf("期望 1 个字段，实际 %d", len(columns))
+		}
+		if columns[0].Comment != "用户邮箱地址" {
+			t.Fatalf("期望注释 '用户邮箱地址'，实际：%q", columns[0].Comment)
+		}
+	})
+
+	t.Run("空 mapping 返回空列表", func(t *testing.T) {
+		mapping := map[string]interface{}{}
+		columns := extractColumnsFromMapping("non-existent", mapping)
+		if len(columns) != 0 {
+			t.Fatalf("空 mapping 应返回空列表，实际 %d 个", len(columns))
+		}
+	})
+
+	t.Run("索引数据无 mappings 字段", func(t *testing.T) {
+		mapping := map[string]interface{}{
+			"idx": map[string]interface{}{
+				"settings": map[string]interface{}{},
+			},
+		}
+		columns := extractColumnsFromMapping("idx", mapping)
+		if len(columns) != 0 {
+			t.Fatalf("无 mappings 时应返回空列表，实际 %d 个", len(columns))
+		}
+	})
+
+	t.Run("从 mapping 响应中自动查找索引数据", func(t *testing.T) {
+		// 模拟 ES 返回的 mapping 响应，键名不完全匹配（如带日期后缀的索引别名）
+		mapping := map[string]interface{}{
+			"logs-2024.01.01": map[string]interface{}{
+				"mappings": map[string]interface{}{
+					"properties": map[string]interface{}{
+						"message": map[string]interface{}{"type": "text"},
+					},
+				},
+			},
+		}
+		columns := extractColumnsFromMapping("non-matching-key", mapping)
+		if len(columns) != 1 {
+			t.Fatalf("应自动查找 mapping 数据，期望 1 个字段，实际 %d 个", len(columns))
+		}
+	})
+}
+
+// TestIsJSONDSL 测试 JSON DSL 检测。
+func TestIsJSONDSL(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected bool
+	}{
+		{"JSON DSL", `{"query":{"match_all":{}}}`, true},
+		{"简单字符串", "hello world", false},
+		{"空字符串", "", false},
+		{"JSON 对象以空格开头", `  {"query":{}}`, true},
+		{"非查询 JSON 前缀", `[1,2,3]`, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := isJSONDSL(tt.input); got != tt.expected {
+				t.Fatalf("isJSONDSL(%q) = %v，期望 %v", tt.input, got, tt.expected)
+			}
+		})
+	}
+}
+
+// TestExtractEsFieldType 测试字段类型提取。
+func TestExtractEsFieldType(t *testing.T) {
+	tests := []struct {
+		name     string
+		prop     interface{}
+		expected string
+	}{
+		{
+			name:     "标准字段类型",
+			prop:     map[string]interface{}{"type": "keyword"},
+			expected: "keyword",
+		},
+		{
+			name:     "嵌套对象类型",
+			prop:     map[string]interface{}{"properties": map[string]interface{}{}},
+			expected: "object",
+		},
+		{
+			name:     "无 type 无 properties",
+			prop:     map[string]interface{}{"enabled": true},
+			expected: "unknown",
+		},
+		{
+			name:     "非 map 类型",
+			prop:     "invalid",
+			expected: "unknown",
+		},
+		{
+			name:     "nil 值",
+			prop:     nil,
+			expected: "unknown",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := extractEsFieldType(tt.prop); got != tt.expected {
+				t.Fatalf("extractEsFieldType() = %q，期望 %q", got, tt.expected)
+			}
+		})
+	}
+}
+
+// TestResolveEsIndexName 测试索引名解析。
+func TestResolveEsIndexName(t *testing.T) {
+	tests := []struct {
+		name      string
+		dbName    string
+		tableName string
+		defaultDB string
+		expected  string
+	}{
+		{
+			name:      "优先使用 tableName",
+			dbName:    "db1",
+			tableName: "tbl1",
+			defaultDB: "default",
+			expected:  "tbl1",
+		},
+		{
+			name:      "回退到 dbName",
+			dbName:    "db1",
+			tableName: "",
+			defaultDB: "default",
+			expected:  "db1",
+		},
+		{
+			name:      "回退到默认值",
+			dbName:    "",
+			tableName: "",
+			defaultDB: "default",
+			expected:  "default",
+		},
+		{
+			name:      "全部为空",
+			dbName:    "",
+			tableName: "",
+			defaultDB: "",
+			expected:  "",
+		},
+		{
+			name:      "空白字符等同于空",
+			dbName:    "  ",
+			tableName: "  ",
+			defaultDB: "default",
+			expected:  "default",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := resolveEsIndexName(tt.dbName, tt.tableName, tt.defaultDB)
+			if got != tt.expected {
+				t.Fatalf("resolveEsIndexName(%q, %q, %q) = %q，期望 %q",
+					tt.dbName, tt.tableName, tt.defaultDB, got, tt.expected)
+			}
+		})
+	}
+}
+
+// TestESMockIntegration 使用完整 mock 服务器的集成测试。
+func TestESMockIntegration(t *testing.T) {
+	// 构造完整的 mock mapping 响应
+	mappingData := buildMockESMappingResponse("products", map[string]string{
+		"name":        "text",
+		"price":       "float",
+		"in_stock":    "boolean",
+		"created_at":  "date",
+		"description": "text",
+	})
+
+	server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+		path := r.URL.Path
+
+		switch {
+		// Ping
+		case r.Method == http.MethodHead && path == "/":
+			w.WriteHeader(http.StatusOK)
+
+		// Indices.Get("*") — 返回所有索引
+		case r.Method == http.MethodGet && (path == "/" || path == "/*") && !strings.Contains(path, "_"):
+			writeJSON(w, map[string]interface{}{
+				"products":  map[string]interface{}{},
+				"orders":    map[string]interface{}{},
+				".internal": map[string]interface{}{},
+			})
+
+		// Indices.GetAlias — 返回别名映射
+		case strings.Contains(path, "/_alias") && r.Method == http.MethodGet:
+			writeJSON(w, map[string]interface{}{
+				"products": map[string]interface{}{
+					"aliases": map[string]interface{}{
+						"products-alias": map[string]interface{}{},
+					},
+				},
+			})
+
+		// Mapping
+		case strings.HasSuffix(path, "/_mapping"):
+			writeJSON(w, mappingData)
+
+		// Settings
+		case strings.HasSuffix(path, "/_settings"):
+			writeJSON(w, map[string]map[string]interface{}{
+				"products": {
+					"settings": map[string]interface{}{
+						"index": map[string]interface{}{
+							"number_of_shards":   "1",
+							"number_of_replicas": "1",
+						},
+					},
+				},
+			})
+
+		// GetCreateStatement
+		case r.Method == http.MethodGet && !strings.Contains(path, "_"):
+			writeJSON(w, map[string]interface{}{
+				"products": map[string]interface{}{
+					"settings": map[string]interface{}{"index": map[string]interface{}{"number_of_shards": "1"}},
+					"mappings": map[string]interface{}{"properties": map[string]interface{}{"name": map[string]interface{}{"type": "text"}}},
+				},
+			})
+
+		// Search
+		case r.Method == http.MethodPost && strings.HasSuffix(path, "/_search"):
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{
+				"hits": {
+					"total": {"value": 3},
+					"hits": [
+						{"_index": "products", "_id": "1", "_source": {"name": "商品A", "price": 99.9}},
+						{"_index": "products", "_id": "2", "_source": {"name": "商品B", "price": 199.9}},
+						{"_index": "products", "_id": "3", "_source": {"name": "商品C", "price": 299.9}}
+					]
+				}
+			}`))
+
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	db := newTestESDB(t, server.URL, "products")
+
+	// 验证 Ping
+	if err := db.Ping(); err != nil {
+		t.Fatalf("Ping 失败：%v", err)
+	}
+
+	// 验证 GetDatabases（应返回全部索引包括系统索引）
+	databases, err := db.GetDatabases()
+	if err != nil {
+		t.Fatalf("GetDatabases 失败：%v", err)
+	}
+	slices.Sort(databases)
+	if len(databases) != 3 || databases[0] != ".internal" || databases[1] != "orders" || databases[2] != "products" {
+		t.Fatalf("GetDatabases 期望 [.internal, orders, products]，实际：%v", databases)
+	}
+
+	// 验证 GetTables（应返回索引名和别名）
+	tables, err := db.GetTables("")
+	if err != nil {
+		t.Fatalf("GetTables 失败：%v", err)
+	}
+	if len(tables) < 1 || tables[0] != "products" {
+		t.Fatalf("GetTables 第一个元素应为 products，实际：%v", tables)
+	}
+	hasAlias := false
+	for _, tbl := range tables {
+		if tbl == "products-alias" {
+			hasAlias = true
+		}
+	}
+	if !hasAlias {
+		t.Fatalf("GetTables 应包含别名 products-alias，实际：%v", tables)
+	}
+
+	// 验证 GetColumns
+	columns, err := db.GetColumns("products", "")
+	if err != nil {
+		t.Fatalf("GetColumns 失败：%v", err)
+	}
+	if len(columns) != 6 { // _id + 5 个 mapping 字段
+		t.Fatalf("GetColumns 期望 6 个字段，实际 %d", len(columns))
+	}
+
+	// 验证 DSL 查询
+	rows, _, err := db.Query(`{"query":{"match_all":{}}}`)
+	if err != nil {
+		t.Fatalf("DSL 查询失败：%v", err)
+	}
+	if len(rows) != 3 {
+		t.Fatalf("DSL 查询期望 3 条结果，实际 %d", len(rows))
+	}
+
+	// 验证 query_string 查询
+	rows, _, err = db.Query("商品")
+	if err != nil {
+		t.Fatalf("query_string 查询失败：%v", err)
+	}
+	if len(rows) != 3 {
+		t.Fatalf("query_string 查询期望 3 条结果，实际 %d", len(rows))
+	}
+
+	// 验证 GetCreateStatement
+	stmt, err := db.GetCreateStatement("products", "")
+	if err != nil {
+		t.Fatalf("GetCreateStatement 失败：%v", err)
+	}
+	if !strings.Contains(stmt, "products") {
+		t.Fatalf("GetCreateStatement 应包含索引名，实际：%s", stmt)
+	}
+
+	// 验证 Exec 不支持
+	_, err = db.Exec("DELETE products")
+	if err == nil || !strings.Contains(err.Error(), "不支持") {
+		t.Fatalf("Exec 应返回不支持错误，实际：%v", err)
+	}
+
+	// 验证 GetForeignKeys / GetTriggers 返回空
+	fks, _ := db.GetForeignKeys("products", "")
+	if len(fks) != 0 {
+		t.Fatalf("GetForeignKeys 应返回空，实际：%d", len(fks))
+	}
+	triggers, _ := db.GetTriggers("products", "")
+	if len(triggers) != 0 {
+		t.Fatalf("GetTriggers 应返回空，实际：%d", len(triggers))
+	}
+}
+
+// ---- P1 功能测试 ----
+
+// TestParseESConsoleRequest 测试 DevTools 风格查询解析。
+func TestParseESConsoleRequest(t *testing.T) {
+	t.Run("带 body 的 GET 请求", func(t *testing.T) {
+		input := "GET /logs-*/_search\n{\"query\":{\"match_all\":{}}}"
+		req, ok := parseESConsoleRequest(input)
+		if !ok {
+			t.Fatal("解析应成功")
+		}
+		if req.Method != "GET" {
+			t.Fatalf("方法期望 GET，实际：%q", req.Method)
+		}
+		if req.Path != "/logs-*/_search" {
+			t.Fatalf("路径期望 /logs-*/_search，实际：%q", req.Path)
+		}
+		if len(req.Body) == 0 {
+			t.Fatal("body 不应为空")
+		}
+	})
+
+	t.Run("带 body 的 POST 请求", func(t *testing.T) {
+		input := "POST /orders/_search\n{\"size\":10}"
+		req, ok := parseESConsoleRequest(input)
+		if !ok {
+			t.Fatal("解析应成功")
+		}
+		if req.Method != "POST" {
+			t.Fatalf("方法期望 POST，实际：%q", req.Method)
+		}
+		if req.Path != "/orders/_search" {
+			t.Fatalf("路径期望 /orders/_search，实际：%q", req.Path)
+		}
+		if len(req.Body) == 0 {
+			t.Fatal("body 不应为空")
+		}
+	})
+
+	t.Run("无 body 的 GET 请求", func(t *testing.T) {
+		input := "GET /_cluster/health"
+		req, ok := parseESConsoleRequest(input)
+		if !ok {
+			t.Fatal("解析应成功")
+		}
+		if req.Method != "GET" {
+			t.Fatalf("方法期望 GET，实际：%q", req.Method)
+		}
+		if req.Path != "/_cluster/health" {
+			t.Fatalf("路径期望 /_cluster/health，实际：%q", req.Path)
+		}
+		if len(req.Body) != 0 {
+			t.Fatalf("无 body 时应为空，实际长度：%d", len(req.Body))
+		}
+	})
+
+	t.Run("DELETE 方法应被拒绝", func(t *testing.T) {
+		input := "DELETE /index"
+		_, ok := parseESConsoleRequest(input)
+		if ok {
+			t.Fatal("DELETE 请求应解析失败")
+		}
+	})
+
+	t.Run("纯 JSON 应被拒绝", func(t *testing.T) {
+		input := "{\"query\":{\"match_all\":{}}}"
+		_, ok := parseESConsoleRequest(input)
+		if ok {
+			t.Fatal("纯 JSON 不是 DevTools 格式，应解析失败")
+		}
+	})
+
+	t.Run("SQL 语句应被拒绝", func(t *testing.T) {
+		input := "select * from test"
+		_, ok := parseESConsoleRequest(input)
+		if ok {
+			t.Fatal("SQL 语句不是 DevTools 格式，应解析失败")
+		}
+	})
+}
+
+// TestFlattenESSource 测试嵌套对象展开为点分路径。
+func TestFlattenESSource(t *testing.T) {
+	t.Run("嵌套对象展开", func(t *testing.T) {
+		source := map[string]interface{}{
+			"user": map[string]interface{}{
+				"name": "张三",
+				"age":  18,
+			},
+		}
+		row := make(map[string]interface{})
+		flattenESSource("", source, row)
+
+		if row["user.name"] != "张三" {
+			t.Fatalf("user.name 期望 张三，实际：%v", row["user.name"])
+		}
+		if row["user.age"] != 18 {
+			t.Fatalf("user.age 期望 18，实际：%v", row["user.age"])
+		}
+		// 原始嵌套键不应保留
+		if _, ok := row["user"]; ok {
+			t.Fatal("展开后不应保留原始嵌套键 user")
+		}
+	})
+
+	t.Run("数组序列化为 JSON 字符串", func(t *testing.T) {
+		source := map[string]interface{}{
+			"tags": []interface{}{"a", "b"},
+		}
+		row := make(map[string]interface{})
+		flattenESSource("", source, row)
+
+		tags, ok := row["tags"].(string)
+		if !ok {
+			t.Fatalf("tags 应序列化为 JSON 字符串，实际类型：%T", row["tags"])
+		}
+		if tags != `["a","b"]` {
+			t.Fatalf("tags JSON 不匹配，实际：%v", tags)
+		}
+	})
+
+	t.Run("多层嵌套展开", func(t *testing.T) {
+		source := map[string]interface{}{
+			"a": map[string]interface{}{
+				"b": map[string]interface{}{
+					"c": 1,
+				},
+			},
+		}
+		row := make(map[string]interface{})
+		flattenESSource("", source, row)
+
+		if row["a.b.c"] != 1 {
+			t.Fatalf("a.b.c 期望 1，实际：%v", row["a.b.c"])
+		}
+		if _, ok := row["a"]; ok {
+			t.Fatal("展开后不应保留原始嵌套键 a")
+		}
+		if _, ok := row["a.b"]; ok {
+			t.Fatal("展开后不应保留中间嵌套键 a.b")
+		}
+	})
+
+	t.Run("空对象返回空", func(t *testing.T) {
+		source := map[string]interface{}{}
+		row := make(map[string]interface{})
+		flattenESSource("", source, row)
+
+		if len(row) != 0 {
+			t.Fatalf("空对象展开后应为空，实际长度：%d", len(row))
+		}
+	})
+}
+
+// TestElasticsearchQueryConsole 测试 DevTools 风格查询端到端。
+func TestElasticsearchQueryConsole(t *testing.T) {
+	t.Run("DevTools 格式查询能正确执行", func(t *testing.T) {
+		var capturedMethod, capturedPath string
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			capturedMethod = r.Method
+			capturedPath = r.URL.Path
+
+			if r.Method == http.MethodGet && r.URL.Path == "/test-index/_search" {
+				w.Header().Set("Content-Type", "application/json")
+				_, _ = w.Write([]byte(`{
+					"hits": {
+						"total": {"value": 1},
+						"hits": [
+							{"_index": "test-index", "_id": "1", "_source": {"name": "测试文档"}}
+						]
+					}
+				}`))
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		})
+
+		db := newTestESDB(t, server.URL, "test-index")
+
+		// 模拟 DevTools 格式查询
+		consoleQuery := "GET /test-index/_search\n{\"query\":{\"match_all\":{}}}"
+		rows, _, err := db.Query(consoleQuery)
+		if err != nil {
+			t.Fatalf("DevTools 查询失败：%v", err)
+		}
+		if len(rows) != 1 {
+			t.Fatalf("期望 1 条结果，实际 %d", len(rows))
+		}
+		if rows[0]["name"] != "测试文档" {
+			t.Fatalf("期望 name=测试文档，实际：%v", rows[0]["name"])
+		}
+
+		// 验证请求路径正确
+		if capturedMethod != "GET" {
+			t.Fatalf("请求方法期望 GET，实际：%q", capturedMethod)
+		}
+		if capturedPath != "/test-index/_search" {
+			t.Fatalf("请求路径期望 /test-index/_search，实际：%q", capturedPath)
+		}
+	})
+
+	t.Run("带 index 的 DevTools 查询", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			if r.Method == http.MethodGet && r.URL.Path == "/my-index/_search" {
+				w.Header().Set("Content-Type", "application/json")
+				_, _ = w.Write([]byte(`{"hits":{"total":{"value":0},"hits":[]}}`))
+				return
+			}
+			w.WriteHeader(http.StatusNotFound)
+		})
+
+		db := newTestESDB(t, server.URL, "default-index")
+		query := "GET /my-index/_search\n{\"query\":{\"match_all\":{}}}"
+		rows, _, err := db.Query(query)
+		if err != nil {
+			t.Fatalf("查询失败：%v", err)
+		}
+		if len(rows) != 0 {
+			t.Fatalf("期望 0 条结果，实际 %d", len(rows))
+		}
+	})
+}
+
+// TestElasticsearchAggregations 测试 aggregation 结果展示。
+func TestElasticsearchAggregations(t *testing.T) {
+	t.Run("仅有 aggregations 无 hits", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{
+				"hits": {
+					"total": {"value": 0},
+					"hits": []
+				},
+				"aggregations": {
+					"status_count": {
+						"buckets": [
+							{"key": "active", "doc_count": 42},
+							{"key": "inactive", "doc_count": 8}
+						]
+					}
+				}
+			}`))
+		})
+
+		db := newTestESDB(t, server.URL, "test-index")
+		rows, columns, err := db.Query(`{"aggs":{"status_count":{"terms":{"field":"status"}}}}`)
+		if err != nil {
+			t.Fatalf("聚合查询失败：%v", err)
+		}
+
+		// hits 为空时应仍返回 _aggregations 行
+		if len(rows) < 1 {
+			t.Fatal("聚合结果不应为空，至少应包含 _aggregations 行")
+		}
+
+		// 验证列中包含 _aggregations 标识
+		hasAgg := false
+		for _, col := range columns {
+			if col == "_aggregations" {
+				hasAgg = true
+			}
+		}
+		if !hasAgg {
+			t.Fatalf("结果列应包含 _aggregations，实际：%v", columns)
+		}
+	})
+
+	t.Run("hits 和 aggregations 同时存在", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{
+				"hits": {
+					"total": {"value": 2},
+					"hits": [
+						{"_index": "test", "_id": "1", "_source": {"status": "active"}},
+						{"_index": "test", "_id": "2", "_source": {"status": "active"}}
+					]
+				},
+				"aggregations": {
+					"avg_score": {
+						"value": 85.5
+					}
+				}
+			}`))
+		})
+
+		db := newTestESDB(t, server.URL, "test-index")
+		rows, columns, err := db.Query(`{"aggs":{"avg_score":{"avg":{"field":"score"}}}}`)
+		if err != nil {
+			t.Fatalf("聚合查询失败：%v", err)
+		}
+
+		// 应包含 hits 数据
+		if len(rows) < 2 {
+			t.Fatalf("期望至少 2 条 hits 结果，实际 %d", len(rows))
+		}
+
+		// 验证列中包含 _aggregations
+		hasAgg := false
+		for _, col := range columns {
+			if col == "_aggregations" {
+				hasAgg = true
+			}
+		}
+		if !hasAgg {
+			t.Fatalf("结果列应包含 _aggregations，实际：%v", columns)
+		}
+	})
+}
+
+// TestESAPIKeyAuth 测试 API Key 认证配置。
+func TestESAPIKeyAuth(t *testing.T) {
+	t.Run("ConnectionParams 中的 apiKey 应设置到配置", func(t *testing.T) {
+		cfg := buildESClientConfig(connection.ConnectionConfig{
+			Host:             "localhost",
+			Port:             9200,
+			ConnectionParams: "apiKey=test-key-123",
+		})
+		if cfg.APIKey != "test-key-123" {
+			t.Fatalf("APIKey 期望 test-key-123，实际：%q", cfg.APIKey)
+		}
+	})
+
+	t.Run("使用 API Key 时 Basic Auth 应被清除", func(t *testing.T) {
+		cfg := buildESClientConfig(connection.ConnectionConfig{
+			Host:             "localhost",
+			Port:             9200,
+			User:             "elastic",
+			Password:         "pass",
+			ConnectionParams: "apiKey=test-key-123",
+		})
+		if cfg.APIKey != "test-key-123" {
+			t.Fatalf("APIKey 期望 test-key-123，实际：%q", cfg.APIKey)
+		}
+		if cfg.Username != "" {
+			t.Fatalf("使用 API Key 时 Username 应为空，实际：%q", cfg.Username)
+		}
+		if cfg.Password != "" {
+			t.Fatalf("使用 API Key 时 Password 应为空，实际：%q", cfg.Password)
+		}
+	})
+}
+
+// TestElasticsearchSourceFlatten 测试 _source 嵌套对象扁平化端到端。
+func TestElasticsearchSourceFlatten(t *testing.T) {
+	t.Run("嵌套对象在结果中扁平化", func(t *testing.T) {
+		server := newMockESServer(t, func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{
+				"hits": {
+					"total": {"value": 1},
+					"hits": [
+						{
+							"_index": "test-index",
+							"_id": "1",
+							"_source": {
+								"user": {"name": "张三", "age": 18},
+								"title": "测试"
+							}
+						}
+					]
+				}
+			}`))
+		})
+
+		db := newTestESDB(t, server.URL, "test-index")
+		rows, columns, err := db.Query(`{"query":{"match_all":{}}}`)
+		if err != nil {
+			t.Fatalf("查询失败：%v", err)
+		}
+		if len(rows) != 1 {
+			t.Fatalf("期望 1 条结果，实际 %d", len(rows))
+		}
+
+		// 验证扁平化字段存在
+		if rows[0]["user.name"] != "张三" {
+			t.Fatalf("user.name 期望 张三，实际：%v", rows[0]["user.name"])
+		}
+		// JSON 数字解析为 float64
+		if age, ok := rows[0]["user.age"].(float64); !ok || age != 18 {
+			t.Fatalf("user.age 期望 18，实际：%v (类型：%T)", rows[0]["user.age"], rows[0]["user.age"])
+		}
+		if rows[0]["title"] != "测试" {
+			t.Fatalf("title 期望 测试，实际：%v", rows[0]["title"])
+		}
+
+		// 验证列中包含扁平化字段
+		colSet := make(map[string]bool)
+		for _, col := range columns {
+			colSet[col] = true
+		}
+		if !colSet["user.name"] {
+			t.Fatalf("列应包含 user.name，实际：%v", columns)
+		}
+		if !colSet["user.age"] {
+			t.Fatalf("列应包含 user.age，实际：%v", columns)
+		}
+
+		// 验证 _source 原始 JSON 保留（序列化为 JSON 字符串）
+		sourceRaw, ok := rows[0]["_source"]
+		if !ok {
+			t.Fatal("结果应包含 _source 原始 JSON")
+		}
+		sourceStr, ok := sourceRaw.(string)
+		if !ok {
+			t.Fatalf("_source 应为 JSON 字符串类型，实际类型：%T", sourceRaw)
+		}
+		var sourceMap map[string]interface{}
+		if err := json.Unmarshal([]byte(sourceStr), &sourceMap); err != nil {
+			t.Fatalf("_source JSON 解析失败：%v", err)
+		}
+		if _, hasNested := sourceMap["user"]; !hasNested {
+			t.Fatal("_source 原始 JSON 中应保留嵌套结构 user")
+		}
+	})
+}
+
+// ---- extractESSQLFromTable 测试 ----
+
+func TestESExtractSQLFromTable(t *testing.T) {
+	tests := []struct {
+		name string
+		sql  string
+		want string
+	}{
+		{"简单表名", `SELECT * FROM "app_log_user" LIMIT 101 OFFSET 0`, "app_log_user"},
+		{"无引号表名", `SELECT * FROM my_index LIMIT 10`, "my_index"},
+		{"带点的表名", `SELECT * FROM "iot_pro_biz_operate_log.index.20240626" LIMIT 101`, "iot_pro_biz_operate_log.index.20240626"},
+		{"通配符表名", `SELECT * FROM "logs-*" LIMIT 10`, "logs-*"},
+		{"多段引号标识符", `SELECT * FROM "iot_pro_biz_operate_log"."index"."20250515" WHERE (("_score">45)) LIMIT 101 OFFSET 0`, "iot_pro_biz_operate_log.index.20250515"},
+		{"两段引号标识符", `SELECT * FROM "my_schema"."my_table" LIMIT 10`, "my_schema.my_table"},
+		{"非 SELECT 语句", `{"query": {"match_all": {}}}`, ""},
+		{"空语句", ``, ""},
+		{"FROM 语句片段", `FROM "test"`, "test"},
+		{"FROM 后无表名", `SELECT * FROM`, ""},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := extractESSQLFromTable(tt.sql)
+			if got != tt.want {
+				t.Fatalf("extractESSQLFromTable(%q) = %q, want %q", tt.sql, got, tt.want)
+			}
+		})
+	}
+}
+
+// ---- parseESSQL 测试 ----
+
+func TestESParseSQL(t *testing.T) {
+	tests := []struct {
+		name      string
+		sql       string
+		wantTable string
+		wantLimit int
+		wantOff   int
+		wantOK    bool
+	}{
+		{"基础SELECT", `SELECT * FROM "app_log_user" LIMIT 101 OFFSET 0`, "app_log_user", 101, 0, true},
+		{"带点索引名", `SELECT * FROM "iot.index.2024" LIMIT 200`, "iot.index.2024", 200, 0, true},
+		{"多段引号", `SELECT * FROM "schema"."table" LIMIT 50 OFFSET 10`, "schema.table", 50, 10, true},
+		{"无LIMIT", `SELECT * FROM "my_index"`, "my_index", 0, 0, true},
+		{"DSL JSON", `{"query": {"match_all": {}}}`, "", 0, 0, false},
+		{"分页_第1页", `SELECT * FROM "app_log_user" LIMIT 101 OFFSET 0`, "app_log_user", 101, 0, true},
+		{"分页_第2页", `SELECT * FROM "app_log_user" LIMIT 101 OFFSET 100`, "app_log_user", 101, 100, true},
+		{"分页_第3页", `SELECT * FROM "app_log_user" LIMIT 101 OFFSET 200`, "app_log_user", 101, 200, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			parsed, ok := parseESSQL(tt.sql)
+			if ok != tt.wantOK {
+				t.Fatalf("parseESSQL(%q) ok=%v want %v", tt.sql, ok, tt.wantOK)
+			}
+			if !tt.wantOK {
+				return
+			}
+			if parsed.Table != tt.wantTable {
+				t.Errorf("Table=%q want %q", parsed.Table, tt.wantTable)
+			}
+			if parsed.Limit != tt.wantLimit {
+				t.Errorf("Limit=%d want %d", parsed.Limit, tt.wantLimit)
+			}
+			if parsed.Offset != tt.wantOff {
+				t.Errorf("Offset=%d want %d", parsed.Offset, tt.wantOff)
+			}
+		})
+	}
+}
+
+func TestESConvertWhere(t *testing.T) {
+	tests := []struct {
+		name  string
+		where string
+		key   string
+	}{
+		{"等值", `"status" = 'active'`, "term"},
+		{"范围", `"age" > 18`, "range"},
+		{"score", `"_score" > 45`, "range"},
+		{"AND", `"a" = '1' AND "b" > 2`, "bool"},
+		{"OR", `"a" = '1' OR "b" = '2'`, "bool"},
+		{"IS NULL", `"name" IS NULL`, "bool"},
+		{"IS NOT NULL", `"name" IS NOT NULL`, "exists"},
+		{"LIKE", `"name" LIKE 'test%'`, "wildcard"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := convertSQLWhereToESQuery(tt.where)
+			if result == nil {
+				t.Fatal("convertSQLWhereToESQuery returned nil")
+			}
+			if _, ok := result[tt.key]; !ok {
+				keys := make([]string, 0, len(result))
+				for k := range result {
+					keys = append(keys, k)
+				}
+				t.Errorf("expected key %q, got %v", tt.key, keys)
+			}
+		})
+	}
+}
diff --git a/internal/db/gaussdb_impl.go b/internal/db/gaussdb_impl.go
new file mode 100644
index 0000000..88ba92b
--- /dev/null
+++ b/internal/db/gaussdb_impl.go
@@ -0,0 +1,262 @@
+//go:build gonavi_full_drivers || gonavi_gaussdb_driver
+
+package db
+
+import (
+	"database/sql"
+	"fmt"
+	"net"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+	"GoNavi-Wails/internal/ssh"
+	"GoNavi-Wails/internal/utils"
+
+	_ "github.com/HuaweiCloudDeveloper/gaussdb-go/stdlib"
+)
+
+const defaultGaussDBPort = 5432
+
+// GaussDB 使用独立 gaussdb:// URI 与官方 database/sql 驱动，
+// 元数据与大多数 SQL 行为按 PG-like 路径复用。
+type GaussDB struct {
+	PostgresDB
+}
+
+func applyGaussDBURI(config connection.ConnectionConfig) connection.ConnectionConfig {
+	uriText := strings.TrimSpace(config.URI)
+	if uriText == "" {
+		return config
+	}
+	parsed, ok := parseConnectionURI(uriText, "gaussdb", "postgres", "postgresql")
+	if !ok {
+		return config
+	}
+
+	if parsed.User != nil {
+		if config.User == "" {
+			config.User = parsed.User.Username()
+		}
+		if pass, ok := parsed.User.Password(); ok && config.Password == "" {
+			config.Password = pass
+		}
+	}
+
+	if dbName := strings.TrimPrefix(parsed.Path, "/"); dbName != "" && config.Database == "" {
+		config.Database = dbName
+	}
+
+	defaultPort := config.Port
+	if defaultPort <= 0 {
+		defaultPort = defaultGaussDBPort
+	}
+	if strings.TrimSpace(config.Host) == "" && strings.TrimSpace(parsed.Host) != "" {
+		host, port, ok := parseHostPortWithDefault(parsed.Host, defaultPort)
+		if ok {
+			config.Host = host
+			config.Port = port
+		}
+	}
+	if config.Port <= 0 {
+		config.Port = defaultGaussDBPort
+	}
+
+	return config
+}
+
+func (g *GaussDB) getDSN(config connection.ConnectionConfig) string {
+	runConfig := applyGaussDBURI(config)
+	dbname := runConfig.Database
+	if dbname == "" {
+		dbname = "postgres"
+	}
+	if runConfig.Port <= 0 {
+		runConfig.Port = defaultGaussDBPort
+	}
+	if strings.TrimSpace(runConfig.Host) != "" {
+		if host, port, err := net.SplitHostPort(runConfig.Host); err == nil {
+			runConfig.Host = host
+			if p, convErr := strconv.Atoi(port); convErr == nil && p > 0 {
+				runConfig.Port = p
+			}
+		}
+	}
+
+	u := &url.URL{
+		Scheme: "gaussdb",
+		Host:   net.JoinHostPort(runConfig.Host, strconv.Itoa(runConfig.Port)),
+		Path:   "/" + dbname,
+	}
+	u.User = url.UserPassword(runConfig.User, runConfig.Password)
+	q := url.Values{}
+	q.Set("sslmode", resolvePostgresSSLMode(runConfig))
+	applyPostgresSSLPathParams(q, runConfig)
+	q.Set("connect_timeout", strconv.Itoa(getConnectTimeoutSeconds(runConfig)))
+	mergeConnectionParamsFromConfigWithAllowlist(q, runConfig, postgresConnectionParamNames, "gaussdb", "postgres", "postgresql")
+	u.RawQuery = q.Encode()
+
+	return u.String()
+}
+
+func (g *GaussDB) Connect(config connection.ConnectionConfig) error {
+	if supported, reason := DriverRuntimeSupportStatus("gaussdb"); !supported {
+		if strings.TrimSpace(reason) == "" {
+			reason = "GaussDB 纯 Go 驱动未启用，请先在驱动管理中安装启用"
+		}
+		return fmt.Errorf("%s", reason)
+	}
+
+	runConfig := applyGaussDBURI(config)
+	g.pingTimeout = getConnectTimeout(runConfig)
+
+	cleanupOnFailure := true
+	defer func() {
+		if !cleanupOnFailure {
+			return
+		}
+		if g.conn != nil {
+			_ = g.conn.Close()
+			g.conn = nil
+		}
+		if g.forwarder != nil {
+			_ = g.forwarder.Close()
+			g.forwarder = nil
+		}
+	}()
+
+	if runConfig.UseSSH {
+		logger.Infof("GaussDB 使用 SSH 连接：地址=%s:%d 用户=%s", runConfig.Host, runConfig.Port, runConfig.User)
+
+		forwarder, err := ssh.GetOrCreateLocalForwarder(runConfig.SSH, runConfig.Host, runConfig.Port)
+		if err != nil {
+			return fmt.Errorf("创建 SSH 隧道失败：%w", err)
+		}
+		g.forwarder = forwarder
+
+		host, portStr, err := net.SplitHostPort(forwarder.LocalAddr)
+		if err != nil {
+			return fmt.Errorf("解析本地转发地址失败：%w", err)
+		}
+
+		port, err := strconv.Atoi(portStr)
+		if err != nil {
+			return fmt.Errorf("解析本地端口失败：%w", err)
+		}
+
+		localConfig := runConfig
+		localConfig.Host = host
+		localConfig.Port = port
+		localConfig.UseSSH = false
+
+		runConfig = localConfig
+		logger.Infof("GaussDB 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	}
+
+	sslAttempts := []connection.ConnectionConfig{runConfig}
+	if shouldTrySSLPreferredFallback(runConfig) {
+		sslAttempts = append(sslAttempts, withSSLDisabled(runConfig))
+	}
+
+	var failures []string
+	for sslIndex, sslConfig := range sslAttempts {
+		sslLabel := "SSL"
+		if sslIndex > 0 {
+			sslLabel = "明文回退"
+		}
+
+		attemptDBs := resolvePostgresConnectDatabases(sslConfig)
+		for _, dbName := range attemptDBs {
+			attemptConfig := sslConfig
+			attemptConfig.Database = dbName
+			dsn := g.getDSN(attemptConfig)
+
+			dbConn, err := sql.Open("gaussdb", dsn)
+			if err != nil {
+				failures = append(failures, fmt.Sprintf("%s 数据库=%s 打开连接失败: %v", sslLabel, dbName, err))
+				continue
+			}
+			g.conn = dbConn
+
+			if err := g.Ping(); err != nil {
+				failures = append(failures, fmt.Sprintf("%s 数据库=%s 验证失败: %v", sslLabel, dbName, err))
+				_ = dbConn.Close()
+				g.conn = nil
+				continue
+			}
+
+			if sslIndex > 0 {
+				logger.Warnf("GaussDB SSL 优先连接失败，已回退至明文连接")
+			}
+			if strings.TrimSpace(config.Database) == "" && !strings.EqualFold(dbName, "postgres") {
+				logger.Infof("GaussDB 自动选择连接数据库：%s", dbName)
+			}
+
+			g.ensureSearchPath(dsn)
+
+			cleanupOnFailure = false
+			return nil
+		}
+	}
+
+	if len(failures) == 0 {
+		return fmt.Errorf("连接建立后验证失败：未找到可用的连接数据库")
+	}
+	return fmt.Errorf("连接建立后验证失败：%s", strings.Join(failures, "；"))
+}
+
+func (g *GaussDB) ensureSearchPath(baseDSN string) {
+	if g.conn == nil {
+		return
+	}
+
+	rawSchemas := g.queryUserSchemas()
+	if len(rawSchemas) == 0 {
+		return
+	}
+
+	searchPathSQL, normalizedSchemas := buildKingbaseSearchPathCommon(rawSchemas)
+	if strings.TrimSpace(searchPathSQL) == "" {
+		return
+	}
+
+	searchPathDSNVal := strings.Join(normalizedSchemas, ",")
+	u, parseErr := url.Parse(baseDSN)
+	if parseErr == nil {
+		q := u.Query()
+		q.Set("search_path", searchPathDSNVal)
+		u.RawQuery = q.Encode()
+		newDSN := u.String()
+
+		newDB, err := sql.Open("gaussdb", newDSN)
+		if err == nil {
+			newDB.SetConnMaxLifetime(5 * time.Minute)
+			oldConn := g.conn
+			g.conn = newDB
+			if err := g.Ping(); err == nil {
+				_ = oldConn.Close()
+				logger.Infof("GaussDB 已通过 DSN 配置 search_path：%s", searchPathDSNVal)
+				return
+			}
+			_ = newDB.Close()
+			g.conn = oldConn
+			logger.Warnf("GaussDB DSN search_path 验证失败，回退至 SET 方式")
+		}
+	}
+
+	timeout := g.pingTimeout
+	if timeout <= 0 {
+		timeout = 5 * time.Second
+	}
+	ctx, cancel := utils.ContextWithTimeout(timeout)
+	defer cancel()
+
+	if _, err := g.conn.ExecContext(ctx, fmt.Sprintf("SET search_path TO %s", searchPathSQL)); err != nil {
+		logger.Warnf("GaussDB 设置 search_path 失败：%v", err)
+		return
+	}
+	logger.Infof("GaussDB 已通过 SET 设置 search_path：%s", searchPathSQL)
+}
diff --git a/internal/db/highgo_impl.go b/internal/db/highgo_impl.go
index 492d389..19fb06c 100644
--- a/internal/db/highgo_impl.go
+++ b/internal/db/highgo_impl.go
@@ -5,6 +5,7 @@ package db
 import (
 	"context"
 	"database/sql"
+	"database/sql/driver"
 	"fmt"
 	"net"
 	"net/url"
@@ -17,7 +18,7 @@ import (
 	"GoNavi-Wails/internal/ssh"
 	"GoNavi-Wails/internal/utils"
 
-	_ "github.com/highgo/pq-sm3" // HighGo uses dedicated SM3-capable driver
+	highgopq "github.com/highgo/pq-sm3" // HighGo uses dedicated SM3-capable driver
 )
 
 // HighGoDB implements Database interface for HighGo (瀚高) database
@@ -28,6 +29,13 @@ type HighGoDB struct {
 	forwarder   *ssh.LocalForwarder
 }
 
+type highgoSessionExecer struct {
+	*sqlConnStatementExecer
+}
+
+var _ QueryMessageExecer = (*HighGoDB)(nil)
+var _ StatementQueryMessageExecer = (*highgoSessionExecer)(nil)
+
 func (h *HighGoDB) getDSN(config connection.ConnectionConfig) string {
 	// postgres://user:password@host:port/dbname?sslmode=disable
 	dbname := config.Database
@@ -152,6 +160,20 @@ func (h *HighGoDB) QueryContext(ctx context.Context, query string) ([]map[string
 	return scanRows(rows)
 }
 
+func (h *HighGoDB) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
+	if h.conn == nil {
+		return nil, nil, nil, fmt.Errorf("连接未打开")
+	}
+
+	conn, err := h.conn.Conn(ctx)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	defer conn.Close()
+
+	return queryHighGoConnWithMessages(ctx, conn, query)
+}
+
 func (h *HighGoDB) Query(query string) ([]map[string]interface{}, []string, error) {
 	if h.conn == nil {
 		return nil, nil, fmt.Errorf("连接未打开")
@@ -165,6 +187,10 @@ func (h *HighGoDB) Query(query string) ([]map[string]interface{}, []string, erro
 	return scanRows(rows)
 }
 
+func (h *HighGoDB) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	return h.QueryContextWithMessages(context.Background(), query)
+}
+
 func (h *HighGoDB) ExecContext(ctx context.Context, query string) (int64, error) {
 	if h.conn == nil {
 		return 0, fmt.Errorf("连接未打开")
@@ -195,7 +221,7 @@ func (h *HighGoDB) OpenSessionExecer(ctx context.Context) (StatementExecer, erro
 	if err != nil {
 		return nil, err
 	}
-	return NewSQLConnStatementExecer(conn), nil
+	return &highgoSessionExecer{sqlConnStatementExecer: &sqlConnStatementExecer{conn: conn}}, nil
 }
 
 func (h *HighGoDB) Exec(query string) (int64, error) {
@@ -209,6 +235,31 @@ func (h *HighGoDB) Exec(query string) (int64, error) {
 	return res.RowsAffected()
 }
 
+func (e *highgoSessionExecer) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	return e.QueryContextWithMessages(context.Background(), query)
+}
+
+func (e *highgoSessionExecer) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
+	if e == nil || e.conn == nil {
+		return nil, nil, nil, fmt.Errorf("连接未打开")
+	}
+	return queryHighGoConnWithMessages(ctx, e.conn, query)
+}
+
+func queryHighGoConnWithMessages(ctx context.Context, conn *sql.Conn, query string) ([]map[string]interface{}, []string, []string, error) {
+	return querySQLConnWithTextNotices(ctx, conn, query, func(driverConn driver.Conn, addNotice func(string)) {
+		if addNotice == nil {
+			highgopq.SetNoticeHandler(driverConn, nil)
+			return
+		}
+		highgopq.SetNoticeHandler(driverConn, func(notice *highgopq.Error) {
+			if notice != nil {
+				addNotice(notice.Message)
+			}
+		})
+	})
+}
+
 func (h *HighGoDB) GetDatabases() ([]string, error) {
 	data, _, err := h.Query("SELECT datname FROM pg_database WHERE datistemplate = false")
 	if err != nil {
@@ -250,178 +301,31 @@ func (h *HighGoDB) GetCreateStatement(dbName, tableName string) (string, error)
 }
 
 func (h *HighGoDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
-	schema := strings.TrimSpace(dbName)
-	if schema == "" {
-		schema = "public"
-	}
-	table := strings.TrimSpace(tableName)
+	schema, table := normalizePGLikeMetadataTable(dbName, tableName)
 	if table == "" {
 		return nil, fmt.Errorf("表名不能为空")
 	}
 
-	esc := func(s string) string { return strings.ReplaceAll(s, "'", "''") }
-
-	query := fmt.Sprintf(`
-SELECT
-	a.attname AS column_name,
-	pg_catalog.format_type(a.atttypid, a.atttypmod) AS data_type,
-	CASE WHEN a.attnotnull THEN 'NO' ELSE 'YES' END AS is_nullable,
-	pg_get_expr(ad.adbin, ad.adrelid) AS column_default,
-	col_description(a.attrelid, a.attnum) AS comment,
-	CASE WHEN pk.attname IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
-FROM pg_class c
-JOIN pg_namespace n ON n.oid = c.relnamespace
-JOIN pg_attribute a ON a.attrelid = c.oid
-LEFT JOIN pg_attrdef ad ON ad.adrelid = c.oid AND ad.adnum = a.attnum
-LEFT JOIN (
-	SELECT i.indrelid, a3.attname
-	FROM pg_index i
-	JOIN pg_attribute a3 ON a3.attrelid = i.indrelid AND a3.attnum = ANY(i.indkey)
-	WHERE i.indisprimary
-) pk ON pk.indrelid = c.oid AND pk.attname = a.attname
-WHERE c.relkind IN ('r', 'p')
-  AND n.nspname = '%s'
-  AND c.relname = '%s'
-  AND a.attnum > 0
-  AND NOT a.attisdropped
-ORDER BY a.attnum`, esc(schema), esc(table))
-
-	data, _, err := h.Query(query)
+	data, _, err := h.Query(buildPGLikeColumnsMetadataQuery(schema, table))
 	if err != nil {
 		return nil, err
 	}
 
-	var columns []connection.ColumnDefinition
-	for _, row := range data {
-		col := connection.ColumnDefinition{
-			Name:     fmt.Sprintf("%v", row["column_name"]),
-			Type:     fmt.Sprintf("%v", row["data_type"]),
-			Nullable: fmt.Sprintf("%v", row["is_nullable"]),
-			Key:      fmt.Sprintf("%v", row["column_key"]),
-			Extra:    "",
-			Comment:  "",
-		}
-
-		if v, ok := row["comment"]; ok && v != nil {
-			col.Comment = fmt.Sprintf("%v", v)
-		}
-
-		if v, ok := row["column_default"]; ok && v != nil {
-			def := fmt.Sprintf("%v", v)
-			col.Default = &def
-			if strings.HasPrefix(strings.ToLower(strings.TrimSpace(def)), "nextval(") {
-				col.Extra = "auto_increment"
-			}
-		}
-
-		columns = append(columns, col)
-	}
-	return columns, nil
+	return buildPGLikeColumnDefinitions(data), nil
 }
 
 func (h *HighGoDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
-	schema := strings.TrimSpace(dbName)
-	if schema == "" {
-		schema = "public"
-	}
-	table := strings.TrimSpace(tableName)
+	schema, table := normalizePGLikeMetadataTable(dbName, tableName)
 	if table == "" {
 		return nil, fmt.Errorf("表名不能为空")
 	}
 
-	esc := func(s string) string { return strings.ReplaceAll(s, "'", "''") }
-
-	query := fmt.Sprintf(`
-SELECT
-	i.relname AS index_name,
-	a.attname AS column_name,
-	ix.indisunique AS is_unique,
-	x.ordinality AS seq_in_index,
-	am.amname AS index_type
-FROM pg_class t
-JOIN pg_namespace n ON n.oid = t.relnamespace
-JOIN pg_index ix ON t.oid = ix.indrelid
-JOIN pg_class i ON i.oid = ix.indexrelid
-JOIN pg_am am ON i.relam = am.oid
-JOIN unnest(ix.indkey) WITH ORDINALITY AS x(attnum, ordinality) ON TRUE
-JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = x.attnum
-WHERE t.relkind IN ('r', 'p')
-  AND t.relname = '%s'
-  AND n.nspname = '%s'
-ORDER BY i.relname, x.ordinality`, esc(table), esc(schema))
-
-	data, _, err := h.Query(query)
+	data, _, err := h.Query(buildPGLikeIndexesMetadataQuery(schema, table))
 	if err != nil {
 		return nil, err
 	}
 
-	parseBool := func(v interface{}) bool {
-		switch val := v.(type) {
-		case bool:
-			return val
-		case string:
-			s := strings.ToLower(strings.TrimSpace(val))
-			return s == "t" || s == "true" || s == "1" || s == "y" || s == "yes"
-		default:
-			s := strings.ToLower(strings.TrimSpace(fmt.Sprintf("%v", v)))
-			return s == "t" || s == "true" || s == "1" || s == "y" || s == "yes"
-		}
-	}
-
-	parseInt := func(v interface{}) int {
-		switch val := v.(type) {
-		case int:
-			return val
-		case int64:
-			return int(val)
-		case float64:
-			return int(val)
-		case string:
-			var n int
-			_, _ = fmt.Sscanf(strings.TrimSpace(val), "%d", &n)
-			return n
-		default:
-			var n int
-			_, _ = fmt.Sscanf(strings.TrimSpace(fmt.Sprintf("%v", v)), "%d", &n)
-			return n
-		}
-	}
-
-	var indexes []connection.IndexDefinition
-	for _, row := range data {
-		isUnique := false
-		if v, ok := row["is_unique"]; ok && v != nil {
-			isUnique = parseBool(v)
-		}
-
-		nonUnique := 1
-		if isUnique {
-			nonUnique = 0
-		}
-
-		seq := 0
-		if v, ok := row["seq_in_index"]; ok && v != nil {
-			seq = parseInt(v)
-		}
-
-		indexType := ""
-		if v, ok := row["index_type"]; ok && v != nil {
-			indexType = strings.ToUpper(fmt.Sprintf("%v", v))
-		}
-		if indexType == "" {
-			indexType = "BTREE"
-		}
-
-		idx := connection.IndexDefinition{
-			Name:       fmt.Sprintf("%v", row["index_name"]),
-			ColumnName: fmt.Sprintf("%v", row["column_name"]),
-			NonUnique:  nonUnique,
-			SeqInIndex: seq,
-			IndexType:  indexType,
-		}
-		indexes = append(indexes, idx)
-	}
-	return indexes, nil
+	return buildPGLikeIndexDefinitions(data), nil
 }
 
 func (h *HighGoDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
diff --git a/internal/db/iotdb_impl.go b/internal/db/iotdb_impl.go
new file mode 100644
index 0000000..decf3b3
--- /dev/null
+++ b/internal/db/iotdb_impl.go
@@ -0,0 +1,699 @@
+//go:build gonavi_full_drivers || gonavi_iotdb_driver
+
+package db
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/url"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+	"GoNavi-Wails/internal/ssh"
+
+	iotdbclient "github.com/apache/iotdb-client-go/client"
+)
+
+const (
+	defaultIoTDBPort         = 6667
+	defaultIoTDBUser         = "root"
+	defaultIoTDBPassword     = "root"
+	defaultIoTDBQueryTimeout = 30 * time.Second
+)
+
+type iotdbDataSet interface {
+	Next() (bool, error)
+	Close() error
+	IsNull(columnName string) (bool, error)
+	GetObject(columnName string) (interface{}, error)
+	GetColumnNames() []string
+}
+
+type iotdbSessionRunner interface {
+	Close() error
+	Query(ctx context.Context, sql string, timeoutMs *int64) (iotdbDataSet, error)
+	Exec(ctx context.Context, sql string) error
+}
+
+type iotdbClientSession struct {
+	session *iotdbclient.Session
+}
+
+func (s *iotdbClientSession) Close() error {
+	if s == nil || s.session == nil {
+		return nil
+	}
+	return s.session.Close()
+}
+
+func (s *iotdbClientSession) Query(ctx context.Context, sql string, timeoutMs *int64) (iotdbDataSet, error) {
+	if s == nil || s.session == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	return s.session.ExecuteQueryStatement(sql, timeoutMs)
+}
+
+func (s *iotdbClientSession) Exec(ctx context.Context, sql string) error {
+	if s == nil || s.session == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	return s.session.ExecuteNonQueryStatement(sql)
+}
+
+var newIoTDBSessionRunner = func(config connection.ConnectionConfig) (iotdbSessionRunner, error) {
+	params := iotdbConnectionParams(config)
+	user := strings.TrimSpace(config.User)
+	if user == "" {
+		user = defaultIoTDBUser
+	}
+	password := config.Password
+	if password == "" {
+		password = defaultIoTDBPassword
+	}
+	fetchSize := int32(intFromAny(params.Get("fetchSize"), iotdbclient.DefaultFetchSize))
+	if fetchSize <= 0 {
+		fetchSize = iotdbclient.DefaultFetchSize
+	}
+	timeZone := strings.TrimSpace(firstNonEmpty(params.Get("timeZone"), params.Get("timezone"), params.Get("zoneId")))
+	if timeZone == "" {
+		timeZone = iotdbclient.DefaultTimeZone
+	}
+	retryMax := intFromAny(firstNonEmpty(params.Get("connectRetryMax"), params.Get("retryMax")), iotdbclient.DefaultConnectRetryMax)
+	if retryMax <= 0 {
+		retryMax = iotdbclient.DefaultConnectRetryMax
+	}
+	enableCompression := getOrBool(map[string]interface{}{"rpcCompression": params.Get("rpcCompression")}, "rpcCompression")
+	cfg := &iotdbclient.Config{
+		Host:            strings.TrimSpace(config.Host),
+		Port:            strconv.Itoa(config.Port),
+		UserName:        user,
+		Password:        password,
+		FetchSize:       fetchSize,
+		TimeZone:        timeZone,
+		ConnectRetryMax: retryMax,
+	}
+	session := iotdbclient.NewSession(cfg)
+	timeoutMs := getConnectTimeout(config).Milliseconds()
+	if timeoutMs < 0 {
+		timeoutMs = 0
+	}
+	if err := session.Open(enableCompression, int(timeoutMs)); err != nil {
+		return nil, err
+	}
+	return &iotdbClientSession{session: &session}, nil
+}
+
+// IoTDBDB implements Database for Apache IoTDB through the official Session API.
+type IoTDBDB struct {
+	session     iotdbSessionRunner
+	forwarder   *ssh.LocalForwarder
+	pingTimeout time.Duration
+}
+
+func (i *IoTDBDB) Connect(config connection.ConnectionConfig) error {
+	if i.forwarder != nil {
+		_ = i.forwarder.Close()
+		i.forwarder = nil
+	}
+	i.session = nil
+
+	runConfig := normalizeIoTDBConfig(config)
+	if runConfig.UseSSH {
+		forwarder, err := ssh.GetOrCreateLocalForwarder(runConfig.SSH, runConfig.Host, runConfig.Port)
+		if err != nil {
+			return fmt.Errorf("创建 SSH 隧道失败：%w", err)
+		}
+		i.forwarder = forwarder
+
+		host, portText, err := net.SplitHostPort(forwarder.LocalAddr)
+		if err != nil {
+			return fmt.Errorf("解析本地转发地址失败：%w", err)
+		}
+		port, err := strconv.Atoi(portText)
+		if err != nil {
+			return fmt.Errorf("解析本地端口失败：%w", err)
+		}
+		runConfig.Host = host
+		runConfig.Port = port
+		runConfig.UseSSH = false
+		logger.Infof("IoTDB 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	}
+
+	session, err := newIoTDBSessionRunner(runConfig)
+	if err != nil {
+		_ = i.Close()
+		return err
+	}
+	i.session = session
+	i.pingTimeout = getConnectTimeout(runConfig)
+	if err := i.Ping(); err != nil {
+		_ = i.Close()
+		return err
+	}
+	return nil
+}
+
+func (i *IoTDBDB) Close() error {
+	if i.forwarder != nil {
+		if err := i.forwarder.Close(); err != nil {
+			logger.Warnf("关闭 IoTDB SSH 端口转发失败：%v", err)
+		}
+		i.forwarder = nil
+	}
+	if i.session != nil {
+		err := i.session.Close()
+		i.session = nil
+		return err
+	}
+	return nil
+}
+
+func (i *IoTDBDB) Ping() error {
+	if i.session == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), i.effectiveTimeout())
+	defer cancel()
+	ds, err := i.session.Query(ctx, "SHOW VERSION", nil)
+	if err != nil {
+		return err
+	}
+	return ds.Close()
+}
+
+func (i *IoTDBDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultIoTDBQueryTimeout)
+	defer cancel()
+	return i.QueryContext(ctx, query)
+}
+
+func (i *IoTDBDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if i.session == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+	text := strings.TrimSpace(query)
+	if text == "" {
+		return nil, nil, fmt.Errorf("查询语句不能为空")
+	}
+	timeoutMs := int64(i.effectiveTimeout().Milliseconds())
+	ds, err := i.session.Query(ctx, text, &timeoutMs)
+	if err != nil {
+		return nil, nil, err
+	}
+	return scanIoTDBDataSet(ds)
+}
+
+func (i *IoTDBDB) Exec(query string) (int64, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultIoTDBQueryTimeout)
+	defer cancel()
+	return i.ExecContext(ctx, query)
+}
+
+func (i *IoTDBDB) ExecContext(ctx context.Context, query string) (int64, error) {
+	if i.session == nil {
+		return 0, fmt.Errorf("连接未打开")
+	}
+	text := strings.TrimSpace(query)
+	if text == "" {
+		return 0, fmt.Errorf("执行语句不能为空")
+	}
+	if err := i.session.Exec(ctx, text); err != nil {
+		return 0, err
+	}
+	return 0, nil
+}
+
+func (i *IoTDBDB) GetDatabases() ([]string, error) {
+	queries := []string{"SHOW DATABASES", "SHOW STORAGE GROUPS", "SHOW STORAGE GROUP"}
+	var lastErr error
+	for _, query := range queries {
+		rows, _, err := i.Query(query)
+		if err != nil {
+			lastErr = err
+			continue
+		}
+		names := make([]string, 0, len(rows))
+		for _, row := range rows {
+			name := firstRowString(row, "Database", "database", "Storage Group", "storage group", "storage_group", "name")
+			if name == "" {
+				name = firstAnyRowString(row)
+			}
+			if name != "" {
+				names = append(names, name)
+			}
+		}
+		if len(names) > 0 {
+			sort.Strings(names)
+			return names, nil
+		}
+	}
+	if lastErr != nil {
+		return nil, lastErr
+	}
+	return []string{}, nil
+}
+
+func (i *IoTDBDB) GetTables(dbName string) ([]string, error) {
+	queries := []string{}
+	if pattern := iotdbDevicePattern(dbName); pattern != "" {
+		queries = append(queries, "SHOW DEVICES "+pattern)
+	}
+	queries = append(queries, "SHOW DEVICES")
+
+	var lastErr error
+	seen := map[string]struct{}{}
+	tables := []string{}
+	for _, query := range queries {
+		rows, _, err := i.Query(query)
+		if err != nil {
+			lastErr = err
+			continue
+		}
+		for _, row := range rows {
+			name := firstRowString(row, "Device", "device", "devices", "Devices", "Path", "path")
+			if name == "" {
+				name = firstAnyRowString(row)
+			}
+			if name == "" {
+				continue
+			}
+			if _, exists := seen[name]; exists {
+				continue
+			}
+			seen[name] = struct{}{}
+			tables = append(tables, name)
+		}
+		if len(tables) > 0 {
+			sort.Strings(tables)
+			return tables, nil
+		}
+	}
+	if lastErr != nil {
+		return nil, lastErr
+	}
+	return []string{}, nil
+}
+
+func (i *IoTDBDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	device := resolveIoTDBDevicePath(dbName, tableName)
+	rows, _, err := i.Query("SHOW TIMESERIES " + iotdbTimeseriesPattern(device))
+	if err != nil {
+		return "", err
+	}
+	statements := make([]string, 0, len(rows))
+	for _, row := range rows {
+		path := firstRowString(row, "Timeseries", "timeseries", "Path", "path")
+		if path == "" {
+			path = firstAnyRowString(row)
+		}
+		if path == "" {
+			continue
+		}
+		dataType := firstRowString(row, "DataType", "dataType", "data_type", "Type", "type")
+		encoding := firstRowString(row, "Encoding", "encoding")
+		compression := firstRowString(row, "Compression", "compression", "Compressor", "compressor")
+		parts := []string{}
+		if dataType != "" {
+			parts = append(parts, "DATATYPE="+dataType)
+		}
+		if encoding != "" {
+			parts = append(parts, "ENCODING="+encoding)
+		}
+		if compression != "" {
+			parts = append(parts, "COMPRESSION="+compression)
+		}
+		if len(parts) == 0 {
+			statements = append(statements, "CREATE TIMESERIES "+path+";")
+		} else {
+			statements = append(statements, "CREATE TIMESERIES "+path+" WITH "+strings.Join(parts, ", ")+";")
+		}
+	}
+	if len(statements) == 0 {
+		return "", fmt.Errorf("未找到 IoTDB timeseries：%s", device)
+	}
+	return strings.Join(statements, "\n"), nil
+}
+
+func (i *IoTDBDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	device := resolveIoTDBDevicePath(dbName, tableName)
+	rows, _, err := i.Query("SHOW TIMESERIES " + iotdbTimeseriesPattern(device))
+	if err != nil {
+		return nil, err
+	}
+	columns := []connection.ColumnDefinition{{
+		Name:     "Time",
+		Type:     "TIMESTAMP",
+		Nullable: "NO",
+		Key:      "PRI",
+		Comment:  "IoTDB timestamp column",
+	}}
+	for _, row := range rows {
+		path := firstRowString(row, "Timeseries", "timeseries", "Path", "path")
+		if path == "" {
+			path = firstAnyRowString(row)
+		}
+		if path == "" {
+			continue
+		}
+		name := strings.TrimPrefix(path, strings.TrimRight(device, ".")+".")
+		dataType := firstRowString(row, "DataType", "dataType", "data_type", "Type", "type")
+		encoding := firstRowString(row, "Encoding", "encoding")
+		compression := firstRowString(row, "Compression", "compression", "Compressor", "compressor")
+		commentParts := []string{}
+		if encoding != "" {
+			commentParts = append(commentParts, "encoding="+encoding)
+		}
+		if compression != "" {
+			commentParts = append(commentParts, "compression="+compression)
+		}
+		columns = append(columns, connection.ColumnDefinition{
+			Name:     name,
+			Type:     dataType,
+			Nullable: "YES",
+			Comment:  strings.Join(commentParts, "; "),
+		})
+	}
+	return columns, nil
+}
+
+func (i *IoTDBDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	tables, err := i.GetTables(dbName)
+	if err != nil {
+		return nil, err
+	}
+	var result []connection.ColumnDefinitionWithTable
+	for _, table := range tables {
+		cols, err := i.GetColumns(dbName, table)
+		if err != nil {
+			continue
+		}
+		for _, col := range cols {
+			result = append(result, connection.ColumnDefinitionWithTable{
+				TableName: table,
+				Name:      col.Name,
+				Type:      col.Type,
+				Comment:   col.Comment,
+			})
+		}
+	}
+	return result, nil
+}
+
+func (i *IoTDBDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	return []connection.IndexDefinition{{Name: "TIME", ColumnName: "Time", NonUnique: 0, SeqInIndex: 1, IndexType: "TIME"}}, nil
+}
+
+func (i *IoTDBDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return []connection.ForeignKeyDefinition{}, nil
+}
+
+func (i *IoTDBDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return []connection.TriggerDefinition{}, nil
+}
+
+func (i *IoTDBDB) ApplyChanges(tableName string, changes connection.ChangeSet) error {
+	if i.session == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	if strings.TrimSpace(tableName) == "" {
+		return fmt.Errorf("设备路径不能为空")
+	}
+	if len(changes.Updates) > 0 || len(changes.Deletes) > 0 {
+		return fmt.Errorf("IoTDB 目标端当前仅支持 INSERT 写入，暂不支持 UPDATE/DELETE 差异同步")
+	}
+	for _, row := range changes.Inserts {
+		sqlText, err := buildIoTDBInsertSQL(tableName, row)
+		if err != nil {
+			return err
+		}
+		if strings.TrimSpace(sqlText) == "" {
+			continue
+		}
+		if _, err := i.Exec(sqlText); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func normalizeIoTDBConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
+	runConfig := applyIoTDBURI(config)
+	if strings.TrimSpace(runConfig.Host) == "" {
+		runConfig.Host = "localhost"
+	}
+	if runConfig.Port <= 0 {
+		runConfig.Port = defaultIoTDBPort
+	}
+	if strings.TrimSpace(runConfig.User) == "" {
+		runConfig.User = defaultIoTDBUser
+	}
+	if runConfig.Password == "" {
+		runConfig.Password = defaultIoTDBPassword
+	}
+	return runConfig
+}
+
+func applyIoTDBURI(config connection.ConnectionConfig) connection.ConnectionConfig {
+	uriText := strings.TrimSpace(config.URI)
+	if uriText == "" {
+		return config
+	}
+	parsed, err := url.Parse(uriText)
+	if err != nil {
+		return config
+	}
+	scheme := strings.ToLower(strings.TrimSpace(parsed.Scheme))
+	if scheme != "iotdb" {
+		return config
+	}
+	if parsed.User != nil {
+		if strings.TrimSpace(config.User) == "" {
+			config.User = parsed.User.Username()
+		}
+		if pass, ok := parsed.User.Password(); ok && config.Password == "" {
+			config.Password = pass
+		}
+	}
+	if host := strings.TrimSpace(parsed.Host); host != "" {
+		if h, port, ok := parseHostPortWithDefault(host, defaultIoTDBPort); ok {
+			config.Host = h
+			config.Port = port
+		}
+	}
+	if dbName := strings.Trim(strings.TrimSpace(parsed.Path), "/"); dbName != "" && strings.TrimSpace(config.Database) == "" {
+		config.Database = dbName
+	}
+	return config
+}
+
+func iotdbConnectionParams(config connection.ConnectionConfig) url.Values {
+	params := url.Values{}
+	mergeConnectionParamValues(params, connectionParamsFromURI(config.URI, "iotdb"))
+	mergeConnectionParamValues(params, connectionParamsFromText(config.ConnectionParams))
+	return params
+}
+
+func (i *IoTDBDB) effectiveTimeout() time.Duration {
+	if i.pingTimeout > 0 {
+		return i.pingTimeout
+	}
+	return defaultIoTDBQueryTimeout
+}
+
+func scanIoTDBDataSet(ds iotdbDataSet) ([]map[string]interface{}, []string, error) {
+	if ds == nil {
+		return nil, nil, nil
+	}
+	defer ds.Close()
+	columns := ds.GetColumnNames()
+	rows := make([]map[string]interface{}, 0)
+	for {
+		hasNext, err := ds.Next()
+		if err != nil {
+			return nil, nil, err
+		}
+		if !hasNext {
+			break
+		}
+		row := make(map[string]interface{}, len(columns))
+		for _, column := range columns {
+			isNull, err := ds.IsNull(column)
+			if err == nil && isNull {
+				row[column] = nil
+				continue
+			}
+			value, err := ds.GetObject(column)
+			if err != nil {
+				row[column] = nil
+				continue
+			}
+			row[column] = normalizeIoTDBValue(value)
+		}
+		rows = append(rows, row)
+	}
+	return rows, columns, nil
+}
+
+func normalizeIoTDBValue(value interface{}) interface{} {
+	switch v := value.(type) {
+	case time.Time:
+		return v.Format(time.RFC3339Nano)
+	case *iotdbclient.Binary:
+		if v == nil {
+			return nil
+		}
+		return v.GetStringValue()
+	case fmt.Stringer:
+		return v.String()
+	default:
+		return value
+	}
+}
+
+func iotdbDevicePattern(dbName string) string {
+	db := strings.Trim(strings.TrimSpace(dbName), ".")
+	if db == "" {
+		return ""
+	}
+	if strings.HasSuffix(db, ".**") || strings.HasSuffix(db, ".*") {
+		return db
+	}
+	return db + ".**"
+}
+
+func iotdbTimeseriesPattern(device string) string {
+	path := strings.Trim(strings.TrimSpace(device), ".")
+	if path == "" {
+		return "root.**"
+	}
+	if strings.HasSuffix(path, ".**") || strings.HasSuffix(path, ".*") {
+		return path
+	}
+	return path + ".*"
+}
+
+func resolveIoTDBDevicePath(dbName, tableName string) string {
+	table := strings.Trim(strings.TrimSpace(tableName), ".")
+	if table == "" {
+		return strings.Trim(strings.TrimSpace(dbName), ".")
+	}
+	if strings.HasPrefix(strings.ToLower(table), "root.") || strings.TrimSpace(dbName) == "" {
+		return table
+	}
+	return strings.Trim(strings.TrimSpace(dbName), ".") + "." + table
+}
+
+func firstRowString(row map[string]interface{}, keys ...string) string {
+	for _, key := range keys {
+		for actual, value := range row {
+			if strings.EqualFold(actual, key) {
+				text := strings.TrimSpace(fmt.Sprintf("%v", value))
+				if text != "" && text != "<nil>" {
+					return text
+				}
+			}
+		}
+	}
+	return ""
+}
+
+func firstAnyRowString(row map[string]interface{}) string {
+	keys := make([]string, 0, len(row))
+	for key := range row {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+	for _, key := range keys {
+		text := strings.TrimSpace(fmt.Sprintf("%v", row[key]))
+		if text != "" && text != "<nil>" {
+			return text
+		}
+	}
+	return ""
+}
+
+func buildIoTDBInsertSQL(device string, row map[string]interface{}) (string, error) {
+	path := strings.TrimSpace(device)
+	if path == "" {
+		return "", fmt.Errorf("设备路径不能为空")
+	}
+	timestamp, ok := iotdbTimestampValue(row)
+	if !ok {
+		return "", fmt.Errorf("IoTDB INSERT 行缺少 Time/time/timestamp 字段")
+	}
+	measurements := make([]string, 0, len(row))
+	for key := range row {
+		if strings.TrimSpace(key) == "" || isIoTDBTimestampColumn(key) {
+			continue
+		}
+		measurements = append(measurements, key)
+	}
+	if len(measurements) == 0 {
+		return "", nil
+	}
+	sort.Strings(measurements)
+
+	columns := append([]string{"timestamp"}, measurements...)
+	values := []string{iotdbTimestampLiteral(timestamp)}
+	for _, measurement := range measurements {
+		values = append(values, iotdbLiteral(row[measurement]))
+	}
+	return fmt.Sprintf("INSERT INTO %s(%s) VALUES(%s)", path, strings.Join(columns, ", "), strings.Join(values, ", ")), nil
+}
+
+func iotdbTimestampValue(row map[string]interface{}) (interface{}, bool) {
+	for key, value := range row {
+		if isIoTDBTimestampColumn(key) {
+			return value, true
+		}
+	}
+	return nil, false
+}
+
+func isIoTDBTimestampColumn(column string) bool {
+	switch strings.ToLower(strings.TrimSpace(column)) {
+	case "time", "timestamp", "_time":
+		return true
+	default:
+		return false
+	}
+}
+
+func iotdbTimestampLiteral(value interface{}) string {
+	switch v := value.(type) {
+	case time.Time:
+		return strconv.FormatInt(v.UnixMilli(), 10)
+	case string:
+		text := strings.TrimSpace(v)
+		if _, err := strconv.ParseInt(text, 10, 64); err == nil {
+			return text
+		}
+		return iotdbLiteral(text)
+	default:
+		return fmt.Sprintf("%v", value)
+	}
+}
+
+func iotdbLiteral(value interface{}) string {
+	switch v := value.(type) {
+	case nil:
+		return "null"
+	case bool:
+		if v {
+			return "true"
+		}
+		return "false"
+	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, float32, float64:
+		return fmt.Sprintf("%v", v)
+	case time.Time:
+		return strconv.FormatInt(v.UnixMilli(), 10)
+	default:
+		text := fmt.Sprintf("%v", v)
+		return "'" + strings.ReplaceAll(text, "'", "''") + "'"
+	}
+}
diff --git a/internal/db/iotdb_impl_test.go b/internal/db/iotdb_impl_test.go
new file mode 100644
index 0000000..d648f01
--- /dev/null
+++ b/internal/db/iotdb_impl_test.go
@@ -0,0 +1,269 @@
+//go:build gonavi_full_drivers || gonavi_iotdb_driver
+
+package db
+
+import (
+	"context"
+	"os"
+	"reflect"
+	"strconv"
+	"strings"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+
+	iotdbclient "github.com/apache/iotdb-client-go/client"
+)
+
+type fakeIoTDBSession struct {
+	queryResults map[string][]map[string]interface{}
+	execs        []string
+}
+
+func (f *fakeIoTDBSession) Close() error { return nil }
+
+func (f *fakeIoTDBSession) Query(_ context.Context, sql string, _ *int64) (iotdbDataSet, error) {
+	rows := f.queryResults[sql]
+	return &fakeIoTDBDataSet{rows: rows, columns: fakeIoTDBColumns(rows)}, nil
+}
+
+func (f *fakeIoTDBSession) Exec(_ context.Context, sql string) error {
+	f.execs = append(f.execs, sql)
+	return nil
+}
+
+type fakeIoTDBDataSet struct {
+	rows    []map[string]interface{}
+	columns []string
+	index   int
+}
+
+func (f *fakeIoTDBDataSet) Next() (bool, error) {
+	if f.index >= len(f.rows) {
+		return false, nil
+	}
+	f.index++
+	return true, nil
+}
+
+func (f *fakeIoTDBDataSet) Close() error { return nil }
+
+func (f *fakeIoTDBDataSet) IsNull(columnName string) (bool, error) {
+	value, ok := f.currentRow()[columnName]
+	return !ok || value == nil, nil
+}
+
+func (f *fakeIoTDBDataSet) GetObject(columnName string) (interface{}, error) {
+	return f.currentRow()[columnName], nil
+}
+
+func (f *fakeIoTDBDataSet) GetColumnNames() []string { return append([]string(nil), f.columns...) }
+
+func (f *fakeIoTDBDataSet) currentRow() map[string]interface{} {
+	if f.index <= 0 || f.index > len(f.rows) {
+		return map[string]interface{}{}
+	}
+	return f.rows[f.index-1]
+}
+
+func fakeIoTDBColumns(rows []map[string]interface{}) []string {
+	seen := map[string]struct{}{}
+	columns := []string{}
+	for _, row := range rows {
+		for key := range row {
+			if _, exists := seen[key]; exists {
+				continue
+			}
+			seen[key] = struct{}{}
+			columns = append(columns, key)
+		}
+	}
+	return columns
+}
+
+func TestIoTDBMetadataMapsStorageGroupsDevicesAndTimeseries(t *testing.T) {
+	session := &fakeIoTDBSession{queryResults: map[string][]map[string]interface{}{
+		"SHOW DATABASES": {
+			{"Database": "root.zeta"},
+			{"Database": "root.sg"},
+		},
+		"SHOW DEVICES root.sg.**": {
+			{"Device": "root.sg.d2"},
+			{"Device": "root.sg.d1"},
+		},
+		"SHOW TIMESERIES root.sg.d1.*": {
+			{
+				"Timeseries":  "root.sg.d1.temperature",
+				"DataType":    "DOUBLE",
+				"Encoding":    "GORILLA",
+				"Compression": "SNAPPY",
+			},
+			{
+				"Timeseries":  "root.sg.d1.status",
+				"DataType":    "TEXT",
+				"Encoding":    "PLAIN",
+				"Compression": "SNAPPY",
+			},
+		},
+	}}
+	client := &IoTDBDB{session: session}
+
+	databases, err := client.GetDatabases()
+	if err != nil {
+		t.Fatalf("GetDatabases: %v", err)
+	}
+	if !reflect.DeepEqual(databases, []string{"root.sg", "root.zeta"}) {
+		t.Fatalf("unexpected databases: %#v", databases)
+	}
+
+	tables, err := client.GetTables("root.sg")
+	if err != nil {
+		t.Fatalf("GetTables: %v", err)
+	}
+	if !reflect.DeepEqual(tables, []string{"root.sg.d1", "root.sg.d2"}) {
+		t.Fatalf("unexpected tables: %#v", tables)
+	}
+
+	columns, err := client.GetColumns("root.sg", "root.sg.d1")
+	if err != nil {
+		t.Fatalf("GetColumns: %v", err)
+	}
+	if len(columns) != 3 {
+		t.Fatalf("unexpected columns: %#v", columns)
+	}
+	if columns[0].Name != "Time" || columns[0].Type != "TIMESTAMP" || columns[0].Key != "PRI" {
+		t.Fatalf("unexpected time column: %#v", columns[0])
+	}
+	if columns[1].Name != "temperature" || columns[1].Type != "DOUBLE" || !strings.Contains(columns[1].Comment, "encoding=GORILLA") {
+		t.Fatalf("unexpected measurement column: %#v", columns[1])
+	}
+
+	ddl, err := client.GetCreateStatement("root.sg", "root.sg.d1")
+	if err != nil {
+		t.Fatalf("GetCreateStatement: %v", err)
+	}
+	if !strings.Contains(ddl, "CREATE TIMESERIES root.sg.d1.temperature WITH DATATYPE=DOUBLE, ENCODING=GORILLA, COMPRESSION=SNAPPY;") {
+		t.Fatalf("unexpected DDL: %s", ddl)
+	}
+}
+
+func TestIoTDBApplyChangesBuildsInsertAndRejectsMutatingDiffs(t *testing.T) {
+	session := &fakeIoTDBSession{}
+	client := &IoTDBDB{session: session}
+
+	err := client.ApplyChanges("root.sg.d1", connection.ChangeSet{
+		Inserts: []map[string]interface{}{
+			{
+				"Time":        int64(1700000000000),
+				"temperature": 23.5,
+				"status":      "ok",
+				"active":      true,
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("ApplyChanges insert: %v", err)
+	}
+	expected := "INSERT INTO root.sg.d1(timestamp, active, status, temperature) VALUES(1700000000000, true, 'ok', 23.5)"
+	if !reflect.DeepEqual(session.execs, []string{expected}) {
+		t.Fatalf("unexpected execs: %#v", session.execs)
+	}
+
+	err = client.ApplyChanges("root.sg.d1", connection.ChangeSet{
+		Updates: []connection.UpdateRow{{}},
+	})
+	if err == nil || !strings.Contains(err.Error(), "仅支持 INSERT") {
+		t.Fatalf("expected update rejection, got %v", err)
+	}
+
+	err = client.ApplyChanges("root.sg.d1", connection.ChangeSet{
+		Deletes: []map[string]interface{}{{"Time": int64(1700000000000)}},
+	})
+	if err == nil || !strings.Contains(err.Error(), "仅支持 INSERT") {
+		t.Fatalf("expected delete rejection, got %v", err)
+	}
+}
+
+func TestIoTDBConfigParsesURIAndConnectionParams(t *testing.T) {
+	config := normalizeIoTDBConfig(connection.ConnectionConfig{
+		URI: "iotdb://alice:secret@iotdb.local:16667/root.sg?fetchSize=2048&timeZone=Asia%2FShanghai",
+	})
+	if config.Host != "iotdb.local" || config.Port != 16667 || config.User != "alice" || config.Password != "secret" || config.Database != "root.sg" {
+		t.Fatalf("unexpected config: %#v", config)
+	}
+
+	params := iotdbConnectionParams(connection.ConnectionConfig{
+		URI:              config.URI,
+		ConnectionParams: "connectRetryMax=3&rpcCompression=true",
+	})
+	if params.Get("fetchSize") != "2048" || params.Get("timeZone") != "Asia/Shanghai" || params.Get("connectRetryMax") != "3" || params.Get("rpcCompression") != "true" {
+		t.Fatalf("unexpected params: %#v", params)
+	}
+}
+
+func TestNormalizeIoTDBValueConvertsBinaryText(t *testing.T) {
+	if got := normalizeIoTDBValue(iotdbclient.NewBinary([]byte("ok"))); got != "ok" {
+		t.Fatalf("expected binary text to become string, got %#v", got)
+	}
+}
+
+func TestIoTDBLiveSmoke(t *testing.T) {
+	addr := strings.TrimSpace(os.Getenv("GONAVI_IOTDB_TEST_ADDR"))
+	if addr == "" {
+		t.Skip("set GONAVI_IOTDB_TEST_ADDR=host:port to run live IoTDB smoke test")
+	}
+	host, portText, ok := strings.Cut(addr, ":")
+	if !ok || strings.TrimSpace(host) == "" || strings.TrimSpace(portText) == "" {
+		t.Fatalf("invalid GONAVI_IOTDB_TEST_ADDR: %q", addr)
+	}
+	port, err := strconv.Atoi(strings.TrimSpace(portText))
+	if err != nil {
+		t.Fatalf("invalid IoTDB port: %v", err)
+	}
+
+	client := &IoTDBDB{}
+	if err := client.Connect(connection.ConnectionConfig{
+		Type:     "iotdb",
+		Host:     strings.TrimSpace(host),
+		Port:     port,
+		User:     "root",
+		Password: "root",
+		Timeout:  15,
+	}); err != nil {
+		t.Fatalf("connect iotdb: %v", err)
+	}
+	defer client.Close()
+
+	_, _ = client.ExecContext(context.Background(), "DELETE DATABASE root.gonavi_smoke")
+	_, _ = client.ExecContext(context.Background(), "DROP DATABASE root.gonavi_smoke")
+
+	if _, err := client.Exec("CREATE DATABASE root.gonavi_smoke"); err != nil {
+		t.Fatalf("create database: %v", err)
+	}
+	defer func() {
+		_, _ = client.Exec("DELETE DATABASE root.gonavi_smoke")
+		_, _ = client.Exec("DROP DATABASE root.gonavi_smoke")
+	}()
+
+	statements := []string{
+		"CREATE TIMESERIES root.gonavi_smoke.d1.temperature WITH DATATYPE=DOUBLE, ENCODING=GORILLA, COMPRESSION=SNAPPY",
+		"CREATE TIMESERIES root.gonavi_smoke.d1.status WITH DATATYPE=TEXT, ENCODING=PLAIN, COMPRESSION=SNAPPY",
+		"INSERT INTO root.gonavi_smoke.d1(timestamp, temperature, status) VALUES(1700000000000, 21.5, 'ok')",
+	}
+	for _, stmt := range statements {
+		if _, err := client.Exec(stmt); err != nil {
+			t.Fatalf("exec %q: %v", stmt, err)
+		}
+	}
+
+	rows, columns, err := client.Query("SELECT temperature, status FROM root.gonavi_smoke.d1 LIMIT 10")
+	if err != nil {
+		t.Fatalf("query smoke data: %v", err)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected one row, got rows=%#v columns=%#v", rows, columns)
+	}
+	if got := rows[0]["root.gonavi_smoke.d1.status"]; got != "ok" {
+		t.Fatalf("unexpected status value: %#v rows=%#v columns=%#v", got, rows, columns)
+	}
+}
diff --git a/internal/db/kafka_impl.go b/internal/db/kafka_impl.go
new file mode 100644
index 0000000..ec00eb5
--- /dev/null
+++ b/internal/db/kafka_impl.go
@@ -0,0 +1,1341 @@
+package db
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"net/url"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+	proxytunnel "GoNavi-Wails/internal/proxy"
+	"GoNavi-Wails/internal/ssh"
+
+	kafka "github.com/segmentio/kafka-go"
+	kafkasasl "github.com/segmentio/kafka-go/sasl"
+	kafkaplain "github.com/segmentio/kafka-go/sasl/plain"
+	kafkascram "github.com/segmentio/kafka-go/sasl/scram"
+)
+
+const (
+	defaultKafkaPort         = 9092
+	defaultKafkaQueryTimeout = 30 * time.Second
+	defaultKafkaPreviewLimit = 100
+	kafkaSyntheticDatabase   = "topics"
+	kafkaFetchMaxBytes       = 1 << 20
+	kafkaDefaultClientID     = "GoNavi"
+)
+
+type kafkaRuntime interface {
+	Close() error
+	Ping(ctx context.Context) error
+	ListTopics(ctx context.Context, includeInternal bool) ([]kafkaTopicInfo, error)
+	DescribeTopic(ctx context.Context, topic string) (kafkaTopicDescription, error)
+	FetchMessages(ctx context.Context, request kafkaFetchRequest) ([]kafkaMessageRecord, error)
+	Publish(ctx context.Context, command kafkaPublishCommand) (int64, error)
+}
+
+type kafkaTopicInfo struct {
+	Name       string
+	Internal   bool
+	Partitions []kafka.Partition
+}
+
+type kafkaTopicDescription struct {
+	Name       string
+	Internal   bool
+	Partitions []kafkaTopicPartition
+}
+
+type kafkaTopicPartition struct {
+	ID               int
+	Leader           kafka.Broker
+	Replicas         []kafka.Broker
+	Isr              []kafka.Broker
+	OfflineReplicas  []kafka.Broker
+	EarliestOffset   int64
+	LatestOffset     int64
+	ApproximateCount int64
+}
+
+type kafkaFetchRequest struct {
+	Topic   string
+	Limit   int
+	Offset  int
+	GroupID string
+	Latest  bool
+}
+
+type kafkaPublishCommand struct {
+	Topic   string
+	Key     interface{}
+	Value   interface{}
+	Headers map[string]interface{}
+}
+
+type kafkaMessageRecord struct {
+	Message kafka.Message
+	Key     interface{}
+	Value   interface{}
+	Headers map[string]interface{}
+}
+
+type kafkaGoRuntime struct {
+	brokers    []string
+	bootstrap  string
+	dialer     *kafka.Dialer
+	transport  *kafka.Transport
+	client     *kafka.Client
+	timeout    time.Duration
+	readWait   time.Duration
+	defaultAck kafka.RequiredAcks
+}
+
+var newKafkaRuntime = func(config connection.ConnectionConfig) (kafkaRuntime, error) {
+	return newKafkaGoRuntime(config)
+}
+
+type KafkaDB struct {
+	runtime      kafkaRuntime
+	forwarders   []*ssh.LocalForwarder
+	defaultTopic string
+	defaultGroup string
+	startLatest  bool
+}
+
+func (k *KafkaDB) Connect(config connection.ConnectionConfig) error {
+	_ = k.Close()
+
+	runConfig := normalizeKafkaConfig(config)
+	if runConfig.UseSSH {
+		sshConfig, brokers, forwarders, err := kafkaForwardBrokersOverSSH(runConfig)
+		if err != nil {
+			return err
+		}
+		k.forwarders = forwarders
+		runConfig = sshConfig
+		runConfig.Hosts = brokers[1:]
+		host, port, ok := parseHostPortWithDefault(brokers[0], defaultKafkaPort)
+		if !ok {
+			_ = k.Close()
+			return fmt.Errorf("解析 Kafka SSH 转发地址失败：%s", brokers[0])
+		}
+		runConfig.Host = host
+		runConfig.Port = port
+		runConfig.UseSSH = false
+		logger.Infof("Kafka 通过 SSH 端口转发连接：brokers=%s", strings.Join(brokers, ","))
+	}
+
+	runtime, err := newKafkaRuntime(runConfig)
+	if err != nil {
+		_ = k.Close()
+		return err
+	}
+	k.runtime = runtime
+	k.defaultTopic = kafkaDefaultTopic(runConfig)
+	k.defaultGroup = kafkaDefaultGroupID(runConfig)
+	k.startLatest = kafkaDefaultStartLatest(runConfig)
+
+	if err := k.Ping(); err != nil {
+		_ = k.Close()
+		return err
+	}
+	return nil
+}
+
+func (k *KafkaDB) Close() error {
+	var firstErr error
+	if k.runtime != nil {
+		if err := k.runtime.Close(); err != nil && firstErr == nil {
+			firstErr = err
+		}
+		k.runtime = nil
+	}
+	for _, forwarder := range k.forwarders {
+		if forwarder == nil {
+			continue
+		}
+		if err := forwarder.Close(); err != nil && firstErr == nil {
+			firstErr = err
+		}
+	}
+	k.forwarders = nil
+	k.defaultTopic = ""
+	k.defaultGroup = ""
+	k.startLatest = false
+	return firstErr
+}
+
+func (k *KafkaDB) Ping() error {
+	if k.runtime == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	return k.runtime.Ping(ctx)
+}
+
+func (k *KafkaDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultKafkaQueryTimeout)
+	defer cancel()
+	return k.QueryContext(ctx, query)
+}
+
+func (k *KafkaDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if k.runtime == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+	text := strings.TrimSpace(query)
+	if text == "" {
+		return nil, nil, fmt.Errorf("查询语句不能为空")
+	}
+	parsed, ok := parseKafkaSQL(text, k.startLatest)
+	if !ok {
+		return nil, nil, fmt.Errorf("Kafka 查询仅支持 SHOW TOPICS、DESCRIBE TOPIC、SELECT * FROM topic 与 CONSUME FROM topic")
+	}
+
+	switch parsed.Action {
+	case "show_topics":
+		topics, err := k.runtime.ListTopics(ctx, false)
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := kafkaTopicRows(topics)
+		if parsed.Limit > 0 && len(rows) > parsed.Limit {
+			rows = rows[:parsed.Limit]
+		}
+		return rows, collectColumns(rows), nil
+	case "describe_topic":
+		description, err := k.runtime.DescribeTopic(ctx, kafkaResolveTopic(parsed.Topic, k.defaultTopic))
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := kafkaDescribeRows(description)
+		return rows, collectColumns(rows), nil
+	case "select", "consume":
+		topic := kafkaResolveTopic(parsed.Topic, k.defaultTopic)
+		if topic == "" {
+			return nil, nil, fmt.Errorf("Kafka topic 不能为空")
+		}
+		groupID := strings.TrimSpace(parsed.GroupID)
+		if parsed.Action == "consume" && groupID == "" {
+			groupID = k.defaultGroup
+		}
+		if parsed.Count {
+			description, err := k.runtime.DescribeTopic(ctx, topic)
+			if err != nil {
+				return nil, nil, err
+			}
+			return []map[string]interface{}{{
+				"topic": topic,
+				"total": kafkaTopicMessageCount(description),
+			}}, []string{"topic", "total"}, nil
+		}
+		records, err := k.runtime.FetchMessages(ctx, kafkaFetchRequest{
+			Topic:   topic,
+			Limit:   parsed.Limit,
+			Offset:  parsed.Offset,
+			GroupID: groupID,
+			Latest:  parsed.Latest,
+		})
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := kafkaMessageRows(records)
+		return rows, collectColumns(rows), nil
+	default:
+		return nil, nil, fmt.Errorf("未实现的 Kafka 查询类型：%s", parsed.Action)
+	}
+}
+
+func (k *KafkaDB) Exec(query string) (int64, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultKafkaQueryTimeout)
+	defer cancel()
+	return k.ExecContext(ctx, query)
+}
+
+func (k *KafkaDB) ExecContext(ctx context.Context, query string) (int64, error) {
+	if k.runtime == nil {
+		return 0, fmt.Errorf("连接未打开")
+	}
+	var cmd map[string]interface{}
+	if err := decodeJSONWithUseNumber([]byte(strings.TrimSpace(query)), &cmd); err != nil {
+		return 0, fmt.Errorf("Kafka 写入命令必须是 JSON：%w", err)
+	}
+	topic := kafkaResolveTopic(firstStringValue(cmd, "publish", "topic"), k.defaultTopic)
+	if topic == "" {
+		return 0, fmt.Errorf("Kafka publish 命令缺少 topic")
+	}
+	headers := map[string]interface{}{}
+	if rawHeaders, ok := cmd["headers"].(map[string]interface{}); ok {
+		headers = rawHeaders
+	}
+	return k.runtime.Publish(ctx, kafkaPublishCommand{
+		Topic:   topic,
+		Key:     firstExisting(cmd, "key", "messageKey"),
+		Value:   firstExisting(cmd, "value", "message", "payload"),
+		Headers: headers,
+	})
+}
+
+func (k *KafkaDB) GetDatabases() ([]string, error) {
+	if k.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	return []string{kafkaSyntheticDatabase}, nil
+}
+
+func (k *KafkaDB) GetTables(dbName string) ([]string, error) {
+	if k.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	topics, err := k.runtime.ListTopics(ctx, false)
+	if err != nil {
+		return nil, err
+	}
+	names := make([]string, 0, len(topics))
+	for _, topic := range topics {
+		if strings.TrimSpace(topic.Name) != "" {
+			names = append(names, topic.Name)
+		}
+	}
+	sort.Strings(names)
+	return names, nil
+}
+
+func (k *KafkaDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	if k.runtime == nil {
+		return "", fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	description, err := k.runtime.DescribeTopic(ctx, kafkaResolveTopic(tableName, k.defaultTopic))
+	if err != nil {
+		return "", err
+	}
+	payload, _ := json.MarshalIndent(description, "", "  ")
+	return fmt.Sprintf("// Kafka topic: %s\n%s", description.Name, string(payload)), nil
+}
+
+func (k *KafkaDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	if k.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	topic := kafkaResolveTopic(tableName, k.defaultTopic)
+	if topic == "" {
+		return nil, fmt.Errorf("Kafka topic 不能为空")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	records, err := k.runtime.FetchMessages(ctx, kafkaFetchRequest{
+		Topic:  topic,
+		Limit:  20,
+		Latest: false,
+	})
+	if err != nil {
+		return nil, err
+	}
+	rows := kafkaMessageRows(records)
+	columns := []connection.ColumnDefinition{
+		{Name: "topic", Type: "string", Nullable: "NO", Comment: "Kafka topic"},
+		{Name: "partition", Type: "int", Nullable: "NO", Key: "PRI", Comment: "Kafka partition id"},
+		{Name: "offset", Type: "bigint", Nullable: "NO", Key: "PRI", Comment: "Kafka message offset"},
+		{Name: "timestamp", Type: "timestamp", Nullable: "YES", Comment: "Message timestamp"},
+		{Name: "high_water_mark", Type: "bigint", Nullable: "YES", Comment: "Partition high water mark"},
+		{Name: "key", Type: "string", Nullable: "YES", Comment: "Message key"},
+		{Name: "value", Type: "json", Nullable: "YES", Comment: "Message value"},
+		{Name: "headers", Type: "json", Nullable: "YES", Comment: "Message headers"},
+		{Name: "key_size", Type: "int", Nullable: "YES", Comment: "Message key size in bytes"},
+		{Name: "value_size", Type: "int", Nullable: "YES", Comment: "Message value size in bytes"},
+	}
+	seen := map[string]struct{}{
+		"topic": {}, "partition": {}, "offset": {}, "timestamp": {}, "high_water_mark": {},
+		"key": {}, "value": {}, "headers": {}, "key_size": {}, "value_size": {},
+	}
+	for _, row := range rows {
+		for key, value := range row {
+			if _, exists := seen[key]; exists {
+				continue
+			}
+			if !strings.HasPrefix(key, "headers.") && !strings.HasPrefix(key, "key.") && !strings.HasPrefix(key, "value.") {
+				continue
+			}
+			seen[key] = struct{}{}
+			columns = append(columns, connection.ColumnDefinition{
+				Name:     key,
+				Type:     inferChromaValueType(value),
+				Nullable: "YES",
+				Comment:  "Derived Kafka field",
+			})
+		}
+	}
+	return columns, nil
+}
+
+func (k *KafkaDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	tables, err := k.GetTables(dbName)
+	if err != nil {
+		return nil, err
+	}
+	var result []connection.ColumnDefinitionWithTable
+	for _, table := range tables {
+		cols, err := k.GetColumns(dbName, table)
+		if err != nil {
+			continue
+		}
+		for _, col := range cols {
+			result = append(result, connection.ColumnDefinitionWithTable{
+				TableName: table,
+				Name:      col.Name,
+				Type:      col.Type,
+				Comment:   col.Comment,
+			})
+		}
+	}
+	return result, nil
+}
+
+func (k *KafkaDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	if k.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	description, err := k.runtime.DescribeTopic(ctx, kafkaResolveTopic(tableName, k.defaultTopic))
+	if err != nil {
+		return nil, err
+	}
+	indexes := []connection.IndexDefinition{
+		{Name: "PRIMARY", ColumnName: "partition", NonUnique: 0, SeqInIndex: 1, IndexType: "PARTITION_OFFSET"},
+		{Name: "PRIMARY", ColumnName: "offset", NonUnique: 0, SeqInIndex: 2, IndexType: "PARTITION_OFFSET"},
+		{Name: "TIMESTAMP", ColumnName: "timestamp", NonUnique: 1, SeqInIndex: 1, IndexType: "BTREE"},
+	}
+	for _, partition := range description.Partitions {
+		indexes = append(indexes, connection.IndexDefinition{
+			Name:       fmt.Sprintf("PARTITION_%d", partition.ID),
+			ColumnName: "offset",
+			NonUnique:  1,
+			SeqInIndex: 1,
+			IndexType:  "PARTITION",
+		})
+	}
+	return indexes, nil
+}
+
+func (k *KafkaDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return []connection.ForeignKeyDefinition{}, nil
+}
+
+func (k *KafkaDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return []connection.TriggerDefinition{}, nil
+}
+
+func (k *KafkaDB) ApplyChanges(tableName string, changes connection.ChangeSet) error {
+	if len(changes.Inserts) == 0 && len(changes.Updates) == 0 && len(changes.Deletes) == 0 {
+		return nil
+	}
+	return fmt.Errorf("Kafka 结果集仅支持只读预览；如需写入请在 SQL 编辑器执行 JSON publish 命令")
+}
+
+func normalizeKafkaConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
+	runConfig := applyKafkaURI(config)
+	if strings.TrimSpace(runConfig.Host) == "" && len(runConfig.Hosts) == 0 {
+		runConfig.Host = "localhost"
+	}
+	if runConfig.Port <= 0 {
+		runConfig.Port = defaultKafkaPort
+	}
+	if kafkaBoolParam(runConfig, "ssl", "tls", "useSSL", "use_ssl") {
+		runConfig.UseSSL = true
+	}
+	if strings.TrimSpace(runConfig.SSLMode) == "" && runConfig.UseSSL {
+		if kafkaBoolParam(runConfig, "skip_verify", "skipVerify", "insecure") {
+			runConfig.SSLMode = "skip-verify"
+		} else {
+			runConfig.SSLMode = "required"
+		}
+	}
+	return runConfig
+}
+
+func applyKafkaURI(config connection.ConnectionConfig) connection.ConnectionConfig {
+	uriText := strings.TrimSpace(config.URI)
+	if uriText == "" {
+		return config
+	}
+	parsed, err := url.Parse(uriText)
+	if err != nil {
+		return config
+	}
+	scheme := strings.ToLower(strings.TrimSpace(parsed.Scheme))
+	if scheme != "kafka" && scheme != "apache-kafka" && scheme != "apache_kafka" {
+		return config
+	}
+	if parsed.User != nil {
+		if strings.TrimSpace(config.User) == "" {
+			config.User = parsed.User.Username()
+		}
+		if pass, ok := parsed.User.Password(); ok && config.Password == "" {
+			config.Password = pass
+		}
+	}
+	hosts := make([]string, 0, 4)
+	for _, entry := range strings.Split(strings.TrimSpace(parsed.Host), ",") {
+		host, port, ok := parseHostPortWithDefault(strings.TrimSpace(entry), defaultKafkaPort)
+		if !ok {
+			continue
+		}
+		hosts = append(hosts, kafkaFormatHostPort(host, port))
+	}
+	if len(hosts) > 0 {
+		host, port, ok := parseHostPortWithDefault(hosts[0], defaultKafkaPort)
+		if ok {
+			config.Host = host
+			config.Port = port
+		}
+		if len(hosts) > 1 {
+			config.Hosts = append([]string(nil), hosts[1:]...)
+		}
+	}
+	if topic := strings.Trim(strings.TrimSpace(parsed.Path), "/"); topic != "" && strings.TrimSpace(config.Database) == "" {
+		config.Database = topic
+	}
+	params := parsed.Query()
+	if strings.TrimSpace(config.Topology) == "" {
+		if topology := strings.ToLower(strings.TrimSpace(firstNonEmpty(params.Get("topology"), params.Get("mode")))); topology != "" {
+			config.Topology = topology
+		} else if len(hosts) > 1 {
+			config.Topology = "cluster"
+		}
+	}
+	return config
+}
+
+func kafkaConnectionParams(config connection.ConnectionConfig) url.Values {
+	params := url.Values{}
+	mergeConnectionParamValues(params, connectionParamsFromURI(config.URI, "kafka", "apache-kafka", "apache_kafka"))
+	mergeConnectionParamValues(params, connectionParamsFromText(config.ConnectionParams))
+	return params
+}
+
+func kafkaBoolParam(config connection.ConnectionConfig, keys ...string) bool {
+	params := kafkaConnectionParams(config)
+	for _, key := range keys {
+		value := strings.ToLower(strings.TrimSpace(params.Get(key)))
+		switch value {
+		case "1", "true", "yes", "on", "required":
+			return true
+		}
+	}
+	return false
+}
+
+func kafkaDefaultTopic(config connection.ConnectionConfig) string {
+	if topic := strings.TrimSpace(config.Database); topic != "" {
+		return topic
+	}
+	params := kafkaConnectionParams(config)
+	return firstNonEmpty(params.Get("topic"), params.Get("defaultTopic"), params.Get("default_topic"))
+}
+
+func kafkaDefaultGroupID(config connection.ConnectionConfig) string {
+	params := kafkaConnectionParams(config)
+	return firstNonEmpty(
+		params.Get("groupId"),
+		params.Get("group_id"),
+		params.Get("consumerGroup"),
+		params.Get("consumer_group"),
+	)
+}
+
+func kafkaDefaultStartLatest(config connection.ConnectionConfig) bool {
+	params := kafkaConnectionParams(config)
+	value := strings.ToLower(strings.TrimSpace(firstNonEmpty(
+		params.Get("startOffset"),
+		params.Get("start_offset"),
+		params.Get("offsetReset"),
+		params.Get("auto.offset.reset"),
+	)))
+	switch value {
+	case "latest", "last", "newest", "end":
+		return true
+	default:
+		return false
+	}
+}
+
+func kafkaClientID(config connection.ConnectionConfig) string {
+	params := kafkaConnectionParams(config)
+	return firstNonEmpty(params.Get("clientId"), params.Get("client_id"), kafkaDefaultClientID)
+}
+
+func kafkaPreviewReadTimeout(config connection.ConnectionConfig) time.Duration {
+	params := kafkaConnectionParams(config)
+	if ms, err := strconv.Atoi(strings.TrimSpace(firstNonEmpty(params.Get("readTimeoutMs"), params.Get("fetchWaitMs")))); err == nil && ms > 0 {
+		return time.Duration(ms) * time.Millisecond
+	}
+	return 1500 * time.Millisecond
+}
+
+func kafkaResolveTopic(topic string, fallback string) string {
+	if text := strings.TrimSpace(topic); text != "" {
+		return text
+	}
+	return strings.TrimSpace(fallback)
+}
+
+func kafkaBrokerAddresses(config connection.ConnectionConfig) ([]string, error) {
+	candidates := make([]string, 0, len(config.Hosts)+1)
+	if host := strings.TrimSpace(config.Host); host != "" {
+		port := config.Port
+		if port <= 0 {
+			port = defaultKafkaPort
+		}
+		candidates = append(candidates, kafkaFormatHostPort(host, port))
+	}
+	candidates = append(candidates, config.Hosts...)
+	seen := map[string]struct{}{}
+	brokers := make([]string, 0, len(candidates))
+	for _, candidate := range candidates {
+		host, port, ok := parseHostPortWithDefault(candidate, defaultKafkaPort)
+		if !ok {
+			continue
+		}
+		address := kafkaFormatHostPort(host, port)
+		if _, exists := seen[address]; exists {
+			continue
+		}
+		seen[address] = struct{}{}
+		brokers = append(brokers, address)
+	}
+	if len(brokers) == 0 {
+		return nil, fmt.Errorf("Kafka 至少需要一个 broker 地址")
+	}
+	return brokers, nil
+}
+
+func kafkaForwardBrokersOverSSH(config connection.ConnectionConfig) (connection.ConnectionConfig, []string, []*ssh.LocalForwarder, error) {
+	brokers, err := kafkaBrokerAddresses(config)
+	if err != nil {
+		return connection.ConnectionConfig{}, nil, nil, err
+	}
+	runConfig := config
+	forwarders := make([]*ssh.LocalForwarder, 0, len(brokers))
+	rewritten := make([]string, 0, len(brokers))
+	for _, broker := range brokers {
+		host, port, ok := parseHostPortWithDefault(broker, defaultKafkaPort)
+		if !ok {
+			return connection.ConnectionConfig{}, nil, nil, fmt.Errorf("解析 Kafka broker 地址失败：%s", broker)
+		}
+		forwarder, err := ssh.GetOrCreateLocalForwarder(config.SSH, host, port)
+		if err != nil {
+			return connection.ConnectionConfig{}, nil, nil, fmt.Errorf("创建 Kafka SSH 隧道失败：%w", err)
+		}
+		forwarders = append(forwarders, forwarder)
+		rewritten = append(rewritten, forwarder.LocalAddr)
+	}
+	return runConfig, rewritten, forwarders, nil
+}
+
+func newKafkaGoRuntime(config connection.ConnectionConfig) (kafkaRuntime, error) {
+	brokers, err := kafkaBrokerAddresses(config)
+	if err != nil {
+		return nil, err
+	}
+	tlsConfig, err := resolveGenericTLSConfig(config)
+	if err != nil {
+		return nil, err
+	}
+	mechanism, err := kafkaSASLMechanism(config)
+	if err != nil {
+		return nil, err
+	}
+	timeout := getConnectTimeout(config)
+	if timeout <= 0 {
+		timeout = 10 * time.Second
+	}
+
+	baseDialer := &net.Dialer{
+		Timeout:   timeout,
+		KeepAlive: 30 * time.Second,
+		DualStack: true,
+	}
+	dialFunc := baseDialer.DialContext
+	if config.UseProxy {
+		proxyConfig := config.Proxy
+		dialFunc = func(ctx context.Context, network, address string) (net.Conn, error) {
+			return proxytunnel.DialContext(ctx, proxyConfig, network, address)
+		}
+	}
+
+	dialer := &kafka.Dialer{
+		ClientID:      kafkaClientID(config),
+		Timeout:       timeout,
+		KeepAlive:     30 * time.Second,
+		DualStack:     true,
+		DialFunc:      dialFunc,
+		TLS:           tlsConfig,
+		SASLMechanism: mechanism,
+	}
+	transport := &kafka.Transport{
+		Dial:        dialFunc,
+		DialTimeout: timeout,
+		ClientID:    kafkaClientID(config),
+		TLS:         tlsConfig,
+		SASL:        mechanism,
+	}
+	client := &kafka.Client{
+		Addr:      kafka.TCP(brokers...),
+		Timeout:   timeout,
+		Transport: transport,
+	}
+	return &kafkaGoRuntime{
+		brokers:    brokers,
+		bootstrap:  brokers[0],
+		dialer:     dialer,
+		transport:  transport,
+		client:     client,
+		timeout:    timeout,
+		readWait:   kafkaPreviewReadTimeout(config),
+		defaultAck: kafka.RequireAll,
+	}, nil
+}
+
+func (r *kafkaGoRuntime) Close() error {
+	if r.transport != nil {
+		r.transport.CloseIdleConnections()
+	}
+	return nil
+}
+
+func (r *kafkaGoRuntime) Ping(ctx context.Context) error {
+	if r.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	_, err := r.client.Metadata(ctx, &kafka.MetadataRequest{Addr: kafka.TCP(r.bootstrap)})
+	return err
+}
+
+func (r *kafkaGoRuntime) ListTopics(ctx context.Context, includeInternal bool) ([]kafkaTopicInfo, error) {
+	if r.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	resp, err := r.client.Metadata(ctx, &kafka.MetadataRequest{Addr: kafka.TCP(r.bootstrap)})
+	if err != nil {
+		return nil, err
+	}
+	topics := make([]kafkaTopicInfo, 0, len(resp.Topics))
+	for _, topic := range resp.Topics {
+		if topic.Error != nil {
+			continue
+		}
+		if !includeInternal && topic.Internal {
+			continue
+		}
+		topics = append(topics, kafkaTopicInfo{
+			Name:       topic.Name,
+			Internal:   topic.Internal,
+			Partitions: append([]kafka.Partition(nil), topic.Partitions...),
+		})
+	}
+	sort.Slice(topics, func(i, j int) bool {
+		return topics[i].Name < topics[j].Name
+	})
+	return topics, nil
+}
+
+func (r *kafkaGoRuntime) DescribeTopic(ctx context.Context, topic string) (kafkaTopicDescription, error) {
+	if r.client == nil {
+		return kafkaTopicDescription{}, fmt.Errorf("连接未打开")
+	}
+	name := strings.TrimSpace(topic)
+	if name == "" {
+		return kafkaTopicDescription{}, fmt.Errorf("Kafka topic 不能为空")
+	}
+	resp, err := r.client.Metadata(ctx, &kafka.MetadataRequest{
+		Addr:   kafka.TCP(r.bootstrap),
+		Topics: []string{name},
+	})
+	if err != nil {
+		return kafkaTopicDescription{}, err
+	}
+	for _, topicInfo := range resp.Topics {
+		if topicInfo.Name != name {
+			continue
+		}
+		if topicInfo.Error != nil {
+			return kafkaTopicDescription{}, topicInfo.Error
+		}
+		description := kafkaTopicDescription{
+			Name:     topicInfo.Name,
+			Internal: topicInfo.Internal,
+		}
+		for _, partition := range topicInfo.Partitions {
+			earliest, latest, err := r.partitionOffsets(ctx, name, partition.ID)
+			if err != nil {
+				return kafkaTopicDescription{}, err
+			}
+			description.Partitions = append(description.Partitions, kafkaTopicPartition{
+				ID:               partition.ID,
+				Leader:           partition.Leader,
+				Replicas:         append([]kafka.Broker(nil), partition.Replicas...),
+				Isr:              append([]kafka.Broker(nil), partition.Isr...),
+				OfflineReplicas:  append([]kafka.Broker(nil), partition.OfflineReplicas...),
+				EarliestOffset:   earliest,
+				LatestOffset:     latest,
+				ApproximateCount: maxInt64(0, latest-earliest),
+			})
+		}
+		sort.Slice(description.Partitions, func(i, j int) bool {
+			return description.Partitions[i].ID < description.Partitions[j].ID
+		})
+		return description, nil
+	}
+	return kafkaTopicDescription{}, fmt.Errorf("Kafka topic 不存在：%s", name)
+}
+
+func (r *kafkaGoRuntime) FetchMessages(ctx context.Context, request kafkaFetchRequest) ([]kafkaMessageRecord, error) {
+	topic := strings.TrimSpace(request.Topic)
+	if topic == "" {
+		return nil, fmt.Errorf("Kafka topic 不能为空")
+	}
+	limit := request.Limit
+	if limit <= 0 {
+		limit = defaultKafkaPreviewLimit
+	}
+	if strings.TrimSpace(request.GroupID) != "" {
+		return r.fetchMessagesWithGroup(ctx, kafkaFetchRequest{
+			Topic:   topic,
+			Limit:   limit,
+			Offset:  maxInt(request.Offset, 0),
+			GroupID: strings.TrimSpace(request.GroupID),
+			Latest:  request.Latest,
+		})
+	}
+	return r.fetchMessagesDirect(ctx, kafkaFetchRequest{
+		Topic:  topic,
+		Limit:  limit,
+		Offset: maxInt(request.Offset, 0),
+		Latest: request.Latest,
+	})
+}
+
+func (r *kafkaGoRuntime) Publish(ctx context.Context, command kafkaPublishCommand) (int64, error) {
+	topic := strings.TrimSpace(command.Topic)
+	if topic == "" {
+		return 0, fmt.Errorf("Kafka publish 命令缺少 topic")
+	}
+	keyBytes, err := kafkaMessageBytes(command.Key)
+	if err != nil {
+		return 0, fmt.Errorf("序列化 Kafka key 失败：%w", err)
+	}
+	valueBytes, err := kafkaMessageBytes(command.Value)
+	if err != nil {
+		return 0, fmt.Errorf("序列化 Kafka value 失败：%w", err)
+	}
+	headers, err := kafkaMessageHeaders(command.Headers)
+	if err != nil {
+		return 0, fmt.Errorf("序列化 Kafka headers 失败：%w", err)
+	}
+	writer := &kafka.Writer{
+		Addr:         kafka.TCP(r.brokers...),
+		Topic:        topic,
+		RequiredAcks: r.defaultAck,
+		Transport:    r.transport,
+		ReadTimeout:  r.timeout,
+		WriteTimeout: r.timeout,
+		BatchTimeout: 20 * time.Millisecond,
+	}
+	defer writer.Close()
+	if err := writer.WriteMessages(ctx, kafka.Message{
+		Topic:   topic,
+		Key:     keyBytes,
+		Value:   valueBytes,
+		Headers: headers,
+		Time:    time.Now(),
+	}); err != nil {
+		return 0, err
+	}
+	return 1, nil
+}
+
+func (r *kafkaGoRuntime) fetchMessagesWithGroup(ctx context.Context, request kafkaFetchRequest) ([]kafkaMessageRecord, error) {
+	reader := kafka.NewReader(kafka.ReaderConfig{
+		Brokers:         append([]string(nil), r.brokers...),
+		GroupID:         request.GroupID,
+		Topic:           request.Topic,
+		Dialer:          r.dialer,
+		QueueCapacity:   maxInt(request.Limit+request.Offset, 1),
+		MinBytes:        1,
+		MaxBytes:        kafkaFetchMaxBytes,
+		MaxWait:         r.readWait,
+		ReadLagInterval: -1,
+		CommitInterval:  0,
+		StartOffset:     kafkaOffsetMode(request.Latest),
+		MaxAttempts:     1,
+	})
+	defer reader.Close()
+
+	target := request.Limit + request.Offset
+	records := make([]kafkaMessageRecord, 0, request.Limit)
+	skipped := 0
+	for len(records) < request.Limit && skipped+len(records) < target {
+		readCtx, cancel := context.WithTimeout(ctx, r.readWait)
+		msg, err := reader.FetchMessage(readCtx)
+		cancel()
+		if err != nil {
+			if isKafkaReadTimeout(err) || errorsIsContextTimeout(err) {
+				break
+			}
+			return nil, err
+		}
+		record := kafkaMessageRecord{
+			Message: msg,
+			Key:     kafkaDecodePayload(msg.Key),
+			Value:   kafkaDecodePayload(msg.Value),
+			Headers: kafkaHeadersToMap(msg.Headers),
+		}
+		if skipped < request.Offset {
+			skipped++
+			continue
+		}
+		records = append(records, record)
+	}
+	return records, nil
+}
+
+func (r *kafkaGoRuntime) fetchMessagesDirect(ctx context.Context, request kafkaFetchRequest) ([]kafkaMessageRecord, error) {
+	partitions, err := r.dialer.LookupPartitions(ctx, "tcp", r.bootstrap, request.Topic)
+	if err != nil {
+		return nil, err
+	}
+	sort.Slice(partitions, func(i, j int) bool {
+		return partitions[i].ID < partitions[j].ID
+	})
+	target := maxInt(request.Limit+request.Offset, request.Limit)
+	records := make([]kafkaMessageRecord, 0, target)
+	for _, partition := range partitions {
+		start, err := r.partitionStartOffset(ctx, request.Topic, partition.ID, request.Latest, target)
+		if err != nil {
+			return nil, err
+		}
+		items, err := r.fetchPartitionMessages(ctx, request.Topic, partition.ID, start, target)
+		if err != nil {
+			return nil, err
+		}
+		records = append(records, items...)
+	}
+	sortKafkaRecords(records, request.Latest)
+	if request.Offset >= len(records) {
+		return []kafkaMessageRecord{}, nil
+	}
+	records = records[request.Offset:]
+	if len(records) > request.Limit {
+		records = records[:request.Limit]
+	}
+	return records, nil
+}
+
+func (r *kafkaGoRuntime) partitionStartOffset(ctx context.Context, topic string, partitionID int, latest bool, limit int) (int64, error) {
+	first, last, err := r.partitionOffsets(ctx, topic, partitionID)
+	if err != nil {
+		return 0, err
+	}
+	if !latest {
+		return first, nil
+	}
+	start := last - int64(limit)
+	if start < first {
+		start = first
+	}
+	return start, nil
+}
+
+func (r *kafkaGoRuntime) partitionOffsets(ctx context.Context, topic string, partitionID int) (int64, int64, error) {
+	conn, err := r.dialer.DialLeader(ctx, "tcp", r.bootstrap, topic, partitionID)
+	if err != nil {
+		return 0, 0, err
+	}
+	defer conn.Close()
+	return conn.ReadOffsets()
+}
+
+func (r *kafkaGoRuntime) fetchPartitionMessages(ctx context.Context, topic string, partitionID int, startOffset int64, limit int) ([]kafkaMessageRecord, error) {
+	conn, err := r.dialer.DialLeader(ctx, "tcp", r.bootstrap, topic, partitionID)
+	if err != nil {
+		return nil, err
+	}
+	defer conn.Close()
+
+	if _, err := conn.Seek(startOffset, io.SeekStart); err != nil {
+		return nil, err
+	}
+	deadline := time.Now().Add(r.readWait)
+	if ctxDeadline, ok := ctx.Deadline(); ok && ctxDeadline.Before(deadline) {
+		deadline = ctxDeadline
+	}
+	_ = conn.SetReadDeadline(deadline)
+
+	records := make([]kafkaMessageRecord, 0, limit)
+	for len(records) < limit {
+		msg, err := conn.ReadMessage(kafkaFetchMaxBytes)
+		if err != nil {
+			if isKafkaReadTimeout(err) || errorsIsContextTimeout(err) || errors.Is(err, io.EOF) {
+				break
+			}
+			return nil, err
+		}
+		records = append(records, kafkaMessageRecord{
+			Message: msg,
+			Key:     kafkaDecodePayload(msg.Key),
+			Value:   kafkaDecodePayload(msg.Value),
+			Headers: kafkaHeadersToMap(msg.Headers),
+		})
+	}
+	return records, nil
+}
+
+func kafkaSASLMechanism(config connection.ConnectionConfig) (kafkasasl.Mechanism, error) {
+	params := kafkaConnectionParams(config)
+	mechanism := strings.ToLower(strings.TrimSpace(firstNonEmpty(
+		params.Get("mechanism"),
+		params.Get("saslMechanism"),
+		params.Get("sasl_mechanism"),
+		params.Get("sasl"),
+	)))
+	if mechanism == "" || mechanism == "none" {
+		return nil, nil
+	}
+	username := strings.TrimSpace(config.User)
+	password := config.Password
+	switch mechanism {
+	case "plain", "sasl_plaintext":
+		return kafkaplain.Mechanism{Username: username, Password: password}, nil
+	case "scram-sha-256", "scram_sha_256", "scram256":
+		return kafkascram.Mechanism(kafkascram.SHA256, username, password)
+	case "scram-sha-512", "scram_sha_512", "scram512":
+		return kafkascram.Mechanism(kafkascram.SHA512, username, password)
+	default:
+		return nil, fmt.Errorf("不支持的 Kafka SASL 认证机制：%s", mechanism)
+	}
+}
+
+type kafkaParsedSQL struct {
+	Action  string
+	Topic   string
+	Limit   int
+	Offset  int
+	GroupID string
+	Count   bool
+	Latest  bool
+}
+
+var (
+	kafkaSQLFromRE        = regexp.MustCompile(`(?i)\bFROM\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([a-zA-Z0-9_.\-]+))`)
+	kafkaSQLLimitRE       = regexp.MustCompile(`(?i)\bLIMIT\s+(\d+)`)
+	kafkaSQLOffsetRE      = regexp.MustCompile(`(?i)\bOFFSET\s+(\d+)`)
+	kafkaShowTopicsRE     = regexp.MustCompile(`(?i)^\s*SHOW\s+TOPICS(?:\s+LIMIT\s+(\d+))?\s*$`)
+	kafkaDescribeTopicRE  = regexp.MustCompile(`(?i)^\s*(?:SHOW|DESCRIBE)\s+TOPIC\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([a-zA-Z0-9_.\-]+))\s*$`)
+	kafkaConsumeTopicRE   = regexp.MustCompile(`(?i)^\s*CONSUME(?:\s+GROUP\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([a-zA-Z0-9_.\-]+)))?\s+FROM\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([a-zA-Z0-9_.\-]+))`)
+)
+
+func parseKafkaSQL(sqlText string, defaultLatest bool) (kafkaParsedSQL, bool) {
+	text := strings.TrimSpace(sqlText)
+	if text == "" {
+		return kafkaParsedSQL{}, false
+	}
+	if matches := kafkaShowTopicsRE.FindStringSubmatch(text); len(matches) > 0 {
+		parsed := kafkaParsedSQL{Action: "show_topics"}
+		if len(matches) > 1 && strings.TrimSpace(matches[1]) != "" {
+			parsed.Limit, _ = strconv.Atoi(matches[1])
+		}
+		return parsed, true
+	}
+	if matches := kafkaDescribeTopicRE.FindStringSubmatch(text); len(matches) > 0 {
+		return kafkaParsedSQL{
+			Action: "describe_topic",
+			Topic:  firstNonEmpty(matches[1], matches[2], matches[3]),
+		}, true
+	}
+	if matches := kafkaConsumeTopicRE.FindStringSubmatch(text); len(matches) > 0 {
+		parsed := kafkaParsedSQL{
+			Action:  "consume",
+			GroupID: firstNonEmpty(matches[1], matches[2], matches[3]),
+			Topic:   firstNonEmpty(matches[4], matches[5], matches[6]),
+			Limit:   defaultKafkaPreviewLimit,
+			Latest:  true,
+		}
+		if limitMatch := kafkaSQLLimitRE.FindStringSubmatch(text); len(limitMatch) > 1 {
+			parsed.Limit, _ = strconv.Atoi(limitMatch[1])
+		}
+		if offsetMatch := kafkaSQLOffsetRE.FindStringSubmatch(text); len(offsetMatch) > 1 {
+			parsed.Offset, _ = strconv.Atoi(offsetMatch[1])
+		}
+		return parsed, true
+	}
+	if !strings.HasPrefix(strings.ToLower(text), "select") {
+		return kafkaParsedSQL{}, false
+	}
+	matches := kafkaSQLFromRE.FindStringSubmatch(text)
+	if len(matches) == 0 {
+		return kafkaParsedSQL{}, false
+	}
+	parsed := kafkaParsedSQL{
+		Action: "select",
+		Topic:  firstNonEmpty(matches[1], matches[2], matches[3]),
+		Limit:  defaultKafkaPreviewLimit,
+		Count:  strings.Contains(strings.ToLower(text), "count("),
+		Latest: defaultLatest,
+	}
+	if limitMatch := kafkaSQLLimitRE.FindStringSubmatch(text); len(limitMatch) > 1 {
+		parsed.Limit, _ = strconv.Atoi(limitMatch[1])
+	}
+	if offsetMatch := kafkaSQLOffsetRE.FindStringSubmatch(text); len(offsetMatch) > 1 {
+		parsed.Offset, _ = strconv.Atoi(offsetMatch[1])
+	}
+	return parsed, true
+}
+
+func kafkaTopicRows(topics []kafkaTopicInfo) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(topics))
+	for _, topic := range topics {
+		rows = append(rows, map[string]interface{}{
+			"topic":           topic.Name,
+			"internal":        topic.Internal,
+			"partition_count": len(topic.Partitions),
+		})
+	}
+	return rows
+}
+
+func kafkaDescribeRows(description kafkaTopicDescription) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(description.Partitions))
+	for _, partition := range description.Partitions {
+		rows = append(rows, map[string]interface{}{
+			"topic":             description.Name,
+			"internal":          description.Internal,
+			"partition":         partition.ID,
+			"leader":            kafkaBrokerAddress(partition.Leader),
+			"replicas":          kafkaBrokerAddressesList(partition.Replicas),
+			"isr":               kafkaBrokerAddressesList(partition.Isr),
+			"offline_replicas":  kafkaBrokerAddressesList(partition.OfflineReplicas),
+			"earliest_offset":   partition.EarliestOffset,
+			"latest_offset":     partition.LatestOffset,
+			"approximate_count": partition.ApproximateCount,
+		})
+	}
+	return rows
+}
+
+func kafkaMessageRows(records []kafkaMessageRecord) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(records))
+	for _, record := range records {
+		row := map[string]interface{}{
+			"topic":           record.Message.Topic,
+			"partition":       record.Message.Partition,
+			"offset":          record.Message.Offset,
+			"timestamp":       record.Message.Time.Format(time.RFC3339Nano),
+			"high_water_mark": record.Message.HighWaterMark,
+			"key":             record.Key,
+			"value":           record.Value,
+			"headers":         record.Headers,
+			"key_size":        len(record.Message.Key),
+			"value_size":      len(record.Message.Value),
+		}
+		if valueMap, ok := record.Value.(map[string]interface{}); ok {
+			flattenKafkaMap("value", valueMap, row)
+		}
+		if keyMap, ok := record.Key.(map[string]interface{}); ok {
+			flattenKafkaMap("key", keyMap, row)
+		}
+		if len(record.Headers) > 0 {
+			flattenKafkaMap("headers", record.Headers, row)
+		}
+		rows = append(rows, row)
+	}
+	return rows
+}
+
+func flattenKafkaMap(prefix string, values map[string]interface{}, row map[string]interface{}) {
+	for key, value := range values {
+		if strings.TrimSpace(key) == "" {
+			continue
+		}
+		name := prefix + "." + key
+		row[name] = value
+		if nested, ok := value.(map[string]interface{}); ok {
+			flattenKafkaMap(name, nested, row)
+		}
+	}
+}
+
+func kafkaHeadersToMap(headers []kafka.Header) map[string]interface{} {
+	result := make(map[string]interface{}, len(headers))
+	for _, header := range headers {
+		key := strings.TrimSpace(header.Key)
+		if key == "" {
+			continue
+		}
+		value := kafkaDecodePayload(header.Value)
+		if existing, ok := result[key]; ok {
+			switch typed := existing.(type) {
+			case []interface{}:
+				result[key] = append(typed, value)
+			default:
+				result[key] = []interface{}{typed, value}
+			}
+			continue
+		}
+		result[key] = value
+	}
+	return result
+}
+
+func kafkaDecodePayload(payload []byte) interface{} {
+	if payload == nil {
+		return nil
+	}
+	var decoded interface{}
+	if err := decodeJSONWithUseNumber(payload, &decoded); err == nil {
+		return decoded
+	}
+	return bytesToDisplayValue(payload, "")
+}
+
+func kafkaMessageBytes(value interface{}) ([]byte, error) {
+	switch typed := value.(type) {
+	case nil:
+		return nil, nil
+	case []byte:
+		return typed, nil
+	case string:
+		return []byte(typed), nil
+	case json.Number:
+		return []byte(typed.String()), nil
+	case bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, float32, float64:
+		return []byte(fmt.Sprintf("%v", typed)), nil
+	case map[string]interface{}, []interface{}:
+		return json.Marshal(typed)
+	default:
+		return json.Marshal(typed)
+	}
+}
+
+func kafkaMessageHeaders(values map[string]interface{}) ([]kafka.Header, error) {
+	if len(values) == 0 {
+		return nil, nil
+	}
+	keys := make([]string, 0, len(values))
+	for key := range values {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+	headers := make([]kafka.Header, 0, len(keys))
+	for _, key := range keys {
+		payload, err := kafkaMessageBytes(values[key])
+		if err != nil {
+			return nil, err
+		}
+		headers = append(headers, kafka.Header{Key: key, Value: payload})
+	}
+	return headers, nil
+}
+
+func sortKafkaRecords(records []kafkaMessageRecord, latest bool) {
+	sort.Slice(records, func(i, j int) bool {
+		left := records[i].Message
+		right := records[j].Message
+		if !left.Time.Equal(right.Time) {
+			if latest {
+				return left.Time.After(right.Time)
+			}
+			return left.Time.Before(right.Time)
+		}
+		if left.Partition != right.Partition {
+			if latest {
+				return left.Partition > right.Partition
+			}
+			return left.Partition < right.Partition
+		}
+		if latest {
+			return left.Offset > right.Offset
+		}
+		return left.Offset < right.Offset
+	})
+}
+
+func kafkaOffsetMode(latest bool) int64 {
+	if latest {
+		return kafka.LastOffset
+	}
+	return kafka.FirstOffset
+}
+
+func kafkaTopicMessageCount(description kafkaTopicDescription) int64 {
+	var total int64
+	for _, partition := range description.Partitions {
+		total += partition.ApproximateCount
+	}
+	return total
+}
+
+func kafkaBrokerAddress(broker kafka.Broker) string {
+	if strings.TrimSpace(broker.Host) == "" || broker.Port <= 0 {
+		return strconv.Itoa(broker.ID)
+	}
+	return kafkaFormatHostPort(broker.Host, broker.Port)
+}
+
+func kafkaBrokerAddressesList(brokers []kafka.Broker) []string {
+	result := make([]string, 0, len(brokers))
+	for _, broker := range brokers {
+		result = append(result, kafkaBrokerAddress(broker))
+	}
+	return result
+}
+
+func kafkaFormatHostPort(host string, port int) string {
+	h := strings.TrimSpace(host)
+	if strings.Contains(h, ":") && !strings.HasPrefix(h, "[") {
+		return fmt.Sprintf("[%s]:%d", h, port)
+	}
+	return fmt.Sprintf("%s:%d", h, port)
+}
+
+func isKafkaReadTimeout(err error) bool {
+	if err == nil {
+		return false
+	}
+	if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
+		return true
+	}
+	return strings.Contains(strings.ToLower(err.Error()), "i/o timeout")
+}
+
+func errorsIsContextTimeout(err error) bool {
+	return errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled)
+}
+
+func maxInt(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+func maxInt64(a, b int64) int64 {
+	if a > b {
+		return a
+	}
+	return b
+}
diff --git a/internal/db/kafka_impl_test.go b/internal/db/kafka_impl_test.go
new file mode 100644
index 0000000..bb18f02
--- /dev/null
+++ b/internal/db/kafka_impl_test.go
@@ -0,0 +1,215 @@
+package db
+
+import (
+	"context"
+	"reflect"
+	"strings"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+
+	kafka "github.com/segmentio/kafka-go"
+)
+
+type fakeKafkaRuntime struct {
+	listTopicsResult    []kafkaTopicInfo
+	describeResult      kafkaTopicDescription
+	fetchResult         []kafkaMessageRecord
+	publishAffected     int64
+	lastDescribeTopic   string
+	lastFetchRequest    kafkaFetchRequest
+	lastPublishCommand  kafkaPublishCommand
+}
+
+func (f *fakeKafkaRuntime) Close() error { return nil }
+
+func (f *fakeKafkaRuntime) Ping(ctx context.Context) error { return nil }
+
+func (f *fakeKafkaRuntime) ListTopics(ctx context.Context, includeInternal bool) ([]kafkaTopicInfo, error) {
+	return append([]kafkaTopicInfo(nil), f.listTopicsResult...), nil
+}
+
+func (f *fakeKafkaRuntime) DescribeTopic(ctx context.Context, topic string) (kafkaTopicDescription, error) {
+	f.lastDescribeTopic = topic
+	return f.describeResult, nil
+}
+
+func (f *fakeKafkaRuntime) FetchMessages(ctx context.Context, request kafkaFetchRequest) ([]kafkaMessageRecord, error) {
+	f.lastFetchRequest = request
+	return append([]kafkaMessageRecord(nil), f.fetchResult...), nil
+}
+
+func (f *fakeKafkaRuntime) Publish(ctx context.Context, command kafkaPublishCommand) (int64, error) {
+	f.lastPublishCommand = command
+	return f.publishAffected, nil
+}
+
+func TestNormalizeKafkaConfigParsesURIAndParams(t *testing.T) {
+	config := normalizeKafkaConfig(connection.ConnectionConfig{
+		URI:              "kafka://alice:secret@127.0.0.1:9092,127.0.0.2:9093/orders.events?topology=cluster&tls=true&skip_verify=true",
+		ConnectionParams: "groupId=analytics&mechanism=scram-sha-256",
+	})
+
+	if config.Host != "127.0.0.1" || config.Port != 9092 {
+		t.Fatalf("unexpected primary broker: %#v", config)
+	}
+	if !reflect.DeepEqual(config.Hosts, []string{"127.0.0.2:9093"}) {
+		t.Fatalf("unexpected extra brokers: %#v", config.Hosts)
+	}
+	if config.User != "alice" || config.Password != "secret" {
+		t.Fatalf("unexpected credentials: %#v", config)
+	}
+	if config.Database != "orders.events" || config.Topology != "cluster" {
+		t.Fatalf("unexpected topic/topology: %#v", config)
+	}
+	if !config.UseSSL || config.SSLMode != "skip-verify" {
+		t.Fatalf("unexpected tls settings: %#v", config)
+	}
+
+	params := kafkaConnectionParams(config)
+	if params.Get("groupId") != "analytics" || params.Get("mechanism") != "scram-sha-256" {
+		t.Fatalf("unexpected kafka params: %#v", params)
+	}
+}
+
+func TestKafkaQueryShowTopicsAndDescribeTopic(t *testing.T) {
+	runtime := &fakeKafkaRuntime{
+		listTopicsResult: []kafkaTopicInfo{
+			{Name: "logs.app", Partitions: []kafka.Partition{{}, {}}},
+			{Name: "orders-events", Partitions: []kafka.Partition{{}}},
+		},
+		describeResult: kafkaTopicDescription{
+			Name: "logs.app",
+			Partitions: []kafkaTopicPartition{{
+				ID:               0,
+				Leader:           kafka.Broker{Host: "127.0.0.1", Port: 9092},
+				EarliestOffset:   1,
+				LatestOffset:     9,
+				ApproximateCount: 8,
+			}},
+		},
+	}
+	client := &KafkaDB{runtime: runtime}
+
+	rows, columns, err := client.Query(`SHOW TOPICS LIMIT 1`)
+	if err != nil {
+		t.Fatalf("SHOW TOPICS failed: %v", err)
+	}
+	if len(rows) != 1 || rows[0]["topic"] != "logs.app" {
+		t.Fatalf("unexpected topic rows: %#v", rows)
+	}
+	if !containsString(columns, "partition_count") {
+		t.Fatalf("expected partition_count column, got %v", columns)
+	}
+
+	rows, columns, err = client.Query(`DESCRIBE TOPIC "logs.app"`)
+	if err != nil {
+		t.Fatalf("DESCRIBE TOPIC failed: %v", err)
+	}
+	if runtime.lastDescribeTopic != "logs.app" {
+		t.Fatalf("expected describe topic logs.app, got %q", runtime.lastDescribeTopic)
+	}
+	if len(rows) != 1 || rows[0]["leader"] != "127.0.0.1:9092" {
+		t.Fatalf("unexpected describe rows: %#v", rows)
+	}
+	if !containsString(columns, "approximate_count") {
+		t.Fatalf("expected approximate_count column, got %v", columns)
+	}
+}
+
+func TestKafkaQuerySelectAndConsumeKeepTopicNameIntact(t *testing.T) {
+	runtime := &fakeKafkaRuntime{
+		fetchResult: []kafkaMessageRecord{{
+			Message: kafka.Message{
+				Topic:         "logs.app-1",
+				Partition:     2,
+				Offset:        42,
+				HighWaterMark: 100,
+				Key:           []byte(`{"tenant":"a"}`),
+				Value:         []byte(`{"event":"login","meta":{"ip":"127.0.0.1"}}`),
+			},
+			Key: map[string]interface{}{"tenant": "a"},
+			Value: map[string]interface{}{
+				"event": "login",
+				"meta":  map[string]interface{}{"ip": "127.0.0.1"},
+			},
+			Headers: map[string]interface{}{"x-trace-id": "trace-1"},
+		}},
+	}
+	client := &KafkaDB{
+		runtime:      runtime,
+		defaultGroup: "gonavi",
+		startLatest:  false,
+	}
+
+	rows, columns, err := client.Query(`SELECT * FROM "logs.app-1" LIMIT 5 OFFSET 2`)
+	if err != nil {
+		t.Fatalf("SELECT failed: %v", err)
+	}
+	if runtime.lastFetchRequest.Topic != "logs.app-1" || runtime.lastFetchRequest.Limit != 5 || runtime.lastFetchRequest.Offset != 2 {
+		t.Fatalf("unexpected select fetch request: %#v", runtime.lastFetchRequest)
+	}
+	if len(rows) != 1 || rows[0]["value.meta.ip"] != "127.0.0.1" || rows[0]["headers.x-trace-id"] != "trace-1" {
+		t.Fatalf("unexpected select rows: %#v", rows)
+	}
+	if !containsString(columns, "value.meta.ip") || !containsString(columns, "headers.x-trace-id") {
+		t.Fatalf("unexpected columns: %v", columns)
+	}
+
+	_, _, err = client.Query(`CONSUME FROM "logs.app-1" LIMIT 3`)
+	if err != nil {
+		t.Fatalf("CONSUME failed: %v", err)
+	}
+	if runtime.lastFetchRequest.Topic != "logs.app-1" || runtime.lastFetchRequest.GroupID != "gonavi" || !runtime.lastFetchRequest.Latest {
+		t.Fatalf("unexpected consume request: %#v", runtime.lastFetchRequest)
+	}
+}
+
+func TestKafkaExecPublishesJSONCommand(t *testing.T) {
+	runtime := &fakeKafkaRuntime{publishAffected: 1}
+	client := &KafkaDB{runtime: runtime, defaultTopic: "orders.events"}
+
+	affected, err := client.Exec(`{"key":{"tenant":"a"},"value":{"id":1},"headers":{"x-env":"dev"}}`)
+	if err != nil {
+		t.Fatalf("Exec failed: %v", err)
+	}
+	if affected != 1 {
+		t.Fatalf("unexpected affected rows: %d", affected)
+	}
+	if runtime.lastPublishCommand.Topic != "orders.events" {
+		t.Fatalf("expected default topic publish, got %#v", runtime.lastPublishCommand)
+	}
+	if valueMap, ok := runtime.lastPublishCommand.Value.(map[string]interface{}); !ok || valueMap["id"] == nil {
+		t.Fatalf("unexpected publish value: %#v", runtime.lastPublishCommand.Value)
+	}
+}
+
+func TestKafkaGetColumnsIncludesDerivedFields(t *testing.T) {
+	runtime := &fakeKafkaRuntime{
+		fetchResult: []kafkaMessageRecord{{
+			Message: kafka.Message{Topic: "orders.events"},
+			Value: map[string]interface{}{
+				"meta": map[string]interface{}{
+					"ip": "127.0.0.1",
+				},
+			},
+			Headers: map[string]interface{}{"x-request-id": "req-1"},
+		}},
+	}
+	client := &KafkaDB{runtime: runtime}
+
+	columns, err := client.GetColumns("topics", "orders.events")
+	if err != nil {
+		t.Fatalf("GetColumns failed: %v", err)
+	}
+	names := make([]string, 0, len(columns))
+	for _, col := range columns {
+		names = append(names, col.Name)
+	}
+	joined := strings.Join(names, ",")
+	for _, want := range []string{"topic", "partition", "offset", "value.meta.ip", "headers.x-request-id"} {
+		if !strings.Contains(joined, want) {
+			t.Fatalf("expected derived column %q in %s", want, joined)
+		}
+	}
+}
diff --git a/internal/db/kingbase_impl.go b/internal/db/kingbase_impl.go
index 6f508ad..1daa776 100644
--- a/internal/db/kingbase_impl.go
+++ b/internal/db/kingbase_impl.go
@@ -5,6 +5,7 @@ package db
 import (
 	"context"
 	"database/sql"
+	"database/sql/driver"
 	"fmt"
 	"net"
 	"net/url"
@@ -18,7 +19,7 @@ import (
 	"GoNavi-Wails/internal/ssh"
 	"GoNavi-Wails/internal/utils"
 
-	_ "gitea.com/kingbase/gokb" // Registers "kingbase" driver
+	gokb "gitea.com/kingbase/gokb" // Registers "kingbase" driver
 )
 
 type KingbaseDB struct {
@@ -27,6 +28,13 @@ type KingbaseDB struct {
 	forwarder   *ssh.LocalForwarder // Store SSH tunnel forwarder
 }
 
+type kingbaseSessionExecer struct {
+	*sqlConnStatementExecer
+}
+
+var _ QueryMessageExecer = (*KingbaseDB)(nil)
+var _ StatementQueryMessageExecer = (*kingbaseSessionExecer)(nil)
+
 func quoteConnValue(v string) string {
 	if v == "" {
 		return "''"
@@ -280,6 +288,20 @@ func (k *KingbaseDB) QueryContext(ctx context.Context, query string) ([]map[stri
 	return scanRows(rows)
 }
 
+func (k *KingbaseDB) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
+	if k.conn == nil {
+		return nil, nil, nil, fmt.Errorf("连接未打开")
+	}
+
+	conn, err := k.conn.Conn(ctx)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	defer conn.Close()
+
+	return queryKingbaseConnWithMessages(ctx, conn, query)
+}
+
 func (k *KingbaseDB) Query(query string) ([]map[string]interface{}, []string, error) {
 	if k.conn == nil {
 		return nil, nil, fmt.Errorf("连接未打开")
@@ -293,6 +315,10 @@ func (k *KingbaseDB) Query(query string) ([]map[string]interface{}, []string, er
 	return scanRows(rows)
 }
 
+func (k *KingbaseDB) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	return k.QueryContextWithMessages(context.Background(), query)
+}
+
 func (k *KingbaseDB) ExecContext(ctx context.Context, query string) (int64, error) {
 	if k.conn == nil {
 		return 0, fmt.Errorf("连接未打开")
@@ -323,7 +349,7 @@ func (k *KingbaseDB) OpenSessionExecer(ctx context.Context) (StatementExecer, er
 	if err != nil {
 		return nil, err
 	}
-	return NewSQLConnStatementExecer(conn), nil
+	return &kingbaseSessionExecer{sqlConnStatementExecer: &sqlConnStatementExecer{conn: conn}}, nil
 }
 
 func (k *KingbaseDB) Exec(query string) (int64, error) {
@@ -337,6 +363,31 @@ func (k *KingbaseDB) Exec(query string) (int64, error) {
 	return res.RowsAffected()
 }
 
+func (e *kingbaseSessionExecer) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	return e.QueryContextWithMessages(context.Background(), query)
+}
+
+func (e *kingbaseSessionExecer) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
+	if e == nil || e.conn == nil {
+		return nil, nil, nil, fmt.Errorf("连接未打开")
+	}
+	return queryKingbaseConnWithMessages(ctx, e.conn, query)
+}
+
+func queryKingbaseConnWithMessages(ctx context.Context, conn *sql.Conn, query string) ([]map[string]interface{}, []string, []string, error) {
+	return querySQLConnWithTextNotices(ctx, conn, query, func(driverConn driver.Conn, addNotice func(string)) {
+		if addNotice == nil {
+			gokb.SetNoticeHandler(driverConn, nil)
+			return
+		}
+		gokb.SetNoticeHandler(driverConn, func(notice *gokb.Error) {
+			if notice != nil {
+				addNotice(notice.Message)
+			}
+		})
+	})
+}
+
 func (k *KingbaseDB) GetDatabases() ([]string, error) {
 	data, _, err := k.Query("SELECT datname FROM pg_database WHERE datistemplate = false")
 	if err == nil {
@@ -443,264 +494,31 @@ func (k *KingbaseDB) GetCreateStatement(dbName, tableName string) (string, error
 }
 
 func (k *KingbaseDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
-	// 解析 schema.table 格式
-	schema := strings.TrimSpace(dbName)
-	table := strings.TrimSpace(tableName)
-
-	// 如果 tableName 包含 schema (格式: schema.table)
-	if parts := strings.SplitN(table, ".", 2); len(parts) == 2 {
-		parsedSchema := strings.TrimSpace(parts[0])
-		parsedTable := strings.TrimSpace(parts[1])
-		if parsedSchema != "" && parsedTable != "" {
-			schema = parsedSchema
-			table = parsedTable
-		}
-	}
-
-	// 如果仍然没有 schema,使用 current_schema()
-	// 这样可以自动匹配当前连接的 search_path
-	if schema == "" {
-		return k.getColumnsWithCurrentSchema(table)
-	}
-
+	schema, table := normalizePGLikeMetadataTable(dbName, tableName)
 	if table == "" {
 		return nil, fmt.Errorf("表名不能为空")
 	}
 
-	// 转义函数:处理单引号,移除双引号
-	esc := func(s string) string {
-		// 移除前后的双引号(如果存在)
-		s = strings.Trim(s, "\"")
-		// 转义单引号
-		return strings.ReplaceAll(s, "'", "''")
-	}
-
-	query := fmt.Sprintf(`
-SELECT
-	a.attname AS column_name,
-	pg_catalog.format_type(a.atttypid, a.atttypmod) AS data_type,
-	CASE WHEN a.attnotnull THEN 'NO' ELSE 'YES' END AS is_nullable,
-	pg_get_expr(ad.adbin, ad.adrelid) AS column_default,
-	col_description(a.attrelid, a.attnum) AS comment,
-	CASE WHEN pk.attname IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
-FROM pg_class c
-JOIN pg_namespace n ON n.oid = c.relnamespace
-JOIN pg_attribute a ON a.attrelid = c.oid
-LEFT JOIN pg_attrdef ad ON ad.adrelid = c.oid AND ad.adnum = a.attnum
-LEFT JOIN (
-	SELECT i.indrelid, a3.attname
-	FROM pg_index i
-	JOIN pg_attribute a3 ON a3.attrelid = i.indrelid AND a3.attnum = ANY(i.indkey)
-	WHERE i.indisprimary
-) pk ON pk.indrelid = c.oid AND pk.attname = a.attname
-WHERE c.relkind IN ('r', 'p')
-	AND n.nspname = '%s'
-	AND c.relname = '%s'
-	AND a.attnum > 0
-	AND NOT a.attisdropped
-ORDER BY a.attnum`, esc(schema), esc(table))
-
-	data, _, err := k.Query(query)
+	data, _, err := k.Query(buildPGLikeColumnsMetadataQuery(schema, table))
 	if err != nil {
 		return nil, err
 	}
 
-	var columns []connection.ColumnDefinition
-	for _, row := range data {
-		col := connection.ColumnDefinition{
-			Name:     fmt.Sprintf("%v", row["column_name"]),
-			Type:     fmt.Sprintf("%v", row["data_type"]),
-			Nullable: fmt.Sprintf("%v", row["is_nullable"]),
-			Key:      fmt.Sprintf("%v", row["column_key"]),
-			Extra:    "",
-			Comment:  "",
-		}
-
-		if row["column_default"] != nil {
-			def := fmt.Sprintf("%v", row["column_default"])
-			col.Default = &def
-			if strings.HasPrefix(strings.ToLower(strings.TrimSpace(def)), "nextval(") {
-				col.Extra = "auto_increment"
-			}
-		}
-
-		if v, ok := row["comment"]; ok && v != nil {
-			col.Comment = fmt.Sprintf("%v", v)
-		}
-
-		columns = append(columns, col)
-	}
-	return columns, nil
-}
-
-// getColumnsWithCurrentSchema 使用 current_schema() 查询当前schema的表
-func (k *KingbaseDB) getColumnsWithCurrentSchema(tableName string) ([]connection.ColumnDefinition, error) {
-	table := strings.TrimSpace(tableName)
-	if table == "" {
-		return nil, fmt.Errorf("表名不能为空")
-	}
-
-	// 转义函数
-	esc := func(s string) string {
-		s = strings.Trim(s, "\"")
-		return strings.ReplaceAll(s, "'", "''")
-	}
-
-	// 使用 current_schema() 获取当前schema
-	query := fmt.Sprintf(`
-SELECT
-	a.attname AS column_name,
-	pg_catalog.format_type(a.atttypid, a.atttypmod) AS data_type,
-	CASE WHEN a.attnotnull THEN 'NO' ELSE 'YES' END AS is_nullable,
-	pg_get_expr(ad.adbin, ad.adrelid) AS column_default,
-	col_description(a.attrelid, a.attnum) AS comment,
-	CASE WHEN pk.attname IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
-FROM pg_class c
-JOIN pg_namespace n ON n.oid = c.relnamespace
-JOIN pg_attribute a ON a.attrelid = c.oid
-LEFT JOIN pg_attrdef ad ON ad.adrelid = c.oid AND ad.adnum = a.attnum
-LEFT JOIN (
-	SELECT i.indrelid, a3.attname
-	FROM pg_index i
-	JOIN pg_attribute a3 ON a3.attrelid = i.indrelid AND a3.attnum = ANY(i.indkey)
-	WHERE i.indisprimary
-) pk ON pk.indrelid = c.oid AND pk.attname = a.attname
-WHERE c.relkind IN ('r', 'p')
-	AND n.nspname = current_schema()
-	AND c.relname = '%s'
-	AND a.attnum > 0
-	AND NOT a.attisdropped
-ORDER BY a.attnum`, esc(table))
-
-	data, _, err := k.Query(query)
-	if err != nil {
-		return nil, err
-	}
-
-	var columns []connection.ColumnDefinition
-	for _, row := range data {
-		col := connection.ColumnDefinition{
-			Name:     fmt.Sprintf("%v", row["column_name"]),
-			Type:     fmt.Sprintf("%v", row["data_type"]),
-			Nullable: fmt.Sprintf("%v", row["is_nullable"]),
-			Key:      fmt.Sprintf("%v", row["column_key"]),
-			Extra:    "",
-			Comment:  "",
-		}
-
-		if row["column_default"] != nil {
-			def := fmt.Sprintf("%v", row["column_default"])
-			col.Default = &def
-			if strings.HasPrefix(strings.ToLower(strings.TrimSpace(def)), "nextval(") {
-				col.Extra = "auto_increment"
-			}
-		}
-
-		if v, ok := row["comment"]; ok && v != nil {
-			col.Comment = fmt.Sprintf("%v", v)
-		}
-
-		columns = append(columns, col)
-	}
-	return columns, nil
+	return buildPGLikeColumnDefinitions(data), nil
 }
 
 func (k *KingbaseDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
-	// 解析 schema.table 格式
-	schema := strings.TrimSpace(dbName)
-	table := strings.TrimSpace(tableName)
-
-	// 如果 tableName 包含 schema (格式: schema.table)
-	if parts := strings.SplitN(table, ".", 2); len(parts) == 2 {
-		parsedSchema := strings.TrimSpace(parts[0])
-		parsedTable := strings.TrimSpace(parts[1])
-		if parsedSchema != "" && parsedTable != "" {
-			schema = parsedSchema
-			table = parsedTable
-		}
-	}
-
+	schema, table := normalizePGLikeMetadataTable(dbName, tableName)
 	if table == "" {
 		return nil, fmt.Errorf("表名不能为空")
 	}
 
-	// 转义函数:处理单引号,移除双引号
-	esc := func(s string) string {
-		s = strings.Trim(s, "\"")
-		return strings.ReplaceAll(s, "'", "''")
-	}
-
-	// 构建查询：如果没有指定schema,使用current_schema()
-	var query string
-	if schema != "" {
-		query = fmt.Sprintf(`
-			SELECT
-				i.relname as index_name,
-				a.attname as column_name,
-				ix.indisunique as is_unique
-			FROM
-				pg_class t,
-				pg_class i,
-				pg_index ix,
-				pg_attribute a,
-				pg_namespace n
-			WHERE
-				t.oid = ix.indrelid
-				AND i.oid = ix.indexrelid
-				AND a.attrelid = t.oid
-				AND a.attnum = ANY(ix.indkey)
-				AND t.relkind = 'r'
-				AND t.relname = '%s'
-				AND n.oid = t.relnamespace
-				AND n.nspname = '%s'
-		`, esc(table), esc(schema))
-	} else {
-		query = fmt.Sprintf(`
-			SELECT
-				i.relname as index_name,
-				a.attname as column_name,
-				ix.indisunique as is_unique
-			FROM
-				pg_class t,
-				pg_class i,
-				pg_index ix,
-				pg_attribute a,
-				pg_namespace n
-			WHERE
-				t.oid = ix.indrelid
-				AND i.oid = ix.indexrelid
-				AND a.attrelid = t.oid
-				AND a.attnum = ANY(ix.indkey)
-				AND t.relkind = 'r'
-				AND t.relname = '%s'
-				AND n.oid = t.relnamespace
-				AND n.nspname = current_schema()
-		`, esc(table))
-	}
-
-	data, _, err := k.Query(query)
+	data, _, err := k.Query(buildPGLikeIndexesMetadataQuery(schema, table))
 	if err != nil {
 		return nil, err
 	}
 
-	var indexes []connection.IndexDefinition
-	for _, row := range data {
-		nonUnique := 1
-		if val, ok := row["is_unique"]; ok {
-			if b, ok := val.(bool); ok && b {
-				nonUnique = 0
-			}
-		}
-
-		idx := connection.IndexDefinition{
-			Name:       fmt.Sprintf("%v", row["index_name"]),
-			ColumnName: fmt.Sprintf("%v", row["column_name"]),
-			NonUnique:  nonUnique,
-			IndexType:  "BTREE", // Default
-		}
-		indexes = append(indexes, idx)
-	}
-	return indexes, nil
+	return buildPGLikeIndexDefinitions(data), nil
 }
 
 func (k *KingbaseDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
diff --git a/internal/db/kingbase_impl_test.go b/internal/db/kingbase_impl_test.go
index 8a171fd..c754d43 100644
--- a/internal/db/kingbase_impl_test.go
+++ b/internal/db/kingbase_impl_test.go
@@ -199,6 +199,50 @@ func TestKingbaseGetDatabasesFallsBackToCurrentDatabase(t *testing.T) {
 	}
 }
 
+func TestKingbaseGetIndexesParsesStringUniqueAndVisibleRelation(t *testing.T) {
+	registerFakeKingbaseDriverOnce.Do(func() {
+		sql.Register(fakeKingbaseDriverName, fakeKingbaseDriver{})
+	})
+
+	db, err := sql.Open(fakeKingbaseDriverName, "")
+	if err != nil {
+		t.Fatalf("open fake kingbase db failed: %v", err)
+	}
+	defer db.Close()
+
+	fakeKingbaseStateMu.Lock()
+	fakeKingbaseState.queryErr = nil
+	fakeKingbaseState.queryResults = map[string]fakeKingbaseQueryResult{}
+	fakeKingbaseState.lastQuery = ""
+	fakeKingbaseState.queries = nil
+	fakeKingbaseStateMu.Unlock()
+
+	client := &KingbaseDB{conn: db}
+	indexes, err := client.GetIndexes("", "users")
+	if err != nil {
+		t.Fatalf("GetIndexes returned error: %v", err)
+	}
+	if len(indexes) != 2 {
+		t.Fatalf("expected two index rows, got %+v", indexes)
+	}
+	if indexes[0].Name != "users_email_key" || indexes[0].ColumnName != "tenant_id" || indexes[0].NonUnique != 0 || indexes[0].SeqInIndex != 1 {
+		t.Fatalf("unexpected first index row: %+v", indexes[0])
+	}
+	if indexes[1].Name != "users_email_key" || indexes[1].ColumnName != "email" || indexes[1].NonUnique != 0 || indexes[1].SeqInIndex != 2 {
+		t.Fatalf("unexpected second index row: %+v", indexes[1])
+	}
+
+	fakeKingbaseStateMu.Lock()
+	lastQuery := fakeKingbaseState.lastQuery
+	fakeKingbaseStateMu.Unlock()
+	if !strings.Contains(lastQuery, "pg_catalog.pg_table_is_visible(t.oid)") {
+		t.Fatalf("expected search_path visible relation metadata query, got %s", lastQuery)
+	}
+	if strings.Contains(lastQuery, "current_schema()") || strings.Contains(lastQuery, "n.nspname = 'public'") {
+		t.Fatalf("metadata query should not force current_schema/public, got %s", lastQuery)
+	}
+}
+
 type fakeKingbaseDriver struct{}
 
 func (fakeKingbaseDriver) Open(name string) (driver.Conn, error) {
@@ -230,6 +274,15 @@ func (fakeKingbaseConn) QueryContext(ctx context.Context, query string, args []d
 		}
 		return &fakeKingbaseRows{columns: result.columns, rows: result.rows}, nil
 	}
+	if strings.Contains(query, "FROM pg_class t") && strings.Contains(query, "JOIN pg_index ix") && strings.Contains(query, "t.relname = 'users'") {
+		return &fakeKingbaseRows{
+			columns: []string{"index_name", "column_name", "is_unique", "seq_in_index", "index_type"},
+			rows: [][]driver.Value{
+				{"users_email_key", "tenant_id", "t", "1", "btree"},
+				{"users_email_key", "email", "t", "2", "btree"},
+			},
+		}, nil
+	}
 	if fakeKingbaseState.queryErr != nil {
 		return nil, fakeKingbaseState.queryErr
 	}
diff --git a/internal/db/mariadb_impl.go b/internal/db/mariadb_impl.go
index 410cbbe..508fddb 100644
--- a/internal/db/mariadb_impl.go
+++ b/internal/db/mariadb_impl.go
@@ -87,7 +87,7 @@ func (m *MariaDB) QueryMulti(query string) ([]connection.ResultSetData, error) {
 		return nil, err
 	}
 	defer rows.Close()
-	return scanMultiRows(rows)
+	return scanMultiRowsForDialect(rows, "mariadb")
 }
 
 func (m *MariaDB) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
@@ -99,7 +99,7 @@ func (m *MariaDB) QueryMultiContext(ctx context.Context, query string) ([]connec
 		return nil, err
 	}
 	defer rows.Close()
-	return scanMultiRows(rows)
+	return scanMultiRowsForDialect(rows, "mariadb")
 }
 
 func (m *MariaDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
@@ -113,7 +113,7 @@ func (m *MariaDB) QueryContext(ctx context.Context, query string) ([]map[string]
 	}
 	defer rows.Close()
 
-	return scanRows(rows)
+	return scanRowsForDialect(rows, "mariadb")
 }
 
 func (m *MariaDB) Query(query string) ([]map[string]interface{}, []string, error) {
@@ -126,7 +126,7 @@ func (m *MariaDB) Query(query string) ([]map[string]interface{}, []string, error
 		return nil, nil, err
 	}
 	defer rows.Close()
-	return scanRows(rows)
+	return scanRowsForDialect(rows, "mariadb")
 }
 
 func (m *MariaDB) ExecBatchContext(ctx context.Context, query string) (int64, error) {
@@ -214,12 +214,7 @@ func (m *MariaDB) GetTables(dbName string) ([]string, error) {
 }
 
 func (m *MariaDB) GetCreateStatement(dbName, tableName string) (string, error) {
-	query := fmt.Sprintf("SHOW CREATE TABLE `%s`.`%s`", dbName, tableName)
-	if dbName == "" {
-		query = fmt.Sprintf("SHOW CREATE TABLE `%s`", tableName)
-	}
-
-	data, _, err := m.Query(query)
+	data, _, err := m.Query(buildMySQLShowCreateTableQuery(dbName, tableName))
 	if err != nil {
 		return "", err
 	}
diff --git a/internal/db/metadata_value.go b/internal/db/metadata_value.go
new file mode 100644
index 0000000..e9f8b81
--- /dev/null
+++ b/internal/db/metadata_value.go
@@ -0,0 +1,44 @@
+package db
+
+import (
+	"fmt"
+	"strings"
+)
+
+func parseMetadataBool(value interface{}) bool {
+	switch val := value.(type) {
+	case bool:
+		return val
+	case int:
+		return val != 0
+	case int64:
+		return val != 0
+	case float64:
+		return val != 0
+	case string:
+		text := strings.ToLower(strings.TrimSpace(val))
+		return text == "t" || text == "true" || text == "1" || text == "y" || text == "yes" || text == "unique"
+	default:
+		text := strings.ToLower(strings.TrimSpace(fmt.Sprintf("%v", value)))
+		return text == "t" || text == "true" || text == "1" || text == "y" || text == "yes" || text == "unique"
+	}
+}
+
+func parseMetadataInt(value interface{}) int {
+	switch val := value.(type) {
+	case int:
+		return val
+	case int64:
+		return int(val)
+	case float64:
+		return int(val)
+	case string:
+		var n int
+		_, _ = fmt.Sscanf(strings.TrimSpace(val), "%d", &n)
+		return n
+	default:
+		var n int
+		_, _ = fmt.Sscanf(strings.TrimSpace(fmt.Sprintf("%v", value)), "%d", &n)
+		return n
+	}
+}
diff --git a/internal/db/mqtt_impl.go b/internal/db/mqtt_impl.go
new file mode 100644
index 0000000..ecc2103
--- /dev/null
+++ b/internal/db/mqtt_impl.go
@@ -0,0 +1,1191 @@
+package db
+
+import (
+	"context"
+	"crypto/tls"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"net"
+	"net/url"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+	"unicode/utf8"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+	proxytunnel "GoNavi-Wails/internal/proxy"
+	"GoNavi-Wails/internal/ssh"
+
+	pahomqtt "github.com/eclipse/paho.mqtt.golang"
+)
+
+const (
+	defaultMQTTPort         = 1883
+	defaultMQTTQueryTimeout = 30 * time.Second
+	defaultMQTTPreviewLimit = 100
+	defaultMQTTFetchWait    = 4 * time.Second
+	maxMQTTFetchWait        = 30 * time.Second
+	mqttSyntheticDatabase   = "topics"
+	mqttDefaultClientID     = "GoNavi"
+)
+
+type mqttRuntime interface {
+	Close() error
+	Ping(ctx context.Context) error
+	FetchMessages(ctx context.Context, request mqttFetchRequest) ([]mqttMessageRecord, error)
+	Publish(ctx context.Context, command mqttPublishCommand) (int64, error)
+}
+
+type mqttFetchRequest struct {
+	Topic  string
+	Limit  int
+	Offset int
+	QoS    byte
+	Wait   time.Duration
+}
+
+type mqttPublishCommand struct {
+	Topic   string
+	Payload interface{}
+	QoS     byte
+	Retain  bool
+}
+
+type mqttMessageRecord struct {
+	Topic      string
+	QoS        byte
+	Retained   bool
+	Duplicate  bool
+	MessageID  uint16
+	Payload    []byte
+	Decoded    interface{}
+	Encoding   string
+	ReceivedAt time.Time
+}
+
+type mqttTopicDescriptor struct {
+	Filter   string
+	Default  bool
+	Wildcard bool
+	Source   string
+}
+
+type pahoMQTTRuntime struct {
+	client  pahomqtt.Client
+	timeout time.Duration
+}
+
+var newMQTTRuntime = func(config connection.ConnectionConfig) (mqttRuntime, error) {
+	return newPahoMQTTRuntime(config)
+}
+
+type MQTTDB struct {
+	runtime       mqttRuntime
+	forwarders    []*ssh.LocalForwarder
+	brokers       []string
+	defaultTopic  string
+	topics        []mqttTopicDescriptor
+	defaultQoS    byte
+	defaultRetain bool
+	cleanSession  bool
+	fetchWait     time.Duration
+}
+
+func (m *MQTTDB) Connect(config connection.ConnectionConfig) error {
+	_ = m.Close()
+
+	runConfig := normalizeMQTTConfig(config)
+	if runConfig.UseSSH {
+		sshConfig, brokers, forwarders, err := mqttForwardBrokersOverSSH(runConfig)
+		if err != nil {
+			return err
+		}
+		m.forwarders = forwarders
+		runConfig = sshConfig
+		runConfig.Hosts = brokers[1:]
+		host, port, ok := parseHostPortWithDefault(brokers[0], defaultMQTTPort)
+		if !ok {
+			_ = m.Close()
+			return fmt.Errorf("解析 MQTT SSH 转发地址失败：%s", brokers[0])
+		}
+		runConfig.Host = host
+		runConfig.Port = port
+		runConfig.UseSSH = false
+		logger.Infof("MQTT 通过 SSH 端口转发连接：brokers=%s", strings.Join(brokers, ","))
+	}
+
+	runtime, err := newMQTTRuntime(runConfig)
+	if err != nil {
+		_ = m.Close()
+		return err
+	}
+	m.runtime = runtime
+	m.defaultTopic = mqttDefaultTopic(runConfig)
+	m.topics = mqttConfiguredTopics(runConfig, m.defaultTopic)
+	m.defaultQoS = mqttDefaultQoS(runConfig)
+	m.defaultRetain = mqttDefaultRetain(runConfig)
+	m.cleanSession = mqttCleanSession(runConfig)
+	m.fetchWait = mqttFetchWait(runConfig)
+	m.brokers, _ = mqttBrokerAddresses(runConfig)
+
+	if err := m.Ping(); err != nil {
+		_ = m.Close()
+		return err
+	}
+	return nil
+}
+
+func (m *MQTTDB) Close() error {
+	var firstErr error
+	if m.runtime != nil {
+		if err := m.runtime.Close(); err != nil && firstErr == nil {
+			firstErr = err
+		}
+		m.runtime = nil
+	}
+	for _, forwarder := range m.forwarders {
+		if forwarder == nil {
+			continue
+		}
+		if err := forwarder.Close(); err != nil && firstErr == nil {
+			firstErr = err
+		}
+	}
+	m.forwarders = nil
+	m.brokers = nil
+	m.defaultTopic = ""
+	m.topics = nil
+	m.defaultQoS = 0
+	m.defaultRetain = false
+	m.cleanSession = false
+	m.fetchWait = 0
+	return firstErr
+}
+
+func (m *MQTTDB) Ping() error {
+	if m.runtime == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	return m.runtime.Ping(ctx)
+}
+
+func (m *MQTTDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultMQTTQueryTimeout)
+	defer cancel()
+	return m.QueryContext(ctx, query)
+}
+
+func (m *MQTTDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if m.runtime == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+	text := strings.TrimSpace(query)
+	if text == "" {
+		return nil, nil, fmt.Errorf("查询语句不能为空")
+	}
+	parsed, ok := parseMQTTSQL(text)
+	if !ok {
+		return nil, nil, fmt.Errorf("MQTT 查询仅支持 SHOW TOPICS、DESCRIBE TOPIC、SELECT * FROM topic 与 CONSUME FROM topic")
+	}
+
+	switch parsed.Action {
+	case "show_topics":
+		rows := mqttTopicRows(m.topics, m.defaultQoS, m.defaultRetain)
+		if parsed.Limit > 0 && len(rows) > parsed.Limit {
+			rows = rows[:parsed.Limit]
+		}
+		return rows, collectColumns(rows), nil
+	case "describe_topic":
+		topic := mqttResolveTopic(parsed.Topic, m.defaultTopic)
+		if topic == "" {
+			return nil, nil, fmt.Errorf("MQTT topic 不能为空")
+		}
+		rows := []map[string]interface{}{mqttDescribeTopicRow(topic, m.topics, m.defaultQoS, m.defaultRetain, m.cleanSession, m.fetchWait, m.brokers)}
+		return rows, collectColumns(rows), nil
+	case "select", "consume":
+		if parsed.Count {
+			return nil, nil, fmt.Errorf("MQTT 不支持 COUNT(*) 总量统计；请使用 SELECT * FROM topic LIMIT n 预览实时消息")
+		}
+		topic := mqttResolveTopic(parsed.Topic, m.defaultTopic)
+		if topic == "" {
+			return nil, nil, fmt.Errorf("MQTT topic 不能为空")
+		}
+		records, err := m.runtime.FetchMessages(ctx, mqttFetchRequest{
+			Topic:  topic,
+			Limit:  parsed.Limit,
+			Offset: parsed.Offset,
+			QoS:    m.defaultQoS,
+			Wait:   m.fetchWait,
+		})
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := mqttMessageRows(records)
+		return rows, collectColumns(rows), nil
+	default:
+		return nil, nil, fmt.Errorf("未实现的 MQTT 查询类型：%s", parsed.Action)
+	}
+}
+
+func (m *MQTTDB) Exec(query string) (int64, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultMQTTQueryTimeout)
+	defer cancel()
+	return m.ExecContext(ctx, query)
+}
+
+func (m *MQTTDB) ExecContext(ctx context.Context, query string) (int64, error) {
+	if m.runtime == nil {
+		return 0, fmt.Errorf("连接未打开")
+	}
+	var cmd map[string]interface{}
+	if err := decodeJSONWithUseNumber([]byte(strings.TrimSpace(query)), &cmd); err != nil {
+		return 0, fmt.Errorf("MQTT 写入命令必须是 JSON：%w", err)
+	}
+
+	topic := mqttResolveTopic(firstStringValue(cmd, "publish", "topic", "destination"), m.defaultTopic)
+	if err := mqttValidatePublishTopic(topic); err != nil {
+		return 0, err
+	}
+	if !hasAnyKey(cmd, "payload", "value", "body", "message") {
+		return 0, fmt.Errorf("MQTT publish 命令缺少 payload")
+	}
+	qos, err := mqttQoSFromAny(firstExisting(cmd, "qos"), m.defaultQoS)
+	if err != nil {
+		return 0, err
+	}
+	retain := mqttBoolFromAny(firstExisting(cmd, "retain", "retained"), m.defaultRetain)
+
+	return m.runtime.Publish(ctx, mqttPublishCommand{
+		Topic:   topic,
+		Payload: firstExisting(cmd, "payload", "value", "body", "message"),
+		QoS:     qos,
+		Retain:  retain,
+	})
+}
+
+func (m *MQTTDB) GetDatabases() ([]string, error) {
+	if m.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	return []string{mqttSyntheticDatabase}, nil
+}
+
+func (m *MQTTDB) GetTables(dbName string) ([]string, error) {
+	if m.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	names := make([]string, 0, len(m.topics))
+	for _, topic := range m.topics {
+		if strings.TrimSpace(topic.Filter) != "" {
+			names = append(names, topic.Filter)
+		}
+	}
+	sort.Strings(names)
+	return names, nil
+}
+
+func (m *MQTTDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	if m.runtime == nil {
+		return "", fmt.Errorf("连接未打开")
+	}
+	topic := mqttResolveTopic(tableName, m.defaultTopic)
+	if topic == "" {
+		return "", fmt.Errorf("MQTT topic 不能为空")
+	}
+	payload, _ := json.MarshalIndent(
+		mqttDescribeTopicRow(topic, m.topics, m.defaultQoS, m.defaultRetain, m.cleanSession, m.fetchWait, m.brokers),
+		"",
+		"  ",
+	)
+	return fmt.Sprintf("// MQTT topic filter: %s\n%s", topic, string(payload)), nil
+}
+
+func (m *MQTTDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	if m.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	topic := mqttResolveTopic(tableName, m.defaultTopic)
+	if topic == "" {
+		return nil, fmt.Errorf("MQTT topic 不能为空")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	records, err := m.runtime.FetchMessages(ctx, mqttFetchRequest{
+		Topic: topic,
+		Limit: 20,
+		QoS:   m.defaultQoS,
+		Wait:  m.fetchWait,
+	})
+	if err != nil {
+		return nil, err
+	}
+	rows := mqttMessageRows(records)
+	columns := []connection.ColumnDefinition{
+		{Name: "topic", Type: "string", Nullable: "NO", Comment: "MQTT topic"},
+		{Name: "qos", Type: "tinyint", Nullable: "NO", Comment: "MQTT QoS level"},
+		{Name: "retained", Type: "bool", Nullable: "YES", Comment: "Whether the message is retained"},
+		{Name: "duplicate", Type: "bool", Nullable: "YES", Comment: "Whether the message is marked as duplicate"},
+		{Name: "message_id", Type: "int", Nullable: "YES", Comment: "MQTT message id"},
+		{Name: "payload", Type: "json", Nullable: "YES", Comment: "Decoded MQTT payload"},
+		{Name: "payload_encoding", Type: "string", Nullable: "YES", Comment: "json / text / base64"},
+		{Name: "payload_bytes", Type: "int", Nullable: "YES", Comment: "Payload size in bytes"},
+		{Name: "received_at", Type: "timestamp", Nullable: "YES", Comment: "Client receive timestamp"},
+	}
+	seen := map[string]struct{}{
+		"topic": {}, "qos": {}, "retained": {}, "duplicate": {}, "message_id": {},
+		"payload": {}, "payload_encoding": {}, "payload_bytes": {}, "received_at": {},
+	}
+	for _, row := range rows {
+		for key, value := range row {
+			if _, exists := seen[key]; exists {
+				continue
+			}
+			if !strings.HasPrefix(key, "payload.") {
+				continue
+			}
+			seen[key] = struct{}{}
+			columns = append(columns, connection.ColumnDefinition{
+				Name:     key,
+				Type:     inferChromaValueType(value),
+				Nullable: "YES",
+				Comment:  "Derived MQTT payload field",
+			})
+		}
+	}
+	return columns, nil
+}
+
+func (m *MQTTDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	tables, err := m.GetTables(dbName)
+	if err != nil {
+		return nil, err
+	}
+	var result []connection.ColumnDefinitionWithTable
+	for _, table := range tables {
+		cols, err := m.GetColumns(dbName, table)
+		if err != nil {
+			continue
+		}
+		for _, col := range cols {
+			result = append(result, connection.ColumnDefinitionWithTable{
+				TableName: table,
+				Name:      col.Name,
+				Type:      col.Type,
+				Comment:   col.Comment,
+			})
+		}
+	}
+	return result, nil
+}
+
+func (m *MQTTDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	return []connection.IndexDefinition{
+		{Name: "TOPIC_RECEIVED_AT", ColumnName: "topic", NonUnique: 1, SeqInIndex: 1, IndexType: "SUBSCRIPTION"},
+		{Name: "TOPIC_RECEIVED_AT", ColumnName: "received_at", NonUnique: 1, SeqInIndex: 2, IndexType: "SUBSCRIPTION"},
+	}, nil
+}
+
+func (m *MQTTDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return []connection.ForeignKeyDefinition{}, nil
+}
+
+func (m *MQTTDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return []connection.TriggerDefinition{}, nil
+}
+
+func (m *MQTTDB) ApplyChanges(tableName string, changes connection.ChangeSet) error {
+	if len(changes.Inserts) == 0 && len(changes.Updates) == 0 && len(changes.Deletes) == 0 {
+		return nil
+	}
+	return fmt.Errorf("MQTT 结果集仅支持只读预览；如需写入请在 SQL 编辑器执行 JSON publish 命令")
+}
+
+func normalizeMQTTConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
+	runConfig := applyMQTTURI(config)
+	if strings.TrimSpace(runConfig.Host) == "" && len(runConfig.Hosts) == 0 {
+		runConfig.Host = "localhost"
+	}
+	if runConfig.Port <= 0 {
+		runConfig.Port = defaultMQTTPort
+	}
+	params := mqttConnectionParams(runConfig)
+	transport := mqttTransportScheme(runConfig)
+	if transport == "ssl" || transport == "wss" || mqttBoolValue(firstNonEmpty(params.Get("ssl"), params.Get("tls"), params.Get("useSSL"), params.Get("use_ssl"))) {
+		runConfig.UseSSL = true
+	}
+	if strings.TrimSpace(runConfig.SSLMode) == "" && runConfig.UseSSL {
+		if mqttBoolValue(firstNonEmpty(params.Get("skip_verify"), params.Get("skipVerify"), params.Get("insecure"))) {
+			runConfig.SSLMode = "skip-verify"
+		} else {
+			runConfig.SSLMode = "required"
+		}
+	}
+	return runConfig
+}
+
+func applyMQTTURI(config connection.ConnectionConfig) connection.ConnectionConfig {
+	uriText := strings.TrimSpace(config.URI)
+	if uriText == "" {
+		return config
+	}
+	parsed, err := url.Parse(uriText)
+	if err != nil {
+		return config
+	}
+	scheme := strings.ToLower(strings.TrimSpace(parsed.Scheme))
+	switch scheme {
+	case "mqtt", "mqtts", "tcp", "ssl", "tls", "ws", "wss":
+	default:
+		return config
+	}
+
+	if parsed.User != nil {
+		if strings.TrimSpace(config.User) == "" {
+			config.User = parsed.User.Username()
+		}
+		if pass, ok := parsed.User.Password(); ok && config.Password == "" {
+			config.Password = pass
+		}
+	}
+
+	hosts := make([]string, 0, 4)
+	for _, entry := range strings.Split(strings.TrimSpace(parsed.Host), ",") {
+		host, port, ok := parseHostPortWithDefault(strings.TrimSpace(entry), defaultMQTTPort)
+		if !ok {
+			continue
+		}
+		hosts = append(hosts, mqttFormatHostPort(host, port))
+	}
+	if len(hosts) > 0 {
+		host, port, ok := parseHostPortWithDefault(hosts[0], defaultMQTTPort)
+		if ok {
+			config.Host = host
+			config.Port = port
+		}
+		if len(hosts) > 1 {
+			config.Hosts = append([]string(nil), hosts[1:]...)
+		}
+	}
+	if topic := strings.Trim(strings.TrimSpace(parsed.Path), "/"); topic != "" && strings.TrimSpace(config.Database) == "" {
+		config.Database = topic
+	}
+	params := parsed.Query()
+	if strings.TrimSpace(config.Topology) == "" {
+		if topology := strings.ToLower(strings.TrimSpace(firstNonEmpty(params.Get("topology"), params.Get("mode")))); topology != "" {
+			config.Topology = topology
+		} else if len(hosts) > 1 {
+			config.Topology = "cluster"
+		}
+	}
+	if scheme == "ssl" || scheme == "tls" || scheme == "mqtts" || scheme == "wss" {
+		config.UseSSL = true
+		if strings.TrimSpace(config.SSLMode) == "" {
+			config.SSLMode = "required"
+		}
+	}
+	return config
+}
+
+func mqttConnectionParams(config connection.ConnectionConfig) url.Values {
+	params := url.Values{}
+	mergeConnectionParamValues(params, connectionParamsFromURI(config.URI, "mqtt", "mqtts", "tcp", "ssl", "tls", "ws", "wss"))
+	mergeConnectionParamValues(params, connectionParamsFromText(config.ConnectionParams))
+	return params
+}
+
+func mqttDefaultTopic(config connection.ConnectionConfig) string {
+	if topic := strings.TrimSpace(config.Database); topic != "" {
+		return topic
+	}
+	params := mqttConnectionParams(config)
+	return strings.TrimSpace(firstNonEmpty(params.Get("defaultTopic"), params.Get("default_topic"), params.Get("topic")))
+}
+
+func mqttConfiguredTopics(config connection.ConnectionConfig, defaultTopic string) []mqttTopicDescriptor {
+	seen := make(map[string]struct{})
+	topics := make([]mqttTopicDescriptor, 0, 8)
+	appendTopic := func(raw string, isDefault bool, source string) {
+		filter := strings.TrimSpace(raw)
+		if filter == "" {
+			return
+		}
+		if _, ok := seen[filter]; ok {
+			if isDefault {
+				for index := range topics {
+					if topics[index].Filter == filter {
+						topics[index].Default = true
+					}
+				}
+			}
+			return
+		}
+		seen[filter] = struct{}{}
+		topics = append(topics, mqttTopicDescriptor{
+			Filter:   filter,
+			Default:  isDefault,
+			Wildcard: strings.ContainsAny(filter, "#+"),
+			Source:   source,
+		})
+	}
+
+	appendTopic(defaultTopic, defaultTopic != "", "default")
+
+	params := mqttConnectionParams(config)
+	for _, key := range []string{"topics", "topicFilters", "topic_filters", "subscriptions", "subscription", "subscribe"} {
+		for _, value := range params[key] {
+			for _, part := range splitMQTTTopicList(value) {
+				appendTopic(part, false, key)
+			}
+		}
+	}
+
+	sort.SliceStable(topics, func(i, j int) bool {
+		if topics[i].Default != topics[j].Default {
+			return topics[i].Default
+		}
+		return topics[i].Filter < topics[j].Filter
+	})
+	return topics
+}
+
+func splitMQTTTopicList(raw string) []string {
+	fields := strings.FieldsFunc(raw, func(r rune) bool {
+		return r == ',' || r == ';' || r == '\n' || r == '\r'
+	})
+	result := make([]string, 0, len(fields))
+	for _, field := range fields {
+		if text := strings.TrimSpace(field); text != "" {
+			result = append(result, text)
+		}
+	}
+	return result
+}
+
+func mqttDefaultQoS(config connection.ConnectionConfig) byte {
+	value, err := mqttQoSFromAny(firstNonEmpty(mqttConnectionParams(config).Get("qos"), "0"), 0)
+	if err != nil {
+		return 0
+	}
+	return value
+}
+
+func mqttDefaultRetain(config connection.ConnectionConfig) bool {
+	params := mqttConnectionParams(config)
+	return mqttBoolValue(firstNonEmpty(params.Get("retain"), params.Get("retained")))
+}
+
+func mqttCleanSession(config connection.ConnectionConfig) bool {
+	params := mqttConnectionParams(config)
+	value := strings.TrimSpace(firstNonEmpty(params.Get("cleanSession"), params.Get("clean_session")))
+	if value == "" {
+		return true
+	}
+	return mqttBoolValue(value)
+}
+
+func mqttFetchWait(config connection.ConnectionConfig) time.Duration {
+	params := mqttConnectionParams(config)
+	for _, key := range []string{"fetchWaitMs", "fetch_wait_ms", "waitMs", "wait_ms"} {
+		if value := strings.TrimSpace(params.Get(key)); value != "" {
+			if ms, err := strconv.Atoi(value); err == nil && ms > 0 {
+				wait := time.Duration(ms) * time.Millisecond
+				if wait > maxMQTTFetchWait {
+					return maxMQTTFetchWait
+				}
+				return wait
+			}
+		}
+	}
+	for _, key := range []string{"fetchWait", "wait"} {
+		if value := strings.TrimSpace(params.Get(key)); value != "" {
+			if seconds, err := strconv.Atoi(value); err == nil && seconds > 0 {
+				wait := time.Duration(seconds) * time.Second
+				if wait > maxMQTTFetchWait {
+					return maxMQTTFetchWait
+				}
+				return wait
+			}
+		}
+	}
+	return defaultMQTTFetchWait
+}
+
+func mqttClientID(config connection.ConnectionConfig) string {
+	params := mqttConnectionParams(config)
+	if clientID := strings.TrimSpace(firstNonEmpty(params.Get("clientId"), params.Get("client_id"))); clientID != "" {
+		return clientID
+	}
+	if id := strings.TrimSpace(config.ID); id != "" {
+		return mqttDefaultClientID + "-" + id
+	}
+	return fmt.Sprintf("%s-%d", mqttDefaultClientID, time.Now().UnixNano())
+}
+
+func mqttTransportScheme(config connection.ConnectionConfig) string {
+	if parsed, err := url.Parse(strings.TrimSpace(config.URI)); err == nil {
+		switch strings.ToLower(strings.TrimSpace(parsed.Scheme)) {
+		case "ssl", "tls", "mqtts":
+			return "ssl"
+		case "wss":
+			return "wss"
+		case "ws":
+			return "ws"
+		case "tcp", "mqtt":
+			return "tcp"
+		}
+	}
+	params := mqttConnectionParams(config)
+	switch strings.ToLower(strings.TrimSpace(firstNonEmpty(params.Get("transport"), params.Get("scheme")))) {
+	case "ssl", "tls", "mqtts":
+		return "ssl"
+	case "wss":
+		return "wss"
+	case "ws":
+		return "ws"
+	}
+	if config.UseSSL {
+		return "ssl"
+	}
+	return "tcp"
+}
+
+func mqttBrokerAddresses(config connection.ConnectionConfig) ([]string, error) {
+	hosts := make([]string, 0, 4)
+	if host, port, ok := parseHostPortWithDefault(net.JoinHostPort(strings.TrimSpace(config.Host), strconv.Itoa(config.Port)), defaultMQTTPort); ok && strings.TrimSpace(host) != "" {
+		hosts = append(hosts, mqttFormatHostPort(host, port))
+	}
+	for _, entry := range config.Hosts {
+		host, port, ok := parseHostPortWithDefault(strings.TrimSpace(entry), defaultMQTTPort)
+		if !ok {
+			continue
+		}
+		hosts = append(hosts, mqttFormatHostPort(host, port))
+	}
+	hosts = uniqueStringsPreserveOrder(hosts)
+	if len(hosts) == 0 {
+		return nil, fmt.Errorf("MQTT 至少需要一个 broker 地址")
+	}
+	return hosts, nil
+}
+
+func mqttFormatHostPort(host string, port int) string {
+	return net.JoinHostPort(strings.TrimSpace(host), strconv.Itoa(port))
+}
+
+func mqttForwardBrokersOverSSH(config connection.ConnectionConfig) (connection.ConnectionConfig, []string, []*ssh.LocalForwarder, error) {
+	brokers, err := mqttBrokerAddresses(config)
+	if err != nil {
+		return connection.ConnectionConfig{}, nil, nil, err
+	}
+	runConfig := config
+	forwarders := make([]*ssh.LocalForwarder, 0, len(brokers))
+	rewritten := make([]string, 0, len(brokers))
+	for _, broker := range brokers {
+		host, port, ok := parseHostPortWithDefault(broker, defaultMQTTPort)
+		if !ok {
+			return connection.ConnectionConfig{}, nil, nil, fmt.Errorf("解析 MQTT broker 地址失败：%s", broker)
+		}
+		forwarder, err := ssh.GetOrCreateLocalForwarder(config.SSH, host, port)
+		if err != nil {
+			return connection.ConnectionConfig{}, nil, nil, fmt.Errorf("创建 MQTT SSH 隧道失败：%w", err)
+		}
+		forwarders = append(forwarders, forwarder)
+		rewritten = append(rewritten, forwarder.LocalAddr)
+	}
+	return runConfig, rewritten, forwarders, nil
+}
+
+func newPahoMQTTRuntime(config connection.ConnectionConfig) (mqttRuntime, error) {
+	brokers, err := mqttBrokerAddresses(config)
+	if err != nil {
+		return nil, err
+	}
+	timeout := getConnectTimeout(config)
+	if timeout <= 0 {
+		timeout = 10 * time.Second
+	}
+	transport := mqttTransportScheme(config)
+	if config.UseProxy && (transport == "ws" || transport == "wss") {
+		return nil, fmt.Errorf("MQTT 当前暂不支持通过代理建立 WebSocket 连接，请改用 tcp/ssl")
+	}
+	tlsConfig, err := resolveGenericTLSConfig(config)
+	if err != nil {
+		return nil, err
+	}
+
+	options := pahomqtt.NewClientOptions().
+		SetClientID(mqttClientID(config)).
+		SetCleanSession(mqttCleanSession(config)).
+		SetOrderMatters(false).
+		SetAutoReconnect(false).
+		SetConnectRetry(false).
+		SetConnectTimeout(timeout).
+		SetWriteTimeout(timeout)
+
+	if user := strings.TrimSpace(config.User); user != "" {
+		options.SetUsername(user)
+		options.SetPassword(config.Password)
+	}
+	if transport == "ssl" || transport == "wss" {
+		options.SetTLSConfig(tlsConfig)
+	}
+	for _, broker := range brokers {
+		options.AddBroker(fmt.Sprintf("%s://%s", transport, broker))
+	}
+	if config.UseProxy {
+		options.SetCustomOpenConnectionFn(mqttProxyOpenConnectionFn(config.Proxy, timeout, tlsConfig))
+	}
+
+	client := pahomqtt.NewClient(options)
+	token := client.Connect()
+	if !token.WaitTimeout(timeout + 5*time.Second) {
+		return nil, fmt.Errorf("MQTT 连接超时")
+	}
+	if err := token.Error(); err != nil {
+		return nil, err
+	}
+	return &pahoMQTTRuntime{
+		client:  client,
+		timeout: timeout,
+	}, nil
+}
+
+func mqttProxyOpenConnectionFn(proxyConfig connection.ProxyConfig, timeout time.Duration, tlsConfig *tls.Config) func(uri *url.URL, options pahomqtt.ClientOptions) (net.Conn, error) {
+	return func(uri *url.URL, options pahomqtt.ClientOptions) (net.Conn, error) {
+		ctx, cancel := context.WithTimeout(context.Background(), timeout)
+		defer cancel()
+
+		conn, err := proxytunnel.DialContext(ctx, proxyConfig, "tcp", uri.Host)
+		if err != nil {
+			return nil, err
+		}
+		if uri.Scheme != "ssl" && uri.Scheme != "wss" {
+			return conn, nil
+		}
+
+		effectiveTLS := tlsConfig
+		if effectiveTLS == nil {
+			effectiveTLS = options.TLSConfig
+		}
+		if effectiveTLS == nil {
+			effectiveTLS = &tls.Config{}
+		}
+		cloned := effectiveTLS.Clone()
+		if cloned.ServerName == "" {
+			host, _, splitErr := net.SplitHostPort(uri.Host)
+			if splitErr == nil {
+				cloned.ServerName = host
+			} else {
+				cloned.ServerName = uri.Host
+			}
+		}
+
+		tlsConn := tls.Client(conn, cloned)
+		if err := tlsConn.HandshakeContext(ctx); err != nil {
+			_ = conn.Close()
+			return nil, err
+		}
+		return tlsConn, nil
+	}
+}
+
+func (r *pahoMQTTRuntime) Close() error {
+	if r == nil || r.client == nil {
+		return nil
+	}
+	r.client.Disconnect(250)
+	r.client = nil
+	return nil
+}
+
+func (r *pahoMQTTRuntime) Ping(ctx context.Context) error {
+	if r == nil || r.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	default:
+	}
+	if !r.client.IsConnectionOpen() {
+		return fmt.Errorf("MQTT 连接已断开")
+	}
+	return nil
+}
+
+func (r *pahoMQTTRuntime) FetchMessages(ctx context.Context, request mqttFetchRequest) ([]mqttMessageRecord, error) {
+	if r == nil || r.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	if !r.client.IsConnectionOpen() {
+		return nil, fmt.Errorf("MQTT 连接已断开")
+	}
+
+	limit := request.Limit
+	if limit <= 0 {
+		limit = defaultMQTTPreviewLimit
+	}
+	offset := request.Offset
+	if offset < 0 {
+		offset = 0
+	}
+	wait := request.Wait
+	if wait <= 0 {
+		wait = defaultMQTTFetchWait
+	}
+	if wait > maxMQTTFetchWait {
+		wait = maxMQTTFetchWait
+	}
+
+	bufferSize := limit + offset + 8
+	if bufferSize < 8 {
+		bufferSize = 8
+	}
+	if bufferSize > 1024 {
+		bufferSize = 1024
+	}
+	messageCh := make(chan mqttMessageRecord, bufferSize)
+	callback := func(_ pahomqtt.Client, msg pahomqtt.Message) {
+		record := mqttRecordFromMessage(msg)
+		select {
+		case messageCh <- record:
+		default:
+		}
+	}
+
+	token := r.client.Subscribe(request.Topic, request.QoS, callback)
+	if !token.WaitTimeout(r.timeout) {
+		return nil, fmt.Errorf("MQTT 订阅超时")
+	}
+	if err := token.Error(); err != nil {
+		return nil, fmt.Errorf("MQTT 订阅失败：%w", err)
+	}
+	defer func() {
+		unsub := r.client.Unsubscribe(request.Topic)
+		if !unsub.WaitTimeout(r.timeout) {
+			logger.Warnf("MQTT 取消订阅超时：%s", request.Topic)
+			return
+		}
+		if err := unsub.Error(); err != nil {
+			logger.Warnf("MQTT 取消订阅失败：topic=%s err=%v", request.Topic, err)
+		}
+	}()
+
+	timer := time.NewTimer(wait)
+	defer timer.Stop()
+
+	result := make([]mqttMessageRecord, 0, limit)
+	for len(result) < limit {
+		select {
+		case <-ctx.Done():
+			if len(result) > 0 {
+				return result, nil
+			}
+			return nil, ctx.Err()
+		case <-timer.C:
+			return result, nil
+		case record := <-messageCh:
+			if offset > 0 {
+				offset--
+				continue
+			}
+			result = append(result, record)
+		}
+	}
+	return result, nil
+}
+
+func (r *pahoMQTTRuntime) Publish(ctx context.Context, command mqttPublishCommand) (int64, error) {
+	if r == nil || r.client == nil {
+		return 0, fmt.Errorf("连接未打开")
+	}
+	if !r.client.IsConnectionOpen() {
+		return 0, fmt.Errorf("MQTT 连接已断开")
+	}
+	payload, err := mqttEncodePayload(command.Payload)
+	if err != nil {
+		return 0, err
+	}
+	token := r.client.Publish(command.Topic, command.QoS, command.Retain, payload)
+	wait := r.timeout
+	if deadline, ok := ctx.Deadline(); ok {
+		if remaining := time.Until(deadline); remaining > 0 && remaining < wait {
+			wait = remaining
+		}
+	}
+	if !token.WaitTimeout(wait) {
+		return 0, fmt.Errorf("MQTT 发布超时")
+	}
+	if err := token.Error(); err != nil {
+		return 0, err
+	}
+	return 1, nil
+}
+
+func mqttEncodePayload(payload interface{}) ([]byte, error) {
+	switch typed := payload.(type) {
+	case nil:
+		return []byte{}, nil
+	case []byte:
+		return typed, nil
+	case string:
+		return []byte(typed), nil
+	default:
+		return json.Marshal(typed)
+	}
+}
+
+func mqttRecordFromMessage(message pahomqtt.Message) mqttMessageRecord {
+	decoded, encoding := mqttDecodePayload(message.Payload())
+	return mqttMessageRecord{
+		Topic:      message.Topic(),
+		QoS:        message.Qos(),
+		Retained:   message.Retained(),
+		Duplicate:  message.Duplicate(),
+		MessageID:  message.MessageID(),
+		Payload:    append([]byte(nil), message.Payload()...),
+		Decoded:    decoded,
+		Encoding:   encoding,
+		ReceivedAt: time.Now(),
+	}
+}
+
+func mqttDecodePayload(payload []byte) (interface{}, string) {
+	if payload == nil {
+		return nil, "text"
+	}
+	var decoded interface{}
+	if err := decodeJSONWithUseNumber(payload, &decoded); err == nil {
+		return decoded, "json"
+	}
+	if utf8.Valid(payload) {
+		return string(payload), "text"
+	}
+	return base64.StdEncoding.EncodeToString(payload), "base64"
+}
+
+type mqttParsedSQL struct {
+	Action string
+	Topic  string
+	Limit  int
+	Offset int
+	Count  bool
+}
+
+var (
+	mqttSQLFromRE       = regexp.MustCompile(`(?i)\bFROM\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([^\s;]+))`)
+	mqttSQLLimitRE      = regexp.MustCompile(`(?i)\bLIMIT\s+(\d+)`)
+	mqttSQLOffsetRE     = regexp.MustCompile(`(?i)\bOFFSET\s+(\d+)`)
+	mqttShowTopicsRE    = regexp.MustCompile(`(?i)^\s*SHOW\s+TOPICS(?:\s+LIMIT\s+(\d+))?\s*;?\s*$`)
+	mqttDescribeTopicRE = regexp.MustCompile(`(?i)^\s*(?:SHOW|DESCRIBE)\s+TOPIC\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([^\s;]+))\s*;?\s*$`)
+	mqttConsumeTopicRE  = regexp.MustCompile(`(?i)^\s*CONSUME\s+FROM\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([^\s;]+))`)
+)
+
+func parseMQTTSQL(sqlText string) (mqttParsedSQL, bool) {
+	text := strings.TrimSpace(sqlText)
+	if text == "" {
+		return mqttParsedSQL{}, false
+	}
+	if matches := mqttShowTopicsRE.FindStringSubmatch(text); len(matches) > 0 {
+		parsed := mqttParsedSQL{Action: "show_topics"}
+		if len(matches) > 1 && strings.TrimSpace(matches[1]) != "" {
+			parsed.Limit, _ = strconv.Atoi(matches[1])
+		}
+		return parsed, true
+	}
+	if matches := mqttDescribeTopicRE.FindStringSubmatch(text); len(matches) > 0 {
+		return mqttParsedSQL{
+			Action: "describe_topic",
+			Topic:  mqttTrimIdentifier(firstNonEmpty(matches[1], matches[2], matches[3])),
+		}, true
+	}
+	if matches := mqttConsumeTopicRE.FindStringSubmatch(text); len(matches) > 0 {
+		parsed := mqttParsedSQL{
+			Action: "consume",
+			Topic:  mqttTrimIdentifier(firstNonEmpty(matches[1], matches[2], matches[3])),
+			Limit:  defaultMQTTPreviewLimit,
+		}
+		if limitMatch := mqttSQLLimitRE.FindStringSubmatch(text); len(limitMatch) > 1 {
+			parsed.Limit, _ = strconv.Atoi(limitMatch[1])
+		}
+		if offsetMatch := mqttSQLOffsetRE.FindStringSubmatch(text); len(offsetMatch) > 1 {
+			parsed.Offset, _ = strconv.Atoi(offsetMatch[1])
+		}
+		return parsed, true
+	}
+	if !strings.HasPrefix(strings.ToLower(text), "select") {
+		return mqttParsedSQL{}, false
+	}
+	matches := mqttSQLFromRE.FindStringSubmatch(text)
+	if len(matches) == 0 {
+		return mqttParsedSQL{}, false
+	}
+	parsed := mqttParsedSQL{
+		Action: "select",
+		Topic:  mqttTrimIdentifier(firstNonEmpty(matches[1], matches[2], matches[3])),
+		Limit:  defaultMQTTPreviewLimit,
+		Count:  strings.Contains(strings.ToLower(text), "count("),
+	}
+	if limitMatch := mqttSQLLimitRE.FindStringSubmatch(text); len(limitMatch) > 1 {
+		parsed.Limit, _ = strconv.Atoi(limitMatch[1])
+	}
+	if offsetMatch := mqttSQLOffsetRE.FindStringSubmatch(text); len(offsetMatch) > 1 {
+		parsed.Offset, _ = strconv.Atoi(offsetMatch[1])
+	}
+	return parsed, true
+}
+
+func mqttTrimIdentifier(value string) string {
+	return strings.TrimSuffix(strings.TrimSpace(value), ";")
+}
+
+func mqttResolveTopic(raw string, fallback string) string {
+	return strings.TrimSpace(firstNonEmpty(raw, fallback))
+}
+
+func mqttValidatePublishTopic(topic string) error {
+	text := strings.TrimSpace(topic)
+	if text == "" {
+		return fmt.Errorf("MQTT publish 命令缺少 topic")
+	}
+	if strings.ContainsAny(text, "#+") {
+		return fmt.Errorf("MQTT publish topic 不能包含通配符：%s", text)
+	}
+	return nil
+}
+
+func mqttQoSFromAny(value interface{}, fallback byte) (byte, error) {
+	if value == nil {
+		return fallback, nil
+	}
+	qosValue := intFromAny(value, int(fallback))
+	if qosValue < 0 || qosValue > 2 {
+		return 0, fmt.Errorf("MQTT QoS 仅支持 0、1、2")
+	}
+	return byte(qosValue), nil
+}
+
+func mqttBoolFromAny(value interface{}, fallback bool) bool {
+	if value == nil {
+		return fallback
+	}
+	switch typed := value.(type) {
+	case bool:
+		return typed
+	case string:
+		return mqttBoolValue(typed)
+	default:
+		return mqttBoolValue(fmt.Sprintf("%v", value))
+	}
+}
+
+func mqttBoolValue(value string) bool {
+	switch strings.ToLower(strings.TrimSpace(value)) {
+	case "1", "true", "yes", "on", "required":
+		return true
+	default:
+		return false
+	}
+}
+
+func mqttTopicRows(topics []mqttTopicDescriptor, defaultQoS byte, defaultRetain bool) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(topics))
+	for _, topic := range topics {
+		rows = append(rows, map[string]interface{}{
+			"topic":     topic.Filter,
+			"default":   topic.Default,
+			"wildcard":  topic.Wildcard,
+			"default_qos": int(defaultQoS),
+			"retain":    defaultRetain,
+			"source":    topic.Source,
+		})
+	}
+	return rows
+}
+
+func mqttDescribeTopicRow(topic string, topics []mqttTopicDescriptor, defaultQoS byte, defaultRetain bool, cleanSession bool, fetchWait time.Duration, brokers []string) map[string]interface{} {
+	configured := false
+	isDefault := false
+	wildcard := strings.ContainsAny(topic, "#+")
+	source := ""
+	for _, entry := range topics {
+		if entry.Filter == topic {
+			configured = true
+			isDefault = entry.Default
+			wildcard = entry.Wildcard
+			source = entry.Source
+			break
+		}
+	}
+	return map[string]interface{}{
+		"topic":          topic,
+		"configured":     configured,
+		"default":        isDefault,
+		"wildcard":       wildcard,
+		"source":         source,
+		"default_qos":    int(defaultQoS),
+		"default_retain": defaultRetain,
+		"clean_session":  cleanSession,
+		"fetch_wait_ms":  fetchWait.Milliseconds(),
+		"broker_count":   len(brokers),
+		"brokers":        append([]string(nil), brokers...),
+	}
+}
+
+func mqttMessageRows(records []mqttMessageRecord) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(records))
+	for _, record := range records {
+		row := map[string]interface{}{
+			"topic":            record.Topic,
+			"qos":              int(record.QoS),
+			"retained":         record.Retained,
+			"duplicate":        record.Duplicate,
+			"message_id":       int(record.MessageID),
+			"payload":          record.Decoded,
+			"payload_encoding": record.Encoding,
+			"payload_bytes":    len(record.Payload),
+			"received_at":      record.ReceivedAt.Format(time.RFC3339Nano),
+		}
+		if payloadMap, ok := record.Decoded.(map[string]interface{}); ok {
+			flattenMQTTMap("payload", payloadMap, row)
+		}
+		rows = append(rows, row)
+	}
+	return rows
+}
+
+func flattenMQTTMap(prefix string, values map[string]interface{}, row map[string]interface{}) {
+	for key, value := range values {
+		if strings.TrimSpace(key) == "" {
+			continue
+		}
+		name := prefix + "." + key
+		row[name] = value
+		if nested, ok := value.(map[string]interface{}); ok {
+			flattenMQTTMap(name, nested, row)
+		}
+	}
+}
+
+func uniqueStringsPreserveOrder(values []string) []string {
+	seen := make(map[string]struct{}, len(values))
+	result := make([]string, 0, len(values))
+	for _, value := range values {
+		key := strings.TrimSpace(value)
+		if key == "" {
+			continue
+		}
+		if _, ok := seen[key]; ok {
+			continue
+		}
+		seen[key] = struct{}{}
+		result = append(result, key)
+	}
+	return result
+}
diff --git a/internal/db/mqtt_impl_test.go b/internal/db/mqtt_impl_test.go
new file mode 100644
index 0000000..158e456
--- /dev/null
+++ b/internal/db/mqtt_impl_test.go
@@ -0,0 +1,211 @@
+package db
+
+import (
+	"context"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+func TestNormalizeMQTTConfigParsesURIAndParams(t *testing.T) {
+	config := normalizeMQTTConfig(connection.ConnectionConfig{
+		URI:              "mqtt://user:secret@127.0.0.1:1883/devices%2F%2B%2Ftelemetry?topology=cluster&tls=true&skip_verify=true",
+		ConnectionParams: "topics=devices%2F%2B%2Ftelemetry,%24SYS%2F%23&qos=1&retain=false&cleanSession=false&fetchWaitMs=3500",
+	})
+
+	if config.Host != "127.0.0.1" || config.Port != 1883 {
+		t.Fatalf("unexpected mqtt host/port: %#v", config)
+	}
+	if config.User != "user" || config.Password != "secret" {
+		t.Fatalf("unexpected mqtt credentials: %#v", config)
+	}
+	if config.Database != "devices/+/telemetry" {
+		t.Fatalf("unexpected mqtt default topic: %q", config.Database)
+	}
+	if !config.UseSSL || config.SSLMode != "skip-verify" {
+		t.Fatalf("unexpected mqtt tls settings: %#v", config)
+	}
+	if config.Topology != "cluster" {
+		t.Fatalf("unexpected mqtt topology: %q", config.Topology)
+	}
+
+	params := mqttConnectionParams(config)
+	if params.Get("topics") != "devices/+/telemetry,$SYS/#" {
+		t.Fatalf("unexpected mqtt topics param: %#v", params)
+	}
+	if params.Get("qos") != "1" || params.Get("fetchWaitMs") != "3500" {
+		t.Fatalf("unexpected mqtt params: %#v", params)
+	}
+}
+
+func TestMQTTQueryExecAndColumns(t *testing.T) {
+	fakeRuntime := &fakeMQTTRuntime{
+		fetchResponses: map[string][]mqttMessageRecord{
+			"devices/+/telemetry": {
+				{
+					Topic:      "devices/device-001/telemetry",
+					QoS:        1,
+					Retained:   false,
+					Duplicate:  false,
+					MessageID:  12,
+					Payload:    []byte(`{"event":"created","meta":{"source":"sensor"}}`),
+					Decoded:    map[string]interface{}{"event": "created", "meta": map[string]interface{}{"source": "sensor"}},
+					Encoding:   "json",
+					ReceivedAt: time.Date(2026, 6, 14, 11, 0, 0, 0, time.UTC),
+				},
+				{
+					Topic:      "devices/device-002/telemetry",
+					QoS:        1,
+					Retained:   true,
+					Duplicate:  false,
+					MessageID:  13,
+					Payload:    []byte("plain-text"),
+					Decoded:    "plain-text",
+					Encoding:   "text",
+					ReceivedAt: time.Date(2026, 6, 14, 11, 0, 1, 0, time.UTC),
+				},
+			},
+		},
+	}
+
+	originalFactory := newMQTTRuntime
+	newMQTTRuntime = func(config connection.ConnectionConfig) (mqttRuntime, error) {
+		return fakeRuntime, nil
+	}
+	defer func() {
+		newMQTTRuntime = originalFactory
+	}()
+
+	client := &MQTTDB{}
+	if err := client.Connect(connection.ConnectionConfig{
+		Type:             "mqtt",
+		Host:             "127.0.0.1",
+		Port:             1883,
+		Database:         "devices/+/telemetry",
+		ConnectionParams: "topics=devices%2F%2B%2Ftelemetry,%24SYS%2F%23&qos=1&fetchWaitMs=2500",
+	}); err != nil {
+		t.Fatalf("Connect failed: %v", err)
+	}
+	defer client.Close()
+
+	rows, columns, err := client.Query(`SHOW TOPICS LIMIT 2`)
+	if err != nil {
+		t.Fatalf("SHOW TOPICS failed: %v", err)
+	}
+	if len(rows) != 2 || rows[0]["topic"] != "devices/+/telemetry" {
+		t.Fatalf("unexpected mqtt topic rows: %#v", rows)
+	}
+	if !containsString(columns, "wildcard") {
+		t.Fatalf("expected wildcard column, got %v", columns)
+	}
+
+	rows, _, err = client.Query(`DESCRIBE TOPIC "devices/+/telemetry"`)
+	if err != nil {
+		t.Fatalf("DESCRIBE TOPIC failed: %v", err)
+	}
+	if len(rows) != 1 || rows[0]["configured"] != true || rows[0]["default_qos"] != 1 {
+		t.Fatalf("unexpected mqtt describe rows: %#v", rows)
+	}
+
+	rows, columns, err = client.Query(`SELECT * FROM "devices/+/telemetry" LIMIT 1 OFFSET 1`)
+	if err != nil {
+		t.Fatalf("SELECT topic failed: %v", err)
+	}
+	if len(fakeRuntime.fetchRequests) == 0 || fakeRuntime.fetchRequests[len(fakeRuntime.fetchRequests)-1].Offset != 1 {
+		t.Fatalf("expected mqtt fetch offset 1, got %#v", fakeRuntime.fetchRequests)
+	}
+	if len(rows) != 1 || rows[0]["payload"] != "plain-text" || rows[0]["payload_encoding"] != "text" {
+		t.Fatalf("unexpected mqtt message rows: %#v", rows)
+	}
+	if !containsString(columns, "payload_encoding") {
+		t.Fatalf("expected payload_encoding column, got %v", columns)
+	}
+
+	affected, err := client.Exec(`{"publish":"devices/device-001/telemetry","payload":{"id":1},"qos":2,"retain":true}`)
+	if err != nil {
+		t.Fatalf("mqtt publish failed: %v", err)
+	}
+	if affected != 1 {
+		t.Fatalf("unexpected affected rows: %d", affected)
+	}
+	if len(fakeRuntime.published) != 1 {
+		t.Fatalf("expected one mqtt publish call, got %#v", fakeRuntime.published)
+	}
+	if fakeRuntime.published[0].Topic != "devices/device-001/telemetry" || fakeRuntime.published[0].QoS != 2 || !fakeRuntime.published[0].Retain {
+		t.Fatalf("unexpected mqtt publish command: %#v", fakeRuntime.published[0])
+	}
+
+	columnDefs, err := client.GetColumns(mqttSyntheticDatabase, "devices/+/telemetry")
+	if err != nil {
+		t.Fatalf("GetColumns failed: %v", err)
+	}
+	names := make([]string, 0, len(columnDefs))
+	for _, col := range columnDefs {
+		names = append(names, col.Name)
+	}
+	joined := strings.Join(names, ",")
+	for _, want := range []string{"topic", "payload.meta.source", "payload_encoding"} {
+		if !strings.Contains(joined, want) {
+			t.Fatalf("expected mqtt column %q in %s", want, joined)
+		}
+	}
+
+	databases, err := client.GetDatabases()
+	if err != nil {
+		t.Fatalf("GetDatabases failed: %v", err)
+	}
+	if !reflect.DeepEqual(databases, []string{mqttSyntheticDatabase}) {
+		t.Fatalf("unexpected mqtt database list: %#v", databases)
+	}
+
+	tables, err := client.GetTables(mqttSyntheticDatabase)
+	if err != nil {
+		t.Fatalf("GetTables failed: %v", err)
+	}
+	if !reflect.DeepEqual(tables, []string{"$SYS/#", "devices/+/telemetry"}) {
+		t.Fatalf("unexpected mqtt topic list: %#v", tables)
+	}
+
+	if _, _, err := client.Query(`SELECT COUNT(*) FROM "devices/+/telemetry"`); err == nil || !strings.Contains(err.Error(), "COUNT(*)") {
+		t.Fatalf("expected COUNT(*) to be rejected, got %v", err)
+	}
+}
+
+type fakeMQTTRuntime struct {
+	fetchResponses map[string][]mqttMessageRecord
+	fetchRequests  []mqttFetchRequest
+	published      []mqttPublishCommand
+	closed         bool
+}
+
+func (f *fakeMQTTRuntime) Close() error {
+	f.closed = true
+	return nil
+}
+
+func (f *fakeMQTTRuntime) Ping(ctx context.Context) error {
+	return nil
+}
+
+func (f *fakeMQTTRuntime) FetchMessages(ctx context.Context, request mqttFetchRequest) ([]mqttMessageRecord, error) {
+	f.fetchRequests = append(f.fetchRequests, request)
+	items := append([]mqttMessageRecord(nil), f.fetchResponses[request.Topic]...)
+	if request.Offset > 0 {
+		if request.Offset >= len(items) {
+			return []mqttMessageRecord{}, nil
+		}
+		items = items[request.Offset:]
+	}
+	if request.Limit > 0 && len(items) > request.Limit {
+		items = items[:request.Limit]
+	}
+	return items, nil
+}
+
+func (f *fakeMQTTRuntime) Publish(ctx context.Context, command mqttPublishCommand) (int64, error) {
+	f.published = append(f.published, command)
+	return 1, nil
+}
diff --git a/internal/db/mysql_connection_params_test.go b/internal/db/mysql_connection_params_test.go
index 97fdd97..bf7135a 100644
--- a/internal/db/mysql_connection_params_test.go
+++ b/internal/db/mysql_connection_params_test.go
@@ -3,10 +3,13 @@ package db
 import (
 	"database/sql"
 	"net/url"
+	"reflect"
 	"strings"
 	"testing"
 
 	"GoNavi-Wails/internal/connection"
+
+	mysql "github.com/go-sql-driver/mysql"
 )
 
 func parseMySQLDSNQueryForTest(t *testing.T, dsn string) url.Values {
@@ -22,6 +25,26 @@ func parseMySQLDSNQueryForTest(t *testing.T, dsn string) url.Values {
 	return values
 }
 
+func parseMySQLDriverCharsetsForTest(t *testing.T, dsn string) []string {
+	t.Helper()
+
+	cfg, err := mysql.ParseDSN(dsn)
+	if err != nil {
+		t.Fatalf("mysql ParseDSN failed: %v", err)
+	}
+
+	field := reflect.ValueOf(cfg).Elem().FieldByName("charsets")
+	if !field.IsValid() {
+		t.Fatal("mysql.Config missing internal charsets field")
+	}
+
+	charsets := make([]string, field.Len())
+	for i := 0; i < field.Len(); i++ {
+		charsets[i] = field.Index(i).String()
+	}
+	return charsets
+}
+
 func TestMySQLDSN_MergesConnectionParamsWithDefaults(t *testing.T) {
 	t.Parallel()
 
@@ -54,6 +77,33 @@ func TestMySQLDSN_MergesConnectionParamsWithDefaults(t *testing.T) {
 	}
 }
 
+func TestMySQLDSN_EmptyDatabaseUsesCompatibilityDefaults(t *testing.T) {
+	t.Parallel()
+
+	m := &MySQLDB{}
+	dsn, err := m.getDSN(connection.ConnectionConfig{
+		Host:     "gdb.local",
+		Port:     1523,
+		User:     "glzc",
+		Password: "secret",
+		Timeout:  30,
+	})
+	if err != nil {
+		t.Fatalf("getDSN failed: %v", err)
+	}
+	if !strings.Contains(dsn, "@tcp(gdb.local:1523)/?") {
+		t.Fatalf("empty database should still keep DSN slash separator, got=%q", dsn)
+	}
+
+	query := parseMySQLDSNQueryForTest(t, dsn)
+	if got := query.Get("charset"); got != "utf8mb4,utf8" {
+		t.Fatalf("default charset should fall back from utf8mb4 to utf8, got=%q", got)
+	}
+	if got := query.Get("multiStatements"); got != "true" {
+		t.Fatalf("default multiStatements should remain enabled, got=%q", got)
+	}
+}
+
 func TestMySQLDSN_MapsCommonJDBCParamsWithoutLeakingUnsupportedKeys(t *testing.T) {
 	t.Parallel()
 
@@ -294,6 +344,61 @@ func TestMySQLDSN_MapsAllowMultiQueriesTrueWithoutLeakingKey(t *testing.T) {
 	}
 }
 
+func TestBuildMySQLCompatibleConnectPlans_AddsHandshakeFallbackWhenMultiStatementsImplicit(t *testing.T) {
+	t.Parallel()
+
+	plans, err := buildMySQLCompatibleConnectPlans(connection.ConnectionConfig{
+		Host:    "gdb.local",
+		Port:    1523,
+		User:    "glzc",
+		Timeout: 30,
+	}, "tcp", "gdb.local:1523", "")
+	if err != nil {
+		t.Fatalf("buildMySQLCompatibleConnectPlans failed: %v", err)
+	}
+	if len(plans) != 2 {
+		t.Fatalf("expected default plan plus compatibility fallback, got %d", len(plans))
+	}
+
+	defaultQuery := parseMySQLDSNQueryForTest(t, plans[0].dsn)
+	if got := defaultQuery.Get("multiStatements"); got != "true" {
+		t.Fatalf("default plan should keep multiStatements enabled, got=%q", got)
+	}
+	if got := defaultQuery.Get("charset"); got != "utf8mb4,utf8" {
+		t.Fatalf("default plan should use utf8 fallback charset, got=%q", got)
+	}
+
+	fallbackQuery := parseMySQLDSNQueryForTest(t, plans[1].dsn)
+	if got := fallbackQuery.Get("multiStatements"); got != "false" {
+		t.Fatalf("fallback plan should disable multiStatements, got=%q", got)
+	}
+	if got := fallbackQuery.Get("charset"); got != "utf8mb4,utf8" {
+		t.Fatalf("fallback plan should preserve charset fallback, got=%q", got)
+	}
+}
+
+func TestBuildMySQLCompatibleConnectPlans_RespectsExplicitMultiStatementsChoice(t *testing.T) {
+	t.Parallel()
+
+	plans, err := buildMySQLCompatibleConnectPlans(connection.ConnectionConfig{
+		Host:             "db.local",
+		Port:             3306,
+		User:             "root",
+		ConnectionParams: "allowMultiQueries=false",
+	}, "tcp", "db.local:3306", "app")
+	if err != nil {
+		t.Fatalf("buildMySQLCompatibleConnectPlans failed: %v", err)
+	}
+	if len(plans) != 1 {
+		t.Fatalf("explicit multiStatements choice should skip compatibility fallback, got %d plans", len(plans))
+	}
+
+	query := parseMySQLDSNQueryForTest(t, plans[0].dsn)
+	if got := query.Get("multiStatements"); got != "false" {
+		t.Fatalf("explicit allowMultiQueries=false should be preserved, got=%q", got)
+	}
+}
+
 func TestMySQLDSN_AsiaShanghaiLocationAcceptedByDriver(t *testing.T) {
 	t.Parallel()
 
@@ -316,6 +421,27 @@ func TestMySQLDSN_AsiaShanghaiLocationAcceptedByDriver(t *testing.T) {
 	_ = db.Close()
 }
 
+func TestMySQLDSN_DefaultCharsetFallbackListRemainsDriverCompatible(t *testing.T) {
+	t.Parallel()
+
+	m := &MySQLDB{}
+	dsn, err := m.getDSN(connection.ConnectionConfig{
+		Host:     "127.0.0.1",
+		Port:     3306,
+		User:     "root",
+		Database: "app",
+	})
+	if err != nil {
+		t.Fatalf("getDSN failed: %v", err)
+	}
+
+	got := parseMySQLDriverCharsetsForTest(t, dsn)
+	want := []string{"utf8mb4", "utf8"}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("driver should parse charset fallback list, got=%v want=%v dsn=%q", got, want, dsn)
+	}
+}
+
 func TestMySQLDSN_URIParamsAndExplicitParamsPrecedence(t *testing.T) {
 	t.Parallel()
 
@@ -346,3 +472,54 @@ func TestMySQLDSN_URIParamsAndExplicitParamsPrecedence(t *testing.T) {
 		t.Fatalf("internal topology parameter should not be passed to driver: %v", query)
 	}
 }
+
+func TestApplyMySQLURI_GoldenDBSchemeUsesDefaultPort(t *testing.T) {
+	t.Parallel()
+
+	config := applyMySQLURI(connection.ConnectionConfig{
+		Type: "goldendb",
+		URI:  "goldendb://glzc:secret@gdb.local/core_ledger?characterEncoding=utf8",
+	})
+
+	if config.Host != "gdb.local" {
+		t.Fatalf("expected goldendb host from URI, got %q", config.Host)
+	}
+	if config.Port != 1523 {
+		t.Fatalf("expected goldendb default port 1523, got %d", config.Port)
+	}
+	if config.Database != "core_ledger" {
+		t.Fatalf("expected goldendb database from URI, got %q", config.Database)
+	}
+	if config.User != "glzc" {
+		t.Fatalf("expected goldendb user from URI, got %q", config.User)
+	}
+	if config.Password != "secret" {
+		t.Fatalf("expected goldendb password from URI, got %q", config.Password)
+	}
+}
+
+func TestMySQLDSN_AcceptsGoldenDBURICompatibilityParams(t *testing.T) {
+	t.Parallel()
+
+	m := &MySQLDB{}
+	dsn, err := m.getDSN(connection.ConnectionConfig{
+		Type:     "goldendb",
+		Host:     "gdb.local",
+		Port:     1523,
+		User:     "glzc",
+		Password: "secret",
+		Database: "core_ledger",
+		URI:      "goldendb://glzc:secret@gdb.local/core_ledger?characterEncoding=utf8&useSSL=false",
+	})
+	if err != nil {
+		t.Fatalf("getDSN failed: %v", err)
+	}
+
+	query := parseMySQLDSNQueryForTest(t, dsn)
+	if got := query.Get("charset"); got != "utf8" {
+		t.Fatalf("goldendb URI characterEncoding should map to charset=utf8, got=%q", got)
+	}
+	if got := query.Get("tls"); got != "false" {
+		t.Fatalf("goldendb URI useSSL=false should map to tls=false, got=%q", got)
+	}
+}
diff --git a/internal/db/mysql_impl.go b/internal/db/mysql_impl.go
index ccbca70..2b4adf6 100644
--- a/internal/db/mysql_impl.go
+++ b/internal/db/mysql_impl.go
@@ -27,14 +27,39 @@ type MySQLDB struct {
 
 const (
 	defaultMySQLPort            = 3306
+	defaultGoldenDBPort         = 1523
 	defaultMySQLInsertBatchSize = 1000
 	maxMySQLInsertBatchArgs     = 60000
 )
 
+var mysqlCompatibleURISchemes = []string{
+	"mysql",
+	"mariadb",
+	"doris",
+	"diros",
+	"oceanbase",
+	"starrocks",
+	"goldendb",
+	"greatdb",
+	"gdb",
+}
+
 func parseMySQLCompatibleURI(raw string, allowedSchemes ...string) (*url.URL, bool) {
 	return parseConnectionURI(raw, allowedSchemes...)
 }
 
+func resolveMySQLCompatibleDefaultPort(config connection.ConnectionConfig) int {
+	if config.Port > 0 {
+		return config.Port
+	}
+	switch strings.ToLower(strings.TrimSpace(config.Type)) {
+	case "goldendb", "greatdb", "gdb":
+		return defaultGoldenDBPort
+	default:
+		return defaultMySQLPort
+	}
+}
+
 func mysqlConnectionParamsFromText(raw string) url.Values {
 	return connectionParamsFromText(raw)
 }
@@ -278,6 +303,53 @@ func mergeMySQLConnectionParams(params url.Values, values url.Values) {
 	}
 }
 
+type mySQLCompatibleDSNOptions struct {
+	defaultCharset         string
+	defaultMultiStatements *bool
+}
+
+type mySQLCompatibleConnectPlan struct {
+	label string
+	dsn   string
+}
+
+const (
+	mySQLCompatPlanDefaultLabel                = "默认兼容参数"
+	mySQLCompatPlanDisableMultiStatementsLabel = "禁用 multiStatements 兼容重试"
+)
+
+func hasMySQLConnectionParam(config connection.ConnectionConfig, names ...string) bool {
+	if len(names) == 0 {
+		return false
+	}
+
+	targets := make(map[string]struct{}, len(names))
+	for _, name := range names {
+		normalized := strings.ToLower(strings.TrimSpace(name))
+		if normalized == "" {
+			continue
+		}
+		targets[normalized] = struct{}{}
+	}
+	if len(targets) == 0 {
+		return false
+	}
+
+	hasMatchingKey := func(values url.Values) bool {
+		for key := range values {
+			if _, ok := targets[strings.ToLower(strings.TrimSpace(key))]; ok {
+				return true
+			}
+		}
+		return false
+	}
+
+	if parsed, ok := parseMySQLCompatibleURI(config.URI, mysqlCompatibleURISchemes...); ok && hasMatchingKey(parsed.Query()) {
+		return true
+	}
+	return hasMatchingKey(mysqlConnectionParamsFromText(config.ConnectionParams))
+}
+
 func resolveMySQLTLSParam(config connection.ConnectionConfig) (string, bool, error) {
 	mode := resolveMySQLTLSMode(config)
 	if mode == "false" || !hasTLSCertificatePaths(config) {
@@ -297,14 +369,18 @@ func resolveMySQLTLSParam(config connection.ConnectionConfig) (string, bool, err
 	return name, normalizeSSLModeValue(config.SSLMode) == sslModePreferred, nil
 }
 
-func buildMySQLCompatibleDSN(config connection.ConnectionConfig, protocol, address, database string) (string, error) {
+func buildMySQLCompatibleDSNWithOptions(config connection.ConnectionConfig, protocol, address, database string, options mySQLCompatibleDSNOptions) (string, error) {
 	timeout := getConnectTimeoutSeconds(config)
 	tlsMode, allowFallbackToPlaintext, err := resolveMySQLTLSParam(config)
 	if err != nil {
 		return "", err
 	}
 	params := url.Values{}
-	params.Set("charset", "utf8mb4")
+	defaultCharset := strings.TrimSpace(options.defaultCharset)
+	if defaultCharset == "" {
+		defaultCharset = "utf8mb4,utf8"
+	}
+	params.Set("charset", defaultCharset)
 	params.Set("parseTime", "True")
 	params.Set("loc", "Local")
 	params.Set("timeout", fmt.Sprintf("%ds", timeout))
@@ -312,17 +388,95 @@ func buildMySQLCompatibleDSN(config connection.ConnectionConfig, protocol, addre
 	if allowFallbackToPlaintext {
 		params.Set("allowFallbackToPlaintext", "true")
 	}
-	params.Set("multiStatements", "true")
-	if parsed, ok := parseMySQLCompatibleURI(config.URI, "mysql", "doris", "diros", "oceanbase"); ok {
+	defaultMultiStatements := true
+	if options.defaultMultiStatements != nil {
+		defaultMultiStatements = *options.defaultMultiStatements
+	}
+	params.Set("multiStatements", strconv.FormatBool(defaultMultiStatements))
+	if parsed, ok := parseMySQLCompatibleURI(config.URI, mysqlCompatibleURISchemes...); ok {
 		mergeMySQLConnectionParams(params, parsed.Query())
 	}
 	mergeMySQLConnectionParams(params, mysqlConnectionParamsFromText(config.ConnectionParams))
+	encodedParams := encodeMySQLDSNQuery(params)
 	return fmt.Sprintf(
 		"%s:%s@%s(%s)/%s?%s",
-		config.User, config.Password, protocol, address, database, params.Encode(),
+		config.User, config.Password, protocol, address, database, encodedParams,
 	), nil
 }
 
+func encodeMySQLDSNQuery(params url.Values) string {
+	if len(params) == 0 {
+		return ""
+	}
+
+	keys := make([]string, 0, len(params))
+	for key := range params {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+
+	var builder strings.Builder
+	for _, key := range keys {
+		escapedKey := url.QueryEscape(key)
+		values := params[key]
+		for _, value := range values {
+			if builder.Len() > 0 {
+				builder.WriteByte('&')
+			}
+			builder.WriteString(escapedKey)
+			builder.WriteByte('=')
+			escapedValue := url.QueryEscape(value)
+			if strings.EqualFold(strings.TrimSpace(key), "charset") {
+				escapedValue = strings.ReplaceAll(escapedValue, "%2C", ",")
+				escapedValue = strings.ReplaceAll(escapedValue, "%2c", ",")
+			}
+			builder.WriteString(escapedValue)
+		}
+	}
+
+	return builder.String()
+}
+
+func buildMySQLCompatibleDSN(config connection.ConnectionConfig, protocol, address, database string) (string, error) {
+	defaultMultiStatements := true
+	return buildMySQLCompatibleDSNWithOptions(config, protocol, address, database, mySQLCompatibleDSNOptions{
+		defaultCharset:         "utf8mb4,utf8",
+		defaultMultiStatements: &defaultMultiStatements,
+	})
+}
+
+func buildMySQLCompatibleConnectPlans(config connection.ConnectionConfig, protocol, address, database string) ([]mySQLCompatibleConnectPlan, error) {
+	defaultDSN, err := buildMySQLCompatibleDSN(config, protocol, address, database)
+	if err != nil {
+		return nil, err
+	}
+	plans := []mySQLCompatibleConnectPlan{{
+		label: mySQLCompatPlanDefaultLabel,
+		dsn:   defaultDSN,
+	}}
+
+	if hasMySQLConnectionParam(config, "multiStatements", "allowMultiQueries") {
+		return plans, nil
+	}
+
+	disabled := false
+	fallbackDSN, err := buildMySQLCompatibleDSNWithOptions(config, protocol, address, database, mySQLCompatibleDSNOptions{
+		defaultCharset:         "utf8mb4,utf8",
+		defaultMultiStatements: &disabled,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if fallbackDSN == defaultDSN {
+		return plans, nil
+	}
+
+	return append(plans, mySQLCompatibleConnectPlan{
+		label: mySQLCompatPlanDisableMultiStatementsLabel,
+		dsn:   fallbackDSN,
+	}), nil
+}
+
 func normalizeMySQLRawDSNCompatibilityParams(raw string) string {
 	text := strings.TrimSpace(raw)
 	queryIndex := strings.Index(text, "?")
@@ -380,7 +534,7 @@ func normalizeMySQLRawDSNCompatibilityParams(raw string) string {
 	if !changed {
 		return raw
 	}
-	encoded := values.Encode()
+	encoded := encodeMySQLDSNQuery(values)
 	if encoded == "" {
 		return prefix + suffix
 	}
@@ -440,6 +594,18 @@ var mysqlDatabaseQueries = []string{
 	"SELECT DATABASE() AS `Database`",
 }
 
+var mysqlDatabaseNameKeys = []string{
+	"Database",
+	"database",
+	"DATABASE",
+	"database_name",
+	"DATABASE_NAME",
+	"schema",
+	"SCHEMA",
+	"schema_name",
+	"SCHEMA_NAME",
+}
+
 func collectMySQLDatabaseNames(queryFn func(string) ([]map[string]interface{}, []string, error)) ([]string, error) {
 	if queryFn == nil {
 		return nil, fmt.Errorf("查询函数为空")
@@ -449,34 +615,59 @@ func collectMySQLDatabaseNames(queryFn func(string) ([]map[string]interface{}, [
 	seen := make(map[string]struct{}, 8)
 	var lastErr error
 
-	appendNames := func(rows []map[string]interface{}) {
-		for _, row := range rows {
-			for _, key := range []string{"Database", "database"} {
-				val, ok := row[key]
-				if !ok || val == nil {
-					continue
-				}
-				name := strings.TrimSpace(fmt.Sprintf("%v", val))
-				if name == "" || strings.EqualFold(name, "<nil>") {
-					continue
-				}
-				if _, exists := seen[name]; exists {
-					continue
-				}
-				seen[name] = struct{}{}
-				names = append(names, name)
-				break
+	normalizeName := func(val interface{}) string {
+		if val == nil {
+			return ""
+		}
+		name := strings.TrimSpace(fmt.Sprintf("%v", val))
+		if name == "" || strings.EqualFold(name, "<nil>") || strings.EqualFold(name, "null") {
+			return ""
+		}
+		return name
+	}
+
+	extractName := func(row map[string]interface{}, columns []string) string {
+		for _, key := range mysqlDatabaseNameKeys {
+			if name := normalizeName(row[key]); name != "" {
+				return name
 			}
 		}
+		for _, column := range columns {
+			if name := normalizeName(row[column]); name != "" {
+				return name
+			}
+		}
+		if len(row) == 1 {
+			for _, val := range row {
+				if name := normalizeName(val); name != "" {
+					return name
+				}
+			}
+		}
+		return ""
+	}
+
+	appendNames := func(rows []map[string]interface{}, columns []string) {
+		for _, row := range rows {
+			name := extractName(row, columns)
+			if name == "" {
+				continue
+			}
+			if _, exists := seen[name]; exists {
+				continue
+			}
+			seen[name] = struct{}{}
+			names = append(names, name)
+		}
 	}
 
 	for _, sqlText := range mysqlDatabaseQueries {
-		rows, _, err := queryFn(sqlText)
+		rows, columns, err := queryFn(sqlText)
 		if err != nil {
 			lastErr = err
 			continue
 		}
-		appendNames(rows)
+		appendNames(rows, columns)
 		if len(names) > 0 {
 			return names, nil
 		}
@@ -496,7 +687,7 @@ func applyMySQLURI(config connection.ConnectionConfig) connection.ConnectionConf
 	if uriText == "" {
 		return config
 	}
-	parsed, ok := parseMySQLCompatibleURI(uriText, "mysql")
+	parsed, ok := parseMySQLCompatibleURI(uriText, mysqlCompatibleURISchemes...)
 	if !ok {
 		return config
 	}
@@ -514,10 +705,7 @@ func applyMySQLURI(config connection.ConnectionConfig) connection.ConnectionConf
 		config.Database = dbName
 	}
 
-	defaultPort := config.Port
-	if defaultPort <= 0 {
-		defaultPort = defaultMySQLPort
-	}
+	defaultPort := resolveMySQLCompatibleDefaultPort(config)
 
 	hostsFromURI := make([]string, 0, 4)
 	hostText := strings.TrimSpace(parsed.Host)
@@ -553,10 +741,7 @@ func applyMySQLURI(config connection.ConnectionConfig) connection.ConnectionConf
 }
 
 func collectMySQLAddresses(config connection.ConnectionConfig) []string {
-	defaultPort := config.Port
-	if defaultPort <= 0 {
-		defaultPort = defaultMySQLPort
-	}
+	defaultPort := resolveMySQLCompatibleDefaultPort(config)
 
 	candidates := make([]string, 0, len(config.Hosts)+1)
 	if len(config.Hosts) > 0 {
@@ -582,20 +767,27 @@ func collectMySQLAddresses(config connection.ConnectionConfig) []string {
 	return result
 }
 
-func (m *MySQLDB) getDSN(config connection.ConnectionConfig) (string, error) {
-	database := config.Database
+func (m *MySQLDB) resolveProtocolAndAddress(config connection.ConnectionConfig) (string, string, error) {
 	protocol := "tcp"
 	address := normalizeMySQLAddress(config.Host, config.Port)
 
 	if config.UseSSH {
 		netName, err := ssh.RegisterSSHNetwork(config.SSH)
 		if err != nil {
-			return "", fmt.Errorf("创建 SSH 隧道失败：%w", err)
+			return "", "", fmt.Errorf("创建 SSH 隧道失败：%w", err)
 		}
 		protocol = netName
 	}
 
-	return buildMySQLCompatibleDSN(config, protocol, address, database)
+	return protocol, address, nil
+}
+
+func (m *MySQLDB) getDSN(config connection.ConnectionConfig) (string, error) {
+	protocol, address, err := m.resolveProtocolAndAddress(config)
+	if err != nil {
+		return "", err
+	}
+	return buildMySQLCompatibleDSN(config, protocol, address, config.Database)
 }
 
 func resolveMySQLCredential(config connection.ConnectionConfig, addressIndex int) (string, string) {
@@ -621,11 +813,12 @@ func (m *MySQLDB) Connect(config connection.ConnectionConfig) error {
 	if len(addresses) == 0 {
 		return fmt.Errorf("连接建立后验证失败：未找到可用的 MySQL 地址")
 	}
+	defaultPort := resolveMySQLCompatibleDefaultPort(runConfig)
 
 	var errorDetails []string
 	for index, address := range addresses {
 		candidateConfig := runConfig
-		host, port, ok := parseHostPortWithDefault(address, defaultMySQLPort)
+		host, port, ok := parseHostPortWithDefault(address, defaultPort)
 		if !ok {
 			continue
 		}
@@ -633,30 +826,50 @@ func (m *MySQLDB) Connect(config connection.ConnectionConfig) error {
 		candidateConfig.Port = port
 		candidateConfig.User, candidateConfig.Password = resolveMySQLCredential(runConfig, index)
 
-		dsn, err := m.getDSN(candidateConfig)
+		protocol, address, err := m.resolveProtocolAndAddress(candidateConfig)
 		if err != nil {
 			errorDetails = append(errorDetails, fmt.Sprintf("%s 生成连接串失败: %v", address, err))
 			continue
 		}
-		db, err := sql.Open("mysql", dsn)
+		plans, err := buildMySQLCompatibleConnectPlans(candidateConfig, protocol, address, candidateConfig.Database)
 		if err != nil {
-			errorDetails = append(errorDetails, fmt.Sprintf("%s 打开失败: %v", address, err))
+			errorDetails = append(errorDetails, fmt.Sprintf("%s 生成连接串失败: %v", address, err))
 			continue
 		}
 
-		timeout := getConnectTimeout(candidateConfig)
-		ctx, cancel := utils.ContextWithTimeout(timeout)
-		pingErr := db.PingContext(ctx)
-		cancel()
-		if pingErr != nil {
-			_ = db.Close()
-			errorDetails = append(errorDetails, fmt.Sprintf("%s 验证失败: %v", address, pingErr))
-			continue
-		}
+		for _, plan := range plans {
+			db, err := sql.Open("mysql", plan.dsn)
+			if err != nil {
+				if len(plans) > 1 || plan.label != mySQLCompatPlanDefaultLabel {
+					errorDetails = append(errorDetails, fmt.Sprintf("%s [%s] 打开失败: %v", address, plan.label, err))
+				} else {
+					errorDetails = append(errorDetails, fmt.Sprintf("%s 打开失败: %v", address, err))
+				}
+				continue
+			}
 
-		m.conn = db
-		m.pingTimeout = timeout
-		return nil
+			timeout := getConnectTimeout(candidateConfig)
+			ctx, cancel := utils.ContextWithTimeout(timeout)
+			pingErr := db.PingContext(ctx)
+			cancel()
+			if pingErr != nil {
+				_ = db.Close()
+				if len(plans) > 1 || plan.label != mySQLCompatPlanDefaultLabel {
+					errorDetails = append(errorDetails, fmt.Sprintf("%s [%s] 验证失败: %v", address, plan.label, pingErr))
+				} else {
+					errorDetails = append(errorDetails, fmt.Sprintf("%s 验证失败: %v", address, pingErr))
+				}
+				continue
+			}
+
+			if plan.label != mySQLCompatPlanDefaultLabel {
+				logger.Warnf("MySQL 兼容回退生效：地址=%s 模式=%s", address, plan.label)
+			}
+
+			m.conn = db
+			m.pingTimeout = timeout
+			return nil
+		}
 	}
 
 	if len(errorDetails) == 0 {
@@ -694,7 +907,7 @@ func (m *MySQLDB) QueryMulti(query string) ([]connection.ResultSetData, error) {
 		return nil, err
 	}
 	defer rows.Close()
-	return scanMultiRows(rows)
+	return scanMultiRowsForDialect(rows, "mysql")
 }
 
 func (m *MySQLDB) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
@@ -706,7 +919,7 @@ func (m *MySQLDB) QueryMultiContext(ctx context.Context, query string) ([]connec
 		return nil, err
 	}
 	defer rows.Close()
-	return scanMultiRows(rows)
+	return scanMultiRowsForDialect(rows, "mysql")
 }
 
 func (m *MySQLDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
@@ -720,7 +933,7 @@ func (m *MySQLDB) QueryContext(ctx context.Context, query string) ([]map[string]
 	}
 	defer rows.Close()
 
-	return scanRows(rows)
+	return scanRowsForDialect(rows, "mysql")
 }
 
 func (m *MySQLDB) Query(query string) ([]map[string]interface{}, []string, error) {
@@ -733,7 +946,7 @@ func (m *MySQLDB) Query(query string) ([]map[string]interface{}, []string, error
 		return nil, nil, err
 	}
 	defer rows.Close()
-	return scanRows(rows)
+	return scanRowsForDialect(rows, "mysql")
 }
 
 func (m *MySQLDB) ExecBatchContext(ctx context.Context, query string) (int64, error) {
@@ -808,13 +1021,56 @@ func (m *MySQLDB) GetTables(dbName string) ([]string, error) {
 	return resolveShardingSphereLogicalTables(tables, m.Query), nil
 }
 
-func (m *MySQLDB) GetCreateStatement(dbName, tableName string) (string, error) {
-	query := fmt.Sprintf("SHOW CREATE TABLE `%s`.`%s`", dbName, tableName)
-	if dbName == "" {
-		query = fmt.Sprintf("SHOW CREATE TABLE `%s`", tableName)
+func normalizeMySQLIdentifierPart(ident string) string {
+	value := strings.TrimSpace(ident)
+	for i := 0; i < 4; i++ {
+		next := normalizeSQLIdentPartCommon(value)
+		if next == value {
+			break
+		}
+		value = next
+	}
+	if len(value) >= 2 {
+		first := value[0]
+		last := value[len(value)-1]
+		switch {
+		case first == '\'' && last == '\'':
+			return strings.TrimSpace(strings.ReplaceAll(value[1:len(value)-1], `''`, `'`))
+		case (first == '\'' && last == '"') || (first == '"' && last == '\''):
+			return strings.TrimSpace(value[1 : len(value)-1])
+		}
+	}
+	return strings.TrimSpace(value)
+}
+
+func quoteMySQLIdentifier(ident string) string {
+	return "`" + strings.ReplaceAll(normalizeMySQLIdentifierPart(ident), "`", "``") + "`"
+}
+
+func mysqlQualifiedTableIdentifier(dbName, tableName string) string {
+	schema := normalizeMySQLIdentifierPart(dbName)
+	table := strings.TrimSpace(tableName)
+	if parsedSchema, parsedTable := SplitSQLQualifiedName(table); parsedTable != "" {
+		if parsedSchema != "" {
+			schema = normalizeMySQLIdentifierPart(parsedSchema)
+		}
+		table = normalizeMySQLIdentifierPart(parsedTable)
+	} else {
+		table = normalizeMySQLIdentifierPart(table)
 	}
 
-	data, _, err := m.Query(query)
+	if schema != "" {
+		return quoteMySQLIdentifier(schema) + "." + quoteMySQLIdentifier(table)
+	}
+	return quoteMySQLIdentifier(table)
+}
+
+func buildMySQLShowCreateTableQuery(dbName, tableName string) string {
+	return "SHOW CREATE TABLE " + mysqlQualifiedTableIdentifier(dbName, tableName)
+}
+
+func (m *MySQLDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	data, _, err := m.Query(buildMySQLShowCreateTableQuery(dbName, tableName))
 	if err != nil {
 		return "", err
 	}
diff --git a/internal/db/mysql_metadata_test.go b/internal/db/mysql_metadata_test.go
index 45df52a..1731083 100644
--- a/internal/db/mysql_metadata_test.go
+++ b/internal/db/mysql_metadata_test.go
@@ -15,8 +15,8 @@ func TestCollectMySQLDatabaseNames_FallsBackToCurrentDatabase(t *testing.T) {
 			return nil, nil, errors.New("Error 1227 (42000): Access denied; you need (at least one of) the SHOW DATABASES privilege(s) for this operation")
 		case mysqlDatabaseQueries[1]:
 			return []map[string]interface{}{
-				{"Database": "biz_app"},
-			}, nil, nil
+				{"database_name": "biz_app"},
+			}, []string{"database_name"}, nil
 		default:
 			return nil, nil, errors.New("unexpected query")
 		}
@@ -31,6 +31,33 @@ func TestCollectMySQLDatabaseNames_FallsBackToCurrentDatabase(t *testing.T) {
 	}
 }
 
+func TestCollectMySQLDatabaseNames_AcceptsMyCATStyleSchemaColumn(t *testing.T) {
+	t.Parallel()
+
+	got, err := collectMySQLDatabaseNames(func(query string) ([]map[string]interface{}, []string, error) {
+		switch query {
+		case mysqlDatabaseQueries[0]:
+			return []map[string]interface{}{
+				{"SCHEMA": "analytics"},
+			}, []string{"SCHEMA"}, nil
+		case mysqlDatabaseQueries[1]:
+			return []map[string]interface{}{
+				{"Database": "should_not_be_used"},
+			}, []string{"Database"}, nil
+		default:
+			return nil, nil, errors.New("unexpected query")
+		}
+	})
+	if err != nil {
+		t.Fatalf("collectMySQLDatabaseNames 返回错误: %v", err)
+	}
+
+	want := []string{"analytics"}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("unexpected database names, got=%v want=%v", got, want)
+	}
+}
+
 func TestCollectMySQLDatabaseNames_PrefersShowDatabasesWhenAvailable(t *testing.T) {
 	t.Parallel()
 
@@ -82,3 +109,53 @@ func TestCollectMySQLDatabaseNames_ReturnsOriginalErrorWhenNoDatabaseResolved(t
 		t.Fatalf("错误不符合预期: %v", err)
 	}
 }
+
+func TestBuildMySQLShowCreateTableQueryNormalizesQuotedIdentifiers(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name      string
+		dbName    string
+		tableName string
+		want      string
+	}{
+		{
+			name:      "plain db and quoted table",
+			dbName:    "app",
+			tableName: `"activate_record"`,
+			want:      "SHOW CREATE TABLE `app`.`activate_record`",
+		},
+		{
+			name:      "escaped quoted qualified table overrides db",
+			dbName:    "ignored",
+			tableName: `\"crm\".\"activate_record\"`,
+			want:      "SHOW CREATE TABLE `crm`.`activate_record`",
+		},
+		{
+			name:      "backtick escaping",
+			dbName:    "app`prod",
+			tableName: "`audit``log`",
+			want:      "SHOW CREATE TABLE `app``prod`.`audit``log`",
+		},
+		{
+			name:      "quoted table containing dot is not split",
+			dbName:    "app",
+			tableName: `"activate.record"`,
+			want:      "SHOW CREATE TABLE `app`.`activate.record`",
+		},
+		{
+			name:      "mixed quote artifact from UI row value",
+			dbName:    "app",
+			tableName: `'activate_record"`,
+			want:      "SHOW CREATE TABLE `app`.`activate_record`",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := buildMySQLShowCreateTableQuery(tt.dbName, tt.tableName); got != tt.want {
+				t.Fatalf("buildMySQLShowCreateTableQuery(%q,%q)=%q,want=%q", tt.dbName, tt.tableName, got, tt.want)
+			}
+		})
+	}
+}
diff --git a/internal/db/notice_query.go b/internal/db/notice_query.go
new file mode 100644
index 0000000..57f1d97
--- /dev/null
+++ b/internal/db/notice_query.go
@@ -0,0 +1,60 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"database/sql/driver"
+	"fmt"
+	"strings"
+)
+
+type sqlTextNoticeHandlerSetter func(driver.Conn, func(string))
+
+func querySQLConnWithTextNotices(ctx context.Context, conn *sql.Conn, query string, setHandler sqlTextNoticeHandlerSetter) ([]map[string]interface{}, []string, []string, error) {
+	if conn == nil {
+		return nil, nil, nil, fmt.Errorf("连接未打开")
+	}
+	if setHandler == nil {
+		return nil, nil, nil, fmt.Errorf("未配置消息捕获处理器")
+	}
+	if ctx == nil {
+		ctx = context.Background()
+	}
+
+	notices := make([]string, 0, 2)
+	addNotice := func(text string) {
+		text = strings.TrimSpace(text)
+		if text != "" {
+			notices = append(notices, text)
+		}
+	}
+
+	if err := conn.Raw(func(rawConn interface{}) error {
+		driverConn, ok := rawConn.(driver.Conn)
+		if !ok {
+			return fmt.Errorf("底层连接类型不支持消息捕获")
+		}
+		setHandler(driverConn, addNotice)
+		return nil
+	}); err != nil {
+		return nil, nil, nil, err
+	}
+	defer func() {
+		_ = conn.Raw(func(rawConn interface{}) error {
+			driverConn, ok := rawConn.(driver.Conn)
+			if ok {
+				setHandler(driverConn, nil)
+			}
+			return nil
+		})
+	}()
+
+	rows, err := conn.QueryContext(ctx, query)
+	if err != nil {
+		return nil, nil, append([]string(nil), notices...), err
+	}
+	defer rows.Close()
+
+	data, columns, err := scanRows(rows)
+	return data, columns, append([]string(nil), notices...), err
+}
diff --git a/internal/db/oceanbase_impl.go b/internal/db/oceanbase_impl.go
index 4ec7573..a680d68 100644
--- a/internal/db/oceanbase_impl.go
+++ b/internal/db/oceanbase_impl.go
@@ -7,36 +7,25 @@
 //  2. OBProxy Oracle listener —— 标准 Oracle TNS 网络协议
 //
 // Navicat 的"OceanBase"数据源经实测能在 OB MySQL wire 端口上直接连接 Oracle 租户，
-// 证明 OB 服务端识别 OBClient 客户端的关键是 CLIENT_CONNECT_ATTRS 中的特定 attribute
-// 组合，而不是 capability bit 0-31 的扩展（这些 bit 是 MySQL 协议标准定义的）。
-// go-sql-driver/mysql v1.9+ 通过 DSN 参数 connectionAttributes 透传 CLIENT_CONNECT_ATTRS，
-// 因此 **不需要 fork mysql driver** 即可复刻 Navicat 的连接路径。
+// 但本机企业版验证表明：仅通过 go-sql-driver/mysql 注入 CLIENT_CONNECT_ATTRS 不足以
+// 让 Oracle 租户放行，还需要 CLIENT_SUPPORT_ORACLE_MODE 等 OceanBase 私有 capability。
+// 因此 GoNavi 将 Oracle 租户的 MySQL-wire 路径隔离到 OB Oracle 专用 driver。
 //
 // GoNavi 当前路由（按 OceanBase 协议字段选择决定）：
 //   - 协议=MySQL：走 go-sql-driver/mysql，连 MySQL 租户。OB 服务端在 Oracle 租户上返回
 //     "Error 1235 (0A000): Oracle tenant for current client driver is not supported"
 //     时，错误信息提示用户切换到 Oracle 协议。
-//   - 协议=Oracle：先做 mysql wire 端口预探测（probeOceanBaseMySQLWireHandshake）：
-//       * 端口是 OB MySQL wire → 走 mysql wire + OBClient capability 注入路径
-//         （ensureOceanBaseOBClientAttributes + ensureOceanBaseOracleANSIQuotes），
-//         元数据查询通过 OracleDB wrapper 复用 Oracle 方言 SQL，
-//         ApplyChanges 用 applyOracleChangesMySQLWire（"?" 占位符 + 双引号引用）。
-//       * 端口非 OB MySQL wire → 走 sijms/go-ora 连接 OBProxy 的 Oracle listener。
-//
-// OBClient capability attribute 候选清单（基于 OceanBase 公开 connector-j 资料 +
-// 社区经验，**未在本仓库联调验证 Navicat 用的具体组合**）：
-//   - _client_name=OceanBase Connector/J     ← OB connector-j 标准
-//   - _client_version=2.4.5
-//   - __ob_client_attribute_capability_flag=1
-//   - ob_capability_flag=1
-//
-// 默认注入完整候选清单（mysql server 忽略未知 attribute 是安全行为）。用户/DBA 通过
-// ConnectionParams 设置 connectionAttributes 时，会与默认注入合并（用户值优先）。
+//   - 协议=Oracle：先做 mysql wire 端口预探测（probeOceanBaseMySQLWireHandshake）。
+//     识别为 OB MySQL wire 时，走 obconnector-go 的 OB Oracle 专用握手路径；
+//     元数据查询通过 OracleDB wrapper 复用 Oracle 方言 SQL，ApplyChanges 用
+//     applyOracleChangesMySQLWire（"?" 占位符 + 双引号引用）。
+//     端口非 OB MySQL wire 时，走 sijms/go-ora 连接 OBProxy 的 Oracle listener。
 //
 // 历史教训：d2dad751 / 17331ddb / 5/14 两次反转都没在真实 OB Oracle 租户集群上联调，
 // 多次方向摇摆。本次反转有 Navicat 真实工作证据（用户报告：Navicat 用 OceanBase 数据源
-// 类型连同一端口 60014 成功）。后续若收到"OBClient 默认注入仍失败"反馈，需要 Wireshark
-// 抓 Navicat 握手包对照 attribute 组合，不要再盲改方向。
+// 类型连同一端口 60014 成功）以及本机企业版 Oracle 租户验证。go-sql-driver/mysql 即使
+// 注入 connectionAttributes 也无法发出 OceanBase Oracle 租户需要的私有 capability，
+// 因此 Oracle/MySQL-wire 路径必须和普通 OceanBase MySQL 路径隔离。
 package db
 
 import (
@@ -56,13 +45,16 @@ import (
 	"GoNavi-Wails/internal/utils"
 
 	mysqlDriver "github.com/go-sql-driver/mysql"
+	_ "github.com/helingjun/obconnector-go"
 )
 
 const (
-	oceanbaseDriverName     = "oceanbase"
-	defaultOceanBasePort    = 2881
-	oceanBaseProtocolMySQL  = "mysql"
-	oceanBaseProtocolOracle = "oracle"
+	oceanbaseDriverName             = "gonavi_oceanbase_mysql"
+	oceanbaseOracleOBClientDriver   = "oboracle"
+	defaultOceanBasePort            = 2881
+	oceanBaseProtocolMySQL          = "mysql"
+	oceanBaseProtocolOracle         = "oracle"
+	oceanBaseOracleProbeReadTimeout = 3 * time.Second
 )
 
 // OceanBaseDB 支持 OceanBase MySQL/Oracle 两种租户协议。
@@ -289,39 +281,6 @@ func withoutOceanBaseProtocolParams(config connection.ConnectionConfig) connecti
 	return next
 }
 
-// ensureOceanBaseOracleANSIQuotes 在 ConnectionParams 中注入 sql_mode='ANSI_QUOTES'，
-// 让 OceanBase Oracle 租户通过 MySQL wire 连接时，把双引号识别为标识符引用（Oracle 语义），
-// 否则元数据查询的列别名 `AS "OWNER"` 和 ApplyChanges 的 `"schema"."table"` 会被当字符串字面量。
-// 用户已显式设置 sql_mode 时追加 ANSI_QUOTES，保留其它 mode。
-func ensureOceanBaseOracleANSIQuotes(raw string) string {
-	values := connectionParamsFromText(raw)
-	if values == nil {
-		values = url.Values{}
-	}
-	existing := strings.TrimSpace(values.Get("sql_mode"))
-	if existing == "" {
-		values.Set("sql_mode", "'ANSI_QUOTES'")
-		return values.Encode()
-	}
-	if strings.Contains(strings.ToUpper(existing), "ANSI_QUOTES") {
-		return values.Encode()
-	}
-	trimmed := strings.Trim(existing, "'")
-	values.Set("sql_mode", "'"+trimmed+",ANSI_QUOTES'")
-	return values.Encode()
-}
-
-// defaultOceanBaseOBClientAttributes 是 GoNavi 在 OceanBase Oracle 租户连接路径上默认注入的
-// CLIENT_CONNECT_ATTRS 列表，用于声明 OBClient 客户端身份让 OB 服务端放行 Oracle 租户。
-// 这些 key/value 基于公开 OceanBase Connector/J 资料整理，未经本仓库真实环境验证。
-// 用户通过 ConnectionParams 中的 connectionAttributes 设置的 attribute 优先级更高。
-var defaultOceanBaseOBClientAttributes = []struct{ Key, Value string }{
-	{Key: "_client_name", Value: "OceanBase Connector/J"},
-	{Key: "_client_version", Value: "2.4.5"},
-	{Key: "__ob_client_attribute_capability_flag", Value: "1"},
-	{Key: "ob_capability_flag", Value: "1"},
-}
-
 // parseMySQLConnectionAttributes 解析 "key1:value1,key2:value2" 格式的 attribute 串。
 // 兼容 mysql DSN 中 connectionAttributes 参数的格式。
 func parseMySQLConnectionAttributes(raw string) map[string]string {
@@ -349,51 +308,6 @@ func parseMySQLConnectionAttributes(raw string) map[string]string {
 	return result
 }
 
-// serializeMySQLConnectionAttributes 把 map 序列化回 mysql DSN 期望的 "key1:value1,key2:value2"。
-// 输出按 key 字典序排序以保证可重现。
-func serializeMySQLConnectionAttributes(attrs map[string]string) string {
-	if len(attrs) == 0 {
-		return ""
-	}
-	keys := make([]string, 0, len(attrs))
-	for k := range attrs {
-		keys = append(keys, k)
-	}
-	// 字典序排序：测试可重现 + 用户视角一致
-	for i := 1; i < len(keys); i++ {
-		for j := i; j > 0 && keys[j-1] > keys[j]; j-- {
-			keys[j-1], keys[j] = keys[j], keys[j-1]
-		}
-	}
-	var b strings.Builder
-	for i, k := range keys {
-		if i > 0 {
-			b.WriteByte(',')
-		}
-		b.WriteString(k)
-		b.WriteByte(':')
-		b.WriteString(attrs[k])
-	}
-	return b.String()
-}
-
-// ensureOceanBaseOBClientAttributes 把 GoNavi 的默认 OBClient capability attribute 合并到
-// ConnectionParams 的 connectionAttributes 中。用户已设置的 attribute 优先（不覆盖）。
-func ensureOceanBaseOBClientAttributes(rawConnectionParams string) string {
-	values := connectionParamsFromText(rawConnectionParams)
-	if values == nil {
-		values = url.Values{}
-	}
-	existing := parseMySQLConnectionAttributes(values.Get("connectionAttributes"))
-	for _, attr := range defaultOceanBaseOBClientAttributes {
-		if _, ok := existing[attr.Key]; !ok {
-			existing[attr.Key] = attr.Value
-		}
-	}
-	values.Set("connectionAttributes", serializeMySQLConnectionAttributes(existing))
-	return values.Encode()
-}
-
 // promoteOceanBaseOracleURIParams 把 oceanbase:// URI 中的 Oracle 业务参数提升到 ConnectionParams，
 // 让 OracleDB.Connect 在不解析 oceanbase URI 的情况下仍能拿到 PREFETCH_ROWS 等参数。
 func promoteOceanBaseOracleURIParams(config connection.ConnectionConfig) connection.ConnectionConfig {
@@ -414,6 +328,77 @@ func promoteOceanBaseOracleURIParams(config connection.ConnectionConfig) connect
 	return config
 }
 
+func mergeOceanBaseOracleOBClientParams(params url.Values, values url.Values) {
+	if len(values) == 0 {
+		return
+	}
+	for key, vals := range values {
+		name := strings.TrimSpace(key)
+		if name == "" {
+			continue
+		}
+		lowerName := strings.ToLower(name)
+		if lowerName == "connectionattributes" {
+			for _, value := range vals {
+				for attrKey, attrValue := range parseMySQLConnectionAttributes(value) {
+					params.Set("attr."+attrKey, attrValue)
+				}
+			}
+			continue
+		}
+		if strings.HasPrefix(lowerName, "attr.") {
+			for _, value := range vals {
+				params.Set(name, value)
+			}
+			continue
+		}
+		switch lowerName {
+		case "timeout", "connecttimeout", "connect timeout":
+			for _, value := range vals {
+				params.Set("timeout", normalizeMySQLDurationParam(value, time.Millisecond))
+			}
+		case "trace", "preset", "cap.add", "cap.drop", "collation", "ob20", "protocol.v2",
+			"ob20.magic", "ob20.disablechecksum", "compress", "usecompression", "use_compression",
+			"tls", "tls.ca", "tls_ca", "tls.cert", "tls_cert", "tls.key", "tls_key":
+			for _, value := range vals {
+				params.Set(name, value)
+			}
+		case "init":
+			for _, value := range vals {
+				params.Add("init", value)
+			}
+		}
+	}
+}
+
+func buildOceanBaseOracleOBClientDSN(config connection.ConnectionConfig) (string, error) {
+	if strings.TrimSpace(config.User) == "" {
+		return "", fmt.Errorf("OceanBase Oracle (OBClient 路径) 缺少用户名")
+	}
+	address := normalizeMySQLAddress(config.Host, config.Port)
+	dsnURL := url.URL{
+		Scheme: "oboracle",
+		Host:   address,
+		User:   url.UserPassword(config.User, config.Password),
+	}
+	if strings.TrimSpace(config.Database) != "" {
+		dsnURL.Path = "/" + strings.TrimSpace(config.Database)
+	}
+
+	params := url.Values{}
+	params.Set("preset", "oboracle")
+	if timeout := getConnectTimeout(config); timeout > 0 {
+		params.Set("timeout", timeout.String())
+	}
+	mergeOceanBaseOracleOBClientParams(params, connectionParamsFromURI(config.URI, "oceanbase", "mysql", "oboracle"))
+	mergeOceanBaseOracleOBClientParams(params, connectionParamsFromText(config.ConnectionParams))
+	if strings.TrimSpace(params.Get("preset")) == "" {
+		params.Set("preset", "oboracle")
+	}
+	dsnURL.RawQuery = params.Encode()
+	return dsnURL.String(), nil
+}
+
 func prepareOceanBaseOracleConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
 	runConfig := withoutOceanBaseProtocolParams(applyOceanBaseURI(config))
 	runConfig = promoteOceanBaseOracleURIParams(runConfig)
@@ -435,7 +420,7 @@ func isOceanBaseOracleTenantMySQLDriverError(err error) bool {
 
 func formatOceanBaseMySQLAttemptError(address string, err error) string {
 	if isOceanBaseOracleTenantMySQLDriverError(err) {
-		return fmt.Sprintf("%s 验证失败：当前选择的是 OceanBase MySQL 协议，但服务端返回 Oracle 租户不支持 MySQL 客户端驱动（OB Error 1235）；请在连接配置中将 OceanBase 协议切换为 Oracle，并填写 OBProxy 暴露的 Oracle 协议端口与服务名（Service Name）", address)
+		return fmt.Sprintf("%s 验证失败：当前选择的是 OceanBase MySQL 协议，但服务端返回 Oracle 租户不支持 MySQL 客户端驱动（OB Error 1235）；请在连接配置中将 OceanBase 协议切换为 Oracle。若使用 OBClient/OBServer MySQL-wire 入口，主机和端口可保持不变且服务名可留空；只有连接 OBProxy Oracle listener/TNS 入口时才需要填写服务名（Service Name）", address)
 	}
 	return fmt.Sprintf("%s 验证失败：%v", address, err)
 }
@@ -458,13 +443,44 @@ func annotateOceanBaseOracleConnectError(err error) error {
 		strings.Contains(lower, "unexpected packet"),
 		strings.Contains(lower, "got packets out of order"),
 		strings.Contains(lower, "use of closed network connection"):
-		return fmt.Errorf("%w（OceanBase Oracle TNS 路径握手失败：当前端口可能是 OBServer 的 MySQL wire 协议端口而非 OBProxy 的 Oracle listener。GoNavi 已实现 OBClient capability 注入路径，路由层会优先尝试该路径；如这里仍报此错说明 OBClient 路径也未成功，详见随后的 OBClient 错误诊断）", err)
+		return fmt.Errorf("%w（OceanBase Oracle TNS 路径握手失败：当前端口可能是 OBServer 的 MySQL wire 协议端口而非 OBProxy 的 Oracle listener。GoNavi 会优先尝试 OB Oracle 专用 MySQL-wire 路径；如这里仍报此错说明该路径也未成功，详见随后的 OBClient 错误诊断）", err)
 	case strings.Contains(lower, "ora-"):
 		return fmt.Errorf("%w（OceanBase Oracle 租户认证或服务名失败：请确认服务名（Service Name）、用户名（如 SYS@oracle_tenant#cluster_name）与权限配置）", err)
 	}
 	return fmt.Errorf("%w（OceanBase Oracle 协议连接失败）", err)
 }
 
+type oceanBaseMySQLWireProbeResult struct {
+	isOBMySQLWire  bool
+	probeSucceeded bool
+	tcpReachable   bool
+	err            error
+}
+
+var oceanBaseProbeDialContext = defaultOceanBaseProbeDialContext
+
+func defaultOceanBaseProbeDialContext(ctx context.Context, config connection.ConnectionConfig, address string) (net.Conn, error) {
+	if config.UseSSH {
+		return ssh.DialContextThroughSSH(ctx, config.SSH, "tcp", address)
+	}
+	var dialer net.Dialer
+	return dialer.DialContext(ctx, "tcp", address)
+}
+
+func formatOceanBaseOracleNetworkProbeError(config connection.ConnectionConfig, err error) error {
+	address := normalizeMySQLAddress(config.Host, config.Port)
+	if config.UseSSH {
+		if err == nil {
+			return fmt.Errorf("OceanBase Oracle 连接失败：通过 SSH 跳板机访问目标地址 %s 失败。该错误发生在协议选择之前，和 OBClient/TNS 路径无关；请确认跳板机能访问该内网地址，并检查 SSH 配置、远端防火墙以及 OBProxy/OBServer 监听端口", address)
+		}
+		return fmt.Errorf("OceanBase Oracle 连接失败：通过 SSH 跳板机访问目标地址 %s 失败：%w。该错误发生在协议选择之前，和 OBClient/TNS 路径无关；请确认跳板机能访问该内网地址，并检查 SSH 配置、远端防火墙以及 OBProxy/OBServer 监听端口", address, err)
+	}
+	if err == nil {
+		return fmt.Errorf("OceanBase Oracle 连接失败：目标地址 %s TCP 不可达。该错误发生在协议选择之前，和 OBClient/TNS 路径无关；请确认客户端机器能访问该地址，并检查 VPN/内网路由、防火墙以及 OBProxy/OBServer 监听端口", address)
+	}
+	return fmt.Errorf("OceanBase Oracle 连接失败：目标地址 %s TCP 不可达：%w。该错误发生在协议选择之前，和 OBClient/TNS 路径无关；请确认客户端机器能访问该地址，并检查 VPN/内网路由、防火墙以及 OBProxy/OBServer 监听端口", address, err)
+}
+
 // probeOceanBaseMySQLWireHandshake 通过读取目标端口的 MySQL initial handshake packet
 // 判断该端口背后是否是 OceanBase 的 MySQL wire 协议端口。
 //
@@ -475,57 +491,72 @@ func annotateOceanBaseOracleConnectError(err error) error {
 //  4. server_version 是从 payload[1] 开始的 null-terminated 字符串
 //  5. server_version 中包含 "oceanbase" / "ob" 关键字时判定为 OB MySQL wire
 //
-// 返回值：(isOBMySQLWire, probeSucceeded)。probeSucceeded=false 表示建连/读包失败，
-// 上层应该兜底执行真实连接尝试（OBClient 优先于 TNS）。
+// 返回值：(isOBMySQLWire, probeSucceeded)。probeSucceeded=false 表示建连或完整握手包读取失败。
+// Connect 使用 probeOceanBaseMySQLWireHandshakeDetail 区分 TCP 不可达与协议探测失败。
 //
 // 容忍度设计：
 //   - protocol_version 不严限（OB 自定义版本号也接受）
 //   - payload 上限 64KB（OB 4.x 的 handshake 可能携带额外的能力位信息）
 //   - 短超时（2s）：探测只为方向选择，主流程的真实超时由 Connect 控制
 func probeOceanBaseMySQLWireHandshake(host string, port int, timeout time.Duration) (bool, bool) {
-	if timeout <= 0 {
-		timeout = 2 * time.Second
+	result := probeOceanBaseMySQLWireHandshakeDetail(connection.ConnectionConfig{Host: host, Port: port}, timeout)
+	return result.isOBMySQLWire, result.probeSucceeded
+}
+
+func probeOceanBaseMySQLWireHandshakeDetail(config connection.ConnectionConfig, timeout time.Duration) oceanBaseMySQLWireProbeResult {
+	return probeOceanBaseMySQLWireHandshakeDetailWithTimeouts(config, timeout, timeout)
+}
+
+func probeOceanBaseMySQLWireHandshakeDetailWithTimeouts(config connection.ConnectionConfig, dialTimeout time.Duration, readTimeout time.Duration) oceanBaseMySQLWireProbeResult {
+	if dialTimeout <= 0 {
+		dialTimeout = 2 * time.Second
 	}
-	addr := normalizeMySQLAddress(host, port)
-	dialer := net.Dialer{Timeout: timeout}
-	conn, err := dialer.Dial("tcp", addr)
+	if readTimeout <= 0 {
+		readTimeout = dialTimeout
+	}
+	addr := normalizeMySQLAddress(config.Host, config.Port)
+	ctx, cancel := context.WithTimeout(context.Background(), dialTimeout)
+	defer cancel()
+	conn, err := oceanBaseProbeDialContext(ctx, config, addr)
 	if err != nil {
-		return false, false
+		return oceanBaseMySQLWireProbeResult{err: err}
 	}
 	defer conn.Close()
-	_ = conn.SetDeadline(time.Now().Add(timeout))
+	_ = conn.SetDeadline(time.Now().Add(readTimeout))
 
 	header := make([]byte, 4)
 	if _, err := io.ReadFull(conn, header); err != nil {
-		return false, false
+		// TCP 已经连通但服务端没有主动发送 MySQL handshake，通常是 Oracle TNS listener
+		// 或其它非 MySQL wire 协议端口。此时不能归因为网络不可达。
+		return oceanBaseMySQLWireProbeResult{probeSucceeded: true, tcpReachable: true, err: err}
 	}
 	payloadLen := int(header[0]) | int(header[1])<<8 | int(header[2])<<16
 	// 放宽上限：OB 4.x handshake 可能携带额外 capability info。仍要约束以避免读取异常长度
 	if payloadLen < 1 || payloadLen > 65536 {
-		return false, true
+		return oceanBaseMySQLWireProbeResult{probeSucceeded: true, tcpReachable: true}
 	}
 	payload := make([]byte, payloadLen)
 	if _, err := io.ReadFull(conn, payload); err != nil {
-		return false, false
+		return oceanBaseMySQLWireProbeResult{tcpReachable: true, err: err}
 	}
 
 	// 不再严格检查 protocol_version。OB 自定义版本号也认作 MySQL wire 候选——
 	// 只要 server_version 字符串含 OceanBase/OBProxy 关键字就足以做方向选择。
 	nullIdx := bytes.IndexByte(payload[1:], 0)
 	if nullIdx < 0 {
-		return false, true
+		return oceanBaseMySQLWireProbeResult{probeSucceeded: true, tcpReachable: true}
 	}
 	serverVersion := strings.ToLower(string(payload[1 : 1+nullIdx]))
 	if serverVersion == "" {
-		return false, true
+		return oceanBaseMySQLWireProbeResult{probeSucceeded: true, tcpReachable: true}
 	}
 	if strings.Contains(serverVersion, "oceanbase") || strings.Contains(serverVersion, "obproxy") {
-		return true, true
+		return oceanBaseMySQLWireProbeResult{isOBMySQLWire: true, probeSucceeded: true, tcpReachable: true}
 	}
 	if strings.Contains(serverVersion, "-ob") {
-		return true, true
+		return oceanBaseMySQLWireProbeResult{isOBMySQLWire: true, probeSucceeded: true, tcpReachable: true}
 	}
-	return false, true
+	return oceanBaseMySQLWireProbeResult{probeSucceeded: true, tcpReachable: true}
 }
 
 // connectOracleViaTNS 走 sijms/go-ora，连 OBProxy 暴露的 Oracle listener 端口（标准 TNS）。
@@ -544,8 +575,8 @@ func (o *OceanBaseDB) connectOracleViaTNS(config connection.ConnectionConfig) er
 	return nil
 }
 
-// connectOracleViaOBClient 走 mysql wire + OBClient capability attribute 注入，连 OceanBase
-// MySQL wire 端口上的 Oracle 租户（复刻 Navicat OceanBase 数据源的连接路径）。
+// connectOracleViaOBClient 走 OB Oracle 专用 MySQL-wire 握手，连 OceanBase
+// MySQL wire 端口上的 Oracle 租户。
 // 用于端口预探测识别为 OB MySQL wire 的情况。
 func (o *OceanBaseDB) connectOracleViaOBClient(config connection.ConnectionConfig) error {
 	addresses := collectOceanBaseAddresses(config)
@@ -563,17 +594,29 @@ func (o *OceanBaseDB) connectOracleViaOBClient(config connection.ConnectionConfi
 		candidateConfig.Host = host
 		candidateConfig.Port = port
 		candidateConfig.User, candidateConfig.Password = resolveMySQLCredential(config, index)
-		// 注入 OBClient capability attribute，让 OB 服务端识别为 OBClient 客户端而放行 Oracle 租户。
-		// 同时确保 sql_mode='ANSI_QUOTES'，让后续 Oracle 元数据查询里的双引号被识别为标识符引用。
-		candidateConfig.ConnectionParams = ensureOceanBaseOBClientAttributes(candidateConfig.ConnectionParams)
-		candidateConfig.ConnectionParams = ensureOceanBaseOracleANSIQuotes(candidateConfig.ConnectionParams)
 
-		dsn, err := o.getDSN(candidateConfig)
+		if candidateConfig.UseSSH {
+			forwarder, err := ssh.GetOrCreateLocalForwarder(candidateConfig.SSH, host, port)
+			if err != nil {
+				errorDetails = append(errorDetails, fmt.Sprintf("%s 创建 SSH 本地转发失败：%v", address, err))
+				continue
+			}
+			localHost, localPort, ok := parseHostPortWithDefault(forwarder.LocalAddr, defaultOceanBasePort)
+			if !ok {
+				errorDetails = append(errorDetails, fmt.Sprintf("%s 解析 SSH 本地转发地址失败：%s", address, forwarder.LocalAddr))
+				continue
+			}
+			candidateConfig.Host = localHost
+			candidateConfig.Port = localPort
+			candidateConfig.UseSSH = false
+		}
+
+		dsn, err := buildOceanBaseOracleOBClientDSN(candidateConfig)
 		if err != nil {
 			errorDetails = append(errorDetails, fmt.Sprintf("%s 生成连接串失败：%v", address, err))
 			continue
 		}
-		db, err := sql.Open(oceanbaseDriverName, dsn)
+		db, err := sql.Open(oceanbaseOracleOBClientDriver, dsn)
 		if err != nil {
 			errorDetails = append(errorDetails, fmt.Sprintf("%s 打开失败：%v", address, err))
 			continue
@@ -603,10 +646,8 @@ func (o *OceanBaseDB) connectOracleViaOBClient(config connection.ConnectionConfi
 func formatOceanBaseOBClientAttemptError(address string, err error) string {
 	if isOceanBaseOracleTenantMySQLDriverError(err) {
 		return fmt.Sprintf("%s 验证失败：OceanBase 服务端仍返回 Error 1235 拒绝当前 client driver。"+
-			"GoNavi 已默认注入 OBClient capability attribute（_client_name=OceanBase Connector/J 等），"+
-			"但该组合未能让服务端放行 Oracle 租户。请用 Wireshark 抓 Navicat 连接此 OB 集群的 mysql 握手包，"+
-			"对照 Client Login Request → Connection Attributes 部分确认服务端期望的 key/value，"+
-			"然后在 GoNavi 连接配置的 ConnectionParams 里通过 connectionAttributes=key1:value1,key2:value2 覆盖。"+
+			"GoNavi 已使用 OB Oracle 专用握手路径；如仍失败，请确认该端口是 OceanBase Oracle 租户的 MySQL-wire 入口，"+
+			"并在 ConnectionParams 中通过 preset/cap.add/cap.drop 或 connectionAttributes=key1:value1 覆盖驱动握手参数。"+
 			"详细错误：%v", address, err)
 	}
 	return fmt.Sprintf("%s 验证失败：%v", address, err)
@@ -641,35 +682,36 @@ func (o *OceanBaseDB) Connect(config connection.ConnectionConfig) error {
 
 	if protocol == oceanBaseProtocolOracle {
 		// 预探测目标端口的实际协议，决定走哪条 Oracle 连接路径。
-		probeTimeout := getConnectTimeout(runConfig)
-		if probeTimeout > 3*time.Second {
-			probeTimeout = 3 * time.Second
+		// SSH 跳板机到内网目标的 direct-tcpip 拨号可能慢于 3 秒；只收紧握手读取超时，避免误判内网目标不可达。
+		probeDialTimeout := getConnectTimeout(runConfig)
+		if !runConfig.UseSSH && probeDialTimeout > oceanBaseOracleProbeReadTimeout {
+			probeDialTimeout = oceanBaseOracleProbeReadTimeout
 		}
-		isOBMySQLWire, probed := probeOceanBaseMySQLWireHandshake(runConfig.Host, runConfig.Port, probeTimeout)
+		probeReadTimeout := oceanBaseOracleProbeReadTimeout
+		if probeReadTimeout > probeDialTimeout {
+			probeReadTimeout = probeDialTimeout
+		}
+		probeResult := probeOceanBaseMySQLWireHandshakeDetailWithTimeouts(runConfig, probeDialTimeout, probeReadTimeout)
 		switch {
-		case probed && isOBMySQLWire:
-			// 明确识别为 OB MySQL wire 端口：直接走 OBClient capability 路径
-			logger.Infof("OceanBase 协议=Oracle 预探测：%s:%d 是 OB MySQL wire 端口，走 OBClient capability 注入路径连接 Oracle 租户", runConfig.Host, runConfig.Port)
+		case probeResult.probeSucceeded && probeResult.isOBMySQLWire:
+			// 明确识别为 OB MySQL wire 端口：直接走 OB Oracle 专用 MySQL-wire 路径
+			logger.Infof("OceanBase 协议=Oracle 预探测：%s:%d 是 OB MySQL wire 端口，走 OB Oracle 专用 MySQL-wire 路径连接 Oracle 租户", runConfig.Host, runConfig.Port)
 			return o.connectOracleViaOBClient(runConfig)
-		case probed:
-			// 探测成功但 server_version 不含 OceanBase 标识：可能是真正的 Oracle TNS 端口
-			logger.Infof("OceanBase 协议=Oracle 预探测：%s:%d 不是 OB MySQL wire，走标准 Oracle TNS 协议（OBProxy Oracle listener）", runConfig.Host, runConfig.Port)
-			return o.connectOracleViaTNS(runConfig)
+		case probeResult.probeSucceeded:
+			// 已收到 MySQL handshake，但 server_version 不一定包含 OceanBase 标识。
+			// 部分 OceanBase Oracle 租户会返回通用 MySQL 版本串；此时仍应优先按
+			// OBClient/MySQL-wire 路径连接，失败后再尝试 TNS。
+			logger.Infof("OceanBase 协议=Oracle 预探测：%s:%d 返回 MySQL handshake 但未识别 OceanBase 标识，优先尝试 OB Oracle 专用 MySQL-wire 路径", runConfig.Host, runConfig.Port)
+			return o.connectOracleViaOBClientThenTNS(runConfig)
+		case !probeResult.tcpReachable && probeResult.err != nil:
+			logger.Warnf("OceanBase 协议=Oracle 预探测建连失败：%s:%d，跳过 OBClient/TNS 重复尝试：%v", runConfig.Host, runConfig.Port, probeResult.err)
+			return formatOceanBaseOracleNetworkProbeError(runConfig, probeResult.err)
 		default:
-			// 探测失败（建连或读 handshake 失败）：可能是网络不通、防火墙阻断、或某些 OB 版本不主动发 handshake。
+			// 探测失败但 TCP 已建连：可能是异常截断的握手包，或某些 OB 版本不主动发完整 handshake。
 			// 不能盲选 TNS——用户填 60014/2881 这类端口大概率仍是 OB MySQL wire。
 			// 串行尝试两条真实路径：先 OBClient（命中概率更高），失败再 TNS，合并错误信息。
-			logger.Warnf("OceanBase 协议=Oracle 预探测失败：%s:%d，串行尝试 OBClient capability 与 TNS 两条路径", runConfig.Host, runConfig.Port)
-			obclientErr := o.connectOracleViaOBClient(runConfig)
-			if obclientErr == nil {
-				return nil
-			}
-			logger.Warnf("OceanBase Oracle OBClient 路径失败，继续尝试 TNS 路径：%v", obclientErr)
-			tnsErr := o.connectOracleViaTNS(runConfig)
-			if tnsErr == nil {
-				return nil
-			}
-			return fmt.Errorf("OceanBase Oracle 两条连接路径均失败；OBClient 路径错误：%v；TNS 路径错误：%w", obclientErr, tnsErr)
+			logger.Warnf("OceanBase 协议=Oracle 预探测失败：%s:%d，串行尝试 OB Oracle 专用 MySQL-wire 与 TNS 两条路径", runConfig.Host, runConfig.Port)
+			return o.connectOracleViaOBClientThenTNS(runConfig)
 		}
 	}
 
@@ -722,6 +764,22 @@ func (o *OceanBaseDB) Connect(config connection.ConnectionConfig) error {
 	return fmt.Errorf("连接建立后验证失败：%s", strings.Join(errorDetails, "；"))
 }
 
+func (o *OceanBaseDB) connectOracleViaOBClientThenTNS(config connection.ConnectionConfig) error {
+	obclientErr := o.connectOracleViaOBClient(config)
+	if obclientErr == nil {
+		return nil
+	}
+	if strings.TrimSpace(config.Database) == "" {
+		return fmt.Errorf("OceanBase Oracle OBClient/MySQL-wire 路径连接失败：%v；当前未填写 Service Name，已跳过 TNS 路径。若连接的是 OBClient/OBServer MySQL-wire 入口，Service Name 可继续留空，请检查主机、端口、用户名、密码和 driver-agent 是否为当前版本；Service Name 只用于 OBProxy Oracle listener/TNS 入口", obclientErr)
+	}
+	logger.Warnf("OceanBase Oracle OBClient 路径失败，继续尝试 TNS 路径：%v", obclientErr)
+	tnsErr := o.connectOracleViaTNS(config)
+	if tnsErr == nil {
+		return nil
+	}
+	return fmt.Errorf("OceanBase Oracle 两条连接路径均失败；OBClient 路径错误：%v；TNS 路径错误：%w", obclientErr, tnsErr)
+}
+
 func (o *OceanBaseDB) activeDatabase() Database {
 	if o.oracle != nil {
 		return o.oracle
@@ -851,7 +909,6 @@ func (o *OceanBaseDB) ApplyChanges(tableName string, changes connection.ChangeSe
 
 // applyOracleChangesMySQLWire 在 OceanBase Oracle 租户的 mysql wire 连接上执行
 // DELETE/UPDATE/INSERT，使用 Oracle 风格双引号引用标识符 + mysql wire 风格 "?" 占位符。
-// 需要事先确保 sql_mode='ANSI_QUOTES'（由 ensureOceanBaseOracleANSIQuotes 在 DSN 中注入）。
 func (o *OceanBaseDB) applyOracleChangesMySQLWire(tableName string, changes connection.ChangeSet) error {
 	if o.oracle == nil || o.oracle.conn == nil {
 		return fmt.Errorf("连接未打开")
diff --git a/internal/db/oceanbase_impl_test.go b/internal/db/oceanbase_impl_test.go
index 3dc8b3f..bca0217 100644
--- a/internal/db/oceanbase_impl_test.go
+++ b/internal/db/oceanbase_impl_test.go
@@ -3,6 +3,7 @@
 package db
 
 import (
+	"context"
 	"errors"
 	"net"
 	"net/url"
@@ -16,6 +17,17 @@ import (
 	mysqlDriver "github.com/go-sql-driver/mysql"
 )
 
+const (
+	testOceanBaseOracleHost     = "ob-oracle.internal.example"
+	testOceanBaseOraclePort     = 2881
+	testOceanBaseOracleUser     = "APP_USER@SERVICE:test_service"
+	testOceanBaseOraclePassword = "test-password"
+	testOceanBaseOracleDatabase = "test_service"
+	testSSHJumpHost             = "ssh-gateway.example.test"
+	testSSHJumpUser             = "test-ops"
+	testSSHJumpPassword         = "test-ssh-password"
+)
+
 func TestResolveOceanBaseProtocol(t *testing.T) {
 	t.Parallel()
 
@@ -288,20 +300,39 @@ func TestOceanBaseOracleDSNParsesTenantCredentials(t *testing.T) {
 	}
 }
 
-// buildMySQLHandshakePacket 构造一个最小化的 MySQL initial handshake packet（protocol v10），
+// buildMySQLHandshakePacket 构造一个完整的 MySQL initial handshake packet（protocol v10），
 // 用于 mock OceanBase / 通用 MySQL / OBProxy 各种 server_version 场景。
 // 实际字段顺序按 MySQL 协议规范：
 //
 //	4 字节 header (3 字节 payload length + 1 字节 sequence id)
 //	payload[0]       protocol_version (10)
 //	payload[1..N]    server_version (null-terminated)
-//	... (后续字段对协议探测无关，可省略)
+//	...             auth seed / capability / auth plugin
 func buildMySQLHandshakePacket(serverVersion string) []byte {
 	payload := []byte{10}
 	payload = append(payload, []byte(serverVersion)...)
 	payload = append(payload, 0)
-	// 追加几个占位字节，让 packet 看起来更像真实 handshake（探测代码并不解析这些字段）
+	// connection id
 	payload = append(payload, []byte{0x01, 0x00, 0x00, 0x00}...)
+	// auth-plugin-data-part-1 + filler
+	payload = append(payload, []byte("12345678")...)
+	payload = append(payload, 0)
+	// capability lower 2 bytes: CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG |
+	// CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION
+	payload = append(payload, 0x05, 0x82)
+	// character set + status flags
+	payload = append(payload, 45, 0x00, 0x00)
+	// capability upper 2 bytes: CLIENT_MULTI_RESULTS | CLIENT_PLUGIN_AUTH |
+	// CLIENT_CONNECT_ATTRS | CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | CLIENT_SESSION_TRACK
+	payload = append(payload, 0x1a, 0x00)
+	// auth-plugin-data length + reserved
+	payload = append(payload, 21)
+	payload = append(payload, make([]byte, 10)...)
+	// auth-plugin-data-part-2 minimum 13 bytes, last byte NUL
+	payload = append(payload, []byte("abcdefghijkl")...)
+	payload = append(payload, 0)
+	payload = append(payload, []byte("mysql_native_password")...)
+	payload = append(payload, 0)
 	payloadLen := len(payload)
 	header := []byte{byte(payloadLen), byte(payloadLen >> 8), byte(payloadLen >> 16), 0}
 	return append(header, payload...)
@@ -376,7 +407,8 @@ func TestProbeOceanBaseMySQLWireDetectsOceanBaseHandshake(t *testing.T) {
 func TestProbeOceanBaseMySQLWireHandshakeReturnsFalseOnUnreachable(t *testing.T) {
 	t.Parallel()
 
-	// 用一个不可达端口（监听后立即关闭），探测应返回 probed=false 让上层继续走 go-ora 路径
+	// 用一个不可达端口（监听后立即关闭），探测应返回 probed=false，
+	// 上层会直接给出网络不可达诊断，避免 OBClient/TNS 两条路径重复超时。
 	ln, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {
 		t.Fatalf("listen failed: %v", err)
@@ -390,7 +422,246 @@ func TestProbeOceanBaseMySQLWireHandshakeReturnsFalseOnUnreachable(t *testing.T)
 		t.Fatal("expected unreachable port not flagged as OB")
 	}
 	if probed {
-		t.Fatal("expected probed=false on unreachable port so upper layer falls back to go-ora")
+		t.Fatal("expected probed=false on unreachable port so upper layer can return network diagnosis")
+	}
+}
+
+func TestOceanBaseOracleConnectTriesOBClientWhenMySQLHandshakeIsGeneric(t *testing.T) {
+	t.Parallel()
+
+	host, port, cleanup := startMockHandshakeServer(t, buildMySQLHandshakePacket("8.0.36"))
+	defer cleanup()
+
+	ob := &OceanBaseDB{}
+	err := ob.Connect(connection.ConnectionConfig{
+		Type:              "oceanbase",
+		Host:              host,
+		Port:              port,
+		User:              testOceanBaseOracleUser,
+		Password:          testOceanBaseOraclePassword,
+		OceanBaseProtocol: oceanBaseProtocolOracle,
+		Timeout:           1,
+	})
+	if err == nil {
+		t.Fatal("expected connect error from mock generic MySQL handshake server")
+	}
+	got := err.Error()
+	if !strings.Contains(got, "OBClient/MySQL-wire 路径连接失败") {
+		t.Fatalf("expected generic MySQL handshake to try OBClient first, got %q", got)
+	}
+	if !strings.Contains(got, "已跳过 TNS 路径") {
+		t.Fatalf("expected empty Service Name to skip TNS fallback, got %q", got)
+	}
+	if strings.Contains(got, "需要填写服务名") {
+		t.Fatalf("expected empty Service Name not to surface TNS required error for MySQL-wire fallback, got %q", got)
+	}
+}
+
+func TestOceanBaseOracleConnectStopsOnProbeDialFailure(t *testing.T) {
+	t.Parallel()
+
+	ln, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("listen failed: %v", err)
+	}
+	host, portStr, _ := net.SplitHostPort(ln.Addr().String())
+	port, _ := strconv.Atoi(portStr)
+	_ = ln.Close()
+
+	ob := &OceanBaseDB{}
+	err = ob.Connect(connection.ConnectionConfig{
+		Type:              "oceanbase",
+		Host:              host,
+		Port:              port,
+		User:              testOceanBaseOracleUser,
+		Password:          testOceanBaseOraclePassword,
+		Database:          testOceanBaseOracleDatabase,
+		OceanBaseProtocol: oceanBaseProtocolOracle,
+		Timeout:           1,
+	})
+	if err == nil {
+		t.Fatal("expected connect error for unreachable OceanBase Oracle endpoint")
+	}
+	got := err.Error()
+	if !strings.Contains(got, "TCP 不可达") {
+		t.Fatalf("expected direct TCP unreachable diagnosis, got %q", got)
+	}
+	if !strings.Contains(got, "和 OBClient/TNS 路径无关") {
+		t.Fatalf("expected error to explain protocol paths are irrelevant, got %q", got)
+	}
+	if strings.Contains(got, "两条连接路径均失败") {
+		t.Fatalf("expected no dual-path failure after probe dial failure, got %q", got)
+	}
+}
+
+func TestOceanBaseOracleConnectProbeDialFailureMentionsSSHWhenEnabled(t *testing.T) {
+	originalDial := oceanBaseProbeDialContext
+	t.Cleanup(func() { oceanBaseProbeDialContext = originalDial })
+
+	var seenConfig connection.ConnectionConfig
+	var seenAddress string
+	oceanBaseProbeDialContext = func(ctx context.Context, config connection.ConnectionConfig, address string) (net.Conn, error) {
+		seenConfig = config
+		seenAddress = address
+		return nil, errors.New("remote dial denied")
+	}
+
+	ob := &OceanBaseDB{}
+	err := ob.Connect(connection.ConnectionConfig{
+		Type:              "oceanbase",
+		Host:              testOceanBaseOracleHost,
+		Port:              testOceanBaseOraclePort,
+		User:              testOceanBaseOracleUser,
+		Password:          testOceanBaseOraclePassword,
+		Database:          testOceanBaseOracleDatabase,
+		OceanBaseProtocol: oceanBaseProtocolOracle,
+		Timeout:           1,
+		UseSSH:            true,
+		SSH: connection.SSHConfig{
+			Host:     testSSHJumpHost,
+			Port:     22,
+			User:     testSSHJumpUser,
+			Password: testSSHJumpPassword,
+		},
+	})
+	if err == nil {
+		t.Fatal("expected connect error for SSH probe dial failure")
+	}
+	got := err.Error()
+	if !seenConfig.UseSSH {
+		t.Fatalf("expected probe dialer to receive UseSSH=true, got %+v", seenConfig)
+	}
+	if seenAddress != "ob-oracle.internal.example:2881" {
+		t.Fatalf("expected probe target to remain remote inner address, got %q", seenAddress)
+	}
+	if !strings.Contains(got, "通过 SSH 跳板机访问目标地址 ob-oracle.internal.example:2881 失败") {
+		t.Fatalf("expected SSH-specific network diagnosis, got %q", got)
+	}
+	if strings.Contains(got, "VPN/内网路由") {
+		t.Fatalf("expected SSH diagnosis not direct-client VPN hint, got %q", got)
+	}
+}
+
+func TestProbeOceanBaseMySQLWireHandshakeUsesSSHConfiguredDialer(t *testing.T) {
+	originalDial := oceanBaseProbeDialContext
+	t.Cleanup(func() { oceanBaseProbeDialContext = originalDial })
+
+	var seenConfig connection.ConnectionConfig
+	var seenAddress string
+	oceanBaseProbeDialContext = func(ctx context.Context, config connection.ConnectionConfig, address string) (net.Conn, error) {
+		seenConfig = config
+		seenAddress = address
+		clientConn, serverConn := net.Pipe()
+		go func() {
+			defer serverConn.Close()
+			_, _ = serverConn.Write(buildMySQLHandshakePacket("5.7.25-OceanBase-v4.2.1.0"))
+		}()
+		return clientConn, nil
+	}
+
+	result := probeOceanBaseMySQLWireHandshakeDetail(connection.ConnectionConfig{
+		Host:   testOceanBaseOracleHost,
+		Port:   testOceanBaseOraclePort,
+		UseSSH: true,
+		SSH: connection.SSHConfig{
+			Host: testSSHJumpHost,
+			Port: 22,
+			User: testSSHJumpUser,
+		},
+	}, time.Second)
+
+	if !result.probeSucceeded || !result.isOBMySQLWire {
+		t.Fatalf("expected SSH-routed probe to detect OceanBase handshake, got %+v", result)
+	}
+	if !seenConfig.UseSSH {
+		t.Fatalf("expected probe dialer to receive SSH config, got %+v", seenConfig)
+	}
+	if seenAddress != "ob-oracle.internal.example:2881" {
+		t.Fatalf("expected remote target address through SSH, got %q", seenAddress)
+	}
+}
+
+func TestOceanBaseOracleConnectUsesFullSSHTimeoutForProbeDial(t *testing.T) {
+	originalDial := oceanBaseProbeDialContext
+	t.Cleanup(func() { oceanBaseProbeDialContext = originalDial })
+
+	var observedDialTimeout time.Duration
+	oceanBaseProbeDialContext = func(ctx context.Context, config connection.ConnectionConfig, address string) (net.Conn, error) {
+		if deadline, ok := ctx.Deadline(); ok {
+			observedDialTimeout = time.Until(deadline)
+		}
+		return nil, errors.New("remote dial denied")
+	}
+
+	ob := &OceanBaseDB{}
+	err := ob.Connect(connection.ConnectionConfig{
+		Type:              "oceanbase",
+		Host:              testOceanBaseOracleHost,
+		Port:              testOceanBaseOraclePort,
+		User:              testOceanBaseOracleUser,
+		Password:          testOceanBaseOraclePassword,
+		Database:          testOceanBaseOracleDatabase,
+		OceanBaseProtocol: oceanBaseProtocolOracle,
+		Timeout:           12,
+		UseSSH:            true,
+		SSH: connection.SSHConfig{
+			Host: testSSHJumpHost,
+			Port: 22,
+			User: testSSHJumpUser,
+		},
+	})
+	if err == nil {
+		t.Fatal("expected connect error from mocked probe dialer")
+	}
+	if observedDialTimeout < 10*time.Second {
+		t.Fatalf("expected SSH probe dial to use the full configured timeout, got about %s", observedDialTimeout)
+	}
+}
+
+func TestProbeOceanBaseMySQLWireHandshakeSplitsDialAndReadTimeout(t *testing.T) {
+	originalDial := oceanBaseProbeDialContext
+	t.Cleanup(func() { oceanBaseProbeDialContext = originalDial })
+
+	var observedDialTimeout time.Duration
+	var serverConn net.Conn
+	oceanBaseProbeDialContext = func(ctx context.Context, config connection.ConnectionConfig, address string) (net.Conn, error) {
+		if deadline, ok := ctx.Deadline(); ok {
+			observedDialTimeout = time.Until(deadline)
+		}
+		clientConn, remoteConn := net.Pipe()
+		serverConn = remoteConn
+		return clientConn, nil
+	}
+	t.Cleanup(func() {
+		if serverConn != nil {
+			_ = serverConn.Close()
+		}
+	})
+
+	started := time.Now()
+	result := probeOceanBaseMySQLWireHandshakeDetailWithTimeouts(connection.ConnectionConfig{
+		Host:   testOceanBaseOracleHost,
+		Port:   testOceanBaseOraclePort,
+		UseSSH: true,
+		SSH: connection.SSHConfig{
+			Host: testSSHJumpHost,
+			Port: 22,
+			User: testSSHJumpUser,
+		},
+	}, 12*time.Second, 50*time.Millisecond)
+	elapsed := time.Since(started)
+
+	if observedDialTimeout < 10*time.Second {
+		t.Fatalf("expected probe dial context to keep the long dial timeout, got about %s", observedDialTimeout)
+	}
+	if elapsed > 500*time.Millisecond {
+		t.Fatalf("expected handshake read to use short timeout, elapsed=%s", elapsed)
+	}
+	if !result.probeSucceeded || !result.tcpReachable {
+		t.Fatalf("expected short read timeout to be treated as reachable non-MySQL-wire probe, got %+v", result)
+	}
+	if result.err == nil {
+		t.Fatalf("expected read timeout error to be recorded for diagnostics")
 	}
 }
 
@@ -427,85 +698,54 @@ func TestProbeOceanBaseMySQLWireHandshakeAcceptsLargerPayload(t *testing.T) {
 	}
 }
 
-// decodeConnectionAttributesFromConnectionParams 把 connectionAttributes 从 url-encoded 的
-// ConnectionParams 中取出来并解析成 map，便于测试用解码后的值断言。
-func decodeConnectionAttributesFromConnectionParams(t *testing.T, raw string) map[string]string {
-	t.Helper()
-	values, err := url.ParseQuery(raw)
-	if err != nil {
-		t.Fatalf("ParseQuery(%q) failed: %v", raw, err)
-	}
-	return parseMySQLConnectionAttributes(values.Get("connectionAttributes"))
-}
-
-// ensureOceanBaseOBClientAttributes 必须默认注入 OBClient capability 候选 attribute，
-// 并且用户在 ConnectionParams 里已设置的 attribute 优先级更高（不被默认值覆盖）。
-func TestEnsureOceanBaseOBClientAttributesInjectsDefaults(t *testing.T) {
-	t.Parallel()
-
-	attrs := decodeConnectionAttributesFromConnectionParams(t, ensureOceanBaseOBClientAttributes(""))
-	want := map[string]string{
-		"_client_name":                          "OceanBase Connector/J",
-		"_client_version":                       "2.4.5",
-		"__ob_client_attribute_capability_flag": "1",
-		"ob_capability_flag":                    "1",
-	}
-	for k, v := range want {
-		if attrs[k] != v {
-			t.Fatalf("expected default attribute %s=%q, got %q (all=%v)", k, v, attrs[k], attrs)
-		}
-	}
-}
-
-func TestEnsureOceanBaseOBClientAttributesPreservesUserOverrides(t *testing.T) {
-	t.Parallel()
-
-	attrs := decodeConnectionAttributesFromConnectionParams(t,
-		ensureOceanBaseOBClientAttributes("connectionAttributes=_client_name:libobclient,_pid:9527"))
-
-	if attrs["_client_name"] != "libobclient" {
-		t.Fatalf("expected user-supplied _client_name preserved, got %q", attrs["_client_name"])
-	}
-	if attrs["_pid"] != "9527" {
-		t.Fatalf("expected user extra attribute _pid preserved, got %q", attrs["_pid"])
-	}
-	// 仍应补齐默认值中用户未提供的部分
-	if attrs["ob_capability_flag"] != "1" {
-		t.Fatalf("expected default ob_capability_flag still injected when user did not set it, got %q (all=%v)", attrs["ob_capability_flag"], attrs)
-	}
-}
-
-// 锁定 Oracle 协议路径下，OBClient capability attribute 会被注入到生成的 mysql DSN 中。
-func TestOceanBaseOracleOBClientDSNCarriesCapabilityAttributes(t *testing.T) {
+// 锁定 Oracle 协议 MySQL-wire 路径使用 oboracle 专用 DSN，并把用户提供的
+// connectionAttributes 映射为 obconnector-go 支持的 attr.* 参数。
+func TestOceanBaseOracleOBClientDSNUsesDedicatedDriverParams(t *testing.T) {
 	t.Parallel()
 
 	cfg := connection.ConnectionConfig{
-		Type:     "oceanbase",
-		Host:     "127.0.0.1",
-		Port:     2881,
-		User:     "SYS@oracle_tenant#cluster",
-		Password: "x",
-		Database: "ORCL",
+		Type:             "oceanbase",
+		Host:             "127.0.0.1",
+		Port:             2881,
+		User:             "SYS@oracle_tenant#cluster",
+		Password:         "p@ss",
+		Database:         "ORCL",
+		Timeout:          12,
+		ConnectionParams: "connectionAttributes=_client_name:Custom OB,_pid:9527&cap.add=0x80&init=alter+session+set+nls_date_format%3D%27YYYY-MM-DD%27",
 	}
-	cfg.ConnectionParams = ensureOceanBaseOBClientAttributes(cfg.ConnectionParams)
-	cfg.ConnectionParams = ensureOceanBaseOracleANSIQuotes(cfg.ConnectionParams)
-	ob := &OceanBaseDB{}
-	dsn, err := ob.getDSN(cfg)
+	dsn, err := buildOceanBaseOracleOBClientDSN(cfg)
 	if err != nil {
-		t.Fatalf("getDSN error: %v", err)
+		t.Fatalf("buildOceanBaseOracleOBClientDSN error: %v", err)
 	}
-	parsed, err := mysqlDriver.ParseDSN(dsn)
+	parsed, err := url.Parse(dsn)
 	if err != nil {
-		t.Fatalf("ParseDSN error: %v", err)
+		t.Fatalf("Parse DSN error: %v", err)
 	}
-	if !strings.Contains(parsed.ConnectionAttributes, "_client_name:OceanBase Connector/J") {
-		t.Fatalf("expected default _client_name in DSN, got %q", parsed.ConnectionAttributes)
+	if parsed.Scheme != "oboracle" {
+		t.Fatalf("expected oboracle scheme, got %q (dsn=%s)", parsed.Scheme, dsn)
 	}
-	if !strings.Contains(parsed.ConnectionAttributes, "ob_capability_flag:1") {
-		t.Fatalf("expected default ob_capability_flag in DSN, got %q", parsed.ConnectionAttributes)
+	if parsed.User.Username() != "SYS@oracle_tenant#cluster" {
+		t.Fatalf("unexpected user %q", parsed.User.Username())
 	}
-	if !strings.Contains(dsn, "sql_mode=%27ANSI_QUOTES%27") {
-		t.Fatalf("expected ANSI_QUOTES sys var in DSN, got %q", dsn)
+	password, _ := parsed.User.Password()
+	if password != "p@ss" {
+		t.Fatalf("unexpected password %q", password)
+	}
+	query := parsed.Query()
+	if query.Get("preset") != "oboracle" {
+		t.Fatalf("expected preset=oboracle, got query=%v", query)
+	}
+	if query.Get("timeout") != "12s" {
+		t.Fatalf("expected timeout=12s, got query=%v", query)
+	}
+	if query.Get("attr._client_name") != "Custom OB" || query.Get("attr._pid") != "9527" {
+		t.Fatalf("expected connectionAttributes mapped to attr.*, got query=%v", query)
+	}
+	if query.Get("cap.add") != "0x80" {
+		t.Fatalf("expected cap.add passthrough, got query=%v", query)
+	}
+	if got := query["init"]; len(got) != 1 || got[0] != "alter session set nls_date_format='YYYY-MM-DD'" {
+		t.Fatalf("expected init SQL passthrough, got query=%v", query)
 	}
 }
 
@@ -586,8 +826,10 @@ func TestFormatOceanBaseMySQLAttemptErrorHintsOracleProtocol(t *testing.T) {
 	if !strings.Contains(got, "切换为 Oracle") {
 		t.Fatalf("expected Oracle protocol hint, got %q", got)
 	}
-	if !strings.Contains(got, "OBProxy") {
-		t.Fatalf("expected hint to mention OBProxy Oracle protocol port, got %q", got)
+	if !strings.Contains(got, "主机和端口可保持不变") {
+		t.Fatalf("expected hint to mention OBClient/MySQL-wire host and port can be kept, got %q", got)
+	}
+	if !strings.Contains(got, "只有连接 OBProxy Oracle listener/TNS 入口时才需要填写服务名") {
+		t.Fatalf("expected hint to limit Service Name requirement to TNS path, got %q", got)
 	}
 }
-
diff --git a/internal/db/oceanbase_oracle_live_test.go b/internal/db/oceanbase_oracle_live_test.go
new file mode 100644
index 0000000..1e0ee5c
--- /dev/null
+++ b/internal/db/oceanbase_oracle_live_test.go
@@ -0,0 +1,43 @@
+//go:build oceanbase_live
+
+package db
+
+import (
+	"os"
+	"strconv"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+func TestOceanBaseOracleLive(t *testing.T) {
+	port, err := strconv.Atoi(os.Getenv("GONAVI_OB_PORT"))
+	if err != nil {
+		t.Fatalf("invalid GONAVI_OB_PORT: %v", err)
+	}
+
+	ob := &OceanBaseDB{}
+	cfg := connection.ConnectionConfig{
+		Type:              "oceanbase",
+		Host:              os.Getenv("GONAVI_OB_HOST"),
+		Port:              port,
+		User:              os.Getenv("GONAVI_OB_USER"),
+		Password:          os.Getenv("GONAVI_OB_PASSWORD"),
+		Database:          os.Getenv("GONAVI_OB_DATABASE"),
+		ConnectionParams:  os.Getenv("GONAVI_OB_PARAMS"),
+		OceanBaseProtocol: "oracle",
+		Timeout:           10,
+	}
+	if err := ob.Connect(cfg); err != nil {
+		t.Fatalf("connect failed: %v", err)
+	}
+	defer ob.Close()
+
+	rows, fields, err := ob.Query("select 1 from dual")
+	if err != nil {
+		t.Fatalf("query failed: %v", err)
+	}
+	if len(fields) != 1 || len(rows) != 1 {
+		t.Fatalf("unexpected result fields=%v rows=%v", fields, rows)
+	}
+}
diff --git a/internal/db/optional_driver_agent_impl.go b/internal/db/optional_driver_agent_impl.go
index 18c0624..5c65da5 100644
--- a/internal/db/optional_driver_agent_impl.go
+++ b/internal/db/optional_driver_agent_impl.go
@@ -25,6 +25,8 @@ const (
 	optionalAgentMethodClose            = "close"
 	optionalAgentMethodMetadata         = "metadata"
 	optionalAgentMethodPing             = "ping"
+	optionalAgentMethodOpenSession      = "openSession"
+	optionalAgentMethodCloseSession     = "closeSession"
 	optionalAgentMethodQuery            = "query"
 	optionalAgentMethodExec             = "exec"
 	optionalAgentMethodGetDatabases     = "getDatabases"
@@ -43,6 +45,7 @@ const (
 type optionalAgentRequest struct {
 	ID        int64                        `json:"id"`
 	Method    string                       `json:"method"`
+	SessionID string                       `json:"sessionId,omitempty"`
 	Config    *connection.ConnectionConfig `json:"config,omitempty"`
 	Query     string                       `json:"query,omitempty"`
 	TimeoutMs int64                        `json:"timeoutMs,omitempty"`
@@ -298,6 +301,14 @@ type OptionalDriverAgentDB struct {
 	client     *optionalDriverAgentClient
 }
 
+type optionalDriverAgentSession struct {
+	client    *optionalDriverAgentClient
+	driver    string
+	sessionID string
+	mu        sync.Mutex
+	closed    bool
+}
+
 func newOptionalDriverAgentDatabase(driverType string) databaseFactory {
 	normalized := normalizeRuntimeDriverType(driverType)
 	return func() Database {
@@ -420,6 +431,100 @@ func (d *OptionalDriverAgentDB) Exec(query string) (int64, error) {
 	return affected, nil
 }
 
+func (d *OptionalDriverAgentDB) OpenSessionExecer(ctx context.Context) (StatementExecer, error) {
+	client, err := d.requireClient()
+	if err != nil {
+		return nil, err
+	}
+	var sessionID string
+	if err := client.call(optionalAgentRequest{
+		Method:    optionalAgentMethodOpenSession,
+		TimeoutMs: timeoutMsFromContext(ctx),
+	}, &sessionID, nil, nil); err != nil {
+		return nil, err
+	}
+	sessionID = strings.TrimSpace(sessionID)
+	if sessionID == "" {
+		return nil, fmt.Errorf("%s 驱动代理未返回事务会话 ID", driverDisplayName(d.driverType))
+	}
+	return &optionalDriverAgentSession{
+		client:    client,
+		driver:    d.driverType,
+		sessionID: sessionID,
+	}, nil
+}
+
+func (s *optionalDriverAgentSession) Query(query string) ([]map[string]interface{}, []string, error) {
+	return s.QueryContext(context.Background(), query)
+}
+
+func (s *optionalDriverAgentSession) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if err := s.ensureOpen(); err != nil {
+		return nil, nil, err
+	}
+	var data []map[string]interface{}
+	var fields []string
+	if err := s.client.call(optionalAgentRequest{
+		Method:    optionalAgentMethodQuery,
+		SessionID: s.sessionID,
+		Query:     query,
+		TimeoutMs: timeoutMsFromContext(ctx),
+	}, &data, &fields, nil); err != nil {
+		return nil, nil, err
+	}
+	return data, fields, nil
+}
+
+func (s *optionalDriverAgentSession) Exec(query string) (int64, error) {
+	return s.ExecContext(context.Background(), query)
+}
+
+func (s *optionalDriverAgentSession) ExecContext(ctx context.Context, query string) (int64, error) {
+	if err := s.ensureOpen(); err != nil {
+		return 0, err
+	}
+	var affected int64
+	if err := s.client.call(optionalAgentRequest{
+		Method:    optionalAgentMethodExec,
+		SessionID: s.sessionID,
+		Query:     query,
+		TimeoutMs: timeoutMsFromContext(ctx),
+	}, nil, nil, &affected); err != nil {
+		return 0, err
+	}
+	return affected, nil
+}
+
+func (s *optionalDriverAgentSession) Close() error {
+	if s == nil {
+		return nil
+	}
+	s.mu.Lock()
+	if s.closed {
+		s.mu.Unlock()
+		return nil
+	}
+	s.closed = true
+	sessionID := s.sessionID
+	s.mu.Unlock()
+	return s.client.call(optionalAgentRequest{
+		Method:    optionalAgentMethodCloseSession,
+		SessionID: sessionID,
+	}, nil, nil, nil)
+}
+
+func (s *optionalDriverAgentSession) ensureOpen() error {
+	if s == nil || s.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	if s.closed || strings.TrimSpace(s.sessionID) == "" {
+		return fmt.Errorf("%s 事务会话已关闭", driverDisplayName(s.driver))
+	}
+	return nil
+}
+
 func (d *OptionalDriverAgentDB) GetDatabases() ([]string, error) {
 	client, err := d.requireClient()
 	if err != nil {
diff --git a/internal/db/oracle_applychanges_test.go b/internal/db/oracle_applychanges_test.go
index 0f6ac58..ce7024e 100644
--- a/internal/db/oracle_applychanges_test.go
+++ b/internal/db/oracle_applychanges_test.go
@@ -6,6 +6,7 @@ import (
 	"database/sql/driver"
 	"fmt"
 	"io"
+	"reflect"
 	"strings"
 	"sync"
 	"testing"
@@ -28,6 +29,7 @@ type oracleRecordingState struct {
 	execQueries  []string
 	execArgs     [][]driver.NamedValue
 	queries      []string
+	beginCalls   int
 	rowsAffected int64
 	queryResults map[string]oracleRecordingQueryResult
 	queryError   error
@@ -61,6 +63,12 @@ func (s *oracleRecordingState) snapshotQueries() []string {
 	return append([]string(nil), s.queries...)
 }
 
+func (s *oracleRecordingState) snapshotBeginCalls() int {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return s.beginCalls
+}
+
 type oracleRecordingDriver struct{}
 
 func (oracleRecordingDriver) Open(name string) (driver.Conn, error) {
@@ -83,7 +91,12 @@ func (c *oracleRecordingConn) Prepare(query string) (driver.Stmt, error) {
 
 func (c *oracleRecordingConn) Close() error { return nil }
 
-func (c *oracleRecordingConn) Begin() (driver.Tx, error) { return oracleRecordingTx{}, nil }
+func (c *oracleRecordingConn) Begin() (driver.Tx, error) {
+	c.state.mu.Lock()
+	c.state.beginCalls++
+	c.state.mu.Unlock()
+	return oracleRecordingTx{}, nil
+}
 
 func (c *oracleRecordingConn) ExecContext(_ context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
 	c.state.mu.Lock()
@@ -191,6 +204,127 @@ func openOracleRecordingDB(t *testing.T) (*sql.DB, *oracleRecordingState) {
 	return dbConn, state
 }
 
+func TestOracleOpenTransactionExecerUsesPinnedSessionTransactionSQL(t *testing.T) {
+	t.Parallel()
+
+	for _, tt := range []struct {
+		name         string
+		finish       func(TransactionExecer) error
+		wantFinalSQL string
+	}{
+		{
+			name: "commit",
+			finish: func(tx TransactionExecer) error {
+				return tx.Commit()
+			},
+			wantFinalSQL: "COMMIT",
+		},
+		{
+			name: "rollback",
+			finish: func(tx TransactionExecer) error {
+				return tx.Rollback()
+			},
+			wantFinalSQL: "ROLLBACK",
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			dbConn, state := openOracleRecordingDB(t)
+			oracleDB := &OracleDB{conn: dbConn}
+			stmt := "UPDATE USERS SET NAME = 'new' WHERE ID = 1"
+
+			tx, err := oracleDB.OpenTransactionExecer(context.Background())
+			if err != nil {
+				t.Fatalf("OpenTransactionExecer returned error: %v", err)
+			}
+			if _, err := tx.ExecContext(context.Background(), stmt); err != nil {
+				t.Fatalf("ExecContext returned error: %v", err)
+			}
+			if err := tt.finish(tx); err != nil {
+				t.Fatalf("finish returned error: %v", err)
+			}
+			if err := tx.Close(); err != nil {
+				t.Fatalf("Close returned error: %v", err)
+			}
+
+			if got := state.snapshotBeginCalls(); got != 0 {
+				t.Fatalf("expected Oracle transaction execer not to call database/sql Begin, got %d", got)
+			}
+			wantExecs := []string{stmt, tt.wantFinalSQL}
+			if got := state.snapshotExecQueries(); !reflect.DeepEqual(got, wantExecs) {
+				t.Fatalf("expected exec queries %#v, got %#v", wantExecs, got)
+			}
+		})
+	}
+}
+
+func TestOracleApplyChangesUsesPinnedSessionTransactionSQL(t *testing.T) {
+	t.Parallel()
+
+	dbConn, state := openOracleRecordingDB(t)
+	oracleDB := &OracleDB{conn: dbConn}
+
+	changes := connection.ChangeSet{
+		Updates: []connection.UpdateRow{{
+			Keys: map[string]interface{}{
+				"ID": 7,
+			},
+			Values: map[string]interface{}{
+				"NAME": "new-name",
+			},
+		}},
+	}
+
+	if err := oracleDB.ApplyChanges("MYCIMLED.EDC_LOG", changes); err != nil {
+		t.Fatalf("ApplyChanges() unexpected error: %v", err)
+	}
+	if got := state.snapshotBeginCalls(); got != 0 {
+		t.Fatalf("expected Oracle ApplyChanges not to call database/sql Begin, got %d", got)
+	}
+	wantExecs := []string{
+		`UPDATE "MYCIMLED"."EDC_LOG" SET "NAME" = :1 WHERE "ID" = :2`,
+		"COMMIT",
+	}
+	if got := state.snapshotExecQueries(); !reflect.DeepEqual(got, wantExecs) {
+		t.Fatalf("expected Oracle ApplyChanges pinned-session execs %#v, got %#v", wantExecs, got)
+	}
+}
+
+func TestOracleApplyChangesRollsBackPinnedSessionOnError(t *testing.T) {
+	t.Parallel()
+
+	dbConn, state := openOracleRecordingDB(t)
+	state.rowsAffected = 0
+	oracleDB := &OracleDB{conn: dbConn}
+
+	changes := connection.ChangeSet{
+		Updates: []connection.UpdateRow{{
+			Keys: map[string]interface{}{
+				"ID": 7,
+			},
+			Values: map[string]interface{}{
+				"NAME": "new-name",
+			},
+		}},
+	}
+
+	err := oracleDB.ApplyChanges("MYCIMLED.EDC_LOG", changes)
+	if err == nil {
+		t.Fatal("expected ApplyChanges to return update row-count error")
+	}
+	if got := state.snapshotBeginCalls(); got != 0 {
+		t.Fatalf("expected Oracle ApplyChanges not to call database/sql Begin, got %d", got)
+	}
+	wantExecs := []string{
+		`UPDATE "MYCIMLED"."EDC_LOG" SET "NAME" = :1 WHERE "ID" = :2`,
+		"ROLLBACK",
+	}
+	if got := state.snapshotExecQueries(); !reflect.DeepEqual(got, wantExecs) {
+		t.Fatalf("expected Oracle ApplyChanges pinned-session rollback execs %#v, got %#v", wantExecs, got)
+	}
+}
+
 func TestOracleApplyChangesReturnsErrorWhenUpdateMatchesNoRows(t *testing.T) {
 	t.Parallel()
 
@@ -289,8 +423,8 @@ func TestOracleApplyChangesNormalizesTemporalStringsForUpdate(t *testing.T) {
 	}
 
 	executions := state.snapshotExecArgs()
-	if len(executions) != 1 {
-		t.Fatalf("期望执行 1 条更新，实际 %d 条", len(executions))
+	if len(executions) == 0 {
+		t.Fatal("期望至少执行 1 条更新，实际没有执行")
 	}
 	args := executions[0]
 	if len(args) != 2 {
@@ -327,8 +461,8 @@ func TestOracleApplyChangesUsesUnquotedRowIDLocator(t *testing.T) {
 	}
 
 	executions := state.snapshotExecQueries()
-	if len(executions) != 1 {
-		t.Fatalf("期望执行 1 条更新，实际 %d 条", len(executions))
+	if len(executions) == 0 {
+		t.Fatal("期望至少执行 1 条更新，实际没有执行")
 	}
 	query := executions[0]
 	if !strings.Contains(query, "ROWID = :2") {
diff --git a/internal/db/oracle_get_tables_test.go b/internal/db/oracle_get_tables_test.go
index 97608a4..093be14 100644
--- a/internal/db/oracle_get_tables_test.go
+++ b/internal/db/oracle_get_tables_test.go
@@ -104,13 +104,59 @@ func TestOracleGetColumnsIncludesColumnComments(t *testing.T) {
 	if len(queries) == 0 || !strings.Contains(queries[0], "all_col_comments") {
 		t.Fatalf("expected GetColumns to join all_col_comments, queries=%v", queries)
 	}
-	for _, want := range []string{`AS "COLUMN_NAME"`, `AS "DATA_TYPE"`, `AS "COMMENT"`} {
+	for _, want := range []string{`AS "COLUMN_NAME"`, `AS "DATA_TYPE"`, `AS "DATA_LENGTH"`, `AS "CHAR_LENGTH"`, `AS "DATA_PRECISION"`, `AS "DATA_SCALE"`, `AS "COMMENT"`} {
 		if !strings.Contains(queries[0], want) {
 			t.Fatalf("expected GetColumns query to contain stable alias %q, got %s", want, queries[0])
 		}
 	}
 }
 
+func TestFormatOracleColumnTypeIncludesLengthAndPrecision(t *testing.T) {
+	t.Parallel()
+
+	cases := []struct {
+		name string
+		row  map[string]interface{}
+		want string
+	}{
+		{
+			name: "varchar2 char length",
+			row: map[string]interface{}{
+				"DATA_TYPE":   "VARCHAR2",
+				"DATA_LENGTH": 256,
+				"CHAR_LENGTH": 128,
+			},
+			want: "VARCHAR2(128)",
+		},
+		{
+			name: "number precision scale",
+			row: map[string]interface{}{
+				"DATA_TYPE":      "NUMBER",
+				"DATA_PRECISION": 10,
+				"DATA_SCALE":     2,
+			},
+			want: "NUMBER(10,2)",
+		},
+		{
+			name: "date remains plain",
+			row: map[string]interface{}{
+				"DATA_TYPE": "DATE",
+			},
+			want: "DATE",
+		},
+	}
+
+	for _, tc := range cases {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+			if got := formatOracleColumnType(tc.row); got != tc.want {
+				t.Fatalf("expected %q, got %q", tc.want, got)
+			}
+		})
+	}
+}
+
 func TestOracleGetCreateStatementAppendsTableAndColumnComments(t *testing.T) {
 	t.Parallel()
 
diff --git a/internal/db/oracle_impl.go b/internal/db/oracle_impl.go
index d5ad107..409e3fa 100644
--- a/internal/db/oracle_impl.go
+++ b/internal/db/oracle_impl.go
@@ -24,6 +24,9 @@ type OracleDB struct {
 	forwarder   *ssh.LocalForwarder // Store SSH tunnel forwarder
 }
 
+var _ SessionExecerProvider = (*OracleDB)(nil)
+var _ TransactionExecerProvider = (*OracleDB)(nil)
+
 func (o *OracleDB) getDSN(config connection.ConnectionConfig) string {
 	// oracle://user:pass@host:port/service_name
 	database := strings.TrimSpace(config.Database)
@@ -251,6 +254,28 @@ func (o *OracleDB) Exec(query string) (int64, error) {
 	return res.RowsAffected()
 }
 
+func (o *OracleDB) OpenTransactionExecer(ctx context.Context) (TransactionExecer, error) {
+	if o.conn == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	conn, err := o.conn.Conn(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return NewSQLConnTransactionExecer(conn, "COMMIT", "ROLLBACK"), nil
+}
+
+func (o *OracleDB) OpenSessionExecer(ctx context.Context) (StatementExecer, error) {
+	if o.conn == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	conn, err := o.conn.Conn(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return NewSQLConnStatementExecer(conn), nil
+}
+
 func (o *OracleDB) GetDatabases() ([]string, error) {
 	// Oracle treats Users/Schemas as "Databases" in this context
 	data, _, err := o.Query("SELECT username FROM all_users ORDER BY username")
@@ -325,7 +350,7 @@ func (o *OracleDB) GetCreateStatement(dbName, tableName string) (string, error)
 func (o *OracleDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
 	metadataTableName := escapeOracleMetadataLiteral(tableName)
 	metadataSchemaName := escapeOracleMetadataLiteral(dbName)
-	query := fmt.Sprintf(`SELECT c.column_name AS "COLUMN_NAME", c.data_type AS "DATA_TYPE", c.nullable AS "NULLABLE", c.data_default AS "DATA_DEFAULT",
+	query := fmt.Sprintf(`SELECT c.column_name AS "COLUMN_NAME", c.data_type AS "DATA_TYPE", c.data_length AS "DATA_LENGTH", c.char_length AS "CHAR_LENGTH", c.data_precision AS "DATA_PRECISION", c.data_scale AS "DATA_SCALE", c.nullable AS "NULLABLE", c.data_default AS "DATA_DEFAULT",
 		CASE WHEN pk.column_name IS NOT NULL THEN 'PRI' ELSE '' END AS "COLUMN_KEY",
 		cc.comments AS "COMMENT"
 		FROM all_tab_columns c
@@ -342,7 +367,7 @@ func (o *OracleDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefi
 		ORDER BY c.column_id`, metadataSchemaName, metadataTableName)
 
 	if dbName == "" {
-		query = fmt.Sprintf(`SELECT c.column_name AS "COLUMN_NAME", c.data_type AS "DATA_TYPE", c.nullable AS "NULLABLE", c.data_default AS "DATA_DEFAULT",
+		query = fmt.Sprintf(`SELECT c.column_name AS "COLUMN_NAME", c.data_type AS "DATA_TYPE", c.data_length AS "DATA_LENGTH", c.char_length AS "CHAR_LENGTH", c.data_precision AS "DATA_PRECISION", c.data_scale AS "DATA_SCALE", c.nullable AS "NULLABLE", c.data_default AS "DATA_DEFAULT",
 			CASE WHEN pk.column_name IS NOT NULL THEN 'PRI' ELSE '' END AS "COLUMN_KEY",
 			cc.comments AS "COMMENT"
 			FROM user_tab_columns c
@@ -367,7 +392,7 @@ func (o *OracleDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefi
 	for _, row := range data {
 		col := connection.ColumnDefinition{
 			Name:     oracleRowString(row, "COLUMN_NAME"),
-			Type:     oracleRowString(row, "DATA_TYPE"),
+			Type:     formatOracleColumnType(row),
 			Nullable: oracleRowString(row, "NULLABLE"),
 			Key:      oracleRowString(row, "COLUMN_KEY"),
 			Comment:  oracleRowString(row, "COMMENT"),
@@ -402,7 +427,58 @@ func oracleRowString(row map[string]interface{}, names ...string) string {
 	if value == nil {
 		return ""
 	}
-	return fmt.Sprintf("%v", value)
+	return strings.TrimSpace(fmt.Sprintf("%v", value))
+}
+
+func oracleRowInt(row map[string]interface{}, names ...string) (int, bool) {
+	raw := oracleRowString(row, names...)
+	if raw == "" {
+		return 0, false
+	}
+	parsed, err := strconv.Atoi(raw)
+	if err != nil {
+		return 0, false
+	}
+	return parsed, true
+}
+
+func isOracleLengthQualifiedType(upperType string) bool {
+	switch strings.TrimSpace(upperType) {
+	case "CHAR", "NCHAR", "VARCHAR", "VARCHAR2", "NVARCHAR", "NVARCHAR2", "RAW", "BINARY", "VARBINARY":
+		return true
+	default:
+		return strings.Contains(upperType, "CHARACTER")
+	}
+}
+
+func formatOracleColumnType(row map[string]interface{}) string {
+	dataType := oracleRowString(row, "DATA_TYPE")
+	if dataType == "" || strings.Contains(dataType, "(") {
+		return dataType
+	}
+
+	upperType := strings.ToUpper(dataType)
+	if isOracleLengthQualifiedType(upperType) {
+		if charLength, ok := oracleRowInt(row, "CHAR_LENGTH", "CHAR_COL_DECL_LENGTH"); ok && charLength > 0 {
+			return fmt.Sprintf("%s(%d)", dataType, charLength)
+		}
+		if dataLength, ok := oracleRowInt(row, "DATA_LENGTH"); ok && dataLength > 0 {
+			return fmt.Sprintf("%s(%d)", dataType, dataLength)
+		}
+	}
+
+	if strings.Contains(upperType, "NUMBER") || strings.Contains(upperType, "DECIMAL") || strings.Contains(upperType, "NUMERIC") {
+		precision, hasPrecision := oracleRowInt(row, "DATA_PRECISION", "NUMERIC_PRECISION")
+		if hasPrecision && precision > 0 {
+			scale, hasScale := oracleRowInt(row, "DATA_SCALE", "NUMERIC_SCALE")
+			if hasScale && scale > 0 {
+				return fmt.Sprintf("%s(%d,%d)", dataType, precision, scale)
+			}
+			return fmt.Sprintf("%s(%d)", dataType, precision)
+		}
+	}
+
+	return dataType
 }
 
 func (o *OracleDB) appendOracleCommentDDL(baseDDL string, dbName string, tableName string) string {
@@ -747,7 +823,7 @@ func parseOracleTemporalString(raw string) (time.Time, bool) {
 	return time.Time{}, false
 }
 
-func (o *OracleDB) ApplyChanges(tableName string, changes connection.ChangeSet) error {
+func (o *OracleDB) ApplyChanges(tableName string, changes connection.ChangeSet) (err error) {
 	if o.conn == nil {
 		return fmt.Errorf("连接未打开")
 	}
@@ -757,11 +833,26 @@ func (o *OracleDB) ApplyChanges(tableName string, changes connection.ChangeSet)
 		return err
 	}
 
-	tx, err := o.conn.Begin()
+	ctx := context.Background()
+	conn, err := o.conn.Conn(ctx)
 	if err != nil {
 		return err
 	}
-	defer tx.Rollback()
+	defer func() {
+		if closeErr := conn.Close(); closeErr != nil && err == nil {
+			err = closeErr
+		}
+	}()
+
+	transactionFinished := false
+	defer func() {
+		if transactionFinished {
+			return
+		}
+		if _, rollbackErr := conn.ExecContext(context.Background(), "ROLLBACK"); rollbackErr != nil {
+			logger.Warnf("Oracle 表格编辑事务回滚失败：table=%s err=%v", tableName, rollbackErr)
+		}
+	}()
 
 	quoteIdent := func(name string) string {
 		n := strings.TrimSpace(name)
@@ -812,7 +903,7 @@ func (o *OracleDB) ApplyChanges(tableName string, changes connection.ChangeSet)
 			continue
 		}
 		query := fmt.Sprintf("DELETE FROM %s WHERE %s", qualifiedTable, strings.Join(wheres, " AND "))
-		res, err := tx.Exec(query, args...)
+		res, err := conn.ExecContext(ctx, query, args...)
 		if err != nil {
 			return fmt.Errorf("删除失败：%v", err)
 		}
@@ -845,7 +936,7 @@ func (o *OracleDB) ApplyChanges(tableName string, changes connection.ChangeSet)
 		}
 
 		query := fmt.Sprintf("UPDATE %s SET %s WHERE %s", qualifiedTable, strings.Join(sets, ", "), strings.Join(wheres, " AND "))
-		res, err := tx.Exec(query, args...)
+		res, err := conn.ExecContext(ctx, query, args...)
 		if err != nil {
 			return fmt.Errorf("更新失败：%v", err)
 		}
@@ -873,7 +964,7 @@ func (o *OracleDB) ApplyChanges(tableName string, changes connection.ChangeSet)
 		}
 
 		query := fmt.Sprintf("INSERT INTO %s (%s) VALUES (%s)", qualifiedTable, strings.Join(cols, ", "), strings.Join(placeholders, ", "))
-		res, err := tx.Exec(query, args...)
+		res, err := conn.ExecContext(ctx, query, args...)
 		if err != nil {
 			return fmt.Errorf("插入失败：%v", err)
 		}
@@ -882,7 +973,11 @@ func (o *OracleDB) ApplyChanges(tableName string, changes connection.ChangeSet)
 		}
 	}
 
-	return tx.Commit()
+	if _, err := conn.ExecContext(ctx, "COMMIT"); err != nil {
+		return fmt.Errorf("事务提交失败：%v", err)
+	}
+	transactionFinished = true
+	return nil
 }
 
 func (o *OracleDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
diff --git a/internal/db/pg_metadata.go b/internal/db/pg_metadata.go
new file mode 100644
index 0000000..5d952f7
--- /dev/null
+++ b/internal/db/pg_metadata.go
@@ -0,0 +1,159 @@
+package db
+
+import (
+	"fmt"
+	"strings"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+func normalizePGLikeMetadataTable(schemaName, tableName string) (string, string) {
+	schema := strings.TrimSpace(schemaName)
+	table := strings.TrimSpace(tableName)
+	if parsedSchema, parsedTable := SplitSQLQualifiedName(table); parsedSchema != "" && parsedTable != "" {
+		schema = parsedSchema
+		table = parsedTable
+	}
+	schema = strings.TrimSpace(normalizeSQLIdentifierEscapes(schema))
+	table = strings.TrimSpace(normalizeSQLIdentifierEscapes(table))
+	schema = strings.Trim(schema, `"`)
+	table = strings.Trim(table, `"`)
+	return schema, table
+}
+
+func escapePGLikeMetadataLiteral(raw string) string {
+	text := strings.TrimSpace(raw)
+	text = strings.Trim(text, `"`)
+	return strings.ReplaceAll(text, "'", "''")
+}
+
+func buildPGLikeVisibleRelationPredicate(alias string, schemaName string) string {
+	relAlias := strings.TrimSpace(alias)
+	if relAlias == "" {
+		relAlias = "c"
+	}
+	if strings.TrimSpace(schemaName) == "" {
+		return fmt.Sprintf("pg_catalog.pg_table_is_visible(%s.oid)", relAlias)
+	}
+	return fmt.Sprintf("n.nspname = '%s'", escapePGLikeMetadataLiteral(schemaName))
+}
+
+func buildPGLikeColumnsMetadataQuery(schemaName, tableName string) string {
+	return fmt.Sprintf(`
+SELECT
+	a.attname AS column_name,
+	pg_catalog.format_type(a.atttypid, a.atttypmod) AS data_type,
+	CASE WHEN a.attnotnull THEN 'NO' ELSE 'YES' END AS is_nullable,
+	pg_get_expr(ad.adbin, ad.adrelid) AS column_default,
+	col_description(a.attrelid, a.attnum) AS comment,
+	CASE WHEN pk.attname IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
+FROM pg_class c
+JOIN pg_namespace n ON n.oid = c.relnamespace
+JOIN pg_attribute a ON a.attrelid = c.oid
+LEFT JOIN pg_attrdef ad ON ad.adrelid = c.oid AND ad.adnum = a.attnum
+LEFT JOIN (
+	SELECT i.indrelid, a3.attname
+	FROM pg_index i
+	JOIN pg_attribute a3 ON a3.attrelid = i.indrelid AND a3.attnum = ANY(i.indkey)
+	WHERE i.indisprimary
+) pk ON pk.indrelid = c.oid AND pk.attname = a.attname
+WHERE c.relkind IN ('r', 'p')
+  AND %s
+  AND c.relname = '%s'
+  AND a.attnum > 0
+  AND NOT a.attisdropped
+ORDER BY a.attnum`, buildPGLikeVisibleRelationPredicate("c", schemaName), escapePGLikeMetadataLiteral(tableName))
+}
+
+func buildPGLikeIndexesMetadataQuery(schemaName, tableName string) string {
+	return fmt.Sprintf(`
+SELECT
+	i.relname AS index_name,
+	a.attname AS column_name,
+	ix.indisunique AS is_unique,
+	x.ordinality AS seq_in_index,
+	am.amname AS index_type
+FROM pg_class t
+JOIN pg_namespace n ON n.oid = t.relnamespace
+JOIN pg_index ix ON t.oid = ix.indrelid
+JOIN pg_class i ON i.oid = ix.indexrelid
+JOIN pg_am am ON i.relam = am.oid
+JOIN unnest(ix.indkey) WITH ORDINALITY AS x(attnum, ordinality) ON TRUE
+JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = x.attnum
+WHERE t.relkind IN ('r', 'p')
+  AND t.relname = '%s'
+  AND %s
+  AND ix.indisvalid
+  AND ix.indpred IS NULL
+  AND x.ordinality <= ix.indnkeyatts
+  AND NOT EXISTS (
+    SELECT 1 FROM unnest(ix.indkey) AS expr_key(attnum) WHERE expr_key.attnum <= 0
+  )
+ORDER BY i.relname, x.ordinality`, escapePGLikeMetadataLiteral(tableName), buildPGLikeVisibleRelationPredicate("t", schemaName))
+}
+
+func buildPGLikeColumnDefinitions(data []map[string]interface{}) []connection.ColumnDefinition {
+	columns := make([]connection.ColumnDefinition, 0, len(data))
+	for _, row := range data {
+		col := connection.ColumnDefinition{
+			Name:     fmt.Sprintf("%v", row["column_name"]),
+			Type:     fmt.Sprintf("%v", row["data_type"]),
+			Nullable: fmt.Sprintf("%v", row["is_nullable"]),
+			Key:      fmt.Sprintf("%v", row["column_key"]),
+			Extra:    "",
+			Comment:  "",
+		}
+
+		if v, ok := row["comment"]; ok && v != nil {
+			col.Comment = fmt.Sprintf("%v", v)
+		}
+
+		if v, ok := row["column_default"]; ok && v != nil {
+			def := fmt.Sprintf("%v", v)
+			col.Default = &def
+			if strings.HasPrefix(strings.ToLower(strings.TrimSpace(def)), "nextval(") {
+				col.Extra = "auto_increment"
+			}
+		}
+
+		columns = append(columns, col)
+	}
+	return columns
+}
+
+func buildPGLikeIndexDefinitions(data []map[string]interface{}) []connection.IndexDefinition {
+	indexes := make([]connection.IndexDefinition, 0, len(data))
+	for _, row := range data {
+		isUnique := false
+		if v, ok := row["is_unique"]; ok && v != nil {
+			isUnique = parseMetadataBool(v)
+		}
+
+		nonUnique := 1
+		if isUnique {
+			nonUnique = 0
+		}
+
+		seq := 0
+		if v, ok := row["seq_in_index"]; ok && v != nil {
+			seq = parseMetadataInt(v)
+		}
+
+		indexType := ""
+		if v, ok := row["index_type"]; ok && v != nil {
+			indexType = strings.ToUpper(fmt.Sprintf("%v", v))
+		}
+		if indexType == "" {
+			indexType = "BTREE"
+		}
+
+		indexes = append(indexes, connection.IndexDefinition{
+			Name:       fmt.Sprintf("%v", row["index_name"]),
+			ColumnName: fmt.Sprintf("%v", row["column_name"]),
+			NonUnique:  nonUnique,
+			SeqInIndex: seq,
+			IndexType:  indexType,
+		})
+	}
+	return indexes
+}
diff --git a/internal/db/pg_metadata_test.go b/internal/db/pg_metadata_test.go
new file mode 100644
index 0000000..8b59ea2
--- /dev/null
+++ b/internal/db/pg_metadata_test.go
@@ -0,0 +1,80 @@
+package db
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestBuildPGLikeMetadataQueriesUseVisibleRelationForPureTable(t *testing.T) {
+	t.Parallel()
+
+	columnQuery := buildPGLikeColumnsMetadataQuery("", "users")
+	if !strings.Contains(columnQuery, "pg_catalog.pg_table_is_visible(c.oid)") {
+		t.Fatalf("expected visible relation predicate for column metadata, got %s", columnQuery)
+	}
+	if strings.Contains(columnQuery, "n.nspname = 'public'") || strings.Contains(columnQuery, "current_schema()") {
+		t.Fatalf("pure table column metadata should not force public/current_schema, got %s", columnQuery)
+	}
+
+	indexQuery := buildPGLikeIndexesMetadataQuery("", "users")
+	if !strings.Contains(indexQuery, "pg_catalog.pg_table_is_visible(t.oid)") {
+		t.Fatalf("expected visible relation predicate for index metadata, got %s", indexQuery)
+	}
+	if strings.Contains(indexQuery, "n.nspname = 'public'") || strings.Contains(indexQuery, "current_schema()") {
+		t.Fatalf("pure table index metadata should not force public/current_schema, got %s", indexQuery)
+	}
+}
+
+func TestBuildPGLikeMetadataQueriesKeepExplicitSchema(t *testing.T) {
+	t.Parallel()
+
+	columnQuery := buildPGLikeColumnsMetadataQuery("audit", "users")
+	if !strings.Contains(columnQuery, "n.nspname = 'audit'") {
+		t.Fatalf("expected explicit schema predicate, got %s", columnQuery)
+	}
+	if strings.Contains(columnQuery, "pg_catalog.pg_table_is_visible") {
+		t.Fatalf("explicit schema metadata should not use visibility predicate, got %s", columnQuery)
+	}
+}
+
+func TestBuildPGLikeColumnDefinitionsMarksPrimaryKey(t *testing.T) {
+	t.Parallel()
+
+	columns := buildPGLikeColumnDefinitions([]map[string]interface{}{
+		{
+			"column_name":    "id",
+			"data_type":      "bigint",
+			"is_nullable":    "NO",
+			"column_default": "nextval('users_id_seq'::regclass)",
+			"column_key":     "PRI",
+		},
+	})
+
+	if len(columns) != 1 {
+		t.Fatalf("unexpected column count: %d", len(columns))
+	}
+	if columns[0].Name != "id" || columns[0].Key != "PRI" || columns[0].Extra != "auto_increment" {
+		t.Fatalf("unexpected primary key column: %+v", columns[0])
+	}
+}
+
+func TestBuildPGLikeIndexDefinitionsParsesStringUnique(t *testing.T) {
+	t.Parallel()
+
+	indexes := buildPGLikeIndexDefinitions([]map[string]interface{}{
+		{
+			"index_name":   "users_email_key",
+			"column_name":  "email",
+			"is_unique":    "t",
+			"seq_in_index": "1",
+			"index_type":   "btree",
+		},
+	})
+
+	if len(indexes) != 1 {
+		t.Fatalf("unexpected index count: %d", len(indexes))
+	}
+	if indexes[0].Name != "users_email_key" || indexes[0].ColumnName != "email" || indexes[0].NonUnique != 0 || indexes[0].SeqInIndex != 1 {
+		t.Fatalf("unexpected unique index metadata: %+v", indexes[0])
+	}
+}
diff --git a/internal/db/postgres_impl.go b/internal/db/postgres_impl.go
index fefce41..30f5fac 100644
--- a/internal/db/postgres_impl.go
+++ b/internal/db/postgres_impl.go
@@ -3,6 +3,7 @@ package db
 import (
 	"context"
 	"database/sql"
+	"database/sql/driver"
 	"fmt"
 	"net"
 	"net/url"
@@ -15,7 +16,7 @@ import (
 	"GoNavi-Wails/internal/ssh"
 	"GoNavi-Wails/internal/utils"
 
-	_ "github.com/lib/pq"
+	"github.com/lib/pq"
 )
 
 type PostgresDB struct {
@@ -24,6 +25,13 @@ type PostgresDB struct {
 	forwarder   *ssh.LocalForwarder // Store SSH tunnel forwarder
 }
 
+type postgresSessionExecer struct {
+	*sqlConnStatementExecer
+}
+
+var _ QueryMessageExecer = (*PostgresDB)(nil)
+var _ StatementQueryMessageExecer = (*postgresSessionExecer)(nil)
+
 func resolvePostgresConnectDatabases(config connection.ConnectionConfig) []string {
 	explicit := strings.TrimSpace(config.Database)
 	if explicit != "" {
@@ -225,6 +233,20 @@ func (p *PostgresDB) QueryContext(ctx context.Context, query string) ([]map[stri
 	return scanRows(rows)
 }
 
+func (p *PostgresDB) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
+	if p.conn == nil {
+		return nil, nil, nil, fmt.Errorf("连接未打开")
+	}
+
+	conn, err := p.conn.Conn(ctx)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	defer conn.Close()
+
+	return queryPostgresConnWithMessages(ctx, conn, query)
+}
+
 func (p *PostgresDB) Query(query string) ([]map[string]interface{}, []string, error) {
 	if p.conn == nil {
 		return nil, nil, fmt.Errorf("连接未打开")
@@ -238,6 +260,10 @@ func (p *PostgresDB) Query(query string) ([]map[string]interface{}, []string, er
 	return scanRows(rows)
 }
 
+func (p *PostgresDB) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	return p.QueryContextWithMessages(context.Background(), query)
+}
+
 func (p *PostgresDB) ExecBatchContext(ctx context.Context, query string) (int64, error) {
 	if p.conn == nil {
 		return 0, fmt.Errorf("连接未打开")
@@ -257,7 +283,7 @@ func (p *PostgresDB) OpenSessionExecer(ctx context.Context) (StatementExecer, er
 	if err != nil {
 		return nil, err
 	}
-	return NewSQLConnStatementExecer(conn), nil
+	return &postgresSessionExecer{sqlConnStatementExecer: &sqlConnStatementExecer{conn: conn}}, nil
 }
 
 func (p *PostgresDB) ExecContext(ctx context.Context, query string) (int64, error) {
@@ -282,6 +308,31 @@ func (p *PostgresDB) Exec(query string) (int64, error) {
 	return res.RowsAffected()
 }
 
+func (e *postgresSessionExecer) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	return e.QueryContextWithMessages(context.Background(), query)
+}
+
+func (e *postgresSessionExecer) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
+	if e == nil || e.conn == nil {
+		return nil, nil, nil, fmt.Errorf("连接未打开")
+	}
+	return queryPostgresConnWithMessages(ctx, e.conn, query)
+}
+
+func queryPostgresConnWithMessages(ctx context.Context, conn *sql.Conn, query string) ([]map[string]interface{}, []string, []string, error) {
+	return querySQLConnWithTextNotices(ctx, conn, query, func(driverConn driver.Conn, addNotice func(string)) {
+		if addNotice == nil {
+			pq.SetNoticeHandler(driverConn, nil)
+			return
+		}
+		pq.SetNoticeHandler(driverConn, func(notice *pq.Error) {
+			if notice != nil {
+				addNotice(notice.Message)
+			}
+		})
+	})
+}
+
 func (p *PostgresDB) GetDatabases() ([]string, error) {
 	data, _, err := p.Query("SELECT datname FROM pg_database WHERE datistemplate = false")
 	if err != nil {
@@ -355,185 +406,31 @@ func (p *PostgresDB) GetCreateStatement(dbName, tableName string) (string, error
 }
 
 func (p *PostgresDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
-	schema := strings.TrimSpace(dbName)
-	if schema == "" {
-		schema = "public"
-	}
-	table := strings.TrimSpace(tableName)
+	schema, table := normalizePGLikeMetadataTable(dbName, tableName)
 	if table == "" {
 		return nil, fmt.Errorf("表名不能为空")
 	}
 
-	esc := func(s string) string { return strings.ReplaceAll(s, "'", "''") }
-
-	query := fmt.Sprintf(`
-SELECT
-	a.attname AS column_name,
-	pg_catalog.format_type(a.atttypid, a.atttypmod) AS data_type,
-	CASE WHEN a.attnotnull THEN 'NO' ELSE 'YES' END AS is_nullable,
-	pg_get_expr(ad.adbin, ad.adrelid) AS column_default,
-	col_description(a.attrelid, a.attnum) AS comment,
-	CASE WHEN pk.attname IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
-FROM pg_class c
-JOIN pg_namespace n ON n.oid = c.relnamespace
-JOIN pg_attribute a ON a.attrelid = c.oid
-LEFT JOIN pg_attrdef ad ON ad.adrelid = c.oid AND ad.adnum = a.attnum
-LEFT JOIN (
-	SELECT i.indrelid, a3.attname
-	FROM pg_index i
-	JOIN pg_attribute a3 ON a3.attrelid = i.indrelid AND a3.attnum = ANY(i.indkey)
-	WHERE i.indisprimary
-) pk ON pk.indrelid = c.oid AND pk.attname = a.attname
-WHERE c.relkind IN ('r', 'p')
-  AND n.nspname = '%s'
-  AND c.relname = '%s'
-  AND a.attnum > 0
-  AND NOT a.attisdropped
-ORDER BY a.attnum`, esc(schema), esc(table))
-
-	data, _, err := p.Query(query)
+	data, _, err := p.Query(buildPGLikeColumnsMetadataQuery(schema, table))
 	if err != nil {
 		return nil, err
 	}
 
-	var columns []connection.ColumnDefinition
-	for _, row := range data {
-		col := connection.ColumnDefinition{
-			Name:     fmt.Sprintf("%v", row["column_name"]),
-			Type:     fmt.Sprintf("%v", row["data_type"]),
-			Nullable: fmt.Sprintf("%v", row["is_nullable"]),
-			Key:      fmt.Sprintf("%v", row["column_key"]),
-			Extra:    "",
-			Comment:  "",
-		}
-
-		if v, ok := row["comment"]; ok && v != nil {
-			col.Comment = fmt.Sprintf("%v", v)
-		}
-
-		if v, ok := row["column_default"]; ok && v != nil {
-			def := fmt.Sprintf("%v", v)
-			col.Default = &def
-			if strings.HasPrefix(strings.ToLower(strings.TrimSpace(def)), "nextval(") {
-				col.Extra = "auto_increment"
-			}
-		}
-
-		columns = append(columns, col)
-	}
-	return columns, nil
+	return buildPGLikeColumnDefinitions(data), nil
 }
 
 func (p *PostgresDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
-	schema := strings.TrimSpace(dbName)
-	if schema == "" {
-		schema = "public"
-	}
-	table := strings.TrimSpace(tableName)
+	schema, table := normalizePGLikeMetadataTable(dbName, tableName)
 	if table == "" {
 		return nil, fmt.Errorf("表名不能为空")
 	}
 
-	esc := func(s string) string { return strings.ReplaceAll(s, "'", "''") }
-
-	query := fmt.Sprintf(`
-SELECT
-	i.relname AS index_name,
-	a.attname AS column_name,
-	ix.indisunique AS is_unique,
-	x.ordinality AS seq_in_index,
-	am.amname AS index_type
-FROM pg_class t
-JOIN pg_namespace n ON n.oid = t.relnamespace
-JOIN pg_index ix ON t.oid = ix.indrelid
-JOIN pg_class i ON i.oid = ix.indexrelid
-JOIN pg_am am ON i.relam = am.oid
-JOIN unnest(ix.indkey) WITH ORDINALITY AS x(attnum, ordinality) ON TRUE
-JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = x.attnum
-WHERE t.relkind IN ('r', 'p')
-  AND t.relname = '%s'
-  AND n.nspname = '%s'
-  AND ix.indisvalid
-  AND ix.indpred IS NULL
-  AND x.ordinality <= ix.indnkeyatts
-  AND NOT EXISTS (
-    SELECT 1 FROM unnest(ix.indkey) AS expr_key(attnum) WHERE expr_key.attnum <= 0
-  )
-ORDER BY i.relname, x.ordinality`, esc(table), esc(schema))
-
-	data, _, err := p.Query(query)
+	data, _, err := p.Query(buildPGLikeIndexesMetadataQuery(schema, table))
 	if err != nil {
 		return nil, err
 	}
 
-	parseBool := func(v interface{}) bool {
-		switch val := v.(type) {
-		case bool:
-			return val
-		case string:
-			s := strings.ToLower(strings.TrimSpace(val))
-			return s == "t" || s == "true" || s == "1" || s == "y" || s == "yes"
-		default:
-			s := strings.ToLower(strings.TrimSpace(fmt.Sprintf("%v", v)))
-			return s == "t" || s == "true" || s == "1" || s == "y" || s == "yes"
-		}
-	}
-
-	parseInt := func(v interface{}) int {
-		switch val := v.(type) {
-		case int:
-			return val
-		case int64:
-			return int(val)
-		case float64:
-			return int(val)
-		case string:
-			// best effort
-			var n int
-			_, _ = fmt.Sscanf(strings.TrimSpace(val), "%d", &n)
-			return n
-		default:
-			var n int
-			_, _ = fmt.Sscanf(strings.TrimSpace(fmt.Sprintf("%v", v)), "%d", &n)
-			return n
-		}
-	}
-
-	var indexes []connection.IndexDefinition
-	for _, row := range data {
-		isUnique := false
-		if v, ok := row["is_unique"]; ok && v != nil {
-			isUnique = parseBool(v)
-		}
-
-		nonUnique := 1
-		if isUnique {
-			nonUnique = 0
-		}
-
-		seq := 0
-		if v, ok := row["seq_in_index"]; ok && v != nil {
-			seq = parseInt(v)
-		}
-
-		indexType := ""
-		if v, ok := row["index_type"]; ok && v != nil {
-			indexType = strings.ToUpper(fmt.Sprintf("%v", v))
-		}
-		if indexType == "" {
-			indexType = "BTREE"
-		}
-
-		idx := connection.IndexDefinition{
-			Name:       fmt.Sprintf("%v", row["index_name"]),
-			ColumnName: fmt.Sprintf("%v", row["column_name"]),
-			NonUnique:  nonUnique,
-			SeqInIndex: seq,
-			IndexType:  indexType,
-		}
-		indexes = append(indexes, idx)
-	}
-	return indexes, nil
+	return buildPGLikeIndexDefinitions(data), nil
 }
 
 func (p *PostgresDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
diff --git a/internal/db/qdrant_impl.go b/internal/db/qdrant_impl.go
new file mode 100644
index 0000000..adca105
--- /dev/null
+++ b/internal/db/qdrant_impl.go
@@ -0,0 +1,1049 @@
+package db
+
+import (
+	"bytes"
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+	proxytunnel "GoNavi-Wails/internal/proxy"
+	"GoNavi-Wails/internal/ssh"
+)
+
+const (
+	defaultQdrantPort         = 6333
+	defaultQdrantDatabase     = "default"
+	defaultQdrantQueryTimeout = 30 * time.Second
+)
+
+type QdrantDB struct {
+	client      *http.Client
+	baseURL     string
+	database    string
+	authHeaders map[string]string
+	forwarder   *ssh.LocalForwarder
+}
+
+type qdrantCollectionInfo struct {
+	Name string `json:"name"`
+}
+
+type qdrantListCollectionsResponse struct {
+	Result struct {
+		Collections []qdrantCollectionInfo `json:"collections"`
+	} `json:"result"`
+}
+
+type qdrantCollectionResponse struct {
+	Result map[string]interface{} `json:"result"`
+}
+
+type qdrantPoint struct {
+	ID      interface{}            `json:"id"`
+	Payload map[string]interface{} `json:"payload"`
+	Vector  interface{}            `json:"vector"`
+	Score   interface{}            `json:"score"`
+	Version interface{}            `json:"version"`
+}
+
+type qdrantScrollResponse struct {
+	Result struct {
+		Points         []qdrantPoint `json:"points"`
+		NextPageOffset interface{}   `json:"next_page_offset"`
+	} `json:"result"`
+}
+
+type qdrantSearchResponse struct {
+	Result []qdrantPoint `json:"result"`
+}
+
+type qdrantCountResponse struct {
+	Result struct {
+		Count int64 `json:"count"`
+	} `json:"result"`
+}
+
+func (q *QdrantDB) Connect(config connection.ConnectionConfig) error {
+	if q.forwarder != nil {
+		_ = q.forwarder.Close()
+		q.forwarder = nil
+	}
+	q.client = nil
+
+	runConfig := normalizeQdrantConfig(config)
+	if runConfig.UseSSH {
+		forwarder, err := ssh.GetOrCreateLocalForwarder(runConfig.SSH, runConfig.Host, runConfig.Port)
+		if err != nil {
+			return fmt.Errorf("创建 SSH 隧道失败：%w", err)
+		}
+		q.forwarder = forwarder
+
+		host, portText, err := net.SplitHostPort(forwarder.LocalAddr)
+		if err != nil {
+			return fmt.Errorf("解析本地转发地址失败：%w", err)
+		}
+		port, err := strconv.Atoi(portText)
+		if err != nil {
+			return fmt.Errorf("解析本地端口失败：%w", err)
+		}
+		runConfig.Host = host
+		runConfig.Port = port
+		runConfig.UseSSH = false
+		logger.Infof("Qdrant 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	}
+
+	q.database = qdrantDatabaseFromConfig(runConfig)
+	q.baseURL = buildQdrantBaseURL(runConfig)
+	q.authHeaders = qdrantAuthHeaders(runConfig)
+	q.client = buildQdrantHTTPClient(runConfig)
+
+	if err := q.Ping(); err != nil {
+		_ = q.Close()
+		return err
+	}
+	return nil
+}
+
+func (q *QdrantDB) Close() error {
+	if q.forwarder != nil {
+		if err := q.forwarder.Close(); err != nil {
+			logger.Warnf("关闭 Qdrant SSH 端口转发失败：%v", err)
+		}
+		q.forwarder = nil
+	}
+	q.client = nil
+	return nil
+}
+
+func (q *QdrantDB) Ping() error {
+	if q.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	var resp qdrantListCollectionsResponse
+	return q.doJSON(ctx, http.MethodGet, "/collections", nil, &resp)
+}
+
+func (q *QdrantDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultQdrantQueryTimeout)
+	defer cancel()
+	return q.QueryContext(ctx, query)
+}
+
+func (q *QdrantDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if q.client == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+	text := strings.TrimSpace(query)
+	if text == "" {
+		return nil, nil, fmt.Errorf("查询语句不能为空")
+	}
+
+	if strings.HasPrefix(text, "{") {
+		return q.queryJSON(ctx, text)
+	}
+
+	if parsed, ok := parseQdrantSQL(text); ok {
+		if parsed.Count {
+			total, err := q.countPoints(ctx, parsed.Collection, nil)
+			if err != nil {
+				return nil, nil, err
+			}
+			return []map[string]interface{}{{"total": total}}, []string{"total"}, nil
+		}
+		return q.scrollPoints(ctx, parsed.Collection, parsed.Limit, parsed.Offset, nil, true, parsed.IncludeVector)
+	}
+
+	return nil, nil, fmt.Errorf("Qdrant 查询仅支持 JSON 命令或简单 SELECT 预览")
+}
+
+func (q *QdrantDB) Exec(query string) (int64, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultQdrantQueryTimeout)
+	defer cancel()
+	return q.ExecContext(ctx, query)
+}
+
+func (q *QdrantDB) ExecContext(ctx context.Context, query string) (int64, error) {
+	if q.client == nil {
+		return 0, fmt.Errorf("连接未打开")
+	}
+	var cmd map[string]interface{}
+	if err := decodeJSONWithUseNumber([]byte(strings.TrimSpace(query)), &cmd); err != nil {
+		return 0, fmt.Errorf("Qdrant 写入命令必须是 JSON：%w", err)
+	}
+	if name := firstStringValue(cmd, "create_collection", "createCollection", "collection"); name != "" && hasAnyKey(cmd, "create_collection", "createCollection") {
+		return 1, q.createCollection(ctx, name, cmd)
+	}
+	if name := firstStringValue(cmd, "delete_collection", "deleteCollection"); name != "" {
+		return 1, q.deleteCollection(ctx, name)
+	}
+	if name := firstStringValue(cmd, "upsert", "collection"); name != "" && hasAnyKey(cmd, "upsert") {
+		return q.upsertCommand(ctx, name, cmd)
+	}
+	if name := firstStringValue(cmd, "delete", "collection"); name != "" && hasAnyKey(cmd, "delete") {
+		return q.deleteCommand(ctx, name, cmd)
+	}
+	if name := firstStringValue(cmd, "create_payload_index", "createPayloadIndex", "collection"); name != "" && hasAnyKey(cmd, "create_payload_index", "createPayloadIndex") {
+		return 1, q.createPayloadIndex(ctx, name, cmd)
+	}
+	if name := firstStringValue(cmd, "delete_payload_index", "deletePayloadIndex", "collection"); name != "" && hasAnyKey(cmd, "delete_payload_index", "deletePayloadIndex") {
+		fieldName := firstStringValue(cmd, "field_name", "fieldName", "field")
+		if fieldName == "" {
+			return 0, fmt.Errorf("Qdrant 删除 payload index 命令缺少 field_name")
+		}
+		return 1, q.deletePayloadIndex(ctx, name, fieldName)
+	}
+	return 0, fmt.Errorf("Qdrant JSON 写入命令仅支持 create_collection/delete_collection/upsert/delete/create_payload_index/delete_payload_index")
+}
+
+func (q *QdrantDB) GetDatabases() ([]string, error) {
+	if q.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	return []string{q.database}, nil
+}
+
+func (q *QdrantDB) GetTables(dbName string) ([]string, error) {
+	collections, err := q.listCollections(context.Background())
+	if err != nil {
+		return nil, err
+	}
+	names := make([]string, 0, len(collections))
+	for _, item := range collections {
+		if strings.TrimSpace(item.Name) != "" {
+			names = append(names, item.Name)
+		}
+	}
+	sort.Strings(names)
+	return names, nil
+}
+
+func (q *QdrantDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	info, err := q.getCollectionInfo(context.Background(), tableNameOrDB(dbName, tableName))
+	if err != nil {
+		return "", err
+	}
+	payload, _ := json.MarshalIndent(info, "", "  ")
+	return fmt.Sprintf("// Qdrant collection: %s\n%s", tableNameOrDB(dbName, tableName), string(payload)), nil
+}
+
+func (q *QdrantDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	rows, _, err := q.scrollPoints(context.Background(), tableNameOrDB(dbName, tableName), 20, nil, nil, true, true)
+	if err != nil {
+		return nil, err
+	}
+	cols := []connection.ColumnDefinition{
+		{Name: "id", Type: "point_id", Nullable: "NO", Key: "PRI", Comment: "Qdrant point id"},
+		{Name: "vector", Type: "vector<float>", Nullable: "YES", Comment: "Vector or named vectors"},
+		{Name: "payload", Type: "json", Nullable: "YES", Comment: "Full payload object"},
+	}
+	seen := map[string]struct{}{"id": {}, "vector": {}, "payload": {}}
+	for _, row := range rows {
+		for key, value := range row {
+			if _, exists := seen[key]; exists || !strings.HasPrefix(key, "payload.") {
+				continue
+			}
+			seen[key] = struct{}{}
+			cols = append(cols, connection.ColumnDefinition{
+				Name:     key,
+				Type:     inferChromaValueType(value),
+				Nullable: "YES",
+				Comment:  "Payload field",
+			})
+		}
+	}
+	return cols, nil
+}
+
+func (q *QdrantDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	tables, err := q.GetTables(dbName)
+	if err != nil {
+		return nil, err
+	}
+	var result []connection.ColumnDefinitionWithTable
+	for _, table := range tables {
+		cols, err := q.GetColumns(dbName, table)
+		if err != nil {
+			continue
+		}
+		for _, col := range cols {
+			result = append(result, connection.ColumnDefinitionWithTable{
+				TableName: table,
+				Name:      col.Name,
+				Type:      col.Type,
+				Comment:   col.Comment,
+			})
+		}
+	}
+	return result, nil
+}
+
+func (q *QdrantDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	indexes := []connection.IndexDefinition{
+		{Name: "PRIMARY", ColumnName: "id", NonUnique: 0, SeqInIndex: 1, IndexType: "PRIMARY"},
+	}
+	info, err := q.getCollectionInfo(context.Background(), tableNameOrDB(dbName, tableName))
+	if err == nil {
+		indexes = append(indexes, qdrantVectorIndexes(info)...)
+		indexes = append(indexes, qdrantPayloadIndexes(info)...)
+	}
+	if len(indexes) == 1 {
+		indexes = append(indexes, connection.IndexDefinition{Name: "VECTOR", ColumnName: "vector", NonUnique: 1, SeqInIndex: 1, IndexType: "VECTOR"})
+	}
+	return indexes, nil
+}
+
+func (q *QdrantDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return []connection.ForeignKeyDefinition{}, nil
+}
+
+func (q *QdrantDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return []connection.TriggerDefinition{}, nil
+}
+
+func (q *QdrantDB) ApplyChanges(tableName string, changes connection.ChangeSet) error {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultQdrantQueryTimeout)
+	defer cancel()
+
+	if len(changes.Deletes) > 0 {
+		ids := make([]interface{}, 0, len(changes.Deletes))
+		for _, row := range changes.Deletes {
+			if id, ok := qdrantRowID(row); ok {
+				ids = append(ids, id)
+			}
+		}
+		if len(ids) > 0 {
+			if _, err := q.deleteCommand(ctx, tableName, map[string]interface{}{"points": ids}); err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(changes.Updates) > 0 {
+		var upserts []map[string]interface{}
+		for _, update := range changes.Updates {
+			row := make(map[string]interface{}, len(update.Keys)+len(update.Values))
+			for k, v := range update.Keys {
+				row[k] = v
+			}
+			for k, v := range update.Values {
+				row[k] = v
+			}
+			if _, hasVector := qdrantRowVector(row); hasVector {
+				upserts = append(upserts, row)
+				continue
+			}
+			if err := q.setPayloadFromRow(ctx, tableName, row); err != nil {
+				return err
+			}
+		}
+		if len(upserts) > 0 {
+			if err := q.upsertRows(ctx, tableName, upserts); err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(changes.Inserts) > 0 {
+		if err := q.upsertRows(ctx, tableName, changes.Inserts); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func normalizeQdrantConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
+	runConfig := applyQdrantURI(config)
+	if strings.TrimSpace(runConfig.Host) == "" {
+		runConfig.Host = "localhost"
+	}
+	if runConfig.Port <= 0 {
+		runConfig.Port = defaultQdrantPort
+	}
+	if strings.TrimSpace(runConfig.SSLMode) == "" && runConfig.UseSSL {
+		runConfig.SSLMode = "required"
+	}
+	return runConfig
+}
+
+func applyQdrantURI(config connection.ConnectionConfig) connection.ConnectionConfig {
+	uriText := strings.TrimSpace(config.URI)
+	if uriText == "" {
+		return config
+	}
+	parsed, err := url.Parse(uriText)
+	if err != nil {
+		return config
+	}
+	scheme := strings.ToLower(strings.TrimSpace(parsed.Scheme))
+	if scheme != "http" && scheme != "https" && scheme != "qdrant" {
+		return config
+	}
+	if parsed.User != nil {
+		if strings.TrimSpace(config.User) == "" {
+			config.User = parsed.User.Username()
+		}
+		if pass, ok := parsed.User.Password(); ok && config.Password == "" {
+			config.Password = pass
+		}
+	}
+	if scheme == "https" {
+		config.UseSSL = true
+	}
+	if host := strings.TrimSpace(parsed.Host); host != "" {
+		if h, port, ok := parseHostPortWithDefault(host, defaultQdrantPort); ok {
+			config.Host = h
+			config.Port = port
+		}
+	}
+	if dbName := strings.Trim(strings.TrimSpace(parsed.Path), "/"); dbName != "" && !strings.HasPrefix(dbName, "collections") && strings.TrimSpace(config.Database) == "" {
+		config.Database = dbName
+	}
+	return config
+}
+
+func buildQdrantBaseURL(config connection.ConnectionConfig) string {
+	scheme := "http"
+	if config.UseSSL {
+		scheme = "https"
+	}
+	return fmt.Sprintf("%s://%s:%d", scheme, strings.TrimSpace(config.Host), config.Port)
+}
+
+func qdrantDatabaseFromConfig(config connection.ConnectionConfig) string {
+	if dbName := strings.TrimSpace(config.Database); dbName != "" {
+		return dbName
+	}
+	return defaultQdrantDatabase
+}
+
+func qdrantConnectionParams(config connection.ConnectionConfig) url.Values {
+	params := url.Values{}
+	mergeConnectionParamValues(params, connectionParamsFromURI(config.URI, "http", "https", "qdrant"))
+	mergeConnectionParamValues(params, connectionParamsFromText(config.ConnectionParams))
+	return params
+}
+
+func qdrantAuthHeaders(config connection.ConnectionConfig) map[string]string {
+	headers := make(map[string]string)
+	params := qdrantConnectionParams(config)
+	apiKey := firstNonEmpty(params.Get("apiKey"), params.Get("apikey"), params.Get("api-key"), params.Get("token"), params.Get("authToken"))
+	if apiKey == "" && strings.TrimSpace(config.User) == "" {
+		apiKey = strings.TrimSpace(config.Password)
+	}
+	if apiKey != "" {
+		headers["api-key"] = apiKey
+	} else if user := strings.TrimSpace(config.User); user != "" {
+		raw := user + ":" + config.Password
+		headers["Authorization"] = "Basic " + base64.StdEncoding.EncodeToString([]byte(raw))
+	}
+	if headerName := strings.TrimSpace(params.Get("authHeader")); headerName != "" {
+		if headerValue := strings.TrimSpace(params.Get("authHeaderValue")); headerValue != "" && isSafeConnectionParamKey(headerName) {
+			headers[headerName] = headerValue
+		}
+	}
+	return headers
+}
+
+func buildQdrantHTTPClient(config connection.ConnectionConfig) *http.Client {
+	transport := http.DefaultTransport.(*http.Transport).Clone()
+	if tlsConfig, err := resolveGenericTLSConfig(config); err == nil && tlsConfig != nil {
+		transport.TLSClientConfig = tlsConfig
+	}
+	if config.UseProxy {
+		proxyCfg := config.Proxy
+		transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+			return proxytunnel.DialContext(ctx, proxyCfg, network, addr)
+		}
+	}
+	return &http.Client{Transport: transport, Timeout: getConnectTimeout(config)}
+}
+
+func (q *QdrantDB) doJSON(ctx context.Context, method, path string, body interface{}, out interface{}) error {
+	if q.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	var reader io.Reader
+	if body != nil {
+		payload, err := json.Marshal(body)
+		if err != nil {
+			return err
+		}
+		reader = bytes.NewReader(payload)
+	}
+	req, err := http.NewRequestWithContext(ctx, method, strings.TrimRight(q.baseURL, "/")+path, reader)
+	if err != nil {
+		return err
+	}
+	if body != nil {
+		req.Header.Set("Content-Type", "application/json")
+	}
+	req.Header.Set("Accept", "application/json")
+	for key, value := range q.authHeaders {
+		if strings.TrimSpace(key) != "" && strings.TrimSpace(value) != "" {
+			req.Header.Set(key, value)
+		}
+	}
+	res, err := q.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	resBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		return err
+	}
+	if res.StatusCode < 200 || res.StatusCode >= 300 {
+		message := strings.TrimSpace(string(resBody))
+		if message == "" {
+			message = res.Status
+		}
+		return fmt.Errorf("Qdrant API %s %s 失败：%s", method, path, message)
+	}
+	if out == nil || len(bytes.TrimSpace(resBody)) == 0 {
+		return nil
+	}
+	if err := decodeJSONWithUseNumber(resBody, out); err != nil {
+		return fmt.Errorf("解析 Qdrant 响应失败：%w", err)
+	}
+	return nil
+}
+
+func (q *QdrantDB) listCollections(ctx context.Context) ([]qdrantCollectionInfo, error) {
+	var resp qdrantListCollectionsResponse
+	if err := q.doJSON(ctx, http.MethodGet, "/collections", nil, &resp); err != nil {
+		return nil, err
+	}
+	return resp.Result.Collections, nil
+}
+
+func (q *QdrantDB) getCollectionInfo(ctx context.Context, collection string) (map[string]interface{}, error) {
+	name := strings.TrimSpace(collection)
+	if name == "" {
+		return nil, fmt.Errorf("collection 名称不能为空")
+	}
+	var resp qdrantCollectionResponse
+	if err := q.doJSON(ctx, http.MethodGet, fmt.Sprintf("/collections/%s", url.PathEscape(name)), nil, &resp); err != nil {
+		return nil, err
+	}
+	return resp.Result, nil
+}
+
+func (q *QdrantDB) scrollPoints(ctx context.Context, collection string, limit int, offset interface{}, filter interface{}, withPayload bool, withVector bool) ([]map[string]interface{}, []string, error) {
+	name := strings.TrimSpace(collection)
+	if name == "" {
+		return nil, nil, fmt.Errorf("collection 名称不能为空")
+	}
+	if limit <= 0 {
+		limit = 200
+	}
+	body := map[string]interface{}{
+		"limit":        limit,
+		"with_payload": withPayload,
+		"with_vector":  withVector,
+	}
+	if offset != nil && strings.TrimSpace(fmt.Sprintf("%v", offset)) != "" {
+		body["offset"] = qdrantNormalizePointID(offset)
+	}
+	if filter != nil {
+		body["filter"] = filter
+	}
+	var resp qdrantScrollResponse
+	if err := q.doJSON(ctx, http.MethodPost, fmt.Sprintf("/collections/%s/points/scroll", url.PathEscape(name)), body, &resp); err != nil {
+		return nil, nil, err
+	}
+	rows := qdrantPointRows(resp.Result.Points)
+	if resp.Result.NextPageOffset != nil {
+		for _, row := range rows {
+			row["next_page_offset"] = resp.Result.NextPageOffset
+		}
+	}
+	return rows, collectColumns(rows), nil
+}
+
+func (q *QdrantDB) searchPoints(ctx context.Context, collection string, cmd map[string]interface{}) ([]map[string]interface{}, []string, error) {
+	name := strings.TrimSpace(collection)
+	if name == "" {
+		return nil, nil, fmt.Errorf("collection 名称不能为空")
+	}
+	vector := firstExisting(cmd, "vector", "query_vector", "queryVector")
+	if vector == nil {
+		return nil, nil, fmt.Errorf("Qdrant search 命令缺少 vector")
+	}
+	body := map[string]interface{}{
+		"vector":       normalizeQdrantVector(vector),
+		"limit":        intFromAny(firstExisting(cmd, "limit", "n_results", "nResults"), 10),
+		"with_payload": qdrantBoolValue(firstExisting(cmd, "with_payload", "withPayload"), true),
+		"with_vector":  qdrantBoolValue(firstExisting(cmd, "with_vector", "withVector"), true),
+	}
+	for _, key := range []string{"filter", "params", "score_threshold", "offset"} {
+		if value, ok := cmd[key]; ok {
+			body[key] = value
+		}
+	}
+	var resp qdrantSearchResponse
+	if err := q.doJSON(ctx, http.MethodPost, fmt.Sprintf("/collections/%s/points/search", url.PathEscape(name)), body, &resp); err != nil {
+		return nil, nil, err
+	}
+	rows := qdrantPointRows(resp.Result)
+	return rows, collectColumns(rows), nil
+}
+
+func (q *QdrantDB) countPoints(ctx context.Context, collection string, filter interface{}) (int64, error) {
+	name := strings.TrimSpace(collection)
+	if name == "" {
+		return 0, fmt.Errorf("collection 名称不能为空")
+	}
+	body := map[string]interface{}{"exact": true}
+	if filter != nil {
+		body["filter"] = filter
+	}
+	var resp qdrantCountResponse
+	if err := q.doJSON(ctx, http.MethodPost, fmt.Sprintf("/collections/%s/points/count", url.PathEscape(name)), body, &resp); err != nil {
+		return 0, err
+	}
+	return resp.Result.Count, nil
+}
+
+func (q *QdrantDB) queryJSON(ctx context.Context, text string) ([]map[string]interface{}, []string, error) {
+	var cmd map[string]interface{}
+	if err := decodeJSONWithUseNumber([]byte(text), &cmd); err != nil {
+		return nil, nil, fmt.Errorf("Qdrant JSON 命令解析失败：%w", err)
+	}
+	if hasAnyKey(cmd, "list_collections", "listCollections") {
+		collections, err := q.listCollections(ctx)
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := make([]map[string]interface{}, 0, len(collections))
+		for _, collection := range collections {
+			rows = append(rows, map[string]interface{}{"name": collection.Name})
+		}
+		return rows, collectColumns(rows), nil
+	}
+	if name := firstStringValue(cmd, "get_collection", "getCollection"); name != "" {
+		info, err := q.getCollectionInfo(ctx, name)
+		if err != nil {
+			return nil, nil, err
+		}
+		return []map[string]interface{}{info}, collectColumns([]map[string]interface{}{info}), nil
+	}
+	if name := firstStringValue(cmd, "count", "collection"); name != "" && hasAnyKey(cmd, "count") {
+		total, err := q.countPoints(ctx, name, cmd["filter"])
+		if err != nil {
+			return nil, nil, err
+		}
+		return []map[string]interface{}{{"total": total}}, []string{"total"}, nil
+	}
+	if name := firstStringValue(cmd, "search", "query", "collection"); name != "" && hasAnyKey(cmd, "search", "query", "vector", "query_vector", "queryVector") {
+		return q.searchPoints(ctx, name, cmd)
+	}
+	if name := firstStringValue(cmd, "scroll", "get", "collection"); name != "" {
+		limit := intFromAny(cmd["limit"], 200)
+		offset := firstExisting(cmd, "offset", "next_page_offset", "nextPageOffset")
+		return q.scrollPoints(
+			ctx,
+			name,
+			limit,
+			offset,
+			cmd["filter"],
+			qdrantBoolValue(firstExisting(cmd, "with_payload", "withPayload"), true),
+			qdrantBoolValue(firstExisting(cmd, "with_vector", "withVector"), true),
+		)
+	}
+	return nil, nil, fmt.Errorf("Qdrant JSON 查询命令仅支持 list_collections/get_collection/count/scroll/search")
+}
+
+func (q *QdrantDB) createCollection(ctx context.Context, name string, cmd map[string]interface{}) error {
+	collection := strings.TrimSpace(name)
+	if collection == "" {
+		return fmt.Errorf("collection 名称不能为空")
+	}
+	body := make(map[string]interface{})
+	if vectors, ok := cmd["vectors"]; ok {
+		body["vectors"] = vectors
+	} else {
+		size := intFromAny(firstExisting(cmd, "size", "vector_size", "vectorSize"), 0)
+		if size <= 0 {
+			return fmt.Errorf("Qdrant create_collection 命令缺少 vectors 或 size")
+		}
+		distance := firstStringValue(cmd, "distance", "metric")
+		if distance == "" {
+			distance = "Cosine"
+		}
+		body["vectors"] = map[string]interface{}{"size": size, "distance": distance}
+	}
+	for _, key := range []string{
+		"sparse_vectors",
+		"shard_number",
+		"replication_factor",
+		"write_consistency_factor",
+		"on_disk_payload",
+		"hnsw_config",
+		"optimizers_config",
+		"wal_config",
+		"quantization_config",
+		"strict_mode_config",
+		"init_from",
+	} {
+		if value, ok := cmd[key]; ok {
+			body[key] = value
+		}
+	}
+	return q.doJSON(ctx, http.MethodPut, fmt.Sprintf("/collections/%s", url.PathEscape(collection)), body, nil)
+}
+
+func (q *QdrantDB) deleteCollection(ctx context.Context, name string) error {
+	collection := strings.TrimSpace(name)
+	if collection == "" {
+		return fmt.Errorf("collection 名称不能为空")
+	}
+	return q.doJSON(ctx, http.MethodDelete, fmt.Sprintf("/collections/%s", url.PathEscape(collection)), nil, nil)
+}
+
+func (q *QdrantDB) createPayloadIndex(ctx context.Context, collection string, cmd map[string]interface{}) error {
+	fieldName := firstStringValue(cmd, "field_name", "fieldName", "field")
+	if fieldName == "" {
+		return fmt.Errorf("Qdrant create_payload_index 命令缺少 field_name")
+	}
+	fieldSchema := firstExisting(cmd, "field_schema", "fieldSchema", "schema")
+	if fieldSchema == nil {
+		fieldSchema = "keyword"
+	}
+	body := map[string]interface{}{
+		"field_name":   fieldName,
+		"field_schema": fieldSchema,
+	}
+	return q.doJSON(ctx, http.MethodPut, fmt.Sprintf("/collections/%s/index", url.PathEscape(collection)), body, nil)
+}
+
+func (q *QdrantDB) deletePayloadIndex(ctx context.Context, collection, fieldName string) error {
+	return q.doJSON(ctx, http.MethodDelete, fmt.Sprintf("/collections/%s/index/%s", url.PathEscape(collection), url.PathEscape(fieldName)), nil, nil)
+}
+
+func (q *QdrantDB) upsertCommand(ctx context.Context, collection string, cmd map[string]interface{}) (int64, error) {
+	if rowsValue, ok := cmd["rows"].([]interface{}); ok {
+		rows := make([]map[string]interface{}, 0, len(rowsValue))
+		for _, raw := range rowsValue {
+			if row, ok := raw.(map[string]interface{}); ok {
+				rows = append(rows, row)
+			}
+		}
+		return int64(len(rows)), q.upsertRows(ctx, collection, rows)
+	}
+	if points, ok := cmd["points"]; ok {
+		body := map[string]interface{}{"points": points}
+		return int64(len(anySlice(points))), q.doJSON(ctx, http.MethodPut, fmt.Sprintf("/collections/%s/points?wait=true", url.PathEscape(collection)), body, nil)
+	}
+	return 0, fmt.Errorf("Qdrant upsert 命令缺少 rows 或 points")
+}
+
+func (q *QdrantDB) deleteCommand(ctx context.Context, collection string, cmd map[string]interface{}) (int64, error) {
+	body := make(map[string]interface{})
+	if points, ok := cmd["points"]; ok {
+		body["points"] = qdrantPointIDSlice(points)
+	} else if ids, ok := cmd["ids"]; ok {
+		body["points"] = qdrantPointIDSlice(ids)
+	} else if filter, ok := cmd["filter"]; ok {
+		body["filter"] = filter
+	}
+	if len(body) == 0 {
+		return 0, fmt.Errorf("Qdrant delete 命令缺少 points/ids/filter")
+	}
+	count := int64(len(anySlice(firstExisting(body, "points"))))
+	return count, q.doJSON(ctx, http.MethodPost, fmt.Sprintf("/collections/%s/points/delete?wait=true", url.PathEscape(collection)), body, nil)
+}
+
+func (q *QdrantDB) upsertRows(ctx context.Context, collection string, rows []map[string]interface{}) error {
+	if len(rows) == 0 {
+		return nil
+	}
+	points := make([]map[string]interface{}, 0, len(rows))
+	for _, row := range rows {
+		id, ok := qdrantRowID(row)
+		if !ok {
+			return fmt.Errorf("Qdrant 写入行缺少 id")
+		}
+		vector, hasVector := qdrantRowVector(row)
+		if !hasVector {
+			return fmt.Errorf("Qdrant upsert 行缺少 vector/embedding")
+		}
+		points = append(points, map[string]interface{}{
+			"id":      id,
+			"vector":  vector,
+			"payload": qdrantPayloadFromRow(row),
+		})
+	}
+	body := map[string]interface{}{"points": points}
+	return q.doJSON(ctx, http.MethodPut, fmt.Sprintf("/collections/%s/points?wait=true", url.PathEscape(collection)), body, nil)
+}
+
+func (q *QdrantDB) setPayloadFromRow(ctx context.Context, collection string, row map[string]interface{}) error {
+	id, ok := qdrantRowID(row)
+	if !ok {
+		return fmt.Errorf("Qdrant payload 更新缺少 id")
+	}
+	payload := qdrantPayloadFromRow(row)
+	if len(payload) == 0 {
+		return nil
+	}
+	body := map[string]interface{}{
+		"points":  []interface{}{id},
+		"payload": payload,
+	}
+	return q.doJSON(ctx, http.MethodPost, fmt.Sprintf("/collections/%s/points/payload?wait=true", url.PathEscape(collection)), body, nil)
+}
+
+type qdrantParsedSQL struct {
+	Collection    string
+	Limit         int
+	Offset        interface{}
+	Count         bool
+	IncludeVector bool
+}
+
+var qdrantSQLFromRE = regexp.MustCompile(`(?i)\bFROM\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([a-zA-Z0-9_.\-]+))`)
+var qdrantSQLLimitRE = regexp.MustCompile(`(?i)\bLIMIT\s+(\d+)`)
+var qdrantSQLOffsetRE = regexp.MustCompile(`(?i)\bOFFSET\s+([a-zA-Z0-9_.\-]+)`)
+
+func parseQdrantSQL(sqlText string) (qdrantParsedSQL, bool) {
+	text := strings.TrimSpace(sqlText)
+	if !strings.HasPrefix(strings.ToLower(text), "select") {
+		return qdrantParsedSQL{}, false
+	}
+	matches := qdrantSQLFromRE.FindStringSubmatch(text)
+	if len(matches) == 0 {
+		return qdrantParsedSQL{}, false
+	}
+	collection := firstNonEmpty(matches[1], matches[2], matches[3])
+	if collection == "" {
+		return qdrantParsedSQL{}, false
+	}
+	parsed := qdrantParsedSQL{Collection: collection, Limit: 200}
+	lower := strings.ToLower(text)
+	parsed.Count = strings.Contains(lower, "count(")
+	parsed.IncludeVector = strings.Contains(lower, "vector")
+	if m := qdrantSQLLimitRE.FindStringSubmatch(text); len(m) > 1 {
+		parsed.Limit, _ = strconv.Atoi(m[1])
+	}
+	if m := qdrantSQLOffsetRE.FindStringSubmatch(text); len(m) > 1 {
+		parsed.Offset = qdrantNormalizePointID(m[1])
+	}
+	return parsed, true
+}
+
+func qdrantPointRows(points []qdrantPoint) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(points))
+	for _, point := range points {
+		row := map[string]interface{}{"id": point.ID}
+		if point.Score != nil {
+			row["score"] = point.Score
+		}
+		if point.Version != nil {
+			row["version"] = point.Version
+		}
+		if point.Vector != nil {
+			row["vector"] = normalizeJSONLikeValue(point.Vector)
+		}
+		if point.Payload != nil {
+			row["payload"] = point.Payload
+			for key, value := range point.Payload {
+				row["payload."+key] = value
+			}
+		}
+		rows = append(rows, row)
+	}
+	return rows
+}
+
+func qdrantRowID(row map[string]interface{}) (interface{}, bool) {
+	raw := firstExisting(row, "id", "_id")
+	if raw == nil {
+		return nil, false
+	}
+	text := strings.TrimSpace(fmt.Sprintf("%v", raw))
+	if text == "" || text == "<nil>" {
+		return nil, false
+	}
+	return qdrantNormalizePointID(raw), true
+}
+
+func qdrantNormalizePointID(value interface{}) interface{} {
+	switch v := value.(type) {
+	case json.Number:
+		if n, err := v.Int64(); err == nil {
+			return n
+		}
+	case float64:
+		if v == float64(int64(v)) {
+			return int64(v)
+		}
+	case float32:
+		if v == float32(int64(v)) {
+			return int64(v)
+		}
+	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
+		return v
+	case string:
+		text := strings.TrimSpace(v)
+		if n, err := strconv.ParseInt(text, 10, 64); err == nil {
+			return n
+		}
+		return text
+	}
+	return value
+}
+
+func qdrantPointIDSlice(value interface{}) []interface{} {
+	items := anySlice(value)
+	result := make([]interface{}, 0, len(items))
+	for _, item := range items {
+		result = append(result, qdrantNormalizePointID(item))
+	}
+	return result
+}
+
+func qdrantRowVector(row map[string]interface{}) (interface{}, bool) {
+	vector := firstExisting(row, "vector", "_vector", "vectors", "embedding", "_embedding")
+	if vector == nil {
+		return nil, false
+	}
+	return normalizeQdrantVector(vector), true
+}
+
+func normalizeQdrantVector(value interface{}) interface{} {
+	if text, ok := value.(string); ok {
+		var parsed interface{}
+		if err := decodeJSONWithUseNumber([]byte(text), &parsed); err == nil {
+			return parsed
+		}
+	}
+	return value
+}
+
+func qdrantPayloadFromRow(row map[string]interface{}) map[string]interface{} {
+	payload := make(map[string]interface{})
+	if raw, ok := row["payload"].(map[string]interface{}); ok {
+		for key, value := range raw {
+			payload[key] = value
+		}
+	}
+	for key, value := range row {
+		if isQdrantReservedRowField(key) {
+			continue
+		}
+		if strings.HasPrefix(key, "payload.") {
+			payload[strings.TrimPrefix(key, "payload.")] = value
+			continue
+		}
+		payload[key] = value
+	}
+	return payload
+}
+
+func isQdrantReservedRowField(key string) bool {
+	switch key {
+	case "id", "_id", "vector", "_vector", "vectors", "embedding", "_embedding", "payload", "score", "version", "next_page_offset":
+		return true
+	default:
+		return false
+	}
+}
+
+func qdrantBoolValue(value interface{}, fallback bool) bool {
+	if value == nil {
+		return fallback
+	}
+	switch v := value.(type) {
+	case bool:
+		return v
+	case string:
+		text := strings.TrimSpace(strings.ToLower(v))
+		if text == "" {
+			return fallback
+		}
+		return text == "1" || text == "true" || text == "yes" || text == "on"
+	default:
+		return fallback
+	}
+}
+
+func qdrantVectorIndexes(info map[string]interface{}) []connection.IndexDefinition {
+	vectors := nestedMapValue(info, "config", "params", "vectors")
+	if len(vectors) == 0 {
+		return nil
+	}
+	if _, ok := vectors["size"]; ok {
+		return []connection.IndexDefinition{{Name: "VECTOR", ColumnName: "vector", NonUnique: 1, SeqInIndex: 1, IndexType: "VECTOR"}}
+	}
+	var indexes []connection.IndexDefinition
+	names := make([]string, 0, len(vectors))
+	for name := range vectors {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	for index, name := range names {
+		indexes = append(indexes, connection.IndexDefinition{
+			Name:       "VECTOR_" + name,
+			ColumnName: "vector." + name,
+			NonUnique:  1,
+			SeqInIndex: index + 1,
+			IndexType:  "VECTOR",
+		})
+	}
+	return indexes
+}
+
+func qdrantPayloadIndexes(info map[string]interface{}) []connection.IndexDefinition {
+	schema := nestedMapValue(info, "payload_schema")
+	if len(schema) == 0 {
+		schema = nestedMapValue(info, "payload_schema", "schema")
+	}
+	if len(schema) == 0 {
+		return nil
+	}
+	names := make([]string, 0, len(schema))
+	for name := range schema {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	indexes := make([]connection.IndexDefinition, 0, len(names))
+	for index, name := range names {
+		indexes = append(indexes, connection.IndexDefinition{
+			Name:       "PAYLOAD_" + name,
+			ColumnName: "payload." + name,
+			NonUnique:  1,
+			SeqInIndex: index + 1,
+			IndexType:  "PAYLOAD",
+		})
+	}
+	return indexes
+}
+
+func nestedMapValue(value interface{}, path ...string) map[string]interface{} {
+	current := value
+	for _, key := range path {
+		m, ok := current.(map[string]interface{})
+		if !ok {
+			return nil
+		}
+		current = m[key]
+	}
+	if m, ok := current.(map[string]interface{}); ok {
+		return m
+	}
+	return nil
+}
diff --git a/internal/db/qdrant_impl_test.go b/internal/db/qdrant_impl_test.go
new file mode 100644
index 0000000..8dab118
--- /dev/null
+++ b/internal/db/qdrant_impl_test.go
@@ -0,0 +1,274 @@
+package db
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"strings"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+func newMockQdrantServer(t *testing.T, handler http.HandlerFunc) *httptest.Server {
+	t.Helper()
+	server := httptest.NewServer(handler)
+	t.Cleanup(server.Close)
+	return server
+}
+
+func newTestQdrantDB(t *testing.T, serverURL string) *QdrantDB {
+	t.Helper()
+	parsed, err := url.Parse(serverURL)
+	if err != nil {
+		t.Fatalf("parse server URL: %v", err)
+	}
+	host, port, ok := parseHostPortWithDefault(parsed.Host, defaultQdrantPort)
+	if !ok {
+		t.Fatalf("parse host port failed: %s", parsed.Host)
+	}
+	db := &QdrantDB{}
+	if err := db.Connect(connection.ConnectionConfig{
+		Type:   "qdrant",
+		Host:   host,
+		Port:   port,
+		UseSSL: strings.EqualFold(parsed.Scheme, "https"),
+	}); err != nil {
+		t.Fatalf("connect qdrant: %v", err)
+	}
+	t.Cleanup(func() { _ = db.Close() })
+	return db
+}
+
+func writeQdrantJSON(w http.ResponseWriter, value interface{}) {
+	w.Header().Set("Content-Type", "application/json")
+	_ = json.NewEncoder(w).Encode(value)
+}
+
+func TestQdrantGetTables(t *testing.T) {
+	server := newMockQdrantServer(t, func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == http.MethodGet && r.URL.Path == "/collections" {
+			writeQdrantJSON(w, map[string]interface{}{
+				"result": map[string]interface{}{
+					"collections": []map[string]interface{}{
+						{"name": "products"},
+						{"name": "logs"},
+					},
+				},
+			})
+			return
+		}
+		w.WriteHeader(http.StatusNotFound)
+	})
+
+	db := newTestQdrantDB(t, server.URL)
+	tables, err := db.GetTables("")
+	if err != nil {
+		t.Fatalf("GetTables failed: %v", err)
+	}
+	if strings.Join(tables, ",") != "logs,products" {
+		t.Fatalf("tables = %v", tables)
+	}
+}
+
+func TestQdrantCreateCollectionBuildsVectorsBody(t *testing.T) {
+	var capturedBody map[string]interface{}
+	server := newMockQdrantServer(t, func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.Method == http.MethodGet && r.URL.Path == "/collections":
+			writeQdrantJSON(w, map[string]interface{}{"result": map[string]interface{}{"collections": []interface{}{}}})
+		case r.Method == http.MethodPut && r.URL.Path == "/collections/products":
+			_ = json.NewDecoder(r.Body).Decode(&capturedBody)
+			writeQdrantJSON(w, map[string]interface{}{"result": true})
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	db := newTestQdrantDB(t, server.URL)
+	if _, err := db.Exec(`{"create_collection":"products","size":3,"distance":"Cosine","on_disk_payload":true}`); err != nil {
+		t.Fatalf("create collection failed: %v", err)
+	}
+	vectors, _ := capturedBody["vectors"].(map[string]interface{})
+	if intFromAny(vectors["size"], 0) != 3 || vectors["distance"] != "Cosine" || capturedBody["on_disk_payload"] != true {
+		t.Fatalf("captured body = %#v", capturedBody)
+	}
+}
+
+func TestQdrantSelectConvertsToScroll(t *testing.T) {
+	var capturedBody map[string]interface{}
+	server := newMockQdrantServer(t, func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.Method == http.MethodGet && r.URL.Path == "/collections":
+			writeQdrantJSON(w, map[string]interface{}{"result": map[string]interface{}{"collections": []interface{}{}}})
+		case r.Method == http.MethodPost && r.URL.Path == "/collections/products/points/scroll":
+			_ = json.NewDecoder(r.Body).Decode(&capturedBody)
+			writeQdrantJSON(w, map[string]interface{}{
+				"result": map[string]interface{}{
+					"points": []map[string]interface{}{
+						{
+							"id":      1,
+							"payload": map[string]interface{}{"category": "book", "price": 19.5},
+							"vector":  []float64{0.1, 0.2, 0.3},
+						},
+					},
+				},
+			})
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	db := newTestQdrantDB(t, server.URL)
+	rows, columns, err := db.Query(`SELECT id, vector FROM "products" LIMIT 10 OFFSET 5`)
+	if err != nil {
+		t.Fatalf("Query failed: %v", err)
+	}
+	if intFromAny(capturedBody["limit"], 0) != 10 || capturedBody["offset"] != float64(5) && capturedBody["offset"] != int64(5) {
+		t.Fatalf("captured body = %#v", capturedBody)
+	}
+	if len(rows) != 1 || rows[0]["id"] == nil || rows[0]["payload.category"] != "book" {
+		t.Fatalf("rows = %#v", rows)
+	}
+	if !containsString(columns, "payload.category") || !containsString(columns, "vector") {
+		t.Fatalf("columns = %v", columns)
+	}
+}
+
+func TestQdrantJSONSearchFlattensResults(t *testing.T) {
+	server := newMockQdrantServer(t, func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.Method == http.MethodGet && r.URL.Path == "/collections":
+			writeQdrantJSON(w, map[string]interface{}{"result": map[string]interface{}{"collections": []interface{}{}}})
+		case r.Method == http.MethodPost && r.URL.Path == "/collections/products/points/search":
+			writeQdrantJSON(w, map[string]interface{}{
+				"result": []map[string]interface{}{
+					{
+						"id":      1,
+						"score":   0.98,
+						"payload": map[string]interface{}{"category": "book"},
+						"vector":  []float64{0.1, 0.2, 0.3},
+					},
+				},
+			})
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	db := newTestQdrantDB(t, server.URL)
+	rows, columns, err := db.Query(`{"search":"products","vector":[0.1,0.2,0.3],"limit":1}`)
+	if err != nil {
+		t.Fatalf("Query failed: %v", err)
+	}
+	if len(rows) != 1 || rows[0]["score"] == nil || rows[0]["payload.category"] != "book" {
+		t.Fatalf("rows = %#v", rows)
+	}
+	if !containsString(columns, "score") || !containsString(columns, "payload.category") {
+		t.Fatalf("columns = %v", columns)
+	}
+}
+
+func TestQdrantApplyChangesUpsertPayloadAndDelete(t *testing.T) {
+	var upsertBody map[string]interface{}
+	var payloadBody map[string]interface{}
+	var deleteBody map[string]interface{}
+	server := newMockQdrantServer(t, func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.Method == http.MethodGet && r.URL.Path == "/collections":
+			writeQdrantJSON(w, map[string]interface{}{"result": map[string]interface{}{"collections": []interface{}{}}})
+		case r.Method == http.MethodPut && r.URL.Path == "/collections/products/points":
+			_ = json.NewDecoder(r.Body).Decode(&upsertBody)
+			writeQdrantJSON(w, map[string]interface{}{"result": map[string]interface{}{"operation_id": 1}})
+		case r.Method == http.MethodPost && r.URL.Path == "/collections/products/points/payload":
+			_ = json.NewDecoder(r.Body).Decode(&payloadBody)
+			writeQdrantJSON(w, map[string]interface{}{"result": map[string]interface{}{"operation_id": 2}})
+		case r.Method == http.MethodPost && r.URL.Path == "/collections/products/points/delete":
+			_ = json.NewDecoder(r.Body).Decode(&deleteBody)
+			writeQdrantJSON(w, map[string]interface{}{"result": map[string]interface{}{"operation_id": 3}})
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	})
+
+	db := newTestQdrantDB(t, server.URL)
+	err := db.ApplyChanges("products", connection.ChangeSet{
+		Deletes: []map[string]interface{}{{"id": 9}},
+		Updates: []connection.UpdateRow{{
+			Keys:   map[string]interface{}{"id": 1},
+			Values: map[string]interface{}{"payload.category": "updated"},
+		}},
+		Inserts: []map[string]interface{}{
+			{"id": 2, "vector": []float64{0.1, 0.2, 0.3}, "payload.kind": "new"},
+		},
+	})
+	if err != nil {
+		t.Fatalf("ApplyChanges failed: %v", err)
+	}
+	if points := anySlice(deleteBody["points"]); len(points) != 1 || intFromAny(points[0], 0) != 9 {
+		t.Fatalf("delete body = %#v", deleteBody)
+	}
+	if points := anySlice(payloadBody["points"]); len(points) != 1 || intFromAny(points[0], 0) != 1 {
+		t.Fatalf("payload body = %#v", payloadBody)
+	}
+	payload, _ := payloadBody["payload"].(map[string]interface{})
+	if payload["category"] != "updated" {
+		t.Fatalf("payload body = %#v", payloadBody)
+	}
+	points := anySlice(upsertBody["points"])
+	if len(points) != 1 {
+		t.Fatalf("upsert body = %#v", upsertBody)
+	}
+	point, _ := points[0].(map[string]interface{})
+	pointPayload, _ := point["payload"].(map[string]interface{})
+	if intFromAny(point["id"], 0) != 2 || pointPayload["kind"] != "new" {
+		t.Fatalf("upsert body = %#v", upsertBody)
+	}
+}
+
+func TestQdrantLiveSmoke(t *testing.T) {
+	serverURL := strings.TrimSpace(os.Getenv("GONAVI_QDRANT_TEST_URL"))
+	if serverURL == "" {
+		t.Skip("set GONAVI_QDRANT_TEST_URL to run live Qdrant smoke test")
+	}
+
+	db := newTestQdrantDB(t, serverURL)
+	collection := "gonavi_smoke_live"
+	_, _ = db.Exec(fmt.Sprintf(`{"delete_collection":%q}`, collection))
+	if _, err := db.Exec(fmt.Sprintf(`{"create_collection":%q,"size":3,"distance":"Cosine"}`, collection)); err != nil {
+		t.Fatalf("create live collection: %v", err)
+	}
+	t.Cleanup(func() { _, _ = db.Exec(fmt.Sprintf(`{"delete_collection":%q}`, collection)) })
+
+	if err := db.ApplyChanges(collection, connection.ChangeSet{
+		Inserts: []map[string]interface{}{{
+			"id":           1,
+			"vector":       []float64{0.1, 0.2, 0.3},
+			"payload.kind": "smoke",
+		}},
+	}); err != nil {
+		t.Fatalf("upsert live row: %v", err)
+	}
+
+	rows, columns, err := db.Query(fmt.Sprintf(`SELECT id, vector FROM "%s" LIMIT 5`, collection))
+	if err != nil {
+		t.Fatalf("select live rows: %v", err)
+	}
+	if len(rows) == 0 || intFromAny(rows[0]["id"], 0) != 1 || rows[0]["payload.kind"] != "smoke" {
+		t.Fatalf("live rows = %#v", rows)
+	}
+	if !containsString(columns, "payload.kind") {
+		t.Fatalf("live columns missing payload.kind: %v", columns)
+	}
+
+	queryRows, queryColumns, err := db.Query(fmt.Sprintf(`{"search":%q,"vector":[0.1,0.2,0.3],"limit":1}`, collection))
+	if err != nil {
+		t.Fatalf("search live rows: %v", err)
+	}
+	if len(queryRows) == 0 || intFromAny(queryRows[0]["id"], 0) != 1 || !containsString(queryColumns, "score") {
+		t.Fatalf("live query rows = %#v columns = %v", queryRows, queryColumns)
+	}
+}
diff --git a/internal/db/query_value.go b/internal/db/query_value.go
index 75554e1..def345e 100644
--- a/internal/db/query_value.go
+++ b/internal/db/query_value.go
@@ -33,8 +33,12 @@ func normalizeQueryValue(v interface{}) interface{} {
 }
 
 func normalizeQueryValueWithDBType(v interface{}, databaseTypeName string) interface{} {
+	return normalizeQueryValueWithDBTypeAndDialect(v, databaseTypeName, "")
+}
+
+func normalizeQueryValueWithDBTypeAndDialect(v interface{}, databaseTypeName, dialect string) interface{} {
 	if tm, ok := v.(time.Time); ok {
-		return normalizeTemporalValueForDisplay(tm, databaseTypeName)
+		return normalizeTemporalValueForDisplay(tm, databaseTypeName, dialect)
 	}
 	if b, ok := v.([]byte); ok {
 		return bytesToDisplayValue(b, databaseTypeName)
@@ -42,15 +46,31 @@ func normalizeQueryValueWithDBType(v interface{}, databaseTypeName string) inter
 	return normalizeCompositeQueryValue(v)
 }
 
-func normalizeTemporalValueForDisplay(value time.Time, databaseTypeName string) interface{} {
+func normalizeTemporalValueForDisplay(value time.Time, databaseTypeName, dialect string) interface{} {
 	if value.IsZero() {
 		if zeroValue, ok := zeroTemporalDisplayValue(databaseTypeName); ok {
 			return zeroValue
 		}
 	}
+	if shouldDisplayTemporalValueAsDateOnly(databaseTypeName, dialect) {
+		return value.Format("2006-01-02")
+	}
 	return value.Format(time.RFC3339Nano)
 }
 
+func shouldDisplayTemporalValueAsDateOnly(databaseTypeName, dialect string) bool {
+	typeName := strings.ToUpper(strings.TrimSpace(databaseTypeName))
+	if typeName != "DATE" && typeName != "NEWDATE" {
+		return false
+	}
+	switch strings.ToLower(strings.TrimSpace(dialect)) {
+	case "mysql", "mariadb", "goldendb", "greatdb", "gdb", "diros", "doris", "starrocks", "sphinx":
+		return true
+	default:
+		return false
+	}
+}
+
 func zeroTemporalDisplayValue(databaseTypeName string) (string, bool) {
 	typeName := strings.ToUpper(strings.TrimSpace(databaseTypeName))
 	if typeName == "" {
@@ -125,7 +145,7 @@ func normalizeCompositeQueryValue(v interface{}) interface{} {
 		// 部分驱动（如 Kingbase）会返回复杂结构体值，直接透传会导致前端渲染和比较开销激增。
 		// 统一降级为可读字符串，避免对象深层序列化触发 UI 卡顿。
 		if tm, ok := v.(time.Time); ok {
-			return normalizeTemporalValueForDisplay(tm, "")
+			return normalizeTemporalValueForDisplay(tm, "", "")
 		}
 		if stringer, ok := v.(fmt.Stringer); ok {
 			return stringer.String()
diff --git a/internal/db/query_value_test.go b/internal/db/query_value_test.go
index d02dda3..7cce552 100644
--- a/internal/db/query_value_test.go
+++ b/internal/db/query_value_test.go
@@ -220,6 +220,34 @@ func TestNormalizeQueryValueWithDBType_TimeStructToRFC3339(t *testing.T) {
 	}
 }
 
+func TestNormalizeQueryValueWithDBTypeAndDialect_MySQLDateOnly(t *testing.T) {
+	input := time.Date(2025, 10, 1, 0, 0, 0, 0, time.Local)
+
+	got := normalizeQueryValueWithDBTypeAndDialect(input, "DATE", "mysql")
+	if got != "2025-10-01" {
+		t.Fatalf("MySQL DATE 应只展示日期，实际=%v(%T)", got, got)
+	}
+
+	got = normalizeQueryValueWithDBTypeAndDialect(input, "NEWDATE", "mysql")
+	if got != "2025-10-01" {
+		t.Fatalf("MySQL NEWDATE 应只展示日期，实际=%v(%T)", got, got)
+	}
+}
+
+func TestNormalizeQueryValueWithDBTypeAndDialect_DatetimeKeepsTime(t *testing.T) {
+	input := time.Date(2025, 10, 1, 13, 14, 15, 0, time.UTC)
+
+	got := normalizeQueryValueWithDBTypeAndDialect(input, "DATETIME", "mysql")
+	if got != "2025-10-01T13:14:15Z" {
+		t.Fatalf("MySQL DATETIME 应保留时间，实际=%v(%T)", got, got)
+	}
+
+	got = normalizeQueryValueWithDBTypeAndDialect(input, "DATE", "oracle")
+	if got != "2025-10-01T13:14:15Z" {
+		t.Fatalf("Oracle DATE 应保留时间语义，实际=%v(%T)", got, got)
+	}
+}
+
 func TestNormalizeQueryValueWithDBType_ZeroTemporalValues(t *testing.T) {
 	zero := time.Time{}
 	cases := []struct {
diff --git a/internal/db/rabbitmq_impl.go b/internal/db/rabbitmq_impl.go
new file mode 100644
index 0000000..cdbff52
--- /dev/null
+++ b/internal/db/rabbitmq_impl.go
@@ -0,0 +1,1155 @@
+package db
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+	proxytunnel "GoNavi-Wails/internal/proxy"
+	"GoNavi-Wails/internal/ssh"
+)
+
+const (
+	defaultRabbitMQPort         = 15672
+	defaultRabbitMQQueryTimeout = 30 * time.Second
+	defaultRabbitMQPreviewLimit = 100
+	defaultRabbitMQPageSize     = 200
+	maxRabbitMQPageSize         = 500
+	rabbitMQDefaultVHost        = "/"
+)
+
+type RabbitMQDB struct {
+	client          *http.Client
+	baseURL         string
+	defaultVHost    string
+	defaultQueue    string
+	defaultExchange string
+	pageSize        int
+	authHeaders     map[string]string
+	forwarder       *ssh.LocalForwarder
+}
+
+func (r *RabbitMQDB) Connect(config connection.ConnectionConfig) error {
+	if r.forwarder != nil {
+		_ = r.forwarder.Close()
+		r.forwarder = nil
+	}
+	r.client = nil
+
+	runConfig := normalizeRabbitMQConfig(config)
+	if runConfig.UseSSH {
+		forwarder, err := ssh.GetOrCreateLocalForwarder(runConfig.SSH, runConfig.Host, runConfig.Port)
+		if err != nil {
+			return fmt.Errorf("创建 SSH 隧道失败：%w", err)
+		}
+		r.forwarder = forwarder
+
+		host, portText, err := net.SplitHostPort(forwarder.LocalAddr)
+		if err != nil {
+			return fmt.Errorf("解析本地转发地址失败：%w", err)
+		}
+		port, err := strconv.Atoi(portText)
+		if err != nil {
+			return fmt.Errorf("解析本地端口失败：%w", err)
+		}
+		runConfig.Host = host
+		runConfig.Port = port
+		runConfig.UseSSH = false
+		logger.Infof("RabbitMQ 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	}
+
+	params := rabbitmqConnectionParams(runConfig)
+	r.baseURL = buildRabbitMQBaseURL(runConfig)
+	r.defaultVHost = rabbitmqResolveVHost(runConfig.Database, "")
+	r.defaultQueue = strings.TrimSpace(firstNonEmpty(params.Get("defaultQueue"), params.Get("queue")))
+	r.defaultExchange = rabbitmqNormalizeExchangeName(firstNonEmpty(params.Get("defaultExchange"), params.Get("exchange")), "")
+	r.pageSize = rabbitmqPageSize(params)
+	r.authHeaders = rabbitmqAuthHeaders(runConfig)
+	r.client = buildRabbitMQHTTPClient(runConfig)
+
+	if err := r.Ping(); err != nil {
+		_ = r.Close()
+		return err
+	}
+	return nil
+}
+
+func (r *RabbitMQDB) Close() error {
+	if r.forwarder != nil {
+		if err := r.forwarder.Close(); err != nil {
+			logger.Warnf("关闭 RabbitMQ SSH 端口转发失败：%v", err)
+		}
+		r.forwarder = nil
+	}
+	r.client = nil
+	r.baseURL = ""
+	r.defaultVHost = ""
+	r.defaultQueue = ""
+	r.defaultExchange = ""
+	r.pageSize = 0
+	r.authHeaders = nil
+	return nil
+}
+
+func (r *RabbitMQDB) Ping() error {
+	if r.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	return r.doJSON(ctx, http.MethodGet, "/api/overview", nil, nil)
+}
+
+func (r *RabbitMQDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultRabbitMQQueryTimeout)
+	defer cancel()
+	return r.QueryContext(ctx, query)
+}
+
+func (r *RabbitMQDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if r.client == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+	text := strings.TrimSpace(query)
+	if text == "" {
+		return nil, nil, fmt.Errorf("查询语句不能为空")
+	}
+
+	parsed, ok := parseRabbitMQSQL(text)
+	if !ok {
+		return nil, nil, fmt.Errorf("RabbitMQ 查询仅支持 SHOW VHOSTS、SHOW QUEUES、SHOW EXCHANGES、DESCRIBE QUEUE、DESCRIBE EXCHANGE、SELECT * FROM queue 与 CONSUME FROM queue")
+	}
+
+	switch parsed.Action {
+	case "show_vhosts":
+		items, err := r.listVHosts(ctx, parsed.Limit)
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := rabbitmqVHostRows(items)
+		return rows, collectColumns(rows), nil
+	case "show_queues":
+		vhost := rabbitmqResolveVHost(parsed.VHost, r.defaultVHost)
+		items, err := r.listQueues(ctx, vhost, parsed.Limit)
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := rabbitmqQueueRows(items)
+		return rows, collectColumns(rows), nil
+	case "show_exchanges":
+		vhost := rabbitmqResolveVHost(parsed.VHost, r.defaultVHost)
+		items, err := r.listExchanges(ctx, vhost, parsed.Limit)
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := rabbitmqExchangeRows(items)
+		return rows, collectColumns(rows), nil
+	case "describe_queue":
+		vhost := rabbitmqResolveVHost(parsed.VHost, r.defaultVHost)
+		queue := rabbitmqResolveQueue(parsed.Name, r.defaultQueue)
+		if queue == "" {
+			return nil, nil, fmt.Errorf("RabbitMQ queue 不能为空")
+		}
+		info, err := r.getQueueInfo(ctx, vhost, queue)
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := []map[string]interface{}{rabbitmqQueueRow(info)}
+		return rows, collectColumns(rows), nil
+	case "describe_exchange":
+		vhost := rabbitmqResolveVHost(parsed.VHost, r.defaultVHost)
+		exchange := rabbitmqNormalizeExchangeName(parsed.Name, r.defaultExchange)
+		info, err := r.getExchangeInfo(ctx, vhost, exchange)
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := []map[string]interface{}{rabbitmqExchangeRow(info)}
+		return rows, collectColumns(rows), nil
+	case "select", "consume":
+		vhost := rabbitmqResolveVHost(parsed.VHost, r.defaultVHost)
+		queue := rabbitmqResolveQueue(parsed.Name, r.defaultQueue)
+		if queue == "" {
+			return nil, nil, fmt.Errorf("RabbitMQ queue 不能为空")
+		}
+		if parsed.Count {
+			info, err := r.getQueueInfo(ctx, vhost, queue)
+			if err != nil {
+				return nil, nil, err
+			}
+			return []map[string]interface{}{{
+				"vhost":   vhost,
+				"queue":   queue,
+				"total":   intFromAny(info["messages"], 0),
+				"ready":   intFromAny(info["messages_ready"], 0),
+				"unacked": intFromAny(info["messages_unacknowledged"], 0),
+			}}, []string{"vhost", "queue", "total", "ready", "unacked"}, nil
+		}
+
+		fetchLimit := parsed.Limit + parsed.Offset
+		if fetchLimit <= 0 {
+			fetchLimit = defaultRabbitMQPreviewLimit
+		}
+		items, err := r.getQueueMessages(ctx, vhost, queue, fetchLimit)
+		if err != nil {
+			return nil, nil, err
+		}
+		if parsed.Offset > 0 {
+			if parsed.Offset >= len(items) {
+				items = nil
+			} else {
+				items = items[parsed.Offset:]
+			}
+		}
+		if parsed.Limit > 0 && len(items) > parsed.Limit {
+			items = items[:parsed.Limit]
+		}
+		rows := rabbitmqMessageRows(vhost, queue, items)
+		return rows, collectColumns(rows), nil
+	default:
+		return nil, nil, fmt.Errorf("未实现的 RabbitMQ 查询类型：%s", parsed.Action)
+	}
+}
+
+func (r *RabbitMQDB) Exec(query string) (int64, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultRabbitMQQueryTimeout)
+	defer cancel()
+	return r.ExecContext(ctx, query)
+}
+
+func (r *RabbitMQDB) ExecContext(ctx context.Context, query string) (int64, error) {
+	if r.client == nil {
+		return 0, fmt.Errorf("连接未打开")
+	}
+	var cmd map[string]interface{}
+	if err := decodeJSONWithUseNumber([]byte(strings.TrimSpace(query)), &cmd); err != nil {
+		return 0, fmt.Errorf("RabbitMQ 写入命令必须是 JSON：%w", err)
+	}
+	if !hasAnyKey(cmd, "publish", "queue", "destination") {
+		return 0, fmt.Errorf("RabbitMQ JSON 写入命令仅支持 publish/queue/destination 形式的消息发送")
+	}
+
+	vhost := rabbitmqResolveVHost(firstStringValue(cmd, "vhost", "database"), r.defaultVHost)
+	queue := rabbitmqResolveQueue(firstStringValue(cmd, "publish", "queue", "destination"), r.defaultQueue)
+	if queue == "" {
+		return 0, fmt.Errorf("RabbitMQ publish 命令缺少 queue")
+	}
+	exchange := rabbitmqNormalizeExchangeName(firstStringValue(cmd, "exchange"), r.defaultExchange)
+	routingKey := strings.TrimSpace(firstNonEmpty(firstStringValue(cmd, "routing_key", "routingKey", "route", "routing"), queue))
+	if routingKey == "" {
+		return 0, fmt.Errorf("RabbitMQ publish 命令缺少 routing_key")
+	}
+	if !hasAnyKey(cmd, "payload", "value", "body", "message") {
+		return 0, fmt.Errorf("RabbitMQ publish 命令缺少 payload")
+	}
+	payload := firstExisting(cmd, "payload", "value", "body", "message")
+
+	properties, err := rabbitmqMapPayload(firstExisting(cmd, "properties", "props"))
+	if err != nil {
+		return 0, fmt.Errorf("RabbitMQ properties 必须是 JSON 对象：%w", err)
+	}
+	headers, err := rabbitmqMapPayload(firstExisting(cmd, "headers"))
+	if err != nil {
+		return 0, fmt.Errorf("RabbitMQ headers 必须是 JSON 对象：%w", err)
+	}
+	if len(headers) > 0 {
+		if properties == nil {
+			properties = map[string]interface{}{}
+		}
+		existingHeaders, err := rabbitmqMapPayload(firstExisting(properties, "headers"))
+		if err != nil {
+			return 0, fmt.Errorf("RabbitMQ properties.headers 必须是 JSON 对象：%w", err)
+		}
+		if existingHeaders == nil {
+			existingHeaders = map[string]interface{}{}
+		}
+		for key, value := range headers {
+			existingHeaders[key] = value
+		}
+		properties["headers"] = existingHeaders
+	}
+
+	return r.publishMessage(ctx, vhost, exchange, routingKey, payload, properties)
+}
+
+func (r *RabbitMQDB) GetDatabases() ([]string, error) {
+	if r.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	items, err := r.listVHosts(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+	names := make([]string, 0, len(items))
+	for _, item := range items {
+		if name := mapString(item, "name"); name != "" {
+			names = append(names, name)
+		}
+	}
+	if len(names) == 0 {
+		names = append(names, rabbitmqResolveVHost("", r.defaultVHost))
+	}
+	sort.Strings(names)
+	return names, nil
+}
+
+func (r *RabbitMQDB) GetTables(dbName string) ([]string, error) {
+	if r.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	vhost := rabbitmqResolveVHost(dbName, r.defaultVHost)
+	items, err := r.listQueues(ctx, vhost, 0)
+	if err != nil {
+		return nil, err
+	}
+	names := make([]string, 0, len(items))
+	for _, item := range items {
+		if name := mapString(item, "name"); name != "" {
+			names = append(names, name)
+		}
+	}
+	sort.Strings(names)
+	return names, nil
+}
+
+func (r *RabbitMQDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	if r.client == nil {
+		return "", fmt.Errorf("连接未打开")
+	}
+	vhost := rabbitmqResolveVHost(dbName, r.defaultVHost)
+	queue := rabbitmqResolveQueue(tableName, r.defaultQueue)
+	if queue == "" {
+		return "", fmt.Errorf("RabbitMQ queue 不能为空")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	info, err := r.getQueueInfo(ctx, vhost, queue)
+	if err != nil {
+		return "", err
+	}
+	payload, _ := json.MarshalIndent(info, "", "  ")
+	return fmt.Sprintf("// RabbitMQ queue: %s @ %s\n%s", queue, vhost, string(payload)), nil
+}
+
+func (r *RabbitMQDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	if r.client == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	vhost := rabbitmqResolveVHost(dbName, r.defaultVHost)
+	queue := rabbitmqResolveQueue(tableName, r.defaultQueue)
+	if queue == "" {
+		return nil, fmt.Errorf("RabbitMQ queue 不能为空")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	items, err := r.getQueueMessages(ctx, vhost, queue, 20)
+	if err != nil {
+		return nil, err
+	}
+	rows := rabbitmqMessageRows(vhost, queue, items)
+	columns := []connection.ColumnDefinition{
+		{Name: "vhost", Type: "string", Nullable: "NO", Comment: "RabbitMQ virtual host"},
+		{Name: "queue", Type: "string", Nullable: "NO", Key: "PRI", Comment: "RabbitMQ queue"},
+		{Name: "exchange", Type: "string", Nullable: "YES", Comment: "Exchange used for routing"},
+		{Name: "routing_key", Type: "string", Nullable: "YES", Comment: "RabbitMQ routing key"},
+		{Name: "redelivered", Type: "bool", Nullable: "YES", Comment: "Whether the message was redelivered"},
+		{Name: "message_count", Type: "int", Nullable: "YES", Comment: "Remaining messages after this delivery"},
+		{Name: "payload", Type: "json", Nullable: "YES", Comment: "Message payload"},
+		{Name: "payload_encoding", Type: "string", Nullable: "YES", Comment: "RabbitMQ payload encoding"},
+		{Name: "payload_bytes", Type: "int", Nullable: "YES", Comment: "Payload size in bytes"},
+		{Name: "properties", Type: "json", Nullable: "YES", Comment: "AMQP properties"},
+		{Name: "headers", Type: "json", Nullable: "YES", Comment: "AMQP headers"},
+	}
+	seen := map[string]struct{}{
+		"vhost": {}, "queue": {}, "exchange": {}, "routing_key": {}, "redelivered": {},
+		"message_count": {}, "payload": {}, "payload_encoding": {}, "payload_bytes": {},
+		"properties": {}, "headers": {},
+	}
+	for _, row := range rows {
+		for key, value := range row {
+			if _, exists := seen[key]; exists {
+				continue
+			}
+			if !strings.HasPrefix(key, "payload.") && !strings.HasPrefix(key, "properties.") && !strings.HasPrefix(key, "headers.") {
+				continue
+			}
+			seen[key] = struct{}{}
+			columns = append(columns, connection.ColumnDefinition{
+				Name:     key,
+				Type:     inferChromaValueType(value),
+				Nullable: "YES",
+				Comment:  "Derived RabbitMQ field",
+			})
+		}
+	}
+	return columns, nil
+}
+
+func (r *RabbitMQDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	tables, err := r.GetTables(dbName)
+	if err != nil {
+		return nil, err
+	}
+	var result []connection.ColumnDefinitionWithTable
+	for _, table := range tables {
+		columns, err := r.GetColumns(dbName, table)
+		if err != nil {
+			return nil, err
+		}
+		for _, column := range columns {
+			result = append(result, connection.ColumnDefinitionWithTable{
+				TableName: table,
+				Name:      column.Name,
+				Type:      column.Type,
+				Comment:   column.Comment,
+			})
+		}
+	}
+	return result, nil
+}
+
+func (r *RabbitMQDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	return []connection.IndexDefinition{}, nil
+}
+
+func (r *RabbitMQDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return []connection.ForeignKeyDefinition{}, nil
+}
+
+func (r *RabbitMQDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return []connection.TriggerDefinition{}, nil
+}
+
+func (r *RabbitMQDB) ApplyChanges(tableName string, changes connection.ChangeSet) error {
+	if len(changes.Inserts) == 0 && len(changes.Updates) == 0 && len(changes.Deletes) == 0 {
+		return nil
+	}
+	return fmt.Errorf("RabbitMQ 结果集仅支持只读预览；如需写入请在 SQL 编辑器执行 JSON publish 命令")
+}
+
+func normalizeRabbitMQConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
+	runConfig := applyRabbitMQURI(config)
+	if strings.TrimSpace(runConfig.Host) == "" {
+		runConfig.Host = "localhost"
+	}
+	if runConfig.Port <= 0 {
+		runConfig.Port = defaultRabbitMQPort
+	}
+	params := rabbitmqConnectionParams(runConfig)
+	if rabbitmqBoolValue(firstNonEmpty(params.Get("ssl"), params.Get("tls"), params.Get("useSSL"), params.Get("use_ssl"))) {
+		runConfig.UseSSL = true
+	}
+	if strings.TrimSpace(runConfig.SSLMode) == "" && runConfig.UseSSL {
+		if rabbitmqBoolValue(firstNonEmpty(params.Get("skip_verify"), params.Get("skipVerify"), params.Get("insecure"))) {
+			runConfig.SSLMode = "skip-verify"
+		} else {
+			runConfig.SSLMode = "required"
+		}
+	}
+	return runConfig
+}
+
+func applyRabbitMQURI(config connection.ConnectionConfig) connection.ConnectionConfig {
+	uriText := strings.TrimSpace(config.URI)
+	if uriText == "" {
+		return config
+	}
+	parsed, err := url.Parse(uriText)
+	if err != nil {
+		return config
+	}
+	scheme := strings.ToLower(strings.TrimSpace(parsed.Scheme))
+	if scheme != "rabbitmq" && scheme != "http" && scheme != "https" {
+		return config
+	}
+	if parsed.User != nil {
+		if strings.TrimSpace(config.User) == "" {
+			config.User = parsed.User.Username()
+		}
+		if pass, ok := parsed.User.Password(); ok && config.Password == "" {
+			config.Password = pass
+		}
+	}
+	host, port, ok := parseHostPortWithDefault(parsed.Host, defaultRabbitMQPort)
+	if ok {
+		config.Host = host
+		config.Port = port
+	}
+	if vhost := rabbitmqDecodePathValue(parsed.Path); vhost != "" && strings.TrimSpace(config.Database) == "" {
+		config.Database = vhost
+	}
+	if scheme == "https" {
+		config.UseSSL = true
+		if strings.TrimSpace(config.SSLMode) == "" {
+			config.SSLMode = "required"
+		}
+	}
+	return config
+}
+
+func rabbitmqConnectionParams(config connection.ConnectionConfig) url.Values {
+	params := url.Values{}
+	mergeConnectionParamValues(params, connectionParamsFromURI(config.URI, "rabbitmq", "http", "https"))
+	mergeConnectionParamValues(params, connectionParamsFromText(config.ConnectionParams))
+	return params
+}
+
+func rabbitmqDecodePathValue(path string) string {
+	trimmed := strings.TrimPrefix(strings.TrimSpace(path), "/")
+	if trimmed == "" {
+		return ""
+	}
+	decoded, err := url.PathUnescape(trimmed)
+	if err != nil {
+		return trimmed
+	}
+	return decoded
+}
+
+func rabbitmqResolveVHost(raw string, fallback string) string {
+	if text := strings.TrimSpace(raw); text != "" {
+		return text
+	}
+	if text := strings.TrimSpace(fallback); text != "" {
+		return text
+	}
+	return rabbitMQDefaultVHost
+}
+
+func rabbitmqResolveQueue(raw string, fallback string) string {
+	if text := strings.TrimSpace(raw); text != "" {
+		return text
+	}
+	return strings.TrimSpace(fallback)
+}
+
+func rabbitmqNormalizeExchangeName(raw string, fallback string) string {
+	text := strings.TrimSpace(firstNonEmpty(raw, fallback))
+	switch text {
+	case "(default)", "amq.default":
+		return ""
+	default:
+		return text
+	}
+}
+
+func rabbitmqPageSize(params url.Values) int {
+	size := intFromAny(firstNonEmpty(params.Get("pageSize"), params.Get("page_size")), defaultRabbitMQPageSize)
+	if size <= 0 {
+		size = defaultRabbitMQPageSize
+	}
+	if size > maxRabbitMQPageSize {
+		size = maxRabbitMQPageSize
+	}
+	return size
+}
+
+func buildRabbitMQBaseURL(config connection.ConnectionConfig) string {
+	scheme := "http"
+	if config.UseSSL {
+		scheme = "https"
+	}
+	params := rabbitmqConnectionParams(config)
+	prefix := strings.TrimSpace(firstNonEmpty(params.Get("managementPathPrefix"), params.Get("pathPrefix")))
+	if prefix != "" {
+		prefix = "/" + strings.Trim(strings.TrimSpace(prefix), "/")
+	}
+	return (&url.URL{
+		Scheme: scheme,
+		Host:   net.JoinHostPort(strings.TrimSpace(config.Host), strconv.Itoa(config.Port)),
+		Path:   prefix,
+	}).String()
+}
+
+func buildRabbitMQHTTPClient(config connection.ConnectionConfig) *http.Client {
+	transport := http.DefaultTransport.(*http.Transport).Clone()
+	if tlsConfig, err := resolveGenericTLSConfig(config); err == nil && tlsConfig != nil {
+		transport.TLSClientConfig = tlsConfig
+	}
+	if config.UseProxy {
+		proxyCfg := config.Proxy
+		transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+			return proxytunnel.DialContext(ctx, proxyCfg, network, addr)
+		}
+	}
+	return &http.Client{Transport: transport, Timeout: getConnectTimeout(config)}
+}
+
+func rabbitmqAuthHeaders(config connection.ConnectionConfig) map[string]string {
+	headers := map[string]string{}
+	if user := strings.TrimSpace(config.User); user != "" {
+		raw := user + ":" + config.Password
+		headers["Authorization"] = "Basic " + base64.StdEncoding.EncodeToString([]byte(raw))
+	}
+	params := rabbitmqConnectionParams(config)
+	if headerName := strings.TrimSpace(params.Get("authHeader")); headerName != "" {
+		if headerValue := strings.TrimSpace(params.Get("authHeaderValue")); headerValue != "" && isSafeConnectionParamKey(headerName) {
+			headers[headerName] = headerValue
+		}
+	}
+	return headers
+}
+
+func (r *RabbitMQDB) doJSON(ctx context.Context, method, path string, body interface{}, out interface{}) error {
+	if r.client == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	var payload io.Reader
+	if body != nil {
+		data, err := json.Marshal(body)
+		if err != nil {
+			return err
+		}
+		payload = strings.NewReader(string(data))
+	}
+	req, err := http.NewRequestWithContext(ctx, method, strings.TrimRight(r.baseURL, "/")+path, payload)
+	if err != nil {
+		return err
+	}
+	req.Header.Set("Accept", "application/json")
+	if body != nil {
+		req.Header.Set("Content-Type", "application/json")
+	}
+	for key, value := range r.authHeaders {
+		req.Header.Set(key, value)
+	}
+	resp, err := r.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	data, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		message := strings.TrimSpace(string(data))
+		var errBody map[string]interface{}
+		if decodeJSONWithUseNumber(data, &errBody) == nil {
+			message = strings.TrimSpace(firstNonEmpty(
+				mapString(errBody, "error"),
+				mapString(errBody, "reason"),
+				mapString(errBody, "message"),
+				message,
+			))
+		}
+		if message == "" {
+			message = resp.Status
+		}
+		return fmt.Errorf("RabbitMQ HTTP API %s %s 失败：%s", method, path, message)
+	}
+	if out == nil || len(data) == 0 {
+		return nil
+	}
+	if err := decodeJSONWithUseNumber(data, out); err != nil {
+		return fmt.Errorf("解析 RabbitMQ HTTP API 响应失败：%w", err)
+	}
+	return nil
+}
+
+func (r *RabbitMQDB) listVHosts(ctx context.Context, limit int) ([]map[string]interface{}, error) {
+	return r.listCollection(ctx, "/api/vhosts", limit, nil)
+}
+
+func (r *RabbitMQDB) listQueues(ctx context.Context, vhost string, limit int) ([]map[string]interface{}, error) {
+	params := url.Values{}
+	params.Set("disable_stats", "true")
+	params.Set("enable_queue_totals", "true")
+	return r.listCollection(ctx, fmt.Sprintf("/api/queues/%s", url.PathEscape(vhost)), limit, params)
+}
+
+func (r *RabbitMQDB) listExchanges(ctx context.Context, vhost string, limit int) ([]map[string]interface{}, error) {
+	return r.listCollection(ctx, fmt.Sprintf("/api/exchanges/%s", url.PathEscape(vhost)), limit, nil)
+}
+
+func (r *RabbitMQDB) listCollection(ctx context.Context, path string, limit int, extraParams url.Values) ([]map[string]interface{}, error) {
+	pageSize := r.pageSize
+	if pageSize <= 0 {
+		pageSize = defaultRabbitMQPageSize
+	}
+	if limit > 0 && limit < pageSize {
+		pageSize = limit
+	}
+	if pageSize <= 0 {
+		pageSize = defaultRabbitMQPageSize
+	}
+	if pageSize > maxRabbitMQPageSize {
+		pageSize = maxRabbitMQPageSize
+	}
+
+	var result []map[string]interface{}
+	for page := 1; ; page++ {
+		query := url.Values{}
+		for key, values := range extraParams {
+			for _, value := range values {
+				query.Add(key, value)
+			}
+		}
+		query.Set("page", strconv.Itoa(page))
+		query.Set("page_size", strconv.Itoa(pageSize))
+		query.Set("pagination", "true")
+
+		requestPath := path
+		if encoded := query.Encode(); encoded != "" {
+			requestPath += "?" + encoded
+		}
+
+		var raw interface{}
+		if err := r.doJSON(ctx, http.MethodGet, requestPath, nil, &raw); err != nil {
+			return nil, err
+		}
+		items, pageCount, err := rabbitmqItemsFromResponse(raw)
+		if err != nil {
+			return nil, err
+		}
+		result = append(result, items...)
+		if limit > 0 && len(result) >= limit {
+			return result[:limit], nil
+		}
+		if pageCount <= page || len(items) == 0 {
+			break
+		}
+	}
+	return result, nil
+}
+
+func rabbitmqItemsFromResponse(raw interface{}) ([]map[string]interface{}, int, error) {
+	switch typed := raw.(type) {
+	case []interface{}:
+		return rabbitmqMapSlice(typed)
+	case []map[string]interface{}:
+		return typed, 1, nil
+	case map[string]interface{}:
+		itemsRaw, ok := typed["items"]
+		if !ok {
+			return nil, 0, fmt.Errorf("RabbitMQ 列表响应缺少 items 字段")
+		}
+		items, _, err := rabbitmqItemsFromResponse(itemsRaw)
+		if err != nil {
+			return nil, 0, err
+		}
+		return items, intFromAny(typed["page_count"], 1), nil
+	default:
+		return nil, 0, fmt.Errorf("无法解析 RabbitMQ 列表响应")
+	}
+}
+
+func rabbitmqMapSlice(raw []interface{}) ([]map[string]interface{}, int, error) {
+	result := make([]map[string]interface{}, 0, len(raw))
+	for _, item := range raw {
+		row, ok := item.(map[string]interface{})
+		if !ok {
+			return nil, 0, fmt.Errorf("RabbitMQ 列表项不是对象")
+		}
+		result = append(result, row)
+	}
+	return result, 1, nil
+}
+
+func (r *RabbitMQDB) getQueueInfo(ctx context.Context, vhost string, queue string) (map[string]interface{}, error) {
+	params := url.Values{}
+	params.Set("disable_stats", "true")
+	params.Set("enable_queue_totals", "true")
+	path := fmt.Sprintf("/api/queues/%s/%s?%s", url.PathEscape(vhost), url.PathEscape(queue), params.Encode())
+	var info map[string]interface{}
+	if err := r.doJSON(ctx, http.MethodGet, path, nil, &info); err != nil {
+		return nil, err
+	}
+	return info, nil
+}
+
+func (r *RabbitMQDB) getExchangeInfo(ctx context.Context, vhost string, exchange string) (map[string]interface{}, error) {
+	path := fmt.Sprintf("/api/exchanges/%s/%s", url.PathEscape(vhost), url.PathEscape(exchange))
+	var info map[string]interface{}
+	if err := r.doJSON(ctx, http.MethodGet, path, nil, &info); err != nil {
+		return nil, err
+	}
+	return info, nil
+}
+
+func (r *RabbitMQDB) getQueueMessages(ctx context.Context, vhost string, queue string, limit int) ([]map[string]interface{}, error) {
+	if limit <= 0 {
+		limit = defaultRabbitMQPreviewLimit
+	}
+	body := map[string]interface{}{
+		"count":    limit,
+		"ackmode":  "ack_requeue_true",
+		"encoding": "auto",
+		"truncate": 50000,
+	}
+	path := fmt.Sprintf("/api/queues/%s/%s/get", url.PathEscape(vhost), url.PathEscape(queue))
+	var result []map[string]interface{}
+	if err := r.doJSON(ctx, http.MethodPost, path, body, &result); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+func (r *RabbitMQDB) publishMessage(ctx context.Context, vhost string, exchange string, routingKey string, payload interface{}, properties map[string]interface{}) (int64, error) {
+	payloadText, encoding, err := rabbitmqEncodePayload(payload)
+	if err != nil {
+		return 0, err
+	}
+	if properties == nil {
+		properties = map[string]interface{}{}
+	}
+	if _, exists := properties["content_type"]; !exists {
+		switch payload.(type) {
+		case map[string]interface{}, []interface{}:
+			properties["content_type"] = "application/json"
+		}
+	}
+	body := map[string]interface{}{
+		"properties":       properties,
+		"routing_key":      routingKey,
+		"payload":          payloadText,
+		"payload_encoding": encoding,
+	}
+	path := fmt.Sprintf("/api/exchanges/%s/%s/publish", url.PathEscape(vhost), url.PathEscape(exchange))
+	var result map[string]interface{}
+	if err := r.doJSON(ctx, http.MethodPut, path, body, &result); err != nil {
+		return 0, err
+	}
+	if !rabbitmqBoolAny(result["routed"]) {
+		return 0, fmt.Errorf("RabbitMQ publish 未路由到任何队列")
+	}
+	return 1, nil
+}
+
+type rabbitmqParsedSQL struct {
+	Action string
+	VHost  string
+	Name   string
+	Limit  int
+	Offset int
+	Count  bool
+}
+
+var (
+	rabbitmqSQLFromRE          = regexp.MustCompile(`(?i)\bFROM\s+(?:"([^"]*)"|` + "`" + `([^` + "`" + `]*)` + "`" + `|([^\s;]+))`)
+	rabbitmqSQLLimitRE         = regexp.MustCompile(`(?i)\bLIMIT\s+(\d+)`)
+	rabbitmqSQLOffsetRE        = regexp.MustCompile(`(?i)\bOFFSET\s+(\d+)`)
+	rabbitmqShowVHostsRE       = regexp.MustCompile(`(?i)^\s*SHOW\s+VHOSTS(?:\s+LIMIT\s+(\d+))?\s*$`)
+	rabbitmqShowQueuesRE       = regexp.MustCompile(`(?i)^\s*SHOW\s+QUEUES(?:\s+LIMIT\s+(\d+))?\s*$`)
+	rabbitmqShowExchangesRE    = regexp.MustCompile(`(?i)^\s*SHOW\s+EXCHANGES(?:\s+LIMIT\s+(\d+))?\s*$`)
+	rabbitmqDescribeQueueRE    = regexp.MustCompile(`(?i)^\s*(?:SHOW|DESCRIBE)\s+QUEUE\s+(?:"([^"]*)"|` + "`" + `([^` + "`" + `]*)` + "`" + `|([^\s;]+))\s*$`)
+	rabbitmqDescribeExchangeRE = regexp.MustCompile(`(?i)^\s*(?:SHOW|DESCRIBE)\s+EXCHANGE\s+(?:"([^"]*)"|` + "`" + `([^` + "`" + `]*)` + "`" + `|([^\s;]+))\s*$`)
+	rabbitmqConsumeQueueRE     = regexp.MustCompile(`(?i)^\s*CONSUME\s+FROM\s+(?:"([^"]*)"|` + "`" + `([^` + "`" + `]*)` + "`" + `|([^\s;]+))`)
+)
+
+func parseRabbitMQSQL(sqlText string) (rabbitmqParsedSQL, bool) {
+	text := strings.TrimSpace(sqlText)
+	if text == "" {
+		return rabbitmqParsedSQL{}, false
+	}
+	if matches := rabbitmqShowVHostsRE.FindStringSubmatch(text); len(matches) > 0 {
+		return rabbitmqParsedSQL{Action: "show_vhosts", Limit: rabbitmqMatchLimit(matches, 1)}, true
+	}
+	if matches := rabbitmqShowQueuesRE.FindStringSubmatch(text); len(matches) > 0 {
+		return rabbitmqParsedSQL{Action: "show_queues", Limit: rabbitmqMatchLimit(matches, 1)}, true
+	}
+	if matches := rabbitmqShowExchangesRE.FindStringSubmatch(text); len(matches) > 0 {
+		return rabbitmqParsedSQL{Action: "show_exchanges", Limit: rabbitmqMatchLimit(matches, 1)}, true
+	}
+	if matches := rabbitmqDescribeQueueRE.FindStringSubmatch(text); len(matches) > 0 {
+		return rabbitmqParsedSQL{
+			Action: "describe_queue",
+			Name:   firstNonEmpty(matches[1], matches[2], matches[3]),
+		}, true
+	}
+	if matches := rabbitmqDescribeExchangeRE.FindStringSubmatch(text); len(matches) > 0 {
+		return rabbitmqParsedSQL{
+			Action: "describe_exchange",
+			Name:   firstNonEmpty(matches[1], matches[2], matches[3]),
+		}, true
+	}
+	if matches := rabbitmqConsumeQueueRE.FindStringSubmatch(text); len(matches) > 0 {
+		parsed := rabbitmqParsedSQL{
+			Action: "consume",
+			Name:   firstNonEmpty(matches[1], matches[2], matches[3]),
+			Limit:  defaultRabbitMQPreviewLimit,
+		}
+		if limitMatch := rabbitmqSQLLimitRE.FindStringSubmatch(text); len(limitMatch) > 1 {
+			parsed.Limit, _ = strconv.Atoi(limitMatch[1])
+		}
+		if offsetMatch := rabbitmqSQLOffsetRE.FindStringSubmatch(text); len(offsetMatch) > 1 {
+			parsed.Offset, _ = strconv.Atoi(offsetMatch[1])
+		}
+		return parsed, true
+	}
+	if !strings.HasPrefix(strings.ToLower(text), "select") {
+		return rabbitmqParsedSQL{}, false
+	}
+	matches := rabbitmqSQLFromRE.FindStringSubmatch(text)
+	if len(matches) == 0 {
+		return rabbitmqParsedSQL{}, false
+	}
+	parsed := rabbitmqParsedSQL{
+		Action: "select",
+		Name:   firstNonEmpty(matches[1], matches[2], matches[3]),
+		Limit:  defaultRabbitMQPreviewLimit,
+		Count:  strings.Contains(strings.ToLower(text), "count("),
+	}
+	if limitMatch := rabbitmqSQLLimitRE.FindStringSubmatch(text); len(limitMatch) > 1 {
+		parsed.Limit, _ = strconv.Atoi(limitMatch[1])
+	}
+	if offsetMatch := rabbitmqSQLOffsetRE.FindStringSubmatch(text); len(offsetMatch) > 1 {
+		parsed.Offset, _ = strconv.Atoi(offsetMatch[1])
+	}
+	return parsed, true
+}
+
+func rabbitmqMatchLimit(matches []string, index int) int {
+	if index >= len(matches) || strings.TrimSpace(matches[index]) == "" {
+		return 0
+	}
+	limit, _ := strconv.Atoi(matches[index])
+	return limit
+}
+
+func rabbitmqVHostRows(items []map[string]interface{}) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(items))
+	for _, item := range items {
+		row := map[string]interface{}{
+			"vhost":   mapString(item, "name"),
+			"tracing": rabbitmqBoolAny(item["tracing"]),
+		}
+		if desc := mapString(item, "description"); desc != "" {
+			row["description"] = desc
+		}
+		if tags := mapString(item, "tags"); tags != "" {
+			row["tags"] = tags
+		}
+		if value := mapString(item, "default_queue_type"); value != "" {
+			row["default_queue_type"] = value
+		}
+		if state, ok := item["cluster_state"].(map[string]interface{}); ok && len(state) > 0 {
+			row["cluster_state"] = state
+		}
+		rows = append(rows, row)
+	}
+	return rows
+}
+
+func rabbitmqQueueRows(items []map[string]interface{}) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(items))
+	for _, item := range items {
+		rows = append(rows, rabbitmqQueueRow(item))
+	}
+	return rows
+}
+
+func rabbitmqQueueRow(item map[string]interface{}) map[string]interface{} {
+	row := map[string]interface{}{
+		"vhost":                   mapString(item, "vhost"),
+		"queue":                   mapString(item, "name"),
+		"durable":                 rabbitmqBoolAny(item["durable"]),
+		"auto_delete":             rabbitmqBoolAny(item["auto_delete"]),
+		"exclusive":               rabbitmqBoolAny(item["exclusive"]),
+		"consumers":               intFromAny(item["consumers"], 0),
+		"messages":                intFromAny(item["messages"], 0),
+		"messages_ready":          intFromAny(item["messages_ready"], 0),
+		"messages_unacknowledged": intFromAny(item["messages_unacknowledged"], 0),
+	}
+	if node := mapString(item, "node"); node != "" {
+		row["node"] = node
+	}
+	if state := mapString(item, "state"); state != "" {
+		row["state"] = state
+	}
+	if queueType := mapString(item, "type"); queueType != "" {
+		row["type"] = queueType
+	}
+	if args, ok := item["arguments"].(map[string]interface{}); ok && len(args) > 0 {
+		row["arguments"] = args
+	}
+	return row
+}
+
+func rabbitmqExchangeRows(items []map[string]interface{}) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(items))
+	for _, item := range items {
+		rows = append(rows, rabbitmqExchangeRow(item))
+	}
+	return rows
+}
+
+func rabbitmqExchangeRow(item map[string]interface{}) map[string]interface{} {
+	name := mapString(item, "name")
+	row := map[string]interface{}{
+		"vhost":       mapString(item, "vhost"),
+		"exchange":    name,
+		"durable":     rabbitmqBoolAny(item["durable"]),
+		"auto_delete": rabbitmqBoolAny(item["auto_delete"]),
+		"internal":    rabbitmqBoolAny(item["internal"]),
+	}
+	if name == "" {
+		row["exchange_display"] = "(default)"
+	}
+	if exchangeType := mapString(item, "type"); exchangeType != "" {
+		row["type"] = exchangeType
+	}
+	if args, ok := item["arguments"].(map[string]interface{}); ok && len(args) > 0 {
+		row["arguments"] = args
+	}
+	return row
+}
+
+func rabbitmqMessageRows(vhost string, queue string, items []map[string]interface{}) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(items))
+	for _, item := range items {
+		row := map[string]interface{}{
+			"vhost":            vhost,
+			"queue":            queue,
+			"exchange":         mapString(item, "exchange"),
+			"routing_key":      mapString(item, "routing_key"),
+			"redelivered":      rabbitmqBoolAny(item["redelivered"]),
+			"message_count":    intFromAny(item["message_count"], 0),
+			"payload_bytes":    intFromAny(item["payload_bytes"], 0),
+			"payload_encoding": mapString(item, "payload_encoding"),
+		}
+		payload := rabbitmqDecodePayload(item["payload"], row["payload_encoding"])
+		if payload != nil {
+			row["payload"] = payload
+			if payloadMap, ok := payload.(map[string]interface{}); ok {
+				flattenRabbitMQMap("payload", payloadMap, row)
+			}
+		}
+		if properties, ok := item["properties"].(map[string]interface{}); ok && len(properties) > 0 {
+			row["properties"] = properties
+			flattenRabbitMQMap("properties", properties, row)
+			if headers, ok := properties["headers"].(map[string]interface{}); ok && len(headers) > 0 {
+				row["headers"] = headers
+				flattenRabbitMQMap("headers", headers, row)
+			}
+		}
+		rows = append(rows, row)
+	}
+	return rows
+}
+
+func flattenRabbitMQMap(prefix string, values map[string]interface{}, row map[string]interface{}) {
+	for key, value := range values {
+		if strings.TrimSpace(key) == "" {
+			continue
+		}
+		name := prefix + "." + key
+		row[name] = value
+		if nested, ok := value.(map[string]interface{}); ok {
+			flattenRabbitMQMap(name, nested, row)
+		}
+	}
+}
+
+func rabbitmqDecodePayload(raw interface{}, encodingValue interface{}) interface{} {
+	switch value := raw.(type) {
+	case nil:
+		return nil
+	case string:
+		encoding := strings.ToLower(strings.TrimSpace(fmt.Sprintf("%v", encodingValue)))
+		if encoding == "base64" {
+			data, err := base64.StdEncoding.DecodeString(value)
+			if err == nil {
+				var decoded interface{}
+				if decodeJSONWithUseNumber(data, &decoded) == nil {
+					return decoded
+				}
+				return bytesToDisplayValue(data, "")
+			}
+		}
+		var decoded interface{}
+		if decodeJSONWithUseNumber([]byte(value), &decoded) == nil {
+			return decoded
+		}
+		return value
+	default:
+		return value
+	}
+}
+
+func rabbitmqEncodePayload(payload interface{}) (string, string, error) {
+	switch typed := payload.(type) {
+	case nil:
+		return "", "string", nil
+	case string:
+		return typed, "string", nil
+	case []byte:
+		return base64.StdEncoding.EncodeToString(typed), "base64", nil
+	case json.Number:
+		return typed.String(), "string", nil
+	case bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, float32, float64:
+		return fmt.Sprintf("%v", typed), "string", nil
+	case map[string]interface{}, []interface{}:
+		data, err := json.Marshal(typed)
+		if err != nil {
+			return "", "", err
+		}
+		return string(data), "string", nil
+	default:
+		data, err := json.Marshal(typed)
+		if err != nil {
+			return "", "", err
+		}
+		return string(data), "string", nil
+	}
+}
+
+func rabbitmqMapPayload(raw interface{}) (map[string]interface{}, error) {
+	if raw == nil {
+		return nil, nil
+	}
+	value, ok := raw.(map[string]interface{})
+	if !ok {
+		return nil, fmt.Errorf("不是对象")
+	}
+	return value, nil
+}
+
+func rabbitmqBoolValue(raw string) bool {
+	switch strings.ToLower(strings.TrimSpace(raw)) {
+	case "1", "true", "yes", "on", "required":
+		return true
+	default:
+		return false
+	}
+}
+
+func rabbitmqBoolAny(raw interface{}) bool {
+	switch value := raw.(type) {
+	case bool:
+		return value
+	case json.Number:
+		n, err := value.Int64()
+		return err == nil && n != 0
+	case float64:
+		return value != 0
+	case int:
+		return value != 0
+	case int64:
+		return value != 0
+	case string:
+		return rabbitmqBoolValue(value)
+	default:
+		return false
+	}
+}
diff --git a/internal/db/rabbitmq_impl_test.go b/internal/db/rabbitmq_impl_test.go
new file mode 100644
index 0000000..bde9b46
--- /dev/null
+++ b/internal/db/rabbitmq_impl_test.go
@@ -0,0 +1,258 @@
+package db
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"reflect"
+	"strings"
+	"testing"
+
+	"GoNavi-Wails/internal/connection"
+)
+
+func TestNormalizeRabbitMQConfigParsesURIAndParams(t *testing.T) {
+	config := normalizeRabbitMQConfig(connection.ConnectionConfig{
+		URI:              "rabbitmq://guest:secret@127.0.0.1:15672/%2F?tls=true&skip_verify=true",
+		ConnectionParams: "defaultQueue=orders.events&exchange=events.topic&pageSize=500",
+	})
+
+	if config.Host != "127.0.0.1" || config.Port != 15672 {
+		t.Fatalf("unexpected rabbitmq host/port: %#v", config)
+	}
+	if config.User != "guest" || config.Password != "secret" {
+		t.Fatalf("unexpected rabbitmq credentials: %#v", config)
+	}
+	if config.Database != "/" {
+		t.Fatalf("expected default vhost '/', got %q", config.Database)
+	}
+	if !config.UseSSL || config.SSLMode != "skip-verify" {
+		t.Fatalf("unexpected rabbitmq tls settings: %#v", config)
+	}
+
+	params := rabbitmqConnectionParams(config)
+	if params.Get("defaultQueue") != "orders.events" || params.Get("exchange") != "events.topic" {
+		t.Fatalf("unexpected rabbitmq params: %#v", params)
+	}
+}
+
+func TestRabbitMQQueryExecAndColumns(t *testing.T) {
+	var lastGetCount int
+	var lastPublishBody map[string]interface{}
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		escapedPath := req.URL.EscapedPath()
+		switch {
+		case req.Method == http.MethodGet && escapedPath == "/api/vhosts":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"items":      []map[string]interface{}{{"name": "/", "tracing": false}},
+				"page":       1,
+				"page_count": 1,
+			})
+		case req.Method == http.MethodGet && escapedPath == "/api/queues/%2F":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"items": []map[string]interface{}{
+					{
+						"vhost":                   "/",
+						"name":                    "orders.events.v1",
+						"durable":                 true,
+						"messages":                8,
+						"messages_ready":          5,
+						"messages_unacknowledged": 3,
+						"consumers":               2,
+					},
+				},
+				"page":       1,
+				"page_count": 1,
+			})
+		case req.Method == http.MethodGet && escapedPath == "/api/queues/%2F/orders.events.v1":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"vhost":                   "/",
+				"name":                    "orders.events.v1",
+				"durable":                 true,
+				"messages":                8,
+				"messages_ready":          5,
+				"messages_unacknowledged": 3,
+				"consumers":               2,
+				"node":                    "rabbit@node1",
+			})
+		case req.Method == http.MethodGet && escapedPath == "/api/exchanges/%2F":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"items": []map[string]interface{}{
+					{
+						"vhost":    "/",
+						"name":     "events.topic",
+						"type":     "topic",
+						"durable":  true,
+						"internal": false,
+					},
+				},
+				"page":       1,
+				"page_count": 1,
+			})
+		case req.Method == http.MethodPost && escapedPath == "/api/queues/%2F/orders.events.v1/get":
+			var body map[string]interface{}
+			if err := json.NewDecoder(req.Body).Decode(&body); err != nil {
+				t.Fatalf("decode get body failed: %v", err)
+			}
+			lastGetCount = intFromAny(body["count"], 0)
+			_ = json.NewEncoder(w).Encode([]map[string]interface{}{
+				{
+					"exchange":         "events.topic",
+					"routing_key":      "orders.events.v1",
+					"payload":          `{"event":"created","meta":{"ip":"127.0.0.1"}}`,
+					"payload_bytes":    46,
+					"payload_encoding": "string",
+					"redelivered":      false,
+					"message_count":    7,
+					"properties": map[string]interface{}{
+						"content_type": "application/json",
+						"headers": map[string]interface{}{
+							"x-env": "dev",
+						},
+					},
+				},
+				{
+					"exchange":         "events.topic",
+					"routing_key":      "orders.events.v1",
+					"payload":          "plain-text",
+					"payload_bytes":    10,
+					"payload_encoding": "string",
+					"redelivered":      true,
+					"message_count":    6,
+					"properties": map[string]interface{}{
+						"headers": map[string]interface{}{
+							"x-env": "qa",
+						},
+					},
+				},
+			})
+		case req.Method == http.MethodPut && escapedPath == "/api/exchanges/%2F/events.topic/publish":
+			if err := json.NewDecoder(req.Body).Decode(&lastPublishBody); err != nil {
+				t.Fatalf("decode publish body failed: %v", err)
+			}
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{"routed": true})
+		default:
+			t.Fatalf("unexpected rabbitmq request: %s %s?%s", req.Method, escapedPath, req.URL.RawQuery)
+		}
+	}))
+	defer server.Close()
+
+	client := &RabbitMQDB{
+		client:          server.Client(),
+		baseURL:         server.URL,
+		defaultVHost:    "/",
+		defaultQueue:    "orders.events.v1",
+		defaultExchange: "events.topic",
+		pageSize:        50,
+	}
+
+	rows, columns, err := client.Query(`SHOW VHOSTS LIMIT 1`)
+	if err != nil {
+		t.Fatalf("SHOW VHOSTS failed: %v", err)
+	}
+	if len(rows) != 1 || rows[0]["vhost"] != "/" {
+		t.Fatalf("unexpected vhost rows: %#v", rows)
+	}
+	if !containsString(columns, "tracing") {
+		t.Fatalf("expected tracing column, got %v", columns)
+	}
+
+	rows, columns, err = client.Query(`SHOW QUEUES LIMIT 1`)
+	if err != nil {
+		t.Fatalf("SHOW QUEUES failed: %v", err)
+	}
+	if len(rows) != 1 || rows[0]["queue"] != "orders.events.v1" {
+		t.Fatalf("unexpected queue rows: %#v", rows)
+	}
+	if !containsString(columns, "messages_ready") {
+		t.Fatalf("expected messages_ready column, got %v", columns)
+	}
+
+	rows, _, err = client.Query(`DESCRIBE QUEUE "orders.events.v1"`)
+	if err != nil {
+		t.Fatalf("DESCRIBE QUEUE failed: %v", err)
+	}
+	if len(rows) != 1 || rows[0]["node"] != "rabbit@node1" {
+		t.Fatalf("unexpected describe queue rows: %#v", rows)
+	}
+
+	rows, columns, err = client.Query(`SHOW EXCHANGES LIMIT 1`)
+	if err != nil {
+		t.Fatalf("SHOW EXCHANGES failed: %v", err)
+	}
+	if len(rows) != 1 || rows[0]["exchange"] != "events.topic" {
+		t.Fatalf("unexpected exchange rows: %#v", rows)
+	}
+	if !containsString(columns, "type") {
+		t.Fatalf("expected exchange type column, got %v", columns)
+	}
+
+	rows, columns, err = client.Query(`SELECT * FROM "orders.events.v1" LIMIT 1 OFFSET 1`)
+	if err != nil {
+		t.Fatalf("SELECT queue failed: %v", err)
+	}
+	if lastGetCount != 2 {
+		t.Fatalf("expected fetch count 2 for offset emulation, got %d", lastGetCount)
+	}
+	if len(rows) != 1 || rows[0]["payload"] != "plain-text" || rows[0]["headers.x-env"] != "qa" {
+		t.Fatalf("unexpected rabbitmq message rows: %#v", rows)
+	}
+	if !containsString(columns, "headers.x-env") {
+		t.Fatalf("expected derived header column, got %v", columns)
+	}
+
+	affected, err := client.Exec(`{"queue":"orders.events.v1","exchange":"events.topic","routing_key":"orders.events.v1","payload":{"id":1},"headers":{"x-env":"dev"}}`)
+	if err != nil {
+		t.Fatalf("rabbitmq publish failed: %v", err)
+	}
+	if affected != 1 {
+		t.Fatalf("unexpected affected rows: %d", affected)
+	}
+	if lastPublishBody["routing_key"] != "orders.events.v1" {
+		t.Fatalf("unexpected publish routing key: %#v", lastPublishBody)
+	}
+	properties, ok := lastPublishBody["properties"].(map[string]interface{})
+	if !ok {
+		t.Fatalf("expected publish properties object, got %#v", lastPublishBody["properties"])
+	}
+	headers, ok := properties["headers"].(map[string]interface{})
+	if !ok || headers["x-env"] != "dev" {
+		t.Fatalf("unexpected publish headers: %#v", properties["headers"])
+	}
+	if lastPublishBody["payload_encoding"] != "string" || !strings.Contains(lastPublishBody["payload"].(string), `"id":1`) {
+		t.Fatalf("unexpected publish payload: %#v", lastPublishBody)
+	}
+
+	columnDefs, err := client.GetColumns("/", "orders.events.v1")
+	if err != nil {
+		t.Fatalf("GetColumns failed: %v", err)
+	}
+	names := make([]string, 0, len(columnDefs))
+	for _, col := range columnDefs {
+		names = append(names, col.Name)
+	}
+	joined := strings.Join(names, ",")
+	for _, want := range []string{"queue", "payload.meta.ip", "headers.x-env", "properties.content_type"} {
+		if !strings.Contains(joined, want) {
+			t.Fatalf("expected derived rabbitmq column %q in %s", want, joined)
+		}
+	}
+
+	databases, err := client.GetDatabases()
+	if err != nil {
+		t.Fatalf("GetDatabases failed: %v", err)
+	}
+	if !reflect.DeepEqual(databases, []string{"/"}) {
+		t.Fatalf("unexpected vhost list: %#v", databases)
+	}
+
+	tables, err := client.GetTables("/")
+	if err != nil {
+		t.Fatalf("GetTables failed: %v", err)
+	}
+	if !reflect.DeepEqual(tables, []string{"orders.events.v1"}) {
+		t.Fatalf("unexpected queue list: %#v", tables)
+	}
+}
diff --git a/internal/db/rocketmq_impl.go b/internal/db/rocketmq_impl.go
new file mode 100644
index 0000000..b091e57
--- /dev/null
+++ b/internal/db/rocketmq_impl.go
@@ -0,0 +1,1482 @@
+package db
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/url"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+
+	rocketmq "github.com/apache/rocketmq-client-go/v2"
+	rocketmqadmin "github.com/apache/rocketmq-client-go/v2/admin"
+	rocketmqconsumer "github.com/apache/rocketmq-client-go/v2/consumer"
+	rocketmqprimitive "github.com/apache/rocketmq-client-go/v2/primitive"
+	rocketmqproducer "github.com/apache/rocketmq-client-go/v2/producer"
+)
+
+const (
+	defaultRocketMQPort           = 9876
+	defaultRocketMQQueryTimeout   = 30 * time.Second
+	defaultRocketMQPreviewLimit   = 100
+	defaultRocketMQPullBatchSize  = 32
+	maxRocketMQPullBatchSize      = 256
+	rocketMQSyntheticDatabase     = "topics"
+	rocketMQDefaultProducerGroup  = "GoNaviRocketMQProducer"
+	rocketMQDefaultConsumerGroup  = "GoNaviRocketMQPreview"
+	rocketMQDefaultInstancePrefix = "GoNavi"
+)
+
+type rocketmqRuntime interface {
+	Close() error
+	Ping(ctx context.Context) error
+	ListTopics(ctx context.Context, includeSystem bool) ([]rocketmqTopicInfo, error)
+	DescribeTopic(ctx context.Context, request rocketmqDescribeRequest) (rocketmqTopicDescription, error)
+	FetchMessages(ctx context.Context, request rocketmqFetchRequest) ([]rocketmqMessageRecord, error)
+	Publish(ctx context.Context, command rocketmqPublishCommand) (int64, error)
+}
+
+type rocketmqDescribeRequest struct {
+	Topic         string
+	ConsumerGroup string
+	TagExpression string
+	PullBatchSize int
+}
+
+type rocketmqTopicInfo struct {
+	Name       string
+	System     bool
+	QueueCount int
+}
+
+type rocketmqTopicDescription struct {
+	Name                 string
+	Namespace            string
+	ConsumerGroup        string
+	TagExpression        string
+	QueueCount           int
+	TotalApproximateCount int64
+	Queues               []rocketmqTopicQueueInfo
+}
+
+type rocketmqTopicQueueInfo struct {
+	BrokerName       string
+	QueueID          int
+	MinOffset        int64
+	MaxOffset        int64
+	ApproximateCount int64
+}
+
+type rocketmqFetchRequest struct {
+	Topic         string
+	Limit         int
+	Offset        int
+	ConsumerGroup string
+	TagExpression string
+	Latest        bool
+	PullBatchSize int
+}
+
+type rocketmqPublishCommand struct {
+	Topic      string
+	Payload    interface{}
+	Tag        string
+	Keys       []string
+	DelayLevel int
+	Properties map[string]string
+}
+
+type rocketmqMessageRecord struct {
+	Topic          string
+	BrokerName     string
+	QueueID        int
+	QueueOffset    int64
+	MsgID          string
+	OffsetMsgID    string
+	Tags           string
+	Keys           string
+	Body           []byte
+	Decoded        interface{}
+	Encoding       string
+	Properties     map[string]string
+	BornTimestamp  time.Time
+	StoreTimestamp time.Time
+	ReconsumeTimes int32
+	MinOffset      int64
+	MaxOffset      int64
+}
+
+type nativeRocketMQRuntime struct {
+	config      connection.ConnectionConfig
+	nameservers []string
+	namespace   string
+	timeout     time.Duration
+	sendTimeout time.Duration
+}
+
+var newRocketMQRuntime = func(config connection.ConnectionConfig) (rocketmqRuntime, error) {
+	return newNativeRocketMQRuntime(config)
+}
+
+type RocketMQDB struct {
+	runtime              rocketmqRuntime
+	defaultTopic         string
+	defaultConsumerGroup string
+	defaultTagExpression string
+	startLatest          bool
+	pullBatchSize        int
+	namespace            string
+}
+
+func (r *RocketMQDB) Connect(config connection.ConnectionConfig) error {
+	_ = r.Close()
+
+	runConfig := normalizeRocketMQConfig(config)
+	if runConfig.UseSSH {
+		return fmt.Errorf("RocketMQ 当前暂不支持 SSH 隧道；请直接连通 NameServer 与 Broker")
+	}
+	if runConfig.UseProxy || runConfig.UseHTTPTunnel {
+		return fmt.Errorf("RocketMQ 当前暂不支持代理或 HTTP 隧道；请直接连通 NameServer 与 Broker")
+	}
+
+	runtime, err := newRocketMQRuntime(runConfig)
+	if err != nil {
+		return err
+	}
+	r.runtime = runtime
+	r.defaultTopic = rocketmqDefaultTopic(runConfig)
+	r.defaultConsumerGroup = rocketmqConfiguredConsumerGroup(runConfig)
+	r.defaultTagExpression = rocketmqConfiguredTagExpression(runConfig)
+	r.startLatest = rocketmqDefaultStartLatest(runConfig)
+	r.pullBatchSize = rocketmqPullBatchSize(runConfig)
+	r.namespace = rocketmqNamespace(runConfig)
+
+	if err := r.Ping(); err != nil {
+		_ = r.Close()
+		return err
+	}
+	return nil
+}
+
+func (r *RocketMQDB) Close() error {
+	var firstErr error
+	if r.runtime != nil {
+		if err := r.runtime.Close(); err != nil && firstErr == nil {
+			firstErr = err
+		}
+	}
+	r.runtime = nil
+	r.defaultTopic = ""
+	r.defaultConsumerGroup = ""
+	r.defaultTagExpression = ""
+	r.startLatest = false
+	r.pullBatchSize = 0
+	r.namespace = ""
+	return firstErr
+}
+
+func (r *RocketMQDB) Ping() error {
+	if r.runtime == nil {
+		return fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	return r.runtime.Ping(ctx)
+}
+
+func (r *RocketMQDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultRocketMQQueryTimeout)
+	defer cancel()
+	return r.QueryContext(ctx, query)
+}
+
+func (r *RocketMQDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	if r.runtime == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+	text := strings.TrimSpace(query)
+	if text == "" {
+		return nil, nil, fmt.Errorf("查询语句不能为空")
+	}
+
+	parsed, ok := parseRocketMQSQL(text, r.startLatest)
+	if !ok {
+		return nil, nil, fmt.Errorf("RocketMQ 查询仅支持 SHOW TOPICS、DESCRIBE TOPIC、SELECT * FROM topic 与 CONSUME FROM topic")
+	}
+
+	switch parsed.Action {
+	case "show_topics":
+		topics, err := r.runtime.ListTopics(ctx, false)
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := rocketmqTopicRows(topics)
+		if parsed.Limit > 0 && len(rows) > parsed.Limit {
+			rows = rows[:parsed.Limit]
+		}
+		return rows, collectColumns(rows), nil
+	case "describe_topic":
+		topic := rocketmqResolveTopic(parsed.Topic, r.defaultTopic)
+		if topic == "" {
+			return nil, nil, fmt.Errorf("RocketMQ topic 不能为空")
+		}
+		description, err := r.runtime.DescribeTopic(ctx, rocketmqDescribeRequest{
+			Topic:         topic,
+			ConsumerGroup: r.resolveConsumerGroup("describe"),
+			TagExpression: r.defaultTagExpression,
+			PullBatchSize: r.pullBatchSize,
+		})
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := rocketmqDescribeRows(description)
+		return rows, collectColumns(rows), nil
+	case "select", "consume":
+		topic := rocketmqResolveTopic(parsed.Topic, r.defaultTopic)
+		if topic == "" {
+			return nil, nil, fmt.Errorf("RocketMQ topic 不能为空")
+		}
+		if parsed.Count {
+			if !rocketmqTagExpressionIsDefault(r.defaultTagExpression) {
+				return nil, nil, fmt.Errorf("RocketMQ 配置了 TAG 过滤时暂不支持 COUNT(*) 总量统计；请改为手动预览消息")
+			}
+			description, err := r.runtime.DescribeTopic(ctx, rocketmqDescribeRequest{
+				Topic:         topic,
+				ConsumerGroup: r.resolveConsumerGroup("count"),
+				TagExpression: r.defaultTagExpression,
+				PullBatchSize: r.pullBatchSize,
+			})
+			if err != nil {
+				return nil, nil, err
+			}
+			rows := []map[string]interface{}{{
+				"topic":                   topic,
+				"queue_count":             description.QueueCount,
+				"total_approximate_count": description.TotalApproximateCount,
+				"namespace":               description.Namespace,
+			}}
+			return rows, []string{"topic", "queue_count", "total_approximate_count", "namespace"}, nil
+		}
+		records, err := r.runtime.FetchMessages(ctx, rocketmqFetchRequest{
+			Topic:         topic,
+			Limit:         parsed.Limit,
+			Offset:        parsed.Offset,
+			ConsumerGroup: r.resolveConsumerGroup(parsed.Action),
+			TagExpression: r.defaultTagExpression,
+			Latest:        parsed.Latest,
+			PullBatchSize: r.pullBatchSize,
+		})
+		if err != nil {
+			return nil, nil, err
+		}
+		rows := rocketmqMessageRows(records)
+		return rows, collectColumns(rows), nil
+	default:
+		return nil, nil, fmt.Errorf("未实现的 RocketMQ 查询类型：%s", parsed.Action)
+	}
+}
+
+func (r *RocketMQDB) Exec(query string) (int64, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultRocketMQQueryTimeout)
+	defer cancel()
+	return r.ExecContext(ctx, query)
+}
+
+func (r *RocketMQDB) ExecContext(ctx context.Context, query string) (int64, error) {
+	if r.runtime == nil {
+		return 0, fmt.Errorf("连接未打开")
+	}
+	var cmd map[string]interface{}
+	if err := decodeJSONWithUseNumber([]byte(strings.TrimSpace(query)), &cmd); err != nil {
+		return 0, fmt.Errorf("RocketMQ 写入命令必须是 JSON：%w", err)
+	}
+	topic := rocketmqResolveTopic(firstStringValue(cmd, "publish", "topic", "destination"), r.defaultTopic)
+	if topic == "" {
+		return 0, fmt.Errorf("RocketMQ publish 命令缺少 topic")
+	}
+	if !hasAnyKey(cmd, "payload", "value", "body", "message") {
+		return 0, fmt.Errorf("RocketMQ publish 命令缺少 payload")
+	}
+	keys, err := rocketmqKeysFromAny(firstExisting(cmd, "keys", "key", "messageKeys", "message_keys"))
+	if err != nil {
+		return 0, err
+	}
+	properties, err := rocketmqPropertiesFromAny(firstExisting(cmd, "properties", "userProperties", "user_properties"))
+	if err != nil {
+		return 0, err
+	}
+	delayLevel, err := rocketmqDelayLevelFromAny(firstExisting(cmd, "delayLevel", "delay_level", "delay"))
+	if err != nil {
+		return 0, err
+	}
+	return r.runtime.Publish(ctx, rocketmqPublishCommand{
+		Topic:      topic,
+		Payload:    firstExisting(cmd, "payload", "value", "body", "message"),
+		Tag:        strings.TrimSpace(firstStringValue(cmd, "tag", "tags")),
+		Keys:       keys,
+		DelayLevel: delayLevel,
+		Properties: properties,
+	})
+}
+
+func (r *RocketMQDB) GetDatabases() ([]string, error) {
+	if r.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	return []string{rocketMQSyntheticDatabase}, nil
+}
+
+func (r *RocketMQDB) GetTables(dbName string) ([]string, error) {
+	if r.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	topics, err := r.runtime.ListTopics(ctx, false)
+	if err != nil {
+		return nil, err
+	}
+	names := make([]string, 0, len(topics))
+	for _, topic := range topics {
+		if strings.TrimSpace(topic.Name) != "" {
+			names = append(names, topic.Name)
+		}
+	}
+	sort.Strings(names)
+	return names, nil
+}
+
+func (r *RocketMQDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	if r.runtime == nil {
+		return "", fmt.Errorf("连接未打开")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	topic := rocketmqResolveTopic(tableName, r.defaultTopic)
+	if topic == "" {
+		return "", fmt.Errorf("RocketMQ topic 不能为空")
+	}
+	description, err := r.runtime.DescribeTopic(ctx, rocketmqDescribeRequest{
+		Topic:         topic,
+		ConsumerGroup: r.resolveConsumerGroup("ddl"),
+		TagExpression: r.defaultTagExpression,
+		PullBatchSize: r.pullBatchSize,
+	})
+	if err != nil {
+		return "", err
+	}
+	payload, _ := json.MarshalIndent(description, "", "  ")
+	return fmt.Sprintf("// RocketMQ topic: %s\n%s", topic, string(payload)), nil
+}
+
+func (r *RocketMQDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	if r.runtime == nil {
+		return nil, fmt.Errorf("连接未打开")
+	}
+	topic := rocketmqResolveTopic(tableName, r.defaultTopic)
+	if topic == "" {
+		return nil, fmt.Errorf("RocketMQ topic 不能为空")
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	records, err := r.runtime.FetchMessages(ctx, rocketmqFetchRequest{
+		Topic:         topic,
+		Limit:         20,
+		ConsumerGroup: r.resolveConsumerGroup("columns"),
+		TagExpression: r.defaultTagExpression,
+		Latest:        false,
+		PullBatchSize: r.pullBatchSize,
+	})
+	if err != nil {
+		return nil, err
+	}
+	rows := rocketmqMessageRows(records)
+	columns := []connection.ColumnDefinition{
+		{Name: "topic", Type: "string", Nullable: "NO", Comment: "RocketMQ topic"},
+		{Name: "broker_name", Type: "string", Nullable: "NO", Comment: "Broker name"},
+		{Name: "queue_id", Type: "int", Nullable: "NO", Key: "PRI", Comment: "Queue id"},
+		{Name: "queue_offset", Type: "bigint", Nullable: "NO", Key: "PRI", Comment: "Queue offset"},
+		{Name: "msg_id", Type: "string", Nullable: "YES", Comment: "Message id"},
+		{Name: "offset_msg_id", Type: "string", Nullable: "YES", Comment: "Offset message id"},
+		{Name: "tags", Type: "string", Nullable: "YES", Comment: "RocketMQ tag"},
+		{Name: "keys", Type: "string", Nullable: "YES", Comment: "RocketMQ keys"},
+		{Name: "born_timestamp", Type: "timestamp", Nullable: "YES", Comment: "Born timestamp"},
+		{Name: "store_timestamp", Type: "timestamp", Nullable: "YES", Comment: "Store timestamp"},
+		{Name: "reconsume_times", Type: "int", Nullable: "YES", Comment: "Reconsume times"},
+		{Name: "body", Type: "json", Nullable: "YES", Comment: "Decoded message body"},
+		{Name: "body_encoding", Type: "string", Nullable: "YES", Comment: "Message body encoding"},
+		{Name: "properties", Type: "json", Nullable: "YES", Comment: "Message properties"},
+	}
+	seen := map[string]struct{}{
+		"topic": {}, "broker_name": {}, "queue_id": {}, "queue_offset": {}, "msg_id": {}, "offset_msg_id": {},
+		"tags": {}, "keys": {}, "born_timestamp": {}, "store_timestamp": {}, "reconsume_times": {},
+		"body": {}, "body_encoding": {}, "properties": {},
+	}
+	for _, row := range rows {
+		for key, value := range row {
+			if _, exists := seen[key]; exists {
+				continue
+			}
+			if !strings.HasPrefix(key, "body.") && !strings.HasPrefix(key, "properties.") {
+				continue
+			}
+			seen[key] = struct{}{}
+			columns = append(columns, connection.ColumnDefinition{
+				Name:     key,
+				Type:     inferChromaValueType(value),
+				Nullable: "YES",
+				Comment:  "Derived RocketMQ field",
+			})
+		}
+	}
+	return columns, nil
+}
+
+func (r *RocketMQDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	tables, err := r.GetTables(dbName)
+	if err != nil {
+		return nil, err
+	}
+	var result []connection.ColumnDefinitionWithTable
+	for _, table := range tables {
+		cols, err := r.GetColumns(dbName, table)
+		if err != nil {
+			continue
+		}
+		for _, col := range cols {
+			result = append(result, connection.ColumnDefinitionWithTable{
+				TableName: table,
+				Name:      col.Name,
+				Type:      col.Type,
+				Comment:   col.Comment,
+			})
+		}
+	}
+	return result, nil
+}
+
+func (r *RocketMQDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	return []connection.IndexDefinition{
+		{Name: "PRIMARY", ColumnName: "queue_id", NonUnique: 0, SeqInIndex: 1, IndexType: "QUEUE_OFFSET"},
+		{Name: "PRIMARY", ColumnName: "queue_offset", NonUnique: 0, SeqInIndex: 2, IndexType: "QUEUE_OFFSET"},
+		{Name: "STORE_TIMESTAMP", ColumnName: "store_timestamp", NonUnique: 1, SeqInIndex: 1, IndexType: "BTREE"},
+	}, nil
+}
+
+func (r *RocketMQDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return []connection.ForeignKeyDefinition{}, nil
+}
+
+func (r *RocketMQDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return []connection.TriggerDefinition{}, nil
+}
+
+func (r *RocketMQDB) ApplyChanges(tableName string, changes connection.ChangeSet) error {
+	if len(changes.Inserts) == 0 && len(changes.Updates) == 0 && len(changes.Deletes) == 0 {
+		return nil
+	}
+	return fmt.Errorf("RocketMQ 结果集仅支持只读预览；如需写入请在 SQL 编辑器执行 JSON publish 命令")
+}
+
+func (r *RocketMQDB) resolveConsumerGroup(purpose string) string {
+	group := strings.TrimSpace(r.defaultConsumerGroup)
+	if group != "" {
+		return group
+	}
+	return fmt.Sprintf("%s-%s-%d", rocketMQDefaultConsumerGroup, purpose, time.Now().UnixNano())
+}
+
+func newNativeRocketMQRuntime(config connection.ConnectionConfig) (rocketmqRuntime, error) {
+	nameservers, err := rocketmqNameServerAddresses(config)
+	if err != nil {
+		return nil, err
+	}
+	timeout := getConnectTimeout(config)
+	if timeout <= 0 {
+		timeout = 10 * time.Second
+	}
+	return &nativeRocketMQRuntime{
+		config:      config,
+		nameservers: nameservers,
+		namespace:   rocketmqNamespace(config),
+		timeout:     timeout,
+		sendTimeout: rocketmqSendTimeout(config),
+	}, nil
+}
+
+func (r *nativeRocketMQRuntime) Close() error {
+	return nil
+}
+
+func (r *nativeRocketMQRuntime) Ping(ctx context.Context) error {
+	adminClient, err := r.newAdmin()
+	if err != nil {
+		return err
+	}
+	defer adminClient.Close()
+	_, err = adminClient.FetchAllTopicList(ctx)
+	return err
+}
+
+func (r *nativeRocketMQRuntime) ListTopics(ctx context.Context, includeSystem bool) ([]rocketmqTopicInfo, error) {
+	adminClient, err := r.newAdmin()
+	if err != nil {
+		return nil, err
+	}
+	defer adminClient.Close()
+
+	response, err := adminClient.FetchAllTopicList(ctx)
+	if err != nil {
+		return nil, err
+	}
+	seen := map[string]struct{}{}
+	topics := make([]rocketmqTopicInfo, 0, len(response.TopicList))
+	for _, name := range response.TopicList {
+		topic := strings.TrimSpace(name)
+		if topic == "" {
+			continue
+		}
+		if _, exists := seen[topic]; exists {
+			continue
+		}
+		seen[topic] = struct{}{}
+		system := rocketmqIsSystemTopic(topic)
+		if system && !includeSystem {
+			continue
+		}
+		queues, err := adminClient.FetchPublishMessageQueues(ctx, topic)
+		queueCount := 0
+		if err == nil {
+			queueCount = len(queues)
+		}
+		topics = append(topics, rocketmqTopicInfo{
+			Name:       topic,
+			System:     system,
+			QueueCount: queueCount,
+		})
+	}
+	sort.Slice(topics, func(i, j int) bool {
+		return topics[i].Name < topics[j].Name
+	})
+	return topics, nil
+}
+
+func (r *nativeRocketMQRuntime) DescribeTopic(ctx context.Context, request rocketmqDescribeRequest) (rocketmqTopicDescription, error) {
+	adminClient, err := r.newAdmin()
+	if err != nil {
+		return rocketmqTopicDescription{}, err
+	}
+	defer adminClient.Close()
+
+	consumerClient, err := r.newPullConsumer(request.Topic, request.ConsumerGroup, request.TagExpression, request.PullBatchSize)
+	if err != nil {
+		return rocketmqTopicDescription{}, err
+	}
+	defer consumerClient.Shutdown()
+
+	return r.describeTopicWithClients(ctx, adminClient, consumerClient, request)
+}
+
+func (r *nativeRocketMQRuntime) FetchMessages(ctx context.Context, request rocketmqFetchRequest) ([]rocketmqMessageRecord, error) {
+	adminClient, err := r.newAdmin()
+	if err != nil {
+		return nil, err
+	}
+	defer adminClient.Close()
+
+	consumerClient, err := r.newPullConsumer(request.Topic, request.ConsumerGroup, request.TagExpression, request.PullBatchSize)
+	if err != nil {
+		return nil, err
+	}
+	defer consumerClient.Shutdown()
+
+	description, err := r.describeTopicWithClients(ctx, adminClient, consumerClient, rocketmqDescribeRequest{
+		Topic:         request.Topic,
+		ConsumerGroup: request.ConsumerGroup,
+		TagExpression: request.TagExpression,
+		PullBatchSize: request.PullBatchSize,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	limit := request.Limit
+	if limit <= 0 {
+		limit = defaultRocketMQPreviewLimit
+	}
+	target := limit + maxInt(request.Offset, 0)
+	if target <= 0 {
+		target = defaultRocketMQPreviewLimit
+	}
+	if request.PullBatchSize <= 0 {
+		request.PullBatchSize = defaultRocketMQPullBatchSize
+	}
+	records := make([]rocketmqMessageRecord, 0, target)
+	for _, queue := range description.Queues {
+		metaQueue := &rocketmqprimitive.MessageQueue{
+			Topic:      description.Name,
+			BrokerName: queue.BrokerName,
+			QueueId:    queue.QueueID,
+		}
+		items, err := r.fetchQueueMessages(ctx, consumerClient, metaQueue, queue, request, target)
+		if err != nil {
+			return nil, err
+		}
+		records = append(records, items...)
+	}
+	rocketmqSortMessages(records, request.Latest)
+	if request.Offset >= len(records) {
+		return []rocketmqMessageRecord{}, nil
+	}
+	records = records[request.Offset:]
+	if len(records) > limit {
+		records = records[:limit]
+	}
+	return records, nil
+}
+
+func (r *nativeRocketMQRuntime) Publish(ctx context.Context, command rocketmqPublishCommand) (int64, error) {
+	topic := strings.TrimSpace(command.Topic)
+	if topic == "" {
+		return 0, fmt.Errorf("RocketMQ publish 命令缺少 topic")
+	}
+	payload, err := mqttEncodePayload(command.Payload)
+	if err != nil {
+		return 0, fmt.Errorf("序列化 RocketMQ payload 失败：%w", err)
+	}
+
+	producerClient, err := r.newProducer()
+	if err != nil {
+		return 0, err
+	}
+	defer producerClient.Shutdown()
+
+	message := rocketmqprimitive.NewMessage(topic, payload)
+	if tag := strings.TrimSpace(command.Tag); tag != "" {
+		message.WithTag(tag)
+	}
+	if len(command.Keys) > 0 {
+		message.WithKeys(command.Keys)
+	}
+	if command.DelayLevel > 0 {
+		message.WithDelayTimeLevel(command.DelayLevel)
+	}
+	if len(command.Properties) > 0 {
+		for key, value := range command.Properties {
+			if strings.TrimSpace(key) == "" {
+				continue
+			}
+			message.WithProperty(strings.TrimSpace(key), value)
+		}
+	}
+
+	result, err := producerClient.SendSync(ctx, message)
+	if err != nil {
+		return 0, err
+	}
+	if result == nil || result.Status != rocketmqprimitive.SendOK {
+		return 0, fmt.Errorf("RocketMQ 发送失败：状态=%v", result)
+	}
+	return 1, nil
+}
+
+func (r *nativeRocketMQRuntime) describeTopicWithClients(ctx context.Context, adminClient rocketmqadmin.Admin, consumerClient rocketmq.PullConsumer, request rocketmqDescribeRequest) (rocketmqTopicDescription, error) {
+	topic := strings.TrimSpace(request.Topic)
+	if topic == "" {
+		return rocketmqTopicDescription{}, fmt.Errorf("RocketMQ topic 不能为空")
+	}
+	queues, err := adminClient.FetchPublishMessageQueues(ctx, topic)
+	if err != nil {
+		return rocketmqTopicDescription{}, err
+	}
+	sort.Slice(queues, func(i, j int) bool {
+		if queues[i].BrokerName == queues[j].BrokerName {
+			return queues[i].QueueId < queues[j].QueueId
+		}
+		if queues[i].QueueId == queues[j].QueueId {
+			return queues[i].BrokerName < queues[j].BrokerName
+		}
+		return queues[i].QueueId < queues[j].QueueId
+	})
+
+	description := rocketmqTopicDescription{
+		Name:          topic,
+		Namespace:     r.namespace,
+		ConsumerGroup: strings.TrimSpace(request.ConsumerGroup),
+		TagExpression: rocketmqNormalizeTagExpression(request.TagExpression),
+		QueueCount:    len(queues),
+		Queues:        make([]rocketmqTopicQueueInfo, 0, len(queues)),
+	}
+	for _, queue := range queues {
+		info, err := r.inspectQueue(ctx, consumerClient, queue)
+		if err != nil {
+			return rocketmqTopicDescription{}, err
+		}
+		description.Queues = append(description.Queues, info)
+		description.TotalApproximateCount += info.ApproximateCount
+	}
+	return description, nil
+}
+
+func (r *nativeRocketMQRuntime) inspectQueue(ctx context.Context, consumerClient rocketmq.PullConsumer, queue *rocketmqprimitive.MessageQueue) (rocketmqTopicQueueInfo, error) {
+	result, err := consumerClient.PullFrom(ctx, queue, 0, 1)
+	if err != nil {
+		return rocketmqTopicQueueInfo{}, err
+	}
+	minOffset := result.MinOffset
+	maxOffset := result.MaxOffset
+	if result.Status == rocketmqprimitive.PullOffsetIllegal && result.NextBeginOffset > minOffset {
+		minOffset = result.NextBeginOffset
+	}
+	if maxOffset < minOffset {
+		maxOffset = minOffset
+	}
+	return rocketmqTopicQueueInfo{
+		BrokerName:       queue.BrokerName,
+		QueueID:          queue.QueueId,
+		MinOffset:        minOffset,
+		MaxOffset:        maxOffset,
+		ApproximateCount: maxInt64(0, maxOffset-minOffset),
+	}, nil
+}
+
+func (r *nativeRocketMQRuntime) fetchQueueMessages(ctx context.Context, consumerClient rocketmq.PullConsumer, queue *rocketmqprimitive.MessageQueue, meta rocketmqTopicQueueInfo, request rocketmqFetchRequest, target int) ([]rocketmqMessageRecord, error) {
+	if target <= 0 || meta.MaxOffset <= meta.MinOffset {
+		return []rocketmqMessageRecord{}, nil
+	}
+	startOffset := meta.MinOffset
+	if request.Latest {
+		startOffset = maxInt64(meta.MinOffset, meta.MaxOffset-int64(target))
+	}
+	if startOffset >= meta.MaxOffset {
+		return []rocketmqMessageRecord{}, nil
+	}
+
+	records := make([]rocketmqMessageRecord, 0, target)
+	currentOffset := startOffset
+	batchSize := request.PullBatchSize
+	if batchSize <= 0 {
+		batchSize = defaultRocketMQPullBatchSize
+	}
+	if batchSize > maxRocketMQPullBatchSize {
+		batchSize = maxRocketMQPullBatchSize
+	}
+	for len(records) < target && currentOffset < meta.MaxOffset {
+		numbers := batchSize
+		if remaining := target - len(records); remaining < numbers {
+			numbers = remaining
+		}
+		if numbers <= 0 {
+			break
+		}
+		result, err := consumerClient.PullFrom(ctx, queue, currentOffset, numbers)
+		if err != nil {
+			return nil, err
+		}
+		switch result.Status {
+		case rocketmqprimitive.PullFound:
+			for _, message := range result.GetMessageExts() {
+				records = append(records, rocketmqRecordFromExt(message, queue.BrokerName, queue.QueueId, result.MinOffset, result.MaxOffset))
+			}
+			if result.NextBeginOffset <= currentOffset {
+				return records, nil
+			}
+			currentOffset = result.NextBeginOffset
+		case rocketmqprimitive.PullOffsetIllegal:
+			if result.NextBeginOffset <= currentOffset {
+				return records, nil
+			}
+			currentOffset = result.NextBeginOffset
+		case rocketmqprimitive.PullNoNewMsg, rocketmqprimitive.PullNoMsgMatched, rocketmqprimitive.PullBrokerTimeout:
+			return records, nil
+		default:
+			return records, nil
+		}
+	}
+	return records, nil
+}
+
+func (r *nativeRocketMQRuntime) newAdmin() (rocketmqadmin.Admin, error) {
+	options := []rocketmqadmin.AdminOption{
+		rocketmqadmin.WithResolver(rocketmqprimitive.NewPassthroughResolver(append([]string(nil), r.nameservers...))),
+	}
+	if namespace := strings.TrimSpace(r.namespace); namespace != "" {
+		options = append(options, rocketmqadmin.WithNamespace(namespace))
+	}
+	if credentials, ok := rocketmqCredentials(r.config); ok {
+		options = append(options, rocketmqadmin.WithCredentials(credentials))
+	}
+	return rocketmqadmin.NewAdmin(options...)
+}
+
+func (r *nativeRocketMQRuntime) newProducer() (rocketmq.Producer, error) {
+	group := rocketmqProducerGroup(r.config)
+	if group == "" {
+		group = fmt.Sprintf("%s-%d", rocketMQDefaultProducerGroup, time.Now().UnixNano())
+	}
+	options := []rocketmqproducer.Option{
+		rocketmqproducer.WithNsResolver(rocketmqprimitive.NewPassthroughResolver(append([]string(nil), r.nameservers...))),
+		rocketmqproducer.WithGroupName(group),
+		rocketmqproducer.WithInstanceName(fmt.Sprintf("%s-producer-%d", rocketMQDefaultInstancePrefix, time.Now().UnixNano())),
+		rocketmqproducer.WithRetry(0),
+		rocketmqproducer.WithSendMsgTimeout(r.sendTimeout),
+	}
+	if namespace := strings.TrimSpace(r.namespace); namespace != "" {
+		options = append(options, rocketmqproducer.WithNamespace(namespace))
+	}
+	if credentials, ok := rocketmqCredentials(r.config); ok {
+		options = append(options, rocketmqproducer.WithCredentials(credentials))
+	}
+	client, err := rocketmq.NewProducer(options...)
+	if err != nil {
+		return nil, err
+	}
+	if err := client.Start(); err != nil {
+		return nil, err
+	}
+	return client, nil
+}
+
+func (r *nativeRocketMQRuntime) newPullConsumer(topic string, consumerGroup string, tagExpression string, pullBatchSize int) (rocketmq.PullConsumer, error) {
+	group := strings.TrimSpace(consumerGroup)
+	if group == "" {
+		group = fmt.Sprintf("%s-%d", rocketMQDefaultConsumerGroup, time.Now().UnixNano())
+	}
+	if pullBatchSize <= 0 {
+		pullBatchSize = defaultRocketMQPullBatchSize
+	}
+	if pullBatchSize > maxRocketMQPullBatchSize {
+		pullBatchSize = maxRocketMQPullBatchSize
+	}
+	options := []rocketmqconsumer.Option{
+		rocketmqconsumer.WithNsResolver(rocketmqprimitive.NewPassthroughResolver(append([]string(nil), r.nameservers...))),
+		rocketmqconsumer.WithGroupName(group),
+		rocketmqconsumer.WithInstance(fmt.Sprintf("%s-consumer-%d", rocketMQDefaultInstancePrefix, time.Now().UnixNano())),
+		rocketmqconsumer.WithConsumeFromWhere(rocketmqconsumer.ConsumeFromFirstOffset),
+		rocketmqconsumer.WithPullBatchSize(int32(pullBatchSize)),
+	}
+	if namespace := strings.TrimSpace(r.namespace); namespace != "" {
+		options = append(options, rocketmqconsumer.WithNamespace(namespace))
+	}
+	if credentials, ok := rocketmqCredentials(r.config); ok {
+		options = append(options, rocketmqconsumer.WithCredentials(credentials))
+	}
+	client, err := rocketmq.NewPullConsumer(options...)
+	if err != nil {
+		return nil, err
+	}
+	selector := rocketmqconsumer.MessageSelector{
+		Type:       rocketmqconsumer.TAG,
+		Expression: rocketmqNormalizeTagExpression(tagExpression),
+	}
+	if err := client.Subscribe(strings.TrimSpace(topic), selector); err != nil {
+		_ = client.Shutdown()
+		return nil, err
+	}
+	if err := client.Start(); err != nil {
+		_ = client.Shutdown()
+		return nil, err
+	}
+	return client, nil
+}
+
+func normalizeRocketMQConfig(config connection.ConnectionConfig) connection.ConnectionConfig {
+	runConfig := applyRocketMQURI(config)
+	if strings.TrimSpace(runConfig.Host) == "" && len(runConfig.Hosts) == 0 {
+		runConfig.Host = "localhost"
+	}
+	if runConfig.Port <= 0 {
+		runConfig.Port = defaultRocketMQPort
+	}
+	return runConfig
+}
+
+func applyRocketMQURI(config connection.ConnectionConfig) connection.ConnectionConfig {
+	uriText := strings.TrimSpace(config.URI)
+	if uriText == "" {
+		return config
+	}
+	parsed, err := url.Parse(uriText)
+	if err != nil {
+		return config
+	}
+	scheme := strings.ToLower(strings.TrimSpace(parsed.Scheme))
+	switch scheme {
+	case "rocketmq", "rocket-mq", "rocket_mq", "apache-rocketmq", "apache_rocketmq", "rmq":
+	default:
+		return config
+	}
+	if parsed.User != nil {
+		if strings.TrimSpace(config.User) == "" {
+			config.User = parsed.User.Username()
+		}
+		if pass, ok := parsed.User.Password(); ok && config.Password == "" {
+			config.Password = pass
+		}
+	}
+	hosts := make([]string, 0, 4)
+	for _, entry := range strings.Split(strings.TrimSpace(parsed.Host), ",") {
+		host, port, ok := parseHostPortWithDefault(strings.TrimSpace(entry), defaultRocketMQPort)
+		if !ok {
+			continue
+		}
+		hosts = append(hosts, rocketmqFormatHostPort(host, port))
+	}
+	if len(hosts) > 0 {
+		host, port, ok := parseHostPortWithDefault(hosts[0], defaultRocketMQPort)
+		if ok {
+			config.Host = host
+			config.Port = port
+		}
+		if len(hosts) > 1 {
+			config.Hosts = append([]string(nil), hosts[1:]...)
+		}
+	}
+	if topic := strings.Trim(strings.TrimSpace(parsed.Path), "/"); topic != "" && strings.TrimSpace(config.Database) == "" {
+		config.Database = topic
+	}
+	params := parsed.Query()
+	if strings.TrimSpace(config.Topology) == "" {
+		if topology := strings.ToLower(strings.TrimSpace(firstNonEmpty(params.Get("topology"), params.Get("mode")))); topology != "" {
+			config.Topology = topology
+		} else if len(hosts) > 1 {
+			config.Topology = "cluster"
+		}
+	}
+	return config
+}
+
+func rocketmqConnectionParams(config connection.ConnectionConfig) url.Values {
+	params := url.Values{}
+	mergeConnectionParamValues(params, connectionParamsFromURI(config.URI, "rocketmq", "rocket-mq", "rocket_mq", "apache-rocketmq", "apache_rocketmq", "rmq"))
+	mergeConnectionParamValues(params, connectionParamsFromText(config.ConnectionParams))
+	return params
+}
+
+func rocketmqDefaultTopic(config connection.ConnectionConfig) string {
+	if topic := strings.TrimSpace(config.Database); topic != "" {
+		return topic
+	}
+	params := rocketmqConnectionParams(config)
+	return firstNonEmpty(params.Get("topic"), params.Get("defaultTopic"), params.Get("default_topic"))
+}
+
+func rocketmqConfiguredConsumerGroup(config connection.ConnectionConfig) string {
+	params := rocketmqConnectionParams(config)
+	return firstNonEmpty(
+		params.Get("groupId"),
+		params.Get("group_id"),
+		params.Get("consumerGroup"),
+		params.Get("consumer_group"),
+	)
+}
+
+func rocketmqProducerGroup(config connection.ConnectionConfig) string {
+	params := rocketmqConnectionParams(config)
+	return firstNonEmpty(params.Get("producerGroup"), params.Get("producer_group"))
+}
+
+func rocketmqConfiguredTagExpression(config connection.ConnectionConfig) string {
+	params := rocketmqConnectionParams(config)
+	return firstNonEmpty(
+		params.Get("tag"),
+		params.Get("tags"),
+		params.Get("tagExpression"),
+		params.Get("tag_expression"),
+		params.Get("selector"),
+		params.Get("selectorExpression"),
+		params.Get("selector_expression"),
+	)
+}
+
+func rocketmqTagExpressionIsDefault(value string) bool {
+	text := strings.TrimSpace(value)
+	return text == "" || text == "*" || strings.EqualFold(text, "all")
+}
+
+func rocketmqNormalizeTagExpression(value string) string {
+	text := strings.TrimSpace(value)
+	if rocketmqTagExpressionIsDefault(text) {
+		return "*"
+	}
+	return text
+}
+
+func rocketmqNamespace(config connection.ConnectionConfig) string {
+	params := rocketmqConnectionParams(config)
+	return firstNonEmpty(params.Get("namespace"), params.Get("ns"))
+}
+
+func rocketmqDefaultStartLatest(config connection.ConnectionConfig) bool {
+	params := rocketmqConnectionParams(config)
+	value := strings.ToLower(strings.TrimSpace(firstNonEmpty(
+		params.Get("startOffset"),
+		params.Get("start_offset"),
+		params.Get("consumeFrom"),
+		params.Get("consume_from"),
+	)))
+	switch value {
+	case "latest", "last", "newest", "end", "tail":
+		return true
+	default:
+		return false
+	}
+}
+
+func rocketmqPullBatchSize(config connection.ConnectionConfig) int {
+	params := rocketmqConnectionParams(config)
+	value := strings.TrimSpace(firstNonEmpty(params.Get("pullBatchSize"), params.Get("pull_batch_size")))
+	if size, err := strconv.Atoi(value); err == nil && size > 0 {
+		if size > maxRocketMQPullBatchSize {
+			return maxRocketMQPullBatchSize
+		}
+		return size
+	}
+	return defaultRocketMQPullBatchSize
+}
+
+func rocketmqSendTimeout(config connection.ConnectionConfig) time.Duration {
+	params := rocketmqConnectionParams(config)
+	value := strings.TrimSpace(firstNonEmpty(params.Get("sendTimeoutMs"), params.Get("send_timeout_ms")))
+	if ms, err := strconv.Atoi(value); err == nil && ms > 0 {
+		return time.Duration(ms) * time.Millisecond
+	}
+	timeout := getConnectTimeout(config)
+	if timeout <= 0 {
+		timeout = 10 * time.Second
+	}
+	return timeout
+}
+
+func rocketmqCredentials(config connection.ConnectionConfig) (rocketmqprimitive.Credentials, bool) {
+	params := rocketmqConnectionParams(config)
+	accessKey := strings.TrimSpace(firstNonEmpty(config.User, params.Get("accessKey"), params.Get("access_key")))
+	secretKey := strings.TrimSpace(firstNonEmpty(config.Password, params.Get("secretKey"), params.Get("secret_key")))
+	securityToken := strings.TrimSpace(firstNonEmpty(params.Get("securityToken"), params.Get("security_token")))
+	credentials := rocketmqprimitive.Credentials{
+		AccessKey:     accessKey,
+		SecretKey:     secretKey,
+		SecurityToken: securityToken,
+	}
+	if credentials.IsEmpty() {
+		return rocketmqprimitive.Credentials{}, false
+	}
+	return credentials, true
+}
+
+func rocketmqNameServerAddresses(config connection.ConnectionConfig) ([]string, error) {
+	candidates := make([]string, 0, len(config.Hosts)+1)
+	if host := strings.TrimSpace(config.Host); host != "" {
+		port := config.Port
+		if port <= 0 {
+			port = defaultRocketMQPort
+		}
+		candidates = append(candidates, rocketmqFormatHostPort(host, port))
+	}
+	candidates = append(candidates, config.Hosts...)
+	seen := map[string]struct{}{}
+	nameservers := make([]string, 0, len(candidates))
+	for _, candidate := range candidates {
+		host, port, ok := parseHostPortWithDefault(candidate, defaultRocketMQPort)
+		if !ok {
+			continue
+		}
+		address := rocketmqFormatHostPort(host, port)
+		if _, exists := seen[address]; exists {
+			continue
+		}
+		seen[address] = struct{}{}
+		nameservers = append(nameservers, address)
+	}
+	if len(nameservers) == 0 {
+		return nil, fmt.Errorf("RocketMQ 至少需要一个 NameServer 地址")
+	}
+	return nameservers, nil
+}
+
+func rocketmqFormatHostPort(host string, port int) string {
+	h := strings.TrimSpace(host)
+	if strings.Contains(h, ":") && !strings.HasPrefix(h, "[") {
+		return fmt.Sprintf("[%s]:%d", h, port)
+	}
+	return fmt.Sprintf("%s:%d", h, port)
+}
+
+func rocketmqResolveTopic(topic string, fallback string) string {
+	if text := strings.TrimSpace(topic); text != "" {
+		return text
+	}
+	return strings.TrimSpace(fallback)
+}
+
+func rocketmqIsSystemTopic(topic string) bool {
+	name := strings.TrimSpace(topic)
+	if name == "" {
+		return false
+	}
+	switch {
+	case strings.HasPrefix(name, "%RETRY%"),
+		strings.HasPrefix(name, "%DLQ%"),
+		strings.HasPrefix(name, "rmq_sys_"),
+		strings.HasPrefix(name, "CID_RMQ_SYS_"):
+		return true
+	}
+	switch name {
+	case "TBW102", "SELF_TEST_TOPIC", "OFFSET_MOVED_EVENT", "SCHEDULE_TOPIC_XXXX", "RMQ_SYS_TRANS_HALF_TOPIC", "RMQ_SYS_TRACE_TOPIC", "TRANS_CHECK_MAX_TIME_TOPIC", "BenchmarkTest":
+		return true
+	default:
+		return false
+	}
+}
+
+func rocketmqKeysFromAny(value interface{}) ([]string, error) {
+	switch typed := value.(type) {
+	case nil:
+		return nil, nil
+	case string:
+		return rocketmqSplitKeys(typed), nil
+	case []string:
+		result := make([]string, 0, len(typed))
+		for _, item := range typed {
+			if text := strings.TrimSpace(item); text != "" {
+				result = append(result, text)
+			}
+		}
+		return result, nil
+	case []interface{}:
+		result := make([]string, 0, len(typed))
+		for _, item := range typed {
+			text := strings.TrimSpace(fmt.Sprintf("%v", item))
+			if text != "" {
+				result = append(result, text)
+			}
+		}
+		return result, nil
+	default:
+		text := strings.TrimSpace(fmt.Sprintf("%v", value))
+		if text == "" || text == "<nil>" {
+			return nil, nil
+		}
+		return rocketmqSplitKeys(text), nil
+	}
+}
+
+func rocketmqSplitKeys(text string) []string {
+	parts := strings.FieldsFunc(text, func(r rune) bool {
+		return r == ',' || r == ';' || r == '|' || r == '\n' || r == '\r' || r == '\t' || r == ' ' || r == '，'
+	})
+	result := make([]string, 0, len(parts))
+	for _, part := range parts {
+		if normalized := strings.TrimSpace(part); normalized != "" {
+			result = append(result, normalized)
+		}
+	}
+	return result
+}
+
+func rocketmqPropertiesFromAny(value interface{}) (map[string]string, error) {
+	switch typed := value.(type) {
+	case nil:
+		return nil, nil
+	case map[string]string:
+		result := make(map[string]string, len(typed))
+		for key, item := range typed {
+			if strings.TrimSpace(key) != "" {
+				result[strings.TrimSpace(key)] = item
+			}
+		}
+		return result, nil
+	case map[string]interface{}:
+		result := make(map[string]string, len(typed))
+		for key, item := range typed {
+			normalizedKey := strings.TrimSpace(key)
+			if normalizedKey == "" {
+				continue
+			}
+			switch casted := item.(type) {
+			case string:
+				result[normalizedKey] = casted
+			default:
+				payload, err := json.Marshal(casted)
+				if err != nil {
+					return nil, fmt.Errorf("RocketMQ properties 字段 %q 无法序列化：%w", normalizedKey, err)
+				}
+				result[normalizedKey] = string(payload)
+			}
+		}
+		return result, nil
+	default:
+		return nil, fmt.Errorf("RocketMQ properties 必须是 JSON 对象")
+	}
+}
+
+func rocketmqDelayLevelFromAny(value interface{}) (int, error) {
+	switch typed := value.(type) {
+	case nil:
+		return 0, nil
+	case json.Number:
+		n, err := typed.Int64()
+		if err != nil {
+			return 0, fmt.Errorf("RocketMQ delayLevel 必须是正整数")
+		}
+		return rocketmqNormalizeDelayLevel(int(n))
+	case float64:
+		return rocketmqNormalizeDelayLevel(int(typed))
+	case int:
+		return rocketmqNormalizeDelayLevel(typed)
+	case int64:
+		return rocketmqNormalizeDelayLevel(int(typed))
+	case string:
+		text := strings.TrimSpace(typed)
+		if text == "" {
+			return 0, nil
+		}
+		n, err := strconv.Atoi(text)
+		if err != nil {
+			return 0, fmt.Errorf("RocketMQ delayLevel 必须是正整数")
+		}
+		return rocketmqNormalizeDelayLevel(n)
+	default:
+		return 0, fmt.Errorf("RocketMQ delayLevel 必须是正整数")
+	}
+}
+
+func rocketmqNormalizeDelayLevel(value int) (int, error) {
+	if value < 0 {
+		return 0, fmt.Errorf("RocketMQ delayLevel 必须是正整数")
+	}
+	return value, nil
+}
+
+func rocketmqRecordFromExt(message *rocketmqprimitive.MessageExt, brokerName string, queueID int, minOffset int64, maxOffset int64) rocketmqMessageRecord {
+	if message == nil {
+		return rocketmqMessageRecord{
+			BrokerName: brokerName,
+			QueueID:    queueID,
+			MinOffset:  minOffset,
+			MaxOffset:  maxOffset,
+		}
+	}
+	decoded, encoding := mqttDecodePayload(message.Body)
+	embeddedBroker := ""
+	if message.Queue != nil {
+		embeddedBroker = message.Queue.BrokerName
+	}
+	return rocketmqMessageRecord{
+		Topic:          message.Topic,
+		BrokerName:     firstNonEmpty(brokerName, embeddedBroker),
+		QueueID:        queueID,
+		QueueOffset:    message.QueueOffset,
+		MsgID:          message.MsgId,
+		OffsetMsgID:    message.OffsetMsgId,
+		Tags:           message.GetTags(),
+		Keys:           message.GetKeys(),
+		Body:           append([]byte(nil), message.Body...),
+		Decoded:        decoded,
+		Encoding:       encoding,
+		Properties:     message.GetProperties(),
+		BornTimestamp:  time.UnixMilli(message.BornTimestamp),
+		StoreTimestamp: time.UnixMilli(message.StoreTimestamp),
+		ReconsumeTimes: message.ReconsumeTimes,
+		MinOffset:      minOffset,
+		MaxOffset:      maxOffset,
+	}
+}
+
+func parseRocketMQSQL(sqlText string, defaultLatest bool) (rocketmqParsedSQL, bool) {
+	text := strings.TrimSpace(sqlText)
+	if text == "" {
+		return rocketmqParsedSQL{}, false
+	}
+	if matches := rocketmqShowTopicsRE.FindStringSubmatch(text); len(matches) > 0 {
+		parsed := rocketmqParsedSQL{Action: "show_topics"}
+		if len(matches) > 1 && strings.TrimSpace(matches[1]) != "" {
+			parsed.Limit, _ = strconv.Atoi(matches[1])
+		}
+		return parsed, true
+	}
+	if matches := rocketmqDescribeTopicRE.FindStringSubmatch(text); len(matches) > 0 {
+		return rocketmqParsedSQL{
+			Action: "describe_topic",
+			Topic:  firstNonEmpty(matches[1], matches[2], matches[3]),
+		}, true
+	}
+	if matches := rocketmqConsumeTopicRE.FindStringSubmatch(text); len(matches) > 0 {
+		parsed := rocketmqParsedSQL{
+			Action: "consume",
+			Topic:  firstNonEmpty(matches[1], matches[2], matches[3]),
+			Limit:  defaultRocketMQPreviewLimit,
+			Latest: true,
+		}
+		if limitMatch := rocketmqSQLLimitRE.FindStringSubmatch(text); len(limitMatch) > 1 {
+			parsed.Limit, _ = strconv.Atoi(limitMatch[1])
+		}
+		if offsetMatch := rocketmqSQLOffsetRE.FindStringSubmatch(text); len(offsetMatch) > 1 {
+			parsed.Offset, _ = strconv.Atoi(offsetMatch[1])
+		}
+		return parsed, true
+	}
+	if !strings.HasPrefix(strings.ToLower(text), "select") {
+		return rocketmqParsedSQL{}, false
+	}
+	matches := rocketmqSQLFromRE.FindStringSubmatch(text)
+	if len(matches) == 0 {
+		return rocketmqParsedSQL{}, false
+	}
+	parsed := rocketmqParsedSQL{
+		Action: "select",
+		Topic:  firstNonEmpty(matches[1], matches[2], matches[3]),
+		Limit:  defaultRocketMQPreviewLimit,
+		Count:  strings.Contains(strings.ToLower(text), "count("),
+		Latest: defaultLatest,
+	}
+	if limitMatch := rocketmqSQLLimitRE.FindStringSubmatch(text); len(limitMatch) > 1 {
+		parsed.Limit, _ = strconv.Atoi(limitMatch[1])
+	}
+	if offsetMatch := rocketmqSQLOffsetRE.FindStringSubmatch(text); len(offsetMatch) > 1 {
+		parsed.Offset, _ = strconv.Atoi(offsetMatch[1])
+	}
+	return parsed, true
+}
+
+type rocketmqParsedSQL struct {
+	Action string
+	Topic  string
+	Limit  int
+	Offset int
+	Count  bool
+	Latest bool
+}
+
+var (
+	rocketmqSQLFromRE       = regexp.MustCompile(`(?i)\bFROM\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([^\s;]+))`)
+	rocketmqSQLLimitRE      = regexp.MustCompile(`(?i)\bLIMIT\s+(\d+)`)
+	rocketmqSQLOffsetRE     = regexp.MustCompile(`(?i)\bOFFSET\s+(\d+)`)
+	rocketmqShowTopicsRE    = regexp.MustCompile(`(?i)^\s*SHOW\s+TOPICS(?:\s+LIMIT\s+(\d+))?\s*;?\s*$`)
+	rocketmqDescribeTopicRE = regexp.MustCompile(`(?i)^\s*(?:SHOW|DESCRIBE)\s+TOPIC\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([^\s;]+))\s*;?\s*$`)
+	rocketmqConsumeTopicRE  = regexp.MustCompile(`(?i)^\s*CONSUME\s+FROM\s+(?:"([^"]+)"|` + "`" + `([^` + "`" + `]+)` + "`" + `|([^\s;]+))`)
+)
+
+func rocketmqTopicRows(topics []rocketmqTopicInfo) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(topics))
+	for _, topic := range topics {
+		rows = append(rows, map[string]interface{}{
+			"topic":        topic.Name,
+			"system_topic": topic.System,
+			"queue_count":  topic.QueueCount,
+		})
+	}
+	return rows
+}
+
+func rocketmqDescribeRows(description rocketmqTopicDescription) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(description.Queues))
+	for _, queue := range description.Queues {
+		rows = append(rows, map[string]interface{}{
+			"topic":                    description.Name,
+			"namespace":                description.Namespace,
+			"consumer_group":           description.ConsumerGroup,
+			"tag_expression":           description.TagExpression,
+			"queue_count":              description.QueueCount,
+			"topic_approximate_count":  description.TotalApproximateCount,
+			"broker_name":              queue.BrokerName,
+			"queue_id":                 queue.QueueID,
+			"min_offset":               queue.MinOffset,
+			"max_offset":               queue.MaxOffset,
+			"approximate_count":        queue.ApproximateCount,
+		})
+	}
+	if len(rows) == 0 {
+		rows = append(rows, map[string]interface{}{
+			"topic":                   description.Name,
+			"namespace":               description.Namespace,
+			"consumer_group":          description.ConsumerGroup,
+			"tag_expression":          description.TagExpression,
+			"queue_count":             0,
+			"topic_approximate_count": 0,
+		})
+	}
+	return rows
+}
+
+func rocketmqMessageRows(records []rocketmqMessageRecord) []map[string]interface{} {
+	rows := make([]map[string]interface{}, 0, len(records))
+	for _, record := range records {
+		row := map[string]interface{}{
+			"topic":           record.Topic,
+			"broker_name":     record.BrokerName,
+			"queue_id":        record.QueueID,
+			"queue_offset":    record.QueueOffset,
+			"msg_id":          record.MsgID,
+			"offset_msg_id":   record.OffsetMsgID,
+			"tags":            record.Tags,
+			"keys":            record.Keys,
+			"born_timestamp":  record.BornTimestamp,
+			"store_timestamp": record.StoreTimestamp,
+			"reconsume_times": record.ReconsumeTimes,
+			"body":            record.Decoded,
+			"body_encoding":   record.Encoding,
+			"properties":      record.Properties,
+			"min_offset":      record.MinOffset,
+			"max_offset":      record.MaxOffset,
+		}
+		if payloadMap, ok := record.Decoded.(map[string]interface{}); ok {
+			flattenRocketMQMap("body", payloadMap, row)
+		}
+		if len(record.Properties) > 0 {
+			for key, value := range record.Properties {
+				if strings.TrimSpace(key) == "" {
+					continue
+				}
+				row["properties."+key] = value
+			}
+		}
+		rows = append(rows, row)
+	}
+	return rows
+}
+
+func flattenRocketMQMap(prefix string, values map[string]interface{}, row map[string]interface{}) {
+	for key, value := range values {
+		if strings.TrimSpace(key) == "" {
+			continue
+		}
+		name := prefix + "." + key
+		row[name] = value
+		if nested, ok := value.(map[string]interface{}); ok {
+			flattenRocketMQMap(name, nested, row)
+		}
+	}
+}
+
+func rocketmqSortMessages(records []rocketmqMessageRecord, latest bool) {
+	sort.Slice(records, func(i, j int) bool {
+		left := records[i]
+		right := records[j]
+		switch {
+		case left.StoreTimestamp.Equal(right.StoreTimestamp):
+			if left.QueueOffset == right.QueueOffset {
+				if left.QueueID == right.QueueID {
+					return left.BrokerName < right.BrokerName
+				}
+				if latest {
+					return left.QueueID > right.QueueID
+				}
+				return left.QueueID < right.QueueID
+			}
+			if latest {
+				return left.QueueOffset > right.QueueOffset
+			}
+			return left.QueueOffset < right.QueueOffset
+		case latest:
+			return left.StoreTimestamp.After(right.StoreTimestamp)
+		default:
+			return left.StoreTimestamp.Before(right.StoreTimestamp)
+		}
+	})
+}
diff --git a/internal/db/rocketmq_impl_test.go b/internal/db/rocketmq_impl_test.go
new file mode 100644
index 0000000..f719aee
--- /dev/null
+++ b/internal/db/rocketmq_impl_test.go
@@ -0,0 +1,312 @@
+package db
+
+import (
+	"context"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+
+	rocketmqprimitive "github.com/apache/rocketmq-client-go/v2/primitive"
+)
+
+type fakeRocketMQRuntime struct {
+	listTopicsResult   []rocketmqTopicInfo
+	describeResult     rocketmqTopicDescription
+	fetchResult        []rocketmqMessageRecord
+	publishAffected    int64
+	lastDescribe       rocketmqDescribeRequest
+	lastFetch          rocketmqFetchRequest
+	lastPublish        rocketmqPublishCommand
+}
+
+func (f *fakeRocketMQRuntime) Close() error { return nil }
+
+func (f *fakeRocketMQRuntime) Ping(ctx context.Context) error { return nil }
+
+func (f *fakeRocketMQRuntime) ListTopics(ctx context.Context, includeSystem bool) ([]rocketmqTopicInfo, error) {
+	result := make([]rocketmqTopicInfo, 0, len(f.listTopicsResult))
+	for _, item := range f.listTopicsResult {
+		if item.System && !includeSystem {
+			continue
+		}
+		result = append(result, item)
+	}
+	return result, nil
+}
+
+func (f *fakeRocketMQRuntime) DescribeTopic(ctx context.Context, request rocketmqDescribeRequest) (rocketmqTopicDescription, error) {
+	f.lastDescribe = request
+	return f.describeResult, nil
+}
+
+func (f *fakeRocketMQRuntime) FetchMessages(ctx context.Context, request rocketmqFetchRequest) ([]rocketmqMessageRecord, error) {
+	f.lastFetch = request
+	items := append([]rocketmqMessageRecord(nil), f.fetchResult...)
+	if request.Offset > 0 {
+		if request.Offset >= len(items) {
+			return []rocketmqMessageRecord{}, nil
+		}
+		items = items[request.Offset:]
+	}
+	if request.Limit > 0 && len(items) > request.Limit {
+		items = items[:request.Limit]
+	}
+	return items, nil
+}
+
+func (f *fakeRocketMQRuntime) Publish(ctx context.Context, command rocketmqPublishCommand) (int64, error) {
+	f.lastPublish = command
+	return f.publishAffected, nil
+}
+
+func TestNormalizeRocketMQConfigParsesURIAndParams(t *testing.T) {
+	config := normalizeRocketMQConfig(connection.ConnectionConfig{
+		URI:              "rocketmq://ak:sk@127.0.0.1:9876,127.0.0.2:9877/orders.events?topology=cluster&groupId=preview&namespace=prod&tag=TagA&pullBatchSize=64&startOffset=latest",
+		ConnectionParams: "producerGroup=writer&sendTimeoutMs=6000",
+	})
+
+	if config.Host != "127.0.0.1" || config.Port != 9876 {
+		t.Fatalf("unexpected rocketmq host/port: %#v", config)
+	}
+	if !reflect.DeepEqual(config.Hosts, []string{"127.0.0.2:9877"}) {
+		t.Fatalf("unexpected rocketmq extra nameservers: %#v", config.Hosts)
+	}
+	if config.User != "ak" || config.Password != "sk" {
+		t.Fatalf("unexpected rocketmq credentials: %#v", config)
+	}
+	if config.Database != "orders.events" || config.Topology != "cluster" {
+		t.Fatalf("unexpected rocketmq topic/topology: %#v", config)
+	}
+
+	params := rocketmqConnectionParams(config)
+	if params.Get("groupId") != "preview" || params.Get("namespace") != "prod" || params.Get("tag") != "TagA" {
+		t.Fatalf("unexpected rocketmq params: %#v", params)
+	}
+	if params.Get("producerGroup") != "writer" || params.Get("sendTimeoutMs") != "6000" {
+		t.Fatalf("unexpected rocketmq producer params: %#v", params)
+	}
+}
+
+func TestRocketMQQueryExecAndColumns(t *testing.T) {
+	fakeRuntime := &fakeRocketMQRuntime{
+		listTopicsResult: []rocketmqTopicInfo{
+			{Name: "orders.events", QueueCount: 2},
+			{Name: "%RETRY%preview", System: true, QueueCount: 1},
+		},
+		describeResult: rocketmqTopicDescription{
+			Name:                  "orders.events",
+			Namespace:             "prod",
+			ConsumerGroup:         "preview",
+			TagExpression:         "*",
+			QueueCount:            2,
+			TotalApproximateCount: 42,
+			Queues: []rocketmqTopicQueueInfo{
+				{BrokerName: "broker-a", QueueID: 0, MinOffset: 0, MaxOffset: 21, ApproximateCount: 21},
+				{BrokerName: "broker-b", QueueID: 1, MinOffset: 0, MaxOffset: 21, ApproximateCount: 21},
+			},
+		},
+		fetchResult: []rocketmqMessageRecord{
+			{
+				Topic:          "orders.events",
+				BrokerName:     "broker-a",
+				QueueID:        0,
+				QueueOffset:    11,
+				MsgID:          "msg-11",
+				OffsetMsgID:    "offset-11",
+				Tags:           "TagA",
+				Keys:           "order-11 tenant-a",
+				Decoded:        map[string]interface{}{"event": "created", "meta": map[string]interface{}{"source": "erp"}},
+				Encoding:       "json",
+				Properties:     map[string]string{"trace": "trace-11"},
+				BornTimestamp:  time.Date(2026, 6, 14, 12, 0, 0, 0, time.UTC),
+				StoreTimestamp: time.Date(2026, 6, 14, 12, 0, 1, 0, time.UTC),
+			},
+			{
+				Topic:          "orders.events",
+				BrokerName:     "broker-b",
+				QueueID:        1,
+				QueueOffset:    12,
+				MsgID:          "msg-12",
+				OffsetMsgID:    "offset-12",
+				Tags:           "TagB",
+				Keys:           "order-12",
+				Decoded:        "plain-text",
+				Encoding:       "text",
+				Properties:     map[string]string{"trace": "trace-12"},
+				BornTimestamp:  time.Date(2026, 6, 14, 12, 0, 2, 0, time.UTC),
+				StoreTimestamp: time.Date(2026, 6, 14, 12, 0, 3, 0, time.UTC),
+			},
+		},
+		publishAffected: 1,
+	}
+
+	originalFactory := newRocketMQRuntime
+	newRocketMQRuntime = func(config connection.ConnectionConfig) (rocketmqRuntime, error) {
+		return fakeRuntime, nil
+	}
+	defer func() {
+		newRocketMQRuntime = originalFactory
+	}()
+
+	client := &RocketMQDB{}
+	if err := client.Connect(connection.ConnectionConfig{
+		Type:             "rocketmq",
+		Host:             "127.0.0.1",
+		Port:             9876,
+		Database:         "orders.events",
+		ConnectionParams: "groupId=preview&namespace=prod&pullBatchSize=48&startOffset=latest",
+	}); err != nil {
+		t.Fatalf("Connect failed: %v", err)
+	}
+	defer client.Close()
+
+	rows, columns, err := client.Query(`SHOW TOPICS LIMIT 1`)
+	if err != nil {
+		t.Fatalf("SHOW TOPICS failed: %v", err)
+	}
+	if len(rows) != 1 || rows[0]["topic"] != "orders.events" || rows[0]["queue_count"] != 2 {
+		t.Fatalf("unexpected rocketmq topic rows: %#v", rows)
+	}
+	if !containsString(columns, "system_topic") {
+		t.Fatalf("expected system_topic column, got %v", columns)
+	}
+
+	rows, columns, err = client.Query(`DESCRIBE TOPIC "orders.events"`)
+	if err != nil {
+		t.Fatalf("DESCRIBE TOPIC failed: %v", err)
+	}
+	if fakeRuntime.lastDescribe.Topic != "orders.events" || fakeRuntime.lastDescribe.ConsumerGroup != "preview" {
+		t.Fatalf("unexpected describe request: %#v", fakeRuntime.lastDescribe)
+	}
+	if len(rows) != 2 || rows[0]["topic_approximate_count"] != int64(42) {
+		t.Fatalf("unexpected rocketmq describe rows: %#v", rows)
+	}
+	if !containsString(columns, "broker_name") {
+		t.Fatalf("expected broker_name column, got %v", columns)
+	}
+
+	rows, columns, err = client.Query(`SELECT * FROM "orders.events" LIMIT 1 OFFSET 1`)
+	if err != nil {
+		t.Fatalf("SELECT topic failed: %v", err)
+	}
+	if fakeRuntime.lastFetch.Topic != "orders.events" || fakeRuntime.lastFetch.Limit != 1 || fakeRuntime.lastFetch.Offset != 1 || !fakeRuntime.lastFetch.Latest {
+		t.Fatalf("unexpected fetch request: %#v", fakeRuntime.lastFetch)
+	}
+	if len(rows) != 1 || rows[0]["body"] != "plain-text" || rows[0]["properties.trace"] != "trace-12" {
+		t.Fatalf("unexpected rocketmq message rows: %#v", rows)
+	}
+	if !containsString(columns, "body_encoding") || !containsString(columns, "properties.trace") {
+		t.Fatalf("unexpected columns: %v", columns)
+	}
+
+	rows, columns, err = client.Query(`SELECT COUNT(*) FROM "orders.events"`)
+	if err != nil {
+		t.Fatalf("COUNT(*) failed: %v", err)
+	}
+	if len(rows) != 1 || rows[0]["total_approximate_count"] != int64(42) {
+		t.Fatalf("unexpected count rows: %#v", rows)
+	}
+	if !containsString(columns, "queue_count") {
+		t.Fatalf("expected queue_count column, got %v", columns)
+	}
+
+	affected, err := client.Exec(`{"publish":"orders.events","payload":{"id":1},"tag":"TagA","keys":["order-1","tenant-a"],"delayLevel":3,"properties":{"trace":"trace-1"}}`)
+	if err != nil {
+		t.Fatalf("RocketMQ publish failed: %v", err)
+	}
+	if affected != 1 {
+		t.Fatalf("unexpected affected rows: %d", affected)
+	}
+	if fakeRuntime.lastPublish.Topic != "orders.events" || fakeRuntime.lastPublish.Tag != "TagA" || fakeRuntime.lastPublish.DelayLevel != 3 {
+		t.Fatalf("unexpected publish command: %#v", fakeRuntime.lastPublish)
+	}
+	if !reflect.DeepEqual(fakeRuntime.lastPublish.Keys, []string{"order-1", "tenant-a"}) {
+		t.Fatalf("unexpected publish keys: %#v", fakeRuntime.lastPublish.Keys)
+	}
+	if fakeRuntime.lastPublish.Properties["trace"] != "trace-1" {
+		t.Fatalf("unexpected publish properties: %#v", fakeRuntime.lastPublish.Properties)
+	}
+
+	columnDefs, err := client.GetColumns(rocketMQSyntheticDatabase, "orders.events")
+	if err != nil {
+		t.Fatalf("GetColumns failed: %v", err)
+	}
+	names := make([]string, 0, len(columnDefs))
+	for _, col := range columnDefs {
+		names = append(names, col.Name)
+	}
+	joined := strings.Join(names, ",")
+	for _, want := range []string{"topic", "body.meta.source", "properties.trace"} {
+		if !strings.Contains(joined, want) {
+			t.Fatalf("expected rocketmq column %q in %s", want, joined)
+		}
+	}
+
+	databases, err := client.GetDatabases()
+	if err != nil {
+		t.Fatalf("GetDatabases failed: %v", err)
+	}
+	if !reflect.DeepEqual(databases, []string{rocketMQSyntheticDatabase}) {
+		t.Fatalf("unexpected rocketmq database list: %#v", databases)
+	}
+
+	tables, err := client.GetTables(rocketMQSyntheticDatabase)
+	if err != nil {
+		t.Fatalf("GetTables failed: %v", err)
+	}
+	if !reflect.DeepEqual(tables, []string{"orders.events"}) {
+		t.Fatalf("unexpected rocketmq topic list: %#v", tables)
+	}
+}
+
+func TestRocketMQCountRejectsTagFilteredConnections(t *testing.T) {
+	fakeRuntime := &fakeRocketMQRuntime{}
+
+	originalFactory := newRocketMQRuntime
+	newRocketMQRuntime = func(config connection.ConnectionConfig) (rocketmqRuntime, error) {
+		return fakeRuntime, nil
+	}
+	defer func() {
+		newRocketMQRuntime = originalFactory
+	}()
+
+	client := &RocketMQDB{}
+	if err := client.Connect(connection.ConnectionConfig{
+		Type:             "rocketmq",
+		Host:             "127.0.0.1",
+		Port:             9876,
+		Database:         "orders.events",
+		ConnectionParams: "tag=TagA",
+	}); err != nil {
+		t.Fatalf("Connect failed: %v", err)
+	}
+	defer client.Close()
+
+	if _, _, err := client.Query(`SELECT COUNT(*) FROM "orders.events"`); err == nil || !strings.Contains(err.Error(), "TAG 过滤") {
+		t.Fatalf("expected COUNT(*) to be rejected for tag-filtered RocketMQ, got %v", err)
+	}
+}
+
+func TestRocketMQRecordFromExtUsesPayloadDecoder(t *testing.T) {
+	record := rocketmqRecordFromExt(&rocketmqprimitive.MessageExt{
+		Message: rocketmqprimitive.Message{
+			Topic: "orders.events",
+			Body:  []byte(`{"id":1}`),
+		},
+		MsgId:          "msg-1",
+		OffsetMsgId:    "offset-1",
+		QueueOffset:    2,
+		BornTimestamp:  time.Date(2026, 6, 14, 12, 0, 0, 0, time.UTC).UnixMilli(),
+		StoreTimestamp: time.Date(2026, 6, 14, 12, 0, 1, 0, time.UTC).UnixMilli(),
+	}, "broker-a", 1, 0, 3)
+
+	if record.Encoding != "json" {
+		t.Fatalf("expected json encoding, got %#v", record)
+	}
+	if body, ok := record.Decoded.(map[string]interface{}); !ok || body["id"] == nil {
+		t.Fatalf("unexpected decoded body: %#v", record.Decoded)
+	}
+}
diff --git a/internal/db/scan_rows.go b/internal/db/scan_rows.go
index e1959ef..cac7064 100644
--- a/internal/db/scan_rows.go
+++ b/internal/db/scan_rows.go
@@ -8,6 +8,10 @@ import (
 )
 
 func scanRows(rows *sql.Rows) ([]map[string]interface{}, []string, error) {
+	return scanRowsForDialect(rows, "")
+}
+
+func scanRowsForDialect(rows *sql.Rows, dialect string) ([]map[string]interface{}, []string, error) {
 	columns, err := rows.Columns()
 	if err != nil {
 		return nil, nil, err
@@ -38,7 +42,7 @@ func scanRows(rows *sql.Rows) ([]map[string]interface{}, []string, error) {
 			if colTypes != nil && i < len(colTypes) && colTypes[i] != nil {
 				dbTypeName = colTypes[i].DatabaseTypeName()
 			}
-			entry[col] = normalizeQueryValueWithDBType(values[i], dbTypeName)
+			entry[col] = normalizeQueryValueWithDBTypeAndDialect(values[i], dbTypeName, dialect)
 		}
 		resultData = append(resultData, entry)
 	}
@@ -92,9 +96,13 @@ func ensureUniqueQueryColumnNames(columns []string) []string {
 // scanMultiRows 遍历 sql.Rows 中的所有结果集，将每个结果集作为 ResultSetData 返回。
 // 利用 rows.NextResultSet() 支持一次 query 返回多个结果集的场景。
 func scanMultiRows(rows *sql.Rows) ([]connection.ResultSetData, error) {
+	return scanMultiRowsForDialect(rows, "")
+}
+
+func scanMultiRowsForDialect(rows *sql.Rows, dialect string) ([]connection.ResultSetData, error) {
 	var results []connection.ResultSetData
 	for {
-		data, cols, err := scanRows(rows)
+		data, cols, err := scanRowsForDialect(rows, dialect)
 		if err != nil {
 			return results, err
 		}
diff --git a/internal/db/scan_rows_test.go b/internal/db/scan_rows_test.go
index 91c5a62..cd683ac 100644
--- a/internal/db/scan_rows_test.go
+++ b/internal/db/scan_rows_test.go
@@ -8,6 +8,7 @@ import (
 	"reflect"
 	"sync"
 	"testing"
+	"time"
 )
 
 const scanRowsDuplicateDriverName = "gonavi-scan-rows-duplicate"
@@ -27,6 +28,18 @@ func (scanRowsDuplicateConn) Close() error                              { return
 func (scanRowsDuplicateConn) Begin() (driver.Tx, error)                 { return nil, driver.ErrSkip }
 
 func (scanRowsDuplicateConn) QueryContext(_ context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
+	if query == "SELECT date_columns" {
+		return &scanRowsDuplicateRows{
+			columns:     []string{"ship_date", "created_at"},
+			columnTypes: []string{"DATE", "DATETIME"},
+			rows: [][]driver.Value{
+				{
+					time.Date(2025, 10, 1, 0, 0, 0, 0, time.UTC),
+					time.Date(2025, 10, 1, 13, 14, 15, 0, time.UTC),
+				},
+			},
+		}, nil
+	}
 	return &scanRowsDuplicateRows{
 		columns: []string{"id", "id", "name"},
 		rows: [][]driver.Value{
@@ -38,13 +51,20 @@ func (scanRowsDuplicateConn) QueryContext(_ context.Context, query string, args
 var _ driver.QueryerContext = (*scanRowsDuplicateConn)(nil)
 
 type scanRowsDuplicateRows struct {
-	columns []string
-	rows    [][]driver.Value
-	index   int
+	columns     []string
+	columnTypes []string
+	rows        [][]driver.Value
+	index       int
 }
 
 func (r *scanRowsDuplicateRows) Columns() []string { return append([]string(nil), r.columns...) }
 func (r *scanRowsDuplicateRows) Close() error      { return nil }
+func (r *scanRowsDuplicateRows) ColumnTypeDatabaseTypeName(index int) string {
+	if index < 0 || index >= len(r.columnTypes) {
+		return ""
+	}
+	return r.columnTypes[index]
+}
 
 func (r *scanRowsDuplicateRows) Next(dest []driver.Value) error {
 	if r.index >= len(r.rows) {
@@ -95,3 +115,72 @@ func TestScanRowsRenamesDuplicateColumns(t *testing.T) {
 		t.Fatalf("unexpected row data: %#v", data[0])
 	}
 }
+
+func TestScanRowsForMySQLDialectFormatsDateOnly(t *testing.T) {
+	t.Parallel()
+
+	registerScanRowsDuplicateDriverOnce.Do(func() {
+		sql.Register(scanRowsDuplicateDriverName, scanRowsDuplicateDriver{})
+	})
+
+	dbConn, err := sql.Open(scanRowsDuplicateDriverName, "")
+	if err != nil {
+		t.Fatalf("open date scan rows db failed: %v", err)
+	}
+	defer dbConn.Close()
+
+	rows, err := dbConn.QueryContext(context.Background(), "SELECT date_columns")
+	if err != nil {
+		t.Fatalf("query date scan rows db failed: %v", err)
+	}
+	defer rows.Close()
+
+	data, columns, err := scanRowsForDialect(rows, "mysql")
+	if err != nil {
+		t.Fatalf("scanRowsForDialect returned error: %v", err)
+	}
+
+	if !reflect.DeepEqual(columns, []string{"ship_date", "created_at"}) {
+		t.Fatalf("unexpected columns: %v", columns)
+	}
+	if len(data) != 1 {
+		t.Fatalf("expected one row, got=%d", len(data))
+	}
+	if data[0]["ship_date"] != "2025-10-01" {
+		t.Fatalf("MySQL DATE 应展示为日期，实际=%v(%T)", data[0]["ship_date"], data[0]["ship_date"])
+	}
+	if data[0]["created_at"] != "2025-10-01T13:14:15Z" {
+		t.Fatalf("MySQL DATETIME 应保留时间，实际=%v(%T)", data[0]["created_at"], data[0]["created_at"])
+	}
+}
+
+func TestScanRowsForOracleDialectKeepsDateTime(t *testing.T) {
+	t.Parallel()
+
+	registerScanRowsDuplicateDriverOnce.Do(func() {
+		sql.Register(scanRowsDuplicateDriverName, scanRowsDuplicateDriver{})
+	})
+
+	dbConn, err := sql.Open(scanRowsDuplicateDriverName, "")
+	if err != nil {
+		t.Fatalf("open date scan rows db failed: %v", err)
+	}
+	defer dbConn.Close()
+
+	rows, err := dbConn.QueryContext(context.Background(), "SELECT date_columns")
+	if err != nil {
+		t.Fatalf("query date scan rows db failed: %v", err)
+	}
+	defer rows.Close()
+
+	data, _, err := scanRowsForDialect(rows, "oracle")
+	if err != nil {
+		t.Fatalf("scanRowsForDialect returned error: %v", err)
+	}
+	if len(data) != 1 {
+		t.Fatalf("expected one row, got=%d", len(data))
+	}
+	if data[0]["ship_date"] != "2025-10-01T00:00:00Z" {
+		t.Fatalf("Oracle DATE 应保留 datetime 语义，实际=%v(%T)", data[0]["ship_date"], data[0]["ship_date"])
+	}
+}
diff --git a/internal/db/sqlserver_impl.go b/internal/db/sqlserver_impl.go
index ffa927a..34839d7 100644
--- a/internal/db/sqlserver_impl.go
+++ b/internal/db/sqlserver_impl.go
@@ -17,6 +17,7 @@ import (
 	"GoNavi-Wails/internal/ssh"
 	"GoNavi-Wails/internal/utils"
 
+	"github.com/golang-sql/sqlexp"
 	_ "github.com/microsoft/go-mssqldb"
 )
 
@@ -26,6 +27,85 @@ type SqlServerDB struct {
 	forwarder   *ssh.LocalForwarder
 }
 
+type sqlServerSessionExecer struct {
+	conn *sql.Conn
+}
+
+func scanSQLServerRowsWithMessages(ctx context.Context, rows *sql.Rows, retmsg *sqlexp.ReturnMessage) ([]connection.ResultSetData, []string, error) {
+	if rows == nil {
+		return []connection.ResultSetData{{Rows: []map[string]interface{}{}, Columns: []string{}}}, nil, nil
+	}
+	if ctx == nil {
+		ctx = context.Background()
+	}
+
+	var (
+		resultSets  []connection.ResultSetData
+		messages    []string
+		allMessages []string
+	)
+	active := true
+	for active {
+		raw := retmsg.Message(ctx)
+		switch msg := raw.(type) {
+		case sqlexp.MsgNotice:
+			text := strings.TrimSpace(fmt.Sprint(msg.Message))
+			if text != "" {
+				messages = append(messages, text)
+				allMessages = append(allMessages, text)
+			}
+		case sqlexp.MsgNext:
+			data, cols, err := scanRows(rows)
+			if err != nil {
+				return resultSets, messages, err
+			}
+			if data == nil {
+				data = []map[string]interface{}{}
+			}
+			if cols == nil {
+				cols = []string{}
+			}
+			resultSets = append(resultSets, connection.ResultSetData{
+				Rows:     data,
+				Columns:  cols,
+				Messages: append([]string(nil), messages...),
+			})
+			messages = nil
+		case sqlexp.MsgRowsAffected:
+			resultSets = append(resultSets, connection.ResultSetData{
+				Rows:     []map[string]interface{}{{"affectedRows": msg.Count}},
+				Columns:  []string{"affectedRows"},
+				Messages: append([]string(nil), messages...),
+			})
+			messages = nil
+		case sqlexp.MsgNextResultSet:
+			active = rows.NextResultSet()
+		case sqlexp.MsgError:
+			return resultSets, messages, msg.Error
+		default:
+			active = false
+		}
+	}
+
+	if len(messages) > 0 {
+		resultSets = append(resultSets, connection.ResultSetData{
+			Rows:     []map[string]interface{}{},
+			Columns:  []string{},
+			Messages: append([]string(nil), messages...),
+		})
+	}
+	if len(resultSets) == 0 {
+		resultSets = []connection.ResultSetData{{
+			Rows:    []map[string]interface{}{},
+			Columns: []string{},
+		}}
+	}
+	if err := rows.Err(); err != nil {
+		return resultSets, allMessages, err
+	}
+	return resultSets, allMessages, nil
+}
+
 // quoteBracket escapes ] in identifiers for safe use in SQL Server [bracket] notation
 func quoteBracket(name string) string {
 	return strings.ReplaceAll(name, "]", "]]")
@@ -133,54 +213,76 @@ func (s *SqlServerDB) Ping() error {
 }
 
 func (s *SqlServerDB) QueryMulti(query string) ([]connection.ResultSetData, error) {
+	results, _, err := s.QueryMultiWithMessages(query)
+	return results, err
+}
+
+func (s *SqlServerDB) QueryMultiWithMessages(query string) ([]connection.ResultSetData, []string, error) {
 	if s.conn == nil {
-		return nil, fmt.Errorf("连接未打开")
+		return nil, nil, fmt.Errorf("连接未打开")
 	}
-	rows, err := s.conn.Query(query)
+	ctx := context.Background()
+	retmsg := &sqlexp.ReturnMessage{}
+	rows, err := s.conn.QueryContext(ctx, query, retmsg)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	defer rows.Close()
-	return scanMultiRows(rows)
+	return scanSQLServerRowsWithMessages(ctx, rows, retmsg)
 }
 
 func (s *SqlServerDB) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
+	results, _, err := s.QueryMultiContextWithMessages(ctx, query)
+	return results, err
+}
+
+func (s *SqlServerDB) QueryMultiContextWithMessages(ctx context.Context, query string) ([]connection.ResultSetData, []string, error) {
 	if s.conn == nil {
-		return nil, fmt.Errorf("连接未打开")
+		return nil, nil, fmt.Errorf("连接未打开")
 	}
-	rows, err := s.conn.QueryContext(ctx, query)
+	retmsg := &sqlexp.ReturnMessage{}
+	rows, err := s.conn.QueryContext(ctx, query, retmsg)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	defer rows.Close()
-	return scanMultiRows(rows)
+	return scanSQLServerRowsWithMessages(ctx, rows, retmsg)
 }
 
 func (s *SqlServerDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	rows, columns, _, err := s.QueryContextWithMessages(ctx, query)
+	return rows, columns, err
+}
+
+func (s *SqlServerDB) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
 	if s.conn == nil {
-		return nil, nil, fmt.Errorf("连接未打开")
+		return nil, nil, nil, fmt.Errorf("连接未打开")
 	}
 
-	rows, err := s.conn.QueryContext(ctx, query)
+	resultSets, messages, err := s.QueryMultiContextWithMessages(ctx, query)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, nil, err
 	}
-	defer rows.Close()
-
-	return scanRows(rows)
+	if len(resultSets) == 0 {
+		return []map[string]interface{}{}, []string{}, messages, nil
+	}
+	first := resultSets[0]
+	if first.Rows == nil {
+		first.Rows = []map[string]interface{}{}
+	}
+	if first.Columns == nil {
+		first.Columns = []string{}
+	}
+	return first.Rows, first.Columns, messages, nil
 }
 
 func (s *SqlServerDB) Query(query string) ([]map[string]interface{}, []string, error) {
-	if s.conn == nil {
-		return nil, nil, fmt.Errorf("连接未打开")
-	}
+	rows, columns, _, err := s.QueryWithMessages(query)
+	return rows, columns, err
+}
 
-	rows, err := s.conn.Query(query)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer rows.Close()
-	return scanRows(rows)
+func (s *SqlServerDB) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	return s.QueryContextWithMessages(context.Background(), query)
 }
 
 func (s *SqlServerDB) ExecContext(ctx context.Context, query string) (int64, error) {
@@ -191,7 +293,7 @@ func (s *SqlServerDB) ExecContext(ctx context.Context, query string) (int64, err
 	if err != nil {
 		return 0, err
 	}
-	return res.RowsAffected()
+	return sqlServerRowsAffected(query, res)
 }
 
 func (s *SqlServerDB) ExecBatchContext(ctx context.Context, query string) (int64, error) {
@@ -202,7 +304,7 @@ func (s *SqlServerDB) ExecBatchContext(ctx context.Context, query string) (int64
 	if err != nil {
 		return 0, err
 	}
-	return res.RowsAffected()
+	return sqlServerRowsAffected(query, res)
 }
 
 func (s *SqlServerDB) OpenSessionExecer(ctx context.Context) (StatementExecer, error) {
@@ -213,7 +315,7 @@ func (s *SqlServerDB) OpenSessionExecer(ctx context.Context) (StatementExecer, e
 	if err != nil {
 		return nil, err
 	}
-	return NewSQLConnStatementExecer(conn), nil
+	return &sqlServerSessionExecer{conn: conn}, nil
 }
 
 func (s *SqlServerDB) Exec(query string) (int64, error) {
@@ -224,7 +326,119 @@ func (s *SqlServerDB) Exec(query string) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
-	return res.RowsAffected()
+	return sqlServerRowsAffected(query, res)
+}
+
+func (e *sqlServerSessionExecer) Exec(query string) (int64, error) {
+	return e.ExecContext(context.Background(), query)
+}
+
+func (e *sqlServerSessionExecer) ExecContext(ctx context.Context, query string) (int64, error) {
+	if e == nil || e.conn == nil {
+		return 0, fmt.Errorf("连接未打开")
+	}
+	res, err := e.conn.ExecContext(ctx, query)
+	if err != nil {
+		return 0, err
+	}
+	return sqlServerRowsAffected(query, res)
+}
+
+func sqlServerRowsAffected(query string, res sql.Result) (int64, error) {
+	if res == nil {
+		return 0, nil
+	}
+	affected, err := res.RowsAffected()
+	if err == nil {
+		return affected, nil
+	}
+	if sqlServerAllowsUnknownRowsAffected(query) {
+		return 0, nil
+	}
+	return 0, err
+}
+
+func sqlServerAllowsUnknownRowsAffected(query string) bool {
+	trimmed := strings.TrimSpace(query)
+	if trimmed == "" {
+		return false
+	}
+	fields := strings.Fields(trimmed)
+	if len(fields) == 0 {
+		return false
+	}
+	switch strings.ToLower(fields[0]) {
+	case "begin", "commit", "rollback", "save":
+		return true
+	default:
+		return false
+	}
+}
+
+func (e *sqlServerSessionExecer) Query(query string) ([]map[string]interface{}, []string, error) {
+	rows, columns, _, err := e.QueryWithMessages(query)
+	return rows, columns, err
+}
+
+func (e *sqlServerSessionExecer) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	rows, columns, _, err := e.QueryContextWithMessages(ctx, query)
+	return rows, columns, err
+}
+
+func (e *sqlServerSessionExecer) QueryWithMessages(query string) ([]map[string]interface{}, []string, []string, error) {
+	return e.QueryContextWithMessages(context.Background(), query)
+}
+
+func (e *sqlServerSessionExecer) QueryContextWithMessages(ctx context.Context, query string) ([]map[string]interface{}, []string, []string, error) {
+	results, messages, err := e.QueryMultiContextWithMessages(ctx, query)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	if len(results) == 0 {
+		return []map[string]interface{}{}, []string{}, messages, nil
+	}
+	first := results[0]
+	if first.Rows == nil {
+		first.Rows = []map[string]interface{}{}
+	}
+	if first.Columns == nil {
+		first.Columns = []string{}
+	}
+	return first.Rows, first.Columns, messages, nil
+}
+
+func (e *sqlServerSessionExecer) QueryMulti(query string) ([]connection.ResultSetData, error) {
+	results, _, err := e.QueryMultiWithMessages(query)
+	return results, err
+}
+
+func (e *sqlServerSessionExecer) QueryMultiContext(ctx context.Context, query string) ([]connection.ResultSetData, error) {
+	results, _, err := e.QueryMultiContextWithMessages(ctx, query)
+	return results, err
+}
+
+func (e *sqlServerSessionExecer) QueryMultiWithMessages(query string) ([]connection.ResultSetData, []string, error) {
+	return e.QueryMultiContextWithMessages(context.Background(), query)
+}
+
+func (e *sqlServerSessionExecer) QueryMultiContextWithMessages(ctx context.Context, query string) ([]connection.ResultSetData, []string, error) {
+	if e == nil || e.conn == nil {
+		return nil, nil, fmt.Errorf("连接未打开")
+	}
+	retmsg := &sqlexp.ReturnMessage{}
+	rows, err := e.conn.QueryContext(ctx, query, retmsg)
+	if err != nil {
+		return nil, nil, err
+	}
+	defer rows.Close()
+	return scanSQLServerRowsWithMessages(ctx, rows, retmsg)
+}
+
+func (e *sqlServerSessionExecer) Close() error {
+	if e == nil || e.conn == nil {
+		return nil
+	}
+	return e.conn.Close()
 }
 
 func (s *SqlServerDB) GetDatabases() ([]string, error) {
diff --git a/internal/db/sqlserver_impl_test.go b/internal/db/sqlserver_impl_test.go
new file mode 100644
index 0000000..bebe085
--- /dev/null
+++ b/internal/db/sqlserver_impl_test.go
@@ -0,0 +1,67 @@
+//go:build gonavi_full_drivers || gonavi_sqlserver_driver
+
+package db
+
+import (
+	"errors"
+	"testing"
+)
+
+type fakeSQLServerExecResult struct {
+	affected int64
+	rowErr   error
+}
+
+func (r fakeSQLServerExecResult) LastInsertId() (int64, error) {
+	return 0, errors.New("not implemented")
+}
+
+func (r fakeSQLServerExecResult) RowsAffected() (int64, error) {
+	if r.rowErr != nil {
+		return 0, r.rowErr
+	}
+	return r.affected, nil
+}
+
+func TestSQLServerRowsAffectedIgnoresTransactionControlErrors(t *testing.T) {
+	rowErr := errors.New("不支持的方法")
+	for _, query := range []string{
+		"BEGIN TRANSACTION",
+		"COMMIT TRANSACTION",
+		"ROLLBACK TRANSACTION",
+		"SAVE TRANSACTION before_update",
+		"BEGIN TRY\nSELECT 1\nEND TRY",
+	} {
+		affected, err := sqlServerRowsAffected(query, fakeSQLServerExecResult{rowErr: rowErr})
+		if err != nil {
+			t.Fatalf("sqlServerRowsAffected(%q) returned unexpected error: %v", query, err)
+		}
+		if affected != 0 {
+			t.Fatalf("sqlServerRowsAffected(%q) = %d, want 0", query, affected)
+		}
+	}
+}
+
+func TestSQLServerRowsAffectedPreservesDMLCount(t *testing.T) {
+	affected, err := sqlServerRowsAffected(
+		"UPDATE dbo.users SET name = 'neo' WHERE id = 1",
+		fakeSQLServerExecResult{affected: 3},
+	)
+	if err != nil {
+		t.Fatalf("sqlServerRowsAffected returned unexpected error: %v", err)
+	}
+	if affected != 3 {
+		t.Fatalf("sqlServerRowsAffected = %d, want 3", affected)
+	}
+}
+
+func TestSQLServerRowsAffectedDoesNotHideDMLRowsAffectedErrors(t *testing.T) {
+	rowErr := errors.New("rows affected unsupported")
+	_, err := sqlServerRowsAffected(
+		"UPDATE dbo.users SET name = 'neo' WHERE id = 1",
+		fakeSQLServerExecResult{rowErr: rowErr},
+	)
+	if !errors.Is(err, rowErr) {
+		t.Fatalf("expected rows affected error to propagate for DML, got %v", err)
+	}
+}
diff --git a/internal/db/tdengine_applychanges_test.go b/internal/db/tdengine_applychanges_test.go
index 7292d35..8a61f21 100644
--- a/internal/db/tdengine_applychanges_test.go
+++ b/internal/db/tdengine_applychanges_test.go
@@ -251,3 +251,125 @@ func TestTDengineGetTablesIncludesSuperTables(t *testing.T) {
 		t.Fatalf("unexpected tables: got=%v want=%v", tables, want)
 	}
 }
+
+func TestTDengineGetTablesFallsBackToLegacyFromSyntax(t *testing.T) {
+	t.Parallel()
+
+	dbConn, state := openTDengineRecordingDB(t)
+	state.mu.Lock()
+	state.queryResults["SHOW TABLES FROM `metrics`"] = tdengineQueryResult{
+		err: fmt.Errorf("[0x2600] syntax error near '`metrics`'"),
+	}
+	state.queryResults["SHOW STABLES FROM `metrics`"] = tdengineQueryResult{
+		err: fmt.Errorf("[0x2600] syntax error near '`metrics`'"),
+	}
+	state.queryResults["SHOW TABLES FROM metrics"] = tdengineQueryResult{
+		columns: []string{"name"},
+		rows: [][]driver.Value{
+			{"d001"},
+		},
+	}
+	state.queryResults["SHOW STABLES FROM metrics"] = tdengineQueryResult{
+		columns: []string{"name"},
+		rows: [][]driver.Value{
+			{"meters"},
+		},
+	}
+	state.mu.Unlock()
+
+	td := &TDengineDB{conn: dbConn}
+	tables, err := td.GetTables("metrics")
+	if err != nil {
+		t.Fatalf("GetTables returned error: %v", err)
+	}
+
+	wantTables := []string{"d001", "meters"}
+	if !reflect.DeepEqual(tables, wantTables) {
+		t.Fatalf("unexpected tables: got=%v want=%v", tables, wantTables)
+	}
+
+	queries := state.snapshotQueries()
+	wantQueries := []string{
+		"SHOW TABLES FROM `metrics`",
+		"SHOW STABLES FROM `metrics`",
+		"SHOW TABLES FROM metrics",
+		"SHOW STABLES FROM metrics",
+		"SHOW TABLES",
+		"SHOW STABLES",
+	}
+	if !reflect.DeepEqual(queries, wantQueries) {
+		t.Fatalf("unexpected query sequence: got=%v want=%v", queries, wantQueries)
+	}
+}
+
+func TestTDengineGetColumnsFallsBackToLegacyDescribeSyntax(t *testing.T) {
+	t.Parallel()
+
+	dbConn, state := openTDengineRecordingDB(t)
+	state.mu.Lock()
+	state.queryResults["DESCRIBE `metrics`.`meters`"] = tdengineQueryResult{
+		err: fmt.Errorf("[0x2600] syntax error near '`metrics`.`meters`'"),
+	}
+	state.queryResults["DESCRIBE metrics.meters"] = tdengineQueryResult{
+		columns: []string{"Field", "Type", "Note", "Null"},
+		rows: [][]driver.Value{
+			{"ts", "TIMESTAMP", "", "NO"},
+			{"value", "DOUBLE", "", "YES"},
+		},
+	}
+	state.mu.Unlock()
+
+	td := &TDengineDB{conn: dbConn}
+	columns, err := td.GetColumns("metrics", "meters")
+	if err != nil {
+		t.Fatalf("GetColumns returned error: %v", err)
+	}
+
+	if len(columns) != 2 {
+		t.Fatalf("expected 2 columns, got %d", len(columns))
+	}
+	queries := state.snapshotQueries()
+	wantQueries := []string{"DESCRIBE `metrics`.`meters`", "DESCRIBE metrics.meters"}
+	if !reflect.DeepEqual(queries, wantQueries) {
+		t.Fatalf("unexpected query sequence: got=%v want=%v", queries, wantQueries)
+	}
+}
+
+func TestTDengineGetCreateStatementFallsBackToLegacySyntax(t *testing.T) {
+	t.Parallel()
+
+	dbConn, state := openTDengineRecordingDB(t)
+	state.mu.Lock()
+	state.queryResults["SHOW CREATE TABLE `metrics`.`meters`"] = tdengineQueryResult{
+		err: fmt.Errorf("[0x2600] syntax error near '`metrics`.`meters`'"),
+	}
+	state.queryResults["SHOW CREATE STABLE `metrics`.`meters`"] = tdengineQueryResult{
+		err: fmt.Errorf("[0x2600] syntax error near '`metrics`.`meters`'"),
+	}
+	state.queryResults["SHOW CREATE TABLE metrics.meters"] = tdengineQueryResult{
+		columns: []string{"SQL"},
+		rows: [][]driver.Value{
+			{"CREATE TABLE metrics.meters (ts TIMESTAMP, value DOUBLE)"},
+		},
+	}
+	state.mu.Unlock()
+
+	td := &TDengineDB{conn: dbConn}
+	ddl, err := td.GetCreateStatement("metrics", "meters")
+	if err != nil {
+		t.Fatalf("GetCreateStatement returned error: %v", err)
+	}
+	if ddl != "CREATE TABLE metrics.meters (ts TIMESTAMP, value DOUBLE)" {
+		t.Fatalf("unexpected DDL: %q", ddl)
+	}
+
+	queries := state.snapshotQueries()
+	wantQueries := []string{
+		"SHOW CREATE TABLE `metrics`.`meters`",
+		"SHOW CREATE STABLE `metrics`.`meters`",
+		"SHOW CREATE TABLE metrics.meters",
+	}
+	if !reflect.DeepEqual(queries, wantQueries) {
+		t.Fatalf("unexpected query sequence: got=%v want=%v", queries, wantQueries)
+	}
+}
diff --git a/internal/db/tdengine_impl.go b/internal/db/tdengine_impl.go
index 785d307..69782e8 100644
--- a/internal/db/tdengine_impl.go
+++ b/internal/db/tdengine_impl.go
@@ -5,6 +5,7 @@ package db
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"fmt"
 	"net"
 	"net/url"
@@ -210,13 +211,7 @@ func (t *TDengineDB) GetDatabases() ([]string, error) {
 }
 
 func (t *TDengineDB) GetTables(dbName string) ([]string, error) {
-	queries := make([]string, 0, 4)
-	if strings.TrimSpace(dbName) != "" {
-		queries = append(queries, fmt.Sprintf("SHOW TABLES FROM `%s`", escapeBacktickIdent(dbName)))
-		queries = append(queries, fmt.Sprintf("SHOW STABLES FROM `%s`", escapeBacktickIdent(dbName)))
-	}
-	queries = append(queries, "SHOW TABLES")
-	queries = append(queries, "SHOW STABLES")
+	queries := tdengineShowTablesQueries(dbName)
 
 	var lastErr error
 	tableSet := make(map[string]struct{})
@@ -267,11 +262,7 @@ func (t *TDengineDB) GetTables(dbName string) ([]string, error) {
 }
 
 func (t *TDengineDB) GetCreateStatement(dbName, tableName string) (string, error) {
-	qualified := quoteTDengineTable(dbName, tableName)
-	queries := []string{
-		fmt.Sprintf("SHOW CREATE TABLE %s", qualified),
-		fmt.Sprintf("SHOW CREATE STABLE %s", qualified),
-	}
+	queries := tdengineCreateStatementQueries(dbName, tableName)
 
 	var lastErr error
 	for _, query := range queries {
@@ -308,9 +299,25 @@ func (t *TDengineDB) GetCreateStatement(dbName, tableName string) (string, error
 }
 
 func (t *TDengineDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
-	query := fmt.Sprintf("DESCRIBE %s", quoteTDengineTable(dbName, tableName))
-	data, _, err := t.Query(query)
+	var (
+		data    []map[string]interface{}
+		err     error
+		lastErr error
+	)
+	for _, query := range tdengineDescribeQueries(dbName, tableName) {
+		data, _, err = t.Query(query)
+		if err == nil {
+			break
+		}
+		lastErr = err
+		if !isTDengineSyntaxCompatibilityError(err) {
+			return nil, err
+		}
+	}
 	if err != nil {
+		if lastErr != nil {
+			return nil, lastErr
+		}
 		return nil, err
 	}
 
@@ -502,6 +509,106 @@ func escapeBacktickIdent(ident string) string {
 	return strings.ReplaceAll(strings.TrimSpace(ident), "`", "``")
 }
 
+func tdengineShowTablesQueries(dbName string) []string {
+	queries := make([]string, 0, 6)
+	appendQuery := func(query string) {
+		query = strings.TrimSpace(query)
+		if query == "" {
+			return
+		}
+		for _, existing := range queries {
+			if existing == query {
+				return
+			}
+		}
+		queries = append(queries, query)
+	}
+
+	db := strings.TrimSpace(dbName)
+	if db != "" {
+		escaped := escapeBacktickIdent(db)
+		appendQuery(fmt.Sprintf("SHOW TABLES FROM `%s`", escaped))
+		appendQuery(fmt.Sprintf("SHOW STABLES FROM `%s`", escaped))
+		appendQuery(fmt.Sprintf("SHOW TABLES FROM %s", db))
+		appendQuery(fmt.Sprintf("SHOW STABLES FROM %s", db))
+	}
+
+	appendQuery("SHOW TABLES")
+	appendQuery("SHOW STABLES")
+	return queries
+}
+
+func tdengineDescribeQueries(dbName, tableName string) []string {
+	qualified := quoteTDengineTable(dbName, tableName)
+	legacyQualified := quoteTDengineTableLegacy(dbName, tableName)
+	queries := []string{fmt.Sprintf("DESCRIBE %s", qualified)}
+	if legacyQualified != qualified {
+		queries = append(queries, fmt.Sprintf("DESCRIBE %s", legacyQualified))
+	}
+	return queries
+}
+
+func tdengineCreateStatementQueries(dbName, tableName string) []string {
+	queries := make([]string, 0, 4)
+	appendQualifiedQueries := func(qualified string) {
+		if strings.TrimSpace(qualified) == "" {
+			return
+		}
+		queries = append(queries,
+			fmt.Sprintf("SHOW CREATE TABLE %s", qualified),
+			fmt.Sprintf("SHOW CREATE STABLE %s", qualified),
+		)
+	}
+	qualified := quoteTDengineTable(dbName, tableName)
+	appendQualifiedQueries(qualified)
+	legacyQualified := quoteTDengineTableLegacy(dbName, tableName)
+	if legacyQualified != qualified {
+		appendQualifiedQueries(legacyQualified)
+	}
+	return queries
+}
+
+func quoteTDengineTableLegacy(dbName, tableName string) string {
+	table := strings.TrimSpace(tableName)
+	if table == "" {
+		return ""
+	}
+	if strings.Contains(table, ".") {
+		return strings.Join(splitTDengineIdentifierParts(table), ".")
+	}
+	db := strings.TrimSpace(dbName)
+	if db == "" {
+		return table
+	}
+	return db + "." + table
+}
+
+func splitTDengineIdentifierParts(path string) []string {
+	parts := strings.Split(strings.TrimSpace(path), ".")
+	result := make([]string, 0, len(parts))
+	for _, part := range parts {
+		trimmed := strings.Trim(strings.TrimSpace(part), "`")
+		if trimmed == "" {
+			continue
+		}
+		result = append(result, trimmed)
+	}
+	return result
+}
+
+func isTDengineSyntaxCompatibilityError(err error) bool {
+	if err == nil {
+		return false
+	}
+	text := strings.ToLower(strings.TrimSpace(err.Error()))
+	if text == "" {
+		return false
+	}
+	return strings.Contains(text, "syntax error near") ||
+		strings.Contains(text, "[0x2600]") ||
+		errors.Is(err, sql.ErrNoRows)
+}
+
 func quoteTDengineTable(dbName, tableName string) string {
 	t := escapeBacktickIdent(tableName)
 	if t == "" {
diff --git a/internal/db/vastbase_impl.go b/internal/db/vastbase_impl.go
index 7bb5521..a1ece0a 100644
--- a/internal/db/vastbase_impl.go
+++ b/internal/db/vastbase_impl.go
@@ -249,178 +249,31 @@ func (v *VastbaseDB) GetCreateStatement(dbName, tableName string) (string, error
 }
 
 func (v *VastbaseDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
-	schema := strings.TrimSpace(dbName)
-	if schema == "" {
-		schema = "public"
-	}
-	table := strings.TrimSpace(tableName)
+	schema, table := normalizePGLikeMetadataTable(dbName, tableName)
 	if table == "" {
 		return nil, fmt.Errorf("表名不能为空")
 	}
 
-	esc := func(s string) string { return strings.ReplaceAll(s, "'", "''") }
-
-	query := fmt.Sprintf(`
-SELECT
-	a.attname AS column_name,
-	pg_catalog.format_type(a.atttypid, a.atttypmod) AS data_type,
-	CASE WHEN a.attnotnull THEN 'NO' ELSE 'YES' END AS is_nullable,
-	pg_get_expr(ad.adbin, ad.adrelid) AS column_default,
-	col_description(a.attrelid, a.attnum) AS comment,
-	CASE WHEN pk.attname IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
-FROM pg_class c
-JOIN pg_namespace n ON n.oid = c.relnamespace
-JOIN pg_attribute a ON a.attrelid = c.oid
-LEFT JOIN pg_attrdef ad ON ad.adrelid = c.oid AND ad.adnum = a.attnum
-LEFT JOIN (
-	SELECT i.indrelid, a3.attname
-	FROM pg_index i
-	JOIN pg_attribute a3 ON a3.attrelid = i.indrelid AND a3.attnum = ANY(i.indkey)
-	WHERE i.indisprimary
-) pk ON pk.indrelid = c.oid AND pk.attname = a.attname
-WHERE c.relkind IN ('r', 'p')
-  AND n.nspname = '%s'
-  AND c.relname = '%s'
-  AND a.attnum > 0
-  AND NOT a.attisdropped
-ORDER BY a.attnum`, esc(schema), esc(table))
-
-	data, _, err := v.Query(query)
+	data, _, err := v.Query(buildPGLikeColumnsMetadataQuery(schema, table))
 	if err != nil {
 		return nil, err
 	}
 
-	var columns []connection.ColumnDefinition
-	for _, row := range data {
-		col := connection.ColumnDefinition{
-			Name:     fmt.Sprintf("%v", row["column_name"]),
-			Type:     fmt.Sprintf("%v", row["data_type"]),
-			Nullable: fmt.Sprintf("%v", row["is_nullable"]),
-			Key:      fmt.Sprintf("%v", row["column_key"]),
-			Extra:    "",
-			Comment:  "",
-		}
-
-		if val, ok := row["comment"]; ok && val != nil {
-			col.Comment = fmt.Sprintf("%v", val)
-		}
-
-		if val, ok := row["column_default"]; ok && val != nil {
-			def := fmt.Sprintf("%v", val)
-			col.Default = &def
-			if strings.HasPrefix(strings.ToLower(strings.TrimSpace(def)), "nextval(") {
-				col.Extra = "auto_increment"
-			}
-		}
-
-		columns = append(columns, col)
-	}
-	return columns, nil
+	return buildPGLikeColumnDefinitions(data), nil
 }
 
 func (v *VastbaseDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
-	schema := strings.TrimSpace(dbName)
-	if schema == "" {
-		schema = "public"
-	}
-	table := strings.TrimSpace(tableName)
+	schema, table := normalizePGLikeMetadataTable(dbName, tableName)
 	if table == "" {
 		return nil, fmt.Errorf("表名不能为空")
 	}
 
-	esc := func(s string) string { return strings.ReplaceAll(s, "'", "''") }
-
-	query := fmt.Sprintf(`
-SELECT
-	i.relname AS index_name,
-	a.attname AS column_name,
-	ix.indisunique AS is_unique,
-	x.ordinality AS seq_in_index,
-	am.amname AS index_type
-FROM pg_class t
-JOIN pg_namespace n ON n.oid = t.relnamespace
-JOIN pg_index ix ON t.oid = ix.indrelid
-JOIN pg_class i ON i.oid = ix.indexrelid
-JOIN pg_am am ON i.relam = am.oid
-JOIN unnest(ix.indkey) WITH ORDINALITY AS x(attnum, ordinality) ON TRUE
-JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = x.attnum
-WHERE t.relkind IN ('r', 'p')
-  AND t.relname = '%s'
-  AND n.nspname = '%s'
-ORDER BY i.relname, x.ordinality`, esc(table), esc(schema))
-
-	data, _, err := v.Query(query)
+	data, _, err := v.Query(buildPGLikeIndexesMetadataQuery(schema, table))
 	if err != nil {
 		return nil, err
 	}
 
-	parseBool := func(val interface{}) bool {
-		switch v := val.(type) {
-		case bool:
-			return v
-		case string:
-			s := strings.ToLower(strings.TrimSpace(v))
-			return s == "t" || s == "true" || s == "1" || s == "y" || s == "yes"
-		default:
-			s := strings.ToLower(strings.TrimSpace(fmt.Sprintf("%v", val)))
-			return s == "t" || s == "true" || s == "1" || s == "y" || s == "yes"
-		}
-	}
-
-	parseInt := func(val interface{}) int {
-		switch v := val.(type) {
-		case int:
-			return v
-		case int64:
-			return int(v)
-		case float64:
-			return int(v)
-		case string:
-			var n int
-			_, _ = fmt.Sscanf(strings.TrimSpace(v), "%d", &n)
-			return n
-		default:
-			var n int
-			_, _ = fmt.Sscanf(strings.TrimSpace(fmt.Sprintf("%v", val)), "%d", &n)
-			return n
-		}
-	}
-
-	var indexes []connection.IndexDefinition
-	for _, row := range data {
-		isUnique := false
-		if val, ok := row["is_unique"]; ok && val != nil {
-			isUnique = parseBool(val)
-		}
-
-		nonUnique := 1
-		if isUnique {
-			nonUnique = 0
-		}
-
-		seq := 0
-		if val, ok := row["seq_in_index"]; ok && val != nil {
-			seq = parseInt(val)
-		}
-
-		indexType := ""
-		if val, ok := row["index_type"]; ok && val != nil {
-			indexType = strings.ToUpper(fmt.Sprintf("%v", val))
-		}
-		if indexType == "" {
-			indexType = "BTREE"
-		}
-
-		idx := connection.IndexDefinition{
-			Name:       fmt.Sprintf("%v", row["index_name"]),
-			ColumnName: fmt.Sprintf("%v", row["column_name"]),
-			NonUnique:  nonUnique,
-			SeqInIndex: seq,
-			IndexType:  indexType,
-		}
-		indexes = append(indexes, idx)
-	}
-	return indexes, nil
+	return buildPGLikeIndexDefinitions(data), nil
 }
 
 func (v *VastbaseDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
diff --git a/internal/mcpserver/backend.go b/internal/mcpserver/backend.go
new file mode 100644
index 0000000..81c2df6
--- /dev/null
+++ b/internal/mcpserver/backend.go
@@ -0,0 +1,115 @@
+package mcpserver
+
+import (
+	"context"
+
+	"GoNavi-Wails/internal/ai"
+	aiservice "GoNavi-Wails/internal/ai/service"
+	appcore "GoNavi-Wails/internal/app"
+	"GoNavi-Wails/internal/appdata"
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/logger"
+)
+
+// Backend 抽象 GoNavi 后端能力，便于复用真实 App 和单元测试替身。
+type Backend interface {
+	Close(context.Context) error
+	GetSavedConnections() ([]connection.SavedConnectionView, error)
+	GetEditableSavedConnection(id string) (connection.SavedConnectionView, error)
+	DBGetDatabases(config connection.ConnectionConfig) connection.QueryResult
+	DBGetTables(config connection.ConnectionConfig, dbName string) connection.QueryResult
+	DBGetAllColumns(config connection.ConnectionConfig, dbName string) connection.QueryResult
+	DBGetColumns(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult
+	DBGetIndexes(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult
+	DBGetForeignKeys(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult
+	DBGetTriggers(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult
+	DBShowCreateTable(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult
+	DBQueryMulti(config connection.ConnectionConfig, dbName string, query string, queryID string) connection.QueryResult
+	InspectSQL(dbType string, sql string) appcore.SQLInspection
+	GetSQLSafetyLevel() ai.SQLPermissionLevel
+}
+
+// AppBackend 基于现有 internal/app.App 暴露 MCP 所需数据库能力。
+type AppBackend struct {
+	app *appcore.App
+}
+
+func NewAppBackend(ctx context.Context) *AppBackend {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	a := appcore.NewApp()
+	appcore.InitializeLifecycle(a, ctx)
+	return &AppBackend{app: a}
+}
+
+func (b *AppBackend) Close(ctx context.Context) error {
+	if b == nil || b.app == nil {
+		return nil
+	}
+	b.app.Shutdown()
+	return nil
+}
+
+func (b *AppBackend) GetSavedConnections() ([]connection.SavedConnectionView, error) {
+	return b.app.GetSavedConnections()
+}
+
+func (b *AppBackend) GetEditableSavedConnection(id string) (connection.SavedConnectionView, error) {
+	return b.app.GetEditableSavedConnection(id)
+}
+
+func (b *AppBackend) DBGetDatabases(config connection.ConnectionConfig) connection.QueryResult {
+	return b.app.DBGetDatabases(config)
+}
+
+func (b *AppBackend) DBGetTables(config connection.ConnectionConfig, dbName string) connection.QueryResult {
+	return b.app.DBGetTables(config, dbName)
+}
+
+func (b *AppBackend) DBGetAllColumns(config connection.ConnectionConfig, dbName string) connection.QueryResult {
+	return b.app.DBGetAllColumns(config, dbName)
+}
+
+func (b *AppBackend) DBGetColumns(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return b.app.DBGetColumns(config, dbName, tableName)
+}
+
+func (b *AppBackend) DBGetIndexes(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return b.app.DBGetIndexes(config, dbName, tableName)
+}
+
+func (b *AppBackend) DBGetForeignKeys(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return b.app.DBGetForeignKeys(config, dbName, tableName)
+}
+
+func (b *AppBackend) DBGetTriggers(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return b.app.DBGetTriggers(config, dbName, tableName)
+}
+
+func (b *AppBackend) DBShowCreateTable(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return b.app.DBShowCreateTable(config, dbName, tableName)
+}
+
+func (b *AppBackend) DBQueryMulti(config connection.ConnectionConfig, dbName string, query string, queryID string) connection.QueryResult {
+	return b.app.DBQueryMulti(config, dbName, query, queryID)
+}
+
+func (b *AppBackend) InspectSQL(dbType string, sql string) appcore.SQLInspection {
+	return appcore.InspectSQL(dbType, sql)
+}
+
+func (b *AppBackend) GetSQLSafetyLevel() ai.SQLPermissionLevel {
+	inspection, err := aiservice.NewProviderConfigStore(appdata.MustResolveActiveRoot(), nil).Inspect()
+	if err != nil {
+		logger.Error(err, "加载 MCP SQL 安全控制失败，按只读模式回退")
+		return ai.PermissionReadOnly
+	}
+
+	switch inspection.Snapshot.SafetyLevel {
+	case ai.PermissionReadOnly, ai.PermissionReadWrite, ai.PermissionFull:
+		return inspection.Snapshot.SafetyLevel
+	default:
+		return ai.PermissionReadOnly
+	}
+}
diff --git a/internal/mcpserver/remote_config.go b/internal/mcpserver/remote_config.go
new file mode 100644
index 0000000..5c97b12
--- /dev/null
+++ b/internal/mcpserver/remote_config.go
@@ -0,0 +1,222 @@
+package mcpserver
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+)
+
+const (
+	defaultRemoteMCPPublicURL = "https://<你的域名或隧道地址>/mcp"
+	defaultRemoteMCPServerID  = "gonavi"
+	defaultRemoteMCPTokenHint = "<随机token>"
+)
+
+// RemoteMCPClientConfigOptions 描述给云端 Agent 生成远程 MCP 配置的参数。
+type RemoteMCPClientConfigOptions struct {
+	Client            string
+	DisplayName       string
+	URL               string
+	Token             string
+	ServerID          string
+	LocalAddr         string
+	Path              string
+	GoNaviCommand     string
+	StandaloneCommand string
+	SchemaOnly        bool
+}
+
+// ParseRemoteMCPClientConfigOptions 解析 remote-config 模式参数。
+func ParseRemoteMCPClientConfigOptions(args []string) (RemoteMCPClientConfigOptions, error) {
+	options := RemoteMCPClientConfigOptions{
+		Client:            "openclaw",
+		URL:               strings.TrimSpace(os.Getenv("GONAVI_MCP_PUBLIC_URL")),
+		Token:             strings.TrimSpace(os.Getenv("GONAVI_MCP_HTTP_TOKEN")),
+		ServerID:          defaultRemoteMCPServerID,
+		LocalAddr:         strings.TrimSpace(os.Getenv("GONAVI_MCP_HTTP_ADDR")),
+		Path:              strings.TrimSpace(os.Getenv("GONAVI_MCP_HTTP_PATH")),
+		GoNaviCommand:     "GoNavi.exe",
+		StandaloneCommand: "gonavi-mcp-server",
+		SchemaOnly:        parseBoolEnvDefault("GONAVI_MCP_SCHEMA_ONLY", true),
+	}
+	if options.URL == "" {
+		options.URL = defaultRemoteMCPPublicURL
+	}
+	if options.Token == "" {
+		options.Token = defaultRemoteMCPTokenHint
+	}
+	if options.LocalAddr == "" {
+		options.LocalAddr = defaultStreamableHTTPAddr
+	}
+	if options.Path == "" {
+		options.Path = defaultStreamableHTTPPath
+	}
+
+	fs := flag.NewFlagSet("gonavi-mcp-server remote-config", flag.ContinueOnError)
+	fs.SetOutput(io.Discard)
+	fs.StringVar(&options.Client, "client", options.Client, "remote MCP client name, for example openclaw or hermans")
+	fs.StringVar(&options.URL, "url", options.URL, "public Streamable HTTP MCP URL")
+	fs.StringVar(&options.Token, "token", options.Token, "bearer token used by the remote MCP client")
+	fs.StringVar(&options.ServerID, "server-id", options.ServerID, "MCP server id in generated config")
+	fs.StringVar(&options.LocalAddr, "addr", options.LocalAddr, "local HTTP listen address for GoNavi")
+	fs.StringVar(&options.Path, "path", options.Path, "local and public MCP path")
+	fs.StringVar(&options.GoNaviCommand, "gonavi-command", options.GoNaviCommand, "GoNavi application command on Windows")
+	fs.StringVar(&options.StandaloneCommand, "standalone-command", options.StandaloneCommand, "standalone gonavi-mcp-server command")
+	fs.BoolVar(&options.SchemaOnly, "schema-only", options.SchemaOnly, "generate a schema-only remote MCP launch command without execute_sql")
+	if err := fs.Parse(args); err != nil {
+		return RemoteMCPClientConfigOptions{}, err
+	}
+	if fs.NArg() > 0 {
+		return RemoteMCPClientConfigOptions{}, fmt.Errorf("未知 remote-config 参数: %s", strings.Join(fs.Args(), " "))
+	}
+	return normalizeRemoteMCPClientConfigOptions(options), nil
+}
+
+func normalizeRemoteMCPClientConfigOptions(options RemoteMCPClientConfigOptions) RemoteMCPClientConfigOptions {
+	options.Client = strings.ToLower(strings.TrimSpace(options.Client))
+	if options.Client == "" {
+		options.Client = "remote-agent"
+	}
+	options.DisplayName = remoteMCPClientDisplayName(options.Client, options.DisplayName)
+	options.URL = strings.TrimSpace(options.URL)
+	if options.URL == "" {
+		options.URL = defaultRemoteMCPPublicURL
+	}
+	options.Token = strings.TrimSpace(options.Token)
+	if options.Token == "" {
+		options.Token = defaultRemoteMCPTokenHint
+	}
+	options.ServerID = strings.TrimSpace(options.ServerID)
+	if options.ServerID == "" {
+		options.ServerID = defaultRemoteMCPServerID
+	}
+	options.LocalAddr = strings.TrimSpace(options.LocalAddr)
+	if options.LocalAddr == "" {
+		options.LocalAddr = defaultStreamableHTTPAddr
+	}
+	options.Path = strings.TrimSpace(options.Path)
+	if options.Path == "" {
+		options.Path = defaultStreamableHTTPPath
+	}
+	if !strings.HasPrefix(options.Path, "/") {
+		options.Path = "/" + options.Path
+	}
+	options.GoNaviCommand = strings.TrimSpace(options.GoNaviCommand)
+	if options.GoNaviCommand == "" {
+		options.GoNaviCommand = "GoNavi.exe"
+	}
+	options.StandaloneCommand = strings.TrimSpace(options.StandaloneCommand)
+	if options.StandaloneCommand == "" {
+		options.StandaloneCommand = "gonavi-mcp-server"
+	}
+	return options
+}
+
+func remoteMCPClientDisplayName(client string, fallback string) string {
+	if trimmed := strings.TrimSpace(fallback); trimmed != "" {
+		return trimmed
+	}
+	switch strings.ToLower(strings.TrimSpace(client)) {
+	case "openclaw":
+		return "OpenClaw"
+	case "hermans":
+		return "Hermans"
+	default:
+		return "远程 Agent"
+	}
+}
+
+// RenderRemoteMCPClientConfig 生成给远程 Agent 和 Windows 本机分别使用的配置文本。
+func RenderRemoteMCPClientConfig(options RemoteMCPClientConfigOptions) (string, error) {
+	normalized := normalizeRemoteMCPClientConfigOptions(options)
+	config := map[string]any{
+		"mcpServers": map[string]any{
+			normalized.ServerID: map[string]any{
+				"type": "streamable-http",
+				"url":  normalized.URL,
+				"headers": map[string]string{
+					"Authorization": "Bearer " + normalized.Token,
+				},
+			},
+		},
+	}
+	configJSON, err := json.MarshalIndent(config, "", "  ")
+	if err != nil {
+		return "", fmt.Errorf("生成远程 MCP 配置失败: %w", err)
+	}
+
+	launch := remoteMCPHTTPLaunchCommand(normalized.GoNaviCommand, true, normalized.LocalAddr, normalized.Path, normalized.Token, normalized.SchemaOnly)
+	standalone := remoteMCPHTTPLaunchCommand(normalized.StandaloneCommand, false, normalized.LocalAddr, normalized.Path, normalized.Token, normalized.SchemaOnly)
+	lines := []string{
+		fmt.Sprintf("GoNavi MCP 远程接入配置 - %s", normalized.DisplayName),
+		"",
+		"云端 Agent 配置（不要写数据库账号密码）：",
+		string(configJSON),
+		"",
+		"Windows 本机启动 GoNavi MCP HTTP：",
+		launch,
+		"",
+		"独立 MCP Server 启动方式：",
+		standalone,
+		"",
+		"验证顺序：",
+		fmt.Sprintf("1. Windows 本机访问 http://%s/healthz，确认返回 ok。", normalized.LocalAddr),
+		fmt.Sprintf("2. %s 中配置上面的 Streamable HTTP MCP，URL 指向公网/隧道后的 %s。", normalized.DisplayName, normalized.URL),
+		"3. 先调用 get_connections 获取 connectionId，再调用 get_databases / get_tables / get_columns / get_table_ddl。",
+		"",
+		"安全边界：",
+		"- 数据库连接、账号和密码继续保存在 Windows GoNavi。",
+		"- 云端 Agent 只保存 MCP URL 和 Bearer Token。",
+		"- 默认 schema-only 模式不会注册 execute_sql，适合只给 OpenClaw/Hermans 读取库表结构。",
+		"- 如明确去掉 --schema-only 开放 execute_sql，它仍受 GoNavi AI 安全控制约束，写操作必须显式传 allowMutating=true。",
+	}
+	return strings.Join(lines, "\n") + "\n", nil
+}
+
+// WriteRemoteMCPClientConfig 把远程 MCP 配置写入指定输出，供 CLI 模式复用。
+func WriteRemoteMCPClientConfig(w io.Writer, args []string) error {
+	if w == nil {
+		w = io.Discard
+	}
+	options, err := ParseRemoteMCPClientConfigOptions(args)
+	if err != nil {
+		return err
+	}
+	text, err := RenderRemoteMCPClientConfig(options)
+	if err != nil {
+		return err
+	}
+	_, err = io.WriteString(w, text)
+	return err
+}
+
+func remoteMCPHTTPLaunchCommand(command string, appSubcommand bool, addr string, path string, token string, schemaOnly bool) string {
+	parts := []string{
+		command,
+	}
+	if appSubcommand {
+		parts = append(parts, "mcp-server")
+	}
+	parts = append(parts, "http", "--addr", addr, "--path", path, "--token", token)
+	if schemaOnly {
+		parts = append(parts, "--schema-only")
+	}
+	for index, part := range parts {
+		parts[index] = quoteCommandPart(part)
+	}
+	return strings.Join(parts, " ")
+}
+
+func quoteCommandPart(value string) string {
+	trimmed := strings.TrimSpace(value)
+	if trimmed == "" {
+		return `""`
+	}
+	if !strings.ContainsAny(trimmed, " \t\"") {
+		return trimmed
+	}
+	return `"` + strings.ReplaceAll(trimmed, `"`, `\"`) + `"`
+}
diff --git a/internal/mcpserver/remote_config_test.go b/internal/mcpserver/remote_config_test.go
new file mode 100644
index 0000000..a5acdc7
--- /dev/null
+++ b/internal/mcpserver/remote_config_test.go
@@ -0,0 +1,103 @@
+package mcpserver
+
+import (
+	"bytes"
+	"strings"
+	"testing"
+)
+
+func TestParseRemoteMCPClientConfigOptionsUsesEnvAndFlags(t *testing.T) {
+	t.Setenv("GONAVI_MCP_PUBLIC_URL", "https://agent.example.com/mcp")
+	t.Setenv("GONAVI_MCP_HTTP_TOKEN", "env-token")
+	t.Setenv("GONAVI_MCP_HTTP_ADDR", "127.0.0.1:9100")
+	t.Setenv("GONAVI_MCP_HTTP_PATH", "/env-mcp")
+
+	options, err := ParseRemoteMCPClientConfigOptions([]string{
+		"--client", "hermans",
+		"--path", "mcp",
+		"--token", "flag-token",
+	})
+	if err != nil {
+		t.Fatalf("ParseRemoteMCPClientConfigOptions returned error: %v", err)
+	}
+	if options.DisplayName != "Hermans" {
+		t.Fatalf("expected Hermans display name, got %q", options.DisplayName)
+	}
+	if options.URL != "https://agent.example.com/mcp" {
+		t.Fatalf("expected env url, got %q", options.URL)
+	}
+	if options.Token != "flag-token" {
+		t.Fatalf("expected flag token, got %q", options.Token)
+	}
+	if options.Path != "/mcp" {
+		t.Fatalf("expected normalized path, got %q", options.Path)
+	}
+	if !options.SchemaOnly {
+		t.Fatal("expected remote config to default to schema-only")
+	}
+}
+
+func TestRenderRemoteMCPClientConfigShowsCloudAndWindowsCommands(t *testing.T) {
+	text, err := RenderRemoteMCPClientConfig(RemoteMCPClientConfigOptions{
+		Client:            "openclaw",
+		URL:               "https://openclaw.example.com/mcp",
+		Token:             "secret-token",
+		LocalAddr:         "127.0.0.1:8765",
+		Path:              "/mcp",
+		GoNaviCommand:     `C:\Program Files\GoNavi\GoNavi.exe`,
+		StandaloneCommand: "gonavi-mcp-server",
+		SchemaOnly:        true,
+	})
+	if err != nil {
+		t.Fatalf("RenderRemoteMCPClientConfig returned error: %v", err)
+	}
+
+	for _, want := range []string{
+		"GoNavi MCP 远程接入配置 - OpenClaw",
+		`"type": "streamable-http"`,
+		`"url": "https://openclaw.example.com/mcp"`,
+		`"Authorization": "Bearer secret-token"`,
+		`"C:\Program Files\GoNavi\GoNavi.exe" mcp-server http --addr 127.0.0.1:8765 --path /mcp --token secret-token --schema-only`,
+		`gonavi-mcp-server http --addr 127.0.0.1:8765 --path /mcp --token secret-token --schema-only`,
+		"数据库连接、账号和密码继续保存在 Windows GoNavi",
+		"默认 schema-only 模式不会注册 execute_sql",
+		"allowMutating=true",
+	} {
+		if !strings.Contains(text, want) {
+			t.Fatalf("expected rendered config to contain %q, got:\n%s", want, text)
+		}
+	}
+	if strings.Contains(text, "gonavi-mcp-server mcp-server http") {
+		t.Fatalf("standalone command must not include app-only mcp-server subcommand, got:\n%s", text)
+	}
+}
+
+func TestRenderRemoteMCPClientConfigCanExposeSQLWhenExplicitlyRequested(t *testing.T) {
+	text, err := RenderRemoteMCPClientConfig(RemoteMCPClientConfigOptions{
+		Client:     "openclaw",
+		URL:        "https://openclaw.example.com/mcp",
+		Token:      "secret-token",
+		SchemaOnly: false,
+	})
+	if err != nil {
+		t.Fatalf("RenderRemoteMCPClientConfig returned error: %v", err)
+	}
+	if strings.Contains(text, "http --addr 127.0.0.1:8765 --path /mcp --token secret-token --schema-only") {
+		t.Fatalf("expected launch commands to omit schema-only when disabled, got:\n%s", text)
+	}
+}
+
+func TestWriteRemoteMCPClientConfigWritesRenderedText(t *testing.T) {
+	var buffer bytes.Buffer
+	err := WriteRemoteMCPClientConfig(&buffer, []string{
+		"--client", "openclaw",
+		"--url", "https://example.com/mcp",
+		"--token", "token-1",
+	})
+	if err != nil {
+		t.Fatalf("WriteRemoteMCPClientConfig returned error: %v", err)
+	}
+	if !strings.Contains(buffer.String(), "https://example.com/mcp") {
+		t.Fatalf("expected written config to contain public url, got %s", buffer.String())
+	}
+}
diff --git a/internal/mcpserver/run.go b/internal/mcpserver/run.go
new file mode 100644
index 0000000..b936846
--- /dev/null
+++ b/internal/mcpserver/run.go
@@ -0,0 +1,323 @@
+package mcpserver
+
+import (
+	"context"
+	"crypto/subtle"
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"os"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+const (
+	defaultStreamableHTTPAddr = "127.0.0.1:8765"
+	defaultStreamableHTTPPath = "/mcp"
+)
+
+// HTTPServerOptions 描述远程 Streamable HTTP MCP 入口。
+type HTTPServerOptions struct {
+	Addr         string
+	Path         string
+	Token        string
+	JSONResponse bool
+	SchemaOnly   bool
+}
+
+// StreamableHTTPServerHandle 表示一个已启动的 Streamable HTTP MCP server。
+type StreamableHTTPServerHandle struct {
+	Addr       string
+	Path       string
+	SchemaOnly bool
+
+	cancel context.CancelFunc
+	done   chan struct{}
+	mu     sync.Mutex
+	err    error
+}
+
+// Stop 关闭 HTTP MCP server，并等待底层 http.Server 完成退出。
+func (h *StreamableHTTPServerHandle) Stop(ctx context.Context) error {
+	if h == nil {
+		return nil
+	}
+	if h.cancel != nil {
+		h.cancel()
+	}
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	select {
+	case <-h.done:
+		return h.waitErr()
+	case <-ctx.Done():
+		return ctx.Err()
+	}
+}
+
+// Wait 阻塞直到 HTTP MCP server 退出。
+func (h *StreamableHTTPServerHandle) Wait() error {
+	if h == nil {
+		return nil
+	}
+	<-h.done
+	return h.waitErr()
+}
+
+func (h *StreamableHTTPServerHandle) complete(err error) {
+	h.mu.Lock()
+	h.err = err
+	h.mu.Unlock()
+	close(h.done)
+}
+
+func (h *StreamableHTTPServerHandle) waitErr() error {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	return h.err
+}
+
+// RunAppStdioServer 启动基于真实 GoNavi App 的 stdio MCP server。
+func RunAppStdioServer(ctx context.Context) error {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+
+	backend := NewAppBackend(ctx)
+	defer backend.Close(ctx)
+
+	return RunStdioServer(ctx, backend)
+}
+
+// RunStdioServer 使用指定 backend 启动 stdio MCP server。
+func RunStdioServer(ctx context.Context, backend Backend) error {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+
+	server := NewServer(backend)
+	return server.Run(ctx, &mcp.StdioTransport{})
+}
+
+// StartAppStreamableHTTPServer 启动基于真实 GoNavi App 的 Streamable HTTP MCP server，并立即返回可停止句柄。
+func StartAppStreamableHTTPServer(ctx context.Context, options HTTPServerOptions) (*StreamableHTTPServerHandle, error) {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+
+	backend := NewAppBackend(ctx)
+	handle, err := StartStreamableHTTPServer(ctx, backend, options)
+	if err != nil {
+		_ = backend.Close(context.Background())
+		return nil, err
+	}
+
+	go func() {
+		_ = handle.Wait()
+		_ = backend.Close(context.Background())
+	}()
+	return handle, nil
+}
+
+// RunAppStreamableHTTPServer 启动基于真实 GoNavi App 的 Streamable HTTP MCP server。
+func RunAppStreamableHTTPServer(ctx context.Context, options HTTPServerOptions) error {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+
+	handle, err := StartAppStreamableHTTPServer(ctx, options)
+	if err != nil {
+		return err
+	}
+	return handle.Wait()
+}
+
+// RunStreamableHTTPServer 使用指定 backend 启动带 bearer token 的 Streamable HTTP MCP server。
+func RunStreamableHTTPServer(ctx context.Context, backend Backend, options HTTPServerOptions) error {
+	handle, err := StartStreamableHTTPServer(ctx, backend, options)
+	if err != nil {
+		return err
+	}
+	return handle.Wait()
+}
+
+// StartStreamableHTTPServer 使用指定 backend 启动带 bearer token 的 Streamable HTTP MCP server，并返回可停止句柄。
+func StartStreamableHTTPServer(ctx context.Context, backend Backend, options HTTPServerOptions) (*StreamableHTTPServerHandle, error) {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+
+	normalized, err := normalizeHTTPServerOptions(options)
+	if err != nil {
+		return nil, err
+	}
+
+	server := NewServerWithOptions(backend, ServerOptions{SchemaOnly: normalized.SchemaOnly})
+	streamableHandler := mcp.NewStreamableHTTPHandler(func(*http.Request) *mcp.Server {
+		return server
+	}, &mcp.StreamableHTTPOptions{
+		JSONResponse:   normalized.JSONResponse,
+		SessionTimeout: 30 * time.Minute,
+	})
+
+	mux := http.NewServeMux()
+	mux.Handle(normalized.Path, bearerTokenAuthHandler(normalized.Token, streamableHandler))
+	mux.HandleFunc("/healthz", func(w http.ResponseWriter, _ *http.Request) {
+		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+		_, _ = io.WriteString(w, "ok")
+	})
+
+	httpServer := &http.Server{
+		Addr:              normalized.Addr,
+		Handler:           mux,
+		ReadHeaderTimeout: 10 * time.Second,
+	}
+
+	listener, err := net.Listen("tcp", normalized.Addr)
+	if err != nil {
+		return nil, err
+	}
+
+	serverCtx, cancel := context.WithCancel(ctx)
+	handle := &StreamableHTTPServerHandle{
+		Addr:       listener.Addr().String(),
+		Path:       normalized.Path,
+		SchemaOnly: normalized.SchemaOnly,
+		cancel:     cancel,
+		done:       make(chan struct{}),
+	}
+
+	errCh := make(chan error, 1)
+	go func() {
+		errCh <- httpServer.Serve(listener)
+	}()
+
+	go func() {
+		select {
+		case err := <-errCh:
+			cancel()
+			if errors.Is(err, http.ErrServerClosed) {
+				handle.complete(nil)
+				return
+			}
+			handle.complete(err)
+		case <-serverCtx.Done():
+			shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 5*time.Second)
+			defer shutdownCancel()
+			shutdownErr := httpServer.Shutdown(shutdownCtx)
+			serveErr := <-errCh
+			if shutdownErr != nil && !errors.Is(shutdownErr, http.ErrServerClosed) {
+				handle.complete(shutdownErr)
+				return
+			}
+			if serveErr != nil && !errors.Is(serveErr, http.ErrServerClosed) {
+				handle.complete(serveErr)
+				return
+			}
+			handle.complete(nil)
+		}
+	}()
+
+	return handle, nil
+}
+
+// ParseHTTPServerOptions 解析 http 模式参数，并支持环境变量兜底。
+func ParseHTTPServerOptions(args []string) (HTTPServerOptions, error) {
+	defaultAddr := strings.TrimSpace(os.Getenv("GONAVI_MCP_HTTP_ADDR"))
+	if defaultAddr == "" {
+		defaultAddr = defaultStreamableHTTPAddr
+	}
+	defaultPath := strings.TrimSpace(os.Getenv("GONAVI_MCP_HTTP_PATH"))
+	if defaultPath == "" {
+		defaultPath = defaultStreamableHTTPPath
+	}
+
+	options := HTTPServerOptions{
+		Addr:         defaultAddr,
+		Path:         defaultPath,
+		Token:        strings.TrimSpace(os.Getenv("GONAVI_MCP_HTTP_TOKEN")),
+		JSONResponse: true,
+		SchemaOnly:   parseBoolEnvDefault("GONAVI_MCP_SCHEMA_ONLY", false),
+	}
+	fs := flag.NewFlagSet("gonavi-mcp-server http", flag.ContinueOnError)
+	fs.SetOutput(io.Discard)
+	fs.StringVar(&options.Addr, "addr", options.Addr, "HTTP listen address, for example 127.0.0.1:8765")
+	fs.StringVar(&options.Path, "path", options.Path, "HTTP MCP path")
+	fs.StringVar(&options.Token, "token", options.Token, "bearer token required by remote MCP clients")
+	fs.BoolVar(&options.JSONResponse, "json-response", options.JSONResponse, "return application/json streamable responses when possible")
+	fs.BoolVar(&options.SchemaOnly, "schema-only", options.SchemaOnly, "only expose schema inspection tools and omit execute_sql")
+	if err := fs.Parse(args); err != nil {
+		return HTTPServerOptions{}, err
+	}
+	if fs.NArg() > 0 {
+		return HTTPServerOptions{}, fmt.Errorf("未知 http 参数: %s", strings.Join(fs.Args(), " "))
+	}
+	return options, nil
+}
+
+func parseBoolEnvDefault(name string, fallback bool) bool {
+	switch strings.ToLower(strings.TrimSpace(os.Getenv(name))) {
+	case "1", "true", "yes", "on":
+		return true
+	case "0", "false", "no", "off":
+		return false
+	default:
+		return fallback
+	}
+}
+
+func normalizeHTTPServerOptions(options HTTPServerOptions) (HTTPServerOptions, error) {
+	options.Addr = strings.TrimSpace(options.Addr)
+	if options.Addr == "" {
+		options.Addr = defaultStreamableHTTPAddr
+	}
+	options.Path = strings.TrimSpace(options.Path)
+	if options.Path == "" {
+		options.Path = defaultStreamableHTTPPath
+	}
+	if !strings.HasPrefix(options.Path, "/") {
+		options.Path = "/" + options.Path
+	}
+	options.Token = strings.TrimSpace(options.Token)
+	if options.Token == "" {
+		return HTTPServerOptions{}, errors.New("远程 MCP HTTP 模式必须设置 bearer token，可使用 --token 或 GONAVI_MCP_HTTP_TOKEN")
+	}
+	return options, nil
+}
+
+func bearerTokenAuthHandler(token string, next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		if !hasBearerToken(req, token) {
+			w.Header().Set("WWW-Authenticate", `Bearer realm="GoNavi MCP"`)
+			http.Error(w, "unauthorized", http.StatusUnauthorized)
+			return
+		}
+		next.ServeHTTP(w, req)
+	})
+}
+
+func hasBearerToken(req *http.Request, token string) bool {
+	if req == nil {
+		return false
+	}
+	expected := strings.TrimSpace(token)
+	if expected == "" {
+		return false
+	}
+	header := strings.TrimSpace(req.Header.Get("Authorization"))
+	if !strings.HasPrefix(strings.ToLower(header), "bearer ") {
+		return false
+	}
+	actual := strings.TrimSpace(header[len("bearer "):])
+	if actual == "" {
+		return false
+	}
+	return subtle.ConstantTimeCompare([]byte(actual), []byte(expected)) == 1
+}
diff --git a/internal/mcpserver/run_test.go b/internal/mcpserver/run_test.go
new file mode 100644
index 0000000..c85b5b1
--- /dev/null
+++ b/internal/mcpserver/run_test.go
@@ -0,0 +1,91 @@
+package mcpserver
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+func TestParseHTTPServerOptionsSupportsFlagsAndEnvFallback(t *testing.T) {
+	t.Setenv("GONAVI_MCP_HTTP_ADDR", "127.0.0.1:9000")
+	t.Setenv("GONAVI_MCP_HTTP_PATH", "/env-mcp")
+	t.Setenv("GONAVI_MCP_HTTP_TOKEN", "env-token")
+
+	options, err := ParseHTTPServerOptions([]string{
+		"--addr", "0.0.0.0:8765",
+		"--path", "mcp",
+		"--token", "flag-token",
+		"--schema-only",
+		"--json-response=false",
+	})
+	if err != nil {
+		t.Fatalf("ParseHTTPServerOptions returned error: %v", err)
+	}
+	normalized, err := normalizeHTTPServerOptions(options)
+	if err != nil {
+		t.Fatalf("normalizeHTTPServerOptions returned error: %v", err)
+	}
+
+	if normalized.Addr != "0.0.0.0:8765" {
+		t.Fatalf("expected addr from flag, got %q", normalized.Addr)
+	}
+	if normalized.Path != "/mcp" {
+		t.Fatalf("expected normalized path /mcp, got %q", normalized.Path)
+	}
+	if normalized.Token != "flag-token" {
+		t.Fatalf("expected token from flag, got %q", normalized.Token)
+	}
+	if normalized.JSONResponse {
+		t.Fatal("expected json response flag to be false")
+	}
+	if !normalized.SchemaOnly {
+		t.Fatal("expected schema-only flag to be true")
+	}
+}
+
+func TestNormalizeHTTPServerOptionsRequiresBearerToken(t *testing.T) {
+	_, err := normalizeHTTPServerOptions(HTTPServerOptions{Addr: "127.0.0.1:8765", Path: "/mcp"})
+	if err == nil || !strings.Contains(err.Error(), "bearer token") {
+		t.Fatalf("expected missing bearer token error, got %v", err)
+	}
+}
+
+func TestBearerTokenAuthHandlerRejectsMissingOrWrongToken(t *testing.T) {
+	called := false
+	handler := bearerTokenAuthHandler("secret-token", http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+		called = true
+		w.WriteHeader(http.StatusNoContent)
+	}))
+
+	recorder := httptest.NewRecorder()
+	handler.ServeHTTP(recorder, httptest.NewRequest(http.MethodPost, "/mcp", nil))
+	if recorder.Code != http.StatusUnauthorized {
+		t.Fatalf("expected missing token to return 401, got %d", recorder.Code)
+	}
+	if called {
+		t.Fatal("next handler should not be called without token")
+	}
+
+	recorder = httptest.NewRecorder()
+	wrongReq := httptest.NewRequest(http.MethodPost, "/mcp", nil)
+	wrongReq.Header.Set("Authorization", "Bearer wrong")
+	handler.ServeHTTP(recorder, wrongReq)
+	if recorder.Code != http.StatusUnauthorized {
+		t.Fatalf("expected wrong token to return 401, got %d", recorder.Code)
+	}
+	if called {
+		t.Fatal("next handler should not be called with wrong token")
+	}
+
+	recorder = httptest.NewRecorder()
+	validReq := httptest.NewRequest(http.MethodPost, "/mcp", nil)
+	validReq.Header.Set("Authorization", "Bearer secret-token")
+	handler.ServeHTTP(recorder, validReq)
+	if recorder.Code != http.StatusNoContent {
+		t.Fatalf("expected valid token to pass, got %d", recorder.Code)
+	}
+	if !called {
+		t.Fatal("next handler should be called with valid token")
+	}
+}
diff --git a/internal/mcpserver/server.go b/internal/mcpserver/server.go
new file mode 100644
index 0000000..feb552a
--- /dev/null
+++ b/internal/mcpserver/server.go
@@ -0,0 +1,91 @@
+package mcpserver
+
+import (
+	"runtime/debug"
+	"strings"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+// ServerOptions 控制 MCP server 对外暴露的工具范围。
+type ServerOptions struct {
+	// SchemaOnly 仅暴露连接、库表、字段、索引、外键、触发器和 DDL 工具，不注册 execute_sql。
+	SchemaOnly bool
+}
+
+func NewServer(backend Backend) *mcp.Server {
+	return NewServerWithOptions(backend, ServerOptions{})
+}
+
+func NewServerWithOptions(backend Backend, options ServerOptions) *mcp.Server {
+	server := mcp.NewServer(&mcp.Implementation{
+		Name:    "gonavi-ai",
+		Version: implementationVersion(),
+	}, nil)
+
+	service := NewService(backend)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Name:        "get_connections",
+		Description: "列出当前 GoNavi 已保存的数据库连接，先调用它获取 connectionId。不会返回明文密码等敏感信息。",
+	}, service.GetConnections)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Name:        "get_databases",
+		Description: "根据 connectionId 获取数据库/Schema 列表。",
+	}, service.GetDatabases)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Name:        "get_tables",
+		Description: "根据 connectionId 和可选 dbName 获取表列表。dbName 为空时优先使用保存连接里的默认数据库。",
+	}, service.GetTables)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Name:        "get_all_columns",
+		Description: "根据 connectionId 和 dbName 获取该数据库下全部表的字段摘要，适合按字段反查表。",
+	}, service.GetAllColumns)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Name:        "get_columns",
+		Description: "根据 connectionId、可选 dbName、tableName 获取字段定义。",
+	}, service.GetColumns)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Name:        "get_indexes",
+		Description: "根据 connectionId、可选 dbName、tableName 获取索引定义。",
+	}, service.GetIndexes)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Name:        "get_foreign_keys",
+		Description: "根据 connectionId、可选 dbName、tableName 获取外键关系。",
+	}, service.GetForeignKeys)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Name:        "get_triggers",
+		Description: "根据 connectionId、可选 dbName、tableName 获取触发器定义。",
+	}, service.GetTriggers)
+
+	mcp.AddTool(server, &mcp.Tool{
+		Name:        "get_table_ddl",
+		Description: "根据 connectionId、可选 dbName、tableName 获取建表或建视图语句。",
+	}, service.GetTableDDL)
+
+	if !options.SchemaOnly {
+		mcp.AddTool(server, &mcp.Tool{
+			Name:        "execute_sql",
+			Description: "执行 SQL，支持多语句结果集。执行范围受 GoNavi AI 设置中的安全控制约束；命中允许范围内的 DML/DDL 等非只读语句时，仍必须显式传 allowMutating=true。",
+		}, service.ExecuteSQL)
+	}
+
+	return server
+}
+
+func implementationVersion() string {
+	if info, ok := debug.ReadBuildInfo(); ok {
+		version := strings.TrimSpace(info.Main.Version)
+		if version != "" && version != "(devel)" {
+			return version
+		}
+	}
+	return "dev"
+}
diff --git a/internal/mcpserver/server_test.go b/internal/mcpserver/server_test.go
new file mode 100644
index 0000000..d85da06
--- /dev/null
+++ b/internal/mcpserver/server_test.go
@@ -0,0 +1,66 @@
+package mcpserver
+
+import (
+	"context"
+	"testing"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+func TestNewServerWithOptionsOmitsExecuteSQLInSchemaOnlyMode(t *testing.T) {
+	toolNames := listServerToolNames(t, NewServerWithOptions(&fakeBackend{}, ServerOptions{SchemaOnly: true}))
+
+	assertToolPresent(t, toolNames, "get_connections")
+	assertToolPresent(t, toolNames, "get_table_ddl")
+	assertToolAbsent(t, toolNames, "execute_sql")
+}
+
+func TestNewServerIncludesExecuteSQLByDefault(t *testing.T) {
+	toolNames := listServerToolNames(t, NewServer(&fakeBackend{}))
+
+	assertToolPresent(t, toolNames, "execute_sql")
+}
+
+func listServerToolNames(t *testing.T, server *mcp.Server) map[string]bool {
+	t.Helper()
+
+	ctx := context.Background()
+	clientTransport, serverTransport := mcp.NewInMemoryTransports()
+	serverSession, err := server.Connect(ctx, serverTransport, nil)
+	if err != nil {
+		t.Fatalf("server.Connect returned error: %v", err)
+	}
+	defer serverSession.Close()
+
+	client := mcp.NewClient(&mcp.Implementation{Name: "test-client", Version: "v0.0.1"}, nil)
+	clientSession, err := client.Connect(ctx, clientTransport, nil)
+	if err != nil {
+		t.Fatalf("client.Connect returned error: %v", err)
+	}
+	defer clientSession.Close()
+
+	result, err := clientSession.ListTools(ctx, &mcp.ListToolsParams{})
+	if err != nil {
+		t.Fatalf("ListTools returned error: %v", err)
+	}
+
+	names := make(map[string]bool, len(result.Tools))
+	for _, tool := range result.Tools {
+		names[tool.Name] = true
+	}
+	return names
+}
+
+func assertToolPresent(t *testing.T, names map[string]bool, name string) {
+	t.Helper()
+	if !names[name] {
+		t.Fatalf("expected tool %q to be registered; got %#v", name, names)
+	}
+}
+
+func assertToolAbsent(t *testing.T, names map[string]bool, name string) {
+	t.Helper()
+	if names[name] {
+		t.Fatalf("expected tool %q to be omitted; got %#v", name, names)
+	}
+}
diff --git a/internal/mcpserver/service.go b/internal/mcpserver/service.go
new file mode 100644
index 0000000..cffef30
--- /dev/null
+++ b/internal/mcpserver/service.go
@@ -0,0 +1,964 @@
+package mcpserver
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/url"
+	"strings"
+
+	"GoNavi-Wails/internal/ai"
+	appcore "GoNavi-Wails/internal/app"
+	"GoNavi-Wails/internal/connection"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+const (
+	defaultMaxRowsPerResult = 200
+	maxRowsPerResultLimit   = 1000
+	redactedOpaqueTarget    = "opaque-connection-string-configured"
+)
+
+type Service struct {
+	backend Backend
+}
+
+func NewService(backend Backend) *Service {
+	return &Service{backend: backend}
+}
+
+type emptyArgs struct{}
+
+type connectionIDArgs struct {
+	ConnectionID string `json:"connectionId" jsonschema:"get_connections 返回的连接 ID"`
+}
+
+type databaseArgs struct {
+	ConnectionID string `json:"connectionId" jsonschema:"get_connections 返回的连接 ID"`
+	DBName       string `json:"dbName,omitempty" jsonschema:"可选数据库/Schema 名称。为空时优先使用保存连接里的默认数据库"`
+}
+
+type tableArgs struct {
+	ConnectionID string `json:"connectionId" jsonschema:"get_connections 返回的连接 ID"`
+	DBName       string `json:"dbName,omitempty" jsonschema:"可选数据库/Schema 名称。为空时优先使用保存连接里的默认数据库"`
+	TableName    string `json:"tableName" jsonschema:"目标表或视图名称"`
+}
+
+type executeSQLArgs struct {
+	ConnectionID     string `json:"connectionId" jsonschema:"get_connections 返回的连接 ID"`
+	DBName           string `json:"dbName,omitempty" jsonschema:"可选数据库/Schema 名称。为空时优先使用保存连接里的默认数据库"`
+	SQL              string `json:"sql" jsonschema:"待执行的 SQL 文本，可以包含多条语句"`
+	AllowMutating    bool   `json:"allowMutating,omitempty" jsonschema:"当 SQL 包含当前 AI 安全控制允许范围内的 DDL/DML 等非只读语句时，必须显式设为 true"`
+	MaxRowsPerResult int    `json:"maxRowsPerResult,omitempty" jsonschema:"每个结果集最多返回多少行。默认 200，最大 1000"`
+}
+
+type connectionDescriptor struct {
+	ID              string `json:"id"`
+	Name            string `json:"name"`
+	Type            string `json:"type"`
+	Host            string `json:"host,omitempty"`
+	Port            int    `json:"port,omitempty"`
+	Database        string `json:"database,omitempty"`
+	Driver          string `json:"driver,omitempty"`
+	Topology        string `json:"topology,omitempty"`
+	Target          string `json:"target,omitempty"`
+	UseSSH          bool   `json:"useSSH,omitempty"`
+	UseProxy        bool   `json:"useProxy,omitempty"`
+	UseHTTPTunnel   bool   `json:"useHttpTunnel,omitempty"`
+	DefaultDatabase string `json:"defaultDatabase,omitempty"`
+}
+
+type getConnectionsResult struct {
+	Connections []connectionDescriptor `json:"connections"`
+}
+
+type getDatabasesResult struct {
+	ConnectionID string   `json:"connectionId"`
+	Databases    []string `json:"databases"`
+}
+
+type getTablesResult struct {
+	ConnectionID string   `json:"connectionId"`
+	DBName       string   `json:"dbName,omitempty"`
+	Tables       []string `json:"tables"`
+}
+
+type getAllColumnsResult struct {
+	ConnectionID string                                 `json:"connectionId"`
+	DBName       string                                 `json:"dbName,omitempty"`
+	Columns      []connection.ColumnDefinitionWithTable `json:"columns"`
+}
+
+type getColumnsResult struct {
+	ConnectionID string                        `json:"connectionId"`
+	DBName       string                        `json:"dbName,omitempty"`
+	TableName    string                        `json:"tableName"`
+	Columns      []connection.ColumnDefinition `json:"columns"`
+}
+
+type getIndexesResult struct {
+	ConnectionID string                       `json:"connectionId"`
+	DBName       string                       `json:"dbName,omitempty"`
+	TableName    string                       `json:"tableName"`
+	Indexes      []connection.IndexDefinition `json:"indexes"`
+}
+
+type getForeignKeysResult struct {
+	ConnectionID string                            `json:"connectionId"`
+	DBName       string                            `json:"dbName,omitempty"`
+	TableName    string                            `json:"tableName"`
+	ForeignKeys  []connection.ForeignKeyDefinition `json:"foreignKeys"`
+}
+
+type getTriggersResult struct {
+	ConnectionID string                         `json:"connectionId"`
+	DBName       string                         `json:"dbName,omitempty"`
+	TableName    string                         `json:"tableName"`
+	Triggers     []connection.TriggerDefinition `json:"triggers"`
+}
+
+type getTableDDLResult struct {
+	ConnectionID string `json:"connectionId"`
+	DBName       string `json:"dbName,omitempty"`
+	TableName    string `json:"tableName"`
+	DDL          string `json:"ddl"`
+}
+
+type sqlStatementSummary struct {
+	Index    int    `json:"index"`
+	Keyword  string `json:"keyword,omitempty"`
+	ReadOnly bool   `json:"readOnly"`
+}
+
+type sqlResultSet struct {
+	StatementIndex int                      `json:"statementIndex,omitempty"`
+	Columns        []string                 `json:"columns"`
+	Rows           []map[string]interface{} `json:"rows"`
+	Messages       []string                 `json:"messages,omitempty"`
+	RowCount       int                      `json:"rowCount"`
+	Truncated      bool                     `json:"truncated,omitempty"`
+}
+
+type executeSQLResult struct {
+	ConnectionID   string                `json:"connectionId"`
+	DBName         string                `json:"dbName,omitempty"`
+	StatementCount int                   `json:"statementCount"`
+	ReadOnly       bool                  `json:"readOnly"`
+	QueryID        string                `json:"queryId,omitempty"`
+	Message        string                `json:"message,omitempty"`
+	Truncated      bool                  `json:"truncated,omitempty"`
+	Statements     []sqlStatementSummary `json:"statements"`
+	Results        []sqlResultSet        `json:"results"`
+}
+
+func (s *Service) GetConnections(ctx context.Context, req *mcp.CallToolRequest, args emptyArgs) (*mcp.CallToolResult, getConnectionsResult, error) {
+	_ = ctx
+	_ = req
+	_ = args
+
+	items, err := s.backend.GetSavedConnections()
+	if err != nil {
+		return toolError("获取已保存连接失败: %v", err), getConnectionsResult{}, nil
+	}
+
+	result := getConnectionsResult{
+		Connections: make([]connectionDescriptor, 0, len(items)),
+	}
+	for _, item := range items {
+		cfg := item.Config
+		result.Connections = append(result.Connections, connectionDescriptor{
+			ID:              item.ID,
+			Name:            item.Name,
+			Type:            strings.TrimSpace(cfg.Type),
+			Host:            strings.TrimSpace(cfg.Host),
+			Port:            cfg.Port,
+			Database:        strings.TrimSpace(cfg.Database),
+			Driver:          strings.TrimSpace(cfg.Driver),
+			Topology:        strings.TrimSpace(cfg.Topology),
+			Target:          describeConnectionTarget(cfg),
+			UseSSH:          cfg.UseSSH,
+			UseProxy:        cfg.UseProxy,
+			UseHTTPTunnel:   cfg.UseHTTPTunnel,
+			DefaultDatabase: strings.TrimSpace(cfg.Database),
+		})
+	}
+	return successResult(), result, nil
+}
+
+func (s *Service) GetDatabases(ctx context.Context, req *mcp.CallToolRequest, args connectionIDArgs) (*mcp.CallToolResult, getDatabasesResult, error) {
+	_ = ctx
+	_ = req
+
+	view, errResult := s.resolveConnection(args.ConnectionID)
+	if errResult != nil {
+		return errResult, getDatabasesResult{}, nil
+	}
+
+	queryResult := s.backend.DBGetDatabases(view.Config)
+	if !queryResult.Success {
+		return toolError("获取数据库列表失败: %s", strings.TrimSpace(queryResult.Message)), getDatabasesResult{}, nil
+	}
+
+	databases, err := decodeNamedStringSlice(queryResult.Data, "Database", "database", "name")
+	if err != nil {
+		return toolError("解析数据库列表失败: %v", err), getDatabasesResult{}, nil
+	}
+
+	return successResult(), getDatabasesResult{
+		ConnectionID: view.ID,
+		Databases:    ensureNonNilStrings(databases),
+	}, nil
+}
+
+func (s *Service) GetTables(ctx context.Context, req *mcp.CallToolRequest, args databaseArgs) (*mcp.CallToolResult, getTablesResult, error) {
+	_ = ctx
+	_ = req
+
+	view, errResult := s.resolveConnection(args.ConnectionID)
+	if errResult != nil {
+		return errResult, getTablesResult{}, nil
+	}
+
+	dbName := effectiveDBName(args.DBName, view.Config)
+	queryResult := s.backend.DBGetTables(view.Config, dbName)
+	if !queryResult.Success {
+		return toolError("获取表列表失败: %s", strings.TrimSpace(queryResult.Message)), getTablesResult{}, nil
+	}
+
+	tables, err := decodeNamedStringSlice(queryResult.Data, "Table", "table", "name")
+	if err != nil {
+		return toolError("解析表列表失败: %v", err), getTablesResult{}, nil
+	}
+
+	return successResult(), getTablesResult{
+		ConnectionID: view.ID,
+		DBName:       dbName,
+		Tables:       ensureNonNilStrings(tables),
+	}, nil
+}
+
+func (s *Service) GetAllColumns(ctx context.Context, req *mcp.CallToolRequest, args databaseArgs) (*mcp.CallToolResult, getAllColumnsResult, error) {
+	_ = ctx
+	_ = req
+
+	view, errResult := s.resolveConnection(args.ConnectionID)
+	if errResult != nil {
+		return errResult, getAllColumnsResult{}, nil
+	}
+
+	dbName := effectiveDBName(args.DBName, view.Config)
+	if strings.TrimSpace(dbName) == "" {
+		return toolError("dbName 不能为空"), getAllColumnsResult{}, nil
+	}
+
+	queryResult := s.backend.DBGetAllColumns(view.Config, dbName)
+	if !queryResult.Success {
+		return toolError("获取全库字段摘要失败: %s", strings.TrimSpace(queryResult.Message)), getAllColumnsResult{}, nil
+	}
+
+	columns, err := decodeColumnsWithTable(queryResult.Data)
+	if err != nil {
+		return toolError("解析全库字段摘要失败: %v", err), getAllColumnsResult{}, nil
+	}
+
+	return successResult(), getAllColumnsResult{
+		ConnectionID: view.ID,
+		DBName:       dbName,
+		Columns:      ensureNonNilColumnsWithTable(columns),
+	}, nil
+}
+
+func (s *Service) GetColumns(ctx context.Context, req *mcp.CallToolRequest, args tableArgs) (*mcp.CallToolResult, getColumnsResult, error) {
+	_ = ctx
+	_ = req
+
+	view, errResult := s.resolveConnection(args.ConnectionID)
+	if errResult != nil {
+		return errResult, getColumnsResult{}, nil
+	}
+
+	tableName := strings.TrimSpace(args.TableName)
+	if tableName == "" {
+		return toolError("tableName 不能为空"), getColumnsResult{}, nil
+	}
+
+	dbName := effectiveDBName(args.DBName, view.Config)
+	queryResult := s.backend.DBGetColumns(view.Config, dbName, tableName)
+	if !queryResult.Success {
+		return toolError("获取字段列表失败: %s", strings.TrimSpace(queryResult.Message)), getColumnsResult{}, nil
+	}
+
+	columns, err := decodeColumns(queryResult.Data)
+	if err != nil {
+		return toolError("解析字段列表失败: %v", err), getColumnsResult{}, nil
+	}
+
+	return successResult(), getColumnsResult{
+		ConnectionID: view.ID,
+		DBName:       dbName,
+		TableName:    tableName,
+		Columns:      ensureNonNilColumns(columns),
+	}, nil
+}
+
+func (s *Service) GetIndexes(ctx context.Context, req *mcp.CallToolRequest, args tableArgs) (*mcp.CallToolResult, getIndexesResult, error) {
+	_ = ctx
+	_ = req
+
+	view, errResult := s.resolveConnection(args.ConnectionID)
+	if errResult != nil {
+		return errResult, getIndexesResult{}, nil
+	}
+
+	tableName := strings.TrimSpace(args.TableName)
+	if tableName == "" {
+		return toolError("tableName 不能为空"), getIndexesResult{}, nil
+	}
+
+	dbName := effectiveDBName(args.DBName, view.Config)
+	queryResult := s.backend.DBGetIndexes(view.Config, dbName, tableName)
+	if !queryResult.Success {
+		return toolError("获取索引定义失败: %s", strings.TrimSpace(queryResult.Message)), getIndexesResult{}, nil
+	}
+
+	indexes, err := decodeIndexes(queryResult.Data)
+	if err != nil {
+		return toolError("解析索引定义失败: %v", err), getIndexesResult{}, nil
+	}
+
+	return successResult(), getIndexesResult{
+		ConnectionID: view.ID,
+		DBName:       dbName,
+		TableName:    tableName,
+		Indexes:      ensureNonNilIndexes(indexes),
+	}, nil
+}
+
+func (s *Service) GetForeignKeys(ctx context.Context, req *mcp.CallToolRequest, args tableArgs) (*mcp.CallToolResult, getForeignKeysResult, error) {
+	_ = ctx
+	_ = req
+
+	view, errResult := s.resolveConnection(args.ConnectionID)
+	if errResult != nil {
+		return errResult, getForeignKeysResult{}, nil
+	}
+
+	tableName := strings.TrimSpace(args.TableName)
+	if tableName == "" {
+		return toolError("tableName 不能为空"), getForeignKeysResult{}, nil
+	}
+
+	dbName := effectiveDBName(args.DBName, view.Config)
+	queryResult := s.backend.DBGetForeignKeys(view.Config, dbName, tableName)
+	if !queryResult.Success {
+		return toolError("获取外键关系失败: %s", strings.TrimSpace(queryResult.Message)), getForeignKeysResult{}, nil
+	}
+
+	foreignKeys, err := decodeForeignKeys(queryResult.Data)
+	if err != nil {
+		return toolError("解析外键关系失败: %v", err), getForeignKeysResult{}, nil
+	}
+
+	return successResult(), getForeignKeysResult{
+		ConnectionID: view.ID,
+		DBName:       dbName,
+		TableName:    tableName,
+		ForeignKeys:  ensureNonNilForeignKeys(foreignKeys),
+	}, nil
+}
+
+func (s *Service) GetTriggers(ctx context.Context, req *mcp.CallToolRequest, args tableArgs) (*mcp.CallToolResult, getTriggersResult, error) {
+	_ = ctx
+	_ = req
+
+	view, errResult := s.resolveConnection(args.ConnectionID)
+	if errResult != nil {
+		return errResult, getTriggersResult{}, nil
+	}
+
+	tableName := strings.TrimSpace(args.TableName)
+	if tableName == "" {
+		return toolError("tableName 不能为空"), getTriggersResult{}, nil
+	}
+
+	dbName := effectiveDBName(args.DBName, view.Config)
+	queryResult := s.backend.DBGetTriggers(view.Config, dbName, tableName)
+	if !queryResult.Success {
+		return toolError("获取触发器定义失败: %s", strings.TrimSpace(queryResult.Message)), getTriggersResult{}, nil
+	}
+
+	triggers, err := decodeTriggers(queryResult.Data)
+	if err != nil {
+		return toolError("解析触发器定义失败: %v", err), getTriggersResult{}, nil
+	}
+
+	return successResult(), getTriggersResult{
+		ConnectionID: view.ID,
+		DBName:       dbName,
+		TableName:    tableName,
+		Triggers:     ensureNonNilTriggers(triggers),
+	}, nil
+}
+
+func (s *Service) GetTableDDL(ctx context.Context, req *mcp.CallToolRequest, args tableArgs) (*mcp.CallToolResult, getTableDDLResult, error) {
+	_ = ctx
+	_ = req
+
+	view, errResult := s.resolveConnection(args.ConnectionID)
+	if errResult != nil {
+		return errResult, getTableDDLResult{}, nil
+	}
+
+	tableName := strings.TrimSpace(args.TableName)
+	if tableName == "" {
+		return toolError("tableName 不能为空"), getTableDDLResult{}, nil
+	}
+
+	dbName := effectiveDBName(args.DBName, view.Config)
+	queryResult := s.backend.DBShowCreateTable(view.Config, dbName, tableName)
+	if !queryResult.Success {
+		return toolError("获取建表语句失败: %s", strings.TrimSpace(queryResult.Message)), getTableDDLResult{}, nil
+	}
+
+	ddl, err := decodeString(queryResult.Data)
+	if err != nil {
+		return toolError("解析建表语句失败: %v", err), getTableDDLResult{}, nil
+	}
+
+	return successResult(), getTableDDLResult{
+		ConnectionID: view.ID,
+		DBName:       dbName,
+		TableName:    tableName,
+		DDL:          ddl,
+	}, nil
+}
+
+func (s *Service) ExecuteSQL(ctx context.Context, req *mcp.CallToolRequest, args executeSQLArgs) (*mcp.CallToolResult, executeSQLResult, error) {
+	_ = ctx
+	_ = req
+
+	view, errResult := s.resolveConnection(args.ConnectionID)
+	if errResult != nil {
+		return errResult, executeSQLResult{}, nil
+	}
+
+	sqlText := strings.TrimSpace(args.SQL)
+	if sqlText == "" {
+		return toolError("sql 不能为空"), executeSQLResult{}, nil
+	}
+
+	inspection := s.backend.InspectSQL(view.Config.Type, sqlText)
+	if inspection.StatementCount == 0 {
+		return toolError("未识别到可执行的 SQL 语句"), executeSQLResult{}, nil
+	}
+
+	safetyLevel := normalizeSQLSafetyLevel(s.backend.GetSQLSafetyLevel())
+	safetyDecision := evaluateSQLSafety(safetyLevel, inspection)
+	if len(safetyDecision.disallowed) > 0 {
+		return toolError("%s", buildSafetyDeniedMessage(safetyLevel, safetyDecision.disallowed)), executeSQLResult{}, nil
+	}
+	if safetyDecision.requiresConfirm && !args.AllowMutating {
+		return toolError("当前 SQL 已通过 GoNavi AI 安全控制（%s），但包含非只读语句 %s，请显式传入 allowMutating=true 后重试", safetyLevelDisplayName(safetyLevel), formatSafetyStatements(safetyDecision.confirmRequired)), executeSQLResult{}, nil
+	}
+
+	dbName := effectiveDBName(args.DBName, view.Config)
+	queryResult := s.backend.DBQueryMulti(view.Config, dbName, sqlText, "")
+	if !queryResult.Success {
+		return toolError("SQL 执行失败: %s", strings.TrimSpace(queryResult.Message)), executeSQLResult{}, nil
+	}
+
+	resultSets, err := decodeResultSets(queryResult.Data)
+	if err != nil {
+		return toolError("解析 SQL 执行结果失败: %v", err), executeSQLResult{}, nil
+	}
+
+	normalizedResults, truncated := normalizeResultSets(resultSets, normalizeMaxRowsPerResult(args.MaxRowsPerResult))
+	return successResult(), executeSQLResult{
+		ConnectionID:   view.ID,
+		DBName:         dbName,
+		StatementCount: inspection.StatementCount,
+		ReadOnly:       inspection.ReadOnly,
+		QueryID:        strings.TrimSpace(queryResult.QueryID),
+		Message:        strings.TrimSpace(queryResult.Message),
+		Truncated:      truncated,
+		Statements:     toStatementSummaries(inspection.Statements),
+		Results:        normalizedResults,
+	}, nil
+}
+
+func successResult() *mcp.CallToolResult {
+	return &mcp.CallToolResult{}
+}
+
+func toolError(format string, args ...interface{}) *mcp.CallToolResult {
+	return &mcp.CallToolResult{
+		IsError: true,
+		Content: []mcp.Content{
+			&mcp.TextContent{Text: fmt.Sprintf(format, args...)},
+		},
+	}
+}
+
+func (s *Service) resolveConnection(connectionID string) (connection.SavedConnectionView, *mcp.CallToolResult) {
+	id := strings.TrimSpace(connectionID)
+	if id == "" {
+		return connection.SavedConnectionView{}, toolError("connectionId 不能为空")
+	}
+	view, err := s.backend.GetEditableSavedConnection(id)
+	if err != nil {
+		return connection.SavedConnectionView{}, toolError("加载连接 %s 失败: %v", id, err)
+	}
+	return view, nil
+}
+
+func effectiveDBName(input string, config connection.ConnectionConfig) string {
+	if trimmed := strings.TrimSpace(input); trimmed != "" {
+		return trimmed
+	}
+	return strings.TrimSpace(config.Database)
+}
+
+func describeConnectionTarget(config connection.ConnectionConfig) string {
+	dbType := strings.ToLower(strings.TrimSpace(config.Type))
+	switch dbType {
+	case "sqlite", "duckdb":
+		if path := strings.TrimSpace(config.Database); path != "" {
+			return path
+		}
+	}
+	if len(config.Hosts) > 0 {
+		return strings.Join(config.Hosts, ",")
+	}
+	if host := strings.TrimSpace(config.Host); host != "" {
+		if config.Port > 0 {
+			return fmt.Sprintf("%s:%d", host, config.Port)
+		}
+		return host
+	}
+	if uri := strings.TrimSpace(config.URI); uri != "" {
+		return redactConnectionTarget(uri)
+	}
+	if dsn := strings.TrimSpace(config.DSN); dsn != "" {
+		return redactConnectionTarget(dsn)
+	}
+	return strings.TrimSpace(config.Database)
+}
+
+func redactConnectionTarget(value string) string {
+	trimmed := strings.TrimSpace(value)
+	if trimmed == "" {
+		return ""
+	}
+
+	if parsed, err := url.Parse(trimmed); err == nil && parsed.Scheme != "" && parsed.Host != "" {
+		parsed.User = nil
+		parsed.RawQuery = ""
+		parsed.Fragment = ""
+		return parsed.String()
+	}
+
+	if looksLikeOpaqueConnectionString(trimmed) {
+		return redactedOpaqueTarget
+	}
+	return trimmed
+}
+
+func looksLikeOpaqueConnectionString(value string) bool {
+	lower := strings.ToLower(strings.TrimSpace(value))
+	if lower == "" {
+		return false
+	}
+	return strings.Contains(lower, "@") ||
+		strings.Contains(lower, "password=") ||
+		strings.Contains(lower, "pwd=") ||
+		strings.Contains(lower, "user=") ||
+		strings.Contains(lower, "uid=") ||
+		strings.Contains(lower, "token=") ||
+		strings.Contains(lower, "secret=") ||
+		strings.Contains(lower, "access_key=") ||
+		strings.Contains(lower, "api_key=")
+}
+
+func decodeNamedStringSlice(data interface{}, keys ...string) ([]string, error) {
+	switch items := data.(type) {
+	case nil:
+		return []string{}, nil
+	case []string:
+		return ensureNonNilStrings(append([]string(nil), items...)), nil
+	case []map[string]string:
+		result := make([]string, 0, len(items))
+		for _, item := range items {
+			result = append(result, pickNamedStringFromStringMap(item, keys...))
+		}
+		return result, nil
+	case []map[string]interface{}:
+		result := make([]string, 0, len(items))
+		for _, item := range items {
+			result = append(result, pickNamedStringFromAnyMap(item, keys...))
+		}
+		return result, nil
+	default:
+		var decoded []map[string]interface{}
+		if err := remarshal(data, &decoded); err != nil {
+			return nil, err
+		}
+		return decodeNamedStringSlice(decoded, keys...)
+	}
+}
+
+func pickNamedStringFromStringMap(item map[string]string, keys ...string) string {
+	for _, key := range keys {
+		if value := strings.TrimSpace(item[key]); value != "" {
+			return value
+		}
+	}
+	for _, value := range item {
+		if trimmed := strings.TrimSpace(value); trimmed != "" {
+			return trimmed
+		}
+	}
+	return ""
+}
+
+func pickNamedStringFromAnyMap(item map[string]interface{}, keys ...string) string {
+	for _, key := range keys {
+		if value, ok := item[key]; ok {
+			if text := strings.TrimSpace(fmt.Sprint(value)); text != "" {
+				return text
+			}
+		}
+	}
+	for _, value := range item {
+		if text := strings.TrimSpace(fmt.Sprint(value)); text != "" {
+			return text
+		}
+	}
+	return ""
+}
+
+func decodeColumns(data interface{}) ([]connection.ColumnDefinition, error) {
+	switch cols := data.(type) {
+	case nil:
+		return []connection.ColumnDefinition{}, nil
+	case []connection.ColumnDefinition:
+		return ensureNonNilColumns(append([]connection.ColumnDefinition(nil), cols...)), nil
+	default:
+		var decoded []connection.ColumnDefinition
+		if err := remarshal(data, &decoded); err != nil {
+			return nil, err
+		}
+		return ensureNonNilColumns(decoded), nil
+	}
+}
+
+func decodeColumnsWithTable(data interface{}) ([]connection.ColumnDefinitionWithTable, error) {
+	switch cols := data.(type) {
+	case nil:
+		return []connection.ColumnDefinitionWithTable{}, nil
+	case []connection.ColumnDefinitionWithTable:
+		return ensureNonNilColumnsWithTable(append([]connection.ColumnDefinitionWithTable(nil), cols...)), nil
+	default:
+		var decoded []connection.ColumnDefinitionWithTable
+		if err := remarshal(data, &decoded); err != nil {
+			return nil, err
+		}
+		return ensureNonNilColumnsWithTable(decoded), nil
+	}
+}
+
+func decodeIndexes(data interface{}) ([]connection.IndexDefinition, error) {
+	switch indexes := data.(type) {
+	case nil:
+		return []connection.IndexDefinition{}, nil
+	case []connection.IndexDefinition:
+		return ensureNonNilIndexes(append([]connection.IndexDefinition(nil), indexes...)), nil
+	default:
+		var decoded []connection.IndexDefinition
+		if err := remarshal(data, &decoded); err != nil {
+			return nil, err
+		}
+		return ensureNonNilIndexes(decoded), nil
+	}
+}
+
+func decodeForeignKeys(data interface{}) ([]connection.ForeignKeyDefinition, error) {
+	switch foreignKeys := data.(type) {
+	case nil:
+		return []connection.ForeignKeyDefinition{}, nil
+	case []connection.ForeignKeyDefinition:
+		return ensureNonNilForeignKeys(append([]connection.ForeignKeyDefinition(nil), foreignKeys...)), nil
+	default:
+		var decoded []connection.ForeignKeyDefinition
+		if err := remarshal(data, &decoded); err != nil {
+			return nil, err
+		}
+		return ensureNonNilForeignKeys(decoded), nil
+	}
+}
+
+func decodeTriggers(data interface{}) ([]connection.TriggerDefinition, error) {
+	switch triggers := data.(type) {
+	case nil:
+		return []connection.TriggerDefinition{}, nil
+	case []connection.TriggerDefinition:
+		return ensureNonNilTriggers(append([]connection.TriggerDefinition(nil), triggers...)), nil
+	default:
+		var decoded []connection.TriggerDefinition
+		if err := remarshal(data, &decoded); err != nil {
+			return nil, err
+		}
+		return ensureNonNilTriggers(decoded), nil
+	}
+}
+
+func decodeString(data interface{}) (string, error) {
+	switch value := data.(type) {
+	case nil:
+		return "", nil
+	case string:
+		return value, nil
+	default:
+		return fmt.Sprint(value), nil
+	}
+}
+
+func decodeResultSets(data interface{}) ([]connection.ResultSetData, error) {
+	switch items := data.(type) {
+	case nil:
+		return []connection.ResultSetData{}, nil
+	case []connection.ResultSetData:
+		return ensureNonNilResultSets(append([]connection.ResultSetData(nil), items...)), nil
+	default:
+		var decoded []connection.ResultSetData
+		if err := remarshal(data, &decoded); err != nil {
+			return nil, err
+		}
+		return ensureNonNilResultSets(decoded), nil
+	}
+}
+
+func remarshal(from interface{}, to interface{}) error {
+	payload, err := json.Marshal(from)
+	if err != nil {
+		return err
+	}
+	return json.Unmarshal(payload, to)
+}
+
+func normalizeMaxRowsPerResult(input int) int {
+	if input <= 0 {
+		return defaultMaxRowsPerResult
+	}
+	if input > maxRowsPerResultLimit {
+		return maxRowsPerResultLimit
+	}
+	return input
+}
+
+func normalizeResultSets(resultSets []connection.ResultSetData, maxRows int) ([]sqlResultSet, bool) {
+	normalized := make([]sqlResultSet, 0, len(resultSets))
+	truncatedAny := false
+	for _, resultSet := range resultSets {
+		rows := ensureNonNilRows(resultSet.Rows)
+		rowCount := len(rows)
+		truncated := false
+		if maxRows > 0 && len(rows) > maxRows {
+			rows = append([]map[string]interface{}(nil), rows[:maxRows]...)
+			truncated = true
+			truncatedAny = true
+		}
+		normalized = append(normalized, sqlResultSet{
+			StatementIndex: resultSet.StatementIndex,
+			Columns:        ensureNonNilStrings(append([]string(nil), resultSet.Columns...)),
+			Rows:           rows,
+			Messages:       ensureNonNilStrings(append([]string(nil), resultSet.Messages...)),
+			RowCount:       rowCount,
+			Truncated:      truncated,
+		})
+	}
+	return normalized, truncatedAny
+}
+
+func toStatementSummaries(items []appcore.SQLStatementInspection) []sqlStatementSummary {
+	result := make([]sqlStatementSummary, 0, len(items))
+	for _, item := range items {
+		result = append(result, sqlStatementSummary{
+			Index:    item.Index,
+			Keyword:  item.Keyword,
+			ReadOnly: item.ReadOnly,
+		})
+	}
+	return result
+}
+
+func ensureNonNilStrings(items []string) []string {
+	if items == nil {
+		return []string{}
+	}
+	return items
+}
+
+func ensureNonNilColumns(items []connection.ColumnDefinition) []connection.ColumnDefinition {
+	if items == nil {
+		return []connection.ColumnDefinition{}
+	}
+	return items
+}
+
+func ensureNonNilColumnsWithTable(items []connection.ColumnDefinitionWithTable) []connection.ColumnDefinitionWithTable {
+	if items == nil {
+		return []connection.ColumnDefinitionWithTable{}
+	}
+	return items
+}
+
+func ensureNonNilIndexes(items []connection.IndexDefinition) []connection.IndexDefinition {
+	if items == nil {
+		return []connection.IndexDefinition{}
+	}
+	return items
+}
+
+func ensureNonNilForeignKeys(items []connection.ForeignKeyDefinition) []connection.ForeignKeyDefinition {
+	if items == nil {
+		return []connection.ForeignKeyDefinition{}
+	}
+	return items
+}
+
+func ensureNonNilTriggers(items []connection.TriggerDefinition) []connection.TriggerDefinition {
+	if items == nil {
+		return []connection.TriggerDefinition{}
+	}
+	return items
+}
+
+func ensureNonNilRows(items []map[string]interface{}) []map[string]interface{} {
+	if items == nil {
+		return []map[string]interface{}{}
+	}
+	return items
+}
+
+func ensureNonNilResultSets(items []connection.ResultSetData) []connection.ResultSetData {
+	if items == nil {
+		return []connection.ResultSetData{}
+	}
+	return items
+}
+
+type sqlSafetyStatement struct {
+	Index         int
+	Keyword       string
+	OperationType ai.SQLOperationType
+}
+
+type sqlSafetyDecision struct {
+	requiresConfirm bool
+	disallowed      []sqlSafetyStatement
+	confirmRequired []sqlSafetyStatement
+}
+
+func evaluateSQLSafety(level ai.SQLPermissionLevel, inspection appcore.SQLInspection) sqlSafetyDecision {
+	decision := sqlSafetyDecision{
+		disallowed:      []sqlSafetyStatement{},
+		confirmRequired: []sqlSafetyStatement{},
+	}
+
+	for _, stmt := range inspection.Statements {
+		statement := sqlSafetyStatement{
+			Index:         stmt.Index,
+			Keyword:       strings.TrimSpace(stmt.Keyword),
+			OperationType: classifyStatementOperation(stmt),
+		}
+		if !isOperationAllowed(level, statement.OperationType) {
+			decision.disallowed = append(decision.disallowed, statement)
+			continue
+		}
+		if statement.OperationType != ai.SQLOpQuery {
+			decision.requiresConfirm = true
+			decision.confirmRequired = append(decision.confirmRequired, statement)
+		}
+	}
+
+	return decision
+}
+
+func classifyStatementOperation(stmt appcore.SQLStatementInspection) ai.SQLOperationType {
+	if stmt.ReadOnly {
+		return ai.SQLOpQuery
+	}
+
+	switch strings.ToLower(strings.TrimSpace(stmt.Keyword)) {
+	case "insert", "update", "delete", "replace", "merge", "upsert":
+		return ai.SQLOpDML
+	case "create", "alter", "drop", "truncate", "rename":
+		return ai.SQLOpDDL
+	default:
+		return ai.SQLOpOther
+	}
+}
+
+func isOperationAllowed(level ai.SQLPermissionLevel, opType ai.SQLOperationType) bool {
+	switch normalizeSQLSafetyLevel(level) {
+	case ai.PermissionReadOnly:
+		return opType == ai.SQLOpQuery
+	case ai.PermissionReadWrite:
+		return opType == ai.SQLOpQuery || opType == ai.SQLOpDML
+	case ai.PermissionFull:
+		return opType == ai.SQLOpQuery || opType == ai.SQLOpDML || opType == ai.SQLOpDDL
+	default:
+		return opType == ai.SQLOpQuery
+	}
+}
+
+func normalizeSQLSafetyLevel(level ai.SQLPermissionLevel) ai.SQLPermissionLevel {
+	switch level {
+	case ai.PermissionReadOnly, ai.PermissionReadWrite, ai.PermissionFull:
+		return level
+	default:
+		return ai.PermissionReadOnly
+	}
+}
+
+func buildSafetyDeniedMessage(level ai.SQLPermissionLevel, statements []sqlSafetyStatement) string {
+	return fmt.Sprintf("当前 GoNavi AI 安全控制为%s，已阻止以下语句：%s。%s", safetyLevelDisplayName(level), formatSafetyStatements(statements), safetyLevelRuleText(level))
+}
+
+func safetyLevelDisplayName(level ai.SQLPermissionLevel) string {
+	switch normalizeSQLSafetyLevel(level) {
+	case ai.PermissionReadOnly:
+		return "只读模式"
+	case ai.PermissionReadWrite:
+		return "读写模式"
+	case ai.PermissionFull:
+		return "完全模式"
+	default:
+		return "只读模式"
+	}
+}
+
+func safetyLevelRuleText(level ai.SQLPermissionLevel) string {
+	switch normalizeSQLSafetyLevel(level) {
+	case ai.PermissionReadOnly:
+		return "只读模式仅允许查询语句。"
+	case ai.PermissionReadWrite:
+		return "读写模式仅允许查询和 DML 语句。"
+	case ai.PermissionFull:
+		return "完全模式仅允许查询、DML 和 DDL；未识别操作仍会被阻止。"
+	default:
+		return "只读模式仅允许查询语句。"
+	}
+}
+
+func formatSafetyStatements(statements []sqlSafetyStatement) string {
+	parts := make([]string, 0, len(statements))
+	for _, stmt := range statements {
+		keyword := strings.TrimSpace(stmt.Keyword)
+		if keyword == "" {
+			keyword = "unknown"
+		}
+		parts = append(parts, fmt.Sprintf("#%d %s(%s)", stmt.Index, strings.ToLower(keyword), strings.ToUpper(string(stmt.OperationType))))
+	}
+	return strings.Join(parts, "，")
+}
diff --git a/internal/mcpserver/service_test.go b/internal/mcpserver/service_test.go
new file mode 100644
index 0000000..965d6ee
--- /dev/null
+++ b/internal/mcpserver/service_test.go
@@ -0,0 +1,631 @@
+package mcpserver
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"GoNavi-Wails/internal/ai"
+	appcore "GoNavi-Wails/internal/app"
+	"GoNavi-Wails/internal/connection"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+type fakeBackend struct {
+	savedConnections    []connection.SavedConnectionView
+	savedConnectionsErr error
+	editableConnection  connection.SavedConnectionView
+	editableErr         error
+	databasesResult     connection.QueryResult
+	tablesResult        connection.QueryResult
+	allColumnsResult    connection.QueryResult
+	columnsResult       connection.QueryResult
+	indexesResult       connection.QueryResult
+	foreignKeysResult   connection.QueryResult
+	triggersResult      connection.QueryResult
+	ddlResult           connection.QueryResult
+	queryResult         connection.QueryResult
+	inspection          appcore.SQLInspection
+	safetyLevel         ai.SQLPermissionLevel
+	queryCalled         bool
+}
+
+func (f *fakeBackend) Close(context.Context) error {
+	return nil
+}
+
+func (f *fakeBackend) GetSavedConnections() ([]connection.SavedConnectionView, error) {
+	return f.savedConnections, f.savedConnectionsErr
+}
+
+func (f *fakeBackend) GetEditableSavedConnection(id string) (connection.SavedConnectionView, error) {
+	return f.editableConnection, f.editableErr
+}
+
+func (f *fakeBackend) DBGetDatabases(config connection.ConnectionConfig) connection.QueryResult {
+	return f.databasesResult
+}
+
+func (f *fakeBackend) DBGetTables(config connection.ConnectionConfig, dbName string) connection.QueryResult {
+	return f.tablesResult
+}
+
+func (f *fakeBackend) DBGetAllColumns(config connection.ConnectionConfig, dbName string) connection.QueryResult {
+	return f.allColumnsResult
+}
+
+func (f *fakeBackend) DBGetColumns(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return f.columnsResult
+}
+
+func (f *fakeBackend) DBGetIndexes(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return f.indexesResult
+}
+
+func (f *fakeBackend) DBGetForeignKeys(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return f.foreignKeysResult
+}
+
+func (f *fakeBackend) DBGetTriggers(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return f.triggersResult
+}
+
+func (f *fakeBackend) DBShowCreateTable(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
+	return f.ddlResult
+}
+
+func (f *fakeBackend) DBQueryMulti(config connection.ConnectionConfig, dbName string, query string, queryID string) connection.QueryResult {
+	f.queryCalled = true
+	return f.queryResult
+}
+
+func (f *fakeBackend) InspectSQL(dbType string, sql string) appcore.SQLInspection {
+	return f.inspection
+}
+
+func (f *fakeBackend) GetSQLSafetyLevel() ai.SQLPermissionLevel {
+	if f.safetyLevel == "" {
+		return ai.PermissionReadOnly
+	}
+	return f.safetyLevel
+}
+
+func TestGetConnectionsReturnsSavedConnectionSummaries(t *testing.T) {
+	backend := &fakeBackend{
+		savedConnections: []connection.SavedConnectionView{
+			{
+				ID:   "mysql-main",
+				Name: "MySQL Main",
+				Config: connection.ConnectionConfig{
+					Type:     "mysql",
+					Host:     "10.0.0.8",
+					Port:     3306,
+					Database: "app",
+					UseSSH:   true,
+				},
+			},
+			{
+				ID:   "duckdb-local",
+				Name: "DuckDB Local",
+				Config: connection.ConnectionConfig{
+					Type:     "duckdb",
+					Database: `C:\data\example.duckdb`,
+				},
+			},
+		},
+	}
+
+	service := NewService(backend)
+	result, out, err := service.GetConnections(context.Background(), nil, emptyArgs{})
+	if err != nil {
+		t.Fatalf("GetConnections returned error: %v", err)
+	}
+	if result == nil || result.IsError {
+		t.Fatalf("expected success result, got %#v", result)
+	}
+	if len(out.Connections) != 2 {
+		t.Fatalf("expected 2 connections, got %d", len(out.Connections))
+	}
+	if out.Connections[0].Target != "10.0.0.8:3306" {
+		t.Fatalf("unexpected mysql target: %q", out.Connections[0].Target)
+	}
+	if out.Connections[1].Target != `C:\data\example.duckdb` {
+		t.Fatalf("unexpected duckdb target: %q", out.Connections[1].Target)
+	}
+}
+
+func TestGetConnectionsRedactsOpaqueURIAndDSNTargets(t *testing.T) {
+	backend := &fakeBackend{
+		savedConnections: []connection.SavedConnectionView{
+			{
+				ID:   "pg-uri",
+				Name: "Postgres URI",
+				Config: connection.ConnectionConfig{
+					Type: "postgres",
+					URI:  "postgres://postgres:secret@db.local:5432/app?sslmode=disable",
+				},
+			},
+			{
+				ID:   "mysql-dsn",
+				Name: "MySQL DSN",
+				Config: connection.ConnectionConfig{
+					Type: "mysql",
+					DSN:  "root:secret@tcp(db.local:3306)/app?charset=utf8mb4",
+				},
+			},
+		},
+	}
+
+	service := NewService(backend)
+	result, out, err := service.GetConnections(context.Background(), nil, emptyArgs{})
+	if err != nil {
+		t.Fatalf("GetConnections returned error: %v", err)
+	}
+	if result == nil || result.IsError {
+		t.Fatalf("expected success result, got %#v", result)
+	}
+	if len(out.Connections) != 2 {
+		t.Fatalf("expected 2 connections, got %d", len(out.Connections))
+	}
+	if out.Connections[0].Target != "postgres://db.local:5432/app" {
+		t.Fatalf("expected URI target to remove credentials and query, got %q", out.Connections[0].Target)
+	}
+	if strings.Contains(out.Connections[0].Target, "secret") || strings.Contains(out.Connections[0].Target, "postgres@") {
+		t.Fatalf("URI target leaked credentials: %q", out.Connections[0].Target)
+	}
+	if out.Connections[1].Target != redactedOpaqueTarget {
+		t.Fatalf("expected opaque DSN target to be redacted, got %q", out.Connections[1].Target)
+	}
+}
+
+func TestGetAllColumnsReturnsCrossTableColumnSummaries(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		allColumnsResult: connection.QueryResult{
+			Success: true,
+			Data: []connection.ColumnDefinitionWithTable{
+				{TableName: "users", Name: "email", Type: "varchar(255)", Comment: "用户邮箱"},
+				{TableName: "orders", Name: "user_id", Type: "bigint", Comment: "关联用户"},
+			},
+		},
+	}
+
+	service := NewService(backend)
+	result, out, err := service.GetAllColumns(context.Background(), nil, databaseArgs{
+		ConnectionID: "mysql-main",
+		DBName:       "app",
+	})
+	if err != nil {
+		t.Fatalf("GetAllColumns returned error: %v", err)
+	}
+	if result == nil || result.IsError {
+		t.Fatalf("expected success result, got %#v", result)
+	}
+	if len(out.Columns) != 2 || out.Columns[0].TableName != "users" || out.Columns[1].Name != "user_id" {
+		t.Fatalf("unexpected all columns output: %#v", out)
+	}
+}
+
+func TestGetIndexesReturnsIndexDefinitions(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		indexesResult: connection.QueryResult{
+			Success: true,
+			Data: []connection.IndexDefinition{
+				{Name: "idx_users_email", ColumnName: "email", NonUnique: 0, SeqInIndex: 1, IndexType: "BTREE"},
+			},
+		},
+	}
+
+	service := NewService(backend)
+	result, out, err := service.GetIndexes(context.Background(), nil, tableArgs{
+		ConnectionID: "mysql-main",
+		DBName:       "app",
+		TableName:    "users",
+	})
+	if err != nil {
+		t.Fatalf("GetIndexes returned error: %v", err)
+	}
+	if result == nil || result.IsError {
+		t.Fatalf("expected success result, got %#v", result)
+	}
+	if len(out.Indexes) != 1 || out.Indexes[0].Name != "idx_users_email" {
+		t.Fatalf("unexpected indexes output: %#v", out)
+	}
+}
+
+func TestGetForeignKeysReturnsForeignKeyDefinitions(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		foreignKeysResult: connection.QueryResult{
+			Success: true,
+			Data: []connection.ForeignKeyDefinition{
+				{Name: "fk_orders_user_id", ColumnName: "user_id", RefTableName: "users", RefColumnName: "id", ConstraintName: "fk_orders_user_id"},
+			},
+		},
+	}
+
+	service := NewService(backend)
+	result, out, err := service.GetForeignKeys(context.Background(), nil, tableArgs{
+		ConnectionID: "mysql-main",
+		DBName:       "app",
+		TableName:    "orders",
+	})
+	if err != nil {
+		t.Fatalf("GetForeignKeys returned error: %v", err)
+	}
+	if result == nil || result.IsError {
+		t.Fatalf("expected success result, got %#v", result)
+	}
+	if len(out.ForeignKeys) != 1 || out.ForeignKeys[0].RefTableName != "users" {
+		t.Fatalf("unexpected foreign keys output: %#v", out)
+	}
+}
+
+func TestGetTriggersReturnsTriggerDefinitions(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		triggersResult: connection.QueryResult{
+			Success: true,
+			Data: []connection.TriggerDefinition{
+				{Name: "trg_orders_audit", Timing: "AFTER", Event: "INSERT", Statement: "INSERT INTO audit_log ..."},
+			},
+		},
+	}
+
+	service := NewService(backend)
+	result, out, err := service.GetTriggers(context.Background(), nil, tableArgs{
+		ConnectionID: "mysql-main",
+		DBName:       "app",
+		TableName:    "orders",
+	})
+	if err != nil {
+		t.Fatalf("GetTriggers returned error: %v", err)
+	}
+	if result == nil || result.IsError {
+		t.Fatalf("expected success result, got %#v", result)
+	}
+	if len(out.Triggers) != 1 || out.Triggers[0].Name != "trg_orders_audit" {
+		t.Fatalf("unexpected triggers output: %#v", out)
+	}
+}
+
+func TestExecuteSQLRejectsMutatingStatementsWithoutAllowMutating(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		inspection: appcore.SQLInspection{
+			StatementCount: 1,
+			ReadOnly:       false,
+			Statements: []appcore.SQLStatementInspection{
+				{Index: 1, Keyword: "delete", ReadOnly: false},
+			},
+		},
+		safetyLevel: ai.PermissionReadWrite,
+	}
+
+	service := NewService(backend)
+	result, _, err := service.ExecuteSQL(context.Background(), nil, executeSQLArgs{
+		ConnectionID: "mysql-main",
+		SQL:          "delete from users where id = 1",
+	})
+	if err != nil {
+		t.Fatalf("ExecuteSQL returned error: %v", err)
+	}
+	if result == nil || !result.IsError {
+		t.Fatalf("expected tool error, got %#v", result)
+	}
+	if !strings.Contains(firstTextContent(result), "allowMutating=true") {
+		t.Fatalf("unexpected error text: %q", firstTextContent(result))
+	}
+	if backend.queryCalled {
+		t.Fatalf("expected SQL not to execute when allowMutating is false")
+	}
+}
+
+func TestExecuteSQLRejectsMutatingStatementsWhenAISafetyIsReadOnly(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		inspection: appcore.SQLInspection{
+			StatementCount: 1,
+			ReadOnly:       false,
+			Statements: []appcore.SQLStatementInspection{
+				{Index: 1, Keyword: "delete", ReadOnly: false},
+			},
+		},
+		safetyLevel: ai.PermissionReadOnly,
+	}
+
+	service := NewService(backend)
+	result, _, err := service.ExecuteSQL(context.Background(), nil, executeSQLArgs{
+		ConnectionID:  "mysql-main",
+		SQL:           "delete from users where id = 1",
+		AllowMutating: true,
+	})
+	if err != nil {
+		t.Fatalf("ExecuteSQL returned error: %v", err)
+	}
+	if result == nil || !result.IsError {
+		t.Fatalf("expected tool error, got %#v", result)
+	}
+	if !strings.Contains(firstTextContent(result), "只读模式") {
+		t.Fatalf("unexpected error text: %q", firstTextContent(result))
+	}
+	if backend.queryCalled {
+		t.Fatalf("expected SQL not to execute when AI safety is readonly")
+	}
+}
+
+func TestExecuteSQLRejectsDDLWhenAISafetyIsReadWrite(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		inspection: appcore.SQLInspection{
+			StatementCount: 1,
+			ReadOnly:       false,
+			Statements: []appcore.SQLStatementInspection{
+				{Index: 1, Keyword: "drop", ReadOnly: false},
+			},
+		},
+		safetyLevel: ai.PermissionReadWrite,
+	}
+
+	service := NewService(backend)
+	result, _, err := service.ExecuteSQL(context.Background(), nil, executeSQLArgs{
+		ConnectionID:  "mysql-main",
+		SQL:           "drop table users",
+		AllowMutating: true,
+	})
+	if err != nil {
+		t.Fatalf("ExecuteSQL returned error: %v", err)
+	}
+	if result == nil || !result.IsError {
+		t.Fatalf("expected tool error, got %#v", result)
+	}
+	text := firstTextContent(result)
+	if !strings.Contains(text, "读写模式") || !strings.Contains(text, "DDL") {
+		t.Fatalf("unexpected error text: %q", text)
+	}
+	if backend.queryCalled {
+		t.Fatalf("expected SQL not to execute when AI safety blocks DDL")
+	}
+}
+
+func TestExecuteSQLRejectsMixedStatementsWhenAISafetyBlocksLaterStatement(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		inspection: appcore.SQLInspection{
+			StatementCount: 2,
+			ReadOnly:       false,
+			Statements: []appcore.SQLStatementInspection{
+				{Index: 1, Keyword: "select", ReadOnly: true},
+				{Index: 2, Keyword: "delete", ReadOnly: false},
+			},
+		},
+		safetyLevel: ai.PermissionReadOnly,
+	}
+
+	service := NewService(backend)
+	result, _, err := service.ExecuteSQL(context.Background(), nil, executeSQLArgs{
+		ConnectionID:  "mysql-main",
+		SQL:           "select * from users; delete from users where id = 1",
+		AllowMutating: true,
+	})
+	if err != nil {
+		t.Fatalf("ExecuteSQL returned error: %v", err)
+	}
+	if result == nil || !result.IsError {
+		t.Fatalf("expected tool error, got %#v", result)
+	}
+	if !strings.Contains(firstTextContent(result), "#2 delete") {
+		t.Fatalf("unexpected error text: %q", firstTextContent(result))
+	}
+	if backend.queryCalled {
+		t.Fatalf("expected SQL not to execute when a later statement is blocked")
+	}
+}
+
+func TestExecuteSQLAllowsDMLWhenAISafetyIsReadWriteAndAllowMutating(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		inspection: appcore.SQLInspection{
+			StatementCount: 1,
+			ReadOnly:       false,
+			Statements: []appcore.SQLStatementInspection{
+				{Index: 1, Keyword: "insert", ReadOnly: false},
+			},
+		},
+		safetyLevel: ai.PermissionReadWrite,
+		queryResult: connection.QueryResult{
+			Success: true,
+			Data:    []connection.ResultSetData{},
+		},
+	}
+
+	service := NewService(backend)
+	result, out, err := service.ExecuteSQL(context.Background(), nil, executeSQLArgs{
+		ConnectionID:  "mysql-main",
+		SQL:           "insert into users(id) values (1)",
+		AllowMutating: true,
+	})
+	if err != nil {
+		t.Fatalf("ExecuteSQL returned error: %v", err)
+	}
+	if result == nil || result.IsError {
+		t.Fatalf("expected success result, got %#v", result)
+	}
+	if !backend.queryCalled {
+		t.Fatalf("expected SQL to be executed")
+	}
+	if out.ReadOnly {
+		t.Fatalf("expected mutating SQL result, got %#v", out)
+	}
+}
+
+func TestExecuteSQLAllowsDDLWhenAISafetyIsFullAndAllowMutating(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		inspection: appcore.SQLInspection{
+			StatementCount: 1,
+			ReadOnly:       false,
+			Statements: []appcore.SQLStatementInspection{
+				{Index: 1, Keyword: "drop", ReadOnly: false},
+			},
+		},
+		safetyLevel: ai.PermissionFull,
+		queryResult: connection.QueryResult{
+			Success: true,
+			Data:    []connection.ResultSetData{},
+		},
+	}
+
+	service := NewService(backend)
+	result, _, err := service.ExecuteSQL(context.Background(), nil, executeSQLArgs{
+		ConnectionID:  "mysql-main",
+		SQL:           "drop table users",
+		AllowMutating: true,
+	})
+	if err != nil {
+		t.Fatalf("ExecuteSQL returned error: %v", err)
+	}
+	if result == nil || result.IsError {
+		t.Fatalf("expected success result, got %#v", result)
+	}
+	if !backend.queryCalled {
+		t.Fatalf("expected SQL to be executed")
+	}
+}
+
+func TestExecuteSQLNormalizesAndTruncatesResultSets(t *testing.T) {
+	backend := &fakeBackend{
+		editableConnection: connection.SavedConnectionView{
+			ID: "mysql-main",
+			Config: connection.ConnectionConfig{
+				Type:     "mysql",
+				Database: "app",
+			},
+		},
+		inspection: appcore.SQLInspection{
+			StatementCount: 1,
+			ReadOnly:       true,
+			Statements: []appcore.SQLStatementInspection{
+				{Index: 1, Keyword: "select", ReadOnly: true},
+			},
+		},
+		queryResult: connection.QueryResult{
+			Success: true,
+			QueryID: "query-1",
+			Data: []connection.ResultSetData{
+				{
+					StatementIndex: 1,
+					Columns:        []string{"id"},
+					Rows: []map[string]interface{}{
+						{"id": 1},
+						{"id": 2},
+						{"id": 3},
+					},
+				},
+			},
+		},
+	}
+
+	service := NewService(backend)
+	result, out, err := service.ExecuteSQL(context.Background(), nil, executeSQLArgs{
+		ConnectionID:     "mysql-main",
+		SQL:              "select id from users",
+		MaxRowsPerResult: 2,
+	})
+	if err != nil {
+		t.Fatalf("ExecuteSQL returned error: %v", err)
+	}
+	if result == nil || result.IsError {
+		t.Fatalf("expected success result, got %#v", result)
+	}
+	if !backend.queryCalled {
+		t.Fatalf("expected SQL to be executed")
+	}
+	if out.StatementCount != 1 || len(out.Results) != 1 {
+		t.Fatalf("unexpected output: %#v", out)
+	}
+	if out.QueryID != "query-1" {
+		t.Fatalf("unexpected query id: %q", out.QueryID)
+	}
+	if !out.Truncated || !out.Results[0].Truncated {
+		t.Fatalf("expected truncated result, got %#v", out.Results[0])
+	}
+	if out.Results[0].RowCount != 3 {
+		t.Fatalf("expected rowCount 3, got %d", out.Results[0].RowCount)
+	}
+	if len(out.Results[0].Rows) != 2 {
+		t.Fatalf("expected 2 returned rows, got %d", len(out.Results[0].Rows))
+	}
+}
+
+func firstTextContent(result *mcp.CallToolResult) string {
+	if result == nil || len(result.Content) == 0 {
+		return ""
+	}
+	text, _ := result.Content[0].(*mcp.TextContent)
+	if text == nil {
+		return ""
+	}
+	return text.Text
+}
diff --git a/internal/redis/redis.go b/internal/redis/redis.go
index d9e776b..2224ad5 100644
--- a/internal/redis/redis.go
+++ b/internal/redis/redis.go
@@ -12,7 +12,7 @@ type RedisValue struct {
 
 // RedisDBInfo represents information about a Redis database
 type RedisDBInfo struct {
-	Index int   `json:"index"` // Database index (single: 0-15, cluster: logical 0-15)
+	Index int   `json:"index"` // Database index (single/sentinel: server configured range, cluster: logical 0-15)
 	Keys  int64 `json:"keys"`  // Number of keys in this database
 }
 
diff --git a/internal/redis/redis_impl.go b/internal/redis/redis_impl.go
index d48e6c4..905665d 100644
--- a/internal/redis/redis_impl.go
+++ b/internal/redis/redis_impl.go
@@ -37,6 +37,8 @@ type RedisClientImpl struct {
 }
 
 const (
+	redisDefaultDatabaseCount         = 16
+	redisClusterLogicalDBCount        = 16
 	redisScanDefaultTargetCount int64 = 2000
 	redisScanMaxTargetCount     int64 = 10000
 	redisScanMinStepCount       int64 = 200
@@ -49,6 +51,10 @@ const (
 	redisSearchMaxDuration            = 3 * time.Second
 )
 
+var redisDBSwitchConnect = func(client *RedisClientImpl, config connection.ConnectionConfig) error {
+	return client.Connect(config)
+}
+
 // NewRedisClient creates a new Redis client instance
 func NewRedisClient() RedisClient {
 	return &RedisClientImpl{}
@@ -122,6 +128,17 @@ func buildRedisSeedAddrs(config connection.ConnectionConfig) ([]string, error) {
 	return addrs, nil
 }
 
+func redisTopologyDisplayName(topology string) string {
+	switch strings.ToLower(strings.TrimSpace(topology)) {
+	case "sentinel":
+		return "Sentinel"
+	case "cluster":
+		return "集群"
+	default:
+		return "多节点"
+	}
+}
+
 func (r *RedisClientImpl) redisNamespacePrefixForDB(index int) string {
 	if !r.isCluster || index <= 0 {
 		return ""
@@ -246,11 +263,11 @@ func sanitizeRedisPassword(password string) string {
 // Connect establishes a connection to Redis
 func (r *RedisClientImpl) Connect(config connection.ConnectionConfig) error {
 	config.Password = sanitizeRedisPassword(config.Password)
+	config.RedisSentinelPassword = sanitizeRedisPassword(config.RedisSentinelPassword)
 	r.config = config
-	if r.config.RedisDB < 0 || r.config.RedisDB > 15 {
+	if r.config.RedisDB < 0 {
 		r.config.RedisDB = 0
 	}
-	r.currentDB = r.config.RedisDB
 	r.forwarder = nil
 	r.client = nil
 	r.singleClient = nil
@@ -264,13 +281,74 @@ func (r *RedisClientImpl) Connect(config connection.ConnectionConfig) error {
 	r.seedAddrs = append([]string(nil), seedAddrs...)
 
 	topology := strings.ToLower(strings.TrimSpace(config.Topology))
-	r.isCluster = topology == "cluster" || len(seedAddrs) > 1
+	isSentinel := topology == "sentinel"
+	r.isCluster = !isSentinel && (topology == "cluster" || len(seedAddrs) > 1)
+	if r.isCluster && r.config.RedisDB >= redisClusterLogicalDBCount {
+		r.config.RedisDB = 0
+	}
+	r.currentDB = r.config.RedisDB
 
-	if r.isCluster && config.UseSSH {
-		return fmt.Errorf("Redis 集群模式暂不支持 SSH 隧道，请关闭 SSH 后重试")
+	if (r.isCluster || isSentinel) && config.UseSSH {
+		return fmt.Errorf("Redis %s模式暂不支持 SSH 隧道，请关闭 SSH 后重试", redisTopologyDisplayName(topology))
 	}
 
 	timeout := normalizeRedisTimeout(config.Timeout)
+	if isSentinel {
+		masterName := strings.TrimSpace(config.RedisSentinelMaster)
+		if masterName == "" {
+			return fmt.Errorf("Redis Sentinel 模式需要填写 master 名称")
+		}
+		attempts := []connection.ConnectionConfig{config}
+		if shouldTryRedisSSLPreferredFallback(config) {
+			attempts = append(attempts, withRedisSSLDisabled(config))
+		}
+
+		var failures []string
+		for idx, attempt := range attempts {
+			var tlsConfig *tls.Config
+			if cfg, err := resolveRedisTLSConfig(attempt); err != nil {
+				failures = append(failures, fmt.Sprintf("第%d次 TLS 配置失败: %v", idx+1, err))
+				continue
+			} else if cfg != nil {
+				if host, _, err := net.SplitHostPort(seedAddrs[0]); err == nil && host != "" {
+					cfg.ServerName = host
+				}
+				tlsConfig = cfg
+			}
+			opts := &redis.FailoverOptions{
+				MasterName:       masterName,
+				SentinelAddrs:    seedAddrs,
+				Username:         strings.TrimSpace(attempt.User),
+				Password:         attempt.Password,
+				SentinelUsername: strings.TrimSpace(attempt.RedisSentinelUser),
+				SentinelPassword: attempt.RedisSentinelPassword,
+				DB:               r.currentDB,
+				DialTimeout:      timeout,
+				ReadTimeout:      timeout,
+				WriteTimeout:     timeout,
+				TLSConfig:        tlsConfig,
+			}
+			sentinelClient := redis.NewFailoverClient(opts)
+			ctx, cancel := context.WithTimeout(context.Background(), timeout)
+			pingErr := sentinelClient.Ping(ctx).Err()
+			cancel()
+			if pingErr != nil {
+				sentinelClient.Close()
+				failures = append(failures, fmt.Sprintf("第%d次连接失败: %v", idx+1, pingErr))
+				continue
+			}
+			r.client = sentinelClient
+			r.singleClient = sentinelClient
+			r.config = attempt
+			if idx > 0 {
+				logger.Warnf("Redis Sentinel SSL 优先连接失败，已回退至明文连接")
+			}
+			logger.Infof("Redis Sentinel 连接成功: sentinels=%s master=%s DB=%d", strings.Join(seedAddrs, ","), masterName, r.currentDB)
+			return nil
+		}
+		return fmt.Errorf("Redis Sentinel 连接失败: %s", strings.Join(failures, "；"))
+	}
+
 	if r.isCluster {
 		attempts := []connection.ConnectionConfig{config}
 		if shouldTryRedisSSLPreferredFallback(config) {
@@ -1276,8 +1354,8 @@ func (r *RedisClientImpl) ExecuteCommand(args []string) (interface{}, error) {
 			if err != nil {
 				return nil, fmt.Errorf("无效数据库索引: %s", args[1])
 			}
-			if index < 0 || index > 15 {
-				return nil, fmt.Errorf("数据库索引必须在 0-15 之间")
+			if index < 0 || index >= redisClusterLogicalDBCount {
+				return nil, fmt.Errorf("数据库索引必须在 0-%d 之间", redisClusterLogicalDBCount-1)
 			}
 			r.currentDB = index
 			r.config.RedisDB = index
@@ -1423,6 +1501,67 @@ func (r *RedisClientImpl) GetServerInfo() (map[string]string, error) {
 	return result, nil
 }
 
+func parseRedisKeyspaceDatabaseKeys(info string) map[int]int64 {
+	dbMap := make(map[int]int64)
+	lines := strings.Split(info, "\n")
+	for _, line := range lines {
+		line = strings.TrimSpace(line)
+		if strings.HasPrefix(line, "db") {
+			// Format: db0:keys=123,expires=0,avg_ttl=0
+			parts := strings.SplitN(line, ":", 2)
+			if len(parts) != 2 {
+				continue
+			}
+			dbIndex, err := strconv.Atoi(strings.TrimPrefix(parts[0], "db"))
+			if err != nil {
+				continue
+			}
+			kvPairs := strings.Split(parts[1], ",")
+			for _, kv := range kvPairs {
+				if strings.HasPrefix(kv, "keys=") {
+					keys, _ := strconv.ParseInt(strings.TrimPrefix(kv, "keys="), 10, 64)
+					dbMap[dbIndex] = keys
+					break
+				}
+			}
+		}
+	}
+	return dbMap
+}
+
+func parseRedisConfiguredDatabaseCount(config map[string]string) (int, bool) {
+	for key, value := range config {
+		if !strings.EqualFold(strings.TrimSpace(key), "databases") {
+			continue
+		}
+		count, err := strconv.Atoi(strings.TrimSpace(value))
+		if err == nil && count > 0 {
+			return count, true
+		}
+	}
+	return 0, false
+}
+
+func (r *RedisClientImpl) resolveRedisDatabaseCount(ctx context.Context, dbMap map[int]int64) int {
+	count := redisDefaultDatabaseCount
+	if r.currentDB >= count {
+		count = r.currentDB + 1
+	}
+	for index := range dbMap {
+		if index >= count {
+			count = index + 1
+		}
+	}
+	config, err := r.client.ConfigGet(ctx, "databases").Result()
+	if err != nil {
+		return count
+	}
+	if configured, ok := parseRedisConfiguredDatabaseCount(config); ok && configured > count {
+		count = configured
+	}
+	return count
+}
+
 // GetDatabases returns information about all databases
 func (r *RedisClientImpl) GetDatabases() ([]RedisDBInfo, error) {
 	if r.client == nil {
@@ -1448,8 +1587,8 @@ func (r *RedisClientImpl) GetDatabases() ([]RedisDBInfo, error) {
 			logger.Warnf("Redis 集群获取 key 数量失败，回退为 0: %v", err)
 			totalKeys = 0
 		}
-		result := make([]RedisDBInfo, 16)
-		for i := 0; i < 16; i++ {
+		result := make([]RedisDBInfo, redisClusterLogicalDBCount)
+		for i := 0; i < redisClusterLogicalDBCount; i++ {
 			result[i] = RedisDBInfo{Index: i, Keys: 0}
 		}
 		result[0].Keys = totalKeys
@@ -1462,36 +1601,10 @@ func (r *RedisClientImpl) GetDatabases() ([]RedisDBInfo, error) {
 		return nil, err
 	}
 
-	// Parse keyspace info
-	dbMap := make(map[int]int64)
-	lines := strings.Split(info, "\n")
-	for _, line := range lines {
-		line = strings.TrimSpace(line)
-		if strings.HasPrefix(line, "db") {
-			// Format: db0:keys=123,expires=0,avg_ttl=0
-			parts := strings.SplitN(line, ":", 2)
-			if len(parts) != 2 {
-				continue
-			}
-			dbIndex, err := strconv.Atoi(strings.TrimPrefix(parts[0], "db"))
-			if err != nil {
-				continue
-			}
-			// Parse keys count
-			kvPairs := strings.Split(parts[1], ",")
-			for _, kv := range kvPairs {
-				if strings.HasPrefix(kv, "keys=") {
-					keys, _ := strconv.ParseInt(strings.TrimPrefix(kv, "keys="), 10, 64)
-					dbMap[dbIndex] = keys
-					break
-				}
-			}
-		}
-	}
-
-	// Return all 16 databases (0-15)
-	result := make([]RedisDBInfo, 16)
-	for i := 0; i < 16; i++ {
+	dbMap := parseRedisKeyspaceDatabaseKeys(info)
+	databaseCount := r.resolveRedisDatabaseCount(ctx, dbMap)
+	result := make([]RedisDBInfo, databaseCount)
+	for i := 0; i < databaseCount; i++ {
 		result[i] = RedisDBInfo{
 			Index: i,
 			Keys:  dbMap[i], // Will be 0 if not in map
@@ -1508,61 +1621,30 @@ func (r *RedisClientImpl) SelectDB(index int) error {
 	}
 
 	if r.isCluster {
-		if index < 0 || index > 15 {
-			return fmt.Errorf("数据库索引必须在 0-15 之间")
+		if index < 0 || index >= redisClusterLogicalDBCount {
+			return fmt.Errorf("数据库索引必须在 0-%d 之间", redisClusterLogicalDBCount-1)
 		}
 		r.currentDB = index
 		r.config.RedisDB = index
 		return nil
 	}
 
-	if index < 0 || index > 15 {
-		return fmt.Errorf("数据库索引必须在 0-15 之间")
+	if index < 0 {
+		return fmt.Errorf("数据库索引必须大于等于 0")
 	}
 
-	// Create new client with different DB
-	addr := ""
-	if len(r.seedAddrs) > 0 {
-		addr = r.seedAddrs[0]
-	}
-	if r.forwarder != nil {
-		addr = r.forwarder.LocalAddr
-	}
-	if addr == "" {
-		addr = fmt.Sprintf("%s:%d", r.config.Host, r.config.Port)
-	}
-
-	timeout := normalizeRedisTimeout(r.config.Timeout)
-
-	opts := &redis.Options{
-		Addr:         addr,
-		Username:     strings.TrimSpace(r.config.User),
-		Password:     r.config.Password,
-		DB:           index,
-		DialTimeout:  timeout,
-		ReadTimeout:  timeout,
-		WriteTimeout: timeout,
-	}
-
-	newClient := redis.NewClient(opts)
-
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	if err := newClient.Ping(ctx).Err(); err != nil {
-		newClient.Close()
+	nextConfig := r.config
+	nextConfig.RedisDB = index
+	nextClient := &RedisClientImpl{}
+	if err := redisDBSwitchConnect(nextClient, nextConfig); err != nil {
 		return fmt.Errorf("切换数据库失败: %w", err)
 	}
 
-	// Close old client and replace
-	if r.client != nil {
-		_ = r.client.Close()
+	oldClient := r.client
+	*r = *nextClient
+	if oldClient != nil {
+		_ = oldClient.Close()
 	}
-	r.client = newClient
-	r.singleClient = newClient
-	r.clusterClient = nil
-	r.currentDB = index
-	r.config.RedisDB = index
 
 	logger.Infof("Redis 切换到数据库: db%d", index)
 	return nil
diff --git a/internal/redis/redis_impl_test.go b/internal/redis/redis_impl_test.go
index 2821be3..a311751 100644
--- a/internal/redis/redis_impl_test.go
+++ b/internal/redis/redis_impl_test.go
@@ -1,14 +1,102 @@
 package redis
 
 import (
+	"GoNavi-Wails/internal/connection"
+	"bufio"
 	"encoding/json"
 	"errors"
+	"fmt"
+	"io"
 	"math"
 	"math/big"
+	"net"
 	"sort"
+	"strconv"
+	"strings"
 	"testing"
+
+	goredis "github.com/redis/go-redis/v9"
 )
 
+func startRedisProtocolTestServer(t *testing.T, handler func([]string) string) string {
+	t.Helper()
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("listen redis test server failed: %v", err)
+	}
+	t.Cleanup(func() {
+		_ = listener.Close()
+	})
+
+	go func() {
+		for {
+			conn, err := listener.Accept()
+			if err != nil {
+				return
+			}
+			go func() {
+				defer conn.Close()
+				reader := bufio.NewReader(conn)
+				for {
+					args, err := readRedisProtocolArray(reader)
+					if err != nil {
+						return
+					}
+					response := handler(args)
+					if response == "" {
+						response = "+OK\r\n"
+					}
+					if _, err := conn.Write([]byte(response)); err != nil {
+						return
+					}
+				}
+			}()
+		}
+	}()
+
+	return listener.Addr().String()
+}
+
+func readRedisProtocolArray(reader *bufio.Reader) ([]string, error) {
+	line, err := reader.ReadString('\n')
+	if err != nil {
+		return nil, err
+	}
+	line = strings.TrimSpace(line)
+	if !strings.HasPrefix(line, "*") {
+		return nil, fmt.Errorf("expected array, got %q", line)
+	}
+	count, err := strconv.Atoi(strings.TrimPrefix(line, "*"))
+	if err != nil {
+		return nil, err
+	}
+	args := make([]string, 0, count)
+	for i := 0; i < count; i++ {
+		bulkHeader, err := reader.ReadString('\n')
+		if err != nil {
+			return nil, err
+		}
+		bulkHeader = strings.TrimSpace(bulkHeader)
+		if !strings.HasPrefix(bulkHeader, "$") {
+			return nil, fmt.Errorf("expected bulk string, got %q", bulkHeader)
+		}
+		size, err := strconv.Atoi(strings.TrimPrefix(bulkHeader, "$"))
+		if err != nil {
+			return nil, err
+		}
+		buf := make([]byte, size+2)
+		if _, err := io.ReadFull(reader, buf); err != nil {
+			return nil, err
+		}
+		args = append(args, string(buf[:size]))
+	}
+	return args, nil
+}
+
+func redisBulkString(value string) string {
+	return fmt.Sprintf("$%d\r\n%s\r\n", len(value), value)
+}
+
 // 回归保护：HGETALL 在 RESP3 下返回 map[interface{}]interface{}（go-redis v9 默认 RESP3），
 // 这种类型 encoding/json 无法序列化，原值穿透到 Wails RPC 会让 Windows 进程退出（用户感知闪退）。
 // formatCommandResult 必须把 map 平展成交错 [k1, v1, k2, v2, ...] array，前端按 array 渲染。
@@ -224,6 +312,160 @@ func TestSanitizeRedisPassword(t *testing.T) {
 	}
 }
 
+func TestRedisSentinelRequiresMasterNameBeforeDial(t *testing.T) {
+	client := NewRedisClient()
+	err := client.Connect(connection.ConnectionConfig{
+		Type:     "redis",
+		Host:     "127.0.0.1",
+		Port:     26379,
+		Topology: "sentinel",
+	})
+	if err == nil || !strings.Contains(err.Error(), "master 名称") {
+		t.Fatalf("expected missing Sentinel master validation error, got %v", err)
+	}
+}
+
+func TestRedisSentinelWithMultipleAddrsDoesNotUseClusterBranch(t *testing.T) {
+	client := NewRedisClient()
+	err := client.Connect(connection.ConnectionConfig{
+		Type:                "redis",
+		Host:                "127.0.0.1",
+		Port:                26379,
+		Hosts:               []string{"127.0.0.2:26379"},
+		Topology:            "sentinel",
+		RedisSentinelMaster: "mymaster",
+		UseSSH:              true,
+	})
+	if err == nil {
+		t.Fatal("expected Sentinel SSH validation error")
+	}
+	if !strings.Contains(err.Error(), "Sentinel模式暂不支持 SSH 隧道") {
+		t.Fatalf("expected Sentinel-specific SSH error, got %v", err)
+	}
+}
+
+func TestRedisClusterKeepsSSHValidation(t *testing.T) {
+	client := NewRedisClient()
+	err := client.Connect(connection.ConnectionConfig{
+		Type:     "redis",
+		Host:     "127.0.0.1",
+		Port:     6379,
+		Topology: "cluster",
+		UseSSH:   true,
+	})
+	if err == nil {
+		t.Fatal("expected cluster SSH validation error")
+	}
+	if !strings.Contains(err.Error(), "集群模式暂不支持 SSH 隧道") {
+		t.Fatalf("expected cluster SSH error, got %v", err)
+	}
+}
+
+func TestRedisGetDatabasesUsesConfiguredDatabaseCountAboveDefault(t *testing.T) {
+	keyspaceInfo := "# Keyspace\r\ndb0:keys=1,expires=0,avg_ttl=0\r\ndb31:keys=2,expires=0,avg_ttl=0\r\n"
+	addr := startRedisProtocolTestServer(t, func(args []string) string {
+		command := strings.ToUpper(strings.TrimSpace(args[0]))
+		switch command {
+		case "HELLO":
+			return "-ERR unknown command 'HELLO'\r\n"
+		case "CLIENT":
+			return "-ERR unknown subcommand\r\n"
+		case "CONFIG":
+			if len(args) >= 3 && strings.EqualFold(args[1], "GET") && strings.EqualFold(args[2], "databases") {
+				return "*2\r\n$9\r\ndatabases\r\n$2\r\n32\r\n"
+			}
+		case "INFO":
+			return redisBulkString(keyspaceInfo)
+		}
+		return "+OK\r\n"
+	})
+
+	rawClient := goredis.NewClient(&goredis.Options{
+		Addr:     addr,
+		Protocol: 2,
+	})
+	client := &RedisClientImpl{
+		client:       rawClient,
+		singleClient: rawClient,
+	}
+	defer client.Close()
+
+	dbs, err := client.GetDatabases()
+	if err != nil {
+		t.Fatalf("GetDatabases returned error: %v", err)
+	}
+	if len(dbs) != 32 {
+		t.Fatalf("expected 32 redis databases, got %d (%#v)", len(dbs), dbs)
+	}
+	if dbs[31].Index != 31 || dbs[31].Keys != 2 {
+		t.Fatalf("expected db31 with 2 keys, got %#v", dbs[31])
+	}
+}
+
+func TestRedisSelectDBReconnectsWithSentinelConfig(t *testing.T) {
+	oldConnect := redisDBSwitchConnect
+	defer func() {
+		redisDBSwitchConnect = oldConnect
+	}()
+
+	var captured connection.ConnectionConfig
+	redisDBSwitchConnect = func(client *RedisClientImpl, config connection.ConnectionConfig) error {
+		captured = config
+		next := goredis.NewClient(&goredis.Options{Addr: "127.0.0.1:0"})
+		client.client = next
+		client.singleClient = next
+		client.config = config
+		client.currentDB = config.RedisDB
+		return nil
+	}
+
+	oldClient := goredis.NewClient(&goredis.Options{Addr: "127.0.0.1:0"})
+	client := &RedisClientImpl{
+		client:       oldClient,
+		singleClient: oldClient,
+		config: connection.ConnectionConfig{
+			Type:                  "redis",
+			Host:                  "sentinel-a.local",
+			Port:                  26379,
+			Hosts:                 []string{"sentinel-b.local:26379", "sentinel-c.local:26379"},
+			Topology:              "sentinel",
+			User:                  "data-user",
+			Password:              "data-pass",
+			RedisSentinelMaster:   "mymaster",
+			RedisSentinelUser:     "sentinel-user",
+			RedisSentinelPassword: "sentinel-pass",
+			UseSSL:                true,
+			SSLMode:               "required",
+			RedisDB:               0,
+		},
+		currentDB: 0,
+	}
+	defer client.Close()
+
+	if err := client.SelectDB(31); err != nil {
+		t.Fatalf("SelectDB returned error: %v", err)
+	}
+
+	if captured.RedisDB != 31 || client.currentDB != 31 {
+		t.Fatalf("expected RedisDB/currentDB=31, captured=%d current=%d", captured.RedisDB, client.currentDB)
+	}
+	if captured.Topology != "sentinel" {
+		t.Fatalf("expected sentinel topology to be preserved, got %q", captured.Topology)
+	}
+	if captured.RedisSentinelMaster != "mymaster" {
+		t.Fatalf("expected Sentinel master to be preserved, got %q", captured.RedisSentinelMaster)
+	}
+	if captured.RedisSentinelUser != "sentinel-user" || captured.RedisSentinelPassword != "sentinel-pass" {
+		t.Fatalf("expected Sentinel credentials to be preserved, got user=%q password=%q", captured.RedisSentinelUser, captured.RedisSentinelPassword)
+	}
+	if len(captured.Hosts) != 2 || captured.Hosts[0] != "sentinel-b.local:26379" || captured.Hosts[1] != "sentinel-c.local:26379" {
+		t.Fatalf("expected Sentinel hosts to be preserved, got %#v", captured.Hosts)
+	}
+	if !captured.UseSSL || captured.SSLMode != "required" {
+		t.Fatalf("expected TLS settings to be preserved, got useSSL=%v sslMode=%q", captured.UseSSL, captured.SSLMode)
+	}
+}
+
 func TestIsRedisKeyGone(t *testing.T) {
 	tests := []struct {
 		name    string
diff --git a/internal/ssh/ssh.go b/internal/ssh/ssh.go
index 15feab3..c145e5a 100644
--- a/internal/ssh/ssh.go
+++ b/internal/ssh/ssh.go
@@ -116,6 +116,22 @@ func RegisterSSHNetwork(sshConfig connection.SSHConfig) (string, error) {
 	return netName, nil
 }
 
+// DialContextThroughSSH creates a context-aware connection through an SSH tunnel.
+func DialContextThroughSSH(ctx context.Context, config connection.SSHConfig, network, address string) (net.Conn, error) {
+	client, err := GetOrCreateSSHClient(config)
+	if err != nil {
+		return nil, fmt.Errorf("建立 SSH 连接失败：%w", err)
+	}
+
+	conn, err := dialContext(ctx, client, network, address)
+	if err != nil {
+		return nil, fmt.Errorf("通过 SSH 隧道连接到 %s 失败：%w", address, err)
+	}
+
+	logger.Infof("已通过 SSH 隧道连接到：%s", address)
+	return conn, nil
+}
+
 // sshClientCache stores SSH clients to avoid creating multiple connections
 var (
 	sshClientCache   = make(map[sshClientCacheKey]*ssh.Client)
diff --git a/internal/sync/analyze.go b/internal/sync/analyze.go
index acb9c3a..9e61a2a 100644
--- a/internal/sync/analyze.go
+++ b/internal/sync/analyze.go
@@ -32,6 +32,7 @@ type SyncAnalyzeResult struct {
 }
 
 func (s *SyncEngine) Analyze(config SyncConfig) SyncAnalyzeResult {
+	config = normalizeSyncConnectionDatabases(config)
 	result := SyncAnalyzeResult{Success: true, Tables: []TableDiffSummary{}}
 	if isRedisToMongoKeyspacePair(config) {
 		return s.analyzeRedisToMongo(config)
diff --git a/internal/sync/direct_import_paging.go b/internal/sync/direct_import_paging.go
index 6142c98..e1e03c8 100644
--- a/internal/sync/direct_import_paging.go
+++ b/internal/sync/direct_import_paging.go
@@ -207,7 +207,7 @@ func directImportPaginationPK(sourceType string, sourceCols []connection.ColumnD
 
 func supportsDirectImportPagination(dbType string) bool {
 	switch normalizeMigrationDBType(dbType) {
-	case "mysql", "mariadb", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "sqlserver", "sqlite", "duckdb", "clickhouse", "tdengine", "starrocks", "diros":
+	case "mysql", "mariadb", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver", "sqlite", "duckdb", "clickhouse", "tdengine", "starrocks", "diros":
 		return true
 	default:
 		return false
diff --git a/internal/sync/migration_clickhouse.go b/internal/sync/migration_clickhouse.go
index 1c5f665..a472aea 100644
--- a/internal/sync/migration_clickhouse.go
+++ b/internal/sync/migration_clickhouse.go
@@ -10,8 +10,8 @@ import (
 
 func buildMySQLToClickHousePlan(config SyncConfig, tableName string, sourceDB db.Database, targetDB db.Database) (SchemaMigrationPlan, []connection.ColumnDefinition, []connection.ColumnDefinition, error) {
 	plan := SchemaMigrationPlan{}
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(config.SourceConfig.Type, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(config.TargetConfig.Type, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(config.SourceConfig.Type, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(config.TargetConfig.Type, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(config.SourceConfig.Type, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(config.TargetConfig.Type, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
@@ -70,8 +70,8 @@ func buildPGLikeToClickHousePlan(config SyncConfig, tableName string, sourceDB d
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
@@ -128,8 +128,8 @@ func buildPGLikeToClickHousePlan(config SyncConfig, tableName string, sourceDB d
 
 func buildClickHouseToMySQLPlan(config SyncConfig, tableName string, sourceDB db.Database, targetDB db.Database) (SchemaMigrationPlan, []connection.ColumnDefinition, []connection.ColumnDefinition, error) {
 	plan := SchemaMigrationPlan{}
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(config.SourceConfig.Type, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(config.TargetConfig.Type, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(config.SourceConfig.Type, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(config.TargetConfig.Type, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(config.SourceConfig.Type, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(config.TargetConfig.Type, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
@@ -187,8 +187,8 @@ func buildClickHouseToPGLikePlan(config SyncConfig, tableName string, sourceDB d
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
@@ -247,8 +247,8 @@ func buildClickHouseToClickHousePlan(config SyncConfig, tableName string, source
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
diff --git a/internal/sync/migration_kernel_router.go b/internal/sync/migration_kernel_router.go
index aff5973..250798e 100644
--- a/internal/sync/migration_kernel_router.go
+++ b/internal/sync/migration_kernel_router.go
@@ -119,7 +119,7 @@ func isMySQLLikeType(dbType string) bool {
 
 func classifyMigrationDataModel(dbType string) MigrationDataModel {
 	switch normalizeMigrationDBType(dbType) {
-	case "mysql", "mariadb", "oceanbase", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "oracle", "sqlserver", "dameng", "sqlite", "duckdb":
+	case "mysql", "mariadb", "oceanbase", "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "oracle", "sqlserver", "dameng", "sqlite", "duckdb":
 		return MigrationDataModelRelational
 	case "mongodb":
 		return MigrationDataModelDocument
@@ -434,8 +434,8 @@ func (mongoToRelationalPlanner) BuildPlan(ctx MigrationBuildContext) (SchemaMigr
 		return SchemaMigrationPlan{}, nil, nil, err
 	}
 	plan := SchemaMigrationPlan{}
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, ctx.Config.SourceConfig.Database, ctx.TableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, ctx.Config.TargetConfig.Database, ctx.TableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(ctx.Config), ctx.TableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(ctx.Config), ctx.TableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, ctx.TableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, ctx.TableName)
 	plan.PlannedAction = "当前库对已进入迁移内核规划阶段，等待 schema 推断与目标方言生成器落地"
diff --git a/internal/sync/migration_mongodb.go b/internal/sync/migration_mongodb.go
index 8cb1422..d30411c 100644
--- a/internal/sync/migration_mongodb.go
+++ b/internal/sync/migration_mongodb.go
@@ -30,8 +30,8 @@ func buildTabularToMongoPlan(config SyncConfig, tableName string, sourceDB db.Da
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标集合导入"
@@ -91,8 +91,8 @@ func buildMongoToMongoPlan(config SyncConfig, tableName string, sourceDB db.Data
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标集合导入"
@@ -154,8 +154,8 @@ func buildMongoToMongoPlan(config SyncConfig, tableName string, sourceDB db.Data
 
 func buildMongoToMySQLPlan(config SyncConfig, tableName string, sourceDB db.Database, targetDB db.Database) (SchemaMigrationPlan, []connection.ColumnDefinition, []connection.ColumnDefinition, error) {
 	plan := SchemaMigrationPlan{}
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(config.SourceConfig.Type, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(config.TargetConfig.Type, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(config.SourceConfig.Type, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(config.TargetConfig.Type, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(config.SourceConfig.Type, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(config.TargetConfig.Type, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
@@ -497,8 +497,8 @@ func moveStringToFront(items []string, target string) []string {
 func buildMongoToPGLikePlan(config SyncConfig, tableName string, sourceDB db.Database, targetDB db.Database) (SchemaMigrationPlan, []connection.ColumnDefinition, []connection.ColumnDefinition, error) {
 	plan := SchemaMigrationPlan{}
 	targetType := strings.ToLower(strings.TrimSpace(config.TargetConfig.Type))
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(config.SourceConfig.Type, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(config.TargetConfig.Type, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(config.SourceConfig.Type, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(config.TargetConfig.Type, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(config.SourceConfig.Type, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(config.TargetConfig.Type, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
diff --git a/internal/sync/migration_redis.go b/internal/sync/migration_redis.go
index 84f159f..83fea67 100644
--- a/internal/sync/migration_redis.go
+++ b/internal/sync/migration_redis.go
@@ -73,7 +73,7 @@ func buildRedisToMongoPlan(config SyncConfig, keyName string, targetDB db.Databa
 		SourceSchema:       strconv.Itoa(resolveRedisDBIndex(config.SourceConfig)),
 		SourceTable:        keyName,
 		SourceQueryTable:   keyName,
-		TargetSchema:       strings.TrimSpace(config.TargetConfig.Database),
+		TargetSchema:       strings.TrimSpace(selectedSyncTargetDatabase(config)),
 		TargetTable:        collection,
 		TargetQueryTable:   collection,
 		PlannedAction:      "按 Redis Key 生成 MongoDB 文档导入",
@@ -557,7 +557,7 @@ func listMongoRedisCollections(sourceDB db.Database, config SyncConfig) ([]strin
 	if len(config.Tables) > 0 {
 		return dedupeStrings(config.Tables), nil
 	}
-	tables, err := sourceDB.GetTables(strings.TrimSpace(config.SourceConfig.Database))
+	tables, err := sourceDB.GetTables(strings.TrimSpace(selectedSyncSourceDatabase(config)))
 	if err == nil && len(tables) > 0 {
 		return dedupeStrings(tables), nil
 	}
diff --git a/internal/sync/migration_tdengine.go b/internal/sync/migration_tdengine.go
index 7e45e64..3a6d690 100644
--- a/internal/sync/migration_tdengine.go
+++ b/internal/sync/migration_tdengine.go
@@ -12,8 +12,8 @@ func buildTDengineToMySQLPlan(config SyncConfig, tableName string, sourceDB db.D
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
@@ -67,8 +67,8 @@ func buildTDengineToPGLikePlan(config SyncConfig, tableName string, sourceDB db.
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
diff --git a/internal/sync/migration_tdengine_target.go b/internal/sync/migration_tdengine_target.go
index 50a1839..5ebc9db 100644
--- a/internal/sync/migration_tdengine_target.go
+++ b/internal/sync/migration_tdengine_target.go
@@ -100,8 +100,8 @@ func buildSourceToTDenginePlan(config SyncConfig, tableName string, sourceDB db.
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
diff --git a/internal/sync/migration_type_resolver.go b/internal/sync/migration_type_resolver.go
index 44e9185..3a4cd4a 100644
--- a/internal/sync/migration_type_resolver.go
+++ b/internal/sync/migration_type_resolver.go
@@ -16,6 +16,8 @@ func normalizeMigrationDBType(dbType string) string {
 		return "kingbase"
 	case "opengauss", "open_gauss", "open-gauss":
 		return "opengauss"
+	case "gaussdb", "gauss_db", "gauss-db":
+		return "gaussdb"
 	case "dm", "dm8":
 		return "dameng"
 	case "sqlite3":
@@ -37,6 +39,8 @@ func resolveMigrationDBType(config connection.ConnectionConfig) string {
 		return "postgres"
 	case "opengauss", "open_gauss", "open-gauss":
 		return "opengauss"
+	case "gaussdb", "gauss_db", "gauss-db":
+		return "gaussdb"
 	case "dm", "dameng", "dm8":
 		return "dameng"
 	case "sqlite3", "sqlite":
@@ -64,6 +68,8 @@ func resolveMigrationDBType(config connection.ConnectionConfig) string {
 	switch {
 	case strings.Contains(driver, "opengauss"), strings.Contains(driver, "open_gauss"), strings.Contains(driver, "open-gauss"):
 		return "opengauss"
+	case strings.Contains(driver, "gaussdb"), strings.Contains(driver, "gauss_db"), strings.Contains(driver, "gauss-db"):
+		return "gaussdb"
 	case strings.Contains(driver, "postgres"):
 		return "postgres"
 	case strings.Contains(driver, "kingbase"):
diff --git a/internal/sync/preview.go b/internal/sync/preview.go
index 7d4a432..366bbd3 100644
--- a/internal/sync/preview.go
+++ b/internal/sync/preview.go
@@ -34,6 +34,7 @@ type TableDiffPreview struct {
 }
 
 func (s *SyncEngine) Preview(config SyncConfig, tableName string, limit int) (TableDiffPreview, error) {
+	config = normalizeSyncConnectionDatabases(config)
 	if limit <= 0 {
 		limit = 200
 	}
diff --git a/internal/sync/schema_migration.go b/internal/sync/schema_migration.go
index 9cde70f..e0b3b72 100644
--- a/internal/sync/schema_migration.go
+++ b/internal/sync/schema_migration.go
@@ -98,13 +98,15 @@ func buildSchemaMigrationPlanLegacy(config SyncConfig, tableName string, sourceD
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
 	if targetType == "tdengine" {
 		plan.Warnings = append(plan.Warnings, "TDengine 目标端当前仅支持 INSERT 写入；若存在差异更新/删除，执行期会被拒绝，请优先使用仅插入或全量覆盖模式")
+	} else if targetType == "iotdb" {
+		plan.Warnings = append(plan.Warnings, "IoTDB 目标端当前仅支持 INSERT 写入；若存在差异更新/删除，执行期会被拒绝，请优先使用仅插入模式")
 	}
 
 	sourceCols, sourceExists, err := inspectTableColumns(sourceDB, plan.SourceSchema, plan.SourceTable)
@@ -573,7 +575,7 @@ func intFromAny(v interface{}) int {
 
 func isPGLikeSource(dbType string) bool {
 	switch normalizeMigrationDBType(dbType) {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "duckdb":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "duckdb":
 		return true
 	default:
 		return false
@@ -582,7 +584,7 @@ func isPGLikeSource(dbType string) bool {
 
 func isPGLikeSameFamilyDDLType(dbType string) bool {
 	switch normalizeMigrationDBType(dbType) {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
 		return true
 	default:
 		return false
@@ -593,8 +595,8 @@ func buildMySQLToMySQLPlan(config SyncConfig, tableName string, sourceDB db.Data
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
@@ -832,8 +834,8 @@ func buildPGLikeToPGLikePlan(config SyncConfig, tableName string, sourceDB db.Da
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
@@ -1078,8 +1080,8 @@ func buildPGLikeToMySQLPlan(config SyncConfig, tableName string, sourceDB db.Dat
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
@@ -1358,7 +1360,7 @@ func mapPGLikeDefaultToMySQL(col connection.ColumnDefinition, targetType string)
 
 func isPGLikeTarget(dbType string) bool {
 	switch normalizeMigrationDBType(dbType) {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "duckdb":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "duckdb":
 		return true
 	default:
 		return false
@@ -1369,8 +1371,8 @@ func buildMySQLToPGLikePlan(config SyncConfig, tableName string, sourceDB db.Dat
 	plan := SchemaMigrationPlan{}
 	sourceType := resolveMigrationDBType(config.SourceConfig)
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	plan.SourceSchema, plan.SourceTable = normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	plan.TargetSchema, plan.TargetTable = normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	plan.SourceQueryTable = qualifiedNameForQuery(sourceType, plan.SourceSchema, plan.SourceTable, tableName)
 	plan.TargetQueryTable = qualifiedNameForQuery(targetType, plan.TargetSchema, plan.TargetTable, tableName)
 	plan.PlannedAction = "使用已有目标表导入"
diff --git a/internal/sync/schema_migration_test.go b/internal/sync/schema_migration_test.go
index 1539fce..e17141a 100644
--- a/internal/sync/schema_migration_test.go
+++ b/internal/sync/schema_migration_test.go
@@ -920,6 +920,41 @@ func TestBuildSchemaMigrationPlan_TDengineTargetWarnsInsertOnlyBoundary(t *testi
 	}
 }
 
+func TestBuildSchemaMigrationPlan_IoTDBTargetWarnsInsertOnlyBoundary(t *testing.T) {
+	t.Parallel()
+
+	sourceDB := &fakeMigrationDB{
+		columns: map[string][]connection.ColumnDefinition{
+			"shop.metrics": {
+				{Name: "Time", Type: "timestamp", Nullable: "NO", Key: "PRI"},
+				{Name: "value", Type: "double", Nullable: "YES"},
+			},
+		},
+	}
+	targetDB := &fakeMigrationDB{
+		columns: map[string][]connection.ColumnDefinition{
+			"root.sg.metrics": {
+				{Name: "Time", Type: "timestamp", Nullable: "NO", Key: "PRI"},
+				{Name: "value", Type: "double", Nullable: "YES"},
+			},
+		},
+	}
+	cfg := SyncConfig{
+		SourceConfig: connection.ConnectionConfig{Type: "mysql", Database: "shop"},
+		TargetConfig: connection.ConnectionConfig{Type: "iotdb", Database: "root.sg"},
+		Mode:         "insert_update",
+	}
+
+	plan, _, _, err := buildSchemaMigrationPlan(cfg, "metrics", sourceDB, targetDB)
+	if err != nil {
+		t.Fatalf("buildSchemaMigrationPlan returned error: %v", err)
+	}
+	warnings := strings.Join(plan.Warnings, " ")
+	if !strings.Contains(warnings, "仅支持 INSERT 写入") {
+		t.Fatalf("expected IoTDB target warning, got: %v", plan.Warnings)
+	}
+}
+
 func TestBuildMySQLLikeToTDenginePlan_AutoCreateWhenTargetMissing(t *testing.T) {
 	t.Parallel()
 
diff --git a/internal/sync/schema_sync.go b/internal/sync/schema_sync.go
index f93abad..a964d51 100644
--- a/internal/sync/schema_sync.go
+++ b/internal/sync/schema_sync.go
@@ -14,8 +14,8 @@ func (s *SyncEngine) syncTableSchema(config SyncConfig, res *SyncResult, sourceD
 	}
 
 	sourceType := resolveMigrationDBType(config.SourceConfig)
-	sourceSchema, sourceTable := normalizeSchemaAndTable(sourceType, config.SourceConfig.Database, tableName)
-	targetSchema, targetTable := normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	sourceSchema, sourceTable := normalizeSchemaAndTable(sourceType, selectedSyncSourceDatabase(config), tableName)
+	targetSchema, targetTable := normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	targetQueryTable := qualifiedNameForQuery(targetType, targetSchema, targetTable, tableName)
 
 	// 1) 获取源表字段
diff --git a/internal/sync/source_query_sync.go b/internal/sync/source_query_sync.go
index 4b36cc1..2b14655 100644
--- a/internal/sync/source_query_sync.go
+++ b/internal/sync/source_query_sync.go
@@ -47,7 +47,7 @@ func validateSourceQuerySyncConfig(config SyncConfig) (string, error) {
 
 func resolveTargetQueryTable(config SyncConfig, tableName string) (string, string, string, string) {
 	targetType := resolveMigrationDBType(config.TargetConfig)
-	targetSchema, targetTable := normalizeSchemaAndTable(targetType, config.TargetConfig.Database, tableName)
+	targetSchema, targetTable := normalizeSchemaAndTable(targetType, selectedSyncTargetDatabase(config), tableName)
 	targetQueryTable := qualifiedNameForQuery(targetType, targetSchema, targetTable, tableName)
 	return targetType, targetSchema, targetTable, targetQueryTable
 }
@@ -505,7 +505,7 @@ func (s *SyncEngine) runSourceQuerySync(config SyncConfig) SyncResult {
 	deletes := make([]map[string]interface{}, 0)
 	applyTableName := ctx.TargetTable
 	switch ctx.TargetType {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "sqlserver":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver":
 		applyTableName = ctx.TargetQueryTable
 	}
 
diff --git a/internal/sync/sql_helpers.go b/internal/sync/sql_helpers.go
index 5d5716e..aae8971 100644
--- a/internal/sync/sql_helpers.go
+++ b/internal/sync/sql_helpers.go
@@ -3,9 +3,73 @@ package sync
 import (
 	"strings"
 
+	"GoNavi-Wails/internal/connection"
 	"GoNavi-Wails/internal/db"
 )
 
+func selectedSyncDatabase(selected string, fallback string) string {
+	if value := strings.TrimSpace(selected); value != "" {
+		return value
+	}
+	return strings.TrimSpace(fallback)
+}
+
+func selectedSyncSourceDatabase(config SyncConfig) string {
+	return selectedSyncDatabase(config.SourceDatabase, config.SourceConfig.Database)
+}
+
+func selectedSyncTargetDatabase(config SyncConfig) string {
+	return selectedSyncDatabase(config.TargetDatabase, config.TargetConfig.Database)
+}
+
+func normalizeSyncConnectionDatabases(config SyncConfig) SyncConfig {
+	config.SourceConfig = normalizeSyncConnectionDatabase(config.SourceConfig, config.SourceDatabase)
+	config.TargetConfig = normalizeSyncConnectionDatabase(config.TargetConfig, config.TargetDatabase)
+	return config
+}
+
+func normalizeSyncConnectionDatabase(config connection.ConnectionConfig, selectedDatabase string) connection.ConnectionConfig {
+	selected := strings.TrimSpace(selectedDatabase)
+	if selected == "" {
+		return config
+	}
+	switch resolveMigrationDBType(config) {
+	case "oracle":
+		// Oracle 的 ConnectionConfig.Database 是 Service Name，数据同步选择的是 schema/owner。
+		return config
+	case "oceanbase":
+		if isOceanBaseOracleSyncConnection(config) {
+			return config
+		}
+	default:
+		config.Database = selected
+		return config
+	}
+	config.Database = selected
+	return config
+}
+
+func isOceanBaseOracleSyncConnection(config connection.ConnectionConfig) bool {
+	if !strings.EqualFold(strings.TrimSpace(config.Type), "oceanbase") {
+		return false
+	}
+	if strings.EqualFold(strings.TrimSpace(config.OceanBaseProtocol), "oracle") {
+		return true
+	}
+	for _, part := range strings.FieldsFunc(config.ConnectionParams, func(r rune) bool { return r == '&' || r == ';' }) {
+		key, value, ok := strings.Cut(part, "=")
+		if !ok {
+			continue
+		}
+		normalizedKey := strings.ToLower(strings.TrimSpace(key))
+		normalizedValue := strings.ToLower(strings.TrimSpace(value))
+		if (normalizedKey == "protocol" || normalizedKey == "tenantmode") && normalizedValue == "oracle" {
+			return true
+		}
+	}
+	return false
+}
+
 func normalizeSyncMode(mode string) string {
 	m := strings.ToLower(strings.TrimSpace(mode))
 	switch m {
@@ -103,7 +167,7 @@ func normalizeSchemaAndTable(dbType string, dbName string, tableName string) (st
 	}
 
 	switch normalizedType {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
 		return "public", rawTable
 	case "duckdb":
 		return "main", rawTable
@@ -122,7 +186,7 @@ func qualifiedNameForQuery(dbType string, schema string, table string, original
 	}
 
 	switch normalizeMigrationDBType(dbType) {
-	case "postgres", "kingbase", "highgo", "vastbase", "opengauss":
+	case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb":
 		s := strings.TrimSpace(schema)
 		if s == "" {
 			s = "public"
diff --git a/internal/sync/sql_helpers_test.go b/internal/sync/sql_helpers_test.go
index bd7c0aa..82d7245 100644
--- a/internal/sync/sql_helpers_test.go
+++ b/internal/sync/sql_helpers_test.go
@@ -52,6 +52,49 @@ func TestNormalizeSchemaAndTable_KingbaseNormalizesEscapedQualifiedName(t *testi
 	}
 }
 
+func TestNormalizeSyncConnectionDatabasesKeepsOracleServiceName(t *testing.T) {
+	t.Parallel()
+
+	config := SyncConfig{
+		SourceConfig:   connection.ConnectionConfig{Type: "oracle", Database: "ORCLPDB1"},
+		SourceDatabase: "APP_SCHEMA",
+		TargetConfig:   connection.ConnectionConfig{Type: "mysql", Database: "old_target"},
+		TargetDatabase: "warehouse",
+	}
+
+	got := normalizeSyncConnectionDatabases(config)
+	if got.SourceConfig.Database != "ORCLPDB1" {
+		t.Fatalf("Oracle 连接 Service Name 不应被 schema 覆盖，got=%q", got.SourceConfig.Database)
+	}
+	if selectedSyncSourceDatabase(got) != "APP_SCHEMA" {
+		t.Fatalf("Oracle 选中 schema 应保留在 SourceDatabase，got=%q", selectedSyncSourceDatabase(got))
+	}
+	if got.TargetConfig.Database != "warehouse" {
+		t.Fatalf("非 Oracle 目标库应继续写入连接 Database，got=%q", got.TargetConfig.Database)
+	}
+}
+
+func TestNormalizeSyncConnectionDatabasesKeepsOceanBaseOracleServiceName(t *testing.T) {
+	t.Parallel()
+
+	config := SyncConfig{
+		SourceConfig: connection.ConnectionConfig{
+			Type:             "oceanbase",
+			Database:         "ORCL",
+			ConnectionParams: "protocol=oracle",
+		},
+		SourceDatabase: "APP_SCHEMA",
+	}
+
+	got := normalizeSyncConnectionDatabases(config)
+	if got.SourceConfig.Database != "ORCL" {
+		t.Fatalf("OceanBase Oracle 服务名不应被 schema 覆盖，got=%q", got.SourceConfig.Database)
+	}
+	if selectedSyncSourceDatabase(got) != "APP_SCHEMA" {
+		t.Fatalf("OceanBase Oracle 选中 schema 应保留在 SourceDatabase，got=%q", selectedSyncSourceDatabase(got))
+	}
+}
+
 func TestNormalizeMigrationDBType_KingbaseAliases(t *testing.T) {
 	t.Parallel()
 
diff --git a/internal/sync/sync_engine.go b/internal/sync/sync_engine.go
index ff8795f..8ba6abf 100644
--- a/internal/sync/sync_engine.go
+++ b/internal/sync/sync_engine.go
@@ -17,6 +17,8 @@ const defaultSyncApplyBatchSize = 1000
 type SyncConfig struct {
 	SourceConfig        connection.ConnectionConfig `json:"sourceConfig"`
 	TargetConfig        connection.ConnectionConfig `json:"targetConfig"`
+	SourceDatabase      string                      `json:"sourceDatabase,omitempty"`
+	TargetDatabase      string                      `json:"targetDatabase,omitempty"`
 	Tables              []string                    `json:"tables"`
 	SourceQuery         string                      `json:"sourceQuery,omitempty"`
 	Content             string                      `json:"content,omitempty"` // "data", "schema", "both"
@@ -50,6 +52,7 @@ func NewSyncEngine(reporter Reporter) *SyncEngine {
 
 // CompareAndSync performs the synchronization
 func (s *SyncEngine) RunSync(config SyncConfig) SyncResult {
+	config = normalizeSyncConnectionDatabases(config)
 	result := SyncResult{Success: true, Logs: []string{}}
 	logger.Infof("开始数据同步：源=%s 目标=%s 表数量=%d", formatConnSummaryForSync(config.SourceConfig), formatConnSummaryForSync(config.TargetConfig), len(config.Tables))
 	if isRedisToMongoKeyspacePair(config) {
@@ -211,7 +214,7 @@ func (s *SyncEngine) RunSync(config SyncConfig) SyncResult {
 			sourceQueryTable, targetQueryTable := plan.SourceQueryTable, plan.TargetQueryTable
 			applyTableName := targetTable
 			switch targetType {
-			case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "sqlserver":
+			case "postgres", "kingbase", "highgo", "vastbase", "opengauss", "gaussdb", "sqlserver":
 				applyTableName = targetQueryTable
 			}
 
diff --git a/main.go b/main.go
index 0168f65..8daf28f 100644
--- a/main.go
+++ b/main.go
@@ -2,12 +2,14 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"strings"
 
 	aiservice "GoNavi-Wails/internal/ai/service"
 	"GoNavi-Wails/internal/app"
 	"GoNavi-Wails/internal/logger"
+	"GoNavi-Wails/internal/mcpserver"
 
 	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
@@ -17,6 +19,10 @@ import (
 )
 
 func main() {
+	if runSpecialMode(os.Args[1:]) {
+		return
+	}
+
 	// Create an instance of the app structure
 	application := app.NewApp()
 	aiService := aiservice.NewService()
@@ -44,7 +50,10 @@ func main() {
 			app.InitializeLifecycle(application, ctx)
 			aiservice.InitializeLifecycle(aiService, ctx)
 		},
-		OnShutdown: application.Shutdown,
+		OnShutdown: func(ctx context.Context) {
+			aiService.Shutdown()
+			application.Shutdown()
+		},
 		Bind: []interface{}{
 			application,
 			aiService,
@@ -68,6 +77,53 @@ func main() {
 	}
 }
 
+func runSpecialMode(args []string) bool {
+	if !shouldRunMCPServerMode(args) {
+		return false
+	}
+
+	if err := runMCPServerMode(context.Background(), args[1:]); err != nil {
+		logger.Error(err, "GoNavi MCP Server 退出")
+	}
+	return true
+}
+
+func runMCPServerMode(ctx context.Context, args []string) error {
+	if len(args) == 0 {
+		return mcpserver.RunAppStdioServer(ctx)
+	}
+
+	mode := strings.ToLower(strings.TrimSpace(args[0]))
+	switch mode {
+	case "stdio", "--stdio":
+		return mcpserver.RunAppStdioServer(ctx)
+	case "http", "--http", "streamable-http", "--streamable-http":
+		options, err := mcpserver.ParseHTTPServerOptions(args[1:])
+		if err != nil {
+			return err
+		}
+		logger.Infof("GoNavi MCP Streamable HTTP Server 启动：addr=%s path=%s schemaOnly=%v", options.Addr, options.Path, options.SchemaOnly)
+		return mcpserver.RunAppStreamableHTTPServer(ctx, options)
+	case "remote-config", "--remote-config":
+		return mcpserver.WriteRemoteMCPClientConfig(os.Stdout, args[1:])
+	default:
+		return fmt.Errorf("未知 MCP server 模式: %s（支持 stdio/http/remote-config）", args[0])
+	}
+}
+
+func shouldRunMCPServerMode(args []string) bool {
+	if len(args) == 0 {
+		return false
+	}
+
+	switch strings.ToLower(strings.TrimSpace(args[0])) {
+	case "mcp-server", "--mcp-server":
+		return true
+	default:
+		return false
+	}
+}
+
 func isLowMemoryMode() bool {
 	switch strings.ToLower(strings.TrimSpace(os.Getenv("GONAVI_LOW_MEMORY_MODE"))) {
 	case "1", "true", "yes", "on":
diff --git a/main_test.go b/main_test.go
index 592d723..4b1d8f3 100644
--- a/main_test.go
+++ b/main_test.go
@@ -24,3 +24,26 @@ func TestIsLowMemoryMode(t *testing.T) {
 		})
 	}
 }
+
+func TestShouldRunMCPServerMode(t *testing.T) {
+	cases := []struct {
+		name string
+		args []string
+		want bool
+	}{
+		{name: "empty", args: nil, want: false},
+		{name: "mcp-server", args: []string{"mcp-server"}, want: true},
+		{name: "flag style", args: []string{"--mcp-server"}, want: true},
+		{name: "mcp-server http mode", args: []string{"mcp-server", "http"}, want: true},
+		{name: "mcp-server remote config", args: []string{"mcp-server", "remote-config"}, want: true},
+		{name: "unknown", args: []string{"serve"}, want: false},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := shouldRunMCPServerMode(tc.args); got != tc.want {
+				t.Fatalf("shouldRunMCPServerMode(%v) = %v, want %v", tc.args, got, tc.want)
+			}
+		})
+	}
+}
diff --git a/optional-driver-agent b/optional-driver-agent
index 66f4431..6d23670 100755
Binary files a/optional-driver-agent and b/optional-driver-agent differ
diff --git a/tools/claude-gonavi-mcp.cmd b/tools/claude-gonavi-mcp.cmd
new file mode 100644
index 0000000..0f67343
--- /dev/null
+++ b/tools/claude-gonavi-mcp.cmd
@@ -0,0 +1,2 @@
+@echo off
+powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0claude-gonavi-mcp.ps1" %*
diff --git a/tools/claude-gonavi-mcp.ps1 b/tools/claude-gonavi-mcp.ps1
new file mode 100644
index 0000000..9f54843
--- /dev/null
+++ b/tools/claude-gonavi-mcp.ps1
@@ -0,0 +1,44 @@
+param(
+    [switch]$SkipBuild
+)
+
+$ErrorActionPreference = 'Stop'
+$ClaudeArgs = $args
+
+$repoRoot = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
+$binDir = Join-Path $repoRoot 'bin'
+$serverExe = Join-Path $binDir 'gonavi-mcp-server.exe'
+
+if (-not $SkipBuild) {
+    if (-not (Test-Path $binDir)) {
+        New-Item -ItemType Directory -Path $binDir | Out-Null
+    }
+
+    & go build -o $serverExe .\cmd\gonavi-mcp-server
+    if ($LASTEXITCODE -ne 0) {
+        throw "构建 gonavi-mcp-server 失败"
+    }
+} elseif (-not (Test-Path $serverExe)) {
+    throw "未找到已编译的 gonavi-mcp-server.exe，请去掉 -SkipBuild 或先手动构建"
+}
+
+$mcpConfig = @{
+    mcpServers = @{
+        gonavi = @{
+            type = 'stdio'
+            command = $serverExe
+            args = @()
+            env = @{}
+        }
+    }
+} | ConvertTo-Json -Compress -Depth 6
+
+$tempConfig = Join-Path ([System.IO.Path]::GetTempPath()) ("gonavi-claude-mcp-" + [System.Guid]::NewGuid().ToString("N") + ".json")
+
+try {
+    Set-Content -LiteralPath $tempConfig -Value $mcpConfig -Encoding UTF8
+    & claude @ClaudeArgs --mcp-config $tempConfig --strict-mcp-config
+    exit $LASTEXITCODE
+} finally {
+    Remove-Item -LiteralPath $tempConfig -ErrorAction SilentlyContinue
+}
diff --git a/tools/complete-driver-release-assets.py b/tools/complete-driver-release-assets.py
index 4c26a72..da945dd 100644
--- a/tools/complete-driver-release-assets.py
+++ b/tools/complete-driver-release-assets.py
@@ -27,9 +27,13 @@ DRIVERS = [
     "highgo",
     "vastbase",
     "opengauss",
+    "gaussdb",
+    "iris",
     "mongodb",
     "tdengine",
+    "iotdb",
     "clickhouse",
+    "elasticsearch",
 ]
 
 BUNDLE_NAME = "GoNavi-DriverAgents.zip"
diff --git a/tools/compress-driver-artifact.sh b/tools/compress-driver-artifact.sh
index bbf2ee7..bb937a6 100755
--- a/tools/compress-driver-artifact.sh
+++ b/tools/compress-driver-artifact.sh
@@ -59,7 +59,11 @@ goos="${platform%%/*}"
 goarch="${platform##*/}"
 
 case "$goos/$goarch" in
-  linux/amd64|linux/arm64|windows/amd64)
+  windows/amd64)
+    echo "ℹ️  Windows amd64 驱动产物不执行 UPX 压缩：$label"
+    exit 0
+    ;;
+  linux/amd64|linux/arm64)
     ;;
   *)
     echo "ℹ️  UPX 跳过不支持的平台：$label ($platform)"
@@ -67,6 +71,56 @@ case "$goos/$goarch" in
     ;;
 esac
 
+host_platform="$(go env GOOS)/$(go env GOARCH)"
+
+is_driver_agent_binary() {
+  local artifact_name
+  artifact_name="$(basename "$artifact_path")"
+  [[ "$artifact_name" == *"-driver-agent-"* ]]
+}
+
+can_smoke_test_driver_agent() {
+  is_driver_agent_binary && [[ "$host_platform" == "$platform" ]]
+}
+
+smoke_test_driver_agent_metadata() {
+  local stdout_file stderr_file
+  stdout_file="$(mktemp "${TMPDIR:-/tmp}/gonavi-driver-agent-stdout.XXXXXX")"
+  stderr_file="$(mktemp "${TMPDIR:-/tmp}/gonavi-driver-agent-stderr.XXXXXX")"
+
+  if ! printf '%s\n' '{"id":1,"method":"metadata"}' | "$artifact_path" >"$stdout_file" 2>"$stderr_file"; then
+    [[ -s "$stderr_file" ]] && cat "$stderr_file" >&2
+    rm -f "$stdout_file" "$stderr_file"
+    return 1
+  fi
+
+  if ! python3 - "$stdout_file" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+lines = [line.strip() for line in Path(sys.argv[1]).read_text(encoding="utf-8", errors="replace").splitlines() if line.strip()]
+if not lines:
+    raise SystemExit(1)
+
+payload = json.loads(lines[0])
+if not payload.get("success"):
+    raise SystemExit(1)
+
+data = payload.get("data") or {}
+if not str(data.get("agentRevision") or "").strip():
+    raise SystemExit(1)
+PY
+  then
+    [[ -s "$stderr_file" ]] && cat "$stderr_file" >&2
+    rm -f "$stdout_file" "$stderr_file"
+    return 1
+  fi
+
+  rm -f "$stdout_file" "$stderr_file"
+  return 0
+}
+
 if ! command -v upx >/dev/null 2>&1; then
   if [[ "$mode" == "required" ]]; then
     echo "❌ 未找到 upx，无法压缩：$label" >&2
@@ -124,6 +178,18 @@ if ! upx -t "$artifact_path" >/dev/null 2>&1; then
   exit 0
 fi
 
+if can_smoke_test_driver_agent; then
+  if ! smoke_test_driver_agent_metadata; then
+    cp "$backup_path" "$artifact_path"
+    if [[ "$mode" == "required" ]]; then
+      echo "❌ UPX 压缩后 driver-agent metadata 自检失败：$label" >&2
+      exit 1
+    fi
+    echo "⚠️  UPX 压缩后 driver-agent metadata 自检失败，已恢复原文件：$label"
+    exit 0
+  fi
+fi
+
 after_bytes="$(file_size_bytes "$artifact_path")"
 if [[ "$after_bytes" -lt "$before_bytes" ]]; then
   saved_bytes=$((before_bytes - after_bytes))
diff --git a/tools/compress-driver-artifact.test.sh b/tools/compress-driver-artifact.test.sh
new file mode 100755
index 0000000..11065cc
--- /dev/null
+++ b/tools/compress-driver-artifact.test.sh
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+tmpdir="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-compress-driver-artifact.XXXXXX")"
+cleanup() {
+  rm -rf "$tmpdir"
+}
+trap cleanup EXIT
+
+windows_amd64_bin="$tmpdir/windows-driver-agent-windows-amd64.exe"
+printf 'fake windows amd64 driver' >"$windows_amd64_bin"
+windows_amd64_before="$(cat "$windows_amd64_bin")"
+windows_skip_output="$(bash "$repo_root/tools/compress-driver-artifact.sh" "$windows_amd64_bin" "windows/amd64" "windows-amd64-driver" 2>&1)"
+if [[ "$windows_skip_output" != *"Windows amd64 驱动产物不执行 UPX 压缩"* ]]; then
+  echo "expected Windows amd64 driver artifact UPX compression to be skipped" >&2
+  echo "$windows_skip_output" >&2
+  exit 1
+fi
+if [[ "$(cat "$windows_amd64_bin")" != "$windows_amd64_before" ]]; then
+  echo "expected Windows amd64 driver artifact to remain unchanged when UPX is skipped" >&2
+  exit 1
+fi
+
+host_platform="$(go env GOOS)/$(go env GOARCH)"
+case "$host_platform" in
+  linux/amd64|linux/arm64)
+    ;;
+  *)
+    echo "skip compress-driver-artifact smoke test on unsupported host platform: $host_platform"
+    exit 0
+    ;;
+esac
+
+suffix=""
+if [[ "$host_platform" == windows/* ]]; then
+  suffix=".exe"
+fi
+
+good_src="$tmpdir/good.go"
+bad_src="$tmpdir/bad.go"
+good_bin="$tmpdir/good-driver-agent-${host_platform/\//-}${suffix}"
+bad_bin="$tmpdir/bad-driver-agent-${host_platform/\//-}${suffix}"
+recover_bin="$tmpdir/recover-driver-agent-${host_platform/\//-}${suffix}"
+fakebin="$tmpdir/bin"
+mkdir -p "$fakebin"
+
+cat >"$good_src" <<'GOEOF'
+package main
+
+import (
+  "bufio"
+  "fmt"
+  "os"
+  "strings"
+)
+
+func main() {
+  scanner := bufio.NewScanner(os.Stdin)
+  for scanner.Scan() {
+    if strings.TrimSpace(scanner.Text()) == "" {
+      continue
+    }
+    fmt.Println(`{"id":1,"success":true,"data":{"agentRevision":"src-test"}}`)
+    return
+  }
+}
+GOEOF
+
+cat >"$bad_src" <<'GOEOF'
+package main
+
+func main() {}
+GOEOF
+
+go build -o "$good_bin" "$good_src"
+go build -o "$bad_bin" "$bad_src"
+cp "$good_bin" "$recover_bin"
+
+cat >"$fakebin/upx" <<'SHEOF'
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [[ "${1:-}" == "-t" ]]; then
+  exit 0
+fi
+
+target="${*: -1}"
+if [[ -n "${FAKE_UPX_REPLACE:-}" && "$target" == *"recover-driver-agent-"* ]]; then
+  cp "$FAKE_UPX_REPLACE" "$target"
+fi
+SHEOF
+chmod +x "$fakebin/upx"
+
+PATH="$fakebin:$PATH" bash "$repo_root/tools/compress-driver-artifact.sh" "$good_bin" "$host_platform" "good"
+metadata_output="$(printf '%s\n' '{"id":1,"method":"metadata"}' | "$good_bin")"
+if [[ "$metadata_output" != *'"agentRevision":"src-test"'* ]]; then
+  echo "expected metadata smoke test to keep good driver-agent executable" >&2
+  exit 1
+fi
+
+warning_output="$(
+  FAKE_UPX_REPLACE="$bad_bin" PATH="$fakebin:$PATH" bash "$repo_root/tools/compress-driver-artifact.sh" "$recover_bin" "$host_platform" "recover" 2>&1
+)"
+if [[ "$warning_output" != *"metadata 自检失败"* ]]; then
+  echo "expected metadata smoke-test warning when fake UPX replacement breaks the executable" >&2
+  echo "$warning_output" >&2
+  exit 1
+fi
+
+recovered_output="$(printf '%s\n' '{"id":1,"method":"metadata"}' | "$recover_bin")"
+if [[ "$recovered_output" != *'"agentRevision":"src-test"'* ]]; then
+  echo "expected metadata smoke-test failure to restore original driver-agent binary" >&2
+  exit 1
+fi
+
+echo "compress-driver-artifact smoke test passed"
diff --git a/tools/detect-changed-driver-agents.sh b/tools/detect-changed-driver-agents.sh
index 5699358..119411b 100644
--- a/tools/detect-changed-driver-agents.sh
+++ b/tools/detect-changed-driver-agents.sh
@@ -7,7 +7,7 @@ cd "$SCRIPT_DIR"
 SCRIPT_DIR_WINDOWS="$(pwd -W 2>/dev/null || true)"
 SCRIPT_DIR_WINDOWS="${SCRIPT_DIR_WINDOWS//\\//}"
 
-DEFAULT_DRIVERS=(mariadb oceanbase doris starrocks sphinx sqlserver sqlite duckdb dameng kingbase highgo vastbase opengauss iris mongodb tdengine clickhouse)
+DEFAULT_DRIVERS=(mariadb oceanbase doris starrocks sphinx sqlserver sqlite duckdb dameng kingbase highgo vastbase opengauss gaussdb iris mongodb tdengine iotdb clickhouse elasticsearch)
 TARGET_PLATFORMS=(darwin/amd64 darwin/arm64 windows/amd64 windows/arm64 linux/amd64)
 
 usage() {
@@ -21,6 +21,8 @@ usage() {
 说明：
   通过 go list -deps 计算每个 driver-agent 的真实源码依赖，再与 git diff 文件求交集。
   如果无法解析基准或依赖分析失败，会保守输出全部 driver。
+  如果 driver 构建 / 发布工作流本身发生变化，也会保守输出全部 driver，
+  避免新应用 revision 与旧 driver-assets 再次错配。
 EOF
 }
 
@@ -50,7 +52,9 @@ normalize_driver() {
   case "$value" in
     doris|diros) echo "doris" ;;
     open_gauss|open-gauss) echo "opengauss" ;;
-    mariadb|oceanbase|starrocks|sphinx|sqlserver|sqlite|duckdb|dameng|kingbase|highgo|vastbase|opengauss|iris|mongodb|tdengine|clickhouse)
+    gaussdb|gauss_db|gauss-db) echo "gaussdb" ;;
+    elastic|elasticsearch) echo "elasticsearch" ;;
+    mariadb|oceanbase|starrocks|sphinx|sqlserver|sqlite|duckdb|dameng|kingbase|highgo|vastbase|opengauss|gaussdb|iris|mongodb|tdengine|iotdb|clickhouse)
       echo "$value"
       ;;
     *)
@@ -154,10 +158,13 @@ driver_tokens_from_text() {
   case "$text" in *highgo*) emit_driver_token highgo ;; esac
   case "$text" in *vastbase*) emit_driver_token vastbase ;; esac
   case "$text" in *opengauss*) emit_driver_token opengauss ;; esac
+  case "$text" in *gaussdb*|*gauss_db*|*gauss-db*) emit_driver_token gaussdb ;; esac
   case "$text" in *iris*) emit_driver_token iris ;; esac
   case "$text" in *mongodb*) emit_driver_token mongodb ;; esac
   case "$text" in *tdengine*) emit_driver_token tdengine ;; esac
+  case "$text" in *iotdb*|*apache-iotdb*|*apache_iotdb*) emit_driver_token iotdb ;; esac
   case "$text" in *clickhouse*) emit_driver_token clickhouse ;; esac
+  case "$text" in *elasticsearch*) emit_driver_token elasticsearch ;; esac
 
   case "$text" in
     *github.com/go-sql-driver/mysql*)
@@ -180,10 +187,13 @@ driver_tokens_from_text() {
       emit_driver_token opengauss
       ;;
   esac
+  case "$text" in *github.com/!huawei!cloud!developer/gaussdb-go*|*github.com/HuaweiCloudDeveloper/gaussdb-go*) emit_driver_token gaussdb ;; esac
   case "$text" in *github.com/caretdev/go-irisnative*|*third_party/go-irisnative*) emit_driver_token iris ;; esac
   case "$text" in *go.mongodb.org/mongo-driver*|*go.mongodb.org/mongo-driver/v2*) emit_driver_token mongodb ;; esac
   case "$text" in *github.com/taosdata/driver-go/v3*) emit_driver_token tdengine ;; esac
+  case "$text" in *github.com/apache/iotdb-client-go*) emit_driver_token iotdb ;; esac
   case "$text" in *github.com/clickhouse/clickhouse-go/v2*|*github.com/clickhouse/ch-go*) emit_driver_token clickhouse ;; esac
+  case "$text" in *github.com/elastic/go-elasticsearch/v8*) emit_driver_token elasticsearch ;; esac
 }
 
 emit_driver_token() {
@@ -317,9 +327,31 @@ add_all_forced_drivers() {
   done
 }
 
+revision_file_changed_drivers() {
+  local line driver emitted_seen
+  emitted_seen="|"
+  while IFS= read -r line; do
+    case "$line" in
+      +++*|---*|@@*)
+        continue
+        ;;
+      +*|-*)
+        if [[ "$line" =~ \"([^\"]+)\"[[:space:]]*:[[:space:]]*\"src-[^\"]+\" ]]; then
+          driver="$(normalize_driver "${BASH_REMATCH[1]}")" || continue
+          if [[ "$emitted_seen" == *"|$driver|"* ]]; then
+            continue
+          fi
+          printf '%s\n' "$driver"
+          emitted_seen="${emitted_seen}${driver}|"
+        fi
+        ;;
+    esac
+  done < <(git diff --unified=0 "$base_commit" "$head_commit" -- internal/db/driver_agent_revisions_gen.go)
+}
+
 is_ignored_driver_agent_source_file() {
   case "$1" in
-    *_test.go|frontend/*|internal/app/*|internal/db/driver_agent_revisions_gen.go)
+    *_test.go|frontend/*|internal/app/*|internal/appdata/*|internal/connection/*|internal/logger/*)
       return 0
       ;;
   esac
@@ -462,10 +494,35 @@ if [[ ${#changed_file_set[@]} -eq 0 ]]; then
   exit 0
 fi
 
+has_revision_file_change=false
+only_workflow_changes=true
+for file in "${!changed_file_set[@]}"; do
+  case "$file" in
+    internal/db/driver_agent_revisions_gen.go)
+      has_revision_file_change=true
+      only_workflow_changes=false
+      ;;
+    .github/workflows/dev-build.yml|.github/workflows/release.yml)
+      ;;
+    *)
+      only_workflow_changes=false
+      ;;
+  esac
+done
+
 declare -a forced_changed_drivers=()
 forced_driver_seen="|"
 for file in "${!changed_file_set[@]}"; do
   case "$file" in
+    internal/db/driver_agent_revisions_gen.go)
+      revision_delta="$(revision_file_changed_drivers)"
+      if [[ -z "$revision_delta" ]]; then
+        echo "检测到 driver-agent revision 文件存在无法归因的变更；保守构建全部 driver-agent：$file" >&2
+        all_drivers_csv
+        exit 0
+      fi
+      add_forced_drivers_from_tokens "$revision_delta"
+      ;;
     go.mod|go.sum|build-driver-agents.sh|tools/generate-driver-agent-revisions.sh)
       set +e
       shared_delta="$(shared_file_driver_delta "$file")"
@@ -478,13 +535,33 @@ for file in "${!changed_file_set[@]}"; do
       fi
       add_forced_drivers_from_tokens "$shared_delta"
       ;;
-    tools/compress-driver-artifact.sh)
-      echo "检测到 driver-agent 压缩脚本变更；保守构建全部 driver-agent：$file" >&2
+    tools/compress-driver-artifact.sh|\
+    tools/package-driver-release-assets.py|\
+    tools/generate-driver-release-manifest.py|\
+    tools/validate-driver-release-assets.py|\
+    tools/complete-driver-release-assets.py|\
+    tools/resolve-driver-release-source.py|\
+    tools/validate-driver-release-manifest.sh|\
+    tools/should-force-global-driver-builds.sh)
+      echo "检测到 driver-agent 构建/发布链路脚本变更；保守构建全部 driver-agent：$file" >&2
+      all_drivers_csv
+      exit 0
+      ;;
+    .github/workflows/dev-build.yml|.github/workflows/release.yml)
+      if [[ "$has_revision_file_change" == "true" ]]; then
+        continue
+      fi
+      if [[ "$only_workflow_changes" == "true" && -f internal/db/driver_agent_revisions_gen.go ]]; then
+        continue
+      fi
+      echo "检测到 driver-agent 构建/发布工作流变更；保守构建全部 driver-agent：$file" >&2
       all_drivers_csv
       exit 0
       ;;
     tools/detect-changed-driver-agents.sh)
-      # This script only selects CI work; it is not embedded in driver-agent binaries.
+      echo "检测到 driver-agent 变更检测脚本更新；保守构建全部 driver-agent：$file" >&2
+      all_drivers_csv
+      exit 0
       ;;
   esac
 done
diff --git a/tools/detect-changed-driver-agents.test.sh b/tools/detect-changed-driver-agents.test.sh
new file mode 100755
index 0000000..8200e6d
--- /dev/null
+++ b/tools/detect-changed-driver-agents.test.sh
@@ -0,0 +1,223 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ "${BASH_VERSINFO[0]:-0}" -lt 4 ]]; then
+  echo "skip: detect-changed-driver-agents.sh requires Bash 4+ for associative arrays; current bash is ${BASH_VERSION:-unknown}"
+  exit 0
+fi
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$SCRIPT_DIR"
+
+tmpdir="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-detect-driver-revisions.XXXXXX")"
+tmpdir_connection=""
+tmpdir_script=""
+cleanup() {
+  rm -rf "$tmpdir"
+  if [[ -n "$tmpdir_connection" ]]; then
+    rm -rf "$tmpdir_connection"
+  fi
+  if [[ -n "$tmpdir_script" ]]; then
+    rm -rf "$tmpdir_script"
+  fi
+}
+trap cleanup EXIT
+
+git init -q "$tmpdir"
+mkdir -p "$tmpdir/tools"
+cp tools/detect-changed-driver-agents.sh "$tmpdir/tools/detect-changed-driver-agents.sh"
+mkdir -p "$tmpdir/internal/db"
+cat >"$tmpdir/internal/db/driver_agent_revisions_gen.go" <<'GOEOF'
+package db
+
+func init() {
+	optionalDriverAgentRevisions = map[string]string{
+		"mariadb":    "src-old-mariadb",
+		"clickhouse": "src-old-clickhouse",
+	}
+}
+GOEOF
+
+(
+  cd "$tmpdir"
+  git add .
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+  base="$(git rev-parse HEAD)"
+  perl -0pi -e 's/src-old-clickhouse/src-new-clickhouse/' internal/db/driver_agent_revisions_gen.go
+  git add internal/db/driver_agent_revisions_gen.go
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'update clickhouse revision'
+  actual="$(bash ./tools/detect-changed-driver-agents.sh --base "$base" --head HEAD)"
+  if [[ "$actual" != "clickhouse" ]]; then
+    echo "expected clickhouse revision-only change to trigger clickhouse build, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+tmpdir_connection="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-detect-connection-change.XXXXXX")"
+git init -q "$tmpdir_connection"
+mkdir -p "$tmpdir_connection/tools" "$tmpdir_connection/internal/connection"
+cp tools/detect-changed-driver-agents.sh "$tmpdir_connection/tools/detect-changed-driver-agents.sh"
+cat >"$tmpdir_connection/internal/connection/types.go" <<'GOEOF'
+package connection
+
+type ConnectionConfig struct {
+	Type string `json:"type"`
+}
+GOEOF
+
+(
+  cd "$tmpdir_connection"
+  git add .
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+  base="$(git rev-parse HEAD)"
+  perl -0pi -e 's/Type string/RedisSentinelLabel string `json:"redisSentinelLabel,omitempty"`\n\tType string/' internal/connection/types.go
+  git add internal/connection/types.go
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'add redis-only connection field'
+  actual="$(bash ./tools/detect-changed-driver-agents.sh --base "$base" --head HEAD)"
+  if [[ -n "$actual" ]]; then
+    echo "expected connection-only field change to keep driver-agent detection empty, got: ${actual}" >&2
+    exit 1
+  fi
+)
+
+tmpdir_script="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-detect-script-change.XXXXXX")"
+git init -q "$tmpdir_script"
+mkdir -p "$tmpdir_script/tools"
+cp tools/detect-changed-driver-agents.sh "$tmpdir_script/tools/detect-changed-driver-agents.sh"
+(
+  cd "$tmpdir_script"
+  git add .
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+  base="$(git rev-parse HEAD)"
+  printf '\n# test change\n' >> tools/detect-changed-driver-agents.sh
+  git add tools/detect-changed-driver-agents.sh
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'update detection script'
+  actual="$(bash ./tools/detect-changed-driver-agents.sh --base "$base" --head HEAD 2>/dev/null)"
+  if [[ "$actual" != *"mariadb"* || "$actual" != *"clickhouse"* || "$actual" != *"elasticsearch"* ]]; then
+    echo "expected detection script change to trigger all driver builds, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+tmpdir_compensation="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-detect-compensation.XXXXXX")"
+git init -q "$tmpdir_compensation"
+mkdir -p "$tmpdir_compensation/tools" "$tmpdir_compensation/internal/db" "$tmpdir_compensation/.github/workflows"
+cp tools/detect-changed-driver-agents.sh "$tmpdir_compensation/tools/detect-changed-driver-agents.sh"
+cat >"$tmpdir_compensation/internal/db/driver_agent_revisions_gen.go" <<'GOEOF'
+package db
+
+func init() {
+	optionalDriverAgentRevisions = map[string]string{
+		"clickhouse": "src-old-clickhouse",
+	}
+}
+GOEOF
+cat >"$tmpdir_compensation/.github/workflows/dev-build.yml" <<'YAMLEOF'
+name: Dev Build
+YAMLEOF
+
+(
+  cd "$tmpdir_compensation"
+  git add .
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+  published_base="$(git rev-parse HEAD)"
+
+  perl -0pi -e 's/src-old-clickhouse/src-new-clickhouse/' internal/db/driver_agent_revisions_gen.go
+  git add internal/db/driver_agent_revisions_gen.go
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'update clickhouse revision'
+  push_base="$(git rev-parse HEAD)"
+
+  printf '\n# workflow fix\n' >> .github/workflows/dev-build.yml
+  git add .github/workflows/dev-build.yml
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'fix workflow'
+
+  actual_push_base="$(bash ./tools/detect-changed-driver-agents.sh --base "$push_base" --head HEAD)"
+  if [[ -n "$actual_push_base" ]]; then
+    echo "expected workflow-only fix commit to be empty when using push diff base, got: ${actual_push_base:-<empty>}" >&2
+    exit 1
+  fi
+
+  actual_published_base="$(bash ./tools/detect-changed-driver-agents.sh --base "$published_base" --head HEAD)"
+  if [[ "$actual_published_base" != "clickhouse" ]]; then
+    echo "expected published release base to recover clickhouse rebuild, got: ${actual_published_base:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+tmpdir_workflow="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-detect-workflow-change.XXXXXX")"
+git init -q "$tmpdir_workflow"
+mkdir -p "$tmpdir_workflow/tools" "$tmpdir_workflow/.github/workflows"
+cp tools/detect-changed-driver-agents.sh "$tmpdir_workflow/tools/detect-changed-driver-agents.sh"
+cat >"$tmpdir_workflow/.github/workflows/dev-build.yml" <<'YAMLEOF'
+name: Dev Build
+YAMLEOF
+
+(
+  cd "$tmpdir_workflow"
+  git add .
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+  base="$(git rev-parse HEAD)"
+
+  printf '\n# workflow logic changed\n' >> .github/workflows/dev-build.yml
+  git add .github/workflows/dev-build.yml
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'update workflow'
+
+  actual="$(bash ./tools/detect-changed-driver-agents.sh --base "$base" --head HEAD 2>/dev/null)"
+  if [[ "$actual" != *"mariadb"* || "$actual" != *"clickhouse"* || "$actual" != *"duckdb"* || "$actual" != *"elasticsearch"* ]]; then
+    echo "expected workflow change to trigger all driver builds, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+tmpdir_packaging="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-detect-packaging-change.XXXXXX")"
+git init -q "$tmpdir_packaging"
+mkdir -p "$tmpdir_packaging/tools"
+cp tools/detect-changed-driver-agents.sh "$tmpdir_packaging/tools/detect-changed-driver-agents.sh"
+cat >"$tmpdir_packaging/tools/package-driver-release-assets.py" <<'PYEOF'
+print("package")
+PYEOF
+
+(
+  cd "$tmpdir_packaging"
+  git add .
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+  base="$(git rev-parse HEAD)"
+
+  printf '\nprint("changed")\n' >> tools/package-driver-release-assets.py
+  git add tools/package-driver-release-assets.py
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'update packaging script'
+
+  actual="$(bash ./tools/detect-changed-driver-agents.sh --base "$base" --head HEAD 2>/dev/null)"
+  if [[ "$actual" != *"mariadb"* || "$actual" != *"clickhouse"* || "$actual" != *"duckdb"* || "$actual" != *"elasticsearch"* ]]; then
+    echo "expected packaging script change to trigger all driver builds, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+tmpdir_release_validation="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-detect-release-validation-change.XXXXXX")"
+git init -q "$tmpdir_release_validation"
+mkdir -p "$tmpdir_release_validation/tools"
+cp tools/detect-changed-driver-agents.sh "$tmpdir_release_validation/tools/detect-changed-driver-agents.sh"
+cat >"$tmpdir_release_validation/tools/validate-driver-release-assets.py" <<'PYEOF'
+print("validate")
+PYEOF
+
+(
+  cd "$tmpdir_release_validation"
+  git add .
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+  base="$(git rev-parse HEAD)"
+
+  printf '\nprint("changed")\n' >> tools/validate-driver-release-assets.py
+  git add tools/validate-driver-release-assets.py
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'update release validation script'
+
+  actual="$(bash ./tools/detect-changed-driver-agents.sh --base "$base" --head HEAD 2>/dev/null)"
+  if [[ "$actual" != *"mariadb"* || "$actual" != *"clickhouse"* || "$actual" != *"duckdb"* || "$actual" != *"elasticsearch"* ]]; then
+    echo "expected release validation script change to trigger all driver builds, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+echo "detect-changed-driver-agents revision test passed"
diff --git a/tools/diff-driver-agent-revisions.sh b/tools/diff-driver-agent-revisions.sh
new file mode 100644
index 0000000..d94523d
--- /dev/null
+++ b/tools/diff-driver-agent-revisions.sh
@@ -0,0 +1,146 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$SCRIPT_DIR"
+
+DEFAULT_DRIVERS=(mariadb oceanbase diros starrocks sphinx sqlserver sqlite duckdb dameng kingbase highgo vastbase opengauss gaussdb iris mongodb tdengine iotdb clickhouse elasticsearch)
+
+usage() {
+  cat <<'EOF'
+用法：
+  ./tools/diff-driver-agent-revisions.sh --base <ref> --head <ref> --platform <GOOS/GOARCH>
+
+输出：
+  逗号分隔的 driver-agent 列表；当 base/head 在当前 runner + 指定平台上生成出的 revision 完全一致时输出空行。
+
+说明：
+  该脚本会分别在 base/head 对应源码上重算指定平台的 driver-agent revision，
+  并按实际 revision 差异判定哪些驱动必须重建。
+EOF
+}
+
+join_drivers() {
+  local IFS=,
+  echo "$*"
+}
+
+public_driver_name() {
+  case "$1" in
+    diros) echo "doris" ;;
+    *) echo "$1" ;;
+  esac
+}
+
+extract_revision() {
+  local file="$1"
+  local driver="$2"
+  awk -v target="$driver" '
+    $0 ~ "\"" target "\"" {
+      if (match($0, /"src-[^"]+"/)) {
+        print substr($0, RSTART + 1, RLENGTH - 2)
+        exit
+      }
+    }
+  ' "$file"
+}
+
+base_ref=""
+head_ref=""
+target_platform=""
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --base)
+      base_ref="${2:-}"
+      shift 2
+      ;;
+    --head)
+      head_ref="${2:-}"
+      shift 2
+      ;;
+    --platform)
+      target_platform="${2:-}"
+      shift 2
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "未知参数：$1" >&2
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
+
+if [[ -z "$base_ref" || -z "$head_ref" || -z "$target_platform" ]]; then
+  usage >&2
+  exit 1
+fi
+if [[ "$target_platform" != */* ]]; then
+  echo "--platform 参数格式错误，应为 GOOS/GOARCH，例如 darwin/arm64" >&2
+  exit 1
+fi
+
+if ! git rev-parse --verify "${base_ref}^{commit}" >/dev/null 2>&1; then
+  echo "无法解析 base ref：$base_ref" >&2
+  exit 1
+fi
+if ! git rev-parse --verify "${head_ref}^{commit}" >/dev/null 2>&1; then
+  echo "无法解析 head ref：$head_ref" >&2
+  exit 1
+fi
+
+base_commit="$(git rev-parse "${base_ref}^{commit}")"
+head_commit="$(git rev-parse "${head_ref}^{commit}")"
+
+if [[ "$base_commit" == "$head_commit" ]]; then
+  echo ""
+  exit 0
+fi
+
+base_worktree="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-driver-rev-base.XXXXXX")"
+head_worktree="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-driver-rev-head.XXXXXX")"
+
+cleanup() {
+  git worktree remove --force "$base_worktree" >/dev/null 2>&1 || true
+  git worktree remove --force "$head_worktree" >/dev/null 2>&1 || true
+  rm -rf "$base_worktree" "$head_worktree"
+}
+trap cleanup EXIT
+
+git worktree add --detach "$base_worktree" "$base_commit" >/dev/null
+git worktree add --detach "$head_worktree" "$head_commit" >/dev/null
+
+generate_revisions() {
+  local worktree="$1"
+  (
+    cd "$worktree"
+    GONAVI_DRIVER_REVISION_JOBS="${GONAVI_DRIVER_REVISION_JOBS:-1}" \
+      bash ./tools/generate-driver-agent-revisions.sh --platform "$target_platform" >/dev/null
+  )
+}
+
+generate_revisions "$base_worktree"
+generate_revisions "$head_worktree"
+
+base_file="$base_worktree/internal/db/driver_agent_revisions_gen.go"
+head_file="$head_worktree/internal/db/driver_agent_revisions_gen.go"
+
+declare -a changed_drivers=()
+for driver in "${DEFAULT_DRIVERS[@]}"; do
+  base_revision="$(extract_revision "$base_file" "$driver")"
+  head_revision="$(extract_revision "$head_file" "$driver")"
+  if [[ "$base_revision" != "$head_revision" ]]; then
+    changed_drivers+=("$(public_driver_name "$driver")")
+  fi
+done
+
+if [[ ${#changed_drivers[@]} -eq 0 ]]; then
+  echo ""
+else
+  join_drivers "${changed_drivers[@]}"
+fi
diff --git a/tools/diff-driver-agent-revisions.test.sh b/tools/diff-driver-agent-revisions.test.sh
new file mode 100644
index 0000000..8c90285
--- /dev/null
+++ b/tools/diff-driver-agent-revisions.test.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$SCRIPT_DIR"
+
+same_commit_result="$(bash ./tools/diff-driver-agent-revisions.sh --base HEAD --head HEAD --platform darwin/arm64)"
+if [[ -n "$same_commit_result" ]]; then
+  echo "expected same commit revision diff to be empty, got: ${same_commit_result}" >&2
+  exit 1
+fi
+
+tmpdir="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-diff-driver-revisions.XXXXXX")"
+cleanup() {
+  rm -rf "$tmpdir"
+}
+trap cleanup EXIT
+
+rsync -a --exclude .git ./ "$tmpdir/" >/dev/null
+
+(
+  cd "$tmpdir"
+  git init -q
+  git add .
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+  base="$(git rev-parse HEAD)"
+
+  perl -0pi -e 's/type DuckDB struct \{/\/\/ test revision change\n&type DuckDB struct {/' internal/db/duckdb_impl.go
+  git add internal/db/duckdb_impl.go
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'touch duckdb impl'
+
+  actual="$(bash ./tools/diff-driver-agent-revisions.sh --base "$base" --head HEAD --platform darwin/arm64)"
+  if [[ "$actual" != *"duckdb"* ]]; then
+    echo "expected duckdb-specific source change to include duckdb revision rebuild, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+tmpdir_frontend="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-diff-driver-revisions-frontend.XXXXXX")"
+cleanup_frontend() {
+  rm -rf "$tmpdir_frontend"
+}
+trap cleanup_frontend EXIT
+
+rsync -a --exclude .git ./ "$tmpdir_frontend/" >/dev/null
+
+(
+  cd "$tmpdir_frontend"
+  git init -q
+  git add .
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+  base="$(git rev-parse HEAD)"
+
+  perl -0pi -e 's/isAddingPrimaryKey:/isAddingPrimaryKeyFlag:/' frontend/src/components/tableDesignerDuckDbPrimaryKey.ts
+  git add frontend/src/components/tableDesignerDuckDbPrimaryKey.ts
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'touch frontend only'
+
+  actual="$(bash ./tools/diff-driver-agent-revisions.sh --base "$base" --head HEAD --platform darwin/arm64)"
+  if [[ -n "$actual" ]]; then
+    echo "expected frontend-only change to keep driver revision diff empty, got: ${actual}" >&2
+    exit 1
+  fi
+)
+
+echo "diff-driver-agent-revisions test passed"
diff --git a/tools/generate-driver-agent-revisions.sh b/tools/generate-driver-agent-revisions.sh
index 9fccef5..81d41d0 100755
--- a/tools/generate-driver-agent-revisions.sh
+++ b/tools/generate-driver-agent-revisions.sh
@@ -4,8 +4,10 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "$SCRIPT_DIR"
+SCRIPT_DIR_WINDOWS="$(pwd -W 2>/dev/null || true)"
+SCRIPT_DIR_WINDOWS="${SCRIPT_DIR_WINDOWS//\\//}"
 
-DEFAULT_DRIVERS=(mariadb oceanbase diros starrocks sphinx sqlserver sqlite duckdb dameng kingbase highgo vastbase opengauss iris mongodb tdengine clickhouse)
+DEFAULT_DRIVERS=(mariadb oceanbase diros starrocks sphinx sqlserver sqlite duckdb dameng kingbase highgo vastbase opengauss gaussdb iris mongodb tdengine iotdb clickhouse elasticsearch)
 OUTPUT_FILE="internal/db/driver_agent_revisions_gen.go"
 
 usage() {
@@ -27,7 +29,9 @@ normalize_driver() {
     doris|diros) echo "diros" ;;
     oceanbase) echo "oceanbase" ;;
     opengauss|open_gauss|open-gauss) echo "opengauss" ;;
-    mariadb|diros|starrocks|sphinx|sqlserver|sqlite|duckdb|dameng|kingbase|highgo|vastbase|iris|mongodb|tdengine|clickhouse)
+    gaussdb|gauss_db|gauss-db) echo "gaussdb" ;;
+    elasticsearch|elastic) echo "elasticsearch" ;;
+    mariadb|diros|starrocks|sphinx|sqlserver|sqlite|duckdb|dameng|kingbase|highgo|vastbase|gaussdb|iris|mongodb|tdengine|iotdb|clickhouse)
       echo "$value"
       ;;
     *)
@@ -115,6 +119,7 @@ sphinx:internal/db/mysql_impl.go|\
 sqlserver:internal/db/sqlserver_impl.go|\
 sqlite:internal/db/sqlite_impl.go|\
 duckdb:internal/db/duckdb_impl.go|\
+duckdb:internal/db/duckdb_metadata.go|\
 duckdb:internal/db/duckdb_driver_import.go|\
 duckdb:internal/db/duckdb_platform_supported.go|\
 duckdb:internal/db/duckdb_platform_unsupported.go|\
@@ -126,11 +131,15 @@ highgo:internal/db/highgo_impl.go|\
 vastbase:internal/db/vastbase_impl.go|\
 opengauss:internal/db/opengauss_impl.go|\
 opengauss:internal/db/postgres_impl.go|\
+gaussdb:internal/db/gaussdb_impl.go|\
 iris:internal/db/iris_impl.go|\
 mongodb:internal/db/mongodb_impl.go|\
 mongodb:internal/db/mongodb_impl_v1.go|\
 tdengine:internal/db/tdengine_impl.go|\
-clickhouse:internal/db/clickhouse_impl.go)
+iotdb:internal/db/iotdb_impl.go|\
+clickhouse:internal/db/clickhouse_impl.go|\
+elasticsearch:internal/db/elasticsearch_impl.go|\
+elasticsearch:internal/db/elasticsearch_helpers.go)
       return 0
       ;;
   esac
@@ -141,6 +150,11 @@ clickhouse:internal/db/clickhouse_impl.go)
 should_include_source_file() {
   local driver="$1"
   local identity="$2"
+  case "$identity" in
+    internal/appdata/*|internal/connection/*|internal/logger/*)
+      return 1
+      ;;
+  esac
   if [[ "$identity" == internal/db/* ]]; then
     should_include_internal_db_file "$driver" "$identity"
     return
@@ -189,6 +203,7 @@ fi
 goos="${target_platform%%/*}"
 goarch="${target_platform##*/}"
 gomodcache="$(go env GOMODCACHE)"
+gomodcache="${gomodcache//\\//}"
 
 declare -a drivers=()
 if [[ -n "$driver_csv" ]]; then
@@ -273,18 +288,23 @@ fingerprint_driver() {
   } >"$tmp"
 
   while IFS= read -r file; do
+    file="${file//\\//}"
     [[ -n "$file" && -f "$file" ]] || continue
-    case "$file" in
-      "$SCRIPT_DIR"/*)
-        identity="${file#$SCRIPT_DIR/}"
-        ;;
-      "$gomodcache"/*)
-        identity="gomod/${file#$gomodcache/}"
-        ;;
-      *)
-        identity="$file"
-        ;;
-    esac
+    if [[ -n "$SCRIPT_DIR_WINDOWS" && "$file" == "$SCRIPT_DIR_WINDOWS"/* ]]; then
+      identity="${file#$SCRIPT_DIR_WINDOWS/}"
+    else
+      case "$file" in
+        "$SCRIPT_DIR"/*)
+          identity="${file#$SCRIPT_DIR/}"
+          ;;
+        "$gomodcache"/*)
+          identity="gomod/${file#$gomodcache/}"
+          ;;
+        *)
+          identity="$file"
+          ;;
+      esac
+    fi
     if [[ "$identity" == "$OUTPUT_FILE" ]]; then
       continue
     fi
diff --git a/tools/generate-driver-agent-revisions.test.sh b/tools/generate-driver-agent-revisions.test.sh
new file mode 100644
index 0000000..379ef7d
--- /dev/null
+++ b/tools/generate-driver-agent-revisions.test.sh
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$SCRIPT_DIR"
+
+extract_revision() {
+  local file="$1"
+  local driver="$2"
+  sed -n "s/.*\"${driver}\"[[:space:]]*:[[:space:]]*\"\\([^\"]*\\)\".*/\\1/p" "$file" | head -n 1
+}
+
+copy_repo_to_tmp() {
+  local target="$1"
+  git ls-files -z | tar --null -T - -cf - | (cd "$target" && tar -xf -)
+}
+
+tmpdir_platform="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-generate-driver-revisions-platform.XXXXXX")"
+tmpdir_connection="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-generate-driver-revisions-connection.XXXXXX")"
+darwin_file="$(mktemp "${TMPDIR:-/tmp}/gonavi-darwin-revisions.XXXXXX")"
+windows_file="$(mktemp "${TMPDIR:-/tmp}/gonavi-windows-revisions.XXXXXX")"
+cleanup() {
+  rm -rf "$tmpdir_platform" "$tmpdir_connection"
+  rm -f "$darwin_file" "$windows_file"
+}
+trap cleanup EXIT
+
+copy_repo_to_tmp "$tmpdir_platform"
+
+(
+  cd "$tmpdir_platform"
+  GONAVI_DRIVER_REVISION_JOBS=1 bash ./tools/generate-driver-agent-revisions.sh --platform darwin/arm64 --drivers duckdb >/dev/null
+  cp internal/db/driver_agent_revisions_gen.go "$darwin_file"
+  GONAVI_DRIVER_REVISION_JOBS=1 bash ./tools/generate-driver-agent-revisions.sh --platform windows/amd64 --drivers duckdb >/dev/null
+  cp internal/db/driver_agent_revisions_gen.go "$windows_file"
+)
+
+darwin_duckdb="$(extract_revision "$darwin_file" duckdb)"
+windows_duckdb="$(extract_revision "$windows_file" duckdb)"
+if [[ -z "$darwin_duckdb" || -z "$windows_duckdb" ]]; then
+  echo "expected duckdb revision to be generated for both platforms" >&2
+  exit 1
+fi
+if [[ "$darwin_duckdb" == "$windows_duckdb" ]]; then
+  echo "expected duckdb revision to differ between darwin/arm64 and windows/amd64, got identical value: $darwin_duckdb" >&2
+  exit 1
+fi
+
+copy_repo_to_tmp "$tmpdir_connection"
+
+(
+  cd "$tmpdir_connection"
+  GONAVI_DRIVER_REVISION_JOBS=1 bash ./tools/generate-driver-agent-revisions.sh --platform windows/amd64 --drivers sqlserver >/dev/null
+  before_file="$(mktemp "${TMPDIR:-/tmp}/gonavi-sqlserver-revision-before.XXXXXX")"
+  after_file="$(mktemp "${TMPDIR:-/tmp}/gonavi-sqlserver-revision-after.XXXXXX")"
+  cleanup_sqlserver_revision_files() {
+    rm -f "$before_file" "$after_file"
+  }
+  trap cleanup_sqlserver_revision_files EXIT
+
+  cp internal/db/driver_agent_revisions_gen.go "$before_file"
+  perl -0pi -e 's/RedisSentinelMaster   string/RedisSentinelLabel    string           `json:"redisSentinelLabel,omitempty"`\n\tRedisSentinelMaster   string/' internal/connection/types.go
+  GONAVI_DRIVER_REVISION_JOBS=1 bash ./tools/generate-driver-agent-revisions.sh --platform windows/amd64 --drivers sqlserver >/dev/null
+  cp internal/db/driver_agent_revisions_gen.go "$after_file"
+
+  before_sqlserver="$(extract_revision "$before_file" sqlserver)"
+  after_sqlserver="$(extract_revision "$after_file" sqlserver)"
+  if [[ -z "$before_sqlserver" || -z "$after_sqlserver" ]]; then
+    echo "expected sqlserver revision to be generated before and after connection-only change" >&2
+    exit 1
+  fi
+  if [[ "$before_sqlserver" != "$after_sqlserver" ]]; then
+    echo "expected Redis-only connection field change to keep sqlserver revision stable, before=$before_sqlserver after=$after_sqlserver" >&2
+    exit 1
+  fi
+)
+
+echo "generate-driver-agent-revisions platform test passed"
diff --git a/tools/generate-driver-release-manifest.py b/tools/generate-driver-release-manifest.py
new file mode 100644
index 0000000..9434c73
--- /dev/null
+++ b/tools/generate-driver-release-manifest.py
@@ -0,0 +1,180 @@
+#!/usr/bin/env python3
+
+import argparse
+import hashlib
+import json
+import os
+import subprocess
+import sys
+import tempfile
+from pathlib import Path
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--assets-dir", required=True, help="driver release staging dir that contains standalone driver assets")
+    parser.add_argument("--output", required=True, help="manifest json output path")
+    return parser.parse_args()
+
+
+def infer_driver_and_platform(file_name: str):
+    suffixes = [
+        ("-driver-agent-v1-darwin-amd64", "darwin/amd64"),
+        ("-driver-agent-v1-darwin-arm64", "darwin/arm64"),
+        ("-driver-agent-v1-linux-amd64", "linux/amd64"),
+        ("-driver-agent-v1-windows-amd64.exe", "windows/amd64"),
+        ("-driver-agent-v1-windows-arm64.exe", "windows/arm64"),
+        ("-driver-agent-v2-darwin-amd64", "darwin/amd64"),
+        ("-driver-agent-v2-darwin-arm64", "darwin/arm64"),
+        ("-driver-agent-v2-linux-amd64", "linux/amd64"),
+        ("-driver-agent-v2-windows-amd64.exe", "windows/amd64"),
+        ("-driver-agent-v2-windows-arm64.exe", "windows/arm64"),
+        ("-driver-agent-darwin-amd64", "darwin/amd64"),
+        ("-driver-agent-darwin-arm64", "darwin/arm64"),
+        ("-driver-agent-linux-amd64", "linux/amd64"),
+        ("-driver-agent-windows-amd64.exe", "windows/amd64"),
+        ("-driver-agent-windows-arm64.exe", "windows/arm64"),
+    ]
+    for suffix, platform in suffixes:
+        if file_name.endswith(suffix):
+            driver = file_name[: -len(suffix)]
+            return driver, platform
+    return None, None
+
+
+def normalize_driver(driver: str):
+    value = str(driver or "").strip().lower()
+    if value == "doris":
+        return "diros"
+    return value
+
+
+def repo_root():
+    return Path(__file__).resolve().parent.parent
+
+
+def resolve_head_commit(root: Path):
+    proc = subprocess.run(
+        ["git", "rev-parse", "HEAD"],
+        cwd=root,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+        check=True,
+    )
+    return proc.stdout.strip()
+
+
+def parse_revision_file(path: Path):
+    revisions = {}
+    for line in path.read_text(encoding="utf-8").splitlines():
+        stripped = line.strip()
+        if not stripped.startswith('"'):
+            continue
+        try:
+            driver, revision = stripped.rstrip(",").split(":", 1)
+        except ValueError:
+            continue
+        revisions[driver.strip().strip('"')] = revision.strip().strip('"')
+    return revisions
+
+
+def generate_platform_revisions(root: Path, drivers_by_platform):
+    if not drivers_by_platform:
+        return {}
+
+    with tempfile.TemporaryDirectory(prefix="gonavi-driver-release-manifest-") as tmp:
+        worktree = Path(tmp) / "worktree"
+        subprocess.run(
+            ["git", "worktree", "add", "--detach", str(worktree), "HEAD"],
+            cwd=root,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            check=True,
+        )
+        try:
+            revision_file = worktree / "internal/db/driver_agent_revisions_gen.go"
+            result = {}
+            for platform in sorted(drivers_by_platform):
+                drivers = sorted({normalize_driver(driver) for driver in drivers_by_platform[platform] if normalize_driver(driver)})
+                command = ["bash", "./tools/generate-driver-agent-revisions.sh", "--platform", platform]
+                if drivers:
+                    command.extend(["--drivers", ",".join(drivers)])
+                subprocess.run(
+                    command,
+                    cwd=worktree,
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                    check=True,
+                )
+                result[platform] = parse_revision_file(revision_file)
+            return result
+        finally:
+            subprocess.run(
+                ["git", "worktree", "remove", "--force", str(worktree)],
+                cwd=root,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                check=False,
+            )
+
+
+def main():
+    args = parse_args()
+    assets_dir = Path(args.assets_dir).resolve()
+    output_path = Path(args.output).resolve()
+    root = repo_root()
+
+    asset_entries = []
+    drivers_by_platform = {}
+    for child in sorted(assets_dir.rglob("*")):
+        if not child.is_file():
+            continue
+        driver, platform = infer_driver_and_platform(child.name)
+        if not driver or not platform:
+            continue
+        if child.stat().st_size == 0:
+            raise RuntimeError(f"{child.name}: asset is empty")
+        asset_entries.append((child, driver, platform))
+        drivers_by_platform.setdefault(platform, set()).add(driver)
+
+    revisions_by_platform = generate_platform_revisions(root, drivers_by_platform)
+
+    manifest = {
+        "schemaVersion": 1,
+        "generatedFrom": os.environ.get("GITHUB_SHA", "").strip() or resolve_head_commit(root),
+        "assets": {},
+    }
+
+    for child, driver, platform in asset_entries:
+        normalized_driver = normalize_driver(driver)
+        revision = str((revisions_by_platform.get(platform) or {}).get(normalized_driver) or "").strip()
+        if not revision:
+            raise RuntimeError(f"{child.name}: missing revision for {platform}/{normalized_driver}")
+        manifest["assets"][child.name] = {
+            "driver": driver,
+            "driverType": driver,
+            "platform": platform,
+            "revision": revision,
+            "size": child.stat().st_size,
+            "sha256": hashlib.sha256(child.read_bytes()).hexdigest(),
+        }
+
+    output_path.parent.mkdir(parents=True, exist_ok=True)
+    output_path.write_text(json.dumps(manifest, ensure_ascii=False, indent=2, sort_keys=True) + "\n", encoding="utf-8")
+    print(f"wrote manifest: {output_path}")
+    print(f"asset count: {len(manifest['assets'])}")
+    return 0
+
+
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main())
+    except subprocess.CalledProcessError as exc:
+        command = exc.cmd if isinstance(exc.cmd, str) else " ".join(exc.cmd)
+        stderr = (exc.stderr or "").strip()
+        if stderr:
+            print(stderr, file=sys.stderr)
+        print(f"error: command failed: {command}", file=sys.stderr)
+        raise
diff --git a/tools/generate-driver-release-manifest.test.py b/tools/generate-driver-release-manifest.test.py
new file mode 100644
index 0000000..e0a452b
--- /dev/null
+++ b/tools/generate-driver-release-manifest.test.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+
+import json
+import os
+import stat
+import subprocess
+import tempfile
+import unittest
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parent.parent
+SCRIPT = ROOT / "tools" / "generate-driver-release-manifest.py"
+
+
+def expected_revision(revision_file: Path, driver: str):
+    for line in revision_file.read_text(encoding="utf-8").splitlines():
+        if f'"{driver}"' not in line:
+            continue
+        left, right = line.strip().rstrip(",").split(":", 1)
+        if left.strip().strip('"') == driver:
+            return right.strip().strip('"')
+    raise AssertionError(f"missing revision for {driver}")
+
+
+class GenerateDriverReleaseManifestTest(unittest.TestCase):
+    def _generate_revision_file(self, platform: str, drivers: str = "clickhouse"):
+        worktree = Path(tempfile.mkdtemp(prefix="gonavi-release-manifest-worktree-"))
+        subprocess.run(
+            ["git", "worktree", "add", "--detach", str(worktree), "HEAD"],
+            cwd=ROOT,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            check=True,
+        )
+        self.addCleanup(
+            lambda: subprocess.run(
+                ["git", "worktree", "remove", "--force", str(worktree)],
+                cwd=ROOT,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                check=False,
+            )
+        )
+        subprocess.run(
+            ["bash", "./tools/generate-driver-agent-revisions.sh", "--platform", platform, "--drivers", drivers],
+            cwd=worktree,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            check=True,
+        )
+        return worktree / "internal" / "db" / "driver_agent_revisions_gen.go"
+
+    def test_generates_manifest_without_executing_cross_platform_assets(self):
+        with tempfile.TemporaryDirectory(prefix="gonavi-release-manifest-test-") as tmp:
+            tmpdir = Path(tmp)
+            assets_dir = tmpdir / "drivers"
+            (assets_dir / "MacOS").mkdir(parents=True)
+            (assets_dir / "Linux").mkdir(parents=True)
+            (assets_dir / "Windows").mkdir(parents=True)
+
+            fixtures = {
+                assets_dir / "MacOS" / "clickhouse-driver-agent-darwin-arm64": b"darwin-binary",
+                assets_dir / "Linux" / "clickhouse-driver-agent-linux-amd64": b"linux-binary",
+                assets_dir / "Windows" / "clickhouse-driver-agent-windows-amd64.exe": b"MZfake-binary",
+                assets_dir / "Windows" / "mongodb-driver-agent-v1-windows-amd64.exe": b"MZfake-mongodb-v1",
+                assets_dir / "Windows" / "mongodb-driver-agent-v2-windows-amd64.exe": b"MZfake-mongodb-v2",
+            }
+            for path, content in fixtures.items():
+                path.write_bytes(content)
+                os.chmod(path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
+
+            output = tmpdir / "manifest.json"
+            proc = subprocess.run(
+                ["python3", str(SCRIPT), "--assets-dir", str(assets_dir), "--output", str(output)],
+                cwd=ROOT,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                check=True,
+            )
+
+            self.assertIn("asset count: 5", proc.stdout)
+            manifest = json.loads(output.read_text(encoding="utf-8"))
+            assets = manifest["assets"]
+            darwin_revision_file = self._generate_revision_file("darwin/arm64")
+            linux_revision_file = self._generate_revision_file("linux/amd64")
+            windows_revision_file = self._generate_revision_file("windows/amd64", "clickhouse,mongodb")
+            self.assertEqual(
+                assets["clickhouse-driver-agent-darwin-arm64"]["revision"],
+                expected_revision(darwin_revision_file, "clickhouse"),
+            )
+            self.assertEqual(
+                assets["clickhouse-driver-agent-linux-amd64"]["revision"],
+                expected_revision(linux_revision_file, "clickhouse"),
+            )
+            self.assertEqual(
+                assets["clickhouse-driver-agent-windows-amd64.exe"]["revision"],
+                expected_revision(windows_revision_file, "clickhouse"),
+            )
+            self.assertEqual(
+                assets["mongodb-driver-agent-v1-windows-amd64.exe"]["driver"],
+                "mongodb",
+            )
+            self.assertEqual(
+                assets["mongodb-driver-agent-v1-windows-amd64.exe"]["platform"],
+                "windows/amd64",
+            )
+            self.assertEqual(
+                assets["mongodb-driver-agent-v1-windows-amd64.exe"]["revision"],
+                expected_revision(windows_revision_file, "mongodb"),
+            )
+            self.assertEqual(
+                assets["mongodb-driver-agent-v2-windows-amd64.exe"]["driver"],
+                "mongodb",
+            )
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tools/package-driver-release-assets.py b/tools/package-driver-release-assets.py
new file mode 100644
index 0000000..7afb4e4
--- /dev/null
+++ b/tools/package-driver-release-assets.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+import json
+import shutil
+import sys
+import zipfile
+from pathlib import Path
+
+
+def main():
+    if len(sys.argv) != 3:
+        raise SystemExit("usage: package-driver-release-assets.py <drivers-dir> <output-dir>")
+
+    drivers_dir = Path(sys.argv[1]).resolve()
+    output_dir = Path(sys.argv[2]).resolve()
+
+    if not drivers_dir.is_dir():
+        raise SystemExit(f"drivers dir not found: {drivers_dir}")
+
+    out_name = "GoNavi-DriverAgents.zip"
+    index_name = "GoNavi-DriverAgents-Index.json"
+    manifest_name = "GoNavi-DriverAgents-Manifest.json"
+
+    if output_dir.exists():
+        shutil.rmtree(output_dir)
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    out_path = output_dir / out_name
+    index_path = output_dir / index_name
+    manifest_path = output_dir / manifest_name
+
+    size_index = {}
+    standalone_assets = []
+    with zipfile.ZipFile(out_path, "w", compression=zipfile.ZIP_DEFLATED) as zf:
+        for asset in sorted(drivers_dir.rglob("*")):
+            if not asset.is_file():
+                continue
+            arcname = asset.relative_to(drivers_dir).as_posix()
+            if asset.name in size_index:
+                raise RuntimeError(f"driver asset name conflict: {asset.name}")
+            zf.write(asset, arcname)
+            size_index[asset.name] = asset.stat().st_size
+            standalone_path = output_dir / asset.name
+            if standalone_path.exists():
+                raise RuntimeError(f"release asset already exists: {standalone_path}")
+            shutil.copy2(asset, standalone_path)
+            standalone_assets.append(standalone_path.name)
+
+    index_path.write_text(
+        json.dumps({"assets": size_index}, ensure_ascii=False, indent=2) + "\n",
+        encoding="utf-8",
+    )
+
+    print(f"created {out_name} size={out_path.stat().st_size} bytes")
+    print(f"created {index_name} entries={len(size_index)}")
+    print(f"published standalone driver assets={len(standalone_assets)}")
+    print(f"reserved manifest output path: {manifest_path}")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/package-driver-release-assets.test.py b/tools/package-driver-release-assets.test.py
new file mode 100644
index 0000000..1f7a939
--- /dev/null
+++ b/tools/package-driver-release-assets.test.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+
+import json
+import subprocess
+import tempfile
+import unittest
+import zipfile
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parent.parent
+SCRIPT = ROOT / "tools" / "package-driver-release-assets.py"
+
+
+class PackageDriverReleaseAssetsTest(unittest.TestCase):
+    def test_packages_bundle_and_standalone_assets(self):
+        with tempfile.TemporaryDirectory(prefix="gonavi-driver-assets-test-") as tmp:
+            tmpdir = Path(tmp)
+            drivers_dir = tmpdir / "drivers"
+            output_dir = tmpdir / "driver-release-assets"
+            (drivers_dir / "Windows").mkdir(parents=True)
+            (drivers_dir / "MacOS").mkdir(parents=True)
+
+            windows_asset = drivers_dir / "Windows" / "clickhouse-driver-agent-windows-amd64.exe"
+            darwin_asset = drivers_dir / "MacOS" / "clickhouse-driver-agent-darwin-arm64"
+            windows_asset.write_bytes(b"windows-asset")
+            darwin_asset.write_bytes(b"darwin-asset")
+
+            proc = subprocess.run(
+                ["python3", str(SCRIPT), str(drivers_dir), str(output_dir)],
+                cwd=ROOT,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                check=True,
+            )
+
+            self.assertIn("created GoNavi-DriverAgents.zip", proc.stdout)
+            self.assertTrue((output_dir / "GoNavi-DriverAgents.zip").is_file())
+            self.assertTrue((output_dir / windows_asset.name).is_file())
+            self.assertTrue((output_dir / darwin_asset.name).is_file())
+
+            index = json.loads((output_dir / "GoNavi-DriverAgents-Index.json").read_text(encoding="utf-8"))
+            self.assertEqual(index["assets"][windows_asset.name], len(b"windows-asset"))
+            self.assertEqual(index["assets"][darwin_asset.name], len(b"darwin-asset"))
+
+            with zipfile.ZipFile(output_dir / "GoNavi-DriverAgents.zip") as zf:
+                self.assertEqual(
+                    sorted(zf.namelist()),
+                    [
+                        "MacOS/clickhouse-driver-agent-darwin-arm64",
+                        "Windows/clickhouse-driver-agent-windows-amd64.exe",
+                    ],
+                )
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tools/resolve-driver-release-source.py b/tools/resolve-driver-release-source.py
new file mode 100644
index 0000000..cce846e
--- /dev/null
+++ b/tools/resolve-driver-release-source.py
@@ -0,0 +1,138 @@
+#!/usr/bin/env python3
+
+import argparse
+import json
+import os
+import re
+import sys
+import urllib.error
+import urllib.parse
+import urllib.request
+
+
+COMMIT_LINK_RE = re.compile(r"/commit/([0-9a-f]{40})(?:\b|/)")
+FULL_SHA_RE = re.compile(r"\b([0-9a-f]{40})\b")
+MANIFEST_ASSET_NAME = "GoNavi-DriverAgents-Manifest.json"
+
+
+def github_headers():
+    headers = {
+        "Accept": "application/vnd.github+json",
+        "User-Agent": "GoNavi-CI",
+    }
+    token = os.environ.get("DRIVER_RELEASE_TOKEN") or os.environ.get("GITHUB_TOKEN")
+    if token:
+        headers["Authorization"] = f"Bearer {token}"
+    return headers
+
+
+def fetch_json(url):
+    request = urllib.request.Request(url, headers=github_headers())
+    with urllib.request.urlopen(request, timeout=30) as response:
+        return json.loads(response.read().decode("utf-8"))
+
+
+def download_asset(asset, destination):
+    headers = github_headers()
+    headers["Accept"] = "application/octet-stream"
+    request = urllib.request.Request(asset["url"], headers=headers)
+    with urllib.request.urlopen(request, timeout=120) as response:
+        with open(destination, "wb") as output:
+            output.write(response.read())
+
+
+def load_release(repo, tag):
+    owner_repo = repo.strip()
+    if not owner_repo:
+        raise ValueError("repo is required")
+
+    if tag == "latest":
+        url = f"https://api.github.com/repos/{owner_repo}/releases/latest"
+    else:
+        url = (
+            f"https://api.github.com/repos/{owner_repo}/releases/tags/"
+            f"{urllib.parse.quote(tag, safe='')}"
+        )
+
+    try:
+        return fetch_json(url)
+    except urllib.error.HTTPError as exc:
+        if exc.code == 404:
+            print(f"warning: release {owner_repo}@{tag} not found", file=sys.stderr)
+            return None
+        print(
+            f"warning: failed to load release {owner_repo}@{tag}: HTTP {exc.code}",
+            file=sys.stderr,
+        )
+        return None
+    except Exception as exc:  # pragma: no cover - defensive logging path
+        print(f"warning: failed to load release {owner_repo}@{tag}: {exc}", file=sys.stderr)
+        return None
+
+
+def extract_source_commit(release):
+    if not isinstance(release, dict):
+        return None
+
+    body = str(release.get("body") or "")
+    for pattern in (COMMIT_LINK_RE, FULL_SHA_RE):
+        match = pattern.search(body)
+        if match:
+            return match.group(1)
+
+    target_commitish = str(release.get("target_commitish") or "").strip()
+    if FULL_SHA_RE.fullmatch(target_commitish):
+        return target_commitish
+
+    return None
+
+
+def find_manifest_asset(release):
+    if not isinstance(release, dict):
+        return None
+
+    for asset in release.get("assets", []):
+        if str(asset.get("name") or "").strip() == MANIFEST_ASSET_NAME:
+            return asset
+    return None
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--repo", default="Syngnat/GoNavi-DriverAgents")
+    parser.add_argument("--tag", required=True, help="release tag name such as dev-latest or v1.0.0")
+    parser.add_argument("--manifest-output", help="optional path to download the published revision manifest asset")
+    args = parser.parse_args()
+
+    release = load_release(args.repo, args.tag)
+    if release is None:
+        return 0
+
+    if args.manifest_output:
+        manifest_path = os.path.abspath(args.manifest_output)
+        manifest_asset = find_manifest_asset(release)
+        if manifest_asset is None:
+            if os.path.exists(manifest_path):
+                os.remove(manifest_path)
+            print(
+                f"warning: release {args.repo}@{args.tag} does not expose {MANIFEST_ASSET_NAME}",
+                file=sys.stderr,
+            )
+        else:
+            os.makedirs(os.path.dirname(manifest_path), exist_ok=True)
+            download_asset(manifest_asset, manifest_path)
+
+    source_commit = extract_source_commit(release)
+    if not source_commit:
+        print(
+            f"warning: release {args.repo}@{args.tag} does not expose source commit",
+            file=sys.stderr,
+        )
+        return 0
+
+    print(source_commit)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/resolve-driver-release-source.test.py b/tools/resolve-driver-release-source.test.py
new file mode 100644
index 0000000..72fc56f
--- /dev/null
+++ b/tools/resolve-driver-release-source.test.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+
+import importlib.util
+import pathlib
+import unittest
+
+
+MODULE_PATH = pathlib.Path(__file__).with_name("resolve-driver-release-source.py")
+SPEC = importlib.util.spec_from_file_location("resolve_driver_release_source", MODULE_PATH)
+MODULE = importlib.util.module_from_spec(SPEC)
+assert SPEC.loader is not None
+SPEC.loader.exec_module(MODULE)
+
+
+class ResolveDriverReleaseSourceTests(unittest.TestCase):
+    def test_extracts_commit_from_release_body_link(self):
+        commit = "a" * 40
+        release = {
+            "body": (
+                f"GoNavi dev driver-agent assets.\n\n"
+                f"**提交**: [`{commit}`](https://github.com/Syngnat/GoNavi/commit/{commit})"
+            )
+        }
+        self.assertEqual(MODULE.extract_source_commit(release), commit)
+
+    def test_extracts_commit_from_plain_body_sha(self):
+        commit = "b" * 40
+        release = {"body": f"source commit: {commit}"}
+        self.assertEqual(MODULE.extract_source_commit(release), commit)
+
+    def test_falls_back_to_full_sha_target_commitish(self):
+        commit = "c" * 40
+        release = {"target_commitish": commit}
+        self.assertEqual(MODULE.extract_source_commit(release), commit)
+
+    def test_ignores_branch_name_target_commitish(self):
+        release = {"body": "", "target_commitish": "main"}
+        self.assertIsNone(MODULE.extract_source_commit(release))
+
+    def test_finds_manifest_asset(self):
+        release = {
+            "assets": [
+                {"name": "foo.txt"},
+                {"name": "GoNavi-DriverAgents-Manifest.json", "url": "https://example.test/manifest"},
+            ]
+        }
+        asset = MODULE.find_manifest_asset(release)
+        self.assertIsNotNone(asset)
+        self.assertEqual(asset["url"], "https://example.test/manifest")
+
+    def test_returns_none_when_manifest_asset_missing(self):
+        release = {"assets": [{"name": "GoNavi-DriverAgents.zip"}]}
+        self.assertIsNone(MODULE.find_manifest_asset(release))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tools/should-force-global-driver-builds.sh b/tools/should-force-global-driver-builds.sh
new file mode 100755
index 0000000..b11a8f1
--- /dev/null
+++ b/tools/should-force-global-driver-builds.sh
@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$SCRIPT_DIR"
+
+usage() {
+  cat <<'EOF'
+用法：
+  ./tools/should-force-global-driver-builds.sh --base <ref> --head <ref>
+
+输出：
+  true  表示本次变更涉及 driver 构建/发布链路，平台构建阶段必须保留全局驱动重建结果
+  false 表示可继续按平台 revision diff 缩小重建范围
+EOF
+}
+
+base_ref=""
+head_ref=""
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --base)
+      base_ref="${2:-}"
+      shift 2
+      ;;
+    --head)
+      head_ref="${2:-}"
+      shift 2
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "未知参数：$1" >&2
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
+
+if [[ -z "$base_ref" || -z "$head_ref" ]]; then
+  usage >&2
+  exit 1
+fi
+
+if [[ "$base_ref" == "all" ]]; then
+  echo "true"
+  exit 0
+fi
+
+if ! git rev-parse --verify "${base_ref}^{commit}" >/dev/null 2>&1; then
+  echo "无法解析 base ref：$base_ref" >&2
+  exit 1
+fi
+if ! git rev-parse --verify "${head_ref}^{commit}" >/dev/null 2>&1; then
+  echo "无法解析 head ref：$head_ref" >&2
+  exit 1
+fi
+
+while IFS= read -r file; do
+  case "$file" in
+    .github/workflows/dev-build.yml|\
+    .github/workflows/release.yml|\
+    build-driver-agents.sh|\
+    tools/compress-driver-artifact.sh|\
+    tools/detect-changed-driver-agents.sh|\
+    tools/diff-driver-agent-revisions.sh|\
+    tools/package-driver-release-assets.py|\
+    tools/generate-driver-release-manifest.py|\
+    tools/validate-driver-release-assets.py|\
+    tools/complete-driver-release-assets.py|\
+    tools/resolve-driver-release-source.py|\
+    tools/validate-driver-release-manifest.sh|\
+    tools/should-force-global-driver-builds.sh)
+      echo "true"
+      exit 0
+      ;;
+  esac
+done < <(git diff --name-only "$base_ref" "$head_ref")
+
+echo "false"
diff --git a/tools/should-force-global-driver-builds.test.sh b/tools/should-force-global-driver-builds.test.sh
new file mode 100755
index 0000000..8d79663
--- /dev/null
+++ b/tools/should-force-global-driver-builds.test.sh
@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$SCRIPT_DIR"
+
+tmpdir="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-force-global-driver-builds.XXXXXX")"
+cleanup() {
+  rm -rf "$tmpdir"
+}
+trap cleanup EXIT
+
+git init -q "$tmpdir"
+mkdir -p "$tmpdir/tools" "$tmpdir/.github/workflows" "$tmpdir/internal/db"
+cp tools/should-force-global-driver-builds.sh "$tmpdir/tools/should-force-global-driver-builds.sh"
+cat >"$tmpdir/.github/workflows/dev-build.yml" <<'YAMLEOF'
+name: Dev Build
+YAMLEOF
+cat >"$tmpdir/tools/package-driver-release-assets.py" <<'PYEOF'
+print("package")
+PYEOF
+cat >"$tmpdir/tools/validate-driver-release-assets.py" <<'PYEOF'
+print("validate")
+PYEOF
+cat >"$tmpdir/internal/db/duckdb_impl.go" <<'GOEOF'
+package db
+GOEOF
+
+base_ref=""
+cd "$tmpdir"
+git add .
+git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m initial
+base_ref="$(git rev-parse HEAD)"
+
+(
+  cd "$tmpdir"
+  printf '\n# workflow change\n' >> .github/workflows/dev-build.yml
+  git add .github/workflows/dev-build.yml
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'workflow change'
+  actual="$(bash ./tools/should-force-global-driver-builds.sh --base "$base_ref" --head HEAD)"
+  if [[ "$actual" != "true" ]]; then
+    echo "expected workflow change to force global driver builds, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+(
+  cd "$tmpdir"
+  git reset --hard -q "$base_ref"
+  printf '\nprint("changed")\n' >> tools/package-driver-release-assets.py
+  git add tools/package-driver-release-assets.py
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'packaging change'
+  actual="$(bash ./tools/should-force-global-driver-builds.sh --base "$base_ref" --head HEAD)"
+  if [[ "$actual" != "true" ]]; then
+    echo "expected packaging change to force global driver builds, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+(
+  cd "$tmpdir"
+  git reset --hard -q "$base_ref"
+  printf '\nprint("changed")\n' >> tools/validate-driver-release-assets.py
+  git add tools/validate-driver-release-assets.py
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'release asset validation change'
+  actual="$(bash ./tools/should-force-global-driver-builds.sh --base "$base_ref" --head HEAD)"
+  if [[ "$actual" != "true" ]]; then
+    echo "expected release asset validation change to force global driver builds, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+(
+  cd "$tmpdir"
+  git reset --hard -q "$base_ref"
+  printf '\n// source-only change\n' >> internal/db/duckdb_impl.go
+  git add internal/db/duckdb_impl.go
+  git -c user.name=GoNavi -c user.email=gonavi@example.test commit -q -m 'duckdb source change'
+  actual="$(bash ./tools/should-force-global-driver-builds.sh --base "$base_ref" --head HEAD)"
+  if [[ "$actual" != "false" ]]; then
+    echo "expected source-only driver change not to force global driver builds, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+(
+  cd "$tmpdir"
+  actual="$(bash ./tools/should-force-global-driver-builds.sh --base all --head HEAD)"
+  if [[ "$actual" != "true" ]]; then
+    echo "expected base=all to force global driver builds, got: ${actual:-<empty>}" >&2
+    exit 1
+  fi
+)
+
+echo "should-force-global-driver-builds test passed"
diff --git a/tools/validate-driver-release-assets.py b/tools/validate-driver-release-assets.py
new file mode 100644
index 0000000..f1f23de
--- /dev/null
+++ b/tools/validate-driver-release-assets.py
@@ -0,0 +1,249 @@
+#!/usr/bin/env python3
+
+import argparse
+import hashlib
+import json
+import os
+import platform
+import shutil
+import stat
+import subprocess
+import sys
+import tempfile
+import urllib.error
+import urllib.parse
+import urllib.request
+from pathlib import Path
+
+
+MANIFEST_ASSET_NAME = "GoNavi-DriverAgents-Manifest.json"
+
+
+def github_headers(binary: bool = False):
+    headers = {
+        "Accept": "application/octet-stream" if binary else "application/vnd.github+json",
+        "User-Agent": "GoNavi-CI",
+    }
+    token = os.environ.get("DRIVER_RELEASE_TOKEN") or os.environ.get("GITHUB_TOKEN")
+    if token:
+        headers["Authorization"] = f"Bearer {token}"
+    return headers
+
+
+def fetch_json(url: str):
+    req = urllib.request.Request(url, headers=github_headers(False))
+    with urllib.request.urlopen(req, timeout=30) as resp:
+        return json.loads(resp.read().decode("utf-8"))
+
+
+def download_url(url: str, destination: Path):
+    req = urllib.request.Request(url, headers=github_headers(False))
+    with urllib.request.urlopen(req, timeout=120) as resp, open(destination, "wb") as out:
+        shutil.copyfileobj(resp, out)
+
+
+def load_release(repo: str, tag: str):
+    owner_repo = repo.strip()
+    if not owner_repo:
+        raise ValueError("repo is required")
+    if tag == "latest":
+        url = f"https://api.github.com/repos/{owner_repo}/releases/latest"
+    else:
+        url = f"https://api.github.com/repos/{owner_repo}/releases/tags/{urllib.parse.quote(tag, safe='')}"
+    return fetch_json(url)
+
+
+def asset_map(release: dict):
+    result = {}
+    for asset in release.get("assets", []):
+        name = str(asset.get("name") or "").strip()
+        if name:
+            result[name] = asset
+    return result
+
+
+def asset_sha256_digest(asset: dict):
+    digest = str(asset.get("digest") or "").strip().lower()
+    prefix = "sha256:"
+    if digest.startswith(prefix):
+        value = digest[len(prefix) :].strip()
+        if value:
+            return value
+    return ""
+
+
+def infer_asset_path(name: str):
+    trimmed = str(name or "").strip()
+    if not trimmed:
+        return None
+    if trimmed == "duckdb.dll":
+        return "Windows/duckdb.dll"
+    if trimmed == "duckdb-driver.zip":
+        return None
+    if (
+        trimmed.endswith("-driver-agent-windows-amd64.exe")
+        or trimmed.endswith("-driver-agent-windows-arm64.exe")
+        or trimmed.endswith("-driver-agent-v1-windows-amd64.exe")
+        or trimmed.endswith("-driver-agent-v1-windows-arm64.exe")
+        or trimmed.endswith("-driver-agent-v2-windows-amd64.exe")
+        or trimmed.endswith("-driver-agent-v2-windows-arm64.exe")
+    ):
+        return f"Windows/{trimmed}"
+    if (
+        trimmed.endswith("-driver-agent-darwin-amd64")
+        or trimmed.endswith("-driver-agent-darwin-arm64")
+        or trimmed.endswith("-driver-agent-v1-darwin-amd64")
+        or trimmed.endswith("-driver-agent-v1-darwin-arm64")
+        or trimmed.endswith("-driver-agent-v2-darwin-amd64")
+        or trimmed.endswith("-driver-agent-v2-darwin-arm64")
+    ):
+        return f"MacOS/{trimmed}"
+    if (
+        trimmed.endswith("-driver-agent-linux-amd64")
+        or trimmed.endswith("-driver-agent-v1-linux-amd64")
+        or trimmed.endswith("-driver-agent-v2-linux-amd64")
+    ):
+        return f"Linux/{trimmed}"
+    return None
+
+
+def normalize_machine(value: str):
+    machine = str(value or "").strip().lower()
+    if machine in {"x86_64", "amd64"}:
+        return "amd64"
+    if machine in {"aarch64", "arm64"}:
+        return "arm64"
+    return machine
+
+
+def current_runtime_platform():
+    system = platform.system().lower()
+    if system == "darwin":
+        goos = "darwin"
+    elif system == "windows":
+        goos = "windows"
+    elif system == "linux":
+        goos = "linux"
+    else:
+        return ""
+    goarch = normalize_machine(platform.machine())
+    if not goarch:
+        return ""
+    return f"{goos}/{goarch}"
+
+
+def sha256_file(path: Path):
+    h = hashlib.sha256()
+    with open(path, "rb") as fh:
+        for chunk in iter(lambda: fh.read(1024 * 1024), b""):
+            if not chunk:
+                break
+            h.update(chunk)
+    return h.hexdigest()
+
+
+def probe_metadata_revision(path: Path):
+    current_mode = path.stat().st_mode
+    path.chmod(current_mode | stat.S_IXUSR)
+    proc = subprocess.run(
+        [str(path)],
+        input=b'{"id":1,"method":"metadata"}\n',
+        capture_output=True,
+        timeout=20,
+        check=True,
+    )
+    if not proc.stdout:
+        raise RuntimeError(f"{path.name}: metadata output is empty")
+    payload = json.loads(proc.stdout.decode("utf-8"))
+    return str(((payload.get("data") or {}).get("agentRevision") or "")).strip()
+
+
+def validate_release_assets(release: dict, manifest: dict, runtime_platform=None):
+    assets = asset_map(release)
+    manifest_assets = manifest.get("assets") or {}
+    if not isinstance(manifest_assets, dict) or not manifest_assets:
+        raise RuntimeError("manifest assets is empty")
+
+    if runtime_platform is None:
+        runtime_platform = current_runtime_platform()
+    runtime_platform = str(runtime_platform or "").strip().lower()
+
+    mismatches = []
+    skipped = []
+    with tempfile.TemporaryDirectory(prefix="gonavi-release-assets-") as tmp:
+        tmp_root = Path(tmp)
+        for name, meta in sorted(manifest_assets.items()):
+            if name == MANIFEST_ASSET_NAME:
+                continue
+            asset = assets.get(name)
+            if asset is None:
+                mismatches.append((name, "missing_release_asset", "", "present in manifest"))
+                continue
+
+            expected_sha = str(meta.get("sha256") or "").strip().lower()
+            expected_revision = str(meta.get("revision") or "").strip()
+            asset_platform = str(meta.get("platform") or "").strip().lower()
+
+            local_path = None
+            actual_sha = asset_sha256_digest(asset)
+            if expected_sha and not actual_sha:
+                local_path = tmp_root / name
+                download_url(str(asset.get("browser_download_url") or "").strip(), local_path)
+                actual_sha = sha256_file(local_path).lower()
+            if expected_sha and actual_sha != expected_sha:
+                mismatches.append((name, "sha256", actual_sha, expected_sha))
+                continue
+
+            path_hint = infer_asset_path(name)
+            if path_hint is None:
+                skipped.append(name)
+                continue
+
+            if expected_revision and asset_platform == runtime_platform:
+                if local_path is None:
+                    local_path = tmp_root / name
+                    download_url(str(asset.get("browser_download_url") or "").strip(), local_path)
+                actual_revision = probe_metadata_revision(local_path)
+                if actual_revision != expected_revision:
+                    mismatches.append((name, "revision", actual_revision, expected_revision))
+
+    return mismatches, skipped
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--repo", default="Syngnat/GoNavi-DriverAgents")
+    parser.add_argument("--tag", required=True)
+    args = parser.parse_args()
+
+    release = load_release(args.repo, args.tag)
+    assets = asset_map(release)
+    manifest_asset = assets.get(MANIFEST_ASSET_NAME)
+    if manifest_asset is None:
+        raise SystemExit(f"release {args.repo}@{args.tag} missing {MANIFEST_ASSET_NAME}")
+
+    with tempfile.TemporaryDirectory(prefix="gonavi-release-manifest-") as tmp:
+        manifest_path = Path(tmp) / MANIFEST_ASSET_NAME
+        download_url(str(manifest_asset.get("browser_download_url") or "").strip(), manifest_path)
+        manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
+
+    mismatches, skipped = validate_release_assets(release, manifest)
+    if mismatches:
+        print("published driver release assets mismatch manifest:", file=sys.stderr)
+        for name, field, actual, expected in mismatches:
+            print(f"  - {name} [{field}] actual={actual or '<empty>'} expected={expected or '<empty>'}", file=sys.stderr)
+        raise SystemExit(1)
+
+    checked = len((manifest.get("assets") or {})) - len(skipped)
+    print(f"driver release assets validation passed: checked={checked} skipped={len(skipped)}")
+    if skipped:
+        print("skipped assets: " + ", ".join(sorted(skipped)))
+    return 0
+
+
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main())
+    except urllib.error.HTTPError as exc:
+        print(f"http error: {exc.code}", file=sys.stderr)
+        raise
diff --git a/tools/validate-driver-release-assets.test.py b/tools/validate-driver-release-assets.test.py
new file mode 100644
index 0000000..37ca4f1
--- /dev/null
+++ b/tools/validate-driver-release-assets.test.py
@@ -0,0 +1,201 @@
+#!/usr/bin/env python3
+
+import hashlib
+import importlib.util
+import pathlib
+import tempfile
+import unittest
+
+
+MODULE_PATH = pathlib.Path(__file__).with_name("validate-driver-release-assets.py")
+SPEC = importlib.util.spec_from_file_location("validate_driver_release_assets", MODULE_PATH)
+MODULE = importlib.util.module_from_spec(SPEC)
+assert SPEC.loader is not None
+SPEC.loader.exec_module(MODULE)
+
+
+class ValidateDriverReleaseAssetsTests(unittest.TestCase):
+    def test_infer_asset_path(self):
+        self.assertEqual(
+            MODULE.infer_asset_path("clickhouse-driver-agent-darwin-arm64"),
+            "MacOS/clickhouse-driver-agent-darwin-arm64",
+        )
+        self.assertEqual(
+            MODULE.infer_asset_path("clickhouse-driver-agent-windows-arm64.exe"),
+            "Windows/clickhouse-driver-agent-windows-arm64.exe",
+        )
+        self.assertEqual(
+            MODULE.infer_asset_path("mongodb-driver-agent-v1-windows-amd64.exe"),
+            "Windows/mongodb-driver-agent-v1-windows-amd64.exe",
+        )
+        self.assertEqual(
+            MODULE.infer_asset_path("mongodb-driver-agent-v2-darwin-arm64"),
+            "MacOS/mongodb-driver-agent-v2-darwin-arm64",
+        )
+        self.assertEqual(MODULE.infer_asset_path("duckdb.dll"), "Windows/duckdb.dll")
+        self.assertIsNone(MODULE.infer_asset_path("duckdb-driver.zip"))
+
+    def test_validate_release_assets_reports_sha_mismatch(self):
+        release = {
+            "assets": [
+                {
+                    "name": "clickhouse-driver-agent-darwin-arm64",
+                    "browser_download_url": "https://example.test/clickhouse-driver-agent-darwin-arm64",
+                }
+            ]
+        }
+        manifest = {
+            "assets": {
+                "clickhouse-driver-agent-darwin-arm64": {
+                    "revision": "src-expected",
+                    "sha256": "deadbeef",
+                }
+            }
+        }
+
+        with tempfile.TemporaryDirectory(prefix="gonavi-validate-release-assets-") as tmp:
+            payload_path = pathlib.Path(tmp) / "clickhouse-driver-agent-darwin-arm64"
+            payload_path.write_bytes(b"test-binary")
+
+            def fake_download(url, destination):
+                destination.write_bytes(payload_path.read_bytes())
+
+            original_download = MODULE.download_url
+            original_probe = MODULE.probe_metadata_revision
+            try:
+                MODULE.download_url = fake_download
+                MODULE.probe_metadata_revision = lambda _path: "src-expected"
+                mismatches, skipped = MODULE.validate_release_assets(release, manifest)
+            finally:
+                MODULE.download_url = original_download
+                MODULE.probe_metadata_revision = original_probe
+
+        self.assertEqual(skipped, [])
+        self.assertEqual(len(mismatches), 1)
+        name, field, actual, expected = mismatches[0]
+        self.assertEqual(name, "clickhouse-driver-agent-darwin-arm64")
+        self.assertEqual(field, "sha256")
+        self.assertEqual(actual, hashlib.sha256(b"test-binary").hexdigest())
+        self.assertEqual(expected, "deadbeef")
+
+    def test_validate_release_assets_reports_revision_mismatch(self):
+        release = {
+            "assets": [
+                {
+                    "name": "clickhouse-driver-agent-darwin-arm64",
+                    "browser_download_url": "https://example.test/clickhouse-driver-agent-darwin-arm64",
+                }
+            ]
+        }
+        payload = b"test-binary"
+        manifest = {
+            "assets": {
+                "clickhouse-driver-agent-darwin-arm64": {
+                    "platform": "darwin/arm64",
+                    "revision": "src-expected",
+                    "sha256": hashlib.sha256(payload).hexdigest(),
+                }
+            }
+        }
+
+        with tempfile.TemporaryDirectory(prefix="gonavi-validate-release-assets-") as tmp:
+            payload_path = pathlib.Path(tmp) / "clickhouse-driver-agent-darwin-arm64"
+            payload_path.write_bytes(payload)
+
+            def fake_download(url, destination):
+                destination.write_bytes(payload_path.read_bytes())
+
+            original_download = MODULE.download_url
+            original_probe = MODULE.probe_metadata_revision
+            try:
+                MODULE.download_url = fake_download
+                MODULE.probe_metadata_revision = lambda _path: "src-actual"
+                mismatches, skipped = MODULE.validate_release_assets(release, manifest, runtime_platform="darwin/arm64")
+            finally:
+                MODULE.download_url = original_download
+                MODULE.probe_metadata_revision = original_probe
+
+        self.assertEqual(skipped, [])
+        self.assertEqual(mismatches, [("clickhouse-driver-agent-darwin-arm64", "revision", "src-actual", "src-expected")])
+
+    def test_validate_release_assets_skips_cross_platform_revision_probe(self):
+        release = {
+            "assets": [
+                {
+                    "name": "clickhouse-driver-agent-darwin-amd64",
+                    "browser_download_url": "https://example.test/clickhouse-driver-agent-darwin-amd64",
+                }
+            ]
+        }
+        payload = b"darwin-binary"
+        manifest = {
+            "assets": {
+                "clickhouse-driver-agent-darwin-amd64": {
+                    "platform": "darwin/amd64",
+                    "revision": "src-expected",
+                    "sha256": hashlib.sha256(payload).hexdigest(),
+                }
+            }
+        }
+
+        with tempfile.TemporaryDirectory(prefix="gonavi-validate-release-assets-") as tmp:
+            payload_path = pathlib.Path(tmp) / "clickhouse-driver-agent-darwin-amd64"
+            payload_path.write_bytes(payload)
+
+            def fake_download(url, destination):
+                destination.write_bytes(payload_path.read_bytes())
+
+            def fail_probe(_path):
+                raise AssertionError("cross-platform asset should not be executed")
+
+            original_download = MODULE.download_url
+            original_probe = MODULE.probe_metadata_revision
+            try:
+                MODULE.download_url = fake_download
+                MODULE.probe_metadata_revision = fail_probe
+                mismatches, skipped = MODULE.validate_release_assets(release, manifest, runtime_platform="linux/amd64")
+            finally:
+                MODULE.download_url = original_download
+                MODULE.probe_metadata_revision = original_probe
+
+        self.assertEqual(mismatches, [])
+        self.assertEqual(skipped, [])
+
+    def test_validate_release_assets_uses_release_digest_without_download(self):
+        payload = b"darwin-binary"
+        digest = hashlib.sha256(payload).hexdigest()
+        release = {
+            "assets": [
+                {
+                    "name": "clickhouse-driver-agent-darwin-amd64",
+                    "digest": f"sha256:{digest}",
+                    "browser_download_url": "https://example.test/clickhouse-driver-agent-darwin-amd64",
+                }
+            ]
+        }
+        manifest = {
+            "assets": {
+                "clickhouse-driver-agent-darwin-amd64": {
+                    "platform": "darwin/amd64",
+                    "revision": "src-expected",
+                    "sha256": digest,
+                }
+            }
+        }
+
+        def fail_download(_url, _destination):
+            raise AssertionError("release digest should avoid downloading cross-platform assets")
+
+        original_download = MODULE.download_url
+        try:
+            MODULE.download_url = fail_download
+            mismatches, skipped = MODULE.validate_release_assets(release, manifest, runtime_platform="linux/amd64")
+        finally:
+            MODULE.download_url = original_download
+
+        self.assertEqual(mismatches, [])
+        self.assertEqual(skipped, [])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tools/validate-driver-release-manifest.sh b/tools/validate-driver-release-manifest.sh
new file mode 100644
index 0000000..5126475
--- /dev/null
+++ b/tools/validate-driver-release-manifest.sh
@@ -0,0 +1,163 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$SCRIPT_DIR"
+
+usage() {
+  cat <<'EOF'
+用法：
+  ./tools/validate-driver-release-manifest.sh --commit <ref> --manifest <path>
+
+说明：
+  校验已发布 driver release manifest 中记录的每个 driver revision，
+  是否与指定源码提交在对应平台上重新生成出的 revision 完全一致。
+EOF
+}
+
+source_commit=""
+manifest_path=""
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --commit)
+      source_commit="${2:-}"
+      shift 2
+      ;;
+    --manifest)
+      manifest_path="${2:-}"
+      shift 2
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "未知参数：$1" >&2
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
+
+if [[ -z "$source_commit" || -z "$manifest_path" ]]; then
+  usage >&2
+  exit 1
+fi
+
+if [[ ! -f "$manifest_path" ]]; then
+  echo "manifest 不存在：$manifest_path" >&2
+  exit 1
+fi
+
+if ! git rev-parse --verify "${source_commit}^{commit}" >/dev/null 2>&1; then
+  echo "无法解析源码提交：$source_commit" >&2
+  exit 1
+fi
+
+extract_revision() {
+  local file="$1"
+  local driver="$2"
+  awk -v target="$driver" '
+    $0 ~ "\"" target "\"" {
+      if (match($0, /"src-[^"]+"/)) {
+        print substr($0, RSTART + 1, RLENGTH - 2)
+        exit
+      }
+    }
+  ' "$file"
+}
+
+normalize_driver() {
+  local value
+  value="$(printf '%s' "$1" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')"
+  case "$value" in
+    doris|diros) echo "diros" ;;
+    *) echo "$value" ;;
+  esac
+}
+
+worktree="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-driver-manifest.XXXXXX")"
+cleanup() {
+  git worktree remove --force "$worktree" >/dev/null 2>&1 || true
+  rm -rf "$worktree"
+}
+trap cleanup EXIT
+
+git worktree add --detach "$worktree" "${source_commit}^{commit}" >/dev/null
+
+python3 - "$manifest_path" "$worktree" <<'PY'
+import json
+import subprocess
+import sys
+from pathlib import Path
+
+manifest_path = Path(sys.argv[1]).resolve()
+worktree = Path(sys.argv[2]).resolve()
+
+with manifest_path.open("r", encoding="utf-8") as fh:
+    manifest = json.load(fh)
+
+assets = manifest.get("assets") or {}
+if not isinstance(assets, dict) or not assets:
+    raise SystemExit("manifest assets 为空")
+
+platforms = sorted({str(meta.get("platform") or "").strip() for meta in assets.values() if str(meta.get("platform") or "").strip()})
+if not platforms:
+    raise SystemExit("manifest 未包含平台信息")
+
+def normalize_driver(driver: str) -> str:
+    value = str(driver or "").strip().lower()
+    if value == "doris":
+        return "diros"
+    return value
+
+
+def parse_revision_file(file_path: Path):
+    import re
+    text = file_path.read_text(encoding="utf-8")
+    revisions = {}
+    for match in re.finditer(r'"([^"]+)"\s*:\s*"([^"]+)"', text):
+        revisions[match.group(1)] = match.group(2)
+    return revisions
+
+drivers_by_platform = {}
+for meta in assets.values():
+    platform = str(meta.get("platform") or "").strip()
+    driver = normalize_driver(meta.get("driver") or meta.get("driverType"))
+    if platform and driver:
+        drivers_by_platform.setdefault(platform, set()).add(driver)
+
+revision_maps = {}
+for platform in platforms:
+    command = ["bash", "./tools/generate-driver-agent-revisions.sh", "--platform", platform]
+    platform_drivers = sorted(drivers_by_platform.get(platform) or [])
+    if platform_drivers:
+        command.extend(["--drivers", ",".join(platform_drivers)])
+    subprocess.run(command, cwd=worktree, check=True, stdout=subprocess.DEVNULL)
+    revision_maps[platform] = parse_revision_file(worktree / "internal/db/driver_agent_revisions_gen.go")
+
+mismatches = []
+for asset_name, meta in sorted(assets.items()):
+    driver = normalize_driver(meta.get("driver") or meta.get("driverType"))
+    platform = str(meta.get("platform") or "").strip()
+    published_revision = str(meta.get("revision") or "").strip()
+    expected_revision = (revision_maps.get(platform) or {}).get(driver, "")
+    if not expected_revision:
+        mismatches.append((asset_name, platform, driver, published_revision, "<missing>"))
+        continue
+    if published_revision != expected_revision:
+        mismatches.append((asset_name, platform, driver, published_revision, expected_revision))
+
+if mismatches:
+    print("published driver release manifest 与源码重算 revision 不一致：", file=sys.stderr)
+    for asset_name, platform, driver, published_revision, expected_revision in mismatches:
+        print(
+            f"  - {asset_name} [{platform}/{driver}] published={published_revision} expected={expected_revision}",
+            file=sys.stderr,
+        )
+    raise SystemExit(1)
+
+print(f"manifest validation passed: {len(assets)} assets")
+PY
diff --git a/tools/validate-driver-release-manifest.test.sh b/tools/validate-driver-release-manifest.test.sh
new file mode 100644
index 0000000..6e3e2e6
--- /dev/null
+++ b/tools/validate-driver-release-manifest.test.sh
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$SCRIPT_DIR"
+
+tmpdir="$(mktemp -d)"
+worktrees=()
+cleanup() {
+  local worktree
+  for worktree in "${worktrees[@]+"${worktrees[@]}"}"; do
+    git worktree remove --force "$worktree" >/dev/null 2>&1 || true
+  done
+  rm -rf "$tmpdir"
+}
+trap cleanup EXIT
+
+manifest_path="$tmpdir/manifest.json"
+
+generate_revision() {
+  local platform="$1"
+  local driver="$2"
+  local worktree revision_file
+  worktree="$tmpdir/worktree-${platform//\//-}-${driver}"
+  git worktree add --detach "$worktree" HEAD >/dev/null
+  worktrees+=("$worktree")
+  (
+    cd "$worktree"
+    bash ./tools/generate-driver-agent-revisions.sh --platform "$platform" --drivers "$driver" >/dev/null
+  )
+  revision_file="$worktree/internal/db/driver_agent_revisions_gen.go"
+  awk -v target="$driver" '
+    $0 ~ "\"" target "\"" {
+      if (match($0, /"src-[^"]+"/)) {
+        print substr($0, RSTART + 1, RLENGTH - 2)
+        exit
+      }
+    }
+  ' "$revision_file"
+}
+
+cat >"$manifest_path" <<'EOF'
+{
+  "schemaVersion": 1,
+  "generatedFrom": "test",
+  "assets": {
+    "clickhouse-driver-agent-darwin-arm64": {
+      "driver": "clickhouse",
+      "driverType": "clickhouse",
+      "platform": "darwin/arm64",
+      "revision": "__CLICKHOUSE_DARWIN_ARM64__",
+      "size": 1
+    },
+    "clickhouse-driver-agent-linux-amd64": {
+      "driver": "clickhouse",
+      "driverType": "clickhouse",
+      "platform": "linux/amd64",
+      "revision": "__CLICKHOUSE_LINUX_AMD64__",
+      "size": 1
+    },
+    "clickhouse-driver-agent-windows-amd64.exe": {
+      "driver": "clickhouse",
+      "driverType": "clickhouse",
+      "platform": "windows/amd64",
+      "revision": "__CLICKHOUSE_WINDOWS_AMD64__",
+      "size": 1
+    },
+    "mariadb-driver-agent-darwin-arm64": {
+      "driver": "mariadb",
+      "driverType": "mariadb",
+      "platform": "darwin/arm64",
+      "revision": "__MARIADB__",
+      "size": 1
+    }
+  }
+}
+EOF
+
+clickhouse_darwin_revision="$(generate_revision darwin/arm64 clickhouse)"
+clickhouse_linux_revision="$(generate_revision linux/amd64 clickhouse)"
+clickhouse_windows_revision="$(generate_revision windows/amd64 clickhouse)"
+mariadb_darwin_revision="$(generate_revision darwin/arm64 mariadb)"
+
+python3 - "$manifest_path" "$clickhouse_darwin_revision" "$clickhouse_linux_revision" "$clickhouse_windows_revision" "$mariadb_darwin_revision" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+path = Path(sys.argv[1])
+clickhouse_darwin = sys.argv[2]
+clickhouse_linux = sys.argv[3]
+clickhouse_windows = sys.argv[4]
+mariadb = sys.argv[5]
+data = json.loads(path.read_text(encoding="utf-8"))
+data["assets"]["clickhouse-driver-agent-darwin-arm64"]["revision"] = clickhouse_darwin
+data["assets"]["clickhouse-driver-agent-linux-amd64"]["revision"] = clickhouse_linux
+data["assets"]["clickhouse-driver-agent-windows-amd64.exe"]["revision"] = clickhouse_windows
+data["assets"]["mariadb-driver-agent-darwin-arm64"]["revision"] = mariadb
+path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
+PY
+
+bash ./tools/validate-driver-release-manifest.sh --commit HEAD --manifest "$manifest_path"
+echo "validate-driver-release-manifest test passed"
diff --git a/tools/verify-driver-agent-revisions.sh b/tools/verify-driver-agent-revisions.sh
new file mode 100755
index 0000000..1f39550
--- /dev/null
+++ b/tools/verify-driver-agent-revisions.sh
@@ -0,0 +1,302 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$SCRIPT_DIR"
+
+usage() {
+  cat <<'EOF'
+用法：
+  ./tools/verify-driver-agent-revisions.sh --assets-dir <目录> --platform <GOOS/GOARCH> --drivers <列表>
+
+说明：
+  校验已构建 driver-agent 资产返回的 agentRevision 是否等于当前源码生成的 revision。
+EOF
+}
+
+assets_dir=""
+target_platform=""
+driver_csv=""
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --assets-dir)
+      assets_dir="${2:-}"
+      shift 2
+      ;;
+    --platform)
+      target_platform="${2:-}"
+      shift 2
+      ;;
+    --drivers)
+      driver_csv="${2:-}"
+      shift 2
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "未知参数：$1" >&2
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
+
+if [[ -z "$assets_dir" || -z "$target_platform" || -z "$driver_csv" ]]; then
+  usage >&2
+  exit 1
+fi
+if [[ "$target_platform" != */* ]]; then
+  echo "--platform 参数格式错误，应为 GOOS/GOARCH，例如 darwin/arm64" >&2
+  exit 1
+fi
+
+goos="${target_platform%%/*}"
+goarch="${target_platform##*/}"
+platform_dir="Unknown"
+case "$goos" in
+  windows) platform_dir="Windows" ;;
+  darwin) platform_dir="MacOS" ;;
+  linux) platform_dir="Linux" ;;
+esac
+
+normalize_driver() {
+  local value
+  value="$(printf '%s' "$1" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')"
+  case "$value" in
+    doris|diros) echo "diros" ;;
+    opengauss|open_gauss|open-gauss) echo "opengauss" ;;
+    gaussdb|gauss_db|gauss-db) echo "gaussdb" ;;
+    elasticsearch|elastic) echo "elasticsearch" ;;
+    mariadb|oceanbase|starrocks|sphinx|sqlserver|sqlite|duckdb|dameng|kingbase|highgo|vastbase|gaussdb|iris|mongodb|tdengine|iotdb|clickhouse)
+      echo "$value"
+      ;;
+    *)
+      return 1
+      ;;
+  esac
+}
+
+public_driver_name() {
+  case "$1" in
+    diros) echo "doris" ;;
+    *) echo "$1" ;;
+  esac
+}
+
+expected_revision_for() {
+  local target="$1"
+  awk -v target="$target" '
+    $0 ~ "\"" target "\"" {
+      if (match($0, /"src-[^"]+"/)) {
+        value=substr($0, RSTART + 1, RLENGTH - 2)
+        print value
+        exit
+      }
+    }
+  ' internal/db/driver_agent_revisions_gen.go
+}
+
+build_tags_for_driver() {
+  local driver="$1"
+  local variant="${2:-}"
+  local tags="gonavi_${driver}_driver"
+  if [[ "$driver" == "mongodb" && "$variant" == "v1" ]]; then
+    tags="gonavi_mongodb_driver_v1"
+  fi
+  if [[ "$driver" == "duckdb" && "$host_goos" == "windows" && "$host_goarch" == "amd64" ]]; then
+    tags="${tags} duckdb_use_lib"
+  fi
+  printf '%s\n' "$tags"
+}
+
+agent_path_for() {
+  local driver="$1"
+  local variant="${2:-}"
+  local public_name asset
+  public_name="$(public_driver_name "$driver")"
+  if [[ "$driver" == "mongodb" && -n "$variant" ]]; then
+    asset="${public_name}-driver-agent-${variant}-${goos}-${goarch}"
+  else
+    asset="${public_name}-driver-agent-${goos}-${goarch}"
+  fi
+  if [[ "$goos" == "windows" ]]; then
+    asset="${asset}.exe"
+  fi
+  printf '%s\n' "${assets_dir%/}/${platform_dir}/${asset}"
+}
+
+agent_variants_for() {
+  local driver="$1"
+  if [[ "$driver" == "mongodb" ]]; then
+    printf '%s\n' "v1" "v2" ""
+    return
+  fi
+  printf '%s\n' ""
+}
+
+probe_agent_revision() {
+  local agent_path="$1"
+  local request
+  request='{"id":1,"method":"metadata"}'
+  printf '%s\n' "$request" | "$agent_path" | python3 -c '
+import json
+import sys
+
+line = sys.stdin.readline()
+payload = json.loads(line)
+data = payload.get("data") or {}
+print(data.get("agentRevision", ""))
+'
+}
+
+probe_host_agent_revision() {
+  local driver="$1"
+  local variant="${2:-}"
+  local build_tags probe_dir probe_path revision
+  build_tags="$(build_tags_for_driver "$driver" "$variant")"
+  probe_dir="$(mktemp -d)"
+  probe_path="${probe_dir}/probe-agent"
+  if [[ "$host_goos" == "windows" ]]; then
+    probe_path="${probe_path}.exe"
+  fi
+
+  CGO_ENABLED=0 go build \
+    -tags "${build_tags}" \
+    -trimpath \
+    -ldflags "-s -w" \
+    -o "${probe_path}" \
+    ./cmd/optional-driver-agent >/dev/null
+
+  chmod +x "$probe_path" 2>/dev/null || true
+  revision="$(probe_agent_revision "$probe_path")"
+  rm -rf "$probe_dir"
+  printf '%s\n' "$revision"
+}
+
+can_execute_target_binary() {
+  [[ "$target_platform" == "$host_platform" ]]
+}
+
+validate_windows_pe_machine() {
+  local agent_path="$1"
+  local expected_goarch="$2"
+  python3 - "$agent_path" "$expected_goarch" <<'PY'
+import os
+import struct
+import sys
+
+path = sys.argv[1]
+goarch = sys.argv[2].strip().lower()
+expected = {
+    "386": 0x014C,
+    "amd64": 0x8664,
+    "arm64": 0xAA64,
+}
+labels = {
+    0x014C: "windows-386",
+    0x8664: "windows-amd64",
+    0xAA64: "windows-arm64",
+}
+
+if goarch not in expected:
+    sys.exit(0)
+
+with open(path, "rb") as fh:
+    fh.seek(0, os.SEEK_END)
+    size = fh.tell()
+    if size < 0x40:
+        raise SystemExit("文件头不完整")
+
+    fh.seek(0)
+    if fh.read(2) != b"MZ":
+        raise SystemExit("缺少 MZ 头")
+
+    fh.seek(0x3C)
+    pe_offset_raw = fh.read(4)
+    if len(pe_offset_raw) != 4:
+        raise SystemExit("读取 PE 头偏移失败")
+    pe_offset = struct.unpack("<I", pe_offset_raw)[0]
+    if pe_offset < 0x40 or pe_offset + 24 > size:
+        raise SystemExit("PE 头不完整")
+
+    fh.seek(pe_offset)
+    if fh.read(4) != b"PE\0\0":
+        raise SystemExit("缺少 PE 签名")
+
+    machine_raw = fh.read(2)
+    if len(machine_raw) != 2:
+        raise SystemExit("读取 PE 架构失败")
+    machine = struct.unpack("<H", machine_raw)[0]
+
+expected_machine = expected[goarch]
+if machine != expected_machine:
+    raise SystemExit(f"可执行文件架构不兼容（文件={labels.get(machine, hex(machine))}，期望={labels[expected_machine]})")
+PY
+}
+
+declare -a raw_drivers=()
+IFS=',' read -r -a raw_drivers <<<"$driver_csv"
+
+host_goos="$(go env GOOS)"
+host_goarch="$(go env GOARCH)"
+host_platform="${host_goos}/${host_goarch}"
+
+failed=0
+for raw_driver in "${raw_drivers[@]}"; do
+  [[ -n "$raw_driver" ]] || continue
+  driver="$(normalize_driver "$raw_driver")"
+  if [[ "$driver" == "duckdb" && "$goos" == "windows" && "$goarch" != "amd64" ]]; then
+    echo "⚠️  跳过 duckdb revision 校验（$target_platform 不构建 agent）"
+    continue
+  fi
+
+  expected="$(expected_revision_for "$driver")"
+  if [[ -z "$expected" ]]; then
+    echo "❌ $driver 缺少期望 revision"
+    failed=1
+    continue
+  fi
+
+  while IFS= read -r variant; do
+    agent_path="$(agent_path_for "$driver" "$variant")"
+    variant_label="$driver"
+    if [[ -n "$variant" ]]; then
+      variant_label="${driver}-${variant}"
+    fi
+    if [[ ! -f "$agent_path" ]]; then
+      echo "❌ $variant_label 缺少 driver-agent 资产：$agent_path"
+      failed=1
+      continue
+    fi
+    chmod +x "$agent_path" 2>/dev/null || true
+
+    if [[ "$goos" == "windows" ]]; then
+      if ! validate_windows_pe_machine "$agent_path" "$goarch"; then
+        echo "❌ $variant_label Windows driver-agent 架构校验失败：asset=$agent_path target=$target_platform"
+        failed=1
+        continue
+      fi
+    fi
+
+    actual=""
+    if can_execute_target_binary; then
+      actual="$(probe_agent_revision "$agent_path" || true)"
+    else
+      echo "ℹ️  runner 平台 ${host_platform} 无法直接执行目标二进制 ${target_platform}，已先完成目标资产架构校验，再用 host-native probe 校验相同 build tags 的 revision"
+      actual="$(probe_host_agent_revision "$driver" "$variant" || true)"
+    fi
+
+    if [[ "$actual" != "$expected" ]]; then
+      echo "❌ $variant_label driver-agent revision 不匹配：asset=$agent_path actual=${actual:-空} expected=$expected"
+      failed=1
+      continue
+    fi
+    echo "✅ $variant_label driver-agent revision 校验通过：$actual"
+  done < <(agent_variants_for "$driver")
+done
+
+exit "$failed"
diff --git a/wails.json b/wails.json
index 384c84b..6c202fe 100644
--- a/wails.json
+++ b/wails.json
@@ -4,7 +4,7 @@
   "frontend:install": "node scripts/wails-frontend-install.mjs",
   "frontend:build": "npm run build",
   "frontend:dev:watcher": "npm run dev",
-  "frontend:dev:serverUrl": "http://localhost:5173",
+  "frontend:dev:serverUrl": "http://127.0.0.1:5173",
   "wailsjsdir": "./frontend",
   "version": "2",
   "author": {