✨ feat(i18n): 推进多语言剩余切片闭环

- 补齐 DataGrid、DataViewer、DefinitionViewer、JVM 等模块多语言文案与回归测试 - 收口 JVM 前后端展示、诊断、监控和资源呈现相关多语言路径 - 更新六语言共享词典并保留 raw 边界
✨ feat(i18n): 推进六语言多语言体系与扫描门禁
2026-06-16 19:49:51 +08:00 · 2026-06-16 12:40:33 +08:00 · 2026-06-15 14:35:08 +08:00 · 2026-06-01 12:11:17 +08:00 · 2026-06-01 12:05:25 +08:00 · 2026-06-01 12:05:25 +08:00
821 changed files with 272155 additions and 5588 deletions
--- a/.github/release.yaml
+++ b/.github/release.yaml
@@ -0,0 +1,26 @@
+changelog:
+  categories:
+    - title: 新功能
+      labels:
+        - feature
+        - enhancement
+        - feat
+    - title: 问题修复
+      labels:
+        - bug
+        - fix
+    - title: 文档与流程
+      labels:
+        - docs
+        - documentation
+        - ci
+        - workflow
+        - chore
+    - title: 重构与优化
+      labels:
+        - refactor
+        - perf
+        - optimization
+    - title: 其他更新
+      labels:
+        - '*'
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -0,0 +1,929 @@
+name: Dev Build
+
+on:
+  push:
+    branches:
+      - dev
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+
+jobs:
+  frontend:
+    name: Build frontend
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Setup Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: '1.24'
+
+      - name: Setup Node
+        uses: actions/setup-node@v5
+        with:
+          node-version: '20'
+          cache: 'npm'
+          cache-dependency-path: frontend/package-lock.json
+
+      - name: Cache frontend node_modules
+        uses: actions/cache@v5
+        with:
+          path: frontend/node_modules
+          key: ${{ runner.os }}-node20-frontend-${{ hashFiles('frontend/package-lock.json') }}
+
+      - name: Install Wails
+        run: go install -v github.com/wailsapp/wails/v2/cmd/wails@v2.11.0
+
+      - name: Build frontend dist
+        shell: bash
+        run: |
+          set -euo pipefail
+          mkdir -p frontend/dist
+          printf '<!doctype html><title>GoNavi</title>\n' > frontend/dist/index.html
+          wails generate module
+          node frontend/scripts/wails-frontend-install.mjs
+          npm --prefix frontend run build
+
+      - name: Pack frontend dist
+        shell: bash
+        run: tar -cf frontend-dist.tar -C frontend/dist .
+
+      - name: Upload frontend dist
+        uses: actions/upload-artifact@v6
+        with:
+          name: frontend-dist
+          path: frontend-dist.tar
+          if-no-files-found: error
+          retention-days: 1
+
+  driver_agents:
+    name: Detect changed driver agents
+    runs-on: ubuntu-latest
+    outputs:
+      drivers: ${{ steps.detect.outputs.drivers }}
+      has_changes: ${{ steps.detect.outputs.has_changes }}
+      release_source: ${{ steps.detect.outputs.release_source }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - 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
+              :
+            else
+              BASE_REF="all"
+            fi
+          fi
+          DRIVERS="$(bash ./tools/detect-changed-driver-agents.sh --base "$BASE_REF" --head "$GITHUB_SHA")"
+          echo "drivers=${DRIVERS}" >> "$GITHUB_OUTPUT"
+          if [ -n "$DRIVERS" ]; then
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+            echo "🧭 Changed driver agents: $DRIVERS"
+          else
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+            echo "🧭 No driver-agent changes detected"
+          fi
+          echo "release_source=dev-latest" >> "$GITHUB_OUTPUT"
+
+  build:
+    name: Build ${{ matrix.platform }}
+    needs:
+      - frontend
+      - driver_agents
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-latest
+            platform: darwin/amd64
+            os_name: MacOS
+            arch_name: Amd64
+            build_name: gonavi-build-darwin-amd64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: ""
+          - os: macos-latest
+            platform: darwin/arm64
+            os_name: MacOS
+            arch_name: Arm64
+            build_name: gonavi-build-darwin-arm64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: ""
+          - os: windows-2025-vs2026
+            platform: windows/amd64
+            os_name: Windows
+            arch_name: Amd64
+            build_name: gonavi-build-windows-amd64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: ""
+          - os: windows-2025-vs2026
+            platform: windows/arm64
+            os_name: Windows
+            arch_name: Arm64
+            build_name: gonavi-build-windows-arm64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: ""
+          - os: ubuntu-22.04
+            platform: linux/amd64
+            os_name: Linux
+            arch_name: Amd64
+            build_name: gonavi-build-linux-amd64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: "4.0"
+          - os: ubuntu-24.04
+            platform: linux/amd64
+            os_name: Linux
+            arch_name: Amd64
+            build_name: gonavi-build-linux-amd64-webkit41
+            wails_tags: "webkit2_41"
+            artifact_suffix: "-WebKit41"
+            build_optional_agents: false
+            linux_webkit: "4.1"
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Setup Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: '1.24'
+
+      - name: Download frontend dist
+        uses: actions/download-artifact@v7
+        with:
+          name: frontend-dist
+          path: .
+
+      - 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/dist/index.html
+
+      - name: Install UPX (Windows)
+        if: matrix.platform == 'windows/amd64'
+        shell: pwsh
+        run: |
+          $UPX_VERSION = "4.2.4"
+          $url = "https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-win64.zip"
+          $zipPath = "$env:RUNNER_TEMP\upx.zip"
+          $extractPath = "$env:RUNNER_TEMP\upx"
+          Write-Host "📥 从 GitHub Releases 下载 UPX v${UPX_VERSION} ..."
+          Invoke-WebRequest -Uri $url -OutFile $zipPath -UseBasicParsing
+          Expand-Archive -Path $zipPath -DestinationPath $extractPath -Force
+          $upxDir = Get-ChildItem -Path $extractPath -Directory | Select-Object -First 1
+          "$($upxDir.FullName)" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8
+          $upxCmd = Join-Path $upxDir.FullName "upx.exe"
+          if (!(Test-Path $upxCmd)) {
+            Write-Error "❌ 未检测到 upx，无法保证 Windows 产物经过压缩"
+            exit 1
+          }
+          & $upxCmd --version
+
+      - name: Install Linux Dependencies
+        if: contains(matrix.platform, 'linux')
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev
+
+          if [ "${{ matrix.linux_webkit }}" = "4.1" ]; then
+            sudo apt-get install -y libwebkit2gtk-4.1-dev libsoup-3.0-dev
+          else
+            sudo apt-get install -y libwebkit2gtk-4.0-dev
+          fi
+
+          sudo apt-get install -y upx-ucl || sudo apt-get install -y upx
+          upx --version
+
+          sudo apt-get install -y libfuse2 || sudo apt-get install -y libfuse2t64 || true
+
+          LINUXDEPLOY_URL="https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+          PLUGIN_URL="https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/releases/download/continuous/linuxdeploy-plugin-gtk-x86_64.AppImage"
+
+          echo "📥 下载 linuxdeploy..."
+          wget --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=3 \
+            -O /tmp/linuxdeploy "$LINUXDEPLOY_URL" || {
+            echo "⚠️ linuxdeploy 下载失败，AppImage 打包将跳过"
+            touch /tmp/skip-appimage
+          }
+
+          echo "📥 下载 linuxdeploy-plugin-gtk..."
+          wget --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=3 \
+            -O /tmp/linuxdeploy-plugin-gtk "$PLUGIN_URL" || {
+            echo "⚠️ linuxdeploy-plugin-gtk 下载失败，AppImage 打包将跳过"
+            touch /tmp/skip-appimage
+          }
+
+          if [ ! -f /tmp/skip-appimage ]; then
+            chmod +x /tmp/linuxdeploy /tmp/linuxdeploy-plugin-gtk
+            echo "✅ AppImage 工具准备完成"
+          fi
+
+      - name: Install Wails
+        run: go install -v github.com/wailsapp/wails/v2/cmd/wails@v2.11.0
+
+      - 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,') }}
+        continue-on-error: true
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          install: >-
+            mingw-w64-ucrt-x86_64-gcc
+
+      - 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,') }}
+        shell: pwsh
+        run: |
+          function Find-MingwBin([string[]]$candidates) {
+            foreach ($bin in $candidates) {
+              if ([string]::IsNullOrWhiteSpace($bin)) {
+                continue
+              }
+              $gcc = Join-Path $bin 'gcc.exe'
+              $gxx = Join-Path $bin 'g++.exe'
+              if ((Test-Path $gcc) -and (Test-Path $gxx)) {
+                return $bin
+              }
+            }
+            return $null
+          }
+
+          $msys2Outcome = "${{ steps.msys2_duckdb.outcome }}"
+          $msys2Location = "${{ steps.msys2_duckdb.outputs['msys2-location'] }}"
+          $candidateBins = @()
+          if (-not [string]::IsNullOrWhiteSpace($msys2Location)) {
+            $candidateBins += Join-Path $msys2Location 'ucrt64\bin'
+          }
+          $candidateBins += @(
+            'C:\msys64\ucrt64\bin',
+            'D:\a\_temp\msys64\ucrt64\bin'
+          )
+          $candidateBins = @($candidateBins | Select-Object -Unique)
+
+          $mingwBin = Find-MingwBin $candidateBins
+          if (-not $mingwBin) {
+            if ($msys2Outcome -ne 'success') {
+              Write-Warning "⚠️ MSYS2 安装步骤结果为 $msys2Outcome，回退到 UCRT64 本机路径探测"
+            } else {
+              Write-Warning "⚠️ MSYS2 已执行，但未找到 UCRT64 gcc/g++，回退到本机路径探测"
+            }
+            $mingwBin = Find-MingwBin $candidateBins
+          }
+
+          if (-not $mingwBin) {
+            Write-Error "❌ 未找到可用的 DuckDB UCRT64 编译器。已检查：$($candidateBins -join ', ')"
+            exit 1
+          }
+
+          $gcc = (Join-Path $mingwBin 'gcc.exe')
+          $gxx = (Join-Path $mingwBin 'g++.exe')
+
+          if (!(Test-Path $gcc) -or !(Test-Path $gxx)) {
+            Write-Error "❌ DuckDB 编译器缺失：gcc=$gcc g++=$gxx"
+            exit 1
+          }
+
+          "$mingwBin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8
+          "CC=$gcc" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          "CXX=$gxx" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          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,') }}
+        shell: pwsh
+        run: |
+          & "$env:CC" --version
+          & "$env:CXX" --version
+
+      # ---- 生成 dev 版本号 ----
+      - name: Generate Dev Version
+        id: version
+        shell: bash
+        run: |
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          DEV_VERSION="dev-${SHORT_SHA}"
+          echo "version=${DEV_VERSION}" >> "$GITHUB_OUTPUT"
+          echo "📌 Dev 版本号: ${DEV_VERSION}"
+
+      - 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
+          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
+        if: ${{ matrix.build_optional_agents && needs.driver_agents.outputs.has_changes == 'true' }}
+        shell: bash
+        env:
+          CHANGED_DRIVER_AGENTS: ${{ needs.driver_agents.outputs.drivers }}
+        run: |
+          set -euo pipefail
+          TARGET_PLATFORM="${{ matrix.platform }}"
+          GOOS="${TARGET_PLATFORM%%/*}"
+          GOARCH="${TARGET_PLATFORM##*/}"
+          IFS=',' read -r -a DRIVERS <<< "$CHANGED_DRIVER_AGENTS"
+          OUTDIR="drivers/${{ matrix.os_name }}"
+          mkdir -p "$OUTDIR"
+          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"
+
+          prepare_duckdb_windows_library() {
+            local lib_dir="$RUNNER_TEMP/duckdb-windows-${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
+              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"
+          }
+
+          for DRIVER in "${DRIVERS[@]}"; do
+            BUILD_DRIVER="$DRIVER"
+            if [ "$DRIVER" = "doris" ]; then
+              BUILD_DRIVER="diros"
+            fi
+            if [ "$DRIVER" = "duckdb" ] && [ "$GOOS" = "windows" ] && [ "$GOARCH" != "amd64" ]; then
+              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"
+            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"
+              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=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}"
+          done
+
+      # macOS Packaging
+      - name: Package macOS DMG
+        if: contains(matrix.platform, 'darwin')
+        run: |
+          brew install create-dmg
+          VERSION="${{ steps.version.outputs.version }}"
+          cd build/bin
+          
+          APP_PATH=$(find . -maxdepth 1 -name "*.app" | head -n 1)
+          if [ -z "$APP_PATH" ]; then
+            echo "❌ 未找到 .app 应用包!"
+            exit 1
+          fi
+          APP_NAME=$(basename "$APP_PATH")
+
+          APP_BIN=$(find "$APP_PATH/Contents/MacOS" -maxdepth 1 -type f | head -n 1)
+          if [ -z "$APP_BIN" ]; then
+            echo "❌ 未找到 macOS 应用主程序!"
+            exit 1
+          fi
+          echo "ℹ️ macOS 产物不执行 UPX 压缩，保留原始主程序。"
+          
+          echo "🔏 正在进行 Ad-hoc 签名..."
+          if command -v xattr >/dev/null 2>&1; then
+            xattr -cr "$APP_NAME" || true
+          fi
+          codesign --force --deep --sign - "$APP_NAME"
+          
+          DMG_NAME="${{ matrix.build_name }}.dmg"
+          FINAL_NAME="GoNavi-${VERSION}-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}.dmg"
+          echo "📦 正在生成 DMG: $DMG_NAME..."
+          
+          create-dmg \
+            --volname "GoNavi Dev Build" \
+            --window-pos 200 120 \
+            --window-size 800 400 \
+            --icon-size 100 \
+            --icon "$APP_NAME" 200 190 \
+            --hide-extension "$APP_NAME" \
+            --app-drop-link 600 185 \
+            "$DMG_NAME" \
+            "$APP_NAME"
+
+          VERIFY_MOUNT_DIR=$(mktemp -d "${TMPDIR:-/tmp}/gonavi-dev-verify.XXXXXX")
+          hdiutil attach -nobrowse -readonly -mountpoint "$VERIFY_MOUNT_DIR" "$DMG_NAME" >/dev/null
+          PACKAGED_APP=$(find "$VERIFY_MOUNT_DIR" -maxdepth 1 -name "*.app" | head -n 1)
+          if [ -z "$PACKAGED_APP" ]; then
+            echo "❌ DMG 内未找到 .app 应用包!"
+            hdiutil detach "$VERIFY_MOUNT_DIR" -quiet >/dev/null 2>&1 || true
+            exit 1
+          fi
+          codesign --verify --deep --strict --verbose=4 "$PACKAGED_APP"
+          hdiutil detach "$VERIFY_MOUNT_DIR" -quiet >/dev/null 2>&1 || true
+            
+          mv "$DMG_NAME" "../../$FINAL_NAME"
+
+      # Windows Packaging
+      - name: Package Windows EXE
+        if: contains(matrix.platform, 'windows')
+        shell: pwsh
+        run: |
+          Set-Location build/bin
+          $version = "${{ steps.version.outputs.version }}"
+          $target = "${{ matrix.build_name }}"
+          $finalExeName = "GoNavi-$version-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}.exe"
+
+          if (Test-Path "$target.exe") {
+              $finalExe = "$target.exe"
+          } elseif (Test-Path "$target") {
+              Rename-Item -Path "$target" -NewName "$target.exe"
+              $finalExe = "$target.exe"
+          } else {
+              Write-Error "❌ 未找到构建产物 '$target'!"
+              exit 1
+          }
+
+          $isArm64Target = "${{ matrix.arch_name }}".ToLowerInvariant() -eq "arm64"
+          if ($isArm64Target) {
+              Write-Warning "⚠️ UPX 当前不支持 win64/arm64，跳过压缩并保留原始 EXE。"
+              $LASTEXITCODE = 0
+          } else {
+              $upxCmd = Get-Command upx -ErrorAction SilentlyContinue
+              if ($null -eq $upxCmd) {
+                  Write-Error "❌ 未找到 upx，无法保证 Windows 产物经过压缩"
+                  exit 1
+              }
+              $beforeBytes = (Get-Item -LiteralPath $finalExe).Length
+              Write-Host "🗜️ 使用 UPX 压缩 $finalExe ..."
+              & upx --best --lzma --force $finalExe | Out-Host
+              if ($LASTEXITCODE -ne 0) {
+                  Write-Error "❌ UPX 压缩失败（$LASTEXITCODE）"
+                  exit 1
+              }
+              & upx -t $finalExe | Out-Host
+              if ($LASTEXITCODE -ne 0) {
+                  Write-Error "❌ UPX 校验失败（$LASTEXITCODE）"
+                  exit 1
+              }
+              $afterBytes = (Get-Item -LiteralPath $finalExe).Length
+              if ($afterBytes -lt $beforeBytes) {
+                  $savedBytes = $beforeBytes - $afterBytes
+                  Write-Host ("✅ UPX 压缩完成：{0:N2}MB -> {1:N2}MB，减少 {2:N2}MB" -f ($beforeBytes / 1MB), ($afterBytes / 1MB), ($savedBytes / 1MB))
+              } else {
+                  Write-Host ("ℹ️ UPX 压缩完成：{0:N2}MB -> {1:N2}MB" -f ($beforeBytes / 1MB), ($afterBytes / 1MB))
+              }
+          }
+
+          Write-Host "📦 输出 Windows 可执行文件 $finalExeName..."
+          Copy-Item -LiteralPath $finalExe -Destination "..\\..\\$finalExeName" -Force
+
+      # Linux Packaging
+      - name: Package Linux
+        if: contains(matrix.platform, 'linux')
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          cd build/bin
+          TARGET="${{ matrix.build_name }}"
+          TAR_NAME="GoNavi-$VERSION-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}.tar.gz"
+          APPIMAGE_NAME="GoNavi-$VERSION-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}.AppImage"
+
+          if [ ! -f "$TARGET" ]; then
+              echo "❌ 未找到构建产物 '$TARGET'!"
+              exit 1
+          fi
+
+          chmod +x "$TARGET"
+          BEFORE_BYTES=$(wc -c <"$TARGET" | tr -d '[:space:]')
+          echo "🗜️ 正在使用 UPX 压缩 Linux 可执行文件: $TARGET ..."
+          upx --best --lzma --force "$TARGET"
+          upx -t "$TARGET"
+          AFTER_BYTES=$(wc -c <"$TARGET" | tr -d '[:space:]')
+          if [ "$AFTER_BYTES" -lt "$BEFORE_BYTES" ]; then
+              SAVED_BYTES=$((BEFORE_BYTES - AFTER_BYTES))
+              awk -v b="$BEFORE_BYTES" -v a="$AFTER_BYTES" -v s="$SAVED_BYTES" 'BEGIN { printf "✅ Linux UPX 压缩完成：%.2fMB -> %.2fMB，减少 %.2fMB\n", b/1024/1024, a/1024/1024, s/1024/1024 }'
+          else
+              awk -v b="$BEFORE_BYTES" -v a="$AFTER_BYTES" 'BEGIN { printf "ℹ️ Linux UPX 压缩完成：%.2fMB -> %.2fMB\n", b/1024/1024, a/1024/1024 }'
+          fi
+
+          echo "📦 正在打包 $TAR_NAME..."
+          tar -czvf "$TAR_NAME" "$TARGET"
+          mv "$TAR_NAME" ../../
+
+          if [ -f /tmp/skip-appimage ]; then
+              echo "⚠️ 跳过 AppImage 打包"
+              exit 0
+          fi
+
+          echo "📦 正在生成 AppImage..."
+          mkdir -p AppDir/usr/bin
+          mkdir -p AppDir/usr/share/applications
+          mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps
+
+          cp "$TARGET" AppDir/usr/bin/gonavi
+
+          printf '%s\n' \
+            '[Desktop Entry]' \
+            'Name=GoNavi' \
+            'Exec=gonavi' \
+            'Icon=gonavi' \
+            'Type=Application' \
+            'Categories=Development;Database;' \
+            'Comment=Database Management Tool' \
+            > AppDir/usr/share/applications/gonavi.desktop
+
+          cp AppDir/usr/share/applications/gonavi.desktop AppDir/gonavi.desktop
+
+          if [ -f "../../build/appicon.png" ]; then
+              cp "../../build/appicon.png" AppDir/usr/share/icons/hicolor/256x256/apps/gonavi.png
+              cp "../../build/appicon.png" AppDir/gonavi.png
+          else
+              convert -size 256x256 xc:#336791 -fill white -gravity center -pointsize 48 -annotate 0 "GoNavi" AppDir/gonavi.png || \
+              wget -q "https://via.placeholder.com/256/336791/FFFFFF?text=GoNavi" -O AppDir/gonavi.png || \
+              touch AppDir/gonavi.png
+              cp AppDir/gonavi.png AppDir/usr/share/icons/hicolor/256x256/apps/gonavi.png
+          fi
+
+          export DEPLOY_GTK_VERSION=3
+          /tmp/linuxdeploy --appdir AppDir --plugin gtk --output appimage || {
+              echo "⚠️ AppImage 生成失败，但 tar.gz 已成功生成"
+              exit 0
+          }
+
+          mv GoNavi*.AppImage "$APPIMAGE_NAME" 2>/dev/null || {
+              echo "⚠️ AppImage 重命名失败"
+              exit 0
+          }
+
+          if [ -f "$APPIMAGE_NAME" ]; then
+              mv "$APPIMAGE_NAME" ../../
+              echo "✅ AppImage 生成成功"
+          fi
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: dev-build-artifacts-${{ strategy.job-index }}
+          path: |
+            GoNavi-*.dmg
+            GoNavi-*.exe
+            GoNavi-*.tar.gz
+            GoNavi-*.AppImage
+            drivers/**
+          retention-days: 7
+
+  # 汇总所有产物并发布为 Pre-release
+  release:
+    name: Publish Dev Pre-release
+    needs:
+      - build
+      - driver_agents
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Download All Artifacts
+        uses: actions/download-artifact@v7
+        with:
+          path: release-assets
+          pattern: dev-build-artifacts-*
+          merge-multiple: true
+
+      - name: List Assets
+        run: ls -R release-assets
+
+      - name: Complete Driver Agent Assets
+        if: needs.driver_agents.outputs.has_changes == 'true'
+        env:
+          DRIVER_RELEASE_TOKEN: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+        run: |
+          python3 tools/complete-driver-release-assets.py \
+            --assets-dir release-assets \
+            --source "${{ needs.driver_agents.outputs.release_source }}" \
+            --require-complete
+
+      - name: Package Driver Agents Bundle
+        id: driver_assets
+        shell: bash
+        run: |
+          set -euo pipefail
+          cd release-assets
+          if [ ! -d drivers ]; then
+            echo "⚠️ 未找到 drivers 目录，跳过驱动总包打包"
+            echo "has_driver_assets=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          if [ -z "$(find drivers -type f 2>/dev/null | head -n 1)" ]; then
+            echo "⚠️ drivers 目录为空，跳过驱动总包打包"
+            rm -rf drivers
+            echo "has_driver_assets=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          echo "📦 打包驱动总包：GoNavi-DriverAgents.zip"
+          python3 - <<'PY'
+          import json
+          import os
+          import shutil
+          import zipfile
+          from pathlib import Path
+
+          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
+
+          rm -rf drivers
+          echo "has_driver_assets=true" >> "$GITHUB_OUTPUT"
+
+      - name: Generate SHA256SUMS
+        shell: bash
+        run: |
+          cd release-assets
+          FILES=()
+          while IFS= read -r file; do
+            if [ -n "$file" ]; then
+              FILES+=("$file")
+            fi
+          done < <(find . -maxdepth 1 -type f ! -name SHA256SUMS -exec basename {} \; | sort)
+          if [ ${#FILES[@]} -eq 0 ]; then
+            echo "⚠️ 未找到可签名资产，生成空 SHA256SUMS"
+            : > SHA256SUMS
+          else
+            sha256sum "${FILES[@]}" > SHA256SUMS
+          fi
+
+      - name: Generate Driver SHA256SUMS
+        if: steps.driver_assets.outputs.has_driver_assets == 'true'
+        shell: bash
+        run: |
+          cd driver-release-assets
+          FILES=()
+          while IFS= read -r file; do
+            if [ -n "$file" ]; then
+              FILES+=("$file")
+            fi
+          done < <(find . -maxdepth 1 -type f ! -name SHA256SUMS -exec basename {} \; | sort)
+          if [ ${#FILES[@]} -eq 0 ]; then
+            echo "❌ 未找到驱动发布资产"
+            exit 1
+          fi
+          sha256sum "${FILES[@]}" > SHA256SUMS
+
+      - name: Generate Dev Version
+        id: version
+        run: |
+          SHORT_SHA="${GITHUB_SHA:0:7}"
+          DEV_VERSION="dev-${SHORT_SHA}"
+          echo "version=${DEV_VERSION}" >> "$GITHUB_OUTPUT"
+
+      - name: Format Build Time
+        id: build_time
+        shell: bash
+        run: |
+          python3 - <<'PY' >> "$GITHUB_OUTPUT"
+          from datetime import datetime, timezone, timedelta
+
+          raw = "${{ github.event.head_commit.timestamp }}"
+          dt = datetime.fromisoformat(raw)
+          china_tz = timezone(timedelta(hours=8))
+          formatted = dt.astimezone(china_tz).strftime("%Y-%m-%d %H:%M:%S")
+          print(f"display={formatted}")
+          PY
+
+      # 删除旧的 dev pre-release（保持只有最新一个）
+      - name: Reset Previous Dev Release
+        uses: actions/github-script@v8
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const tag = 'dev-latest';
+            const ref = `tags/${tag}`;
+            const { owner, repo } = context.repo;
+            const releases = await github.paginate(github.rest.repos.listReleases, {
+              owner,
+              repo,
+              per_page: 100,
+            });
+
+            const matchedReleases = releases.filter((release) => release.tag_name === tag);
+            if (matchedReleases.length === 0) {
+              core.info(`No existing releases found for tag ${tag}`);
+            } else {
+              for (const release of matchedReleases) {
+                core.info(`Deleting release ${release.id} (${release.name || 'unnamed'}) for tag ${tag}`);
+                await github.rest.repos.deleteRelease({
+                  owner,
+                  repo,
+                  release_id: release.id,
+                });
+              }
+            }
+
+            try {
+              await github.rest.git.deleteRef({
+                owner,
+                repo,
+                ref,
+              });
+              core.info(`Deleted ref ${ref}`);
+            } catch (error) {
+              const message = String(error.response?.data?.message || error.message || '');
+              if (error.status === 404 || (error.status === 422 && message.includes('Reference does not exist'))) {
+                core.info(`No existing ref found for ${ref}`);
+              } else {
+                throw error;
+              }
+            }
+
+      - name: Reset Previous Driver Dev Release
+        if: steps.driver_assets.outputs.has_driver_assets == 'true'
+        uses: actions/github-script@v8
+        with:
+          github-token: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+          script: |
+            const tag = 'dev-latest';
+            const ref = `tags/${tag}`;
+            const [owner, repo] = 'Syngnat/GoNavi-DriverAgents'.split('/');
+            const releases = await github.paginate(github.rest.repos.listReleases, {
+              owner,
+              repo,
+              per_page: 100,
+            });
+
+            const matchedReleases = releases.filter((release) => release.tag_name === tag);
+            if (matchedReleases.length === 0) {
+              core.info(`No existing driver releases found for tag ${tag}`);
+            } else {
+              for (const release of matchedReleases) {
+                core.info(`Deleting driver release ${release.id} (${release.name || 'unnamed'}) for tag ${tag}`);
+                await github.rest.repos.deleteRelease({
+                  owner,
+                  repo,
+                  release_id: release.id,
+                });
+              }
+            }
+
+            try {
+              await github.rest.git.deleteRef({
+                owner,
+                repo,
+                ref,
+              });
+              core.info(`Deleted driver ref ${ref}`);
+            } catch (error) {
+              const message = String(error.response?.data?.message || error.message || '');
+              if (error.status === 404 || (error.status === 422 && message.includes('Reference does not exist'))) {
+                core.info(`No existing driver ref found for ${ref}`);
+              } else {
+                throw error;
+              }
+            }
+
+      - 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: |
+            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 }}
+
+      - name: Create Dev Pre-release
+        uses: softprops/action-gh-release@v3
+        with:
+          tag_name: dev-latest
+          name: "🧪 Dev Build (${{ steps.version.outputs.version }})"
+          target_commitish: ${{ github.sha }}
+          files: release-assets/*
+          prerelease: true
+          draft: false
+          body: |
+            ## 🧪 测试版本 (Dev Build)
+
+            **版本**: `${{ steps.version.outputs.version }}`
+            **分支**: `dev`
+            **提交**: [`${{ github.sha }}`](${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }})
+            **构建时间**: ${{ steps.build_time.outputs.display }}
+
+            > ⚠️ 这是开发测试版本，仅供内部测试使用，不建议用于生产环境。
+            > 每次 push 到 `dev` 分支会自动覆盖此 release。
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/release-winget.yml
+++ b/.github/workflows/release-winget.yml
@@ -12,7 +12,7 @@ on:

 jobs:
  publish:
-    runs-on: windows-latest
+    runs-on: windows-2025-vs2026
    steps:
      - uses: vedantmgoyal9/winget-releaser@v2
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,9 +9,100 @@ permissions:
  contents: write

 jobs:
+  frontend:
+    name: Build frontend
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Setup Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: '1.24'
+
+      - name: Setup Node
+        uses: actions/setup-node@v5
+        with:
+          node-version: '20'
+          cache: 'npm'
+          cache-dependency-path: frontend/package-lock.json
+
+      - name: Cache frontend node_modules
+        uses: actions/cache@v5
+        with:
+          path: frontend/node_modules
+          key: ${{ runner.os }}-node20-frontend-${{ hashFiles('frontend/package-lock.json') }}
+
+      - name: Install Wails
+        run: go install -v github.com/wailsapp/wails/v2/cmd/wails@v2.11.0
+
+      - name: Build frontend dist
+        shell: bash
+        run: |
+          set -euo pipefail
+          mkdir -p frontend/dist
+          printf '<!doctype html><title>GoNavi</title>\n' > frontend/dist/index.html
+          wails generate module
+          node frontend/scripts/wails-frontend-install.mjs
+          npm --prefix frontend run build
+
+      - name: Pack frontend dist
+        shell: bash
+        run: tar -cf frontend-dist.tar -C frontend/dist .
+
+      - name: Upload frontend dist
+        uses: actions/upload-artifact@v6
+        with:
+          name: frontend-dist
+          path: frontend-dist.tar
+          if-no-files-found: error
+          retention-days: 1
+
+  driver_agents:
+    name: Detect changed driver agents
+    runs-on: ubuntu-latest
+    outputs:
+      drivers: ${{ steps.detect.outputs.drivers }}
+      has_changes: ${{ steps.detect.outputs.has_changes }}
+      release_source: ${{ steps.detect.outputs.release_source }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Detect changed driver agents
+        id: detect
+        shell: bash
+        run: |
+          set -euo pipefail
+          git fetch --force --tags
+          PREV_TAG="$(git describe --tags --match 'v*' --abbrev=0 "${GITHUB_SHA}^" 2>/dev/null || true)"
+          if [ -n "$PREV_TAG" ]; then
+            BASE_REF="$PREV_TAG"
+            RELEASE_SOURCE="$PREV_TAG"
+          else
+            BASE_REF="all"
+            RELEASE_SOURCE="all"
+          fi
+          DRIVERS="$(bash ./tools/detect-changed-driver-agents.sh --base "$BASE_REF" --head "$GITHUB_SHA")"
+          echo "drivers=${DRIVERS}" >> "$GITHUB_OUTPUT"
+          echo "release_source=${RELEASE_SOURCE}" >> "$GITHUB_OUTPUT"
+          if [ -n "$DRIVERS" ]; then
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+            echo "🧭 Changed driver agents since ${BASE_REF}: $DRIVERS"
+          else
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+            echo "🧭 No driver-agent changes since ${BASE_REF}"
+          fi
+
  # Phase 1: Build in parallel and output artifacts
  build:
    name: Build ${{ matrix.platform }}
+    needs:
+      - frontend
+      - driver_agents
    runs-on: ${{ matrix.os }}
    strategy:
      fail-fast: false
@@ -19,45 +110,122 @@ jobs:
        include:
          - os: macos-latest
            platform: darwin/amd64
-            artifact_name: GoNavi-mac-amd64
-            asset_ext: .dmg
+            os_name: MacOS
+            arch_name: Amd64
+            build_name: gonavi-build-darwin-amd64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: ""
          - os: macos-latest
            platform: darwin/arm64
-            artifact_name: GoNavi-mac-arm64
-            asset_ext: .dmg
-          - os: windows-latest
+            os_name: MacOS
+            arch_name: Arm64
+            build_name: gonavi-build-darwin-arm64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: ""
+          - os: windows-2025-vs2026
            platform: windows/amd64
-            artifact_name: GoNavi-windows-amd64
-            asset_ext: .exe
-          - os: windows-latest
+            os_name: Windows
+            arch_name: Amd64
+            build_name: gonavi-build-windows-amd64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: ""
+          - os: windows-2025-vs2026
            platform: windows/arm64
-            artifact_name: GoNavi-windows-arm64
-            asset_ext: .exe
+            os_name: Windows
+            arch_name: Arm64
+            build_name: gonavi-build-windows-arm64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: ""
          - os: ubuntu-22.04
            platform: linux/amd64
-            artifact_name: GoNavi-linux-amd64
+            os_name: Linux
+            arch_name: Amd64
+            build_name: gonavi-build-linux-amd64
+            wails_tags: ""
+            artifact_suffix: ""
+            build_optional_agents: true
+            linux_webkit: "4.0"
+          # Debian 13 (trixie) 默认仓库已切到 WebKitGTK 4.1：单独提供 4.1 变体产物
+          - os: ubuntu-24.04
+            platform: linux/amd64
+            os_name: Linux
+            arch_name: Amd64
+            build_name: gonavi-build-linux-amd64-webkit41
+            wails_tags: "webkit2_41"
+            artifact_suffix: "-WebKit41"
+            build_optional_agents: false
+            linux_webkit: "4.1"

    steps:
      - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5

      - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
        with:
          go-version: '1.24'
-          check-latest: true

-      - name: Setup Node
-        uses: actions/setup-node@v4
+      - name: Download frontend dist
+        uses: actions/download-artifact@v7
        with:
-          node-version: '20'
+          name: frontend-dist
+          path: .
+
+      - 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/dist/index.html
+
+      - name: Install UPX (Windows)
+        if: matrix.platform == 'windows/amd64'
+        shell: pwsh
+        run: |
+          $UPX_VERSION = "4.2.4"
+          $url = "https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-win64.zip"
+          $zipPath = "$env:RUNNER_TEMP\upx.zip"
+          $extractPath = "$env:RUNNER_TEMP\upx"
+          Write-Host "📥 从 GitHub Releases 下载 UPX v${UPX_VERSION} ..."
+          Invoke-WebRequest -Uri $url -OutFile $zipPath -UseBasicParsing
+          Expand-Archive -Path $zipPath -DestinationPath $extractPath -Force
+          $upxDir = Get-ChildItem -Path $extractPath -Directory | Select-Object -First 1
+          "$($upxDir.FullName)" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8
+          $upxCmd = Join-Path $upxDir.FullName "upx.exe"
+          if (!(Test-Path $upxCmd)) {
+            Write-Error "❌ 未检测到 upx，无法保证 Windows 产物经过压缩"
+            exit 1
+          }
+          & $upxCmd --version

      # Linux Dependencies (GTK3, WebKit2GTK required by Wails)
      - name: Install Linux Dependencies
        if: contains(matrix.platform, 'linux')
        run: |
          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libfuse2
+          sudo apt-get install -y libgtk-3-dev
+
+          # WebKitGTK 4.1 需要 libsoup3；4.0 使用 libsoup2（通常由 webkit2gtk dev 包拉起）
+          if [ "${{ matrix.linux_webkit }}" = "4.1" ]; then
+            sudo apt-get install -y libwebkit2gtk-4.1-dev libsoup-3.0-dev
+          else
+            sudo apt-get install -y libwebkit2gtk-4.0-dev
+          fi
+
+          sudo apt-get install -y upx-ucl || sudo apt-get install -y upx
+          upx --version
+
+          # AppImage 运行/打包可能需要 FUSE2。不同发行版/版本包名不同，做兼容兜底。
+          sudo apt-get install -y libfuse2 || sudo apt-get install -y libfuse2t64 || true

          # Download linuxdeploy tools for AppImage packaging
          LINUXDEPLOY_URL="https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
@@ -83,18 +251,190 @@ jobs:
          fi

      - name: Install Wails
-        run: go install -v github.com/wailsapp/wails/v2/cmd/wails@latest
+        run: go install -v github.com/wailsapp/wails/v2/cmd/wails@v2.11.0
+
+      - 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,') }}
+        continue-on-error: true
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          install: >-
+            mingw-w64-ucrt-x86_64-gcc
+
+      - 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,') }}
+        shell: pwsh
+        run: |
+          function Find-MingwBin([string[]]$candidates) {
+            foreach ($bin in $candidates) {
+              if ([string]::IsNullOrWhiteSpace($bin)) {
+                continue
+              }
+              $gcc = Join-Path $bin 'gcc.exe'
+              $gxx = Join-Path $bin 'g++.exe'
+              if ((Test-Path $gcc) -and (Test-Path $gxx)) {
+                return $bin
+              }
+            }
+            return $null
+          }
+
+          $msys2Outcome = "${{ steps.msys2_duckdb.outcome }}"
+          $msys2Location = "${{ steps.msys2_duckdb.outputs['msys2-location'] }}"
+          $candidateBins = @()
+          if (-not [string]::IsNullOrWhiteSpace($msys2Location)) {
+            $candidateBins += Join-Path $msys2Location 'ucrt64\bin'
+          }
+          $candidateBins += @(
+            'C:\msys64\ucrt64\bin',
+            'D:\a\_temp\msys64\ucrt64\bin'
+          )
+          $candidateBins = @($candidateBins | Select-Object -Unique)
+
+          $mingwBin = Find-MingwBin $candidateBins
+          if (-not $mingwBin) {
+            if ($msys2Outcome -ne 'success') {
+              Write-Warning "⚠️ MSYS2 安装步骤结果为 $msys2Outcome，回退到 UCRT64 本机路径探测"
+            } else {
+              Write-Warning "⚠️ MSYS2 已执行，但未找到 UCRT64 gcc/g++，回退到本机路径探测"
+            }
+            $mingwBin = Find-MingwBin $candidateBins
+          }
+
+          if (-not $mingwBin) {
+            Write-Error "❌ 未找到可用的 DuckDB UCRT64 编译器。已检查：$($candidateBins -join ', ')"
+            exit 1
+          }
+
+          $gcc = (Join-Path $mingwBin 'gcc.exe')
+          $gxx = (Join-Path $mingwBin 'g++.exe')
+
+          if (!(Test-Path $gcc) -or !(Test-Path $gxx)) {
+            Write-Error "❌ DuckDB 编译器缺失：gcc=$gcc g++=$gxx"
+            exit 1
+          }
+
+          "$mingwBin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8
+          "CC=$gcc" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          "CXX=$gxx" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          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,') }}
+        shell: pwsh
+        run: |
+          & "$env:CC" --version
+          & "$env:CXX" --version

      - name: Build
        shell: bash
+        env:
+          CHANGED_DRIVER_AGENTS: ${{ needs.driver_agents.outputs.drivers }}
        run: |
-          wails build -platform ${{ matrix.platform }} -clean -o ${{ matrix.artifact_name }} -ldflags "-X GoNavi-Wails/internal/app.AppVersion=${{ github.ref_name }}"
+          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
+          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
+        if: ${{ matrix.build_optional_agents && needs.driver_agents.outputs.has_changes == 'true' }}
+        shell: bash
+        env:
+          CHANGED_DRIVER_AGENTS: ${{ needs.driver_agents.outputs.drivers }}
+        run: |
+          set -euo pipefail
+          TARGET_PLATFORM="${{ matrix.platform }}"
+          GOOS="${TARGET_PLATFORM%%/*}"
+          GOARCH="${TARGET_PLATFORM##*/}"
+          IFS=',' read -r -a DRIVERS <<< "$CHANGED_DRIVER_AGENTS"
+          OUTDIR="drivers/${{ matrix.os_name }}"
+          mkdir -p "$OUTDIR"
+          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"
+
+          prepare_duckdb_windows_library() {
+            local lib_dir="$RUNNER_TEMP/duckdb-windows-${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
+              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"
+          }
+
+          for DRIVER in "${DRIVERS[@]}"; do
+            BUILD_DRIVER="$DRIVER"
+            if [ "$DRIVER" = "doris" ]; then
+              BUILD_DRIVER="diros"
+            fi
+            if [ "$DRIVER" = "duckdb" ] && [ "$GOOS" = "windows" ] && [ "$GOARCH" != "amd64" ]; then
+              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"
+            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"
+              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=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}"
+          done

      # macOS Packaging
      - name: Package macOS DMG
        if: contains(matrix.platform, 'darwin')
        run: |
          brew install create-dmg
+          VERSION="${{ github.ref_name }}"
+          VERSION="${VERSION#v}"
          cd build/bin
          
          APP_PATH=$(find . -maxdepth 1 -name "*.app" | head -n 1)
@@ -103,11 +443,24 @@ jobs:
            exit 1
          fi
          APP_NAME=$(basename "$APP_PATH")
+
+          APP_BIN=$(find "$APP_PATH/Contents/MacOS" -maxdepth 1 -type f | head -n 1)
+          if [ -z "$APP_BIN" ]; then
+            echo "❌ 未找到 macOS 应用主程序!"
+            exit 1
+          fi
+          echo "ℹ️ macOS 产物不执行 UPX 压缩，保留原始主程序。"
          
          echo "🔏 正在进行 Ad-hoc 签名..."
-          codesign --force --options runtime --deep --sign - "$APP_NAME"
+          # 注意：Ad-hoc + hardened runtime（--options runtime）在未配置 entitlements 时，
+          # 可能导致部分 macOS 机型上应用双击无响应。这里保持 Ad-hoc 深签名但禁用 runtime hardened。
+          if command -v xattr >/dev/null 2>&1; then
+            xattr -cr "$APP_NAME" || true
+          fi
+          codesign --force --deep --sign - "$APP_NAME"
          
-          DMG_NAME="${{ matrix.artifact_name }}.dmg"
+          DMG_NAME="${{ matrix.build_name }}.dmg"
+          FINAL_NAME="GoNavi-$VERSION-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}.dmg"
          echo "📦 正在生成 DMG: $DMG_NAME..."
          
          create-dmg \
@@ -120,36 +473,87 @@ jobs:
            --app-drop-link 600 185 \
            "$DMG_NAME" \
            "$APP_NAME"
+
+          VERIFY_MOUNT_DIR=$(mktemp -d "${TMPDIR:-/tmp}/gonavi-release-verify.XXXXXX")
+          hdiutil attach -nobrowse -readonly -mountpoint "$VERIFY_MOUNT_DIR" "$DMG_NAME" >/dev/null
+          PACKAGED_APP=$(find "$VERIFY_MOUNT_DIR" -maxdepth 1 -name "*.app" | head -n 1)
+          if [ -z "$PACKAGED_APP" ]; then
+            echo "❌ DMG 内未找到 .app 应用包!"
+            hdiutil detach "$VERIFY_MOUNT_DIR" -quiet >/dev/null 2>&1 || true
+            exit 1
+          fi
+          codesign --verify --deep --strict --verbose=4 "$PACKAGED_APP"
+          hdiutil detach "$VERIFY_MOUNT_DIR" -quiet >/dev/null 2>&1 || true
            
-          mv "$DMG_NAME" ../../
+          mv "$DMG_NAME" "../../$FINAL_NAME"

      # Windows Packaging
-      - name: Prepare Windows Exe
+      - name: Package Windows EXE
        if: contains(matrix.platform, 'windows')
-        shell: bash
+        shell: pwsh
        run: |
-          cd build/bin
-          TARGET="${{ matrix.artifact_name }}"
-          
-          if [ -f "$TARGET.exe" ]; then
-              FINAL_EXE="$TARGET.exe"
-          elif [ -f "$TARGET" ]; then
-              mv "$TARGET" "$TARGET.exe"
-              FINAL_EXE="$TARGET.exe"
-          else
-              echo "❌ 未找到构建产物 '$TARGET'!"
+          Set-Location build/bin
+          $version = "${{ github.ref_name }}"
+          if ($version.StartsWith("v")) {
+              $version = $version.Substring(1)
+          }
+          $target = "${{ matrix.build_name }}"
+          $finalExeName = "GoNavi-$version-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}.exe"
+
+          if (Test-Path "$target.exe") {
+              $finalExe = "$target.exe"
+          } elseif (Test-Path "$target") {
+              Rename-Item -Path "$target" -NewName "$target.exe"
+              $finalExe = "$target.exe"
+          } else {
+              Write-Error "❌ 未找到构建产物 '$target'!"
              exit 1
-          fi
-          
-          echo "📦 正在移动 $FINAL_EXE 到根目录..."
-          mv "$FINAL_EXE" "../../$FINAL_EXE"
+          }
+
+          $isArm64Target = "${{ matrix.arch_name }}".ToLowerInvariant() -eq "arm64"
+          if ($isArm64Target) {
+              Write-Warning "⚠️ UPX 当前不支持 win64/arm64，跳过压缩并保留原始 EXE。"
+              $LASTEXITCODE = 0
+          } else {
+              $upxCmd = Get-Command upx -ErrorAction SilentlyContinue
+              if ($null -eq $upxCmd) {
+                  Write-Error "❌ 未找到 upx，无法保证 Windows 产物经过压缩"
+                  exit 1
+              }
+              $beforeBytes = (Get-Item -LiteralPath $finalExe).Length
+              Write-Host "🗜️ 使用 UPX 压缩 $finalExe ..."
+              & upx --best --lzma --force $finalExe | Out-Host
+              if ($LASTEXITCODE -ne 0) {
+                  Write-Error "❌ UPX 压缩失败（$LASTEXITCODE）"
+                  exit 1
+              }
+              & upx -t $finalExe | Out-Host
+              if ($LASTEXITCODE -ne 0) {
+                  Write-Error "❌ UPX 校验失败（$LASTEXITCODE）"
+                  exit 1
+              }
+              $afterBytes = (Get-Item -LiteralPath $finalExe).Length
+              if ($afterBytes -lt $beforeBytes) {
+                  $savedBytes = $beforeBytes - $afterBytes
+                  Write-Host ("✅ UPX 压缩完成：{0:N2}MB -> {1:N2}MB，减少 {2:N2}MB" -f ($beforeBytes / 1MB), ($afterBytes / 1MB), ($savedBytes / 1MB))
+              } else {
+                  Write-Host ("ℹ️ UPX 压缩完成：{0:N2}MB -> {1:N2}MB" -f ($beforeBytes / 1MB), ($afterBytes / 1MB))
+              }
+          }
+
+          Write-Host "📦 输出 Windows 可执行文件 $finalExeName..."
+          Copy-Item -LiteralPath $finalExe -Destination "..\\..\\$finalExeName" -Force

      # Linux Packaging (tar.gz and AppImage)
      - name: Package Linux
        if: contains(matrix.platform, 'linux')
        run: |
+          VERSION="${{ github.ref_name }}"
+          VERSION="${VERSION#v}"
          cd build/bin
-          TARGET="${{ matrix.artifact_name }}"
+          TARGET="${{ matrix.build_name }}"
+          TAR_NAME="GoNavi-$VERSION-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}.tar.gz"
+          APPIMAGE_NAME="GoNavi-$VERSION-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}.AppImage"

          if [ ! -f "$TARGET" ]; then
              echo "❌ 未找到构建产物 '$TARGET'!"
@@ -157,11 +561,22 @@ jobs:
          fi

          chmod +x "$TARGET"
+          BEFORE_BYTES=$(wc -c <"$TARGET" | tr -d '[:space:]')
+          echo "🗜️ 正在使用 UPX 压缩 Linux 可执行文件: $TARGET ..."
+          upx --best --lzma --force "$TARGET"
+          upx -t "$TARGET"
+          AFTER_BYTES=$(wc -c <"$TARGET" | tr -d '[:space:]')
+          if [ "$AFTER_BYTES" -lt "$BEFORE_BYTES" ]; then
+              SAVED_BYTES=$((BEFORE_BYTES - AFTER_BYTES))
+              awk -v b="$BEFORE_BYTES" -v a="$AFTER_BYTES" -v s="$SAVED_BYTES" 'BEGIN { printf "✅ Linux UPX 压缩完成：%.2fMB -> %.2fMB，减少 %.2fMB\n", b/1024/1024, a/1024/1024, s/1024/1024 }'
+          else
+              awk -v b="$BEFORE_BYTES" -v a="$AFTER_BYTES" 'BEGIN { printf "ℹ️ Linux UPX 压缩完成：%.2fMB -> %.2fMB\n", b/1024/1024, a/1024/1024 }'
+          fi

          # 1. Create tar.gz
-          echo "📦 正在打包 $TARGET.tar.gz..."
-          tar -czvf "$TARGET.tar.gz" "$TARGET"
-          mv "$TARGET.tar.gz" ../../
+          echo "📦 正在打包 $TAR_NAME..."
+          tar -czvf "$TAR_NAME" "$TARGET"
+          mv "$TAR_NAME" ../../

          # 2. Create AppImage (skip for ARM64 or if tools unavailable)
          if [ -f /tmp/skip-appimage ]; then
@@ -211,19 +626,19 @@ jobs:
          }

          # Rename output
-          mv GoNavi*.AppImage "$TARGET.AppImage" 2>/dev/null || {
+          mv GoNavi*.AppImage "$APPIMAGE_NAME" 2>/dev/null || {
              echo "⚠️ AppImage 重命名失败"
              exit 0
          }

-          if [ -f "$TARGET.AppImage" ]; then
-              mv "$TARGET.AppImage" ../../
+          if [ -f "$APPIMAGE_NAME" ]; then
+              mv "$APPIMAGE_NAME" ../../
              echo "✅ AppImage 生成成功"
          fi

      # Upload to Actions Artifacts (Temporary Storage)
      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
        with:
          name: build-artifacts-${{ strategy.job-index }} # Unique name per job
          path: |
@@ -231,16 +646,22 @@ jobs:
            GoNavi-*.exe
            GoNavi-*.tar.gz
            GoNavi-*.AppImage
+            drivers/**
          retention-days: 1

  # Phase 2: Collect all artifacts and Publish Release (Single Job)
  release:
    name: Publish Release
-    needs: build
+    needs:
+      - build
+      - driver_agents
    runs-on: ubuntu-latest
    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
      - name: Download All Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
        with:
          path: release-assets
          pattern: build-artifacts-*
@@ -249,17 +670,249 @@ jobs:
      - name: List Assets
        run: ls -R release-assets

+      - name: Complete Driver Agent Assets
+        if: needs.driver_agents.outputs.has_changes == 'true' && needs.driver_agents.outputs.release_source != 'all'
+        env:
+          DRIVER_RELEASE_TOKEN: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+        run: |
+          python3 tools/complete-driver-release-assets.py \
+            --assets-dir release-assets \
+            --source "${{ needs.driver_agents.outputs.release_source }}" \
+            --require-complete
+
+      - name: Verify Optional Driver Assets
+        if: needs.driver_agents.outputs.has_changes == 'true'
+        shell: bash
+        env:
+          CHANGED_DRIVER_AGENTS: ${{ needs.driver_agents.outputs.drivers }}
+        run: |
+          set -euo pipefail
+          cd release-assets
+
+          missing=0
+          IFS=',' read -r -a DRIVERS <<< "$CHANGED_DRIVER_AGENTS"
+          for driver in "${DRIVERS[@]}"; do
+            REQUIRED_FILES=(
+              "drivers/Windows/${driver}-driver-agent-windows-amd64.exe"
+              "drivers/MacOS/${driver}-driver-agent-darwin-amd64"
+              "drivers/MacOS/${driver}-driver-agent-darwin-arm64"
+              "drivers/Linux/${driver}-driver-agent-linux-amd64"
+            )
+            if [ "$driver" != "duckdb" ]; then
+              REQUIRED_FILES+=("drivers/Windows/${driver}-driver-agent-windows-arm64.exe")
+            else
+              REQUIRED_FILES+=("drivers/Windows/duckdb.dll")
+            fi
+
+            for file in "${REQUIRED_FILES[@]}"; do
+              if [ ! -f "$file" ]; then
+                echo "❌ 缺少驱动资产：$file"
+                missing=1
+              else
+                echo "✅ 已找到驱动资产：$file"
+              fi
+            done
+          done
+
+          if [ "$missing" -ne 0 ]; then
+            echo "❌ 可选驱动资产不完整，终止发布"
+            exit 1
+          fi
+
+      - name: Package Driver Agents Bundle
+        id: driver_assets
+        shell: bash
+        run: |
+          set -euo pipefail
+          cd release-assets
+          if [ ! -d drivers ]; then
+            echo "⚠️ 未找到 drivers 目录，跳过驱动总包打包"
+            echo "has_driver_assets=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          if [ -z "$(find drivers -type f 2>/dev/null | head -n 1)" ]; then
+            echo "⚠️ drivers 目录为空，跳过驱动总包打包"
+            rm -rf drivers
+            echo "has_driver_assets=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          echo "📦 打包驱动总包：GoNavi-DriverAgents.zip"
+          python3 - <<'PY'
+          import json
+          import os
+          import shutil
+          import zipfile
+          from pathlib import Path
+
+          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
+
+          # GoNavi 主仓库只保留主程序包；驱动资产发布到独立仓库。
+          rm -rf drivers
+          echo "has_driver_assets=true" >> "$GITHUB_OUTPUT"
+
      - name: Generate SHA256SUMS
+        shell: bash
        run: |
          cd release-assets
-          sha256sum * > SHA256SUMS
+          FILES=()
+          while IFS= read -r file; do
+            if [ -n "$file" ]; then
+              FILES+=("$file")
+            fi
+          done < <(find . -maxdepth 1 -type f ! -name SHA256SUMS -exec basename {} \; | sort)
+          if [ ${#FILES[@]} -eq 0 ]; then
+            echo "⚠️ 未找到可签名资产，生成空 SHA256SUMS"
+            : > SHA256SUMS
+          else
+            sha256sum "${FILES[@]}" > SHA256SUMS
+          fi
+
+      - name: Generate Driver SHA256SUMS
+        if: steps.driver_assets.outputs.has_driver_assets == 'true'
+        shell: bash
+        run: |
+          cd driver-release-assets
+          FILES=()
+          while IFS= read -r file; do
+            if [ -n "$file" ]; then
+              FILES+=("$file")
+            fi
+          done < <(find . -maxdepth 1 -type f ! -name SHA256SUMS -exec basename {} \; | sort)
+          if [ ${#FILES[@]} -eq 0 ]; then
+            echo "❌ 未找到驱动发布资产"
+            exit 1
+          fi
+          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: |
+            GoNavi driver-agent assets for `${{ github.ref_name }}`.
+          token: ${{ secrets.DRIVER_RELEASE_TOKEN }}
+
+      - name: Checkout code for changelog
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          path: repo-for-changelog
+
+      - name: Generate Changelog
+        id: changelog
+        shell: bash
+        run: |
+          set -euo pipefail
+          cd repo-for-changelog
+          TAG="${{ github.ref_name }}"
+          # 获取上一个 tag
+          PREV_TAG=$(git tag --sort=-creatordate | grep -E '^v' | sed -n '2p' || true)
+          if [ -z "$PREV_TAG" ]; then
+            echo "⚠️ 未找到上一个 tag，使用全部 commit"
+            RANGE="$TAG"
+          else
+            RANGE="${PREV_TAG}..${TAG}"
+          fi
+
+          echo "📋 生成更新日志：$RANGE"
+
+          # 提取 commit 消息（排除 merge commit）
+          COMMITS=$(git log "$RANGE" --no-merges --pretty=format:'%s' 2>/dev/null || true)
+          if [ -z "$COMMITS" ]; then
+            BODY="暂无提交记录。"
+          else
+            CAT_FEAT=""
+            CAT_FIX=""
+            CAT_PERF=""
+            CAT_REFACTOR=""
+            CAT_I18N=""
+            CAT_OTHER=""
+
+            while IFS= read -r line; do
+              [ -z "$line" ] && continue
+              case "$line" in
+                ✨*|*feat*)     CAT_FEAT="${CAT_FEAT}\n- ${line}" ;;
+                🐛*|*fix*)     CAT_FIX="${CAT_FIX}\n- ${line}" ;;
+                ⚡*|*perf*)    CAT_PERF="${CAT_PERF}\n- ${line}" ;;
+                ♻️*|*refactor*) CAT_REFACTOR="${CAT_REFACTOR}\n- ${line}" ;;
+                🌐*)           CAT_I18N="${CAT_I18N}\n- ${line}" ;;
+                🔧*|🔨*|*chore*) CAT_OTHER="${CAT_OTHER}\n- ${line}" ;;
+                *)             CAT_OTHER="${CAT_OTHER}\n- ${line}" ;;
+              esac
+            done <<< "$COMMITS"
+
+            BODY=""
+            [ -n "$CAT_FEAT" ]     && BODY="${BODY}## ✨ 新功能\n${CAT_FEAT}\n\n"
+            [ -n "$CAT_FIX" ]      && BODY="${BODY}## 🐛 问题修复\n${CAT_FIX}\n\n"
+            [ -n "$CAT_PERF" ]     && BODY="${BODY}## ⚡ 性能优化\n${CAT_PERF}\n\n"
+            [ -n "$CAT_REFACTOR" ] && BODY="${BODY}## ♻️ 重构\n${CAT_REFACTOR}\n\n"
+            [ -n "$CAT_I18N" ]     && BODY="${BODY}## 🌐 国际化\n${CAT_I18N}\n\n"
+            [ -n "$CAT_OTHER" ]    && BODY="${BODY}## 🔧 其他变更\n${CAT_OTHER}\n\n"
+
+            # 附加 compare 链接
+            if [ -n "$PREV_TAG" ]; then
+              REPO_URL="${{ github.server_url }}/${{ github.repository }}"
+              BODY="${BODY}---\n**完整变更**: [${PREV_TAG}...${TAG}](${REPO_URL}/compare/${PREV_TAG}...${TAG})\n"
+            fi
+          fi
+
+          # 写入到文件避免多行环境变量问题
+          printf '%b' "$BODY" > /tmp/changelog.md
+          echo "changelog_file=/tmp/changelog.md" >> "$GITHUB_OUTPUT"

      - name: Create Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
        if: startsWith(github.ref, 'refs/tags/')
        with:
          files: release-assets/*
          draft: true
          make_latest: true
+          body_path: ${{ steps.changelog.outputs.changelog_file }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,12 @@
 # IDE
 .idea/
 *.iml
-
+.gitignore
 # build / release artifacts
 frontend/release/
 **/release/
 **/dist/
-**/build/
+build/bin/

 # wails / node artifacts (按需)
 node_modules/
@@ -17,3 +17,16 @@ dist/
 GoNavi-Wails
 GoNavi-Wails.exe
 .ace-tool/
+.superpowers/
+.claude/
+.gemini/
+.playwright-mcp/
+**/tmpclaude-*
+docs/superpowers/
+docs/需求追踪/
+
+CLAUDE.md
+**/CLAUDE.md
+.worktrees
+docs
+.tmp_superpowers_edit
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,143 @@
+# Contributing Guide
+
+Thank you for contributing to this project.
+
+This repository uses `dev` as the default integration branch, while stable releases are published from `main` through `release/*` branches.
+
+---
+
+## Branch Model
+
+- `dev`: default branch and day-to-day integration branch
+- `main`: stable release branch
+- `release/*`: release preparation branches for maintainers
+- Recommended branch names for external contributors:
+  - `fix/*`: bug fixes
+  - `feature/*`: new features or enhancements
+
+Maintainer release flow:
+
+```text
+feature/* / fix/* -> dev -> release/* -> main -> tag(vX.Y.Z)
+```
+
+---
+
+## How External Contributors Should Open Pull Requests
+
+Whether your branch is `fix/*` or `feature/*`, external contributors should **open pull requests directly against `dev`**.
+
+Reasons:
+
+- `dev` is the active integration branch, so changes can be reviewed in the same lane as ongoing work
+- contributors align with the branch that triggers day-to-day validation and dev builds
+- maintainers can cut `release/*` branches from `dev` without re-syncing external changes first
+
+Recommended flow:
+
+1. Fork this repository
+2. Sync your fork with `dev` and create a branch from `dev` (`fix/*` or `feature/*` is recommended)
+3. Make your changes and perform basic self-checks
+4. Push the branch to your fork
+5. Open a pull request against the `dev` branch of this repository
+
+---
+
+## Pull Request Requirements
+
+Please keep each pull request focused, reviewable, and easy to validate.
+
+Recommended expectations:
+
+- one pull request should address one logical change
+- use a clear title that explains the purpose
+- include the following in the description:
+  - background and problem statement
+  - key changes
+  - impact scope
+  - validation method
+- include screenshots or recordings for UI changes when helpful
+- explicitly mention risk and rollback notes for compatibility, data, or build-chain changes
+
+---
+
+## Merge Strategy for Maintainers
+
+Pull requests merged into `dev` should generally use **Squash and merge**.
+
+Reasons:
+
+- keeps `dev` history readable and easier to audit during active iteration
+- maps each PR to a single integration commit on `dev`
+- reduces cherry-pick and conflict cost before creating `release/*`
+
+---
+
+## Maintainer Sync Rules
+
+Because external pull requests are merged directly into `dev`, maintainers should treat `dev` as the source branch for daily collaboration and release preparation.
+
+### 1. Create `release/*` from `dev`
+
+Before a release, create a release branch from `dev`, for example:
+
+```bash
+git checkout dev
+git pull
+git checkout -b release/v0.6.0
+git push -u origin release/v0.6.0
+```
+
+### 2. Release from `release/*` back to `main`
+
+When release preparation is complete, merge the release branch back into `main` and create a tag:
+
+```bash
+git checkout main
+git pull
+git merge release/v0.6.0
+git push
+git tag v0.6.0
+git push origin v0.6.0
+```
+
+### 3. Sync `main` back to `dev` after release
+
+After the release, sync `main` back into `dev` so the next iteration starts from the released code line:
+
+```bash
+git checkout dev
+git pull
+git merge main
+git push
+```
+
+---
+
+## Commit Message Recommendation
+
+Keep commit messages clear and easy to audit.
+
+Recommended format:
+
+```text
+emoji type(scope): concise description
+```
+
+Examples:
+
+```text
+🔧 fix(ci): fix DuckDB driver toolchain on Windows AMD64
+✨ feat(redis): add Stream data browsing support
+♻️ refactor(datagrid): optimize large-table horizontal scrolling and rendering
+```
+
+---
+
+## Additional Notes
+
+- Please include validation results for documentation, build-chain, or driver compatibility changes
+- For larger changes, opening an issue or draft PR first is recommended
+- Maintainers may ask contributors to narrow the scope if the change conflicts with the current project direction
+
+Thank you for contributing.
--- a/CONTRIBUTING.zh-CN.md
+++ b/CONTRIBUTING.zh-CN.md
@@ -0,0 +1,143 @@
+# 贡献指南
+
+感谢你对本项目的贡献。
+
+本项目当前采用“`dev` 作为默认集成分支，`main` 作为稳定发布分支，`release/*` 负责发版准备”的协作模型。为减少分支漂移与 PR 处理成本，请在提交贡献前先阅读本指南。
+
+---
+
+## 分支模型
+
+- `dev`：默认分支，也是日常开发集成分支
+- `main`：稳定发布分支
+- `release/*`：发布准备分支，主要供维护者使用
+- 外部贡献者建议使用以下分支命名：
+  - `fix/*`：问题修复
+  - `feature/*`：功能新增或增强
+
+维护者发布流转如下：
+
+```text
+feature/* / fix/* -> dev -> release/* -> main -> tag(vX.Y.Z)
+```
+
+---
+
+## 外部贡献者如何提 Pull Request
+
+无论是 `fix/*` 还是 `feature/*`，**外部贡献者统一直接向 `dev` 发起 Pull Request**。
+
+这样做的原因：
+
+- `dev` 是当前日常集成分支，评审与合入路径和维护者开发流程一致
+- 外部贡献会直接进入触发日常校验和 dev 构建的分支
+- 维护者可以直接从 `dev` 切 `release/*`，减少额外同步步骤
+
+建议流程：
+
+1. Fork 本仓库
+2. 先同步你 fork 中的 `dev`，再从 `dev` 创建分支（建议命名为 `fix/*` 或 `feature/*`）
+3. 完成代码修改，并进行必要自检
+4. 推送到你的远程分支
+5. 向本仓库的 `dev` 分支发起 Pull Request
+
+---
+
+## Pull Request 要求
+
+请尽量保证 PR 单一、清晰、可审核。
+
+建议遵循以下要求：
+
+- 一个 PR 只解决一类问题，避免混入无关改动
+- 标题清晰说明改动目的
+- 描述中说明：
+  - 背景与问题
+  - 变更点
+  - 影响范围
+  - 验证方式
+- 如涉及 UI 调整，建议附截图或录屏
+- 如涉及兼容性、数据变更或构建链路调整，请明确说明风险和回滚方式
+
+---
+
+## PR 合并策略（维护者）
+
+`dev` 分支上的 PR 建议使用 **Squash and merge**。
+
+原因：
+
+- 保持 `dev` 集成历史清晰、便于审查
+- 每个 PR 在 `dev` 上对应一个明确的集成提交
+- 降低发版前整理与冲突处理成本
+
+---
+
+## 维护者同步规则
+
+由于外部 PR 会直接合入 `dev`，维护者应将 `dev` 作为日常协作与发版准备的主线分支。
+
+### 1. 发版前从 dev 切 release/*
+
+发布前由维护者基于 `dev` 创建发布分支，例如：
+
+```bash
+git checkout dev
+git pull
+git checkout -b release/v0.6.0
+git push -u origin release/v0.6.0
+```
+
+### 2. release/* → main 发版
+
+发布准备完成后，将 `release/*` 合并回 `main`，并打标签发布：
+
+```bash
+git checkout main
+git pull
+git merge release/v0.6.0
+git push
+git tag v0.6.0
+git push origin v0.6.0
+```
+
+### 3. main 回流到 dev（发版后必做）
+
+发布完成后，需要将 `main` 回流到 `dev`，确保下一轮开发从已发布代码线继续推进：
+
+```bash
+git checkout dev
+git pull
+git merge main
+git push
+```
+
+---
+
+## 提交建议
+
+建议保持提交信息简洁、明确，便于维护者审查与后续追踪。
+
+推荐格式：
+
+```text
+emoji type(scope): 中文描述
+```
+
+示例：
+
+```text
+🔧 fix(ci): 修复 Windows AMD64 下 DuckDB 驱动构建工具链
+✨ feat(redis): 新增 Stream 类型数据浏览支持
+♻️ refactor(datagrid): 优化大表横向滚动与渲染结构
+```
+
+---
+
+## 其他说明
+
+- 文档、构建链路、驱动兼容性相关改动，请尽量附带验证结果
+- 若改动较大，建议先提 Issue 或 Draft PR，先对齐方案再实施
+- 如提交内容与项目当前架构方向冲突，维护者可能要求收敛范围后再合并
+
+感谢你的贡献。
--- a/README.md
+++ b/README.md
@@ -1,162 +1,243 @@
-# GoNavi - 现代化的轻量级数据库管理工具
+# GoNavi - A Modern Lightweight Database Client

 [![Go Version](https://img.shields.io/github/go-mod/go-version/Syngnat/GoNavi)](https://go.dev/)
 [![Wails Version](https://img.shields.io/badge/Wails-v2-red)](https://wails.io)
 [![React Version](https://img.shields.io/badge/React-v18-blue)](https://reactjs.org/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](LICENSE)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/Syngnat/GoNavi/release.yml?label=Build)](https://github.com/Syngnat/GoNavi/actions)
+[![Stars](https://img.shields.io/github/stars/Syngnat/GoNavi?style=social)](https://github.com/Syngnat/GoNavi/stargazers)
+[![Downloads](https://img.shields.io/github/downloads/Syngnat/GoNavi/total?color=blue&label=downloads)](https://github.com/Syngnat/GoNavi/releases)

-**GoNavi** 是一款基于 **Wails (Go)** 和 **React** 构建的现代化、高性能、跨平台数据库管理客户端。它旨在提供如原生应用般流畅的用户体验，同时保持极低的资源占用。
+**Language**: English | [简体中文](README.zh-CN.md)

-相比于 Electron 应用，GoNavi 的体积更小（~10MB），启动速度更快，内存占用更低。
+GoNavi is a modern, high-performance, cross-platform database client built with **Wails (Go)** and **React**.
+It delivers native-like responsiveness with low resource usage.

-<h2 align="center">📸 项目截图</h2>
+Compared with many Electron-based clients, GoNavi is typically smaller in binary size (around 10MB class), starts faster, and uses less memory.
+
+---
+
+## Project Overview
+
+GoNavi is designed for developers and DBAs who need a unified desktop experience across multiple databases.
+
+- **Native-performance architecture**: Wails (Go + WebView) with lightweight runtime overhead.
+- **Large dataset usability**: virtualized rendering and optimized DataGrid workflows for high-volume tables.
+- **Unified connectivity**: URI build/parse, SSH tunnel, proxy support, and on-demand driver activation.
+- **Production-oriented workflow**: SQL editor, object management, batch export/backup, sync tools, execution logs, and update checks.
+
+## Supported Data Sources
+
+> `Built-in`: available out of the box.  
+> `Optional driver agent`: install/enable via Driver Manager first.
+
+| Category | Data Source | Driver Mode | Typical Capabilities |
+|---|---|---|---|
+| Relational | MySQL | Built-in | Schema browsing, SQL query, data editing, export/backup |
+| Relational | PostgreSQL | Built-in | Schema browsing, SQL query, data editing, object management |
+| Relational | Oracle | Built-in | Query execution, object browsing, data editing |
+| Cache | Redis | Built-in | Key browsing, command execution, encoding/view switch |
+| Relational | MariaDB | Optional driver agent | Querying, object management, data editing |
+| Relational | Doris | Optional driver agent | Querying, object browsing, SQL execution |
+| Columnar Analytics | StarRocks | Optional driver agent | Querying, object browsing, SQL execution |
+| Search | Sphinx | Optional driver agent | SphinxQL querying and object browsing |
+| Relational | SQL Server | Optional driver agent | Schema browsing, SQL query, object management |
+| File-based | SQLite | Optional driver agent | Local DB browsing, editing, export |
+| File-based | DuckDB | Optional driver agent | Large-table query, pagination, file-DB workflow |
+| Domestic DB | Dameng | Optional driver agent | Querying, object browsing, data editing |
+| Domestic DB | Kingbase | Optional driver agent | Querying, object browsing, data editing |
+| Domestic DB | HighGo | Optional driver agent | Querying, object browsing, data editing |
+| Domestic DB | Vastbase | Optional driver agent | Querying, object browsing, data editing |
+| 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 |
+| Extensibility | Custom Driver/DSN | Custom | Extend to more data sources via Driver + DSN |
+
+<h2 align="center">📸 Screenshots</h2>

 <div align="center">
-    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/341cda98-79a5-4198-90f3-1335131ccde0" />
-    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/224a74e7-65df-4aef-9710-d8e82e3a70c1" />
-    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/ec522145-5ceb-4481-ae46-a9251c89bdfc" />
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/0eefe07f-2836-44fa-9ddf-a0d2124b90e2" />
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/6765e539-83ea-4cd6-9c9e-f42790fa05b5" />
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/60e3d187-171a-4248-94e0-c6b08736e235" />
    <br />
-    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/330ce49b-45f1-4919-ae14-75f7d47e5f73" />
-    <img width="14%" alt="image" src="https://github.com/user-attachments/assets/d15fa9e9-5486-423b-a0e9-53b467e45432" />
-    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/f0c57590-d987-4ecf-89b2-64efad60b6d7" />
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/7a478602-0f08-4b30-8f6a-879f4a60ae32" />
+    <img width="14%" alt="image" src="https://github.com/user-attachments/assets/6442ca7d-ce9e-46d9-aecd-405ba88f5a5e" />
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/bc17895e-02a4-4cc5-b471-c3803cf25a2b" />
 </div>

 ---

-## ✨ 核心特性
+## Key Features

-### 🚀 极致性能
- **零卡顿交互**：采用独创的 "幽灵拖拽" (Ghost Resizing) 技术，在包含数万行数据的表格中调整列宽，依然保持 60fps+ 的丝滑体验。
- **虚拟滚动**：轻松处理海量数据展示，拒绝卡顿。
+### AI Assistant (New)
+- **Multi-provider Support**: OpenAI, Google Gemini, Anthropic Claude, and custom API support.
+- **Context-Aware Chat**: Attach table schemas to the AI context for accurate SQL generation and assistance.
+- **Slash Commands**: Quick commands for generating SQL, explaining queries, optimizing performance, and reviewing schema designs.

-### 🔌 多数据库支持
- **MySQL**：完整支持，涵盖数据编辑、结构管理与导入导出。
- **PostgreSQL**：数据查看与编辑支持，事务提交能力持续完善。
- **SQLite**：本地文件数据库支持。
- **Oracle**：基础数据访问与编辑支持。
- **Dameng（达梦）**：基础数据访问与编辑支持。
- **Kingbase（人大金仓）**：基础数据访问与编辑支持。
- **Redis**：Key/Value 浏览、命令执行、视图与编码切换。
- **自定义驱动**：支持配置 Driver/DSN 接入更多数据源。
- **SSH 隧道**：内置 SSH 隧道支持，安全连接内网数据库。
+### Performance
+- **Smooth interaction under load**: optimized table interaction (including column resize workflow on large datasets).
+- **Virtualized rendering**: keeps large result sets responsive.

-### 📊 强大的数据管理 (DataGrid)
- **所见即所得编辑**：直接在表格中双击单元格修改数据。
- **批量事务操作**：支持批量新增、修改、删除，一键提交或回滚事务。
- **大字段编辑**：双击大字段自动打开弹窗编辑器，避免卡顿。
- **右键上下文菜单**：快速设置 NULL、复制/导出等操作。
- **智能上下文**：自动识别单表查询，解锁编辑功能；复杂查询自动切换为只读模式。
- **批量导出/备份**：支持表与数据库的批量导出/备份。
- **数据导出**：支持 CSV、Excel (XLSX)、JSON、Markdown 等格式。
+### Data Management (DataGrid)
+- In-place cell editing.
+- Batch insert/update/delete with transaction-oriented submit/rollback.
+- Large-field popup editor.
+- Context actions (set NULL, copy/export, etc.).
+- Smart read/write mode switching based on query context.
+- Export formats: CSV, Excel (XLSX), JSON, Markdown.

-### 🧰 批量导出/备份
- **数据库批量导出**：支持结构导出与结构+数据备份。
- **表批量导出**：支持多表一键导出/备份。
- **智能上下文检测**：自动判断目标范围，避免误操作。
+### SQL Editor
+- Monaco Editor core.
+- Context-aware completion for databases/tables/columns.
+- Multi-tab query workflow.

-### 🧩 Redis 视图与编码
- **视图模式切换**：自动/原始文本/UTF-8/十六进制多模式显示。
- **智能解码**：针对二进制值进行 UTF-8 质量判定与中文字符识别。
- **命令执行**：内置命令面板快速操作。
+### Batch Export / Backup
+- Database-level and table-level batch export/backup.
+- Scope-aware operation flow to reduce mistakes.

-### 🔄 数据同步与导入导出
- **连接配置导入/导出**：支持配置 JSON 导入导出，便于团队共享。
- **数据同步**：内置数据同步面板，支持跨库同步任务配置。
+### Connectivity
+- URI generation/parsing.
+- SSH tunnel support.
+- Proxy support.
+- Config import/export (JSON).
+- Optional driver management and activation.

-### 🆙 在线更新
- **自动更新**：启动/定时/手动检查更新，自动下载并提示重启完成更新。
+### Redis Tools
+- Multi-view value rendering (auto/raw text/UTF-8/hex).
+- Built-in command execution panel.

-### 🧾 可观测性
- **SQL 执行日志**：实时查看 SQL 与执行耗时，便于排障与优化。
+### Observability and Update
+- SQL execution logs with timing information.
+- Startup/scheduled/manual update checks.

-### 📝 智能 SQL 编辑器
- **Monaco Editor 内核**：集成 VS Code 同款编辑器，体验极佳。
- **智能补全**：自动感知当前连接上下文，提供数据库、表名、字段名的实时补全。
- **多标签页**：支持多窗口并行操作，像浏览器一样管理你的查询会话。
-
-### 🎨 现代化 UI
- **Ant Design 5**：企业级 UI 设计语言。
- **暗黑模式**：内置深色/浅色主题切换，适应不同光照环境。
- **响应式布局**：灵活的侧边栏与布局调整。
+### UI/UX
+- Ant Design 5 based interface.
+- Light/Dark themes.
+- Flexible sidebar and layout behavior.

 ---

-## 🛠️ 技术栈
+## Tech Stack

-*   **后端 (Backend)**: Go 1.24 + Wails v2
-*   **前端 (Frontend)**: React 18 + TypeScript + Vite
-*   **UI 框架**: Ant Design 5
-*   **状态管理**: Zustand
-*   **编辑器**: Monaco Editor
+- **Backend**: Go 1.24 + Wails v2
+- **Frontend**: React 18 + TypeScript + Vite
+- **UI**: Ant Design 5
+- **State Management**: Zustand
+- **Editor**: Monaco Editor

 ---

-## 📦 安装与运行
+## Installation and Run

-### 前置要求
-*   [Go](https://go.dev/dl/) 1.21+
-*   [Node.js](https://nodejs.org/) 18+
-*   [Wails CLI](https://wails.io/docs/gettingstarted/installation): `go install github.com/wailsapp/wails/v2/cmd/wails@latest`
+### Prerequisites
+- [Go](https://go.dev/dl/) 1.21+
+- [Node.js](https://nodejs.org/) 18+
+- [Wails CLI](https://wails.io/docs/gettingstarted/installation):
+  `go install github.com/wailsapp/wails/v2/cmd/wails@v2.11.0`

-### 开发模式
+### Development Mode

-```bash
-# 克隆项目
+```shell
+# Clone
 git clone https://github.com/Syngnat/GoNavi.git
 cd GoNavi

-# 启动开发服务器 (支持热重载)
+# Start development with hot reload
 wails dev
+
+# Faster local startup when exported Go method signatures are unchanged
+node tools/wails-fast-dev.mjs
+
+# Refresh Wails JS bindings after changing exported Go method signatures
+node tools/wails-fast-dev.mjs --refresh-bindings
+
+# Windows PowerShell low-memory visual mode: disables transparent WebView/Acrylic backdrop
+$env:GONAVI_LOW_MEMORY_MODE="1"; node tools/wails-fast-dev.mjs
 ```

-### 编译构建
+### Build

 ```bash
-# 构建当前平台的可执行文件
+# Build for current platform
 wails build

-# 清理并构建 (推荐发布前使用)
+# Clean build (recommended before release)
 wails build -clean
 ```

-构建产物将位于 `build/bin` 目录下。
+Artifacts are generated in `build/bin`.

-### 跨平台编译 (GitHub Actions)
+### Cross-Platform Release (GitHub Actions)

-本项目内置了 GitHub Actions 流水线，Push `v*` 格式的 Tag 即可自动触发构建并发布 Release。
-支持构建：
-*   macOS (AMD64 / ARM64)
-*   Windows (AMD64)
+The repository includes a release workflow.
+Push a `v*` tag to trigger automated build and release.
+Release notes are generated automatically from merged pull requests and categorized by `.github/release.yaml`.
+
+Target artifacts include:
+- macOS (AMD64 / ARM64)
+- Windows (AMD64)
+- Linux (AMD64, WebKitGTK 4.0 and 4.1 variants)

 ---

-## ❓ 常见问题 (Troubleshooting)
+## Troubleshooting

-### macOS 提示 "应用已损坏，无法打开"
+### macOS: "App is damaged and can’t be opened"

-由于本项目尚未购买 Apple 开发者证书进行签名（Notarization），macOS 的 Gatekeeper 安全机制可能会拦截应用的运行。请按照以下步骤解决：
+Without Apple notarization, Gatekeeper may block startup.

-1.  将下载的 `GoNavi.app` 拖入 **应用程序** 文件夹。
-2.  打开 **终端 (Terminal)**。
-3.  复制并执行以下命令（输入密码时不会显示）：
-    ```bash
-    sudo xattr -rd com.apple.quarantine /Applications/GoNavi.app
-    ```
-4.  或者：在 Finder 中右键点击应用图标，按住 `Control` 键选择 **打开**，然后在弹出的窗口中再次点击 **打开**。
+1. Move `GoNavi.app` to **Applications**.
+2. Open **Terminal**.
+3. Run:
+
+```bash
+sudo xattr -rd com.apple.quarantine /Applications/GoNavi.app
+```
+
+Or right-click the app in Finder and choose **Open** with Control key flow.
+
+### Linux: missing `libwebkit2gtk` / `libjavascriptcoregtk`
+
+GoNavi depends on WebKitGTK runtime libraries.
+
+```bash
+# Debian 13 / Ubuntu 24.04+
+sudo apt-get update
+sudo apt-get install -y libgtk-3-0 libwebkit2gtk-4.1-0 libjavascriptcoregtk-4.1-0
+
+# Ubuntu 22.04 / Debian 12
+sudo apt-get update
+sudo apt-get install -y libgtk-3-0 libwebkit2gtk-4.0-37 libjavascriptcoregtk-4.0-18
+```
+
+If you use Linux artifacts with the `-WebKit41` suffix, prefer Debian 13 / Ubuntu 24.04+.

 ---

-## 🤝 贡献指南
+## Contributing

-欢迎提交 Issue 和 Pull Request！
+Issues and pull requests are welcome.

-1.  Fork 本仓库
-2.  创建你的特性分支 (`git checkout -b feature/AmazingFeature`)
-3.  提交你的改动 (`git commit -m 'feat: Add some AmazingFeature'`)
-4.  推送到分支 (`git push origin feature/AmazingFeature`)
-5.  开启一个 Pull Request
+For the full workflow, branch model, and maintainer sync rules, see:

-## 📄 开源协议
+- [CONTRIBUTING.md](CONTRIBUTING.md)

-本项目采用 [Apache-2.0 协议](LICENSE) 开源。
+External contributors should branch from `dev` and open pull requests against `dev`.
+
+## Star History
+<a href="https://www.star-history.com/?repos=Syngnat%2FGoNavi&type=date&legend=top-left">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/image?repos=Syngnat/GoNavi&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/image?repos=Syngnat/GoNavi&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://api.star-history.com/image?repos=Syngnat/GoNavi&type=date&legend=top-left" />
+ </picture>
+</a>
+
+## Links
+
+- [linux.do](https://linux.do/)
+- [AIBook](https://aibook.ren/)
+
+## License
+
+Licensed under [Apache-2.0](LICENSE).
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -0,0 +1,227 @@
+# GoNavi - 现代化轻量级数据库客户端
+
+[![Go Version](https://img.shields.io/github/go-mod/go-version/Syngnat/GoNavi)](https://go.dev/)
+[![Wails Version](https://img.shields.io/badge/Wails-v2-red)](https://wails.io)
+[![React Version](https://img.shields.io/badge/React-v18-blue)](https://reactjs.org/)
+[![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](LICENSE)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/Syngnat/GoNavi/release.yml?label=Build)](https://github.com/Syngnat/GoNavi/actions)
+[![Stars](https://img.shields.io/github/stars/Syngnat/GoNavi?style=social)](https://github.com/Syngnat/GoNavi/stargazers)
+[![Downloads](https://img.shields.io/github/downloads/Syngnat/GoNavi/total?color=blue&label=downloads)](https://github.com/Syngnat/GoNavi/releases)
+
+**语言**: [English](README.md) | 简体中文
+
+GoNavi 是基于 **Wails (Go)** 与 **React** 构建的跨平台数据库管理工具，强调原生性能、低资源占用与多数据源统一工作流。
+
+相比常见 Electron 客户端，GoNavi 在体积、启动速度和内存占用上更轻量。
+
+---
+
+## 项目简介
+
+GoNavi 面向开发者与 DBA，核心目标是让数据库操作在桌面端做到“快、稳、统一”。
+
+- **原生性能架构**：Wails（Go + WebView），降低运行时开销。
+- **大数据可用性**：虚拟滚动 + DataGrid 交互优化，提升大结果集可操作性。
+- **统一连接能力**：支持 URI 生成/解析、SSH 隧道、代理、驱动按需安装。
+- **工程化能力完整**：覆盖 SQL 编辑、对象管理、批量导出/备份、数据同步、执行日志、在线更新。
+
+## 支持的数据源
+
+> `内置`：主程序开箱即用。  
+> `可选驱动代理`：需在驱动管理中安装启用后可用。
+
+| 类别 | 数据源 | 驱动模式 | 典型能力 |
+|---|---|---|---|
+| 关系型 | MySQL | 内置 | 库表浏览、SQL 查询、数据编辑、导出/备份 |
+| 关系型 | PostgreSQL | 内置 | 库表浏览、SQL 查询、数据编辑、对象管理 |
+| 关系型 | Oracle | 内置 | 连接查询、对象浏览、数据编辑 |
+| 缓存 | Redis | 内置 | Key 浏览、命令执行、编码/视图切换 |
+| 关系型 | MariaDB | 可选驱动代理 | 连接查询、对象管理、数据编辑 |
+| 关系型 | Doris | 可选驱动代理 | 连接查询、对象浏览、SQL 执行 |
+| 列式分析 | StarRocks | 可选驱动代理 | 连接查询、对象浏览、SQL 执行 |
+| 搜索 | Sphinx | 可选驱动代理 | SphinxQL 查询与对象浏览 |
+| 关系型 | SQL Server | 可选驱动代理 | 库表浏览、SQL 查询、对象管理 |
+| 文件型 | SQLite | 可选驱动代理 | 本地文件库浏览、编辑、导出 |
+| 文件型 | DuckDB | 可选驱动代理 | 大表查询、分页浏览、文件库管理 |
+| 国产数据库 | Dameng | 可选驱动代理 | 连接查询、对象浏览、数据编辑 |
+| 国产数据库 | Kingbase | 可选驱动代理 | 连接查询、对象浏览、数据编辑 |
+| 国产数据库 | HighGo | 可选驱动代理 | 连接查询、对象浏览、数据编辑 |
+| 国产数据库 | Vastbase | 可选驱动代理 | 连接查询、对象浏览、数据编辑 |
+| 文档型 | MongoDB | 可选驱动代理 | 文档查询、集合浏览、连接管理 |
+| 时序 | TDengine | 可选驱动代理 | 时序库表浏览、查询分析 |
+| 列式分析 | ClickHouse | 可选驱动代理 | 分析查询、对象浏览、SQL 执行 |
+| 扩展接入 | Custom Driver/DSN | 自定义 | 通过 Driver + DSN 接入更多数据源 |
+
+<h2 align="center">📸 项目截图</h2>
+
+<div align="center">
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/0eefe07f-2836-44fa-9ddf-a0d2124b90e2" />
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/6765e539-83ea-4cd6-9c9e-f42790fa05b5" />
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/60e3d187-171a-4248-94e0-c6b08736e235" />
+    <br />
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/7a478602-0f08-4b30-8f6a-879f4a60ae32" />
+    <img width="14%" alt="image" src="https://github.com/user-attachments/assets/6442ca7d-ce9e-46d9-aecd-405ba88f5a5e" />
+    <img width="25%" alt="image" src="https://github.com/user-attachments/assets/bc17895e-02a4-4cc5-b471-c3803cf25a2b" />
+</div>
+
+---
+
+## 核心特性
+
+### AI 智能助手 (New)
+- **多模型服务商支持**：内置跨平台接入 OpenAI, Google Gemini, Anthropic Claude，同时支持任意自定义兼容 OpenAI 格式的 API。
+- **关联表结构上下文**：原生支持将当前数据库表结构直接提取作为上下文发送给 AI，让 SQL 生成、分析变得更精准。
+- **快捷指令**：内置多种快捷对话指（如一键生成 SQL、解释执行逻辑、分析性能优化、表字段代码评审等）。
+
+### 性能与交互
+- 大数据场景下保持流畅交互（含 DataGrid 列宽拖拽、批量编辑流程优化）。
+- 虚拟滚动渲染，降低大结果集卡顿风险。
+
+### 数据管理（DataGrid）
+- 单元格所见即所得编辑。
+- 批量新增/修改/删除，支持事务提交与回滚。
+- 大字段弹窗编辑。
+- 右键上下文操作（NULL、复制、导出等）。
+- 根据查询上下文智能切换读写模式。
+- 支持 CSV / XLSX / JSON / Markdown 导出。
+
+### SQL 编辑器
+- 基于 Monaco Editor。
+- 上下文补全（数据库/表/字段）。
+- 多标签查询工作流。
+
+### 连接与驱动
+- URI 生成与解析。
+- SSH 隧道、代理支持。
+- 连接配置 JSON 导入/导出。
+- 可选驱动安装与启用管理。
+
+### Redis 工具
+- 自动/原始文本/UTF-8/十六进制等视图模式。
+- 内置命令执行面板。
+
+### 可观测性与更新
+- SQL 执行日志（含耗时）。
+- 启动/定时/手动更新检查。
+
+### UI 体验
+- Ant Design 5 体系。
+- 深色/浅色主题切换。
+- 灵活布局与侧边栏行为。
+
+---
+
+## 技术栈
+
+- **后端**: Go 1.24 + Wails v2
+- **前端**: React 18 + TypeScript + Vite
+- **UI 框架**: Ant Design 5
+- **状态管理**: Zustand
+- **编辑器**: Monaco Editor
+
+---
+
+## 安装与运行
+
+### 前置要求
+- [Go](https://go.dev/dl/) 1.21+
+- [Node.js](https://nodejs.org/) 18+
+- [Wails CLI](https://wails.io/docs/gettingstarted/installation):
+  `go install github.com/wailsapp/wails/v2/cmd/wails@v2.11.0`
+
+### 开发模式
+
+```shell
+# 克隆项目
+git clone https://github.com/Syngnat/GoNavi.git
+cd GoNavi
+
+# 启动开发（热重载）
+wails dev
+
+# 本地快速启动：未修改 Go 导出方法签名时使用
+node tools/wails-fast-dev.mjs
+
+# 修改 Go 导出方法签名后刷新 Wails JS 绑定
+node tools/wails-fast-dev.mjs --refresh-bindings
+
+# Windows PowerShell 低内存视觉模式：关闭透明 WebView 和 Acrylic 背景
+$env:GONAVI_LOW_MEMORY_MODE="1"; node tools/wails-fast-dev.mjs
+```
+
+### 编译构建
+
+```bash
+# 构建当前平台
+wails build
+
+# 清理后构建（发布前推荐）
+wails build -clean
+```
+
+构建产物位于 `build/bin`。
+
+### 跨平台发布（GitHub Actions）
+
+仓库内置发布流水线，推送 `v*` Tag 可自动构建并发布 Release。
+Release 更新说明会基于已合并 Pull Request 自动生成，并按 `.github/release.yaml` 分类。
+
+支持目标：
+- macOS (AMD64 / ARM64)
+- Windows (AMD64)
+- Linux (AMD64，含 WebKitGTK 4.0 / 4.1 变体)
+
+---
+
+## 常见问题
+
+### macOS 提示“应用已损坏，无法打开”
+
+在未进行 Apple Notarization 时，Gatekeeper 可能拦截应用。
+
+```bash
+sudo xattr -rd com.apple.quarantine /Applications/GoNavi.app
+```
+
+### Linux 缺少 `libwebkit2gtk` / `libjavascriptcoregtk`
+
+```bash
+# Debian 13 / Ubuntu 24.04+
+sudo apt-get update
+sudo apt-get install -y libgtk-3-0 libwebkit2gtk-4.1-0 libjavascriptcoregtk-4.1-0
+
+# Ubuntu 22.04 / Debian 12
+sudo apt-get update
+sudo apt-get install -y libgtk-3-0 libwebkit2gtk-4.0-37 libjavascriptcoregtk-4.0-18
+```
+
+---
+
+## 贡献指南
+
+欢迎提交 Issue 与 Pull Request。
+
+完整流程、分支模型与维护者同步规则请查看：
+
+- [CONTRIBUTING.zh-CN.md](CONTRIBUTING.zh-CN.md)
+
+外部贡献者应从 `dev` 拉出分支，并统一向 `dev` 发起 Pull Request。
+
+## Star History (Star 增长趋势)
+
+<a href="https://www.star-history.com/?repos=Syngnat%2FGoNavi&type=date&legend=top-left">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/image?repos=Syngnat/GoNavi&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/image?repos=Syngnat/GoNavi&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://api.star-history.com/image?repos=Syngnat/GoNavi&type=date&legend=top-left" />
+ </picture>
+</a>
+
+## 友情链接
+
+- [linux.do](https://linux.do/)
+- [AI全书](https://aibook.ren/)
+
+## 开源协议
+
+本项目采用 [Apache-2.0 协议](LICENSE)。
--- a/assets_dev.go
+++ b/assets_dev.go
@@ -0,0 +1,9 @@
+//go:build dev
+
+package main
+
+import "os"
+
+// 开发模式下由 Wails DevServer 提供前端资源，这里只提供一个稳定的占位 FS，
+// 避免编译时依赖 frontend/dist 被并发重建。
+var assets = os.DirFS(".")
--- a/assets_prod.go
+++ b/assets_prod.go
@@ -0,0 +1,13 @@
+//go:build !dev
+
+package main
+
+import (
+	"embed"
+	"io/fs"
+)
+
+//go:embed all:frontend/dist
+var embeddedAssets embed.FS
+
+var assets fs.FS = embeddedAssets
--- a/build-driver-agents.sh
+++ b/build-driver-agents.sh
@@ -0,0 +1,416 @@
+#!/usr/bin/env bash
+
+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_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"
+DUCKDB_WINDOWS_SUPPORT_DLL="duckdb.dll"
+
+usage() {
+  cat <<'EOF'
+用法：
+  ./build-driver-agents.sh [选项]
+
+选项：
+  --drivers <列表>      指定驱动列表（逗号分隔），例如：kingbase,mongodb
+  --platform <目标>      目标平台：current、all、GOOS/GOARCH，或逗号分隔列表
+                        默认 current（当前 Go 环境）
+  --out-dir <目录>      输出目录根路径，默认：dist/driver-agents
+  --bundle-name <文件名> 驱动总包 zip 名称，默认：GoNavi-DriverAgents.zip
+  --strict              任一驱动构建失败即中断（默认失败后继续，最后汇总）
+  --upx                 要求使用 UPX 压缩支持的平台产物（默认 auto：有 upx 则压缩）
+  --no-upx              禁用 UPX 压缩
+  -h, --help            显示帮助
+
+示例：
+  ./build-driver-agents.sh
+  ./build-driver-agents.sh --drivers kingbase
+  ./build-driver-agents.sh --platform windows/amd64 --drivers kingbase,mongodb
+  ./build-driver-agents.sh --platform all
+  ./build-driver-agents.sh --platform darwin/arm64,windows/amd64,linux/amd64
+EOF
+}
+
+normalize_driver() {
+  local name
+  name="$(echo "${1:-}" | tr '[:upper:]' '[:lower:]' | xargs)"
+  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)
+      echo "$name"
+      ;;
+    *)
+      return 1
+      ;;
+  esac
+}
+
+build_driver_name() {
+  case "$1" in
+    doris) echo "diros" ;;
+    *) echo "$1" ;;
+  esac
+}
+
+platform_dir_name() {
+  case "$1" in
+    windows) echo "Windows" ;;
+    darwin) echo "MacOS" ;;
+    linux) echo "Linux" ;;
+    *) echo "Unknown" ;;
+  esac
+}
+
+current_platform() {
+  echo "$(go env GOOS)/$(go env GOARCH)"
+}
+
+append_platform() {
+  local candidate
+  candidate="$1"
+  if [[ "$platform_seen" == *"|$candidate|"* ]]; then
+    return 0
+  fi
+  platforms+=("$candidate")
+  platform_seen="${platform_seen}${candidate}|"
+}
+
+normalize_platform() {
+  local value goos goarch platform_dir
+  value="$(printf '%s' "${1:-}" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')"
+  case "$value" in
+    current|"")
+      current_platform
+      ;;
+    */*)
+      goos="${value%%/*}"
+      goarch="${value##*/}"
+      platform_dir="$(platform_dir_name "$goos")"
+      if [[ -z "$goos" || -z "$goarch" || "$platform_dir" == "Unknown" ]]; then
+        return 1
+      fi
+      echo "$goos/$goarch"
+      ;;
+    *)
+      return 1
+      ;;
+  esac
+}
+
+zip_bundle() {
+  local bundle_zip_path="$1"
+  local bundle_stage_dir="$2"
+  local -a bundle_dirs=()
+  local dir
+
+  for dir in "$bundle_stage_dir"/*; do
+    [[ -d "$dir" ]] || continue
+    bundle_dirs+=("$(basename "$dir")")
+  done
+
+  if [[ ${#bundle_dirs[@]} -eq 0 ]]; then
+    echo "❌ 驱动总包 staging 目录为空。"
+    exit 1
+  fi
+
+  rm -f "$bundle_zip_path"
+  if command -v zip >/dev/null 2>&1; then
+    (
+      cd "$bundle_stage_dir"
+      zip -qry "$bundle_zip_path" "${bundle_dirs[@]}"
+    )
+  elif command -v python3 >/dev/null 2>&1; then
+    BUNDLE_STAGE_DIR="$bundle_stage_dir" BUNDLE_ZIP_PATH="$bundle_zip_path" python3 - <<'PY'
+import os
+import zipfile
+from pathlib import Path
+
+stage = Path(os.environ["BUNDLE_STAGE_DIR"])
+target = Path(os.environ["BUNDLE_ZIP_PATH"])
+with zipfile.ZipFile(target, "w", compression=zipfile.ZIP_DEFLATED) as zf:
+    for path in stage.rglob("*"):
+        if path.is_file():
+            zf.write(path, path.relative_to(stage).as_posix())
+PY
+  else
+    echo "❌ 未找到 zip 或 python3，无法生成驱动总包 zip。"
+    exit 1
+  fi
+}
+
+prepare_duckdb_windows_library() {
+  local cache_root="$1"
+  local lib_dir="$cache_root/duckdb-windows-${DUCKDB_WINDOWS_LIBRARY_VERSION}"
+  local zip_path="$cache_root/libduckdb-windows-amd64.zip"
+
+  if [[ -f "$lib_dir/duckdb.dll" && -f "$lib_dir/duckdb.lib" ]]; then
+    printf '%s\n' "$lib_dir"
+    return 0
+  fi
+
+  mkdir -p "$lib_dir"
+  echo "⬇️  下载 DuckDB Windows 官方动态库：$DUCKDB_WINDOWS_LIBRARY_URL" >&2
+  if command -v curl >/dev/null 2>&1; then
+    curl -fsSL "$DUCKDB_WINDOWS_LIBRARY_URL" -o "$zip_path"
+  elif command -v wget >/dev/null 2>&1; then
+    wget -q "$DUCKDB_WINDOWS_LIBRARY_URL" -O "$zip_path"
+  else
+    echo "❌ 未找到 curl 或 wget，无法下载 DuckDB Windows 动态库。" >&2
+    return 1
+  fi
+
+  if command -v unzip >/dev/null 2>&1; then
+    unzip -qo "$zip_path" -d "$lib_dir"
+  elif command -v python3 >/dev/null 2>&1; then
+    DUCKDB_LIB_ZIP="$zip_path" DUCKDB_LIB_DIR="$lib_dir" python3 - <<'PY'
+import os
+import zipfile
+
+zip_path = os.environ["DUCKDB_LIB_ZIP"]
+target = os.environ["DUCKDB_LIB_DIR"]
+with zipfile.ZipFile(zip_path) as zf:
+    zf.extractall(target)
+PY
+  else
+    echo "❌ 未找到 unzip 或 python3，无法解压 DuckDB Windows 动态库。" >&2
+    return 1
+  fi
+
+  if [[ ! -f "$lib_dir/duckdb.dll" || ! -f "$lib_dir/duckdb.lib" ]]; then
+    echo "❌ DuckDB Windows 动态库包缺少 duckdb.dll 或 duckdb.lib。" >&2
+    return 1
+  fi
+
+  cp "$lib_dir/duckdb.lib" "$lib_dir/libduckdb.dll.a"
+  cp "$lib_dir/duckdb.lib" "$lib_dir/libduckdb.a"
+  printf '%s\n' "$lib_dir"
+}
+
+join_by_comma() {
+  local IFS=,
+  echo "$*"
+}
+
+driver_csv=""
+target_platform=""
+out_root="dist/driver-agents"
+bundle_name="GoNavi-DriverAgents.zip"
+strict_mode="false"
+upx_mode="${GONAVI_DRIVER_AGENT_UPX:-auto}"
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --drivers)
+      driver_csv="${2:-}"
+      shift 2
+      ;;
+    --platform)
+      target_platform="${2:-}"
+      shift 2
+      ;;
+    --out-dir)
+      out_root="${2:-}"
+      shift 2
+      ;;
+    --bundle-name)
+      bundle_name="${2:-}"
+      shift 2
+      ;;
+    --strict)
+      strict_mode="true"
+      shift
+      ;;
+    --upx)
+      upx_mode="required"
+      shift
+      ;;
+    --no-upx)
+      upx_mode="off"
+      shift
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "❌ 未知参数：$1"
+      usage
+      exit 1
+      ;;
+  esac
+done
+
+if ! command -v go >/dev/null 2>&1; then
+  echo "❌ 未找到 Go，请先安装 Go 并确保 go 在 PATH 中。"
+  exit 1
+fi
+
+declare -a drivers=()
+if [[ -n "$driver_csv" ]]; then
+  IFS=',' read -r -a raw_drivers <<<"$driver_csv"
+  for item in "${raw_drivers[@]}"; do
+    normalized="$(normalize_driver "$item")" || {
+      echo "❌ 不支持的驱动：$item"
+      exit 1
+    }
+    drivers+=("$normalized")
+  done
+else
+  drivers=("${DEFAULT_DRIVERS[@]}")
+fi
+revision_driver_csv="$(join_by_comma "${drivers[@]}")"
+
+declare -a platforms=()
+platform_seen="|"
+if [[ -z "$target_platform" ]]; then
+  target_platform="current"
+fi
+IFS=',' read -r -a raw_platforms <<<"$target_platform"
+for item in "${raw_platforms[@]}"; do
+  normalized_platform="$(printf '%s' "$item" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')"
+  if [[ "$normalized_platform" == "all" ]]; then
+    for default_platform in "${DEFAULT_PLATFORMS[@]}"; do
+      append_platform "$default_platform"
+    done
+    continue
+  fi
+  normalized_platform="$(normalize_platform "$item")" || {
+    echo "❌ --platform 参数格式错误，应为 current、all、GOOS/GOARCH 或逗号分隔列表，例如 darwin/arm64,windows/amd64"
+    exit 1
+  }
+  append_platform "$normalized_platform"
+done
+
+if [[ ${#platforms[@]} -eq 0 ]]; then
+  echo "❌ 未指定有效目标平台。"
+  exit 1
+fi
+
+mkdir -p "$out_root"
+out_root_abs="$(cd "$out_root" && pwd)"
+bundle_stage_dir="$(mktemp -d "${TMPDIR:-/tmp}/gonavi-driver-bundle.XXXXXX")"
+
+cleanup() {
+  rm -rf "$bundle_stage_dir"
+}
+trap cleanup EXIT
+
+if [[ ${#platforms[@]} -eq 1 ]]; then
+  single_platform="${platforms[0]}"
+  single_platform_key="${single_platform/\//-}"
+  single_output_dir="${out_root%/}/$single_platform_key"
+  mkdir -p "$single_output_dir"
+  bundle_zip_path="$(cd "$single_output_dir" && pwd)/$bundle_name"
+else
+  bundle_zip_path="$out_root_abs/$bundle_name"
+fi
+
+declare -a built_assets=()
+declare -a failed_drivers=()
+declare -a skipped_drivers=()
+
+echo "🚀 开始构建 optional-driver-agent"
+echo "   平台：${platforms[*]}"
+echo "   输出根目录：$out_root_abs"
+echo "   驱动列表：${drivers[*]}"
+
+for platform in "${platforms[@]}"; do
+  goos="${platform%%/*}"
+  goarch="${platform##*/}"
+  platform_key="${goos}-${goarch}"
+  platform_dir="$(platform_dir_name "$goos")"
+  output_dir="${out_root%/}/${platform_key}"
+  bundle_platform_dir="$bundle_stage_dir/$platform_dir"
+
+  mkdir -p "$output_dir" "$bundle_platform_dir"
+  output_dir_abs="$(cd "$output_dir" && pwd)"
+
+  echo ""
+  echo "🧭 生成 driver-agent revision 指纹：$platform"
+  "$SCRIPT_DIR/tools/generate-driver-agent-revisions.sh" --platform "$platform" --drivers "$revision_driver_csv"
+
+  for driver in "${drivers[@]}"; do
+    if [[ "$driver" == "duckdb" && "$goos" == "windows" && "$goarch" != "amd64" ]]; then
+      echo "⚠️  跳过 duckdb（$platform 仅支持 windows/amd64）"
+      skipped_drivers+=("duckdb($platform)")
+      continue
+    fi
+
+    build_driver="$(build_driver_name "$driver")"
+    tag="gonavi_${build_driver}_driver"
+    build_tags="$tag"
+    asset_name="${driver}-driver-agent-${goos}-${goarch}"
+    if [[ "$goos" == "windows" ]]; then
+      asset_name="${asset_name}.exe"
+    fi
+    output_path="$output_dir_abs/$asset_name"
+
+    cgo_enabled=0
+    if [[ "$driver" == "duckdb" ]]; then
+      cgo_enabled=1
+    fi
+    duckdb_lib_dir=""
+    if [[ "$driver" == "duckdb" && "$goos" == "windows" && "$goarch" == "amd64" ]]; then
+      duckdb_lib_dir="$(prepare_duckdb_windows_library "$bundle_stage_dir")"
+      build_tags="$build_tags duckdb_use_lib"
+    fi
+
+    echo "🔧 构建 $driver -> $asset_name (platform=$platform, tags=$build_tags, CGO_ENABLED=$cgo_enabled)"
+    set +e
+    if [[ -n "$duckdb_lib_dir" ]]; then
+      CGO_ENABLED="$cgo_enabled" GOOS="$goos" GOARCH="$goarch" GOTOOLCHAIN=auto \
+        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
+    else
+      CGO_ENABLED="$cgo_enabled" GOOS="$goos" GOARCH="$goarch" GOTOOLCHAIN=auto \
+        go build -tags "$build_tags" -trimpath -ldflags "-s -w" -o "$output_path" ./cmd/optional-driver-agent
+    fi
+    build_exit=$?
+    set -e
+
+    if [[ $build_exit -ne 0 ]]; then
+      echo "❌ 构建失败：$driver ($platform)"
+      failed_drivers+=("$driver($platform)")
+      if [[ "$strict_mode" == "true" ]]; then
+        exit $build_exit
+      fi
+      continue
+    fi
+
+    GONAVI_DRIVER_AGENT_UPX="$upx_mode" "$SCRIPT_DIR/tools/compress-driver-artifact.sh" "$output_path" "$platform" "$platform_dir/$asset_name"
+    cp "$output_path" "$bundle_platform_dir/$asset_name"
+    if [[ -n "$duckdb_lib_dir" ]]; then
+      cp "$duckdb_lib_dir/$DUCKDB_WINDOWS_SUPPORT_DLL" "$output_dir_abs/$DUCKDB_WINDOWS_SUPPORT_DLL"
+      GONAVI_DRIVER_AGENT_UPX="$upx_mode" "$SCRIPT_DIR/tools/compress-driver-artifact.sh" "$output_dir_abs/$DUCKDB_WINDOWS_SUPPORT_DLL" "$platform" "$platform_dir/$DUCKDB_WINDOWS_SUPPORT_DLL"
+      cp "$output_dir_abs/$DUCKDB_WINDOWS_SUPPORT_DLL" "$bundle_platform_dir/$DUCKDB_WINDOWS_SUPPORT_DLL"
+      built_assets+=("$platform_dir/$DUCKDB_WINDOWS_SUPPORT_DLL")
+    fi
+    built_assets+=("$platform_dir/$asset_name")
+  done
+done
+
+if [[ ${#built_assets[@]} -eq 0 ]]; then
+  echo "❌ 未成功构建任何驱动代理。"
+  exit 1
+fi
+
+zip_bundle "$bundle_zip_path" "$bundle_stage_dir"
+
+echo ""
+echo "✅ 构建完成"
+echo "   单文件输出根目录：$out_root_abs"
+echo "   驱动总包：$bundle_zip_path"
+echo "   已构建：${built_assets[*]}"
+if [[ ${#skipped_drivers[@]} -gt 0 ]]; then
+  echo "   已跳过：${skipped_drivers[*]}"
+fi
+if [[ ${#failed_drivers[@]} -gt 0 ]]; then
+  echo "⚠️  构建失败驱动：${failed_drivers[*]}"
+  exit 2
+fi
--- a/build-release.sh
+++ b/build-release.sh
@@ -1,18 +1,44 @@
 #!/bin/bash

+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
 # 配置
 APP_NAME="GoNavi"
 DIST_DIR="dist"
 BUILD_BIN_DIR="build/bin"
 DEFAULT_BINARY_NAME="GoNavi" # 对应 wails.json 中的 outputfilename
+DEV_VERSION_FILE="version/dev-version.txt"
+DEFAULT_DEV_VERSION="0.0.1-test"

-# 提取版本号
-VERSION=$(grep '"version":' frontend/package.json | head -1 | awk -F: '{ print $2 }' | sed 's/[",]//g' | tr -d '[[:space:]]')
-if [ -z "$VERSION" ]; then
-    VERSION="0.0.0"
-fi
+resolve_build_version() {
+    if [ -n "${GONAVI_VERSION:-}" ]; then
+        printf '%s\n' "${GONAVI_VERSION}"
+        return
+    fi
+
+    if [ -f "$DEV_VERSION_FILE" ]; then
+        local dev_version
+        dev_version=$(head -n 1 "$DEV_VERSION_FILE" | tr -d '\r' | tr -d '[:space:]')
+        if [ -n "$dev_version" ]; then
+            printf '%s\n' "$dev_version"
+            return
+        fi
+    fi
+
+    local package_version
+    package_version=$(grep '"version":' frontend/package.json | head -1 | awk -F: '{ print $2 }' | sed 's/[",]//g' | tr -d '[:space:]')
+    if [ -n "$package_version" ]; then
+        printf '%s\n' "$package_version"
+        return
+    fi
+
+    printf '%s\n' "$DEFAULT_DEV_VERSION"
+}
+
+VERSION="$(resolve_build_version)"
 echo "ℹ️  检测到版本号: $VERSION"
-LDFLAGS="-X GoNavi-Wails/internal/app.AppVersion=$VERSION"
+LDFLAGS="-s -w -X GoNavi-Wails/internal/app.AppVersion=$VERSION"

 # 颜色配置
 GREEN='\033[0;32m'
@@ -20,124 +46,182 @@ RED='\033[0;31m'
 YELLOW='\033[1;33m'
 NC='\033[0m'

+BUILD_FAILURES=()
+
+record_build_failure() {
+    local target="$1"
+    BUILD_FAILURES+=("$target")
+}
+
+get_file_size_bytes() {
+    local target="$1"
+    if [ ! -f "$target" ]; then
+        echo 0
+        return
+    fi
+    if stat -f%z "$target" >/dev/null 2>&1; then
+        stat -f%z "$target"
+        return
+    fi
+    if stat -c%s "$target" >/dev/null 2>&1; then
+        stat -c%s "$target"
+        return
+    fi
+    wc -c <"$target" | tr -d '[:space:]'
+}
+
+format_size_mb() {
+    local bytes="${1:-0}"
+    awk -v b="$bytes" 'BEGIN { printf "%.2fMB", b / 1024 / 1024 }'
+}
+
+try_compress_binary_with_upx() {
+    local exe_path="$1"
+    local label="$2"
+    if [ ! -f "$exe_path" ]; then
+        echo -e "${RED}   ❌ 未找到 ${label} 文件：$exe_path${NC}"
+        exit 1
+    fi
+
+    if ! command -v upx >/dev/null 2>&1; then
+        echo -e "${RED}   ❌ 未找到 upx，${label} 必须进行压缩后才能继续打包。${NC}"
+        case "$(uname -s)" in
+            Darwin)
+                echo "      安装命令: brew install upx"
+                ;;
+            Linux)
+                echo "      安装命令: sudo apt-get install -y upx-ucl  (或对应发行版包管理器)"
+                ;;
+        esac
+        exit 1
+    fi
+
+    local before_bytes after_bytes
+    before_bytes=$(get_file_size_bytes "$exe_path")
+    echo "   🗜️  正在使用 UPX 压缩 ${label}..."
+    if upx --best --lzma --force "$exe_path" >/dev/null 2>&1; then
+        if ! upx -t "$exe_path" >/dev/null 2>&1; then
+            echo -e "${RED}   ❌ UPX 校验失败：${label}${NC}"
+            exit 1
+        fi
+        after_bytes=$(get_file_size_bytes "$exe_path")
+        if [ "$after_bytes" -lt "$before_bytes" ]; then
+            local saved_bytes=$((before_bytes - after_bytes))
+            echo "   ✅ UPX 压缩完成: $(format_size_mb "$before_bytes") -> $(format_size_mb "$after_bytes")，减少 $(format_size_mb "$saved_bytes")"
+        else
+            echo "   ℹ️  UPX 压缩完成: $(format_size_mb "$before_bytes") -> $(format_size_mb "$after_bytes")"
+        fi
+    else
+        echo -e "${RED}   ❌ UPX 压缩失败：${label}${NC}"
+        exit 1
+    fi
+}
+
+clear_macos_bundle_xattrs() {
+    local bundle_path="$1"
+    if [ -z "$bundle_path" ] || [ ! -e "$bundle_path" ]; then
+        return
+    fi
+    if command -v xattr >/dev/null 2>&1; then
+        xattr -cr "$bundle_path" >/dev/null 2>&1 || true
+    fi
+}
+
+package_macos_bundle_zip() {
+    local app_path="$1"
+    local archive_path="$2"
+    local archive_abs
+
+    if [ ! -d "$app_path" ]; then
+        echo -e "${RED}   ❌ 未找到 macOS 应用包：$app_path${NC}"
+        exit 1
+    fi
+
+    archive_abs="$(cd "$(dirname "$archive_path")" && pwd)/$(basename "$archive_path")"
+    rm -f "$archive_path"
+    if command -v ditto >/dev/null 2>&1; then
+        ditto -c -k --sequesterRsrc --keepParent "$app_path" "$archive_abs"
+    elif command -v zip >/dev/null 2>&1; then
+        (
+            cd "$(dirname "$app_path")" && \
+            zip -qry "$archive_abs" "$(basename "$app_path")"
+        )
+    else
+        echo -e "${RED}   ❌ 未找到 ditto/zip，无法打包 macOS 应用。${NC}"
+        exit 1
+    fi
+
+    if [ ! -f "$archive_abs" ]; then
+        echo -e "${RED}   ❌ macOS 应用归档失败：$archive_abs${NC}"
+        exit 1
+    fi
+}
+
+package_macos_release() {
+    local platform="$1"
+    local archive_suffix="$2"
+
+    echo -e "${GREEN}🍎 正在构建 macOS (${platform})...${NC}"
+    generate_driver_agent_revisions "darwin/${platform}"
+    wails build -platform "darwin/${platform}" -clean -ldflags "$LDFLAGS"
+    if [ $? -ne 0 ]; then
+        echo -e "${RED}   ❌ macOS ${platform} 构建失败。${NC}"
+        record_build_failure "macOS ${platform}"
+        return
+    fi
+
+    local app_src="$BUILD_BIN_DIR/$DEFAULT_BINARY_NAME.app"
+    local app_dest_name="${APP_NAME}-${VERSION}-${archive_suffix}.app"
+    local zip_name="${APP_NAME}-${VERSION}-${archive_suffix}.zip"
+
+    mv "$app_src" "$DIST_DIR/$app_dest_name"
+
+    local app_bin_path
+    app_bin_path=$(find "$DIST_DIR/$app_dest_name/Contents/MacOS" -maxdepth 1 -type f -print -quit)
+    if [ -z "$app_bin_path" ] || [ ! -f "$app_bin_path" ]; then
+        echo -e "${RED}   ❌ 未找到 macOS ${platform} 主程序文件。${NC}"
+        exit 1
+    fi
+
+    echo -e "${YELLOW}   ⚠️  macOS ${platform} 改为无交互 ZIP 打包，不再生成 DMG。${NC}"
+    echo "   🔏 正在对 .app 进行 ad-hoc 签名 (${platform})..."
+    clear_macos_bundle_xattrs "$DIST_DIR/$app_dest_name"
+    codesign --force --deep --sign - "$DIST_DIR/$app_dest_name"
+
+    echo "   📦 正在打包 macOS 应用归档 (${platform})..."
+    package_macos_bundle_zip "$DIST_DIR/$app_dest_name" "$DIST_DIR/$zip_name"
+    rm -rf "$DIST_DIR/$app_dest_name"
+    echo "   ✅ 已生成 $zip_name"
+}
+
+generate_driver_agent_revisions() {
+    local platform="$1"
+    echo "   🧭 正在生成 driver-agent revision 指纹 (${platform})..."
+    ./tools/generate-driver-agent-revisions.sh --platform "$platform"
+}
+
 echo -e "${GREEN}🚀 开始构建 $APP_NAME $VERSION...${NC}"

 # 清理并创建输出目录
-rm -rf $DIST_DIR
-mkdir -p $DIST_DIR
+rm -rf "$DIST_DIR"
+mkdir -p "$DIST_DIR"

-# --- macOS ARM64 构建 ---
-echo -e "${GREEN}🍎 正在构建 macOS (arm64)...${NC}"
-wails build -platform darwin/arm64 -clean -ldflags "$LDFLAGS"
-if [ $? -eq 0 ]; then
-    APP_SRC="$BUILD_BIN_DIR/$DEFAULT_BINARY_NAME.app"
-    APP_DEST_NAME="${APP_NAME}-${VERSION}-mac-arm64.app"
-    DMG_NAME="${APP_NAME}-${VERSION}-mac-arm64.dmg"
-    
-    # 移动 .app 到 dist
-    mv "$APP_SRC" "$DIST_DIR/$APP_DEST_NAME"
-    
-    # 创建 DMG
-    if command -v create-dmg &> /dev/null; then
-        echo "   📦 正在打包 DMG (arm64)..."
-        # 移除已存在的 DMG (以防万一)
-        rm -f "$DIST_DIR/$DMG_NAME"
-        
-        create-dmg \
-            --volname "${APP_NAME} ${VERSION}" \
-            --volicon "build/appicon.icns" \
-            --window-pos 200 120 \
-            --window-size 800 400 \
-            --icon-size 100 \
-            --icon "$APP_DEST_NAME" 200 190 \
-            --hide-extension "$APP_DEST_NAME" \
-            --app-drop-link 600 185 \
-            "$DIST_DIR/$DMG_NAME" \
-            "$DIST_DIR/$APP_DEST_NAME"
-        
-        # 检查是否生成了 rw.* 的临时文件并重命名 (create-dmg 有时会有此行为)
-        if [ ! -f "$DIST_DIR/$DMG_NAME" ]; then
-             RW_FILE=$(find "$DIST_DIR" -name "rw.*.dmg" -print -quit)
-             if [ -n "$RW_FILE" ]; then
-                 echo -e "${YELLOW}   ⚠️  检测到临时文件名，正在重命名...${NC}"
-                 mv "$RW_FILE" "$DIST_DIR/$DMG_NAME"
-             fi
-        fi
-
-        # 删除中间的 .app 文件，保持目录整洁
-        rm -rf "$DIST_DIR/$APP_DEST_NAME"
-        
-        if [ -f "$DIST_DIR/$DMG_NAME" ]; then
-             echo "   ✅ 已生成 $DMG_NAME"
-        else
-             echo -e "${RED}   ❌ DMG 生成失败，请检查 create-dmg 输出。${NC}"
-        fi
-    else
-        echo -e "${YELLOW}   ⚠️  未找到 create-dmg 工具，跳过 DMG 打包，仅保留 .app。${NC}"
-        echo "      安装命令: brew install create-dmg"
-    fi
-else
-    echo -e "${RED}   ❌ macOS arm64 构建失败。${NC}"
-fi
-
-# --- macOS AMD64 构建 ---
-echo -e "${GREEN}🍎 正在构建 macOS (amd64)...${NC}"
-wails build -platform darwin/amd64 -clean -ldflags "$LDFLAGS"
-if [ $? -eq 0 ]; then
-    APP_SRC="$BUILD_BIN_DIR/$DEFAULT_BINARY_NAME.app"
-    APP_DEST_NAME="${APP_NAME}-${VERSION}-mac-amd64.app"
-    DMG_NAME="${APP_NAME}-${VERSION}-mac-amd64.dmg"
-    
-    mv "$APP_SRC" "$DIST_DIR/$APP_DEST_NAME"
-    
-    if command -v create-dmg &> /dev/null; then
-        echo "   📦 正在打包 DMG (amd64)..."
-        rm -f "$DIST_DIR/$DMG_NAME"
-        
-        create-dmg \
-            --volname "${APP_NAME} ${VERSION}" \
-            --volicon "build/appicon.icns" \
-            --window-pos 200 120 \
-            --window-size 800 400 \
-            --icon-size 100 \
-            --icon "$APP_DEST_NAME" 200 190 \
-            --hide-extension "$APP_DEST_NAME" \
-            --app-drop-link 600 185 \
-            "$DIST_DIR/$DMG_NAME" \
-            "$DIST_DIR/$APP_DEST_NAME"
-
-        # 检查是否生成了 rw.* 的临时文件并重命名
-        if [ ! -f "$DIST_DIR/$DMG_NAME" ]; then
-             RW_FILE=$(find "$DIST_DIR" -name "rw.*.dmg" -print -quit)
-             if [ -n "$RW_FILE" ]; then
-                 echo -e "${YELLOW}   ⚠️  检测到临时文件名，正在重命名...${NC}"
-                 mv "$RW_FILE" "$DIST_DIR/$DMG_NAME"
-             fi
-        fi
-        
-        rm -rf "$DIST_DIR/$APP_DEST_NAME"
-        
-        if [ -f "$DIST_DIR/$DMG_NAME" ]; then
-             echo "   ✅ 已生成 $DMG_NAME"
-        else
-             echo -e "${RED}   ❌ DMG 生成失败。${NC}"
-        fi
-    else
-        echo -e "${YELLOW}   ⚠️  未找到 create-dmg 工具。${NC}"
-    fi
-else
-    echo -e "${RED}   ❌ macOS amd64 构建失败。${NC}"
-fi
+package_macos_release "arm64" "mac-arm64"
+package_macos_release "amd64" "mac-amd64"

 # --- Windows AMD64 构建 ---
 echo -e "${GREEN}🪟 正在构建 Windows (amd64)...${NC}"
 if command -v x86_64-w64-mingw32-gcc &> /dev/null; then
+    generate_driver_agent_revisions "windows/amd64"
    wails build -platform windows/amd64 -clean -ldflags "$LDFLAGS"
    if [ $? -eq 0 ]; then
-        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}.exe" "$DIST_DIR/${APP_NAME}-${VERSION}-windows-amd64.exe"
+        TARGET_EXE="$DIST_DIR/${APP_NAME}-${VERSION}-windows-amd64.exe"
+        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}.exe" "$TARGET_EXE"
+        try_compress_binary_with_upx "$TARGET_EXE" "Windows amd64 可执行文件"
        echo "   ✅ 已生成 ${APP_NAME}-${VERSION}-windows-amd64.exe"
    else
        echo -e "${RED}   ❌ Windows amd64 构建失败。${NC}"
+        record_build_failure "Windows amd64"
    fi
 else
    echo -e "${YELLOW}   ⚠️  未找到 MinGW 工具 (x86_64-w64-mingw32-gcc)，跳过 Windows amd64 构建。${NC}"
@@ -146,12 +230,16 @@ fi
 # --- Windows ARM64 构建 ---
 echo -e "${GREEN}🪟 正在构建 Windows (arm64)...${NC}"
 if command -v aarch64-w64-mingw32-gcc &> /dev/null; then
+    generate_driver_agent_revisions "windows/arm64"
    wails build -platform windows/arm64 -clean -ldflags "$LDFLAGS"
    if [ $? -eq 0 ]; then
-        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}.exe" "$DIST_DIR/${APP_NAME}-${VERSION}-windows-arm64.exe"
+        TARGET_EXE="$DIST_DIR/${APP_NAME}-${VERSION}-windows-arm64.exe"
+        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}.exe" "$TARGET_EXE"
+        echo -e "${YELLOW}   ⚠️  当前 UPX 不支持 win64/arm64，跳过 Windows arm64 压缩。${NC}"
        echo "   ✅ 已生成 ${APP_NAME}-${VERSION}-windows-arm64.exe"
    else
        echo -e "${RED}   ❌ Windows arm64 构建失败。${NC}"
+        record_build_failure "Windows arm64"
    fi
 else
    echo -e "${YELLOW}   ⚠️  未找到 MinGW ARM64 工具 (aarch64-w64-mingw32-gcc)，跳过 Windows arm64 构建。${NC}"
@@ -166,10 +254,13 @@ CURRENT_ARCH=$(uname -m)

 if [ "$CURRENT_OS" = "Linux" ] && [ "$CURRENT_ARCH" = "x86_64" ]; then
    # 本机 Linux amd64，直接构建
+    generate_driver_agent_revisions "linux/amd64"
    wails build -platform linux/amd64 -clean -ldflags "$LDFLAGS"
    if [ $? -eq 0 ]; then
-        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}" "$DIST_DIR/${APP_NAME}-${VERSION}-linux-amd64"
-        chmod +x "$DIST_DIR/${APP_NAME}-${VERSION}-linux-amd64"
+        TARGET_LINUX_BIN="$DIST_DIR/${APP_NAME}-${VERSION}-linux-amd64"
+        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}" "$TARGET_LINUX_BIN"
+        chmod +x "$TARGET_LINUX_BIN"
+        try_compress_binary_with_upx "$TARGET_LINUX_BIN" "Linux amd64 可执行文件"
        # 打包为 tar.gz
        cd "$DIST_DIR"
        tar -czvf "${APP_NAME}-${VERSION}-linux-amd64.tar.gz" "${APP_NAME}-${VERSION}-linux-amd64"
@@ -178,16 +269,20 @@ if [ "$CURRENT_OS" = "Linux" ] && [ "$CURRENT_ARCH" = "x86_64" ]; then
        echo "   ✅ 已生成 ${APP_NAME}-${VERSION}-linux-amd64.tar.gz"
    else
        echo -e "${RED}   ❌ Linux amd64 构建失败。${NC}"
+        record_build_failure "Linux amd64"
    fi
 elif command -v x86_64-linux-gnu-gcc &> /dev/null; then
    # macOS 或其他系统，尝试交叉编译
    export CC=x86_64-linux-gnu-gcc
    export CXX=x86_64-linux-gnu-g++
    export CGO_ENABLED=1
+    generate_driver_agent_revisions "linux/amd64"
    wails build -platform linux/amd64 -clean -ldflags "$LDFLAGS"
    if [ $? -eq 0 ]; then
-        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}" "$DIST_DIR/${APP_NAME}-${VERSION}-linux-amd64"
-        chmod +x "$DIST_DIR/${APP_NAME}-${VERSION}-linux-amd64"
+        TARGET_LINUX_BIN="$DIST_DIR/${APP_NAME}-${VERSION}-linux-amd64"
+        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}" "$TARGET_LINUX_BIN"
+        chmod +x "$TARGET_LINUX_BIN"
+        try_compress_binary_with_upx "$TARGET_LINUX_BIN" "Linux amd64 可执行文件"
        cd "$DIST_DIR"
        tar -czvf "${APP_NAME}-${VERSION}-linux-amd64.tar.gz" "${APP_NAME}-${VERSION}-linux-amd64"
        rm "${APP_NAME}-${VERSION}-linux-amd64"
@@ -195,6 +290,7 @@ elif command -v x86_64-linux-gnu-gcc &> /dev/null; then
        echo "   ✅ 已生成 ${APP_NAME}-${VERSION}-linux-amd64.tar.gz"
    else
        echo -e "${RED}   ❌ Linux amd64 交叉编译失败。${NC}"
+        record_build_failure "Linux amd64"
    fi
    unset CC CXX CGO_ENABLED
 else
@@ -206,10 +302,13 @@ fi
 echo -e "${GREEN}🐧 正在构建 Linux (arm64)...${NC}"
 if [ "$CURRENT_OS" = "Linux" ] && [ "$CURRENT_ARCH" = "aarch64" ]; then
    # 本机 Linux arm64，直接构建
+    generate_driver_agent_revisions "linux/arm64"
    wails build -platform linux/arm64 -clean -ldflags "$LDFLAGS"
    if [ $? -eq 0 ]; then
-        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}" "$DIST_DIR/${APP_NAME}-${VERSION}-linux-arm64"
-        chmod +x "$DIST_DIR/${APP_NAME}-${VERSION}-linux-arm64"
+        TARGET_LINUX_BIN="$DIST_DIR/${APP_NAME}-${VERSION}-linux-arm64"
+        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}" "$TARGET_LINUX_BIN"
+        chmod +x "$TARGET_LINUX_BIN"
+        try_compress_binary_with_upx "$TARGET_LINUX_BIN" "Linux arm64 可执行文件"
        cd "$DIST_DIR"
        tar -czvf "${APP_NAME}-${VERSION}-linux-arm64.tar.gz" "${APP_NAME}-${VERSION}-linux-arm64"
        rm "${APP_NAME}-${VERSION}-linux-arm64"
@@ -217,16 +316,20 @@ if [ "$CURRENT_OS" = "Linux" ] && [ "$CURRENT_ARCH" = "aarch64" ]; then
        echo "   ✅ 已生成 ${APP_NAME}-${VERSION}-linux-arm64.tar.gz"
    else
        echo -e "${RED}   ❌ Linux arm64 构建失败。${NC}"
+        record_build_failure "Linux arm64"
    fi
 elif command -v aarch64-linux-gnu-gcc &> /dev/null; then
    # 交叉编译
    export CC=aarch64-linux-gnu-gcc
    export CXX=aarch64-linux-gnu-g++
    export CGO_ENABLED=1
+    generate_driver_agent_revisions "linux/arm64"
    wails build -platform linux/arm64 -clean -ldflags "$LDFLAGS"
    if [ $? -eq 0 ]; then
-        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}" "$DIST_DIR/${APP_NAME}-${VERSION}-linux-arm64"
-        chmod +x "$DIST_DIR/${APP_NAME}-${VERSION}-linux-arm64"
+        TARGET_LINUX_BIN="$DIST_DIR/${APP_NAME}-${VERSION}-linux-arm64"
+        mv "$BUILD_BIN_DIR/${DEFAULT_BINARY_NAME}" "$TARGET_LINUX_BIN"
+        chmod +x "$TARGET_LINUX_BIN"
+        try_compress_binary_with_upx "$TARGET_LINUX_BIN" "Linux arm64 可执行文件"
        cd "$DIST_DIR"
        tar -czvf "${APP_NAME}-${VERSION}-linux-arm64.tar.gz" "${APP_NAME}-${VERSION}-linux-arm64"
        rm "${APP_NAME}-${VERSION}-linux-arm64"
@@ -234,6 +337,7 @@ elif command -v aarch64-linux-gnu-gcc &> /dev/null; then
        echo "   ✅ 已生成 ${APP_NAME}-${VERSION}-linux-arm64.tar.gz"
    else
        echo -e "${RED}   ❌ Linux arm64 交叉编译失败。${NC}"
+        record_build_failure "Linux arm64"
    fi
    unset CC CXX CGO_ENABLED
 else
@@ -267,12 +371,21 @@ else
 fi

 echo ""
-echo -e "${GREEN}🎉 所有任务完成！构建产物在 'dist/' 目录下：${NC}"
+if [ "${#BUILD_FAILURES[@]}" -gt 0 ]; then
+    echo -e "${RED}❌ 构建未完全成功，失败平台：${BUILD_FAILURES[*]}${NC}"
+    echo -e "${YELLOW}📦 已成功生成的产物在 'dist/' 目录下：${NC}"
+else
+    echo -e "${GREEN}🎉 所有任务完成！构建产物在 'dist/' 目录下：${NC}"
+fi
 ls -lh "$DIST_DIR"
 echo ""
 echo -e "${GREEN}📋 支持的平台：${NC}"
-echo "   • macOS (Intel/Apple Silicon): .dmg"
+echo "   • macOS (Intel/Apple Silicon): .zip"
 echo "   • Windows (x64/ARM64): .exe"
 echo "   • Linux (x64/ARM64): .tar.gz"
 echo ""
 echo -e "${YELLOW}💡 提示：Linux AppImage 包请使用 GitHub Actions CI/CD 构建。${NC}"
+
+if [ "${#BUILD_FAILURES[@]}" -gt 0 ]; then
+    exit 1
+fi
--- a/build/appicon.png
+++ b/build/appicon.png
--- a/build/darwin/Info.dev.plist
+++ b/build/darwin/Info.dev.plist
@@ -0,0 +1,68 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleName</key>
+        <string>{{.Info.ProductName}}</string>
+        <key>CFBundleExecutable</key>
+        <string>{{.OutputFilename}}</string>
+        <key>CFBundleIdentifier</key>
+        <string>com.wails.{{.Name}}.dev</string>
+        <key>CFBundleVersion</key>
+        <string>{{.Info.ProductVersion}}</string>
+        <key>CFBundleGetInfoString</key>
+        <string>{{.Info.Comments}}</string>
+        <key>CFBundleShortVersionString</key>
+        <string>{{.Info.ProductVersion}}</string>
+        <key>CFBundleIconFile</key>
+        <string>iconfile</string>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.13.0</string>
+        <key>NSHighResolutionCapable</key>
+        <string>true</string>
+        <key>NSHumanReadableCopyright</key>
+        <string>{{.Info.Copyright}}</string>
+        {{if .Info.FileAssociations}}
+        <key>CFBundleDocumentTypes</key>
+        <array>
+          {{range .Info.FileAssociations}}
+          <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+              <string>{{.Ext}}</string>
+            </array>
+            <key>CFBundleTypeName</key>
+            <string>{{.Name}}</string>
+            <key>CFBundleTypeRole</key>
+            <string>{{.Role}}</string>
+            <key>CFBundleTypeIconFile</key>
+            <string>{{.IconName}}</string>
+          </dict>
+          {{end}}
+        </array>
+        {{end}}
+        {{if .Info.Protocols}}
+        <key>CFBundleURLTypes</key>
+        <array>
+          {{range .Info.Protocols}}
+            <dict>
+                <key>CFBundleURLName</key>
+                <string>com.wails.{{.Scheme}}</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>{{.Scheme}}</string>
+                </array>
+                <key>CFBundleTypeRole</key>
+                <string>{{.Role}}</string>
+            </dict>
+          {{end}}
+        </array>
+        {{end}}
+        <key>NSAppTransportSecurity</key>
+        <dict>
+            <key>NSAllowsLocalNetworking</key>
+            <true/>
+        </dict>
+    </dict>
+</plist>
--- a/build/darwin/Info.plist
+++ b/build/darwin/Info.plist
@@ -0,0 +1,63 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleName</key>
+        <string>{{.Info.ProductName}}</string>
+        <key>CFBundleExecutable</key>
+        <string>{{.OutputFilename}}</string>
+        <key>CFBundleIdentifier</key>
+        <string>com.wails.{{.Name}}</string>
+        <key>CFBundleVersion</key>
+        <string>{{.Info.ProductVersion}}</string>
+        <key>CFBundleGetInfoString</key>
+        <string>{{.Info.Comments}}</string>
+        <key>CFBundleShortVersionString</key>
+        <string>{{.Info.ProductVersion}}</string>
+        <key>CFBundleIconFile</key>
+        <string>iconfile</string>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.13.0</string>
+        <key>NSHighResolutionCapable</key>
+        <string>true</string>
+        <key>NSHumanReadableCopyright</key>
+        <string>{{.Info.Copyright}}</string>
+        {{if .Info.FileAssociations}}
+        <key>CFBundleDocumentTypes</key>
+        <array>
+          {{range .Info.FileAssociations}}
+          <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+              <string>{{.Ext}}</string>
+            </array>
+            <key>CFBundleTypeName</key>
+            <string>{{.Name}}</string>
+            <key>CFBundleTypeRole</key>
+            <string>{{.Role}}</string>
+            <key>CFBundleTypeIconFile</key>
+            <string>{{.IconName}}</string>
+          </dict>
+          {{end}}
+        </array>
+        {{end}}
+        {{if .Info.Protocols}}
+        <key>CFBundleURLTypes</key>
+        <array>
+          {{range .Info.Protocols}}
+            <dict>
+                <key>CFBundleURLName</key>
+                <string>com.wails.{{.Scheme}}</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>{{.Scheme}}</string>
+                </array>
+                <key>CFBundleTypeRole</key>
+                <string>{{.Role}}</string>
+            </dict>
+          {{end}}
+        </array>
+        {{end}}
+    </dict>
+</plist>
--- a/build/darwin/icon.icns
+++ b/build/darwin/icon.icns
--- a/build/windows/icon.ico
+++ b/build/windows/icon.ico
--- a/build/windows/info.json
+++ b/build/windows/info.json
@@ -0,0 +1,15 @@
+{
+	"fixed": {
+		"file_version": "{{.Info.ProductVersion}}"
+	},
+	"info": {
+		"0000": {
+			"ProductVersion": "{{.Info.ProductVersion}}",
+			"CompanyName": "{{.Info.CompanyName}}",
+			"FileDescription": "{{.Info.ProductName}}",
+			"LegalCopyright": "{{.Info.Copyright}}",
+			"ProductName": "{{.Info.ProductName}}",
+			"Comments": "{{.Info.Comments}}"
+		}
+	}
+}
--- a/build/windows/wails.exe.manifest
+++ b/build/windows/wails.exe.manifest
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity type="win32" name="com.wails.{{.Name}}" version="{{.Info.ProductVersion}}.0" processorArchitecture="*"/>
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
+        </dependentAssembly>
+    </dependency>
+    <asmv3:application>
+        <asmv3:windowsSettings>
+            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware> <!-- fallback for Windows 7 and 8 -->
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">permonitorv2,permonitor</dpiAwareness> <!-- falls back to per-monitor if per-monitor v2 is not supported -->
+        </asmv3:windowsSettings>
+    </asmv3:application>
+</assembly>
--- a/cmd/manualtestseed/main.go
+++ b/cmd/manualtestseed/main.go
@@ -0,0 +1,339 @@
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/ai"
+	aiservice "GoNavi-Wails/internal/ai/service"
+	"GoNavi-Wails/internal/app"
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/secretstore"
+)
+
+const (
+	modeSeedSecureStorage = "seed-secure-storage"
+	modeSeedAIUpdate      = "seed-ai-update"
+)
+
+const (
+	testConnectionID       = "manualtest-postgres"
+	testSecureProviderID   = "manualtest-secure-provider"
+	testPendingProviderID  = "manualtest-pending-provider"
+	testBackupDirName      = "manual-test-backups"
+	connectionsFileName    = "connections.json"
+	globalProxyFileName    = "global_proxy.json"
+	aiConfigFileName       = "ai_config.json"
+	securityUpdateFileName = "config-security-update.json"
+)
+
+type backupManifest struct {
+	CreatedAt string               `json:"createdAt"`
+	ConfigDir string               `json:"configDir"`
+	Files     []backupManifestFile `json:"files"`
+}
+
+type backupManifestFile struct {
+	RelativePath string `json:"relativePath"`
+	Existed      bool   `json:"existed"`
+}
+
+type storedAIConfig struct {
+	SchemaVersion  int                 `json:"schemaVersion,omitempty"`
+	Providers      []ai.ProviderConfig `json:"providers"`
+	ActiveProvider string              `json:"activeProvider"`
+	SafetyLevel    string              `json:"safetyLevel"`
+	ContextLevel   string              `json:"contextLevel"`
+}
+
+func main() {
+	mode := flag.String("mode", modeSeedSecureStorage, "seed mode: seed-secure-storage | seed-ai-update")
+	flag.Parse()
+
+	configDir, err := resolveConfigDir()
+	if err != nil {
+		fatalf("resolve config dir failed: %v", err)
+	}
+
+	store := secretstore.NewKeyringStore()
+	if err := store.HealthCheck(); err != nil {
+		fatalf("secret store unavailable: %v", err)
+	}
+
+	backupDir, err := backupConfigFiles(configDir)
+	if err != nil {
+		fatalf("backup config files failed: %v", err)
+	}
+
+	switch strings.TrimSpace(*mode) {
+	case modeSeedSecureStorage:
+		if err := seedSecureStorage(configDir, store); err != nil {
+			fatalf("seed secure storage failed: %v", err)
+		}
+		fmt.Printf("mode=%s\nbackup=%s\nconnectionId=%s\nproviderId=%s\n", modeSeedSecureStorage, backupDir, testConnectionID, testSecureProviderID)
+	case modeSeedAIUpdate:
+		if err := seedAIUpdate(configDir, store); err != nil {
+			fatalf("seed ai update failed: %v", err)
+		}
+		fmt.Printf("mode=%s\nbackup=%s\npendingProviderId=%s\n", modeSeedAIUpdate, backupDir, testPendingProviderID)
+	default:
+		fatalf("unsupported mode: %s", *mode)
+	}
+}
+
+func fatalf(format string, args ...any) {
+	fmt.Fprintf(os.Stderr, format+"\n", args...)
+	os.Exit(1)
+}
+
+func resolveConfigDir() (string, error) {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(homeDir, ".gonavi"), nil
+}
+
+func backupConfigFiles(configDir string) (string, error) {
+	backupDir := filepath.Join(configDir, testBackupDirName, time.Now().Format("20060102-150405"))
+	files := []string{
+		connectionsFileName,
+		globalProxyFileName,
+		aiConfigFileName,
+		filepath.Join("migrations", securityUpdateFileName),
+	}
+
+	manifest := backupManifest{
+		CreatedAt: time.Now().Format(time.RFC3339),
+		ConfigDir: configDir,
+		Files:     make([]backupManifestFile, 0, len(files)),
+	}
+
+	for _, relativePath := range files {
+		srcPath := filepath.Join(configDir, relativePath)
+		info, err := os.Stat(srcPath)
+		if err != nil {
+			if os.IsNotExist(err) {
+				manifest.Files = append(manifest.Files, backupManifestFile{
+					RelativePath: relativePath,
+					Existed:      false,
+				})
+				continue
+			}
+			return "", err
+		}
+		if info.IsDir() {
+			continue
+		}
+
+		dstPath := filepath.Join(backupDir, relativePath)
+		if err := os.MkdirAll(filepath.Dir(dstPath), 0o755); err != nil {
+			return "", err
+		}
+		data, err := os.ReadFile(srcPath)
+		if err != nil {
+			return "", err
+		}
+		if err := os.WriteFile(dstPath, data, 0o644); err != nil {
+			return "", err
+		}
+		manifest.Files = append(manifest.Files, backupManifestFile{
+			RelativePath: relativePath,
+			Existed:      true,
+		})
+	}
+
+	if err := os.MkdirAll(backupDir, 0o755); err != nil {
+		return "", err
+	}
+	manifestData, err := json.MarshalIndent(manifest, "", "  ")
+	if err != nil {
+		return "", err
+	}
+	if err := os.WriteFile(filepath.Join(backupDir, "manifest.json"), manifestData, 0o644); err != nil {
+		return "", err
+	}
+	return backupDir, nil
+}
+
+func seedSecureStorage(configDir string, store secretstore.SecretStore) error {
+	if err := cleanupKnownTestSecrets(store); err != nil {
+		return err
+	}
+
+	appService := app.NewAppWithSecretStore(store)
+	_ = appService.DeleteConnection(testConnectionID)
+
+	if _, err := appService.SaveConnection(connection.SavedConnectionInput{
+		ID:   testConnectionID,
+		Name: "手工测试 PostgreSQL",
+		Config: connection.ConnectionConfig{
+			ID:       testConnectionID,
+			Type:     "postgres",
+			Host:     "127.0.0.1",
+			Port:     5432,
+			User:     "postgres",
+			Password: "manualtest-pg-secret",
+			Database: "postgres",
+		},
+	}); err != nil {
+		return err
+	}
+
+	if _, err := appService.SaveGlobalProxy(connection.SaveGlobalProxyInput{
+		Enabled:  true,
+		Type:     "http",
+		Host:     "127.0.0.1",
+		Port:     7890,
+		User:     "manual-test",
+		Password: "manualtest-proxy-secret",
+	}); err != nil {
+		return err
+	}
+
+	storeConfig := aiservice.NewProviderConfigStore(configDir, store)
+	snapshot, err := storeConfig.LoadRuntime()
+	if err != nil {
+		return err
+	}
+	snapshot.Providers = filterProviders(snapshot.Providers, testSecureProviderID, testPendingProviderID)
+	snapshot.Providers = append(snapshot.Providers, ai.ProviderConfig{
+		ID:        testSecureProviderID,
+		Type:      "custom",
+		Name:      "手工测试 Secure Provider",
+		APIKey:    "manualtest-ai-secret",
+		BaseURL:   "https://api.openai.com/v1",
+		Model:     "gpt-4o-mini",
+		APIFormat: "openai",
+		Headers: map[string]string{
+			"Authorization": "Bearer manualtest-header-secret",
+			"X-Trace-Id":    "manualtest-visible",
+		},
+		MaxTokens:   2048,
+		Temperature: 0.2,
+	})
+	if snapshot.SafetyLevel == "" {
+		snapshot.SafetyLevel = ai.PermissionReadOnly
+	}
+	if snapshot.ContextLevel == "" {
+		snapshot.ContextLevel = ai.ContextSchemaOnly
+	}
+	return storeConfig.Save(snapshot)
+}
+
+func seedAIUpdate(configDir string, store secretstore.SecretStore) error {
+	if err := cleanupKnownTestSecrets(store); err != nil {
+		return err
+	}
+
+	configPath := filepath.Join(configDir, aiConfigFileName)
+	cfg, err := readStoredAIConfig(configPath)
+	if err != nil {
+		return err
+	}
+
+	cfg.Providers = filterProviders(cfg.Providers, testSecureProviderID, testPendingProviderID)
+	cfg.Providers = append(cfg.Providers, ai.ProviderConfig{
+		ID:        testPendingProviderID,
+		Type:      "custom",
+		Name:      "手工测试 待迁移 AI",
+		APIKey:    "manualtest-ai-update-secret",
+		BaseURL:   "https://api.openai.com/v1",
+		Model:     "gpt-4o-mini",
+		APIFormat: "openai",
+		MaxTokens: 1024,
+	})
+	if cfg.SchemaVersion == 0 {
+		cfg.SchemaVersion = 2
+	}
+	if cfg.Providers == nil {
+		cfg.Providers = []ai.ProviderConfig{}
+	}
+	if err := os.MkdirAll(configDir, 0o755); err != nil {
+		return err
+	}
+	data, err := json.MarshalIndent(cfg, "", "  ")
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(configPath, data, 0o644)
+}
+
+func readStoredAIConfig(configPath string) (storedAIConfig, error) {
+	cfg := storedAIConfig{
+		Providers:      []ai.ProviderConfig{},
+		SafetyLevel:    string(ai.PermissionReadOnly),
+		ContextLevel:   string(ai.ContextSchemaOnly),
+		SchemaVersion:  2,
+		ActiveProvider: "",
+	}
+
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return cfg, nil
+		}
+		return storedAIConfig{}, err
+	}
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		return storedAIConfig{}, err
+	}
+	if cfg.Providers == nil {
+		cfg.Providers = []ai.ProviderConfig{}
+	}
+	return cfg, nil
+}
+
+func filterProviders(providers []ai.ProviderConfig, excludedIDs ...string) []ai.ProviderConfig {
+	excluded := make(map[string]struct{}, len(excludedIDs))
+	for _, id := range excludedIDs {
+		excluded[strings.TrimSpace(id)] = struct{}{}
+	}
+	filtered := make([]ai.ProviderConfig, 0, len(providers))
+	for _, provider := range providers {
+		if _, skip := excluded[strings.TrimSpace(provider.ID)]; skip {
+			continue
+		}
+		filtered = append(filtered, provider)
+	}
+	return filtered
+}
+
+func cleanupKnownTestSecrets(store secretstore.SecretStore) error {
+	type secretRef struct {
+		kind string
+		id   string
+	}
+	refs := []secretRef{
+		{kind: "connection", id: testConnectionID},
+		{kind: "global-proxy", id: "default"},
+		{kind: "ai-provider", id: testSecureProviderID},
+		{kind: "ai-provider", id: testPendingProviderID},
+	}
+
+	for _, item := range refs {
+		ref, err := secretstore.BuildRef(item.kind, item.id)
+		if err != nil {
+			return err
+		}
+		if err := store.Delete(ref); err != nil && !isIgnorableDeleteError(err) {
+			return err
+		}
+	}
+	return nil
+}
+
+func isIgnorableDeleteError(err error) bool {
+	if err == nil || os.IsNotExist(err) {
+		return true
+	}
+	message := strings.ToLower(strings.TrimSpace(err.Error()))
+	return strings.Contains(message, "could not be found") ||
+		strings.Contains(message, "not be found in the keyring") ||
+		strings.Contains(message, "element not found")
+}
--- a/cmd/mysql-driver-agent/main.go
+++ b/cmd/mysql-driver-agent/main.go
@@ -0,0 +1,227 @@
+//go:build gonavi_mysql_driver
+
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"os"
+	"strings"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/db"
+)
+
+type mysqlAgentRequest struct {
+	ID        int64                        `json:"id"`
+	Method    string                       `json:"method"`
+	Config    *connection.ConnectionConfig `json:"config,omitempty"`
+	Query     string                       `json:"query,omitempty"`
+	DBName    string                       `json:"dbName,omitempty"`
+	TableName string                       `json:"tableName,omitempty"`
+	Changes   *connection.ChangeSet        `json:"changes,omitempty"`
+}
+
+type mysqlAgentResponse struct {
+	ID           int64       `json:"id"`
+	Success      bool        `json:"success"`
+	Error        string      `json:"error,omitempty"`
+	Data         interface{} `json:"data,omitempty"`
+	Fields       []string    `json:"fields,omitempty"`
+	RowsAffected int64       `json:"rowsAffected,omitempty"`
+}
+
+const (
+	mysqlAgentMethodConnect       = "connect"
+	mysqlAgentMethodClose         = "close"
+	mysqlAgentMethodPing          = "ping"
+	mysqlAgentMethodQuery         = "query"
+	mysqlAgentMethodExec          = "exec"
+	mysqlAgentMethodGetDatabases  = "getDatabases"
+	mysqlAgentMethodGetTables     = "getTables"
+	mysqlAgentMethodGetCreateStmt = "getCreateStatement"
+	mysqlAgentMethodGetColumns    = "getColumns"
+	mysqlAgentMethodGetAllColumns = "getAllColumns"
+	mysqlAgentMethodGetIndexes    = "getIndexes"
+	mysqlAgentMethodGetForeignKey = "getForeignKeys"
+	mysqlAgentMethodGetTriggers   = "getTriggers"
+	mysqlAgentMethodApplyChanges  = "applyChanges"
+)
+
+func main() {
+	scanner := bufio.NewScanner(os.Stdin)
+	scanner.Buffer(make([]byte, 0, 16<<10), 8<<20)
+	writer := bufio.NewWriter(os.Stdout)
+	defer writer.Flush()
+
+	var inst *db.MySQLDB
+	for scanner.Scan() {
+		line := strings.TrimSpace(scanner.Text())
+		if line == "" {
+			continue
+		}
+
+		var req mysqlAgentRequest
+		if err := json.Unmarshal([]byte(line), &req); err != nil {
+			_ = writeResponse(writer, mysqlAgentResponse{
+				ID:      req.ID,
+				Success: false,
+				Error:   fmt.Sprintf("解析请求失败：%v", err),
+			})
+			continue
+		}
+
+		resp := handleRequest(&inst, req)
+		if err := writeResponse(writer, resp); err != nil {
+			fmt.Fprintf(os.Stderr, "写入响应失败：%v\n", err)
+			break
+		}
+	}
+
+	if inst != nil {
+		_ = inst.Close()
+	}
+
+	if err := scanner.Err(); err != nil {
+		fmt.Fprintf(os.Stderr, "读取请求失败：%v\n", err)
+	}
+}
+
+func handleRequest(inst **db.MySQLDB, req mysqlAgentRequest) mysqlAgentResponse {
+	resp := mysqlAgentResponse{
+		ID:      req.ID,
+		Success: true,
+	}
+
+	switch strings.TrimSpace(req.Method) {
+	case mysqlAgentMethodConnect:
+		if req.Config == nil {
+			return fail(resp, "连接配置为空")
+		}
+		if *inst != nil {
+			_ = (*inst).Close()
+		}
+		next := &db.MySQLDB{}
+		if err := next.Connect(*req.Config); err != nil {
+			return fail(resp, err.Error())
+		}
+		*inst = next
+		return resp
+	case mysqlAgentMethodClose:
+		if *inst != nil {
+			if err := (*inst).Close(); err != nil {
+				return fail(resp, err.Error())
+			}
+			*inst = nil
+		}
+		return resp
+	}
+
+	if *inst == nil {
+		return fail(resp, "connection not open")
+	}
+
+	switch strings.TrimSpace(req.Method) {
+	case mysqlAgentMethodPing:
+		if err := (*inst).Ping(); err != nil {
+			return fail(resp, err.Error())
+		}
+	case mysqlAgentMethodQuery:
+		data, fields, err := (*inst).Query(req.Query)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+		resp.Fields = fields
+	case mysqlAgentMethodExec:
+		affected, err := (*inst).Exec(req.Query)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.RowsAffected = affected
+	case mysqlAgentMethodGetDatabases:
+		data, err := (*inst).GetDatabases()
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case mysqlAgentMethodGetTables:
+		data, err := (*inst).GetTables(req.DBName)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case mysqlAgentMethodGetCreateStmt:
+		data, err := (*inst).GetCreateStatement(req.DBName, req.TableName)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case mysqlAgentMethodGetColumns:
+		data, err := (*inst).GetColumns(req.DBName, req.TableName)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case mysqlAgentMethodGetAllColumns:
+		data, err := (*inst).GetAllColumns(req.DBName)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case mysqlAgentMethodGetIndexes:
+		data, err := (*inst).GetIndexes(req.DBName, req.TableName)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case mysqlAgentMethodGetForeignKey:
+		data, err := (*inst).GetForeignKeys(req.DBName, req.TableName)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case mysqlAgentMethodGetTriggers:
+		data, err := (*inst).GetTriggers(req.DBName, req.TableName)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case mysqlAgentMethodApplyChanges:
+		if req.Changes == nil {
+			return fail(resp, "变更集为空")
+		}
+		applier, ok := interface{}(*inst).(interface {
+			ApplyChanges(tableName string, changes connection.ChangeSet) error
+		})
+		if !ok {
+			return fail(resp, "当前驱动不支持 ApplyChanges")
+		}
+		if err := applier.ApplyChanges(req.TableName, *req.Changes); err != nil {
+			return fail(resp, err.Error())
+		}
+	default:
+		return fail(resp, "不支持的方法")
+	}
+
+	return resp
+}
+
+func writeResponse(writer *bufio.Writer, resp mysqlAgentResponse) error {
+	payload, err := json.Marshal(resp)
+	if err != nil {
+		return err
+	}
+	payload = append(payload, '\n')
+	if _, err := writer.Write(payload); err != nil {
+		return err
+	}
+	return writer.Flush()
+}
+
+func fail(resp mysqlAgentResponse, errText string) mysqlAgentResponse {
+	resp.Success = false
+	resp.Error = strings.TrimSpace(errText)
+	return resp
+}
--- a/cmd/optional-driver-agent/main.go
+++ b/cmd/optional-driver-agent/main.go
@@ -0,0 +1,338 @@
+package main
+
+import (
+	"bufio"
+	"context"
+	"encoding/json"
+	"fmt"
+	"os"
+	"reflect"
+	"strings"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/db"
+)
+
+type agentRequest struct {
+	ID        int64                        `json:"id"`
+	Method    string                       `json:"method"`
+	Config    *connection.ConnectionConfig `json:"config,omitempty"`
+	Query     string                       `json:"query,omitempty"`
+	TimeoutMs int64                        `json:"timeoutMs,omitempty"`
+	DBName    string                       `json:"dbName,omitempty"`
+	TableName string                       `json:"tableName,omitempty"`
+	Changes   *connection.ChangeSet        `json:"changes,omitempty"`
+}
+
+type agentResponse struct {
+	ID           int64       `json:"id"`
+	Success      bool        `json:"success"`
+	Error        string      `json:"error,omitempty"`
+	Data         interface{} `json:"data,omitempty"`
+	Fields       []string    `json:"fields,omitempty"`
+	RowsAffected int64       `json:"rowsAffected,omitempty"`
+}
+
+const (
+	agentMethodConnect       = "connect"
+	agentMethodClose         = "close"
+	agentMethodMetadata      = "metadata"
+	agentMethodPing          = "ping"
+	agentMethodQuery         = "query"
+	agentMethodExec          = "exec"
+	agentMethodGetDatabases  = "getDatabases"
+	agentMethodGetTables     = "getTables"
+	agentMethodGetCreateStmt = "getCreateStatement"
+	agentMethodGetColumns    = "getColumns"
+	agentMethodGetAllColumns = "getAllColumns"
+	agentMethodGetIndexes    = "getIndexes"
+	agentMethodGetForeignKey = "getForeignKeys"
+	agentMethodGetTriggers   = "getTriggers"
+	agentMethodApplyChanges  = "applyChanges"
+)
+
+const legacyClickHouseDefaultTimeout = 2 * time.Hour
+
+var (
+	agentDriverType      string
+	agentDatabaseFactory func() db.Database
+)
+
+func main() {
+	if agentDatabaseFactory == nil || strings.TrimSpace(agentDriverType) == "" {
+		fmt.Fprintf(os.Stderr, "未配置驱动代理 provider，请使用 gonavi_<driver>_driver 标签构建\n")
+		os.Exit(2)
+	}
+
+	scanner := bufio.NewScanner(os.Stdin)
+	scanner.Buffer(make([]byte, 0, 16<<10), 8<<20)
+	writer := bufio.NewWriter(os.Stdout)
+	defer writer.Flush()
+
+	var inst db.Database
+	for scanner.Scan() {
+		line := strings.TrimSpace(scanner.Text())
+		if line == "" {
+			continue
+		}
+
+		var req agentRequest
+		if err := json.Unmarshal([]byte(line), &req); err != nil {
+			_ = writeResponse(writer, agentResponse{
+				ID:      req.ID,
+				Success: false,
+				Error:   fmt.Sprintf("解析请求失败：%v", err),
+			})
+			continue
+		}
+
+		resp := handleRequest(&inst, req)
+		if err := writeResponse(writer, resp); err != nil {
+			fmt.Fprintf(os.Stderr, "写入响应失败：%v\n", err)
+			break
+		}
+	}
+
+	if inst != nil {
+		_ = inst.Close()
+	}
+
+	if err := scanner.Err(); err != nil {
+		fmt.Fprintf(os.Stderr, "读取请求失败：%v\n", err)
+	}
+}
+
+func handleRequest(inst *db.Database, req agentRequest) agentResponse {
+	resp := agentResponse{ID: req.ID, Success: true}
+	method := strings.TrimSpace(req.Method)
+
+	switch method {
+	case agentMethodConnect:
+		if req.Config == nil {
+			return fail(resp, "连接配置为空")
+		}
+		if *inst != nil {
+			_ = (*inst).Close()
+		}
+		next := agentDatabaseFactory()
+		if next == nil {
+			return fail(resp, "驱动代理初始化失败")
+		}
+		if err := next.Connect(*req.Config); err != nil {
+			return fail(resp, err.Error())
+		}
+		*inst = next
+		return resp
+	case agentMethodClose:
+		if *inst != nil {
+			if err := (*inst).Close(); err != nil {
+				return fail(resp, err.Error())
+			}
+			*inst = nil
+		}
+		return resp
+	case agentMethodMetadata:
+		resp.Data = map[string]string{
+			"driverType":     strings.TrimSpace(agentDriverType),
+			"agentRevision":  db.OptionalDriverAgentRevision(agentDriverType),
+			"protocolSchema": "json-lines-v1",
+		}
+		return resp
+	}
+
+	if *inst == nil {
+		return fail(resp, "connection not open")
+	}
+
+	switch method {
+	case agentMethodPing:
+		if err := (*inst).Ping(); err != nil {
+			return fail(resp, err.Error())
+		}
+	case agentMethodQuery:
+		data, fields, err := queryWithOptionalTimeout(*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)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.RowsAffected = affected
+	case agentMethodGetDatabases:
+		data, err := (*inst).GetDatabases()
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case agentMethodGetTables:
+		data, err := (*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)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case agentMethodGetColumns:
+		data, err := (*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)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case agentMethodGetIndexes:
+		data, err := (*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)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case agentMethodGetTriggers:
+		data, err := (*inst).GetTriggers(req.DBName, req.TableName)
+		if err != nil {
+			return fail(resp, err.Error())
+		}
+		resp.Data = data
+	case agentMethodApplyChanges:
+		if req.Changes == nil {
+			return fail(resp, "变更集为空")
+		}
+		applier, ok := (*inst).(interface {
+			ApplyChanges(tableName string, changes connection.ChangeSet) error
+		})
+		if !ok {
+			return fail(resp, "当前驱动不支持 ApplyChanges")
+		}
+		if err := applier.ApplyChanges(req.TableName, *req.Changes); err != nil {
+			return fail(resp, err.Error())
+		}
+	default:
+		return fail(resp, "不支持的方法")
+	}
+
+	return resp
+}
+
+func writeResponse(writer *bufio.Writer, resp agentResponse) error {
+	// 对响应数据做统一 JSON 安全归一化：
+	// 将 map[any]any（如 duckdb.Map）递归转换为 map[string]any，避免序列化失败导致代理进程退出。
+	safeResp := resp
+	safeResp.Data = normalizeAgentResponseData(resp.Data)
+	payload, err := json.Marshal(safeResp)
+	if err != nil {
+		return err
+	}
+	payload = append(payload, '\n')
+	if _, err := writer.Write(payload); err != nil {
+		return err
+	}
+	return writer.Flush()
+}
+
+func fail(resp agentResponse, errText string) agentResponse {
+	resp.Success = false
+	resp.Error = strings.TrimSpace(errText)
+	return resp
+}
+
+func normalizeAgentResponseData(v interface{}) interface{} {
+	if v == nil {
+		return nil
+	}
+
+	rv := reflect.ValueOf(v)
+	switch rv.Kind() {
+	case reflect.Pointer, reflect.Interface:
+		if rv.IsNil() {
+			return nil
+		}
+		return normalizeAgentResponseData(rv.Elem().Interface())
+	case reflect.Map:
+		if rv.IsNil() {
+			return nil
+		}
+		out := make(map[string]interface{}, rv.Len())
+		iter := rv.MapRange()
+		for iter.Next() {
+			out[fmt.Sprint(iter.Key().Interface())] = normalizeAgentResponseData(iter.Value().Interface())
+		}
+		return out
+	case reflect.Slice:
+		if rv.IsNil() {
+			return nil
+		}
+		// 保持 []byte 原样，避免改变现有二进制列的 JSON 编码行为（base64）。
+		if rv.Type().Elem().Kind() == reflect.Uint8 {
+			return v
+		}
+		size := rv.Len()
+		items := make([]interface{}, size)
+		for i := 0; i < size; i++ {
+			items[i] = normalizeAgentResponseData(rv.Index(i).Interface())
+		}
+		return items
+	case reflect.Array:
+		size := rv.Len()
+		items := make([]interface{}, size)
+		for i := 0; i < size; i++ {
+			items[i] = normalizeAgentResponseData(rv.Index(i).Interface())
+		}
+		return items
+	default:
+		return v
+	}
+}
+
+func queryWithOptionalTimeout(inst db.Database, 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)
+	}
+	if effectiveTimeoutMs <= 0 {
+		return inst.Query(query)
+	}
+	if q, ok := inst.(interface {
+		QueryContext(context.Context, string) ([]map[string]interface{}, []string, error)
+	}); ok {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Duration(effectiveTimeoutMs)*time.Millisecond)
+		defer cancel()
+		return q.QueryContext(ctx, query)
+	}
+	return inst.Query(query)
+}
+
+func execWithOptionalTimeout(inst db.Database, query string, timeoutMs int64) (int64, error) {
+	effectiveTimeoutMs := timeoutMs
+	if effectiveTimeoutMs <= 0 && strings.EqualFold(strings.TrimSpace(agentDriverType), "clickhouse") {
+		effectiveTimeoutMs = int64(legacyClickHouseDefaultTimeout / time.Millisecond)
+	}
+	if effectiveTimeoutMs <= 0 {
+		return inst.Exec(query)
+	}
+	if e, ok := inst.(interface {
+		ExecContext(context.Context, string) (int64, error)
+	}); ok {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Duration(effectiveTimeoutMs)*time.Millisecond)
+		defer cancel()
+		return e.ExecContext(ctx, query)
+	}
+	return inst.Exec(query)
+}
--- a/cmd/optional-driver-agent/main_test.go
+++ b/cmd/optional-driver-agent/main_test.go
@@ -0,0 +1,200 @@
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"testing"
+	"time"
+
+	"GoNavi-Wails/internal/connection"
+	"GoNavi-Wails/internal/db"
+)
+
+type duckMapLike map[any]any
+
+func TestWriteResponse_NormalizesMapAnyAny(t *testing.T) {
+	resp := agentResponse{
+		ID:      1,
+		Success: true,
+		Data: []map[string]interface{}{
+			{
+				"id":   int64(7),
+				"meta": duckMapLike{"k": "v", 2: "two"},
+			},
+		},
+	}
+
+	var out bytes.Buffer
+	writer := bufio.NewWriter(&out)
+	if err := writeResponse(writer, resp); err != nil {
+		t.Fatalf("writeResponse 返回错误: %v", err)
+	}
+
+	var decoded struct {
+		Data []map[string]interface{} `json:"data"`
+	}
+	if err := json.Unmarshal(bytes.TrimSpace(out.Bytes()), &decoded); err != nil {
+		t.Fatalf("解码响应失败: %v", err)
+	}
+
+	if len(decoded.Data) != 1 {
+		t.Fatalf("期望 1 行数据，实际 %d", len(decoded.Data))
+	}
+	meta, ok := decoded.Data[0]["meta"].(map[string]interface{})
+	if !ok {
+		t.Fatalf("meta 字段类型异常: %T", decoded.Data[0]["meta"])
+	}
+	if meta["k"] != "v" {
+		t.Fatalf("字符串 key 转换异常: %v", meta["k"])
+	}
+	if meta["2"] != "two" {
+		t.Fatalf("数字 key 未字符串化: %v", meta["2"])
+	}
+}
+
+func TestNormalizeAgentResponseData_KeepByteSlice(t *testing.T) {
+	raw := []byte{0x61, 0x62, 0x63}
+	normalized := normalizeAgentResponseData(raw)
+	out, ok := normalized.([]byte)
+	if !ok {
+		t.Fatalf("期望 []byte，实际 %T", normalized)
+	}
+	if !bytes.Equal(out, raw) {
+		t.Fatalf("[]byte 内容被意外改写: %v", out)
+	}
+}
+
+func TestHandleRequestMetadataReportsAgentRevision(t *testing.T) {
+	previousDriverType := agentDriverType
+	previousFactory := agentDatabaseFactory
+	t.Cleanup(func() {
+		agentDriverType = previousDriverType
+		agentDatabaseFactory = previousFactory
+	})
+	agentDriverType = "clickhouse"
+	agentDatabaseFactory = func() db.Database { return nil }
+
+	var inst db.Database
+	resp := handleRequest(&inst, agentRequest{ID: 7, Method: agentMethodMetadata})
+	if !resp.Success {
+		t.Fatalf("metadata request failed: %s", resp.Error)
+	}
+	data, ok := resp.Data.(map[string]string)
+	if !ok {
+		t.Fatalf("metadata response data type = %T", resp.Data)
+	}
+	if data["driverType"] != "clickhouse" {
+		t.Fatalf("unexpected driver type: %q", data["driverType"])
+	}
+	if data["agentRevision"] != db.OptionalDriverAgentRevision("clickhouse") {
+		t.Fatalf("unexpected agent revision: %q", data["agentRevision"])
+	}
+}
+
+type fakeAgentTimeoutDB struct {
+	queryCalled        bool
+	queryContextCalled bool
+	execCalled         bool
+	execContextCalled  bool
+	deadlineSet        bool
+}
+
+func (f *fakeAgentTimeoutDB) Connect(config connection.ConnectionConfig) error { return nil }
+func (f *fakeAgentTimeoutDB) Close() error                                     { return nil }
+func (f *fakeAgentTimeoutDB) Ping() error                                      { return nil }
+func (f *fakeAgentTimeoutDB) Query(query string) ([]map[string]interface{}, []string, error) {
+	f.queryCalled = true
+	return nil, nil, errors.New("query should not be called")
+}
+func (f *fakeAgentTimeoutDB) QueryContext(ctx context.Context, query string) ([]map[string]interface{}, []string, error) {
+	f.queryContextCalled = true
+	if _, ok := ctx.Deadline(); ok {
+		f.deadlineSet = true
+	}
+	return []map[string]interface{}{{"ok": 1}}, []string{"ok"}, nil
+}
+func (f *fakeAgentTimeoutDB) Exec(query string) (int64, error) {
+	f.execCalled = true
+	return 0, errors.New("exec should not be called")
+}
+func (f *fakeAgentTimeoutDB) ExecContext(ctx context.Context, query string) (int64, error) {
+	f.execContextCalled = true
+	if _, ok := ctx.Deadline(); ok {
+		f.deadlineSet = true
+	}
+	return 3, nil
+}
+func (f *fakeAgentTimeoutDB) GetDatabases() ([]string, error) { return nil, nil }
+func (f *fakeAgentTimeoutDB) GetTables(dbName string) ([]string, error) {
+	return nil, nil
+}
+func (f *fakeAgentTimeoutDB) GetCreateStatement(dbName, tableName string) (string, error) {
+	return "", nil
+}
+func (f *fakeAgentTimeoutDB) GetColumns(dbName, tableName string) ([]connection.ColumnDefinition, error) {
+	return nil, nil
+}
+func (f *fakeAgentTimeoutDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
+	return nil, nil
+}
+func (f *fakeAgentTimeoutDB) GetIndexes(dbName, tableName string) ([]connection.IndexDefinition, error) {
+	return nil, nil
+}
+func (f *fakeAgentTimeoutDB) GetForeignKeys(dbName, tableName string) ([]connection.ForeignKeyDefinition, error) {
+	return nil, nil
+}
+func (f *fakeAgentTimeoutDB) GetTriggers(dbName, tableName string) ([]connection.TriggerDefinition, error) {
+	return nil, nil
+}
+
+func TestQueryWithOptionalTimeout_UsesQueryContext(t *testing.T) {
+	fake := &fakeAgentTimeoutDB{}
+	data, fields, err := queryWithOptionalTimeout(fake, "SELECT 1", int64((2 * time.Second).Milliseconds()))
+	if err != nil {
+		t.Fatalf("queryWithOptionalTimeout 返回错误: %v", err)
+	}
+	if !fake.queryContextCalled || fake.queryCalled {
+		t.Fatalf("query 调用路径异常，QueryContext=%v Query=%v", fake.queryContextCalled, fake.queryCalled)
+	}
+	if !fake.deadlineSet {
+		t.Fatal("queryWithOptionalTimeout 未设置 deadline")
+	}
+	if len(data) != 1 || len(fields) != 1 || fields[0] != "ok" {
+		t.Fatalf("queryWithOptionalTimeout 返回数据异常: data=%v fields=%v", data, fields)
+	}
+}
+
+func TestExecWithOptionalTimeout_UsesExecContext(t *testing.T) {
+	fake := &fakeAgentTimeoutDB{}
+	affected, err := execWithOptionalTimeout(fake, "DELETE FROM t", int64((2 * time.Second).Milliseconds()))
+	if err != nil {
+		t.Fatalf("execWithOptionalTimeout 返回错误: %v", err)
+	}
+	if !fake.execContextCalled || fake.execCalled {
+		t.Fatalf("exec 调用路径异常，ExecContext=%v Exec=%v", fake.execContextCalled, fake.execCalled)
+	}
+	if !fake.deadlineSet {
+		t.Fatal("execWithOptionalTimeout 未设置 deadline")
+	}
+	if affected != 3 {
+		t.Fatalf("受影响行数异常，want=3 got=%d", affected)
+	}
+}
+
+func TestQueryWithOptionalTimeout_ClickHouseLegacyModeUsesQueryContext(t *testing.T) {
+	old := agentDriverType
+	agentDriverType = "clickhouse"
+	defer func() { agentDriverType = old }()
+
+	fake := &fakeAgentTimeoutDB{}
+	_, _, err := queryWithOptionalTimeout(fake, "SELECT 1", 0)
+	if err != nil {
+		t.Fatalf("queryWithOptionalTimeout 返回错误: %v", err)
+	}
+	if !fake.queryContextCalled || fake.queryCalled {
+		t.Fatalf("clickhouse legacy query 调用路径异常，QueryContext=%v Query=%v", fake.queryContextCalled, fake.queryCalled)
+	}
+}
--- a/cmd/optional-driver-agent/provider_clickhouse.go
+++ b/cmd/optional-driver-agent/provider_clickhouse.go
@@ -0,0 +1,12 @@
+//go:build gonavi_clickhouse_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "clickhouse"
+	agentDatabaseFactory = func() db.Database {
+		return &db.ClickHouseDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_dameng.go
+++ b/cmd/optional-driver-agent/provider_dameng.go
@@ -0,0 +1,12 @@
+//go:build gonavi_dameng_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "dameng"
+	agentDatabaseFactory = func() db.Database {
+		return &db.DamengDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_diros.go
+++ b/cmd/optional-driver-agent/provider_diros.go
@@ -0,0 +1,12 @@
+//go:build gonavi_diros_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "diros"
+	agentDatabaseFactory = func() db.Database {
+		return &db.DirosDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_duckdb.go
+++ b/cmd/optional-driver-agent/provider_duckdb.go
@@ -0,0 +1,12 @@
+//go:build gonavi_duckdb_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "duckdb"
+	agentDatabaseFactory = func() db.Database {
+		return &db.DuckDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_highgo.go
+++ b/cmd/optional-driver-agent/provider_highgo.go
@@ -0,0 +1,12 @@
+//go:build gonavi_highgo_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "highgo"
+	agentDatabaseFactory = func() db.Database {
+		return &db.HighGoDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_iris.go
+++ b/cmd/optional-driver-agent/provider_iris.go
@@ -0,0 +1,12 @@
+//go:build gonavi_iris_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "iris"
+	agentDatabaseFactory = func() db.Database {
+		return &db.IrisDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_kingbase.go
+++ b/cmd/optional-driver-agent/provider_kingbase.go
@@ -0,0 +1,12 @@
+//go:build gonavi_kingbase_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "kingbase"
+	agentDatabaseFactory = func() db.Database {
+		return &db.KingbaseDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_mariadb.go
+++ b/cmd/optional-driver-agent/provider_mariadb.go
@@ -0,0 +1,12 @@
+//go:build gonavi_mariadb_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "mariadb"
+	agentDatabaseFactory = func() db.Database {
+		return &db.MariaDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_mongodb.go
+++ b/cmd/optional-driver-agent/provider_mongodb.go
@@ -0,0 +1,12 @@
+//go:build gonavi_mongodb_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "mongodb"
+	agentDatabaseFactory = func() db.Database {
+		return &db.MongoDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_mongodb_v1.go
+++ b/cmd/optional-driver-agent/provider_mongodb_v1.go
@@ -0,0 +1,12 @@
+//go:build gonavi_mongodb_driver_v1
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "mongodb"
+	agentDatabaseFactory = func() db.Database {
+		return &db.MongoDBV1{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_mysql.go
+++ b/cmd/optional-driver-agent/provider_mysql.go
@@ -0,0 +1,12 @@
+//go:build gonavi_mysql_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "mysql"
+	agentDatabaseFactory = func() db.Database {
+		return &db.MySQLDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_oceanbase.go
+++ b/cmd/optional-driver-agent/provider_oceanbase.go
@@ -0,0 +1,12 @@
+//go:build gonavi_oceanbase_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "oceanbase"
+	agentDatabaseFactory = func() db.Database {
+		return &db.OceanBaseDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_opengauss.go
+++ b/cmd/optional-driver-agent/provider_opengauss.go
@@ -0,0 +1,12 @@
+//go:build gonavi_opengauss_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "opengauss"
+	agentDatabaseFactory = func() db.Database {
+		return &db.OpenGaussDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_sphinx.go
+++ b/cmd/optional-driver-agent/provider_sphinx.go
@@ -0,0 +1,12 @@
+//go:build gonavi_sphinx_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "sphinx"
+	agentDatabaseFactory = func() db.Database {
+		return &db.SphinxDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_sqlite.go
+++ b/cmd/optional-driver-agent/provider_sqlite.go
@@ -0,0 +1,12 @@
+//go:build gonavi_sqlite_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "sqlite"
+	agentDatabaseFactory = func() db.Database {
+		return &db.SQLiteDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_sqlserver.go
+++ b/cmd/optional-driver-agent/provider_sqlserver.go
@@ -0,0 +1,12 @@
+//go:build gonavi_sqlserver_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "sqlserver"
+	agentDatabaseFactory = func() db.Database {
+		return &db.SqlServerDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_starrocks.go
+++ b/cmd/optional-driver-agent/provider_starrocks.go
@@ -0,0 +1,12 @@
+//go:build gonavi_starrocks_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "starrocks"
+	agentDatabaseFactory = func() db.Database {
+		return &db.StarRocksDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_tdengine.go
+++ b/cmd/optional-driver-agent/provider_tdengine.go
@@ -0,0 +1,12 @@
+//go:build gonavi_tdengine_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "tdengine"
+	agentDatabaseFactory = func() db.Database {
+		return &db.TDengineDB{}
+	}
+}
--- a/cmd/optional-driver-agent/provider_vastbase.go
+++ b/cmd/optional-driver-agent/provider_vastbase.go
@@ -0,0 +1,12 @@
+//go:build gonavi_vastbase_driver
+
+package main
+
+import "GoNavi-Wails/internal/db"
+
+func init() {
+	agentDriverType = "vastbase"
+	agentDatabaseFactory = func() db.Database {
+		return &db.VastbaseDB{}
+	}
+}
--- a/docs/driver-manifest.json
+++ b/docs/driver-manifest.json
@@ -0,0 +1,101 @@
+{
+  "engine": "go",
+  "drivers": {
+    "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"
+    },
+    "sphinx": {
+      "engine": "go",
+      "version": "1.9.3",
+      "checksumPolicy": "off",
+      "downloadUrl": "builtin://activate/sphinx"
+    },
+    "sqlserver": {
+      "engine": "go",
+      "version": "1.9.6",
+      "checksumPolicy": "off",
+      "downloadUrl": "builtin://activate/sqlserver"
+    },
+    "sqlite": {
+      "engine": "go",
+      "version": "1.44.3",
+      "checksumPolicy": "off",
+      "downloadUrl": "builtin://activate/sqlite"
+    },
+    "duckdb": {
+      "engine": "go",
+      "version": "2.5.6",
+      "checksumPolicy": "off",
+      "downloadUrl": "builtin://activate/duckdb"
+    },
+    "dameng": {
+      "engine": "go",
+      "version": "1.8.22",
+      "checksumPolicy": "off",
+      "downloadUrl": "builtin://activate/dameng"
+    },
+    "kingbase": {
+      "engine": "go",
+      "version": "0.0.0-20201021123113-29bd62a876c3",
+      "checksumPolicy": "off",
+      "downloadUrl": "builtin://activate/kingbase"
+    },
+    "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"
+    },
+    "mongodb": {
+      "engine": "go",
+      "version": "2.5.0",
+      "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"
+    },
+    "postgres": {
+      "engine": "go",
+      "version": "1.11.1",
+      "checksumPolicy": "off",
+      "downloadUrl": "builtin://activate/postgres"
+    }
+  }
+}
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -0,0 +1 @@
+.ace-tool/
--- a/frontend/ai_ui_mockups_wip.html
+++ b/frontend/ai_ui_mockups_wip.html
@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <title>AI UI Brainstorming Prototypes</title>
+    <!-- React & ReactDOM -->
+    <script crossorigin src="https://unpkg.com/react@18/umd/react.development.js"></script>
+    <script crossorigin src="https://unpkg.com/react-dom@18/umd/react-dom.development.js"></script>
+    <!-- Babel -->
+    <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
+    <!-- Ant Design -->
+    <script src="https://unpkg.com/dayjs/dayjs.min.js"></script>
+    <script src="https://unpkg.com/antd/dist/antd.min.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/antd/dist/reset.css" />
+    <!-- Icons -->
+    <script src="https://unpkg.com/@ant-design/icons/dist/index.umd.js"></script>
+    <style>
+        body { padding: 40px; background: #f0f2f5; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial; }
+        .prototype-container { display: flex; gap: 40px; }
+        .prototype-column { flex: 1; max-width: 600px; background: white; border-radius: 12px; box-shadow: 0 4px 12px rgba(0,0,0,0.05); overflow: hidden; }
+        .prototype-header { padding: 16px 24px; border-bottom: 1px solid #f0f0f0; background: #fafafa; font-weight: bold; }
+        .prototype-body { padding: 24px; }
+        
+        /* Default App Theme Colors (Light Mode) */
+        :root {
+            --gn-border: rgba(16,24,40,0.08);
+            --gn-bg: rgba(255,255,255,0.84);
+            --gn-text: #162033;
+            --gn-muted: rgba(16,24,40,0.55);
+            --gn-primary: #1677ff;
+            --gn-primary-bg: rgba(24,144,255,0.1);
+        }
+
+        /* V1 Styles: Professional List */
+        .v1-list-item {
+            display: flex; align-items: center; justify-content: space-between;
+            padding: 12px 16px; margin-bottom: 8px; border-radius: 8px;
+            border: 1px solid transparent; cursor: pointer; transition: all 0.2s;
+        }
+        .v1-list-item:hover { background: #f5f5f5; }
+        .v1-list-item.selected {
+            background: var(--gn-primary-bg); border-color: var(--gn-primary);
+        }
+        
+        /* V2 Styles: Refined Cards (ConnectionModal Style) */
+        .v2-card-grid {
+            display: grid; grid-template-columns: 1fr 1fr; gap: 12px;
+        }
+        .v2-card {
+            padding: 16px; border-radius: 12px; border: 1px solid var(--gn-border);
+            cursor: pointer; transition: all 0.2s; background: white;
+            box-shadow: inset 0 0 0 1px rgba(16,24,40,0.01);
+        }
+        .v2-card:hover { border-color: #d9d9d9; background: #fafafa; }
+        .v2-card.selected {
+            border-color: var(--gn-primary); box-shadow: 0 0 0 1px var(--gn-primary) inset;
+        }
+        
+        .section-title { font-size: 13px; font-weight: 600; color: var(--gn-muted); margin-bottom: 12px; text-transform: uppercase; letter-spacing: 0.5px; }
+    </style>
+</head>
+<body>
+    <div id="root"></div>
+    <script type="text/babel">
+        const { useState } = React;
+        const { Input, Slider, Select, Button, Form, ConfigProvider } = antd;
+        const { ThunderboltOutlined, CloudOutlined, ExperimentOutlined, AppstoreOutlined, SettingOutlined, LinkOutlined, KeyOutlined } = icons;
+
+        const PROVIDERS = [
+            { key: 'openai', label: 'OpenAI', icon: <ThunderboltOutlined />, desc: 'GPT-4o / o1' },
+            { key: 'deepseek', label: 'DeepSeek', icon: <ThunderboltOutlined />, desc: 'V3 / R1' },
+            { key: 'anthropic', label: 'Claude', icon: <ExperimentOutlined />, desc: 'Sonnet 3.5' },
+            { key: 'custom', label: '自定义', icon: <AppstoreOutlined />, desc: '通用 API' },
+        ];
+
+        const V1ListDesign = () => {
+            const [selected, setSelected] = useState('openai');
+            return (
+                <div className="prototype-column">
+                    <div className="prototype-header">方案一：IDE 专业列表风格 (更克制、无彩色渐变)</div>
+                    <div className="prototype-body">
+                        <div className="section-title">提供商选择</div>
+                        <div style={{ marginBottom: 24, padding: 8, background: '#fafafa', borderRadius: 10, border: '1px solid #f0f0f0' }}>
+                            {PROVIDERS.map(p => (
+                                <div key={p.key} className={`v1-list-item ${selected === p.key ? 'selected' : ''}`} onClick={() => setSelected(p.key)}>
+                                    <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
+                                        <div style={{ 
+                                            width: 32, height: 32, borderRadius: 6, display: 'grid', placeItems: 'center',
+                                            background: selected === p.key ? '#1677ff' : '#e6f4ff', 
+                                            color: selected === p.key ? '#fff' : '#1677ff', fontSize: 16
+                                        }}>
+                                            {p.icon}
+                                        </div>
+                                        <div>
+                                            <div style={{ fontWeight: 500, color: 'var(--gn-text)', fontSize: 14 }}>{p.label}</div>
+                                            <div style={{ fontSize: 12, color: 'var(--gn-muted)' }}>{p.desc}</div>
+                                        </div>
+                                    </div>
+                                    <div style={{ width: 16, height: 16, borderRadius: '50%', border: `2px solid ${selected === p.key ? 'var(--gn-primary)' : '#d9d9d9'}`, padding: 2 }}>
+                                        {selected === p.key && <div style={{ width: '100%', height: '100%', background: 'var(--gn-primary)', borderRadius: '50%' }} />}
+                                    </div>
+                                </div>
+                            ))}
+                        </div>
+                        
+                        <div className="section-title">连接配置 (紧凑表单)</div>
+                        <Form layout="vertical" size="middle">
+                            <Form.Item label="API Endpoint">
+                                <Input placeholder="https://api.openai.com/v1" prefix={<LinkOutlined style={{color: 'var(--gn-muted)'}}/>} />
+                            </Form.Item>
+                            <Form.Item label="API Key">
+                                <Input.Password placeholder="sk-..." prefix={<KeyOutlined style={{color: 'var(--gn-muted)'}}/>} />
+                            </Form.Item>
+                            <Form.Item label="Model Name">
+                                <Input placeholder="gpt-4o" prefix={<AppstoreOutlined style={{color: 'var(--gn-muted)'}}/>} />
+                            </Form.Item>
+                        </Form>
+                    </div>
+                </div>
+            );
+        };
+
+        const V2CardDesign = () => {
+            const [selected, setSelected] = useState('openai');
+            return (
+                <div className="prototype-column">
+                    <div className="prototype-header">方案二：GoNavi 统一卡片风格 (类似 ConnectionModal)</div>
+                    <div className="prototype-body">
+                        <div className="section-title">选择服务提供商</div>
+                        <div className="v2-card-grid" style={{ marginBottom: 24 }}>
+                            {PROVIDERS.map(p => (
+                                <div key={p.key} className={`v2-card ${selected === p.key ? 'selected' : ''}`} onClick={() => setSelected(p.key)}>
+                                    <div style={{ display: 'flex', alignItems: 'flex-start', gap: 12 }}>
+                                        <div style={{ color: selected === p.key ? 'var(--gn-primary)' : 'var(--gn-muted)', fontSize: 20, marginTop: 2 }}>
+                                            {p.icon}
+                                        </div>
+                                        <div>
+                                            <div style={{ fontWeight: 600, color: 'var(--gn-text)', fontSize: 14 }}>{p.label}</div>
+                                            <div style={{ fontSize: 12, color: 'var(--gn-muted)', marginTop: 4 }}>{p.desc}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            ))}
+                        </div>
+
+                        <div style={{ padding: 20, borderRadius: 12, border: '1px solid var(--gn-border)', background: '#fafafa' }}>
+                            <div className="section-title" style={{ marginTop: 0 }}>认证与设置</div>
+                            <Form layout="horizontal" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }} size="middle">
+                                <Form.Item label="Endpoint" style={{ marginBottom: 16 }}>
+                                    <Input placeholder="https://api..." />
+                                </Form.Item>
+                                <Form.Item label="API Key" style={{ marginBottom: 16 }}>
+                                    <Input.Password placeholder="sk-..." />
+                                </Form.Item>
+                                <Form.Item label="模型名称" style={{ marginBottom: 0 }}>
+                                    <Input placeholder="例如 gpt-4o" />
+                                </Form.Item>
+                            </Form>
+                        </div>
+                    </div>
+                </div>
+            );
+        };
+
+        const App = () => (
+            <ConfigProvider theme={{ token: { colorPrimary: '#1677ff', borderRadius: 6 } }}>
+                <div style={{ marginBottom: 24 }}>
+                    <h1 style={{ fontSize: 24, margin: 0 }}>AI 设置 UI 重构探讨</h1>
+                    <p style={{ color: 'var(--gn-muted)' }}>当前设计带有太多渐变和鲜艳色彩（"AI 味"）。以下是遵循 GoNavi 本身设计规范（克制、专业）的两个方案：</p>
+                </div>
+                <div className="prototype-container">
+                    <V1ListDesign />
+                    <V2CardDesign />
+                </div>
+            </ConfigProvider>
+        );
+
+        const root = ReactDOM.createRoot(document.getElementById('root'));
+        root.render(<App />);
+    </script>
+</body>
+</html>
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -5,6 +5,23 @@
    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>GoNavi</title>
+    <script>
+      if (typeof window !== 'undefined' && !window.go) {
+        window.go = {
+          app: {
+            App: new Proxy({}, { get: () => async () => ({ success: false }) })
+          }
+        };
+      }
+      if (typeof window !== 'undefined' && !window.runtime) {
+        window.runtime = new Proxy({}, { 
+            get: (target, prop) => {
+                if (prop === 'Environment') return async () => ({ platform: 'darwin' });
+                return typeof prop === 'string' && prop.startsWith('WindowIs') ? () => false : () => {};
+            }
+        });
+      }
+    </script>
  </head>
  <body>
    <div id="root"></div>
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,12 +1,14 @@
 {
  "name": "gonavi-client",
  "private": true,
-  "version": "0.0.1",
+  "version": "0.6.5",
  "type": "module",
  "scripts": {
    "dev": "vite",
    "build": "tsc && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest run",
+    "i18n:scan": "go run ../tools/i18n-scan --root .."
  },
  "dependencies": {
    "@ant-design/icons": "^5.2.6",
@@ -15,11 +17,17 @@
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
    "@monaco-editor/react": "^4.6.0",
+    "@types/react-syntax-highlighter": "^15.5.13",
    "antd": "^5.12.0",
    "clsx": "^2.1.0",
+    "mermaid": "^11.13.0",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
+    "react-markdown": "^10.1.0",
    "react-resizable": "^3.1.3",
+    "react-syntax-highlighter": "^16.1.1",
+    "recharts": "^3.8.1",
+    "remark-gfm": "^4.0.1",
    "sql-formatter": "^15.7.0",
    "uuid": "^9.0.1",
    "zustand": "^4.4.7"
@@ -28,9 +36,12 @@
    "@types/react": "^18.2.43",
    "@types/react-dom": "^18.2.17",
    "@types/react-resizable": "^3.0.8",
+    "@types/react-test-renderer": "^18.0.7",
    "@types/uuid": "^9.0.7",
    "@vitejs/plugin-react": "^4.2.1",
+    "react-test-renderer": "^18.2.0",
    "typescript": "^5.2.2",
-    "vite": "^5.0.8"
+    "vite": "^5.0.8",
+    "vitest": "^3.2.4"
  }
-}
+}
--- a/frontend/package.json.md5
+++ b/frontend/package.json.md5
@@ -1 +1 @@
-5b8157374dae5f9340e31b2d0bd2c00e
+9cd8f4622f2dcccbe605710ea36885d4
--- a/frontend/public/db-icons/clickhouse.svg
+++ b/frontend/public/db-icons/clickhouse.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>ClickHouse</title><path d="M21.333 10H24v4h-2.667ZM16 1.335h2.667v21.33H16Zm-5.333 0h2.666v21.33h-2.666ZM0 22.665V1.335h2.667v21.33zm5.333-21.33H8v21.33H5.333Z"/></svg>
--- a/frontend/public/db-icons/diros.svg
+++ b/frontend/public/db-icons/diros.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Apache Doris</title><path d="M8.666.0001c-.5355-.004-1.068.1072-1.5241.3384-.207.1048-.5749.3802-.8177.6118-1.0278.9803-1.2876 2.5138-.6553 3.8679.205.439.5068.7694 2.8476 3.1166 2.4527 2.4594 2.6352 2.6255 2.8852 2.6258.2446.0003.3647-.099 1.4408-1.19.9367-.9496 1.2306-1.2992 1.4536-1.7286.5966-1.149.6487-2.0513.174-3.014-.2264-.459-.4816-.7514-1.9012-2.176-.9018-.9052-1.7907-1.7496-1.9751-1.8765C10.0488.2005 9.3548.0052 8.666 0ZM3.5518 5.5737c-.2176.0031-.6097.085-.6097.3285v12.0904l.1642.175c.1123.1194.2498.1748.4342.1748.2545 0 .4436-.1738 3.349-3.0786 2.6868-2.6862 3.079-2.909 3.0791-3.305.0002-.3961-.3924-.6194-3.0784-3.306-2.8612-2.8619-3.0968-3.079-3.3384-3.079Zm13.0967.861c-.0481.0184-.112.1636-.1418.3225-.0756.403-.3719 1.109-.6572 1.5663-.1407.2253-2.2392 2.3955-5.049 5.2212-2.7513 2.7667-4.9104 4.9985-5.0468 5.2165-.4552.7275-.5967 1.3905-.4684 2.1964.222 1.3947 1.3263 2.6812 2.5486 2.9693.4667.11 1.618.0927 2.0329-.0305.2084-.062.526-.2112.7055-.3318.5023-.3373 9.341-9.0562 9.6463-9.5154.449-.6753.8356-1.0716.8395-1.9762-.0056-.5935-.1305-1.1138-1.0715-2.306-.5094-.6523-3.2341-3.3723-3.338-3.3324Z"/></svg>
--- a/frontend/public/db-icons/duckdb.svg
+++ b/frontend/public/db-icons/duckdb.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>DuckDB</title><path d="M12 0C5.363 0 0 5.363 0 12s5.363 12 12 12 12-5.363 12-12S18.637 0 12 0zM9.502 7.03a4.974 4.974 0 0 1 4.97 4.97 4.974 4.974 0 0 1-4.97 4.97A4.974 4.974 0 0 1 4.532 12a4.974 4.974 0 0 1 4.97-4.97zm6.563 3.183h2.351c.98 0 1.787.782 1.787 1.762s-.807 1.789-1.787 1.789h-2.351v-3.551z"/></svg>
--- a/frontend/public/db-icons/mariadb.svg
+++ b/frontend/public/db-icons/mariadb.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>MariaDB</title><path d="M23.157 4.412c-.676.284-.79.31-1.673.372-.65.045-.757.057-1.212.209-.75.246-1.395.75-2.02 1.59-.296.398-1.249 1.913-1.249 1.988 0 .057-.65.998-.915 1.32-.574.713-1.08 1.079-2.14 1.59-.77.36-1.224.524-4.102 1.477-1.073.353-2.133.738-2.367.864-.852.449-1.515 1.036-2.203 1.938-1.003 1.32-.972 1.313-3.042.947a12.264 12.264 0 00-.675-.063c-.644-.05-1.023.044-1.332.334L0 17.193l.177.088c.094.05.353.234.561.398.215.17.461.347.55.391.088.044.17.088.183.101.012.013-.089.17-.228.353-.435.581-.593.871-.574 1.048.019.164.032.17.43.17.517-.006.826-.056 1.261-.208.65-.233 2.058-.94 2.784-1.4.776-.5 1.717-.998 1.956-1.042.082-.02.354-.07.594-.114.58-.107 1.464-.095 2.587.05.108.013.373.045.6.064.227.025.43.057.454.076.026.012.474.037.998.056.934.026 1.104.007 1.3-.189.126-.133.385-.631.498-.985.209-.643.417-.921.366-.492-.113.966-.322 1.692-.713 2.411-.259.499-.663 1.092-.934 1.395-.322.347-.315.36.088.315.619-.063 1.471-.397 2.096-.82.827-.562 1.647-1.691 2.19-3.03.107-.27.22-.22.183.083-.013.094-.038.315-.057.498l-.031.328.353-.202c.833-.48 1.414-1.262 2.127-2.884.227-.518.877-2.922 1.073-3.976a9.64 9.64 0 01.271-1.042c.127-.429.196-.555.48-.858.183-.19.625-.555.978-.808.72-.505.953-.75 1.187-1.205.208-.417.284-1.13.132-1.357-.132-.202-.284-.196-.763.006Z"/></svg>
--- a/frontend/public/db-icons/mongodb.svg
+++ b/frontend/public/db-icons/mongodb.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>MongoDB</title><path d="M17.193 9.555c-1.264-5.58-4.252-7.414-4.573-8.115-.28-.394-.53-.954-.735-1.44-.036.495-.055.685-.523 1.184-.723.566-4.438 3.682-4.74 10.02-.282 5.912 4.27 9.435 4.888 9.884l.07.05A73.49 73.49 0 0111.91 24h.481c.114-1.032.284-2.056.51-3.07.417-.296.604-.463.85-.693a11.342 11.342 0 003.639-8.464c.01-.814-.103-1.662-.197-2.218zm-5.336 8.195s0-8.291.275-8.29c.213 0 .49 10.695.49 10.695-.381-.045-.765-1.76-.765-2.405z"/></svg>
--- a/frontend/public/db-icons/mysql.svg
+++ b/frontend/public/db-icons/mysql.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>MySQL</title><path d="M16.405 5.501c-.115 0-.193.014-.274.033v.013h.014c.054.104.146.18.214.273.054.107.1.214.154.32l.014-.015c.094-.066.14-.172.14-.333-.04-.047-.046-.094-.08-.14-.04-.067-.126-.1-.18-.153zM5.77 18.695h-.927a50.854 50.854 0 00-.27-4.41h-.008l-1.41 4.41H2.45l-1.4-4.41h-.01a72.892 72.892 0 00-.195 4.41H0c.055-1.966.192-3.81.41-5.53h1.15l1.335 4.064h.008l1.347-4.064h1.095c.242 2.015.384 3.86.428 5.53zm4.017-4.08c-.378 2.045-.876 3.533-1.492 4.46-.482.716-1.01 1.073-1.583 1.073-.153 0-.34-.046-.566-.138v-.494c.11.017.24.026.386.026.268 0 .483-.075.647-.222.197-.18.295-.382.295-.605 0-.155-.077-.47-.23-.944L6.23 14.615h.91l.727 2.36c.164.536.233.91.205 1.123.4-1.064.678-2.227.835-3.483zm12.325 4.08h-2.63v-5.53h.885v4.85h1.745zm-3.32.135l-1.016-.5c.09-.076.177-.158.255-.25.433-.506.648-1.258.648-2.253 0-1.83-.718-2.746-2.155-2.746-.704 0-1.254.232-1.65.697-.43.508-.646 1.256-.646 2.245 0 .972.19 1.686.574 2.14.35.41.877.615 1.583.615.264 0 .506-.033.725-.098l1.325.772.36-.622zM15.5 17.588c-.225-.36-.337-.94-.337-1.736 0-1.393.424-2.09 1.27-2.09.443 0 .77.167.977.5.224.362.336.936.336 1.723 0 1.404-.424 2.108-1.27 2.108-.445 0-.77-.167-.978-.5zm-1.658-.425c0 .47-.172.856-.516 1.156-.344.3-.803.45-1.384.45-.543 0-1.064-.172-1.573-.515l.237-.476c.438.22.833.328 1.19.328.332 0 .593-.073.783-.22a.754.754 0 00.3-.615c0-.33-.23-.61-.648-.845-.388-.213-1.163-.657-1.163-.657-.422-.307-.632-.636-.632-1.177 0-.45.157-.81.47-1.085.315-.278.72-.415 1.22-.415.512 0 .98.136 1.4.41l-.213.476a2.726 2.726 0 00-1.064-.23c-.283 0-.502.068-.654.206a.685.685 0 00-.248.524c0 .328.234.61.666.85.393.215 1.187.67 1.187.67.433.305.648.63.648 1.168zm9.382-5.852c-.535-.014-.95.04-1.297.188-.1.04-.26.04-.274.167.055.053.063.14.11.214.08.134.218.313.346.407.14.11.28.216.427.31.26.16.555.255.81.416.145.094.293.213.44.313.073.05.12.14.214.172v-.02c-.046-.06-.06-.147-.105-.214-.067-.067-.134-.127-.2-.193a3.223 3.223 0 00-.695-.675c-.214-.146-.682-.35-.77-.595l-.013-.014c.146-.013.32-.066.46-.106.227-.06.435-.047.67-.106.106-.027.213-.06.32-.094v-.06c-.12-.12-.21-.283-.334-.395a8.867 8.867 0 00-1.104-.823c-.21-.134-.476-.22-.697-.334-.08-.04-.214-.06-.26-.127-.12-.146-.19-.34-.275-.514a17.69 17.69 0 01-.547-1.163c-.12-.262-.193-.523-.34-.763-.69-1.137-1.437-1.826-2.586-2.5-.247-.14-.543-.2-.856-.274-.167-.008-.334-.02-.5-.027-.11-.047-.216-.174-.31-.235-.38-.24-1.364-.76-1.644-.072-.18.434.267.862.422 1.082.115.153.26.328.34.5.047.116.06.235.107.356.106.294.207.622.347.897.073.14.153.287.247.413.054.073.146.107.167.227-.094.136-.1.334-.154.5-.24.757-.146 1.693.194 2.25.107.166.362.534.703.393.3-.12.234-.5.32-.835.02-.08.007-.133.048-.187v.015c.094.188.188.367.274.555.206.328.566.668.867.895.16.12.287.328.487.402v-.02h-.015c-.043-.058-.1-.086-.154-.133a3.445 3.445 0 01-.35-.4 8.76 8.76 0 01-.747-1.218c-.11-.21-.202-.436-.29-.643-.04-.08-.04-.2-.107-.24-.1.146-.247.273-.32.453-.127.288-.14.642-.188 1.01-.027.007-.014 0-.027.014-.214-.052-.287-.274-.367-.46-.2-.475-.233-1.238-.06-1.785.047-.14.247-.582.167-.716-.042-.127-.174-.2-.247-.303a2.478 2.478 0 01-.24-.427c-.16-.374-.24-.788-.414-1.162-.08-.173-.22-.354-.334-.513-.127-.18-.267-.307-.368-.52-.033-.073-.08-.194-.027-.274.014-.054.042-.075.094-.09.088-.072.335.022.422.062.247.1.455.194.662.334.094.066.195.193.315.226h.14c.214.047.455.014.655.073.355.114.675.28.962.46a5.953 5.953 0 012.085 2.286c.08.154.115.295.188.455.14.33.313.663.455.982.14.315.275.636.476.897.1.14.502.213.682.286.133.06.34.115.46.188.23.14.454.3.67.454.11.076.443.243.463.378z"/></svg>
--- a/frontend/public/db-icons/postgres.svg
+++ b/frontend/public/db-icons/postgres.svg
--- a/frontend/public/db-icons/redis.svg
+++ b/frontend/public/db-icons/redis.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Redis</title><path d="M22.71 13.145c-1.66 2.092-3.452 4.483-7.038 4.483-3.203 0-4.397-2.825-4.48-5.12.701 1.484 2.073 2.685 4.214 2.63 4.117-.133 6.94-3.852 6.94-7.239 0-4.05-3.022-6.972-8.268-6.972-3.752 0-8.4 1.428-11.455 3.685C2.59 6.937 3.885 9.958 4.35 9.626c2.648-1.904 4.748-3.13 6.784-3.744C8.12 9.244.886 17.05 0 18.425c.1 1.261 1.66 4.648 2.424 4.648.232 0 .431-.133.664-.365a100.49 100.49 0 0 0 5.54-6.765c.222 3.104 1.748 6.898 6.014 6.898 3.819 0 7.604-2.756 9.33-8.965.2-.764-.73-1.361-1.261-.73zm-4.349-5.013c0 1.959-1.926 2.922-3.685 2.922-.941 0-1.664-.247-2.235-.568 1.051-1.592 2.092-3.225 3.21-4.973 1.972.334 2.71 1.43 2.71 2.619z"/></svg>
--- a/frontend/public/db-icons/sphinx.svg
+++ b/frontend/public/db-icons/sphinx.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Sphinx</title><path d="M16.284 19.861c0-.654.177-1.834.393-2.623.499-1.822.774-4.079.497-4.079-.116 0-.959.762-1.873 1.694-3.472 3.54-7.197 5.543-10.312 5.543-1.778 0-2.987-.45-4.154-1.545C.128 18.186 0 17.858 0 16.703c0-1.188.117-1.468.909-2.175.718-.642 1.171-.813 2.157-.813.76.171 1.21.16 1.457.461.251.296.338 1.265.035 1.832-.162.303-.585.491-1.105.491-.49 0-.77-.116-.669-.278.315-.511-.135-.857-.713-.548-.699.374-.711 1.698-.021 2.322.969.878 3.65 1.208 5.262.648 1.743-.605 4.022-2.061 5.841-3.732l1.6-1.469-2.088-.013c-2.186-.012-3.608-.273-8.211-1.506-1.531-.41-3.003-.765-3.271-.789-.304-.026-.503-.274-.487-.656.027-.646.378-1.127.793-1.308.249-.109 1.977-.274 3.809-.761 7.136-1.898 7.569-1.629 12.323-.426 1.553.393 3.351.821 4.147.835 1.227.022 1.493.124 1.74.666.16.351.291.686.291.745 0 .058-.695.424-1.545.813-3.12 1.428-4.104 2.185-3.088 3.635.421.602.412.666-.14 1.052-.323.227-.59.687-.593 1.022-.009.908-.583 2.856-1.417 3.624l-.732.675v-1.189Zm1.594-8.328c1.242-.346 1.994-.738 3.539-1.562-1.272-.372-4.462-.895-4.462-.895-2.354-.472-2.108-.448-2.214.071a3.475 3.475 0 0 1-.45 1.105c-.541.848-2.521 1.026-3.656.483-.356-.171-.714-.821-.709-1.283.007-.65-.362-.801-.598-.714-.191.07-.813.079-2.179.448-4.514 1.217-5.132 1.078-2.189 1.495.353.05 2.223.572 3.136.815 2.239.597 2.658.641 5.556.581 2.015-.042 2.858-.163 4.226-.544ZM.732 6.258c.056-.577.088-.702 1.692-1.025.919-.185 3.185-.785 5.036-1.333 4.254-1.26 5.462-1.263 9.873-.026 1.904.535 4.037.973 4.74.975 1.097.002 1.668.487 1.668.487.505 1.16.412 1.24-1.558 1.24-1.374 0-2.558-.232-4.385-.857-1.389-.476-3.369-.923-4.451-1.004-1.974-.149-1.971-.15-8.072 1.529-1.072.295-2.553.624-3.29.732l-1.342.196.089-.914Z"/></svg>
--- a/frontend/public/db-icons/sqlite.svg
+++ b/frontend/public/db-icons/sqlite.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>SQLite</title><path d="M21.678.521c-1.032-.92-2.28-.55-3.513.544a8.71 8.71 0 0 0-.547.535c-2.109 2.237-4.066 6.38-4.674 9.544.237.48.422 1.093.544 1.561a13.044 13.044 0 0 1 .164.703s-.019-.071-.096-.296l-.05-.146a1.689 1.689 0 0 0-.033-.08c-.138-.32-.518-.995-.686-1.289-.143.423-.27.818-.376 1.176.484.884.778 2.4.778 2.4s-.025-.099-.147-.442c-.107-.303-.644-1.244-.772-1.464-.217.804-.304 1.346-.226 1.478.152.256.296.698.422 1.186.286 1.1.485 2.44.485 2.44l.017.224a22.41 22.41 0 0 0 .056 2.748c.095 1.146.273 2.13.5 2.657l.155-.084c-.334-1.038-.47-2.399-.41-3.967.09-2.398.642-5.29 1.661-8.304 1.723-4.55 4.113-8.201 6.3-9.945-1.993 1.8-4.692 7.63-5.5 9.788-.904 2.416-1.545 4.684-1.931 6.857.666-2.037 2.821-2.912 2.821-2.912s1.057-1.304 2.292-3.166c-.74.169-1.955.458-2.362.629-.6.251-.762.337-.762.337s1.945-1.184 3.613-1.72C21.695 7.9 24.195 2.767 21.678.521m-18.573.543A1.842 1.842 0 0 0 1.27 2.9v16.608a1.84 1.84 0 0 0 1.835 1.834h9.418a22.953 22.953 0 0 1-.052-2.707c-.006-.062-.011-.141-.016-.2a27.01 27.01 0 0 0-.473-2.378c-.121-.47-.275-.898-.369-1.057-.116-.197-.098-.31-.097-.432 0-.12.015-.245.037-.386a9.98 9.98 0 0 1 .234-1.045l.217-.028c-.017-.035-.014-.065-.031-.097l-.041-.381a32.8 32.8 0 0 1 .382-1.194l.2-.019c-.008-.016-.01-.038-.018-.053l-.043-.316c.63-3.28 2.587-7.443 4.8-9.791.066-.069.133-.128.198-.194Z"/></svg>
--- a/frontend/public/db-icons/sqlserver.svg
+++ b/frontend/public/db-icons/sqlserver.svg
@@ -0,0 +1,6 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title>SQL Server</title>
+  <path fill="#A91D22" d="M4.2 7.25c1.05-1.56 4.53-2.69 8.24-2.69 3.34 0 6.13.91 7.25 2.15.57.64.63 1.29.16 1.87-1 1.27-3.81 2.09-7.18 2.09-3.85 0-7.1-1.03-8.29-2.52-.32-.4-.38-.61-.18-.9Z"/>
+  <path fill="#D63539" d="M5.07 11.11c1.27-1.2 4.24-2.04 7.42-2.04 3.59 0 6.58 1.04 7.34 2.54.27.54.16 1.07-.34 1.55-1.18 1.12-3.89 1.81-7.12 1.81-3.56 0-6.56-.91-7.6-2.25-.4-.52-.31-1.02.3-1.61Z"/>
+  <path fill="#F15F5C" d="M7.2 16.12c1.12-.75 3.11-1.18 5.38-1.18 2.43 0 4.59.52 5.71 1.39.84.65 1 1.42.42 2.05-.92 1-3.09 1.63-5.74 1.63-2.87 0-5.34-.75-6.22-1.88-.53-.68-.36-1.37.45-2.01Z"/>
+</svg>
--- a/frontend/scripts/wails-frontend-install.mjs
+++ b/frontend/scripts/wails-frontend-install.mjs
@@ -0,0 +1,125 @@
+#!/usr/bin/env node
+
+import { spawnSync } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import { existsSync, readFileSync, statSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const scriptDir = path.dirname(fileURLToPath(import.meta.url));
+const frontendDir = path.resolve(scriptDir, '..');
+const packageJsonPath = path.join(frontendDir, 'package.json');
+const packageLockPath = path.join(frontendDir, 'package-lock.json');
+const nodeModulesPath = path.join(frontendDir, 'node_modules');
+const npmHiddenLockPath = path.join(nodeModulesPath, '.package-lock.json');
+const installStatePath = path.join(nodeModulesPath, '.gonavi-install-state.json');
+const npmCommand = 'npm';
+const commonArgs = [
+  '--prefer-offline',
+  '--no-audit',
+  '--fund=false',
+  '--fetch-retries=5',
+  '--fetch-retry-mintimeout=20000',
+  '--fetch-retry-maxtimeout=120000',
+];
+const isCI = process.env.CI === 'true' || process.env.GITHUB_ACTIONS === 'true';
+
+const fail = (message) => {
+  console.error(`[gonavi-frontend-install] ${message}`);
+  process.exit(1);
+};
+
+const exitWithStatus = (status) => {
+  process.exit(typeof status === 'number' && status > 0 && status <= 255 ? status : 1);
+};
+
+const hashFile = (filePath) => {
+  const hash = createHash('sha256');
+  hash.update(readFileSync(filePath));
+  return hash.digest('hex');
+};
+
+const currentState = () => ({
+  packageJson: hashFile(packageJsonPath),
+  packageLock: existsSync(packageLockPath) ? hashFile(packageLockPath) : '',
+});
+
+const readInstalledState = () => {
+  if (!existsSync(installStatePath)) return null;
+  try {
+    return JSON.parse(readFileSync(installStatePath, 'utf8'));
+  } catch {
+    return null;
+  }
+};
+
+const writeInstalledState = (state) => {
+  writeFileSync(installStatePath, `${JSON.stringify(state, null, 2)}\n`, 'utf8');
+};
+
+const packageInputsAreOlderThanNpmLock = () => {
+  if (!existsSync(npmHiddenLockPath)) return false;
+  const markerTime = statSync(npmHiddenLockPath).mtimeMs;
+  return [packageJsonPath, packageLockPath]
+    .filter(existsSync)
+    .every((filePath) => statSync(filePath).mtimeMs <= markerTime);
+};
+
+const runNpm = (subcommand) => {
+  const args = [subcommand, ...commonArgs];
+  if (isCI) {
+    console.log(
+      `[gonavi-frontend-install] cwd=${process.cwd()} frontend=${frontendDir} node=${process.version} platform=${process.platform}/${process.arch} command=${npmCommand} ${args.join(' ')}`,
+    );
+  }
+
+  const result = spawnSync(npmCommand, args, {
+    cwd: frontendDir,
+    env: process.env,
+    stdio: 'inherit',
+    shell: process.platform === 'win32',
+  });
+  if (result.error) {
+    fail(`failed to start npm: ${result.error.message}`);
+  }
+  if (result.signal) {
+    fail(`npm was terminated by signal ${result.signal}`);
+  }
+  if (result.status !== 0) {
+    console.error(`[gonavi-frontend-install] npm exited with status ${result.status ?? 'unknown'}`);
+    exitWithStatus(result.status);
+  }
+};
+
+if (!existsSync(packageJsonPath)) {
+  fail(`package.json not found at ${packageJsonPath}; cwd=${process.cwd()}`);
+}
+
+const state = currentState();
+const installedState = readInstalledState();
+const forceInstall = process.env.GONAVI_FORCE_FRONTEND_INSTALL === '1';
+
+if (!forceInstall && existsSync(nodeModulesPath)) {
+  if (
+    installedState?.packageJson === state.packageJson &&
+    installedState?.packageLock === state.packageLock
+  ) {
+    console.log('Frontend dependencies are up to date; skipping npm install.');
+    process.exit(0);
+  }
+
+  if (!installedState && isCI && existsSync(npmHiddenLockPath)) {
+    writeInstalledState(state);
+    console.log('Frontend dependencies are up to date from CI cache; recorded install state.');
+    process.exit(0);
+  }
+
+  if (!installedState && packageInputsAreOlderThanNpmLock()) {
+    writeInstalledState(state);
+    console.log('Frontend dependencies are up to date; recorded install state.');
+    process.exit(0);
+  }
+}
+
+runNpm(isCI ? 'ci' : 'install');
+writeInstalledState(state);
--- a/frontend/src/App.ai-panel-error-boundary.test.ts
+++ b/frontend/src/App.ai-panel-error-boundary.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest';
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+const appSource = readFileSync(
+  fileURLToPath(new globalThis.URL('./App.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('<AIPanelErrorBoundary');
+    expect(appSource).toContain('key={aiPanelRenderNonce}');
+    expect(appSource).toContain('AI 面板加载失败');
+    expect(appSource).toContain('重新加载');
+    expect(appSource).toContain('setAiPanelRenderNonce((current) => current + 1)');
+    expect(appSource).toContain('<AIChatPanel width={aiPanelRenderWidth}');
+    expect(appSource).not.toContain('const loadAIChatPanelModule = async (retryNonce: number) => {');
+  });
+});
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -1,8 +1,33 @@
+: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;
+}
+
 html, body, #root {
  height: 100%;
  margin: 0;
  padding: 0;
  overflow: hidden; /* Disable global scrollbar */
+  background-color: transparent !important; /* CRITICAL: Allow Wails window transparency */
+}
+
+body, #root {
+  border-radius: var(--gonavi-border-radius); /* Slightly rounded app window corners */
+}
+
+body,
+button,
+input,
+textarea,
+select {
+  font-family: var(--gn-font-sans);
+}
+
+code,
+pre,
+kbd,
+samp {
+  font-family: var(--gn-font-mono);
 }

 /* 侧边栏 Tree 样式优化 */
@@ -30,4 +55,627 @@ html, body, #root {
  text-overflow: ellipsis;
  white-space: nowrap;
  padding-right: 8px;
-}
+}
+
+.sidebar-tree-scroll-shell {
+  overflow-x: auto;
+  overflow-y: hidden;
+}
+
+.sidebar-tree-scroll-content {
+  min-width: 100%;
+}
+
+.sidebar-tree-scroll-shell .ant-tree {
+  min-width: 100%;
+}
+
+.sidebar-tree-scroll-shell .ant-tree .ant-tree-list-holder,
+.sidebar-tree-scroll-shell .ant-tree .ant-tree-list-holder-inner {
+  min-width: 100%;
+}
+
+.sidebar-tree-scroll-shell .ant-tree .ant-tree-treenode {
+  width: auto;
+  min-width: 100%;
+}
+
+.sidebar-tree-scroll-shell .ant-tree .ant-tree-node-content-wrapper {
+  width: auto !important;
+  min-width: 0;
+  display: flex !important;
+  align-items: center;
+  gap: 8px;
+}
+
+.sidebar-tree-scroll-shell .ant-tree .ant-tree-switcher {
+  flex: 0 0 24px;
+  width: 24px;
+  min-width: 24px;
+}
+
+.sidebar-tree-scroll-shell .ant-tree .ant-tree-iconEle {
+  flex: 0 0 16px;
+  width: 16px;
+  min-width: 16px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  margin-inline-end: 0;
+}
+
+.sidebar-tree-scroll-shell .ant-tree .ant-tree-title {
+  flex: 0 0 auto;
+  min-width: 0;
+  overflow: visible;
+  text-overflow: clip;
+}
+
+.redis-viewer-workbench .ant-tree {
+    background: transparent;
+}
+
+.redis-viewer-workbench .ant-tree .ant-tree-list-holder-inner,
+.redis-viewer-workbench .ant-tree .ant-tree-list-holder-inner .ant-tree-treenode {
+    width: 100% !important;
+}
+
+.redis-viewer-workbench .ant-tree .ant-tree-node-content-wrapper {
+    min-height: 36px;
+    border-radius: 14px;
+    transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease;
+    background: transparent !important;
+    border: none !important;
+    box-shadow: none !important;
+    outline: none !important;
+    flex: 1 1 auto;
+    min-width: 0;
+    width: auto !important;
+}
+
+.redis-viewer-workbench .ant-tree .ant-tree-node-content-wrapper:hover,
+.redis-viewer-workbench .ant-tree .ant-tree-node-content-wrapper:active,
+.redis-viewer-workbench .ant-tree .ant-tree-node-content-wrapper:focus,
+.redis-viewer-workbench .ant-tree .ant-tree-node-content-wrapper:focus-visible,
+.redis-viewer-workbench .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected,
+.redis-viewer-workbench .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected:hover {
+    background: transparent !important;
+    border-color: transparent !important;
+    box-shadow: none !important;
+    outline: none !important;
+}
+
+.redis-viewer-workbench .ant-tree .ant-tree-treenode {
+    padding: 2px 0;
+    width: 100%;
+    border-radius: 14px;
+    transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease;
+    border: none;
+    align-items: center;
+    position: relative;
+    z-index: 0;
+    display: flex !important;
+    box-sizing: border-box;
+}
+
+.redis-viewer-workbench .ant-tree .ant-tree-switcher {
+    width: 0 !important;
+    min-width: 0 !important;
+    margin-inline-end: 0 !important;
+    padding: 0 !important;
+    overflow: hidden !important;
+    background: transparent !important;
+}
+
+.redis-viewer-workbench .ant-tree .ant-tree-switcher:hover,
+.redis-viewer-workbench .ant-tree .ant-tree-switcher:active,
+.redis-viewer-workbench .ant-tree .ant-tree-switcher:focus {
+    background: transparent !important;
+}
+
+.redis-viewer-workbench .redis-tree-expander-button:hover,
+.redis-viewer-workbench .redis-tree-expander-button:focus-visible {
+    background: transparent !important;
+    outline: none;
+}
+
+.redis-viewer-workbench .ant-radio-group .ant-radio-button-wrapper {
+    border-radius: 10px;
+    margin-inline-end: 6px;
+}
+
+.redis-viewer-workbench .ant-radio-group .ant-radio-button-wrapper:last-child {
+    margin-inline-end: 0;
+}
+
+.redis-viewer-workbench .ant-table {
+    background: transparent;
+}
+
+.redis-viewer-workbench .ant-table-wrapper .ant-table-thead > tr > th {
+    font-weight: 700;
+}
+
+/* Scrollbar styling for dark mode */
+body[data-theme='dark'] ::-webkit-scrollbar {
+    width: 10px;
+    height: 10px;
+}
+body[data-theme='dark'] ::-webkit-scrollbar-track {
+    background: #1f1f1f;
+}
+body[data-theme='dark'] ::-webkit-scrollbar-corner {
+    background: #1f1f1f;
+}
+body[data-theme='dark'] ::-webkit-scrollbar-thumb {
+    background: #424242;
+    border-radius: 4px;
+    border: 2px solid #1f1f1f;
+}
+body[data-theme='dark'] ::-webkit-scrollbar-thumb:hover {
+    background: #666;
+}
+
+/* Scrollbar styling for light mode (transparent-friendly) */
+body[data-theme='light'] ::-webkit-scrollbar {
+    width: 10px;
+    height: 10px;
+}
+body[data-theme='light'] ::-webkit-scrollbar-track {
+    background: transparent;
+}
+body[data-theme='light'] ::-webkit-scrollbar-corner {
+    background: transparent;
+}
+body[data-theme='light'] ::-webkit-scrollbar-thumb {
+    background: rgba(0, 0, 0, 0.18);
+    border-radius: 4px;
+    border: 2px solid transparent;
+    background-clip: content-box;
+}
+body[data-theme='light'] ::-webkit-scrollbar-thumb:hover {
+    background: rgba(0, 0, 0, 0.30);
+    border: 2px solid transparent;
+    background-clip: content-box;
+}
+
+/* Ensure body background matches theme to avoid white flashes, but kept transparent for window composition */
+body {
+    transition: color 0.3s;
+}
+
+body[data-theme='dark'] {
+    /* 移除全局 text-shadow：对每个文本元素增加 GPU compositing 成本，
+       在透明窗口环境下会显著加剧 GPU 负载 */
+}
+
+/* 暗色 + 透明：提升选中/焦点可读性，避免默认蓝色在半透明背景下发灰 */
+body[data-theme='dark'] .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected,
+body[data-theme='dark'] .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected:hover {
+    background: rgba(246, 196, 83, 0.24) !important;
+    color: rgba(255, 236, 179, 0.98) !important;
+}
+
+body[data-theme='dark'] .redis-viewer-workbench .ant-tree .ant-tree-treenode:hover {
+    background: rgba(255, 255, 255, 0.05) !important;
+}
+
+body[data-theme='dark'] .redis-viewer-workbench .ant-tree .ant-tree-treenode.ant-tree-treenode-selected,
+body[data-theme='dark'] .redis-viewer-workbench .ant-tree .ant-tree-treenode.ant-tree-treenode-selected:hover {
+    background: linear-gradient(90deg, rgba(246, 196, 83, 0.22), rgba(246, 196, 83, 0.08)) !important;
+    border: 1px solid rgba(246, 196, 83, 0.24) !important;
+}
+
+body[data-theme='dark'] .ant-checkbox-checked .ant-checkbox-inner {
+    background-color: #f6c453 !important;
+    border-color: #f6c453 !important;
+}
+
+body[data-theme='dark'] .ant-checkbox-indeterminate .ant-checkbox-inner::after {
+    background-color: #f6c453 !important;
+}
+
+body[data-theme='dark'] .ant-checkbox:hover .ant-checkbox-inner,
+body[data-theme='dark'] .ant-checkbox-wrapper:hover .ant-checkbox-inner {
+    border-color: #f6c453 !important;
+}
+
+body[data-theme='dark'] .ant-radio-checked .ant-radio-inner {
+    border-color: #f6c453 !important;
+    background-color: #f6c453 !important;
+}
+
+body[data-theme='dark'] .ant-radio-wrapper:hover .ant-radio-inner,
+body[data-theme='dark'] .ant-radio:hover .ant-radio-inner {
+    border-color: #f6c453 !important;
+}
+
+body[data-theme='dark'] .ant-switch.ant-switch-checked {
+    background: #d8a93b !important;
+}
+
+body[data-theme='dark'] .ant-table-tbody > tr.ant-table-row-selected > td,
+body[data-theme='dark'] .ant-table-tbody .ant-table-row.ant-table-row-selected > .ant-table-cell {
+    background: rgba(246, 196, 83, 0.18) !important;
+}
+
+body[data-theme='dark'] .ant-table-tbody > tr.ant-table-row-selected:hover > td,
+body[data-theme='dark'] .ant-table-tbody .ant-table-row.ant-table-row-selected:hover > .ant-table-cell {
+    background: rgba(246, 196, 83, 0.26) !important;
+}
+
+body[data-theme='dark'] .redis-viewer-workbench .ant-radio-button-wrapper {
+    background: rgba(255, 255, 255, 0.04);
+    border-color: rgba(255, 255, 255, 0.08);
+    color: rgba(230, 234, 242, 0.9);
+}
+
+body[data-theme='dark'] .redis-viewer-workbench .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    background: rgba(246, 196, 83, 0.16);
+    border-color: rgba(246, 196, 83, 0.3);
+    color: #f6c453;
+}
+
+body[data-theme='light'] .redis-viewer-workbench .ant-tree .ant-tree-treenode:hover {
+    background: rgba(15, 23, 42, 0.04) !important;
+}
+
+body[data-theme='light'] .redis-viewer-workbench .ant-tree .ant-tree-treenode.ant-tree-treenode-selected,
+body[data-theme='light'] .redis-viewer-workbench .ant-tree .ant-tree-treenode.ant-tree-treenode-selected:hover {
+    color: rgba(15, 23, 42, 0.92) !important;
+    background: linear-gradient(90deg, rgba(22, 119, 255, 0.12), rgba(22, 119, 255, 0.04)) !important;
+    border: 1px solid rgba(22, 119, 255, 0.18) !important;
+}
+
+body[data-theme='light'] .redis-viewer-workbench .ant-radio-button-wrapper {
+    background: rgba(255, 255, 255, 0.72);
+    border-color: rgba(15, 23, 42, 0.08);
+    color: rgba(51, 65, 85, 0.88);
+}
+
+body[data-theme='light'] .redis-viewer-workbench .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    background: rgba(22, 119, 255, 0.1);
+    border-color: rgba(22, 119, 255, 0.22);
+    color: #1677ff;
+}
+
+/* 连接配置弹窗：滚动仅在弹窗 body 内部，不使用外层 wrap 滚动条 */
+.connection-modal-wrap {
+    overflow: hidden !important;
+}
+
+.connection-modal-wrap .ant-modal-content {
+    max-height: calc(100vh - 72px);
+    display: flex;
+    flex-direction: column;
+}
+
+.connection-modal-wrap .ant-modal-body {
+    flex: 1 1 auto;
+    min-height: 0;
+}
+
+.connection-modal-wrap .ant-modal-footer {
+    flex-shrink: 0;
+}
+
+/* Custom Title Bar Close Button Hover */
+.titlebar-close-btn:hover {
+    background-color: #ff4d4f !important;
+    color: #fff !important;
+}
+
+.driver-manager-modal .ant-modal-body {
+    background: var(--ant-color-bg-layout, #f5f5f5);
+}
+
+.driver-manager-shell {
+    display: flex;
+    flex-direction: column;
+    gap: 14px;
+}
+
+.driver-manager-header {
+    display: grid;
+    grid-template-columns: minmax(0, 1fr) auto;
+    gap: 16px;
+    align-items: stretch;
+    padding: 14px 16px;
+    border: 1px solid rgba(5, 5, 5, 0.08);
+    border-radius: 8px;
+    background: var(--ant-color-bg-container, #fff);
+}
+
+.driver-manager-heading {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+    min-width: 0;
+}
+
+.driver-manager-stats {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(64px, 1fr));
+    gap: 8px;
+    min-width: 360px;
+}
+
+.driver-manager-stat {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+    justify-content: center;
+    min-height: 58px;
+    padding: 8px 10px;
+    border: 1px solid rgba(5, 5, 5, 0.08);
+    border-radius: 8px;
+    background: rgba(5, 5, 5, 0.02);
+}
+
+.driver-manager-stat span:first-child {
+    font-size: 20px;
+    font-weight: 700;
+    line-height: 1.2;
+}
+
+.driver-manager-stat-warning span:first-child {
+    color: #d48806;
+}
+
+.driver-manager-directory-panel {
+    border: 1px solid rgba(5, 5, 5, 0.08);
+    border-radius: 8px;
+    background: var(--ant-color-bg-container, #fff);
+}
+
+.driver-manager-toolbar {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.driver-manager-search {
+    min-width: 280px;
+    flex: 1 1 360px;
+}
+
+.driver-manager-toolbar-actions {
+    justify-content: flex-end;
+}
+
+.driver-manager-batch-progress-panel {
+    display: grid;
+    gap: 8px;
+    padding: 12px 14px;
+    border-radius: 8px;
+}
+
+.driver-manager-batch-progress-header,
+.driver-manager-batch-progress-meta {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px 12px;
+    align-items: center;
+    justify-content: space-between;
+    min-width: 0;
+}
+
+.driver-manager-batch-progress-header span,
+.driver-manager-batch-progress-meta span {
+    min-width: 0;
+    word-break: break-word;
+}
+
+.driver-manager-list-head {
+    display: flex;
+    justify-content: space-between;
+    gap: 12px;
+    min-height: 24px;
+}
+
+.driver-manager-list {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.driver-manager-card {
+    border: 1px solid rgba(5, 5, 5, 0.08);
+    border-radius: 8px;
+    background: var(--ant-color-bg-container, #fff);
+    overflow: hidden;
+}
+
+.driver-manager-card-warning {
+    border-color: rgba(250, 173, 20, 0.35);
+}
+
+.driver-manager-card-ready {
+    border-color: rgba(82, 196, 26, 0.22);
+}
+
+.driver-manager-card-main {
+    display: grid;
+    grid-template-columns: minmax(0, 1fr) minmax(300px, 38%);
+    gap: 16px;
+    padding: 16px;
+}
+
+.driver-manager-card-info {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    min-width: 0;
+}
+
+.driver-manager-title-row,
+.driver-manager-meta-row {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+    min-width: 0;
+}
+
+.driver-manager-driver-name {
+    font-size: 16px;
+}
+
+.driver-manager-meta-row {
+    row-gap: 4px;
+}
+
+.driver-manager-update-note {
+    display: grid;
+    gap: 4px;
+    padding: 10px 12px;
+    border-radius: 8px;
+    background: rgba(250, 173, 20, 0.1);
+}
+
+.driver-manager-note-text,
+.driver-manager-muted-message {
+    margin-bottom: 0 !important;
+}
+
+.driver-manager-muted-message {
+    color: var(--ant-color-text-secondary);
+}
+
+.driver-manager-card-controls {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    min-width: 0;
+}
+
+.driver-manager-control-block {
+    display: grid;
+    gap: 4px;
+}
+
+.driver-manager-control-label,
+.driver-manager-small-text {
+    font-size: 12px;
+}
+
+.driver-manager-version-control {
+    display: grid;
+    gap: 4px;
+}
+
+.driver-manager-version-lock {
+    line-height: 24px;
+}
+
+.driver-manager-card-actions {
+    justify-content: flex-end;
+}
+
+.driver-manager-card-actions .ant-btn {
+    min-width: 88px;
+}
+
+.driver-manager-footer-actions {
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+}
+
+@media (max-width: 900px) {
+    .driver-manager-header,
+    .driver-manager-card-main {
+        grid-template-columns: 1fr;
+    }
+
+    .driver-manager-stats {
+        min-width: 0;
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+
+    .driver-manager-card-actions {
+        justify-content: flex-start;
+    }
+
+    .driver-manager-batch-progress-header,
+    .driver-manager-batch-progress-meta {
+        justify-content: flex-start;
+    }
+}
+
+.security-update-action-btn.ant-btn,
+.security-update-action-btn.ant-btn-default,
+.security-update-action-btn.ant-btn-primary,
+.security-update-action-btn.ant-btn-text {
+    box-shadow: none !important;
+}
+
+.security-update-action-btn.ant-btn:focus,
+.security-update-action-btn.ant-btn:focus-visible,
+.security-update-action-btn.ant-btn-default:focus,
+.security-update-action-btn.ant-btn-default:focus-visible,
+.security-update-action-btn.ant-btn-primary:focus,
+.security-update-action-btn.ant-btn-primary:focus-visible,
+.security-update-action-btn.ant-btn-text:focus,
+.security-update-action-btn.ant-btn-text:focus-visible {
+    outline: none !important;
+    box-shadow: none !important;
+}
+
+.security-update-banner {
+    position: relative;
+    isolation: isolate;
+}
+
+.security-update-result-card {
+    transition: background 0.22s ease, box-shadow 0.22s ease, transform 0.22s ease;
+}
+
+.security-update-result-card-active {
+    animation: security-update-result-pulse 1.8s ease;
+}
+
+@keyframes security-update-result-pulse {
+    0% {
+        transform: translateY(0);
+    }
+    30% {
+        transform: translateY(-2px);
+    }
+    100% {
+        transform: translateY(0);
+    }
+}
+.gonavi-query-editor-link-hint {
+  cursor: pointer;
+  text-decoration: underline;
+  text-decoration-style: dashed;
+  text-decoration-thickness: 1px;
+  text-underline-offset: 3px;
+}
+
+.gonavi-query-editor-object-token {
+  color: #2563eb;
+}
+
+.gonavi-query-editor-column-token {
+  color: #0f766e;
+}
+
+.gonavi-query-editor-db-token {
+  color: #7c3aed;
+}
+
+body[data-theme='dark'] .gonavi-query-editor-object-token {
+  color: #7dd3fc;
+}
+
+body[data-theme='dark'] .gonavi-query-editor-column-token {
+  color: #5eead4;
+}
+
+body[data-theme='dark'] .gonavi-query-editor-db-token {
+  color: #c4b5fd;
+}
--- a/frontend/src/App.tool-center.test.ts
+++ b/frontend/src/App.tool-center.test.ts
@@ -0,0 +1,244 @@
+import { describe, expect, it } from 'vitest';
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+const appSource = readFileSync(
+  fileURLToPath(new globalThis.URL('./App.tsx', import.meta.url)),
+  'utf8',
+);
+
+const getGlobalShortcutCaseBlock = (action: string) => {
+  const caseToken = `case '${action}':`;
+  const start = appSource.indexOf(caseToken);
+  expect(start).toBeGreaterThan(-1);
+
+  const afterCase = appSource.slice(start + caseToken.length);
+  const nextCaseIndex = afterCase.search(/\n\s+case '[^']+':/);
+  const switchEndIndex = afterCase.indexOf("window.addEventListener('keydown', handleGlobalShortcut, true);");
+  const endIndex = nextCaseIndex >= 0 ? nextCaseIndex : switchEndIndex;
+
+  expect(endIndex).toBeGreaterThan(-1);
+  return afterCase.slice(0, endIndex);
+};
+
+describe('tool center menu entries', () => {
+  it('exposes snippet management next to shortcut management', () => {
+    expect(appSource).toContain("key: 'snippet-settings'");
+    expect(appSource).toContain("title: t('app.tools.entry.snippets.title')");
+    expect(appSource).toContain("description: t('app.tools.entry.snippets.description')");
+    expect(appSource).toContain('setIsSnippetModalOpen(true)');
+
+    const snippetIndex = appSource.indexOf("key: 'snippet-settings'");
+    const shortcutIndex = appSource.indexOf("key: 'shortcut-settings'", snippetIndex);
+    expect(snippetIndex).toBeGreaterThan(-1);
+    expect(shortcutIndex).toBeGreaterThan(snippetIndex);
+  });
+
+  it('keeps the v2 AI entry in the sidebar and the legacy AI entry on the content edge', () => {
+    expect(appSource).toContain('onToggleAI={toggleAIPanel}');
+    expect(appSource).toContain('renderLegacyAIEdgeHandle');
+    expect(appSource).toContain('resolveLegacyAIEdgeHandleDockStyle');
+    expect(appSource).toContain('data-gonavi-legacy-ai-edge-action="true"');
+    expect(appSource).toContain('{!isV2Ui && !aiPanelVisible && (');
+    expect(appSource).toContain('{!isV2Ui && (');
+    expect(appSource).not.toContain('data-gonavi-ai-entry-action="true"');
+  });
+
+  it('keeps sidebar utility handlers stable so v2 button clicks do not repaint the workspace', () => {
+    expect(appSource).toContain('const handleOpenToolsModal = useCallback(');
+    expect(appSource).toContain('const handleOpenSettingsModal = useCallback(');
+    expect(appSource).toContain('const handleToggleLogPanel = useCallback(');
+    expect(appSource).toContain('const handleFocusSidebarSearch = useCallback(');
+    expect(appSource).toContain('const antdTheme = useMemo(() => ({');
+    expect(appSource).toContain('theme={antdTheme}');
+    expect(appSource).toContain('const sqlLogCount = useStore(state => state.sqlLogs.length);');
+    expect(appSource).toContain('onOpenTools={handleOpenToolsModal}');
+    expect(appSource).toContain('onOpenSettings={handleOpenSettingsModal}');
+    expect(appSource).toContain('onToggleLogPanel={handleToggleLogPanel}');
+    expect(appSource).toContain('onFocusCommandSearch={handleFocusSidebarSearch}');
+    expect(appSource).toContain('sqlLogCount={sqlLogCount}');
+    expect(appSource).not.toContain('onOpenTools={() => setIsToolsModalOpen(true)}');
+    expect(appSource).not.toContain('onOpenSettings={() => setIsSettingsModalOpen(true)}');
+    expect(appSource).not.toContain('onToggleLogPanel={() => setIsLogPanelOpen((prev) => !prev)}');
+    expect(appSource).not.toContain('theme={{');
+    expect(appSource).not.toContain('const sqlLogs = useStore(state => state.sqlLogs);');
+  });
+
+  it('lets the v2 Sidebar own the entire left layout instead of stacking legacy controls above it', () => {
+    const siderIndex = appSource.indexOf("className={isV2Ui ? 'gn-v2-app-sider' : undefined}");
+    const legacyGuardIndex = appSource.indexOf('{!isV2Ui && (', siderIndex);
+    const legacyCreateIndex = appSource.indexOf('<Button icon={<PlusOutlined />} onClick={handleCreateConnection}', legacyGuardIndex);
+    const legacyCreateTitleIndex = appSource.indexOf("title={t('connection.new')}", legacyCreateIndex);
+    const legacyQueryIndex = appSource.indexOf('<Button icon={<ConsoleSqlOutlined />} onClick={handleNewQuery}', legacyGuardIndex);
+    const legacyQueryTitleIndex = appSource.indexOf("title={t('query.new')}", legacyQueryIndex);
+    const sidebarIndex = appSource.indexOf('<Sidebar', legacyGuardIndex);
+    const floatingLogIndex = appSource.indexOf('Floating SQL Log Toggle', sidebarIndex);
+    const floatingLogGuardIndex = appSource.indexOf('{!isV2Ui && (', floatingLogIndex);
+
+    expect(siderIndex).toBeGreaterThan(-1);
+    expect(legacyGuardIndex).toBeGreaterThan(siderIndex);
+    expect(legacyCreateIndex).toBeGreaterThan(legacyGuardIndex);
+    expect(legacyCreateIndex).toBeLessThan(sidebarIndex);
+    expect(legacyCreateTitleIndex).toBeGreaterThan(legacyCreateIndex);
+    expect(legacyQueryIndex).toBeGreaterThan(legacyCreateIndex);
+    expect(legacyQueryIndex).toBeLessThan(sidebarIndex);
+    expect(legacyQueryTitleIndex).toBeGreaterThan(legacyQueryIndex);
+    expect(appSource).toContain('paddingBottom: isV2Ui ? 0 : 58');
+    expect(floatingLogIndex).toBeGreaterThan(sidebarIndex);
+    expect(floatingLogGuardIndex).toBeGreaterThan(floatingLogIndex);
+  });
+
+  it('uses the v2 green accent for sidebar and log resize guide lines', () => {
+    expect(appSource).toContain('const resizeGuideColor = isV2Ui');
+    expect(appSource).toContain("'var(--gn-accent, #16a34a)'");
+    expect(appSource).toContain("darkMode ? 'rgba(246, 196, 83, 0.55)' : 'rgba(24, 144, 255, 0.5)'");
+  });
+
+  it('does not start sidebar resize from right-clicking the resize handle', () => {
+    expect(appSource).toContain('if (e.button !== 0)');
+    expect(appSource).toContain('onContextMenu={(event) => {');
+    expect(appSource).toContain('event.preventDefault();');
+    expect(appSource).toContain('event.stopPropagation();');
+
+    const guardIndex = appSource.indexOf('if (e.button !== 0)');
+    const ghostDisplayIndex = appSource.indexOf("ghostRef.current.style.display = 'block'", guardIndex);
+    const dragStartIndex = appSource.indexOf('sidebarDragRef.current = {', guardIndex);
+
+    expect(guardIndex).toBeGreaterThan(-1);
+    expect(ghostDisplayIndex).toBeGreaterThan(guardIndex);
+    expect(dragStartIndex).toBeGreaterThan(guardIndex);
+  });
+
+  it('positions sidebar resize guide from the rendered sider edge', () => {
+    expect(appSource).toContain('const siderRef = React.useRef<HTMLDivElement | null>(null);');
+    expect(appSource).toContain('ref={siderRef}');
+    expect(appSource).toContain('const siderRect = siderRef.current?.getBoundingClientRect();');
+    expect(appSource).toContain('const startGuideLeft = siderRect?.right ?? sidebarWidth;');
+    expect(appSource).toContain('const startWidth = siderRect?.width ?? sidebarWidth;');
+    expect(appSource).toContain('resolveSidebarResizeBounds(siderRef.current)');
+    expect(appSource).toContain('ghostRef.current.style.left = `${startGuideLeft}px`;');
+    expect(appSource).toContain('ghostRef.current.style.left = `${startGuideLeft + (newWidth - startWidth)}px`;');
+  });
+
+  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 && (');
+    expect(appSource).toContain('{isToolsModalOpen && (');
+    expect(appSource).toContain('{isSettingsModalOpen && (');
+    expect(appSource).toContain('{isThemeModalOpen && (');
+    expect(appSource).toContain('{isShortcutModalOpen && (');
+    expect(appSource).toContain('{isAISettingsOpen && (');
+    expect(appSource).toContain('{isDriverModalOpen && (');
+    expect(appSource).toContain('{isSyncModalOpen && (');
+  });
+
+  it('loads editable connection details before opening the edit modal so stored secrets can be shown', () => {
+    expect(appSource).toContain("typeof backendApp?.GetEditableSavedConnection === 'function'");
+    expect(appSource).toContain('const editableConnection = await backendApp.GetEditableSavedConnection(conn.id);');
+    expect(appSource).toContain('const errorMessage = error?.message;');
+    expect(appSource).toContain("typeof errorMessage === 'string'");
+    expect(appSource).toContain("t('app.connection.message.editable_load_failed_with_detail', { detail })");
+    expect(appSource).toContain("t('app.connection.message.editable_load_failed')");
+    expect(appSource).toContain('setEditingConnection(nextConnection);');
+    expect(appSource).toContain('setIsModalOpen(true);');
+  });
+
+  it('loads editable AI provider details before opening the edit modal so stored api keys can be shown', () => {
+    expect(appSource).toContain('<AISettingsModal');
+    const modalSource = readFileSync(new URL('./components/AISettingsModal.tsx', import.meta.url), 'utf8');
+    expect(modalSource).toContain("typeof Service?.AIGetEditableProvider === 'function'");
+    expect(modalSource).toContain('await Service.AIGetEditableProvider(p.id)');
+  });
+
+  it('keeps edit-mode passwords masked by default instead of forcing the eye toggle open', () => {
+    expect(appSource).not.toContain('setPrimaryPasswordVisible(String(config.password || "").trim() !== "")');
+  });
+
+  it('keeps shortcut manager scrolling inside the modal body', () => {
+    expect(appSource).toContain('centered');
+    expect(appSource).toContain("height: 'min(760px, calc(100vh - 80px))'");
+    expect(appSource).toContain("maxHeight: 'calc(100vh - 80px)'");
+    expect(appSource).toContain("body: { paddingTop: 8, overflow: 'hidden', flex: 1, minHeight: 0 }");
+    expect(appSource).toContain('data-gonavi-shortcut-modal-scroll="true"');
+    expect(appSource).toContain("height: '100%'");
+    expect(appSource).toContain("overflowY: 'auto'");
+  });
+
+  it('renders recorded shortcuts with platform-specific display labels', () => {
+    expect(appSource).toContain('getShortcutDisplayLabel');
+    expect(appSource).toContain('getShortcutDisplayLabel(binding.combo, activeShortcutPlatform)');
+  });
+
+  it('executes every global shortcut action exposed in the shortcut manager', () => {
+    const expectedHandlers = new Map([
+      ['runQuery', 'gonavi:run-active-query'],
+      ['focusSidebarSearch', 'gonavi:focus-sidebar-search'],
+      ['newQueryTab', 'handleNewQuery();'],
+      ['switchToNextTab', 'switchActiveTabByOffset(1);'],
+      ['switchToPreviousTab', 'switchActiveTabByOffset(-1);'],
+      ['newConnection', 'handleCreateConnection();'],
+      ['toggleAIPanel', 'toggleAIPanel();'],
+      ['toggleLogPanel', 'handleToggleLogPanel();'],
+      ['toggleTheme', 'setTheme('],
+      ['openShortcutManager', 'setIsShortcutModalOpen(true);'],
+      ['toggleMacFullscreen', 'handleTitleBarWindowToggle();'],
+      ['resetWindowZoom', 'handleManualResetWindowZoom();'],
+    ]);
+
+    for (const [action, handler] of expectedHandlers) {
+      expect(getGlobalShortcutCaseBlock(action)).toContain(handler);
+    }
+    expect(appSource).toContain('const switchActiveTabByOffset = useCallback((offset: 1 | -1) => {');
+    expect(appSource).toContain('const nextIndex = (baseIndex + offset + tabs.length) % tabs.length;');
+    expect(appSource).toContain('setActiveTab(tabs[nextIndex].id);');
+    expect(appSource).toContain('handleCreateConnection, handleManualResetWindowZoom');
+    expect(appSource).toContain('switchActiveTabByOffset, themeMode');
+  });
+
+  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('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);");
+    expect(appSource).toContain('const handleCreateQueryTabEvent = () => {');
+    expect(appSource).toContain('handleNewQuery();');
+  });
+});
+
+describe('global appearance tokens', () => {
+  it('publishes v2 font and scale variables for non-AntD chrome', () => {
+    expect(appSource).toContain("setProperty('--gonavi-font-size'");
+    expect(appSource).toContain("setProperty('--gn-ui-scale'");
+    expect(appSource).toContain("setProperty('--gn-font-size'");
+    expect(appSource).toContain("setProperty('--gn-font-size-sm'");
+    expect(appSource).toContain("setProperty('--gn-font-size-xs'");
+    expect(appSource).toContain("setProperty('--gn-font-size-mono'");
+    expect(appSource).toContain("setProperty('--gn-data-table-font-size'");
+    expect(appSource).toContain("setProperty('--gn-sidebar-tree-font-size'");
+    expect(appSource).toContain("setProperty('--gn-control-height'");
+    expect(appSource).toContain("setProperty('--gn-control-height-sm'");
+    expect(appSource).toContain('fontFamily: resolvedUiFontFamily');
+    expect(appSource).toContain('fontFamilyCode: resolvedMonoFontFamily');
+    expect(appSource).toContain("t('app.theme.data_table.font_size')");
+    expect(appSource).toContain("t('app.theme.data_table.sidebar_tree_font_size')");
+    expect(appSource).toContain('buildFontFamilyOptions(runtimePlatform, \'ui\', installedFontFamilies)');
+    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('matchFontFamilyOption');
+    expect(appSource).toContain('showSearch');
+    expect(appSource).toContain('const dataTableFontSizeFollowsGlobal = appearance.dataTableFontSizeFollowGlobal !== false;');
+    expect(appSource).toContain('const sidebarTreeFontSizeFollowsGlobal = appearance.sidebarTreeFontSizeFollowGlobal !== false;');
+    expect(appSource).toContain('disabled={dataTableFontSizeFollowsGlobal}');
+    expect(appSource).toContain('disabled={sidebarTreeFontSizeFollowsGlobal}');
+    expect(appSource).toContain("type={dataTableFontSizeFollowsGlobal ? 'primary' : 'default'}");
+    expect(appSource).toContain("type={sidebarTreeFontSizeFollowsGlobal ? 'primary' : 'default'}");
+    expect(appSource).toContain('dataTableFontSizeFollowGlobal: !dataTableFontSizeFollowsGlobal');
+    expect(appSource).toContain('sidebarTreeFontSizeFollowGlobal: !sidebarTreeFontSizeFollowsGlobal');
+    expect(appSource).toContain('dataTableFontSize: dataTableFontSizeFollowsGlobal');
+    expect(appSource).toContain('sidebarTreeFontSize: sidebarTreeFontSizeFollowsGlobal');
+  });
+});
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
--- a/frontend/src/App.ui-version.test.ts
+++ b/frontend/src/App.ui-version.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from 'vitest';
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+const appSource = readFileSync(
+  fileURLToPath(new globalThis.URL('./App.tsx', import.meta.url)),
+  'utf8',
+);
+
+describe('UI version switch placement', () => {
+  it('loads the v2 theme stylesheet with the app shell', () => {
+    expect(appSource).toContain("import './App.css';");
+    expect(appSource).toContain("import './v2-theme.css';");
+  });
+
+  it('keeps the UI version switch in theme mode and outside macOS-only settings', () => {
+    const themeBranchIndex = appSource.indexOf("{themeModalSection === 'theme' ? (");
+    const uiVersionIndex = appSource.indexOf('界面版本', themeBranchIndex);
+    const lightThemeIndex = appSource.indexOf('亮色主题', themeBranchIndex);
+    const appearanceBranchIndex = appSource.indexOf(') : (', themeBranchIndex);
+    const macWindowIndex = appSource.indexOf('macOS 窗口控制');
+
+    expect(themeBranchIndex).toBeGreaterThan(-1);
+    expect(uiVersionIndex).toBeGreaterThan(themeBranchIndex);
+    expect(uiVersionIndex).toBeLessThan(lightThemeIndex);
+    expect(uiVersionIndex).toBeLessThan(appearanceBranchIndex);
+    expect(macWindowIndex).toBeGreaterThan(uiVersionIndex);
+    expect(appSource).toContain("badge: '默认'");
+    expect(appSource).toContain("badge: 'Beta'");
+    expect(appSource).toContain("onClick={() => setAppearance({ uiVersion: item.key as 'legacy' | 'v2' })}");
+    expect(appSource).toContain('新版 UI 仍在 Beta');
+    expect(appSource).toContain('Windows、macOS 与 Linux 均可切换');
+  });
+
+  it('uses the card-style v2 switch from the redesign instead of the segmented pill', () => {
+    const uiVersionIndex = appSource.indexOf('界面版本');
+    const themeModeIndex = appSource.indexOf('主题模式', uiVersionIndex);
+    const uiVersionBlock = appSource.slice(uiVersionIndex, themeModeIndex);
+
+    expect(uiVersionBlock).toContain('NEW');
+    expect(uiVersionBlock).toContain("gridTemplateColumns: 'repeat(2, minmax(0, 1fr))'");
+    expect(uiVersionBlock).toContain("label: '旧版 UI'");
+    expect(uiVersionBlock).toContain("label: '新版 UI'");
+    expect(uiVersionBlock).toContain('CheckOutlined');
+    expect(uiVersionBlock).not.toContain('<Segmented');
+  });
+});
--- a/frontend/src/components/AIChatPanel.css
+++ b/frontend/src/components/AIChatPanel.css
@@ -0,0 +1,511 @@
+.ai-chat-panel {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+    border-left: 1px solid rgba(128, 128, 128, 0.12);
+    position: relative;
+    font-family: var(--gn-font-sans, "Inter", "PingFang SC", -apple-system, BlinkMacSystemFont, "Helvetica Neue", "Segoe UI", sans-serif);
+}
+
+/* Resize Handle */
+.ai-resize-handle {
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    width: 4px;
+    cursor: col-resize;
+    z-index: 10;
+    transition: background 0.15s ease;
+}
+
+.ai-resize-handle:hover,
+.ai-resize-handle.active {
+    background: rgba(22, 119, 255, 0.5);
+}
+
+/* Header */
+.ai-chat-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 12px 16px;
+    border-bottom: 1px solid rgba(128, 128, 128, 0.1);
+    flex-shrink: 0;
+}
+
+.ai-chat-header-left {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+
+.ai-chat-header-left .ai-logo {
+    width: 28px;
+    height: 28px;
+    border-radius: 8px;
+    display: grid;
+    place-items: center;
+    font-size: 16px;
+    font-weight: 700;
+    flex-shrink: 0;
+}
+
+.ai-chat-header-left .ai-title {
+    font-size: 14px;
+    font-weight: 700;
+    letter-spacing: 0.01em;
+}
+
+.ai-chat-header-right {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+}
+
+/* Messages Area */
+.ai-chat-messages {
+    flex: 1;
+    overflow-y: auto;
+    padding: 16px;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+}
+
+.ai-chat-messages::-webkit-scrollbar {
+    width: 5px;
+}
+
+.ai-chat-messages::-webkit-scrollbar-track {
+    background: transparent;
+}
+
+.ai-chat-messages::-webkit-scrollbar-thumb {
+    background: rgba(128, 128, 128, 0.3);
+    border-radius: 3px;
+}
+
+/* Welcome */
+.ai-chat-welcome {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 16px;
+    padding: 40px 20px;
+    text-align: center;
+    flex: 1;
+}
+
+.ai-chat-welcome .welcome-icon {
+    width: 56px;
+    height: 56px;
+    border-radius: 16px;
+    display: grid;
+    place-items: center;
+    font-size: 28px;
+}
+
+.ai-chat-welcome .welcome-title {
+    font-size: 18px;
+    font-weight: 700;
+    margin-bottom: 4px;
+}
+
+.ai-chat-welcome .quick-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    justify-content: center;
+    margin-top: 8px;
+}
+
+.ai-chat-welcome .quick-action-btn {
+    padding: 6px 14px;
+    border-radius: 20px;
+    font-size: 12px;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    border: 1px solid;
+}
+
+.ai-chat-welcome .quick-action-btn:hover {
+    background: rgba(99, 102, 241, 0.12) !important;
+    border-color: rgba(99, 102, 241, 0.3) !important;
+    color: #818cf8 !important;
+}
+
+/* IDE Style Messages */
+.ai-ide-message {
+    padding: 12px 16px;
+    animation: ai-msg-in 0.2s ease-out;
+}
+
+@keyframes ai-msg-in {
+    from {
+        opacity: 0;
+        transform: translateY(8px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+.ai-ide-message-header {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    font-size: 13px;
+    font-weight: 600;
+    margin-bottom: 8px;
+    text-transform: uppercase;
+    letter-spacing: 0.02em;
+}
+
+.ai-ide-message-content {
+    font-size: 13px;
+    line-height: 1.6;
+    word-break: break-word;
+    /* Remove pre-wrap here, as it conflicts with ReactMarkdown's block rendering */
+}
+
+/* Markdown Styles Override */
+.ai-markdown-content {
+    white-space: normal;
+}
+.ai-markdown-content p {
+    margin: 0 0 10px;
+}
+.ai-markdown-content p:last-child {
+    margin-bottom: 0;
+}
+.ai-markdown-content h1,
+.ai-markdown-content h2,
+.ai-markdown-content h3,
+.ai-markdown-content h4,
+.ai-markdown-content h5,
+.ai-markdown-content h6 {
+    margin: 16px 0 8px;
+    line-height: 1.4;
+    font-weight: 600;
+}
+.ai-markdown-content h1:first-child,
+.ai-markdown-content h2:first-child,
+.ai-markdown-content h3:first-child,
+.ai-markdown-content h4:first-child,
+.ai-markdown-content h5:first-child,
+.ai-markdown-content h6:first-child {
+    margin-top: 0;
+}
+.ai-markdown-content pre {
+    margin: 10px 0;
+    border-radius: 4px;
+    padding: 10px;
+    font-family: var(--gn-font-mono, "JetBrains Mono", ui-monospace, "SF Mono", Menlo, Consolas, monospace);
+    font-size: 12px;
+    overflow-x: auto;
+    border: 1px solid rgba(128, 128, 128, 0.15);
+    background: rgba(0, 0, 0, 0.2);
+}
+.ai-markdown-content code {
+    font-family: var(--gn-font-mono, "JetBrains Mono", ui-monospace, "SF Mono", Menlo, Consolas, monospace);
+    background: rgba(128, 128, 128, 0.15);
+    padding: 2px 4px;
+    border-radius: 3px;
+    font-size: 0.95em;
+}
+.ai-markdown-content ul, .ai-markdown-content ol {
+    margin: 0 0 10px;
+    padding-left: 20px;
+}
+.ai-markdown-content li {
+    margin-bottom: 4px;
+}
+
+/* Advanced Typing/Blinker indicator */
+.ai-blinking-cursor {
+    display: inline-block;
+    width: 6px;
+    height: 14px;
+    background-color: currentColor;
+    border-radius: 1px;
+    vertical-align: middle;
+    margin-left: 4px;
+    animation: blink 1s step-end infinite;
+}
+
+@keyframes blink {
+    0%, 100% { opacity: 1; }
+    50% { opacity: 0; }
+}
+
+@keyframes ai-dot-bounce {
+    0%, 80%, 100% { transform: scale(0.6); opacity: 0.4; }
+    40% { transform: scale(1); opacity: 1; }
+}
+
+/* History Drawer Styles */
+.ai-history-list::-webkit-scrollbar {
+    width: 4px;
+}
+.ai-history-list::-webkit-scrollbar-thumb {
+    background: rgba(128, 128, 128, 0.2);
+    border-radius: 4px;
+}
+.ai-history-list:hover::-webkit-scrollbar-thumb {
+    background: rgba(128, 128, 128, 0.4);
+}
+
+.ai-history-item:hover {
+    background: rgba(128, 128, 128, 0.08) !important;
+}
+
+.ai-history-item .ai-history-delete-btn {
+    opacity: 0;
+    transition: opacity 0.2s, background 0.2s;
+}
+
+.ai-history-item:hover .ai-history-delete-btn,
+.ai-history-item.active .ai-history-delete-btn {
+    opacity: 1;
+}
+
+/* Input Area */
+.ai-chat-input-area {
+    padding: 12px 16px 16px;
+    border-top: 1px solid rgba(128, 128, 128, 0.1);
+    flex-shrink: 0;
+}
+
+/* Textarea scrollbar */
+.ai-chat-input-wrapper textarea {
+    scrollbar-width: thin;
+    scrollbar-color: rgba(128, 128, 128, 0.3) transparent;
+}
+
+.ai-chat-input-wrapper textarea::-webkit-scrollbar {
+    width: 4px;
+}
+
+.ai-chat-input-wrapper textarea::-webkit-scrollbar-track {
+    background: transparent;
+}
+
+.ai-chat-input-wrapper textarea::-webkit-scrollbar-thumb {
+    background: rgba(128, 128, 128, 0.3);
+    border-radius: 2px;
+}
+
+.ai-chat-input-wrapper {
+    display: flex;
+    align-items: flex-end;
+    gap: 8px;
+    border-radius: 6px;
+    border: 1px solid transparent;
+    border-bottom-color: rgba(128, 128, 128, 0.4);
+    padding: 6px 10px;
+    transition: all 0.2s ease;
+    background: transparent !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;
+}
+
+.ai-chat-input-wrapper textarea {
+    width: 100%;
+    border: none;
+    outline: none;
+    background: transparent;
+    resize: none;
+    font-size: 13px;
+    line-height: 1.5;
+    min-height: 28px;
+    max-height: 200px;
+    padding: 0;
+    font-family: inherit;
+    overflow-y: auto;
+}
+
+.ai-chat-input-wrapper textarea::placeholder {
+    opacity: 0.4;
+}
+
+.ai-chat-send-btn {
+    width: 26px;
+    height: 26px;
+    border-radius: 4px;
+    display: grid;
+    place-items: center;
+    border: none;
+    cursor: pointer;
+    flex-shrink: 0;
+    transition: transform 0.15s ease, opacity 0.15s ease;
+}
+
+.ai-chat-send-btn:hover {
+    transform: scale(1.06);
+}
+
+.ai-chat-send-btn:active {
+    transform: scale(0.96);
+}
+
+.ai-chat-send-btn:disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+    transform: none;
+}
+
+.ai-ide-message:hover .ai-message-actions {
+    opacity: 1 !important;
+}
+
+/* Markdown 额外样式增强: Table & Blockquote */
+.ai-markdown-content table {
+  width: max-content;
+  min-width: 100%;
+  border-collapse: collapse;
+  margin: 12px 0;
+  font-size: 13px;
+}
+
+/* 让消息内容区域成为表格的滚动约束容器 */
+.ai-ide-message-content {
+  max-width: 100%;
+  overflow-x: hidden;
+}
+
+/* 表格滚动容器 - 不限定直接子元素 */
+.ai-markdown-content table {
+  display: block;
+  overflow-x: auto;
+  -webkit-overflow-scrolling: touch;
+  max-width: 100%;
+}
+
+.ai-markdown-content table::-webkit-scrollbar {
+  height: 4px;
+}
+
+.ai-markdown-content table::-webkit-scrollbar-thumb {
+  background: rgba(128, 128, 128, 0.3);
+  border-radius: 2px;
+}
+
+.ai-markdown-content th,
+.ai-markdown-content td {
+  border: 1px solid rgba(125, 125, 125, 0.2);
+  padding: 6px 12px;
+  text-align: left;
+  white-space: nowrap;
+}
+
+.ai-markdown-content th {
+  background: rgba(125, 125, 125, 0.1);
+  font-weight: 600;
+}
+
+.ai-markdown-content blockquote {
+  margin: 12px 0;
+  padding: 8px 14px;
+  border-left: 4px solid rgba(125, 125, 125, 0.4);
+  background: rgba(125, 125, 125, 0.05);
+  color: inherit;
+  opacity: 0.85;
+  border-radius: 0 6px 6px 0;
+  font-style: italic;
+}
+
+/* 覆盖 code 块容器样式避免和 syntax highlighter 冲突 */
+.ai-markdown-content > pre {
+    background: transparent !important;
+    padding: 0 !important;
+    margin: 0 !important;
+}
+
+/* ===== 新版 AI 状态流转动画 ===== */
+
+/* 1. 连接脉冲动画 (connecting) */
+.ai-wave-pulse {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+}
+.ai-wave-pulse span {
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    background-color: currentColor;
+    animation: wave-pulse-anim 1.2s ease-in-out infinite;
+}
+.ai-wave-pulse span:nth-child(1) { animation-delay: 0s; }
+.ai-wave-pulse span:nth-child(2) { animation-delay: 0.15s; }
+.ai-wave-pulse span:nth-child(3) { animation-delay: 0.3s; }
+
+@keyframes wave-pulse-anim {
+    0%, 100% { transform: translateY(0) scale(0.8); opacity: 0.4; }
+    50% { transform: translateY(-4px) scale(1.1); opacity: 1; }
+}
+
+/* 2. 平滑高度与透明度过渡 (针对 ThinkingBlock 和 面板折叠) */
+.ai-expand-transition {
+    display: grid;
+    transition: grid-template-rows 0.3s ease-out, opacity 0.3s ease-out;
+}
+.ai-expand-transition.expanded {
+    grid-template-rows: 1fr;
+    opacity: 1;
+}
+.ai-expand-transition.collapsed {
+    grid-template-rows: 0fr;
+    opacity: 0;
+}
+.ai-expand-transition > div {
+    overflow: hidden;
+}
+
+/* 3. Agent风格旋转Loading环 */
+.ai-spinning-ring {
+    width: 14px;
+    height: 14px;
+    border: 2px solid rgba(22, 119, 255, 0.2);
+    border-top-color: #1677ff;
+    border-radius: 50%;
+    animation: ai-spin-anim 0.8s linear infinite;
+    flex-shrink: 0;
+}
+
+@keyframes ai-spin-anim {
+    to { transform: rotate(360deg); }
+}
+
+/* 面板/弹窗内部 toast 定位覆盖：从 fixed（视口顶部）改为 absolute（容器内部顶部） */
+.ai-chat-panel .ant-message,
+.ai-settings-body .ant-message {
+    position: absolute !important;
+    top: 16px !important;
+    left: 50% !important;
+    transform: translateX(-50%) !important;
+    right: auto !important;
+    width: min(100%, 720px);
+    max-width: calc(100% - 32px);
+    z-index: 100;
+}
+
+.ai-settings-body .ant-message .ant-message-notice {
+    width: 100%;
+}
+
+.ai-settings-body .ant-message .ant-message-notice-content {
+    width: 100%;
+    white-space: normal;
+    word-break: break-word;
+    overflow-wrap: anywhere;
+    text-align: left;
+}
--- a/frontend/src/components/AIChatPanel.message-boundary.test.tsx
+++ b/frontend/src/components/AIChatPanel.message-boundary.test.tsx
--- a/frontend/src/components/AIChatPanel.tsx
+++ b/frontend/src/components/AIChatPanel.tsx
--- a/frontend/src/components/AISettingsModal.edit-password.test.tsx
+++ b/frontend/src/components/AISettingsModal.edit-password.test.tsx
@@ -0,0 +1,37 @@
+import { describe, expect, it } from 'vitest';
+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');
+
+describe('AISettingsModal edit password behavior', () => {
+  it('loads editable provider details before opening the edit modal', () => {
+    expect(source).toContain("typeof Service?.AIGetEditableProvider === 'function'");
+    expect(source).toContain('await Service.AIGetEditableProvider(p.id)');
+  });
+
+  it('keeps the prefilled api key masked by default', () => {
+    expect(source).toContain('const [primaryPasswordVisible, setPrimaryPasswordVisible] = useState(false);');
+    expect(source).toContain('visible: primaryPasswordVisible,');
+  });
+
+  it('does not render the clear helper block anymore', () => {
+    expect(source).not.toContain('当前已保存 API Key。留空表示继续沿用，输入新值表示替换。');
+    expect(source).not.toContain('清除已保存 API Key');
+    expect(source).not.toContain('留空表示继续沿用已保存密钥');
+  });
+
+  it('renders in-modal test errors through the local message host', () => {
+    expect(source).toContain('antdMessage.useMessage({ getContainer: () => modalBodyRef.current || document.body })');
+    expect(source).toContain("void messageApi.error(`测试失败: ${res?.message || '未知错误'}`);");
+  });
+
+  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('.ai-settings-body .ant-message .ant-message-notice-content {');
+    expect(aiChatPanelCss).toContain('white-space: normal;');
+    expect(aiChatPanelCss).toContain('overflow-wrap: anywhere;');
+  });
+});
--- a/frontend/src/components/AISettingsModal.tsx
+++ b/frontend/src/components/AISettingsModal.tsx
@@ -0,0 +1,835 @@
+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 {
+    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';
+interface AISettingsModalProps {
+    open: boolean;
+    onClose: () => void;
+    darkMode: boolean;
+    overlayTheme: OverlayWorkbenchTheme;
+    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 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 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 AISettingsModal: React.FC<AISettingsModalProps> = ({ open, onClose, darkMode, overlayTheme, focusProviderId }) => {
+    const { t } = useI18n();
+    const [providers, setProviders] = useState<AIProviderConfig[]>([]);
+    const [activeProviderId, setActiveProviderId] = useState<string>('');
+    const [safetyLevel, setSafetyLevel] = useState<AISafetyLevel>('readonly');
+    const [contextLevel, setContextLevel] = useState<AIContextLevel>('schema_only');
+    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 [primaryPasswordVisible, setPrimaryPasswordVisible] = useState(false);
+    const [form] = Form.useForm();
+    const modalBodyRef = useRef<HTMLDivElement>(null);
+
+    // Modal 内部 toast 通知
+    const [messageApi, messageContextHolder] = antdMessage.useMessage({ getContainer: () => modalBodyRef.current || document.body });
+
+    // 主题色
+    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 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?.() || {},
+            ]);
+            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);
+        } catch (e) { console.warn('Failed to load AI config', e); }
+    }, []);
+
+    useEffect(() => { if (open) void loadConfig(); }, [open, loadConfig]);
+
+    useEffect(() => {
+        if (!open || !focusProviderId) {
+            return;
+        }
+        if (!providers.some((provider) => provider.id === focusProviderId)) {
+            return;
+        }
+        setActiveSection('providers');
+        setActiveProviderId(focusProviderId);
+    }, [focusProviderId, open, providers]);
+
+    const applyProviderEditorSession = useCallback((session: ProviderEditorSession) => {
+        setEditingProvider(session.editingProvider as AIProviderConfig | null);
+        setIsEditing(session.isEditing);
+        setTestStatus(session.testStatus);
+        setPrimaryPasswordVisible(false);
+        form.resetFields();
+        if (session.formValues) {
+            form.setFieldsValue(session.formValues);
+        }
+    }, [form]);
+
+    const resetProviderEditorSession = useCallback(() => {
+        applyProviderEditorSession(buildClosedProviderEditorSession());
+    }, [applyProviderEditorSession]);
+
+    const handleModalClose = useCallback(() => {
+        resetProviderEditorSession();
+        onClose();
+    }, [onClose, resetProviderEditorSession]);
+
+    useEffect(() => {
+        if (!open) {
+            resetProviderEditorSession();
+        }
+    }, [open, resetProviderEditorSession]);
+    const handleAddProvider = () => {
+        const preset = findPreset('openai');
+        applyProviderEditorSession(buildAddProviderEditorSession({
+            presetKey: 'openai',
+            presetBackendType: preset.backendType,
+            presetBaseUrl: preset.defaultBaseUrl,
+            presetModel: preset.defaultModel,
+            presetModels: preset.models,
+            apiFormat: 'openai',
+        }));
+    };
+
+    const handleEditProvider = async (p: AIProviderConfig) => {
+        try {
+            const Service = (window as any).go?.aiservice?.Service;
+            const editableProvider = typeof Service?.AIGetEditableProvider === 'function'
+                ? await Service.AIGetEditableProvider(p.id)
+                : p;
+            // 尝试根据 baseUrl 和 type 推断 preset
+            const matchedPreset = matchProviderPreset(editableProvider);
+            const resolvedTransport = resolvePresetTransport({
+                presetBackendType: matchedPreset.backendType,
+                presetFixedApiFormat: matchedPreset.fixedApiFormat,
+                valuesApiFormat: editableProvider.apiFormat,
+            });
+            applyProviderEditorSession(buildEditProviderEditorSession({
+                provider: { ...editableProvider, presetKey: matchedPreset.key } as any,
+                formValues: {
+                    ...editableProvider,
+                    type: resolvedTransport.type,
+                    models: editableProvider.models || [],
+                    presetKey: matchedPreset.key,
+                    apiFormat: resolvedTransport.apiFormat || editableProvider.apiFormat || 'openai',
+                },
+            }));
+        } catch (e: any) {
+            void messageApi.error(e?.message || t('ai_settings.message.load_provider_failed'));
+        }
+    };
+
+    const handleDeleteProvider = async (id: string) => {
+        try {
+            const Service = (window as any).go?.aiservice?.Service;
+            const wasActive = id === activeProviderId;
+            await Service?.AIDeleteProvider?.(id);
+            await loadConfig();
+            // 合并提示：删除的是当前激活的供应商时，附带自动切换信息
+            if (wasActive) {
+                const newProviders: any[] = await Service?.AIGetProviders?.() || [];
+                if (newProviders.length > 0) {
+                    const newActiveName = newProviders[0]?.name || t('ai_settings.provider.next_provider');
+                    void messageApi.success(t('ai_settings.message.deleted_and_switched', { name: newActiveName }));
+                } else {
+                    void messageApi.success(t('ai_settings.message.deleted'));
+                }
+            } else {
+                void messageApi.success(t('ai_settings.message.deleted'));
+            }
+            window.dispatchEvent(new CustomEvent('gonavi:ai:provider-changed'));
+        } catch (e: any) { void messageApi.error(e?.message || t('ai_settings.message.delete_failed')); }
+    };
+
+    const handleSaveProvider = async () => {
+        try {
+            const values = await form.validateFields();
+            setLoading(true);
+            const Service = (window as any).go?.aiservice?.Service;
+            
+            // 构建 payload，处理 model/models 逻辑
+            const preset = findPreset(values.presetKey);
+            const isCustomLike = values.presetKey === 'custom' || values.presetKey === 'ollama';
+            const { model: finalModel, models: resolvedModels } = resolvePresetModelSelection({
+                presetKey: values.presetKey,
+                presetDefaultModel: preset.defaultModel,
+                presetModels: preset.models,
+                valuesModel: values.model,
+                customModels: values.models,
+            });
+            // 内置供应商自动使用 preset label 作为名称
+            const finalName = isCustomLike ? (values.name || preset.fallbackLabel) : preset.fallbackLabel;
+            
+            const finalBaseUrl = resolvePresetBaseURL({
+                presetKey: values.presetKey,
+                presetDefaultBaseUrl: preset.defaultBaseUrl,
+                valuesBaseUrl: values.baseUrl,
+            });
+            const resolvedTransport = resolvePresetTransport({
+                presetBackendType: preset.backendType,
+                presetFixedApiFormat: preset.fixedApiFormat,
+                valuesApiFormat: values.apiFormat,
+            });
+            const secretDraft = resolveProviderSecretDraft({
+                apiKeyInput: values.apiKey,
+            });
+            const payload = { 
+                ...editingProvider, 
+                ...values, 
+                ...resolvedTransport,
+                name: finalName,
+                apiKey: secretDraft.apiKey,
+                hasSecret: secretDraft.hasSecret,
+                model: finalModel,
+                models: resolvedModels,
+                baseUrl: finalBaseUrl,
+                apiFormat: resolvedTransport.apiFormat,
+            };
+            // 后端 AISaveProvider 统一处理新增和更新，返回 void，失败抛异常
+            await Service?.AISaveProvider?.(payload);
+            void messageApi.success(t('ai_settings.message.saved')); resetProviderEditorSession(); void loadConfig();
+            window.dispatchEvent(new CustomEvent('gonavi:ai:provider-changed'));
+        } catch (e: any) {
+            if (e?.errorFields) { /* antd form validation error, ignore */ }
+            else void messageApi.error(e?.message || t('ai_settings.message.save_failed'));
+        } finally { setLoading(false); }
+    };
+
+    const handleSetActive = async (id: string) => {
+        try {
+            const Service = (window as any).go?.aiservice?.Service;
+            await Service?.AISetActiveProvider?.(id);
+            setActiveProviderId(id); void messageApi.success(t('ai_settings.message.switched'));
+            window.dispatchEvent(new CustomEvent('gonavi:ai:provider-changed'));
+        } catch (e: any) { void messageApi.error(e?.message || t('ai_settings.message.switch_failed')); }
+    };
+
+    const handleSafetyChange = async (level: AISafetyLevel) => {
+        try {
+            const Service = (window as any).go?.aiservice?.Service;
+            await Service?.AISetSafetyLevel?.(level);
+            setSafetyLevel(level);
+        } catch (e) { /* ignore */ }
+    };
+
+    const handleContextChange = async (level: AIContextLevel) => {
+        try {
+            const Service = (window as any).go?.aiservice?.Service;
+            await Service?.AISetContextLevel?.(level);
+            setContextLevel(level);
+        } catch (e) { /* ignore */ }
+    };
+
+    const handleTestProvider = async () => {
+        try {
+            const values = await form.validateFields();
+            setLoading(true);
+            setTestStatus('idle');
+            const Service = (window as any).go?.aiservice?.Service;
+            const preset = findPreset(values.presetKey || 'openai');
+            const finalBaseUrl = resolvePresetBaseURL({
+                presetKey: values.presetKey || 'openai',
+                presetDefaultBaseUrl: preset.defaultBaseUrl,
+                valuesBaseUrl: values.baseUrl,
+            });
+            const { model: finalModel, models: resolvedModels } = resolvePresetModelSelection({
+                presetKey: values.presetKey || 'openai',
+                presetDefaultModel: preset.defaultModel,
+                presetModels: preset.models,
+                valuesModel: values.model,
+                customModels: values.models,
+            });
+            const resolvedTransport = resolvePresetTransport({
+                presetBackendType: preset.backendType,
+                presetFixedApiFormat: preset.fixedApiFormat,
+                valuesApiFormat: values.apiFormat,
+            });
+            const secretDraft = resolveProviderSecretDraft({
+                apiKeyInput: values.apiKey,
+            });
+            if (secretDraft.mode === 'clear') {
+                throw new Error(t('ai_settings.message.test_requires_new_api_key'));
+            }
+            const res = await Service?.AITestProvider?.({
+                ...editingProvider,
+                ...values,
+                ...resolvedTransport,
+                apiKey: secretDraft.apiKey,
+                hasSecret: secretDraft.hasSecret,
+                baseUrl: finalBaseUrl,
+                model: finalModel,
+                models: resolvedModels,
+                maxTokens: Number(values.maxTokens) || 4096,
+                temperature: Number(values.temperature) ?? 0.7,
+                apiFormat: resolvedTransport.apiFormat,
+            });
+            if (res?.success) { setTestStatus('success'); void messageApi.success(t('ai_settings.message.test_success')); }
+            else { setTestStatus('error'); void messageApi.error(res?.message || t('ai_settings.message.test_failed')); }
+        } catch (e: any) { setTestStatus('error'); void messageApi.error(e?.message || t('ai_settings.message.test_failed')); }
+        finally { setLoading(false); }
+    };
+
+    const handlePresetChange = (presetKey: string) => {
+        const preset = findPreset(presetKey);
+        const resolvedTransport = resolvePresetTransport({
+            presetBackendType: preset.backendType,
+            presetFixedApiFormat: preset.fixedApiFormat,
+            valuesApiFormat: form.getFieldValue('apiFormat'),
+        });
+        form.setFieldsValue({
+            presetKey,
+            type: resolvedTransport.type,
+            apiFormat: resolvedTransport.apiFormat || 'openai',
+            baseUrl: preset.defaultBaseUrl,
+            model: preset.defaultModel,
+        });
+    };
+
+    // ---- 字段装饰器样式 ----
+    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,
+    };
+
+    return (
+        <Modal
+            title={
+                <div style={{ display: 'flex', alignItems: 'flex-start', gap: 12 }}>
+                    <div style={{
+                        width: 38, height: 38, borderRadius: 12, display: 'grid', placeItems: 'center',
+                        background: overlayTheme.iconBg, color: overlayTheme.iconColor, fontSize: 18, flexShrink: 0,
+                    }}>
+                        <RobotOutlined />
+                    </div>
+                    <div>
+                        <div style={{ fontSize: 16, fontWeight: 800, color: overlayTheme.titleText }}>{t('ai_settings.title')}</div>
+                        <div style={{ marginTop: 3, color: overlayTheme.mutedText, fontSize: 12 }}>
+                            {t('ai_settings.subtitle')}
+                        </div>
+                    </div>
+                </div>
+            }
+            open={open}
+            onCancel={handleModalClose}
+            footer={null}
+            width={820}
+            styles={{
+                content: modalShellStyle,
+                header: { background: 'transparent', borderBottom: 'none', paddingBottom: 8 },
+                body: { paddingTop: 8, height: 620, overflow: 'hidden' },
+            }}
+        >
+              <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>
+                  <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()}
+                  </div>
+              </div>
+        </Modal>
+    );
+};
+
+export default AISettingsModal;
+
+
+
--- a/frontend/src/components/ConnectionModal.edit-password.test.tsx
+++ b/frontend/src/components/ConnectionModal.edit-password.test.tsx
@@ -0,0 +1,38 @@
+import { describe, expect, it } from 'vitest';
+import { readFileSync } from 'node:fs';
+
+const source = readFileSync(new URL('./ConnectionModal.tsx', import.meta.url), 'utf8');
+
+describe('ConnectionModal edit password behavior', () => {
+  it('keeps the prefilled primary password masked by default', () => {
+    expect(source).toContain('const [primaryPasswordVisible, setPrimaryPasswordVisible] = useState(false);');
+    expect(source).not.toContain('setPrimaryPasswordVisible(String(config.password || "").trim() !== "")');
+    expect(source).toContain('visible: primaryPasswordVisible,');
+  });
+
+  it('does not render the primary-password clear helper block anymore', () => {
+    expect(source).not.toContain('description:\n                          "当前已保存主连接密码。留空表示继续沿用，输入新值表示替换。"');
+    expect(source).not.toContain('description:\n                          "当前已保存 Redis 密码。留空表示继续沿用，输入新值表示替换。"');
+    expect(source).toContain('String(config.password || "") === ""');
+  });
+
+  it('reuses the shared backend-cancel helper for file and certificate pickers', () => {
+    expect(source).not.toContain('res?.message !== "已取消"');
+    expect(source.match(/isBackendCancelledResult\(res\)/g) ?? []).toHaveLength(3);
+  });
+
+  it('uses localized SSL mode labels instead of hardcoded English strings', () => {
+    expect(source).not.toContain('label: "Preferred"');
+    expect(source).not.toContain('label: "Required"');
+    expect(source).not.toContain('label: "Skip Verify"');
+    expect(source).toMatch(
+      /label:\s*t\(\s*"connection\.modal\.network\.ssl_mode\.preferred",\s*\)/,
+    );
+    expect(source).toMatch(
+      /label:\s*t\(\s*"connection\.modal\.network\.ssl_mode\.required",\s*\)/,
+    );
+    expect(source).toMatch(
+      /label:\s*t\(\s*"connection\.modal\.network\.ssl_mode\.skip_verify",\s*\)/,
+    );
+  });
+});
--- a/frontend/src/components/ConnectionModal.i18n.test.tsx
+++ b/frontend/src/components/ConnectionModal.i18n.test.tsx
--- a/frontend/src/components/ConnectionModal.tsx
+++ b/frontend/src/components/ConnectionModal.tsx
--- a/frontend/src/components/ConnectionPackagePasswordModal.tsx
+++ b/frontend/src/components/ConnectionPackagePasswordModal.tsx
@@ -0,0 +1,108 @@
+import React from 'react';
+import { Checkbox, Input, Modal, Typography } from 'antd';
+import { useI18n } from '../i18n/provider';
+
+const { Text } = Typography;
+
+type ConnectionPackagePasswordModalMode = 'import' | 'export';
+
+export interface ConnectionPackagePasswordModalProps {
+  open: boolean;
+  title: string;
+  mode?: ConnectionPackagePasswordModalMode;
+  includeSecrets?: boolean;
+  useFilePassword?: boolean;
+  password: string;
+  error?: string;
+  confirmLoading?: boolean;
+  confirmText?: string;
+  cancelText?: string;
+  onIncludeSecretsChange?: (value: boolean) => void;
+  onUseFilePasswordChange?: (value: boolean) => void;
+  onPasswordChange: (value: string) => void;
+  onConfirm: () => void;
+  onCancel: () => void;
+}
+
+export default function ConnectionPackagePasswordModal({
+  open,
+  title,
+  mode = 'import',
+  includeSecrets = true,
+  useFilePassword = false,
+  password,
+  error,
+  confirmLoading,
+  confirmText,
+  cancelText,
+  onIncludeSecretsChange,
+  onUseFilePasswordChange,
+  onPasswordChange,
+  onConfirm,
+  onCancel,
+}: ConnectionPackagePasswordModalProps) {
+  const { t } = useI18n();
+  const isExportMode = mode === 'export';
+  const showFilePasswordInput = isExportMode ? useFilePassword : true;
+  const resolvedConfirmText = confirmText ?? t('common.confirm');
+  const resolvedCancelText = cancelText ?? t('common.cancel');
+  const placeholder = isExportMode
+    ? t('app.connection_package.dialog.file_password_placeholder')
+    : t('app.connection_package.dialog.restore_password_placeholder');
+  const helperText = !includeSecrets
+    ? t('app.connection_package.dialog.help.exclude_passwords')
+    : (useFilePassword
+      ? t('app.connection_package.dialog.help.share_file_password_separately')
+      : t('app.connection_package.dialog.help.encrypted_passwords_recommend_file_password'));
+
+  return (
+    <Modal
+      open={open}
+      title={title}
+      okText={resolvedConfirmText}
+      cancelText={resolvedCancelText}
+      confirmLoading={confirmLoading}
+      onOk={onConfirm}
+      onCancel={onCancel}
+      destroyOnHidden={false}
+      maskClosable={false}
+    >
+      {isExportMode ? (
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+          <Checkbox
+            checked={includeSecrets}
+            onChange={(event) => onIncludeSecretsChange?.(event.target.checked)}
+          >
+            {t('app.connection_package.dialog.option.include_passwords')}
+          </Checkbox>
+          <Checkbox
+            checked={useFilePassword}
+            disabled={!includeSecrets}
+            onChange={(event) => onUseFilePasswordChange?.(event.target.checked)}
+          >
+            {t('app.connection_package.dialog.option.use_file_password')}
+          </Checkbox>
+        </div>
+      ) : null}
+      {showFilePasswordInput ? (
+        <Input.Password
+          autoFocus
+          value={password}
+          placeholder={placeholder}
+          disabled={isExportMode && !useFilePassword}
+          onChange={(event) => onPasswordChange(event.target.value)}
+        />
+      ) : null}
+      {isExportMode ? (
+        <Text type={useFilePassword ? 'warning' : 'secondary'} style={{ display: 'block', marginTop: 8 }}>
+          {helperText}
+        </Text>
+      ) : null}
+      {error ? (
+        <Text type="danger" style={{ display: 'block', marginTop: 8 }}>
+          {error}
+        </Text>
+      ) : null}
+    </Modal>
+  );
+}
--- a/frontend/src/components/DataGrid.ddl.test.tsx
+++ b/frontend/src/components/DataGrid.ddl.test.tsx
--- a/frontend/src/components/DataGrid.layout.test.tsx
+++ b/frontend/src/components/DataGrid.layout.test.tsx
--- a/frontend/src/components/DataGrid.tsx
+++ b/frontend/src/components/DataGrid.tsx
--- a/frontend/src/components/DataGridColumnInfoPopoverContent.tsx
+++ b/frontend/src/components/DataGridColumnInfoPopoverContent.tsx
@@ -0,0 +1,115 @@
+import React from 'react';
+import { Button, Checkbox, Input } from 'antd';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+export type DataGridColumnInfoTranslate = (key: string, params?: I18nParams) => string;
+
+export interface DataGridColumnInfoPopoverContentProps {
+  darkMode: boolean;
+  showColumnComment: boolean;
+  showColumnType: boolean;
+  columnSearchText: string;
+  allOrderedColumnNames: string[];
+  localHiddenColumns: string[];
+  enableColumnOrderMemory: boolean;
+  enableHiddenColumnMemory: boolean;
+  canResetOrder: boolean;
+  canResetHidden: boolean;
+  translate?: DataGridColumnInfoTranslate;
+  onShowColumnCommentChange: (checked: boolean) => void;
+  onShowColumnTypeChange: (checked: boolean) => void;
+  onToggleAllColumnsVisibility: (visible: boolean) => void;
+  onColumnSearchTextChange: (value: string) => void;
+  onToggleColumnVisibility: (columnName: string, visible: boolean) => void;
+  onEnableColumnOrderMemoryChange: (checked: boolean) => void;
+  onEnableHiddenColumnMemoryChange: (checked: boolean) => void;
+  onResetOrder: () => void;
+  onResetHidden: () => void;
+}
+
+const DataGridColumnInfoPopoverContent: React.FC<DataGridColumnInfoPopoverContentProps> = ({
+  darkMode,
+  showColumnComment,
+  showColumnType,
+  columnSearchText,
+  allOrderedColumnNames,
+  localHiddenColumns,
+  enableColumnOrderMemory,
+  enableHiddenColumnMemory,
+  canResetOrder,
+  canResetHidden,
+  translate = defaultTranslate,
+  onShowColumnCommentChange,
+  onShowColumnTypeChange,
+  onToggleAllColumnsVisibility,
+  onColumnSearchTextChange,
+  onToggleColumnVisibility,
+  onEnableColumnOrderMemoryChange,
+  onEnableHiddenColumnMemoryChange,
+  onResetOrder,
+  onResetHidden,
+}) => (
+  <div style={{ display: 'flex', flexDirection: 'column', gap: 8, minWidth: 200, maxWidth: 300 }}>
+    <div style={{ fontWeight: 600, fontSize: 13, color: darkMode ? '#ddd' : '#666' }}>
+      {translate('data_grid.column_settings.display_settings')}
+    </div>
+    <Checkbox checked={showColumnComment} onChange={(e) => onShowColumnCommentChange(e.target.checked)}>
+      {translate('data_grid.column_settings.show_comments')}
+    </Checkbox>
+    <Checkbox checked={showColumnType} onChange={(e) => onShowColumnTypeChange(e.target.checked)}>
+      {translate('data_grid.column_settings.show_types')}
+    </Checkbox>
+    <div style={{ height: 1, backgroundColor: darkMode ? '#424242' : '#f0f0f0', margin: '4px 0' }} />
+
+    <div style={{ fontWeight: 600, fontSize: 13, color: darkMode ? '#ddd' : '#666', display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+      <span>{translate('data_grid.column_settings.column_visibility')}</span>
+      <div style={{ display: 'flex', gap: 8 }}>
+        <a style={{ fontSize: 12 }} onClick={() => onToggleAllColumnsVisibility(true)}>
+          {translate('data_grid.column_settings.show_all')}
+        </a>
+        <a style={{ fontSize: 12 }} onClick={() => onToggleAllColumnsVisibility(false)}>
+          {translate('data_grid.column_settings.hide_all')}
+        </a>
+      </div>
+    </div>
+    <Input
+      placeholder={translate('data_grid.column_settings.search_columns_placeholder')}
+      size="small"
+      value={columnSearchText}
+      onChange={(e) => onColumnSearchTextChange(e.target.value)}
+      allowClear
+    />
+    <div className="custom-scrollbar" style={{ maxHeight: 240, overflowY: 'auto', display: 'flex', flexDirection: 'column', gap: 4 }}>
+      {allOrderedColumnNames
+        .filter((col) => !columnSearchText || col.toLowerCase().includes(columnSearchText.toLowerCase()))
+        .map((col) => (
+          <Checkbox
+            key={col}
+            checked={!localHiddenColumns.includes(col)}
+            onChange={(e) => onToggleColumnVisibility(col, e.target.checked)}
+            style={{ marginLeft: 0 }}
+          >
+            {col}
+          </Checkbox>
+        ))}
+    </div>
+
+    <div style={{ height: 1, backgroundColor: darkMode ? '#424242' : '#f0f0f0', margin: '4px 0' }} />
+    <Checkbox checked={enableColumnOrderMemory} onChange={(e) => onEnableColumnOrderMemoryChange(e.target.checked)}>
+      {translate('data_grid.column_settings.remember_column_order')}
+    </Checkbox>
+    <Checkbox checked={enableHiddenColumnMemory} onChange={(e) => onEnableHiddenColumnMemoryChange(e.target.checked)}>
+      {translate('data_grid.column_settings.remember_hidden_columns')}
+    </Checkbox>
+    <div style={{ display: 'flex', gap: 8, marginTop: 4 }}>
+      <Button size="small" danger style={{ flex: 1 }} disabled={!canResetOrder} onClick={onResetOrder}>
+        {translate('data_grid.column_settings.reset_order')}
+      </Button>
+      <Button size="small" danger style={{ flex: 1 }} disabled={!canResetHidden} onClick={onResetHidden}>
+        {translate('data_grid.column_settings.reset_hidden')}
+      </Button>
+    </div>
+  </div>
+);
+
+export default DataGridColumnInfoPopoverContent;
--- a/frontend/src/components/DataGridColumnQuickFind.tsx
+++ b/frontend/src/components/DataGridColumnQuickFind.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import { AutoComplete, Input, Tooltip } from 'antd';
+import { SearchOutlined } from '@ant-design/icons';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+export type DataGridColumnQuickFindTranslate = (key: string, params?: I18nParams) => string;
+
+export interface DataGridColumnQuickFindProps {
+  isV2Ui: boolean;
+  darkMode: boolean;
+  inputProps?: Record<string, unknown>;
+  value: string;
+  options: Array<{ value: string; label?: React.ReactNode }>;
+  hasTarget: boolean;
+  translate?: DataGridColumnQuickFindTranslate;
+  onChange: (value: string) => void;
+  onSubmit: (value?: string) => void;
+}
+
+const DataGridColumnQuickFind: React.FC<DataGridColumnQuickFindProps> = ({
+  isV2Ui,
+  inputProps,
+  value,
+  options,
+  translate = defaultTranslate,
+  onChange,
+  onSubmit,
+}) => {
+  const legacyDropdownOpen = !isV2Ui && String(value || '').trim().length > 0 && options.length > 0;
+
+  return (
+    <Tooltip title={translate('data_grid.column_quick_find.tooltip')}>
+      <div
+        data-grid-column-quick-find="true"
+        className={isV2Ui ? 'gn-v2-data-grid-column-quick-find' : undefined}
+        style={isV2Ui ? undefined : { display: 'flex', alignItems: 'center', minWidth: 0, width: '100%', height: 32 }}
+      >
+        <div
+          className={isV2Ui ? 'gn-v2-data-grid-column-quick-find-row' : undefined}
+          style={isV2Ui ? undefined : { display: 'flex', alignItems: 'center', gap: 8, minWidth: 0, width: '100%', flexWrap: 'nowrap', height: 32 }}
+        >
+          <div className={isV2Ui ? 'gn-v2-data-grid-column-quick-find-field' : undefined} style={isV2Ui ? undefined : { display: 'flex', alignItems: 'center', height: 32 }}>
+            <AutoComplete
+              className={isV2Ui ? 'gn-v2-data-grid-column-quick-find-autocomplete' : undefined}
+              options={options}
+              value={value}
+              open={isV2Ui ? undefined : legacyDropdownOpen}
+              onChange={onChange}
+              onSelect={(nextValue) => {
+                onChange(nextValue);
+                onSubmit(nextValue);
+              }}
+              filterOption={false}
+              popupMatchSelectWidth={280}
+            >
+              <Input
+                {...inputProps}
+                allowClear
+                size="small"
+                variant="borderless"
+                prefix={<SearchOutlined />}
+                placeholder={translate('data_grid.column_quick_find.placeholder')}
+                value={value}
+                onChange={(event) => onChange(event.target.value)}
+                onPressEnter={() => onSubmit(value)}
+                style={isV2Ui ? undefined : { width: 168, height: 32 }}
+              />
+            </AutoComplete>
+          </div>
+        </div>
+      </div>
+    </Tooltip>
+  );
+};
+
+export default DataGridColumnQuickFind;
--- a/frontend/src/components/DataGridColumnTitle.test.tsx
+++ b/frontend/src/components/DataGridColumnTitle.test.tsx
@@ -0,0 +1,114 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { describe, expect, it, vi } from 'vitest';
+
+import DataGridColumnTitle from './DataGridColumnTitle';
+
+vi.mock('antd', () => ({
+  Tooltip: ({ children, title }: { children: React.ReactNode; title?: React.ReactNode }) => (
+    <>
+      <div data-testid="tooltip-title">{title}</div>
+      {children}
+    </>
+  ),
+}));
+
+describe('DataGridColumnTitle', () => {
+  it('marks v2 table headers as single-line when column type and comment rows are hidden', () => {
+    const markup = renderToStaticMarkup(
+      <DataGridColumnTitle
+        columnName="id"
+        showColumnType={false}
+        showColumnComment={false}
+        metaFontSize={11}
+        columnMetaHintColor="#999"
+        columnMetaTooltipColor="#fff"
+        darkMode={false}
+      />,
+    );
+
+    expect(markup).toContain('data-grid-column-title-single-line="true"');
+    expect(markup).not.toContain('gn-v2-column-title-type');
+    expect(markup).not.toContain('gn-v2-column-title-comment');
+  });
+
+  it('renders column type and comment rows when enabled', () => {
+    const markup = renderToStaticMarkup(
+      <DataGridColumnTitle
+        columnName="id"
+        columnMeta={{ type: 'bigint', comment: '主键 ID' }}
+        showColumnType
+        showColumnComment
+        metaFontSize={11}
+        columnMetaHintColor="#999"
+        columnMetaTooltipColor="#fff"
+        darkMode={false}
+      />,
+    );
+
+    expect(markup).toContain('class="gn-v2-column-title"');
+    expect(markup).toContain('class="gn-v2-column-title-type"');
+    expect(markup).toContain('bigint');
+    expect(markup).toContain('class="gn-v2-column-title-comment"');
+    expect(markup).toContain('主键 ID');
+    expect(markup).toContain('flex-direction:column');
+    expect(markup).toContain('align-items:flex-start');
+  });
+
+  it('renders foreign-key jump affordance when reference target exists', () => {
+    const markup = renderToStaticMarkup(
+      <DataGridColumnTitle
+        columnName="customer_id"
+        foreignKeyTarget={{ refTableName: 'customers', refColumnName: 'id' }}
+        showColumnType={false}
+        showColumnComment={false}
+        metaFontSize={11}
+        columnMetaHintColor="#999"
+        columnMetaTooltipColor="#fff"
+        darkMode={false}
+      />,
+    );
+
+    expect(markup).toContain('data-grid-fk-jump="true"');
+    expect(markup).toContain('data-ref-table-name="customers"');
+  });
+
+  it('uses translated tooltip wrappers while preserving raw metadata values', () => {
+    const translate = vi.fn((key: string, params?: Record<string, unknown>) => {
+      if (key === 'data_grid.column.type_tooltip') return `TYPE ${String(params?.type)}`;
+      if (key === 'data_grid.column.comment_tooltip') return `COMMENT ${String(params?.comment)}`;
+      if (key === 'data_grid.column.foreign_key_tooltip') return `FK ${String(params?.target)}`;
+      if (key === 'data_grid.column.foreign_key_jump_title') return `JUMP ${String(params?.tableName)}`;
+      return key;
+    });
+
+    const markup = renderToStaticMarkup(
+      <DataGridColumnTitle
+        columnName="account_id"
+        columnMeta={{ type: 'uuid', comment: '账户编号' }}
+        foreignKeyTarget={{ refTableName: 'public.users', refColumnName: 'id' }}
+        showColumnType
+        showColumnComment
+        metaFontSize={11}
+        columnMetaHintColor="#999"
+        columnMetaTooltipColor="#fff"
+        darkMode={false}
+        translate={translate}
+      />,
+    );
+
+    expect(markup).toContain('TYPE uuid');
+    expect(markup).toContain('COMMENT 账户编号');
+    expect(markup).toContain('FK public.users.id');
+    expect(markup).toContain('title="JUMP public.users"');
+    expect(markup).not.toContain('类型：uuid');
+    expect(markup).not.toContain('备注：账户编号');
+    expect(markup).not.toContain('外键：public.users.id');
+    expect(markup).not.toContain('跳转到外键表：public.users');
+
+    expect(translate).toHaveBeenCalledWith('data_grid.column.type_tooltip', { type: 'uuid' });
+    expect(translate).toHaveBeenCalledWith('data_grid.column.comment_tooltip', { comment: '账户编号' });
+    expect(translate).toHaveBeenCalledWith('data_grid.column.foreign_key_tooltip', { target: 'public.users.id' });
+    expect(translate).toHaveBeenCalledWith('data_grid.column.foreign_key_jump_title', { tableName: 'public.users' });
+  });
+});
--- a/frontend/src/components/DataGridColumnTitle.tsx
+++ b/frontend/src/components/DataGridColumnTitle.tsx
@@ -0,0 +1,182 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { LinkOutlined } from '@ant-design/icons';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+export type DataGridColumnTitleTranslate = (key: string, params?: I18nParams) => string;
+
+export interface DataGridColumnTitleProps {
+  columnName: string;
+  columnMeta?: {
+    type?: string;
+    comment?: string;
+  } | null;
+  foreignKeyTarget?: {
+    refTableName?: string;
+    refColumnName?: string;
+  } | null;
+  showColumnType: boolean;
+  showColumnComment: boolean;
+  metaFontSize: number;
+  columnMetaHintColor: string;
+  columnMetaTooltipColor: string;
+  darkMode: boolean;
+  highlighted?: boolean;
+  translate?: DataGridColumnTitleTranslate;
+  onOpenForeignKey?: () => void;
+}
+
+const DataGridColumnTitle: React.FC<DataGridColumnTitleProps> = ({
+  columnName,
+  columnMeta,
+  foreignKeyTarget,
+  showColumnType,
+  showColumnComment,
+  metaFontSize,
+  columnMetaHintColor,
+  columnMetaTooltipColor,
+  darkMode,
+  highlighted = false,
+  translate = defaultTranslate,
+  onOpenForeignKey,
+}) => {
+  const normalizedName = String(columnName || '');
+  const columnType = String(columnMeta?.type || '').trim();
+  const columnComment = String(columnMeta?.comment || '').trim();
+  const refTableName = String(foreignKeyTarget?.refTableName || '').trim();
+  const refColumnName = String(foreignKeyTarget?.refColumnName || '').trim();
+  const shouldShowColumnType = showColumnType && columnType.length > 0;
+  const shouldShowColumnComment = showColumnComment && columnComment.length > 0;
+  const isSingleLineColumnTitle = !shouldShowColumnType && !shouldShowColumnComment;
+
+  const hoverLines: string[] = [];
+  if (columnType) hoverLines.push(translate('data_grid.column.type_tooltip', { type: columnType }));
+  if (columnComment) hoverLines.push(translate('data_grid.column.comment_tooltip', { comment: columnComment }));
+  if (refTableName) {
+    const refColumnText = refColumnName ? `.${refColumnName}` : '';
+    hoverLines.push(translate('data_grid.column.foreign_key_tooltip', { target: `${refTableName}${refColumnText}` }));
+  }
+
+  const fieldLabel = refTableName ? (
+    <button
+      type="button"
+      data-grid-fk-jump="true"
+      data-column-name={normalizedName}
+      data-ref-table-name={refTableName}
+      title={translate('data_grid.column.foreign_key_jump_title', { tableName: refTableName })}
+      onClick={(event) => {
+        event.preventDefault();
+        event.stopPropagation();
+        onOpenForeignKey?.();
+      }}
+      onPointerDown={(event) => event.stopPropagation()}
+      style={{
+        display: 'inline-flex',
+        alignItems: 'center',
+        gap: 4,
+        minWidth: 0,
+        maxWidth: '100%',
+        padding: 0,
+        border: 0,
+        background: 'transparent',
+        color: 'inherit',
+        font: 'inherit',
+        lineHeight: 'inherit',
+        cursor: 'pointer',
+      }}
+    >
+      <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', minWidth: 0 }}>
+        {normalizedName}
+      </span>
+      <LinkOutlined style={{ fontSize: metaFontSize + 1, color: columnMetaHintColor, flex: 'none' }} />
+    </button>
+  ) : (
+    <span style={{ whiteSpace: 'nowrap' }}>{normalizedName}</span>
+  );
+
+  const titleNode = (
+    <div
+      className={isSingleLineColumnTitle ? 'gn-v2-column-title is-single-line' : 'gn-v2-column-title'}
+      data-grid-column-highlighted={highlighted ? 'true' : undefined}
+      data-column-name={normalizedName}
+      data-grid-column-title-single-line={isSingleLineColumnTitle ? 'true' : undefined}
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        alignItems: 'flex-start',
+        justifyContent: 'center',
+        minWidth: 0,
+        maxWidth: '100%',
+        lineHeight: 1.2,
+        borderRadius: highlighted ? 8 : undefined,
+        background: highlighted ? (darkMode ? 'rgba(250, 173, 20, 0.18)' : 'rgba(250, 173, 20, 0.16)') : undefined,
+        boxShadow: highlighted ? `inset 0 0 0 1px ${darkMode ? 'rgba(250, 173, 20, 0.5)' : 'rgba(250, 173, 20, 0.55)'}` : undefined,
+        padding: highlighted ? '4px 6px' : undefined,
+        transition: 'background 160ms ease, box-shadow 160ms ease',
+      }}
+    >
+      {fieldLabel}
+      {shouldShowColumnType && (
+        <span
+          className="gn-v2-column-title-type"
+          style={{
+            marginTop: 2,
+            fontSize: metaFontSize,
+            color: columnMetaHintColor,
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+            maxWidth: '100%',
+          }}
+        >
+          {columnType}
+        </span>
+      )}
+      {shouldShowColumnComment && (
+        <span
+          className="gn-v2-column-title-comment"
+          style={{
+            marginTop: 2,
+            fontSize: metaFontSize,
+            color: columnMetaHintColor,
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+            maxWidth: '100%',
+          }}
+        >
+          {columnComment}
+        </span>
+      )}
+    </div>
+  );
+
+  if (hoverLines.length === 0) {
+    return titleNode;
+  }
+
+  return (
+    <Tooltip
+      title={(
+        <pre
+          style={{
+            maxHeight: 260,
+            overflow: 'auto',
+            margin: 0,
+            fontSize: 12,
+            whiteSpace: 'pre-wrap',
+            color: darkMode ? columnMetaTooltipColor : '#fff',
+          }}
+        >
+          {hoverLines.join('\n')}
+        </pre>
+      )}
+      styles={{ root: { maxWidth: 640 } }}
+      {...(!darkMode ? { color: 'rgba(0, 0, 0, 0.82)' } : {})}
+    >
+      <span style={{ display: 'inline-flex', maxWidth: '100%' }}>{titleNode}</span>
+    </Tooltip>
+  );
+};
+
+export default DataGridColumnTitle;
--- a/frontend/src/components/DataGridLegacyCellContextMenu.tsx
+++ b/frontend/src/components/DataGridLegacyCellContextMenu.tsx
@@ -0,0 +1,226 @@
+import React from 'react';
+import { createPortal } from 'react-dom';
+import { CopyOutlined, EditOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons';
+import { t } from '../i18n';
+
+interface CellContextMenuState {
+  visible: boolean;
+  x: number;
+  y: number;
+  record: Record<string, any> | null;
+  dataIndex: string;
+}
+
+interface DataGridLegacyCellContextMenuProps {
+  visible: boolean;
+  darkMode: boolean;
+  bgContextMenu: string;
+  cellContextMenu: CellContextMenuState;
+  canModifyData: boolean;
+  copiedRowsForPasteLength: number;
+  selectedRowKeysLength: number;
+  copiedCellPatchAvailable: boolean;
+  supportsCopyInsert: boolean;
+  translate?: (key: string, params?: Record<string, unknown>) => string;
+  onClose: () => void;
+  onCopyFieldName: () => void;
+  onCopyRowData: () => void;
+  onCopyRowForPaste: () => void;
+  onPasteCopiedRowsAsNew: () => void;
+  onSetNull: () => void;
+  onEditRow: () => void;
+  onFillToSelected: () => void;
+  onPasteCopiedColumns: () => void;
+  onCopyInsert: () => void;
+  onCopyUpdate: () => void;
+  onCopyDelete: () => void;
+  onCopyJson: () => void;
+  onCopyCsv: () => void;
+  onCopyMarkdown: () => void;
+  onExportCsv: () => void;
+  onExportXlsx: () => void;
+  onExportJson: () => void;
+  onExportHtml: () => void;
+}
+
+const baseItemStyle: React.CSSProperties = {
+  padding: '8px 12px',
+  cursor: 'pointer',
+  transition: 'background 0.2s',
+};
+
+const separatorStyle = (darkMode: boolean): React.CSSProperties => ({
+  height: 1,
+  background: darkMode ? '#303030' : '#f0f0f0',
+  margin: '4px 0',
+});
+
+const fallbackTranslate = (key: string, params?: Record<string, unknown>) => (
+  t(key, params as Parameters<typeof t>[1])
+);
+
+const DataGridLegacyCellContextMenu: React.FC<DataGridLegacyCellContextMenuProps> = ({
+  visible,
+  darkMode,
+  bgContextMenu,
+  cellContextMenu,
+  canModifyData,
+  copiedRowsForPasteLength,
+  selectedRowKeysLength,
+  copiedCellPatchAvailable,
+  supportsCopyInsert,
+  translate = fallbackTranslate,
+  onClose,
+  onCopyFieldName,
+  onCopyRowData,
+  onCopyRowForPaste,
+  onPasteCopiedRowsAsNew,
+  onSetNull,
+  onEditRow,
+  onFillToSelected,
+  onPasteCopiedColumns,
+  onCopyInsert,
+  onCopyUpdate,
+  onCopyDelete,
+  onCopyJson,
+  onCopyCsv,
+  onCopyMarkdown,
+  onExportCsv,
+  onExportXlsx,
+  onExportJson,
+  onExportHtml,
+}) => {
+  if (!visible) {
+    return null;
+  }
+
+  const hoverBg = darkMode ? '#303030' : '#f5f5f5';
+  const canFillRows = selectedRowKeysLength > 0;
+  const canPasteRows = copiedRowsForPasteLength > 0;
+
+  const makeHoverHandlers = (enabled = true) => ({
+    onMouseEnter: (e: React.MouseEvent<HTMLDivElement>) => {
+      if (enabled) e.currentTarget.style.background = hoverBg;
+    },
+    onMouseLeave: (e: React.MouseEvent<HTMLDivElement>) => {
+      e.currentTarget.style.background = 'transparent';
+    },
+  });
+
+  const closeAfter = (callback: () => void) => () => {
+    callback();
+    onClose();
+  };
+
+  return createPortal(
+    <div
+      data-grid-legacy-cell-context-menu="true"
+      style={{
+        position: 'fixed',
+        left: cellContextMenu.x,
+        top: cellContextMenu.y,
+        zIndex: 10000,
+        background: bgContextMenu,
+        border: darkMode ? '1px solid #303030' : '1px solid #d9d9d9',
+        borderRadius: 4,
+        boxShadow: '0 2px 8px rgba(0,0,0,0.15)',
+        minWidth: 160,
+        maxHeight: `calc(100vh - ${cellContextMenu.y}px - 8px)`,
+        overflowY: 'auto',
+        color: darkMode ? '#fff' : 'rgba(0, 0, 0, 0.88)',
+      }}
+      onClick={(e) => e.stopPropagation()}
+    >
+      <div style={baseItemStyle} {...makeHoverHandlers()} onClick={onCopyFieldName}>
+        <CopyOutlined style={{ marginRight: 8 }} />
+        {translate('data_grid.context_menu.copy_field_name')}
+      </div>
+      <div style={separatorStyle(darkMode)} />
+      {canModifyData && (
+        <>
+          <div style={baseItemStyle} {...makeHoverHandlers()} onClick={onSetNull}>
+            {translate('data_grid.batch_fill.set_null')}
+          </div>
+          <div style={baseItemStyle} {...makeHoverHandlers()} onClick={onEditRow}>
+            <EditOutlined style={{ marginRight: 8 }} />
+            {translate('data_grid.context_menu.edit_row')}
+          </div>
+          <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onCopyRowForPaste)}>
+            <CopyOutlined style={{ marginRight: 8 }} />
+            {translate('data_grid.context_menu.copy_row_as_new')}
+          </div>
+          <div
+            style={{
+              ...baseItemStyle,
+              cursor: canPasteRows ? 'pointer' : 'not-allowed',
+              opacity: canPasteRows ? 1 : 0.5,
+            }}
+            {...makeHoverHandlers(canPasteRows)}
+            onClick={() => {
+              if (canPasteRows) {
+                onPasteCopiedRowsAsNew();
+                onClose();
+              }
+            }}
+          >
+            <VerticalAlignBottomOutlined style={{ marginRight: 8 }} />
+            {canPasteRows
+              ? translate('data_grid.context_menu.paste_row_as_new_count', { count: copiedRowsForPasteLength })
+              : translate('data_grid.context_menu.paste_row_as_new')}
+          </div>
+          <div
+            style={{
+              ...baseItemStyle,
+              cursor: canFillRows ? 'pointer' : 'not-allowed',
+              opacity: canFillRows ? 1 : 0.5,
+            }}
+            {...makeHoverHandlers(canFillRows)}
+            onClick={() => {
+              if (canFillRows) onFillToSelected();
+            }}
+          >
+            <VerticalAlignBottomOutlined style={{ marginRight: 8 }} />
+            {translate('data_grid.context_menu.fill_to_selected_rows', { count: selectedRowKeysLength })}
+          </div>
+          <div
+            style={{
+              ...baseItemStyle,
+              cursor: copiedCellPatchAvailable ? 'pointer' : 'not-allowed',
+              opacity: copiedCellPatchAvailable ? 1 : 0.5,
+            }}
+            {...makeHoverHandlers(copiedCellPatchAvailable)}
+            onClick={() => {
+              if (copiedCellPatchAvailable) onPasteCopiedColumns();
+            }}
+          >
+            <VerticalAlignBottomOutlined style={{ marginRight: 8 }} />
+            {translate('data_grid.context_menu.paste_copied_columns')}
+          </div>
+          <div style={separatorStyle(darkMode)} />
+        </>
+      )}
+      <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onCopyRowData)}>
+        <CopyOutlined style={{ marginRight: 8 }} />
+        {translate('data_grid.context_menu.copy_row_data')}
+      </div>
+      {supportsCopyInsert && (
+        <>
+          <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onCopyInsert)}>{translate('data_grid.context_menu.copy_as_insert')}</div>
+          <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onCopyUpdate)}>{translate('data_grid.context_menu.copy_as_update')}</div>
+          <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onCopyDelete)}>{translate('data_grid.context_menu.copy_as_delete')}</div>
+        </>
+      )}
+      <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onCopyJson)}>{translate('data_grid.context_menu.copy_as_json')}</div>
+      <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onCopyCsv)}>{translate('data_grid.context_menu.copy_as_csv')}</div>
+      <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onCopyMarkdown)}>{translate('data_grid.context_menu.copy_as_markdown')}</div>
+      <div style={separatorStyle(darkMode)} />
+      <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onExportCsv)}>{translate('data_grid.context_menu.export_as_csv')}</div>
+      <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onExportXlsx)}>{translate('data_grid.context_menu.export_as_excel')}</div>
+      <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onExportJson)}>{translate('data_grid.context_menu.export_as_json')}</div>
+      <div style={baseItemStyle} {...makeHoverHandlers()} onClick={closeAfter(onExportHtml)}>{translate('data_grid.context_menu.export_as_html')}</div>
+    </div>,
+    document.body,
+  );
+};
+
+export default DataGridLegacyCellContextMenu;
--- a/frontend/src/components/DataGridModals.tsx
+++ b/frontend/src/components/DataGridModals.tsx
@@ -0,0 +1,325 @@
+import React from 'react';
+import { Button, Checkbox, DatePicker, Form, Input, Modal, TimePicker } from 'antd';
+import dayjs from 'dayjs';
+import { CopyOutlined } from '@ant-design/icons';
+import Editor from './MonacoEditor';
+import {
+  TEMPORAL_FORMATS,
+  getTemporalPickerType,
+  type TemporalPickerType,
+} from './dataGridTemporal';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+export type DataGridModalsTranslate = (key: string, params?: I18nParams) => string;
+
+type ColumnMeta = {
+  type: string;
+  comment: string;
+};
+
+export interface DataGridRowEditorField {
+  columnName: string;
+  sample: string;
+  placeholder?: string;
+  isJson: boolean;
+  useTextArea: boolean;
+  pickerType?: TemporalPickerType;
+  isTemporalValue: boolean;
+  isWritable: boolean;
+}
+
+export interface DataGridModalsProps {
+  tableName?: string;
+  darkMode: boolean;
+  translate?: DataGridModalsTranslate;
+  displayColumnNames: string[];
+  rowEditorOpen: boolean;
+  rowEditorRowKey: string;
+  rowEditorForm: any;
+  rowEditorFields: DataGridRowEditorField[];
+  onCloseRowEditor: () => void;
+  onApplyRowEditor: () => void;
+  onOpenRowEditorFieldEditor: (columnName: string) => void;
+  cellEditorOpen: boolean;
+  cellEditorMeta: { record: Record<string, unknown>; dataIndex: string; title: string } | null;
+  cellEditorIsJson: boolean;
+  cellEditorValue: string;
+  onCloseCellEditor: () => void;
+  onFormatJsonInEditor: () => void;
+  onSaveCellEditor: () => void;
+  onCellEditorValueChange: (value: string) => void;
+  batchEditModalOpen: boolean;
+  selectedCellsSize: number;
+  batchEditSetNull: boolean;
+  batchEditValue: string;
+  onCloseBatchEditModal: () => void;
+  onApplyBatchFill: () => void;
+  onBatchEditSetNullChange: (checked: boolean) => void;
+  onBatchEditValueChange: (value: string) => void;
+  jsonEditorOpen: boolean;
+  jsonEditorValue: string;
+  onCloseJsonEditor: () => void;
+  onFormatJsonEditor: () => void;
+  onApplyJsonEditor: () => void;
+  onJsonEditorValueChange: (value: string) => void;
+  ddlModalOpen: boolean;
+  ddlLoading: boolean;
+  ddlText: string;
+  onCloseDdlModal: () => void;
+  onCopyDdl: () => void;
+}
+
+const DataGridModals: React.FC<DataGridModalsProps> = ({
+  tableName,
+  darkMode,
+  translate = defaultTranslate,
+  rowEditorOpen,
+  rowEditorRowKey,
+  rowEditorForm,
+  rowEditorFields,
+  onCloseRowEditor,
+  onApplyRowEditor,
+  onOpenRowEditorFieldEditor,
+  cellEditorOpen,
+  cellEditorMeta,
+  cellEditorIsJson,
+  cellEditorValue,
+  onCloseCellEditor,
+  onFormatJsonInEditor,
+  onSaveCellEditor,
+  onCellEditorValueChange,
+  batchEditModalOpen,
+  selectedCellsSize,
+  batchEditSetNull,
+  batchEditValue,
+  onCloseBatchEditModal,
+  onApplyBatchFill,
+  onBatchEditSetNullChange,
+  onBatchEditValueChange,
+  jsonEditorOpen,
+  jsonEditorValue,
+  onCloseJsonEditor,
+  onFormatJsonEditor,
+  onApplyJsonEditor,
+  onJsonEditorValueChange,
+  ddlModalOpen,
+  ddlLoading,
+  ddlText,
+  onCloseDdlModal,
+  onCopyDdl,
+}) => (
+  <>
+    <Modal
+      title={translate('data_grid.row_editor.title')}
+      open={rowEditorOpen}
+      onCancel={onCloseRowEditor}
+      width={980}
+      destroyOnHidden
+      maskClosable={false}
+      footer={[
+        <Button key="cancel" onClick={onCloseRowEditor}>{translate('common.cancel')}</Button>,
+        <Button key="ok" type="primary" onClick={onApplyRowEditor}>{translate('data_grid.action.apply')}</Button>,
+      ]}
+    >
+      <div style={{ marginBottom: 8, color: '#888', fontSize: 12, display: 'flex', justifyContent: 'space-between', gap: 8 }}>
+        <span>{tableName ? `${tableName}` : ''}</span>
+        <span>{rowEditorRowKey ? `rowKey: ${rowEditorRowKey}` : ''}</span>
+      </div>
+      <Form form={rowEditorForm} layout="vertical">
+        <div className="custom-scrollbar" style={{ maxHeight: '62vh', overflow: 'auto', paddingRight: 8 }}>
+          {rowEditorFields.map((field) => (
+            <Form.Item key={field.columnName} label={field.columnName} style={{ marginBottom: 12 }}>
+              <div style={{ display: 'flex', gap: 8, alignItems: 'flex-start' }}>
+                <Form.Item name={field.columnName} noStyle>
+                  {field.isTemporalValue && field.pickerType ? (
+                    field.pickerType === 'time' ? (
+                      <TimePicker
+                        style={{ flex: 1, width: '100%' }}
+                        format={TEMPORAL_FORMATS[field.pickerType]}
+                        placeholder={field.placeholder}
+                        needConfirm={false}
+                        disabled={!field.isWritable}
+                      />
+                    ) : field.pickerType === 'datetime' ? (
+                      <DatePicker
+                        style={{ flex: 1, width: '100%' }}
+                        showTime
+                        format={TEMPORAL_FORMATS[field.pickerType]}
+                        placeholder={field.placeholder}
+                        needConfirm
+                        disabled={!field.isWritable}
+                      />
+                    ) : (
+                      <DatePicker
+                        style={{ flex: 1, width: '100%' }}
+                        format={TEMPORAL_FORMATS[field.pickerType]}
+                        picker={field.pickerType as any}
+                        placeholder={field.placeholder}
+                        needConfirm={false}
+                        disabled={!field.isWritable}
+                      />
+                    )
+                  ) : field.useTextArea ? (
+                    <Input.TextArea
+                      style={{ flex: 1 }}
+                      autoSize={{ minRows: field.isJson ? 4 : 1, maxRows: 10 }}
+                      placeholder={field.placeholder}
+                      disabled={!field.isWritable}
+                    />
+                  ) : (
+                    <Input style={{ flex: 1 }} placeholder={field.placeholder} disabled={!field.isWritable} />
+                  )}
+                </Form.Item>
+                <Button
+                  size="small"
+                  onClick={() => onOpenRowEditorFieldEditor(field.columnName)}
+                  title={translate('data_grid.row_editor.popup_edit')}
+                  disabled={!field.isWritable}
+                >
+                  ...
+                </Button>
+              </div>
+            </Form.Item>
+          ))}
+        </div>
+      </Form>
+    </Modal>
+
+    <Modal
+      title={
+        cellEditorMeta
+          ? translate('data_grid.cell_editor.title_with_column', { column: cellEditorMeta.title })
+          : translate('data_grid.cell_editor.title')
+      }
+      open={cellEditorOpen}
+      onCancel={onCloseCellEditor}
+      destroyOnHidden
+      width={960}
+      maskClosable={false}
+      footer={[
+        <Button key="format" onClick={onFormatJsonInEditor} disabled={!cellEditorIsJson}>{translate('data_grid.json_editor.format')}</Button>,
+        <Button key="cancel" onClick={onCloseCellEditor}>{translate('common.cancel')}</Button>,
+        <Button key="ok" type="primary" onClick={onSaveCellEditor}>{translate('common.save')}</Button>,
+      ]}
+    >
+      <div style={{ marginBottom: 8, color: '#888', fontSize: 12 }}>
+        {cellEditorMeta ? `${tableName || ''}${tableName ? '.' : ''}${cellEditorMeta.dataIndex}` : ''}
+      </div>
+      {cellEditorOpen && (
+        <Editor
+          height="56vh"
+          language={cellEditorIsJson ? 'json' : 'plaintext'}
+          theme={darkMode ? 'transparent-dark' : 'transparent-light'}
+          value={cellEditorValue}
+          onChange={(value) => onCellEditorValueChange(value || '')}
+          options={{
+            minimap: { enabled: false },
+            scrollBeyondLastLine: false,
+            wordWrap: 'on',
+            fontSize: 14,
+            tabSize: 2,
+            automaticLayout: true,
+          }}
+        />
+      )}
+    </Modal>
+
+    <Modal
+      title={translate('data_grid.batch_fill.title', { count: selectedCellsSize })}
+      open={batchEditModalOpen}
+      onCancel={onCloseBatchEditModal}
+      width={500}
+      footer={[
+        <Button key="cancel" onClick={onCloseBatchEditModal}>{translate('common.cancel')}</Button>,
+        <Button key="ok" type="primary" onClick={onApplyBatchFill}>{translate('data_grid.action.apply')}</Button>,
+      ]}
+    >
+      <div style={{ marginBottom: 16 }}>
+        <Checkbox checked={batchEditSetNull} onChange={(event) => onBatchEditSetNullChange(event.target.checked)}>
+          {translate('data_grid.batch_fill.set_null')}
+        </Checkbox>
+      </div>
+      {!batchEditSetNull && (
+        <Input.TextArea
+          value={batchEditValue}
+          onChange={(event) => onBatchEditValueChange(event.target.value)}
+          placeholder={translate('data_grid.batch_fill.value_placeholder')}
+          autoSize={{ minRows: 3, maxRows: 10 }}
+          autoFocus
+        />
+      )}
+    </Modal>
+
+    <Modal
+      title={translate('data_grid.json_editor.title')}
+      open={jsonEditorOpen}
+      onCancel={onCloseJsonEditor}
+      destroyOnHidden
+      width={980}
+      maskClosable={false}
+      footer={[
+        <Button key="format" onClick={onFormatJsonEditor}>{translate('data_grid.json_editor.format')}</Button>,
+        <Button key="cancel" onClick={onCloseJsonEditor}>{translate('common.cancel')}</Button>,
+        <Button key="ok" type="primary" onClick={onApplyJsonEditor}>{translate('data_grid.json_editor.apply_changes')}</Button>,
+      ]}
+    >
+      <div style={{ marginBottom: 8, color: '#888', fontSize: 12 }}>
+        {translate('data_grid.json_editor.description')}
+      </div>
+      {jsonEditorOpen && (
+        <Editor
+          height="56vh"
+          language="json"
+          theme={darkMode ? 'transparent-dark' : 'transparent-light'}
+          value={jsonEditorValue}
+          onChange={(value) => onJsonEditorValueChange(value || '')}
+          options={{
+            readOnly: false,
+            minimap: { enabled: false },
+            scrollBeyondLastLine: false,
+            wordWrap: 'off',
+            fontSize: 12,
+            tabSize: 2,
+            automaticLayout: true,
+          }}
+        />
+      )}
+    </Modal>
+
+    <Modal
+      title={tableName ? `DDL - ${tableName}` : 'DDL'}
+      open={ddlModalOpen}
+      onCancel={onCloseDdlModal}
+      destroyOnHidden
+      width={960}
+      footer={[
+        <Button key="copy" icon={<CopyOutlined />} onClick={onCopyDdl} disabled={!ddlText.trim()}>
+          {translate('data_grid.ddl.copy')}
+        </Button>,
+        <Button key="close" type="primary" onClick={onCloseDdlModal}>
+          {translate('common.close')}
+        </Button>,
+      ]}
+    >
+      {ddlModalOpen && (
+        <Editor
+          height="56vh"
+          language="sql"
+          theme={darkMode ? 'transparent-dark' : 'transparent-light'}
+          value={ddlLoading ? translate('data_grid.ddl.loading') : ddlText}
+          options={{
+            readOnly: true,
+            minimap: { enabled: false },
+            scrollBeyondLastLine: false,
+            wordWrap: 'off',
+            fontSize: 12,
+            tabSize: 2,
+            automaticLayout: true,
+          }}
+        />
+      )}
+    </Modal>
+  </>
+);
+
+export default DataGridModals;
--- a/frontend/src/components/DataGridPageFind.tsx
+++ b/frontend/src/components/DataGridPageFind.tsx
@@ -0,0 +1,112 @@
+import React from 'react';
+import { Button, Input, Tooltip } from 'antd';
+import { LeftOutlined, RightOutlined, SearchOutlined } from '@ant-design/icons';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+export type DataGridPageFindTranslate = (key: string, params?: I18nParams) => string;
+
+export interface DataGridPageFindProps {
+  isV2Ui: boolean;
+  darkMode: boolean;
+  inputProps?: Record<string, unknown>;
+  pageFindText: string;
+  normalizedPageFindText: string;
+  hasMatches: boolean;
+  activePageFindPosition: number;
+  matchCount: number;
+  occurrenceCount: number;
+  matchedCellCount: number;
+  onPageFindTextChange: (value: string) => void;
+  onCancel: () => void;
+  onNavigatePrevious: () => void;
+  onNavigateNext: () => void;
+  translate?: DataGridPageFindTranslate;
+}
+
+const DataGridPageFind: React.FC<DataGridPageFindProps> = ({
+  isV2Ui,
+  darkMode,
+  inputProps,
+  pageFindText,
+  normalizedPageFindText,
+  hasMatches,
+  activePageFindPosition,
+  matchCount,
+  occurrenceCount,
+  matchedCellCount,
+  onPageFindTextChange,
+  onCancel,
+  onNavigatePrevious,
+  onNavigateNext,
+  translate = defaultTranslate,
+}) => {
+  const summaryText = translate('data_grid.page_find.summary', {
+    occurrences: occurrenceCount,
+    cells: matchedCellCount,
+  });
+
+  return (
+    <Tooltip title={translate('data_grid.page_find.tooltip')}>
+      <div
+        data-grid-page-find="true"
+        className={isV2Ui ? 'gn-v2-data-grid-page-find' : undefined}
+        style={isV2Ui ? undefined : { display: 'flex', alignItems: 'center', gap: 8, minWidth: 0, flexWrap: 'nowrap', height: 32 }}
+      >
+        <Input
+          className={isV2Ui ? 'gn-v2-data-grid-page-find-input' : undefined}
+          {...inputProps}
+          allowClear
+          size="small"
+          variant="borderless"
+          prefix={<SearchOutlined />}
+          placeholder={translate('data_grid.page_find.placeholder')}
+          value={pageFindText}
+          onChange={(event) => onPageFindTextChange(event.target.value)}
+          onKeyDown={(event) => {
+            if (event.key === 'Escape') {
+              event.preventDefault();
+              event.stopPropagation();
+              onCancel();
+            }
+          }}
+          style={isV2Ui ? undefined : { width: 168, height: 32 }}
+        />
+        <Button
+          data-grid-page-find-prev="true"
+          className={isV2Ui ? 'gn-v2-data-grid-page-find-prev' : undefined}
+          size="small"
+          icon={<LeftOutlined />}
+          disabled={!hasMatches}
+          onClick={onNavigatePrevious}
+          style={isV2Ui ? undefined : { height: 32, minWidth: 32, paddingInline: 8 }}
+        />
+        <Button
+          data-grid-page-find-next="true"
+          className={isV2Ui ? 'gn-v2-data-grid-page-find-next' : undefined}
+          size="small"
+          icon={<RightOutlined />}
+          disabled={!hasMatches}
+          onClick={onNavigateNext}
+          style={isV2Ui ? undefined : { height: 32, minWidth: 32, paddingInline: 8 }}
+        />
+        {normalizedPageFindText && (
+          <span
+            aria-live="polite"
+            style={isV2Ui ? undefined : {
+              fontSize: 12,
+              color: darkMode ? '#999' : '#666',
+              lineHeight: 1.4,
+              whiteSpace: 'nowrap',
+              textAlign: 'left',
+              flex: '0 1 auto',
+            }}
+          >
+            {hasMatches ? `${activePageFindPosition} / ${matchCount} · ` : ''}{summaryText}
+          </span>
+        )}
+      </div>
+    </Tooltip>
+  );
+};
+
+export default DataGridPageFind;
--- a/frontend/src/components/DataGridPaginationBar.tsx
+++ b/frontend/src/components/DataGridPaginationBar.tsx
@@ -0,0 +1,173 @@
+import React from 'react';
+import { Button, InputNumber, Pagination, Select } from 'antd';
+import { LeftOutlined, RightOutlined } from '@ant-design/icons';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+interface DataGridPaginationState {
+  current: number;
+  pageSize: number;
+  total: number;
+  totalKnown?: boolean;
+  totalApprox?: boolean;
+  approximateTotal?: number;
+  totalCountLoading?: boolean;
+  totalCountCancelled?: boolean;
+}
+
+export type DataGridPaginationTranslate = (key: string, params?: I18nParams) => string;
+
+export interface DataGridPaginationBarProps {
+  isV2Ui: boolean;
+  pagination?: DataGridPaginationState;
+  paginationV2SummaryText: string;
+  paginationSummaryText: string;
+  paginationControlTotal: number;
+  paginationTotalPages: number;
+  paginationPageSizeOptions: string[];
+  onPageChange?: (page: number, size: number) => void;
+  onPageSizeChange: (value: string) => void;
+  onV2PageStep: (direction: 'previous' | 'next') => void;
+  translate?: DataGridPaginationTranslate;
+}
+
+const DataGridPaginationBar: React.FC<DataGridPaginationBarProps> = ({
+  isV2Ui,
+  pagination,
+  paginationV2SummaryText,
+  paginationSummaryText,
+  paginationControlTotal,
+  paginationTotalPages,
+  paginationPageSizeOptions,
+  onPageChange,
+  onPageSizeChange,
+  onV2PageStep,
+  translate = defaultTranslate,
+}) => {
+  const [jumpPage, setJumpPage] = React.useState<number | null>(pagination?.current ?? null);
+
+  React.useEffect(() => {
+    setJumpPage(pagination?.current ?? null);
+  }, [pagination?.current]);
+
+  if (!pagination) {
+    return null;
+  }
+
+  const maxJumpPage = Math.max(1, paginationTotalPages);
+  const normalizedJumpPage = Number.isFinite(Number(jumpPage)) && Number(jumpPage) > 0
+    ? Math.min(maxJumpPage, Math.max(1, Math.trunc(Number(jumpPage))))
+    : null;
+  const jumpDisabled = !onPageChange || normalizedJumpPage === null || normalizedJumpPage === pagination.current;
+  const submitJumpPage = () => {
+    if (!onPageChange || normalizedJumpPage === null) return;
+    if (normalizedJumpPage === pagination.current) return;
+    onPageChange(normalizedJumpPage, pagination.pageSize);
+  };
+  const jumpPageControl = (
+    <div className="data-grid-pagination-jump" data-grid-pagination-jump="true">
+      <span className="data-grid-pagination-jump-label">{translate('data_grid.pagination.jump_label')}</span>
+      <InputNumber
+        size="small"
+        min={1}
+        max={maxJumpPage}
+        precision={0}
+        controls={false}
+        value={jumpPage}
+        onChange={(value) => setJumpPage(typeof value === 'number' && Number.isFinite(value) ? value : null)}
+        onPressEnter={submitJumpPage}
+        className="data-grid-pagination-jump-input"
+        aria-label={translate('data_grid.pagination.jump_aria')}
+        disabled={!onPageChange}
+      />
+      <Button
+        size="small"
+        className="data-grid-pagination-jump-button"
+        disabled={jumpDisabled}
+        onClick={submitJumpPage}
+      >
+        {translate('data_grid.pagination.jump_action')}
+      </Button>
+    </div>
+  );
+
+  return (
+    <div
+      className={`${isV2Ui ? 'gn-v2-data-grid-pagination-wrap ' : ''}data-grid-pagination-wrap`}
+      style={isV2Ui ? undefined : { padding: 0, borderTop: 'none', display: 'flex', justifyContent: 'flex-start' }}
+    >
+      {isV2Ui ? (
+        <div className="data-grid-pagination-shell" data-grid-v2-pagination="true">
+          <div className="data-grid-pagination-summary" aria-live="polite">
+            <span className="data-grid-pagination-summary-value">{paginationV2SummaryText}</span>
+          </div>
+          <Button
+            data-grid-v2-pagination-prev="true"
+            size="small"
+            icon={<LeftOutlined />}
+            disabled={!onPageChange || pagination.current <= 1}
+            onClick={() => onV2PageStep('previous')}
+          />
+          <div className="data-grid-pagination-page-chip" data-grid-v2-page-chip="true">
+            <strong>{pagination.current}</strong>
+            <span>/</span>
+            <span>{paginationTotalPages}</span>
+          </div>
+          <Button
+            data-grid-v2-pagination-next="true"
+            size="small"
+            icon={<RightOutlined />}
+            disabled={!onPageChange || pagination.current >= paginationTotalPages}
+            onClick={() => onV2PageStep('next')}
+          />
+          {jumpPageControl}
+          <Select
+            size="small"
+            popupMatchSelectWidth={false}
+            value={String(pagination.pageSize)}
+            onChange={onPageSizeChange}
+            options={paginationPageSizeOptions.map((value) => ({ value, label: translate('data_grid.pagination.page_size_option', { count: value }) }))}
+            className="data-grid-pagination-size-select"
+            aria-label={translate('data_grid.pagination.page_size_aria')}
+          />
+        </div>
+      ) : (
+        <div className="data-grid-pagination-shell">
+          <div className="data-grid-pagination-summary" aria-live="polite">
+            <span className="data-grid-pagination-kicker">{translate('data_grid.pagination.result_set')}</span>
+            <span className="data-grid-pagination-summary-value">{paginationSummaryText}</span>
+          </div>
+          <Pagination
+            current={pagination.current}
+            pageSize={pagination.pageSize}
+            total={paginationControlTotal}
+            showSizeChanger={false}
+            onChange={onPageChange}
+            showTitle={false}
+            size="small"
+            itemRender={(_page, type, originalElement) => {
+              if (type === 'prev') {
+                return <span className="data-grid-pagination-nav-icon" aria-hidden="true"><LeftOutlined /></span>;
+              }
+              if (type === 'next') {
+                return <span className="data-grid-pagination-nav-icon" aria-hidden="true"><RightOutlined /></span>;
+              }
+              return originalElement;
+            }}
+          />
+          {jumpPageControl}
+          <Select
+            size="small"
+            popupMatchSelectWidth={false}
+            value={String(pagination.pageSize)}
+            onChange={onPageSizeChange}
+            options={paginationPageSizeOptions.map((value) => ({ value, label: translate('data_grid.pagination.page_size_option', { count: value }) }))}
+            className="data-grid-pagination-size-select"
+            aria-label={translate('data_grid.pagination.page_size_aria')}
+          />
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default DataGridPaginationBar;
--- a/frontend/src/components/DataGridPreviewPanel.tsx
+++ b/frontend/src/components/DataGridPreviewPanel.tsx
@@ -0,0 +1,136 @@
+import React from 'react';
+import { Button } from 'antd';
+import Editor from './MonacoEditor';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+type ColumnMeta = {
+  type?: string;
+};
+
+export type DataGridPreviewPanelTranslate = (key: string, params?: I18nParams) => string;
+
+interface DataGridPreviewPanelProps {
+  visible: boolean;
+  isTableSurfaceActive: boolean;
+  darkMode: boolean;
+  focusedCellInfo: { dataIndex: string } | null;
+  dataPanelIsJson: boolean;
+  focusedCellWritable: boolean;
+  dataPanelValue: string;
+  columnMetaMap: Record<string, ColumnMeta>;
+  columnMetaMapByLowerName: Record<string, ColumnMeta>;
+  translate?: DataGridPreviewPanelTranslate;
+  onFormatJson: () => void;
+  onSave: () => void;
+  onValueChange: (value: string) => void;
+  onDirtyChange: (dirty: boolean) => void;
+  isDirtyComparedToOriginal: (value: string) => boolean;
+}
+
+const DataGridPreviewPanel: React.FC<DataGridPreviewPanelProps> = ({
+  visible,
+  isTableSurfaceActive,
+  darkMode,
+  focusedCellInfo,
+  dataPanelIsJson,
+  focusedCellWritable,
+  dataPanelValue,
+  columnMetaMap,
+  columnMetaMapByLowerName,
+  translate = defaultTranslate,
+  onFormatJson,
+  onSave,
+  onValueChange,
+  onDirtyChange,
+  isDirtyComparedToOriginal,
+}) => {
+  if (!visible || !isTableSurfaceActive) {
+    return null;
+  }
+
+  const meta = focusedCellInfo
+    ? (columnMetaMap[focusedCellInfo.dataIndex] || columnMetaMapByLowerName[focusedCellInfo.dataIndex.toLowerCase()])
+    : undefined;
+
+  return (
+    <div
+      data-grid-preview-panel="true"
+      style={{
+        height: 200,
+        borderTop: darkMode ? '1px solid rgba(255,255,255,0.12)' : '1px solid rgba(0,0,0,0.12)',
+        display: 'flex',
+        flexDirection: 'column',
+        background: darkMode ? 'rgba(0,0,0,0.15)' : 'rgba(255,255,255,0.6)',
+        flexShrink: 0,
+      }}
+    >
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          gap: 8,
+          padding: '4px 10px',
+          fontSize: 12,
+          borderBottom: darkMode ? '1px solid rgba(255,255,255,0.06)' : '1px solid rgba(0,0,0,0.06)',
+          flexShrink: 0,
+        }}
+      >
+        <span style={{ color: darkMode ? '#aaa' : '#666', fontWeight: 500 }}>
+          {focusedCellInfo ? focusedCellInfo.dataIndex : translate('data_grid.preview_panel.no_cell_title')}
+        </span>
+        {meta?.type ? <span style={{ color: '#888', fontSize: 11 }}>({meta.type})</span> : null}
+        <div style={{ flex: 1 }} />
+        {dataPanelIsJson && (
+          <Button size="small" onClick={onFormatJson}>{translate('data_grid.json_editor.format')}</Button>
+        )}
+        {focusedCellWritable && (
+          <Button size="small" type="primary" onClick={onSave}>{translate('common.save')}</Button>
+        )}
+      </div>
+      <div style={{ flex: 1, minHeight: 0 }}>
+        {focusedCellInfo ? (
+          <Editor
+            height="100%"
+            gonaviTypography="data"
+            language={dataPanelIsJson ? 'json' : 'plaintext'}
+            theme={darkMode ? 'transparent-dark' : 'transparent-light'}
+            value={dataPanelValue}
+            onChange={(val) => {
+              const newVal = val || '';
+              onValueChange(newVal);
+              onDirtyChange(isDirtyComparedToOriginal(newVal));
+            }}
+            options={{
+              minimap: { enabled: false },
+              scrollBeyondLastLine: false,
+              wordWrap: 'on',
+              tabSize: 2,
+              automaticLayout: true,
+              readOnly: !focusedCellWritable,
+              lineNumbers: 'off',
+              glyphMargin: false,
+              folding: false,
+              lineDecorationsWidth: 4,
+              padding: { top: 6, bottom: 6 },
+            }}
+          />
+        ) : (
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              height: '100%',
+              color: '#999',
+              fontSize: 13,
+            }}
+          >
+            {translate('data_grid.preview_panel.no_cell_description')}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default DataGridPreviewPanel;
--- a/frontend/src/components/DataGridRecordViews.tsx
+++ b/frontend/src/components/DataGridRecordViews.tsx
@@ -0,0 +1,122 @@
+import React from 'react';
+import { Button } from 'antd';
+import Editor from './MonacoEditor';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+export type DataGridRecordViewTranslate = (key: string, params?: I18nParams) => string;
+
+interface DataGridJsonViewProps {
+  darkMode: boolean;
+  rowCount: number;
+  canModifyData: boolean;
+  jsonViewText: string;
+  translate?: DataGridRecordViewTranslate;
+  onOpenJsonEditor: () => void;
+}
+
+export const DataGridJsonView: React.FC<DataGridJsonViewProps> = ({
+  darkMode,
+  rowCount,
+  canModifyData,
+  jsonViewText,
+  translate = defaultTranslate,
+  onOpenJsonEditor,
+}) => (
+  <div style={{ height: '100%', minHeight: 0, display: 'flex', flexDirection: 'column' }}>
+    <div style={{ padding: '8px 10px', borderBottom: darkMode ? '1px solid rgba(255,255,255,0.08)' : '1px solid rgba(0,0,0,0.08)', display: 'flex', alignItems: 'center', gap: 8 }}>
+      <span style={{ fontSize: 12, color: darkMode ? '#999' : '#666' }}>
+        {rowCount === 0
+          ? translate('data_grid.record_view.empty')
+          : translate('data_grid.record_view.json_record_count', { count: rowCount })}
+      </span>
+      {canModifyData && (
+        <Button size="small" type="primary" onClick={onOpenJsonEditor} disabled={rowCount === 0}>
+          {translate('data_grid.record_view.edit_json')}
+        </Button>
+      )}
+    </div>
+    <div style={{ flex: 1, minHeight: 0, padding: '8px 10px 10px 10px' }}>
+      <Editor
+        height="100%"
+        defaultLanguage="json"
+        language="json"
+        theme={darkMode ? 'transparent-dark' : 'transparent-light'}
+        value={jsonViewText}
+        options={{
+          readOnly: true,
+          minimap: { enabled: false },
+          scrollBeyondLastLine: false,
+          wordWrap: 'off',
+          fontSize: 12,
+          tabSize: 2,
+          automaticLayout: true,
+        }}
+      />
+    </div>
+  </div>
+);
+
+interface DataGridTextViewProps {
+  darkMode: boolean;
+  rowCount: number;
+  textRecordIndex: number;
+  canModifyData: boolean;
+  currentTextRow: Record<string, any> | null;
+  displayOutputColumnNames: string[];
+  translate?: DataGridRecordViewTranslate;
+  onPrev: () => void;
+  onNext: () => void;
+  onEditCurrent: () => void;
+  formatTextViewValue: (value: any, columnName?: string) => string;
+}
+
+export const DataGridTextView: React.FC<DataGridTextViewProps> = ({
+  darkMode,
+  rowCount,
+  textRecordIndex,
+  canModifyData,
+  currentTextRow,
+  displayOutputColumnNames,
+  translate = defaultTranslate,
+  onPrev,
+  onNext,
+  onEditCurrent,
+  formatTextViewValue,
+}) => (
+  <div style={{ height: '100%', minHeight: 0, display: 'flex', flexDirection: 'column' }}>
+    <div style={{ padding: '8px 12px', borderBottom: darkMode ? '1px solid rgba(255,255,255,0.08)' : '1px solid rgba(0,0,0,0.08)', display: 'flex', alignItems: 'center', gap: 8 }}>
+      <Button size="small" onClick={onPrev} disabled={rowCount === 0 || textRecordIndex <= 0}>
+        {translate('data_grid.record_view.previous')}
+      </Button>
+      <Button size="small" onClick={onNext} disabled={rowCount === 0 || textRecordIndex >= rowCount - 1}>
+        {translate('data_grid.record_view.next')}
+      </Button>
+      <span style={{ fontSize: 12, color: darkMode ? '#999' : '#666' }}>
+        {rowCount === 0
+          ? translate('data_grid.record_view.empty')
+          : translate('data_grid.record_view.record_position', { current: textRecordIndex + 1, total: rowCount })}
+      </span>
+      {canModifyData && (
+        <Button size="small" type="primary" onClick={onEditCurrent} disabled={rowCount === 0}>
+          {translate('data_grid.record_view.edit_current')}
+        </Button>
+      )}
+    </div>
+    <div className="custom-scrollbar" style={{ flex: 1, minHeight: 0, overflow: 'auto', padding: '8px 12px' }}>
+      {currentTextRow ? displayOutputColumnNames.map((col) => (
+        <div key={col} style={{ display: 'grid', gridTemplateColumns: '240px 1fr', gap: 10, padding: '6px 0', borderBottom: darkMode ? '1px solid rgba(255,255,255,0.06)' : '1px solid rgba(0,0,0,0.06)', alignItems: 'start' }}>
+          <div style={{ fontWeight: 600, color: darkMode ? 'rgba(255,255,255,0.9)' : 'rgba(0,0,0,0.88)', wordBreak: 'break-all' }}>
+            {col} :
+          </div>
+          <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word', color: darkMode ? 'rgba(255,255,255,0.88)' : 'rgba(0,0,0,0.88)' }}>
+            {formatTextViewValue(currentTextRow[col], col)}
+          </div>
+        </div>
+      )) : (
+        <div style={{ fontSize: 12, color: darkMode ? '#999' : '#666', paddingTop: 4 }}>
+          {translate('data_grid.record_view.empty')}
+        </div>
+      )}
+    </div>
+  </div>
+);
--- a/frontend/src/components/DataGridResultViewSwitcher.tsx
+++ b/frontend/src/components/DataGridResultViewSwitcher.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { Segmented } from 'antd';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+type GridViewMode = 'table' | 'json' | 'text' | 'fields' | 'ddl' | 'er';
+
+export type DataGridResultViewTranslate = (key: string, params?: I18nParams) => string;
+
+export interface DataGridResultViewSwitcherProps {
+  isV2Ui: boolean;
+  darkMode: boolean;
+  viewMode: GridViewMode;
+  onViewModeChange: (nextMode: GridViewMode) => void;
+  translate?: DataGridResultViewTranslate;
+}
+
+const DataGridResultViewSwitcher: React.FC<DataGridResultViewSwitcherProps> = ({
+  isV2Ui,
+  darkMode,
+  viewMode,
+  onViewModeChange,
+  translate = defaultTranslate,
+}) => (
+  <div
+    data-grid-view-switcher="true"
+    className={isV2Ui ? 'gn-v2-data-grid-result-switcher' : undefined}
+    style={isV2Ui ? undefined : { display: 'flex', alignItems: 'center', gap: 8 }}
+  >
+    <span style={isV2Ui ? undefined : { fontSize: 12, color: darkMode ? '#999' : '#666' }}>{translate('data_grid.view.result_view')}</span>
+    <Segmented
+      size="small"
+      value={viewMode === 'json' || viewMode === 'text' ? viewMode : 'table'}
+      options={[
+        { label: translate('data_grid.view.table'), value: 'table' },
+        { label: 'JSON', value: 'json' },
+        { label: translate('data_grid.view.text'), value: 'text' },
+      ]}
+      onChange={(value) => onViewModeChange(String(value) as GridViewMode)}
+    />
+  </div>
+);
+
+export default DataGridResultViewSwitcher;
--- a/frontend/src/components/DataGridSecondaryActions.tsx
+++ b/frontend/src/components/DataGridSecondaryActions.tsx
@@ -0,0 +1,218 @@
+import React from 'react';
+import { Button, Popover } from 'antd';
+import {
+  AimOutlined,
+  ConsoleSqlOutlined,
+  EditOutlined,
+  FileTextOutlined,
+  LinkOutlined,
+  TableOutlined,
+} from '@ant-design/icons';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+type GridViewMode = 'table' | 'json' | 'text' | 'fields' | 'ddl' | 'er';
+
+export type DataGridSecondaryActionsTranslate = (key: string, params?: I18nParams) => string;
+
+export interface DataGridSecondaryActionsProps {
+  isV2Ui: boolean;
+  canViewDdl: boolean;
+  viewMode: GridViewMode;
+  ddlLoading: boolean;
+  showColumnComment: boolean;
+  showColumnType: boolean;
+  mergedDisplayCount: number;
+  pendingChangeCount: number;
+  resultViewSwitcher: React.ReactNode;
+  columnInfoSettingContent: React.ReactNode;
+  columnQuickFindContent: React.ReactNode;
+  pageFindContent: React.ReactNode;
+  paginationContent: React.ReactNode;
+  onViewModeChange: (nextMode: GridViewMode) => void;
+  dataPanelOpen: boolean;
+  isTableSurfaceActive: boolean;
+  onToggleDataPanel: () => void;
+  onOpenTableDdl: () => void;
+  translate?: DataGridSecondaryActionsTranslate;
+}
+
+const DataGridSecondaryActions: React.FC<DataGridSecondaryActionsProps> = ({
+  isV2Ui,
+  canViewDdl,
+  viewMode,
+  ddlLoading,
+  showColumnComment,
+  showColumnType,
+  mergedDisplayCount,
+  pendingChangeCount,
+  resultViewSwitcher,
+  columnInfoSettingContent,
+  columnQuickFindContent,
+  pageFindContent,
+  paginationContent,
+  onViewModeChange,
+  dataPanelOpen,
+  isTableSurfaceActive,
+  onToggleDataPanel,
+  onOpenTableDdl,
+  translate = defaultTranslate,
+}) => {
+  if (isV2Ui) {
+    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: 'ddl', label: translate('data_grid.secondary.view_ddl'), icon: <ConsoleSqlOutlined />, disabled: !canViewDdl },
+      { key: 'er', label: translate('data_grid.secondary.er_diagram'), icon: <LinkOutlined /> },
+    ];
+
+    return (
+      <div data-grid-secondary-actions="true" className="gn-v2-data-grid-statusbar">
+        <div className="gn-v2-data-grid-status-main">
+          <div className="gn-v2-data-grid-view-tabs">
+            {viewTabItems.map((item) => (
+              <Button
+                data-grid-ddl-action={item.key === 'ddl' && canViewDdl ? 'true' : undefined}
+                key={item.key}
+                size="small"
+                type={viewMode === item.key || (item.key === 'table' && (viewMode === 'json' || viewMode === 'text')) ? 'primary' : 'text'}
+                icon={item.icon}
+                disabled={item.disabled}
+                loading={item.key === 'ddl' && ddlLoading}
+                onClick={() => {
+                  if (item.key === 'table') {
+                    onViewModeChange('table');
+                    return;
+                  }
+                  onViewModeChange(item.key);
+                }}
+              >
+                {item.label}
+              </Button>
+            ))}
+          </div>
+          <div className="gn-v2-toolbar-divider" />
+          {resultViewSwitcher}
+          <Popover trigger="click" placement="topRight" content={columnInfoSettingContent}>
+            <Button
+              data-grid-column-display-action="true"
+              size="small"
+              type={showColumnComment || showColumnType ? 'primary' : 'text'}
+              icon={<FileTextOutlined />}
+            >
+              {translate('data_grid.secondary.column_display')}
+            </Button>
+          </Popover>
+          <Popover trigger="click" placement="topRight" content={<div style={{ padding: 4 }}>{columnQuickFindContent}</div>}>
+            <Button
+              data-grid-column-quick-find-action="true"
+              size="small"
+              type="text"
+              icon={<AimOutlined />}
+            >
+              {translate('data_grid.secondary.jump_column')}
+            </Button>
+          </Popover>
+          {pageFindContent}
+          <div className="gn-v2-data-grid-status-center">
+            <span className="gn-v2-data-grid-live">{translate('data_grid.secondary.live')}</span>
+            <span>{translate('data_grid.secondary.row_count', { count: mergedDisplayCount })}</span>
+            <span>{translate('data_grid.secondary.pending_changes', { count: pendingChangeCount })}</span>
+          </div>
+        </div>
+        <div className="gn-v2-data-grid-status-right">
+          {paginationContent}
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <>
+      <div
+        data-grid-secondary-actions="true"
+        data-grid-legacy-secondary-actions="true"
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 4,
+          padding: '4px 0 0',
+        }}
+      >
+        <div
+          data-grid-legacy-secondary-row="primary"
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            gap: 8,
+            flexWrap: 'wrap',
+            justifyContent: 'flex-start',
+          }}
+        >
+          <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap', flex: '0 1 auto', minWidth: 0 }}>
+            <Button
+              icon={<EditOutlined />}
+              type={dataPanelOpen ? 'primary' : 'default'}
+              disabled={!isTableSurfaceActive}
+              onClick={onToggleDataPanel}
+            >
+              {translate('data_grid.secondary.data_preview')}
+            </Button>
+            <Popover trigger="click" placement="bottomRight" content={columnInfoSettingContent}>
+              <Button data-grid-column-display-action="true" icon={<FileTextOutlined />}>{translate('data_grid.column_settings.field_info')}</Button>
+            </Popover>
+            {canViewDdl && (
+              <Button
+                data-grid-ddl-action="true"
+                icon={<FileTextOutlined />}
+                loading={ddlLoading}
+                onClick={onOpenTableDdl}
+              >
+                {translate('data_grid.secondary.view_ddl')}
+              </Button>
+            )}
+          </div>
+          <div
+            data-grid-legacy-result-view-switcher="true"
+            style={{ display: 'flex', alignItems: 'center', minWidth: 0 }}
+          >
+            {resultViewSwitcher}
+          </div>
+        </div>
+        <div
+          data-grid-legacy-secondary-row="search"
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            gap: 8,
+            flexWrap: 'wrap',
+            justifyContent: 'flex-start',
+            minHeight: 32,
+          }}
+        >
+          {columnQuickFindContent ? (
+            <div
+              data-grid-legacy-column-quick-find="true"
+              style={{ display: 'flex', flex: '0 1 240px', minWidth: 0 }}
+            >
+              {columnQuickFindContent}
+            </div>
+          ) : null}
+          <div
+            data-grid-legacy-page-find="true"
+            style={{ display: 'flex', flex: '0 1 auto', minWidth: 0 }}
+          >
+            {pageFindContent}
+          </div>
+          <div
+            data-grid-legacy-pagination="true"
+            style={{ display: 'flex', minWidth: 0, marginLeft: 'auto' }}
+          >
+            {paginationContent}
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default DataGridSecondaryActions;
--- a/frontend/src/components/DataGridToolbarFrame.tsx
+++ b/frontend/src/components/DataGridToolbarFrame.tsx
@@ -0,0 +1,715 @@
+import React from 'react';
+import { AutoComplete, Button, Checkbox, Dropdown, Input, Select, Tooltip } from 'antd';
+import type { MenuProps } from 'antd';
+import {
+  ClearOutlined,
+  CloseOutlined,
+  ConsoleSqlOutlined,
+  CopyOutlined,
+  DeleteOutlined,
+  DownOutlined,
+  EditOutlined,
+  ExportOutlined,
+  FilterOutlined,
+  ImportOutlined,
+  PlusOutlined,
+  ReloadOutlined,
+  RobotOutlined,
+  SaveOutlined,
+  TableOutlined,
+  UndoOutlined,
+  VerticalAlignBottomOutlined,
+} from '@ant-design/icons';
+
+type GridFilterCondition = {
+  id: number;
+  enabled?: boolean;
+  logic?: string;
+  column: string;
+  op: string;
+  value: string;
+  value2?: string;
+};
+
+type GridSortInfo = {
+  columnKey: string;
+  order: string;
+  enabled?: boolean;
+};
+
+export interface DataGridToolbarFrameProps {
+  isV2Ui: boolean;
+  tableName?: string;
+  dbName?: string;
+  translate?: (key: string, params?: Record<string, string | number>) => string;
+  loading: boolean;
+  darkMode: boolean;
+  bgFilter: string;
+  panelFrameColor: string;
+  panelRadius: number;
+  panelOuterGap: number;
+  panelPaddingY: number;
+  panelPaddingX: number;
+  toolbarBottomPadding: number;
+  filterTopPadding: number;
+  selectionAccentHex: string;
+  toolbarDividerColor: string;
+  showFilter?: boolean;
+  filterPanelRef?: React.RefObject<HTMLDivElement>;
+  onReload?: () => void;
+  onToggleFilter?: () => void;
+  canModifyData: boolean;
+  selectedRowKeysLength: number;
+  allSelectedAreDeleted: boolean;
+  cellEditMode: boolean;
+  selectedCellsSize: number;
+  copiedCellPatchColumnCount: number;
+  hasChanges: boolean;
+  pendingChangeCount: number;
+  canImport: boolean;
+  canExport: boolean;
+  isQueryResultExport: boolean;
+  canCopyQueryResult: boolean;
+  prefersManualTotalCount: boolean;
+  aiShortcutLabel: string;
+  legacyAiButtonStyle?: React.CSSProperties;
+  paginationTotalCountLoading?: boolean;
+  filterConditions: GridFilterCondition[];
+  sortInfo: GridSortInfo[];
+  displayColumnNames: string[];
+  quickWhereDraft: string;
+  quickWhereCondition?: string;
+  quickWhereSuggestionsOpen: boolean;
+  quickWhereSuggestionOptions: Array<{ value: string; label?: React.ReactNode; insertText?: string }>;
+  gridFieldSelectOptions: Array<{ value: string; label: string; title: string }>;
+  filterLogicOptions: Array<{ value: string; label: string }>;
+  filterOpOptions: Array<{ value: string; label: string }>;
+  renderGridFieldSelectOption: (option: { label?: React.ReactNode; value?: unknown; title?: unknown }) => React.ReactNode;
+  noAutoCapInputProps: Record<string, unknown>;
+  filterFieldSelectStyle: React.CSSProperties;
+  filterFieldPopupWidth: number;
+  exportMenu: MenuProps['items'];
+  queryResultCopyMenu: MenuProps['items'];
+  dbType: string;
+  onResetPendingChanges: () => void;
+  onRefresh: () => void;
+  onToggleFilterClick: () => void;
+  onAddRow: () => void;
+  onUndoDeleteSelected: () => void;
+  onDeleteSelected: () => void;
+  onToggleCellEditMode: () => void;
+  onCopySelectedCellsToClipboard: () => void;
+  onCopySelectedColumnsFromRow: () => void;
+  onOpenBatchEditModal: () => void;
+  onPasteCopiedColumnsToSelectedRows: () => void;
+  onCommit: () => void;
+  onPreviewChanges: () => void;
+  onImport: () => void;
+  onCopyQueryResultCsv: () => void;
+  onRequestAiInsight: () => void;
+  onToggleTotalCount: () => void;
+  onQuickWhereDraftChange: (value: string) => void;
+  onQuickWhereSuggestionsOpenChange: (open: boolean) => void;
+  onQuickWhereKeyDown: (event: React.KeyboardEvent<HTMLInputElement>) => void;
+  onQuickWhereSelect: (value: string, option: unknown) => void;
+  onQuickWhereCopy: (event: React.ClipboardEvent<HTMLInputElement>) => void;
+  onQuickWhereCut: (event: React.ClipboardEvent<HTMLInputElement>) => void;
+  onQuickWherePaste: (event: React.ClipboardEvent<HTMLInputElement>) => void;
+  onApplyQuickWhere: () => void;
+  onClearQuickWhere: () => void;
+  updateFilter: (id: number, field: keyof GridFilterCondition, value: string | boolean) => void;
+  removeFilter: (id: number) => void;
+  addFilter: () => void;
+  isListOp: (op: string) => boolean;
+  isBetweenOp: (op: string) => boolean;
+  isNoValueOp: (op: string) => boolean;
+  enableSortControls: boolean;
+  onApplySortInfo: (next: GridSortInfo[]) => void;
+  onApplyFilters: () => void;
+  onEnableAllFilters: () => void;
+  onDisableAllFilters: () => void;
+  onClearFiltersAndSorts: () => void;
+}
+
+const DataGridToolbarFrame: React.FC<DataGridToolbarFrameProps> = ({
+  isV2Ui,
+  tableName,
+  dbName,
+  translate: translateProp,
+  loading,
+  darkMode,
+  bgFilter,
+  panelFrameColor,
+  panelRadius,
+  panelOuterGap,
+  panelPaddingY,
+  panelPaddingX,
+  toolbarBottomPadding,
+  filterTopPadding,
+  selectionAccentHex,
+  toolbarDividerColor,
+  showFilter,
+  filterPanelRef,
+  onReload,
+  onToggleFilter,
+  canModifyData,
+  selectedRowKeysLength,
+  allSelectedAreDeleted,
+  cellEditMode,
+  selectedCellsSize,
+  copiedCellPatchColumnCount,
+  hasChanges,
+  pendingChangeCount,
+  canImport,
+  canExport,
+  isQueryResultExport,
+  canCopyQueryResult,
+  prefersManualTotalCount,
+  aiShortcutLabel,
+  legacyAiButtonStyle,
+  paginationTotalCountLoading,
+  filterConditions,
+  sortInfo,
+  displayColumnNames,
+  quickWhereDraft,
+  quickWhereCondition,
+  quickWhereSuggestionsOpen,
+  quickWhereSuggestionOptions,
+  gridFieldSelectOptions,
+  filterLogicOptions,
+  filterOpOptions,
+  renderGridFieldSelectOption,
+  noAutoCapInputProps,
+  filterFieldSelectStyle,
+  filterFieldPopupWidth,
+  exportMenu,
+  queryResultCopyMenu,
+  dbType,
+  onResetPendingChanges,
+  onRefresh,
+  onToggleFilterClick,
+  onAddRow,
+  onUndoDeleteSelected,
+  onDeleteSelected,
+  onToggleCellEditMode,
+  onCopySelectedCellsToClipboard,
+  onCopySelectedColumnsFromRow,
+  onOpenBatchEditModal,
+  onPasteCopiedColumnsToSelectedRows,
+  onCommit,
+  onPreviewChanges,
+  onImport,
+  onCopyQueryResultCsv,
+  onRequestAiInsight,
+  onToggleTotalCount,
+  onQuickWhereDraftChange,
+  onQuickWhereSuggestionsOpenChange,
+  onQuickWhereKeyDown,
+  onQuickWhereSelect,
+  onQuickWhereCopy,
+  onQuickWhereCut,
+  onQuickWherePaste,
+  onApplyQuickWhere,
+  onClearQuickWhere,
+  updateFilter,
+  removeFilter,
+  addFilter,
+  isListOp,
+  isBetweenOp,
+  isNoValueOp,
+  enableSortControls,
+  onApplySortInfo,
+  onApplyFilters,
+  onEnableAllFilters,
+  onDisableAllFilters,
+  onClearFiltersAndSorts,
+}) => {
+  const translate = React.useCallback(
+    (key: string, params?: Record<string, string | number>) => translateProp?.(key, params) ?? key,
+    [translateProp],
+  );
+  const renderToolbarDivider = () => (
+    <div
+      className={isV2Ui ? 'gn-v2-toolbar-divider' : undefined}
+      style={isV2Ui ? undefined : { width: 1, height: 18, background: toolbarDividerColor, margin: '0 2px', flexShrink: 0 }}
+      aria-hidden="true"
+    />
+  );
+
+  const quickWherePlaceholder = dbType === 'mongodb'
+    ? translate('data_grid.filter.mongodb_query_placeholder')
+    : translate('data_grid.filter.quick_where_placeholder');
+  const toolbarTitle = tableName || translate('data_grid.table_fallback.query_result');
+
+  return (
+    <div
+      className={isV2Ui ? 'gn-v2-data-grid-toolbar-frame' : undefined}
+      style={{
+        margin: `${panelOuterGap}px 0 ${panelOuterGap}px 0`,
+        border: `1px solid ${panelFrameColor}`,
+        borderRadius: `${panelRadius}px`,
+        background: bgFilter,
+        overflow: 'hidden',
+        boxSizing: 'border-box',
+      }}
+    >
+      <div
+        className="data-grid-toolbar-scroll"
+        data-grid-primary-actions="true"
+        style={{
+          padding: showFilter ? `${panelPaddingY}px ${panelPaddingX}px ${toolbarBottomPadding}px ${panelPaddingX}px` : `${panelPaddingY}px ${panelPaddingX}px`,
+          border: 'none',
+          borderRadius: 0,
+          background: 'transparent',
+          display: 'flex',
+          gap: 8,
+          alignItems: 'center',
+          flexWrap: 'nowrap',
+          minWidth: 0,
+          overflowX: 'auto',
+          overflowY: 'hidden',
+          scrollbarGutter: 'stable',
+          WebkitOverflowScrolling: 'touch',
+          boxSizing: 'border-box',
+        }}
+      >
+        {isV2Ui && (
+          <>
+            <div className="gn-v2-data-grid-toolbar-title">
+              <TableOutlined className="gn-v2-data-grid-icon" />
+              <strong title={toolbarTitle}>{toolbarTitle}</strong>
+              {dbName && <small title={dbName}>· {dbName}</small>}
+            </div>
+            {renderToolbarDivider()}
+          </>
+        )}
+        {onReload && (
+          <Button icon={<ReloadOutlined />} disabled={loading} onClick={onRefresh}>
+            {translate('data_grid.toolbar.refresh')}
+          </Button>
+        )}
+
+        {onToggleFilter && (
+          <>
+            {renderToolbarDivider()}
+            <Button icon={<FilterOutlined />} type={showFilter ? 'primary' : 'default'} onClick={onToggleFilterClick}>
+              {translate('data_grid.toolbar.filter')}
+            </Button>
+          </>
+        )}
+
+        {canModifyData && (
+          <>
+            {renderToolbarDivider()}
+            <Button icon={<PlusOutlined />} onClick={onAddRow}>{translate('data_grid.toolbar.add_row')}</Button>
+            {allSelectedAreDeleted ? (
+              <Button icon={<UndoOutlined />} disabled={selectedRowKeysLength === 0} onClick={onUndoDeleteSelected}>{translate('data_grid.toolbar.undo_delete')}</Button>
+            ) : (
+              <Button icon={<DeleteOutlined />} danger disabled={selectedRowKeysLength === 0} onClick={onDeleteSelected}>{translate('data_grid.toolbar.delete_selected')}</Button>
+            )}
+            {selectedRowKeysLength > 0 && <span style={{ fontSize: '12px', color: '#888' }}>{translate('data_grid.toolbar.selected_count', { count: selectedRowKeysLength })}</span>}
+            {renderToolbarDivider()}
+            <Button
+              data-grid-cell-editor-action="true"
+              icon={<EditOutlined />}
+              type={cellEditMode ? 'primary' : 'default'}
+              onClick={onToggleCellEditMode}
+            >
+              {translate('data_grid.toolbar.cell_editor')}
+            </Button>
+            {cellEditMode && selectedCellsSize > 0 && (
+              <>
+                <Button icon={<CopyOutlined />} onClick={onCopySelectedCellsToClipboard}>
+                  {translate('data_grid.toolbar.copy_selection', { count: selectedCellsSize })}
+                </Button>
+                <Button icon={<CopyOutlined />} onClick={onCopySelectedColumnsFromRow}>
+                  {translate('data_grid.toolbar.copy_selection_columns', { count: selectedCellsSize })}
+                </Button>
+                <Button type="primary" onClick={onOpenBatchEditModal}>
+                  {translate('data_grid.toolbar.batch_fill', { count: selectedCellsSize })}
+                </Button>
+              </>
+            )}
+            {cellEditMode && copiedCellPatchColumnCount > 0 && (
+              <>
+                <Button
+                  icon={<VerticalAlignBottomOutlined />}
+                  disabled={selectedRowKeysLength === 0}
+                  onClick={onPasteCopiedColumnsToSelectedRows}
+                >
+                  {translate('data_grid.toolbar.paste_to_selected_rows', { count: selectedRowKeysLength })}
+                </Button>
+                <span style={{ fontSize: '12px', color: '#888' }}>
+                  {translate('data_grid.toolbar.copied_columns_count', { count: copiedCellPatchColumnCount })}
+                </span>
+              </>
+            )}
+            {renderToolbarDivider()}
+            <Button
+              className={isV2Ui ? 'gn-v2-commit-button' : undefined}
+              icon={<SaveOutlined />}
+              type="primary"
+              disabled={!hasChanges}
+              onClick={onCommit}
+            >
+              {isV2Ui ? (
+                <>
+                  <span>{translate('data_grid.toolbar.commit_label')}</span>
+                  <span className="gn-v2-toolbar-kbd">{pendingChangeCount}</span>
+                </>
+              ) : translate('data_grid.toolbar.commit', { count: pendingChangeCount })}
+            </Button>
+            {hasChanges && (
+              <Dropdown menu={{ items: [{ key: 'preview-sql', label: translate('data_grid.toolbar.preview_sql_generate'), icon: <ConsoleSqlOutlined />, onClick: onPreviewChanges }] }}>
+                <Button icon={<ConsoleSqlOutlined />}>{translate('data_grid.toolbar.preview_sql')} <DownOutlined /></Button>
+              </Dropdown>
+            )}
+            {hasChanges && <Button icon={<UndoOutlined />} onClick={onResetPendingChanges}>{translate('data_grid.toolbar.rollback')}</Button>}
+          </>
+        )}
+
+        {(canImport || canExport) && (
+          <>
+            {renderToolbarDivider()}
+            {canImport && <Button icon={<ImportOutlined />} onClick={onImport}>{translate('data_grid.toolbar.import')}</Button>}
+            {canExport && <Dropdown menu={{ items: exportMenu }}><Button icon={<ExportOutlined />}>{translate('data_grid.toolbar.export')} <DownOutlined /></Button></Dropdown>}
+          </>
+        )}
+
+        {isQueryResultExport && (
+          <>
+            {renderToolbarDivider()}
+            <Dropdown menu={{ items: queryResultCopyMenu }} disabled={!canCopyQueryResult}>
+              <Button
+                data-grid-query-copy-action="true"
+                icon={<CopyOutlined />}
+                disabled={!canCopyQueryResult}
+                onClick={onCopyQueryResultCsv}
+              >
+                {translate('data_grid.toolbar.copy')} <DownOutlined />
+              </Button>
+            </Dropdown>
+          </>
+        )}
+
+        <>
+          {renderToolbarDivider()}
+          <Tooltip title={translate('data_grid.toolbar.ai_insight_tooltip')}>
+            <Button
+              className={isV2Ui ? 'gn-v2-ai-insight-button' : undefined}
+              icon={<RobotOutlined />}
+              style={legacyAiButtonStyle}
+              onMouseEnter={(event) => {
+                if (isV2Ui) return;
+                event.currentTarget.style.background = darkMode ? 'linear-gradient(135deg, rgba(16,185,129,0.25), rgba(16,185,129,0.1))' : 'linear-gradient(135deg, rgba(16,185,129,0.15), rgba(16,185,129,0.05))';
+                event.currentTarget.style.borderColor = '#10b981';
+              }}
+              onMouseLeave={(event) => {
+                if (isV2Ui) return;
+                event.currentTarget.style.background = darkMode ? 'linear-gradient(135deg, rgba(16,185,129,0.15), rgba(16,185,129,0.05))' : 'linear-gradient(135deg, rgba(16,185,129,0.1), rgba(16,185,129,0.02))';
+                event.currentTarget.style.borderColor = darkMode ? 'rgba(16,185,129,0.3)' : 'rgba(16,185,129,0.4)';
+              }}
+              onClick={onRequestAiInsight}
+            >
+              <span>{isV2Ui ? translate('data_grid.toolbar.ai_insight_short') : translate('data_grid.toolbar.ai_insight')}</span>
+              {isV2Ui && aiShortcutLabel !== '-' && <span className="gn-v2-toolbar-kbd">{aiShortcutLabel}</span>}
+            </Button>
+          </Tooltip>
+        </>
+
+        {prefersManualTotalCount && (
+          <>
+            {renderToolbarDivider()}
+            <Tooltip title={paginationTotalCountLoading ? translate('data_grid.toolbar.cancel_count_tooltip') : translate('data_grid.toolbar.count_total_tooltip')}>
+              <Button
+                icon={paginationTotalCountLoading ? <CloseOutlined /> : <VerticalAlignBottomOutlined />}
+                onClick={onToggleTotalCount}
+              >
+                {paginationTotalCountLoading ? translate('data_grid.toolbar.cancel_count') : translate('data_grid.toolbar.count_total')}
+              </Button>
+            </Tooltip>
+          </>
+        )}
+
+        <div style={{ marginLeft: 'auto' }} />
+      </div>
+
+      {showFilter && (
+        <div
+          ref={filterPanelRef}
+          className={isV2Ui ? 'gn-v2-smart-filter-panel' : undefined}
+          style={{
+            padding: `${filterTopPadding}px ${panelPaddingX}px ${panelPaddingY}px ${panelPaddingX}px`,
+            background: 'transparent',
+            boxSizing: 'border-box',
+            display: 'flex',
+            flexDirection: 'column',
+          }}
+        >
+          <div
+            data-grid-quick-where="true"
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: 10,
+              padding: '10px 12px',
+              marginBottom: 10,
+              borderRadius: Math.max(10, panelRadius - 2),
+              border: `1px solid ${panelFrameColor}`,
+              background: darkMode ? 'rgba(255,255,255,0.035)' : 'rgba(255,255,255,0.72)',
+              boxSizing: 'border-box',
+              minWidth: 0,
+            }}
+          >
+            <span
+              style={{
+                flex: '0 0 auto',
+                minWidth: 58,
+                height: 28,
+                display: 'inline-flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                borderRadius: 999,
+                background: darkMode ? 'rgba(24,144,255,0.18)' : 'rgba(24,144,255,0.10)',
+                border: `1px solid ${darkMode ? 'rgba(24,144,255,0.32)' : 'rgba(24,144,255,0.22)'}`,
+                color: selectionAccentHex,
+                fontSize: 12,
+                fontWeight: 700,
+                letterSpacing: '0.03em',
+              }}
+            >
+              WHERE
+            </span>
+            <AutoComplete
+              value={quickWhereDraft}
+              options={quickWhereSuggestionOptions}
+              onChange={onQuickWhereDraftChange}
+              onOpenChange={onQuickWhereSuggestionsOpenChange}
+              onInputKeyDown={onQuickWhereKeyDown}
+              onSelect={onQuickWhereSelect}
+              style={{ flex: '1 1 320px', minWidth: 220 }}
+              popupMatchSelectWidth={420}
+            >
+              <Input
+                {...noAutoCapInputProps}
+                allowClear
+                data-grid-quick-where-input="true"
+                onCopy={onQuickWhereCopy}
+                onCut={onQuickWhereCut}
+                onPaste={onQuickWherePaste}
+                placeholder={quickWherePlaceholder}
+              />
+            </AutoComplete>
+            <Button size="small" type="primary" onClick={onApplyQuickWhere}>
+              {translate('data_grid.filter.apply_where')}
+            </Button>
+            <Button size="small" onClick={onClearQuickWhere} disabled={!quickWhereDraft && !quickWhereCondition}>
+              {translate('data_grid.filter.clear')}
+            </Button>
+          </div>
+
+          <div style={{ maxHeight: 200, overflowY: 'auto', overflowX: 'hidden', flex: '0 1 auto' }}>
+            {filterConditions.map((cond, condIndex) => (
+              <div key={cond.id} style={{ display: 'flex', gap: 8, marginBottom: 8, alignItems: 'flex-start', opacity: cond.enabled === false ? 0.58 : 1 }}>
+                <Checkbox
+                  checked={cond.enabled !== false}
+                  onChange={(event) => updateFilter(cond.id, 'enabled', event.target.checked)}
+                  style={{ marginTop: 6, flex: '0 0 auto', whiteSpace: 'nowrap' }}
+                >
+                  {translate('data_grid.filter.enabled')}
+                </Checkbox>
+                <Select
+                  style={{ width: 96, minWidth: 96, maxWidth: 96, flex: '0 0 96px' }}
+                  value={condIndex === 0 ? '__FIRST__' : (cond.logic === 'OR' ? 'OR' : 'AND')}
+                  onChange={(value) => updateFilter(cond.id, 'logic', value)}
+                  options={condIndex === 0 ? [{ value: '__FIRST__', label: translate('data_grid.filter.first_condition') }] : filterLogicOptions}
+                  disabled={condIndex === 0}
+                />
+                <Select
+                  style={filterFieldSelectStyle}
+                  value={cond.column}
+                  onChange={(value) => updateFilter(cond.id, 'column', value)}
+                  options={gridFieldSelectOptions}
+                  showSearch
+                  optionFilterProp="label"
+                  optionRender={renderGridFieldSelectOption}
+                  popupMatchSelectWidth={filterFieldPopupWidth}
+                  filterOption={(input, option) =>
+                    String(option?.label ?? '')
+                      .toLowerCase()
+                      .includes(String(input || '').trim().toLowerCase())
+                  }
+                  placeholder={translate('data_grid.filter.search_field_placeholder')}
+                  disabled={cond.op === 'CUSTOM'}
+                />
+                <Select
+                  style={{ width: 140 }}
+                  value={cond.op}
+                  onChange={(value) => updateFilter(cond.id, 'op', value)}
+                  options={filterOpOptions}
+                />
+
+                {cond.op === 'CUSTOM' ? (
+                  <Input.TextArea
+                    {...noAutoCapInputProps}
+                    style={{ flex: 1 }}
+                    autoSize={{ minRows: 1, maxRows: 4 }}
+                    value={cond.value}
+                    onChange={(event) => updateFilter(cond.id, 'value', event.target.value)}
+                    placeholder={translate('data_grid.filter.custom_where_placeholder')}
+                  />
+                ) : isListOp(cond.op) ? (
+                  <Input.TextArea
+                    {...noAutoCapInputProps}
+                    style={{ flex: 1 }}
+                    autoSize={{ minRows: 1, maxRows: 4 }}
+                    value={cond.value}
+                    onChange={(event) => updateFilter(cond.id, 'value', event.target.value)}
+                    placeholder={translate('data_grid.filter.list_values_placeholder')}
+                  />
+                ) : isBetweenOp(cond.op) ? (
+                  <>
+                    <Input
+                      {...noAutoCapInputProps}
+                      style={{ width: 220 }}
+                      value={cond.value}
+                      onChange={(event) => updateFilter(cond.id, 'value', event.target.value)}
+                      placeholder={translate('data_grid.filter.start_value_placeholder')}
+                    />
+                    <Input
+                      {...noAutoCapInputProps}
+                      style={{ width: 220 }}
+                      value={cond.value2 || ''}
+                      onChange={(event) => updateFilter(cond.id, 'value2', event.target.value)}
+                      placeholder={translate('data_grid.filter.end_value_placeholder')}
+                    />
+                  </>
+                ) : isNoValueOp(cond.op) ? (
+                  <Input {...noAutoCapInputProps} style={{ width: 220 }} value="" disabled placeholder={translate('data_grid.filter.no_value_placeholder')} />
+                ) : (
+                  <Input
+                    {...noAutoCapInputProps}
+                    style={{ width: 280 }}
+                    value={cond.value}
+                    onChange={(event) => updateFilter(cond.id, 'value', event.target.value)}
+                  />
+                )}
+
+                <Button icon={<CloseOutlined />} onClick={() => removeFilter(cond.id)} type="text" danger />
+              </div>
+            ))}
+            {enableSortControls && (
+              <div style={{ paddingTop: filterConditions.length > 0 ? 4 : 0, borderTop: filterConditions.length > 0 && sortInfo.length > 0 ? `1px dashed ${panelFrameColor}` : 'none' }}>
+                {sortInfo.map((item, index) => (
+                <div key={`${item.columnKey || 'sort'}-${index}`} style={{ display: 'flex', gap: 8, marginBottom: 8, alignItems: 'center', opacity: item.enabled === false ? 0.58 : 1 }}>
+                  <Checkbox
+                    checked={item.enabled !== false}
+                    onChange={(event) => {
+                      const next = [...sortInfo];
+                      next[index] = { ...next[index], enabled: event.target.checked };
+                      onApplySortInfo(next);
+                    }}
+                    style={{ flex: '0 0 auto' }}
+                  />
+                  <span style={{ fontSize: 12, color: 'inherit', opacity: 0.7, whiteSpace: 'nowrap', minWidth: 32 }}>
+                    {index === 0 ? translate('data_grid.filter.sort_label') : translate('data_grid.filter.then_label')}
+                  </span>
+                  <Select
+                    style={filterFieldSelectStyle}
+                    value={item.columnKey || undefined}
+                    onChange={(value) => {
+                      const next = [...sortInfo];
+                      if (!value) {
+                        next.splice(index, 1);
+                      } else {
+                        next[index] = { ...next[index], columnKey: value };
+                      }
+                      onApplySortInfo(next.filter((entry) => entry.columnKey));
+                    }}
+                    options={displayColumnNames
+                      .filter((columnName) => columnName === item.columnKey || !sortInfo.some((entry) => entry.columnKey === columnName))
+                      .map((columnName) => ({ value: columnName, label: columnName, title: columnName }))}
+                    showSearch
+                    optionFilterProp="label"
+                    optionRender={renderGridFieldSelectOption}
+                    popupMatchSelectWidth={filterFieldPopupWidth}
+                    filterOption={(input, option) =>
+                      String(option?.label ?? '')
+                        .toLowerCase()
+                        .includes(String(input || '').trim().toLowerCase())
+                    }
+                    placeholder={translate('data_grid.filter.select_sort_field_placeholder')}
+                    allowClear
+                    onClear={() => {
+                      const next = sortInfo.filter((_, itemIndex) => itemIndex !== index);
+                      onApplySortInfo(next);
+                    }}
+                  />
+                  <Select
+                    style={{ width: 110 }}
+                    value={item.order || 'ascend'}
+                    onChange={(value) => {
+                      const next = [...sortInfo];
+                      next[index] = { ...next[index], order: value };
+                      onApplySortInfo(next);
+                    }}
+                    options={[
+                      { value: 'ascend', label: `${translate('data_grid.filter.sort_asc')} ↑` },
+                      { value: 'descend', label: `${translate('data_grid.filter.sort_desc')} ↓` },
+                    ]}
+                    disabled={!item.columnKey}
+                  />
+                  <Button
+                    icon={<CloseOutlined />}
+                    type="text"
+                    danger
+                    size="small"
+                    onClick={() => onApplySortInfo(sortInfo.filter((_, itemIndex) => itemIndex !== index))}
+                  />
+                </div>
+                ))}
+              </div>
+            )}
+          </div>
+
+          <div
+            style={{
+              display: 'flex',
+              gap: 8,
+              flexWrap: 'wrap',
+              alignItems: 'center',
+              flex: '0 0 auto',
+              marginTop: ((enableSortControls && sortInfo.length > 0) || filterConditions.length > 0) ? 4 : 0,
+              paddingTop: ((enableSortControls && sortInfo.length > 0) || filterConditions.length > 0) ? 6 : 0,
+              borderTop: ((enableSortControls && sortInfo.length > 0) || filterConditions.length > 0) ? `1px dashed ${panelFrameColor}` : 'none',
+            }}
+          >
+            <Button type="primary" ghost onClick={addFilter} size="small" icon={<PlusOutlined />}>{translate('data_grid.filter.add_condition')}</Button>
+            {enableSortControls && (
+              <Button
+                type="dashed"
+                size="small"
+                icon={<PlusOutlined />}
+                onClick={() => {
+                  const nextColumn = displayColumnNames.find((columnName) => !sortInfo.some((item) => item.columnKey === columnName)) || displayColumnNames[0] || '';
+                  onApplySortInfo([...sortInfo, { columnKey: nextColumn, order: 'ascend', enabled: true }]);
+                }}
+                disabled={sortInfo.length >= displayColumnNames.length}
+              >
+                {translate('data_grid.filter.add_sort')}
+              </Button>
+            )}
+            <div style={{ width: 1, height: 16, background: panelFrameColor, margin: '0 2px', flexShrink: 0 }} />
+            <Button size="small" onClick={onEnableAllFilters}>{translate('data_grid.filter.enable_all')}</Button>
+            <Button size="small" onClick={onDisableAllFilters}>{translate('data_grid.filter.disable_all')}</Button>
+            <div style={{ width: 1, height: 16, background: panelFrameColor, margin: '0 2px', flexShrink: 0 }} />
+            <Button type="primary" onClick={onApplyFilters} size="small">{translate('data_grid.filter.apply')}</Button>
+            <Button size="small" icon={<ClearOutlined />} onClick={onClearFiltersAndSorts}>{translate('data_grid.filter.clear')}</Button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default DataGridToolbarFrame;
--- a/frontend/src/components/DataGridV2DdlWorkspace.tsx
+++ b/frontend/src/components/DataGridV2DdlWorkspace.tsx
@@ -0,0 +1,135 @@
+import React from 'react';
+import { Button, Segmented } from 'antd';
+import { CopyOutlined } from '@ant-design/icons';
+import Editor from './MonacoEditor';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+type DdlViewLayoutMode = 'bottom' | 'side';
+export type DataGridV2DdlWorkspaceTranslate = (key: string, params?: I18nParams) => string;
+
+export interface DataGridV2DdlViewProps {
+  layout: DdlViewLayoutMode;
+  translate?: DataGridV2DdlWorkspaceTranslate;
+  tableName?: string;
+  ddlViewLayout: DdlViewLayoutMode;
+  ddlLoading: boolean;
+  ddlText: string;
+  darkMode: boolean;
+  onDdlViewLayoutChange: (layout: DdlViewLayoutMode) => void;
+  onReload: () => void;
+  onCopy: () => void;
+}
+
+export const DataGridV2DdlView: React.FC<DataGridV2DdlViewProps> = ({
+  layout,
+  translate = defaultTranslate,
+  tableName,
+  ddlViewLayout,
+  ddlLoading,
+  ddlText,
+  darkMode,
+  onDdlViewLayoutChange,
+  onReload,
+  onCopy,
+}) => (
+  <div data-grid-ddl-view={layout} className={`gn-v2-data-grid-ddl-view${layout === 'side' ? ' is-side' : ''}`}>
+    <div className="gn-v2-data-grid-alt-toolbar">
+      <div>
+        <span>DDL</span>
+        <strong>{tableName ? `DDL - ${tableName}` : 'DDL'}</strong>
+      </div>
+      <div>
+        <Segmented
+          size="small"
+          value={ddlViewLayout}
+          options={[
+            { label: translate('data_grid.ddl.layout_bottom'), value: 'bottom' },
+            { label: translate('data_grid.ddl.layout_side'), value: 'side' },
+          ]}
+          onChange={(value) => onDdlViewLayoutChange(String(value) as DdlViewLayoutMode)}
+        />
+        <Button size="small" onClick={onReload} loading={ddlLoading}>
+          {translate('data_grid.ddl.reload')}
+        </Button>
+        <Button size="small" icon={<CopyOutlined />} onClick={onCopy} disabled={!ddlText.trim()}>
+          {translate('data_grid.ddl.copy')}
+        </Button>
+        {layout === 'side' && (
+          <Button size="small" onClick={() => onDdlViewLayoutChange('bottom')}>
+            {translate('common.close')}
+          </Button>
+        )}
+      </div>
+    </div>
+    <div className="gn-v2-data-grid-ddl-code">
+      <Editor
+        height="100%"
+        gonaviTypography="code"
+        language="sql"
+        theme={darkMode ? 'transparent-dark' : 'transparent-light'}
+        value={ddlLoading ? translate('data_grid.ddl.loading') : ddlText}
+        options={{
+          readOnly: true,
+          minimap: { enabled: false },
+          scrollBeyondLastLine: false,
+          wordWrap: 'off',
+          tabSize: 2,
+          automaticLayout: true,
+        }}
+      />
+    </div>
+  </div>
+);
+
+export interface DataGridV2DdlSideWorkspaceProps extends Omit<DataGridV2DdlViewProps, 'layout'> {
+  tableContent: React.ReactNode;
+  ddlSidebarWidth: number;
+  ddlSidebarResizePreviewX: number | null;
+  onResizeStart: (event: React.MouseEvent<HTMLDivElement>) => void;
+}
+
+export const DataGridV2DdlSideWorkspace: React.FC<DataGridV2DdlSideWorkspaceProps> = ({
+  tableContent,
+  ddlSidebarWidth,
+  ddlSidebarResizePreviewX,
+  onResizeStart,
+  ...ddlViewProps
+}) => {
+  const translate = ddlViewProps.translate ?? defaultTranslate;
+
+  return (
+    <div
+      data-grid-ddl-layout="side"
+      className="gn-v2-data-grid-split-workspace"
+      style={{
+        gridTemplateColumns: `minmax(0, 1fr) 8px ${ddlSidebarWidth}px`,
+        '--gn-v2-ddl-sidebar-width': `${ddlSidebarWidth}px`,
+      } as React.CSSProperties}
+    >
+      <div className="gn-v2-data-grid-split-main">
+        {tableContent}
+      </div>
+      <div
+        data-grid-ddl-resizer="true"
+        className="gn-v2-data-grid-ddl-resizer"
+        role="separator"
+        aria-orientation="vertical"
+        aria-valuemin={320}
+        aria-valuemax={760}
+        aria-valuenow={ddlSidebarWidth}
+        onMouseDown={onResizeStart}
+      />
+      <aside aria-label={translate('data_grid.ddl.sidebar_aria')} className="gn-v2-data-grid-ddl-sidebar">
+        <DataGridV2DdlView layout="side" {...ddlViewProps} />
+      </aside>
+      <div
+        data-grid-ddl-resize-preview="true"
+        className="gn-v2-data-grid-ddl-resize-preview"
+        style={{
+          opacity: ddlSidebarResizePreviewX === null ? 0 : 1,
+          transform: ddlSidebarResizePreviewX === null ? undefined : `translateX(${ddlSidebarResizePreviewX}px)`,
+        }}
+      />
+    </div>
+  );
+};
--- a/frontend/src/components/DataGridV2MetadataViews.tsx
+++ b/frontend/src/components/DataGridV2MetadataViews.tsx
@@ -0,0 +1,99 @@
+import React from 'react';
+import { t as defaultTranslate, type I18nParams } from '../i18n';
+
+type DataGridMetadataTranslate = (key: string, params?: I18nParams) => string;
+
+export interface DataGridV2FieldsViewProps {
+  tableName?: string;
+  displayOutputColumnNames: string[];
+  pkColumns: string[];
+  locatorColumns?: string[];
+  columnMetaMap: Record<string, { type?: string; comment?: string }>;
+  columnMetaMapByLowerName: Record<string, { type?: string; comment?: string }>;
+  translate?: DataGridMetadataTranslate;
+}
+
+export const DataGridV2FieldsView: React.FC<DataGridV2FieldsViewProps> = ({
+  tableName,
+  displayOutputColumnNames,
+  pkColumns,
+  locatorColumns,
+  columnMetaMap,
+  columnMetaMapByLowerName,
+  translate = defaultTranslate,
+}) => (
+  <div className="gn-v2-data-grid-fields-view">
+    <div className="gn-v2-data-grid-fields-head">
+      <div>
+        <span>{translate('data_grid.metadata_view.fields_badge')}</span>
+        <strong>{tableName || translate('data_grid.table_fallback.query_result')}</strong>
+      </div>
+      <div>
+        <span>{translate('data_grid.metadata_view.field_count', { count: displayOutputColumnNames.length })}</span>
+      </div>
+    </div>
+    <div className="gn-v2-data-grid-fields-table">
+      <div className="gn-v2-data-grid-fields-row is-head">
+        <span>#</span>
+        <span>{translate('data_grid.metadata_view.column_name')}</span>
+        <span>{translate('data_grid.metadata_view.column_type')}</span>
+        <span>NN</span>
+        <span>PK</span>
+        <span>{translate('data_grid.metadata_view.default_value')}</span>
+        <span>{translate('data_grid.metadata_view.comment')}</span>
+      </div>
+      {displayOutputColumnNames.map((columnName, index) => {
+        const meta = columnMetaMap[columnName] || columnMetaMapByLowerName[columnName.toLowerCase()];
+        const isPk = pkColumns.includes(columnName) || locatorColumns?.includes(columnName);
+        return (
+          <div className="gn-v2-data-grid-fields-row" key={columnName}>
+            <span>{index + 1}</span>
+            <span className="gn-v2-data-grid-field-name">{columnName}</span>
+            <span className="gn-v2-data-grid-field-type">{meta?.type || '-'}</span>
+            <span>-</span>
+            <span>{isPk ? <em>PK</em> : '-'}</span>
+            <span>-</span>
+            <span>{meta?.comment || '-'}</span>
+          </div>
+        );
+      })}
+    </div>
+  </div>
+);
+
+export interface DataGridV2ErViewProps {
+  tableName?: string;
+  displayOutputColumnNames: string[];
+  columnMetaMap: Record<string, { type?: string; comment?: string }>;
+  columnMetaMapByLowerName: Record<string, { type?: string; comment?: string }>;
+  translate?: DataGridMetadataTranslate;
+}
+
+export const DataGridV2ErView: React.FC<DataGridV2ErViewProps> = ({
+  tableName,
+  displayOutputColumnNames,
+  columnMetaMap,
+  columnMetaMapByLowerName,
+  translate = defaultTranslate,
+}) => (
+  <div className="gn-v2-data-grid-er-view">
+    <div className="gn-v2-data-grid-er-node is-main">
+      <span>{translate('data_grid.metadata_view.er_table_badge')}</span>
+      <strong>{tableName || translate('data_grid.table_fallback.query_result')}</strong>
+      <small>{translate('data_grid.metadata_view.field_count', { count: displayOutputColumnNames.length })}</small>
+    </div>
+    <div className="gn-v2-data-grid-er-lines">
+      <span />
+      <span />
+    </div>
+    <div className="gn-v2-data-grid-er-side">
+      {displayOutputColumnNames.slice(0, 6).map((columnName) => (
+        <div className="gn-v2-data-grid-er-node" key={columnName}>
+          <span>{translate('data_grid.metadata_view.er_field_badge')}</span>
+          <strong>{columnName}</strong>
+          <small>{(columnMetaMap[columnName] || columnMetaMapByLowerName[columnName.toLowerCase()])?.type || '-'}</small>
+        </div>
+      ))}
+    </div>
+  </div>
+);
--- a/frontend/src/components/DataSyncModal.i18n.test.ts
+++ b/frontend/src/components/DataSyncModal.i18n.test.ts
@@ -0,0 +1,39 @@
+import { readFileSync } from 'node:fs';
+import { describe, expect, it } from 'vitest';
+
+const source = readFileSync(new URL('./DataSyncModal.tsx', import.meta.url), 'utf8');
+
+describe('DataSyncModal i18n', () => {
+  it('localizes fixed workflow chrome while preserving raw table and SQL details as params', () => {
+    [
+      '差异分析完成',
+      '确认全量覆盖',
+      '全量覆盖会清空目标表数据后再插入，请确认已备份目标库。',
+      '跨库迁移工作台',
+      '数据同步工作台',
+      '请选择需要同步的表：',
+      '差异预览：',
+      'SQL 已复制',
+      '复制失败，请手动复制',
+      '复制 SQL',
+    ].forEach((snippet) => {
+      expect(source).not.toContain(snippet);
+    });
+
+    expect(source).toContain('useOptionalI18n()');
+    expect(source).toContain("tr('data_sync.message.analysis_complete')");
+    expect(source).toContain("tr('data_sync.modal.full_overwrite_title')");
+    expect(source).toContain("tr('data_sync.preview.title', { table: previewTable })");
+    expect(source).toContain("tr('data_sync.preview.message.sql_copied')");
+    expect(source).toContain("tr('data_sync.preview.message.copy_failed')");
+  });
+
+  it('wraps backend details in localized shells without translating raw detail values', () => {
+    expect(source).not.toContain('message.error(res.message || "差异分析失败")');
+    expect(source).not.toContain('message.error("差异分析失败: " + (e?.message || ""))');
+    expect(source).not.toContain('message.error(res.message || "加载差异预览失败")');
+
+    expect(source).toContain("tr('data_sync.message.analysis_failed_detail', { detail:");
+    expect(source).toContain("tr('data_sync.message.preview_load_failed_detail', { detail:");
+  });
+});
--- a/frontend/src/components/DataSyncModal.tsx
+++ b/frontend/src/components/DataSyncModal.tsx
--- a/frontend/src/components/DataViewer.primary-key.test.tsx
+++ b/frontend/src/components/DataViewer.primary-key.test.tsx
@@ -0,0 +1,417 @@
+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 type { TabData } from '../types';
+import { ORACLE_ROWID_LOCATOR_COLUMN } from '../utils/rowLocator';
+import DataViewer from './DataViewer';
+
+const storeState = vi.hoisted(() => ({
+  connections: [
+    {
+      id: 'conn-1',
+      name: 'oracle',
+      config: {
+        type: 'oracle',
+        host: '127.0.0.1',
+        port: 1521,
+        user: 'scott',
+        password: '',
+        database: 'ORCLPDB1',
+      },
+    },
+  ],
+  languagePreference: 'zh-CN',
+  addSqlLog: vi.fn(),
+}));
+
+const backendApp = vi.hoisted(() => ({
+  DBQuery: vi.fn(),
+  DBGetColumns: vi.fn(),
+  DBGetIndexes: vi.fn(),
+}));
+
+const messageApi = vi.hoisted(() => ({
+  error: vi.fn(),
+  warning: vi.fn(),
+}));
+
+const dataGridState = vi.hoisted(() => ({
+  latestProps: null as any,
+}));
+
+vi.mock('../store', () => {
+  const useStore = Object.assign(
+    (selector: (state: typeof storeState) => any) => selector(storeState),
+    { getState: () => storeState },
+  );
+  return { useStore };
+});
+
+vi.mock('../../wailsjs/go/app/App', () => backendApp);
+
+vi.mock('antd', () => ({
+  message: messageApi,
+}));
+
+vi.mock('./DataGrid', () => ({
+  default: (props: any) => {
+    dataGridState.latestProps = props;
+    return <div data-grid="true" />;
+  },
+  GONAVI_ROW_KEY: '__gonavi_row_key__',
+}));
+
+const createTab = (overrides: Partial<TabData> = {}): TabData => ({
+  id: 'tab-1',
+  title: 'EDC_LOG',
+  type: 'table',
+  connectionId: 'conn-1',
+  dbName: 'MYCIMLED',
+  tableName: 'EDC_LOG',
+  ...overrides,
+});
+
+const flushPromises = async () => {
+  await act(async () => {
+    await Promise.resolve();
+    await Promise.resolve();
+  });
+};
+
+const createRows = (count: number) => Array.from({ length: count }, (_, i) => ({
+  ID: i + 1,
+  NAME: `row-${i + 1}`,
+}));
+
+describe('DataViewer safe editing locator', () => {
+  it('memoizes the table data viewer so parent-only modal state does not repaint loaded data', () => {
+    const source = readFileSync(new URL('./DataViewer.tsx', import.meta.url), 'utf8');
+
+    expect(source).toContain('React.memo(({ tab, isActive = true }) => {');
+  });
+
+  const renderAndReload = async (tab: TabData = createTab()) => {
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<DataViewer tab={tab} />);
+    });
+
+    await act(async () => {
+      await dataGridState.latestProps.onReload();
+    });
+    await flushPromises();
+    return renderer!;
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    dataGridState.latestProps = null;
+    storeState.connections = [
+      {
+        id: 'conn-1',
+        name: 'oracle',
+        config: {
+          type: 'oracle',
+          host: '127.0.0.1',
+          port: 1521,
+          user: 'scott',
+          password: '',
+          database: 'ORCLPDB1',
+        },
+      },
+    ];
+    storeState.languagePreference = 'zh-CN';
+    storeState.connections[0].config.type = 'oracle';
+    storeState.connections[0].config.database = 'ORCLPDB1';
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      fields: ['ID', 'NAME'],
+      data: [{ ID: 7, NAME: 'old-name' }],
+    });
+    backendApp.DBGetIndexes.mockResolvedValue({ success: true, data: [] });
+  });
+
+  it('localizes the missing connection message through DataViewer catalog keys', async () => {
+    storeState.connections = [];
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<DataViewer tab={createTab({ connectionId: 'missing-conn' })} />);
+      await Promise.resolve();
+    });
+    await flushPromises();
+
+    expect(messageApi.error).toHaveBeenCalledWith('未找到连接');
+    renderer!.unmount();
+  });
+
+  it('keeps DataViewer message wrappers and SQL log phase labels keyed', () => {
+    const source = readFileSync(new URL('./DataViewer.tsx', import.meta.url), 'utf8');
+
+    expect(source).not.toMatch(/当前结果集尚未就绪|统计失败|统计总数失败|统计结果解析失败|Mongo 筛选条件无效|解析失败|主查询|复杂类型降级重试|重试\(32MB sort_buffer\)|重试\(128MB sort_buffer\)|已自动提升排序缓冲并重试成功|查询失败|查询超过连接超时时间|DuckDB 查询超过连接超时时间|超时|MongoDB 结果集中缺少 _id|加载索引失败|无法加载主键\/唯一索引元数据|无法加载唯一索引元数据|保持只读|当前结果没有可用的安全行定位方式/);
+    expect(source).toContain('data_viewer.message.connection_not_found');
+    expect(source).toContain('data_viewer.message.result_not_ready');
+    expect(source).toContain('data_viewer.message.query_failed');
+    expect(source).toContain('data_viewer.message.query_timeout');
+    expect(source).toContain('data_viewer.message.duckdb_query_timeout');
+    expect(source).toContain('data_viewer.read_only.reason.mongo_id_missing');
+    expect(source).toContain('data_viewer.read_only.reason.no_safe_locator');
+    expect(source).toContain('data_viewer.read_only.warning.table');
+    expect(source).toContain('data_viewer.read_only.warning.collection');
+    expect(source).toContain('data_viewer.sql_log.phase.main_query');
+    expect(source).toContain('data_viewer.sql_log.phase.sort_buffer_retry');
+  });
+
+  it('enables table preview editing after primary keys are loaded', async () => {
+    backendApp.DBGetColumns.mockResolvedValue({
+      success: true,
+      data: [{ Name: 'ID', Key: 'PRI' }, { Name: 'NAME', Key: '' }],
+    });
+
+    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,
+      data: [{ name: 'EMAIL', key: '' }, { name: 'NAME', key: '' }],
+    });
+    backendApp.DBGetIndexes.mockResolvedValue({
+      success: true,
+      data: [{ name: 'UK_EMAIL', columnName: 'EMAIL', nonUnique: 0, seqInIndex: 1, indexType: 'BTREE' }],
+    });
+
+    const renderer = await renderAndReload();
+
+    expect(dataGridState.latestProps?.pkColumns).toEqual([]);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'unique-key',
+      columns: ['EMAIL'],
+      valueColumns: ['EMAIL'],
+      readOnly: false,
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(false);
+    expect(messageApi.warning).not.toHaveBeenCalled();
+    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';
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      fields: ['_id', '__gonavi_mongodb_id_locator__', 'name', 'age'],
+      data: [{
+        _id: '507f1f77bcf86cd799439011',
+        __gonavi_mongodb_id_locator__: { $oid: '507f1f77bcf86cd799439011' },
+        name: 'old-name',
+        age: 18,
+      }],
+    });
+
+    const renderer = await renderAndReload(createTab({ id: 'tab-mongo', dbName: 'app', tableName: 'users', title: 'users' }));
+
+    expect(backendApp.DBGetColumns).not.toHaveBeenCalled();
+    expect(backendApp.DBGetIndexes).not.toHaveBeenCalled();
+    expect(dataGridState.latestProps?.pkColumns).toEqual(['_id']);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'primary-key',
+      columns: ['_id'],
+      valueColumns: ['__gonavi_mongodb_id_locator__'],
+      hiddenColumns: ['__gonavi_mongodb_id_locator__'],
+      writableColumns: {
+        name: 'name',
+        age: 'age',
+      },
+      readOnly: false,
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(false);
+    expect(messageApi.warning).not.toHaveBeenCalled();
+    const mongoFindCall = backendApp.DBQuery.mock.calls.find((call: any[]) => String(call[2] || '').includes('"find":"users"'));
+    expect(mongoFindCall).toBeTruthy();
+    expect(JSON.parse(String(mongoFindCall?.[2] || '{}'))).toMatchObject({
+      find: 'users',
+      sort: { _id: 1 },
+      __gonaviIncludeObjectIDLocator: true,
+    });
+    renderer.unmount();
+  });
+
+  it('keeps MongoDB results read-only when _id is missing', async () => {
+    storeState.languagePreference = 'en-US';
+    storeState.connections[0].config.type = 'mongodb';
+    storeState.connections[0].config.database = 'app';
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      fields: ['name'],
+      data: [{ name: 'orphan-doc' }],
+    });
+
+    const renderer = await renderAndReload(createTab({ id: 'tab-mongo-no-id', dbName: 'app', tableName: 'users', title: 'users' }));
+
+    expect(dataGridState.latestProps?.pkColumns).toEqual([]);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'none',
+      readOnly: true,
+      reason: 'MongoDB result set is missing _id, so changes cannot be submitted safely.',
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(true);
+    expect(messageApi.warning).toHaveBeenCalledWith('Collection app.users remains read-only: MongoDB result set is missing _id, so changes cannot be submitted safely.');
+    renderer.unmount();
+  });
+
+  it('uses hidden Oracle ROWID when no primary or unique key is available', async () => {
+    backendApp.DBGetColumns.mockResolvedValue({
+      success: true,
+      data: [{ name: 'ID', key: '' }, { name: 'NAME', key: '' }],
+    });
+    backendApp.DBQuery.mockResolvedValue({
+      success: true,
+      fields: ['ID', 'NAME', ORACLE_ROWID_LOCATOR_COLUMN],
+      data: [{ ID: 7, NAME: 'old-name', [ORACLE_ROWID_LOCATOR_COLUMN]: 'AAAA' }],
+    });
+
+    const renderer = await renderAndReload();
+
+    expect(dataGridState.latestProps?.pkColumns).toEqual([]);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'oracle-rowid',
+      columns: ['ROWID'],
+      valueColumns: [ORACLE_ROWID_LOCATOR_COLUMN],
+      hiddenColumns: [ORACLE_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 "${ORACLE_ROWID_LOCATOR_COLUMN}"`))).toBe(true);
+    renderer.unmount();
+  });
+
+  it('does not add fallback ORDER BY for DuckDB table preview when a primary key is available', 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-order', dbName: 'main', tableName: 'events', title: 'events' }));
+
+    const tableQueries = backendApp.DBQuery.mock.calls
+      .map((call: any[]) => String(call[2] || ''))
+      .filter((sql: string) => sql.includes('FROM "events"'));
+    expect(tableQueries.length).toBeGreaterThan(0);
+    expect(tableQueries.every((sql: string) => !/\border\s+by\b/i.test(sql))).toBe(true);
+    expect(tableQueries[tableQueries.length - 1]).toContain('LIMIT 101 OFFSET 0');
+    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';
+    backendApp.DBGetColumns.mockResolvedValue({
+      success: true,
+      data: [{ name: 'ID', key: 'PRI' }, { name: 'NAME', key: '' }],
+    });
+
+    let pageQueryCount = 0;
+    backendApp.DBQuery.mockImplementation(async (_config: any, _dbName: string, sql: string) => {
+      if (/count\s*\(/i.test(String(sql))) {
+        return {
+          success: true,
+          fields: ['total'],
+          data: [{ total: 500 }],
+        };
+      }
+      pageQueryCount += 1;
+      return {
+        success: true,
+        fields: ['ID', 'NAME'],
+        data: pageQueryCount === 1 ? createRows(100) : createRows(101),
+      };
+    });
+
+    let renderer: ReactTestRenderer;
+    await act(async () => {
+      renderer = create(<DataViewer tab={createTab({ dbName: 'main', tableName: 'users', title: 'users' })} />);
+    });
+    await flushPromises();
+
+    expect(dataGridState.latestProps?.pagination).toMatchObject({
+      total: 100,
+      totalKnown: true,
+    });
+
+    await act(async () => {
+      dataGridState.latestProps?.onReload();
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+    await flushPromises();
+
+    expect(backendApp.DBQuery.mock.calls.some((call: any[]) => /count\s*\(/i.test(String(call[2] || '')))).toBe(true);
+    expect(dataGridState.latestProps?.pagination).toMatchObject({
+      total: 500,
+      totalKnown: true,
+    });
+    expect(dataGridState.latestProps?.data).toHaveLength(100);
+    renderer!.unmount();
+  });
+
+  it('shows an actionable message for DuckDB timeout interruption errors', async () => {
+    storeState.languagePreference = 'en-US';
+    storeState.connections[0].config.type = 'duckdb';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBGetColumns.mockResolvedValue({
+      success: true,
+      data: [{ name: 'ID', key: '' }, { name: 'NAME', key: '' }],
+    });
+    backendApp.DBQuery.mockResolvedValue({
+      success: false,
+      message: 'context deadline exceeded INTERRUPT Error: Interrupted!',
+      fields: [],
+      data: [],
+    });
+
+    const renderer = await renderAndReload(createTab({ id: 'tab-duckdb-timeout', dbName: 'main', tableName: 'events', title: 'events' }));
+
+    expect(messageApi.error).toHaveBeenCalledWith('DuckDB query exceeded the connection timeout and was interrupted. Increase the connection timeout, or reduce the sort/filter scope and retry.');
+    expect(storeState.addSqlLog.mock.calls.some((call: any[]) => String(call[0]?.message || '').includes('context deadline exceeded'))).toBe(true);
+    renderer.unmount();
+  });
+
+  it('keeps non-Oracle table preview read-only when no safe locator exists', async () => {
+    storeState.languagePreference = 'en-US';
+    storeState.connections[0].config.type = 'mysql';
+    storeState.connections[0].config.database = 'main';
+    backendApp.DBGetColumns.mockResolvedValue({
+      success: true,
+      data: [{ name: 'ID', key: '' }, { name: 'NAME', key: '' }],
+    });
+
+    const renderer = await renderAndReload(createTab({ dbName: 'main', tableName: 'users', title: 'users' }));
+
+    expect(dataGridState.latestProps?.pkColumns).toEqual([]);
+    expect(dataGridState.latestProps?.editLocator).toMatchObject({
+      strategy: 'none',
+      readOnly: true,
+      reason: 'No primary key or usable unique index was found, so changes cannot be submitted safely.',
+    });
+    expect(dataGridState.latestProps?.readOnly).toBe(true);
+    expect(messageApi.warning).toHaveBeenCalledWith('Table main.users remains read-only: No primary key or usable unique index was found, so changes cannot be submitted safely.');
+    renderer.unmount();
+  });
+});
--- a/frontend/src/components/DataViewer.tsx
+++ b/frontend/src/components/DataViewer.tsx
--- a/frontend/src/components/DatabaseIcons.test.tsx
+++ b/frontend/src/components/DatabaseIcons.test.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { describe, expect, it } from 'vitest';
+import { renderToStaticMarkup } from 'react-dom/server';
+
+import { DB_ICON_TYPES, getDbIcon, getDbIconLabel } from './DatabaseIcons';
+
+describe('DatabaseIcons', () => {
+  it('includes InterSystems IRIS in the selectable database icons', () => {
+    expect(DB_ICON_TYPES).toContain('iris');
+    expect(getDbIconLabel('iris')).toBe('InterSystems IRIS');
+  });
+
+  it('wraps database icons in a consistent frame for sidebar sizing', () => {
+    const mysqlMarkup = renderToStaticMarkup(<>{getDbIcon('mysql', undefined, 22)}</>);
+    const jvmMarkup = renderToStaticMarkup(<>{getDbIcon('jvm', undefined, 22)}</>);
+
+    expect(mysqlMarkup).toContain('data-db-icon-frame="true"');
+    expect(jvmMarkup).toContain('data-db-icon-frame="true"');
+    expect(mysqlMarkup).toContain('width:22px');
+    expect(jvmMarkup).toContain('width:22px');
+  });
+});
--- a/frontend/src/components/DatabaseIcons.tsx
+++ b/frontend/src/components/DatabaseIcons.tsx
@@ -0,0 +1,270 @@
+import React from 'react';
+
+// ─── 公共接口 ───────────────────────────────────────────────
+
+export interface DbIconProps {
+    size?: number;
+    color?: string;
+}
+
+const IconFrame: React.FC<{
+    size: number;
+    children: React.ReactNode;
+}> = ({ size, children }) => (
+    <span
+        data-db-icon-frame="true"
+        style={{
+            width: size,
+            height: size,
+            display: 'inline-flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            flexShrink: 0,
+        }}
+    >
+        {children}
+    </span>
+);
+
+// ─── 默认色表 ───────────────────────────────────────────────
+
+const DB_DEFAULT_COLORS: Record<string, string> = {
+    mysql:      '#00758F',
+    mariadb:    '#003545',
+    oceanbase:  '#0052CC',
+    postgres:   '#336791',
+    redis:      '#DC382D',
+    mongodb:    '#47A248',
+    jvm:        '#1677FF',
+    kingbase:   '#1890FF',
+    dameng:     '#E6002D',
+    oracle:     '#F80000',
+    sqlserver:  '#CC2927',
+    clickhouse: '#FFBF00',
+    sqlite:     '#003B57',
+    duckdb:     '#FFC107',
+    vastbase:   '#0066CC',
+    opengauss:  '#2446A8',
+    highgo:     '#00A86B',
+    iris:       '#1F6FEB',
+    tdengine:   '#2962FF',
+    diros:      '#0050B3',
+    starrocks:  '#00A6A6',
+    sphinx:     '#2F5D62',
+    custom:     '#888888',
+};
+
+export const getDbDefaultColor = (type: string): string =>
+    DB_DEFAULT_COLORS[type?.toLowerCase()] || DB_DEFAULT_COLORS.custom;
+
+// ─── 有品牌 SVG 文件的数据库类型（文件在 /db-icons/ 下） ────
+
+const BRAND_SVG_TYPES = new Set([
+    'mysql', 'mariadb', 'postgres', 'redis', 'mongodb', 'clickhouse', 'sqlite',
+    'diros', 'sphinx', 'duckdb', 'sqlserver',
+]);
+
+/** 品牌 SVG 图标：用 <img> 加载 /db-icons/*.svg */
+const BrandSvgIcon: React.FC<{ type: string; size: number; color?: string }> = ({ type, size, color }) => {
+    const bgColor = color || getDbDefaultColor(type);
+    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}`,
+                flexShrink: 0, overflow: 'hidden', boxSizing: 'border-box',
+            }}>
+                <img
+                    src={`/db-icons/${type}.svg`}
+                    alt={type}
+                    width={Math.round(size * 0.64)}
+                    height={Math.round(size * 0.64)}
+                    style={{ display: 'block', objectFit: 'contain' }}
+                />
+            </span>
+        </IconFrame>
+    );
+};
+
+// ─── 彩色标签图标（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} />
+);
+const MariaDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon 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" />
+);
+const PostgresIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon type="postgres" size={size} color={color} />
+);
+const RedisIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon type="redis" size={size} color={color} />
+);
+const MongoDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon type="mongodb" size={size} color={color} />
+);
+const ClickHouseIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon type="clickhouse" size={size} color={color} />
+);
+const SQLiteIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon 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" />
+);
+const SQLServerIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon type="sqlserver" size={size} color={color} />
+);
+const DorisIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon 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" />
+);
+const SphinxIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon type="sphinx" size={size} color={color} />
+);
+const DuckDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <BrandSvgIcon 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" />
+);
+const DamengIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.dameng} label="DM" />
+);
+const VastBaseIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.vastbase} label="VB" />
+);
+const OpenGaussIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.opengauss} label="OG" />
+);
+const HighGoIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.highgo} label="HG" />
+);
+const IrisIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.iris} label="IR" />
+);
+const TDengineIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.tdengine} label="TD" />
+);
+const JVMIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
+    <ColorBadge size={size} color={color || DB_DEFAULT_COLORS.jvm} label="JVM" />
+);
+
+/** Custom — 齿轮图标 */
+const CustomIcon: React.FC<DbIconProps> = ({ size = 16, color }) => {
+    const c = color || DB_DEFAULT_COLORS.custom;
+    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={c}/>
+                <circle cx="12" cy="12" r="3.5" stroke="#fff" strokeWidth="1.5" fill="none"/>
+                <path d="M12 4v2.5M12 17.5V20M4 12h2.5M17.5 12H20M6.34 6.34l1.77 1.77M15.89 15.89l1.77 1.77M6.34 17.66l1.77-1.77M15.89 8.11l1.77-1.77" stroke="#fff" strokeWidth="1.3" strokeLinecap="round"/>
+            </svg>
+        </IconFrame>
+    );
+};
+
+// ─── 图标注册表 ─────────────────────────────────────────────
+
+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,
+    oceanbase: OceanBaseIcon,
+    diros: DorisIcon,
+    starrocks: StarRocksIcon,
+    sphinx: SphinxIcon,
+    postgres: PostgresIcon,
+    redis: RedisIcon,
+    mongodb: MongoDBIcon,
+    jvm: JVMIcon,
+    kingbase: KingBaseIcon,
+    dameng: DamengIcon,
+    oracle: OracleIcon,
+    sqlserver: SQLServerIcon,
+    clickhouse: ClickHouseIcon,
+    sqlite: SQLiteIcon,
+    duckdb: DuckDBIcon,
+    vastbase: VastBaseIcon,
+    opengauss: OpenGaussIcon,
+    highgo: HighGoIcon,
+    iris: IrisIcon,
+    tdengine: TDengineIcon,
+    custom: CustomIcon,
+};
+
+/** 可选图标类型列表（用于图标选择器 UI） */
+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',
+];
+
+/** 该类型是否有品牌 SVG 文件 */
+export const hasBrandSvg = (type: string): boolean => BRAND_SVG_TYPES.has(type?.toLowerCase());
+
+/** 获取数据库图标 React 节点 */
+export const getDbIcon = (type: string, color?: string, size?: number): React.ReactNode => {
+    const key = (type || 'custom').toLowerCase();
+    const Component = DB_ICON_MAP[key] || CustomIcon;
+    return <Component size={size} color={color} />;
+};
+
+/** 获取数据库图标显示名称（中文） */
+export const getDbIconLabel = (type: string): string => {
+    const labels: Record<string, string> = {
+        mysql: 'MySQL', mariadb: 'MariaDB', oceanbase: 'OceanBase', postgres: 'PostgreSQL',
+        redis: 'Redis', mongodb: 'MongoDB', jvm: 'JVM',
+        oracle: 'Oracle',
+        sqlserver: 'SQL Server', clickhouse: 'ClickHouse', sqlite: 'SQLite',
+        starrocks: 'StarRocks',
+        duckdb: 'DuckDB', kingbase: '金仓', dameng: '达梦',
+        vastbase: 'VastBase', opengauss: 'OpenGauss', highgo: '瀚高', iris: 'InterSystems IRIS', tdengine: 'TDengine',
+        custom: '自定义',
+    };
+    return labels[type?.toLowerCase()] || type;
+};
+
+/** 预设颜色列表 */
+export const PRESET_ICON_COLORS: string[] = [
+    '#336791', '#00758F', '#DC382D', '#47A248', '#F80000',
+    '#CC2927', '#1890FF', '#E6002D', '#FFBF00', '#2962FF',
+    '#00A86B', '#0066CC', '#FF6B35', '#7C3AED',
+];
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>ClickHouse</title><path d="M21.333 10H24v4h-2.667ZM16 1.335h2.667v21.33H16Zm-5.333 0h2.666v21.33h-2.666ZM0 22.665V1.335h2.667v21.33zm5.333-21.33H8v21.33H5.333Z"/></svg>`
				`@@ -0,0 +1 @@`
				<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Apache Doris</title><path d="M8.666.0001c-.5355-.004-1.068.1072-1.5241.3384-.207.1048-.5749.3802-.8177.6118-1.0278.9803-1.2876 2.5138-.6553 3.8679.205.439.5068.7694 2.8476 3.1166 2.4527 2.4594 2.6352 2.6255 2.8852 2.6258.2446.0003.3647-.099 1.4408-1.19.9367-.9496 1.2306-1.2992 1.4536-1.7286.5966-1.149.6487-2.0513.174-3.014-.2264-.459-.4816-.7514-1.9012-2.176-.9018-.9052-1.7907-1.7496-1.9751-1.8765C10.0488.2005 9.3548.0052 8.666 0ZM3.5518 5.5737c-.2176.0031-.6097.085-.6097.3285v12.0904l.1642.175c.1123.1194.2498.1748.4342.1748.2545 0 .4436-.1738 3.349-3.0786 2.6868-2.6862 3.079-2.909 3.0791-3.305.0002-.3961-.3924-.6194-3.0784-3.306-2.8612-2.8619-3.0968-3.079-3.3384-3.079Zm13.0967.861c-.0481.0184-.112.1636-.1418.3225-.0756.403-.3719 1.109-.6572 1.5663-.1407.2253-2.2392 2.3955-5.049 5.2212-2.7513 2.7667-4.9104 4.9985-5.0468 5.2165-.4552.7275-.5967 1.3905-.4684 2.1964.222 1.3947 1.3263 2.6812 2.5486 2.9693.4667.11 1.618.0927 2.0329-.0305.2084-.062.526-.2112.7055-.3318.5023-.3373 9.341-9.0562 9.6463-9.5154.449-.6753.8356-1.0716.8395-1.9762-.0056-.5935-.1305-1.1138-1.0715-2.306-.5094-.6523-3.2341-3.3723-3.338-3.3324Z"/></svg>