From db3da22972c5bd5dd19ff104f464ac95fc6ba17a Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Fri, 5 Jun 2026 16:35:19 +0800
Subject: [PATCH 01/22] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E7=89=87?=
 =?UTF-8?q?=E6=AE=B5=20(snippets)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- useSnippets：localStorage 存储，前缀/语言/描述/内容，按语言匹配
- 编辑器 Tab 展开：光标前单词等于片段前缀时按 Tab 展开，$0/${0} 为光标落点，未匹配回落到默认缩进（Prec.highest）
- SnippetManager 管理面板（增删改），接入命令面板
- 用 keymap 实现，无需新增 @codemirror/autocomplete 依赖，避免实例冲突
---
 src/App.vue                            |  12 ++-
 src/components/SnippetManager.vue      | 109 +++++++++++++++++++++++++
 src/composables/useCodeMirrorEditor.ts |  41 ++++++++++
 src/composables/useSnippets.ts         |  60 ++++++++++++++
 4 files changed, 220 insertions(+), 2 deletions(-)
 create mode 100644 src/components/SnippetManager.vue
 create mode 100644 src/composables/useSnippets.ts

diff --git a/src/App.vue b/src/App.vue
index d750d3d..e9e143c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -230,6 +230,9 @@
              @go="gotoLine"
              @close="showOutline = false"/>
 
+    <!-- 代码片段管理 -->
+    <SnippetManager v-if="showSnippets" @close="showSnippets = false"/>
+
     <!-- 差异对比：当前 vs 已保存 -->
     <DiffView v-if="showDiff"
               :original="savedContent || ''"
@@ -259,7 +262,7 @@
 <script setup lang="ts">
 import {computed, nextTick, onMounted, onUnmounted, ref, watch} from 'vue'
 import {debounce} from 'lodash-es'
-import {ChevronRight, CornerDownRight, Eye, FolderOpen, GitBranch, GitCompare, History, ListTree, Maximize2, Monitor, Moon, PanelBottom, PanelLeft, PanelRight, Play, Plus, Save, Search, Settings as SettingsIcon, Sparkles, Sun, X} from 'lucide-vue-next'
+import {ChevronRight, Code2, CornerDownRight, Eye, FolderOpen, GitBranch, GitCompare, History, ListTree, Maximize2, Monitor, Moon, PanelBottom, PanelLeft, PanelRight, Play, Plus, Save, Search, Settings as SettingsIcon, Sparkles, Sun, X} from 'lucide-vue-next'
 import {ExecutionResult, LayoutMode, SplitDirection} from './types/app.ts'
 import AppHeader from './components/AppHeader.vue'
 import CodeEditor from './components/CodeEditor.vue'
@@ -288,6 +291,7 @@ import PreviewPanel from './components/PreviewPanel.vue'
 import GitPanel from './components/GitPanel.vue'
 import GoToLine from './components/GoToLine.vue'
 import Outline from './components/Outline.vue'
+import SnippetManager from './components/SnippetManager.vue'
 import {computeDiffMarkers, setDiffMarkers} from './editor/diffGutter'
 import AiAssistant from './components/AiAssistant.vue'
 import InlineGenerate from './components/InlineGenerate.vue'
@@ -722,6 +726,9 @@ const openOutline = () => {
   showOutline.value = true
 }
 
