diff --git a/package.json b/package.json
index 37b63fe1..cf21fd6a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "codeforge",
   "private": true,
-  "version": "26.2.0",
+  "version": "26.3.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -32,6 +32,7 @@
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.1",
     "@open-rpc/client-js": "^2.0.0",
+    "@replit/codemirror-minimap": "^0.5.2",
     "@tauri-apps/api": "^2",
     "@tauri-apps/plugin-dialog": "^2.3.2",
     "@tauri-apps/plugin-fs": "^2.4.2",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 5fda3dfc..247ed67b 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4,7 +4,7 @@ version = 4
 
 [[package]]
 name = "CodeForge"
-version = "26.2.0"
+version = "26.3.0"
 dependencies = [
  "async-trait",
  "chrono",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 6bd79286..f0eac932 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "CodeForge"
-version = "26.2.0"
+version = "26.3.0"
 description = "CodeForge 是一款轻量级、高性能的桌面代码执行器，专为开发者、学生和编程爱好者设计。"
 authors = ["devlive-community"]
 edition = "2024"
diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
index 6f742db8..361f5f6b 100644
--- a/src-tauri/src/config.rs
+++ b/src-tauri/src/config.rs
@@ -20,6 +20,8 @@ pub struct EditorConfig {
     pub show_line_numbers: Option<bool>,   // 是否显示行号
     pub show_function_help: Option<bool>,  // 是否显示函数帮助
     pub space_dot_omission: Option<bool>,  // 是否显示空格省略
+    pub show_minimap: Option<bool>,        // 是否显示代码缩略图
+    pub show_sticky_scroll: Option<bool>,  // 是否启用粘性滚动
     pub layout: Option<String>,            // 编辑器/控制台布局: horizontal | vertical | editor
     pub last_direction: Option<String>,    // 仅编辑器模式下控制台弹出方向: horizontal | vertical
     pub max_open_file_size: Option<u32>,   // 打开文件大小上限(MB)，超过则拒绝打开
@@ -69,6 +71,8 @@ impl Default for AppConfig {
                 show_line_numbers: Some(true),
                 show_function_help: Some(false),
                 space_dot_omission: Some(false),
+                show_minimap: Some(false),
+                show_sticky_scroll: Some(false),
                 layout: Some("horizontal".to_string()),
                 last_direction: Some("horizontal".to_string()),
                 max_open_file_size: Some(5),
@@ -139,6 +143,8 @@ impl ConfigManager {
                                 show_line_numbers: Some(true),
                                 show_function_help: Some(false),
                                 space_dot_omission: Some(false),
+                                show_minimap: Some(false),
+                                show_sticky_scroll: Some(false),
                                 layout: Some("horizontal".to_string()),
                                 last_direction: Some("horizontal".to_string()),
                                 max_open_file_size: Some(5),
@@ -262,6 +268,8 @@ impl ConfigManager {
                 show_line_numbers: Some(true),
                 show_function_help: Some(false),
                 space_dot_omission: Some(false),
+                show_minimap: Some(false),
+                show_sticky_scroll: Some(false),
                 layout: Some("horizontal".to_string()),
                 last_direction: Some("horizontal".to_string()),
                 max_open_file_size: Some(5),
diff --git a/src-tauri/src/dap.rs b/src-tauri/src/dap.rs
new file mode 100644
index 00000000..e8543071
--- /dev/null
+++ b/src-tauri/src/dap.rs
@@ -0,0 +1,306 @@
+//! DAP 桥接：按语言拉起调试适配器进程，转发 DAP 消息（与 LSP 同为 Content-Length 帧）。
+//! 后端只做透明转发：前端发送/接收原始 JSON 字符串，握手与协议由前端的 DAP 客户端负责。
+//! 复用 lsp.rs 的 find_in_path / augmented_path / read_message。
+
+use crate::lsp::{augmented_path, find_in_path, read_message, read_raw_line};
+use serde::Serialize;
+use std::collections::HashMap;
+use std::io::{BufReader, Read, Write};
+use std::process::{Child, Command, Stdio};
+use std::sync::Mutex as StdMutex;
+use tauri::{AppHandle, Emitter, State};
+
+struct Adapter {
+    child: Child,
+    // 写入走独立线程，避免 stdin 写阻塞主线程
+    tx: std::sync::mpsc::Sender<Vec<u8>>,
+}
+
+pub struct DapState {
+    // 以会话 key 区分（前端通常传语言名，单语言单会话）
+    adapters: StdMutex<HashMap<String, Adapter>>,
+}
+
+impl DapState {
+    pub fn new() -> Self {
+        Self {
+            adapters: StdMutex::new(HashMap::new()),
+        }
+    }
+}
+
+#[derive(Clone, Serialize)]
+struct DapBatch {
+    session: String,
+    messages: Vec<String>,
+}
+
+/// 语言 -> (适配器可执行名, 启动参数)。适配器仅负责说 DAP；
+/// 具体调试目标(program/args/cwd)由前端在 launch 请求中给出。新增语言在此加一行。
+fn adapter_cmd(language: &str) -> Option<(&'static str, Vec<&'static str>)> {
+    match language {
+        // debugpy：python -m debugpy.adapter（需 pip install debugpy）
+        "python" | "python3" | "python2" => Some(("python3", vec!["-m", "debugpy.adapter"])),
+        // delve：dlv dap
+        "go" => Some(("dlv", vec!["dap"])),
+        // lldb-dap（LLVM 自带）：适用于 Rust / C / C++
+        "rust" | "c" | "cpp" => Some(("lldb-dap", vec![])),
+        _ => None,
+    }
+}
+
+/// 该语言是否有可用的调试适配器。Python 进一步校验 debugpy 模块是否可导入。
+#[tauri::command]
+pub fn dap_available(language: String) -> bool {
+    let Some((prog, _)) = adapter_cmd(&language) else {
+        return false;
+    };
+    let Some(exe) = find_in_path(prog) else {
+        return false;
+    };
+    if matches!(language.as_str(), "python" | "python3" | "python2") {
+        return Command::new(&exe)
+            .args(["-c", "import debugpy"])
+            .env("PATH", augmented_path())
+            .output()
+            .map(|o| o.status.success())
+            .unwrap_or(false);
+    }
+    true
+}
+
+/// 启动调试适配器；已启动则直接返回 true。session 作为多会话区分键（前端传语言名即可）。
+#[tauri::command]
+pub fn dap_start(
+    app: AppHandle,
+    state: State<'_, DapState>,
+    session: String,
+    language: String,
+) -> Result<bool, String> {
+    {
+        let adapters = state.adapters.lock().map_err(|e| e.to_string())?;
+        if adapters.contains_key(&session) {
+            return Ok(true);
+        }
+    }
+    let (prog, args) = adapter_cmd(&language).ok_or_else(|| "该语言暂不支持调试".to_string())?;
+    let exe = find_in_path(prog)
+        .ok_or_else(|| format!("未找到调试适配器：{}（请先安装并确保在 PATH 中）", prog))?;
+
+    let mut cmd = Command::new(&exe);
+    cmd.args(&args)
+        .env("PATH", augmented_path())
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped());
+
+    let mut child = cmd
+        .spawn()
+        .map_err(|e| format!("启动 {} 失败: {}", prog, e))?;
+    let stdin = child.stdin.take().ok_or("无法获取 stdin")?;
+    let stdout = child.stdout.take().ok_or("无法获取 stdout")?;
+    let stderr = child.stderr.take();
+
+    // 读取线程：解析 Content-Length 帧，丢进 channel
+    let (msg_tx, msg_rx) = std::sync::mpsc::channel::<String>();
+    std::thread::spawn(move || {
+        let mut reader = BufReader::new(stdout);
+        while let Some(body) = read_message(&mut reader) {
+            if msg_tx.send(body).is_err() {
+                break;
+            }
+        }
+    });
+
+    // 发射线程：合批转发（output/variables 等可能突发），会话结束发 dap:exit
+    let app_reader = app.clone();
+    let sess_emit = session.clone();
+    std::thread::spawn(move || {
+        while let Ok(first) = msg_rx.recv() {
+            let mut batch = vec![first];
+            while let Ok(m) = msg_rx.try_recv() {
+                batch.push(m);
+                if batch.len() >= 256 {
+                    break;
+                }
+            }
+            let _ = app_reader.emit(
+                "dap:messages",
+                DapBatch {
+                    session: sess_emit.clone(),
+                    messages: batch,
+                },
+            );
+        }
+        let _ = app_reader.emit("dap:exit", sess_emit.clone());
+    });
+
+    // 排空 stderr，避免阻塞
+    if let Some(mut err) = stderr {
+        std::thread::spawn(move || {
+            let mut buf = [0u8; 4096];
+            while let Ok(n) = err.read(&mut buf) {
+                if n == 0 {
+                    break;
+                }
+            }
+        });
+    }
+
+    // 写入线程：独占 stdin，从 channel 取帧写入
+    let (tx, rx) = std::sync::mpsc::channel::<Vec<u8>>();
+    std::thread::spawn(move || {
+        let mut stdin = stdin;
+        while let Ok(frame) = rx.recv() {
+            if stdin.write_all(&frame).is_err() {
+                break;
+            }
+            if stdin.flush().is_err() {
+                break;
+            }
+        }
+    });
+
+    state
+        .adapters
+        .lock()
+        .map_err(|e| e.to_string())?
+        .insert(session, Adapter { child, tx });
+    Ok(true)
+}
+
+/// 向调试适配器发送一条 DAP 消息（已是完整 JSON 字符串）
+#[tauri::command]
+pub fn dap_send(
+    state: State<'_, DapState>,
+    session: String,
+    message: String,
+) -> Result<(), String> {
+    let adapters = state.adapters.lock().map_err(|e| e.to_string())?;
+    let adapter = adapters
+        .get(&session)
+        .ok_or_else(|| "调试会话未启动".to_string())?;
+    let frame = format!("Content-Length: {}\r\n\r\n{}", message.len(), message);
+    adapter
+        .tx
+        .send(frame.into_bytes())
+        .map_err(|_| "调试适配器写入通道已关闭".to_string())?;
+    Ok(())
+}
+
+/// 停止调试会话
+#[tauri::command]
+pub fn dap_stop(state: State<'_, DapState>, session: String) -> Result<(), String> {
+    if let Some(mut adapter) = state
+        .adapters
+        .lock()
+        .map_err(|e| e.to_string())?
+        .remove(&session)
+    {
+        let _ = adapter.child.kill();
+    }
+    Ok(())
+}
+
+// 可安装的调试适配器：(id, 展示名, 安装命令)
+fn adapter_defs() -> Vec<(&'static str, &'static str, &'static str)> {
+    vec![
+        (
+            "debugpy",
+            "Python (debugpy)",
+            "python3 -m pip install debugpy",
+        ),
+        (
+            "delve",
+            "Go (delve)",
+            "go install github.com/go-delve/delve/cmd/dlv@latest",
+        ),
+    ]
+}
+
+fn adapter_installed(id: &str) -> bool {
+    match id {
+        // debugpy 校验模块可导入
+        "debugpy" => dap_available("python".to_string()),
+        "delve" => find_in_path("dlv").is_some(),
+        _ => false,
+    }
+}
+
+#[derive(Serialize)]
+pub struct DapAdapterInfo {
+    id: String,
+    label: String,
+    installed: bool,
+    install: String,
+}
+
+/// 列出可安装的调试适配器及其安装状态
+#[tauri::command]
+pub fn dap_adapter_list() -> Vec<DapAdapterInfo> {
+    adapter_defs()
+        .into_iter()
+        .map(|(id, label, install)| DapAdapterInfo {
+            id: id.to_string(),
+            label: label.to_string(),
+            installed: adapter_installed(id),
+            install: install.to_string(),
+        })
+        .collect()
+}
+
+/// 一键安装某调试适配器：执行安装命令并实时输出日志（事件 dap:install / dap:install-done）
+#[tauri::command]
+pub fn dap_install(app: AppHandle, id: String) -> Result<(), String> {
+    let def = adapter_defs()
+        .into_iter()
+        .find(|(d, ..)| *d == id)
+        .ok_or_else(|| "未知的调试适配器".to_string())?;
+    let cmd_str = def.2.to_string();
+
+    let (shell, flag) = if cfg!(windows) {
+        ("cmd", "/C")
+    } else {
+        ("sh", "-c")
+    };
+    let mut child = Command::new(shell)
+        .arg(flag)
+        .arg(&cmd_str)
+        .env("PATH", augmented_path())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .map_err(|e| format!("无法执行安装命令: {}", e))?;
+
+    let stdout = child.stdout.take();
+    let stderr = child.stderr.take();
+    let id_done = id.clone();
+    let app_done = app.clone();
+
+    let emit_lines = |app: AppHandle, id: String, reader: Option<Box<dyn Read + Send>>| {
+        if let Some(r) = reader {
+            std::thread::spawn(move || {
+                let mut buf = BufReader::new(r);
+                while let Some(line) = read_raw_line(&mut buf) {
+                    let _ = app.emit("dap:install", (id.clone(), line));
+                }
+            });
+        }
+    };
+    emit_lines(
+        app.clone(),
+        id.clone(),
+        stdout.map(|s| Box::new(s) as Box<dyn Read + Send>),
+    );
+    emit_lines(
+        app.clone(),
+        id.clone(),
+        stderr.map(|s| Box::new(s) as Box<dyn Read + Send>),
+    );
+
+    std::thread::spawn(move || {
+        let success = child.wait().map(|s| s.success()).unwrap_or(false);
+        let _ = app_done.emit("dap:install-done", (id_done, success));
+    });
+    Ok(())
+}
diff --git a/src-tauri/src/filesystem.rs b/src-tauri/src/filesystem.rs
index a99fa323..d842aed6 100644
--- a/src-tauri/src/filesystem.rs
+++ b/src-tauri/src/filesystem.rs
@@ -1036,10 +1036,16 @@ pub async fn git_log(
     limit: u32,
     skip: u32,
     revision: Option<String>,
+    grep: Option<String>,
+    author: Option<String>,
 ) -> Result<Vec<GitCommit>, String> {
     tokio::task::spawn_blocking(move || {
         let n = format!("-n{}", limit);
         let sk = format!("--skip={}", skip);
+        let grep = grep.unwrap_or_default();
+        let author = author.unwrap_or_default();
+        let grep_arg = format!("--grep={}", grep.trim());
+        let author_arg = format!("--author={}", author.trim());
         // 字段以 \x1f 分隔、每提交一行；%s 为单行主题
         let mut args = vec![
             "log",
@@ -1048,6 +1054,14 @@ pub async fn git_log(
             "--date=format:%Y-%m-%d %H:%M",
             "--pretty=format:%H\x1f%h\x1f%an\x1f%ad\x1f%s",
         ];
+        // 提交信息搜索（大小写不敏感）与作者过滤
+        if !grep.trim().is_empty() {
+            args.push("-i");
+            args.push(grep_arg.as_str());
+        }
+        if !author.trim().is_empty() {
+            args.push(author_arg.as_str());
+        }
         let rev = revision.unwrap_or_default();
         if !rev.trim().is_empty() {
             args.push(rev.as_str());
@@ -1615,6 +1629,187 @@ pub async fn git_set_identity(root: String, name: String, email: String) -> Resu
     .map_err(|e| format!("git 任务失败: {}", e))?
 }
 
+/// 读取仓库本地签名配置，返回 [gpgsign("true"/""), signingkey]。
+#[tauri::command]
+pub async fn git_get_signing(root: String) -> Result<Vec<String>, String> {
+    tokio::task::spawn_blocking(move || {
+        let sign = run_git(&root, &["config", "--local", "commit.gpgsign"])
+            .unwrap_or_default()
+            .trim()
+            .to_string();
+        let key = run_git(&root, &["config", "--local", "user.signingkey"])
+            .unwrap_or_default()
+            .trim()
+            .to_string();
+        let enabled = if sign == "true" {
+            "true".to_string()
+        } else {
+            String::new()
+        };
+        Ok(vec![enabled, key])
+    })
+    .await
+    .map_err(|e| format!("git 任务失败: {}", e))?
+}
+
+/// 设置仓库本地签名配置：commit.gpgsign 开关；key 非空则设 user.signingkey。
+#[tauri::command]
+pub async fn git_set_signing(root: String, enabled: bool, key: String) -> Result<String, String> {
+    tokio::task::spawn_blocking(move || {
+        run_git(
+            &root,
+            &[
+                "config",
+                "--local",
+                "commit.gpgsign",
+                if enabled { "true" } else { "false" },
+            ],
+        )?;
+        if !key.trim().is_empty() {
+            run_git(&root, &["config", "--local", "user.signingkey", key.trim()])?;
+        }
+        Ok(String::new())
+    })
+    .await
+    .map_err(|e| format!("git 任务失败: {}", e))?
+}
+
+/// 常见客户端 git 钩子名（用于校验，避免路径穿越）。
+const GIT_HOOK_NAMES: [&str; 13] = [
+    "applypatch-msg",
+    "pre-applypatch",
+    "post-applypatch",
+    "pre-commit",
+    "pre-merge-commit",
+    "prepare-commit-msg",
+    "commit-msg",
+    "post-commit",
+    "pre-rebase",
+    "post-checkout",
+    "post-merge",
+    "pre-push",
+    "post-rewrite",
+];
+
+fn git_hooks_dir(root: &str) -> Result<std::path::PathBuf, String> {
+    let git_dir = run_git(root, &["rev-parse", "--git-dir"])?
+        .trim()
+        .to_string();
+    let p = std::path::Path::new(&git_dir);
+    let base = if p.is_absolute() {
+        std::path::PathBuf::from(&git_dir)
+    } else {
+        std::path::Path::new(root).join(&git_dir)
+    };
+    Ok(base.join("hooks"))
+}
+
+#[cfg(unix)]
+fn is_executable(path: &std::path::Path) -> bool {
+    use std::os::unix::fs::PermissionsExt;
+    std::fs::metadata(path)
+        .map(|m| m.permissions().mode() & 0o111 != 0)
+        .unwrap_or(false)
+}
+
+#[cfg(not(unix))]
+fn is_executable(path: &std::path::Path) -> bool {
+    path.exists()
+}
+
+#[derive(Serialize)]
+pub struct GitHook {
+    name: String,
+    /// 同名钩子文件已存在
+    active: bool,
+    /// 具备可执行权限（类 Unix）
+    executable: bool,
+}
+
+/// 列出常见客户端钩子及其状态。
+#[tauri::command]
+pub async fn git_hooks(root: String) -> Result<Vec<GitHook>, String> {
+    tokio::task::spawn_blocking(move || {
+        let dir = git_hooks_dir(&root)?;
+        let mut list = Vec::new();
+        for name in GIT_HOOK_NAMES {
+            let path = dir.join(name);
+            let active = path.is_file();
+            list.push(GitHook {
+                name: name.to_string(),
+                active,
+                executable: active && is_executable(&path),
+            });
+        }
+        Ok(list)
+    })
+    .await
+    .map_err(|e| format!("git 任务失败: {}", e))?
+}
+
+/// 读取某钩子内容（不存在返回空串）。
+#[tauri::command]
+pub async fn git_hook_read(root: String, name: String) -> Result<String, String> {
+    tokio::task::spawn_blocking(move || {
+        if !GIT_HOOK_NAMES.contains(&name.as_str()) {
+            return Err(format!("未知钩子: {}", name));
+        }
+        let path = git_hooks_dir(&root)?.join(&name);
+        if path.is_file() {
+            std::fs::read_to_string(&path).map_err(|e| format!("读取钩子失败: {}", e))
+        } else {
+            Ok(String::new())
+        }
+    })
+    .await
+    .map_err(|e| format!("git 任务失败: {}", e))?
+}
+
+/// 写入某钩子内容并按 executable 设置可执行权限（类 Unix）。
+#[tauri::command]
+pub async fn git_hook_save(
+    root: String,
+    name: String,
+    content: String,
+    executable: bool,
+) -> Result<String, String> {
+    tokio::task::spawn_blocking(move || {
+        if !GIT_HOOK_NAMES.contains(&name.as_str()) {
+            return Err(format!("未知钩子: {}", name));
+        }
+        let dir = git_hooks_dir(&root)?;
+        std::fs::create_dir_all(&dir).map_err(|e| format!("创建 hooks 目录失败: {}", e))?;
+        let path = dir.join(&name);
+        std::fs::write(&path, &content).map_err(|e| format!("写入钩子失败: {}", e))?;
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::PermissionsExt;
+            let mode = if executable { 0o755 } else { 0o644 };
+            let _ = std::fs::set_permissions(&path, std::fs::Permissions::from_mode(mode));
+        }
+        Ok(String::new())
+    })
+    .await
+    .map_err(|e| format!("git 任务失败: {}", e))?
+}
+
+/// 删除某钩子文件。
+#[tauri::command]
+pub async fn git_hook_delete(root: String, name: String) -> Result<String, String> {
+    tokio::task::spawn_blocking(move || {
+        if !GIT_HOOK_NAMES.contains(&name.as_str()) {
+            return Err(format!("未知钩子: {}", name));
+        }
+        let path = git_hooks_dir(&root)?.join(&name);
+        if path.is_file() {
+            std::fs::remove_file(&path).map_err(|e| format!("删除钩子失败: {}", e))?;
+        }
+        Ok(String::new())
+    })
+    .await
+    .map_err(|e| format!("git 任务失败: {}", e))?
+}
+
 /// 创建标签。hash 为空则打在 HEAD；message 非空则创建附注标签（-a -m）。
 #[tauri::command]
 pub async fn git_tag_create(
diff --git a/src-tauri/src/lsp.rs b/src-tauri/src/lsp.rs
index 2bc6e91c..fd9eb105 100644
--- a/src-tauri/src/lsp.rs
+++ b/src-tauri/src/lsp.rs
@@ -244,7 +244,7 @@ pub fn lsp_install(app: AppHandle, id: String) -> Result<(), String> {
 }
 
 /// 读取一行普通文本（以 \n 结尾，用于安装日志）
-fn read_raw_line<R: Read>(reader: &mut BufReader<R>) -> Option<String> {
+pub(crate) fn read_raw_line<R: Read>(reader: &mut BufReader<R>) -> Option<String> {
     let mut buf = Vec::new();
     let mut byte = [0u8; 1];
     loop {
@@ -289,7 +289,7 @@ fn dirs_home() -> Option<PathBuf> {
 }
 
 /// 在 PATH 与常见目录中查找可执行文件全路径
-fn find_in_path(prog: &str) -> Option<PathBuf> {
+pub(crate) fn find_in_path(prog: &str) -> Option<PathBuf> {
     let exts: Vec<&str> = if cfg!(windows) {
         vec!["", ".cmd", ".exe", ".bat"]
     } else {
@@ -312,7 +312,7 @@ fn find_in_path(prog: &str) -> Option<PathBuf> {
 }
 
 /// 给子进程增广 PATH（语言服务器常依赖 node 等）
-fn augmented_path() -> String {
+pub(crate) fn augmented_path() -> String {
     let mut parts: Vec<String> = Vec::new();
     if let Some(path) = std::env::var_os("PATH") {
         parts.push(path.to_string_lossy().to_string());
@@ -474,7 +474,7 @@ pub fn lsp_stop(state: State<'_, LspState>, language: String) -> Result<(), Stri
 }
 
 /// 读取一条 LSP 消息（Content-Length 帧）；EOF 返回 None
-fn read_message<R: Read>(reader: &mut BufReader<R>) -> Option<String> {
+pub(crate) fn read_message<R: Read>(reader: &mut BufReader<R>) -> Option<String> {
     let mut content_length: usize = 0;
     // 逐字节读 header 行直到空行
     loop {
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 527c5b67..affbb8e6 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -8,6 +8,7 @@ mod ai_history;
 mod cache;
 mod config;
 mod custom_plugin_commands;
+mod dap;
 mod db;
 mod db_connections;
 mod env_commands;
@@ -39,6 +40,9 @@ use crate::custom_plugin_commands::{
     add_custom_plugin, get_custom_plugins, remove_custom_plugin, save_custom_icon,
     update_custom_plugin,
 };
+use crate::dap::{
+    DapState, dap_adapter_list, dap_available, dap_install, dap_send, dap_start, dap_stop,
+};
 use crate::db::{run_sql, run_sql_paged};
 use crate::db_connections::{
     DbConnStore, db_connection_delete, db_connection_save, db_connections_list,
@@ -62,17 +66,17 @@ use crate::filesystem::{
     git_bisect_state, git_blame, git_branch_create, git_branch_delete, git_branch_rename,
     git_branches, git_checkout, git_checkout_track, git_cherry_pick, git_clean, git_clean_preview,
     git_clone, git_commit, git_compare, git_delete_remote_branch, git_diff, git_discard, git_fetch,
-    git_file_diff, git_file_head, git_get_identity, git_graph, git_ignore_add, git_init, git_log,
-    git_log_file, git_merge, git_op_abort, git_op_continue, git_op_skip, git_op_state, git_pull,
-    git_pull_rebase, git_push, git_push_force, git_push_tags, git_rebase_interactive, git_reflog,
-    git_remote_add, git_remote_branches, git_remote_remove, git_remotes, git_reset,
-    git_restore_file, git_revert, git_set_identity, git_set_upstream, git_show, git_stage,
-    git_stash_apply, git_stash_drop, git_stash_list, git_stash_pop, git_stash_push, git_stash_show,
-    git_status, git_submodule_sync, git_submodule_update, git_submodules, git_tag_create,
-    git_tag_delete, git_tags, git_unstage, git_worktree_add, git_worktree_prune,
-    git_worktree_remove, git_worktrees, list_files, read_directory_tree, read_file_lines,
-    read_file_text, rename_path, replace_in_files, reveal_path, search_in_files, watch_directory,
-    write_file_text,
+    git_file_diff, git_file_head, git_get_identity, git_get_signing, git_graph, git_hook_delete,
+    git_hook_read, git_hook_save, git_hooks, git_ignore_add, git_init, git_log, git_log_file,
+    git_merge, git_op_abort, git_op_continue, git_op_skip, git_op_state, git_pull, git_pull_rebase,
+    git_push, git_push_force, git_push_tags, git_rebase_interactive, git_reflog, git_remote_add,
+    git_remote_branches, git_remote_remove, git_remotes, git_reset, git_restore_file, git_revert,
+    git_set_identity, git_set_signing, git_set_upstream, git_show, git_stage, git_stash_apply,
+    git_stash_drop, git_stash_list, git_stash_pop, git_stash_push, git_stash_show, git_status,
+    git_submodule_sync, git_submodule_update, git_submodules, git_tag_create, git_tag_delete,
+    git_tags, git_unstage, git_worktree_add, git_worktree_prune, git_worktree_remove,
+    git_worktrees, list_files, 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::lsp::{
@@ -120,6 +124,7 @@ fn main() {
         .manage(DbConnStore::new().expect("failed to initialize db connections database"))
         .manage(TerminalState::new())
         .manage(LspState::new())
+        .manage(DapState::new())
         .manage(ExecutionPluginManagerState::new(PluginManager::new()))
         .manage(EnvironmentManagerState::new(env_manager))
         .setup(|app| {
@@ -262,6 +267,12 @@ fn main() {
             git_tag_delete,
             git_get_identity,
             git_set_identity,
+            git_get_signing,
+            git_set_signing,
+            git_hooks,
+            git_hook_read,
+            git_hook_save,
+            git_hook_delete,
             git_remotes,
             git_remote_add,
             git_remote_remove,
@@ -322,7 +333,14 @@ fn main() {
             lsp_send,
             lsp_stop,
             lsp_server_list,
-            lsp_install
+            lsp_install,
+            // DAP 调试桥接
+            dap_available,
+            dap_start,
+            dap_send,
+            dap_stop,
+            dap_adapter_list,
+            dap_install
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 11ab8f66..eb07e4d7 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "CodeForge",
-  "version": "26.2.0",
+  "version": "26.3.0",
   "identifier": "org.devlive.codeforge",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/src/App.vue b/src/App.vue
index e0bf6e1c..d015904c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,6 +15,7 @@
                @save-file="handleSave"
                @show-history="showHistory = true"
                @show-ai="handleShowAi"
+               @show-git="openGit"
                @show-settings="showSettings = true"
                @load-example="loadExample">
     </AppHeader>
@@ -261,6 +262,7 @@
     <!-- 集成终端：停靠在底部，占据高度使上方编辑区自动收缩。
          首次打开后保持挂载，用 v-show 收起以保留会话；关闭所有标签才彻底卸载 -->
     <Terminal v-if="terminalMounted"
+              ref="terminalRef"
               v-show="showTerminal"
               class="flex-shrink-0"
               :root-dir="rootDir"
@@ -358,6 +360,15 @@
                   :file-name="currentFileName"
                   @close="showPreview = false"/>
 
+    <!-- 调试工具栏（会话进行中显示） -->
+    <DebugToolbar/>
+
+    <!-- 调试侧栏：调用栈 + 变量 -->
+    <DebugPanel/>
+
+    <!-- 运行任务 -->
+    <TaskRunner v-if="showTasks && rootDir" :root-dir="rootDir" @run="runTask" @close="showTasks = false"/>
+
     <!-- Git 源代码管理 -->
     <GitPanel v-if="showGit && rootDir"
               :root-dir="rootDir"
@@ -402,6 +413,10 @@
             {{ t('git.fileHistory') }}
           </button>
         </template>
+        <div v-if="editorCtx.lsp || canBlame" class="border-t border-gray-100 dark:border-gray-700 my-1"></div>
+        <button class="w-full text-left px-3 py-1.5 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" @click="sendToTerminal">
+          {{ t('app.sendToTerminal') }}
+        </button>
       </div>
     </div>
 
@@ -443,8 +458,9 @@ import {computed, nextTick, onMounted, onUnmounted, reactive, ref, shallowRef, w
 import {useI18n} from 'vue-i18n'
 import {debounce} from 'lodash-es'
 import {formatDocument, formatSelection, renameSymbol} from 'codemirror-languageserver'
-import {runGotoDefinition, lspSupportsLanguage, triggerCodeActions, applyCodeAction} from './editor/lspExtension'
-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 {runGotoDefinition, lspSupportsLanguage, triggerCodeActions, applyCodeAction, formatDocumentAsync} from './editor/lspExtension'
+import {dapSupportsLanguage} from './debug/dapClient'
+import {ChevronRight, Code2, CornerDownRight, Eye, FolderOpen, GitBranch, GitCompare, History, ListChecks, 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'
@@ -484,6 +500,9 @@ import PreviewPanel from './components/PreviewPanel.vue'
 import BlameView from './components/BlameView.vue'
 import GitLog from './components/GitLog.vue'
 import GitPanel from './components/GitPanel.vue'
+import TaskRunner from './components/TaskRunner.vue'
+import DebugToolbar from './components/DebugToolbar.vue'
+import DebugPanel from './components/DebugPanel.vue'
 import GoToLine from './components/GoToLine.vue'
 import Outline from './components/Outline.vue'
 import SnippetManager from './components/SnippetManager.vue'
@@ -496,6 +515,8 @@ import {useAiConfig} from './composables/useAiConfig'
 import {setGhost, clearGhostIn, ghostActive} from './editor/aiComplete'
 import {cursorInfo} from './editor/cursorInfo'
 import {computeDiffMarkers, setDiffMarkers} from './editor/diffGutter'
+import {setBreakpointData} from './editor/breakpointGutter'
+import {useDebug} from './composables/useDebug'
 import AiAssistant from './components/AiAssistant.vue'
 import InlineGenerate from './components/InlineGenerate.vue'
 import SearchPanel from './components/SearchPanel.vue'
@@ -908,6 +929,14 @@ const openAiForExecution = (item: ExecutionResult) => {
   showAi.value = true
 }
 
+// ===== 保存时格式化（走 LSP textDocument/formatting）=====
+const formatOnSave = ref(kvGet('format-on-save') === 'true')
+const toggleFormatOnSave = () => {
+  formatOnSave.value = !formatOnSave.value
+  kvSet('format-on-save', String(formatOnSave.value))
+  toast.info(formatOnSave.value ? t('app.formatOnSaveOn') : t('app.formatOnSaveOff'))
+}
+
 // ===== AI 代码预测（幽灵补全，Tab 接受）=====
 const {active: aiActive, reload: reloadAiCfg} = useAiConfig()
 const aiCompletion = ref(kvGet('ai-completion') === 'true')
@@ -1109,6 +1138,7 @@ const revealInFinder = (path: string) => {
 // 集成终端：首次打开后保持挂载（保留会话），仅切换显示
 const showTerminal = ref(false)
 const terminalMounted = ref(false)
+const terminalRef = ref<any>(null)
 const toggleTerminal = () => {
   if (showTerminal.value) {
     showTerminal.value = false
@@ -1119,6 +1149,134 @@ const toggleTerminal = () => {
   }
 }
 
+// ===== 运行任务（B4）：在集成终端中执行预设命令 =====
+const showTasks = ref(false)
+const openTasks = () => {
+  if (!rootDir.value) {
+    toast.info(t('app.openFolderFirst'))
+    return
+  }
+  showTasks.value = true
+}
+const runTask = async (command: string) => {
+  terminalMounted.value = true
+  showTerminal.value = true
+  await nextTick()
+  terminalRef.value?.runCommand(command)
+}
+
+// B1-P3：开始调试当前文件（需已保存 + 语言可调试）
+const startDebug = async () => {
+  const path = currentFilePath.value
+  if (!path) {
+    toast.info(t('debug.saveFirst'))
+    return
+  }
+  const lang = currentLanguage.value
+  if (!dapSupportsLanguage(lang)) {
+    toast.info(t('debug.langUnsupported'))
+    return
+  }
+  // 适配器可用性检查（Python 含 debugpy 模块校验），不可用则给安装提示
+  let ok = false
+  try {
+    ok = await invoke<boolean>('dap_available', {language: lang})
+  }
+  catch {
+    ok = false
+  }
+  if (!ok) {
+    toast.error(lang === 'go' ? t('debug.installGo') : t('debug.installPython'))
+    return
+  }
+  try {
+    await debug.startSession({filePath: path, language: lang, cwd: rootDir.value})
+  }
+  catch (error) {
+    toast.error(t('debug.startFailed') + ': ' + error)
+  }
+}
+
+// B2：按项目类型识别测试命令（读取根目录顶层标记文件）
+const detectTestCommand = async (): Promise<string | null> => {
+  const root = rootDir.value
+  if (!root) {
+    return null
+  }
+  let names: string[] = []
+  try {
+    const nodes = await invoke<{ name: string; is_dir: boolean }[]>('read_directory_tree', {path: root})
+    names = nodes.map(n => n.name)
+  }
+  catch {
+    return null
+  }
+  const has = (n: string) => names.includes(n)
+  if (has('Cargo.toml')) {
+    return 'cargo test'
+  }
+  if (has('go.mod')) {
+    return 'go test ./...'
+  }
+  if (has('package.json')) {
+    if (has('pnpm-lock.yaml')) {
+      return 'pnpm test'
+    }
+    if (has('yarn.lock')) {
+      return 'yarn test'
+    }
+    return 'npm test'
+  }
+  if (has('pyproject.toml') || has('pytest.ini') || has('setup.py') || has('tox.ini')) {
+    return 'pytest'
+  }
+  if (has('pom.xml')) {
+    return 'mvn test'
+  }
+  if (has('build.gradle') || has('build.gradle.kts')) {
+    return 'gradle test'
+  }
+  if (has('Gemfile')) {
+    return 'bundle exec rake test'
+  }
+  if (has('composer.json')) {
+    return 'composer test'
+  }
+  if (has('Makefile')) {
+    return 'make test'
+  }
+  return null
+}
+const runTests = async () => {
+  if (!rootDir.value) {
+    toast.info(t('app.openFolderFirst'))
+    return
+  }
+  const cmd = await detectTestCommand()
+  if (!cmd) {
+    toast.info(t('app.testCmdNotFound'))
+    return
+  }
+  await runTask(cmd)
+}
+
+// B3：发送选区（无选区则当前行）到集成终端，用于 REPL 式交互
+const sendToTerminal = async () => {
+  closeEditorCtx()
+  const view = editorView.value
+  if (!view) {
+    return
+  }
+  const sel = view.state.selection.main
+  const text = sel.empty
+    ? view.state.doc.lineAt(sel.head).text
+    : view.state.sliceDoc(sel.from, sel.to)
+  if (!text.trim()) {
+    return
+  }
+  await runTask(text)
+}
+
 const openSearchResult = async (path: string, line: number) => {
   showSearch.value = false
   await smartOpen(path)
@@ -1181,11 +1339,13 @@ const onEditorContext = (e: MouseEvent) => {
   }
   editorCtx.lsp = lsp
   e.preventDefault()
-  // 将光标移到右键处，使命令作用于点击位置
   const view = editorView.value
   if (view) {
+    const cur = view.state.selection.main
     const pos = view.posAtCoords({x: e.clientX, y: e.clientY})
-    if (pos != null) {
+    // 仅在无选区、或右键点在选区之外时才移动光标；点在选区内则保留选区（不清除高亮）
+    const insideSel = !cur.empty && pos != null && pos >= cur.from && pos <= cur.to
+    if (pos != null && !insideSel) {
       view.dispatch({selection: {anchor: pos}})
     }
   }
@@ -1381,6 +1541,39 @@ watch(currentFilePath, () => fetchBaseline())
 watch(code, () => applyDiffMarkersDebounced())
 watch(editorView, () => applyDiffMarkers())
 
+// ===== 断点（B1-P2）：把当前文件的断点 + 执行行派发到编辑器 =====
+const debug = useDebug()
+const applyBreakpoints = () => {
+  const view = editorView.value
+  if (!view) {
+    return
+  }
+  const path = currentFilePath.value
+  const lines = debug.fileBreakpoints(path)
+  const exec = debug.stopped.value && debug.stopped.value.path === path ? debug.stopped.value.line : null
+  view.dispatch({effects: setBreakpointData.of({lines, exec})})
+}
+watch(() => debug.bpVersion.value, () => {
+  applyBreakpoints()
+  // 会话进行中：实时下发当前文件断点
+  debug.syncBreakpoints(currentFilePath.value)
+})
+watch(() => debug.stopped.value, () => applyBreakpoints())
+watch(editorView, () => applyBreakpoints())
+watch(currentFilePath, () => applyBreakpoints())
+
+// 停驻 / 选择调用栈帧时打开对应文件并跳转
+watch(() => debug.reveal.value, async (loc) => {
+  if (!loc) {
+    return
+  }
+  if (loc.path !== currentFilePath.value) {
+    await smartOpen(loc.path)
+    await nextTick()
+  }
+  gotoLine(loc.line)
+})
+
 // 打开文件夹、保存文件后刷新文件树 Git 徽标与差异基线
 watch(rootDir, () => refreshGitStatus(), {immediate: true})
 watch(savedContent, () => refreshGitStatus())
@@ -1461,6 +1654,14 @@ watch(watchMode, (v) => kvSet('watch-mode', String(v)))
 
 // 保存包装：保存后若开启监听模式则自动运行
 const handleSave = async () => {
+  // 保存前格式化：仅当开启、编辑器就绪且当前语言支持 LSP；失败/无能力则静默跳过
+  if (formatOnSave.value && editorView.value && lspSupportsLanguage(currentLanguage.value)) {
+    try {
+      await formatDocumentAsync(editorView.value)
+      await nextTick()
+    }
+    catch { /* 格式化失败不阻断保存 */ }
+  }
   await saveFile()
   if (watchMode.value && currentFilePath.value && !isDirty.value) {
     handleRunCode()
@@ -1835,6 +2036,7 @@ const paletteCommands = computed<PaletteCommand[]>(() => [
   {id: 'runSelection', label: t('command.runSelection'), icon: Play, hint: hintOf('runSelection'), run: () => runSelection()},
   {id: 'watchMode', label: watchMode.value ? t('command.watchModeOff') : t('command.watchModeOn'), icon: Eye, run: () => { watchMode.value = !watchMode.value }},
   {id: 'aiCompletion', label: aiCompletion.value ? t('command.aiCompletionOff') : t('command.aiCompletionOn'), icon: Sparkles, run: () => toggleAiCompletion()},
+  {id: 'formatOnSave', label: formatOnSave.value ? t('command.formatOnSaveOff') : t('command.formatOnSaveOn'), icon: Save, run: () => toggleFormatOnSave()},
   {id: 'open', label: t('command.open'), icon: FolderOpen, hint: hintOf('open'), run: () => handleOpenFileClick()},
   {id: 'openFolder', label: t('command.openFolder'), icon: FolderOpen, run: () => openFolder()},
   {id: 'save', label: t('command.save'), icon: Save, hint: hintOf('save'), run: () => saveFile()},
@@ -1856,6 +2058,10 @@ const paletteCommands = computed<PaletteCommand[]>(() => [
   {id: 'diff', label: t('command.diff'), icon: GitCompare, run: () => openDiff()},
   {id: 'preview', label: t('command.preview'), icon: Eye, run: () => togglePreview()},
   {id: 'git', label: t('command.git'), icon: GitBranch, run: () => openGit()},
+  {id: 'tasks', label: t('command.tasks'), icon: ListChecks, run: () => openTasks()},
+  {id: 'runTests', label: t('command.runTests'), icon: ListChecks, run: () => runTests()},
+  {id: 'startDebug', label: t('command.startDebug'), icon: Play, run: () => startDebug()},
+  {id: 'sendToTerminal', label: t('command.sendToTerminal'), icon: TerminalIcon, run: () => sendToTerminal()},
   {id: 'toggleSidebar', label: t('command.toggleSidebar'), icon: PanelLeft, hint: hintOf('toggleSidebar'), run: () => toggleSidebar()},
   {id: 'layoutHorizontal', label: t('command.layoutHorizontal'), group: t('command.groupLayout'), icon: PanelRight, run: () => handleLayoutChange('horizontal')},
   {id: 'layoutVertical', label: t('command.layoutVertical'), group: t('command.groupLayout'), icon: PanelBottom, run: () => handleLayoutChange('vertical')},
diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
index 079ebd3d..ebe56edf 100644
--- a/src/components/AppHeader.vue
+++ b/src/components/AppHeader.vue
@@ -43,6 +43,9 @@
       <Tooltip :text="t('header.ai')">
         <Button type="secondary" :icon="Sparkles" :icon-only="true" @click="emit('show-ai')"/>
       </Tooltip>
+      <Tooltip :text="t('header.git')">
+        <Button type="secondary" :icon="GitBranch" :icon-only="true" @click="emit('show-git')"/>
+      </Tooltip>
     </div>
 
     <div class="flex items-center space-x-3">
@@ -77,7 +80,7 @@
 <script setup lang="ts">
 import {computed, onMounted, ref} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {CheckCircle, FileCode, FolderOpen, History, Maximize2, PanelBottom, PanelLeft, PanelRight, Play, Save, Sparkles, Square} from 'lucide-vue-next'
+import {CheckCircle, FileCode, FolderOpen, GitBranch, History, Maximize2, PanelBottom, PanelLeft, PanelRight, Play, Save, Sparkles, Square} from 'lucide-vue-next'
 import Select from '../ui/Select.vue'
 import Button from '../ui/Button.vue'
 import Tooltip from '../ui/Tooltip.vue'
@@ -105,6 +108,7 @@ const emit = defineEmits<{
   'save-file': []
   'show-history': []
   'show-ai': []
+  'show-git': []
   'toggle-sidebar': []
 }>()
 
diff --git a/src/components/DebugPanel.vue b/src/components/DebugPanel.vue
new file mode 100644
index 00000000..4fd18676
--- /dev/null
+++ b/src/components/DebugPanel.vue
@@ -0,0 +1,170 @@
+<template>
+  <div v-if="debug.status.value !== 'inactive'"
+       class="fixed top-0 right-0 bottom-0 z-30 w-[300px] bg-white dark:bg-gray-900 dark:text-gray-100 border-l border-gray-200 dark:border-gray-700 shadow-xl flex flex-col">
+    <div class="flex items-center justify-between px-3 py-2 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">
+        <Bug class="w-4 h-4 text-gray-400"/>
+        <span>{{ t('debug.panelTitle') }}</span>
+      </div>
+      <button class="text-gray-400 hover:text-red-500 cursor-pointer" :title="t('debug.stop')" @click="debug.stopSession()">
+        <Square class="w-4 h-4"/>
+      </button>
+    </div>
+
+    <div class="flex-1 min-h-0 overflow-y-auto">
+      <!-- 监视 -->
+      <div class="px-3 py-1.5 text-[11px] font-semibold text-gray-500 dark:text-gray-400 flex items-center gap-2">
+        <span>{{ t('debug.watch') }}</span>
+        <input v-model="watchInput"
+               class="flex-1 min-w-0 text-[11px] font-mono border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-1.5 py-0.5 focus:outline-none focus:border-blue-500"
+               :placeholder="t('debug.watchPlaceholder')"
+               @keydown.enter="addWatch"/>
+      </div>
+      <div v-for="(w, i) in debug.watches.value" :key="i"
+           class="group flex items-start gap-1 px-3 py-0.5 font-mono text-[11px] leading-5 hover:bg-gray-100 dark:hover:bg-gray-800">
+        <span class="text-purple-600 dark:text-purple-300 flex-shrink-0">{{ w.expr }}</span>
+        <span class="text-gray-400">:</span>
+        <span class="text-gray-700 dark:text-gray-200 break-all flex-1">{{ w.value }}</span>
+        <button class="text-gray-400 hover:text-red-500 opacity-0 group-hover:opacity-100 cursor-pointer flex-shrink-0" @click="debug.removeWatch(i)">×</button>
+      </div>
+
+      <!-- 调用栈 -->
+      <div class="px-3 py-1.5 mt-1 text-[11px] font-semibold text-gray-500 dark:text-gray-400 border-t border-gray-100 dark:border-gray-800">{{ t('debug.callStack') }}</div>
+      <div v-if="!debug.frames.value.length" class="px-3 py-2 text-[11px] text-gray-400">{{ t('debug.notStopped') }}</div>
+      <button v-for="f in debug.frames.value" :key="f.id"
+              class="w-full text-left px-3 py-1 text-[11px] font-mono truncate cursor-pointer"
+              :class="debug.selectedFrameId.value === f.id ? 'bg-blue-50 dark:bg-blue-900/30' : 'hover:bg-gray-100 dark:hover:bg-gray-800'"
+              @click="debug.selectFrame(f.id)">
+        <span class="text-gray-800 dark:text-gray-100">{{ f.name }}</span>
+        <span class="text-gray-400"> · {{ f.source?.name || '' }}:{{ f.line }}</span>
+      </button>
+
+      <!-- 变量 -->
+      <div class="px-3 py-1.5 mt-1 text-[11px] font-semibold text-gray-500 dark:text-gray-400 border-t border-gray-100 dark:border-gray-800">{{ t('debug.variables') }}</div>
+      <div v-if="!scopes.length" class="px-3 py-2 text-[11px] text-gray-400">—</div>
+      <div v-for="scope in scopes" :key="scope.variablesReference" class="pb-1">
+        <button class="w-full text-left px-2 py-0.5 text-[11px] font-medium text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 cursor-pointer flex items-center gap-1"
+                @click="toggleScope(scope.variablesReference)">
+          <ChevronRight class="w-3 h-3 transition-transform" :class="{ 'rotate-90': openScopes.has(scope.variablesReference) }"/>
+          {{ scope.name }}
+        </button>
+        <template v-if="openScopes.has(scope.variablesReference)">
+          <DebugVarNode v-for="(v, i) in (scopeVars.get(scope.variablesReference) || [])" :key="i" :variable="v" :depth="1"/>
+        </template>
+      </div>
+
+      <!-- 断点列表 -->
+      <div class="px-3 py-1.5 mt-1 text-[11px] font-semibold text-gray-500 dark:text-gray-400 border-t border-gray-100 dark:border-gray-800">{{ t('debug.breakpoints') }}</div>
+      <div v-if="!bps.length" class="px-3 py-1 text-[11px] text-gray-400">—</div>
+      <div v-for="b in bps" :key="b.path + ':' + b.line"
+           class="group flex items-center gap-1.5 px-3 py-0.5 text-[11px] hover:bg-gray-100 dark:hover:bg-gray-800">
+        <span class="text-red-500 flex-shrink-0 cursor-pointer" @click="debug.revealLocation(b.path, b.line)">{{ b.condition ? '◆' : '●' }}</span>
+        <span class="truncate text-gray-700 dark:text-gray-200 flex-shrink-0 cursor-pointer" @click="debug.revealLocation(b.path, b.line)">{{ baseName(b.path) }}<span class="text-gray-400">:{{ b.line }}</span></span>
+        <input :value="b.condition" class="flex-1 min-w-0 text-[11px] font-mono bg-transparent border border-transparent hover:border-gray-300 dark:hover:border-gray-600 focus:border-blue-500 rounded px-1 focus:outline-none"
+               :placeholder="t('debug.conditionPlaceholder')"
+               @change="onCondition(b.path, b.line, $event)"/>
+        <button class="text-gray-400 hover:text-red-500 opacity-0 group-hover:opacity-100 flex-shrink-0" @click="debug.toggleBreakpoint(b.path, b.line)">×</button>
+      </div>
+
+      <!-- 异常断点 -->
+      <template v-if="debug.exceptionFilters.value.length">
+        <div class="px-3 py-1.5 mt-1 text-[11px] font-semibold text-gray-500 dark:text-gray-400 border-t border-gray-100 dark:border-gray-800">{{ t('debug.exceptions') }}</div>
+        <label v-for="f in debug.exceptionFilters.value" :key="f.filter"
+               class="flex items-center gap-1.5 px-3 py-0.5 text-[11px] text-gray-700 dark:text-gray-200 cursor-pointer">
+          <input type="checkbox" class="cursor-pointer"
+                 :checked="debug.selectedExceptionFilters.value.has(f.filter)"
+                 @change="debug.setExceptionFilter(f.filter, ($event.target as HTMLInputElement).checked)"/>
+          {{ f.label }}
+        </label>
+      </template>
+
+      <!-- 调试控制台输出 -->
+      <div class="px-3 py-1.5 mt-1 text-[11px] font-semibold text-gray-500 dark:text-gray-400 border-t border-gray-100 dark:border-gray-800">{{ t('debug.console') }}</div>
+      <pre class="px-3 pb-2 text-[11px] font-mono whitespace-pre-wrap break-all"><span
+          v-for="(l, i) in debug.consoleLines.value" :key="i" :class="lineClass(l.category)">{{ l.text }}</span></pre>
+    </div>
+
+    <!-- REPL 输入 -->
+    <div class="flex-shrink-0 border-t border-gray-200 dark:border-gray-700 px-2 py-1.5">
+      <input v-model="replInput"
+             class="w-full text-[11px] font-mono border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500"
+             :placeholder="t('debug.replPlaceholder')"
+             @keydown.enter="submitRepl"/>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {computed, ref, watch} from 'vue'
+import {Bug, ChevronRight, Square} from 'lucide-vue-next'
+import {useI18n} from 'vue-i18n'
+import {useDebug, type DapVariable, type Scope} from '../composables/useDebug'
+import DebugVarNode from './DebugVarNode.vue'
+
+const {t} = useI18n()
+const debug = useDebug()
+
+const scopes = ref<Scope[]>([])
+const openScopes = ref<Set<number>>(new Set())
+const scopeVars = ref<Map<number, DapVariable[]>>(new Map())
+const watchInput = ref('')
+const replInput = ref('')
+
+// 断点列表（随 bpVersion 刷新）
+const bps = computed(() => {
+  void debug.bpVersion.value
+  return debug.allBreakpoints()
+})
+const baseName = (p: string) => p.split(/[\\/]/).pop() || p
+const onCondition = (path: string, line: number, e: Event) => {
+  debug.setBreakpointCondition(path, line, (e.target as HTMLInputElement).value.trim())
+}
+
+const lineClass = (category: string): string => {
+  if (category === 'stderr') return 'text-red-500'
+  if (category === 'input') return 'text-blue-500'
+  if (category === 'result') return 'text-emerald-600 dark:text-emerald-400'
+  return 'text-gray-700 dark:text-gray-300'
+}
+
+const loadScopes = async () => {
+  scopes.value = []
+  openScopes.value = new Set()
+  scopeVars.value = new Map()
+  const id = debug.selectedFrameId.value
+  if (id == null) {
+    return
+  }
+  scopes.value = await debug.requestScopes(id)
+  const first = scopes.value[0]
+  if (first) {
+    await toggleScope(first.variablesReference)
+  }
+}
+
+const toggleScope = async (ref_: number) => {
+  const open = openScopes.value
+  if (open.has(ref_)) {
+    open.delete(ref_)
+  }
+  else {
+    open.add(ref_)
+    if (!scopeVars.value.has(ref_)) {
+      scopeVars.value.set(ref_, await debug.requestVariables(ref_))
+    }
+  }
+  openScopes.value = new Set(open)
+}
+
+const addWatch = () => {
+  debug.addWatch(watchInput.value)
+  watchInput.value = ''
+}
+const submitRepl = () => {
+  const v = replInput.value
+  replInput.value = ''
+  debug.evalRepl(v)
+}
+
+watch(() => debug.selectedFrameId.value, () => loadScopes())
+</script>
diff --git a/src/components/DebugToolbar.vue b/src/components/DebugToolbar.vue
new file mode 100644
index 00000000..3a949190
--- /dev/null
+++ b/src/components/DebugToolbar.vue
@@ -0,0 +1,57 @@
+<template>
+  <div v-if="debug.status.value !== 'inactive'"
+       class="fixed top-2 left-1/2 -translate-x-1/2 z-40 flex items-center gap-1 px-2 py-1 rounded-lg bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 shadow-lg">
+    <button class="p-1.5 rounded hover:bg-gray-100 dark:hover:bg-gray-700 text-emerald-600 dark:text-emerald-400 disabled:opacity-30 cursor-pointer"
+            :disabled="debug.status.value !== 'stopped'" :title="t('debug.continue')" @click="debug.continue()">
+      <Play class="w-4 h-4"/>
+    </button>
+    <button class="p-1.5 rounded hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-30 cursor-pointer"
+            :disabled="debug.status.value !== 'running'" :title="t('debug.pause')" @click="debug.pause()">
+      <Pause class="w-4 h-4"/>
+    </button>
+    <div class="w-px h-4 bg-gray-200 dark:bg-gray-700 mx-0.5"></div>
+    <button class="p-1.5 rounded hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-30 cursor-pointer"
+            :disabled="debug.status.value !== 'stopped'" :title="t('debug.stepOver')" @click="debug.stepOver()">
+      <StepForward class="w-4 h-4"/>
+    </button>
+    <button class="p-1.5 rounded hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-30 cursor-pointer"
+            :disabled="debug.status.value !== 'stopped'" :title="t('debug.stepIn')" @click="debug.stepIn()">
+      <ArrowDownToLine class="w-4 h-4"/>
+    </button>
+    <button class="p-1.5 rounded hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-30 cursor-pointer"
+            :disabled="debug.status.value !== 'stopped'" :title="t('debug.stepOut')" @click="debug.stepOut()">
+      <ArrowUpFromLine class="w-4 h-4"/>
+    </button>
+    <div class="w-px h-4 bg-gray-200 dark:bg-gray-700 mx-0.5"></div>
+    <button class="p-1.5 rounded hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" :title="t('debug.restart')" @click="debug.restart()">
+      <RotateCcw class="w-4 h-4"/>
+    </button>
+    <button class="p-1.5 rounded hover:bg-gray-100 dark:hover:bg-gray-700 text-red-500 cursor-pointer" :title="t('debug.stop')" @click="debug.stopSession()">
+      <Square class="w-4 h-4"/>
+    </button>
+    <span class="ml-1 text-[11px] text-gray-400 select-none">{{ statusLabel }}</span>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {computed} from 'vue'
+import {ArrowDownToLine, ArrowUpFromLine, Pause, Play, RotateCcw, Square, StepForward} from 'lucide-vue-next'
+import {useI18n} from 'vue-i18n'
+import {useDebug} from '../composables/useDebug'
+
+const {t} = useI18n()
+const debug = useDebug()
+
+const statusLabel = computed(() => {
+  switch (debug.status.value) {
+    case 'starting':
+      return t('debug.statusStarting')
+    case 'running':
+      return t('debug.statusRunning')
+    case 'stopped':
+      return t('debug.statusStopped')
+    default:
+      return ''
+  }
+})
+</script>
diff --git a/src/components/DebugVarNode.vue b/src/components/DebugVarNode.vue
new file mode 100644
index 00000000..32828c9e
--- /dev/null
+++ b/src/components/DebugVarNode.vue
@@ -0,0 +1,42 @@
+<template>
+  <div>
+    <div class="flex items-start gap-1 px-1 py-0.5 hover:bg-gray-100 dark:hover:bg-gray-800 rounded cursor-default font-mono text-[11px] leading-5"
+         :style="{ paddingLeft: `${depth * 12 + 4}px` }"
+         @click="toggle">
+      <span class="w-3 flex-shrink-0 text-gray-400">
+        <ChevronRight v-if="expandable" class="w-3 h-3 transition-transform" :class="{ 'rotate-90': expanded }"/>
+      </span>
+      <span class="text-purple-600 dark:text-purple-300 flex-shrink-0">{{ variable.name }}</span>
+      <span class="text-gray-400">:</span>
+      <span class="text-gray-700 dark:text-gray-200 break-all">{{ variable.value }}</span>
+    </div>
+    <div v-if="expanded">
+      <DebugVarNode v-for="(child, i) in children" :key="i" :variable="child" :depth="depth + 1"/>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {computed, ref} from 'vue'
+import {ChevronRight} from 'lucide-vue-next'
+import {useDebug, type DapVariable} from '../composables/useDebug'
+
+const props = defineProps<{ variable: DapVariable; depth: number }>()
+const debug = useDebug()
+
+const expandable = computed(() => props.variable.variablesReference > 0)
+const expanded = ref(false)
+const children = ref<DapVariable[]>([])
+let loaded = false
+
+const toggle = async () => {
+  if (!expandable.value) {
+    return
+  }
+  expanded.value = !expanded.value
+  if (expanded.value && !loaded) {
+    children.value = await debug.requestVariables(props.variable.variablesReference)
+    loaded = true
+  }
+}
+</script>
diff --git a/src/components/GitConfig.vue b/src/components/GitConfig.vue
index 1c52d2ea..ce2f1b53 100644
--- a/src/components/GitConfig.vue
+++ b/src/components/GitConfig.vue
@@ -5,30 +5,51 @@
       <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">
           <UserCog class="w-4 h-4 text-gray-400"/>
-          <span>{{ t('git.identityTitle') }}</span>
+          <span>{{ t('git.configTitle') }}</span>
         </div>
         <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="emit('close')">
           <X class="w-4 h-4"/>
         </button>
       </div>
 
-      <div class="p-4 space-y-3">
-        <p class="text-[11px] text-gray-400">{{ t('git.identityHint') }}</p>
-        <label class="block">
-          <span class="text-xs text-gray-500 dark:text-gray-400">{{ t('git.identityName') }}</span>
-          <input v-model="name"
-                 class="mt-1 w-full text-sm border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500"
-                 placeholder="Your Name"/>
-        </label>
-        <label class="block">
-          <span class="text-xs text-gray-500 dark:text-gray-400">{{ t('git.identityEmail') }}</span>
-          <input v-model="email"
-                 class="mt-1 w-full text-sm border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500"
-                 placeholder="you@example.com"/>
-        </label>
+      <div class="p-4 space-y-4">
+        <!-- 提交身份 -->
+        <div class="space-y-2">
+          <div class="text-xs font-semibold text-gray-600 dark:text-gray-300">{{ t('git.identitySection') }}</div>
+          <p class="text-[11px] text-gray-400">{{ t('git.identityHint') }}</p>
+          <label class="block">
+            <span class="text-xs text-gray-500 dark:text-gray-400">{{ t('git.identityName') }}</span>
+            <input v-model="name"
+                   class="mt-1 w-full text-sm border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500"
+                   placeholder="Your Name"/>
+          </label>
+          <label class="block">
+            <span class="text-xs text-gray-500 dark:text-gray-400">{{ t('git.identityEmail') }}</span>
+            <input v-model="email"
+                   class="mt-1 w-full text-sm border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500"
+                   placeholder="you@example.com"/>
+          </label>
+        </div>
+
+        <!-- 提交签名 -->
+        <div class="space-y-2 pt-3 border-t border-gray-100 dark:border-gray-800">
+          <div class="text-xs font-semibold text-gray-600 dark:text-gray-300">{{ t('git.signingSection') }}</div>
+          <p class="text-[11px] text-gray-400">{{ t('git.signingHint') }}</p>
+          <label class="flex items-center gap-2 cursor-pointer">
+            <input v-model="gpgsign" type="checkbox" class="cursor-pointer"/>
+            <span class="text-sm text-gray-700 dark:text-gray-200">{{ t('git.signingEnable') }}</span>
+          </label>
+          <label class="block">
+            <span class="text-xs text-gray-500 dark:text-gray-400">{{ t('git.signingKey') }}</span>
+            <input v-model="signingKey"
+                   class="mt-1 w-full text-sm font-mono border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500"
+                   placeholder="3AA5C34371567BD2"/>
+          </label>
+        </div>
+
         <div class="flex justify-end gap-2 pt-1">
           <Button size="sm" type="secondary" @click="emit('close')">{{ t('git.cancel') }}</Button>
-          <Button size="sm" :loading="busy" :disabled="!name.trim() && !email.trim()" @click="save">{{ t('git.identitySave') }}</Button>
+          <Button size="sm" :loading="busy" @click="save">{{ t('git.identitySave') }}</Button>
         </div>
       </div>
     </div>
@@ -50,6 +71,8 @@ const toast = useToast()
 const {t} = useI18n()
 const name = ref('')
 const email = ref('')
+const gpgsign = ref(false)
+const signingKey = ref('')
 const busy = ref(false)
 
 const load = async () => {
@@ -57,6 +80,9 @@ const load = async () => {
     const [n, e] = await invoke<string[]>('git_get_identity', {root: props.rootDir})
     name.value = n || ''
     email.value = e || ''
+    const [sign, key] = await invoke<string[]>('git_get_signing', {root: props.rootDir})
+    gpgsign.value = sign === 'true'
+    signingKey.value = key || ''
   }
   catch (error) {
     toast.error(t('git.identityFailed') + ': ' + error)
@@ -67,6 +93,7 @@ const save = async () => {
   busy.value = true
   try {
     await invoke('git_set_identity', {root: props.rootDir, name: name.value.trim(), email: email.value.trim()})
+    await invoke('git_set_signing', {root: props.rootDir, enabled: gpgsign.value, key: signingKey.value.trim()})
     toast.success(t('git.identitySaved'))
     emit('close')
   }
diff --git a/src/components/GitHooks.vue b/src/components/GitHooks.vue
new file mode 100644
index 00000000..e38b60ad
--- /dev/null
+++ b/src/components/GitHooks.vue
@@ -0,0 +1,129 @@
+<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-[640px] max-h-full bg-white dark:bg-gray-900 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">
+          <Webhook class="w-4 h-4 text-gray-400"/>
+          <span>{{ t('git.hooksTitle') }}</span>
+        </div>
+        <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="emit('close')">
+          <X class="w-4 h-4"/>
+        </button>
+      </div>
+
+      <div class="px-4 py-2 text-[11px] text-gray-500 dark:text-gray-400 border-b border-gray-100 dark:border-gray-800 leading-relaxed flex-shrink-0">
+        {{ t('git.hooksHint') }}
+      </div>
+
+      <!-- 编辑中 -->
+      <template v-if="editing">
+        <div class="px-4 py-2 flex items-center gap-2 border-b border-gray-100 dark:border-gray-800 flex-shrink-0">
+          <span class="font-mono text-sm text-gray-800 dark:text-gray-100">{{ editing }}</span>
+          <label class="ml-auto flex items-center gap-1.5 text-xs text-gray-600 dark:text-gray-300 cursor-pointer">
+            <input v-model="execBit" type="checkbox" class="cursor-pointer"/>
+            {{ t('git.hookExecutable') }}
+          </label>
+        </div>
+        <textarea v-model="content" spellcheck="false"
+                  class="flex-1 min-h-[260px] w-full font-mono text-xs p-3 bg-gray-50 dark:bg-gray-800/60 focus:outline-none resize-none"
+                  :placeholder="t('git.hookContentPlaceholder')"/>
+        <div class="flex items-center justify-end gap-2 px-4 py-2.5 border-t border-gray-200 dark:border-gray-700 flex-shrink-0">
+          <Button size="sm" type="secondary" @click="editing = null">{{ t('git.cancel') }}</Button>
+          <Button size="sm" :loading="busy" @click="save">{{ t('git.hookSave') }}</Button>
+        </div>
+      </template>
+
+      <!-- 列表 -->
+      <div v-else class="flex-1 overflow-y-auto min-h-[160px]">
+        <div v-for="hk in hooks" :key="hk.name"
+             class="group flex items-center gap-2 px-4 py-2 border-b border-gray-100 dark:border-gray-800">
+          <span class="flex-1 font-mono text-sm" :class="hk.active ? 'text-gray-800 dark:text-gray-100' : 'text-gray-400'">{{ hk.name }}</span>
+          <span v-if="hk.active" class="text-[10px] px-1.5 py-0.5 rounded flex-shrink-0 bg-green-100 text-green-700 dark:bg-green-900/40 dark:text-green-300">{{ t('git.hooksActive') }}</span>
+          <span v-if="hk.active && !hk.executable" class="text-[10px] px-1.5 py-0.5 rounded flex-shrink-0 bg-amber-100 text-amber-700 dark:bg-amber-900/40 dark:text-amber-300">{{ t('git.hooksNotExecutable') }}</span>
+          <button class="text-xs text-blue-500 hover:underline opacity-0 group-hover:opacity-100 cursor-pointer flex-shrink-0" @click="edit(hk.name)">{{ t('git.hookEdit') }}</button>
+          <button v-if="hk.active" class="text-xs text-red-500 hover:underline opacity-0 group-hover:opacity-100 cursor-pointer flex-shrink-0" :disabled="busy" @click="remove(hk.name)">{{ t('git.hookDelete') }}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {onMounted, ref} from 'vue'
+import {invoke} from '@tauri-apps/api/core'
+import {Webhook, X} from 'lucide-vue-next'
+import Button from '../ui/Button.vue'
+import {useToast} from '../plugins/toast'
+import {useI18n} from 'vue-i18n'
+
+interface Hook { name: string; active: boolean; executable: boolean }
+
+const props = defineProps<{ rootDir: string }>()
+const emit = defineEmits<{ close: [] }>()
+
+const toast = useToast()
+const {t} = useI18n()
+const hooks = ref<Hook[]>([])
+const editing = ref<string | null>(null)
+const content = ref('')
+const execBit = ref(true)
+const busy = ref(false)
+
+const load = async () => {
+  try {
+    hooks.value = await invoke<Hook[]>('git_hooks', {root: props.rootDir})
+  }
+  catch (error) {
+    toast.error(t('git.hookFailed') + ': ' + error)
+  }
+}
+
+const edit = async (name: string) => {
+  try {
+    const existing = await invoke<string>('git_hook_read', {root: props.rootDir, name})
+    content.value = existing || '#!/bin/sh\n'
+    execBit.value = true
+    editing.value = name
+  }
+  catch (error) {
+    toast.error(t('git.hookFailed') + ': ' + error)
+  }
+}
+
+const save = async () => {
+  if (!editing.value) {
+    return
+  }
+  busy.value = true
+  try {
+    await invoke('git_hook_save', {root: props.rootDir, name: editing.value, content: content.value, executable: execBit.value})
+    toast.success(t('git.hookSaved'))
+    editing.value = null
+    await load()
+  }
+  catch (error) {
+    toast.error(t('git.hookFailed') + ': ' + error)
+  }
+  finally {
+    busy.value = false
+  }
+}
+
+const remove = async (name: string) => {
+  busy.value = true
+  try {
+    await invoke('git_hook_delete', {root: props.rootDir, name})
+    toast.success(t('git.hookDeleted'))
+    await load()
+  }
+  catch (error) {
+    toast.error(t('git.hookFailed') + ': ' + error)
+  }
+  finally {
+    busy.value = false
+  }
+}
+
+onMounted(load)
+</script>
diff --git a/src/components/GitLog.vue b/src/components/GitLog.vue
index 96241b87..a2915f79 100644
--- a/src/components/GitLog.vue
+++ b/src/components/GitLog.vue
@@ -20,6 +20,22 @@
         </button>
       </div>
 
+      <!-- 过滤栏：提交信息搜索 + 作者（仅分支/提交历史视图） -->
+      <div v-if="!relPath" class="flex items-center gap-2 px-4 py-2 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
+        <Search class="w-3.5 h-3.5 text-gray-400 flex-shrink-0"/>
+        <input v-model="grep"
+               class="flex-1 min-w-0 text-xs border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500"
+               :placeholder="t('git.logSearchPlaceholder')"
+               @input="onFilterInput" @keydown.enter="reloadAll"/>
+        <input v-model="author"
+               class="w-40 flex-shrink-0 text-xs border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500"
+               :placeholder="t('git.logAuthorPlaceholder')"
+               @input="onFilterInput" @keydown.enter="reloadAll"/>
+        <button v-if="grep || author" class="text-xs text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer flex-shrink-0" @click="grep = ''; author = ''; reloadAll()">
+          {{ t('git.logClearFilter') }}
+        </button>
+      </div>
+
       <div class="flex-1 min-h-0 grid grid-cols-[300px_1fr]">
         <!-- 提交列表 -->
         <aside class="border-r border-gray-200 dark:border-gray-700 overflow-y-auto" @scroll="onScroll">
@@ -92,7 +108,7 @@
 <script setup lang="ts">
 import {computed, onMounted, ref} from 'vue'
 import {invoke} from '@tauri-apps/api/core'
-import {History, X} from 'lucide-vue-next'
+import {History, Search, X} from 'lucide-vue-next'
 import Button from '../ui/Button.vue'
 import Modal from '../ui/Modal.vue'
 import {useToast} from '../plugins/toast'
@@ -119,6 +135,14 @@ const tagName = ref('')
 // 分支切换（查看其它分支历史以便 cherry-pick）
 const branches = ref<string[]>([])
 const selectedRev = ref('')
+// 提交信息搜索 + 作者过滤（仅分支/提交历史视图）
+const grep = ref('')
+const author = ref('')
+let filterTimer: ReturnType<typeof setTimeout> | undefined
+const onFilterInput = () => {
+  clearTimeout(filterTimer)
+  filterTimer = setTimeout(() => reloadAll(), 300)
+}
 
 const patchLines = computed(() => patch.value.split('\n'))
 
@@ -139,7 +163,7 @@ const loadMore = async () => {
   try {
     const batch = props.relPath
       ? await invoke<GitCommit[]>('git_log_file', {root: props.rootDir, relPath: props.relPath, limit: PAGE, skip: commits.value.length})
-      : await invoke<GitCommit[]>('git_log', {root: props.rootDir, limit: PAGE, skip: commits.value.length, revision: selectedRev.value || null})
+      : await invoke<GitCommit[]>('git_log', {root: props.rootDir, limit: PAGE, skip: commits.value.length, revision: selectedRev.value || null, grep: grep.value.trim() || null, author: author.value.trim() || null})
     commits.value = [...commits.value, ...batch]
     if (batch.length < PAGE) {
       done.value = true
diff --git a/src/components/GitPanel.vue b/src/components/GitPanel.vue
index d83515ac..7e1d8150 100644
--- a/src/components/GitPanel.vue
+++ b/src/components/GitPanel.vue
@@ -1,5 +1,9 @@
 <template>
-  <div class="fixed top-0 right-0 bottom-0 z-40 w-[42%] min-w-[360px] max-w-[640px] bg-white dark:bg-gray-900 border-l border-gray-200 dark:border-gray-700 shadow-2xl flex flex-col">
+  <div class="fixed top-0 right-0 bottom-0 z-40 bg-white dark:bg-gray-900 border-l border-gray-200 dark:border-gray-700 shadow-2xl flex flex-col"
+       :style="{ width: panelWidth + 'px' }">
+    <!-- 左缘拖拽改宽 -->
+    <div class="absolute left-0 top-0 bottom-0 w-1 -ml-0.5 cursor-col-resize hover:bg-blue-500 z-50"
+         @mousedown="startResize"></div>
     <!-- 头部：分支 + 操作 -->
     <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 min-w-0">
@@ -64,54 +68,91 @@
         </div>
       </template>
       <div class="flex items-center gap-2 flex-shrink-0">
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.remoteTitle')" @click="showRemotes = true">
-          <Cloud class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.tagTitle')" @click="showTags = true">
-          <Tag class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.identityTitle')" @click="showConfig = true">
-          <UserCog class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.stashTitle')" @click="showStash = true">
-          <Archive class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.history')" @click="showLog = true">
-          <History class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.graph')" @click="showGraph = true">
-          <Network class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo && submoduleCount > 0" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.submodule')" @click="showSubmodules = true">
-          <Boxes class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.worktree')" @click="showWorktrees = true">
-          <TreeDeciduous class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.bisect')" @click="showBisect = true">
-          <Crosshair class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.rebase')" @click="showRebase = true">
-          <ListOrdered class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.compare')" @click="showCompare = true">
-          <GitCompareArrows class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.reflog')" @click="showReflog = true">
-          <RotateCcw class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-red-500 cursor-pointer" :title="t('git.clean')" @click="openClean">
-          <Eraser class="w-4 h-4"/>
-        </button>
-        <button v-if="status.is_repo" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer disabled:opacity-40" :title="t('git.fetch')" :disabled="busy" @click="fetch">
-          <DownloadCloud class="w-4 h-4" :class="{ 'animate-pulse': pending === 'fetch' }"/>
-        </button>
-        <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.refresh')" @click="refresh">
-          <RefreshCw class="w-4 h-4" :class="{ 'animate-spin': loading }"/>
-        </button>
-        <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('git.close')" @click="emit('close')">
-          <X class="w-4 h-4"/>
-        </button>
+        <Tooltip v-if="status.is_repo" :text="t('git.remoteTitle')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showRemotes = true">
+            <Cloud class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.tagTitle')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showTags = true">
+            <Tag class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.configTitle')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showConfig = true">
+            <UserCog class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.stashTitle')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showStash = true">
+            <Archive class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.history')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showLog = true">
+            <History class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.graph')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showGraph = true">
+            <Network class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo && submoduleCount > 0" :text="t('git.submodule')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showSubmodules = true">
+            <Boxes class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.worktree')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showWorktrees = true">
+            <TreeDeciduous class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.bisect')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showBisect = true">
+            <Crosshair class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.rebase')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showRebase = true">
+            <ListOrdered class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.hooks')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showHooks = true">
+            <Webhook class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.compare')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showCompare = true">
+            <GitCompareArrows class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.reflog')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showReflog = true">
+            <RotateCcw class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.clean')">
+          <button class="text-gray-400 hover:text-red-500 cursor-pointer" @click="openClean">
+            <Eraser class="w-4 h-4"/>
+          </button>
+        </Tooltip>
+        <Tooltip v-if="status.is_repo" :text="t('git.fetch')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer disabled:opacity-40" :disabled="busy" @click="fetch">
+            <DownloadCloud class="w-4 h-4" :class="{ 'animate-pulse': pending === 'fetch' }"/>
+          </button>
+        </Tooltip>
+        <Tooltip :text="t('git.refresh')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="refresh">
+            <RefreshCw class="w-4 h-4" :class="{ 'animate-spin': loading }"/>
+          </button>
+        </Tooltip>
+        <Tooltip :text="t('git.close')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="emit('close')">
+            <X class="w-4 h-4"/>
+          </button>
+        </Tooltip>
       </div>
     </div>
 
@@ -297,6 +338,9 @@
   <!-- 交互式变基 -->
   <GitRebase v-if="showRebase" :root-dir="rootDir" @close="showRebase = false" @changed="refresh"/>
 
+  <!-- Git 钩子 -->
+  <GitHooks v-if="showHooks" :root-dir="rootDir" @close="showHooks = false"/>
+
   <!-- 提交历史 -->
   <GitLog v-if="showLog" :root-dir="rootDir" @close="showLog = false" @changed="refresh"/>
 
@@ -317,11 +361,13 @@
 </template>
 
 <script setup lang="ts">
-import {computed, h, onMounted, ref} from 'vue'
+import {computed, h, onBeforeUnmount, onMounted, ref} from 'vue'
+import {kvGet, kvSet} from '../composables/useKvStore'
 import {invoke} from '@tauri-apps/api/core'
-import {AlertTriangle, Archive, Boxes, Cloud, Crosshair, DownloadCloud, Eraser, GitBranch, GitBranchPlus, GitCompare as GitCompareIcon, GitCompareArrows, GitMerge, History, ListOrdered, MoreHorizontal, Network, Pencil, RefreshCw, RotateCcw, Rows3, Sparkles, Tag, Trash2, TreeDeciduous, Undo2, UserCog, X} from 'lucide-vue-next'
+import {AlertTriangle, Archive, Boxes, Cloud, Crosshair, DownloadCloud, Eraser, GitBranch, GitBranchPlus, GitCompare as GitCompareIcon, GitCompareArrows, GitMerge, History, ListOrdered, MoreHorizontal, Network, Pencil, RefreshCw, RotateCcw, Rows3, Sparkles, Tag, Trash2, TreeDeciduous, Undo2, UserCog, Webhook, X} from 'lucide-vue-next'
 import Button from '../ui/Button.vue'
 import Modal from '../ui/Modal.vue'
+import Tooltip from '../ui/Tooltip.vue'
 import DiffView from './DiffView.vue'
 import GitLog from './GitLog.vue'
 import GitReflog from './GitReflog.vue'
@@ -336,6 +382,7 @@ import GitSubmodules from './GitSubmodules.vue'
 import GitWorktrees from './GitWorktrees.vue'
 import GitBisect from './GitBisect.vue'
 import GitRebase from './GitRebase.vue'
+import GitHooks from './GitHooks.vue'
 import {useToast} from '../plugins/toast'
 import {useI18n} from 'vue-i18n'
 import {useAiConfig} from '../composables/useAiConfig'
@@ -346,6 +393,36 @@ interface GitStatusData { is_repo: boolean; branch: string; ahead: number; behin
 const props = defineProps<{ rootDir: string }>()
 const emit = defineEmits<{ close: []; refresh: []; open: [path: string] }>()
 
+// 面板宽度（可拖拽左缘改宽，持久化到 KV）
+const clampWidth = (w: number) => Math.max(360, Math.min(w, Math.max(360, window.innerWidth - 200)))
+const panelWidth = ref(clampWidth(Number(kvGet('git-panel-width')) || Math.round(window.innerWidth * 0.42)))
+let resizeStartX = 0
+let resizeStartWidth = 0
+const onResize = (e: MouseEvent) => {
+  // 拖拽左缘：鼠标左移（clientX 减小）使面板变宽
+  panelWidth.value = clampWidth(resizeStartWidth + (resizeStartX - e.clientX))
+}
+const stopResize = () => {
+  document.removeEventListener('mousemove', onResize)
+  document.removeEventListener('mouseup', stopResize)
+  document.body.style.userSelect = ''
+  document.body.style.cursor = ''
+  kvSet('git-panel-width', String(panelWidth.value))
+}
+const startResize = (e: MouseEvent) => {
+  e.preventDefault()
+  resizeStartX = e.clientX
+  resizeStartWidth = panelWidth.value
+  document.addEventListener('mousemove', onResize)
+  document.addEventListener('mouseup', stopResize)
+  document.body.style.userSelect = 'none'
+  document.body.style.cursor = 'col-resize'
+}
+onBeforeUnmount(() => {
+  document.removeEventListener('mousemove', onResize)
+  document.removeEventListener('mouseup', stopResize)
+})
+
 const toast = useToast()
 const {t} = useI18n()
 const {active, reload: reloadAi} = useAiConfig()
@@ -386,6 +463,7 @@ const submoduleCount = ref(0)
 const showWorktrees = ref(false)
 const showBisect = ref(false)
 const showRebase = ref(false)
+const showHooks = ref(false)
 const hunkFile = ref<{ path: string; staged: boolean } | null>(null)
 const openHunks = (path: string, staged: boolean) => {
   hunkFile.value = {path, staged}
diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue
index cb08d185..2197fd57 100644
--- a/src/components/StatusBar.vue
+++ b/src/components/StatusBar.vue
@@ -22,6 +22,12 @@
     </div>
 
     <div class="flex items-center space-x-4">
+      <!-- 调试状态 -->
+      <div v-if="debug.status.value !== 'inactive'" class="flex items-center space-x-1">
+        <Bug class="w-3.5 h-3.5"/>
+        <span>{{ debug.status.value === 'stopped' ? t('debug.statusStopped') : debug.status.value === 'starting' ? t('debug.statusStarting') : t('debug.statusRunning') }}</span>
+      </div>
+
       <!-- LSP 状态（点击开关问题面板）-->
       <button v-if="lspState.status !== 'off'"
               class="flex items-center space-x-2 px-1 rounded cursor-pointer hover:bg-white/20 transition-colors"
@@ -52,15 +58,17 @@
 </template>
 
 <script setup lang="ts">
-import { AlertTriangle, Clock, Hash, RefreshCw, Terminal as TerminalIcon, XCircle } from 'lucide-vue-next'
+import { AlertTriangle, Bug, Clock, Hash, RefreshCw, Terminal as TerminalIcon, XCircle } from 'lucide-vue-next'
 import { computed, toRefs } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useStatusBar } from '../composables/useStatusBar'
 import { lspState } from '../editor/lspStatus'
+import { useDebug } from '../composables/useDebug'
 import { diagnostics } from '../editor/lspDiagnostics'
 import { useShortcuts } from '../composables/useShortcuts'
 
 const {t} = useI18n()
+const debug = useDebug()
 
 const props = defineProps<{
   envInfo: {
diff --git a/src/components/TaskRunner.vue b/src/components/TaskRunner.vue
new file mode 100644
index 00000000..44338bc9
--- /dev/null
+++ b/src/components/TaskRunner.vue
@@ -0,0 +1,85 @@
+<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-[560px] max-h-full bg-white dark:bg-gray-900 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">
+          <ListChecks class="w-4 h-4 text-gray-400"/>
+          <span>{{ t('task.title') }}</span>
+        </div>
+        <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="emit('close')">
+          <X class="w-4 h-4"/>
+        </button>
+      </div>
+
+      <!-- 新增任务 -->
+      <div class="p-3 border-b border-gray-200 dark:border-gray-700 flex-shrink-0 flex gap-2">
+        <input v-model="label" class="w-36 flex-shrink-0 text-sm border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500" :placeholder="t('task.labelPlaceholder')"/>
+        <input v-model="command" class="flex-1 min-w-0 text-sm font-mono border border-gray-300 dark:border-gray-600 dark:bg-gray-800 rounded px-2 py-1 focus:outline-none focus:border-blue-500" :placeholder="t('task.commandPlaceholder')" @keydown.enter="add"/>
+        <Button size="sm" :disabled="!label.trim() || !command.trim()" @click="add">{{ t('task.add') }}</Button>
+      </div>
+
+      <!-- 任务列表 -->
+      <div class="flex-1 overflow-y-auto min-h-[120px]">
+        <div v-if="!tasks.length" class="px-4 py-10 text-center text-sm text-gray-400">{{ t('task.empty') }}</div>
+        <div v-for="(tk, i) in tasks" :key="i"
+             class="group flex items-center gap-2 px-4 py-2 border-b border-gray-100 dark:border-gray-800">
+          <button class="text-emerald-600 dark:text-emerald-400 hover:text-emerald-500 cursor-pointer flex-shrink-0" :title="t('task.run')" @click="run(tk)">
+            <Play class="w-4 h-4"/>
+          </button>
+          <div class="flex-1 min-w-0">
+            <div class="text-sm font-medium text-gray-800 dark:text-gray-100 truncate">{{ tk.label }}</div>
+            <div class="text-[11px] text-gray-400 font-mono truncate">{{ tk.command }}</div>
+          </div>
+          <button class="text-xs text-red-500 hover:underline opacity-0 group-hover:opacity-100 cursor-pointer flex-shrink-0" @click="remove(i)">{{ t('task.delete') }}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {onMounted, ref} from 'vue'
+import {ListChecks, Play, X} from 'lucide-vue-next'
+import Button from '../ui/Button.vue'
+import {kvGetJSON, kvSetJSON} from '../composables/useKvStore'
+import {useI18n} from 'vue-i18n'
+
+interface Task { label: string; command: string }
+
+const props = defineProps<{ rootDir: string }>()
+const emit = defineEmits<{ close: []; run: [command: string] }>()
+
+const {t} = useI18n()
+const key = () => `tasks:${props.rootDir}`
+const tasks = ref<Task[]>([])
+const label = ref('')
+const command = ref('')
+
+const load = () => {
+  tasks.value = kvGetJSON<Task[]>(key(), [])
+}
+const persist = () => kvSetJSON(key(), tasks.value)
+
+const add = () => {
+  if (!label.value.trim() || !command.value.trim()) {
+    return
+  }
+  tasks.value = [...tasks.value, {label: label.value.trim(), command: command.value.trim()}]
+  persist()
+  label.value = ''
+  command.value = ''
+}
+
+const remove = (i: number) => {
+  tasks.value = tasks.value.filter((_, idx) => idx !== i)
+  persist()
+}
+
+const run = (tk: Task) => {
+  emit('run', tk.command)
+  emit('close')
+}
+
+onMounted(load)
+</script>
diff --git a/src/components/Terminal.vue b/src/components/Terminal.vue
index 3b24c119..5ef44f21 100644
--- a/src/components/Terminal.vue
+++ b/src/components/Terminal.vue
@@ -145,6 +145,12 @@ const initXterm = async (id: string) => {
 
   try {
     await invoke('terminal_create', {id, cwd: props.rootDir || null, cols: term.cols, rows: term.rows})
+    // 会话就绪后执行挂起的命令（外部 runCommand 在会话初始化期间排入）
+    if (pendingCmd) {
+      const c = pendingCmd
+      pendingCmd = null
+      invoke('terminal_write', {id, data: c + '\r'}).catch(() => {})
+    }
   }
   catch (error) {
     term.write(`\r\n\x1b[31m${t('terminal.startFailed')}${error}\x1b[0m\r\n`)
@@ -155,6 +161,9 @@ const initXterm = async (id: string) => {
   term.focus()
 }
 
+// 外部「运行任务」排入的待执行命令（会话初始化完成后由 initXterm 发送）
+let pendingCmd: string | null = null
+
 const createSession = () => {
   const id = genId()
   seq++
@@ -163,6 +172,26 @@ const createSession = () => {
   initXterm(id)
 }
 
+// 供父组件调用：在集成终端中运行一条命令（无会话则新建）
+const runCommand = (cmd: string) => {
+  if (sessions.value.length === 0) {
+    pendingCmd = cmd
+    createSession()
+    return
+  }
+  const id = activeId.value
+  if (terms.has(id)) {
+    invoke('terminal_write', {id, data: cmd + '\r'}).catch(() => {})
+    terms.get(id)?.term.focus()
+  }
+  else {
+    // 当前会话仍在初始化，挂起到 init 完成再发送
+    pendingCmd = cmd
+  }
+}
+
+defineExpose({runCommand})
+
 const switchTo = (id: string) => {
   if (id === activeId.value) {
     return
diff --git a/src/components/setting/Editor.vue b/src/components/setting/Editor.vue
index b33871bb..4f2bd564 100644
--- a/src/components/setting/Editor.vue
+++ b/src/components/setting/Editor.vue
@@ -16,6 +16,14 @@
       <Switch v-model="editorConfig.space_dot_omission"/>
     </Label>
 
+    <Label :label="t('settings.editor.showMinimap')">
+      <Switch v-model="editorConfig.show_minimap"/>
+    </Label>
+
+    <Label :label="t('settings.editor.showStickyScroll')">
+      <Switch v-model="editorConfig.show_sticky_scroll"/>
+    </Label>
+
     <Label :label="t('settings.editor.tabSize')">
       <Number v-model="editorConfig.tab_size" :min="1" :max="8" :placeholder="t('settings.editor.tabSize')"/>
     </Label>
diff --git a/src/components/setting/Lsp.vue b/src/components/setting/Lsp.vue
index dde69625..8db3dcb8 100644
--- a/src/components/setting/Lsp.vue
+++ b/src/components/setting/Lsp.vue
@@ -1,58 +1,113 @@
 <template>
-  <div class="space-y-4">
-    <div class="flex items-center justify-between">
-      <div>
-        <h3 class="text-sm font-medium text-gray-800 dark:text-gray-100">{{ t('settings.lsp.title') }}</h3>
-        <p class="text-xs text-gray-500 dark:text-gray-400 mt-0.5">{{ t('settings.lsp.desc') }}</p>
-      </div>
+  <Tabs v-model="tab" :tabs="tabDefs">
+    <template #extra>
       <button class="inline-flex items-center gap-1 px-2 py-1 text-xs rounded border border-gray-200 dark:border-gray-700 text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" @click="reload">
         <RefreshCw class="w-3.5 h-3.5" :class="loading ? 'animate-spin' : ''"/>{{ t('settings.lsp.recheck') }}
       </button>
-    </div>
+    </template>
 
-    <div class="space-y-2">
-      <div v-for="s in servers" :key="s.id" class="rounded-lg border border-gray-200 dark:border-gray-700 p-3">
-        <div class="flex items-center gap-3">
-          <span class="w-2 h-2 rounded-full flex-shrink-0" :class="s.installed ? 'bg-emerald-500' : 'bg-gray-300 dark:bg-gray-600'"/>
-          <div class="min-w-0 flex-1">
-            <div class="text-sm text-gray-800 dark:text-gray-100">{{ s.label }}</div>
-            <code class="text-[11px] text-gray-400">{{ s.install }}</code>
+    <!-- 语言服务 -->
+    <template #servers>
+      <div class="space-y-4">
+        <p class="text-xs text-gray-500 dark:text-gray-400">{{ t('settings.lsp.desc') }}</p>
+        <div class="space-y-2">
+          <div v-for="s in servers" :key="s.id" class="rounded-lg border border-gray-200 dark:border-gray-700 p-3">
+            <div class="flex items-center gap-3">
+              <span class="w-2 h-2 rounded-full flex-shrink-0" :class="s.installed ? 'bg-emerald-500' : 'bg-gray-300 dark:bg-gray-600'"/>
+              <div class="min-w-0 flex-1">
+                <div class="text-sm text-gray-800 dark:text-gray-100">{{ s.label }}</div>
+                <code class="text-[11px] text-gray-400">{{ s.install }}</code>
+              </div>
+              <span v-if="s.installed" class="text-xs text-emerald-600 dark:text-emerald-400 flex-shrink-0">{{ t('settings.lsp.installed') }}</span>
+              <button v-else class="px-2.5 py-1 text-xs rounded bg-blue-500 text-white hover:bg-blue-600 disabled:opacity-50 cursor-pointer flex-shrink-0"
+                      :disabled="installing === s.id" @click="install(s)">
+                <RefreshCw v-if="installing === s.id" class="w-3 h-3 animate-spin inline"/>
+                {{ installing === s.id ? t('settings.lsp.installing') : t('settings.lsp.install') }}
+              </button>
+            </div>
+            <pre v-if="logs[s.id]" class="mt-2 max-h-32 overflow-auto rounded bg-gray-950 text-gray-300 text-[11px] p-2 whitespace-pre-wrap">{{ logs[s.id] }}</pre>
           </div>
-          <span v-if="s.installed" class="text-xs text-emerald-600 dark:text-emerald-400 flex-shrink-0">{{ t('settings.lsp.installed') }}</span>
-          <button v-else class="px-2.5 py-1 text-xs rounded bg-blue-500 text-white hover:bg-blue-600 disabled:opacity-50 cursor-pointer flex-shrink-0"
-                  :disabled="installing === s.id" @click="install(s)">
-            <RefreshCw v-if="installing === s.id" class="w-3 h-3 animate-spin inline"/>
-            {{ installing === s.id ? t('settings.lsp.installing') : t('settings.lsp.install') }}
-          </button>
         </div>
-        <!-- 安装日志 -->
-        <pre v-if="logs[s.id]" class="mt-2 max-h-32 overflow-auto rounded bg-gray-950 text-gray-300 text-[11px] p-2 whitespace-pre-wrap">{{ logs[s.id] }}</pre>
+        <p class="text-[11px] text-gray-400 leading-relaxed">{{ t('settings.lsp.note') }}</p>
       </div>
-    </div>
+    </template>
 
-    <p class="text-[11px] text-gray-400 leading-relaxed">
-      {{ t('settings.lsp.note') }}
-    </p>
-  </div>
+    <!-- 调试适配器 -->
+    <template #adapters>
+      <div class="space-y-4">
+        <p class="text-xs text-gray-500 dark:text-gray-400">{{ t('settings.lsp.dapDesc') }}</p>
+        <div class="space-y-2">
+          <div v-for="a in adapters" :key="a.id" class="rounded-lg border border-gray-200 dark:border-gray-700 p-3">
+            <div class="flex items-center gap-3">
+              <span class="w-2 h-2 rounded-full flex-shrink-0" :class="a.installed ? 'bg-emerald-500' : 'bg-gray-300 dark:bg-gray-600'"/>
+              <div class="min-w-0 flex-1">
+                <div class="text-sm text-gray-800 dark:text-gray-100">{{ a.label }}</div>
+                <code class="text-[11px] text-gray-400">{{ a.install }}</code>
+              </div>
+              <span v-if="a.installed" class="text-xs text-emerald-600 dark:text-emerald-400 flex-shrink-0">{{ t('settings.lsp.installed') }}</span>
+              <button v-else class="px-2.5 py-1 text-xs rounded bg-blue-500 text-white hover:bg-blue-600 disabled:opacity-50 cursor-pointer flex-shrink-0"
+                      :disabled="installingDap === a.id" @click="installDap(a)">
+                <RefreshCw v-if="installingDap === a.id" class="w-3 h-3 animate-spin inline"/>
+                {{ installingDap === a.id ? t('settings.lsp.installing') : t('settings.lsp.install') }}
+              </button>
+            </div>
+            <pre v-if="dapLogs[a.id]" class="mt-2 max-h-32 overflow-auto rounded bg-gray-950 text-gray-300 text-[11px] p-2 whitespace-pre-wrap">{{ dapLogs[a.id] }}</pre>
+          </div>
+        </div>
+      </div>
+    </template>
+  </Tabs>
 </template>
 
 <script setup lang="ts">
-import {onMounted, onUnmounted, ref} from 'vue'
+import {computed, onMounted, onUnmounted, ref} from 'vue'
 import {invoke} from '@tauri-apps/api/core'
 import {listen, type UnlistenFn} from '@tauri-apps/api/event'
 import {RefreshCw} from 'lucide-vue-next'
 import {useI18n} from 'vue-i18n'
+import Tabs from '../../ui/Tabs.vue'
 
 const {t} = useI18n()
 
+const tabDefs = computed(() => [
+  {key: 'servers', label: t('settings.lsp.tabServers')},
+  {key: 'adapters', label: t('settings.lsp.tabAdapters')}
+])
+
 interface ServerInfo { id: string; label: string; program: string; installed: boolean; install: string }
+interface AdapterInfo { id: string; label: string; installed: boolean; install: string }
 
+const tab = ref<'servers' | 'adapters'>('servers')
 const servers = ref<ServerInfo[]>([])
 const loading = ref(false)
 const installing = ref('')
 const logs = ref<Record<string, string>>({})
+const adapters = ref<AdapterInfo[]>([])
+const installingDap = ref('')
+const dapLogs = ref<Record<string, string>>({})
 let unlisten: UnlistenFn[] = []
 
+const reloadDap = async () => {
+  try {
+    adapters.value = await invoke<AdapterInfo[]>('dap_adapter_list')
+  }
+  catch {
+    adapters.value = []
+  }
+}
+
+const installDap = async (a: AdapterInfo) => {
+  installingDap.value = a.id
+  dapLogs.value = {...dapLogs.value, [a.id]: t('settings.lsp.startInstall') + '\n'}
+  try {
+    await invoke('dap_install', {id: a.id})
+  }
+  catch (e: any) {
+    dapLogs.value = {...dapLogs.value, [a.id]: (dapLogs.value[a.id] || '') + t('settings.lsp.startInstallFailed') + String(e?.message || e) + '\n'}
+    installingDap.value = ''
+  }
+}
+
 const reload = async () => {
   loading.value = true
   try {
@@ -64,6 +119,7 @@ const reload = async () => {
   finally {
     loading.value = false
   }
+  await reloadDap()
 }
 
 const install = async (s: ServerInfo) => {
@@ -80,6 +136,7 @@ const install = async (s: ServerInfo) => {
 
 onMounted(async () => {
   await reload()
+  await reloadDap()
   unlisten.push(await listen<[string, string]>('lsp:install', (e) => {
     const [id, line] = e.payload
     logs.value = {...logs.value, [id]: (logs.value[id] || '') + line + '\n'}
@@ -90,6 +147,16 @@ onMounted(async () => {
     installing.value = ''
     await reload()
   }))
+  unlisten.push(await listen<[string, string]>('dap:install', (e) => {
+    const [id, line] = e.payload
+    dapLogs.value = {...dapLogs.value, [id]: (dapLogs.value[id] || '') + line + '\n'}
+  }))
+  unlisten.push(await listen<[string, boolean]>('dap:install-done', async (e) => {
+    const [id, success] = e.payload
+    dapLogs.value = {...dapLogs.value, [id]: (dapLogs.value[id] || '') + (success ? '\n' + t('settings.lsp.installDone') : '\n' + t('settings.lsp.installFailed')) + '\n'}
+    installingDap.value = ''
+    await reloadDap()
+  }))
 })
 onUnmounted(() => {
   for (const u of unlisten) {
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index 04fdb06f..cac465c6 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -89,6 +89,12 @@ import {EditorConfig} from '../types/app.ts'
 import {useCodeMirrorFunctionHelp} from './useCodeMirrorFunctionHelp'
 import {useCodeMirrorSpaceOmission} from './useCodeMirrorSpaceOmission.ts'
 import {EditorView, keymap} from "@codemirror/view";
+import {showMinimap} from "@replit/codemirror-minimap";
+import {stickyScroll} from "../editor/stickyScroll";
+import {breakpointExtension} from "../editor/breakpointGutter";
+import {debugHover} from "../editor/debugHover";
+import {dapSupportsLanguage} from "../debug/dapClient";
+import {useDebug} from "./useDebug";
 import {Prec} from "@codemirror/state";
 import {useCodeMirrorFontFamily} from "./useCodeMirrorFontFamily.ts";
 import {diffGutterExtension} from "../editor/diffGutter";
@@ -160,10 +166,124 @@ function buildTooltipTheme(dark: boolean) {
     }, {dark})
 }
 
+// 文件内查找/替换面板样式（覆盖 CodeMirror 默认原生控件，跟随明暗主题）
+function buildSearchPanelTheme(dark: boolean) {
+    const panelBg = dark ? '#1f2937' : '#ffffff'
+    const border = dark ? '#374151' : '#e5e7eb'
+    const text = dark ? '#e5e7eb' : '#1f2937'
+    const subt = dark ? '#9ca3af' : '#6b7280'
+    const inputBg = dark ? '#111827' : '#ffffff'
+    const inputBorder = dark ? '#4b5563' : '#d1d5db'
+    const btnBg = dark ? '#374151' : '#f3f4f6'
+    const btnHover = dark ? '#4b5563' : '#e5e7eb'
+    const accent = '#3b82f6'
+    return EditorView.theme({
+        '.cm-panels': {backgroundColor: panelBg, color: text},
+        '.cm-panels.cm-panels-top': {borderBottom: `1px solid ${border}`},
+        '.cm-panel.cm-search': {
+            padding: '8px 32px 8px 10px',
+            display: 'flex',
+            flexWrap: 'wrap',
+            alignItems: 'center',
+            gap: '6px',
+            position: 'relative',
+            fontFamily: 'inherit'
+        },
+        '.cm-panel.cm-search label': {
+            fontSize: '12px',
+            color: subt,
+            display: 'inline-flex',
+            alignItems: 'center',
+            gap: '3px'
+        },
+        '.cm-panel.cm-search input[type=checkbox]': {accentColor: accent, cursor: 'pointer'},
+        '.cm-panel.cm-search input.cm-textfield': {
+            backgroundColor: inputBg,
+            color: text,
+            border: `1px solid ${inputBorder}`,
+            borderRadius: '6px',
+            padding: '3px 8px',
+            fontSize: '12px',
+            outline: 'none'
+        },
+        '.cm-panel.cm-search input.cm-textfield:focus': {
+            borderColor: accent,
+            boxShadow: `0 0 0 2px ${accent}33`
+        },
+        '.cm-panel.cm-search .cm-button': {
+            backgroundColor: btnBg,
+            backgroundImage: 'none',
+            color: text,
+            border: `1px solid ${border}`,
+            borderRadius: '6px',
+            padding: '3px 10px',
+            fontSize: '12px',
+            cursor: 'pointer'
+        },
+        '.cm-panel.cm-search .cm-button:hover': {backgroundColor: btnHover},
+        '.cm-panel.cm-search button[name=close]': {
+            position: 'absolute',
+            top: '6px',
+            right: '8px',
+            backgroundColor: 'transparent',
+            border: 'none',
+            color: subt,
+            fontSize: '16px',
+            lineHeight: '1',
+            padding: '2px 4px',
+            cursor: 'pointer'
+        },
+        '.cm-panel.cm-search button[name=close]:hover': {color: text}
+    }, {dark})
+}
+
+// 粘性滚动浮层样式：固定在编辑器顶部、贴合背景、底部分隔线、悬停高亮、可点击跳转
+function buildStickyTheme(dark: boolean) {
+    const border = dark ? '#374151' : '#e5e7eb'
+    const bg = dark ? '#0d1117' : '#ffffff'
+    const hover = dark ? '#1f2937' : '#f3f4f6'
+    return EditorView.theme({
+        '.cm-sticky-scroll': {
+            position: 'absolute',
+            zIndex: '6',
+            boxShadow: dark ? '0 4px 8px rgba(0,0,0,0.4)' : '0 4px 8px rgba(0,0,0,0.08)',
+            borderBottom: `1px solid ${border}`,
+            backgroundColor: bg,
+            overflow: 'hidden'
+        },
+        '.cm-sticky-line': {
+            padding: '0 4px 0 8px',
+            whiteSpace: 'pre',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            cursor: 'pointer',
+            fontFamily: 'inherit'
+        },
+        '.cm-sticky-line:hover': {backgroundColor: hover}
+    }, {dark})
+}
+
+// 代码缩略图样式微调：左侧分隔线、贴合编辑器背景、去掉厚重阴影、视口浮层更柔和
+function buildMinimapTheme(dark: boolean) {
+    const border = dark ? '#374151' : '#e5e7eb'
+    const bg = dark ? '#0d1117' : '#ffffff'
+    return EditorView.theme({
+        '.cm-minimap-gutter': {
+            borderLeft: `1px solid ${border}`,
+            backgroundColor: bg
+        },
+        '.cm-minimap-box-shadow': {boxShadow: 'none'},
+        '.cm-minimap-overlay-container .cm-minimap-overlay': {
+            backgroundColor: dark ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.07)'
+        }
+    }, {dark})
+}
+
 export function useCodeMirrorEditor(props: Props)
 {
     const toast = useToast()
     const {isDark} = useTheme()
+    const debug = useDebug()
     const {showFunctionHelpHover, functionHelpTheme} = useCodeMirrorFunctionHelp()
 
     // 状态管理
@@ -433,16 +553,20 @@ export function useCodeMirrorEditor(props: Props)
         }
     }
 
-    // 隐藏行号的主题扩展
+    // 隐藏行号列的主题扩展（仅隐藏行号，保留折叠等其它 gutter）
     const hideLineNumbersTheme = EditorView.theme({
         '.cm-lineNumbers': {
             display: 'none !important'
-        },
-        '.cm-gutters': {
-            display: 'none !important'
         }
     })
 
+    // 折叠箭头：默认淡显、悬停加深，避免左缘出现显眼的列
+    const foldGutterTheme = EditorView.theme({
+        '.cm-gutters': {backgroundColor: 'transparent', border: 'none'},
+        '.cm-foldGutter .cm-gutterElement': {cursor: 'pointer', opacity: '0.4', padding: '0 2px'},
+        '.cm-foldGutter .cm-gutterElement:hover': {opacity: '0.9'}
+    })
+
     // 更新扩展的函数
     const updateExtensions = async (showLineNumbers?: boolean, showFunctionHelp?: boolean) => {
         const result = []
@@ -454,9 +578,16 @@ export function useCodeMirrorEditor(props: Props)
         // 添加函数帮助主题
         result.push(functionHelpTheme)
 
-        // 字体缩放快捷键（搜索/替换、折叠、括号匹配等由 vue-codemirror 的 basicSetup 提供）
+        // 字体缩放快捷键
         result.push(fontSizeKeymap)
 
+        // 查找/替换（Cmd/Ctrl+F）、代码折叠、括号匹配等由 vue-codemirror 默认的 basicSetup 提供
+        // （CodeEditor 传入的 extensions 是叠加在 basicSetup 之上，而非替换），此处只补样式：
+        //   - 美化查找面板（替换原生控件外观，跟随明暗主题）
+        //   - 折叠箭头跟随主题、默认淡显（并配合下方 hideLineNumbersTheme 让箭头可见）
+        result.push(buildSearchPanelTheme(isDark.value))
+        result.push(foldGutterTheme)
+
         // 代码片段 Tab 展开
         result.push(snippetKeymap)
 
@@ -521,6 +652,28 @@ export function useCodeMirrorEditor(props: Props)
             result.push(spaceOmissionTheme)
         }
 
+        // 代码缩略图（minimap），右侧显示，可在设置中开关
+        if (editorConfig.value?.show_minimap) {
+            result.push(showMinimap.of({
+                create: () => ({dom: document.createElement('div')}),
+                displayText: 'characters',
+                showOverlay: 'always'
+            }))
+            result.push(buildMinimapTheme(isDark.value))
+        }
+
+        // 断点 gutter + 调试悬停求值（仅可调试语言）
+        if (dapSupportsLanguage(props.language)) {
+            result.push(breakpointExtension((line) => debug.toggleBreakpoint(props.filePath ?? null, line)))
+            result.push(debugHover)
+        }
+
+        // 粘性滚动：把外层作用域头部固定在顶部，可在设置中开关
+        if (editorConfig.value?.show_sticky_scroll) {
+            result.push(stickyScroll(editorConfig.value?.tab_size ?? 4))
+            result.push(buildStickyTheme(isDark.value))
+        }
+
         extensions.value = result
 
         // 如果组件还没准备好，等待下一个 tick 后设置为准备好
@@ -636,6 +789,14 @@ export function useCodeMirrorEditor(props: Props)
         await reRenderEditor()
     })
 
+    watch(() => editorConfig.value?.show_minimap, async () => {
+        await reRenderEditor()
+    })
+
+    watch(() => editorConfig.value?.show_sticky_scroll, async () => {
+        await reRenderEditor()
+    })
+
     return {
         // 状态
         isReady,
diff --git a/src/composables/useDebug.ts b/src/composables/useDebug.ts
new file mode 100644
index 00000000..400d6b70
--- /dev/null
+++ b/src/composables/useDebug.ts
@@ -0,0 +1,466 @@
+// 调试状态共享 store（单例）。P2：断点与执行位置；P3：会话编排与控制。
+import {reactive, ref} from 'vue'
+import {DapClient} from '../debug/dapClient'
+
+export type DebugStatus = 'inactive' | 'starting' | 'running' | 'stopped'
+export interface LaunchConfig { filePath: string; language: string; cwd?: string | null }
+export interface StackFrame { id: number; name: string; line: number; column: number; source?: {path?: string; name?: string} }
+export interface Scope { name: string; variablesReference: number; expensive: boolean }
+export interface DapVariable { name: string; value: string; type?: string; variablesReference: number }
+
+// 文件绝对路径 -> (行号(1-based) -> 条件表达式，空串表示无条件)
+const breakpoints = reactive<Map<string, Map<number, string>>>(new Map())
+// 断点变更版本号：Map 深层响应不够可靠，统一用版本号驱动外部同步
+const bpVersion = ref(0)
+// 当前停驻（执行）位置
+const stopped = ref<{path: string; line: number} | null>(null)
+
+function fileBreakpoints(path: string | null | undefined): number[] {
+  if (!path) {
+    return []
+  }
+  const m = breakpoints.get(path)
+  return m ? [...m.keys()].sort((a, b) => a - b) : []
+}
+
+function breakpointCondition(path: string | null | undefined, line: number): string {
+  if (!path) {
+    return ''
+  }
+  return breakpoints.get(path)?.get(line) ?? ''
+}
+
+function toggleBreakpoint(path: string | null | undefined, line: number): void {
+  if (!path || line < 1) {
+    return
+  }
+  let m = breakpoints.get(path)
+  if (!m) {
+    m = new Map()
+    breakpoints.set(path, m)
+  }
+  if (m.has(line)) {
+    m.delete(line)
+  }
+  else {
+    m.set(line, '')
+  }
+  if (m.size === 0) {
+    breakpoints.delete(path)
+  }
+  bpVersion.value++
+}
+
+// 设置/更新某断点的条件（行不存在则新建该断点）
+function setBreakpointCondition(path: string | null | undefined, line: number, condition: string): void {
+  if (!path || line < 1) {
+    return
+  }
+  let m = breakpoints.get(path)
+  if (!m) {
+    m = new Map()
+    breakpoints.set(path, m)
+  }
+  m.set(line, condition)
+  bpVersion.value++
+}
+
+function setStopped(loc: {path: string; line: number} | null): void {
+  stopped.value = loc
+}
+
+// 列出全部断点（跨文件，供断点列表面板）
+function allBreakpoints(): {path: string; line: number; condition: string}[] {
+  const out: {path: string; line: number; condition: string}[] = []
+  for (const [path, lines] of breakpoints) {
+    for (const [line, condition] of lines) {
+      out.push({path, line, condition})
+    }
+  }
+  return out.sort((a, b) => (a.path === b.path ? a.line - b.line : a.path.localeCompare(b.path)))
+}
+
+// ===== P3：会话编排与控制 =====
+const status = ref<DebugStatus>('inactive')
+const consoleLines = ref<{category: string; text: string}[]>([])
+const frames = ref<StackFrame[]>([])
+const selectedFrameId = ref<number | null>(null)
+// 跳转请求（停驻/选择帧时触发，由 App 打开文件并定位）
+const reveal = ref<{path: string; line: number; seq: number} | null>(null)
+let revealSeq = 0
+let client: DapClient | null = null
+let threadId = 0
+let lastConfig: LaunchConfig | null = null
+let stopping = false
+
+function requestReveal(path: string, line: number): void {
+  reveal.value = {path, line, seq: ++revealSeq}
+}
+
+// 监视表达式（停驻/选帧时重算）
+const watches = ref<{expr: string; value: string}[]>([])
+
+// 异常断点：适配器声明的过滤器及当前选中项
+const exceptionFilters = ref<{filter: string; label: string; default?: boolean}[]>([])
+const selectedExceptionFilters = ref<Set<string>>(new Set())
+
+function setExceptionFilter(filter: string, enabled: boolean): void {
+  const s = new Set(selectedExceptionFilters.value)
+  if (enabled) {
+    s.add(filter)
+  }
+  else {
+    s.delete(filter)
+  }
+  selectedExceptionFilters.value = s
+  if (client && status.value !== 'inactive') {
+    client.request('setExceptionBreakpoints', {filters: [...s]}).catch(() => {})
+  }
+}
+
+// 求值：在选中帧上下文中执行表达式。context: watch | repl | hover
+async function evaluate(expression: string, context: string): Promise<{result: string; variablesReference: number}> {
+  if (!client || !expression.trim()) {
+    return {result: '', variablesReference: 0}
+  }
+  const args: Record<string, any> = {expression, context}
+  if (selectedFrameId.value != null) {
+    args.frameId = selectedFrameId.value
+  }
+  const res = await client.request('evaluate', args)
+  return {result: res?.result ?? '', variablesReference: res?.variablesReference ?? 0}
+}
+
+async function refreshWatches(): Promise<void> {
+  if (status.value !== 'stopped') {
+    return
+  }
+  for (const w of watches.value) {
+    try {
+      const {result} = await evaluate(w.expr, 'watch')
+      w.value = result
+    }
+    catch (e) {
+      w.value = `<${e}>`
+    }
+  }
+}
+
+function addWatch(expr: string): void {
+  if (expr.trim()) {
+    watches.value.push({expr: expr.trim(), value: ''})
+    refreshWatches()
+  }
+}
+function removeWatch(i: number): void {
+  watches.value.splice(i, 1)
+}
+
+async function evalRepl(expr: string): Promise<void> {
+  if (!expr.trim()) {
+    return
+  }
+  pushOut('input', `› ${expr}\n`)
+  try {
+    const {result} = await evaluate(expr, 'repl')
+    pushOut('result', `${result}\n`)
+  }
+  catch (e) {
+    pushOut('stderr', `${e}\n`)
+  }
+}
+
+function pushOut(category: string, text: string): void {
+  consoleLines.value.push({category, text})
+  if (consoleLines.value.length > 2000) {
+    consoleLines.value.splice(0, consoleLines.value.length - 2000)
+  }
+}
+
+async function sendBreakpoints(): Promise<void> {
+  if (!client) {
+    return
+  }
+  for (const path of breakpoints.keys()) {
+    await client.request('setBreakpoints', bpArgs(path)).catch(() => {})
+  }
+}
+
+// 某文件的 setBreakpoints 参数（带条件）
+function bpArgs(path: string): Record<string, any> {
+  return {
+    source: {path},
+    breakpoints: fileBreakpoints(path).map((line) => {
+      const cond = breakpointCondition(path, line)
+      return cond ? {line, condition: cond} : {line}
+    })
+  }
+}
+
+// 会话进行中时，断点变更后实时下发（重发当前文件断点）
+async function syncBreakpoints(path: string | null | undefined): Promise<void> {
+  if (!client || status.value === 'inactive' || !path) {
+    return
+  }
+  await client.request('setBreakpoints', bpArgs(path)).catch(() => {})
+}
+
+// 停驻后加载调用栈，定位栈顶帧
+async function loadStopState(): Promise<void> {
+  if (!client) {
+    return
+  }
+  try {
+    const res = await client.request('stackTrace', {threadId, startFrame: 0, levels: 20})
+    frames.value = (res?.stackFrames ?? []) as StackFrame[]
+    const top = frames.value[0]
+    selectedFrameId.value = top?.id ?? null
+    if (top?.source?.path && top.line) {
+      setStopped({path: top.source.path, line: top.line})
+      requestReveal(top.source.path, top.line)
+    }
+    await refreshWatches()
+  }
+  catch {
+    // 忽略
+  }
+}
+
+// 选择调用栈帧：跳转到其源码位置（不改变执行行高亮），并按该帧重算监视
+function selectFrame(id: number): void {
+  selectedFrameId.value = id
+  const f = frames.value.find(x => x.id === id)
+  if (f?.source?.path && f.line) {
+    requestReveal(f.source.path, f.line)
+  }
+  refreshWatches()
+}
+
+async function requestScopes(frameId: number): Promise<Scope[]> {
+  if (!client) {
+    return []
+  }
+  try {
+    const res = await client.request('scopes', {frameId})
+    return (res?.scopes ?? []) as Scope[]
+  }
+  catch {
+    return []
+  }
+}
+
+async function requestVariables(variablesReference: number): Promise<DapVariable[]> {
+  if (!client || variablesReference <= 0) {
+    return []
+  }
+  try {
+    const res = await client.request('variables', {variablesReference})
+    return (res?.variables ?? []) as DapVariable[]
+  }
+  catch {
+    return []
+  }
+}
+
+// 各语言 launch 请求参数（Python=debugpy 源码级 / Go=delve 源码级）
+function buildLaunchArgs(config: LaunchConfig): Record<string, any> {
+  const base: Record<string, any> = {
+    request: 'launch',
+    name: 'CodeForge',
+    program: config.filePath,
+    cwd: config.cwd || undefined
+  }
+  if (config.language === 'go') {
+    return {...base, mode: 'debug'}
+  }
+  return {...base, type: 'python', console: 'internalConsole', justMyCode: true, stopOnEntry: false}
+}
+
+async function startSession(config: LaunchConfig): Promise<void> {
+  if (status.value !== 'inactive') {
+    await stopSession()
+  }
+  if (!config.filePath) {
+    throw new Error('需要已保存的文件')
+  }
+  lastConfig = config
+  status.value = 'starting'
+  consoleLines.value = []
+  threadId = 0
+  const c = new DapClient('debug', config.language)
+  client = c
+
+  c.onClose(() => cleanup())
+  c.on('initialized', async () => {
+    await sendBreakpoints()
+    await c.request('setExceptionBreakpoints', {filters: [...selectedExceptionFilters.value]}).catch(() => {})
+    await c.request('configurationDone').catch(() => {})
+  })
+  c.on('stopped', async (body) => {
+    threadId = body?.threadId ?? threadId
+    status.value = 'stopped'
+    await loadStopState()
+  })
+  c.on('continued', () => {
+    status.value = 'running'
+    setStopped(null)
+    frames.value = []
+    selectedFrameId.value = null
+  })
+  c.on('output', (body) => pushOut(body?.category || 'console', body?.output || ''))
+  c.on('terminated', () => stopSession())
+
+  try {
+    await c.start()
+    const caps = await c.request('initialize', {
+      clientID: 'codeforge',
+      clientName: 'CodeForge',
+      adapterID: config.language === 'go' ? 'go' : 'debugpy',
+      locale: 'en',
+      linesStartAt1: true,
+      columnsStartAt1: true,
+      pathFormat: 'path',
+      supportsRunInTerminalRequest: false
+    })
+    // 异常断点过滤器（首次连接按适配器默认项选中）
+    exceptionFilters.value = caps?.exceptionBreakpointFilters ?? []
+    if (!selectedExceptionFilters.value.size) {
+      selectedExceptionFilters.value = new Set(
+        exceptionFilters.value.filter(f => f.default).map(f => f.filter)
+      )
+    }
+    // launch 在 configurationDone 后才返回，故不在主流程等待
+    c.request('launch', buildLaunchArgs(config)).catch((e) => {
+      pushOut('stderr', `launch 失败: ${e}\n`)
+      stopSession()
+    })
+    status.value = 'running'
+  }
+  catch (e) {
+    cleanup()
+    throw e
+  }
+}
+
+function withThread(command: string): void {
+  if (!client || status.value === 'inactive') {
+    return
+  }
+  client.request(command, {threadId}).catch(() => {})
+}
+
+function clearStopUi(): void {
+  setStopped(null)
+  frames.value = []
+  selectedFrameId.value = null
+}
+
+function doContinue(): void {
+  if (status.value !== 'stopped') {
+    return
+  }
+  status.value = 'running'
+  clearStopUi()
+  withThread('continue')
+}
+function pause(): void {
+  withThread('pause')
+}
+function stepOver(): void {
+  if (status.value !== 'stopped') {
+    return
+  }
+  clearStopUi()
+  withThread('next')
+}
+function stepIn(): void {
+  if (status.value !== 'stopped') {
+    return
+  }
+  clearStopUi()
+  withThread('stepIn')
+}
+function stepOut(): void {
+  if (status.value !== 'stopped') {
+    return
+  }
+  clearStopUi()
+  withThread('stepOut')
+}
+
+async function stopSession(): Promise<void> {
+  if (stopping) {
+    return
+  }
+  stopping = true
+  const c = client
+  if (c) {
+    try {
+      await c.request('disconnect', {terminateDebuggee: true})
+    }
+    catch {
+      // 忽略
+    }
+    await c.stop()
+  }
+  cleanup()
+  stopping = false
+}
+
+async function restart(): Promise<void> {
+  const cfg = lastConfig
+  await stopSession()
+  if (cfg) {
+    await startSession(cfg)
+  }
+}
+
+function cleanup(): void {
+  client = null
+  threadId = 0
+  status.value = 'inactive'
+  setStopped(null)
+  frames.value = []
+  selectedFrameId.value = null
+  exceptionFilters.value = []
+}
+
+export function useDebug() {
+  return {
+    breakpoints,
+    bpVersion,
+    stopped,
+    status,
+    consoleLines,
+    frames,
+    selectedFrameId,
+    reveal,
+    watches,
+    exceptionFilters,
+    selectedExceptionFilters,
+    setExceptionFilter,
+    fileBreakpoints,
+    breakpointCondition,
+    allBreakpoints,
+    toggleBreakpoint,
+    setBreakpointCondition,
+    setStopped,
+    revealLocation: requestReveal,
+    syncBreakpoints,
+    selectFrame,
+    requestScopes,
+    requestVariables,
+    evaluate,
+    addWatch,
+    removeWatch,
+    evalRepl,
+    startSession,
+    stopSession,
+    restart,
+    continue: doContinue,
+    pause,
+    stepOver,
+    stepIn,
+    stepOut
+  }
+}
diff --git a/src/debug/dapClient.ts b/src/debug/dapClient.ts
new file mode 100644
index 00000000..3b31dfdd
--- /dev/null
+++ b/src/debug/dapClient.ts
@@ -0,0 +1,147 @@
+// DAP 客户端：把后端 dap_* 命令/事件封装为请求-响应 + 事件分发模型。
+// 后端已剥离 Content-Length 帧，这里收发的是完整 JSON 字符串。
+// 与 lspTransport 同构；launch 握手由上层(useDebug)用这些原语编排。
+import {invoke} from '@tauri-apps/api/core'
+import {listen, type UnlistenFn} from '@tauri-apps/api/event'
+
+// 已打通的可调试语言（源码级）。Rust/C/C++ 为编译型，需先构建再调试可执行文件，留待 P6b。
+const DAP_LANGUAGES = new Set(['python', 'python3', 'python2', 'go'])
+export function dapSupportsLanguage(language?: string): boolean {
+  return !!language && DAP_LANGUAGES.has(language)
+}
+
+type Handler = (body: any) => void
+type ReverseHandler = (args: any) => any | Promise<any>
+
+interface Pending {
+  resolve: (v: any) => void
+  reject: (e: Error) => void
+}
+
+export class DapClient {
+  readonly session: string
+  private language: string
+  private seq = 1
+  private pending = new Map<number, Pending>()
+  private eventHandlers = new Map<string, Set<Handler>>()
+  private reverseHandlers = new Map<string, ReverseHandler>()
+  private unlisten: UnlistenFn[] = []
+  private closeCb: (() => void) | null = null
+
+  constructor(session: string, language: string) {
+    this.session = session
+    this.language = language
+  }
+
+  // 启动适配器并开始监听消息
+  async start(): Promise<void> {
+    const un1 = await listen<{session: string; messages: string[]}>('dap:messages', (e) => {
+      if (e.payload.session === this.session) {
+        for (const m of e.payload.messages) {
+          this.handle(m)
+        }
+      }
+    })
+    const un2 = await listen<string>('dap:exit', (e) => {
+      if (e.payload === this.session) {
+        this.closeCb?.()
+      }
+    })
+    this.unlisten = [un1, un2]
+    await invoke('dap_start', {session: this.session, language: this.language})
+  }
+
+  private handle(raw: string): void {
+    let msg: any
+    try {
+      msg = JSON.parse(raw)
+    }
+    catch {
+      return
+    }
+    if (msg.type === 'response') {
+      const p = this.pending.get(msg.request_seq)
+      if (p) {
+        this.pending.delete(msg.request_seq)
+        if (msg.success) {
+          p.resolve(msg.body)
+        }
+        else {
+          p.reject(new Error(msg.message || `${msg.command} 失败`))
+        }
+      }
+    }
+    else if (msg.type === 'event') {
+      const hs = this.eventHandlers.get(msg.event)
+      if (hs) {
+        for (const h of [...hs]) {
+          h(msg.body)
+        }
+      }
+    }
+    else if (msg.type === 'request') {
+      // 适配器反向请求（runInTerminal / startDebugging 等）
+      const handler = this.reverseHandlers.get(msg.command)
+      Promise.resolve(handler ? handler(msg.arguments) : null)
+        .then((body) => this.sendRaw({type: 'response', request_seq: msg.seq, success: true, command: msg.command, body}))
+        .catch((err) => this.sendRaw({type: 'response', request_seq: msg.seq, success: false, command: msg.command, message: String(err)}))
+    }
+  }
+
+  private sendRaw(obj: Record<string, any>): void {
+    const message = JSON.stringify({seq: this.seq++, ...obj})
+    invoke('dap_send', {session: this.session, message}).catch(() => {})
+  }
+
+  // 发送一个 DAP 请求，按 request_seq 关联响应
+  request<T = any>(command: string, args?: any): Promise<T> {
+    const seq = this.seq++
+    const message = JSON.stringify({seq, type: 'request', command, arguments: args ?? {}})
+    return new Promise<T>((resolve, reject) => {
+      this.pending.set(seq, {resolve, reject})
+      invoke('dap_send', {session: this.session, message}).catch((e) => {
+        this.pending.delete(seq)
+        reject(new Error(String(e)))
+      })
+    })
+  }
+
+  // 订阅适配器事件，返回取消订阅函数
+  on(event: string, handler: Handler): () => void {
+    let set = this.eventHandlers.get(event)
+    if (!set) {
+      set = new Set()
+      this.eventHandlers.set(event, set)
+    }
+    const s = set
+    s.add(handler)
+    return () => s.delete(handler)
+  }
+
+  // 注册反向请求处理器
+  onReverseRequest(command: string, handler: ReverseHandler): void {
+    this.reverseHandlers.set(command, handler)
+  }
+
+  onClose(cb: () => void): void {
+    this.closeCb = cb
+  }
+
+  async stop(): Promise<void> {
+    try {
+      await invoke('dap_stop', {session: this.session})
+    }
+    catch {
+      // 忽略
+    }
+    for (const u of this.unlisten) {
+      u()
+    }
+    this.unlisten = []
+    for (const p of this.pending.values()) {
+      p.reject(new Error('调试会话已结束'))
+    }
+    this.pending.clear()
+    this.eventHandlers.clear()
+  }
+}
diff --git a/src/editor/breakpointGutter.ts b/src/editor/breakpointGutter.ts
new file mode 100644
index 00000000..19b1f973
--- /dev/null
+++ b/src/editor/breakpointGutter.ts
@@ -0,0 +1,81 @@
+// 断点 gutter + 当前执行行高亮。断点数据由外部(App)按当前文件 dispatch 填充。
+import {Decoration, EditorView, GutterMarker, gutter} from '@codemirror/view'
+import {StateEffect, StateField} from '@codemirror/state'
+
+export interface BreakpointData {
+  lines: number[]      // 断点行号(1-based)
+  exec: number | null  // 当前执行行(1-based)，无则 null
+}
+
+// 由外部派发：设置当前文件的断点与执行行
+export const setBreakpointData = StateEffect.define<BreakpointData>()
+
+interface BpState {
+  lines: Set<number>
+  exec: number | null
+}
+
+const bpField = StateField.define<BpState>({
+  create: () => ({lines: new Set(), exec: null}),
+  update(val, tr) {
+    for (const e of tr.effects) {
+      if (e.is(setBreakpointData)) {
+        return {lines: new Set(e.value.lines), exec: e.value.exec}
+      }
+    }
+    return val
+  }
+})
+
+class BreakpointMarker extends GutterMarker {
+  toDOM() {
+    const span = document.createElement('span')
+    span.className = 'cm-bp-dot'
+    span.textContent = '●'
+    return span
+  }
+}
+const bpMarker = new BreakpointMarker()
+
+// 当前执行行整行高亮
+const execLineDeco = EditorView.decorations.compute([bpField], (state) => {
+  const f = state.field(bpField)
+  if (!f.exec || f.exec < 1 || f.exec > state.doc.lines) {
+    return Decoration.none
+  }
+  const line = state.doc.line(f.exec)
+  return Decoration.set([Decoration.line({class: 'cm-debug-exec-line'}).range(line.from)])
+})
+
+const bpTheme = EditorView.baseTheme({
+  '.cm-breakpoint-gutter': {width: '14px', cursor: 'pointer'},
+  '.cm-breakpoint-gutter .cm-gutterElement': {paddingLeft: '2px'},
+  '.cm-bp-dot': {color: '#e51400', fontSize: '12px', lineHeight: '1'},
+  '.cm-debug-exec-line': {backgroundColor: 'rgba(250, 204, 21, 0.18)'}
+})
+
+// 断点 gutter 扩展。onToggle 在点击 gutter 时回调行号(1-based)。
+export function breakpointExtension(onToggle: (line: number) => void) {
+  const bpGutter = gutter({
+    class: 'cm-breakpoint-gutter',
+    lineMarker(view, block) {
+      const f = view.state.field(bpField, false)
+      if (!f) {
+        return null
+      }
+      const lineNo = view.state.doc.lineAt(block.from).number
+      return f.lines.has(lineNo) ? bpMarker : null
+    },
+    // 断点数据变化时强制重算 gutter 标记
+    lineMarkerChange: (update) =>
+      update.transactions.some(tr => tr.effects.some(e => e.is(setBreakpointData))),
+    domEventHandlers: {
+      mousedown(view, block) {
+        const lineNo = view.state.doc.lineAt(block.from).number
+        onToggle(lineNo)
+        return true
+      }
+    }
+  })
+  return [bpField, bpGutter, execLineDeco, bpTheme]
+}
diff --git a/src/editor/debugHover.ts b/src/editor/debugHover.ts
new file mode 100644
index 00000000..78cc62e9
--- /dev/null
+++ b/src/editor/debugHover.ts
@@ -0,0 +1,61 @@
+// 调试悬停求值：会话停驻时，悬停标识符即在当前帧上下文求值并显示其值。
+import {EditorView, hoverTooltip} from '@codemirror/view'
+import {useDebug} from '../composables/useDebug'
+
+const debugHoverTooltip = hoverTooltip(async (view, pos) => {
+  const debug = useDebug()
+  if (debug.status.value !== 'stopped') {
+    return null
+  }
+  const line = view.state.doc.lineAt(pos)
+  const rel = pos - line.from
+  // 取光标处的标识符（含成员访问 a.b.c）
+  const re = /[\w$.]+/g
+  let word = ''
+  let start = -1
+  let end = -1
+  let m: RegExpExecArray | null
+  while ((m = re.exec(line.text))) {
+    if (m.index <= rel && rel <= m.index + m[0].length) {
+      word = m[0]
+      start = line.from + m.index
+      end = line.from + m.index + m[0].length
+      break
+    }
+  }
+  if (!word) {
+    return null
+  }
+  try {
+    const {result} = await debug.evaluate(word, 'hover')
+    if (!result) {
+      return null
+    }
+    return {
+      pos: start,
+      end,
+      above: true,
+      create: () => {
+        const dom = document.createElement('div')
+        dom.className = 'cm-debug-hover'
+        dom.textContent = `${word} = ${result}`
+        return {dom}
+      }
+    }
+  }
+  catch {
+    return null
+  }
+})
+
+const debugHoverTheme = EditorView.baseTheme({
+  '.cm-debug-hover': {
+    padding: '4px 8px',
+    fontFamily: 'monospace',
+    fontSize: '12px',
+    whiteSpace: 'pre-wrap',
+    maxWidth: '420px'
+  }
+})
+
+export const debugHover = [debugHoverTooltip, debugHoverTheme]
diff --git a/src/editor/lspExtension.ts b/src/editor/lspExtension.ts
index 7e616f3f..dce39353 100644
--- a/src/editor/lspExtension.ts
+++ b/src/editor/lspExtension.ts
@@ -176,6 +176,47 @@ export const applyCodeAction = async (view: EditorView, action: any): Promise<{o
   return {otherFiles}
 }
 
+/**
+ * 可 await 的「格式化整篇文档」：请求 textDocument/formatting 并应用编辑，返回是否实际改动。
+ * 供「保存时格式化」在保存前等待格式化完成（库自带的 formatDocument 是异步应用、无法 await）。
+ */
+export const formatDocumentAsync = async (
+  view: EditorView,
+  fmtOptions?: {tabSize?: number; insertSpaces?: boolean}
+): Promise<boolean> => {
+  const plugin: any = view.plugin(languageServerPlugin as any)
+  const client = plugin?.client
+  if (!client?.ready || !client.capabilities?.documentFormattingProvider) {
+    return false
+  }
+  const params = {
+    textDocument: {uri: plugin.documentUri},
+    options: {
+      tabSize: fmtOptions?.tabSize ?? 4,
+      insertSpaces: fmtOptions?.insertSpaces ?? true
+    }
+  }
+  try {
+    const edits = await client.request('textDocument/formatting', params, 10000)
+    if (!Array.isArray(edits) || edits.length === 0) {
+      return false
+    }
+    const doc = view.state.doc
+    const changes = edits
+      .map((te: any) => ({
+        from: lspPosToOffset(doc, te.range.start),
+        to: lspPosToOffset(doc, te.range.end),
+        insert: te.newText ?? ''
+      }))
+      .sort((a, b) => a.from - b.from)
+    view.dispatch({changes})
+    return true
+  }
+  catch {
+    return false
+  }
+}
+
 /**
  * 触发代码操作：请求后派发 lsp:code-actions（携带动作与锚点坐标）由 App 弹菜单。
  * 供 Cmd+. 键位与右键菜单共用。
diff --git a/src/editor/stickyScroll.ts b/src/editor/stickyScroll.ts
new file mode 100644
index 00000000..03d1b045
--- /dev/null
+++ b/src/editor/stickyScroll.ts
@@ -0,0 +1,122 @@
+import {EditorView, ViewPlugin, ViewUpdate} from '@codemirror/view'
+
+// 粘性滚动（sticky scroll）：把当前视口顶部所在作用域的外层「头部行」固定在编辑器顶部。
+// 采用语言无关的「缩进链」启发式：从顶部可见行向上，依次收集缩进严格更小的非空行，
+// 即为其外层作用域的头部（函数/类/块的起始行）。适配缩进型与花括号型语言。
+
+const MAX_ROWS = 5
+
+function indentOf(text: string, tabSize: number): number {
+    let n = 0
+    for (const ch of text) {
+        if (ch === ' ') {
+            n++
+        }
+        else if (ch === '\t') {
+            n += tabSize
+        }
+        else {
+            break
+        }
+    }
+    return n
+}
+
+export function stickyScroll(tabSize = 4) {
+    return ViewPlugin.fromClass(
+        class {
+            dom: HTMLElement
+            onScroll: () => void
+
+            constructor(view: EditorView) {
+                this.dom = document.createElement('div')
+                this.dom.className = 'cm-sticky-scroll'
+                this.dom.style.display = 'none'
+                view.dom.appendChild(this.dom)
+                // 视口变化不一定每次滚动都触发 update，故额外监听滚动
+                this.onScroll = () => this.compute(view)
+                view.scrollDOM.addEventListener('scroll', this.onScroll, {passive: true})
+                this.compute(view)
+            }
+
+            update(u: ViewUpdate) {
+                if (u.docChanged || u.viewportChanged || u.geometryChanged) {
+                    this.compute(u.view)
+                }
+            }
+
+            compute(view: EditorView) {
+                const {state} = view
+                const scrollTop = view.scrollDOM.scrollTop
+                let topLineNo: number
+                try {
+                    const block = view.lineBlockAtHeight(scrollTop)
+                    topLineNo = state.doc.lineAt(block.from).number
+                }
+                catch {
+                    this.hide()
+                    return
+                }
+                if (topLineNo <= 1) {
+                    this.hide()
+                    return
+                }
+
+                const rows: Array<{no: number; text: string}> = []
+                let minIndent = indentOf(state.doc.line(topLineNo).text, tabSize)
+                for (let n = topLineNo - 1; n >= 1; n--) {
+                    const line = state.doc.line(n)
+                    if (!line.text.trim()) {
+                        continue
+                    }
+                    const ind = indentOf(line.text, tabSize)
+                    if (ind < minIndent) {
+                        rows.unshift({no: n, text: line.text})
+                        minIndent = ind
+                        if (ind === 0) {
+                            break
+                        }
+                    }
+                }
+
+                // 仅保留最靠近的若干层
+                const shown = rows.slice(-MAX_ROWS)
+                if (!shown.length) {
+                    this.hide()
+                    return
+                }
+
+                // 定位到滚动区域顶部（避开上方的查找面板等）
+                const scroller = view.scrollDOM
+                this.dom.style.top = `${scroller.offsetTop}px`
+                this.dom.style.left = `${scroller.offsetLeft}px`
+                this.dom.style.width = `${scroller.clientWidth}px`
+                this.dom.style.display = 'block'
+
+                this.dom.textContent = ''
+                for (const r of shown) {
+                    const el = document.createElement('div')
+                    el.className = 'cm-sticky-line'
+                    el.textContent = r.text || ' '
+                    el.addEventListener('click', () => {
+                        const pos = state.doc.line(r.no).from
+                        view.dispatch({
+                            selection: {anchor: pos},
+                            effects: EditorView.scrollIntoView(pos, {y: 'start'})
+                        })
+                        view.focus()
+                    })
+                    this.dom.appendChild(el)
+                }
+            }
+
+            hide() {
+                this.dom.style.display = 'none'
+            }
+
+            destroy() {
+                this.dom.remove()
+            }
+        }
+    )
+}
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index ed80576b..9960041e 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -45,6 +45,8 @@
       "showLineNumbers": "Show line numbers",
       "showFunctionHelp": "Show function help",
       "spaceDotOmission": "Show whitespace dots",
+      "showMinimap": "Show minimap",
+      "showStickyScroll": "Enable sticky scroll",
       "tabSize": "Indent size",
       "font": "Editor font",
       "fontSize": "Font size",
@@ -202,6 +204,10 @@
       "installing": "Installing…",
       "install": "Install",
       "note": "Auto-install relies on the matching toolchains already present on this machine: npm (pyright / typescript / intelephense / vscode-langservers-extracted), rustup (rust-analyzer), go (gopls), Homebrew (clangd / lua-language-server), gem (solargraph). If install fails, install manually with the command above then click \"Re-check\". Restart the app after installation to load the new server.",
+      "tabServers": "Language servers",
+      "tabAdapters": "Debug adapters",
+      "dapTitle": "Debug adapters",
+      "dapDesc": "Debug adapters (DAP). Once installed you can set breakpoints and debug the matching language.",
       "startInstall": "Starting installation…",
       "startInstallFailed": "Failed to start installation: ",
       "installDone": "✓ Installation complete",
@@ -290,6 +296,7 @@
     "openFile": "Open file",
     "saveFile": "Save file",
     "ai": "AI Assistant",
+    "git": "Git source control",
     "showSidebar": "Show sidebar",
     "hideSidebar": "Hide sidebar",
     "layoutHorizontal": "Side-by-side",
@@ -381,6 +388,9 @@
     "compareFailed": "Compare failed",
     "history": "Commit history",
     "logEmpty": "No commits",
+    "logSearchPlaceholder": "Search commit messages…",
+    "logAuthorPlaceholder": "Author",
+    "logClearFilter": "Clear",
     "loadMore": "Load more",
     "allLoaded": "All commits loaded",
     "logFailed": "Failed to load commit history",
@@ -444,13 +454,19 @@
     "tagMessagePlaceholder": "Annotation (optional; makes an annotated tag)",
     "tagCheckout": "Checkout (detached HEAD)",
     "tagCheckedOut": "Tag checked out",
+    "configTitle": "Repository Git config",
+    "identitySection": "Commit identity",
     "identityTitle": "Repository identity",
     "identityHint": "Applies to this repository only (git config --local), overriding the global user.name / user.email.",
     "identityName": "Name",
     "identityEmail": "Email",
     "identitySave": "Save",
-    "identitySaved": "Repository identity saved",
+    "identitySaved": "Repository config saved",
     "identityFailed": "Operation failed",
+    "signingSection": "Commit signing (GPG)",
+    "signingHint": "When enabled, commits are GPG-signed (commit.gpgsign); a signing key must be configured locally.",
+    "signingEnable": "GPG-sign commits",
+    "signingKey": "Signing key ID (user.signingkey, optional)",
     "graph": "Branch graph",
     "graphTitle": "Branch graph",
     "graphEmpty": "No commits",
@@ -470,6 +486,21 @@
     "rebaseMoveUp": "Move up",
     "rebaseMoveDown": "Move down",
     "rebaseNote": "Newer commits are on top; squash melds into the (older) commit below it.",
+    "hooks": "Hooks",
+    "hooksTitle": "Git hooks",
+    "hooksHint": "Hook scripts live in .git/hooks and run automatically on specific Git events. On Unix-like systems they must be executable to take effect.",
+    "hooksActive": "Active",
+    "hooksInactive": "Not set",
+    "hooksExecutable": "Executable",
+    "hooksNotExecutable": "Not executable",
+    "hookEdit": "Edit",
+    "hookContentPlaceholder": "#!/bin/sh\n# Write your hook script here…",
+    "hookExecutable": "Executable (enabled)",
+    "hookSave": "Save",
+    "hookDelete": "Delete",
+    "hookSaved": "Hook saved",
+    "hookDeleted": "Hook deleted",
+    "hookFailed": "Hook operation failed",
     "bisect": "Bisect",
     "bisectTitle": "Bisect",
     "bisectIdleHint": "Find the commit that introduced a problem via binary search: after starting, mark a known-good commit as \"good\" and a broken one as \"bad\"; git narrows down step by step.",
@@ -606,6 +637,8 @@
     "watchModeOff": "Disable watch mode (run on save)",
     "aiCompletionOn": "Enable AI completion (Tab to accept)",
     "aiCompletionOff": "Disable AI completion",
+    "formatOnSaveOn": "Enable format on save",
+    "formatOnSaveOff": "Disable format on save",
     "open": "Open file",
     "openFolder": "Open folder",
     "save": "Save file",
@@ -627,6 +660,10 @@
     "diff": "Diff (current vs saved)",
     "preview": "Live preview (Markdown / HTML)",
     "git": "Git source control",
+    "tasks": "Run tasks",
+    "runTests": "Run tests (auto-detect)",
+    "startDebug": "Debug current file",
+    "sendToTerminal": "Send selection to terminal",
     "toggleSidebar": "Toggle sidebar",
     "layoutHorizontal": "Layout: side-by-side",
     "layoutVertical": "Layout: top-bottom",
@@ -987,6 +1024,43 @@
     "revealIn": "Reveal in file manager: {path}",
     "unsaved": "Unsaved changes"
   },
+  "task": {
+    "title": "Run tasks",
+    "labelPlaceholder": "Task name",
+    "commandPlaceholder": "Command, e.g. npm run build",
+    "add": "Add",
+    "run": "Run",
+    "delete": "Delete",
+    "empty": "No tasks yet — add a command to run in the integrated terminal"
+  },
+  "debug": {
+    "continue": "Continue",
+    "pause": "Pause",
+    "stepOver": "Step over",
+    "stepIn": "Step into",
+    "stepOut": "Step out",
+    "restart": "Restart",
+    "stop": "Stop",
+    "statusStarting": "Starting…",
+    "statusRunning": "Running",
+    "statusStopped": "Paused",
+    "saveFirst": "Save the file before debugging",
+    "langUnsupported": "Debugging not supported for this language",
+    "installPython": "debugpy not found — install it: pip install debugpy",
+    "installGo": "delve not found — install it: go install github.com/go-delve/delve/cmd/dlv@latest",
+    "startFailed": "Failed to start debugging",
+    "panelTitle": "Debug",
+    "callStack": "Call stack",
+    "variables": "Variables",
+    "notStopped": "Running (not paused)",
+    "watch": "Watch",
+    "watchPlaceholder": "Add expression…",
+    "breakpoints": "Breakpoints",
+    "conditionPlaceholder": "Condition (optional)",
+    "exceptions": "Exception breakpoints",
+    "console": "Debug console",
+    "replPlaceholder": "Evaluate expression, Enter to run…"
+  },
   "snippet": {
     "title": "Snippets",
     "subtitle": "Type the prefix then press Tab to expand ($0 is the cursor position)",
@@ -1133,6 +1207,8 @@
     "codeActionMenu": "Code actions / quick fixes",
     "formatDoc": "Format document",
     "formatSelection": "Format selection",
+    "sendToTerminal": "Send to terminal",
+    "testCmdNotFound": "No test command detected; use Run Tasks to define one",
     "untitled": "Untitled",
     "multiEngine": "This type has multiple run engines; selected \"{name}\", switch manually in the dropdown",
     "pathCopied": "Path copied",
@@ -1145,6 +1221,8 @@
     "aiFormatting": "Requesting AI to tidy the code…",
     "noAdjust": "No adjustment needed",
     "formatFailed": "Format failed: ",
+    "formatOnSaveOn": "Format on save enabled",
+    "formatOnSaveOff": "Format on save disabled",
     "aiPredictOff": "AI code prediction disabled",
     "aiPredictOnNoKey": "AI code prediction enabled, but no API Key is configured. Fill it in \"Settings → AI\"",
     "aiPredictOn": "AI code prediction enabled; pause typing to see the gray completion, press Tab to accept",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 51bfd418..6633e874 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -45,6 +45,8 @@
       "showLineNumbers": "是否显示行号",
       "showFunctionHelp": "是否显示函数帮助信息",
       "spaceDotOmission": "是否显示空格省略",
+      "showMinimap": "显示代码缩略图 (minimap)",
+      "showStickyScroll": "启用粘性滚动 (sticky scroll)",
       "tabSize": "缩进空格数",
       "font": "编辑器字体",
       "fontSize": "字体大小",
@@ -202,6 +204,10 @@
       "installing": "安装中…",
       "install": "安装",
       "note": "自动安装依赖本机已具备对应工具链：npm（pyright / typescript / intelephense / vscode-langservers-extracted）、rustup（rust-analyzer）、go（gopls）、Homebrew（clangd / lua-language-server）、gem（solargraph）。若安装失败，可按上方命令手动安装后点「重新检测」。安装完成后请重启应用以加载新服务器。",
+      "tabServers": "语言服务",
+      "tabAdapters": "调试适配器",
+      "dapTitle": "调试适配器",
+      "dapDesc": "调试器(DAP)适配器，安装后即可对相应语言下断点调试。",
       "startInstall": "开始安装…",
       "startInstallFailed": "启动安装失败：",
       "installDone": "✓ 安装完成",
@@ -290,6 +296,7 @@
     "openFile": "打开文件",
     "saveFile": "保存文件",
     "ai": "AI 助手",
+    "git": "Git 源代码管理",
     "showSidebar": "显示侧栏",
     "hideSidebar": "隐藏侧栏",
     "layoutHorizontal": "左右布局",
@@ -381,6 +388,9 @@
     "compareFailed": "对比失败",
     "history": "提交历史",
     "logEmpty": "暂无提交",
+    "logSearchPlaceholder": "搜索提交信息…",
+    "logAuthorPlaceholder": "作者",
+    "logClearFilter": "清除",
     "loadMore": "加载更多",
     "allLoaded": "已加载全部提交",
     "logFailed": "加载提交历史失败",
@@ -444,13 +454,19 @@
     "tagMessagePlaceholder": "附注信息（可选，填则为附注标签）",
     "tagCheckout": "检出(分离 HEAD)",
     "tagCheckedOut": "已检出标签",
+    "configTitle": "仓库 Git 配置",
+    "identitySection": "提交身份",
     "identityTitle": "仓库身份",
     "identityHint": "仅作用于当前仓库（git config --local），覆盖全局 user.name / user.email。",
     "identityName": "用户名",
     "identityEmail": "邮箱",
     "identitySave": "保存",
-    "identitySaved": "已保存仓库身份",
+    "identitySaved": "已保存仓库配置",
     "identityFailed": "操作失败",
+    "signingSection": "提交签名 (GPG)",
+    "signingHint": "开启后提交将使用 GPG 签名（commit.gpgsign），需本地已配置签名密钥。",
+    "signingEnable": "提交时进行 GPG 签名",
+    "signingKey": "签名密钥 ID（user.signingkey，可选）",
     "graph": "分支图",
     "graphTitle": "分支图",
     "graphEmpty": "暂无提交",
@@ -470,6 +486,21 @@
     "rebaseMoveUp": "上移",
     "rebaseMoveDown": "下移",
     "rebaseNote": "顶部为较新提交；合并会并入其下方（较旧）的提交。",
+    "hooks": "钩子",
+    "hooksTitle": "Git 钩子 (hooks)",
+    "hooksHint": "钩子脚本存放于 .git/hooks，在特定 Git 事件时自动执行。类 Unix 下需具备可执行权限才会生效。",
+    "hooksActive": "已启用",
+    "hooksInactive": "未设置",
+    "hooksExecutable": "可执行",
+    "hooksNotExecutable": "无执行权限",
+    "hookEdit": "编辑",
+    "hookContentPlaceholder": "#!/bin/sh\n# 在此编写钩子脚本…",
+    "hookExecutable": "可执行（启用）",
+    "hookSave": "保存",
+    "hookDelete": "删除",
+    "hookSaved": "钩子已保存",
+    "hookDeleted": "钩子已删除",
+    "hookFailed": "钩子操作失败",
     "bisect": "二分定位",
     "bisectTitle": "二分定位 (bisect)",
     "bisectIdleHint": "通过二分查找定位引入问题的提交：开始后，把已知正常的提交标记为「好」、有问题的标记为「坏」，git 会逐步缩小范围。",
@@ -606,6 +637,8 @@
     "watchModeOff": "关闭监听模式（保存自动运行）",
     "aiCompletionOn": "开启 AI 代码预测（Tab 补全）",
     "aiCompletionOff": "关闭 AI 代码预测",
+    "formatOnSaveOn": "开启保存时格式化",
+    "formatOnSaveOff": "关闭保存时格式化",
     "open": "打开文件",
     "openFolder": "打开文件夹",
     "save": "保存文件",
@@ -627,6 +660,10 @@
     "diff": "差异对比（当前 vs 已保存）",
     "preview": "实时预览（Markdown / HTML）",
     "git": "Git 源代码管理",
+    "tasks": "运行任务",
+    "runTests": "运行测试（自动识别）",
+    "startDebug": "开始调试当前文件",
+    "sendToTerminal": "发送选区到终端",
     "toggleSidebar": "切换侧栏",
     "layoutHorizontal": "布局：左右",
     "layoutVertical": "布局：上下",
@@ -987,6 +1024,43 @@
     "revealIn": "在访达中显示：{path}",
     "unsaved": "有未保存的修改"
   },
+  "task": {
+    "title": "运行任务",
+    "labelPlaceholder": "任务名",
+    "commandPlaceholder": "命令，如 npm run build",
+    "add": "添加",
+    "run": "运行",
+    "delete": "删除",
+    "empty": "暂无任务，添加一个在集成终端中运行的命令"
+  },
+  "debug": {
+    "continue": "继续",
+    "pause": "暂停",
+    "stepOver": "单步跳过",
+    "stepIn": "单步进入",
+    "stepOut": "单步跳出",
+    "restart": "重启",
+    "stop": "停止",
+    "statusStarting": "启动中…",
+    "statusRunning": "运行中",
+    "statusStopped": "已停驻",
+    "saveFirst": "请先保存文件再开始调试",
+    "langUnsupported": "当前语言暂不支持调试",
+    "installPython": "未检测到 debugpy，请先安装：pip install debugpy",
+    "installGo": "未检测到 delve，请先安装：go install github.com/go-delve/delve/cmd/dlv@latest",
+    "startFailed": "启动调试失败",
+    "panelTitle": "调试",
+    "callStack": "调用栈",
+    "variables": "变量",
+    "notStopped": "运行中（未停驻）",
+    "watch": "监视",
+    "watchPlaceholder": "添加表达式…",
+    "breakpoints": "断点",
+    "conditionPlaceholder": "条件（可选）",
+    "exceptions": "异常断点",
+    "console": "调试控制台",
+    "replPlaceholder": "求值表达式，回车执行…"
+  },
   "snippet": {
     "title": "代码片段",
     "subtitle": "输入前缀后按 Tab 展开（$0 为光标落点）",
@@ -1133,6 +1207,8 @@
     "codeActionMenu": "代码操作 / 快速修复",
     "formatDoc": "格式化文档",
     "formatSelection": "格式化选中",
+    "sendToTerminal": "发送到终端",
+    "testCmdNotFound": "未识别到测试命令，请用「运行任务」自定义",
     "untitled": "未命名",
     "multiEngine": "该类型可用多个运行引擎，已选「{name}」，可在下拉手动切换",
     "pathCopied": "已复制路径",
@@ -1145,6 +1221,8 @@
     "aiFormatting": "正在请求 AI 整理代码…",
     "noAdjust": "代码无需调整",
     "formatFailed": "格式化失败: ",
+    "formatOnSaveOn": "已开启保存时格式化",
+    "formatOnSaveOff": "已关闭保存时格式化",
     "aiPredictOff": "AI 代码预测已关闭",
     "aiPredictOnNoKey": "AI 代码预测已开启，但尚未配置 API Key，请在「设置 → AI」中填写",
     "aiPredictOn": "AI 代码预测已开启，停顿打字即可看到灰色补全，Tab 接受",
diff --git a/src/main.ts b/src/main.ts
index 5bf8df0f..bf31e39b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,6 +2,7 @@ import { createApp } from 'vue'
 import App from './App.vue'
 import './style.css'
 import ToastPlugin from './plugins/toast'
+import { TooltipPlugin, vTooltip } from './plugins/tooltip'
 import { loadKvStore } from './composables/useKvStore'
 import { i18n, loadLocales } from './i18n'
 import { loadDbConnections } from './composables/useDbConnections'
@@ -10,8 +11,10 @@ import { loadDbConnections } from './composables/useDbConnections'
 loadKvStore().finally(() => {
     loadLocales() // KV 载入后合并自定义语言包并恢复界面语言
     loadDbConnections() // 从独立表载入数据库连接（含旧 KV 数据迁移）
-    createApp(App)
-        .use(ToastPlugin)
+    const app = createApp(App)
+    app.use(ToastPlugin)
         .use(i18n)
-        .mount('#app')
+        .use(TooltipPlugin)
+    app.directive('tooltip', vTooltip)
+    app.mount('#app')
 })
diff --git a/src/plugins/tooltip.ts b/src/plugins/tooltip.ts
new file mode 100644
index 00000000..7b49f2df
--- /dev/null
+++ b/src/plugins/tooltip.ts
@@ -0,0 +1,131 @@
+import type {App, Directive} from 'vue'
+
+// 全局提示气泡：任何带原生 title（或 data-cf-tip）的元素，悬停时显示统一样式的气泡，
+// 并抑制浏览器默认 title。一处实现，全应用生效（含动态/未来新增的元素）。
+// 样式与 ui/Tooltip.vue 保持一致（深色气泡、白字、圆角、出现在元素下方）。
+
+let tip: HTMLDivElement | null = null
+
+function ensureTip(): HTMLDivElement {
+    if (tip) {
+        return tip
+    }
+    tip = document.createElement('div')
+    tip.setAttribute('role', 'tooltip')
+    Object.assign(tip.style, {
+        position: 'fixed',
+        zIndex: '99999',
+        pointerEvents: 'none',
+        background: '#1f2937',
+        color: '#ffffff',
+        fontSize: '12px',
+        lineHeight: '1.3',
+        padding: '4px 8px',
+        borderRadius: '6px',
+        boxShadow: '0 4px 14px rgba(0,0,0,0.25)',
+        maxWidth: '320px',
+        opacity: '0',
+        transition: 'opacity 120ms ease',
+        top: '0',
+        left: '0'
+    } as Partial<CSSStyleDeclaration>)
+    document.body.appendChild(tip)
+    return tip
+}
+
+function show(el: HTMLElement, text: string) {
+    const t = ensureTip()
+    t.textContent = text
+    t.style.whiteSpace = text.length > 40 ? 'normal' : 'nowrap'
+    t.style.opacity = '0'
+    const r = el.getBoundingClientRect()
+    const bw = t.offsetWidth
+    const bh = t.offsetHeight
+    let left = r.left + r.width / 2 - bw / 2
+    let top = r.bottom + 6
+    // 下方放不下则翻到上方
+    if (top + bh > window.innerHeight - 4) {
+        top = r.top - bh - 6
+    }
+    left = Math.max(4, Math.min(left, window.innerWidth - bw - 4))
+    t.style.left = `${Math.round(left)}px`
+    t.style.top = `${Math.round(top)}px`
+    t.style.opacity = '1'
+}
+
+function hide() {
+    if (tip) {
+        tip.style.opacity = '0'
+    }
+}
+
+// 读取提示文案：首次把原生 title 迁移到 data-cf-tip 并移除 title（抑制浏览器默认气泡），
+// 之后从 data-cf-tip 读取；title 再次出现（动态更新）时会重新捕获。
+function getText(el: HTMLElement): string | null {
+    const title = el.getAttribute('title')
+    if (title) {
+        el.setAttribute('data-cf-tip', title)
+        el.removeAttribute('title')
+        return title
+    }
+    return el.getAttribute('data-cf-tip')
+}
+
+function onOver(e: Event) {
+    const target = e.target as HTMLElement | null
+    if (!target || !target.closest) {
+        return
+    }
+    const el = target.closest('[title],[data-cf-tip]') as HTMLElement | null
+    if (!el) {
+        return
+    }
+    const text = getText(el)
+    if (text) {
+        show(el, text)
+    }
+}
+
+function onOut(e: Event) {
+    const target = e.target as HTMLElement | null
+    if (!target || !target.closest) {
+        return
+    }
+    const el = target.closest('[title],[data-cf-tip]') as HTMLElement | null
+    if (!el) {
+        return
+    }
+    // 移动到该元素的子节点内不应隐藏
+    const related = (e as MouseEvent).relatedTarget as Node | null
+    if (related && el.contains(related)) {
+        return
+    }
+    hide()
+}
+
+export const TooltipPlugin = {
+    install(_app: App) {
+        if (typeof document === 'undefined') {
+            return
+        }
+        document.addEventListener('mouseover', onOver, true)
+        document.addEventListener('mouseout', onOut, true)
+        document.addEventListener('scroll', hide, true)
+        window.addEventListener('blur', hide)
+    }
+}
+
+// 可选的显式用法：v-tooltip="'文本'"（无需依赖原生 title）
+export const vTooltip: Directive<HTMLElement, string | undefined> = {
+    mounted(el, binding) {
+        if (binding.value) {
+            el.setAttribute('data-cf-tip', binding.value)
+            el.removeAttribute('title')
+        }
+    },
+    updated(el, binding) {
+        if (binding.value) {
+            el.setAttribute('data-cf-tip', binding.value)
+        }
+    }
+}
diff --git a/src/types/app.ts b/src/types/app.ts
index 01ce9b1d..f9da7c2e 100644
--- a/src/types/app.ts
+++ b/src/types/app.ts
@@ -57,6 +57,8 @@ export interface EditorConfig
     show_line_numbers?: boolean
     show_function_help?: boolean
     space_dot_omission?: boolean
+    show_minimap?: boolean
+    show_sticky_scroll?: boolean
     layout?: LayoutMode
     last_direction?: SplitDirection
     max_open_file_size?: number