+// 代码片段管理
+const showSnippets = ref(false)
+
 const openSearchResult = async (path: string, line: number) => {
   showSearch.value = false
   await smartOpen(path)
@@ -1167,7 +1174,7 @@ const isOverlayOpen = () =>
     showSettings.value || showAbout.value || showUpdate.value
     || showHistory.value || showViewer.value || showRunPrompt.value
     || showQuickOpen.value || showGenerate.value || showSearch.value
-    || showCommandPalette.value || showDiff.value || showGoToLine.value || showOutline.value
+    || showCommandPalette.value || showDiff.value || showGoToLine.value || showOutline.value || showSnippets.value
 
 // 全局快捷键（绑定可在设置中自定义）
 const {matchAction: matchShortcut, reload: reloadShortcuts, getBinding, formatCombo} = useShortcuts()
@@ -1217,6 +1224,7 @@ const paletteCommands = computed<PaletteCommand[]>(() => [
   {id: 'quickOpen', label: '快速打开文件', icon: Search, hint: hintOf('quickOpen'), run: () => openQuickOpen()},
   {id: 'gotoLine', label: '跳转到行', icon: CornerDownRight, hint: hintOf('gotoLine'), run: () => openGoToLine()},
   {id: 'outline', label: '符号大纲', icon: ListTree, hint: hintOf('outline'), run: () => openOutline()},
+  {id: 'snippets', label: '管理代码片段', icon: Code2, run: () => { showSnippets.value = true }},
   {id: 'searchInFiles', label: '在文件夹内搜索', icon: Search, hint: hintOf('searchInFiles'), run: () => openSearch()},
   {id: 'generate', label: 'AI 生成代码', icon: Sparkles, hint: hintOf('generate'), run: () => openGenerate()},
   {id: 'showAi', label: 'AI 助手', icon: Sparkles, run: () => handleShowAi()},
diff --git a/src/components/SnippetManager.vue b/src/components/SnippetManager.vue
new file mode 100644
index 0000000..8be8051
--- /dev/null
+++ b/src/components/SnippetManager.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="fixed inset-0 z-50 flex items-start justify-center pt-16 px-6 pb-6" @click="emit('close')">
+    <div class="w-full max-w-[760px] bg-white dark:bg-gray-800 dark:text-gray-100 rounded-lg shadow-2xl border border-gray-200 dark:border-gray-700 overflow-hidden flex flex-col max-h-[80vh]"
+         @click.stop>
+      <div class="flex items-center justify-between px-4 py-2.5 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
+        <div class="flex items-center gap-2 text-sm font-medium text-gray-700 dark:text-gray-200">
+          <Code2 class="w-4 h-4 text-gray-400"/>
+          <span>代码片段</span>
+          <span class="text-xs text-gray-400">· 输入前缀后按 Tab 展开（{{ '$0' }} 为光标落点）</span>
+        </div>
+        <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" title="关闭" @click="emit('close')">
+          <X class="w-4 h-4"/>
+        </button>
+      </div>
+
+      <div class="flex-1 overflow-y-auto">
+        <!-- 列表 -->
+        <div v-if="snippets.length" class="divide-y divide-gray-100 dark:divide-gray-700">
+          <div v-for="s in snippets" :key="s.id" class="px-4 py-2 flex items-start gap-3 hover:bg-gray-50 dark:hover:bg-gray-900/40">
+            <div class="flex-1 min-w-0">
+              <div class="flex items-center gap-2">
+                <code class="text-sm font-semibold text-blue-600 dark:text-blue-400">{{ s.prefix }}</code>
+                <span class="text-[10px] px-1.5 py-0.5 rounded bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400">{{ s.language && s.language !== '*' ? s.language : '所有语言' }}</span>
+                <span v-if="s.description" class="text-xs text-gray-400 truncate">{{ s.description }}</span>
+              </div>
+              <pre class="mt-1 text-xs text-gray-500 dark:text-gray-400 font-mono whitespace-pre-wrap line-clamp-3">{{ s.body }}</pre>
+            </div>
+            <div class="flex items-center gap-1 flex-shrink-0">
+              <button class="p-1 rounded text-gray-400 hover:text-blue-500 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" title="编辑" @click="startEdit(s)">
+                <Pencil class="w-3.5 h-3.5"/>
+              </button>
+              <button class="p-1 rounded text-gray-400 hover:text-red-500 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" title="删除" @click="remove(s.id)">
+                <Trash2 class="w-3.5 h-3.5"/>
+              </button>
+            </div>
+          </div>
+        </div>
+        <div v-else class="px-4 py-8 text-center text-sm text-gray-400">还没有代码片段，在下方添加</div>
+      </div>
+
+      <!-- 编辑/新增表单 -->
+      <div class="border-t border-gray-200 dark:border-gray-700 p-3 flex-shrink-0 space-y-2">
+        <div class="flex gap-2">
+          <input v-model="form.prefix" placeholder="前缀（如 fn）" class="w-40 text-sm border border-gray-300 dark:border-gray-600 dark:bg-gray-900 rounded px-2 py-1 focus:outline-none focus:border-blue-500"/>
+          <input v-model="form.language" placeholder="语言（留空=所有）" class="w-44 text-sm border border-gray-300 dark:border-gray-600 dark:bg-gray-900 rounded px-2 py-1 focus:outline-none focus:border-blue-500"/>
+          <input v-model="form.description" placeholder="描述（可选）" class="flex-1 text-sm border border-gray-300 dark:border-gray-600 dark:bg-gray-900 rounded px-2 py-1 focus:outline-none focus:border-blue-500"/>
+        </div>
+        <textarea v-model="form.body" rows="4" placeholder="片段内容，$0 为展开后光标位置" class="w-full text-sm font-mono border border-gray-300 dark:border-gray-600 dark:bg-gray-900 rounded px-2 py-1.5 resize-none focus:outline-none focus:border-blue-500"/>
+        <div class="flex items-center gap-2">
+          <Button size="sm" :disabled="!canSave" @click="submit">{{ editingId ? '保存修改' : '添加片段' }}</Button>
+          <Button v-if="editingId" size="sm" type="secondary" @click="resetForm">取消编辑</Button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {computed, reactive, ref} from 'vue'
+import {Code2, Pencil, Trash2, X} from 'lucide-vue-next'
+import Button from '../ui/Button.vue'
+import {useSnippets, type Snippet} from '../composables/useSnippets'
+
+const emit = defineEmits<{ close: [] }>()
+
+const {snippets, add, update, remove} = useSnippets()
+
+const editingId = ref<string | null>(null)
+const form = reactive<{ prefix: string; language: string; description: string; body: string }>({
+  prefix: '', language: '', description: '', body: ''
+})
+
+const canSave = computed(() => form.prefix.trim().length > 0 && form.body.length > 0)
+
+const resetForm = () => {
+  editingId.value = null
+  form.prefix = ''
+  form.language = ''
+  form.description = ''
+  form.body = ''
+}
+
+const startEdit = (s: Snippet) => {
+  editingId.value = s.id
+  form.prefix = s.prefix
+  form.language = s.language && s.language !== '*' ? s.language : ''
+  form.description = s.description || ''
+  form.body = s.body
+}
+
+const submit = () => {
+  if (!canSave.value) {
+    return
+  }
+  const payload = {
+    prefix: form.prefix.trim(),
+    language: form.language.trim() || '*',
+    description: form.description.trim(),
+    body: form.body
+  }
+  if (editingId.value) {
+    update(editingId.value, payload)
+  }
+  else {
+    add(payload)
+  }
+  resetForm()
+}
+</script>
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index 0ea0da8..40b7cfa 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -75,8 +75,10 @@ import {EditorConfig} from '../types/app.ts'
 import {useCodeMirrorFunctionHelp} from './useCodeMirrorFunctionHelp'
 import {useCodeMirrorSpaceOmission} from './useCodeMirrorSpaceOmission.ts'
 import {EditorView, keymap} from "@codemirror/view";
+import {Prec} from "@codemirror/state";
 import {useCodeMirrorFontFamily} from "./useCodeMirrorFontFamily.ts";
 import {diffGutterExtension} from "../editor/diffGutter";
+import {useSnippets} from "./useSnippets";
 
 interface Props
 {
@@ -146,6 +148,42 @@ export function useCodeMirrorEditor(props: Props)
         {key: 'Mod-0', preventDefault: true, run: () => (resetFontSize(), true)}
     ])
 
+    // 代码片段：在光标前的单词等于某片段前缀时，按 Tab 展开（$0 / ${0} 为光标落点）
+    const {findByPrefix} = useSnippets()
+    const expandSnippet = (view: EditorView): boolean => {
+        const {state} = view
+        const sel = state.selection.main
+        if (!sel.empty) {
+            return false
+        }
+        const lineFrom = state.doc.lineAt(sel.head).from
+        const before = state.sliceDoc(lineFrom, sel.head)
+        const m = /([A-Za-z_]\w*)$/.exec(before)
+        if (!m) {
+            return false
+        }
+        const snip = findByPrefix(m[1], props.language || '')
+        if (!snip) {
+            return false
+        }
+        const from = sel.head - m[1].length
+        let body = snip.body
+        let cursorOffset = -1
+        const ph = /\$\{0\}|\$0/.exec(body)
+        if (ph) {
+            cursorOffset = ph.index
+            body = body.slice(0, ph.index) + body.slice(ph.index + ph[0].length)
+        }
+        view.dispatch({
+            changes: {from, to: sel.head, insert: body},
+            selection: {anchor: cursorOffset >= 0 ? from + cursorOffset : from + body.length},
+            scrollIntoView: true
+        })
+        return true
+    }
+    // 高优先级拦截 Tab；未匹配片段则返回 false，回落到默认缩进
+    const snippetKeymap = Prec.highest(keymap.of([{key: 'Tab', run: expandSnippet}]))
+
     // 主题映射
     const themeMap: Record<string, any> = {
         abcdef,
@@ -298,6 +336,9 @@ export function useCodeMirrorEditor(props: Props)
         // 字体缩放快捷键（搜索/替换、折叠、括号匹配等由 vue-codemirror 的 basicSetup 提供）
         result.push(fontSizeKeymap)
 
+        // 代码片段 Tab 展开
+        result.push(snippetKeymap)
+
         // Git 行内差异标记（标记数据由外部 dispatch 填充，无 git 时为空）
         result.push(diffGutterExtension)
 
diff --git a/src/composables/useSnippets.ts b/src/composables/useSnippets.ts
new file mode 100644
index 0000000..e9e2dc6
--- /dev/null
+++ b/src/composables/useSnippets.ts
@@ -0,0 +1,60 @@
+import {ref} from 'vue'
+
+export interface Snippet
+{
+    id: string
+    prefix: string
+    body: string
+    description?: string
+    // 适用语言；空或 '*' 表示所有语言
+    language?: string
+}
+
+const STORAGE_KEY = 'snippets'
+
+const load = (): Snippet[] => {
+    try {
+        const arr = JSON.parse(localStorage.getItem(STORAGE_KEY) || '[]')
+        return Array.isArray(arr) ? arr : []
+    }
+    catch {
+        return []
+    }
+}
+
+// 模块级共享，保证编辑器扩展与管理面板看到同一份数据
+const snippets = ref<Snippet[]>(load())
+
+export function useSnippets()
+{
+    const persist = () => {
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(snippets.value))
+    }
+    const reload = () => {
+        snippets.value = load()
+    }
+
+    const add = (s: Omit<Snippet, 'id'>) => {
+        snippets.value.push({...s, id: `sn-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`})
+        persist()
+    }
+    const update = (id: string, patch: Partial<Snippet>) => {
+        const i = snippets.value.findIndex(x => x.id === id)
+        if (i >= 0) {
+            snippets.value[i] = {...snippets.value[i], ...patch}
+            persist()
+        }
+    }
+    const remove = (id: string) => {
+        snippets.value = snippets.value.filter(x => x.id !== id)
+        persist()
+    }
+
+    // 查找某语言下前缀完全匹配的片段（精确前缀 + 语言匹配）
+    const findByPrefix = (prefix: string, lang: string): Snippet | undefined =>
+        snippets.value.find(s =>
+            s.prefix === prefix && (!s.language || s.language === '*' || s.language === lang)
+        )
+
+    return {snippets, reload, persist, add, update, remove, findByPrefix}
+}

From 3864b6087bebe30d0b5a7d3c5c1ad3953a3b9d7e Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Fri, 5 Jun 2026 16:45:08 +0800
Subject: [PATCH 02/22] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E7=89=87?=
 =?UTF-8?q?=E6=AE=B5=E6=94=B9=E5=AD=98=20SQLite=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 snippets 表与 get_snippets/save_snippet/delete_snippet 命令，存于 codeforge.sqlite（与执行历史/AI 对话同库）
- useSnippets 改为调用后端，启动时载入；保留内存 ref 供编辑器 Tab 展开同步读取
- 一次性迁移旧的 localStorage 片段到数据库后清除
---
 src-tauri/src/main.rs          |   9 ++-
 src-tauri/src/snippets.rs      | 105 +++++++++++++++++++++++++++++++++
 src/App.vue                    |   3 +
 src/composables/useSnippets.ts |  89 ++++++++++++++++++++--------
 4 files changed, 180 insertions(+), 26 deletions(-)
 create mode 100644 src-tauri/src/snippets.rs

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index e4c9576..1073c47 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -19,6 +19,7 @@ mod logger;
 mod plugin;
 mod plugins;
 mod setup;
+mod snippets;
 mod update;
 mod utils;
 
@@ -54,6 +55,7 @@ use crate::filesystem::{
 };
 use crate::plugin::{get_info, get_supported_languages};
 use crate::setup::app::get_app_info;
+use crate::snippets::{Snippets, delete_snippet, get_snippets, save_snippet};
 use crate::utils::logger::{
     clear_logs, get_log_directory, get_log_files, reset_log_directory, set_log_directory,
 };
@@ -84,6 +86,7 @@ fn main() {
         .plugin(tauri_plugin_fs::init())
         .manage(ExecutionHistory::new().expect("failed to initialize execution history database"))
         .manage(AiHistory::new().expect("failed to initialize ai history database"))
+        .manage(Snippets::new().expect("failed to initialize snippets database"))
         .manage(ExecutionPluginManagerState::new(PluginManager::new()))
         .manage(EnvironmentManagerState::new(env_manager))
         .setup(|app| {
@@ -198,7 +201,11 @@ fn main() {
             save_ai_conversation,
             list_ai_conversation_ids,
             get_ai_conversation,
-            delete_ai_conversation
+            delete_ai_conversation,
+            // 代码片段
+            get_snippets,
+            save_snippet,
+            delete_snippet
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/src/snippets.rs b/src-tauri/src/snippets.rs
new file mode 100644
index 0000000..8056db6
--- /dev/null
+++ b/src-tauri/src/snippets.rs
@@ -0,0 +1,105 @@
+use crate::execution::get_codeforge_db_path;
+use rusqlite::{Connection, params};
+use serde::{Deserialize, Serialize};
+use std::sync::Mutex as StdMutex;
+use tauri::State;
+
+/// 用户代码片段，存于同一个 codeforge.sqlite 库。
+pub struct Snippets {
+    conn: StdMutex<Connection>,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct Snippet {
+    pub id: String,
+    pub prefix: String,
+    pub body: String,
+    #[serde(default)]
+    pub description: String,
+    /// 适用语言；'*' 或空表示所有语言
+    #[serde(default)]
+    pub language: String,
+}
+
+impl Snippets {
+    pub fn new() -> Result<Self, String> {
+        let db_path = get_codeforge_db_path()?;
+        let conn = Connection::open(&db_path).map_err(|e| format!("打开数据库失败: {}", e))?;
+        let _ = conn.pragma_update(None, "journal_mode", "WAL");
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS snippets (
+                id TEXT PRIMARY KEY,
+                prefix TEXT NOT NULL,
+                body TEXT NOT NULL,
+                description TEXT NOT NULL DEFAULT '',
+                language TEXT NOT NULL DEFAULT '*',
+                updated_at INTEGER NOT NULL DEFAULT 0
+            )",
+            [],
+        )
+        .map_err(|e| format!("初始化代码片段表失败: {}", e))?;
+
+        Ok(Self {
+            conn: StdMutex::new(conn),
+        })
+    }
+}
+
+/// 列出所有代码片段（按前缀排序）
+#[tauri::command]
+pub async fn get_snippets(state: State<'_, Snippets>) -> Result<Vec<Snippet>, String> {
+    let conn = state.conn.lock().map_err(|_| "数据库锁错误".to_string())?;
+    let mut stmt = conn
+        .prepare("SELECT id, prefix, body, description, language FROM snippets ORDER BY prefix")
+        .map_err(|e| format!("查询代码片段失败: {}", e))?;
+    let rows = stmt
+        .query_map([], |row| {
+            Ok(Snippet {
+                id: row.get(0)?,
+                prefix: row.get(1)?,
+                body: row.get(2)?,
+                description: row.get(3)?,
+                language: row.get(4)?,
+            })
+        })
+        .map_err(|e| format!("读取代码片段失败: {}", e))?;
+    let mut out = Vec::new();
+    for r in rows {
+        out.push(r.map_err(|e| format!("读取代码片段失败: {}", e))?);
+    }
+    Ok(out)
+}
+
+/// 新增/更新一条代码片段（按 id upsert）
+#[tauri::command]
+pub async fn save_snippet(snippet: Snippet, state: State<'_, Snippets>) -> Result<(), String> {
+    let conn = state.conn.lock().map_err(|_| "数据库锁错误".to_string())?;
+    let now = std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .map(|d| d.as_millis() as i64)
+        .unwrap_or(0);
+    conn.execute(
+        "INSERT INTO snippets (id, prefix, body, description, language, updated_at)
+         VALUES (?1, ?2, ?3, ?4, ?5, ?6)
+         ON CONFLICT(id) DO UPDATE SET prefix=?2, body=?3, description=?4, language=?5, updated_at=?6",
+        params![
+            snippet.id,
+            snippet.prefix,
+            snippet.body,
+            snippet.description,
+            snippet.language,
+            now
+        ],
+    )
+    .map_err(|e| format!("保存代码片段失败: {}", e))?;
+    Ok(())
+}
+
+/// 删除一条代码片段
+#[tauri::command]
+pub async fn delete_snippet(id: String, state: State<'_, Snippets>) -> Result<(), String> {
+    let conn = state.conn.lock().map_err(|_| "数据库锁错误".to_string())?;
+    conn.execute("DELETE FROM snippets WHERE id = ?1", params![id])
+        .map_err(|e| format!("删除代码片段失败: {}", e))?;
+    Ok(())
+}
diff --git a/src/App.vue b/src/App.vue
index e9e143c..0342e83 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -292,6 +292,7 @@ import GitPanel from './components/GitPanel.vue'
 import GoToLine from './components/GoToLine.vue'
 import Outline from './components/Outline.vue'
 import SnippetManager from './components/SnippetManager.vue'
+import {initSnippets} from './composables/useSnippets'
 import {computeDiffMarkers, setDiffMarkers} from './editor/diffGutter'
 import AiAssistant from './components/AiAssistant.vue'
 import InlineGenerate from './components/InlineGenerate.vue'
@@ -1268,6 +1269,8 @@ onMounted(async () => {
   await loadEditorConfig()
   await initializeEventListeners()
   consoleType.value = getCurrentConsoleType()
+  // 从数据库载入代码片段（并迁移旧的 localStorage 数据）
+  initSnippets()
 
   // 恢复上次打开的文件夹
   const lastRoot = localStorage.getItem(LAST_ROOT_KEY)
diff --git a/src/composables/useSnippets.ts b/src/composables/useSnippets.ts
index e9e2dc6..e4f4d99 100644
--- a/src/composables/useSnippets.ts
+++ b/src/composables/useSnippets.ts
@@ -1,4 +1,5 @@
 import {ref} from 'vue'
+import {invoke} from '@tauri-apps/api/core'
 
 export interface Snippet
 {
@@ -10,51 +11,89 @@ export interface Snippet
     language?: string
 }
 
-const STORAGE_KEY = 'snippets'
+// 模块级共享，保证编辑器扩展与管理面板看到同一份数据
+const snippets = ref<Snippet[]>([])
+let loaded = false
+
+const genId = () => `sn-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`
 
-const load = (): Snippet[] => {
+const load = async () => {
     try {
-        const arr = JSON.parse(localStorage.getItem(STORAGE_KEY) || '[]')
-        return Array.isArray(arr) ? arr : []
+        snippets.value = await invoke<Snippet[]>('get_snippets')
     }
-    catch {
-        return []
+    catch (error) {
+        console.error('加载代码片段失败:', error)
+        snippets.value = []
     }
 }
 
-// 模块级共享，保证编辑器扩展与管理面板看到同一份数据
-const snippets = ref<Snippet[]>(load())
+// 一次性把旧版 localStorage 中的片段迁移进数据库
+const migrateFromLocalStorage = async () => {
+    try {
+        const raw = localStorage.getItem('snippets')
+        if (!raw) {
+            return
+        }
+        const old = JSON.parse(raw)
+        if (Array.isArray(old) && old.length && snippets.value.length === 0) {
+            for (const s of old) {
+                await invoke('save_snippet', {
+                    snippet: {
+                        id: s.id || genId(),
+                        prefix: s.prefix || '',
+                        body: s.body || '',
+                        description: s.description || '',
+                        language: s.language || '*'
+                    }
+                })
+            }
+            await load()
+        }
+        localStorage.removeItem('snippets')
+    }
+    catch (error) {
+        console.error('迁移代码片段失败:', error)
+    }
+}
+
+// 应用启动时调用一次：从数据库载入并迁移旧数据
+export const initSnippets = async () => {
+    if (loaded) {
+        return
+    }
+    loaded = true
+    await load()
+    await migrateFromLocalStorage()
+}
 
 export function useSnippets()
 {
-    const persist = () => {
-        localStorage.setItem(STORAGE_KEY, JSON.stringify(snippets.value))
-    }
-    const reload = () => {
-        snippets.value = load()
+    const add = async (s: Omit<Snippet, 'id'>) => {
+        const snip: Snippet = {id: genId(), ...s}
+        await invoke('save_snippet', {snippet: {description: '', language: '*', ...snip}})
+        snippets.value.push(snip)
     }
 
-    const add = (s: Omit<Snippet, 'id'>) => {
-        snippets.value.push({...s, id: `sn-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`})
-        persist()
-    }
-    const update = (id: string, patch: Partial<Snippet>) => {
+    const update = async (id: string, patch: Partial<Snippet>) => {
         const i = snippets.value.findIndex(x => x.id === id)
-        if (i >= 0) {
-            snippets.value[i] = {...snippets.value[i], ...patch}
-            persist()
+        if (i < 0) {
+            return
         }
+        const merged = {...snippets.value[i], ...patch}
+        await invoke('save_snippet', {snippet: {description: '', language: '*', ...merged}})
+        snippets.value[i] = merged
     }
-    const remove = (id: string) => {
+
+    const remove = async (id: string) => {
+        await invoke('delete_snippet', {id})
         snippets.value = snippets.value.filter(x => x.id !== id)
-        persist()
     }
 
-    // 查找某语言下前缀完全匹配的片段（精确前缀 + 语言匹配）
+    // 查找某语言下前缀完全匹配的片段（同步，供编辑器 Tab 展开）
     const findByPrefix = (prefix: string, lang: string): Snippet | undefined =>
         snippets.value.find(s =>
             s.prefix === prefix && (!s.language || s.language === '*' || s.language === lang)
         )
 
-    return {snippets, reload, persist, add, update, remove, findByPrefix}
+    return {snippets, reload: load, add, update, remove, findByPrefix}
 }

From 54dd86b935ac4b130eeaed6434d42f57b175b30a Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Fri, 5 Jun 2026 23:31:47 +0800
Subject: [PATCH 03/22] =?UTF-8?q?refactor:=20=E5=85=A8=E9=83=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=94=B9=E7=94=A8=20SQLite=20=E9=94=AE=E5=80=BC?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=EF=BC=8C=E7=A7=BB=E9=99=A4=20localStorage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 kv_store 表与 kv_get_all/kv_set/kv_delete 命令
- 前端 useKvStore：启动前一次性载入缓存，同步读取、异步落库
- 迁移 shortcuts/ai-config/run-configs/session-tabs/recent-folders/sidebar/watch-mode/面板尺寸/skipped_version 等全部 localStorage 到数据库
- main.ts 挂载前先 loadKvStore

feat: AI 代码预测（幽灵补全，Tab 接受）
- aiComplete 扩展：StateField + widget 渲染灰色幽灵文本，Tab 接受/Esc 取消（Prec.highest，高于代码片段 Tab）
- App 防抖请求 ai_chat 预测后续代码并 dispatch 显示；开关存数据库，命令面板可切换
---
 src-tauri/src/kv.rs                    |  73 +++++++++++++
 src-tauri/src/main.rs                  |   9 +-
 src/App.vue                            | 136 ++++++++++++++++++-------
 src/components/DiffView.vue            |   4 +-
 src/components/ResizablePanels.vue     |   5 +-
 src/composables/useAiConfig.ts         |  20 ++--
 src/composables/useCodeMirrorEditor.ts |   7 +-
 src/composables/useKvStore.ts          |  61 +++++++++++
 src/composables/useShortcuts.ts        |  10 +-
 src/composables/useSnippets.ts         |  32 +-----
 src/composables/useUpdateManager.ts    |   3 +-
 src/editor/aiComplete.ts               | 117 +++++++++++++++++++++
 src/main.ts                            |  10 +-
 13 files changed, 391 insertions(+), 96 deletions(-)
 create mode 100644 src-tauri/src/kv.rs
 create mode 100644 src/composables/useKvStore.ts
 create mode 100644 src/editor/aiComplete.ts

diff --git a/src-tauri/src/kv.rs b/src-tauri/src/kv.rs
new file mode 100644
index 0000000..a0bf793
--- /dev/null
+++ b/src-tauri/src/kv.rs
@@ -0,0 +1,73 @@
+use crate::execution::get_codeforge_db_path;
+use rusqlite::{Connection, params};
+use std::collections::HashMap;
+use std::sync::Mutex as StdMutex;
+use tauri::State;
+
+/// 通用键值存储，存于同一个 codeforge.sqlite 库。
+/// 用于替代前端 localStorage，集中持久化所有应用配置/状态。
+pub struct KvStore {
+    conn: StdMutex<Connection>,
+}
+
+impl KvStore {
+    pub fn new() -> Result<Self, String> {
+        let db_path = get_codeforge_db_path()?;
+        let conn = Connection::open(&db_path).map_err(|e| format!("打开数据库失败: {}", e))?;
+        let _ = conn.pragma_update(None, "journal_mode", "WAL");
+        conn.execute(
+            "CREATE TABLE IF NOT EXISTS kv_store (
+                key TEXT PRIMARY KEY,
+                value TEXT NOT NULL
+            )",
+            [],
+        )
+        .map_err(|e| format!("初始化键值表失败: {}", e))?;
+
+        Ok(Self {
+            conn: StdMutex::new(conn),
+        })
+    }
+}
+
+/// 读取所有键值（启动时一次性载入到前端缓存）
+#[tauri::command]
+pub async fn kv_get_all(state: State<'_, KvStore>) -> Result<HashMap<String, String>, String> {
+    let conn = state.conn.lock().map_err(|_| "数据库锁错误".to_string())?;
+    let mut stmt = conn
+        .prepare("SELECT key, value FROM kv_store")
+        .map_err(|e| format!("查询键值失败: {}", e))?;
+    let rows = stmt
+        .query_map([], |row| {
+            Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?))
+        })
+        .map_err(|e| format!("读取键值失败: {}", e))?;
+    let mut map = HashMap::new();
+    for r in rows {
+        let (k, v) = r.map_err(|e| format!("读取键值失败: {}", e))?;
+        map.insert(k, v);
+    }
+    Ok(map)
+}
+
+/// 写入一个键值
+#[tauri::command]
+pub async fn kv_set(key: String, value: String, state: State<'_, KvStore>) -> Result<(), String> {
+    let conn = state.conn.lock().map_err(|_| "数据库锁错误".to_string())?;
+    conn.execute(
+        "INSERT INTO kv_store (key, value) VALUES (?1, ?2)
+         ON CONFLICT(key) DO UPDATE SET value=?2",
+        params![key, value],
+    )
+    .map_err(|e| format!("保存键值失败: {}", e))?;
+    Ok(())
+}
+
+/// 删除一个键
+#[tauri::command]
+pub async fn kv_delete(key: String, state: State<'_, KvStore>) -> Result<(), String> {
+    let conn = state.conn.lock().map_err(|_| "数据库锁错误".to_string())?;
+    conn.execute("DELETE FROM kv_store WHERE key = ?1", params![key])
+        .map_err(|e| format!("删除键值失败: {}", e))?;
+    Ok(())
+}
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 1073c47..c1c0682 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -15,6 +15,7 @@ mod example;
 mod execution;
 mod filesystem;
 mod font;
+mod kv;
 mod logger;
 mod plugin;
 mod plugins;
@@ -53,6 +54,7 @@ use crate::filesystem::{
     read_directory_tree, read_file_lines, read_file_text, rename_path, replace_in_files,
     reveal_path, search_in_files, watch_directory, write_file_text,
 };
+use crate::kv::{KvStore, kv_delete, kv_get_all, kv_set};
 use crate::plugin::{get_info, get_supported_languages};
 use crate::setup::app::get_app_info;
 use crate::snippets::{Snippets, delete_snippet, get_snippets, save_snippet};
@@ -87,6 +89,7 @@ fn main() {
         .manage(ExecutionHistory::new().expect("failed to initialize execution history database"))
         .manage(AiHistory::new().expect("failed to initialize ai history database"))
         .manage(Snippets::new().expect("failed to initialize snippets database"))
+        .manage(KvStore::new().expect("failed to initialize kv store database"))
         .manage(ExecutionPluginManagerState::new(PluginManager::new()))
         .manage(EnvironmentManagerState::new(env_manager))
         .setup(|app| {
@@ -205,7 +208,11 @@ fn main() {
             // 代码片段
             get_snippets,
             save_snippet,
-            delete_snippet
+            delete_snippet,
+            // 通用键值存储（替代 localStorage）
+            kv_get_all,
+            kv_set,
+            kv_delete
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src/App.vue b/src/App.vue
index 0342e83..5cd56aa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -293,6 +293,9 @@ import GoToLine from './components/GoToLine.vue'
 import Outline from './components/Outline.vue'
 import SnippetManager from './components/SnippetManager.vue'
 import {initSnippets} from './composables/useSnippets'
+import {kvGet, kvGetJSON, kvSet, kvSetJSON} from './composables/useKvStore'
+import {useAiConfig} from './composables/useAiConfig'
+import {setGhost, clearGhostIn} from './editor/aiComplete'
 import {computeDiffMarkers, setDiffMarkers} from './editor/diffGutter'
 import AiAssistant from './components/AiAssistant.vue'
 import InlineGenerate from './components/InlineGenerate.vue'
@@ -435,28 +438,20 @@ const handleCopyPath = async (path: string) => {
 
 // ===== 侧栏 / 文件夹 =====
 const rootDir = ref<string | null>(null)
-const sidebarVisible = ref(localStorage.getItem('sidebar-visible') === 'true')
-const sidebarWidth = ref(Number(localStorage.getItem('sidebar-width')) || 240)
+const sidebarVisible = ref(kvGet('sidebar-visible') === 'true')
+const sidebarWidth = ref(Number(kvGet('sidebar-width')) || 240)
 
 // 最近打开的文件夹
 const RECENT_FOLDERS_KEY = 'recent-folders'
 const LAST_ROOT_KEY = 'last-root-dir'
-const loadRecentFolders = (): string[] => {
-  try {
-    return JSON.parse(localStorage.getItem(RECENT_FOLDERS_KEY) || '[]')
-  }
-  catch {
-    return []
-  }
-}
-const recentFolders = ref<string[]>(loadRecentFolders())
+const recentFolders = ref<string[]>(kvGetJSON<string[]>(RECENT_FOLDERS_KEY, []))
 
 // 记住打开的文件夹（去重、置顶、最多 8 个），并记录为上次文件夹
 const rememberFolder = (path: string) => {
   const list = [path, ...recentFolders.value.filter(p => p !== path)].slice(0, 8)
   recentFolders.value = list
-  localStorage.setItem(RECENT_FOLDERS_KEY, JSON.stringify(list))
-  localStorage.setItem(LAST_ROOT_KEY, path)
+  kvSetJSON(RECENT_FOLDERS_KEY, list)
+  kvSet(LAST_ROOT_KEY, path)
 }
 
 const openFolderPath = (path: string) => {
@@ -471,7 +466,7 @@ const SESSION_TABS_KEY = 'session-tabs'
 const persistSession = () => {
   const paths = editorTabs.value.map(t => t.filePath).filter((p): p is string => !!p)
   const activePath = editorTabs.value.find(t => t.id === activeTabId.value)?.filePath || null
-  localStorage.setItem(SESSION_TABS_KEY, JSON.stringify({paths, activePath}))
+  kvSetJSON(SESSION_TABS_KEY, {paths, activePath})
 }
 
 // 标签集合/文件/激活项变化时持久化（不含正文编辑，避免频繁写入）
@@ -482,13 +477,7 @@ watch(
 
 // 启动时恢复上次打开的文件标签（仅已保存且可读的文本文件）
 const restoreSession = async () => {
-  let saved: { paths: string[], activePath: string | null } | null = null
-  try {
-    saved = JSON.parse(localStorage.getItem(SESSION_TABS_KEY) || 'null')
-  }
-  catch {
-    saved = null
-  }
+  const saved = kvGetJSON<{ paths: string[], activePath: string | null } | null>(SESSION_TABS_KEY, null)
   if (!saved || !saved.paths?.length) {
     return
   }
@@ -514,7 +503,7 @@ const restoreSession = async () => {
   }
 }
 
-watch(sidebarVisible, (v) => localStorage.setItem('sidebar-visible', String(v)))
+watch(sidebarVisible, (v) => kvSet('sidebar-visible', String(v)))
 
 // 拖拽改变侧栏宽度
 let resizeStartX = 0
@@ -528,7 +517,7 @@ const stopSidebarResize = () => {
   document.removeEventListener('mouseup', stopSidebarResize)
   document.body.style.userSelect = ''
   document.body.style.cursor = ''
-  localStorage.setItem('sidebar-width', String(sidebarWidth.value))
+  kvSet('sidebar-width', String(sidebarWidth.value))
 }
 const startSidebarResize = (e: MouseEvent) => {
   e.preventDefault()
@@ -659,6 +648,86 @@ const openAiForExecution = (item: ExecutionResult) => {
   showAi.value = true
 }
 
+// ===== AI 代码预测（幽灵补全，Tab 接受）=====
+const {active: aiActive, reload: reloadAiCfg} = useAiConfig()
+const aiCompletion = ref(kvGet('ai-completion') === 'true')
+
+const toggleAiCompletion = () => {
+  aiCompletion.value = !aiCompletion.value
+  kvSet('ai-completion', String(aiCompletion.value))
+  if (!aiCompletion.value) {
+    clearGhostIn(editorView.value)
+  }
+  toast.info(aiCompletion.value ? 'AI 代码预测已开启' : 'AI 代码预测已关闭')
+}
+
+// 清洗补全结果：去掉代码块围栏与开头多余换行
+const cleanCompletion = (raw: string): string => {
+  let s = raw.replace(/^```[a-z]*\n?/i, '').replace(/```\s*$/i, '')
+  s = s.replace(/^\n+/, '')
+  return s
+}
+
+let predictNonce = 0
+const requestPrediction = async () => {
+  if (!aiCompletion.value || isRunning.value) {
+    return
+  }
+  const view = editorView.value
+  if (!view) {
+    return
+  }
+  reloadAiCfg()
+  if (!aiActive.value.apiKey) {
+    return
+  }
+  const sel = view.state.selection.main
+  if (!sel.empty) {
+    return
+  }
+  const pos = sel.head
+  const prefix = view.state.sliceDoc(0, pos)
+  if (!prefix.trim()) {
+    return
+  }
+  const suffix = view.state.sliceDoc(pos)
+  const nonce = ++predictNonce
+  try {
+    const res = await invoke<string>('ai_chat', {
+      provider: aiActive.value.provider,
+      baseUrl: aiActive.value.baseUrl,
+      apiKey: aiActive.value.apiKey,
+      model: aiActive.value.model,
+      system: '你是代码自动补全引擎。只输出应插入在光标处的后续代码，不要解释、不要重复已有代码、不要使用代码块标记。若无合适补全则输出空。',
+      messages: [{
+        role: 'user',
+        content: `语言：${currentLanguage.value}\n光标前代码：\n${prefix}\n\n光标后代码：\n${suffix}\n\n请仅输出应插入光标处的后续代码：`
+      }]
+    })
+    // 丢弃过期结果或光标已移动的情况
+    if (nonce !== predictNonce) {
+      return
+    }
+    const v = editorView.value
+    if (!v || v.state.selection.main.head !== pos) {
+      return
+    }
+    const text = cleanCompletion(res)
+    if (text) {
+      v.dispatch({effects: setGhost.of({text, pos})})
+    }
+  }
+  catch {
+    // 静默失败，不打扰编辑
+  }
+}
+const requestPredictionDebounced = debounce(requestPrediction, 600)
+watch(code, () => {
+  if (aiCompletion.value) {
+    requestPredictionDebounced()
+  }
+})
+
 // 把 AI 代码块应用到编辑器（替换当前内容，可撤销）
 const applyAiCode = (codeText: string) => {
   code.value = codeText
@@ -950,8 +1019,8 @@ const runStdin = ref('')
 const runEnv = ref('')
 
 // 监听模式：保存后自动运行
-const watchMode = ref(localStorage.getItem('watch-mode') === 'true')
-watch(watchMode, (v) => localStorage.setItem('watch-mode', String(v)))
+const watchMode = ref(kvGet('watch-mode') === 'true')
+watch(watchMode, (v) => kvSet('watch-mode', String(v)))
 
 // 保存包装：保存后若开启监听模式则自动运行
 const handleSave = async () => {
@@ -964,14 +1033,8 @@ const handleSave = async () => {
 // ===== 按文件记忆运行配置（args/stdin/env）=====
 const RUN_CONFIGS_KEY = 'run-configs'
 type RunConfig = { args: string, stdin: string, env: string }
-const loadRunConfigs = (): Record<string, RunConfig> => {
-  try {
-    return JSON.parse(localStorage.getItem(RUN_CONFIGS_KEY) || '{}')
-  }
-  catch {
-    return {}
-  }
-}
+const loadRunConfigs = (): Record<string, RunConfig> =>
+    kvGetJSON<Record<string, RunConfig>>(RUN_CONFIGS_KEY, {})
 // 把当前输入写入指定文件的配置（全空则删除该条）
 const saveRunConfig = (path: string) => {
   const map = loadRunConfigs()
@@ -981,7 +1044,7 @@ const saveRunConfig = (path: string) => {
   else {
     map[path] = {args: runArgs.value, stdin: runStdin.value, env: runEnv.value}
   }
-  localStorage.setItem(RUN_CONFIGS_KEY, JSON.stringify(map))
+  kvSetJSON(RUN_CONFIGS_KEY, map)
 }
 // 载入指定文件的配置（无则清空）
 const loadRunConfig = (path: string | null) => {
@@ -1216,6 +1279,7 @@ const paletteCommands = computed<PaletteCommand[]>(() => [
   {id: 'run', label: '运行代码', icon: Play, hint: hintOf('run'), run: () => handleRunCode()},
   {id: 'runSelection', label: '运行选中片段', icon: Play, hint: hintOf('runSelection'), run: () => runSelection()},
   {id: 'watchMode', label: watchMode.value ? '关闭监听模式（保存自动运行）' : '开启监听模式（保存自动运行）', icon: Eye, run: () => { watchMode.value = !watchMode.value }},
+  {id: 'aiCompletion', label: aiCompletion.value ? '关闭 AI 代码预测' : '开启 AI 代码预测（Tab 补全）', icon: Sparkles, run: () => toggleAiCompletion()},
   {id: 'open', label: '打开文件', icon: FolderOpen, hint: hintOf('open'), run: () => handleOpenFileClick()},
   {id: 'openFolder', label: '打开文件夹', icon: FolderOpen, run: () => openFolder()},
   {id: 'save', label: '保存文件', icon: Save, hint: hintOf('save'), run: () => saveFile()},
@@ -1269,11 +1333,11 @@ onMounted(async () => {
   await loadEditorConfig()
   await initializeEventListeners()
   consoleType.value = getCurrentConsoleType()
-  // 从数据库载入代码片段（并迁移旧的 localStorage 数据）
+  // 从数据库载入代码片段
   initSnippets()
 
   // 恢复上次打开的文件夹
-  const lastRoot = localStorage.getItem(LAST_ROOT_KEY)
+  const lastRoot = kvGet(LAST_ROOT_KEY)
   if (lastRoot) {
     rootDir.value = lastRoot
   }
diff --git a/src/components/DiffView.vue b/src/components/DiffView.vue
index 6abafc6..d956a0e 100644
--- a/src/components/DiffView.vue
+++ b/src/components/DiffView.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="fixed inset-0 z-50 flex justify-center pt-16 px-6 pb-6" @click="emit('close')">
-    <div class="w-full max-w-[980px] bg-white dark:bg-gray-800 dark:text-gray-100 rounded-lg shadow-2xl border border-gray-200 dark:border-gray-700 overflow-hidden flex flex-col"
+  <div class="fixed inset-0 z-50 flex items-start justify-center pt-16 px-6 pb-6" @click="emit('close')">
+    <div class="w-full max-w-[980px] max-h-full bg-white dark:bg-gray-800 dark:text-gray-100 rounded-lg shadow-2xl border border-gray-200 dark:border-gray-700 overflow-hidden flex flex-col"
          @click.stop>
       <div class="flex items-center justify-between px-4 py-2.5 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
         <div class="flex items-center gap-2 text-sm font-medium text-gray-700 dark:text-gray-200">
diff --git a/src/components/ResizablePanels.vue b/src/components/ResizablePanels.vue
index 9663c50..ab27d3d 100644
--- a/src/components/ResizablePanels.vue
+++ b/src/components/ResizablePanels.vue
@@ -27,6 +27,7 @@
 <script setup lang="ts">
 import {computed, onMounted, onUnmounted, ref, watch} from 'vue'
 import {SplitDirection} from '../types/app.ts'
+import {kvGet, kvSet} from '../composables/useKvStore'
 
 interface Props
 {
@@ -76,7 +77,7 @@ const initSize = () => {
   // 默认主面板占 60%
   let size = Math.floor(total * 0.6)
 
-  const saved = localStorage.getItem(storageKey.value)
+  const saved = kvGet(storageKey.value)
   if (saved) {
     const parsed = parseInt(saved, 10)
     if (!Number.isNaN(parsed)) {
@@ -154,6 +155,6 @@ const stopResize = () => {
   document.body.style.userSelect = ''
   document.body.style.cursor = ''
 
-  localStorage.setItem(storageKey.value, primarySize.value.toString())
+  kvSet(storageKey.value, primarySize.value.toString())
 }
 </script>
diff --git a/src/composables/useAiConfig.ts b/src/composables/useAiConfig.ts
index 3a82e4c..1cba74b 100644
--- a/src/composables/useAiConfig.ts
+++ b/src/composables/useAiConfig.ts
@@ -1,4 +1,5 @@
 import {computed, reactive} from 'vue'
+import {kvGetJSON, kvSetJSON} from './useKvStore'
 
 export interface AiProviderConfig
 {
@@ -39,20 +40,15 @@ const buildDefault = (): AiConfig => {
 
 const loadRaw = (): AiConfig => {
     const base = buildDefault()
-    try {
-        const saved = JSON.parse(localStorage.getItem(STORAGE_KEY) || 'null')
-        if (saved && saved.providers) {
-            base.provider = saved.provider || base.provider
-            for (const key of Object.keys(base.providers)) {
-                if (saved.providers[key]) {
-                    base.providers[key] = {...base.providers[key], ...saved.providers[key]}
-                }
+    const saved = kvGetJSON<any>(STORAGE_KEY, null)
+    if (saved && saved.providers) {
+        base.provider = saved.provider || base.provider
+        for (const key of Object.keys(base.providers)) {
+            if (saved.providers[key]) {
+                base.providers[key] = {...base.providers[key], ...saved.providers[key]}
             }
         }
     }
-    catch {
-        // 忽略损坏的配置
-    }
     return base
 }
 
@@ -61,7 +57,7 @@ export function useAiConfig()
     const state = reactive<AiConfig>(loadRaw())
 
     const save = () => {
-        localStorage.setItem(STORAGE_KEY, JSON.stringify(state))
+        kvSetJSON(STORAGE_KEY, state)
     }
 
     const reload = () => {
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index 40b7cfa..68018ad 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -78,6 +78,7 @@ import {EditorView, keymap} from "@codemirror/view";
 import {Prec} from "@codemirror/state";
 import {useCodeMirrorFontFamily} from "./useCodeMirrorFontFamily.ts";
 import {diffGutterExtension} from "../editor/diffGutter";
+import {aiCompleteExtension} from "../editor/aiComplete";
 import {useSnippets} from "./useSnippets";
 
 interface Props
@@ -182,7 +183,8 @@ export function useCodeMirrorEditor(props: Props)
         return true
     }
     // 高优先级拦截 Tab；未匹配片段则返回 false，回落到默认缩进
-    const snippetKeymap = Prec.highest(keymap.of([{key: 'Tab', run: expandSnippet}]))
+    // 比默认高、但低于 AI 幽灵补全的 Tab（接受补全优先）
+    const snippetKeymap = Prec.high(keymap.of([{key: 'Tab', run: expandSnippet}]))
 
     // 主题映射
     const themeMap: Record<string, any> = {
@@ -339,6 +341,9 @@ export function useCodeMirrorEditor(props: Props)
         // 代码片段 Tab 展开
         result.push(snippetKeymap)
 
+        // AI 幽灵补全（Tab 接受 / Esc 取消），由外部 dispatch 设置
+        result.push(aiCompleteExtension)
+
         // Git 行内差异标记（标记数据由外部 dispatch 填充，无 git 时为空）
         result.push(diffGutterExtension)
 
diff --git a/src/composables/useKvStore.ts b/src/composables/useKvStore.ts
new file mode 100644
index 0000000..ade0884
--- /dev/null
+++ b/src/composables/useKvStore.ts
@@ -0,0 +1,61 @@
+import {invoke} from '@tauri-apps/api/core'
+
+/**
+ * 通用键值存储，替代 localStorage，持久化到 SQLite。
+ * 启动时一次性把全部键值载入内存缓存，使读取保持同步；写入更新缓存并异步落库。
+ */
+const cache = new Map<string, string>()
+let loaded = false
+
+// 在应用挂载前调用一次，载入全部键值
+export const loadKvStore = async () => {
+    if (loaded) {
+        return
+    }
+    try {
+        const all = await invoke<Record<string, string>>('kv_get_all')
+        for (const [k, v] of Object.entries(all)) {
+            cache.set(k, v)
+        }
+    }
+    catch (error) {
+        console.error('载入键值存储失败:', error)
+    }
+    loaded = true
+}
+
+// 同步读取（缓存）；不存在返回 null
+export const kvGet = (key: string): string | null => {
+    return cache.has(key) ? cache.get(key)! : null
+}
+
+// 读取并 JSON 解析，失败/不存在返回默认值
+export const kvGetJSON = <T>(key: string, fallback: T): T => {
+    const raw = kvGet(key)
+    if (raw == null) {
+        return fallback
+    }
+    try {
+        return JSON.parse(raw) as T
+    }
+    catch {
+        return fallback
+    }
+}
+
+// 写入（更新缓存 + 异步落库）
+export const kvSet = (key: string, value: string) => {
+    cache.set(key, value)
+    invoke('kv_set', {key, value}).catch(e => console.error('保存键值失败:', e))
+}
+
+// 写入对象（JSON 序列化）
+export const kvSetJSON = (key: string, value: unknown) => {
+    kvSet(key, JSON.stringify(value))
+}
+
+// 删除
+export const kvRemove = (key: string) => {
+    cache.delete(key)
+    invoke('kv_delete', {key}).catch(e => console.error('删除键值失败:', e))
+}
diff --git a/src/composables/useShortcuts.ts b/src/composables/useShortcuts.ts
index a7a04f4..88e2076 100644
--- a/src/composables/useShortcuts.ts
+++ b/src/composables/useShortcuts.ts
@@ -1,4 +1,5 @@
 import {computed, ref} from 'vue'
+import {kvGetJSON, kvSetJSON} from './useKvStore'
 
 export interface ShortcutAction
 {
@@ -65,17 +66,12 @@ export function useShortcuts()
     const overrides = ref<Record<string, string>>({})
 
     const load = () => {
-        try {
-            overrides.value = JSON.parse(localStorage.getItem(STORAGE_KEY) || '{}')
-        }
-        catch {
-            overrides.value = {}
-        }
+        overrides.value = kvGetJSON<Record<string, string>>(STORAGE_KEY, {})
     }
     load()
 
     const persist = () => {
-        localStorage.setItem(STORAGE_KEY, JSON.stringify(overrides.value))
+        kvSetJSON(STORAGE_KEY, overrides.value)
     }
 
     // 当前生效的绑定（默认 + 覆盖）
diff --git a/src/composables/useSnippets.ts b/src/composables/useSnippets.ts
index e4f4d99..8f2b3bd 100644
--- a/src/composables/useSnippets.ts
+++ b/src/composables/useSnippets.ts
@@ -27,43 +27,13 @@ const load = async () => {
     }
 }
 
-// 一次性把旧版 localStorage 中的片段迁移进数据库
-const migrateFromLocalStorage = async () => {
-    try {
-        const raw = localStorage.getItem('snippets')
-        if (!raw) {
-            return
-        }
-        const old = JSON.parse(raw)
-        if (Array.isArray(old) && old.length && snippets.value.length === 0) {
-            for (const s of old) {
-                await invoke('save_snippet', {
-                    snippet: {
-                        id: s.id || genId(),
-                        prefix: s.prefix || '',
-                        body: s.body || '',
-                        description: s.description || '',
-                        language: s.language || '*'
-                    }
-                })
-            }
-            await load()
-        }
-        localStorage.removeItem('snippets')
-    }
-    catch (error) {
-        console.error('迁移代码片段失败:', error)
-    }
-}
-
-// 应用启动时调用一次：从数据库载入并迁移旧数据
+// 应用启动时调用一次：从数据库载入
 export const initSnippets = async () => {
     if (loaded) {
         return
     }
     loaded = true
     await load()
-    await migrateFromLocalStorage()
 }
 
 export function useSnippets()
diff --git a/src/composables/useUpdateManager.ts b/src/composables/useUpdateManager.ts
index 723d822..3068640 100644
--- a/src/composables/useUpdateManager.ts
+++ b/src/composables/useUpdateManager.ts
@@ -2,6 +2,7 @@ import {ref} from 'vue'
 import {invoke} from '@tauri-apps/api/core'
 import {listen} from '@tauri-apps/api/event'
 import {CheckCircle, Download, RefreshCw, Wifi} from 'lucide-vue-next'
+import {kvSet} from './useKvStore'
 
 interface UpdateInfo
 {
@@ -210,7 +211,7 @@ export function useUpdateManager()
         }
 
         // 存储跳过的版本信息
-        localStorage.setItem('skipped_version', updateInfo.value.version)
+        kvSet('skipped_version', updateInfo.value.version)
     }
 
     // 事件监听
diff --git a/src/editor/aiComplete.ts b/src/editor/aiComplete.ts
new file mode 100644
index 0000000..b6b6d40
--- /dev/null
+++ b/src/editor/aiComplete.ts
@@ -0,0 +1,117 @@
+import {Decoration, EditorView, WidgetType, keymap} from '@codemirror/view'
+import {Prec, StateEffect, StateField} from '@codemirror/state'
+
+export interface Ghost
+{
+    text: string
+    pos: number
+}
+
+// 设置/清除幽灵补全文本
+export const setGhost = StateEffect.define<Ghost>()
+export const clearGhost = StateEffect.define<null>()
+
+// 幽灵文本 widget（灰色、不可选中，支持多行）
+class GhostWidget extends WidgetType
+{
+    constructor(readonly text: string)
+    {
+        super()
+    }
+
+    eq(other: GhostWidget)
+    {
+        return other.text === this.text
+    }
+
+    toDOM()
+    {
+        const span = document.createElement('span')
+        span.className = 'cm-ai-ghost'
+        span.textContent = this.text
+        return span
+    }
+
+    ignoreEvent()
+    {
+        return true
+    }
+}
+
+// 持有当前幽灵补全：任何文档改动/光标移动都会清除，仅 setGhost 显式设置
+const ghostField = StateField.define<Ghost | null>({
+    create: () => null,
+    update(value, tr) {
+        for (const e of tr.effects) {
+            if (e.is(setGhost)) {
+                return e.value
+            }
+            if (e.is(clearGhost)) {
+                return null
+            }
+        }
+        if (tr.docChanged || tr.selection) {
+            return null
+        }
+        return value
+    },
+    provide: f => EditorView.decorations.from(f, (g) => {
+        if (!g) {
+            return Decoration.none
+        }
+        const deco = Decoration.widget({
+            widget: new GhostWidget(g.text),
+            side: 1
+        })
+        return Decoration.set([deco.range(g.pos)])
+    })
+})
+
+// 是否有幽灵补全显示
+export const hasGhost = (view: EditorView): boolean => view.state.field(ghostField, false) != null
+
+// 接受补全：插入文本并把光标移到末尾
+const acceptGhost = (view: EditorView): boolean => {
+    const g = view.state.field(ghostField, false)
+    if (!g) {
+        return false
+    }
+    view.dispatch({
+        changes: {from: g.pos, insert: g.text},
+        selection: {anchor: g.pos + g.text.length},
+        effects: clearGhost.of(null)
+    })
+    return true
+}
+
+// 取消补全
+const dismissGhost = (view: EditorView): boolean => {
+    if (!view.state.field(ghostField, false)) {
+        return false
+    }
+    view.dispatch({effects: clearGhost.of(null)})
+    return true
+}
+
+// Tab 接受、Esc 取消；无补全时返回 false 回落到默认行为
+const ghostKeymap = Prec.highest(keymap.of([
+    {key: 'Tab', run: acceptGhost},
+    {key: 'Escape', run: dismissGhost}
+]))
+
+const ghostTheme = EditorView.baseTheme({
+    '.cm-ai-ghost': {
+        opacity: '0.4',
+        color: '#8b949e',
+        whiteSpace: 'pre-wrap',
+    },
+})
+
+// 清除当前补全（外部调用，如关闭功能时）
+export const clearGhostIn = (view: EditorView | null | undefined) => {
+    if (view && hasGhost(view)) {
+        view.dispatch({effects: clearGhost.of(null)})
+    }
+}
+
+export const aiCompleteExtension = [ghostField, ghostKeymap, ghostTheme]
diff --git a/src/main.ts b/src/main.ts
index 7229308..f365977 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,7 +2,11 @@ import { createApp } from 'vue'
 import App from './App.vue'
 import './style.css'
 import ToastPlugin from './plugins/toast'
+import { loadKvStore } from './composables/useKvStore'
 
-createApp(App)
-    .use(ToastPlugin)
-    .mount('#app')
+// 先从数据库载入全部键值（替代 localStorage），再挂载应用，保证同步读取可用
+loadKvStore().finally(() => {
+    createApp(App)
+        .use(ToastPlugin)
+        .mount('#app')
+})

From d4d9c3a4b8aa017d7f9221ed563b6fbc5c68fa2f Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Fri, 5 Jun 2026 23:42:35 +0800
Subject: [PATCH 04/22] =?UTF-8?q?feat:=20AI=20=E4=BB=A3=E7=A0=81=E9=A2=84?=
 =?UTF-8?q?=E6=B5=8B=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=8A=B6=E6=80=81=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 编辑器头部状态区在请求中显示「AI 预测中…」（脉冲 Sparkles），用计数器避免并发请求闪烁
- 开启功能时若未配置 API Key 明确 toast 提示，避免静默无反应让用户困惑
---
 src/App.vue | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 5cd56aa..98192a1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -86,6 +86,9 @@
                 </div>
 
                 <div class="flex items-center space-x-2 text-xs text-gray-500">
+                  <span v-if="predicting" class="flex items-center gap-1 text-blue-500">
+                    <Sparkles class="w-3 h-3 animate-pulse"/> AI 预测中…
+                  </span>
                   <span><strong>{{ (code || '').length }}</strong> 字符</span>
                   <span><strong>{{ (code || '').split('\n').length }}</strong> 行</span>
                 </div>
@@ -150,6 +153,9 @@
           </div>
 
           <div class="flex items-center space-x-2 text-xs text-gray-500">
+            <span v-if="predicting" class="flex items-center gap-1 text-blue-500">
+              <Sparkles class="w-3 h-3 animate-pulse"/> AI 预测中…
+            </span>
             <span><strong>{{ (code || '').length }}</strong> 字符</span>
             <span><strong>{{ (code || '').split('\n').length }}</strong> 行</span>
           </div>
@@ -657,8 +663,17 @@ const toggleAiCompletion = () => {
   kvSet('ai-completion', String(aiCompletion.value))
   if (!aiCompletion.value) {
     clearGhostIn(editorView.value)
+    toast.info('AI 代码预测已关闭')
+    return
+  }
+  // 开启时若未配置 API Key，明确提示（否则预测会静默不工作）
+  reloadAiCfg()
+  if (!aiActive.value.apiKey) {
+    toast.warning('AI 代码预测已开启，但尚未配置 API Key，请在「设置 → AI」中填写')
+  }
+  else {
+    toast.info('AI 代码预测已开启，停顿打字即可看到灰色补全，Tab 接受')
   }
-  toast.info(aiCompletion.value ? 'AI 代码预测已开启' : 'AI 代码预测已关闭')
 }
 
 // 清洗补全结果：去掉代码块围栏与开头多余换行
@@ -669,6 +684,9 @@ const cleanCompletion = (raw: string): string => {
 }
 
 let predictNonce = 0
+let predictInflight = 0
+// 是否正在请求 AI 预测（用于状态提示）
+const predicting = ref(false)
 const requestPrediction = async () => {
   if (!aiCompletion.value || isRunning.value) {
     return
@@ -692,6 +710,8 @@ const requestPrediction = async () => {
   }
   const suffix = view.state.sliceDoc(pos)
   const nonce = ++predictNonce
+  predictInflight++
+  predicting.value = true
   try {
     const res = await invoke<string>('ai_chat', {
       provider: aiActive.value.provider,
@@ -720,6 +740,12 @@ const requestPrediction = async () => {
   catch {
     // 静默失败，不打扰编辑
   }
+  finally {
+    predictInflight--
+    if (predictInflight === 0) {
+      predicting.value = false
+    }
+  }
 }
 const requestPredictionDebounced = debounce(requestPrediction, 600)
 watch(code, () => {

From 1f64485fcf6f70df3cc5fba401eedf4b4fa2577a Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Fri, 5 Jun 2026 23:46:27 +0800
Subject: [PATCH 05/22] =?UTF-8?q?feat:=20=E5=B9=BD=E7=81=B5=E8=A1=A5?=
 =?UTF-8?q?=E5=85=A8=E6=98=BE=E7=A4=BA=E6=97=B6=E6=8F=90=E7=A4=BA=E3=80=8C?=
 =?UTF-8?q?Tab=20=E6=8E=A5=E5=8F=97=20=C2=B7=20Esc=20=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E3=80=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

aiComplete 暴露 ghostActive 响应式信号（updateListener 同步），编辑器头部状态区在补全显示时给出操作提示
---
 src/App.vue              |  4 +++-
 src/editor/aiComplete.ts | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 98192a1..56d313c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -89,6 +89,7 @@
                   <span v-if="predicting" class="flex items-center gap-1 text-blue-500">
                     <Sparkles class="w-3 h-3 animate-pulse"/> AI 预测中…
                   </span>
+                  <span v-else-if="ghostActive" class="text-blue-500">Tab 接受 · Esc 取消</span>
                   <span><strong>{{ (code || '').length }}</strong> 字符</span>
                   <span><strong>{{ (code || '').split('\n').length }}</strong> 行</span>
                 </div>
@@ -156,6 +157,7 @@
             <span v-if="predicting" class="flex items-center gap-1 text-blue-500">
               <Sparkles class="w-3 h-3 animate-pulse"/> AI 预测中…
             </span>
+            <span v-else-if="ghostActive" class="text-blue-500">Tab 接受 · Esc 取消</span>
             <span><strong>{{ (code || '').length }}</strong> 字符</span>
             <span><strong>{{ (code || '').split('\n').length }}</strong> 行</span>
           </div>
@@ -301,7 +303,7 @@ import SnippetManager from './components/SnippetManager.vue'
 import {initSnippets} from './composables/useSnippets'
 import {kvGet, kvGetJSON, kvSet, kvSetJSON} from './composables/useKvStore'
 import {useAiConfig} from './composables/useAiConfig'
-import {setGhost, clearGhostIn} from './editor/aiComplete'
+import {setGhost, clearGhostIn, ghostActive} from './editor/aiComplete'
 import {computeDiffMarkers, setDiffMarkers} from './editor/diffGutter'
 import AiAssistant from './components/AiAssistant.vue'
 import InlineGenerate from './components/InlineGenerate.vue'
diff --git a/src/editor/aiComplete.ts b/src/editor/aiComplete.ts
index b6b6d40..04d80e9 100644
--- a/src/editor/aiComplete.ts
+++ b/src/editor/aiComplete.ts
@@ -1,5 +1,9 @@
 import {Decoration, EditorView, WidgetType, keymap} from '@codemirror/view'
 import {Prec, StateEffect, StateField} from '@codemirror/state'
+import {ref} from 'vue'
+
+// 当前是否有幽灵补全显示（供界面提示「Tab 接受」）
+export const ghostActive = ref(false)
 
 export interface Ghost
 {
@@ -114,4 +118,12 @@ export const clearGhostIn = (view: EditorView | null | undefined) => {
     }
 }
 
-export const aiCompleteExtension = [ghostField, ghostKeymap, ghostTheme]
+// 每次更新后同步幽灵补全显示状态到响应式信号
+const ghostWatcher = EditorView.updateListener.of((u) => {
+    const active = u.state.field(ghostField, false) != null
+    if (active !== ghostActive.value) {
+        ghostActive.value = active
+    }
+})
+
+export const aiCompleteExtension = [ghostField, ghostKeymap, ghostTheme, ghostWatcher]

From ff2fe19f1af7fe7c860c62591731128f49c07fc3 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Fri, 5 Jun 2026 23:51:26 +0800
Subject: [PATCH 06/22] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=20AI=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=89=8D=E5=85=88=E5=BC=B9=E5=B7=AE=E5=BC=82?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AiAssistant 的「应用」不再直接覆盖编辑器，改为弹出 DiffView（当前红→AI 建议绿），点「应用」确认后替换。DiffView 增加 title/subtitle/confirmLabel 与 confirm 事件
---
 src/App.vue                 | 23 +++++++++++++++++++++--
 src/components/DiffView.vue | 14 +++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 56d313c..8710c3d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -248,6 +248,16 @@
               :file-name="currentFileName"
               @close="showDiff = false"/>
 
+    <!-- 应用 AI 代码前的差异预览 -->
+    <DiffView v-if="applyPreview"
+              :original="code"
+              :modified="applyPreview.modified"
+              title="应用 AI 代码预览"
+              subtitle="当前（红） → AI 建议（绿），确认后替换编辑器内容"
+              confirm-label="应用"
+              @confirm="confirmApplyAi"
+              @close="applyPreview = null"/>
+
     <!-- 实时预览（Markdown / HTML）-->
     <PreviewPanel v-if="showPreview"
                   :content="code"
@@ -756,9 +766,17 @@ watch(code, () => {
   }
 })
 
-// 把 AI 代码块应用到编辑器（替换当前内容，可撤销）
+// 应用 AI 代码块：先弹出差异预览，确认后再替换（避免直接覆盖）
+const applyPreview = ref<{ modified: string } | null>(null)
 const applyAiCode = (codeText: string) => {
-  code.value = codeText
+  applyPreview.value = {modified: codeText}
+}
+const confirmApplyAi = () => {
+  if (applyPreview.value) {
+    code.value = applyPreview.value.modified
+    applyPreview.value = null
+    toast.success('已应用 AI 代码')
+  }
 }
 
 // 当前 CodeMirror view（用于在光标处插入生成的代码）
@@ -1267,6 +1285,7 @@ const isOverlayOpen = () =>
     || showHistory.value || showViewer.value || showRunPrompt.value
     || showQuickOpen.value || showGenerate.value || showSearch.value
     || showCommandPalette.value || showDiff.value || showGoToLine.value || showOutline.value || showSnippets.value
+    || applyPreview.value != null
 
 // 全局快捷键（绑定可在设置中自定义）
 const {matchAction: matchShortcut, reload: reloadShortcuts, getBinding, formatCombo} = useShortcuts()
diff --git a/src/components/DiffView.vue b/src/components/DiffView.vue
index d956a0e..5356231 100644
--- a/src/components/DiffView.vue
+++ b/src/components/DiffView.vue
@@ -5,12 +5,17 @@
       <div class="flex items-center justify-between px-4 py-2.5 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
         <div class="flex items-center gap-2 text-sm font-medium text-gray-700 dark:text-gray-200">
           <GitCompare class="w-4 h-4 text-gray-400"/>
-          <span>差异对比</span>
+          <span>{{ title || '差异对比' }}</span>
           <span v-if="fileName" class="text-xs text-gray-400">· {{ fileName }}</span>
         </div>
         <div class="flex items-center gap-3 text-xs">
           <span class="text-green-600 dark:text-green-400">+{{ added }}</span>
           <span class="text-red-600 dark:text-red-400">−{{ removed }}</span>
+          <button v-if="confirmLabel"
+                  class="px-2 py-1 rounded bg-blue-500 hover:bg-blue-600 text-white cursor-pointer"
+                  @click="emit('confirm')">
+            {{ confirmLabel }}
+          </button>
           <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" title="关闭" @click="emit('close')">
             <X class="w-4 h-4"/>
           </button>
@@ -18,7 +23,7 @@
       </div>
 
       <div class="flex items-center px-4 py-1.5 text-xs text-gray-400 border-b border-gray-100 dark:border-gray-700 flex-shrink-0">
-        已保存（红） → 当前（绿）
+        {{ subtitle || '已保存（红） → 当前（绿）' }}
       </div>
 
       <div class="flex-1 overflow-auto font-mono text-xs leading-5 max-h-[70vh]">
@@ -44,8 +49,11 @@ const props = defineProps<{
   original: string
   modified: string
   fileName?: string | null
+  title?: string
+  subtitle?: string
+  confirmLabel?: string
 }>()
-const emit = defineEmits<{ close: [] }>()
+const emit = defineEmits<{ close: []; confirm: [] }>()
 
 interface DiffRow { type: 'same' | 'add' | 'del'; text: string; oldNo?: number; newNo?: number }
 

From 44cb6c253b8b7d98f8d33cbae824426230e56cb5 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:06:08 +0800
Subject: [PATCH 07/22] =?UTF-8?q?feat:=20=E9=9B=86=E6=88=90=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Rust：portable-pty 启动真实 shell，terminal_create/write/resize/kill 命令，后台线程把 PTY 输出经 terminal-output 事件推送，进程退出发 terminal-exit
- 前端：Terminal.vue 用 xterm.js 渲染，跟随深色主题、可拖拽改高度、ResizeObserver 自适应、cwd 取当前文件夹
- 接入快捷键(Mod+`)与命令面板；底部停靠面板
---
 package.json                    |   2 +
 src-tauri/Cargo.lock            | 155 ++++++++++++++++++++++++++-
 src-tauri/Cargo.toml            |   1 +
 src-tauri/src/main.rs           |  12 ++-
 src-tauri/src/terminal.rs       | 178 ++++++++++++++++++++++++++++++++
 src/App.vue                     |  16 ++-
 src/components/Terminal.vue     | 154 +++++++++++++++++++++++++++
 src/composables/useShortcuts.ts |   3 +-
 8 files changed, 513 insertions(+), 8 deletions(-)
 create mode 100644 src-tauri/src/terminal.rs
 create mode 100644 src/components/Terminal.vue

diff --git a/package.json b/package.json
index d997c93..1785026 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,8 @@
     "@tauri-apps/plugin-shell": "^2.3.0",
     "@uiw/codemirror-themes-all": "^4.24.2",
     "@vueuse/core": "^13.6.0",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/xterm": "^6.0.0",
     "codemirror": "^6.0.2",
     "lodash-es": "^4.17.21",
     "lucide-vue-next": "^0.539.0",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index ec51ab3..dad6d15 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -15,6 +15,7 @@ dependencies = [
  "futures-util",
  "log",
  "notify",
+ "portable-pty",
  "regex",
  "reqwest 0.11.27",
  "rfd 0.15.4",
@@ -1237,10 +1238,21 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
 dependencies = [
- "memoffset",
+ "memoffset 0.9.1",
  "rustc_version",
 ]
 
+[[package]]
+name = "filedescriptor"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d"
+dependencies = [
+ "libc",
+ "thiserror 1.0.69",
+ "winapi",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.26"
@@ -2192,6 +2204,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "ioctl-rs"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7970510895cee30b3e9128319f2cefd4bde883a39f38baa279567ba3a7eb97d"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -2343,6 +2364,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
 [[package]]
 name = "libappindicator"
 version = "0.9.0"
@@ -2480,6 +2507,15 @@ version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.9.1"
@@ -2596,6 +2632,20 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
+[[package]]
+name = "nix"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset 0.6.5",
+ "pin-utils",
+]
+
 [[package]]
 name = "nix"
 version = "0.30.1"
@@ -2606,7 +2656,7 @@ dependencies = [
  "cfg-if",
  "cfg_aliases",
  "libc",
- "memoffset",
+ "memoffset 0.9.1",
 ]
 
 [[package]]
@@ -3215,6 +3265,27 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
+[[package]]
+name = "portable-pty"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "806ee80c2a03dbe1a9fb9534f8d19e4c0546b790cde8fd1fea9d6390644cb0be"
+dependencies = [
+ "anyhow",
+ "bitflags 1.3.2",
+ "downcast-rs",
+ "filedescriptor",
+ "lazy_static",
+ "libc",
+ "log",
+ "nix 0.25.1",
+ "serial",
+ "shared_library",
+ "shell-words",
+ "winapi",
+ "winreg 0.10.1",
+]
+
 [[package]]
 name = "potential_utf"
 version = "0.1.2"
@@ -3905,6 +3976,48 @@ dependencies = [
  "syn 2.0.104",
 ]
 
+[[package]]
+name = "serial"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1237a96570fc377c13baa1b88c7589ab66edced652e43ffb17088f003db3e86"
+dependencies = [
+ "serial-core",
+ "serial-unix",
+ "serial-windows",
+]
+
+[[package]]
+name = "serial-core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f46209b345401737ae2125fe5b19a77acce90cd53e1658cda928e4fe9a64581"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "serial-unix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f03fbca4c9d866e24a459cbca71283f545a37f8e3e002ad8c70593871453cab7"
+dependencies = [
+ "ioctl-rs",
+ "libc",
+ "serial-core",
+ "termios",
+]
+
+[[package]]
+name = "serial-windows"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15c6d3b776267a75d31bbdfd5d36c0ca051251caafc285827052bc53bcdc8162"
+dependencies = [
+ "libc",
+ "serial-core",
+]
+
 [[package]]
 name = "serialize-to-javascript"
 version = "0.1.2"
@@ -3969,6 +4082,22 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "shared_library"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
+dependencies = [
+ "lazy_static",
+ "libc",
+]
+
+[[package]]
+name = "shell-words"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77"
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -4651,6 +4780,15 @@ dependencies = [
  "utf-8",
 ]
 
+[[package]]
+name = "termios"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -5013,7 +5151,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
 dependencies = [
- "memoffset",
+ "memoffset 0.9.1",
  "tempfile",
  "winapi",
 ]
@@ -5942,6 +6080,15 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
 
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -6105,7 +6252,7 @@ dependencies = [
  "futures-core",
  "futures-lite",
  "hex",
- "nix",
+ "nix 0.30.1",
  "ordered-stream",
  "serde",
  "serde_repr",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 42c3350..3372903 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -35,6 +35,7 @@ futures-util = "0.3"
 rfd = "0.15"
 fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" }
 async-trait = "0.1"
+portable-pty = "0.8"
 zip = "2.2.2"
 flate2 = "1.0"
 tar = "0.4"
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index c1c0682..3f815d4 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -21,6 +21,7 @@ mod plugin;
 mod plugins;
 mod setup;
 mod snippets;
+mod terminal;
 mod update;
 mod utils;
 
@@ -58,6 +59,9 @@ use crate::kv::{KvStore, kv_delete, kv_get_all, kv_set};
 use crate::plugin::{get_info, get_supported_languages};
 use crate::setup::app::get_app_info;
 use crate::snippets::{Snippets, delete_snippet, get_snippets, save_snippet};
+use crate::terminal::{
+    TerminalState, terminal_create, terminal_kill, terminal_resize, terminal_write,
+};
 use crate::utils::logger::{
     clear_logs, get_log_directory, get_log_files, reset_log_directory, set_log_directory,
 };
@@ -90,6 +94,7 @@ fn main() {
         .manage(AiHistory::new().expect("failed to initialize ai history database"))
         .manage(Snippets::new().expect("failed to initialize snippets database"))
         .manage(KvStore::new().expect("failed to initialize kv store database"))
+        .manage(TerminalState::new())
         .manage(ExecutionPluginManagerState::new(PluginManager::new()))
         .manage(EnvironmentManagerState::new(env_manager))
         .setup(|app| {
@@ -212,7 +217,12 @@ fn main() {
             // 通用键值存储（替代 localStorage）
             kv_get_all,
             kv_set,
-            kv_delete
+            kv_delete,
+            // 集成终端
+            terminal_create,
+            terminal_write,
+            terminal_resize,
+            terminal_kill
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/src/terminal.rs b/src-tauri/src/terminal.rs
new file mode 100644
index 0000000..a586ccc
--- /dev/null
+++ b/src-tauri/src/terminal.rs
@@ -0,0 +1,178 @@
+use portable_pty::{CommandBuilder, MasterPty, PtySize, native_pty_system};
+use std::collections::HashMap;
+use std::io::{Read, Write};
+use std::sync::Mutex as StdMutex;
+use tauri::{AppHandle, Emitter, State};
+
+/// 单个终端会话：保留 master（用于改尺寸）与 writer（用于写入）
+struct TermSession {
+    master: Box<dyn MasterPty + Send>,
+    writer: Box<dyn Write + Send>,
+}
+
+#[derive(Default)]
+pub struct TerminalState {
+    sessions: StdMutex<HashMap<String, TermSession>>,
+}
+
+impl TerminalState {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+#[derive(Clone, serde::Serialize)]
+struct TerminalOutput {
+    id: String,
+    data: Vec<u8>,
+}
+
+/// 创建一个终端会话：启动 shell，并在后台线程把输出通过事件推给前端。
+#[tauri::command]
+pub fn terminal_create(
+    id: String,
+    cwd: Option<String>,
+    cols: u16,
+    rows: u16,
+    app: AppHandle,
+    state: State<'_, TerminalState>,
+) -> Result<(), String> {
+    let pty_system = native_pty_system();
+    let pair = pty_system
+        .openpty(PtySize {
+            rows,
+            cols,
+            pixel_width: 0,
+            pixel_height: 0,
+        })
+        .map_err(|e| format!("打开 PTY 失败: {}", e))?;
+
+    // 选择 shell：优先 $SHELL，其次按平台默认
+    let shell = std::env::var("SHELL").unwrap_or_else(|_| {
+        if cfg!(target_os = "windows") {
+            "powershell.exe".to_string()
+        } else {
+            "/bin/bash".to_string()
+        }
+    });
+    let mut cmd = CommandBuilder::new(shell);
+    if let Some(dir) = cwd.as_ref().filter(|d| !d.is_empty()) {
+        cmd.cwd(dir);
+    }
+    cmd.env("TERM", "xterm-256color");
+
+    let mut child = pair
+        .slave
+        .spawn_command(cmd)
+        .map_err(|e| format!("启动 shell 失败: {}", e))?;
+
+    let mut reader = pair
+        .master
+        .try_clone_reader()
+        .map_err(|e| format!("读取 PTY 失败: {}", e))?;
+    let writer = pair
+        .master
+        .take_writer()
+        .map_err(|e| format!("写入 PTY 失败: {}", e))?;
+
+    {
+        let mut sessions = state
+            .sessions
+            .lock()
+            .map_err(|_| "终端状态锁错误".to_string())?;
+        sessions.insert(
+            id.clone(),
+            TermSession {
+                master: pair.master,
+                writer,
+            },
+        );
+    }
+
+    // 后台读输出 → 事件
+    let app_reader = app.clone();
+    let read_id = id.clone();
+    std::thread::spawn(move || {
+        let mut buf = [0u8; 4096];
+        loop {
+            match reader.read(&mut buf) {
+                Ok(0) => break,
+                Ok(n) => {
+                    let _ = app_reader.emit(
+                        "terminal-output",
+                        TerminalOutput {
+                            id: read_id.clone(),
+                            data: buf[..n].to_vec(),
+                        },
+                    );
+                }
+                Err(_) => break,
+            }
+        }
+        // 进程结束，通知前端
+        let _ = app_reader.emit("terminal-exit", read_id.clone());
+    });
+
+    // 等待子进程结束（独立线程，避免僵尸进程）
+    std::thread::spawn(move || {
+        let _ = child.wait();
+    });
+
+    Ok(())
+}
+
+/// 写入终端（用户键入）
+#[tauri::command]
+pub fn terminal_write(
+    id: String,
+    data: String,
+    state: State<'_, TerminalState>,
+) -> Result<(), String> {
+    let mut sessions = state
+        .sessions
+        .lock()
+        .map_err(|_| "终端状态锁错误".to_string())?;
+    if let Some(s) = sessions.get_mut(&id) {
+        s.writer
+            .write_all(data.as_bytes())
+            .map_err(|e| format!("写入终端失败: {}", e))?;
+        let _ = s.writer.flush();
+    }
+    Ok(())
+}
+
+/// 调整终端尺寸
+#[tauri::command]
+pub fn terminal_resize(
+    id: String,
+    cols: u16,
+    rows: u16,
+    state: State<'_, TerminalState>,
+) -> Result<(), String> {
+    let sessions = state
+        .sessions
+        .lock()
+        .map_err(|_| "终端状态锁错误".to_string())?;
+    if let Some(s) = sessions.get(&id) {
+        s.master
+            .resize(PtySize {
+                rows,
+                cols,
+                pixel_width: 0,
+                pixel_height: 0,
+            })
+            .map_err(|e| format!("调整终端尺寸失败: {}", e))?;
+    }
+    Ok(())
+}
+
+/// 关闭终端会话
+#[tauri::command]
+pub fn terminal_kill(id: String, state: State<'_, TerminalState>) -> Result<(), String> {
+    let mut sessions = state
+        .sessions
+        .lock()
+        .map_err(|_| "终端状态锁错误".to_string())?;
+    sessions.remove(&id);
+    Ok(())
+}
diff --git a/src/App.vue b/src/App.vue
index 8710c3d..e0d761e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -241,6 +241,9 @@
     <!-- 代码片段管理 -->
     <SnippetManager v-if="showSnippets" @close="showSnippets = false"/>
 
+    <!-- 集成终端 -->
+    <Terminal v-if="showTerminal" :root-dir="rootDir" @close="showTerminal = false"/>
+
     <!-- 差异对比：当前 vs 已保存 -->
     <DiffView v-if="showDiff"
               :original="savedContent || ''"
@@ -280,7 +283,7 @@
 <script setup lang="ts">
 import {computed, nextTick, onMounted, onUnmounted, ref, watch} from 'vue'
 import {debounce} from 'lodash-es'
-import {ChevronRight, Code2, CornerDownRight, Eye, FolderOpen, GitBranch, GitCompare, History, ListTree, Maximize2, Monitor, Moon, PanelBottom, PanelLeft, PanelRight, Play, Plus, Save, Search, Settings as SettingsIcon, Sparkles, Sun, X} from 'lucide-vue-next'
+import {ChevronRight, Code2, CornerDownRight, Eye, FolderOpen, GitBranch, GitCompare, History, ListTree, Maximize2, Monitor, Moon, PanelBottom, PanelLeft, PanelRight, Play, Plus, Save, Search, Settings as SettingsIcon, Sparkles, Sun, Terminal as TerminalIcon, X} from 'lucide-vue-next'
 import {ExecutionResult, LayoutMode, SplitDirection} from './types/app.ts'
 import AppHeader from './components/AppHeader.vue'
 import CodeEditor from './components/CodeEditor.vue'
@@ -310,6 +313,7 @@ import GitPanel from './components/GitPanel.vue'
 import GoToLine from './components/GoToLine.vue'
 import Outline from './components/Outline.vue'
 import SnippetManager from './components/SnippetManager.vue'
+import Terminal from './components/Terminal.vue'
 import {initSnippets} from './composables/useSnippets'
 import {kvGet, kvGetJSON, kvSet, kvSetJSON} from './composables/useKvStore'
 import {useAiConfig} from './composables/useAiConfig'
@@ -845,6 +849,12 @@ const openOutline = () => {
 // 代码片段管理
 const showSnippets = ref(false)
 
+// 集成终端
+const showTerminal = ref(false)
+const toggleTerminal = () => {
+  showTerminal.value = !showTerminal.value
+}
+
 const openSearchResult = async (path: string, line: number) => {
   showSearch.value = false
   await smartOpen(path)
@@ -1304,7 +1314,8 @@ const shortcutDispatch: Record<string, () => void> = {
   open: () => handleOpenFileClick(),
   newTab: () => handleNewTab(),
   closeTab: () => handleCloseTab(activeTabId.value),
-  toggleSidebar: () => toggleSidebar()
+  toggleSidebar: () => toggleSidebar(),
+  toggleTerminal: () => toggleTerminal()
 }
 
 // 切换并持久化外观主题
@@ -1337,6 +1348,7 @@ const paletteCommands = computed<PaletteCommand[]>(() => [
   {id: 'gotoLine', label: '跳转到行', icon: CornerDownRight, hint: hintOf('gotoLine'), run: () => openGoToLine()},
   {id: 'outline', label: '符号大纲', icon: ListTree, hint: hintOf('outline'), run: () => openOutline()},
   {id: 'snippets', label: '管理代码片段', icon: Code2, run: () => { showSnippets.value = true }},
+  {id: 'terminal', label: '切换终端', icon: TerminalIcon, hint: hintOf('toggleTerminal'), run: () => toggleTerminal()},
   {id: 'searchInFiles', label: '在文件夹内搜索', icon: Search, hint: hintOf('searchInFiles'), run: () => openSearch()},
   {id: 'generate', label: 'AI 生成代码', icon: Sparkles, hint: hintOf('generate'), run: () => openGenerate()},
   {id: 'showAi', label: 'AI 助手', icon: Sparkles, run: () => handleShowAi()},
diff --git a/src/components/Terminal.vue b/src/components/Terminal.vue
new file mode 100644
index 0000000..ee8d6f5
--- /dev/null
+++ b/src/components/Terminal.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="fixed left-0 right-0 bottom-0 z-40 flex flex-col bg-[#1e1e1e] border-t border-gray-300 dark:border-gray-700 shadow-2xl"
+       :style="{ height: `${height}px` }">
+    <!-- 顶部拖拽改高度 + 标题栏 -->
+    <div class="h-1 cursor-row-resize bg-transparent hover:bg-blue-500 transition-colors flex-shrink-0"
+         @mousedown="startResize"></div>
+    <div class="flex items-center justify-between px-3 py-1 bg-gray-100 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
+      <div class="flex items-center gap-2 text-xs font-medium text-gray-600 dark:text-gray-300">
+        <TerminalIcon class="w-3.5 h-3.5 text-gray-400"/>
+        <span>终端</span>
+        <span v-if="exited" class="text-gray-400">（已结束）</span>
+      </div>
+      <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" title="关闭终端" @click="emit('close')">
+        <X class="w-4 h-4"/>
+      </button>
+    </div>
+    <div ref="termEl" class="flex-1 overflow-hidden px-2 py-1"></div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {nextTick, onBeforeUnmount, onMounted, ref, watch} from 'vue'
+import {invoke} from '@tauri-apps/api/core'
+import {listen, type UnlistenFn} from '@tauri-apps/api/event'
+import {Terminal} from '@xterm/xterm'
+import {FitAddon} from '@xterm/addon-fit'
+import '@xterm/xterm/css/xterm.css'
+import {X, Terminal as TerminalIcon} from 'lucide-vue-next'
+import {useTheme} from '../composables/useTheme'
+
+const props = defineProps<{ rootDir?: string | null }>()
+const emit = defineEmits<{ close: [] }>()
+
+const {isDark} = useTheme()
+
+const termEl = ref<HTMLElement | null>(null)
+const height = ref(300)
+const exited = ref(false)
+
+const id = `term-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`
+let term: Terminal | null = null
+let fit: FitAddon | null = null
+let unlistenOut: UnlistenFn | null = null
+let unlistenExit: UnlistenFn | null = null
+let resizeObserver: ResizeObserver | null = null
+
+const lightTheme = {background: '#ffffff', foreground: '#1f2328', cursor: '#1f2328'}
+const darkTheme = {background: '#1e1e1e', foreground: '#d4d4d4', cursor: '#d4d4d4'}
+
+const doFit = () => {
+  if (!fit || !term) {
+    return
+  }
+  try {
+    fit.fit()
+    invoke('terminal_resize', {id, cols: term.cols, rows: term.rows}).catch(() => {})
+  }
+  catch {
+    // 容器尺寸为 0 时忽略
+  }
+}
+
+onMounted(async () => {
+  await nextTick()
+  if (!termEl.value) {
+    return
+  }
+  term = new Terminal({
+    fontSize: 13,
+    fontFamily: 'Menlo, Monaco, "Courier New", monospace',
+    cursorBlink: true,
+    theme: isDark.value ? darkTheme : lightTheme
+  })
+  fit = new FitAddon()
+  term.loadAddon(fit)
+  term.open(termEl.value)
+  doFit()
+
+  // 接收 PTY 输出
+  unlistenOut = await listen<{ id: string, data: number[] }>('terminal-output', (e) => {
+    if (e.payload.id === id && term) {
+      term.write(new Uint8Array(e.payload.data))
+    }
+  })
+  unlistenExit = await listen<string>('terminal-exit', (e) => {
+    if (e.payload === id) {
+      exited.value = true
+      term?.write('\r\n\x1b[90m[进程已退出]\x1b[0m\r\n')
+    }
+  })
+
+  // 用户键入 → 写入 PTY
+  term.onData((data) => {
+    invoke('terminal_write', {id, data}).catch(() => {})
+  })
+
+  // 启动 shell
+  try {
+    await invoke('terminal_create', {
+      id,
+      cwd: props.rootDir || null,
+      cols: term.cols,
+      rows: term.rows
+    })
+  }
+  catch (error) {
+    term.write(`\r\n\x1b[31m启动终端失败: ${error}\x1b[0m\r\n`)
+  }
+
+  term.focus()
+
+  // 容器尺寸变化时自适应
+  resizeObserver = new ResizeObserver(() => doFit())
+  resizeObserver.observe(termEl.value)
+})
+
+watch(isDark, (dark) => {
+  if (term) {
+    term.options.theme = dark ? darkTheme : lightTheme
+  }
+})
+
+// 面板高度变化后重新 fit
+watch(height, () => nextTick(doFit))
+
+onBeforeUnmount(() => {
+  resizeObserver?.disconnect()
+  unlistenOut?.()
+  unlistenExit?.()
+  invoke('terminal_kill', {id}).catch(() => {})
+  term?.dispose()
+})
+
+// ===== 拖拽改高度 =====
+let startY = 0
+let startH = 0
+const onResize = (e: MouseEvent) => {
+  const h = startH + (startY - e.clientY)
+  height.value = Math.max(140, Math.min(window.innerHeight - 120, h))
+}
+const stopResize = () => {
+  document.removeEventListener('mousemove', onResize)
+  document.removeEventListener('mouseup', stopResize)
+  document.body.style.userSelect = ''
+}
+const startResize = (e: MouseEvent) => {
+  e.preventDefault()
+  startY = e.clientY
+  startH = height.value
+  document.addEventListener('mousemove', onResize)
+  document.addEventListener('mouseup', stopResize)
+  document.body.style.userSelect = 'none'
+}
+</script>
diff --git a/src/composables/useShortcuts.ts b/src/composables/useShortcuts.ts
index 88e2076..d2411e3 100644
--- a/src/composables/useShortcuts.ts
+++ b/src/composables/useShortcuts.ts
@@ -23,7 +23,8 @@ export const SHORTCUT_ACTIONS: ShortcutAction[] = [
     {id: 'generate', label: 'AI 生成代码', default: 'Mod+K'},
     {id: 'newTab', label: '新建标签', default: 'Mod+N'},
     {id: 'closeTab', label: '关闭标签', default: 'Mod+W'},
-    {id: 'toggleSidebar', label: '切换侧栏', default: 'Mod+B'}
+    {id: 'toggleSidebar', label: '切换侧栏', default: 'Mod+B'},
+    {id: 'toggleTerminal', label: '切换终端', default: 'Mod+`'}
 ]
 
 const STORAGE_KEY = 'shortcuts'

From b5b0921dceff941bd05d89ab5c7de8b436d39dfd Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:09:56 +0800
Subject: [PATCH 08/22] =?UTF-8?q?fix:=20=E7=BB=88=E7=AB=AF=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E6=B7=B1=E8=89=B2=E9=85=8D=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

终端不再跟随应用主题，浅色模式下不再出现白底（与为深色设计的 shell 提示符不搭）；统一用深色背景，与面板容器一致
---
 src/components/Terminal.vue | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/components/Terminal.vue b/src/components/Terminal.vue
index ee8d6f5..cc08b9c 100644
--- a/src/components/Terminal.vue
+++ b/src/components/Terminal.vue
@@ -26,13 +26,10 @@ import {Terminal} from '@xterm/xterm'
 import {FitAddon} from '@xterm/addon-fit'
 import '@xterm/xterm/css/xterm.css'
 import {X, Terminal as TerminalIcon} from 'lucide-vue-next'
-import {useTheme} from '../composables/useTheme'
 
 const props = defineProps<{ rootDir?: string | null }>()
 const emit = defineEmits<{ close: [] }>()
 
-const {isDark} = useTheme()
-
 const termEl = ref<HTMLElement | null>(null)
 const height = ref(300)
 const exited = ref(false)
@@ -44,8 +41,8 @@ let unlistenOut: UnlistenFn | null = null
 let unlistenExit: UnlistenFn | null = null
 let resizeObserver: ResizeObserver | null = null
 
-const lightTheme = {background: '#ffffff', foreground: '#1f2328', cursor: '#1f2328'}
-const darkTheme = {background: '#1e1e1e', foreground: '#d4d4d4', cursor: '#d4d4d4'}
+// 终端始终使用深色配色（不随应用主题切换）
+const termTheme = {background: '#1e1e1e', foreground: '#d4d4d4', cursor: '#d4d4d4'}
 
 const doFit = () => {
   if (!fit || !term) {
@@ -69,7 +66,7 @@ onMounted(async () => {
     fontSize: 13,
     fontFamily: 'Menlo, Monaco, "Courier New", monospace',
     cursorBlink: true,
-    theme: isDark.value ? darkTheme : lightTheme
+    theme: termTheme
   })
   fit = new FitAddon()
   term.loadAddon(fit)
@@ -114,12 +111,6 @@ onMounted(async () => {
   resizeObserver.observe(termEl.value)
 })
 
-watch(isDark, (dark) => {
-  if (term) {
-    term.options.theme = dark ? darkTheme : lightTheme
-  }
-})
-
 // 面板高度变化后重新 fit
 watch(height, () => nextTick(doFit))
 

From 3a7fe26029b4cb10795b879cc2dcd66079db9a0a Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:14:13 +0800
Subject: [PATCH 09/22] =?UTF-8?q?fix:=20=E7=BB=88=E7=AB=AF=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=B8=83=E5=B1=80=E5=86=85=E5=81=9C=E9=9D=A0=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E6=8B=96=E6=8B=BD=E9=AB=98=E5=BA=A6=E6=97=B6?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8C=BA/=E7=9B=AE=E5=BD=95=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 不再用 fixed 浮层覆盖，改为 App 纵向布局列里的 flex-shrink-0 子项，上方主区域 flex-1 自动收缩
- 拖拽分隔条改用 bg-gray-200 dark:bg-gray-700 主题色，不再是黑条
---
 src/App.vue                 | 6 +++---
 src/components/Terminal.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e0d761e..7d8f0b6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -175,6 +175,9 @@
       </div>
     </div>
 
+    <!-- 集成终端：停靠在底部，占据高度使上方编辑区自动收缩 -->
+    <Terminal v-if="showTerminal" :root-dir="rootDir" @close="showTerminal = false"/>
+
     <!-- 状态栏 -->
     <StatusBar :env-info="envInfo" :is-loading="isLoadingEnvInfo" :execution-time="lastExecutionTime" :code-length="(code || '').length" @check-environment="refreshEnvInfo"/>
 
@@ -241,9 +244,6 @@
     <!-- 代码片段管理 -->
     <SnippetManager v-if="showSnippets" @close="showSnippets = false"/>
 
-    <!-- 集成终端 -->
-    <Terminal v-if="showTerminal" :root-dir="rootDir" @close="showTerminal = false"/>
-
     <!-- 差异对比：当前 vs 已保存 -->
     <DiffView v-if="showDiff"
               :original="savedContent || ''"
diff --git a/src/components/Terminal.vue b/src/components/Terminal.vue
index cc08b9c..27bb9be 100644
--- a/src/components/Terminal.vue
+++ b/src/components/Terminal.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="fixed left-0 right-0 bottom-0 z-40 flex flex-col bg-[#1e1e1e] border-t border-gray-300 dark:border-gray-700 shadow-2xl"
+  <div class="flex flex-col flex-shrink-0 bg-[#1e1e1e] border-t border-gray-200 dark:border-gray-700"
        :style="{ height: `${height}px` }">
-    <!-- 顶部拖拽改高度 + 标题栏 -->
-    <div class="h-1 cursor-row-resize bg-transparent hover:bg-blue-500 transition-colors flex-shrink-0"
+    <!-- 顶部拖拽改高度 -->
+    <div class="h-1 cursor-row-resize bg-gray-200 dark:bg-gray-700 hover:bg-blue-500 transition-colors flex-shrink-0"
          @mousedown="startResize"></div>
     <div class="flex items-center justify-between px-3 py-1 bg-gray-100 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
       <div class="flex items-center gap-2 text-xs font-medium text-gray-600 dark:text-gray-300">

From 1af876177b7a134c1135451f7b815688da6e0ede Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:16:52 +0800
Subject: [PATCH 10/22] =?UTF-8?q?feat:=20=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=89=E6=A0=87=E4=BD=8D=E7=BD=AE=EF=BC=88?=
 =?UTF-8?q?=E8=A1=8C:=E5=88=97=EF=BC=89=E4=B8=8E=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增 cursorInfo 扩展（updateListener 监听选区），编辑器头部状态区显示「行 X, 列 Y」，有选中时显示「已选 N」
---
 src/App.vue                            |  5 +++++
 src/composables/useCodeMirrorEditor.ts |  4 ++++
 src/editor/cursorInfo.ts               | 27 ++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 src/editor/cursorInfo.ts

diff --git a/src/App.vue b/src/App.vue
index 7d8f0b6..8820a89 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -90,6 +90,8 @@
                     <Sparkles class="w-3 h-3 animate-pulse"/> AI 预测中…
                   </span>
                   <span v-else-if="ghostActive" class="text-blue-500">Tab 接受 · Esc 取消</span>
+                  <span>行 {{ cursorInfo.line }}, 列 {{ cursorInfo.col }}</span>
+                  <span v-if="cursorInfo.selLen">已选 <strong>{{ cursorInfo.selLen }}</strong></span>
                   <span><strong>{{ (code || '').length }}</strong> 字符</span>
                   <span><strong>{{ (code || '').split('\n').length }}</strong> 行</span>
                 </div>
@@ -158,6 +160,8 @@
               <Sparkles class="w-3 h-3 animate-pulse"/> AI 预测中…
             </span>
             <span v-else-if="ghostActive" class="text-blue-500">Tab 接受 · Esc 取消</span>
+            <span>行 {{ cursorInfo.line }}, 列 {{ cursorInfo.col }}</span>
+            <span v-if="cursorInfo.selLen">已选 <strong>{{ cursorInfo.selLen }}</strong></span>
             <span><strong>{{ (code || '').length }}</strong> 字符</span>
             <span><strong>{{ (code || '').split('\n').length }}</strong> 行</span>
           </div>
@@ -318,6 +322,7 @@ import {initSnippets} from './composables/useSnippets'
 import {kvGet, kvGetJSON, kvSet, kvSetJSON} from './composables/useKvStore'
 import {useAiConfig} from './composables/useAiConfig'
 import {setGhost, clearGhostIn, ghostActive} from './editor/aiComplete'
+import {cursorInfo} from './editor/cursorInfo'
 import {computeDiffMarkers, setDiffMarkers} from './editor/diffGutter'
 import AiAssistant from './components/AiAssistant.vue'
 import InlineGenerate from './components/InlineGenerate.vue'
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index 68018ad..776ab2f 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -79,6 +79,7 @@ import {Prec} from "@codemirror/state";
 import {useCodeMirrorFontFamily} from "./useCodeMirrorFontFamily.ts";
 import {diffGutterExtension} from "../editor/diffGutter";
 import {aiCompleteExtension} from "../editor/aiComplete";
+import {cursorListener} from "../editor/cursorInfo";
 import {useSnippets} from "./useSnippets";
 
 interface Props
@@ -344,6 +345,9 @@ export function useCodeMirrorEditor(props: Props)
         // AI 幽灵补全（Tab 接受 / Esc 取消），由外部 dispatch 设置
         result.push(aiCompleteExtension)
 
+        // 光标位置/选中长度（供状态栏显示）
+        result.push(cursorListener)
+
         // Git 行内差异标记（标记数据由外部 dispatch 填充，无 git 时为空）
         result.push(diffGutterExtension)
 
diff --git a/src/editor/cursorInfo.ts b/src/editor/cursorInfo.ts
new file mode 100644
index 0000000..e8ecbb0
--- /dev/null
+++ b/src/editor/cursorInfo.ts
@@ -0,0 +1,27 @@
+import {EditorView} from '@codemirror/view'
+import {ref} from 'vue'
+
+export interface CursorInfo
+{
+    line: number
+    col: number
+    // 选中的字符数（无选中为 0）
+    selLen: number
+}
+
+// 当前光标位置/选中长度（供状态栏显示）
+export const cursorInfo = ref<CursorInfo>({line: 1, col: 1, selLen: 0})
+
+// 监听选区/文档变化，更新光标信息
+export const cursorListener = EditorView.updateListener.of((u) => {
+    if (!u.selectionSet && !u.docChanged) {
+        return
+    }
+    const sel = u.state.selection.main
+    const line = u.state.doc.lineAt(sel.head)
+    cursorInfo.value = {
+        line: line.number,
+        col: sel.head - line.from + 1,
+        selLen: Math.abs(sel.to - sel.from)
+    }
+})

From 81f01e5684a30b88f706a8b00bf3affc3aaaa11f Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:19:50 +0800
Subject: [PATCH 11/22] =?UTF-8?q?feat:=20=E6=9C=80=E8=BF=91=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=85=88=EF=BC=88Cmd+P=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

打开文件时记录到数据库（recent-files，最多 30），快速打开空查询时最近文件按时间优先展示并标注「最近」
---
 src/App.vue                  | 12 ++++++++++++
 src/components/QuickOpen.vue | 25 +++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 8820a89..cde5f88 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -224,6 +224,7 @@
     <!-- 快速打开文件 -->
     <QuickOpen v-if="showQuickOpen && rootDir"
                :root-dir="rootDir"
+               :recent-paths="recentFiles"
                @select="smartOpen"
                @close="showQuickOpen = false"/>
 
@@ -473,6 +474,15 @@ const RECENT_FOLDERS_KEY = 'recent-folders'
 const LAST_ROOT_KEY = 'last-root-dir'
 const recentFolders = ref<string[]>(kvGetJSON<string[]>(RECENT_FOLDERS_KEY, []))
 
+// 最近打开的文件（用于 Cmd+P 优先展示）
+const RECENT_FILES_KEY = 'recent-files'
+const recentFiles = ref<string[]>(kvGetJSON<string[]>(RECENT_FILES_KEY, []))
+const addRecentFile = (path: string) => {
+  const list = [path, ...recentFiles.value.filter(p => p !== path)].slice(0, 30)
+  recentFiles.value = list
+  kvSetJSON(RECENT_FILES_KEY, list)
+}
+
 // 记住打开的文件夹（去重、置顶、最多 8 个），并记录为上次文件夹
 const rememberFolder = (path: string) => {
   const list = [path, ...recentFolders.value.filter(p => p !== path)].slice(0, 8)
@@ -588,6 +598,8 @@ const smartOpen = async (filePath: string) => {
       return
     }
 
+    addRecentFile(filePath)
+
     // 已打开则切换到对应标签，否则在新标签打开
     const existing = editorTabs.value.find(t => t.filePath === filePath)
     if (existing) {
diff --git a/src/components/QuickOpen.vue b/src/components/QuickOpen.vue
index e7f7fe5..6cfe82b 100644
--- a/src/components/QuickOpen.vue
+++ b/src/components/QuickOpen.vue
@@ -28,6 +28,7 @@
           <FileText class="w-4 h-4 text-gray-400 flex-shrink-0 mr-2"/>
           <span class="text-sm text-gray-800 dark:text-gray-100 truncate">{{ file.name }}</span>
           <span class="ml-2 text-xs text-gray-400 truncate">{{ file.dir }}</span>
+          <span v-if="!query && recentSet.has(file.path)" class="ml-auto pl-2 text-[10px] text-blue-500 flex-shrink-0">最近</span>
         </button>
       </div>
     </div>
@@ -47,7 +48,7 @@ interface FileItem
   lower: string
 }
 
-const props = defineProps<{ rootDir: string }>()
+const props = defineProps<{ rootDir: string; recentPaths?: string[] }>()
 const emit = defineEmits<{ select: [path: string]; close: [] }>()
 
 const query = ref('')
@@ -61,6 +62,8 @@ const setItemRef = (el: any, i: number) => {
   if (el) itemRefs[i] = el
 }
 
+const recentSet = computed(() => new Set(props.recentPaths || []))
+
 const rel = (p: string) => p.startsWith(props.rootDir) ? p.slice(props.rootDir.length + 1) : p
 
 onMounted(async () => {
@@ -82,10 +85,28 @@ onMounted(async () => {
   }
 })
 
+// 空查询时：最近打开的文件优先（按最近顺序），其余随后
+const emptyOrdered = computed<FileItem[]>(() => {
+  const recent = props.recentPaths || []
+  if (!recent.length) {
+    return allFiles.value.slice(0, 50)
+  }
+  const byPath = new Map(allFiles.value.map(f => [f.path, f]))
+  const recentItems: FileItem[] = []
+  for (const p of recent) {
+    const f = byPath.get(p)
+    if (f) {
+      recentItems.push(f)
+      byPath.delete(p)
+    }
+  }
+  return [...recentItems, ...byPath.values()].slice(0, 50)
+})
+
 const filtered = computed<FileItem[]>(() => {
   const q = query.value.trim().toLowerCase()
   if (!q) {
-    return allFiles.value.slice(0, 50)
+    return emptyOrdered.value
   }
   const scored = allFiles.value
       .map(f => {

From bd2ab0aff7bdbd492caa3e479f4e8e667ca1a5cc Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:23:01 +0800
Subject: [PATCH 12/22] =?UTF-8?q?feat:=20AI=20=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

命令面板新增「AI 格式化代码」：请求 AI 返回整理后的完整代码，复用应用前差异预览确认后替换；复用 useAiConfig 与 cleanCompletion
---
 src/App.vue | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/App.vue b/src/App.vue
index cde5f88..29b9991 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -679,6 +679,39 @@ const generateTests = () => {
   openAiWithPrompt(`请为下面这段 ${currentLanguage.value} 代码生成单元测试，覆盖主要分支与边界情况，使用该语言常用的测试框架，只输出测试代码：\n\n\`\`\`${currentLanguage.value}\n${snippet}\n\`\`\``)
 }
 
+// AI 格式化/整理代码：请求 AI 返回整理后的完整代码，再走应用前差异预览确认
+const formatWithAi = async () => {
+  reloadAiCfg()
+  if (!aiActive.value.apiKey) {
+    toast.warning('请先在「设置 → AI」中配置 API Key')
+    return
+  }
+  const src = code.value
+  if (!src.trim()) {
+    return
+  }
+  toast.info('正在请求 AI 整理代码…')
+  try {
+    const res = await invoke<string>('ai_chat', {
+      provider: aiActive.value.provider,
+      baseUrl: aiActive.value.baseUrl,
+      apiKey: aiActive.value.apiKey,
+      model: aiActive.value.model,
+      system: '你是代码格式化与整理工具。只输出整理后的完整代码，保持逻辑与行为不变，规范缩进与风格，不要解释、不要使用代码块标记。',
+      messages: [{role: 'user', content: `语言：${currentLanguage.value}\n请整理/格式化下面的代码：\n${src}`}]
+    })
+    const formatted = cleanCompletion(res)
+    if (!formatted || formatted === src) {
+      toast.info('代码无需调整')
+      return
+    }
+    applyAiCode(formatted)
+  }
+  catch (error) {
+    toast.error('格式化失败: ' + error)
+  }
+}
+
 const openAiForExecution = (item: ExecutionResult) => {
   aiExecutionId.value = item.id ?? null
   aiErrorContext.value = item.success
@@ -1371,6 +1404,7 @@ const paletteCommands = computed<PaletteCommand[]>(() => [
   {id: 'showAi', label: 'AI 助手', icon: Sparkles, run: () => handleShowAi()},
   {id: 'explainCode', label: 'AI 解释代码（选中或全文）', icon: Sparkles, run: () => explainCode()},
   {id: 'generateTests', label: 'AI 生成测试（选中或全文）', icon: Sparkles, run: () => generateTests()},
+  {id: 'formatWithAi', label: 'AI 格式化代码', icon: Sparkles, run: () => formatWithAi()},
   {id: 'history', label: '执行历史', icon: History, run: () => { showHistory.value = true }},
   {id: 'diff', label: '差异对比（当前 vs 已保存）', icon: GitCompare, run: () => openDiff()},
   {id: 'preview', label: '实时预览（Markdown / HTML）', icon: Eye, run: () => togglePreview()},

From 1d8618ee004c30df2633a9ce5a95d4519ab36f15 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:25:09 +0800
Subject: [PATCH 13/22] =?UTF-8?q?feat:=20=E7=BB=88=E7=AB=AF=E5=A4=9A?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Terminal.vue 重构为多会话：标签栏可新建(+)/切换/关闭单个终端，每个 tab 独立 xterm 实例与 PTY 会话（按 id 路由输出），仅渲染激活会话、切换时重新 fit；关闭最后一个标签收起面板
---
 src/components/Terminal.vue | 195 ++++++++++++++++++++++++++----------
 1 file changed, 141 insertions(+), 54 deletions(-)

diff --git a/src/components/Terminal.vue b/src/components/Terminal.vue
index 27bb9be..164b1ec 100644
--- a/src/components/Terminal.vue
+++ b/src/components/Terminal.vue
@@ -4,17 +4,48 @@
     <!-- 顶部拖拽改高度 -->
     <div class="h-1 cursor-row-resize bg-gray-200 dark:bg-gray-700 hover:bg-blue-500 transition-colors flex-shrink-0"
          @mousedown="startResize"></div>
-    <div class="flex items-center justify-between px-3 py-1 bg-gray-100 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
-      <div class="flex items-center gap-2 text-xs font-medium text-gray-600 dark:text-gray-300">
-        <TerminalIcon class="w-3.5 h-3.5 text-gray-400"/>
-        <span>终端</span>
-        <span v-if="exited" class="text-gray-400">（已结束）</span>
+
+    <!-- 标签栏 -->
+    <div class="flex items-stretch bg-gray-100 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 flex-shrink-0 overflow-x-auto
+                [&::-webkit-scrollbar]:hidden [-ms-overflow-style:none] [scrollbar-width:none]">
+      <div class="flex items-center gap-2 px-2 text-xs font-medium text-gray-500 dark:text-gray-400 flex-shrink-0">
+        <TerminalIcon class="w-3.5 h-3.5"/>
+      </div>
+      <div v-for="s in sessions"
+           :key="s.id"
+           class="group flex items-center gap-1.5 pl-3 pr-2 py-1 border-r border-gray-200 dark:border-gray-700 cursor-pointer text-xs flex-shrink-0"
+           :class="s.id === activeId ? 'bg-[#1e1e1e] text-gray-200' : 'text-gray-500 dark:text-gray-400 hover:bg-gray-200 dark:hover:bg-gray-700'"
+           @click="switchTo(s.id)">
+        <span>{{ s.title }}</span>
+        <span v-if="s.exited" class="text-gray-500">·已结束</span>
+        <button class="rounded p-0.5 text-gray-400 hover:text-gray-200 hover:bg-gray-600 opacity-0 group-hover:opacity-100 transition-opacity"
+                :class="{ 'opacity-100': s.id === activeId }"
+                title="关闭"
+                @click.stop="closeSession(s.id)">
+          <X class="w-3 h-3"/>
+        </button>
       </div>
-      <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" title="关闭终端" @click="emit('close')">
-        <X class="w-4 h-4"/>
+      <button class="flex items-center justify-center px-2 text-gray-400 hover:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-700 cursor-pointer flex-shrink-0"
+              title="新建终端"
+              @click="createSession">
+        <Plus class="w-3.5 h-3.5"/>
       </button>
+      <div class="flex-1"></div>
+      <button class="flex items-center justify-center px-2 text-gray-400 hover:text-gray-200 cursor-pointer flex-shrink-0"
+              title="关闭终端面板"
+              @click="emit('close')">
+        <ChevronDown class="w-4 h-4"/>
+      </button>
+    </div>
+
+    <!-- 各会话的容器：仅显示当前激活的 -->
+    <div class="flex-1 overflow-hidden relative">
+      <div v-for="s in sessions"
+           :key="s.id"
+           v-show="s.id === activeId"
+           :ref="el => setContainerRef(s.id, el)"
+           class="absolute inset-0 px-2 py-1"></div>
     </div>
-    <div ref="termEl" class="flex-1 overflow-hidden px-2 py-1"></div>
   </div>
 </template>
 
@@ -25,101 +56,157 @@ import {listen, type UnlistenFn} from '@tauri-apps/api/event'
 import {Terminal} from '@xterm/xterm'
 import {FitAddon} from '@xterm/addon-fit'
 import '@xterm/xterm/css/xterm.css'
-import {X, Terminal as TerminalIcon} from 'lucide-vue-next'
+import {ChevronDown, Plus, X, Terminal as TerminalIcon} from 'lucide-vue-next'
 
 const props = defineProps<{ rootDir?: string | null }>()
 const emit = defineEmits<{ close: [] }>()
 
-const termEl = ref<HTMLElement | null>(null)
+interface Sess { id: string; title: string; exited: boolean }
+
+const sessions = ref<Sess[]>([])
+const activeId = ref('')
 const height = ref(300)
-const exited = ref(false)
 
-const id = `term-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`
-let term: Terminal | null = null
-let fit: FitAddon | null = null
-let unlistenOut: UnlistenFn | null = null
-let unlistenExit: UnlistenFn | null = null
-let resizeObserver: ResizeObserver | null = null
+// xterm 实例与监听器放普通 Map（避免被 Vue 代理）
+interface TermBundle {
+  term: Terminal
+  fit: FitAddon
+  unlistenOut?: UnlistenFn
+  unlistenExit?: UnlistenFn
+  observer?: ResizeObserver
+}
+const terms = new Map<string, TermBundle>()
+const containers = new Map<string, HTMLElement>()
 
-// 终端始终使用深色配色（不随应用主题切换）
+let seq = 0
+const genId = () => `term-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`
 const termTheme = {background: '#1e1e1e', foreground: '#d4d4d4', cursor: '#d4d4d4'}
 
-const doFit = () => {
-  if (!fit || !term) {
+const setContainerRef = (id: string, el: any) => {
+  if (el) {
+    containers.set(id, el as HTMLElement)
+  }
+}
+
+const fitOne = (id: string) => {
+  const b = terms.get(id)
+  if (!b) {
     return
   }
   try {
-    fit.fit()
-    invoke('terminal_resize', {id, cols: term.cols, rows: term.rows}).catch(() => {})
+    b.fit.fit()
+    invoke('terminal_resize', {id, cols: b.term.cols, rows: b.term.rows}).catch(() => {})
   }
   catch {
     // 容器尺寸为 0 时忽略
   }
 }
 
-onMounted(async () => {
+const initXterm = async (id: string) => {
   await nextTick()
-  if (!termEl.value) {
+  const el = containers.get(id)
+  if (!el) {
     return
   }
-  term = new Terminal({
+  const term = new Terminal({
     fontSize: 13,
     fontFamily: 'Menlo, Monaco, "Courier New", monospace',
     cursorBlink: true,
     theme: termTheme
   })
-  fit = new FitAddon()
+  const fit = new FitAddon()
   term.loadAddon(fit)
-  term.open(termEl.value)
-  doFit()
+  term.open(el)
+  const bundle: TermBundle = {term, fit}
+  terms.set(id, bundle)
+  fitOne(id)
 
-  // 接收 PTY 输出
-  unlistenOut = await listen<{ id: string, data: number[] }>('terminal-output', (e) => {
-    if (e.payload.id === id && term) {
+  bundle.unlistenOut = await listen<{ id: string, data: number[] }>('terminal-output', (e) => {
+    if (e.payload.id === id) {
       term.write(new Uint8Array(e.payload.data))
     }
   })
-  unlistenExit = await listen<string>('terminal-exit', (e) => {
+  bundle.unlistenExit = await listen<string>('terminal-exit', (e) => {
     if (e.payload === id) {
-      exited.value = true
-      term?.write('\r\n\x1b[90m[进程已退出]\x1b[0m\r\n')
+      const s = sessions.value.find(x => x.id === id)
+      if (s) {
+        s.exited = true
+      }
+      term.write('\r\n\x1b[90m[进程已退出]\x1b[0m\r\n')
     }
   })
-
-  // 用户键入 → 写入 PTY
   term.onData((data) => {
     invoke('terminal_write', {id, data}).catch(() => {})
   })
 
-  // 启动 shell
   try {
-    await invoke('terminal_create', {
-      id,
-      cwd: props.rootDir || null,
-      cols: term.cols,
-      rows: term.rows
-    })
+    await invoke('terminal_create', {id, cwd: props.rootDir || null, cols: term.cols, rows: term.rows})
   }
   catch (error) {
     term.write(`\r\n\x1b[31m启动终端失败: ${error}\x1b[0m\r\n`)
   }
 
+  bundle.observer = new ResizeObserver(() => fitOne(id))
+  bundle.observer.observe(el)
   term.focus()
+}
 
-  // 容器尺寸变化时自适应
-  resizeObserver = new ResizeObserver(() => doFit())
-  resizeObserver.observe(termEl.value)
-})
+const createSession = () => {
+  const id = genId()
+  seq++
+  sessions.value.push({id, title: `终端 ${seq}`, exited: false})
+  activeId.value = id
+  initXterm(id)
+}
+
+const switchTo = (id: string) => {
+  if (id === activeId.value) {
+    return
+  }
+  activeId.value = id
+  nextTick(() => {
+    fitOne(id)
+    terms.get(id)?.term.focus()
+  })
+}
 
-// 面板高度变化后重新 fit
-watch(height, () => nextTick(doFit))
+const disposeSession = (id: string) => {
+  const b = terms.get(id)
+  if (b) {
+    b.observer?.disconnect()
+    b.unlistenOut?.()
+    b.unlistenExit?.()
+    invoke('terminal_kill', {id}).catch(() => {})
+    b.term.dispose()
+    terms.delete(id)
+  }
+  containers.delete(id)
+}
+
+const closeSession = (id: string) => {
+  disposeSession(id)
+  const idx = sessions.value.findIndex(s => s.id === id)
+  if (idx >= 0) {
+    sessions.value.splice(idx, 1)
+  }
+  if (sessions.value.length === 0) {
+    emit('close')
+    return
+  }
+  if (activeId.value === id) {
+    const next = sessions.value[Math.min(idx, sessions.value.length - 1)]
+    switchTo(next.id)
+  }
+}
+
+watch(height, () => nextTick(() => fitOne(activeId.value)))
+
+onMounted(() => createSession())
 
 onBeforeUnmount(() => {
-  resizeObserver?.disconnect()
-  unlistenOut?.()
-  unlistenExit?.()
-  invoke('terminal_kill', {id}).catch(() => {})
-  term?.dispose()
+  for (const s of sessions.value) {
+    disposeSession(s.id)
+  }
 })
 
 // ===== 拖拽改高度 =====

From 01cf91439fca50753d107ae72fb8ebc15405b7a1 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:28:41 +0800
Subject: [PATCH 14/22] =?UTF-8?q?fix:=20=E7=BB=88=E7=AB=AF=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7=E4=BF=9D=E7=95=99=E4=BC=9A=E8=AF=9D=EF=BC=8Cchrome=20?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=B7=B1=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ⌄ 改为收起(collapse)：仅隐藏面板、保留 PTY 会话与历史，不再卸载重置
- App 首次打开后保持挂载，用 v-show 切换显示；仅关闭所有标签才彻底卸载
- 标签栏改用统一深色配色(#252526/#1e1e1e)，浅色模式下不再出现浅栏配深色激活页的割裂
---
 src/App.vue                 | 20 ++++++++++++++++----
 src/components/Terminal.vue | 19 ++++++++++---------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 29b9991..c66837c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -179,8 +179,13 @@
       </div>
     </div>
 
-    <!-- 集成终端：停靠在底部，占据高度使上方编辑区自动收缩 -->
-    <Terminal v-if="showTerminal" :root-dir="rootDir" @close="showTerminal = false"/>
+    <!-- 集成终端：停靠在底部，占据高度使上方编辑区自动收缩。
+         首次打开后保持挂载，用 v-show 收起以保留会话；关闭所有标签才彻底卸载 -->
+    <Terminal v-if="terminalMounted"
+              v-show="showTerminal"
+              :root-dir="rootDir"
+              @collapse="showTerminal = false"
+              @close="showTerminal = false; terminalMounted = false"/>
 
     <!-- 状态栏 -->
     <StatusBar :env-info="envInfo" :is-loading="isLoadingEnvInfo" :execution-time="lastExecutionTime" :code-length="(code || '').length" @check-environment="refreshEnvInfo"/>
@@ -899,10 +904,17 @@ const openOutline = () => {
 // 代码片段管理
 const showSnippets = ref(false)
 
-// 集成终端
+// 集成终端：首次打开后保持挂载（保留会话），仅切换显示
 const showTerminal = ref(false)
+const terminalMounted = ref(false)
 const toggleTerminal = () => {
-  showTerminal.value = !showTerminal.value
+  if (showTerminal.value) {
+    showTerminal.value = false
+  }
+  else {
+    terminalMounted.value = true
+    showTerminal.value = true
+  }
 }
 
 const openSearchResult = async (path: string, line: number) => {
diff --git a/src/components/Terminal.vue b/src/components/Terminal.vue
index 164b1ec..1714bb1 100644
--- a/src/components/Terminal.vue
+++ b/src/components/Terminal.vue
@@ -5,16 +5,16 @@
     <div class="h-1 cursor-row-resize bg-gray-200 dark:bg-gray-700 hover:bg-blue-500 transition-colors flex-shrink-0"
          @mousedown="startResize"></div>
 
-    <!-- 标签栏 -->
-    <div class="flex items-stretch bg-gray-100 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 flex-shrink-0 overflow-x-auto
+    <!-- 标签栏（终端始终深色，chrome 统一深色更协调）-->
+    <div class="flex items-stretch bg-[#252526] flex-shrink-0 overflow-x-auto
                 [&::-webkit-scrollbar]:hidden [-ms-overflow-style:none] [scrollbar-width:none]">
-      <div class="flex items-center gap-2 px-2 text-xs font-medium text-gray-500 dark:text-gray-400 flex-shrink-0">
+      <div class="flex items-center gap-2 px-2 text-xs font-medium text-gray-500 flex-shrink-0">
         <TerminalIcon class="w-3.5 h-3.5"/>
       </div>
       <div v-for="s in sessions"
            :key="s.id"
-           class="group flex items-center gap-1.5 pl-3 pr-2 py-1 border-r border-gray-200 dark:border-gray-700 cursor-pointer text-xs flex-shrink-0"
-           :class="s.id === activeId ? 'bg-[#1e1e1e] text-gray-200' : 'text-gray-500 dark:text-gray-400 hover:bg-gray-200 dark:hover:bg-gray-700'"
+           class="group flex items-center gap-1.5 pl-3 pr-2 py-1 border-r border-black/30 cursor-pointer text-xs flex-shrink-0"
+           :class="s.id === activeId ? 'bg-[#1e1e1e] text-gray-200' : 'text-gray-400 hover:bg-[#333333]'"
            @click="switchTo(s.id)">
         <span>{{ s.title }}</span>
         <span v-if="s.exited" class="text-gray-500">·已结束</span>
@@ -25,15 +25,15 @@
           <X class="w-3 h-3"/>
         </button>
       </div>
-      <button class="flex items-center justify-center px-2 text-gray-400 hover:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-700 cursor-pointer flex-shrink-0"
+      <button class="flex items-center justify-center px-2 text-gray-400 hover:text-gray-200 hover:bg-[#333333] cursor-pointer flex-shrink-0"
               title="新建终端"
               @click="createSession">
         <Plus class="w-3.5 h-3.5"/>
       </button>
       <div class="flex-1"></div>
       <button class="flex items-center justify-center px-2 text-gray-400 hover:text-gray-200 cursor-pointer flex-shrink-0"
-              title="关闭终端面板"
-              @click="emit('close')">
+              title="收起终端面板（保留会话）"
+              @click="emit('collapse')">
         <ChevronDown class="w-4 h-4"/>
       </button>
     </div>
@@ -59,7 +59,8 @@ import '@xterm/xterm/css/xterm.css'
 import {ChevronDown, Plus, X, Terminal as TerminalIcon} from 'lucide-vue-next'
 
 const props = defineProps<{ rootDir?: string | null }>()
-const emit = defineEmits<{ close: [] }>()
+// close：所有会话已关闭，应彻底关掉面板；collapse：仅收起，保留会话
+const emit = defineEmits<{ close: []; collapse: [] }>()
 
 interface Sess { id: string; title: string; exited: boolean }
 

From 5204afc2d12f04915cc62a93a28d9f9e181347f9 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:31:18 +0800
Subject: [PATCH 15/22] =?UTF-8?q?feat:=20=E9=9D=A2=E5=8C=85=E5=B1=91?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

编辑器头部把已保存文件的路径显示为可点击层级（相对已打开文件夹），点击任一段在访达/资源管理器中定位；未命名草稿仍显示文件名
---
 src/App.vue                    | 12 ++++++++-
 src/components/Breadcrumbs.vue | 46 ++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 src/components/Breadcrumbs.vue

diff --git a/src/App.vue b/src/App.vue
index c66837c..e96ad63 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -79,7 +79,11 @@
                 <div class="flex items-center space-x-3">
                   <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5" :alt="currentLanguage"/>
                   <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
-                  <span v-if="currentFileName" class="text-xs text-gray-500 flex items-center">
+                  <template v-if="currentFilePath">
+                    <span class="text-gray-400 text-xs">·</span>
+                    <Breadcrumbs :path="currentFilePath" :root-dir="rootDir" :dirty="isDirty" @reveal="revealInFinder"/>
+                  </template>
+                  <span v-else-if="currentFileName" class="text-xs text-gray-500 flex items-center">
                     · {{ currentFileName }}
                     <span v-if="isDirty" class="ml-1 text-amber-500" title="有未保存的修改">●</span>
                   </span>
@@ -324,6 +328,7 @@ import GoToLine from './components/GoToLine.vue'
 import Outline from './components/Outline.vue'
 import SnippetManager from './components/SnippetManager.vue'
 import Terminal from './components/Terminal.vue'
+import Breadcrumbs from './components/Breadcrumbs.vue'
 import {initSnippets} from './composables/useSnippets'
 import {kvGet, kvGetJSON, kvSet, kvSetJSON} from './composables/useKvStore'
 import {useAiConfig} from './composables/useAiConfig'
@@ -904,6 +909,11 @@ const openOutline = () => {
 // 代码片段管理
 const showSnippets = ref(false)
 
+// 面包屑点击：在系统文件管理器中显示该路径
+const revealInFinder = (path: string) => {
+  invoke('reveal_path', {path}).catch((error) => toast.error('打开失败: ' + error))
+}
+
 // 集成终端：首次打开后保持挂载（保留会话），仅切换显示
 const showTerminal = ref(false)
 const terminalMounted = ref(false)
diff --git a/src/components/Breadcrumbs.vue b/src/components/Breadcrumbs.vue
new file mode 100644
index 0000000..12aed43
--- /dev/null
+++ b/src/components/Breadcrumbs.vue
@@ -0,0 +1,46 @@
+<template>
+  <span class="flex items-center text-xs text-gray-500 min-w-0">
+    <template v-for="(seg, i) in segments" :key="i">
+      <ChevronRight v-if="i > 0" class="w-3 h-3 mx-0.5 text-gray-300 dark:text-gray-600 flex-shrink-0"/>
+      <button class="hover:text-blue-500 truncate max-w-[160px] cursor-pointer"
+              :title="`在访达中显示：${seg.full}`"
+              @click="emit('reveal', seg.full)">
+        {{ seg.name }}
+      </button>
+    </template>
+    <span v-if="dirty" class="ml-1 text-amber-500 flex-shrink-0" title="有未保存的修改">●</span>
+  </span>
+</template>
+
+<script setup lang="ts">
+import {computed} from 'vue'
+import {ChevronRight} from 'lucide-vue-next'
+
+const props = defineProps<{
+  path: string
+  rootDir?: string | null
+  dirty?: boolean
+}>()
+const emit = defineEmits<{ reveal: [path: string] }>()
+
+interface Seg { name: string; full: string }
+
+const segments = computed<Seg[]>(() => {
+  const p = props.path
+  const root = props.rootDir
+  // 在已打开文件夹内：以文件夹为根显示相对层级；否则只显示文件名
+  if (root && p.startsWith(root)) {
+    const rel = p.slice(root.length).replace(/^[\\/]/, '')
+    const parts = rel.split(/[\\/]/).filter(Boolean)
+    const segs: Seg[] = []
+    let acc = root.replace(/[\\/]$/, '')
+    for (const part of parts) {
+      acc = `${acc}/${part}`
+      segs.push({name: part, full: acc})
+    }
+    return segs
+  }
+  const name = p.split(/[\\/]/).pop() || p
+  return [{name, full: p}]
+})
+</script>

From 169828123c5ccfa3751df886b8cdabb763375f89 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:37:06 +0800
Subject: [PATCH 16/22] =?UTF-8?q?fix:=20=E9=9D=A2=E5=8C=85=E5=B1=91?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E6=A0=B9=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8D?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E7=9B=AE=E5=BD=95=E4=B8=8B=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=8F=AA=E5=89=A9=E5=8D=95=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

之前根目录直属文件的相对路径只有文件名一段，看起来像没有面包屑。改为首段显示文件夹名（DockDoor › icon.json）；未打开文件夹时显示绝对路径末几段
---
 src/components/Breadcrumbs.vue | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/Breadcrumbs.vue b/src/components/Breadcrumbs.vue
index 12aed43..6d8d8d4 100644
--- a/src/components/Breadcrumbs.vue
+++ b/src/components/Breadcrumbs.vue
@@ -28,19 +28,28 @@ interface Seg { name: string; full: string }
 const segments = computed<Seg[]>(() => {
   const p = props.path
   const root = props.rootDir
-  // 在已打开文件夹内：以文件夹为根显示相对层级；否则只显示文件名
+  // 在已打开文件夹内：以文件夹名为首段，再展开相对层级
   if (root && p.startsWith(root)) {
+    const base = root.replace(/[\\/]$/, '')
+    const rootName = base.split(/[\\/]/).pop() || base
     const rel = p.slice(root.length).replace(/^[\\/]/, '')
     const parts = rel.split(/[\\/]/).filter(Boolean)
-    const segs: Seg[] = []
-    let acc = root.replace(/[\\/]$/, '')
+    const segs: Seg[] = [{name: rootName, full: base}]
+    let acc = base
     for (const part of parts) {
       acc = `${acc}/${part}`
       segs.push({name: part, full: acc})
     }
     return segs
   }
-  const name = p.split(/[\\/]/).pop() || p
-  return [{name, full: p}]
+  // 未打开文件夹：显示绝对路径（过长则保留末 4 段，full 仍为完整路径）
+  const parts = p.split(/[\\/]/).filter(Boolean)
+  const segs: Seg[] = []
+  let acc = ''
+  for (const part of parts) {
+    acc = `${acc}/${part}`
+    segs.push({name: part, full: acc})
+  }
+  return segs.length > 5 ? segs.slice(-4) : segs
 })
 </script>

From fd157b4b8989934cc6e0be55ebbe69fa2ee78ec7 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:51:32 +0800
Subject: [PATCH 17/22] =?UTF-8?q?fix:=20=E4=BB=85=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E5=B8=83=E5=B1=80=E7=9A=84=E5=A4=B4=E9=83=A8=E4=B9=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=9D=A2=E5=8C=85=E5=B1=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

之前 replace_all 因两个 header 分支缩进不同只替换了一个，仅编辑器布局仍是旧的 currentFileName 兜底，所以看起来面包屑没生效。补上第二个分支
---
 src/App.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index e96ad63..6c6a027 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -153,7 +153,11 @@
           <div class="flex items-center space-x-3">
             <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5" :alt="currentLanguage"/>
             <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
-            <span v-if="currentFileName" class="text-xs text-gray-500 flex items-center">
+            <template v-if="currentFilePath">
+              <span class="text-gray-400 text-xs">·</span>
+              <Breadcrumbs :path="currentFilePath" :root-dir="rootDir" :dirty="isDirty" @reveal="revealInFinder"/>
+            </template>
+            <span v-else-if="currentFileName" class="text-xs text-gray-500 flex items-center">
               · {{ currentFileName }}
               <span v-if="isDirty" class="ml-1 text-amber-500" title="有未保存的修改">●</span>
             </span>

From bb738a796c0ef55cc22a88347a0a73d9473d8ddd Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:53:48 +0800
Subject: [PATCH 18/22] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E5=A4=B4=E9=83=A8=E4=B8=8D=E6=8D=A2=E8=A1=8C=EF=BC=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=8C=85=E5=B1=91=E8=BF=87=E9=95=BF=E6=A8=AA=E5=90=91=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 图标/标题/右侧光标信息加 whitespace-nowrap + flex-shrink-0，不再被挤换行
- 面包屑外层 min-w-0 overflow-x-auto，过长时横向滚动；段落不截断不换行
- 两个布局分支头部一致处理
---
 src/App.vue                    | 32 ++++++++++++++++++--------------
 src/components/Breadcrumbs.vue |  4 ++--
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6c6a027..133743f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -76,20 +76,22 @@
               <EditorTabs :tabs="editorTabs" :active-id="activeTabId" @switch="switchTab" @close="handleCloseTab" @new="handleNewTab"
                           @close-others="closeOthers" @close-right="closeToRight" @move="moveTab" @copy-path="handleCopyPath"/>
               <div v-if="!showViewer" class="bg-gray-100 dark:bg-gray-800 px-4 py-2 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between flex-shrink-0">
-                <div class="flex items-center space-x-3">
-                  <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5" :alt="currentLanguage"/>
-                  <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
+                <div class="flex items-center space-x-3 min-w-0 flex-1">
+                  <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5 flex-shrink-0" :alt="currentLanguage"/>
+                  <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200 whitespace-nowrap flex-shrink-0">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
                   <template v-if="currentFilePath">
-                    <span class="text-gray-400 text-xs">·</span>
-                    <Breadcrumbs :path="currentFilePath" :root-dir="rootDir" :dirty="isDirty" @reveal="revealInFinder"/>
+                    <span class="text-gray-400 text-xs flex-shrink-0">·</span>
+                    <div class="min-w-0 overflow-x-auto [&::-webkit-scrollbar]:h-1">
+                      <Breadcrumbs :path="currentFilePath" :root-dir="rootDir" :dirty="isDirty" @reveal="revealInFinder"/>
+                    </div>
                   </template>
-                  <span v-else-if="currentFileName" class="text-xs text-gray-500 flex items-center">
+                  <span v-else-if="currentFileName" class="text-xs text-gray-500 flex items-center whitespace-nowrap flex-shrink-0">
                     · {{ currentFileName }}
                     <span v-if="isDirty" class="ml-1 text-amber-500" title="有未保存的修改">●</span>
                   </span>
                 </div>
 
-                <div class="flex items-center space-x-2 text-xs text-gray-500">
+                <div class="flex items-center space-x-2 text-xs text-gray-500 whitespace-nowrap flex-shrink-0 pl-3">
                   <span v-if="predicting" class="flex items-center gap-1 text-blue-500">
                     <Sparkles class="w-3 h-3 animate-pulse"/> AI 预测中…
                   </span>
@@ -150,20 +152,22 @@
         <EditorTabs :tabs="editorTabs" :active-id="activeTabId" @switch="switchTab" @close="handleCloseTab" @new="handleNewTab"
                           @close-others="closeOthers" @close-right="closeToRight" @move="moveTab" @copy-path="handleCopyPath"/>
         <div v-if="!showViewer" class="bg-gray-100 dark:bg-gray-800 px-4 py-2 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between flex-shrink-0">
-          <div class="flex items-center space-x-3">
-            <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5" :alt="currentLanguage"/>
-            <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
+          <div class="flex items-center space-x-3 min-w-0 flex-1">
+            <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5 flex-shrink-0" :alt="currentLanguage"/>
+            <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200 whitespace-nowrap flex-shrink-0">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
             <template v-if="currentFilePath">
-              <span class="text-gray-400 text-xs">·</span>
-              <Breadcrumbs :path="currentFilePath" :root-dir="rootDir" :dirty="isDirty" @reveal="revealInFinder"/>
+              <span class="text-gray-400 text-xs flex-shrink-0">·</span>
+              <div class="min-w-0 overflow-x-auto [&::-webkit-scrollbar]:h-1">
+                <Breadcrumbs :path="currentFilePath" :root-dir="rootDir" :dirty="isDirty" @reveal="revealInFinder"/>
+              </div>
             </template>
-            <span v-else-if="currentFileName" class="text-xs text-gray-500 flex items-center">
+            <span v-else-if="currentFileName" class="text-xs text-gray-500 flex items-center whitespace-nowrap flex-shrink-0">
               · {{ currentFileName }}
               <span v-if="isDirty" class="ml-1 text-amber-500" title="有未保存的修改">●</span>
             </span>
           </div>
 
-          <div class="flex items-center space-x-2 text-xs text-gray-500">
+          <div class="flex items-center space-x-2 text-xs text-gray-500 whitespace-nowrap flex-shrink-0 pl-3">
             <span v-if="predicting" class="flex items-center gap-1 text-blue-500">
               <Sparkles class="w-3 h-3 animate-pulse"/> AI 预测中…
             </span>
diff --git a/src/components/Breadcrumbs.vue b/src/components/Breadcrumbs.vue
index 6d8d8d4..d8cf1f4 100644
--- a/src/components/Breadcrumbs.vue
+++ b/src/components/Breadcrumbs.vue
@@ -1,8 +1,8 @@
 <template>
-  <span class="flex items-center text-xs text-gray-500 min-w-0">
+  <span class="flex items-center text-xs text-gray-500 w-max whitespace-nowrap">
     <template v-for="(seg, i) in segments" :key="i">
       <ChevronRight v-if="i > 0" class="w-3 h-3 mx-0.5 text-gray-300 dark:text-gray-600 flex-shrink-0"/>
-      <button class="hover:text-blue-500 truncate max-w-[160px] cursor-pointer"
+      <button class="hover:text-blue-500 cursor-pointer flex-shrink-0"
               :title="`在访达中显示：${seg.full}`"
               @click="emit('reveal', seg.full)">
         {{ seg.name }}

From d7000799e5aaf6d54fac9eaa9a3a489ea7fb0444 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 00:54:26 +0800
Subject: [PATCH 19/22] =?UTF-8?q?fix:=20=E9=9D=A2=E5=8C=85=E5=B1=91?=
 =?UTF-8?q?=E6=A8=AA=E5=90=91=E6=BB=9A=E5=8A=A8=E9=9A=90=E8=97=8F=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

滚动条遮挡了路径文字，改用与标签栏一致的隐藏方案（仍可滚动）
---
 src/App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 133743f..1dad1f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -81,7 +81,7 @@
                   <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200 whitespace-nowrap flex-shrink-0">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
                   <template v-if="currentFilePath">
                     <span class="text-gray-400 text-xs flex-shrink-0">·</span>
-                    <div class="min-w-0 overflow-x-auto [&::-webkit-scrollbar]:h-1">
+                    <div class="min-w-0 overflow-x-auto [&::-webkit-scrollbar]:hidden [-ms-overflow-style:none] [scrollbar-width:none]">
                       <Breadcrumbs :path="currentFilePath" :root-dir="rootDir" :dirty="isDirty" @reveal="revealInFinder"/>
                     </div>
                   </template>
@@ -157,7 +157,7 @@
             <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200 whitespace-nowrap flex-shrink-0">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
             <template v-if="currentFilePath">
               <span class="text-gray-400 text-xs flex-shrink-0">·</span>
-              <div class="min-w-0 overflow-x-auto [&::-webkit-scrollbar]:h-1">
+              <div class="min-w-0 overflow-x-auto [&::-webkit-scrollbar]:hidden [-ms-overflow-style:none] [scrollbar-width:none]">
                 <Breadcrumbs :path="currentFilePath" :root-dir="rootDir" :dirty="isDirty" @reveal="revealInFinder"/>
               </div>
             </template>

From de7f2ea1242830d49608089d9448bb3d61aad471 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 01:09:44 +0800
Subject: [PATCH 20/22] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20JSON/XML/YAM?=
 =?UTF-8?q?L/Markdown/=E7=BA=AF=E6=96=87=E6=9C=AC=20=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

按既有插件架构，在 src-tauri/src/plugins/ 下各加一个独立插件文件并在 mod.rs/manager.rs 注册：
- json(.json) / xml(.xml) / yaml(.yaml) / markdown(.md) / text(.txt)
- 均为不可编译型，run_command 为 cat $filename，console 输出
- 启动时经 merge_plugins_config 自动并入配置，文件树/检测/语言下拉自动识别对应扩展名
---
 src-tauri/src/plugins/json.rs     | 54 +++++++++++++++++++++++++++++++
 src-tauri/src/plugins/manager.rs  | 10 ++++++
 src-tauri/src/plugins/markdown.rs | 54 +++++++++++++++++++++++++++++++
 src-tauri/src/plugins/mod.rs      |  5 +++
 src-tauri/src/plugins/text.rs     | 54 +++++++++++++++++++++++++++++++
 src-tauri/src/plugins/xml.rs      | 54 +++++++++++++++++++++++++++++++
 src-tauri/src/plugins/yaml.rs     | 54 +++++++++++++++++++++++++++++++
 7 files changed, 285 insertions(+)
 create mode 100644 src-tauri/src/plugins/json.rs
 create mode 100644 src-tauri/src/plugins/markdown.rs
 create mode 100644 src-tauri/src/plugins/text.rs
 create mode 100644 src-tauri/src/plugins/xml.rs
 create mode 100644 src-tauri/src/plugins/yaml.rs

diff --git a/src-tauri/src/plugins/json.rs b/src-tauri/src/plugins/json.rs
new file mode 100644
index 0000000..e228d3a
--- /dev/null
+++ b/src-tauri/src/plugins/json.rs
@@ -0,0 +1,54 @@
+use super::{LanguagePlugin, PluginConfig};
+use std::vec;
+
+pub struct JsonPlugin;
+
+impl LanguagePlugin for JsonPlugin {
+    fn get_order(&self) -> i32 {
+        23
+    }
+
+    fn get_language_name(&self) -> &'static str {
+        "JSON"
+    }
+
+    fn get_language_key(&self) -> &'static str {
+        "json"
+    }
+
+    fn get_file_extension(&self) -> String {
+        self.get_config()
+            .map(|config| config.extension.clone())
+            .unwrap_or_else(|| "json".to_string())
+    }
+
+    fn get_version_args(&self) -> Vec<&'static str> {
+        vec!["--"]
+    }
+
+    fn get_path_command(&self) -> String {
+        "--".to_string()
+    }
+
+    fn get_default_config(&self) -> PluginConfig {
+        PluginConfig {
+            enabled: true,
+            language: String::from("json"),
+            before_compile: None,
+            extension: String::from("json"),
+            execute_home: None,
+            run_command: Some(String::from("cat $filename")),
+            after_compile: None,
+            template: Some(String::from("{\n  \n}")),
+            timeout: Some(30),
+            console_type: Some(String::from("console")),
+            icon_path: None,
+        }
+    }
+
+    fn get_default_command(&self) -> String {
+        self.get_config()
+            .and_then(|config| config.run_command.clone())
+            .unwrap_or_else(|| "cat".to_string())
+    }
+}
diff --git a/src-tauri/src/plugins/manager.rs b/src-tauri/src/plugins/manager.rs
index 9511366..374d7d9 100644
--- a/src-tauri/src/plugins/manager.rs
+++ b/src-tauri/src/plugins/manager.rs
@@ -14,8 +14,10 @@ use crate::plugins::java::JavaPlugin;
 use crate::plugins::javascript_browser::JavaScriptBrowserPlugin;
 use crate::plugins::javascript_jquery::JavaScriptJQueryPlugin;
 use crate::plugins::javascript_nodejs::JavaScriptNodeJsPlugin;
+use crate::plugins::json::JsonPlugin;
 use crate::plugins::kotlin::KotlinPlugin;
 use crate::plugins::lua::LuaPlugin;
+use crate::plugins::markdown::MarkdownPlugin;
 use crate::plugins::nodejs::NodeJSPlugin;
 use crate::plugins::objective_c::ObjectiveCPlugin;
 use crate::plugins::objective_cpp::ObjectiveCppPlugin;
@@ -29,9 +31,12 @@ use crate::plugins::scala::ScalaPlugin;
 use crate::plugins::shell::ShellPlugin;
 use crate::plugins::svg::SvgPlugin;
 use crate::plugins::swift::SwiftPlugin;
+use crate::plugins::text::TextPlugin;
 use crate::plugins::typescript::TypeScriptPlugin;
 use crate::plugins::typescript_browser::TypeScriptBrowserPlugin;
 use crate::plugins::typescript_nodejs::TypeScriptNodeJsPlugin;
+use crate::plugins::xml::XmlPlugin;
+use crate::plugins::yaml::YamlPlugin;
 use std::collections::HashMap;
 
 pub struct PluginManager {
@@ -65,6 +70,11 @@ impl PluginManager {
             ("html".to_string(), Box::new(HtmlPlugin)),
             ("css".to_string(), Box::new(CssPlugin)),
             ("svg".to_string(), Box::new(SvgPlugin)),
+            ("json".to_string(), Box::new(JsonPlugin)),
+            ("xml".to_string(), Box::new(XmlPlugin)),
+            ("yaml".to_string(), Box::new(YamlPlugin)),
+            ("markdown".to_string(), Box::new(MarkdownPlugin)),
+            ("text".to_string(), Box::new(TextPlugin)),
             ("php".to_string(), Box::new(PHPPlugin)),
             ("r".to_string(), Box::new(RPlugin)),
             ("cangjie".to_string(), Box::new(CangjiePlugin)),
diff --git a/src-tauri/src/plugins/markdown.rs b/src-tauri/src/plugins/markdown.rs
new file mode 100644
index 0000000..6336c8c
--- /dev/null
+++ b/src-tauri/src/plugins/markdown.rs
@@ -0,0 +1,54 @@
+use super::{LanguagePlugin, PluginConfig};
+use std::vec;
+
+pub struct MarkdownPlugin;
+
+impl LanguagePlugin for MarkdownPlugin {
+    fn get_order(&self) -> i32 {
+        26
+    }
+
+    fn get_language_name(&self) -> &'static str {
+        "Markdown"
+    }
+
+    fn get_language_key(&self) -> &'static str {
+        "markdown"
+    }
+
+    fn get_file_extension(&self) -> String {
+        self.get_config()
+            .map(|config| config.extension.clone())
+            .unwrap_or_else(|| "md".to_string())
+    }
+
+    fn get_version_args(&self) -> Vec<&'static str> {
+        vec!["--"]
+    }
+
+    fn get_path_command(&self) -> String {
+        "--".to_string()
+    }
+
+    fn get_default_config(&self) -> PluginConfig {
+        PluginConfig {
+            enabled: true,
+            language: String::from("markdown"),
+            before_compile: None,
+            extension: String::from("md"),
+            execute_home: None,
+            run_command: Some(String::from("cat $filename")),
+            after_compile: None,
+            template: Some(String::from("# 标题\n\n在这里输入 Markdown 内容\n")),
+            timeout: Some(30),
+            console_type: Some(String::from("console")),
+            icon_path: None,
+        }
+    }
+
+    fn get_default_command(&self) -> String {
+        self.get_config()
+            .and_then(|config| config.run_command.clone())
+            .unwrap_or_else(|| "cat".to_string())
+    }
+}
diff --git a/src-tauri/src/plugins/mod.rs b/src-tauri/src/plugins/mod.rs
index 012b091..eed10ee 100644
--- a/src-tauri/src/plugins/mod.rs
+++ b/src-tauri/src/plugins/mod.rs
@@ -413,9 +413,11 @@ pub mod java;
 pub mod javascript_browser;
 pub mod javascript_jquery;
 pub mod javascript_nodejs;
+pub mod json;
 pub mod kotlin;
 pub mod lua;
 pub mod manager;
+pub mod markdown;
 pub mod nodejs;
 pub mod objective_c;
 pub mod objective_cpp;
@@ -429,8 +431,11 @@ pub mod scala;
 pub mod shell;
 pub mod svg;
 pub mod swift;
+pub mod text;
 pub mod typescript;
 pub mod typescript_browser;
 pub mod typescript_nodejs;
+pub mod xml;
+pub mod yaml;
 
 pub use manager::PluginManager;
diff --git a/src-tauri/src/plugins/text.rs b/src-tauri/src/plugins/text.rs
new file mode 100644
index 0000000..bff3b20
--- /dev/null
+++ b/src-tauri/src/plugins/text.rs
@@ -0,0 +1,54 @@
+use super::{LanguagePlugin, PluginConfig};
+use std::vec;
+
+pub struct TextPlugin;
+
+impl LanguagePlugin for TextPlugin {
+    fn get_order(&self) -> i32 {
+        27
+    }
+
+    fn get_language_name(&self) -> &'static str {
+        "纯文本"
+    }
+
+    fn get_language_key(&self) -> &'static str {
+        "text"
+    }
+
+    fn get_file_extension(&self) -> String {
+        self.get_config()
+            .map(|config| config.extension.clone())
+            .unwrap_or_else(|| "txt".to_string())
+    }
+
+    fn get_version_args(&self) -> Vec<&'static str> {
+        vec!["--"]
+    }
+
+    fn get_path_command(&self) -> String {
+        "--".to_string()
+    }
+
+    fn get_default_config(&self) -> PluginConfig {
+        PluginConfig {
+            enabled: true,
+            language: String::from("text"),
+            before_compile: None,
+            extension: String::from("txt"),
+            execute_home: None,
+            run_command: Some(String::from("cat $filename")),
+            after_compile: None,
+            template: Some(String::from("")),
+            timeout: Some(30),
+            console_type: Some(String::from("console")),
+            icon_path: None,
+        }
+    }
+
+    fn get_default_command(&self) -> String {
+        self.get_config()
+            .and_then(|config| config.run_command.clone())
+            .unwrap_or_else(|| "cat".to_string())
+    }
+}
diff --git a/src-tauri/src/plugins/xml.rs b/src-tauri/src/plugins/xml.rs
new file mode 100644
index 0000000..31e4eeb
--- /dev/null
+++ b/src-tauri/src/plugins/xml.rs
@@ -0,0 +1,54 @@
+use super::{LanguagePlugin, PluginConfig};
+use std::vec;
+
+pub struct XmlPlugin;
+
+impl LanguagePlugin for XmlPlugin {
+    fn get_order(&self) -> i32 {
+        24
+    }
+
+    fn get_language_name(&self) -> &'static str {
+        "XML"
+    }
+
+    fn get_language_key(&self) -> &'static str {
+        "xml"
+    }
+
+    fn get_file_extension(&self) -> String {
+        self.get_config()
+            .map(|config| config.extension.clone())
+            .unwrap_or_else(|| "xml".to_string())
+    }
+
+    fn get_version_args(&self) -> Vec<&'static str> {
+        vec!["--"]
+    }
+
+    fn get_path_command(&self) -> String {
+        "--".to_string()
+    }
+
+    fn get_default_config(&self) -> PluginConfig {
+        PluginConfig {
+            enabled: true,
+            language: String::from("xml"),
+            before_compile: None,
+            extension: String::from("xml"),
+            execute_home: None,
+            run_command: Some(String::from("cat $filename")),
+            after_compile: None,
+            template: Some(String::from("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")),
+            timeout: Some(30),
+            console_type: Some(String::from("console")),
+            icon_path: None,
+        }
+    }
+
+    fn get_default_command(&self) -> String {
+        self.get_config()
+            .and_then(|config| config.run_command.clone())
+            .unwrap_or_else(|| "cat".to_string())
+    }
+}
diff --git a/src-tauri/src/plugins/yaml.rs b/src-tauri/src/plugins/yaml.rs
new file mode 100644
index 0000000..6de6065
--- /dev/null
+++ b/src-tauri/src/plugins/yaml.rs
@@ -0,0 +1,54 @@
+use super::{LanguagePlugin, PluginConfig};
+use std::vec;
+
+pub struct YamlPlugin;
+
+impl LanguagePlugin for YamlPlugin {
+    fn get_order(&self) -> i32 {
+        25
+    }
+
+    fn get_language_name(&self) -> &'static str {
+        "YAML"
+    }
+
+    fn get_language_key(&self) -> &'static str {
+        "yaml"
+    }
+
+    fn get_file_extension(&self) -> String {
+        self.get_config()
+            .map(|config| config.extension.clone())
+            .unwrap_or_else(|| "yaml".to_string())
+    }
+
+    fn get_version_args(&self) -> Vec<&'static str> {
+        vec!["--"]
+    }
+
+    fn get_path_command(&self) -> String {
+        "--".to_string()
+    }
+
+    fn get_default_config(&self) -> PluginConfig {
+        PluginConfig {
+            enabled: true,
+            language: String::from("yaml"),
+            before_compile: None,
+            extension: String::from("yaml"),
+            execute_home: None,
+            run_command: Some(String::from("cat $filename")),
+            after_compile: None,
+            template: Some(String::from("# 在这里输入 YAML 内容\n")),
+            timeout: Some(30),
+            console_type: Some(String::from("console")),
+            icon_path: None,
+        }
+    }
+
+    fn get_default_command(&self) -> String {
+        self.get_config()
+            .and_then(|config| config.run_command.clone())
+            .unwrap_or_else(|| "cat".to_string())
+    }
+}

From 1bcaf3e49bd64b63e0355cb96d18f654cb868eb9 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 01:10:10 +0800
Subject: [PATCH 21/22] =?UTF-8?q?feat:=20=E6=96=87=E6=9C=AC=E7=B1=BB?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E7=9A=84=20CodeMirror=20=E9=AB=98=E4=BA=AE?=
 =?UTF-8?q?=E4=B8=8E=E5=9B=BE=E6=A0=87=E5=85=9C=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- getLanguageExtension 增加 json/yaml/markdown/xml/text 的高亮（lang-json/markdown/yaml）
- 新增通用 text.svg 图标，语言图标缺失时 @error 回落（头部与标签页）
---
 package.json                           |  3 +++
 public/icons/text.svg                  |  7 +++++++
 src/App.vue                            | 12 ++++++++++--
 src/components/EditorTabs.vue          |  3 ++-
 src/composables/useCodeMirrorEditor.ts | 13 +++++++++++++
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 public/icons/text.svg

diff --git a/package.json b/package.json
index 1785026..1f6fa75 100644
--- a/package.json
+++ b/package.json
@@ -17,10 +17,13 @@
     "@codemirror/lang-html": "^6.4.9",
     "@codemirror/lang-java": "^6.0.2",
     "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/lang-markdown": "^6.5.0",
     "@codemirror/lang-php": "^6.0.2",
     "@codemirror/lang-python": "^6.2.1",
     "@codemirror/lang-rust": "^6.0.2",
     "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/lang-yaml": "^6.1.3",
     "@codemirror/language": "^6.11.2",
     "@codemirror/legacy-modes": "^6.5.1",
     "@codemirror/state": "^6.5.2",
diff --git a/public/icons/text.svg b/public/icons/text.svg
new file mode 100644
index 0000000..c6006d1
--- /dev/null
+++ b/public/icons/text.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#888" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/>
+  <polyline points="14 2 14 8 20 8"/>
+  <line x1="8" y1="13" x2="16" y2="13"/>
+  <line x1="8" y1="17" x2="16" y2="17"/>
+  <line x1="8" y1="9" x2="10" y2="9"/>
+</svg>
diff --git a/src/App.vue b/src/App.vue
index 1dad1f0..d60189a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -77,7 +77,7 @@
                           @close-others="closeOthers" @close-right="closeToRight" @move="moveTab" @copy-path="handleCopyPath"/>
               <div v-if="!showViewer" class="bg-gray-100 dark:bg-gray-800 px-4 py-2 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between flex-shrink-0">
                 <div class="flex items-center space-x-3 min-w-0 flex-1">
-                  <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5 flex-shrink-0" :alt="currentLanguage"/>
+                  <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5 flex-shrink-0" :alt="currentLanguage" @error="onIconError"/>
                   <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200 whitespace-nowrap flex-shrink-0">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
                   <template v-if="currentFilePath">
                     <span class="text-gray-400 text-xs flex-shrink-0">·</span>
@@ -153,7 +153,7 @@
                           @close-others="closeOthers" @close-right="closeToRight" @move="moveTab" @copy-path="handleCopyPath"/>
         <div v-if="!showViewer" class="bg-gray-100 dark:bg-gray-800 px-4 py-2 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between flex-shrink-0">
           <div class="flex items-center space-x-3 min-w-0 flex-1">
-            <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5 flex-shrink-0" :alt="currentLanguage"/>
+            <img :src="`/icons/${currentLanguage.replace(/\d+$/, '')}.svg`" class="w-5 h-5 flex-shrink-0" :alt="currentLanguage" @error="onIconError"/>
             <h2 class="text-sm font-medium text-gray-700 dark:text-gray-200 whitespace-nowrap flex-shrink-0">{{ getLanguageDisplayName(currentLanguage) }} 代码编辑器</h2>
             <template v-if="currentFilePath">
               <span class="text-gray-400 text-xs flex-shrink-0">·</span>
@@ -917,6 +917,14 @@ const openOutline = () => {
 // 代码片段管理
 const showSnippets = ref(false)
 
+// 语言图标缺失时回落到通用文本图标
+const onIconError = (e: Event) => {
+  const t = e.target as HTMLImageElement
+  if (!t.src.endsWith('/icons/text.svg')) {
+    t.src = '/icons/text.svg'
+  }
+}
+
 // 面包屑点击：在系统文件管理器中显示该路径
 const revealInFinder = (path: string) => {
   invoke('reveal_path', {path}).catch((error) => toast.error('打开失败: ' + error))
diff --git a/src/components/EditorTabs.vue b/src/components/EditorTabs.vue
index ac196c5..904466b 100644
--- a/src/components/EditorTabs.vue
+++ b/src/components/EditorTabs.vue
@@ -17,7 +17,8 @@
          @dragleave="dragOverId === tab.id && (dragOverId = null)"
          @drop.prevent="onDrop(tab.id)"
          @dragend="onDragEnd">
-      <img :src="iconUrl(tab.language)" class="w-4 h-4 flex-shrink-0" :alt="tab.language"/>
+      <img :src="iconUrl(tab.language)" class="w-4 h-4 flex-shrink-0" :alt="tab.language"
+           @error="(e) => { const t = e.target as HTMLImageElement; if (!t.src.endsWith('/icons/text.svg')) t.src = '/icons/text.svg' }"/>
       <span class="text-xs truncate">{{ title(tab) }}</span>
       <span v-if="isDirty(tab)" class="text-amber-500 text-xs flex-shrink-0" title="未保存">●</span>
       <button class="ml-1 rounded p-0.5 text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-700 opacity-0 group-hover:opacity-100 transition-opacity flex-shrink-0"
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index 776ab2f..95112b2 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -80,6 +80,9 @@ import {useCodeMirrorFontFamily} from "./useCodeMirrorFontFamily.ts";
 import {diffGutterExtension} from "../editor/diffGutter";
 import {aiCompleteExtension} from "../editor/aiComplete";
 import {cursorListener} from "../editor/cursorInfo";
+import {json} from "@codemirror/lang-json";
+import {markdown} from "@codemirror/lang-markdown";
+import {yaml} from "@codemirror/lang-yaml";
 import {useSnippets} from "./useSnippets";
 
 interface Props
@@ -310,6 +313,16 @@ export function useCodeMirrorEditor(props: Props)
                 return StreamLanguage.define(objectiveC)
             case 'objective-cpp':
                 return StreamLanguage.define(objectiveCpp)
+            case 'json':
+                return json()
+            case 'yaml':
+                return yaml()
+            case 'markdown':
+                return markdown()
+            case 'xml':
+                return xml()
+            case 'text':
+                return null
             default:
                 return null
         }

From 72f3a020b085280ac9bb13e8e2b73db4bd92360c Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Sat, 6 Jun 2026 01:14:21 +0800
Subject: [PATCH 22/22] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E5=9B=BE=E6=A0=87=EF=BC=8CYAML=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=20.yml=20=E5=90=8E=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为 json/xml/yaml/markdown 各加 SVG 图标（text 复用已有）
- 语言注册表支持插件声明多个扩展名（逗号/空格分隔）；YAML 插件 extension 改为 yaml,yml，文件名取首个
---
 public/icons/json.svg                  |  4 ++++
 public/icons/markdown.svg              |  5 +++++
 public/icons/xml.svg                   |  4 ++++
 public/icons/yaml.svg                  |  4 ++++
 src-tauri/src/plugins/yaml.rs          | 13 +++++++++++--
 src/composables/useLanguageRegistry.ts | 23 +++++++++++++++--------
 6 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 public/icons/json.svg
 create mode 100644 public/icons/markdown.svg
 create mode 100644 public/icons/xml.svg
 create mode 100644 public/icons/yaml.svg

diff --git a/public/icons/json.svg b/public/icons/json.svg
new file mode 100644
index 0000000..c8eb10d
--- /dev/null
+++ b/public/icons/json.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <rect x="2" y="2" width="20" height="20" rx="4" fill="#5a5a5a"/>
+  <text x="12" y="16.5" font-family="ui-monospace, Menlo, monospace" font-size="12" font-weight="700" fill="#ffffff" text-anchor="middle">{ }</text>
+</svg>
diff --git a/public/icons/markdown.svg b/public/icons/markdown.svg
new file mode 100644
index 0000000..ad14936
--- /dev/null
+++ b/public/icons/markdown.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <rect x="2" y="5" width="20" height="14" rx="3" fill="none" stroke="#4a5568" stroke-width="1.6"/>
+  <path d="M6 15.5V9.5h1.8L9.5 12l1.7-2.5H13v6h-1.8v-3.4L9.5 14.4 7.8 12.1V15.5z" fill="#4a5568"/>
+  <path d="M16.4 9.5h1.7v3.2h1.5L17.25 15.6 14.9 12.7h1.5z" fill="#4a5568"/>
+</svg>
diff --git a/public/icons/xml.svg b/public/icons/xml.svg
new file mode 100644
index 0000000..d468c0c
--- /dev/null
+++ b/public/icons/xml.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <rect x="2" y="2" width="20" height="20" rx="4" fill="#e37933"/>
+  <text x="12" y="16" font-family="ui-monospace, Menlo, monospace" font-size="9" font-weight="700" fill="#ffffff" text-anchor="middle">&lt;/&gt;</text>
+</svg>
diff --git a/public/icons/yaml.svg b/public/icons/yaml.svg
new file mode 100644
index 0000000..fc707e5
--- /dev/null
+++ b/public/icons/yaml.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <rect x="2" y="2" width="20" height="20" rx="4" fill="#cb171e"/>
+  <text x="12" y="16" font-family="ui-monospace, Menlo, monospace" font-size="8" font-weight="700" fill="#ffffff" text-anchor="middle">YML</text>
+</svg>
diff --git a/src-tauri/src/plugins/yaml.rs b/src-tauri/src/plugins/yaml.rs
index 6de6065..bd04999 100644
--- a/src-tauri/src/plugins/yaml.rs
+++ b/src-tauri/src/plugins/yaml.rs
@@ -17,8 +17,17 @@ impl LanguagePlugin for YamlPlugin {
     }
 
     fn get_file_extension(&self) -> String {
+        // extension 可能是多个（如 "yaml,yml"），文件名取第一个
         self.get_config()
-            .map(|config| config.extension.clone())
+            .map(|config| {
+                config
+                    .extension
+                    .split(',')
+                    .next()
+                    .unwrap_or("yaml")
+                    .trim()
+                    .to_string()
+            })
             .unwrap_or_else(|| "yaml".to_string())
     }
 
@@ -35,7 +44,7 @@ impl LanguagePlugin for YamlPlugin {
             enabled: true,
             language: String::from("yaml"),
             before_compile: None,
-            extension: String::from("yaml"),
+            extension: String::from("yaml,yml"),
             execute_home: None,
             run_command: Some(String::from("cat $filename")),
             after_compile: None,
diff --git a/src/composables/useLanguageRegistry.ts b/src/composables/useLanguageRegistry.ts
index e021663..d3db7aa 100644
--- a/src/composables/useLanguageRegistry.ts
+++ b/src/composables/useLanguageRegistry.ts
@@ -33,19 +33,26 @@ export function useLanguageRegistry()
                 if (plugin.enabled === false) {
                     continue
                 }
-                const ext = normalizeExt(String(plugin.extension))
-                if (!ext) {
+                // 支持一个插件声明多个扩展名（逗号/空格分隔，如 yaml 的 "yaml,yml"）
+                const exts = String(plugin.extension)
+                    .split(/[,\s]+/)
+                    .map(normalizeExt)
+                    .filter(Boolean)
+                if (exts.length === 0) {
                     continue
                 }
 
+                // 语言 -> 扩展名取第一个作为主扩展名
                 if (!l2e[plugin.language]) {
-                    l2e[plugin.language] = ext
+                    l2e[plugin.language] = exts[0]
                 }
-                if (!e2l[ext]) {
-                    e2l[ext] = []
-                }
-                if (!e2l[ext].includes(plugin.language)) {
-                    e2l[ext].push(plugin.language)
+                for (const ext of exts) {
+                    if (!e2l[ext]) {
+                        e2l[ext] = []
+                    }
+                    if (!e2l[ext].includes(plugin.language)) {
+                        e2l[ext].push(plugin.language)
+                    }
                 }
             }